@oino-ts/common 0.17.1 → 0.17.2

package/dist/cjs/OINORequest.js

@@ -42,7 +42,7 @@ class OINOHttpRequest extends OINORequest {
     url;
     method;
     headers;
-    body;
+    data;
     requestType;
     responseType;
     multipartBoundary;
@@ -59,7 +59,7 @@ class OINOHttpRequest extends OINORequest {
         this.url = init.url;
         this.method = init.method ?? "GET";
         this.headers = init.headers ?? {};
-        this.body = init.body ?? "";
+        this.data = init.data ?? "";
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
         if (init.multipartBoundary) {
@@ -110,5 +110,14 @@ class OINOHttpRequest extends OINORequest {
             this.etags = etags;
         }
     }
+    static async fromRequest(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),
+        });
+    }
 }
 exports.OINOHttpRequest = OINOHttpRequest;

package/dist/esm/OINORequest.js

@@ -38,7 +38,7 @@ export class OINOHttpRequest extends OINORequest {
     url;
     method;
     headers;
-    body;
+    data;
     requestType;
     responseType;
     multipartBoundary;
@@ -55,7 +55,7 @@ export class OINOHttpRequest extends OINORequest {
         this.url = init.url;
         this.method = init.method ?? "GET";
         this.headers = init.headers ?? {};
-        this.body = init.body ?? "";
+        this.data = init.data ?? "";
         this.multipartBoundary = "";
         this.lastModified = init.lastModified;
         if (init.multipartBoundary) {
@@ -106,4 +106,13 @@ export class OINOHttpRequest extends OINORequest {
             this.etags = etags;
         }
     }
+    static async fromRequest(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),
+        });
+    }
 }

package/dist/types/OINORequest.d.ts

@@ -28,7 +28,7 @@ export interface OINOHttpRequestInit extends OINORequestInit {
     url?: URL;
     method?: string;
     headers?: Record<string, string>;
-    body?: string;
+    data?: string | Buffer | Uint8Array | object | null;
     requestType?: OINOContentType;
     responseType?: OINOContentType;
     multipartBoundary?: string;
@@ -41,7 +41,7 @@ export declare class OINOHttpRequest extends OINORequest {
     readonly url?: URL;
     readonly method: string;
     readonly headers: Record<string, string>;
-    readonly body: string;
+    readonly data: string | Buffer | Uint8Array | object | null;
     readonly requestType: OINOContentType;
     readonly responseType: OINOContentType;
     readonly multipartBoundary?: string;
@@ -54,4 +54,5 @@ export declare class OINOHttpRequest extends OINORequest {
      *
      */
     constructor(init: OINOHttpRequestInit);
+    static fromRequest(request: Request): Promise<OINOHttpRequest>;
 }

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.2",
+  "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.2",
+    "@types/node": "^22.0.0",
+    "typescript": "~5.9.0"
+  },
+  "files": [
+    "src/*.ts",
+    "dist/cjs/*.js",
+    "dist/esm/*.js",
+    "dist/types/*.d.ts"
+  ]
+}

package/src/OINOBenchmark.ts

