@opra/core 1.0.0-alpha.25 → 1.0.0-alpha.26

package/cjs/http/http-context.js

@@ -69,26 +69,7 @@ class HttpContext extends execution_context_js_1.ExecutionContext {
             /** Retrieve all fields */
             const parts = await reader.getAll();
             /** Filter fields according to configuration */
-            this._body = [];
-            const multipartFields = mediaType?.multipartFields;
-            if (mediaType && multipartFields?.length) {
-                const fieldsFound = new Map();
-                for (const item of parts) {
-                    const field = mediaType.findMultipartField(item.field, item.kind);
-                    if (field) {
-                        fieldsFound.set(field, true);
-                        this._body.push(item);
-                    }
-                }
-                /** Check required fields */
-                for (const field of multipartFields) {
-                    if (field.required && !fieldsFound.get(field)) {
-                        throw new common_1.BadRequestError({
-                            message: `Multipart field (${field.fieldName}) is required`,
-                        });
-                    }
-                }
-            }
+            this._body = [...parts];
             return this._body;
         }
         this._body = await this.request.readBody({ limit: operation.requestBody?.maxContentSize });

package/cjs/http/http-handler.js

@@ -378,30 +378,26 @@ class HttpHandler {
         }
     }
     async _sendErrorResponse(context) {
+        context.errors = this._wrapExceptions(context.errors);
+        try {
+            await this.adapter.emitAsync('error', context.errors, context);
+            context.errors = this._wrapExceptions(context.errors);
+        }
+        catch (e) {
+            context.errors = this._wrapExceptions([e, ...context.errors]);
+        }
         const { response, errors } = context;
         if (response.headersSent) {
             response.end();
             return;
         }
-        const wrappedErrors = errors.map(wrap_exception_1.wrapException);
-        if (!wrappedErrors.length)
-            wrappedErrors.push(new common_1.InternalServerError());
-        // Sort errors from fatal to info
-        wrappedErrors.sort((a, b) => {
-            const i = common_1.IssueSeverity.Keys.indexOf(a.severity) - common_1.IssueSeverity.Keys.indexOf(b.severity);
-            if (i === 0)
-                return b.status - a.status;
-            return i;
-        });
-        context.errors = wrappedErrors;
         let status = response.statusCode || 0;
         if (!status || status < Number(common_1.HttpStatusCode.BAD_REQUEST)) {
-            status = wrappedErrors[0].status;
+            status = errors[0].status;
             if (status < Number(common_1.HttpStatusCode.BAD_REQUEST))
                 status = common_1.HttpStatusCode.INTERNAL_SERVER_ERROR;
         }
         response.statusCode = status;
-        this.adapter.emitAsync('error', wrappedErrors[0], context).catch(() => undefined);
         const { document } = this.adapter;
         const dt = document.node.getComplexType('OperationResult');
         let encode = this[constants_1.kAssetCache].get(dt, 'encode');
@@ -411,7 +407,7 @@ class HttpHandler {
         }
         const { i18n } = this.adapter;
         const bodyObject = new common_1.OperationResult({
-            errors: wrappedErrors.map(x => {
+            errors: errors.map(x => {
                 const o = x.toJSON();
                 if (!(process.env.NODE_ENV === 'dev' || process.env.NODE_ENV === 'development'))
                     delete o.stack;
@@ -427,6 +423,30 @@ class HttpHandler {
         response.send(JSON.stringify(body));
         response.end();
     }
+    async sendDocumentSchema(context) {
+        const { request, response } = context;
+        const { document } = this.adapter;
+        response.setHeader('content-type', common_1.MimeTypes.json);
+        const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
+        const { searchParams } = url;
+        const documentId = searchParams.get('id');
+        const doc = documentId ? document.findDocument(documentId) : document;
+        if (!doc) {
+            context.errors.push(new common_1.BadRequestError({
+                message: `Document with given id [${documentId}] does not exists`,
+            }));
+            return this.sendResponse(context);
+        }
+        /** Check if response cache exists */
+        let responseBody = this[constants_1.kAssetCache].get(doc, `$schema`);
+        /** Create response if response cache does not exists */
+        if (!responseBody) {
+            const schema = doc.export();
+            responseBody = JSON.stringify(schema);
+            this[constants_1.kAssetCache].set(doc, `$schema`, responseBody);
+        }
+        response.end(responseBody);
+    }
     /**
      *
      * @param context
@@ -554,29 +574,18 @@ class HttpHandler {
             responseArgs.body = body;
         return responseArgs;
     }
-    async sendDocumentSchema(context) {
-        const { request, response } = context;
-        const { document } = this.adapter;
-        response.setHeader('content-type', common_1.MimeTypes.json);
-        const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
-        const { searchParams } = url;
-        const documentId = searchParams.get('id');
-        const doc = documentId ? document.findDocument(documentId) : document;
-        if (!doc) {
-            context.errors.push(new common_1.BadRequestError({
-                message: `Document with given id [${documentId}] does not exists`,
-            }));
-            return this.sendResponse(context);
-        }
-        /** Check if response cache exists */
-        let responseBody = this[constants_1.kAssetCache].get(doc, `$schema`);
-        /** Create response if response cache does not exists */
-        if (!responseBody) {
-            const schema = doc.export();
-            responseBody = JSON.stringify(schema);
-            this[constants_1.kAssetCache].set(doc, `$schema`, responseBody);
-        }
-        response.end(responseBody);
+    _wrapExceptions(exceptions) {
+        const wrappedErrors = exceptions.map(wrap_exception_1.wrapException);
+        if (!wrappedErrors.length)
+            wrappedErrors.push(new common_1.InternalServerError());
+        // Sort errors from fatal to info
+        wrappedErrors.sort((a, b) => {
+            const i = common_1.IssueSeverity.Keys.indexOf(a.severity) - common_1.IssueSeverity.Keys.indexOf(b.severity);
+            if (i === 0)
+                return b.status - a.status;
+            return i;
+        });
+        return wrappedErrors;
     }
 }
 exports.HttpHandler = HttpHandler;

package/cjs/http/impl/multipart-reader.js

@@ -76,15 +76,22 @@ class MultipartReader extends events_1.EventEmitter {
         if (!item && !this._finished) {
             this.resume();
             item = await new Promise((resolve, reject) => {
+                let resolved = false;
                 if (this._stack.length)
                     return resolve(this._stack.shift());
                 if (this._form.ended)
                     return resolve(undefined);
                 this._form.once('close', () => {
+                    if (resolved)
+                        return;
+                    resolved = true;
                     resolve(this._stack.shift());
                 });
                 this.once('item', () => {
                     this.pause();
+                    if (resolved)
+                        return;
+                    resolved = true;
                     resolve(this._stack.shift());
                 });
                 this.once('error', e => reject(e));
@@ -119,6 +126,8 @@ class MultipartReader extends events_1.EventEmitter {
             }
             let issues;
             for (const field of fieldsLeft) {
+                if (!field.required)
+                    continue;
                 try {
                     (0, valgen_1.isNotNullish)(null, { onFail: () => `Multi part field "${String(field.fieldName)}" is required` });
                 }
@@ -137,7 +146,7 @@ class MultipartReader extends events_1.EventEmitter {
         return item;
     }
     async getAll() {
-        const items = [];
+        const items = [...this._items];
         let item;
         while (!this._cancelled && (item = await this.getNext())) {
             items.push(item);

package/esm/http/http-context.js

@@ -1,5 +1,5 @@
 import typeIs from '@browsery/type-is';
-import { BadRequestError, InternalServerError, NotAcceptableError, } from '@opra/common';
+import { InternalServerError, NotAcceptableError, } from '@opra/common';
 import { vg } from 'valgen';
 import { kAssetCache } from '../constants.js';
 import { ExecutionContext } from '../execution-context.js';
@@ -65,26 +65,7 @@ export class HttpContext extends ExecutionContext {
             /** Retrieve all fields */
             const parts = await reader.getAll();
             /** Filter fields according to configuration */
-            this._body = [];
-            const multipartFields = mediaType?.multipartFields;
-            if (mediaType && multipartFields?.length) {
-                const fieldsFound = new Map();
-                for (const item of parts) {
-                    const field = mediaType.findMultipartField(item.field, item.kind);
-                    if (field) {
-                        fieldsFound.set(field, true);
-                        this._body.push(item);
-                    }
-                }
-                /** Check required fields */
-                for (const field of multipartFields) {
-                    if (field.required && !fieldsFound.get(field)) {
-                        throw new BadRequestError({
-                            message: `Multipart field (${field.fieldName}) is required`,
-                        });
-                    }
-                }
-            }
+            this._body = [...parts];
             return this._body;
         }
         this._body = await this.request.readBody({ limit: operation.requestBody?.maxContentSize });

package/esm/http/http-handler.js

@@ -374,30 +374,26 @@ export class HttpHandler {
         }
     }
     async _sendErrorResponse(context) {
+        context.errors = this._wrapExceptions(context.errors);
+        try {
+            await this.adapter.emitAsync('error', context.errors, context);
+            context.errors = this._wrapExceptions(context.errors);
+        }
+        catch (e) {
+            context.errors = this._wrapExceptions([e, ...context.errors]);
+        }
         const { response, errors } = context;
         if (response.headersSent) {
             response.end();
             return;
         }
-        const wrappedErrors = errors.map(wrapException);
-        if (!wrappedErrors.length)
-            wrappedErrors.push(new InternalServerError());
-        // Sort errors from fatal to info
-        wrappedErrors.sort((a, b) => {
-            const i = IssueSeverity.Keys.indexOf(a.severity) - IssueSeverity.Keys.indexOf(b.severity);
-            if (i === 0)
-                return b.status - a.status;
-            return i;
-        });
-        context.errors = wrappedErrors;
         let status = response.statusCode || 0;
         if (!status || status < Number(HttpStatusCode.BAD_REQUEST)) {
-            status = wrappedErrors[0].status;
+            status = errors[0].status;
             if (status < Number(HttpStatusCode.BAD_REQUEST))
                 status = HttpStatusCode.INTERNAL_SERVER_ERROR;
         }
         response.statusCode = status;
-        this.adapter.emitAsync('error', wrappedErrors[0], context).catch(() => undefined);
         const { document } = this.adapter;
         const dt = document.node.getComplexType('OperationResult');
         let encode = this[kAssetCache].get(dt, 'encode');
@@ -407,7 +403,7 @@ export class HttpHandler {
         }
         const { i18n } = this.adapter;
         const bodyObject = new OperationResult({
-            errors: wrappedErrors.map(x => {
+            errors: errors.map(x => {
                 const o = x.toJSON();
                 if (!(process.env.NODE_ENV === 'dev' || process.env.NODE_ENV === 'development'))
                     delete o.stack;
@@ -423,6 +419,30 @@ export class HttpHandler {
         response.send(JSON.stringify(body));
         response.end();
     }
+    async sendDocumentSchema(context) {
+        const { request, response } = context;
+        const { document } = this.adapter;
+        response.setHeader('content-type', MimeTypes.json);
+        const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
+        const { searchParams } = url;
+        const documentId = searchParams.get('id');
+        const doc = documentId ? document.findDocument(documentId) : document;
+        if (!doc) {
+            context.errors.push(new BadRequestError({
+                message: `Document with given id [${documentId}] does not exists`,
+            }));
+            return this.sendResponse(context);
+        }
+        /** Check if response cache exists */
+        let responseBody = this[kAssetCache].get(doc, `$schema`);
+        /** Create response if response cache does not exists */
+        if (!responseBody) {
+            const schema = doc.export();
+            responseBody = JSON.stringify(schema);
+            this[kAssetCache].set(doc, `$schema`, responseBody);
+        }
+        response.end(responseBody);
+    }
     /**
      *
      * @param context
@@ -550,28 +570,17 @@ export class HttpHandler {
             responseArgs.body = body;
         return responseArgs;
     }
-    async sendDocumentSchema(context) {
-        const { request, response } = context;
-        const { document } = this.adapter;
-        response.setHeader('content-type', MimeTypes.json);
-        const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
-        const { searchParams } = url;
-        const documentId = searchParams.get('id');
-        const doc = documentId ? document.findDocument(documentId) : document;
-        if (!doc) {
-            context.errors.push(new BadRequestError({
-                message: `Document with given id [${documentId}] does not exists`,
-            }));
-            return this.sendResponse(context);
-        }
-        /** Check if response cache exists */
-        let responseBody = this[kAssetCache].get(doc, `$schema`);
-        /** Create response if response cache does not exists */
-        if (!responseBody) {
-            const schema = doc.export();
-            responseBody = JSON.stringify(schema);
-            this[kAssetCache].set(doc, `$schema`, responseBody);
-        }
-        response.end(responseBody);
+    _wrapExceptions(exceptions) {
+        const wrappedErrors = exceptions.map(wrapException);
+        if (!wrappedErrors.length)
+            wrappedErrors.push(new InternalServerError());
+        // Sort errors from fatal to info
+        wrappedErrors.sort((a, b) => {
+            const i = IssueSeverity.Keys.indexOf(a.severity) - IssueSeverity.Keys.indexOf(b.severity);
+            if (i === 0)
+                return b.status - a.status;
+            return i;
+        });
+        return wrappedErrors;
     }
 }

package/esm/http/impl/multipart-reader.js

@@ -72,15 +72,22 @@ export class MultipartReader extends EventEmitter {
         if (!item && !this._finished) {
             this.resume();
             item = await new Promise((resolve, reject) => {
+                let resolved = false;
                 if (this._stack.length)
                     return resolve(this._stack.shift());
                 if (this._form.ended)
                     return resolve(undefined);
                 this._form.once('close', () => {
+                    if (resolved)
+                        return;
+                    resolved = true;
                     resolve(this._stack.shift());
                 });
                 this.once('item', () => {
                     this.pause();
+                    if (resolved)
+                        return;
+                    resolved = true;
                     resolve(this._stack.shift());
                 });
                 this.once('error', e => reject(e));
@@ -115,6 +122,8 @@ export class MultipartReader extends EventEmitter {
             }
             let issues;
             for (const field of fieldsLeft) {
+                if (!field.required)
+                    continue;
                 try {
                     isNotNullish(null, { onFail: () => `Multi part field "${String(field.fieldName)}" is required` });
                 }
@@ -133,7 +142,7 @@ export class MultipartReader extends EventEmitter {
         return item;
     }
     async getAll() {
-        const items = [];
+        const items = [...this._items];
         let item;
         while (!this._cancelled && (item = await this.getNext())) {
             items.push(item);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "1.0.0-alpha.25",
+  "version": "1.0.0-alpha.26",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@browsery/http-parser": "^0.5.8",
     "@browsery/type-is": "^1.6.18-r2",
-    "@opra/common": "^1.0.0-alpha.25",
+    "@opra/common": "^1.0.0-alpha.26",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
     "busboy": "^1.6.0",

package/types/execution-context.d.ts

@@ -1,4 +1,4 @@
-import { ApiDocument, OpraException, OpraSchema } from '@opra/common';
+import { ApiDocument, OpraHttpError, OpraSchema } from '@opra/common';
 import { AsyncEventEmitter } from 'strict-typed-events';
 /**
  * @namespace ExecutionContext
@@ -18,7 +18,7 @@ export declare abstract class ExecutionContext extends AsyncEventEmitter {
     readonly document: ApiDocument;
     readonly protocol: OpraSchema.Protocol;
     readonly platform: string;
-    errors: OpraException[];
+    errors: OpraHttpError[];
     protected constructor(init: ExecutionContext.Initiator);
     addListener(event: 'finish', listener: ExecutionContext.OnFinishListener): this;
     removeListener(event: 'finish', listener: ExecutionContext.OnFinishListener): this;

package/types/http/http-handler.d.ts

@@ -1,4 +1,4 @@
-import { HttpOperationResponse, OpraException } from '@opra/common';
+import { HttpOperationResponse, OpraException, OpraHttpError } from '@opra/common';
 import { kAssetCache } from '../constants';
 import type { HttpAdapter } from './http-adapter';
 import { HttpContext } from './http-context';
@@ -62,6 +62,7 @@ export declare class HttpHandler {
      */
     sendResponse(context: HttpContext, responseValue?: any): Promise<void>;
     protected _sendErrorResponse(context: HttpContext): Promise<void>;
+    sendDocumentSchema(context: HttpContext): Promise<void>;
     /**
      *
      * @param context
@@ -69,5 +70,5 @@ export declare class HttpHandler {
      * @protected
      */
     protected _determineResponseArgs(context: HttpContext, body: any): HttpHandler.ResponseArgs;
-    sendDocumentSchema(context: HttpContext): Promise<void>;
+    protected _wrapExceptions(exceptions: any[]): OpraHttpError[];
 }