feat(satori): enhance blob support for internal api

satorijs · Nov 25, 2024 · 8b20e2a · 8b20e2a
1 parent fab90c8
commit 8b20e2a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/adapters/satori/package.json b/adapters/satori/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/adapter-satori",
   "description": "Satori Adapter for Satorijs",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "type": "module",
   "exports": {
     ".": {

diff --git a/adapters/satori/src/bot.ts b/adapters/satori/src/bot.ts
@@ -34,7 +34,7 @@ function createInternal(bot: SatoriBot, prefix = '') {
         return bot.http.post('/v1/internal/' + key, args)
       }
       const form = new FormData()
-      form.append('$', new Blob([JSON.stringify(data)], { type: 'application/json' }))
+      form.append('$', JSON.stringify(data))
       for (const [key, value] of Object.entries(blobs)) {
         if (value instanceof File) {
           form.append(key, value, value.name)

diff --git a/packages/server/package.json b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@satorijs/plugin-server",
   "description": "Basic API server for Satori protocol",
-  "version": "2.8.0",
+  "version": "2.8.2",
   "type": "module",
   "exports": {
     ".": {

diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
@@ -135,17 +135,12 @@ class SatoriServer extends Service<SatoriServer.Config> {
       try {
         let args = koa.request.body
         if (koa.request.files) {
-          const blobs: Dict<Blob> = Object.create(null)
-          const { $, ...files } = koa.request.files
-          const [json] = await Promise.all([
-            readFile(makeArray($)[0].filepath, 'utf8'),
-            Promise.all(Object.entries(files).map(async ([key, value]) => {
-              value = makeArray(value)[0]
-              const buffer = await readFile(value.filepath)
-              return [key, new File([buffer], value.originalFilename!, { type: value.mimetype! })]
-            })),
-          ])
-          args = deserialize(JSON.parse(json), '$', blobs)
+          const blobs = Object.fromEntries(await Promise.all(Object.entries(koa.request.files).map(async ([key, value]) => {
+            value = makeArray(value)[0]
+            const buffer = await readFile(value.filepath)
+            return [key, new File([buffer], value.originalFilename!, { type: value.mimetype! })] as const
+          })))
+          args = deserialize(JSON.parse(koa.request.body.$), '$', blobs)
         }
         const result = await bot.internal[name](...args)
         koa.body = result