@oino-ts/common 0.17.2 → 0.17.4

package/dist/cjs/OINOHeaders.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OINOHeaders = void 0;
+/**
+ * Type for HTTP style headers that just guarantees keys are normalized to lowercase.
+ *
+ */
+class OINOHeaders {
+    constructor(init) {
+        this.setHeaders(init ?? {});
+    }
+    get(key) {
+        return this[key.toLowerCase()];
+    }
+    set(key, value) {
+        this[key.toLowerCase()] = value;
+    }
+    setHeaders(init) {
+        if (init instanceof OINOHeaders) {
+            for (const key of Object.keys(init)) {
+                this.set(key, init.get(key));
+            }
+        }
+        else if (init instanceof Map) {
+            for (const [key, value] of init.entries()) {
+                this.set(key, value);
+            }
+        }
+        else if (Array.isArray(init)) {
+            for (const [key, value] of init) {
+                this.set(key, value);
+            }
+        }
+        else if (init && typeof init === "object") {
+            for (const key in init) {
+                this.set(key, init[key]);
+            }
+        }
+    }
+    clear() {
+        for (const key of Object.keys(this)) {
+            delete this[key];
+        }
+    }
+}
+exports.OINOHeaders = OINOHeaders;

package/dist/cjs/OINORequest.js

@@ -6,8 +6,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OINOHttpRequest = exports.OINORequest = void 0;
+const node_buffer_1 = require("node:buffer");
 const _1 = require(".");
-const index_js_1 = require("./index.js");
 /**
  * OINO API request result object with returned data and/or http status code/message and
  * error / warning messages.
@@ -25,14 +25,6 @@ class OINORequest {
     constructor(init) {
         this.params = init?.params ?? {};
     }
-    /**
-     * Copy values from different result.
-     *
-     * @param request source value
-     */
-    copy(request) {
-        this.params = { ...request.params };
-    }
 }
 exports.OINORequest = OINORequest;
 /**
@@ -58,7 +50,7 @@ class OINOHttpRequest extends OINORequest {
         super(init);
         this.url = init.url;
         this.method = init.method ?? "GET";
-        this.headers = init.headers ?? {};
+        this.headers = new _1.OINOHeaders(init.headers);
         this.data = init.data ?? "";
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
@@ -69,7 +61,7 @@ class OINOHttpRequest extends OINORequest {
             this.requestType = init.requestType;
         }
         else {
-            const request_type_param = this.url?.searchParams.get(index_js_1.OINO_REQUEST_TYPE_PARAM) || this.headers["content-type"]; // content-type header can be overridden by query parameter
+            const request_type_param = this.url?.searchParams.get(_1.OINO_REQUEST_TYPE_PARAM) || this.headers.get("content-type"); // content-type header can be overridden by query parameter
             if (request_type_param == _1.OINOContentType.csv) {
                 this.requestType = _1.OINOContentType.csv;
             }
@@ -90,7 +82,7 @@ class OINOHttpRequest extends OINORequest {
             this.responseType = init.responseType;
         }
         else {
-            const response_type_param = this.url?.searchParams.get(index_js_1.OINO_RESPONSE_TYPE_PARAM) || this.headers["accept"]; // accept header can be overridden by query parameter
+            const response_type_param = this.url?.searchParams.get(_1.OINO_RESPONSE_TYPE_PARAM) || this.headers.get("accept"); // accept header can be overridden by query parameter
             const accept_types = response_type_param?.split(', ') || [];
             let response_type = undefined;
             for (let i = 0; i < accept_types.length; i++) {
@@ -101,23 +93,57 @@ class OINOHttpRequest extends OINORequest {
             }
             this.responseType = response_type ?? _1.OINOContentType.json;
         }
-        const last_modified = this.headers["if-modified-since"];
+        const last_modified = this.headers.get("if-modified-since");
         if (last_modified) {
             this.lastModified = new Date(last_modified).getTime();
         }
-        const etags = this.headers["if-none-match"]?.split(',').map(e => e.trim());
+        const etags = this.headers.get("if-none-match")?.split(',').map(e => e.trim());
         if (etags) {
             this.etags = etags;
         }
     }
-    static async fromRequest(request) {
+    static async fromFetchRequest(request) {
         const body = await request.arrayBuffer();
         return new OINOHttpRequest({
             url: new URL(request.url),
             method: request.method,
             headers: Object.fromEntries(request.headers),
-            data: Buffer.from(body),
+            data: node_buffer_1.Buffer.from(body),
         });
     }
+    dataAsText() {
+        if (this.data instanceof Uint8Array) {
+            return new TextDecoder().decode(this.data);
+        }
+        else if (this.data instanceof Object) {
+            return JSON.stringify(this.data);
+        }
+        else {
+            return this.data?.toString() || "";
+        }
+    }
+    dataAsParsedJson() {
+        return this.data ? JSON.parse(this.dataAsText()) : {};
+    }
+    dataAsFormData() {
+        return new URLSearchParams(this.dataAsText() || "");
+    }
+    dataAsBuffer() {
+        if (this.data === null) {
+            return node_buffer_1.Buffer.alloc(0);
+        }
+        else if (this.data instanceof node_buffer_1.Buffer) {
+            return this.data;
+        }
+        else if (this.data instanceof Uint8Array) {
+            return node_buffer_1.Buffer.from(this.data);
+        }
+        else if (this.data instanceof Object) {
+            return node_buffer_1.Buffer.from(JSON.stringify(this.data), "utf-8");
+        }
+        else {
+            return node_buffer_1.Buffer.from(this.data, "utf-8");
+        }
+    }
 }
 exports.OINOHttpRequest = OINOHttpRequest;

package/dist/cjs/OINOResult.js

@@ -133,19 +133,19 @@ class OINOResult {
         for (let i = 0; i < this.messages.length; i++) {
             const message = this.messages[i].replaceAll("\r", " ").replaceAll("\n", " ");
             if (copyErrors && message.startsWith(_1.OINO_ERROR_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-' + j, message);
+                headers.set('X-OINO-MESSAGE-' + j, message);
                 j++;
             }
             if (copyWarnings && message.startsWith(_1.OINO_WARNING_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-' + j, message);
+                headers.set('X-OINO-MESSAGE-' + j, message);
                 j++;
             }
             if (copyInfos && message.startsWith(_1.OINO_INFO_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-' + j, message);
+                headers.set('X-OINO-MESSAGE-' + j, message);
                 j++;
             }
             if (copyDebug && message.startsWith(_1.OINO_DEBUG_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-' + j, message);
+                headers.set('X-OINO-MESSAGE-' + j, message);
                 j++;
             }
         }
@@ -166,6 +166,8 @@ class OINOHttpResult extends OINOResult {
     _etag;
     /** HTTP body data */
     body;
