Merge pull request #162 from sensebox/feat/project-id

feat: add projectId param

Author: Thiemann96

Dockerfile

@@ -1,6 +1,6 @@
 FROM node:22-alpine AS base
 
-ENV ARDUINO_CLI_VERSION=1.1.0
+ENV ARDUINO_CLI_VERSION=1.3.0
 ENV SENSEBOXCORE_VERSION=2.0.0
 ENV ARDUINO_SAMD_VERSION=1.8.13
 ENV ARDUINO_AVR_VERSION=1.8.5
@@ -138,4 +138,4 @@ COPY splash.h ../root/Arduino/libraries/Adafruit_SSD1306/splash.h
 
 # COPY platform.txt /app/src/arduino-ide/packages/arduino/hardware/samd/1.8.11
 
-CMD ["yarn","start"]
+CMD ["yarn","start"]

src/builder.js

@@ -73,10 +73,21 @@ export const payloadValidator = function payloadValidator(req, res, next) {
   next();
 };
 
-const execBuilder = async function execBuilder({ board, sketch, buildDir }) {
+const execBuilder = async function execBuilder({
+  board,
+  projectId,
+  sketch,
+  buildDir,
+}) {
   // const tmpSketchPath = await tempWrite(sketch);
-  const sketchDir = `${temporaryDirectory()}/sketch`;
-  mkdirSync(sketchDir);
+
+  const sketchDir = projectId
+    ? `/tmp/${projectId}/sketch`
+    : `${temporaryDirectory()}/sketch`;
+
+  mkdirSync(sketchDir, {
+    recursive: true,
+  });
 
   const tmpSketchPath = `${sketchDir}/sketch.ino`;
   writeFileSync(tmpSketchPath, sketch);
@@ -108,8 +119,17 @@ export const compileHandler = async function compileHandler(req, res, next) {
     );
   }
 
-  const buildDir = temporaryDirectory();
-  req._builderParams = { buildDir, ...req._builderParams };
+  // create temporary directory for build
+  // if projectId is provided, use it as part of the directory name
+  let buildDir = req.body.projectId
+    ? `/tmp/${req.body.projectId}`
+    : temporaryDirectory();
+
+  req._builderParams = {
+    buildDir,
+    projectId: req.body.projectId,
+    ...req._builderParams,
+  };
 
   // execute builder with parameters from user
   try {
@@ -127,7 +147,7 @@ export const compileHandler = async function compileHandler(req, res, next) {
     );
   } catch (err) {
     if (process.env.NODE_ENV === "test") {
-      console.error(err.message)
+      console.error(err.message);
     }
     return next(new HTTPError({ error: err.message }));
   }