@opra/http 1.23.3 → 1.24.0

package/http-context.js

@@ -1,6 +1,8 @@
 import typeIs from '@browsery/type-is';
 import { InternalServerError, NotAcceptableError, } from '@opra/common';
 import { ExecutionContext, kAssetCache } from '@opra/core';
+import toml from 'toml';
+import yaml from 'yaml';
 import { MultipartReader } from './impl/multipart-reader.js';
 export class HttpContext extends ExecutionContext {
     _body;
@@ -21,12 +23,12 @@ export class HttpContext extends ExecutionContext {
                 init.__adapter.document.node,
             transport: 'http',
         });
-        if (init.__contDef)
-            this.__contDef = init.__contDef;
         if (init.__controller)
             this.__controller = init.__controller;
+        if (init.__contDef)
+            this.__contDef = Object.create(init.__contDef);
         if (init.__oprDef)
-            this.__oprDef = init.__oprDef;
+            this.__oprDef = Object.create(init.__oprDef);
         if (init.__handler)
             this.__handler = init.__handler;
         this.request = init.request;
@@ -86,14 +88,22 @@ export class HttpContext extends ExecutionContext {
             limit: __oprDef?.requestBody?.maxContentSize,
         });
         if (this._body != null) {
-            // Convert Buffer to string if media is text
+            const encoding = request.characterEncoding();
+            if (encoding)
+                this._body = this._body.toString(encoding);
             if (Buffer.isBuffer(this._body) &&
-                request.is(['json', 'xml', 'txt', 'text'])) {
+                request.is(['json', 'xml', 'txt', 'text', 'yaml', 'toml'])) {
                 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);
+            // Transform text to Object if media is YAML
+            if (typeof this._body === 'string' && request.is(['yaml']))
+                this._body = yaml.parse(this._body);
+            // Transform text to Object if media is YAML
+            if (typeof this._body === 'string' && request.is(['toml']))
+                this._body = toml.parse(this._body);
         }
         if (mediaType) {
             // Decode/Validate the data object according to data model

package/http-handler.js

@@ -279,9 +279,17 @@ export class HttpHandler {
             let mediaType;
             let contentType = request.header('content-type');
             if (contentType) {
-                contentType = parseContentType(contentType).type;
+                const ct = parseContentType(contentType);
+                contentType = ct.type;
                 mediaType = __oprDef.requestBody.content.find(mc => mc.contentType &&
                     typeIs.is(contentType, Array.isArray(mc.contentType) ? mc.contentType : [mc.contentType]));
+                if (mediaType)
+                    mediaType = Object.create(mediaType);
+                if (ct && mediaType) {
+                    mediaType.contentType = contentType;
+                    mediaType.contentEncoding =
+                        ct.parameters?.['charset'] || mediaType.contentEncoding;
+                }
             }
             if (!mediaType) {
                 const contentTypes = __oprDef.requestBody.content

package/impl/http-incoming.host.d.ts

@@ -16,6 +16,7 @@ export declare class HttpIncomingHost implements HttpIncoming {
     acceptsCharsets(...charsets: any): any;
     acceptsEncodings(...encoding: any): any;
     acceptsLanguages(...lang: any): any;
+    characterEncoding(): string | undefined;
     is(type: string | string[], ...otherTypes: string[]): string | false | null;
     range(size: number, options: any): parseRange.Ranges | parseRange.Result | undefined;
     readBody(options: BodyReader.Options): Promise<string | Buffer | undefined>;

package/impl/http-incoming.host.js

@@ -7,6 +7,7 @@ import accepts from 'accepts';
 import fresh from 'fresh';
 import parseRange from 'range-parser';
 import { BodyReader } from '../utils/body-reader.js';
+const ENCODING_PATTERN = /encoding=([^;]+)/;
 export class HttpIncomingHost {
     body;
     get protocol() {
@@ -87,6 +88,10 @@ export class HttpIncomingHost {
         // eslint-disable-next-line prefer-spread
         return accept.languages.apply(accept, lang);
     }
+    characterEncoding() {
+        const contentType = this.header('content-type');
+        return contentType ? ENCODING_PATTERN.exec(contentType)?.[1] : undefined;
+    }
     is(type, ...otherTypes) {
         const types = Array.isArray(type) ? type : [type];
         if (otherTypes.length)

package/interfaces/http-incoming.interface.d.ts

@@ -152,6 +152,7 @@ export interface HttpIncoming extends NodeIncomingMessage {
     acceptsLanguages(lang: string): string | false;
     acceptsLanguages(lang: string[]): string | false;
     acceptsLanguages(...lang: string[]): string | false;
+    characterEncoding(): string | undefined;
     /**
      * Check if the incoming request contains the "Content-Type"
      * header field, and it contains the give mime `type`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/http",
-  "version": "1.23.3",
+  "version": "1.24.0",
   "description": "Opra Http Server Adapter",
   "author": "Panates",
   "license": "MIT",
@@ -8,7 +8,7 @@
     "@browsery/antlr4": "^4.13.3-r4",
     "@browsery/http-parser": "^0.5.10-r2",
     "@browsery/type-is": "^2.0.1",
-    "@jsopen/objects": "^2.1.1",
+    "@jsopen/objects": "^2.2.0",
     "accepts": "^1.3.8",
     "base64-stream": "^1.0.0",
     "busboy": "^1.6.0",
@@ -18,7 +18,7 @@
     "cookie": "^1.1.1",
     "cookie-signature": "^1.2.2",
     "encodeurl": "^2.0.0",
-    "expect": "^30.2.0",
+    "expect": "^30.3.0",
     "fast-tokenizer": "^1.9.0",
     "fresh": "^0.5.2",
     "iconv-lite": "^0.7.2",
@@ -30,13 +30,15 @@
     "raw-body": "^3.0.2",
     "reflect-metadata": "^0.2.2",
     "super-fast-md5": "^1.0.3",
+    "toml": "^3.0.0",
     "tslib": "^2.8.1",
     "valgen": "^5.19.5",
-    "vary": "^1.1.2"
+    "vary": "^1.1.2",
+    "yaml": "^2.8.2"
   },
   "peerDependencies": {
-    "@opra/common": "^1.23.3",
-    "@opra/core": "^1.23.3"
+    "@opra/common": "^1.24.0",
+    "@opra/core": "^1.24.0"
   },
   "optionalDependencies": {
     "express": "^4.0.0 || ^5.0.0",