+    /** HTTP headers */
+    headers;
     /** HTTP cache expiration value
      * Note: default 0 means no expiration and 'Pragma: no-cache' is set.
     */
@@ -181,6 +183,7 @@ class OINOHttpResult extends OINOResult {
     constructor(init) {
         super(init);
         this.body = init?.body ?? "";
+        this.headers = new _1.OINOHeaders(init?.headers);
         this.expires = init?.expires ?? 0;
         this.lastModified = init?.lastModified ?? 0;
         this._etag = "";
@@ -201,14 +204,18 @@ class OINOHttpResult extends OINOResult {
      *
      * @param headers HTTP headers (overrides existing values)
      */
-    getHttpResponse(headers) {
-        const result = new Response(this.body, { status: this.status, statusText: this.statusText, headers: headers });
+    getFetchResponse(headers) {
+        const merged_headers = new _1.OINOHeaders(this.headers);
+        if (headers) {
+            merged_headers.setHeaders(headers);
+        }
+        const result = new Response(this.body, { status: this.status, statusText: this.statusText, headers: merged_headers });
         result.headers.set('Content-Length', this.body.length.toString());
-        if (this.lastModified > 0) {
+        if (merged_headers['Last-Modified'] === undefined && this.lastModified > 0) {
             result.headers.set('Last-Modified', new Date(this.lastModified).toUTCString());
         }
-        if (this.expires >= 0) {
-            result.headers.set('Expires', Math.round(this.expires).toString());
+        if (merged_headers['Expires'] === undefined && this.expires >= 0) {
+            result.headers.set('Expires', new Date(Date.now() + Math.round(this.expires)).toUTCString());
             if (this.expires == 0) {
                 result.headers.set('Pragma', 'no-cache');
             }

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OINOContentType = exports.OINO_RESPONSE_TYPE_PARAM = exports.OINO_REQUEST_TYPE_PARAM = exports.OINO_DEBUG_PREFIX = exports.OINO_INFO_PREFIX = exports.OINO_WARNING_PREFIX = exports.OINO_ERROR_PREFIX = exports.OINO_EMPTY_FORMATTER = exports.OINOFormatter = exports.OINOHtmlTemplate = exports.OINOStr = exports.OINOHttpRequest = exports.OINORequest = exports.OINOHttpResult = exports.OINOResult = exports.OINOConsoleLog = exports.OINOLogLevel = exports.OINOLog = exports.OINOMemoryBenchmark = exports.OINOBenchmark = void 0;
+exports.OINOContentType = exports.OINO_RESPONSE_TYPE_PARAM = exports.OINO_REQUEST_TYPE_PARAM = exports.OINO_DEBUG_PREFIX = exports.OINO_INFO_PREFIX = exports.OINO_WARNING_PREFIX = exports.OINO_ERROR_PREFIX = exports.OINOHeaders = exports.OINO_EMPTY_FORMATTER = exports.OINOFormatter = exports.OINOHtmlTemplate = exports.OINOStr = exports.OINOHttpRequest = exports.OINORequest = exports.OINOHttpResult = exports.OINOResult = exports.OINOConsoleLog = exports.OINOLogLevel = exports.OINOLog = exports.OINOMemoryBenchmark = exports.OINOBenchmark = void 0;
 var OINOBenchmark_js_1 = require("./OINOBenchmark.js");
 Object.defineProperty(exports, "OINOBenchmark", { enumerable: true, get: function () { return OINOBenchmark_js_1.OINOBenchmark; } });
 Object.defineProperty(exports, "OINOMemoryBenchmark", { enumerable: true, get: function () { return OINOBenchmark_js_1.OINOMemoryBenchmark; } });
@@ -21,6 +21,8 @@ Object.defineProperty(exports, "OINOHtmlTemplate", { enumerable: true, get: func
 var OINOFormatter_js_1 = require("./OINOFormatter.js");
 Object.defineProperty(exports, "OINOFormatter", { enumerable: true, get: function () { return OINOFormatter_js_1.OINOFormatter; } });
 Object.defineProperty(exports, "OINO_EMPTY_FORMATTER", { enumerable: true, get: function () { return OINOFormatter_js_1.OINO_EMPTY_FORMATTER; } });
+var OINOHeaders_js_1 = require("./OINOHeaders.js");
+Object.defineProperty(exports, "OINOHeaders", { enumerable: true, get: function () { return OINOHeaders_js_1.OINOHeaders; } });
 /** OINO error message prefix */
 exports.OINO_ERROR_PREFIX = "OINO ERROR";
 /** OINO warning message prefix */

package/dist/esm/OINOHeaders.js

@@ -0,0 +1,42 @@
+/**
+ * Type for HTTP style headers that just guarantees keys are normalized to lowercase.
+ *
+ */
+export class OINOHeaders {
+    constructor(init) {
+        this.setHeaders(init ?? {});
+    }
+    get(key) {
+        return this[key.toLowerCase()];
+    }
+    set(key, value) {
+        this[key.toLowerCase()] = value;
+    }
+    setHeaders(init) {
+        if (init instanceof OINOHeaders) {
+            for (const key of Object.keys(init)) {
+                this.set(key, init.get(key));
+            }
+        }
+        else if (init instanceof Map) {
+            for (const [key, value] of init.entries()) {
+                this.set(key, value);
+            }
+        }
+        else if (Array.isArray(init)) {
+            for (const [key, value] of init) {
+                this.set(key, value);
+            }
+        }
+        else if (init && typeof init === "object") {
+            for (const key in init) {
+                this.set(key, init[key]);
+            }
+        }
+    }
+    clear() {
+        for (const key of Object.keys(this)) {
+            delete this[key];
+        }
+    }
+}

package/dist/esm/OINORequest.js

@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
-import { OINOContentType } from ".";
-import { OINO_REQUEST_TYPE_PARAM, OINO_RESPONSE_TYPE_PARAM } from "./index.js";
+import { Buffer } from "node:buffer";
+import { OINOContentType, OINO_REQUEST_TYPE_PARAM, OINO_RESPONSE_TYPE_PARAM, OINOHeaders } from ".";
 /**
  * OINO API request result object with returned data and/or http status code/message and
  * error / warning messages.
@@ -22,14 +22,6 @@ export class OINORequest {
     constructor(init) {
         this.params = init?.params ?? {};
     }
-    /**
-     * Copy values from different result.
-     *
-     * @param request source value
-     */
-    copy(request) {
-        this.params = { ...request.params };
-    }
 }
 /**
  * Specialized result for HTTP responses.
@@ -54,7 +46,7 @@ export class OINOHttpRequest extends OINORequest {
         super(init);
         this.url = init.url;
         this.method = init.method ?? "GET";
-        this.headers = init.headers ?? {};
+        this.headers = new OINOHeaders(init.headers);
         this.data = init.data ?? "";
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
@@ -65,7 +57,7 @@ export class OINOHttpRequest extends OINORequest {
             this.requestType = init.requestType;
         }
         else {
-            const request_type_param = this.url?.searchParams.get(OINO_REQUEST_TYPE_PARAM) || this.headers["content-type"]; // content-type header can be overridden by query parameter
+            const request_type_param = this.url?.searchParams.get(OINO_REQUEST_TYPE_PARAM) || this.headers.get("content-type"); // content-type header can be overridden by query parameter
             if (request_type_param == OINOContentType.csv) {
                 this.requestType = OINOContentType.csv;
             }
@@ -86,7 +78,7 @@ export class OINOHttpRequest extends OINORequest {
             this.responseType = init.responseType;
         }
         else {
-            const response_type_param = this.url?.searchParams.get(OINO_RESPONSE_TYPE_PARAM) || this.headers["accept"]; // accept header can be overridden by query parameter
+            const response_type_param = this.url?.searchParams.get(OINO_RESPONSE_TYPE_PARAM) || this.headers.get("accept"); // accept header can be overridden by query parameter
             const accept_types = response_type_param?.split(', ') || [];
             let response_type = undefined;
             for (let i = 0; i < accept_types.length; i++) {
@@ -97,16 +89,16 @@ export class OINOHttpRequest extends OINORequest {
             }
             this.responseType = response_type ?? OINOContentType.json;
         }
-        const last_modified = this.headers["if-modified-since"];
+        const last_modified = this.headers.get("if-modified-since");
         if (last_modified) {
             this.lastModified = new Date(last_modified).getTime();
         }
-        const etags = this.headers["if-none-match"]?.split(',').map(e => e.trim());
+        const etags = this.headers.get("if-none-match")?.split(',').map(e => e.trim());
         if (etags) {
             this.etags = etags;
         }
     }
-    static async fromRequest(request) {
+    static async fromFetchRequest(request) {
         const body = await request.arrayBuffer();
         return new OINOHttpRequest({
             url: new URL(request.url),
@@ -115,4 +107,38 @@ export class OINOHttpRequest extends OINORequest {
             data: Buffer.from(body),
         });
     }
+    dataAsText() {
+        if (this.data instanceof Uint8Array) {
+            return new TextDecoder().decode(this.data);
+        }
+        else if (this.data instanceof Object) {
+            return JSON.stringify(this.data);
+        }
+        else {
+            return this.data?.toString() || "";
+        }
+    }
+    dataAsParsedJson() {
+        return this.data ? JSON.parse(this.dataAsText()) : {};
+    }
+    dataAsFormData() {
+        return new URLSearchParams(this.dataAsText() || "");
+    }
+    dataAsBuffer() {
+        if (this.data === null) {
+            return Buffer.alloc(0);
+        }
+        else if (this.data instanceof Buffer) {
+            return this.data;
+        }
+        else if (this.data instanceof Uint8Array) {
+            return Buffer.from(this.data);
+        }
+        else if (this.data instanceof Object) {
+            return Buffer.from(JSON.stringify(this.data), "utf-8");
+        }
+        else {
+            return Buffer.from(this.data, "utf-8");
+        }
+    }
 }

package/dist/esm/OINOResult.js

@@ -4,7 +4,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 import { createHash } from "node:crypto";
-import { OINO_DEBUG_PREFIX, OINO_ERROR_PREFIX, OINO_INFO_PREFIX, OINO_WARNING_PREFIX } from ".";
+import { OINO_DEBUG_PREFIX, OINO_ERROR_PREFIX, OINO_INFO_PREFIX, OINO_WARNING_PREFIX, OINOHeaders } from ".";
 /**
  * OINO API request result object with returned data and/or http status code/message and
  * error / warning messages.
@@ -130,19 +130,19 @@ export class OINOResult {
         for (let i = 0; i < this.messages.length; i++) {
             const message = this.messages[i].replaceAll("\r", " ").replaceAll("\n", " ");
             if (copyErrors && message.startsWith(OINO_ERROR_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-' + j, message);
+                headers.set('X-OINO-MESSAGE-' + j, message);
                 j++;
             }
             if (copyWarnings && message.startsWith(OINO_WARNING_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-' + j, message);
+                headers.set('X-OINO-MESSAGE-' + j, message);
                 j++;
             }
             if (copyInfos && message.startsWith(OINO_INFO_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-' + j, message);
+                headers.set('X-OINO-MESSAGE-' + j, message);
                 j++;
             }
             if (copyDebug && message.startsWith(OINO_DEBUG_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-' + j, message);
+                headers.set('X-OINO-MESSAGE-' + j, message);
                 j++;
             }
         }
@@ -162,6 +162,8 @@ export class OINOHttpResult extends OINOResult {
     _etag;
     /** HTTP body data */
     body;
+    /** HTTP headers */
+    headers;
     /** HTTP cache expiration value
      * Note: default 0 means no expiration and 'Pragma: no-cache' is set.
     */
@@ -177,6 +179,7 @@ export class OINOHttpResult extends OINOResult {
     constructor(init) {
         super(init);
         this.body = init?.body ?? "";
+        this.headers = new OINOHeaders(init?.headers);
         this.expires = init?.expires ?? 0;
         this.lastModified = init?.lastModified ?? 0;
         this._etag = "";
@@ -197,14 +200,18 @@ export class OINOHttpResult extends OINOResult {
      *
      * @param headers HTTP headers (overrides existing values)
      */
-    getHttpResponse(headers) {
-        const result = new Response(this.body, { status: this.status, statusText: this.statusText, headers: headers });
+    getFetchResponse(headers) {
+        const merged_headers = new OINOHeaders(this.headers);
+        if (headers) {
+            merged_headers.setHeaders(headers);
+        }
+        const result = new Response(this.body, { status: this.status, statusText: this.statusText, headers: merged_headers });
         result.headers.set('Content-Length', this.body.length.toString());
-        if (this.lastModified > 0) {
+        if (merged_headers['Last-Modified'] === undefined && this.lastModified > 0) {
             result.headers.set('Last-Modified', new Date(this.lastModified).toUTCString());
         }
-        if (this.expires >= 0) {
-            result.headers.set('Expires', Math.round(this.expires).toString());
+        if (merged_headers['Expires'] === undefined && this.expires >= 0) {
+            result.headers.set('Expires', new Date(Date.now() + Math.round(this.expires)).toUTCString());
             if (this.expires == 0) {
                 result.headers.set('Pragma', 'no-cache');
             }

package/dist/esm/index.js

@@ -5,6 +5,7 @@ export { OINORequest, OINOHttpRequest } from "./OINORequest.js";
 export { OINOStr } from "./OINOStr.js";
 export { OINOHtmlTemplate } from "./OINOHtmlTemplate.js";
 export { OINOFormatter, OINO_EMPTY_FORMATTER } from "./OINOFormatter.js";
+export { OINOHeaders } from "./OINOHeaders.js";
 /** OINO error message prefix */
 export const OINO_ERROR_PREFIX = "OINO ERROR";
 /** OINO warning message prefix */

package/dist/types/OINOHeaders.d.ts

@@ -0,0 +1,13 @@
+export type OINOHeadersInit = OINOHeaders | Record<string, string> | [string, string][] | Map<string, string>;
+/**
+ * Type for HTTP style headers that just guarantees keys are normalized to lowercase.
+ *
+ */
+export declare class OINOHeaders {
+    [key: string]: any;
+    constructor(init?: OINOHeadersInit);
+    get(key: string): string | undefined;
+    set(key: string, value: string): void;
+    setHeaders(init?: OINOHeadersInit): void;
+    clear(): void;
+}

package/dist/types/OINORequest.d.ts

@@ -1,4 +1,5 @@
-import { OINOContentType } from ".";
+import { Buffer } from "node:buffer";
+import { OINOContentType, OINOHeaders, OINOHeadersInit } from ".";
 export interface OINORequestInit {
     params?: Record<string, string>;
 }
@@ -17,17 +18,11 @@ export declare class OINORequest {
      *
      */
     constructor(init?: OINORequestInit);
-    /**
-     * Copy values from different result.
-     *
-     * @param request source value
-     */
-    copy(request: OINORequest): void;
 }
 export interface OINOHttpRequestInit extends OINORequestInit {
     url?: URL;
     method?: string;
-    headers?: Record<string, string>;
+    headers?: OINOHeadersInit;
     data?: string | Buffer | Uint8Array | object | null;
     requestType?: OINOContentType;
     responseType?: OINOContentType;
@@ -40,7 +35,7 @@ export interface OINOHttpRequestInit extends OINORequestInit {
 export declare class OINOHttpRequest extends OINORequest {
     readonly url?: URL;
     readonly method: string;
-    readonly headers: Record<string, string>;
+    readonly headers: OINOHeaders;
     readonly data: string | Buffer | Uint8Array | object | null;
     readonly requestType: OINOContentType;
     readonly responseType: OINOContentType;
@@ -54,5 +49,9 @@ export declare class OINOHttpRequest extends OINORequest {
      *
      */
     constructor(init: OINOHttpRequestInit);
-    static fromRequest(request: Request): Promise<OINOHttpRequest>;
+    static fromFetchRequest(request: Request): Promise<OINOHttpRequest>;
+    dataAsText(): string;
+    dataAsParsedJson(): any;
+    dataAsFormData(): URLSearchParams;
+    dataAsBuffer(): Buffer;
 }

package/dist/types/OINOResult.d.ts

@@ -1,3 +1,4 @@
+import { OINOHeaders, OINOHeadersInit } from ".";
 export interface OINOResultInit {
     success?: boolean;
     status?: number;
@@ -79,7 +80,7 @@ export declare class OINOResult {
      * @param copyDebug wether debug messages should be copied (default false)
      *
      */
-    copyMessagesToHeaders(headers: Headers, copyErrors?: boolean, copyWarnings?: boolean, copyInfos?: boolean, copyDebug?: boolean): void;
+    copyMessagesToHeaders(headers: OINOHeaders, copyErrors?: boolean, copyWarnings?: boolean, copyInfos?: boolean, copyDebug?: boolean): void;
     /**
      * Print result for logging.
      *
@@ -88,6 +89,7 @@ export declare class OINOResult {
 }
 export interface OINOHttpResultInit extends OINOResultInit {
     body?: string;
+    headers?: OINOHeadersInit;
     expires?: number;
     lastModified?: number;
 }
@@ -98,6 +100,8 @@ export declare class OINOHttpResult extends OINOResult {
     private _etag;
     /** HTTP body data */
     readonly body: string;
+    /** HTTP headers */
+    readonly headers: OINOHeaders;
     /** HTTP cache expiration value
      * Note: default 0 means no expiration and 'Pragma: no-cache' is set.
     */
@@ -121,5 +125,5 @@ export declare class OINOHttpResult extends OINOResult {
      *
      * @param headers HTTP headers (overrides existing values)
      */
-    getHttpResponse(headers?: Record<string, string>): Response;
+    getFetchResponse(headers?: OINOHeadersInit): Response;
 }

package/dist/types/index.d.ts

@@ -5,6 +5,7 @@ export { OINORequest, OINOHttpRequest, type OINORequestInit, type OINOHttpReques
 export { OINOStr } from "./OINOStr.js";
 export { OINOHtmlTemplate } from "./OINOHtmlTemplate.js";
 export { OINOFormatter, OINO_EMPTY_FORMATTER } from "./OINOFormatter.js";
+export { OINOHeaders, type OINOHeadersInit } from "./OINOHeaders.js";
 /** OINO error message prefix */
 export declare const OINO_ERROR_PREFIX = "OINO ERROR";
 /** OINO warning message prefix */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/common",
-  "version": "0.17.2",
+  "version": "0.17.4",
   "description": "OINO TS package for common classes.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,7 +19,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@oino-ts/types": "0.17.2",
+    "@oino-ts/types": "0.17.4",
     "@types/node": "^22.0.0",
     "typescript": "~5.9.0"
   },

package/src/OINOHeaders.ts

@@ -0,0 +1,51 @@
+export type OINOHeadersInit = OINOHeaders | Record<string, string> | [string, string][] | Map<string, string>;
+
+/**
+ * Type for HTTP style headers that just guarantees keys are normalized to lowercase.
+ *
+ */
+
+export class OINOHeaders  {
+    [key: string]: any
+
+    constructor(init?: OINOHeadersInit) {
+        this.setHeaders(init ?? {})
+    }
+
+    get(key: string): string | undefined {
+        return this[key.toLowerCase()]
+    }
+
+    set(key: string, value: string): void {
+        this[key.toLowerCase()] = value
+    }   
+
+    setHeaders(init?: OINOHeadersInit): void {
+        if (init instanceof OINOHeaders) {
+            for (const key of Object.keys(init)) {    
+                this.set(key, init.get(key)!)
+            }
+
+        } else if (init instanceof Map) {
+            for (const [key, value] of init.entries()) {    
+                this.set(key, value)
+            }
+
+        } else if (Array.isArray(init)) {
+            for (const [key, value] of init) {
+                this.set(key, value)
+            }
+            
+        } else if (init && typeof init === "object") {
+            for (const key in init as Record<string, string>) {
+                this.set(key, init[key])
+            }
+        }
+    }
+
+    clear(): void {
+        for (const key of Object.keys(this)) {
+            delete this[key]
+        }
+    }
+}

package/src/OINORequest.ts

@@ -4,8 +4,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-import { OINOContentType } from "."
-import { OINO_REQUEST_TYPE_PARAM, OINO_RESPONSE_TYPE_PARAM } from "./index.js"
+import { Buffer } from "node:buffer"
+
+import { OINOContentType, OINO_REQUEST_TYPE_PARAM, OINO_RESPONSE_TYPE_PARAM, OINOHeaders, OINOHeadersInit } from "."
 
 export interface OINORequestInit {
     params?: Record<string, string>
@@ -29,21 +30,12 @@ export class OINORequest {
     constructor (init?: OINORequestInit) {
         this.params = init?.params ?? {}
     }
-
-    /**
-     * Copy values from different result.
-     * 
-     * @param request source value
-     */
-    copy(request: OINORequest) {
-        this.params = {...request.params}
-    }
 }
 
 export interface OINOHttpRequestInit extends OINORequestInit {
     url?: URL
     method?: string
-    headers?: Record<string, string>
+    headers?: OINOHeadersInit
     data?: string|Buffer|Uint8Array|object|null
     requestType?:OINOContentType
     responseType?:OINOContentType
@@ -57,7 +49,7 @@ export interface OINOHttpRequestInit extends OINORequestInit {
 export class OINOHttpRequest extends OINORequest {
     readonly url?: URL
     readonly method: string
-    readonly headers: Record<string, string>
+    readonly headers: OINOHeaders
     readonly data: string|Buffer|Uint8Array|object|null
     readonly requestType:OINOContentType
     readonly responseType:OINOContentType
@@ -75,7 +67,7 @@ export class OINOHttpRequest extends OINORequest {
         super(init)
         this.url = init.url 
         this.method = init.method ?? "GET"
-        this.headers = init.headers ?? {}
+        this.headers = new OINOHeaders(init.headers)
         this.data = init.data ?? ""
         this.multipartBoundary = ""
         this.lastModified = init.lastModified
@@ -86,7 +78,7 @@ export class OINOHttpRequest extends OINORequest {
         if (init.requestType) {
             this.requestType = init.requestType
         } else {
-            const request_type_param = this.url?.searchParams.get(OINO_REQUEST_TYPE_PARAM) || this.headers["content-type"] // content-type header can be overridden by query parameter
+            const request_type_param = this.url?.searchParams.get(OINO_REQUEST_TYPE_PARAM) || this.headers.get("content-type") // content-type header can be overridden by query parameter
             if (request_type_param == OINOContentType.csv) {
                 this.requestType = OINOContentType.csv
 
@@ -105,7 +97,7 @@ export class OINOHttpRequest extends OINORequest {
         if (init.responseType) {
             this.responseType = init.responseType
         } else {
-            const response_type_param = this.url?.searchParams.get(OINO_RESPONSE_TYPE_PARAM) || this.headers["accept"] // accept header can be overridden by query parameter
+            const response_type_param = this.url?.searchParams.get(OINO_RESPONSE_TYPE_PARAM) || this.headers.get("accept") // accept header can be overridden by query parameter
             const accept_types = response_type_param?.split(', ') || []
             let response_type:OINOContentType|undefined = undefined
             for (let i=0; i<accept_types.length; i++) {
@@ -116,17 +108,17 @@ export class OINOHttpRequest extends OINORequest {
             }
             this.responseType = response_type ?? OINOContentType.json
         }
-        const last_modified = this.headers["if-modified-since"]
+        const last_modified = this.headers.get("if-modified-since")
         if (last_modified) {
             this.lastModified =  new Date(last_modified).getTime()
         }
-        const etags = this.headers["if-none-match"]?.split(',').map(e => e.trim())
+        const etags = this.headers.get("if-none-match")?.split(',').map(e => e.trim())
         if (etags) {
             this.etags = etags
         }
     }
 
-    static async fromRequest(request: Request): Promise<OINOHttpRequest> {
+    static async fromFetchRequest(request: Request): Promise<OINOHttpRequest> {
         const body = await request.arrayBuffer()
         return new OINOHttpRequest({
             url: new URL(request.url),
@@ -136,4 +128,42 @@ export class OINOHttpRequest extends OINORequest {
         })
     }
 
+    dataAsText(): string {
+        if (this.data instanceof Uint8Array) {
+            return new TextDecoder().decode(this.data)
+
+        } else if (this.data instanceof Object) {
+            return JSON.stringify(this.data)
+            
+        } else {
+            return this.data?.toString() || ""
+        }
+    }
+
+    dataAsParsedJson(): any {
+        return this.data ? JSON.parse(this.dataAsText()) : {}
+    }
+
+    dataAsFormData(): URLSearchParams {
+        return new URLSearchParams(this.dataAsText() || "")
+    }
+
+    dataAsBuffer(): Buffer {
+        if (this.data === null) {
+            return Buffer.alloc(0)
+
+        } else if (this.data instanceof Buffer) {
+            return this.data
+
+        } else if (this.data instanceof Uint8Array) {
+            return Buffer.from(this.data)
+
+        } else if (this.data instanceof Object) {
+            return Buffer.from(JSON.stringify(this.data), "utf-8")
+
+        } else {
+            return Buffer.from(this.data, "utf-8")
+        }
+    }
+
 }

package/src/OINOResult.ts

@@ -5,7 +5,7 @@
  */
 
 import { createHash, Hash } from "node:crypto";
-import { OINO_DEBUG_PREFIX, OINO_ERROR_PREFIX, OINO_INFO_PREFIX, OINO_WARNING_PREFIX } from ".";
+import { OINO_DEBUG_PREFIX, OINO_ERROR_PREFIX, OINO_INFO_PREFIX, OINO_WARNING_PREFIX, OINOHeaders, OINOHeadersInit } from ".";
 
 export interface OINOResultInit {
     success?: boolean
@@ -144,24 +144,24 @@ export class OINOResult {
      * @param copyDebug wether debug messages should be copied (default false)
      *
      */
-    copyMessagesToHeaders(headers:Headers, copyErrors:boolean = true, copyWarnings:boolean = false, copyInfos:boolean = false, copyDebug:boolean = false) {
+    copyMessagesToHeaders(headers:OINOHeaders, copyErrors:boolean = true, copyWarnings:boolean = false, copyInfos:boolean = false, copyDebug:boolean = false) {
         let j=1
         for(let i=0; i<this.messages.length; i++) {
             const message = this.messages[i].replaceAll("\r", " ").replaceAll("\n", " ")
             if (copyErrors && message.startsWith(OINO_ERROR_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-'+j, message)
+                headers.set('X-OINO-MESSAGE-'+j, message)
                 j++
             } 
             if (copyWarnings && message.startsWith(OINO_WARNING_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-'+j, message)
+                headers.set('X-OINO-MESSAGE-'+j, message)
                 j++
             } 
             if (copyInfos && message.startsWith(OINO_INFO_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-'+j, message)
+                headers.set('X-OINO-MESSAGE-'+j, message)
                 j++
             } 
             if (copyDebug && message.startsWith(OINO_DEBUG_PREFIX)) {
-                headers.append('X-OINO-MESSAGE-'+j, message)
+                headers.set('X-OINO-MESSAGE-'+j, message)
                 j++
             } 
         }
@@ -178,6 +178,7 @@ export class OINOResult {
 
 export interface OINOHttpResultInit extends OINOResultInit {
     body?: string
+    headers?: OINOHeadersInit
     expires?: number
     lastModified?: number
 }
@@ -190,6 +191,9 @@ export class OINOHttpResult extends OINOResult {
 
     /** HTTP body data */
     readonly body: string
+    
+    /** HTTP headers */
+    readonly headers: OINOHeaders
 
     /** HTTP cache expiration value 
      * Note: default 0 means no expiration and 'Pragma: no-cache' is set.
@@ -208,6 +212,7 @@ export class OINOHttpResult extends OINOResult {
     constructor(init?: OINOHttpResultInit) {
         super(init)
         this.body = init?.body ?? ""
+        this.headers = new OINOHeaders(init?.headers)
         this.expires = init?.expires ?? 0
         this.lastModified = init?.lastModified ?? 0
         this._etag = ""
@@ -230,14 +235,18 @@ export class OINOHttpResult extends OINOResult {
      * 
      * @param headers HTTP headers (overrides existing values)
      */
-    getHttpResponse(headers?:Record<string, string>):Response {
-        const result:Response = new Response(this.body, {status:this.status, statusText: this.statusText, headers: headers})
+    getFetchResponse(headers?:OINOHeadersInit):Response {
+        const merged_headers = new OINOHeaders(this.headers)
+        if (headers) {
+            merged_headers.setHeaders(headers)
+        }
+        const result: Response = new Response(this.body, { status: this.status, statusText: this.statusText, headers: merged_headers })
         result.headers.set('Content-Length', this.body.length.toString())
-        if (this.lastModified > 0) {
+        if (merged_headers['Last-Modified'] === undefined && this.lastModified > 0) {
             result.headers.set('Last-Modified', new Date(this.lastModified).toUTCString())
         }
-        if (this.expires >= 0) {
-            result.headers.set('Expires', Math.round(this.expires).toString())
+        if (merged_headers['Expires'] === undefined && this.expires >= 0) {
+            result.headers.set('Expires', new Date(Date.now() + Math.round(this.expires)).toUTCString())
             if (this.expires == 0) {
                 result.headers.set('Pragma', 'no-cache')
             }

package/src/index.ts

@@ -5,6 +5,7 @@ export { OINORequest, OINOHttpRequest, type OINORequestInit, type OINOHttpReques
 export { OINOStr } from "./OINOStr.js"
 export { OINOHtmlTemplate } from "./OINOHtmlTemplate.js"
 export { OINOFormatter, OINO_EMPTY_FORMATTER } from "./OINOFormatter.js"
+export { OINOHeaders, type OINOHeadersInit } from "./OINOHeaders.js"
 
 /** OINO error message prefix */
 export const OINO_ERROR_PREFIX = "OINO ERROR"