structured-fw 1.0.2 → 1.0.4

package/build/system/server/Request.js

@@ -351,12 +351,17 @@ export class Request {
     static parseBodyMultipart(bodyRaw, boundary) {
         const pairsRaw = bodyRaw.split(boundary);
         const pairs = pairsRaw.map((pair) => {
-            const parts = /Content-Disposition: form-data; name="([^\r\n"]+)"\r?\n\r?\n([^$]+)/m.exec(pair);
-            if (parts) {
-                return {
-                    key: parts[1],
-                    value: parts[2]
-                };
+            const parts = pair.split(/\r?\n\r?\n/, 2).filter((part) => { return part.length > 0; });
+            if (parts.length > 0) {
+                const header = parts[0];
+                const data = typeof parts[1] === 'string' ? parts[1].trim() : '';
+                const headerParts = /Content-Disposition: form-data; name="([^\r\n"]+)"/m.exec(header);
+                if (headerParts) {
+                    return {
+                        key: headerParts[1],
+                        value: data
+                    };
+                }
             }
             return null;
         });

package/build/system/server/dom/HTMLParser.js

@@ -103,7 +103,9 @@ export class HTMLParser {
                     throw this.error(`Found closing tag ${this.tokenCurrent}, expected ${this.context.tagName}`);
                 }
                 this.context = this.context.parentNode || this.fragment;
-                this.state = 'idle';
+                this.state = 'text';
+                this.tokenCurrent = '';
+                return true;
             }
             this.tokenCurrent += char;
         }

package/package.json

@@ -19,7 +19,7 @@
   "license": "MIT",
   "type": "module",
   "main": "build/index",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "scripts": {
     "develop": "tsc --watch",
     "startDev": "cd build && nodemon --watch '../app/**/*' --watch '../build/**/*' -e js,html,css index.js",