fix

package-lock.json

@@ -12,6 +12,7 @@
         "@gorgonjs/file-provider": "^1.4.1",
         "@gorgonjs/gorgon": "^1.4.1",
         "@types/express": "^4.17.17",
+        "@types/express-fileupload": "^1.4.2",
         "@types/uuid": "^9.0.2",
         "archiver": "^6.0.1",
         "axios": "^1.5.1",
@@ -126,6 +127,14 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/busboy": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/@types/busboy/-/busboy-1.5.1.tgz",
+      "integrity": "sha512-JAymE2skNionWnBUwby3MatzPUw4D/6/7FX1qxBXLzmRnFxmqU0luIof7om0I8R3B/rSr9FKUnFCqxZ/NeGbrw==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/connect": {
       "version": "3.4.36",
       "license": "MIT",
@@ -143,6 +152,15 @@
         "@types/serve-static": "*"
       }
     },
+    "node_modules/@types/express-fileupload": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/@types/express-fileupload/-/express-fileupload-1.4.2.tgz",
+      "integrity": "sha512-m7j9veuCI02m0eyMfmZI7jrVU2CzH43U6EbAuzvCoBdhliXdIndb32cukcRTG4AOQONbe0MBmEcWvXAmQh9IMg==",
+      "dependencies": {
+        "@types/busboy": "*",
+        "@types/express": "*"
+      }
+    },
     "node_modules/@types/express-serve-static-core": {
       "version": "4.17.36",
       "license": "MIT",

package.json

@@ -15,6 +15,7 @@
     "@gorgonjs/file-provider": "^1.4.1",
     "@gorgonjs/gorgon": "^1.4.1",
     "@types/express": "^4.17.17",
+    "@types/express-fileupload": "^1.4.2",
     "@types/uuid": "^9.0.2",
     "archiver": "^6.0.1",
     "axios": "^1.5.1",

src/index.mts

@@ -33,7 +33,7 @@ app.post("/", async (req: Request, res: Response, _next: NextFunction) => {
   }
 
   const options: ColmapOptions = req.body;
-  let dataFile: fileUpload.UploadedFile | string = "";
+  let dataFile: fileUpload.UploadedFile | Buffer = Buffer.from("");
 
   try {
     // we accept either JSON requests
@@ -95,7 +95,7 @@ function setupDirectories() {
   return { projectTempDir, outputTempDir, imageFolder };
 }
 
-async function handleFileStorage(dataFile: fileUpload.UploadedFile | string, projectTempDir: string) {
+async function handleFileStorage(dataFile: fileUpload.UploadedFile | Buffer, projectTempDir: string) {
   console.log(`handleFileStorage called (projectTempDir: ${projectTempDir})`);
   console.log("typeof dataFile: " + typeof dataFile);
   if (dataFile instanceof Buffer) {
@@ -104,6 +104,9 @@ async function handleFileStorage(dataFile: fileUpload.UploadedFile | string, pro
   } else if (typeof dataFile === "object" && dataFile.mv) {
     console.log(`typeof dataFile === "object" && dataFile.mv`);
     try {
+      console.log("dataFile.name = " + dataFile.name);
+
+      console.log("path.join(projectTempDir, dataFile.name) = " + path.join(projectTempDir, dataFile.name));
       await dataFile.mv(path.join(projectTempDir, dataFile.name));
     } catch (error) {
       throw new Error(`File can't be moved: ${error}`);