geonix 1.23.1 → 1.23.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "geonix",
-    "version": "1.23.1",
+    "version": "1.23.2",
     "type": "module",
     "description": "",
     "bin": {

package/src/Util.js

@@ -295,43 +295,45 @@ export async function parseMultipart(req, _options) {
             const boundaryIndex = combined.indexOf(boundary);
             const isLastBoundary = combined[boundaryIndex + boundary.length] === 45 && combined[boundaryIndex + boundary.length + 1] === 45;
 
-            if (boundaryIndex > -1) {
-                if (boundaryIndex > 0) {
-                    if (options.useMemory) {
-                        activePart.body.push(combined.slice(0, boundaryIndex));
-                    } else {
-                        activePart.body.write(combined.slice(0, boundaryIndex));
-                    }
-                }
+            if (boundaryIndex === -1) {
+                break;
+            }
 
-                if (isLastBoundary) {
-                    combined = combined.slice(boundaryIndex + boundary.length + 2);
-                    done = true;
-                    break;
+            if (boundaryIndex > 0) {
+                if (options.useMemory) {
+                    activePart.body.push(combined.slice(0, boundaryIndex));
+                } else {
+                    activePart.body.write(combined.slice(0, boundaryIndex));
                 }
+            }
 
-                // create new part
-                const bodyFile = tempFilename();
-                activePart = {
-                    headers: {},
-                    bodyFile: options.useMemory ? undefined : bodyFile,
-                    body: options.useMemory ? [] : createWriteStream(bodyFile, { flags: "wx" })
-                };
-                parts.push(activePart);
-
-                const endOfHeaders = combined.indexOf(END_OF_HEADERS, boundaryIndex);
-                activePart.headers = combined
-                    .slice(boundaryIndex + boundary.length + 2, endOfHeaders).toString()
-                    .split("\r\n")
-                    .reduce((acc, val) => {
-                        const [header, value] = val.split(": ");
-                        acc[header.toLowerCase()] = value;
-                        return acc;
-                    }, {});
-
-                combined = combined.slice(endOfHeaders + END_OF_HEADERS.length);
+            if (isLastBoundary) {
+                combined = combined.slice(boundaryIndex + boundary.length + 2);
+                done = true;
+                break;
             }
 
+            // create new part
+            const bodyFile = tempFilename();
+            activePart = {
+                headers: {},
+                bodyFile: options.useMemory ? undefined : bodyFile,
+                body: options.useMemory ? [] : createWriteStream(bodyFile, { flags: "wx" })
+            };
+            parts.push(activePart);
+
+            const endOfHeaders = combined.indexOf(END_OF_HEADERS, boundaryIndex);
+            activePart.headers = combined
+                .slice(boundaryIndex + boundary.length + 2, endOfHeaders).toString()
+                .split("\r\n")
+                .reduce((acc, val) => {
+                    const [header, value] = val.split(": ");
+                    acc[header.toLowerCase()] = value;
+                    return acc;
+                }, {});
+
+            combined = combined.slice(endOfHeaders + END_OF_HEADERS.length);
+
             lastChunk = combined;
         }
 

package/src/WebServer.js

@@ -98,7 +98,9 @@ class WebServer {
 
             res.on("finish", () => {
                 handled = true;
-                currentResolve();
+                if (currentResolve) {
+                    currentResolve();
+                }
             });
 
             let router = routers.shift();

package/test/gateway.js

@@ -8,21 +8,13 @@ class TestService extends Service {
     }
 
     async "POST /upload"(req, res) {
-        try {
-            const parts = await parseMultipart(req, { useMemory: false });
+        const parts = await parseMultipart(req, { useMemory: false });
 
-            for (const part of parts) {
-                console.debug(part?.body);
-            }
-
-            res.send("OK");
-        } catch (e) {
-            console.error(e);
+        for (const part of parts) {
+            console.log(part.body);
         }
-    }
 
-    "GET /test"(req, res) {
-        res.send("Hello World - /test");
+        res.send("OK");
     }
 
 }