add file upload

botuniverse · Jun 2, 2023 · 12f7cfe · 12f7cfe
1 parent 5ef1455
commit 12f7cfe
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/src/OneBot/Driver/Swoole/TopEventListener.php b/src/OneBot/Driver/Swoole/TopEventListener.php
@@ -5,6 +5,7 @@
 namespace OneBot\Driver\Swoole;
 
 use Choir\Http\HttpFactory;
+use Choir\Http\UploadedFile;
 use Choir\WebSocket\FrameInterface;
 use OneBot\Driver\Coroutine\Adaptive;
 use OneBot\Driver\Event\Http\HttpRequestEvent;
@@ -92,7 +93,21 @@ public function onRequest(array $config, Request $request, Response $response)
             $request->header,
             $content
         );
-        $req = $req->withQueryParams($request->get ?? []);
+        $req = $req->withQueryParams($request->get ?? [])
+            ->withCookieParams($request->cookie ?? []);
+        $uploaded = [];
+        if (!empty($request->files)) {
+            foreach ($request->files as $key => $value) {
+                $upload = new UploadedFile([
+                    'key' => $key,
+                    ...$value,
+                ]);
+                $uploaded[] = $upload;
+            }
+            if ($uploaded !== []) {
+                $req = $req->withUploadedFiles($uploaded);
+            }
+        }
         $event = new HttpRequestEvent($req);
         try {
             $event->setSocketConfig($config);

diff --git a/src/OneBot/Driver/Workerman/TopEventListener.php b/src/OneBot/Driver/Workerman/TopEventListener.php
@@ -5,6 +5,7 @@
 namespace OneBot\Driver\Workerman;
 
 use Choir\Http\HttpFactory;
+use Choir\Http\UploadedFile;
 use Choir\WebSocket\FrameFactory;
 use Choir\WebSocket\FrameInterface;
 use OneBot\Driver\Coroutine\Adaptive;
@@ -161,12 +162,28 @@ public function onHttpRequest(array $config, TcpConnection $connection, Request
         }
         $port = $connection->getLocalPort();
         ob_logger()->debug('Http request from ' . $port . ': ' . $request->uri());
-        $event = new HttpRequestEvent(HttpFactory::createServerRequest(
+        $req = HttpFactory::createServerRequest(
             $request->method(),
             $request->uri(),
             $request->header(),
             $request->rawBody()
-        ));
+        );
+        $req = $req->withQueryParams($request->get() ?? [])
+            ->withCookieParams($request->cookie() ?? []);
+        if (!empty($request->file())) {
+            $uploaded = [];
+            foreach ($request->file() as $key => $value) {
+                $upload = new UploadedFile([
+                    'key' => $key,
+                    ...$value,
+                ]);
+                $uploaded[] = $upload;
+            }
+            if ($uploaded !== []) {
+                $req = $req->withUploadedFiles($uploaded);
+            }
+        }
+        $event = new HttpRequestEvent($req);
         $event->setSocketConfig($config);
         $send_callable = function (ResponseInterface $psr_response) use ($connection) {
             $response = new WorkermanResponse();

diff --git a/src/OneBot/global_defines.php b/src/OneBot/global_defines.php
@@ -13,7 +13,7 @@
 use ZM\Logger\ConsoleLogger;
 
 const ONEBOT_VERSION = '12';
-const ONEBOT_LIBOB_VERSION = '0.6.3';
+const ONEBOT_LIBOB_VERSION = '0.6.4';
 
 const ONEBOT_JSON = 1;
 const ONEBOT_MSGPACK = 2;