@oino-ts/common 0.17.1 → 0.17.3

package/dist/cjs/OINORequest.js

@@ -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;
 /**
@@ -42,7 +34,7 @@ class OINOHttpRequest extends OINORequest {
     url;
     method;
     headers;
-    body;
+    data;
     requestType;
     responseType;
     multipartBoundary;
@@ -58,8 +50,19 @@ class OINOHttpRequest extends OINORequest {
         super(init);
         this.url = init.url;
         this.method = init.method ?? "GET";
-        this.headers = init.headers ?? {};
-        this.body = init.body ?? "";
+        if (init.headers && init.headers) {
+            this.headers = init.headers;
+        }
+        else if (init.headers && init.headers) {
+            this.headers = {};
+            for (const key in init.headers) {
+                this.headers[key.toLowerCase()] = init.headers[key];
+            }
+        }
+        else {
+            this.headers = {};
+        }
+        this.data = init.data ?? "";
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
         if (init.multipartBoundary) {
@@ -110,5 +113,48 @@ class OINOHttpRequest extends OINORequest {
             this.etags = etags;
         }
     }
+    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),
+        });
+    }
+    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");
+        }
+    }
 }
 exports.OINOHttpRequest = OINOHttpRequest;

package/dist/cjs/OINOResult.js

@@ -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 = init?.headers ?? {};
         this.expires = init?.expires ?? 0;
         this.lastModified = init?.lastModified ?? 0;
         this._etag = "";
@@ -201,14 +204,15 @@ 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 = { ...this.headers, ...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/OINORequest.js

@@ -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.
@@ -38,7 +30,7 @@ export class OINOHttpRequest extends OINORequest {
     url;
     method;
     headers;
-    body;
+    data;
     requestType;
     responseType;
     multipartBoundary;
@@ -54,8 +46,19 @@ export class OINOHttpRequest extends OINORequest {
         super(init);
         this.url = init.url;
         this.method = init.method ?? "GET";
-        this.headers = init.headers ?? {};
-        this.body = init.body ?? "";
+        if (init.headers && init.headers) {
+            this.headers = init.headers;
+        }
+        else if (init.headers && init.headers) {
+            this.headers = {};
+            for (const key in init.headers) {
+                this.headers[key.toLowerCase()] = init.headers[key];
+            }
+        }
+        else {
+            this.headers = {};
+        }
+        this.data = init.data ?? "";
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
         if (init.multipartBoundary) {
@@ -106,4 +109,47 @@ export class OINOHttpRequest extends OINORequest {
             this.etags = etags;
         }
     }
+    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),
+        });
+    }
+    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

@@ -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 = init?.headers ?? {};
         this.expires = init?.expires ?? 0;
         this.lastModified = init?.lastModified ?? 0;
         this._etag = "";
@@ -197,14 +200,15 @@ 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 = { ...this.headers, ...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/types/OINORequest.d.ts

@@ -17,18 +17,17 @@ export declare class OINORequest {
      *
      */
     constructor(init?: OINORequestInit);
-    /**
-     * Copy values from different result.
-     *
-     * @param request source value
-     */
-    copy(request: OINORequest): void;
 }
+/**
+ * Type for HTTP headers that just guarantees keys are normalized to lowercase.
+ *
+ */
+export type OINOHttpHeaders = Record<string, string>;
 export interface OINOHttpRequestInit extends OINORequestInit {
     url?: URL;
     method?: string;
-    headers?: Record<string, string>;
-    body?: string;
+    headers?: OINOHttpHeaders | Record<string, string>;
+    data?: string | Buffer | Uint8Array | object | null;
     requestType?: OINOContentType;
     responseType?: OINOContentType;
     multipartBoundary?: string;
@@ -40,8 +39,8 @@ export interface OINOHttpRequestInit extends OINORequestInit {
 export declare class OINOHttpRequest extends OINORequest {
     readonly url?: URL;
     readonly method: string;
-    readonly headers: Record<string, string>;
-    readonly body: string;
+    readonly headers: OINOHttpHeaders;
+    readonly data: string | Buffer | Uint8Array | object | null;
     readonly requestType: OINOContentType;
     readonly responseType: OINOContentType;
     readonly multipartBoundary?: string;
@@ -54,4 +53,9 @@ export declare class OINOHttpRequest extends OINORequest {
      *
      */
     constructor(init: OINOHttpRequestInit);
+    static fromFetchRequest(request: Request): Promise<OINOHttpRequest>;
+    dataAsText(): string;
+    dataAsParsedJson(): any;
+    dataAsFormData(): URLSearchParams;
+    dataAsBuffer(): Buffer;
 }

package/dist/types/OINOResult.d.ts

@@ -88,6 +88,7 @@ export declare class OINOResult {
 }
 export interface OINOHttpResultInit extends OINOResultInit {
     body?: string;
+    headers?: Record<string, string>;
     expires?: number;
     lastModified?: number;
 }
@@ -98,6 +99,8 @@ export declare class OINOHttpResult extends OINOResult {
     private _etag;
     /** HTTP body data */
     readonly body: string;
+    /** HTTP headers */
+    readonly headers?: Record<string, string>;
     /** HTTP cache expiration value
      * Note: default 0 means no expiration and 'Pragma: no-cache' is set.
     */
@@ -121,5 +124,5 @@ export declare class OINOHttpResult extends OINOResult {
      *
      * @param headers HTTP headers (overrides existing values)
      */
-    getHttpResponse(headers?: Record<string, string>): Response;
+    getFetchResponse(headers?: Record<string, string>): Response;
 }

package/package.json

@@ -1,32 +1,32 @@
-{
-  "name": "@oino-ts/common",
-  "version": "0.17.1",
-  "description": "OINO TS package for common classes.",
-  "author": "Matias Kiviniemi (pragmatta)",
-  "license": "MPL-2.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/pragmatta/oino-ts.git"
-  },
-  "keywords": [
-    "types",
-    "typescript",
-    "library"
-  ],
-  "main": "./dist/cjs/index.js",
-  "module": "./dist/esm/index.js",
-  "types": "./dist/types/index.d.ts",
-  "dependencies": {
-  },
-  "devDependencies": {
-    "@oino-ts/types": "0.17.1",
-    "@types/node": "^22.0.0",
-    "typescript": "~5.9.0"
-  },
-  "files": [
-    "src/*.ts",
-    "dist/cjs/*.js",
-    "dist/esm/*.js",
-    "dist/types/*.d.ts"
-  ]
-}
+{
+  "name": "@oino-ts/common",
+  "version": "0.17.3",
+  "description": "OINO TS package for common classes.",
+  "author": "Matias Kiviniemi (pragmatta)",
+  "license": "MPL-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/pragmatta/oino-ts.git"
+  },
+  "keywords": [
+    "types",
+    "typescript",
+    "library"
+  ],
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "types": "./dist/types/index.d.ts",
+  "dependencies": {
+  },
+  "devDependencies": {
+    "@oino-ts/types": "0.17.3",
+    "@types/node": "^22.0.0",
+    "typescript": "~5.9.0"
+  },
+  "files": [
+    "src/*.ts",
+    "dist/cjs/*.js",
+    "dist/esm/*.js",
+    "dist/types/*.d.ts"
+  ]
+}