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

package/cjs/http/http-handler.js

@@ -278,104 +278,111 @@ class HttpHandler {
      */
     async sendResponse(context, responseValue) {
         if (context.errors.length)
-            return this.sendErrorResponse(context, context.errors);
+            return this._sendErrorResponse(context);
         const { response } = context;
         const { document } = this.adapter;
-        const responseArgs = this._determineResponseArgs(context, responseValue);
-        const { operationResponse, statusCode } = responseArgs;
-        let { contentType, body } = responseArgs;
-        const operationResultType = document.node.getDataType(common_1.OperationResult);
-        let operationResultEncoder = this[constants_1.kAssetCache].get(operationResultType, 'encode');
-        if (!operationResultEncoder) {
-            operationResultEncoder = operationResultType.generateCodec('encode', { ignoreWriteonlyFields: true });
-            this[constants_1.kAssetCache].set(operationResultType, 'encode', operationResultEncoder);
-        }
-        /** Validate response */
-        if (operationResponse?.type) {
-            if (!(body == null && statusCode === common_1.HttpStatusCode.NO_CONTENT)) {
-                /** Generate encoder */
-                let encode = this[constants_1.kAssetCache].get(operationResponse, 'encode');
-                if (!encode) {
-                    encode = operationResponse.type.generateCodec('encode', {
-                        partial: operationResponse.partial,
-                        projection: '*',
-                        ignoreWriteonlyFields: true,
-                    });
-                    if (operationResponse) {
-                        if (operationResponse.isArray)
-                            encode = valgen_1.vg.isArray(encode);
-                        this[constants_1.kAssetCache].set(operationResponse, 'encode', encode);
+        try {
+            const responseArgs = this._determineResponseArgs(context, responseValue);
+            const { operationResponse, statusCode } = responseArgs;
+            let { contentType, body } = responseArgs;
+            const operationResultType = document.node.getDataType(common_1.OperationResult);
+            let operationResultEncoder = this[constants_1.kAssetCache].get(operationResultType, 'encode');
+            if (!operationResultEncoder) {
+                operationResultEncoder = operationResultType.generateCodec('encode', { ignoreWriteonlyFields: true });
+                this[constants_1.kAssetCache].set(operationResultType, 'encode', operationResultEncoder);
+            }
+            /** Validate response */
+            if (operationResponse?.type) {
+                if (!(body == null && statusCode === common_1.HttpStatusCode.NO_CONTENT)) {
+                    /** Generate encoder */
+                    let encode = this[constants_1.kAssetCache].get(operationResponse, 'encode');
+                    if (!encode) {
+                        encode = operationResponse.type.generateCodec('encode', {
+                            partial: operationResponse.partial,
+                            projection: '*',
+                            ignoreWriteonlyFields: true,
+                            onFail: issue => `Response body validation failed: ` + issue.message,
+                        });
+                        if (operationResponse) {
+                            if (operationResponse.isArray)
+                                encode = valgen_1.vg.isArray(encode);
+                            this[constants_1.kAssetCache].set(operationResponse, 'encode', encode);
+                        }
+                    }
+                    /** Encode body */
+                    if (operationResponse.type.extendsFrom(operationResultType)) {
+                        if (body instanceof common_1.OperationResult)
+                            body = encode(body);
+                        else {
+                            body.payload = encode(body.payload);
+                            body = operationResultEncoder(body);
+                        }
                     }
-                }
-                /** Encode body */
-                if (operationResponse.type.extendsFrom(operationResultType)) {
-                    if (body instanceof common_1.OperationResult)
-                        body = encode(body);
                     else {
-                        body.payload = encode(body.payload);
-                        body = operationResultEncoder(body);
+                        if (body instanceof common_1.OperationResult &&
+                            contentType &&
+                            type_is_1.default.is(contentType, [common_1.MimeTypes.opra_response_json])) {
+                            body.payload = encode(body.payload);
+                            body = operationResultEncoder(body);
+                        }
+                        else {
+                            body = encode(body);
+                        }
                     }
-                }
-                else {
                     if (body instanceof common_1.OperationResult &&
-                        contentType &&
-                        type_is_1.default.is(contentType, [common_1.MimeTypes.opra_response_json])) {
-                        body.payload = encode(body.payload);
-                        body = operationResultEncoder(body);
+                        operationResponse.type &&
+                        operationResponse.type !== document.node.getDataType(common_1.OperationResult)) {
+                        body.type = operationResponse.type.name ? operationResponse.type.name : '#embedded';
                     }
-                    else
-                        body = encode(body);
-                }
-                if (body instanceof common_1.OperationResult &&
-                    operationResponse.type &&
-                    operationResponse.type !== document.node.getDataType(common_1.OperationResult)) {
-                    body.type = operationResponse.type.name ? operationResponse.type.name : '#embedded';
                 }
             }
-        }
-        else if (body != null) {
-            if (body instanceof common_1.OperationResult) {
-                body = operationResultEncoder(body);
-                contentType = common_1.MimeTypes.opra_response_json;
-            }
-            else if (Buffer.isBuffer(body))
-                contentType = common_1.MimeTypes.binary;
-            else if (typeof body === 'object') {
-                contentType = contentType || common_1.MimeTypes.json;
-                if (typeof body.toJSON === 'function')
-                    body = body.toJSON();
+            else if (body != null) {
+                if (body instanceof common_1.OperationResult) {
+                    body = operationResultEncoder(body);
+                    contentType = common_1.MimeTypes.opra_response_json;
+                }
+                else if (Buffer.isBuffer(body))
+                    contentType = common_1.MimeTypes.binary;
+                else if (typeof body === 'object') {
+                    contentType = contentType || common_1.MimeTypes.json;
+                    if (typeof body.toJSON === 'function')
+                        body = body.toJSON();
+                }
+                else {
+                    contentType = contentType || common_1.MimeTypes.text;
+                    body = String(body);
+                }
             }
-            else {
-                contentType = contentType || common_1.MimeTypes.text;
-                body = String(body);
+            /** Set content-type header value if not set */
+            if (contentType && contentType !== responseArgs.contentType)
+                response.setHeader('content-type', contentType);
+            response.status(statusCode);
+            if (body == null) {
+                response.end();
+                return;
             }
+            let x;
+            if (Buffer.isBuffer(body) || (0, common_1.isReadableStream)(body))
+                x = body;
+            else if ((0, common_1.isBlob)(body))
+                x = body.stream();
+            else if (typeof body === 'object')
+                x = JSON.stringify(body);
+            else
+                x = String(body);
+            response.end(x);
         }
-        /** Set content-type header value if not set */
-        if (contentType && contentType !== responseArgs.contentType)
-            response.setHeader('content-type', contentType);
-        response.status(statusCode);
-        if (body == null) {
-            response.end();
-            return;
+        catch (error) {
+            context.errors.push(error);
+            return this._sendErrorResponse(context);
         }
-        let x;
-        if (Buffer.isBuffer(body) || (0, common_1.isReadableStream)(body))
-            x = body;
-        else if ((0, common_1.isBlob)(body))
-            x = body.stream();
-        else if (typeof body === 'object')
-            x = JSON.stringify(body);
-        else
-            x = String(body);
-        response.end(x);
     }
-    async sendErrorResponse(context, errors) {
-        const { response } = context;
+    async _sendErrorResponse(context) {
+        const { response, errors } = context;
         if (response.headersSent) {
             response.end();
             return;
         }
-        errors = errors || context.errors;
         const wrappedErrors = errors.map(wrap_exception_1.wrapException);
         if (!wrappedErrors.length)
             wrappedErrors.push(new common_1.InternalServerError());
@@ -477,6 +484,8 @@ class HttpHandler {
                                     : operationResponse.contentType);
                                 if (typeof ct === 'string')
                                     responseArgs.contentType = contentType = ct;
+                                else if (operationResponse.type)
+                                    responseArgs.contentType = common_1.MimeTypes.opra_response_json;
                             }
                         }
                     }

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

@@ -95,8 +95,10 @@ class MultipartReader extends events_1.EventEmitter {
             if (!field)
                 throw new common_1.BadRequestError(`Unknown multipart field (${item.field})`);
             if (item.kind === 'field') {
-                const codec = field.generateCodec('decode');
-                item.value = codec(item.value);
+                const decode = field.generateCodec('decode');
+                item.value = decode(item.value, {
+                    onFail: issue => `Multipart field (${item.field}) validation failed: ` + issue.message,
+                });
             }
             else if (item.kind === 'file') {
                 if (field.contentType) {
@@ -108,7 +110,7 @@ class MultipartReader extends events_1.EventEmitter {
             }
         }
         /** if all items received we check for required items */
-        if (!item && this.mediaType && this.mediaType.multipartFields?.length > 0) {
+        if (this._finished && this.mediaType && this.mediaType.multipartFields?.length > 0) {
             const fieldsLeft = new Set(this.mediaType.multipartFields);
             for (const x of this._items) {
                 const field = this.mediaType.findMultipartField(x.field);
@@ -173,14 +175,7 @@ class MultipartReader extends events_1.EventEmitter {
         this._items.forEach(item => {
             if (item.kind !== 'file')
                 return;
-            const file = item.storedPath;
-            promises.push(new Promise(resolve => {
-                if (file._writeStream.closed)
-                    return resolve();
-                file._writeStream.once('close', resolve);
-            })
-                .then(() => promises_1.default.unlink(file.filepath))
-                .then(() => 0));
+            promises.push(promises_1.default.unlink(item.storedPath));
         });
         return Promise.allSettled(promises);
     }

package/esm/http/http-handler.js

@@ -274,104 +274,111 @@ export class HttpHandler {
      */
     async sendResponse(context, responseValue) {
         if (context.errors.length)
-            return this.sendErrorResponse(context, context.errors);
+            return this._sendErrorResponse(context);
         const { response } = context;
         const { document } = this.adapter;
-        const responseArgs = this._determineResponseArgs(context, responseValue);
-        const { operationResponse, statusCode } = responseArgs;
-        let { contentType, body } = responseArgs;
-        const operationResultType = document.node.getDataType(OperationResult);
-        let operationResultEncoder = this[kAssetCache].get(operationResultType, 'encode');
-        if (!operationResultEncoder) {
-            operationResultEncoder = operationResultType.generateCodec('encode', { ignoreWriteonlyFields: true });
-            this[kAssetCache].set(operationResultType, 'encode', operationResultEncoder);
-        }
-        /** Validate response */
-        if (operationResponse?.type) {
-            if (!(body == null && statusCode === HttpStatusCode.NO_CONTENT)) {
-                /** Generate encoder */
-                let encode = this[kAssetCache].get(operationResponse, 'encode');
-                if (!encode) {
-                    encode = operationResponse.type.generateCodec('encode', {
-                        partial: operationResponse.partial,
-                        projection: '*',
-                        ignoreWriteonlyFields: true,
-                    });
-                    if (operationResponse) {
-                        if (operationResponse.isArray)
-                            encode = vg.isArray(encode);
-                        this[kAssetCache].set(operationResponse, 'encode', encode);
+        try {
+            const responseArgs = this._determineResponseArgs(context, responseValue);
+            const { operationResponse, statusCode } = responseArgs;
+            let { contentType, body } = responseArgs;
+            const operationResultType = document.node.getDataType(OperationResult);
+            let operationResultEncoder = this[kAssetCache].get(operationResultType, 'encode');
+            if (!operationResultEncoder) {
+                operationResultEncoder = operationResultType.generateCodec('encode', { ignoreWriteonlyFields: true });
+                this[kAssetCache].set(operationResultType, 'encode', operationResultEncoder);
+            }
+            /** Validate response */
+            if (operationResponse?.type) {
+                if (!(body == null && statusCode === HttpStatusCode.NO_CONTENT)) {
+                    /** Generate encoder */
+                    let encode = this[kAssetCache].get(operationResponse, 'encode');
+                    if (!encode) {
+                        encode = operationResponse.type.generateCodec('encode', {
+                            partial: operationResponse.partial,
+                            projection: '*',
+                            ignoreWriteonlyFields: true,
+                            onFail: issue => `Response body validation failed: ` + issue.message,
+                        });
+                        if (operationResponse) {
+                            if (operationResponse.isArray)
+                                encode = vg.isArray(encode);
+                            this[kAssetCache].set(operationResponse, 'encode', encode);
+                        }
+                    }
+                    /** Encode body */
+                    if (operationResponse.type.extendsFrom(operationResultType)) {
+                        if (body instanceof OperationResult)
+                            body = encode(body);
+                        else {
+                            body.payload = encode(body.payload);
+                            body = operationResultEncoder(body);
+                        }
                     }
-                }
-                /** Encode body */
-                if (operationResponse.type.extendsFrom(operationResultType)) {
-                    if (body instanceof OperationResult)
-                        body = encode(body);
                     else {
-                        body.payload = encode(body.payload);
-                        body = operationResultEncoder(body);
+                        if (body instanceof OperationResult &&
+                            contentType &&
+                            typeIs.is(contentType, [MimeTypes.opra_response_json])) {
+                            body.payload = encode(body.payload);
+                            body = operationResultEncoder(body);
+                        }
+                        else {
+                            body = encode(body);
+                        }
                     }
-                }
-                else {
                     if (body instanceof OperationResult &&
-                        contentType &&
-                        typeIs.is(contentType, [MimeTypes.opra_response_json])) {
-                        body.payload = encode(body.payload);
-                        body = operationResultEncoder(body);
+                        operationResponse.type &&
+                        operationResponse.type !== document.node.getDataType(OperationResult)) {
+                        body.type = operationResponse.type.name ? operationResponse.type.name : '#embedded';
                     }
-                    else
-                        body = encode(body);
-                }
-                if (body instanceof OperationResult &&
-                    operationResponse.type &&
-                    operationResponse.type !== document.node.getDataType(OperationResult)) {
-                    body.type = operationResponse.type.name ? operationResponse.type.name : '#embedded';
                 }
             }
-        }
-        else if (body != null) {
-            if (body instanceof OperationResult) {
-                body = operationResultEncoder(body);
-                contentType = MimeTypes.opra_response_json;
-            }
-            else if (Buffer.isBuffer(body))
-                contentType = MimeTypes.binary;
-            else if (typeof body === 'object') {
-                contentType = contentType || MimeTypes.json;
-                if (typeof body.toJSON === 'function')
-                    body = body.toJSON();
+            else if (body != null) {
+                if (body instanceof OperationResult) {
+                    body = operationResultEncoder(body);
+                    contentType = MimeTypes.opra_response_json;
+                }
+                else if (Buffer.isBuffer(body))
+                    contentType = MimeTypes.binary;
+                else if (typeof body === 'object') {
+                    contentType = contentType || MimeTypes.json;
+                    if (typeof body.toJSON === 'function')
+                        body = body.toJSON();
+                }
+                else {
+                    contentType = contentType || MimeTypes.text;
+                    body = String(body);
+                }
             }
-            else {
-                contentType = contentType || MimeTypes.text;
-                body = String(body);
+            /** Set content-type header value if not set */
+            if (contentType && contentType !== responseArgs.contentType)
+                response.setHeader('content-type', contentType);
+            response.status(statusCode);
+            if (body == null) {
+                response.end();
+                return;
             }
+            let x;
+            if (Buffer.isBuffer(body) || isReadableStream(body))
+                x = body;
+            else if (isBlob(body))
+                x = body.stream();
+            else if (typeof body === 'object')
+                x = JSON.stringify(body);
+            else
+                x = String(body);
+            response.end(x);
         }
-        /** Set content-type header value if not set */
-        if (contentType && contentType !== responseArgs.contentType)
-            response.setHeader('content-type', contentType);
-        response.status(statusCode);
-        if (body == null) {
-            response.end();
-            return;
+        catch (error) {
+            context.errors.push(error);
+            return this._sendErrorResponse(context);
         }
-        let x;
-        if (Buffer.isBuffer(body) || isReadableStream(body))
-            x = body;
-        else if (isBlob(body))
-            x = body.stream();
-        else if (typeof body === 'object')
-            x = JSON.stringify(body);
-        else
-            x = String(body);
-        response.end(x);
     }
-    async sendErrorResponse(context, errors) {
-        const { response } = context;
+    async _sendErrorResponse(context) {
+        const { response, errors } = context;
         if (response.headersSent) {
             response.end();
             return;
         }
-        errors = errors || context.errors;
         const wrappedErrors = errors.map(wrapException);
         if (!wrappedErrors.length)
             wrappedErrors.push(new InternalServerError());
@@ -473,6 +480,8 @@ export class HttpHandler {
                                     : operationResponse.contentType);
                                 if (typeof ct === 'string')
                                     responseArgs.contentType = contentType = ct;
+                                else if (operationResponse.type)
+                                    responseArgs.contentType = MimeTypes.opra_response_json;
                             }
                         }
                     }

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

@@ -91,8 +91,10 @@ export class MultipartReader extends EventEmitter {
             if (!field)
                 throw new BadRequestError(`Unknown multipart field (${item.field})`);
             if (item.kind === 'field') {
-                const codec = field.generateCodec('decode');
-                item.value = codec(item.value);
+                const decode = field.generateCodec('decode');
+                item.value = decode(item.value, {
+                    onFail: issue => `Multipart field (${item.field}) validation failed: ` + issue.message,
+                });
             }
             else if (item.kind === 'file') {
                 if (field.contentType) {
@@ -104,7 +106,7 @@ export class MultipartReader extends EventEmitter {
             }
         }
         /** if all items received we check for required items */
-        if (!item && this.mediaType && this.mediaType.multipartFields?.length > 0) {
+        if (this._finished && this.mediaType && this.mediaType.multipartFields?.length > 0) {
             const fieldsLeft = new Set(this.mediaType.multipartFields);
             for (const x of this._items) {
                 const field = this.mediaType.findMultipartField(x.field);
@@ -169,14 +171,7 @@ export class MultipartReader extends EventEmitter {
         this._items.forEach(item => {
             if (item.kind !== 'file')
                 return;
-            const file = item.storedPath;
-            promises.push(new Promise(resolve => {
-                if (file._writeStream.closed)
-                    return resolve();
-                file._writeStream.once('close', resolve);
-            })
-                .then(() => fsPromise.unlink(file.filepath))
-                .then(() => 0));
+            promises.push(fsPromise.unlink(item.storedPath));
         });
         return Promise.allSettled(promises);
     }

package/i18n/i18n/en/error.json

@@ -0,0 +1,21 @@
+{
+  "BAD_REQUEST": "Bad request",
+  "FAILED_DEPENDENCY": "The request failed due to failure of a previous request",
+  "FORBIDDEN": "You are not authorized to perform this action",
+  "INTERNAL_SERVER_ERROR": "Internal server error",
+  "METHOD_NOT_ALLOWED": "Method not allowed",
+  "NOT_ACCEPTABLE": "Not acceptable",
+  "NOT_FOUND": "Not found",
+  "UNAUTHORIZED": "You have not been authenticated to perform this action",
+  "UNPROCESSABLE_ENTITY": "Unprocessable entity",
+  "REQUEST_VALIDATION": "Request validation failed",
+  "RESPONSE_VALIDATION": "Response validation failed",
+  "RESOURCE_NOT_AVAILABLE": "Resource is not available or you dont have access",
+  "RESOURCE_CONFLICT": "There is already an other {{resource}} resource with same field values ({{fields}})",
+  "OPERATION_FORBIDDEN": "The {{resource}} resource does not accept '{{operation}}' operations",
+  "ACTION_NOT_FOUND": "The {{resource}} resource doesn't have an action named '{{action}}'",
+  "UNKNOWN_FIELD": "Unknown field '{{field}}'",
+  "UNACCEPTED_SORT_FIELD": "Field '{{field}}' is not available for sort operation",
+  "UNACCEPTED_FILTER_FIELD": "Field '{{field}}' is not available for filter operation",
+  "UNACCEPTED_FILTER_OPERATION": "'{{operation}}' for field '{{field}}' is not available for filter operation"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "1.0.0-alpha.24",
+  "version": "1.0.0-alpha.25",
   "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.24",
+    "@opra/common": "^1.0.0-alpha.25",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
     "busboy": "^1.6.0",

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

@@ -61,7 +61,7 @@ export declare class HttpHandler {
      * @protected
      */
     sendResponse(context: HttpContext, responseValue?: any): Promise<void>;
-    sendErrorResponse(context: HttpContext, errors: any[]): Promise<void>;
+    protected _sendErrorResponse(context: HttpContext): Promise<void>;
     /**
      *
      * @param context

package/types/http/impl/multipart-reader.d.ts

@@ -10,7 +10,7 @@ export declare namespace MultipartReader {
     interface FieldInfo {
         kind: 'field';
         field: string;
-        value?: string;
+        value?: any;
         mimeType?: string;
         encoding?: string;
     }