@opra/core 1.0.0-alpha.1 → 1.0.0-alpha.10

package/cjs/index.js

@@ -10,20 +10,20 @@ const HttpOutgoingHost_ = tslib_1.__importStar(require("./http/impl/http-outgoin
 const NodeIncomingMessageHost_ = tslib_1.__importStar(require("./http/impl/node-incoming-message.host.js"));
 const NodeOutgoingMessageHost_ = tslib_1.__importStar(require("./http/impl/node-outgoing-message.host.js"));
 tslib_1.__exportStar(require("./execution-context.js"), exports);
-tslib_1.__exportStar(require("./platform-adapter.js"), exports);
-tslib_1.__exportStar(require("./type-guards.js"), exports);
 tslib_1.__exportStar(require("./helpers/logger.js"), exports);
 tslib_1.__exportStar(require("./helpers/service-base.js"), exports);
 tslib_1.__exportStar(require("./http/express-adapter.js"), exports);
 tslib_1.__exportStar(require("./http/http-adapter.js"), exports);
 tslib_1.__exportStar(require("./http/http-context.js"), exports);
+tslib_1.__exportStar(require("./http/impl/multipart-reader.js"), exports);
 tslib_1.__exportStar(require("./http/interfaces/http-incoming.interface.js"), exports);
 tslib_1.__exportStar(require("./http/interfaces/http-outgoing.interface.js"), exports);
 tslib_1.__exportStar(require("./http/interfaces/node-incoming-message.interface.js"), exports);
 tslib_1.__exportStar(require("./http/interfaces/node-outgoing-message.interface.js"), exports);
-tslib_1.__exportStar(require("./http/impl/multipart-reader.js"), exports);
 tslib_1.__exportStar(require("./http/utils/wrap-exception.js"), exports);
 tslib_1.__exportStar(require("./interfaces/logger.interface.js"), exports);
+tslib_1.__exportStar(require("./platform-adapter.js"), exports);
+tslib_1.__exportStar(require("./type-guards.js"), exports);
 var classes;
 (function (classes) {
     classes.HttpIncomingHost = HttpIncomingHost_.HttpIncomingHost;

package/cjs/platform-adapter.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformAdapter = void 0;
 require("./augmentation/18n.augmentation.js");
-const strict_typed_events_1 = require("strict-typed-events");
 const common_1 = require("@opra/common");
+const strict_typed_events_1 = require("strict-typed-events");
 const constants_js_1 = require("./constants.js");
 const logger_js_1 = require("./helpers/logger.js");
 const asset_cache_js_1 = require("./http/impl/asset-cache.js");

package/esm/augmentation/18n.augmentation.js

@@ -1,6 +1,6 @@
+import { getStackFileName, I18n as I18n_ } from '@opra/common';
 import fs from 'fs';
 import path from 'path';
-import { getStackFileName, I18n as I18n_ } from '@opra/common';
 I18n_.load = async function (options) {
     const opts = {
         ...options,

package/esm/execution-context.js

@@ -8,7 +8,6 @@ export class ExecutionContext extends AsyncEventEmitter {
         this.document = init.document;
         this.protocol = init.protocol;
         this.platform = init.platform;
-        this.platformArgs = init.platformArgs;
     }
     addListener(event, listener) {
         return super.addListener(event, listener);

package/esm/http/express-adapter.js

@@ -1,6 +1,6 @@
+import { HttpApi, NotFoundError } from '@opra/common';
 import { Router } from 'express';
 import * as nodePath from 'path';
-import { HttpApi, NotFoundError } from '@opra/common';
 import { kHandler } from '../constants.js';
 import { HttpAdapter } from './http-adapter.js';
 import { HttpContext } from './http-context.js';
@@ -31,13 +31,14 @@ export class ExpressAdapter extends HttpAdapter {
             }
             if (resource.onShutdown) {
                 const instance = this._controllerInstances.get(resource) || resource.instance;
-                if (instance)
+                if (instance) {
                     try {
                         await resource.onShutdown.call(instance, resource);
                     }
                     catch (e) {
                         this.logger.error(e);
                     }
+                }
             }
         };
         for (const c of this.api.controllers.values())
@@ -61,14 +62,9 @@ export class ExpressAdapter extends HttpAdapter {
         const createContext = (_req, _res, args) => {
             const request = HttpIncoming.from(_req);
             const response = HttpOutgoing.from(_res);
-            const platformArgs = {
-                request: _req,
-                response: _res,
-            };
             return new HttpContext({
                 adapter: this,
                 platform: this.platform,
-                platformArgs,
                 request,
                 response,
                 controller: args?.controller,
@@ -78,16 +74,9 @@ export class ExpressAdapter extends HttpAdapter {
             });
         };
         /** Add an endpoint that returns document schema */
-        router.get('*', (_req, _res, next) => {
-            if (_req.url.includes('/$schema')) {
-                const url = (_req.url.includes('?') ? _req.url.substring(0, _req.url.indexOf('?')) : _req.url).toLowerCase();
-                if (url === '/$schema') {
-                    const context = createContext(_req, _res);
-                    this[kHandler].sendDocumentSchema(context).catch(next);
-                    return;
-                }
-            }
-            next();
+        router.get('/\\$schema', (_req, _res, next) => {
+            const context = createContext(_req, _res);
+            this[kHandler].sendDocumentSchema(context).catch(next);
         });
         /** Add operation endpoints */
         if (this.api.controllers.size) {

package/esm/http/http-context.js

@@ -1,6 +1,6 @@
-import { vg } from 'valgen';
 import typeIs from '@browsery/type-is';
 import { BadRequestError, InternalServerError, NotAcceptableError, } from '@opra/common';
+import { vg } from 'valgen';
 import { kAssetCache } from '../constants.js';
 import { ExecutionContext } from '../execution-context.js';
 import { MultipartReader } from './impl/multipart-reader.js';
@@ -74,10 +74,11 @@ export class HttpContext extends ExecutionContext {
                 }
                 /** Check required fields */
                 for (const field of multipartFields) {
-                    if (field.required && !fieldsFound.get(field))
+                    if (field.required && !fieldsFound.get(field)) {
                         throw new BadRequestError({
                             message: `Multipart field (${field.fieldName}) is required`,
                         });
+                    }
                 }
             }
             return this._body;
@@ -85,8 +86,9 @@ export class HttpContext extends ExecutionContext {
         this._body = await this.request.readBody({ limit: operation.requestBody?.maxContentSize });
         if (this._body != null) {
             // Convert Buffer to string if media is text
-            if (Buffer.isBuffer(this._body) && request.is(['json', 'xml', 'txt', 'text']))
+            if (Buffer.isBuffer(this._body) && request.is(['json', 'xml', 'txt', 'text'])) {
                 this._body = this._body.toString('utf-8');
+            }
             // Transform text to Object if media is JSON
             if (typeof this._body === 'string' && request.is(['json']))
                 this._body = JSON.parse(this._body);
@@ -100,6 +102,7 @@ export class HttpContext extends ExecutionContext {
                         mediaType.type?.generateCodec('decode', {
                             partial: operation.requestBody?.partial,
                             projection: '*',
+                            ignoreReadonlyFields: true,
                         }) || vg.isAny();
                     this.adapter[kAssetCache].set(mediaType, 'decode', decode);
                 }

package/esm/http/impl/http-handler.js

@@ -1,10 +1,10 @@
+import * as process from 'node:process';
+import typeIs from '@browsery/type-is';
+import { BadRequestError, HttpHeaderCodes, HttpStatusCode, InternalServerError, isBlob, isReadableStream, IssueSeverity, MethodNotAllowedError, MimeTypes, OperationResult, OpraException, OpraSchema, translate, } from '@opra/common';
 import { parse as parseContentType } from 'content-type';
 import { splitString } from 'fast-tokenizer';
-import * as process from 'node:process';
 import { asMutable } from 'ts-gems';
 import { toArray, ValidationError, vg } from 'valgen';
-import typeIs from '@browsery/type-is';
-import { BadRequestError, HttpHeaderCodes, HttpStatusCode, InternalServerError, isBlob, isReadableStream, IssueSeverity, MethodNotAllowedError, MimeTypes, OperationResult, OpraException, OpraSchema, translate, } from '@opra/common';
 import { kAssetCache } from '../../constants.js';
 import { wrapException } from '../utils/wrap-exception.js';
 /**
@@ -60,7 +60,8 @@ export class HttpHandler {
             else
                 await this._executeRequest(context);
         }
-        catch (e) {
+        catch (error) {
+            let e = error;
             if (e instanceof ValidationError) {
                 e = new InternalServerError({
                     message: translate('error:RESPONSE_VALIDATION,', 'Response validation failed'),
@@ -72,11 +73,10 @@ export class HttpHandler {
                 e = wrapException(e);
             response.status(e.statusCode || e.status || HttpStatusCode.INTERNAL_SERVER_ERROR);
             response.contentType(MimeTypes.opra_response_json);
-            await this._sendResponse(context, new OperationResult({ errors: [e] })).finally(() => {
+            await this._sendResponse(context, new OperationResult({ errors: [e.toJSON()] })).finally(() => {
                 if (!response.finished)
                     response.end();
             });
-            // if (!outgoing.writableEnded) await this._sendErrorResponse(context.response, [error]);
         }
         finally {
             await context.emitAsync('finish');
@@ -109,17 +109,17 @@ export class HttpHandler {
      */
     async _parseParameters(context) {
         const { operation, request } = context;
-        let prmName = '';
+        let key = '';
         try {
             const onFail = (issue) => {
-                issue.location = prmName;
+                issue.location = key;
                 return issue;
             };
             /** prepare decoders */
             const getDecoder = (prm) => {
                 let decode = this[kAssetCache].get(prm, 'decode');
                 if (!decode) {
-                    decode = prm.type?.generateCodec('decode') || vg.isAny();
+                    decode = prm.type?.generateCodec('decode', { ignoreReadonlyFields: true }) || vg.isAny();
                     this[kAssetCache].set(prm, 'decode', decode);
                 }
                 return decode;
@@ -127,9 +127,9 @@ export class HttpHandler {
             const paramsLeft = new Set([...operation.parameters, ...operation.owner.parameters]);
             /** parse cookie parameters */
             if (request.cookies) {
-                for (prmName of Object.keys(request.cookies)) {
-                    const oprPrm = operation.findParameter(prmName, 'cookie');
-                    const cntPrm = operation.owner.findParameter(prmName, 'cookie');
+                for (key of Object.keys(request.cookies)) {
+                    const oprPrm = operation.findParameter(key, 'cookie');
+                    const cntPrm = operation.owner.findParameter(key, 'cookie');
                     const prm = oprPrm || cntPrm;
                     if (!prm)
                         continue;
@@ -138,16 +138,17 @@ export class HttpHandler {
                     if (cntPrm)
                         paramsLeft.delete(cntPrm);
                     const decode = getDecoder(prm);
-                    const v = decode(request.cookies[prmName], { coerce: true, label: prmName, onFail });
+                    const v = decode(request.cookies[key], { coerce: true, label: key, onFail });
+                    const prmName = typeof prm.name === 'string' ? prm.name : key;
                     if (v !== undefined)
                         context.cookies[prmName] = v;
                 }
             }
             /** parse headers */
             if (request.headers) {
-                for (prmName of Object.keys(request.headers)) {
-                    const oprPrm = operation.findParameter(prmName, 'header');
-                    const cntPrm = operation.owner.findParameter(prmName, 'header');
+                for (key of Object.keys(request.headers)) {
+                    const oprPrm = operation.findParameter(key, 'header');
+                    const cntPrm = operation.owner.findParameter(key, 'header');
                     const prm = oprPrm || cntPrm;
                     if (!prm)
                         continue;
@@ -156,16 +157,17 @@ export class HttpHandler {
                     if (cntPrm)
                         paramsLeft.delete(cntPrm);
                     const decode = getDecoder(prm);
-                    const v = decode(request.headers[prmName], { coerce: true, label: prmName, onFail });
+                    const v = decode(request.headers[key], { coerce: true, label: key, onFail });
+                    const prmName = typeof prm.name === 'string' ? prm.name : key;
                     if (v !== undefined)
                         context.headers[prmName] = v;
                 }
             }
             /** parse path parameters */
             if (request.params) {
-                for (prmName of Object.keys(request.params)) {
-                    const oprPrm = operation.findParameter(prmName, 'path');
-                    const cntPrm = operation.owner.findParameter(prmName, 'path');
+                for (key of Object.keys(request.params)) {
+                    const oprPrm = operation.findParameter(key, 'path');
+                    const cntPrm = operation.owner.findParameter(key, 'path');
                     const prm = oprPrm || cntPrm;
                     if (!prm)
                         continue;
@@ -174,17 +176,17 @@ export class HttpHandler {
                     if (cntPrm)
                         paramsLeft.delete(cntPrm);
                     const decode = getDecoder(prm);
-                    const v = decode(request.params[prmName], { coerce: true, label: prmName, onFail });
+                    const v = decode(request.params[key], { coerce: true, label: key, onFail });
                     if (v !== undefined)
-                        context.pathParams[prmName] = v;
+                        context.pathParams[key] = v;
                 }
             }
             /** parse query parameters */
             const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
             const { searchParams } = url;
-            for (prmName of searchParams.keys()) {
-                const oprPrm = operation.findParameter(prmName, 'query');
-                const cntPrm = operation.owner.findParameter(prmName, 'query');
+            for (key of searchParams.keys()) {
+                const oprPrm = operation.findParameter(key, 'query');
+                const cntPrm = operation.owner.findParameter(key, 'query');
                 const prm = oprPrm || cntPrm;
                 if (!prm)
                     continue;
@@ -193,15 +195,16 @@ export class HttpHandler {
                 if (cntPrm)
                     paramsLeft.delete(cntPrm);
                 const decode = getDecoder(prm);
-                let values = searchParams?.getAll(prmName);
+                let values = searchParams?.getAll(key);
+                const prmName = typeof prm.name === 'string' ? prm.name : key;
                 if (values?.length && prm.isArray) {
                     values = values.map(v => splitString(v, { delimiters: prm.arraySeparator, quotes: true })).flat();
-                    values = values.map(v => decode(v, { coerce: true, label: prmName, onFail }));
+                    values = values.map(v => decode(v, { coerce: true, label: key, onFail }));
                     if (values.length)
                         context.queryParams[prmName] = values;
                 }
                 else {
-                    const v = decode(values[0], { coerce: true, label: prmName, onFail });
+                    const v = decode(values[0], { coerce: true, label: key, onFail });
                     if (values.length)
                         context.queryParams[prmName] = v;
                 }
@@ -216,8 +219,8 @@ export class HttpHandler {
         }
         catch (e) {
             if (e instanceof ValidationError) {
-                e = new BadRequestError({
-                    message: `Invalid parameter (${prmName}) value. ` + e.message,
+                throw new BadRequestError({
+                    message: `Invalid parameter (${key}) value. ` + e.message,
                     code: 'REQUEST_VALIDATION',
                     details: e.issues,
                 }, e);
@@ -237,9 +240,8 @@ export class HttpHandler {
             let contentType = request.header('content-type');
             if (contentType) {
                 contentType = parseContentType(contentType).type;
-                mediaType = operation.requestBody.content.find(mc => {
-                    return (mc.contentType && typeIs.is(contentType, Array.isArray(mc.contentType) ? mc.contentType : [mc.contentType]));
-                });
+                mediaType = operation.requestBody.content.find(mc => mc.contentType &&
+                    typeIs.is(contentType, Array.isArray(mc.contentType) ? mc.contentType : [mc.contentType]));
             }
             if (!mediaType) {
                 const contentTypes = operation.requestBody.content.map(mc => mc.contentType).flat();
@@ -258,11 +260,12 @@ export class HttpHandler {
             throw new MethodNotAllowedError();
         const responseValue = await context.operationHandler.call(context.controllerInstance, context);
         const { response } = context;
-        if (!response.writableEnded)
+        if (!response.writableEnded) {
             await this._sendResponse(context, responseValue).finally(() => {
                 if (!response.writableEnded)
                     response.end();
             });
+        }
     }
     /**
      *
@@ -279,7 +282,7 @@ export class HttpHandler {
         const operationResultType = document.node.getDataType(OperationResult);
         let operationResultEncoder = this[kAssetCache].get(operationResultType, 'encode');
         if (!operationResultEncoder) {
-            operationResultEncoder = operationResultType.generateCodec('encode');
+            operationResultEncoder = operationResultType.generateCodec('encode', { ignoreWriteonlyFields: true });
             this[kAssetCache].set(operationResultType, 'encode', operationResultEncoder);
         }
         /** Validate response */
@@ -291,6 +294,7 @@ export class HttpHandler {
                     encode = operationResponse.type.generateCodec('encode', {
                         partial: operationResponse.partial,
                         projection: '*',
+                        ignoreWriteonlyFields: true,
                     });
                     if (operationResponse) {
                         if (operationResponse.isArray)
@@ -387,8 +391,9 @@ export class HttpHandler {
                 /** Filter available HttpOperationResponse instances according to status code. */
                 const filteredResponses = operation.responses.filter(r => r.statusCode.find(sc => sc.start <= statusCode && sc.end >= statusCode));
                 /** Throw InternalServerError if controller returns non-configured status code */
-                if (!filteredResponses.length && statusCode < 400)
+                if (!filteredResponses.length && statusCode < 400) {
                     throw new InternalServerError(`No responses defined for status code ${statusCode} in operation "${operation.name}"`);
+                }
                 /** We search for content-type in filtered HttpOperationResponse array */
                 if (filteredResponses.length) {
                     /** If no response returned, and content-type has not been set (No response wants to be returned by operation) */
@@ -401,8 +406,9 @@ export class HttpHandler {
                         if (contentType) {
                             // Find HttpEndpointResponse instance according to content-type header
                             operationResponse = filteredResponses.find(r => typeIs.is(contentType, toArray(r.contentType)));
-                            if (!operationResponse)
+                            if (!operationResponse) {
                                 throw new InternalServerError(`Operation didn't configured to return "${contentType}" content`);
+                            }
                         }
                         else {
                             /** Select first HttpOperationResponse if content-type header has not been set */
@@ -434,23 +440,26 @@ export class HttpHandler {
                 case 'Entity.Get':
                 case 'Entity.FindMany':
                 case 'Entity.Update': {
-                    if (!(body instanceof OperationResult))
+                    if (!(body instanceof OperationResult)) {
                         body = new OperationResult({
                             payload: body,
                         });
+                    }
                     if ((composition === 'Entity.Create' || composition === 'Entity.Update') &&
                         composition &&
-                        body.affected == null)
+                        body.affected == null) {
                         body.affected = 1;
+                    }
                     break;
                 }
                 case 'Entity.Delete':
                 case 'Entity.DeleteMany':
                 case 'Entity.UpdateMany': {
-                    if (!(body instanceof OperationResult))
+                    if (!(body instanceof OperationResult)) {
                         body = new OperationResult({
                             affected: body,
                         });
+                    }
                     body.affected =
                         typeof body.affected === 'number'
                             ? body.affected
@@ -461,15 +470,19 @@ export class HttpHandler {
                                 : undefined;
                     break;
                 }
+                default:
+                    break;
             }
         }
-        if (responseArgs.contentType && responseArgs.contentType !== parsedContentType?.type)
+        if (responseArgs.contentType && responseArgs.contentType !== parsedContentType?.type) {
             response.setHeader('content-type', responseArgs.contentType);
+        }
         if (responseArgs.contentType &&
             body != null &&
             !(body instanceof OperationResult) &&
-            typeIs.is(responseArgs.contentType, [MimeTypes.opra_response_json]))
+            typeIs.is(responseArgs.contentType, [MimeTypes.opra_response_json])) {
             body = new OperationResult({ payload: body });
+        }
         if (hasBody)
             responseArgs.body = body;
         return responseArgs;
@@ -478,28 +491,24 @@ export class HttpHandler {
         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) {
+            return this.sendErrorResponse(response, [
+                new BadRequestError({
+                    message: `Document with given id [${documentId}] does not exists`,
+                }),
+            ]);
+        }
         /** Check if response cache exists */
-        let responseBody = this[kAssetCache].get(document, '$schema-response');
+        let responseBody = this[kAssetCache].get(doc, `$schema`);
         /** Create response if response cache does not exists */
         if (!responseBody) {
-            const url = new URL(request.originalUrl || request.url || '/', 'http://tempuri.org');
-            const { searchParams } = url;
-            // const nsPath = searchParams.get('ns');
-            // if (nsPath) {
-            //   const arr = nsPath.split('/');
-            //   let doc = document;
-            //   for (const a of arr) {
-            //   }
-            // }
-            const schema = document.export({ references: searchParams.get('references') });
-            const dt = document.node.getComplexType('OperationResult');
-            let encode = this[kAssetCache].get(dt, 'encode');
-            if (!encode) {
-                encode = dt.generateCodec('encode');
-                this[kAssetCache].set(dt, 'encode', encode);
-            }
+            const schema = doc.export();
             responseBody = JSON.stringify(schema);
-            this[kAssetCache].set(document, '$schema-response', responseBody);
+            this[kAssetCache].set(doc, `$schema`, responseBody);
         }
         response.end(responseBody);
     }
@@ -546,7 +555,7 @@ export class HttpHandler {
         const dt = document.node.getComplexType('OperationResult');
         let encode = this[kAssetCache].get(dt, 'encode');
         if (!encode) {
-            encode = dt.generateCodec('encode');
+            encode = dt.generateCodec('encode', { ignoreWriteonlyFields: true });
             this[kAssetCache].set(dt, 'encode', encode);
         }
         const { i18n } = this.adapter;

package/esm/http/impl/http-incoming.host.js

@@ -2,10 +2,10 @@
   Some parts of this file contains codes from open source express library
   https://github.com/expressjs
  */
+import typeIs from '@browsery/type-is';
 import accepts from 'accepts';
 import fresh from 'fresh';
 import parseRange from 'range-parser';
-import typeIs from '@browsery/type-is';
 import { BodyReader } from '../utils/body-reader.js';
 export class HttpIncomingHost {
     get protocol() {
@@ -37,11 +37,11 @@ export class HttpIncomingHost {
     get fresh() {
         const method = this.method;
         // GET or HEAD for weak freshness validation only
-        if ('GET' !== method && 'HEAD' !== method)
+        if (method !== 'GET' && method !== 'HEAD')
             return false;
         const status = this.res?.statusCode;
         // 2xx or 304 as per rfc2616 14.26
-        if ((status >= 200 && status < 300) || 304 === status) {
+        if ((status >= 200 && status < 300) || status === 304) {
             return fresh(this.headers, {
                 etag: this.res.getHeader('ETag'),
                 'last-modified': this.res.getHeader('Last-Modified'),

package/esm/http/impl/http-outgoing.host.js

@@ -2,6 +2,7 @@
   Some parts of this file contains codes from open source express library
   https://github.com/expressjs
  */
+import { HttpStatusCode } from '@opra/common';
 import contentDisposition from 'content-disposition';
 import contentType from 'content-type';
 import cookie from 'cookie';
@@ -11,7 +12,6 @@ import mime from 'mime-types';
 import path from 'path';
 import { toString } from 'putil-varhelpers';
 import vary from 'vary';
-import { HttpStatusCode } from '@opra/common';
 const charsetRegExp = /;\s*charset\s*=/;
 export class HttpOutgoingHost {
     attachment(filename) {
@@ -160,7 +160,7 @@ export class HttpOutgoingHost {
         if (req?.fresh)
             this.statusCode = 304;
         // strip irrelevant headers
-        if (204 === this.statusCode || 304 === this.statusCode) {
+        if (this.statusCode === 204 || this.statusCode === 304) {
             this.removeHeader('Content-Type');
             this.removeHeader('Content-Length');
             this.removeHeader('Transfer-Encoding');

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

@@ -12,9 +12,7 @@ export class MultipartReader extends EventEmitter {
         this._incoming = incoming;
         const form = (this._form = formidable({
             ...options,
-            filter: (part) => {
-                return !this._cancelled && (!options?.filter || options.filter(part));
-            },
+            filter: (part) => !this._cancelled && (!options?.filter || options.filter(part)),
         }));
         form.once('error', () => {
             this._cancelled = true;
@@ -69,7 +67,7 @@ export class MultipartReader extends EventEmitter {
     }
     resume() {
         if (!this._started)
-            this._form.parse(this._incoming, () => void 0);
+            this._form.parse(this._incoming, () => undefined);
         if (this._form.req)
             this._form.resume();
     }
@@ -88,12 +86,8 @@ export class MultipartReader extends EventEmitter {
                     return resolve();
                 file._writeStream.once('close', resolve);
             })
-                .then(() => {
-                return fs.unlink(file.filepath);
-            })
-                .then(() => {
-                return 0;
-            }));
+                .then(() => fs.unlink(file.filepath))
+                .then(() => 0));
         });
         return Promise.allSettled(promises);
     }

package/esm/http/impl/node-incoming-message.host.js

@@ -1,5 +1,5 @@
-import { Duplex, Readable } from 'stream';
 import { isAsyncIterable, isIterable } from '@opra/common';
+import { Duplex, Readable } from 'stream';
 import { convertToHeaders, convertToHeadersDistinct } from '../utils/convert-to-headers.js';
 import { convertToRawHeaders } from '../utils/convert-to-raw-headers.js';
 export const CRLF = Buffer.from('\r\n');
@@ -33,10 +33,12 @@ export class NodeIncomingMessageHost extends Duplex {
                 else
                     this.body = Buffer.from(JSON.stringify(init.body), 'utf-8');
             }
-            if (init.headers)
+            if (init.headers) {
                 this.rawHeaders = Array.isArray(init.headers) ? init.headers : convertToRawHeaders(init.headers);
-            if (init.trailers)
+            }
+            if (init.trailers) {
                 this.rawTrailers = Array.isArray(init.trailers) ? init.trailers : convertToRawHeaders(init.trailers);
+            }
             this.ip = init.ip || '';
             this.ips = init.ips || (this.ip ? [this.ip] : []);
             if (this.body && !this.headers['content-length'])

package/esm/http/interfaces/node-incoming-message.interface.js

@@ -1,6 +1,6 @@
-import { Readable } from 'stream';
 import { HTTPParser } from '@browsery/http-parser';
 import { isAsyncIterable, isIterable } from '@opra/common';
+import { Readable } from 'stream';
 import { CRLF, kHttpParser, NodeIncomingMessageHost } from '../impl/node-incoming-message.host.js';
 import { concatReadable } from '../utils/concat-readable.js';
 /**
@@ -14,8 +14,9 @@ export var NodeIncomingMessage;
      * @param iterable
      */
     function from(iterable) {
-        if (typeof iterable === 'object' && !(isIterable(iterable) || isAsyncIterable(iterable)))
+        if (typeof iterable === 'object' && !(isIterable(iterable) || isAsyncIterable(iterable))) {
             return new NodeIncomingMessageHost(iterable);
+        }
         const msg = new NodeIncomingMessageHost();
         const parser = (msg[kHttpParser] = new HTTPParser(HTTPParser.REQUEST));
         let bodyChunks;

package/esm/http/utils/body-reader.js

@@ -1,3 +1,5 @@
+import typeIs from '@browsery/type-is';
+import { BadRequestError, InternalServerError, OpraHttpError } from '@opra/common';
 import { Base64Decode } from 'base64-stream';
 import byteParser from 'bytes';
 import { parse as parseContentType } from 'content-type';
@@ -5,8 +7,6 @@ import { EventEmitter } from 'events';
 import iconv from 'iconv-lite';
 import { Writable } from 'stream';
 import * as zlib from 'zlib';
-import typeIs from '@browsery/type-is';
-import { BadRequestError, InternalServerError, OpraHttpError } from '@opra/common';
 /**
  *
  * @class BodyReader
@@ -29,11 +29,12 @@ export class BodyReader extends EventEmitter {
     }
     async read() {
         /* istanbul ignore next */
-        if (this._completed)
+        if (this._completed) {
             throw new InternalServerError({
                 message: 'Stream already read',
                 code: 'STREAM_ALREADY_READ',
             });
+        }
         if (!this.req.readable) {
             throw new InternalServerError({
                 message: 'Stream is not readable',
@@ -57,8 +58,9 @@ export class BodyReader extends EventEmitter {
              * http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.3
              */
             const contentLength = parseInt(this.req.headers['content-length'] || '0', 10);
-            if (this.req.headers['transfer-encoding'] === undefined && !(contentLength && !isNaN(contentLength)))
+            if (this.req.headers['transfer-encoding'] === undefined && !(contentLength && !isNaN(contentLength))) {
                 return this.onEnd();
+            }
             // check the length and limit options.
             // note: we intentionally leave the stream paused,
             // so users should handle the stream themselves.