@oino-ts/common 0.17.5 → 0.19.0

package/dist/cjs/OINORequest.js

@@ -34,7 +34,7 @@ class OINOHttpRequest extends OINORequest {
     url;
     method;
     headers;
-    data;
+    body;
     requestType;
     responseType;
     multipartBoundary;
@@ -48,10 +48,10 @@ class OINOHttpRequest extends OINORequest {
      */
     constructor(init) {
         super(init);
-        this.url = init.url;
-        this.method = init.method ?? "GET";
+        this.url = typeof init.url === "string" ? new URL(init.url) : init.url;
+        this.method = init.method?.toUpperCase() ?? "GET";
         this.headers = new _1.OINOHeaders(init.headers);
-        this.data = init.data ?? "";
+        this.body = init.body ?? null;
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
         if (init.multipartBoundary) {
@@ -102,47 +102,72 @@ class OINOHttpRequest extends OINORequest {
             this.etags = etags;
         }
     }
+    /**
+     * Creates a `OINOHttpRequest` from a Fetch API `Request` object.
+     *
+     * @param request Fetch 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: node_buffer_1.Buffer.from(body),
+            body: node_buffer_1.Buffer.from(body),
         });
     }
-    dataAsText() {
-        if (this.data instanceof Uint8Array) {
-            return new TextDecoder().decode(this.data);
+    /**
+     * Returns the request data as a text string.
+     *
+     */
+    bodyAsText() {
+        if (this.body == null) {
+            return "";
         }
-        else if (this.data instanceof Object) {
-            return JSON.stringify(this.data);
+        else if (this.body instanceof Uint8Array) {
+            return new TextDecoder().decode(this.body);
+        }
+        else if (typeof this.body === "object") {
+            return JSON.stringify(this.body);
         }
         else {
-            return this.data?.toString() || "";
+            return this.body?.toString() || "";
         }
     }
-    dataAsParsedJson() {
-        return this.data ? JSON.parse(this.dataAsText()) : {};
+    /**
+     * Returns the request data parsed as JSON object.
+     *
+     */
+    bodyAsParsedJson() {
+        return this.body ? JSON.parse(this.bodyAsText()) : {};
     }
-    dataAsFormData() {
-        return new URLSearchParams(this.dataAsText() || "");
+    /**
+     * Returns the request data as URLSearchParams (form data).
+     *
+     */
+    bodyAsFormData() {
+        return new URLSearchParams(this.bodyAsText() || "");
     }
-    dataAsBuffer() {
-        if (this.data === null) {
+    /**
+     * Returns the request data as Buffer.
+     *
+     */
+    bodyAsBuffer() {
+        if ((this.body === null) || (this.body === undefined)) {
             return node_buffer_1.Buffer.alloc(0);
         }
-        else if (this.data instanceof node_buffer_1.Buffer) {
-            return this.data;
+        else if (this.body instanceof node_buffer_1.Buffer) {
+            return this.body;
         }
-        else if (this.data instanceof Uint8Array) {
-            return node_buffer_1.Buffer.from(this.data);
+        else if (this.body instanceof Uint8Array) {
+            return node_buffer_1.Buffer.from(this.body);
         }
-        else if (this.data instanceof Object) {
-            return node_buffer_1.Buffer.from(JSON.stringify(this.data), "utf-8");
+        else if (typeof this.body === "object") {
+            return node_buffer_1.Buffer.from(JSON.stringify(this.body), "utf-8");
         }
         else {
-            return node_buffer_1.Buffer.from(this.data, "utf-8");
+            return node_buffer_1.Buffer.from(this.body, "utf-8");
         }
     }
 }

package/dist/cjs/OINOResult.js

@@ -231,5 +231,66 @@ class OINOHttpResult extends OINOResult {
         result.headers.set("ETag", this.getEtag());
         return result;
     }
+    /**
+     * Create from a Response object from the result values.
+     *
+     * @param response fetch Response object
+     *
+     */
+    static async fromFetchResponse(response) {
+        const body = node_buffer_1.Buffer.from(await response.arrayBuffer());
+        const last_modified = response.headers.get('Last-Modified');
+        const expires = response.headers.get('Expires');
+        const result = new OINOHttpResult({
+            status: response.status,
+            statusText: response.statusText,
+            body: body,
+            headers: response.headers,
+            lastModified: last_modified ? (new Date(last_modified).getTime()) : 0,
+            expires: expires ? (new Date(expires).getTime() - Date.now()) : 0
+        });
+        return result;
+    }
+    /**
+     * Returns the request body as a text string.
+     *
+     */
+    bodyAsText() {
+        if (this.body instanceof node_buffer_1.Buffer) {
+            return this.body.toString("utf-8");
+        }
+        else {
+            return this.body || "";
+        }
+    }
+    /**
+     * Returns the request body parsed as JSON object.
+     *
+     */
+    bodyAsParsedJson() {
+        return this.body ? JSON.parse(this.bodyAsText()) : {};
+    }
+    /**
+     * Returns the request body as URLSearchParams (form body).
+     *
+     */
+    bodyAsFormData() {
+        return new URLSearchParams(this.bodyAsText() || "");
+    }
+    /**
+     * Returns the request body as Buffer.
+     *
+     */
+    bodyAsBuffer() {
+        if (this.body === null) {
+            return node_buffer_1.Buffer.alloc(0);
+        }
+        else if (this.body instanceof node_buffer_1.Buffer) {
+            return this.body;
+        }
+        else {
+            return node_buffer_1.Buffer.from(this.body, "utf-8");
+        }
+    }
 }
 exports.OINOHttpResult = OINOHttpResult;

package/dist/esm/OINORequest.js

@@ -30,7 +30,7 @@ export class OINOHttpRequest extends OINORequest {
     url;
     method;
     headers;
-    data;
+    body;
     requestType;
     responseType;
     multipartBoundary;
@@ -44,10 +44,10 @@ export class OINOHttpRequest extends OINORequest {
      */
     constructor(init) {
         super(init);
-        this.url = init.url;
-        this.method = init.method ?? "GET";
+        this.url = typeof init.url === "string" ? new URL(init.url) : init.url;
+        this.method = init.method?.toUpperCase() ?? "GET";
         this.headers = new OINOHeaders(init.headers);
-        this.data = init.data ?? "";
+        this.body = init.body ?? null;
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
         if (init.multipartBoundary) {
@@ -98,47 +98,72 @@ export class OINOHttpRequest extends OINORequest {
             this.etags = etags;
         }
     }
+    /**
+     * Creates a `OINOHttpRequest` from a Fetch API `Request` object.
+     *
+     * @param request Fetch 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),
+            body: Buffer.from(body),
         });
     }
-    dataAsText() {
-        if (this.data instanceof Uint8Array) {
-            return new TextDecoder().decode(this.data);
+    /**
+     * Returns the request data as a text string.
+     *
+     */
+    bodyAsText() {
+        if (this.body == null) {
+            return "";
         }
-        else if (this.data instanceof Object) {
-            return JSON.stringify(this.data);
+        else if (this.body instanceof Uint8Array) {
+            return new TextDecoder().decode(this.body);
+        }
+        else if (typeof this.body === "object") {
+            return JSON.stringify(this.body);
         }
         else {
-            return this.data?.toString() || "";
+            return this.body?.toString() || "";
         }
     }
-    dataAsParsedJson() {
-        return this.data ? JSON.parse(this.dataAsText()) : {};
+    /**
+     * Returns the request data parsed as JSON object.
+     *
+     */
+    bodyAsParsedJson() {
+        return this.body ? JSON.parse(this.bodyAsText()) : {};
     }
-    dataAsFormData() {
-        return new URLSearchParams(this.dataAsText() || "");
+    /**
+     * Returns the request data as URLSearchParams (form data).
+     *
+     */
+    bodyAsFormData() {
+        return new URLSearchParams(this.bodyAsText() || "");
     }
-    dataAsBuffer() {
-        if (this.data === null) {
+    /**
+     * Returns the request data as Buffer.
+     *
+     */
+    bodyAsBuffer() {
+        if ((this.body === null) || (this.body === undefined)) {
             return Buffer.alloc(0);
         }
-        else if (this.data instanceof Buffer) {
-            return this.data;
+        else if (this.body instanceof Buffer) {
+            return this.body;
         }
-        else if (this.data instanceof Uint8Array) {
-            return Buffer.from(this.data);
+        else if (this.body instanceof Uint8Array) {
+            return Buffer.from(this.body);
         }
-        else if (this.data instanceof Object) {
-            return Buffer.from(JSON.stringify(this.data), "utf-8");
+        else if (typeof this.body === "object") {
+            return Buffer.from(JSON.stringify(this.body), "utf-8");
         }
         else {
-            return Buffer.from(this.data, "utf-8");
+            return Buffer.from(this.body, "utf-8");
         }
     }
 }

package/dist/esm/OINOResult.js

@@ -227,4 +227,65 @@ export class OINOHttpResult extends OINOResult {
         result.headers.set("ETag", this.getEtag());
         return result;
     }
+    /**
+     * Create from a Response object from the result values.
+     *
+     * @param response fetch Response object
+     *
+     */
+    static async fromFetchResponse(response) {
+        const body = Buffer.from(await response.arrayBuffer());
+        const last_modified = response.headers.get('Last-Modified');
+        const expires = response.headers.get('Expires');
+        const result = new OINOHttpResult({
+            status: response.status,
+            statusText: response.statusText,
+            body: body,
+            headers: response.headers,
+            lastModified: last_modified ? (new Date(last_modified).getTime()) : 0,
+            expires: expires ? (new Date(expires).getTime() - Date.now()) : 0
+        });
+        return result;
+    }
+    /**
+     * Returns the request body as a text string.
+     *
+     */
+    bodyAsText() {
+        if (this.body instanceof Buffer) {
+            return this.body.toString("utf-8");
+        }
+        else {
+            return this.body || "";
+        }
+    }
+    /**
+     * Returns the request body parsed as JSON object.
+     *
+     */
+    bodyAsParsedJson() {
+        return this.body ? JSON.parse(this.bodyAsText()) : {};
+    }
+    /**
+     * Returns the request body as URLSearchParams (form body).
+     *
+     */
+    bodyAsFormData() {
+        return new URLSearchParams(this.bodyAsText() || "");
+    }
+    /**
+     * Returns the request body as Buffer.
+     *
+     */
+    bodyAsBuffer() {
+        if (this.body === null) {
+            return Buffer.alloc(0);
+        }
+        else if (this.body instanceof Buffer) {
+            return this.body;
+        }
+        else {
+            return Buffer.from(this.body, "utf-8");
+        }
+    }
 }

package/dist/types/OINORequest.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { Buffer } from "node:buffer";
 import { OINOContentType, OINOHeaders, OINOHeadersInit } from ".";
 export interface OINORequestInit {
@@ -19,11 +21,12 @@ export declare class OINORequest {
      */
     constructor(init?: OINORequestInit);
 }
+export type OINOHttpData = string | Buffer | Uint8Array | null;
 export interface OINOHttpRequestInit extends OINORequestInit {
-    url?: URL;
+    url?: URL | string;
     method?: string;
     headers?: OINOHeadersInit;
-    data?: string | Buffer | Uint8Array | object | null;
+    body?: OINOHttpData;
     requestType?: OINOContentType;
     responseType?: OINOContentType;
     multipartBoundary?: string;
@@ -33,15 +36,15 @@ export interface OINOHttpRequestInit extends OINORequestInit {
  * Specialized result for HTTP responses.
  */
 export declare class OINOHttpRequest extends OINORequest {
-    readonly url?: URL;
-    readonly method: string;
-    readonly headers: OINOHeaders;
-    readonly data: string | Buffer | Uint8Array | object | null;
-    readonly requestType: OINOContentType;
-    readonly responseType: OINOContentType;
-    readonly multipartBoundary?: string;
-    readonly lastModified?: number;
-    readonly etags?: string[];
+    url?: URL;
+    method: string;
+    headers: OINOHeaders;
+    body: OINOHttpData;
+    requestType: OINOContentType;
+    responseType: OINOContentType;
+    multipartBoundary?: string;
+    lastModified?: number;
+    etags?: string[];
     /**
      * Constructor for a `OINOHttpRequest`
      *
@@ -49,9 +52,31 @@ export declare class OINOHttpRequest extends OINORequest {
      *
      */
     constructor(init: OINOHttpRequestInit);
+    /**
+     * Creates a `OINOHttpRequest` from a Fetch API `Request` object.
+     *
+     * @param request Fetch request
+     *
+     */
     static fromFetchRequest(request: Request): Promise<OINOHttpRequest>;
-    dataAsText(): string;
-    dataAsParsedJson(): any;
-    dataAsFormData(): URLSearchParams;
-    dataAsBuffer(): Buffer;
+    /**
+     * Returns the request data as a text string.
+     *
+     */
+    bodyAsText(): string;
+    /**
+     * Returns the request data parsed as JSON object.
+     *
+     */
+    bodyAsParsedJson(): any;
+    /**
+     * Returns the request data as URLSearchParams (form data).
+     *
+     */
+    bodyAsFormData(): URLSearchParams;
+    /**
+     * Returns the request data as Buffer.
+     *
+     */
+    bodyAsBuffer(): Buffer;
 }

package/dist/types/OINOResult.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { Buffer } from "node:buffer";
 import { OINOHeaders, OINOHeadersInit } from ".";
 export interface OINOResultInit {
@@ -127,4 +129,31 @@ export declare class OINOHttpResult extends OINOResult {
      * @param headers HTTP headers (overrides existing values)
      */
     getFetchResponse(headers?: OINOHeadersInit): Response;
+    /**
+     * Create from a Response object from the result values.
+     *
+     * @param response fetch Response object
+     *
+     */
+    static fromFetchResponse(response: Response): Promise<OINOHttpResult>;
+    /**
+     * Returns the request body as a text string.
+     *
+     */
+    bodyAsText(): string;
+    /**
+     * Returns the request body parsed as JSON object.
+     *
+     */
+    bodyAsParsedJson(): any;
+    /**
+     * Returns the request body as URLSearchParams (form body).
+     *
+     */
+    bodyAsFormData(): URLSearchParams;
+    /**
+     * Returns the request body as Buffer.
+     *
+     */
+    bodyAsBuffer(): Buffer;
 }

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
 export { OINOBenchmark, OINOMemoryBenchmark } from "./OINOBenchmark.js";
 export { OINOLog, OINOLogLevel, OINOConsoleLog } from "./OINOLog.js";
 export { OINOResult, OINOHttpResult, type OINOResultInit, type OINOHttpResultInit } from "./OINOResult.js";
-export { OINORequest, OINOHttpRequest, type OINORequestInit, type OINOHttpRequestInit } from "./OINORequest.js";
+export { OINORequest, OINOHttpRequest, type OINOHttpData, type OINORequestInit, type OINOHttpRequestInit } from "./OINORequest.js";
 export { OINOStr } from "./OINOStr.js";
 export { OINOHtmlTemplate } from "./OINOHtmlTemplate.js";
 export { OINOFormatter, OINO_EMPTY_FORMATTER } from "./OINOFormatter.js";

package/package.json

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

package/src/OINORequest.ts

@@ -32,11 +32,13 @@ export class OINORequest {
     }
 }
 
+export type OINOHttpData = string|Buffer|Uint8Array|null
+
 export interface OINOHttpRequestInit extends OINORequestInit {
-    url?: URL
+    url?: URL|string
     method?: string
     headers?: OINOHeadersInit
-    data?: string|Buffer|Uint8Array|object|null
+    body?: OINOHttpData
     requestType?:OINOContentType
     responseType?:OINOContentType
     multipartBoundary?:string
@@ -47,15 +49,15 @@ export interface OINOHttpRequestInit extends OINORequestInit {
  * Specialized result for HTTP responses.
  */
 export class OINOHttpRequest extends OINORequest {
-    readonly url?: URL
-    readonly method: string
-    readonly headers: OINOHeaders
-    readonly data: string|Buffer|Uint8Array|object|null
-    readonly requestType:OINOContentType
-    readonly responseType:OINOContentType
-    readonly multipartBoundary?:string
-    readonly lastModified?:number
-    readonly etags?:string[]
+    url?: URL
+    method: string
+    headers: OINOHeaders
+    body: OINOHttpData
+    requestType:OINOContentType
+    responseType:OINOContentType
+    multipartBoundary?:string
+    lastModified?:number
+    etags?:string[]
 
     /**
      * Constructor for a `OINOHttpRequest` 
@@ -65,10 +67,10 @@ export class OINOHttpRequest extends OINORequest {
      */
     constructor(init: OINOHttpRequestInit) {
         super(init)
-        this.url = init.url 
-        this.method = init.method ?? "GET"
+        this.url = typeof init.url === "string" ? new URL(init.url) : init.url
+        this.method = init.method?.toUpperCase() ?? "GET"
         this.headers = new OINOHeaders(init.headers)
-        this.data = init.data ?? ""
+        this.body = init.body ?? null
         this.multipartBoundary = ""
         this.lastModified = init.lastModified
 
@@ -118,51 +120,76 @@ export class OINOHttpRequest extends OINORequest {
         }
     }
 
+    /**
+     * Creates a `OINOHttpRequest` from a Fetch API `Request` object.
+     * 
+     * @param request Fetch request
+     *  
+     */
     static async fromFetchRequest(request: Request): Promise<OINOHttpRequest> {
         const body = await request.arrayBuffer()
         return new OINOHttpRequest({
             url: new URL(request.url),
             method: request.method,
             headers: Object.fromEntries(request.headers as any),
-            data: Buffer.from(body),
+            body: Buffer.from(body),
         })
     }
 
-    dataAsText(): string {
-        if (this.data instanceof Uint8Array) {
-            return new TextDecoder().decode(this.data)
+    /**
+     * Returns the request data as a text string.
+     * 
+     */
+    bodyAsText(): string {
+        if (this.body == null) {
+            return ""
+
+        } else if (this.body instanceof Uint8Array) {
+            return new TextDecoder().decode(this.body)
 
-        } else if (this.data instanceof Object) {
-            return JSON.stringify(this.data)
+        } else if (typeof this.body === "object") {
+            return JSON.stringify(this.body)
             
         } else {
-            return this.data?.toString() || ""
+            return this.body?.toString() || ""
         }
     }
 
-    dataAsParsedJson(): any {
-        return this.data ? JSON.parse(this.dataAsText()) : {}
+    /**
+     * Returns the request data parsed as JSON object.
+     * 
+     */
+    bodyAsParsedJson(): any {
+        return this.body ? JSON.parse(this.bodyAsText()) : {}
     }
 
-    dataAsFormData(): URLSearchParams {
-        return new URLSearchParams(this.dataAsText() || "")
+    /**
+     * Returns the request data as URLSearchParams (form data).
+     * 
+     */
+    bodyAsFormData(): URLSearchParams {
+        return new URLSearchParams(this.bodyAsText() || "")
     }
-
-    dataAsBuffer(): Buffer {
-        if (this.data === null) {
+    
+    /**
+     * Returns the request data as Buffer.
+     * 
+     */
+    bodyAsBuffer(): Buffer {
+        if ((this.body === null) || (this.body === undefined)) {
             return Buffer.alloc(0)
 
-        } else if (this.data instanceof Buffer) {
-            return this.data
+        } else if (this.body instanceof Buffer) {
+            return this.body
 
-        } else if (this.data instanceof Uint8Array) {
-            return Buffer.from(this.data)
+        } else if (this.body instanceof Uint8Array) {
+            return Buffer.from(this.body)
 
-        } else if (this.data instanceof Object) {
-            return Buffer.from(JSON.stringify(this.data), "utf-8")
+        } else if (typeof this.body === "object") {
+            return Buffer.from(JSON.stringify(this.body), "utf-8")
 
         } else {
-            return Buffer.from(this.data, "utf-8")
+            return Buffer.from(this.body, "utf-8")
         }
     }
 

package/src/OINOResult.ts

@@ -262,4 +262,69 @@ export class OINOHttpResult extends OINOResult {
         return result
     }
 
+    /**
+     * Create from a Response object from the result values.
+     * 
+     * @param response fetch Response object
+     * 
+     */
+    static async fromFetchResponse(response: Response): Promise<OINOHttpResult> {
+        const body = Buffer.from(await response.arrayBuffer())
+        const last_modified = response.headers.get('Last-Modified')
+        const expires = response.headers.get('Expires')
+        const result = new OINOHttpResult({
+            status: response.status,
+            statusText: response.statusText,
+            body: body,            
+            headers: response.headers as unknown as OINOHeadersInit,
+            lastModified: last_modified ? (new Date(last_modified).getTime()) : 0,
+            expires: expires ? (new Date(expires).getTime() - Date.now()) : 0
+        })
+        return result
+    }
+
+    /**
+     * Returns the request body as a text string.
+     * 
+     */
+    bodyAsText(): string {
+        if (this.body instanceof Buffer) {
+            return this.body.toString("utf-8")
+            
+        } else {
+            return this.body as string || ""
+        }
+    }
+
+    /**
+     * Returns the request body parsed as JSON object.
+     * 
+     */
+    bodyAsParsedJson(): any {
+        return this.body ? JSON.parse(this.bodyAsText()) : {}
+    }
+
+    /**
+     * Returns the request body as URLSearchParams (form body).
+     * 
+     */
+    bodyAsFormData(): URLSearchParams {
+        return new URLSearchParams(this.bodyAsText() || "")
+    }
+    
+    /**
+     * Returns the request body as Buffer.
+     * 
+     */
+    bodyAsBuffer(): Buffer {
+        if (this.body === null) {
+            return Buffer.alloc(0)
+
+        } else if (this.body instanceof Buffer) {
+            return this.body
+
+        } else {
+            return Buffer.from(this.body as string, "utf-8")
+        }
+    }
 }

package/src/index.ts

@@ -1,7 +1,7 @@
 export { OINOBenchmark, OINOMemoryBenchmark } from "./OINOBenchmark.js"
 export { OINOLog, OINOLogLevel, OINOConsoleLog } from "./OINOLog.js"
 export { OINOResult, OINOHttpResult, type OINOResultInit, type OINOHttpResultInit } from "./OINOResult.js"
-export { OINORequest, OINOHttpRequest, type OINORequestInit, type OINOHttpRequestInit } from "./OINORequest.js"
+export { OINORequest, OINOHttpRequest, type OINOHttpData, type OINORequestInit, type OINOHttpRequestInit } from "./OINORequest.js"
 export { OINOStr } from "./OINOStr.js"
 export { OINOHtmlTemplate } from "./OINOHtmlTemplate.js"
 export { OINOFormatter, OINO_EMPTY_FORMATTER } from "./OINOFormatter.js"