update

package-lock.json

@@ -14,6 +14,7 @@
         "@types/express": "^4.17.17",
         "@types/uuid": "^9.0.2",
         "archiver": "^6.0.1",
+        "axios": "^1.5.1",
         "eventsource-parser": "^1.0.0",
         "express": "^4.18.2",
         "express-fileupload": "^1.4.0",
@@ -272,6 +273,21 @@
       "version": "3.2.4",
       "license": "MIT"
     },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
+    },
+    "node_modules/axios": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+      "dependencies": {
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
     "node_modules/b4a": {
       "version": "1.6.4",
       "license": "ISC"
@@ -443,6 +459,17 @@
         "simple-swizzle": "^0.2.2"
       }
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/commander": {
       "version": "2.20.3",
       "license": "MIT"
@@ -585,6 +612,14 @@
         "node": ">=4.0.0"
       }
     },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "license": "MIT",
@@ -835,6 +870,38 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/follow-redirects": {
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/formdata-polyfill": {
       "version": "4.0.10",
       "license": "MIT",
@@ -1434,6 +1501,11 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
+    },
     "node_modules/pump": {
       "version": "3.0.0",
       "license": "MIT",

package.json

@@ -17,6 +17,7 @@
     "@types/express": "^4.17.17",
     "@types/uuid": "^9.0.2",
     "archiver": "^6.0.1",
+    "axios": "^1.5.1",
     "eventsource-parser": "^1.0.0",
     "express": "^4.18.2",
     "express-fileupload": "^1.4.0",

src/index.mts

@@ -1,15 +1,12 @@
-import express from "express"
-import fileUpload from "express-fileupload"
-import path from "path"
-import os from "os"
-import fs from "fs"
-import archiver from "archiver"
-import ffmpeg from "fluent-ffmpeg"
-
-// import { initFolders } from "./initFolders.mts"
-import { runColmap, ColmapOptions } from "./colmap.mts"
-
-// initFolders()
+import express, { Request, Response, NextFunction } from "express";
+import path from "path";
+import os from "os";
+import fs from "fs";
+import axios from "axios";
+import fileUpload from "express-fileupload";
+import archiver from "archiver";
+import ffmpeg from "fluent-ffmpeg";
+import { ColmapOptions, runColmap } from "./colmap.mts";
 
 declare module 'express-serve-static-core' {
   interface Request {
@@ -17,87 +14,112 @@ declare module 'express-serve-static-core' {
   }
 }
 
-const app = express()
-const port = 7860
+const app = express();
+const port = 7860;
 
-const maxActiveRequests = 4
-let activeRequests = 0
+const maxActiveRequests = 4;
+let activeRequests = 0;
 
-app.use(express.json({limit: '50mb'}))
-app.use(express.urlencoded({limit: '50mb', extended: true}))
-app.use(fileUpload())
+app.use(express.json({limit: '50mb'}));
+app.use(express.urlencoded({limit: '50mb', extended: true}));
+app.use(fileUpload());
 
-app.post("/", async (req, res) => {
-  if (activeRequests >= maxActiveRequests) {
-    res.status(503).json({message: "Service Unavailable: Max concurrent requests reached. Please try again later"}).end();
-    return
+app.use("/", async (req: Request, res: Response, _next: NextFunction) => {
+  if (activeRequests++ >= maxActiveRequests) {
+    return res.status(503).send("Service Unavailable");
   }
-  activeRequests++
-  
-  if (!req.files || !req.files.data || req.files.data.mimetype !== 'video/mp4') {
-    res.status(400).json({error: "Missing or invalid data file in request"}).end()
-    return
-  }
-
-  let options: ColmapOptions = req.body 
-  let dataFile: fileUpload.UploadedFile = req.files.data
 
-  let projectTempDir = path.join(os.tmpdir(), Math.random().toString().slice(2))
-  let outputTempDir = path.join(os.tmpdir(), Math.random().toString().slice(2))
+  const options: ColmapOptions = req.body;
+  let dataFile: fileUpload.UploadedFile | string = "";
 
   try {
-    fs.mkdirSync(projectTempDir) 
-    fs.mkdirSync(outputTempDir) 
-
-    await dataFile.mv(path.join(projectTempDir, dataFile.name)) 
-
-    let imageFolder = path.join(projectTempDir, 'images');
-    fs.mkdirSync(imageFolder)
-
-    await new Promise((resolve, reject) => {
-      ffmpeg(path.join(projectTempDir, dataFile.name))
-        .outputOptions('-vf', 'fps=1') // Change this value depending on the number of frames you want from video.
-        .output(path.join(imageFolder, 'image-%03d.png'))
-        .on('end', resolve)
-        .on('error', reject)
-        .run()
-    })
-
-    options.projectPath = projectTempDir 
-    options.workspacePath = projectTempDir 
-    options.imagePath = imageFolder
-
-    const result = await runColmap(options)
-
-    let outputFilePath = path.join(outputTempDir, 'output.zip')
-    let output = fs.createWriteStream(outputFilePath)
-    let archive = archiver('zip')
-
-    archive.directory(outputTempDir, false)
-    archive.pipe(output)
-    await archive.finalize()
-
-    res.status(200)
-    res.download(outputFilePath, 'output.zip', (error) => {
-      if (!error) fs.rmSync(projectTempDir, {recursive: true, force: true}) 
-      fs.rmSync(outputTempDir, {recursive: true, force: true})
-    })
+    if (req.is("json")) {
+      const { data } = await axios.get(req.body.assetUrl, {
+        responseType: "arraybuffer",
+      });
+      dataFile = Buffer.from(data, "binary");
+    }
+    // Request is not JSON type is file upload request
+    else {
+      if (!req.files || !req.files.data || req.files.data.mimetype !== 'video/mp4') {
+        return res.status(400).send("Missing or invalid data file in request");
+      }
+      dataFile = req.files.data;
+    }
+
+    const { projectTempDir, outputTempDir, imageFolder } = setupDirectories();
+    await handleFileStorage(dataFile, projectTempDir);
+
+    await generateImagesFromData(projectTempDir, imageFolder);
+
+    options.projectPath = projectTempDir;
+    options.workspacePath = projectTempDir;
+    options.imagePath = imageFolder;
+
+    // note: we don't need to read the result since this is a function having side effects on the file system
+    const result = await runColmap(options);
+    console.log("result:", result);
+    
+    await createOutputArchive(outputTempDir);
+
+    res.download(path.join(outputTempDir, 'output.zip'), 'output.zip', (error) => {
+      if (!error) fs.rmSync(projectTempDir, {recursive: true, force: true});
+      fs.rmSync(outputTempDir, {recursive: true, force: true});
+    });
   } catch (error) {
-    res.status(500).json({
-      error: "Couldn't generate pose data",
-      message: error
-    }).end()
+    res.status(500).send(`Couldn't generate pose data. Error: ${error}`);
   } finally {
-    activeRequests--
+    activeRequests--;
   }
 });
 
-app.get("/", async (req, res) => {
-  res.status(200)
-  res.write(`<html><head></head><body>
-Campose API is a micro-service used to generate came pose data from a set of images.
-    </body></html>`)
-  res.end()
-})
+app.get("/", async (req: Request, res: Response) => {
+  res.send("Campose API is a micro-service used to generate camera pose data from a set of images.");
+});
+
+app.listen(port, () => console.log(`Listening at http://localhost:${port}`));
+
+function setupDirectories() {
+  const projectTempDir = path.join(os.tmpdir(), Math.random().toString().slice(2));
+  const outputTempDir = path.join(os.tmpdir(), Math.random().toString().slice(2));
+  const imageFolder = path.join(projectTempDir, 'images');
+
+  fs.mkdirSync(projectTempDir);
+  fs.mkdirSync(outputTempDir);
+  fs.mkdirSync(imageFolder);
+
+  return { projectTempDir, outputTempDir, imageFolder };
+}
+
+async function handleFileStorage(dataFile: fileUpload.UploadedFile | string, projectTempDir: string) {
+  if (typeof dataFile === "string") {
+    fs.writeFile(path.join(projectTempDir, "data.mp4"), dataFile, (err) => {
+      if (err) throw err;
+    });
+  } else {
+    await dataFile.mv(path.join(projectTempDir, dataFile.name));
+  }
+}
+
+function generateImagesFromData(projectTempDir: string, imageFolder: string) {
+  return new Promise<void>((resolve, reject) => {
+    ffmpeg(path.join(projectTempDir, 'data.mp4'))
+      .outputOptions('-vf', 'fps=1')
+      .output(path.join(imageFolder, 'image-%03d.png'))
+      .on('end', resolve)
+      .on('error', reject)
+      .run()
+  });
+}
 
-app.listen(port, () => { console.log(`Open http://localhost:${port}`) })
+function createOutputArchive(outputTempDir: string) {
+  return new Promise<void>((resolve, reject) => {
+    const archive = archiver('zip', { zlib: { level: 9 } });
+    const output = fs.createWriteStream(path.join(outputTempDir, 'output.zip'));
+
+    archive.pipe(output);
+    archive.directory(path.join(outputTempDir, '/'), '');
+    archive.finalize();
+    resolve();
+  });
+}