@opra/core 0.31.7 → 0.31.8

package/cjs/http/helpers/multipart-helper.js

@@ -5,9 +5,8 @@ const tslib_1 = require("tslib");
 const events_1 = require("events");
 const formidable_1 = tslib_1.__importDefault(require("formidable"));
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
-const noOp = () => void 0;
 class MultipartIterator extends events_1.EventEmitter {
-    constructor(incoming, options) {
+    constructor(options) {
         super();
         this._cancelled = false;
         this._items = [];
@@ -36,7 +35,6 @@ class MultipartIterator extends events_1.EventEmitter {
             this._stack.push(item);
             this.emit('item', item);
         });
-        form.parse(incoming).catch(noOp);
     }
     get items() {
         return this._items;
@@ -65,13 +63,16 @@ class MultipartIterator extends events_1.EventEmitter {
     }
     cancel() {
         this._cancelled = true;
-        this.resume();
+        if (this._form.req)
+            this.resume();
     }
     resume() {
-        this._form.resume();
+        if (this._form.req)
+            this._form.resume();
     }
     pause() {
-        this._form.pause();
+        if (this._form.req)
+            this._form.pause();
     }
     async deleteFiles() {
         const promises = [];
@@ -92,5 +93,10 @@ class MultipartIterator extends events_1.EventEmitter {
         });
         return Promise.allSettled(promises);
     }
+    static async create(incoming, options) {
+        const out = new MultipartIterator(options);
+        await out._form.parse(incoming);
+        return out;
+    }
 }
 exports.MultipartIterator = MultipartIterator;

package/cjs/http/http-adapter-host.js

@@ -155,7 +155,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 return request;
         }
         if (resource instanceof common_1.Storage)
-            request = await this._parseRequestStorage(executionContext, resource, searchParams);
+            request = await this._parseRequestStorage(executionContext, resource, urlPath.slice(1), searchParams);
         else if (urlPath.length === 1) { // Collection and Singleton resources should be last element in path
             if (resource instanceof common_1.Collection)
                 request = await this._parseRequestCollection(executionContext, resource, urlPath, searchParams);
@@ -419,7 +419,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             message: `Singleton resource doesn't accept http "${incoming.method}" method`
         });
     }
-    async _parseRequestStorage(executionContext, resource, searchParams) {
+    async _parseRequestStorage(executionContext, resource, urlPath, searchParams) {
         const { incoming } = executionContext.switchToHttp();
         const contentId = incoming.headers['content-id'];
         switch (incoming.method) {
@@ -432,7 +432,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     handler,
                     http: incoming,
                     contentId,
-                    path: incoming.parsedUrl.path.slice(1).toString().substring(1),
+                    path: urlPath.toString().substring(1),
                     params
                 });
             }
@@ -445,7 +445,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     handler,
                     http: incoming,
                     contentId,
-                    path: incoming.parsedUrl.path.slice(1).toString().substring(1),
+                    path: urlPath.toString().substring(1),
                     params
                 });
             }
@@ -453,7 +453,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'post');
                 const params = this.parseParameters(endpoint.parameters, searchParams);
                 await promises_1.default.mkdir(this._tempDir, { recursive: true });
-                const multipartIterator = new multipart_helper_js_1.MultipartIterator(incoming, {
+                const multipartIterator = await multipart_helper_js_1.MultipartIterator.create(incoming, {
                     ...endpoint.options,
                     filename: () => this.serviceName + '_p' + process.pid +
                         't' + String(Date.now()).substring(8) + 'r' + (0, common_1.uid)(12)
@@ -471,7 +471,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     http: incoming,
                     contentId,
                     parts: multipartIterator,
-                    path: incoming.parsedUrl.path.slice(1).toString().substring(1),
+                    path: urlPath.toString().substring(1),
                     params
                 });
             }

package/esm/http/helpers/multipart-helper.js

@@ -1,9 +1,8 @@
 import { EventEmitter } from 'events';
 import formidable from 'formidable';
 import fs from 'fs/promises';
-const noOp = () => void 0;
 export class MultipartIterator extends EventEmitter {
-    constructor(incoming, options) {
+    constructor(options) {
         super();
         this._cancelled = false;
         this._items = [];
@@ -32,7 +31,6 @@ export class MultipartIterator extends EventEmitter {
             this._stack.push(item);
             this.emit('item', item);
         });
-        form.parse(incoming).catch(noOp);
     }
     get items() {
         return this._items;
@@ -61,13 +59,16 @@ export class MultipartIterator extends EventEmitter {
     }
     cancel() {
         this._cancelled = true;
-        this.resume();
+        if (this._form.req)
+            this.resume();
     }
     resume() {
-        this._form.resume();
+        if (this._form.req)
+            this._form.resume();
     }
     pause() {
-        this._form.pause();
+        if (this._form.req)
+            this._form.pause();
     }
     async deleteFiles() {
         const promises = [];
@@ -88,4 +89,9 @@ export class MultipartIterator extends EventEmitter {
         });
         return Promise.allSettled(promises);
     }
+    static async create(incoming, options) {
+        const out = new MultipartIterator(options);
+        await out._form.parse(incoming);
+        return out;
+    }
 }

package/esm/http/http-adapter-host.js

@@ -151,7 +151,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 return request;
         }
         if (resource instanceof Storage)
