@oino-ts/common 0.17.2 → 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;
 /**
@@ -58,7 +50,18 @@ class OINOHttpRequest extends OINORequest {
         super(init);
         this.url = init.url;
         this.method = init.method ?? "GET";
-        this.headers = init.headers ?? {};
+        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;
@@ -110,7 +113,7 @@ class OINOHttpRequest extends OINORequest {
             this.etags = etags;
         }
     }
-    static async fromRequest(request) {
+    static async fromFetchRequest(request) {
         const body = await request.arrayBuffer();
         return new OINOHttpRequest({
             url: new URL(request.url),
@@ -119,5 +122,39 @@ 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");
+        }
+    }
 }
 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.
@@ -54,7 +46,18 @@ export class OINOHttpRequest extends OINORequest {
         super(init);
         this.url = init.url;
         this.method = init.method ?? "GET";
-        this.headers = init.headers ?? {};
+        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;
@@ -106,7 +109,7 @@ export class OINOHttpRequest extends OINORequest {
             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 +118,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

@@ -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,17 +17,16 @@ 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>;
+    headers?: OINOHttpHeaders | Record<string, string>;
     data?: string | Buffer | Uint8Array | object | null;
     requestType?: OINOContentType;
     responseType?: OINOContentType;
@@ -40,7 +39,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: OINOHttpHeaders;
     readonly data: string | Buffer | Uint8Array | object | null;
     readonly requestType: OINOContentType;
     readonly responseType: OINOContentType;
@@ -54,5 +53,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

@@ -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,6 +1,6 @@
 {
   "name": "@oino-ts/common",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "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.3",
     "@types/node": "^22.0.0",
     "typescript": "~5.9.0"
   },

package/src/OINORequest.ts

@@ -29,21 +29,18 @@ 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}
-    }
 }
 
+/**
+ * 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>
+    headers?: OINOHttpHeaders|Record<string, string>
     data?: string|Buffer|Uint8Array|object|null
     requestType?:OINOContentType
     responseType?:OINOContentType
@@ -57,7 +54,7 @@ export interface OINOHttpRequestInit extends OINORequestInit {
 export class OINOHttpRequest extends OINORequest {
     readonly url?: URL
     readonly method: string
-    readonly headers: Record<string, string>
+    readonly headers: OINOHttpHeaders
     readonly data: string|Buffer|Uint8Array|object|null
     readonly requestType:OINOContentType
     readonly responseType:OINOContentType
@@ -75,7 +72,18 @@ export class OINOHttpRequest extends OINORequest {
         super(init)
         this.url = init.url 
         this.method = init.method ?? "GET"
-        this.headers = init.headers ?? {}
+        if (init.headers && init.headers satisfies OINOHttpHeaders) {
+            this.headers = init.headers as OINOHttpHeaders
+
+        } else if (init.headers && init.headers satisfies Record<string, string>) {
+            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
@@ -126,7 +134,7 @@ export class OINOHttpRequest extends OINORequest {
         }
     }
 
-    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 +144,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

@@ -178,6 +178,7 @@ export class OINOResult {
 
 export interface OINOHttpResultInit extends OINOResultInit {
     body?: string
+    headers?: Record<string, string>
     expires?: number
     lastModified?: number
 }
@@ -190,6 +191,9 @@ export class OINOHttpResult extends OINOResult {
 
     /** 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.
@@ -208,6 +212,7 @@ export class OINOHttpResult extends OINOResult {
     constructor(init?: OINOHttpResultInit) {
         super(init)
         this.body = init?.body ?? ""
+        this.headers = init?.headers ?? {}
         this.expires = init?.expires ?? 0
         this.lastModified = init?.lastModified ?? 0
         this._etag = ""
@@ -230,14 +235,15 @@ 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?:Record<string, string>):Response {
+        const merged_headers = { ...this.headers, ...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')
             }