geonix 1.23.1 → 1.23.3

package/.vscode/settings.json

@@ -6,5 +6,6 @@
         "javascript"
     ],
     "editor.tabSize": 4,
-    "editor.detectIndentation": false
+    "editor.detectIndentation": false,
+    "editor.formatOnSave": true
 }

package/package.json

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

package/src/Util.js

@@ -280,6 +280,25 @@ export async function parseMultipart(req, _options) {
     let activePart;
     let done = false;
 
+    const write = (chunk) => {
+        if (options.useMemory) {
+            activePart.body.push(chunk);
+        } else {
+            activePart.body.write(chunk);
+        }
+    };
+
+    const newPart = () => {
+        // create new part
+        const bodyFile = tempFilename();
+        activePart = {
+            headers: {},
+            bodyFile: options.useMemory ? undefined : bodyFile,
+            body: options.useMemory ? [] : createWriteStream(bodyFile, { flags: "wx" })
+        };
+        parts.push(activePart);
+    };
+
     while (stream.readable) {
         // next next chunk
         let chunk = stream.read(BUFFER_SIZE);
@@ -295,53 +314,42 @@ 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) {
+                lastChunk = combined;
+                break;
+            }
 
-                if (isLastBoundary) {
-                    combined = combined.slice(boundaryIndex + boundary.length + 2);
-                    done = true;
-                    break;
-                }
+            if (boundaryIndex > 0) {
+                write(combined.subarray(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.subarray(boundaryIndex + boundary.length + 2);
+                done = true;
+                break;
             }
 
+            newPart();
+
+            const endOfHeaders = combined.indexOf(END_OF_HEADERS, boundaryIndex);
+
+            activePart.headers = combined
+                .subarray(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.subarray(endOfHeaders + END_OF_HEADERS.length);
+
             lastChunk = combined;
         }
 
         // there's no boundary in the chunk, add it to active part
         if (activePart && lastChunk.length > 0 && !done) {
-            if (options.useMemory) {
-                activePart.body.push(lastChunk);
-            } else {
-                activePart.body.write(lastChunk);
-            }
+            write(lastChunk);
             lastChunk = Buffer.alloc(0);
         }
     }

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");
     }
 
 }

package/test/upload.js

@@ -0,0 +1,23 @@
+import { write } from "fs";
+import { Service, streamToBuffer } from "../exports.js";
+import { parseMultipart } from "../src/Util.js";
+import { writeFile } from "fs/promises";
+
+class UploadService extends Service {
+
+    async "POST /upload"(req, res) {
+        const files = await parseMultipart(req, { useMemory: false });
+
+        for (const file of files) {
+            file.body = await streamToBuffer(file.body);
+            console.log(`${file.filename} ${file.headers["content-type"]} size=${file.body.length}`);
+
+            await writeFile("/tmp/temp.pdf", file.body);
+        }
+
+        res.send("ok");
+    }
+
+}
+
+UploadService.start({ middleware: { raw: false } });