-            request = await this._parseRequestStorage(executionContext, resource, searchParams);
+            request = await this._parseRequestStorage(executionContext, resource, urlPath.slice(1), searchParams);
         else if (urlPath.length === 1) { // Collection and Singleton resources should be last element in path
             if (resource instanceof Collection)
                 request = await this._parseRequestCollection(executionContext, resource, urlPath, searchParams);
@@ -415,7 +415,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             message: `Singleton resource doesn't accept http "${incoming.method}" method`
         });
     }
-    async _parseRequestStorage(executionContext, resource, searchParams) {
+    async _parseRequestStorage(executionContext, resource, urlPath, searchParams) {
         const { incoming } = executionContext.switchToHttp();
         const contentId = incoming.headers['content-id'];
         switch (incoming.method) {
@@ -428,7 +428,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     handler,
                     http: incoming,
                     contentId,
-                    path: incoming.parsedUrl.path.slice(1).toString().substring(1),
+                    path: urlPath.toString().substring(1),
                     params
                 });
             }
@@ -441,7 +441,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     handler,
                     http: incoming,
                     contentId,
-                    path: incoming.parsedUrl.path.slice(1).toString().substring(1),
+                    path: urlPath.toString().substring(1),
                     params
                 });
             }
@@ -449,7 +449,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'post');
                 const params = this.parseParameters(endpoint.parameters, searchParams);
                 await fs.mkdir(this._tempDir, { recursive: true });
-                const multipartIterator = new MultipartIterator(incoming, {
+                const multipartIterator = await MultipartIterator.create(incoming, {
                     ...endpoint.options,
                     filename: () => this.serviceName + '_p' + process.pid +
                         't' + String(Date.now()).substring(8) + 'r' + uid(12)
@@ -467,7 +467,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     http: incoming,
                     contentId,
                     parts: multipartIterator,
-                    path: incoming.parsedUrl.path.slice(1).toString().substring(1),
+                    path: urlPath.toString().substring(1),
                     params
                 });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.31.7",
+  "version": "0.31.8",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@browsery/type-is": "^0.6.3",
-    "@opra/common": "^0.31.7",
+    "@opra/common": "^0.31.8",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",

package/types/http/helpers/multipart-helper.d.ts

@@ -14,7 +14,7 @@ export declare class MultipartIterator extends EventEmitter {
     protected _form: IncomingForm;
     protected _items: MultipartItem[];
     protected _stack: MultipartItem[];
-    constructor(incoming: HttpIncomingMessage, options?: formidable.Options);
+    protected constructor(options?: formidable.Options);
     get items(): MultipartItem[];
     getNext(): Promise<MultipartItem | undefined>;
     getAll(): Promise<MultipartItem[]>;
@@ -22,4 +22,5 @@ export declare class MultipartIterator extends EventEmitter {
     resume(): void;
     pause(): void;
     deleteFiles(): Promise<PromiseSettledResult<any>[]>;
+    static create(incoming: HttpIncomingMessage, options?: formidable.Options): Promise<MultipartIterator>;
 }

package/types/http/http-adapter-host.d.ts

@@ -26,7 +26,7 @@ export declare abstract class HttpAdapterHost extends PlatformAdapterHost {
     protected _parseRequestAction(executionContext: ExecutionContext, resource: Resource, urlPath: OpraURLPath, searchParams: URLSearchParams): Promise<RequestHost>;
     protected _parseRequestCollection(executionContext: ExecutionContext, resource: Collection, urlPath: OpraURLPath, searchParams: URLSearchParams): Promise<RequestHost>;
     protected _parseRequestSingleton(executionContext: ExecutionContext, resource: Singleton, urlPath: OpraURLPath, searchParams?: URLSearchParams): Promise<RequestHost>;
-    protected _parseRequestStorage(executionContext: ExecutionContext, resource: Storage, searchParams: URLSearchParams): Promise<RequestHost>;
+    protected _parseRequestStorage(executionContext: ExecutionContext, resource: Storage, urlPath: OpraURLPath, searchParams: URLSearchParams): Promise<RequestHost>;
     protected parseParameters(paramDefs: Map<string, Parameter>, searchParams?: URLSearchParams): Record<string, any>;
     protected executeRequest(context: RequestContext): Promise<void>;
     sendResponse(context: RequestContext): Promise<void>;