@opra/core 0.26.5 → 0.27.0

package/cjs/execution-context.host.js

@@ -7,7 +7,6 @@ class ExecutionContextHost extends strict_typed_events_1.AsyncEventEmitter {
         super();
         this.api = api;
         this.platform = platform;
-        this.errors = [];
         this.ws = protocol.ws;
         this.rpc = protocol.rpc;
         if (protocol.http) {

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

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpAdapterHost = void 0;
 const tslib_1 = require("tslib");
-const assert_1 = tslib_1.__importDefault(require("assert"));
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
 const os_1 = tslib_1.__importDefault(require("os"));
+const type_is_1 = tslib_1.__importDefault(require("type-is"));
 const vg = tslib_1.__importStar(require("valgen"));
 const common_1 = require("@opra/common");
 const execution_context_host_js_1 = require("../execution-context.host.js");
@@ -33,54 +33,47 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
     async handleHttp(incoming, outgoing) {
         const context = new execution_context_host_js_1.ExecutionContextHost(this.api, this.platform, { http: { incoming, outgoing } });
         try {
-            try {
-                /* istanbul ignore next */
-                if (!this._api)
-                    throw new common_1.InternalServerError(`${Object.getPrototypeOf(this).constructor.name} has not been initialized yet`);
-                outgoing.setHeader(common_1.HttpHeaderCodes.X_Opra_Version, common_1.OpraSchema.SpecVersion);
-                // Expose headers if cors enabled
-                if (outgoing.getHeader(common_1.HttpHeaderCodes.Access_Control_Allow_Origin)) {
-                    // Expose X-Opra-* headers
-                    outgoing.appendHeader(common_1.HttpHeaderCodes.Access_Control_Expose_Headers, Object.values(common_1.HttpHeaderCodes)
-                        .filter(k => k.toLowerCase().startsWith('x-opra-')));
+            /* istanbul ignore next */
+            if (!this._api)
+                throw new common_1.InternalServerError(`${Object.getPrototypeOf(this).constructor.name} has not been initialized yet`);
+            outgoing.setHeader(common_1.HttpHeaderCodes.X_Opra_Version, common_1.OpraSchema.SpecVersion);
+            // Expose headers if cors enabled
+            if (outgoing.getHeader(common_1.HttpHeaderCodes.Access_Control_Allow_Origin)) {
+                // Expose X-Opra-* headers
+                outgoing.appendHeader(common_1.HttpHeaderCodes.Access_Control_Expose_Headers, Object.values(common_1.HttpHeaderCodes)
+                    .filter(k => k.toLowerCase().startsWith('x-opra-')));
+            }
+            const { parsedUrl } = incoming;
+            if (!parsedUrl.path.length) {
+                if (incoming.method === 'GET') {
+                    outgoing.setHeader('content-type', 'application/json');
+                    outgoing.end(JSON.stringify(this.api.exportSchema({ webSafe: true })));
+                    return;
                 }
-                const { parsedUrl } = incoming;
-                if (!parsedUrl.path.length) {
-                    if (incoming.method === 'GET') {
-                        outgoing.setHeader('content-type', 'application/json');
-                        outgoing.end(JSON.stringify(this.api.exportSchema({ webSafe: true })));
-                        return;
-                    }
-                    // Process Batch
-                    if (incoming.method === 'POST' && incoming.headers['content-type'] === 'multipart/mixed') {
-                        // todo Process Batch
-                    }
-                    throw new common_1.BadRequestError();
+                // Process Batch
+                if (incoming.method === 'POST' && incoming.headers['content-type'] === 'multipart/mixed') {
+                    // todo Process Batch
                 }
-                let i = 0;
-                let requestProcessed = false;
-                const next = async () => {
-                    const interceptor = this._interceptors[i++];
-                    if (interceptor) {
-                        await interceptor(context, next);
-                        await next();
-                    }
-                    else if (!requestProcessed) {
-                        requestProcessed = true;
-                        await this.handleExecution(context);
-                    }
-                };
-                await next();
-            }
-            catch (error) {
-                context.errors.push((0, common_1.wrapException)(error));
-            }
-            // If no response returned to the client we send an error
-            if (!outgoing.writableEnded) {
-                if (!context.errors.length)
-                    context.errors.push(new common_1.BadRequestError(`Server can not process this request`));
-                await this.handleError(context);
+                throw new common_1.BadRequestError();
             }
+            let i = 0;
+            let requestProcessed = false;
+            const next = async () => {
+                const interceptor = this._interceptors[i++];
+                if (interceptor) {
+                    await interceptor(context, next);
+                    await next();
+                }
+                else if (!requestProcessed) {
+                    requestProcessed = true;
+                    await this.handleExecution(context);
+                }
+            };
+            await next();
+        }
+        catch (error) {
+            if (!outgoing.writableEnded)
+                await this.sendErrorResponse(context, [error]);
         }
         finally {
             await context.emitAsync('finish');
@@ -88,16 +81,27 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
     }
     async handleExecution(executionContext) {
         // Parse incoming message and create Request object
-        const request = await this.parseRequest(executionContext);
-        const { outgoing } = executionContext.switchToHttp();
-        const response = new response_host_js_1.ResponseHost({ http: outgoing });
-        const context = request_context_js_1.RequestContext.from(executionContext, request, response);
-        await this.executeRequest(context);
-        if (response.errors.length) {
-            context.errors.push(...response.errors);
-            return;
+        let request;
+        try {
+            request = await this.parseRequest(executionContext);
+        }
+        catch (e) {
+            if (e instanceof common_1.OpraException)
+                throw e;
+            if (e instanceof vg.ValidationError) {
+                throw new common_1.BadRequestError({
+                    message: (0, common_1.translate)('error:RESPONSE_VALIDATION,', 'Response validation failed'),
+                    code: 'RESPONSE_VALIDATION',
+                    details: e.issues
+                }, e);
+            }
+            throw new common_1.BadRequestError(e);
         }
         try {
+            const { outgoing } = executionContext.switchToHttp();
+            const response = new response_host_js_1.ResponseHost({ http: outgoing });
+            const context = request_context_js_1.RequestContext.from(executionContext, request, response);
+            await this.executeRequest(context);
             await this.sendResponse(context);
         }
         catch (e) {
@@ -151,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, urlPath.slice(1), searchParams);
+            request = await this._parseRequestStorage(executionContext, resource, 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);
@@ -171,7 +175,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         const { controller, endpoint, handler } = await this.getActionHandler(resource, p.resource);
         const { incoming } = executionContext.switchToHttp();
         const contentId = incoming.headers['content-id'];
-        const params = this.parseParameters(endpoint.parameters, p, searchParams);
+        const params = this.parseParameters(endpoint.parameters, searchParams);
         return new request_host_js_1.RequestHost({
             endpoint,
             controller,
@@ -194,7 +198,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                     let data = await jsonReader(incoming);
                     data = endpoint.decodeInput(data, { coerce: true });
-                    const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                    const params = this.parseParameters(endpoint.parameters, searchParams);
                     return new request_host_js_1.RequestHost({
                         endpoint,
                         controller,
@@ -215,7 +219,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             case 'DELETE': {
                 if (p.key != null) {
                     const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'delete');
-                    const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                    const params = this.parseParameters(endpoint.parameters, searchParams);
                     return new request_host_js_1.RequestHost({
                         endpoint,
                         controller,
@@ -227,7 +231,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     });
                 }
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'deleteMany');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
                     controller,
@@ -243,7 +247,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             case 'GET': {
                 if (p.key != null) {
                     const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'get');
-                    const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                    const params = this.parseParameters(endpoint.parameters, searchParams);
                     return new request_host_js_1.RequestHost({
                         endpoint,
                         controller,
@@ -260,7 +264,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     });
                 }
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'findMany');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
                     controller,
@@ -283,7 +287,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                     const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                     let data = await jsonReader(incoming);
                     data = endpoint.decodeInput(data, { coerce: true });
-                    const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                    const params = this.parseParameters(endpoint.parameters, searchParams);
                     return new request_host_js_1.RequestHost({
                         endpoint,
                         controller,
@@ -304,7 +308,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
                 data = endpoint.decodeInput(data, { coerce: true });
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
                     controller,
@@ -328,14 +332,13 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         if ((incoming.method === 'POST' || incoming.method === 'PATCH') && !incoming.is('json'))
             throw new common_1.BadRequestError({ message: 'Unsupported Content-Type' });
         const contentId = incoming.headers['content-id'];
-        const p = urlPath[0];
         switch (incoming.method) {
             case 'POST': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'create');
                 const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
                 data = endpoint.decodeInput(data, { coerce: true });
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
                     controller,
@@ -353,7 +356,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             }
             case 'DELETE': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'delete');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
                     controller,
@@ -365,7 +368,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             }
             case 'GET': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'get');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
                     controller,
@@ -385,7 +388,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 const jsonReader = (0, json_body_loader_js_1.jsonBodyLoader)({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
                 data = endpoint.decodeInput(data, { coerce: true });
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
                     controller,
@@ -406,14 +409,13 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             message: `Singleton resource doesn't accept http "${incoming.method}" method`
         });
     }
-    async _parseRequestStorage(executionContext, resource, urlPath, searchParams) {
+    async _parseRequestStorage(executionContext, resource, searchParams) {
         const { incoming } = executionContext.switchToHttp();
         const contentId = incoming.headers['content-id'];
-        const p = urlPath[0];
         switch (incoming.method) {
             case 'GET': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'get');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
                     controller,
@@ -426,7 +428,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             }
             case 'DELETE': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'delete');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new request_host_js_1.RequestHost({
                     endpoint,
                     controller,
@@ -439,7 +441,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             }
             case 'POST': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'post');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                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, {
                     ...endpoint.options,
@@ -468,13 +470,15 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             message: `Storage resource doesn't accept http "${incoming.method}" method`
         });
     }
-    parseParameters(paramDefs, pathComponent, searchParams) {
+    parseParameters(paramDefs, searchParams) {
         const out = {};
         // Parse known parameters
         for (const [k, prm] of paramDefs.entries()) {
             const decode = prm.getDecoder();
             let v = searchParams?.getAll(k);
             try {
+                if (!v.length && prm.default != null)
+                    v = [prm.default];
                 if (!prm.isArray) {
                     v = v[0];
                     v = decode(v, { coerce: true });
@@ -507,7 +511,7 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
     async executeRequest(context) {
         const { request } = context;
         const { response } = context;
-        const { resource, handler } = request;
+        const { endpoint, resource, handler } = request;
         // Call endpoint handler method
         let value;
         try {
@@ -515,37 +519,41 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
             if (response.value == null)
                 response.value = value;
             // Normalize response value
-            if (request.endpoint.kind === 'operation' &&
-                (resource instanceof common_1.Collection || resource instanceof common_1.Singleton || resource instanceof common_1.Storage)) {
-                const { endpoint } = request;
-                const operationName = endpoint.name;
-                if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
-                    let affected = 0;
-                    if (typeof value === 'number')
-                        affected = value;
-                    if (typeof value === 'boolean')
-                        affected = value ? 1 : 0;
-                    if (typeof value === 'object')
-                        affected = value.affected || value.affectedRows ||
-                            (operationName === 'updateMany' ? value.updated : value.deleted);
-                    response.value = affected;
-                    return;
+            if (endpoint.kind === 'operation') {
+                if (resource instanceof common_1.Storage && endpoint.name === 'post') {
+                    // Count file parts
+                    value = context.request.parts.items.reduce((n, item) => item.file ? n + 1 : n, 0);
                 }
-                if (resource instanceof common_1.Storage)
+                if (resource instanceof common_1.Collection || resource instanceof common_1.Singleton || resource instanceof common_1.Storage) {
+                    const operationName = endpoint.name;
+                    if (operationName === 'delete' || operationName === 'deleteMany' ||
+                        operationName === 'updateMany' || operationName === 'post') {
+                        let affected = 0;
+                        if (typeof value === 'number')
+                            affected = value;
+                        else if (typeof value === 'boolean')
+                            affected = value ? 1 : 0;
+                        else if (typeof value === 'object')
+                            affected = value.affected || value.affectedRows ||
+                                (operationName === 'updateMany' ? value.updated : value.deleted);
+                        response.value = affected;
+                        return;
+                    }
+                    if (resource instanceof common_1.Storage)
+                        return;
+                    // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
+                    if (value == null && (operationName === 'get' || operationName === 'update'))
+                        throw new common_1.ResourceNotFoundError(resource.name, request.key);
+                    // "findMany" endpoint should return array of entity instances
+                    if (operationName === 'findMany')
+                        value = (value == null ? [] : Array.isArray(value) ? value : [value]);
+                    else
+                        value = value == null ? {} : Array.isArray(value) ? value[0] : value;
+                    value = endpoint.encodeReturning(value, { coerce: true });
+                    response.value = value;
                     return;
-                // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
-                if (value == null && (operationName === 'get' || operationName === 'update'))
-                    throw new common_1.ResourceNotFoundError(resource.name, request.key);
-                // "findMany" endpoint should return array of entity instances
-                if (operationName === 'findMany')
-                    value = (value == null ? [] : Array.isArray(value) ? value : [value]);
-                else
-                    value = value == null ? {} : Array.isArray(value) ? value[0] : value;
-                value = endpoint.encodeReturning(value, { coerce: true });
-                response.value = value;
-                return;
+                }
             }
-            const { endpoint } = request;
             if (response.value)
                 response.value = endpoint.encodeReturning(response.value, { coerce: true });
         }
@@ -557,52 +565,76 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         const { request, response } = context;
         const { endpoint, resource } = request;
         const outgoing = response.switchToHttp();
-        if (endpoint.kind === 'operation' &&
+        if (response.errors?.length || (outgoing.statusCode >= 400 && outgoing.statusCode <= 599))
+            return this.sendErrorResponse(context, response.errors || []);
+        // if response redirected we do not send any response
+        if (outgoing.statusCode >= 300 && outgoing.statusCode < 400) {
+            outgoing.end();
+            return;
+        }
+        let contentType = String(outgoing.getHeader('content-type') || '');
+        const returnType = endpoint.returnType;
+        if (endpoint.kind === 'action' && !contentType && endpoint.returnMime && response.value) {
+            contentType = endpoint.returnMime;
+            outgoing.setHeader('Content-Type', contentType);
+        }
+        // OperationResult response
+        if ((endpoint.kind === 'operation' &&
             (resource instanceof common_1.Collection || resource instanceof common_1.Singleton ||
-                (resource instanceof common_1.Storage && endpoint.name !== 'get'))) {
-            const returnType = endpoint.returnType;
-            const operationName = endpoint.name;
-            const body = {
-                context: resource.getFullPath(),
-                operation: operationName
-            };
-            if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
+                (resource instanceof common_1.Storage && endpoint.name !== 'get'))) ||
+            (endpoint.kind === 'action' &&
+                (!contentType || type_is_1.default.is(contentType, ['application/opra+json'])))) {
+            const incoming = context.switchToHttp().incoming;
+            const apiUrl = new common_1.OpraURL(incoming.baseUrl, incoming.protocol + '://' + incoming.get('host')).toString();
+            const body = new common_1.OperationResult({
+                context: endpoint.getFullPath(false),
+                contextUrl: apiUrl + '/#' + endpoint.getFullPath(true)
+            });
+            const operationName = endpoint.kind === 'operation' ? endpoint.name : '';
+            if (operationName === 'delete' || operationName === 'deleteMany' ||
+                operationName === 'updateMany' || operationName === 'post')
                 body.affected = response.value;
-            }
             else {
-                if (!response.value)
-                    throw new common_1.InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
-                (0, assert_1.default)(returnType instanceof common_1.ComplexType);
-                body.type = returnType.name || '#anonymous';
-                body.data = this.i18n.deep(response.value);
+                outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
                 if (operationName === 'create')
                     outgoing.statusCode = 201;
-                if (operationName === 'create' || operationName === 'update')
-                    body.affected = 1;
-                else if (operationName === 'get' || operationName === 'update')
-                    body.key = request.key;
-                if (operationName === 'findMany' && response.count != null && response.count >= 0)
-                    body.totalCount = response.count;
+                if (operationName === 'update' || operationName === 'create')
+                    body.affected = response.value ? 1 : 0;
+                if (operationName === 'findMany') {
+                    body.count = response.value.length;
+                    body.totalMatches = response.totalMatches;
+                }
+                if (returnType) {
+                    if (response.value == null)
+                        throw new common_1.InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
+                    if (returnType.name) {
+                        const ns = this.api.getDataTypeNs(returnType);
+                        // const isOpraSpec = returnType.document.url?.startsWith('https://oprajs.com/spec/v1.0')
+                        body.type = (ns ? ns + ':' : '') + returnType.name;
+                        body.typeUrl =
+                            (ns
+                                ? new common_1.OpraURL('/#/types/' + returnType.name, returnType.document.url || 'http://tempuri.org').toString()
+                                : apiUrl + '/#/types/' + returnType.name);
+                    }
+                    else
+                        body.typeUrl = body.contextUrl + '/type';
+                    body.payload = this.i18n.deep(response.value);
+                }
             }
-            outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
             outgoing.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
             outgoing.send(JSON.stringify(body));
             outgoing.end();
             return;
         }
-        // Storage "get" resource
-        if (endpoint.kind === 'action') {
-            //
-        }
         outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
         if (response.value != null) {
             if (typeof response.value === 'string') {
-                if (!outgoing.hasHeader('content-type'))
+                if (!contentType)
                     outgoing.setHeader('content-type', 'text/plain');
                 outgoing.send(response.value);
             }
             else if (Buffer.isBuffer(response.value) || (0, common_1.isReadable)(response.value)) {
-                if (!outgoing.hasHeader('content-type'))
+                if (!contentType)
                     outgoing.setHeader('content-type', 'application/octet-stream');
                 outgoing.send(response.value);
             }
@@ -613,13 +645,14 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
         }
         outgoing.end();
     }
-    async handleError(context) {
-        const { errors } = context;
+    async sendErrorResponse(context, errors) {
         const { outgoing } = context.switchToHttp();
         if (outgoing.headersSent) {
             outgoing.end();
             return;
         }
+        if (!errors.length)
+            errors.push((0, common_1.wrapException)({ status: outgoing.statusCode || 500 }));
         errors.forEach(x => {
             if (x instanceof common_1.OpraException) {
                 switch (x.severity) {
@@ -651,9 +684,9 @@ class HttpAdapterHost extends platform_adapter_host_js_1.PlatformAdapterHost {
                 status = common_1.HttpStatusCodes.INTERNAL_SERVER_ERROR;
         }
         outgoing.statusCode = status;
-        const body = {
+        const body = new common_1.OperationResult({
             errors: wrappedErrors.map(x => this._i18n.deep(x.toJSON()))
-        };
+        });
         outgoing.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
         outgoing.setHeader(common_1.HttpHeaderCodes.Cache_Control, 'no-cache');
         outgoing.setHeader(common_1.HttpHeaderCodes.Pragma, 'no-cache');

package/cjs/request-context.js

@@ -6,7 +6,7 @@ var RequestContext;
     function from(executionContext, request, response) {
         const out = {
             request,
-            response,
+            response
         };
         Object.setPrototypeOf(out, executionContext);
         return out;

package/esm/execution-context.host.js

@@ -4,7 +4,6 @@ export class ExecutionContextHost extends AsyncEventEmitter {
         super();
         this.api = api;
         this.platform = platform;
-        this.errors = [];
         this.ws = protocol.ws;
         this.rpc = protocol.rpc;
         if (protocol.http) {

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

@@ -1,8 +1,8 @@
-import assert from 'assert';
 import fs from 'fs/promises';
 import os from 'os';
+import typeIs from 'type-is';
 import * as vg from 'valgen';
-import { BadRequestError, Collection, ComplexType, Container, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OpraException, OpraSchema, OpraURL, ResourceNotFoundError, Singleton, Storage, translate, uid, wrapException } from '@opra/common';
+import { BadRequestError, Collection, Container, HttpHeaderCodes, HttpStatusCodes, InternalServerError, isReadable, IssueSeverity, MethodNotAllowedError, OperationResult, OpraException, OpraSchema, OpraURL, ResourceNotFoundError, Singleton, Storage, translate, uid, wrapException } from '@opra/common';
 import { ExecutionContextHost } from '../execution-context.host.js';
 import { PlatformAdapterHost } from '../platform-adapter.host.js';
 import { RequestHost } from '../request.host.js';
@@ -29,54 +29,47 @@ export class HttpAdapterHost extends PlatformAdapterHost {
     async handleHttp(incoming, outgoing) {
         const context = new ExecutionContextHost(this.api, this.platform, { http: { incoming, outgoing } });
         try {
-            try {
-                /* istanbul ignore next */
-                if (!this._api)
-                    throw new InternalServerError(`${Object.getPrototypeOf(this).constructor.name} has not been initialized yet`);
-                outgoing.setHeader(HttpHeaderCodes.X_Opra_Version, OpraSchema.SpecVersion);
-                // Expose headers if cors enabled
-                if (outgoing.getHeader(HttpHeaderCodes.Access_Control_Allow_Origin)) {
-                    // Expose X-Opra-* headers
-                    outgoing.appendHeader(HttpHeaderCodes.Access_Control_Expose_Headers, Object.values(HttpHeaderCodes)
-                        .filter(k => k.toLowerCase().startsWith('x-opra-')));
+            /* istanbul ignore next */
+            if (!this._api)
+                throw new InternalServerError(`${Object.getPrototypeOf(this).constructor.name} has not been initialized yet`);
+            outgoing.setHeader(HttpHeaderCodes.X_Opra_Version, OpraSchema.SpecVersion);
+            // Expose headers if cors enabled
+            if (outgoing.getHeader(HttpHeaderCodes.Access_Control_Allow_Origin)) {
+                // Expose X-Opra-* headers
+                outgoing.appendHeader(HttpHeaderCodes.Access_Control_Expose_Headers, Object.values(HttpHeaderCodes)
+                    .filter(k => k.toLowerCase().startsWith('x-opra-')));
+            }
+            const { parsedUrl } = incoming;
+            if (!parsedUrl.path.length) {
+                if (incoming.method === 'GET') {
+                    outgoing.setHeader('content-type', 'application/json');
+                    outgoing.end(JSON.stringify(this.api.exportSchema({ webSafe: true })));
+                    return;
                 }
-                const { parsedUrl } = incoming;
-                if (!parsedUrl.path.length) {
-                    if (incoming.method === 'GET') {
-                        outgoing.setHeader('content-type', 'application/json');
-                        outgoing.end(JSON.stringify(this.api.exportSchema({ webSafe: true })));
-                        return;
-                    }
-                    // Process Batch
-                    if (incoming.method === 'POST' && incoming.headers['content-type'] === 'multipart/mixed') {
-                        // todo Process Batch
-                    }
-                    throw new BadRequestError();
+                // Process Batch
+                if (incoming.method === 'POST' && incoming.headers['content-type'] === 'multipart/mixed') {
+                    // todo Process Batch
                 }
-                let i = 0;
-                let requestProcessed = false;
-                const next = async () => {
-                    const interceptor = this._interceptors[i++];
-                    if (interceptor) {
-                        await interceptor(context, next);
-                        await next();
-                    }
-                    else if (!requestProcessed) {
-                        requestProcessed = true;
-                        await this.handleExecution(context);
-                    }
-                };
-                await next();
-            }
-            catch (error) {
-                context.errors.push(wrapException(error));
-            }
-            // If no response returned to the client we send an error
-            if (!outgoing.writableEnded) {
-                if (!context.errors.length)
-                    context.errors.push(new BadRequestError(`Server can not process this request`));
-                await this.handleError(context);
+                throw new BadRequestError();
             }
+            let i = 0;
+            let requestProcessed = false;
+            const next = async () => {
+                const interceptor = this._interceptors[i++];
+                if (interceptor) {
+                    await interceptor(context, next);
+                    await next();
+                }
+                else if (!requestProcessed) {
+                    requestProcessed = true;
+                    await this.handleExecution(context);
+                }
+            };
+            await next();
+        }
+        catch (error) {
+            if (!outgoing.writableEnded)
+                await this.sendErrorResponse(context, [error]);
         }
         finally {
             await context.emitAsync('finish');
@@ -84,16 +77,27 @@ export class HttpAdapterHost extends PlatformAdapterHost {
     }
     async handleExecution(executionContext) {
         // Parse incoming message and create Request object
-        const request = await this.parseRequest(executionContext);
-        const { outgoing } = executionContext.switchToHttp();
-        const response = new ResponseHost({ http: outgoing });
-        const context = RequestContext.from(executionContext, request, response);
-        await this.executeRequest(context);
-        if (response.errors.length) {
-            context.errors.push(...response.errors);
-            return;
+        let request;
+        try {
+            request = await this.parseRequest(executionContext);
+        }
+        catch (e) {
+            if (e instanceof OpraException)
+                throw e;
+            if (e instanceof vg.ValidationError) {
+                throw new BadRequestError({
+                    message: translate('error:RESPONSE_VALIDATION,', 'Response validation failed'),
+                    code: 'RESPONSE_VALIDATION',
+                    details: e.issues
+                }, e);
+            }
+            throw new BadRequestError(e);
         }
         try {
+            const { outgoing } = executionContext.switchToHttp();
+            const response = new ResponseHost({ http: outgoing });
+            const context = RequestContext.from(executionContext, request, response);
+            await this.executeRequest(context);
             await this.sendResponse(context);
         }
         catch (e) {
@@ -147,7 +151,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 return request;
         }
         if (resource instanceof Storage)
-            request = await this._parseRequestStorage(executionContext, resource, urlPath.slice(1), searchParams);
+            request = await this._parseRequestStorage(executionContext, resource, 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);
@@ -167,7 +171,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         const { controller, endpoint, handler } = await this.getActionHandler(resource, p.resource);
         const { incoming } = executionContext.switchToHttp();
         const contentId = incoming.headers['content-id'];
-        const params = this.parseParameters(endpoint.parameters, p, searchParams);
+        const params = this.parseParameters(endpoint.parameters, searchParams);
         return new RequestHost({
             endpoint,
             controller,
@@ -190,7 +194,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                     let data = await jsonReader(incoming);
                     data = endpoint.decodeInput(data, { coerce: true });
-                    const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                    const params = this.parseParameters(endpoint.parameters, searchParams);
                     return new RequestHost({
                         endpoint,
                         controller,
@@ -211,7 +215,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             case 'DELETE': {
                 if (p.key != null) {
                     const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'delete');
-                    const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                    const params = this.parseParameters(endpoint.parameters, searchParams);
                     return new RequestHost({
                         endpoint,
                         controller,
@@ -223,7 +227,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     });
                 }
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'deleteMany');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new RequestHost({
                     endpoint,
                     controller,
@@ -239,7 +243,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             case 'GET': {
                 if (p.key != null) {
                     const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'get');
-                    const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                    const params = this.parseParameters(endpoint.parameters, searchParams);
                     return new RequestHost({
                         endpoint,
                         controller,
@@ -256,7 +260,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     });
                 }
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'findMany');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new RequestHost({
                     endpoint,
                     controller,
@@ -279,7 +283,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                     const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                     let data = await jsonReader(incoming);
                     data = endpoint.decodeInput(data, { coerce: true });
-                    const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                    const params = this.parseParameters(endpoint.parameters, searchParams);
                     return new RequestHost({
                         endpoint,
                         controller,
@@ -300,7 +304,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
                 data = endpoint.decodeInput(data, { coerce: true });
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new RequestHost({
                     endpoint,
                     controller,
@@ -324,14 +328,13 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         if ((incoming.method === 'POST' || incoming.method === 'PATCH') && !incoming.is('json'))
             throw new BadRequestError({ message: 'Unsupported Content-Type' });
         const contentId = incoming.headers['content-id'];
-        const p = urlPath[0];
         switch (incoming.method) {
             case 'POST': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'create');
                 const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
                 data = endpoint.decodeInput(data, { coerce: true });
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new RequestHost({
                     endpoint,
                     controller,
@@ -349,7 +352,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             }
             case 'DELETE': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'delete');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new RequestHost({
                     endpoint,
                     controller,
@@ -361,7 +364,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             }
             case 'GET': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'get');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new RequestHost({
                     endpoint,
                     controller,
@@ -381,7 +384,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 const jsonReader = jsonBodyLoader({ limit: endpoint.inputMaxContentSize }, endpoint);
                 let data = await jsonReader(incoming);
                 data = endpoint.decodeInput(data, { coerce: true });
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new RequestHost({
                     endpoint,
                     controller,
@@ -402,14 +405,13 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             message: `Singleton resource doesn't accept http "${incoming.method}" method`
         });
     }
-    async _parseRequestStorage(executionContext, resource, urlPath, searchParams) {
+    async _parseRequestStorage(executionContext, resource, searchParams) {
         const { incoming } = executionContext.switchToHttp();
         const contentId = incoming.headers['content-id'];
-        const p = urlPath[0];
         switch (incoming.method) {
             case 'GET': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'get');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new RequestHost({
                     endpoint,
                     controller,
@@ -422,7 +424,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             }
             case 'DELETE': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'delete');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 return new RequestHost({
                     endpoint,
                     controller,
@@ -435,7 +437,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             }
             case 'POST': {
                 const { controller, endpoint, handler } = await this.getOperationHandler(resource, 'post');
-                const params = this.parseParameters(endpoint.parameters, p, searchParams);
+                const params = this.parseParameters(endpoint.parameters, searchParams);
                 await fs.mkdir(this._tempDir, { recursive: true });
                 const multipartIterator = new MultipartIterator(incoming, {
                     ...endpoint.options,
@@ -464,13 +466,15 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             message: `Storage resource doesn't accept http "${incoming.method}" method`
         });
     }
-    parseParameters(paramDefs, pathComponent, searchParams) {
+    parseParameters(paramDefs, searchParams) {
         const out = {};
         // Parse known parameters
         for (const [k, prm] of paramDefs.entries()) {
             const decode = prm.getDecoder();
             let v = searchParams?.getAll(k);
             try {
+                if (!v.length && prm.default != null)
+                    v = [prm.default];
                 if (!prm.isArray) {
                     v = v[0];
                     v = decode(v, { coerce: true });
@@ -503,7 +507,7 @@ export class HttpAdapterHost extends PlatformAdapterHost {
     async executeRequest(context) {
         const { request } = context;
         const { response } = context;
-        const { resource, handler } = request;
+        const { endpoint, resource, handler } = request;
         // Call endpoint handler method
         let value;
         try {
@@ -511,37 +515,41 @@ export class HttpAdapterHost extends PlatformAdapterHost {
             if (response.value == null)
                 response.value = value;
             // Normalize response value
-            if (request.endpoint.kind === 'operation' &&
-                (resource instanceof Collection || resource instanceof Singleton || resource instanceof Storage)) {
-                const { endpoint } = request;
-                const operationName = endpoint.name;
-                if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
-                    let affected = 0;
-                    if (typeof value === 'number')
-                        affected = value;
-                    if (typeof value === 'boolean')
-                        affected = value ? 1 : 0;
-                    if (typeof value === 'object')
-                        affected = value.affected || value.affectedRows ||
-                            (operationName === 'updateMany' ? value.updated : value.deleted);
-                    response.value = affected;
-                    return;
+            if (endpoint.kind === 'operation') {
+                if (resource instanceof Storage && endpoint.name === 'post') {
+                    // Count file parts
+                    value = context.request.parts.items.reduce((n, item) => item.file ? n + 1 : n, 0);
                 }
-                if (resource instanceof Storage)
+                if (resource instanceof Collection || resource instanceof Singleton || resource instanceof Storage) {
+                    const operationName = endpoint.name;
+                    if (operationName === 'delete' || operationName === 'deleteMany' ||
+                        operationName === 'updateMany' || operationName === 'post') {
+                        let affected = 0;
+                        if (typeof value === 'number')
+                            affected = value;
+                        else if (typeof value === 'boolean')
+                            affected = value ? 1 : 0;
+                        else if (typeof value === 'object')
+                            affected = value.affected || value.affectedRows ||
+                                (operationName === 'updateMany' ? value.updated : value.deleted);
+                        response.value = affected;
+                        return;
+                    }
+                    if (resource instanceof Storage)
+                        return;
+                    // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
+                    if (value == null && (operationName === 'get' || operationName === 'update'))
+                        throw new ResourceNotFoundError(resource.name, request.key);
+                    // "findMany" endpoint should return array of entity instances
+                    if (operationName === 'findMany')
+                        value = (value == null ? [] : Array.isArray(value) ? value : [value]);
+                    else
+                        value = value == null ? {} : Array.isArray(value) ? value[0] : value;
+                    value = endpoint.encodeReturning(value, { coerce: true });
+                    response.value = value;
                     return;
-                // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
-                if (value == null && (operationName === 'get' || operationName === 'update'))
-                    throw new ResourceNotFoundError(resource.name, request.key);
-                // "findMany" endpoint should return array of entity instances
-                if (operationName === 'findMany')
-                    value = (value == null ? [] : Array.isArray(value) ? value : [value]);
-                else
-                    value = value == null ? {} : Array.isArray(value) ? value[0] : value;
-                value = endpoint.encodeReturning(value, { coerce: true });
-                response.value = value;
-                return;
+                }
             }
-            const { endpoint } = request;
             if (response.value)
                 response.value = endpoint.encodeReturning(response.value, { coerce: true });
         }
@@ -553,52 +561,76 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         const { request, response } = context;
         const { endpoint, resource } = request;
         const outgoing = response.switchToHttp();
-        if (endpoint.kind === 'operation' &&
+        if (response.errors?.length || (outgoing.statusCode >= 400 && outgoing.statusCode <= 599))
+            return this.sendErrorResponse(context, response.errors || []);
+        // if response redirected we do not send any response
+        if (outgoing.statusCode >= 300 && outgoing.statusCode < 400) {
+            outgoing.end();
+            return;
+        }
+        let contentType = String(outgoing.getHeader('content-type') || '');
+        const returnType = endpoint.returnType;
+        if (endpoint.kind === 'action' && !contentType && endpoint.returnMime && response.value) {
+            contentType = endpoint.returnMime;
+            outgoing.setHeader('Content-Type', contentType);
+        }
+        // OperationResult response
+        if ((endpoint.kind === 'operation' &&
             (resource instanceof Collection || resource instanceof Singleton ||
-                (resource instanceof Storage && endpoint.name !== 'get'))) {
-            const returnType = endpoint.returnType;
-            const operationName = endpoint.name;
-            const body = {
-                context: resource.getFullPath(),
-                operation: operationName
-            };
-            if (operationName === 'delete' || operationName === 'deleteMany' || operationName === 'updateMany') {
+                (resource instanceof Storage && endpoint.name !== 'get'))) ||
+            (endpoint.kind === 'action' &&
+                (!contentType || typeIs.is(contentType, ['application/opra+json'])))) {
+            const incoming = context.switchToHttp().incoming;
+            const apiUrl = new OpraURL(incoming.baseUrl, incoming.protocol + '://' + incoming.get('host')).toString();
+            const body = new OperationResult({
+                context: endpoint.getFullPath(false),
+                contextUrl: apiUrl + '/#' + endpoint.getFullPath(true)
+            });
+            const operationName = endpoint.kind === 'operation' ? endpoint.name : '';
+            if (operationName === 'delete' || operationName === 'deleteMany' ||
+                operationName === 'updateMany' || operationName === 'post')
                 body.affected = response.value;
-            }
             else {
-                if (!response.value)
-                    throw new InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
-                assert(returnType instanceof ComplexType);
-                body.type = returnType.name || '#anonymous';
-                body.data = this.i18n.deep(response.value);
+                outgoing.statusCode = outgoing.statusCode || HttpStatusCodes.OK;
                 if (operationName === 'create')
                     outgoing.statusCode = 201;
-                if (operationName === 'create' || operationName === 'update')
-                    body.affected = 1;
-                else if (operationName === 'get' || operationName === 'update')
-                    body.key = request.key;
-                if (operationName === 'findMany' && response.count != null && response.count >= 0)
-                    body.totalCount = response.count;
+                if (operationName === 'update' || operationName === 'create')
+                    body.affected = response.value ? 1 : 0;
+                if (operationName === 'findMany') {
+                    body.count = response.value.length;
+                    body.totalMatches = response.totalMatches;
+                }
+                if (returnType) {
+                    if (response.value == null)
+                        throw new InternalServerError(`"${request.endpoint.name}" endpoint should return value`);
+                    if (returnType.name) {
+                        const ns = this.api.getDataTypeNs(returnType);
+                        // const isOpraSpec = returnType.document.url?.startsWith('https://oprajs.com/spec/v1.0')
+                        body.type = (ns ? ns + ':' : '') + returnType.name;
+                        body.typeUrl =
+                            (ns
+                                ? new OpraURL('/#/types/' + returnType.name, returnType.document.url || 'http://tempuri.org').toString()
+                                : apiUrl + '/#/types/' + returnType.name);
+                    }
+                    else
+                        body.typeUrl = body.contextUrl + '/type';
+                    body.payload = this.i18n.deep(response.value);
+                }
             }
-            outgoing.statusCode = outgoing.statusCode || HttpStatusCodes.OK;
             outgoing.setHeader(HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
             outgoing.send(JSON.stringify(body));
             outgoing.end();
             return;
         }
-        // Storage "get" resource
-        if (endpoint.kind === 'action') {
-            //
-        }
         outgoing.statusCode = outgoing.statusCode || HttpStatusCodes.OK;
         if (response.value != null) {
             if (typeof response.value === 'string') {
-                if (!outgoing.hasHeader('content-type'))
+                if (!contentType)
                     outgoing.setHeader('content-type', 'text/plain');
                 outgoing.send(response.value);
             }
             else if (Buffer.isBuffer(response.value) || isReadable(response.value)) {
-                if (!outgoing.hasHeader('content-type'))
+                if (!contentType)
                     outgoing.setHeader('content-type', 'application/octet-stream');
                 outgoing.send(response.value);
             }
@@ -609,13 +641,14 @@ export class HttpAdapterHost extends PlatformAdapterHost {
         }
         outgoing.end();
     }
-    async handleError(context) {
-        const { errors } = context;
+    async sendErrorResponse(context, errors) {
         const { outgoing } = context.switchToHttp();
         if (outgoing.headersSent) {
             outgoing.end();
             return;
         }
+        if (!errors.length)
+            errors.push(wrapException({ status: outgoing.statusCode || 500 }));
         errors.forEach(x => {
             if (x instanceof OpraException) {
                 switch (x.severity) {
@@ -647,9 +680,9 @@ export class HttpAdapterHost extends PlatformAdapterHost {
                 status = HttpStatusCodes.INTERNAL_SERVER_ERROR;
         }
         outgoing.statusCode = status;
-        const body = {
+        const body = new OperationResult({
             errors: wrappedErrors.map(x => this._i18n.deep(x.toJSON()))
-        };
+        });
         outgoing.setHeader(HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
         outgoing.setHeader(HttpHeaderCodes.Cache_Control, 'no-cache');
         outgoing.setHeader(HttpHeaderCodes.Pragma, 'no-cache');

package/esm/request-context.js

@@ -3,7 +3,7 @@ export var RequestContext;
     function from(executionContext, request, response) {
         const out = {
             request,
-            response,
+            response
         };
         Object.setPrototypeOf(out, executionContext);
         return out;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/core",
-  "version": "0.26.5",
+  "version": "0.27.0",
   "description": "Opra schema package",
   "author": "Panates",
   "license": "MIT",
@@ -27,7 +27,7 @@
     "clean:cover": "rimraf ../../coverage/core"
   },
   "dependencies": {
-    "@opra/common": "^0.26.5",
+    "@opra/common": "^0.27.0",
     "accepts": "^1.3.8",
     "content-disposition": "^0.5.4",
     "content-type": "^1.0.5",
@@ -94,4 +94,4 @@
     "swagger",
     "raml"
   ]
-}
+}

package/types/execution-context.d.ts

@@ -4,7 +4,6 @@ import type { Protocol } from './platform-adapter.js';
 export interface ExecutionContext {
     readonly protocol: Protocol;
     readonly platform: string;
-    errors: Error[];
     switchToHttp(): HttpMessageContext;
     switchToWs(): WsMessageContext;
     switchToRpc(): RpcMessageContext;

package/types/execution-context.host.d.ts

@@ -11,7 +11,6 @@ export declare class ExecutionContextHost extends AsyncEventEmitter implements E
     readonly http?: HttpMessageContext;
     readonly ws?: WsMessageContext;
     readonly rpc?: RpcMessageContext;
-    errors: Error[];
     constructor(api: ApiDocument, platform: string, protocol: {
         http?: {
             incoming: HttpServerRequest;

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

@@ -1,4 +1,4 @@
-import { Collection, OpraURLPath, OpraURLPathComponent, Parameter, Resource, Singleton, Storage } from '@opra/common';
+import { Collection, OpraURLPath, Parameter, Resource, Singleton, Storage } from '@opra/common';
 import { ExecutionContext } from '../execution-context.js';
 import { PlatformAdapterHost } from '../platform-adapter.host.js';
 import type { Protocol } from '../platform-adapter.js';
@@ -26,9 +26,9 @@ 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, urlPath: OpraURLPath, searchParams: URLSearchParams): Promise<RequestHost>;
-    protected parseParameters(paramDefs: Map<string, Parameter>, pathComponent: OpraURLPathComponent, searchParams?: URLSearchParams): Record<string, any>;
+    protected _parseRequestStorage(executionContext: ExecutionContext, resource: Storage, 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>;
-    protected handleError(context: ExecutionContext): Promise<void>;
+    protected sendErrorResponse(context: ExecutionContext, errors: any[]): Promise<void>;
 }

package/types/response.d.ts

@@ -15,7 +15,7 @@ export interface Response {
     /**
      * Total count of matched entities. (Used in "search" endpoint with "count" option
      */
-    count?: number;
+    totalMatches?: number;
     switchToHttp(): HttpServerResponse;
     switchToWs(): never;
     switchToRpc(): never;