@@ -1,250 +1,250 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * 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/.
- */
-
-/**
- * Static class for benchmarking functions.
- *
- */
-export abstract class OINOBenchmark {
-
-    protected static _instance:OINOBenchmark
-    protected static _enabled:Record<string, boolean> = {}
-
-    /**
-     * Create a new OINOBenchmark instance.
-     * 
-     * @param enabledModules array of those benchmarks that are enabled
-     */
-    constructor(enabledModules:string[] = []) {
-        OINOBenchmark.setEnabled(enabledModules)
-    }
-
-    /**
-     * Set active benchmarking instance.
-     * 
-     * @param instance OINOBenchmark instance
-     *
-     */
-    static setInstance(instance: OINOBenchmark) {
-        if (instance) {
-            OINOBenchmark._instance = instance
-        }
-    }
-
-    /**
-     * Get active benchmarking instance.
-     * 
-     */
-    static getInstance(): OINOBenchmark {
-        return OINOBenchmark._instance
-    }
-
-    protected abstract _reset():void
-    /**
-     * Reset benchmark data (but not what is enabled).
-     *
-     */
-    static reset():void {
-        OINOBenchmark._instance?._reset()
-    }
-
-    /**
-     *  Set benchmark names that are enabled.
-     *
-     *  @param modules array of those benchmarks that are enabled 
-     */
-    static setEnabled(modules:string[]):void {
-        OINOBenchmark._enabled = {}
-        modules.forEach(module_name => {
-            this._enabled[module_name] = true        
-        });
-    }
-
-    protected abstract _startMetric(module:string, method:string):void
-    /**
-     * Start benchmark timing.
-     *
-     * @param module of the benchmark
-     * @param method of the benchmark
-     */
-    static startMetric(module:string, method:string):void {
-        OINOBenchmark._instance?._startMetric(module, method)
-    }
-
-    protected abstract _endMetric(module:string, method:string):void
-    /**
-     * Complete benchmark timing
-     * 
-     * @param module of the benchmark
-     * @param method of the benchmark
-     */
-    static endMetric(module:string, method:string):void {
-        OINOBenchmark._instance?._endMetric(module, method)
-    }
-
-    protected abstract _getMetric(module:string, method:string):number
-    /**
-     * Get given benchmark data.
-     * 
-     * @param module of the benchmark
-     * @param method of the benchmark
-     * 
-     */
-    static getMetric(module:string, method:string):number {
-        return OINOBenchmark._instance?._getMetric(module, method)
-    }
-
-    protected abstract _getMetrics():Record<string, number>
-    /**
-     * Get all benchmark data.
-     * 
-     */
-    static getMetrics():Record<string, number> {
-        return OINOBenchmark._instance?._getMetrics()
-    }
-
-    protected abstract _trackMetric(module:string, method:string, value:number):void
-    /**
-     * Track a metric value
-     * 
-     * @param module of the metric
-     * @param method of the metric
-     * @param value of the metric
-     * 
-     */
-    static trackMetric(module:string, method:string, value:number):void {
-        if (OINOBenchmark._enabled[module]) {
-            OINOBenchmark._instance?._trackMetric(module, method, value)
-        }
-    }
-
-    protected abstract _trackException(module:string, method:string, name:string, message:string, stack: string):void
-    /**
-     * Track an exception
-     * 
-     * @param module of the benchmark
-     * @param method of the benchmark
-     * @param name of the exception
-     * @param message of the exception
-     * @param stack trace of the exception
-     */
-    static trackException(module:string, method:string, name:string, message:string, stack:string):void {
-        if (OINOBenchmark._enabled[module]) {
-            OINOBenchmark._instance?._trackException(module, method, name, message, stack)
-        }
-    }
-
-    protected abstract _getExceptions():any[]
-    /**
-     * Get all tracked exceptions.
-     * 
-     */
-    static getExceptions():any[] {
-        return OINOBenchmark._instance?._getExceptions()
-    }
-}
-
-/**
- * OINOMemoryBenchmark is a memory-based benchmark implementation.
- * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
- * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. * 
- */
-export class OINOMemoryBenchmark extends OINOBenchmark {
-
-    protected _benchmarkCount:Record<string, number> = {}
-    protected _benchmarkData:Record<string, number> = {}
-    protected _benchmarkStart:Record<string, number> = {}
-
-    protected _exceptions:any[] = []
-
-    /**
-     * Reset benchmark data (but not what is enabled).
-     *
-     */
-    protected _reset():void {
-        this._benchmarkData = {}
-        this._benchmarkCount = {}
-    }
-
-    /**
-     * Start benchmark timing.
-     *
-     * @param module of the benchmark
-     * @param method of the benchmark
-     */
-    protected _startMetric(module:string, method:string):void {
-        const name:string = module + "." + method
-        if (OINOBenchmark._enabled[module] && ((this._benchmarkStart[name] === undefined) || (this._benchmarkStart[name] === 0))) { // if benchmark is already started (e.g. loop/recursion), do not start it again
-            this._benchmarkStart[name] = performance.now()
-        }
-    }
-
-    /**
-     * Complete benchmark timing
-     * 
-     * @param module of the benchmark
-     * @param method of the benchmark
-     */
-    protected _endMetric(module:string, method:string):void {
-        const name:string = module + "." + method
-        let result:number = 0
-        if (OINOBenchmark._enabled[module] && (this._benchmarkStart[name] > 0)) { // if benchmark is started, end it
-            const duration = performance.now() - this._benchmarkStart[name]
-            this._benchmarkStart[name] = 0 
-            this._trackMetric(module, method, duration)
-        }
-        return
-    }
-
-    /**
-     * Get given benchmark data.
-     * 
-     * @param module of the benchmark
-     * @param method of the benchmark
-     * 
-     */
-    protected _getMetric(module:string, method:string):number {
-        const name:string = module + "." + method
-        if (OINOBenchmark._enabled[module] && (this._benchmarkCount[name] > 0)) {
-            return this._benchmarkData[module] / this._benchmarkCount[module]
-        }
-        return -1
-    }
-
-    /**
-     * Get all benchmark data.
-     * 
-     */
-    protected _getMetrics():Record<string, number> {
-        let result:Record<string, number> = {}
-        for (const name in this._benchmarkData) {
-            if (this._benchmarkCount[name] > 0) {
-                result[name] = this._benchmarkData[name] / this._benchmarkCount[name]
-            }
-        }
-        return result
-    }
-
-    protected _trackMetric(module:string, method:string, value:number):void {
-        const name:string = module + "." + method
-        if (this._benchmarkCount[name] == undefined) {
-            this._benchmarkCount[name] = 1
-            this._benchmarkData[name] = value
-        } else {
-            this._benchmarkCount[name] += 1
-            this._benchmarkData[name] += value
-        }
-    }
-
-    protected _trackException(module:string, method:string, name:string, message:string, stack:string):void {
-        const exception = { module, method, name, message, stack, timestamp: Date.now() }
-        this._exceptions.push(exception)
-    }
-
-    protected _getExceptions():any[] {
-        return this._exceptions
-    }
-}
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/.
+ */
+
+/**
+ * Static class for benchmarking functions.
+ *
+ */
+export abstract class OINOBenchmark {
+
+    protected static _instance:OINOBenchmark
+    protected static _enabled:Record<string, boolean> = {}
+
+    /**
+     * Create a new OINOBenchmark instance.
+     * 
+     * @param enabledModules array of those benchmarks that are enabled
+     */
+    constructor(enabledModules:string[] = []) {
+        OINOBenchmark.setEnabled(enabledModules)
+    }
+
+    /**
+     * Set active benchmarking instance.
+     * 
+     * @param instance OINOBenchmark instance
+     *
+     */
+    static setInstance(instance: OINOBenchmark) {
+        if (instance) {
+            OINOBenchmark._instance = instance
+        }
+    }
+
+    /**
+     * Get active benchmarking instance.
+     * 
+     */
+    static getInstance(): OINOBenchmark {
+        return OINOBenchmark._instance
+    }
+
+    protected abstract _reset():void
+    /**
+     * Reset benchmark data (but not what is enabled).
+     *
+     */
+    static reset():void {
+        OINOBenchmark._instance?._reset()
+    }
+
+    /**
+     *  Set benchmark names that are enabled.
+     *
+     *  @param modules array of those benchmarks that are enabled 
+     */
+    static setEnabled(modules:string[]):void {
+        OINOBenchmark._enabled = {}
+        modules.forEach(module_name => {
+            this._enabled[module_name] = true        
+        });
+    }
+
+    protected abstract _startMetric(module:string, method:string):void
+    /**
+     * Start benchmark timing.
+     *
+     * @param module of the benchmark
+     * @param method of the benchmark
+     */
+    static startMetric(module:string, method:string):void {
+        OINOBenchmark._instance?._startMetric(module, method)
+    }
+
+    protected abstract _endMetric(module:string, method:string):void
+    /**
+     * Complete benchmark timing
+     * 
+     * @param module of the benchmark
+     * @param method of the benchmark
+     */
+    static endMetric(module:string, method:string):void {
+        OINOBenchmark._instance?._endMetric(module, method)
+    }
+
+    protected abstract _getMetric(module:string, method:string):number
+    /**
+     * Get given benchmark data.
+     * 
+     * @param module of the benchmark
+     * @param method of the benchmark
+     * 
+     */
+    static getMetric(module:string, method:string):number {
+        return OINOBenchmark._instance?._getMetric(module, method)
+    }
+
+    protected abstract _getMetrics():Record<string, number>
+    /**
+     * Get all benchmark data.
+     * 
+     */
+    static getMetrics():Record<string, number> {
+        return OINOBenchmark._instance?._getMetrics()
+    }
+
+    protected abstract _trackMetric(module:string, method:string, value:number):void
+    /**
+     * Track a metric value
+     * 
+     * @param module of the metric
+     * @param method of the metric
+     * @param value of the metric
+     * 
+     */
+    static trackMetric(module:string, method:string, value:number):void {
+        if (OINOBenchmark._enabled[module]) {
+            OINOBenchmark._instance?._trackMetric(module, method, value)
+        }
+    }
+
+    protected abstract _trackException(module:string, method:string, name:string, message:string, stack: string):void
+    /**
+     * Track an exception
+     * 
+     * @param module of the benchmark
+     * @param method of the benchmark
+     * @param name of the exception
+     * @param message of the exception
+     * @param stack trace of the exception
+     */
+    static trackException(module:string, method:string, name:string, message:string, stack:string):void {
+        if (OINOBenchmark._enabled[module]) {
+            OINOBenchmark._instance?._trackException(module, method, name, message, stack)
+        }
+    }
+
+    protected abstract _getExceptions():any[]
+    /**
+     * Get all tracked exceptions.
+     * 
+     */
+    static getExceptions():any[] {
+        return OINOBenchmark._instance?._getExceptions()
+    }
+}
+
+/**
+ * OINOMemoryBenchmark is a memory-based benchmark implementation.
+ * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
+ * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. * 
+ */
+export class OINOMemoryBenchmark extends OINOBenchmark {
+
+    protected _benchmarkCount:Record<string, number> = {}
+    protected _benchmarkData:Record<string, number> = {}
+    protected _benchmarkStart:Record<string, number> = {}
+
+    protected _exceptions:any[] = []
+
+    /**
+     * Reset benchmark data (but not what is enabled).
+     *
+     */
+    protected _reset():void {
+        this._benchmarkData = {}
+        this._benchmarkCount = {}
+    }
+
+    /**
+     * Start benchmark timing.
+     *
+     * @param module of the benchmark
+     * @param method of the benchmark
+     */
+    protected _startMetric(module:string, method:string):void {
+        const name:string = module + "." + method
+        if (OINOBenchmark._enabled[module] && ((this._benchmarkStart[name] === undefined) || (this._benchmarkStart[name] === 0))) { // if benchmark is already started (e.g. loop/recursion), do not start it again
+            this._benchmarkStart[name] = performance.now()
+        }
+    }
+
+    /**
+     * Complete benchmark timing
+     * 
+     * @param module of the benchmark
+     * @param method of the benchmark
+     */
+    protected _endMetric(module:string, method:string):void {
+        const name:string = module + "." + method
+        let result:number = 0
+        if (OINOBenchmark._enabled[module] && (this._benchmarkStart[name] > 0)) { // if benchmark is started, end it
+            const duration = performance.now() - this._benchmarkStart[name]
+            this._benchmarkStart[name] = 0 
+            this._trackMetric(module, method, duration)
+        }
+        return
+    }
+
+    /**
+     * Get given benchmark data.
+     * 
+     * @param module of the benchmark
+     * @param method of the benchmark
+     * 
+     */
+    protected _getMetric(module:string, method:string):number {
+        const name:string = module + "." + method
+        if (OINOBenchmark._enabled[module] && (this._benchmarkCount[name] > 0)) {
+            return this._benchmarkData[module] / this._benchmarkCount[module]
+        }
+        return -1
+    }
+
+    /**
+     * Get all benchmark data.
+     * 
+     */
+    protected _getMetrics():Record<string, number> {
+        let result:Record<string, number> = {}
+        for (const name in this._benchmarkData) {
+            if (this._benchmarkCount[name] > 0) {
+                result[name] = this._benchmarkData[name] / this._benchmarkCount[name]
+            }
+        }
+        return result
+    }
+
+    protected _trackMetric(module:string, method:string, value:number):void {
+        const name:string = module + "." + method
+        if (this._benchmarkCount[name] == undefined) {
+            this._benchmarkCount[name] = 1
+            this._benchmarkData[name] = value
+        } else {
+            this._benchmarkCount[name] += 1
+            this._benchmarkData[name] += value
+        }
+    }
+
+    protected _trackException(module:string, method:string, name:string, message:string, stack:string):void {
+        const exception = { module, method, name, message, stack, timestamp: Date.now() }
+        this._exceptions.push(exception)
+    }
+
+    protected _getExceptions():any[] {
+        return this._exceptions
+    }
+}