feat(server): use multer

Author: itschip

game/package.json

@@ -11,10 +11,12 @@
   },
   "dependencies": {
     "@citizenfx/http-wrapper": "^0.2.2",
+    "@koa/router": "^13.1.0",
     "form-data": "^4.0.1",
     "koa": "^2.15.4",
     "koa-body": "^6.0.1",
     "koa-router": "^13.0.1",
+    "multer": "1.4.5-lts.1",
     "nanoid": "^5.0.8",
     "node-fetch": "^3.3.2"
   },
@@ -25,6 +27,8 @@
     "@types/formidable": "^3.4.5",
     "@types/koa": "^2.15.0",
     "@types/koa-router": "^7.4.8",
+    "@types/koa__router": "^12.0.4",
+    "@types/multer": "^1.4.12",
     "@types/node": "^22.8.6",
     "colorette": "^2.0.20",
     "esbuild": "^0.24.0",

game/pnpm-lock.yaml

@@ -9,8 +9,8 @@ const shouldRestart = process.argv.findIndex((arg) => arg === '--restart') !== -
 const buildConfig = {
   server: {
     platform: 'node',
-    target: ['node16'],
-    format: 'cjs',
+    target: ['node21'],
+    format: 'cjs'
   },
   client: {
     platform: 'browser',

game/scripts/esbuild.config.js

@@ -1,20 +1,23 @@
 import Koa from 'koa';
-import { koaBody } from 'koa-body';
-import Router from 'koa-router';
+import Router from '@koa/router';
+import { multer } from './multer'
+
 // @ts-ignore - no types
 import { setHttpCallback } from '@citizenfx/http-wrapper';
 
 import FormData from 'form-data';
 import fetch from 'node-fetch';
 import { CaptureOptions, DataType } from './types';
 import { UploadStore } from './upload-store';
-import { readFile, unlink } from 'fs/promises';
 
 export async function createServer(uploadStore: UploadStore) {
   const app = new Koa();
   const router = new Router();
+  const upload = multer({
+    storage: multer.memoryStorage()
+  });
 
-  router.post('/image', async (ctx) => {
+  router.post('/image', upload.single("file") as any, async (ctx) => {
     const token = ctx.request.headers['x-screencapture-token'] as string;
     if (!token) {
       ctx.status = 401;
@@ -25,25 +28,16 @@ export async function createServer(uploadStore: UploadStore) {
     const { callback, dataType, isRemote, remoteConfig, url, playerSource, correlationId } =
       uploadStore.getUpload(token);
 
-    const files = ctx.request.files;
-    if (!files) {
-      ctx.status = 400;
-      ctx.body = { status: 'error', message: 'No files provided' };
-      return;
-    }
-
-    // dont blame me, but node runtime does not like formidable for some reason
-    const file = files['file'] as any;
+    const file = ctx.file;
     if (!file) {
       ctx.status = 400;
       ctx.body = { status: 'error', message: 'No file provided' };
       return;
     }
 
     try {
-      const d = await readFile(file.filepath);
-      const buf = await buffer(dataType, d);
-      await unlink(file.filepath);
+
+      const buf = await buffer(dataType, file.buffer);
 
       if (isRemote) {
         const response = await uploadFile(url, remoteConfig, buf, dataType);
@@ -71,12 +65,7 @@ export async function createServer(uploadStore: UploadStore) {
     }
   });
 
-  const koaMiddle = koaBody({
-    multipart: true,
-    patchKoa: true,
-  });
-
-  app.use(koaMiddle).use(router.routes()).use(router.allowedMethods());
+  app.use(router.routes()).use(router.allowedMethods());
 
   setHttpCallback(app.callback());
 }

game/server/koa-router.ts

@@ -0,0 +1,56 @@
+import originalMulter, { Options, Multer } from 'multer';
+
+export function multer(options: Options): Multer {
+  const m = originalMulter(options);
+
+  makePromise(m, 'any');
+  makePromise(m, 'array');
+  makePromise(m, 'fields');
+  makePromise(m, 'none');
+  makePromise(m, 'single');
+
+  return m;
+}
+
+function makePromise(multer: any, name: any): any {
+  if (!multer[name]) return;
+
+  const fn = multer[name];
+
+  multer[name] = function () {
+    const middleware = Reflect.apply(fn, this, arguments);
+
+    return async (ctx: any, next: any) => {
+      await new Promise((resolve, reject) => {
+        middleware(ctx.req, ctx.res, (err: any) => {
+          if (err) return reject(err);
+          if ('request' in ctx) {
+            if (ctx.req.body) {
+              ctx.request.body = ctx.req.body;
+              delete ctx.req.body;
+            }
+
+            if (ctx.req.file) {
+              ctx.request.file = ctx.req.file;
+              ctx.file = ctx.req.file;
+              delete ctx.req.file;
+            }
+
+            if (ctx.req.files) {
+              ctx.request.files = ctx.req.files;
+              ctx.files = ctx.req.files;
+              delete ctx.req.files;
+            }
+          }
+
+          resolve(ctx);
+        });
+      });
+
+      return next();
+    };
+  };
+}
+
+multer.diskStorage = originalMulter.diskStorage;
+multer.memoryStorage = originalMulter.memoryStorage;