@oino-ts/hashid 0.17.1 → 0.17.2

package/README.md

@@ -1,183 +1,183 @@
-# OINO TS
-OINO Is Not an ORM but it's trying to solve a similar problem for API development. Instead of mirroring your DB schema in code that needs manual updates, OINO will get the data schema from DBMS using SQL in real time. Every time your app starts, it has an updated data model which enables automatic (de)serialize SQL results to JSON/CSV and back. OINO works on the level below routing where you pass the method, URL ID, body and request parameters to the API-object. OINO will parse and validate the data against the data model and generate proper SQL for your DB. Because OINO knows how data is serialized (e.g. JSON), what column it belongs to (e.g. floating point number) and what the target database is, it knows how to parse, format and escape the value as valid SQL.
-
-```
-const result:OINOApiResult = await api_orderdetails.doRequest("GET", id, body, params)
-return new Response(result.modelset.writeString(OINOContentType.json))
-```
-
-
-# GETTING STARTED
-
-### Setup
-Install the `@oino-ts/db` npm package and necessary database packages and import them in your code.
-```
-bun install @oino-ts/db
-bun install @oino-ts/db-bunsqlite
-```
-
-```
-import { OINODb, OINOApi, OINOFactory } from "@oino-ts/db";
-import { OINODbBunSqlite } from "@oino-ts/db-bunsqlite"
-```
-
-### Register database and logger
-Register your database implementation and logger (see [`OINOConsoleLog`](https://pragmatta.github.io/oino-ts/classes/common_src.OINOConsoleLog.html) how to implement your own)
-
-```
-OINOLog.setLogger(new OINOConsoleLog())
-OINOFactory.registerDb("OINODbBunSqlite", OINODbBunSqlite)
-```
-
-### Create a database
-Creating a database connection [`OINODb`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODb.html) is done by passing [`OINODbParams`](https://pragmatta.github.io/oino-ts/types/db_src.OINODbParams.html) to the factory method. For [`OINODbBunSqlite`](https://pragmatta.github.io/oino-ts/classes/db_bunsqlite_src.OINODbBunSqlite.html) that means a file url for the database file, for others network host, port, credentials etc.
-```
-const db:OINODb = await OINOFactory.createDb( { type: "OINODbBunSqlite", url: "file://../localDb/northwind.sqlite" } )
-```
-
-### Create an API
-From a database you can create an [`OINOApi`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbApi.html) by passing [`OINOApiParams`](https://pragmatta.github.io/oino-ts/types/db_src.OINODbApiParams.html) with table name and preferences to the factory method.
-```
-const api_employees:OINOApi = await OINOFactory.createApi(db, { tableName: "Employees", excludeFields:["BirthDate"] })
-```
-
-### Pass HTTP requests to API
-When you receive a HTTP request, just pass the method, URL ID, body and params to the correct API, which will parse and validate input and return results.
-
-```
-const result:OINOApiResult = await api_orderdetails.doRequest("GET", id, body, params)
-```
-
-### Write results back to HTTP Response
-The results for a GET request will contain [`OINOModelSet`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbModelSet.html) data that can be written out as JSON or CSV as needed. For other requests result is just success or error with messages.
-```
-return new Response(result.data.writeString(OINOContentType.json))
-```
-
-
-# MAIN FEATURES
-
-## RESTfull
-OINO maps HTTP methods GET/POST/PUT/DELETE to SQL operations SELECT/INSERT/UPDATE/DELETE. The GET/POST requests can be made without URL ID to get all rows or insert new ones and others target a single row using URL ID. 
-
-For example HTTP POST 
-```
-Request and response:
-> curl.exe -X POST http://localhost:3001/orderdetails -H "Content-Type: application/json" --data '[{\"OrderID\":11077,\"ProductID\":99,\"UnitPrice\":19,\"Quantity\":1,\"Discount\":0}]'
-{"success":true,"statusCode":200,"statusMessage":"OK","messages":[]}
-
-SQL:
-INSERT INTO [OrderDetails] ("OrderID","ProductID","UnitPrice","Quantity","Discount") VALUES (11077,99,19,1,0);
-```
-
-
-## Universal Serialization
-OINO handles serialization of data to JSON/CSV/etc. and back based on the data model. It knows what columns exist, what is their data type and how to convert each to JSON/CSV and back. This allows also partial data to be sent, i.e. you can send only columns that need updating or even send extra columns and have them ignored.
-
-- Files can be sent to BLOB fields using BASE64 or MIME multipart encoding. Also supports standard HTML form file submission to blob fields and returning them data url images.
-- Datetimes are (optionally) normalized to ISO 8601 format.
-- Extended JSON-encoding
-  - Unquoted literal `undefined` can be used to represent non-existent values (leaving property out works too but preserving structure might be easier e.g. when translating data).
-- CSV
-  - Comma-separated, doublequotes.
-  - Unquoted literal `null` represents null values.
-  - Unquoted empty string represents undefined values.
-- Form data
-  - Multipart-mixed and binary files not supported.
-  - Non-existent value line (i.e. nothing after the empty line) treated as a null value.
-- Url-encoded
-  - No null values, missing properties treated as undefined.
-  - Multiple lines could be used to post multiple rows.
-
-
-## Database Abstraction
-OINO functions as a database abstraction, providing a consistent interface for working with different databases. It abstracts out different conventions in connecting, making queries and formatting data.
-
-Currently supported databases:
-- Bun Sqlite through Bun native implementation
-- Postgresql through [pg](https://www.npmjs.com/package/pg)-package
-- Mariadb / Mysql-support through [mariadb](https://www.npmjs.com/package/mariadb)-package
-- Sql Server through [mssql](https://www.npmjs.com/package/mssql)-package
-
-## Composite Keys
-To support tables with multipart primary keys OINO generates a composite key `_OINOID_` that is included in the result and can be used as the REST ID. For example in the example above table `OrderDetails` has two primary keys `OrderID` and `ProductID` making the `_OINOID_` of form `11077:99`. 
-
-## Power Of SQL
-Since OINO is just generating SQL, WHERE-conditions can be defined with [`OINODbSqlFilter`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlFilter.html), order with [`OINODbSqlOrder`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlOrder.html), limits/paging with [`OINODbSqlLimit`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlLimit.html) and aggregation with [`OINODbSqlAggregate`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlAggregate.html) that are passed as HTTP request parameters. No more API development where you make unique API endpoints for each filter that fetch all data with original API and filter in backend code. Every API can be filtered when and as needed without unnessecary data tranfer and utilizing SQL indexing when available.
-
-## Swagger Support
-Swagger is great as long as the definitions are updated and with OINO you can automatically get a Swagger definition including a data model schema.
-```
-if (url.pathname == "/swagger.json") {
-  return new Response(JSON.stringify(OINOSwagger.getApiDefinition(api_array)))
-}
-```
-![Swagger definition with a data model schema](img/readme-swagger.png)
-
-## Node support
-OINO is developped Typescript first but compiles to standard CommonJS and the NPM packages should work on either ESM / CommonJS. Checkout sample apps `readmeApp` (ESM) and `nodeApp` (CommonJS).
-
-## HTMX support
-OINO is [htmx.org](https://htmx.org) friendly, allowing easy translation of [`OINODataRow`](https://pragmatta.github.io/oino-ts/types/db_src.OINODataRow.html) to HTML output using templates (cf. the [htmx sample app](https://github.com/pragmatta/oino-ts/tree/main/samples/htmxApp)).
-
-## Hashids
-Autoinc numeric id's are very pragmatic and fit well with OINO (e.g. using a form without primary key fields to insert new rows with database assigned ids). However it's not always sensible to share information about the sequence. Hashids solve this by masking the original values by encrypting the ids using AES-128 and some randomness. Length of the hashid can be chosen from 12-32 characters where longer ids provide more security. However this should not be considereded a cryptographic solution for keeping ids secret but rather making it infeasible to iterate all ids.
-
-
-# STATUS
-OINO is currently a side project which should considered in beta status. That means that semantic versioning is the goal but backwards incompatible changes can still happen in point releases if serious architectual issues are discovered.
-
-## Roadmap
-Major features that are considered in future releases ()
-
-### Support for views
-Simple cases of views probably work already in some databases but edge cases might get complicated.
-
-For example issues could be
-- How to handle a view which does not have a complete private key?
-- What edge cases exist in updating views?
-- Can views be handled transparently to the DBMS or is there some fundamentally platform specific behavior?
-
-### Batch updates
-Supporting batch updates similar to batch inserts is slightly bending the RESTfull principles but would still be a useful optional feature in some situations.
-
-### Streaming
-One core idea is to be efficient in not making unnecessary copies of the data and minimizing garbage collection debt. This can be taken further by implementing streaming, allowing large dataset to be written to HTTP response as SQL result rows are received.
-
-### SQL generation callbacks
-It would be useful to allow developer to validate / override SQL generation to cover cases OINO does not support or even workaround issues.
-
-### Transactions
-Even though the basic case for OINO is executing SQL operations on individual rows, having an option to use SQL transactions could make sense at least for batch operations.
-
-
-# HELP
-
-## Bug reports
-Fixing bugs is a priority and getting good quality bug reports helps. It's recommended to use the sample Northwind database included with project to replicate issues or make an SQL script export of the relevant table.
-
-## Feedback
-Understanding and prioritizing the use cases for OINO is also important and feedback about how you'd use OINO is interesting. Feel free to raise issues and feature requests in Github, but understand that short term most of the effort goes towards reaching the beta stage.
-
-## Typescript / Javascript architecture
-Typescript building with different targets and module-systemts and a ton of configuration is a complex domain and something I have little experience un so help in fixing problems and how thing ought to be done is appreciated.
-
-# LINKS
-- [Github repository](https://github.com/pragmatta/oino-ts)
-- [NPM repository](https://www.npmjs.com/org/oino-ts) 
-
-
-# ACKNOWLEDGEMENTS
-
-## Libraries
-OINO uses the following open source libraries and npm packages and I would like to thank everyone for their contributions:
-- Postgresql [node-postgres package](https://www.npmjs.com/package/pg)
-- Mariadb / Mysql [mariadb package](https://www.npmjs.com/package/mariadb)
-- Sql Server [mssql package](https://www.npmjs.com/package/mssql)
-- Custom base encoding [base-x package](https://www.npmjs.com/package/base-x)
-
-## Bun
-OINO has been developed using the Bun runtime, not because of the speed improvements but for the first class Typescript support and integrated developper experience. Kudos on the bun team for making Typescript work more exiting again.
-
-## SQL Scripts
-The SQL scripts for creating the sample Northwind database are based on [Google Code archive](https://code.google.com/archive/p/northwindextended/downloads) and have been further customized to ensure they would have identical data (in the scope of the automated testing).
+# OINO TS
+OINO Is Not an ORM but it's trying to solve a similar problem for API development. Instead of mirroring your DB schema in code that needs manual updates, OINO will get the data schema from DBMS using SQL in real time. Every time your app starts, it has an updated data model which enables automatic (de)serialize SQL results to JSON/CSV and back. OINO works on the level below routing where you pass the method, URL ID, body and request parameters to the API-object. OINO will parse and validate the data against the data model and generate proper SQL for your DB. Because OINO knows how data is serialized (e.g. JSON), what column it belongs to (e.g. floating point number) and what the target database is, it knows how to parse, format and escape the value as valid SQL.
+
+```
+const result:OINOApiResult = await api_orderdetails.doRequest("GET", id, body, params)
+return new Response(result.modelset.writeString(OINOContentType.json))
+```
+
+
+# GETTING STARTED
+
+### Setup
+Install the `@oino-ts/db` npm package and necessary database packages and import them in your code.
+```
+bun install @oino-ts/db
+bun install @oino-ts/db-bunsqlite
+```
+
+```
+import { OINODb, OINOApi, OINOFactory } from "@oino-ts/db";
+import { OINODbBunSqlite } from "@oino-ts/db-bunsqlite"
+```
+
+### Register database and logger
+Register your database implementation and logger (see [`OINOConsoleLog`](https://pragmatta.github.io/oino-ts/classes/common_src.OINOConsoleLog.html) how to implement your own)
+
+```
+OINOLog.setLogger(new OINOConsoleLog())
+OINOFactory.registerDb("OINODbBunSqlite", OINODbBunSqlite)
+```
+
+### Create a database
+Creating a database connection [`OINODb`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODb.html) is done by passing [`OINODbParams`](https://pragmatta.github.io/oino-ts/types/db_src.OINODbParams.html) to the factory method. For [`OINODbBunSqlite`](https://pragmatta.github.io/oino-ts/classes/db_bunsqlite_src.OINODbBunSqlite.html) that means a file url for the database file, for others network host, port, credentials etc.
+```
+const db:OINODb = await OINOFactory.createDb( { type: "OINODbBunSqlite", url: "file://../localDb/northwind.sqlite" } )
+```
+
+### Create an API
+From a database you can create an [`OINOApi`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbApi.html) by passing [`OINOApiParams`](https://pragmatta.github.io/oino-ts/types/db_src.OINODbApiParams.html) with table name and preferences to the factory method.
+```
+const api_employees:OINOApi = await OINOFactory.createApi(db, { tableName: "Employees", excludeFields:["BirthDate"] })
+```
+
+### Pass HTTP requests to API
+When you receive a HTTP request, just pass the method, URL ID, body and params to the correct API, which will parse and validate input and return results.
+
+```
+const result:OINOApiResult = await api_orderdetails.doRequest("GET", id, body, params)
+```
+
+### Write results back to HTTP Response
+The results for a GET request will contain [`OINOModelSet`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbModelSet.html) data that can be written out as JSON or CSV as needed. For other requests result is just success or error with messages.
+```
+return new Response(result.data.writeString(OINOContentType.json))
+```
+
+
+# MAIN FEATURES
+
+## RESTfull
+OINO maps HTTP methods GET/POST/PUT/DELETE to SQL operations SELECT/INSERT/UPDATE/DELETE. The GET/POST requests can be made without URL ID to get all rows or insert new ones and others target a single row using URL ID. 
+
+For example HTTP POST 
+```
+Request and response:
+> curl.exe -X POST http://localhost:3001/orderdetails -H "Content-Type: application/json" --data '[{\"OrderID\":11077,\"ProductID\":99,\"UnitPrice\":19,\"Quantity\":1,\"Discount\":0}]'
+{"success":true,"statusCode":200,"statusMessage":"OK","messages":[]}
+
+SQL:
+INSERT INTO [OrderDetails] ("OrderID","ProductID","UnitPrice","Quantity","Discount") VALUES (11077,99,19,1,0);
+```
+
+
+## Universal Serialization
+OINO handles serialization of data to JSON/CSV/etc. and back based on the data model. It knows what columns exist, what is their data type and how to convert each to JSON/CSV and back. This allows also partial data to be sent, i.e. you can send only columns that need updating or even send extra columns and have them ignored.
+
+- Files can be sent to BLOB fields using BASE64 or MIME multipart encoding. Also supports standard HTML form file submission to blob fields and returning them data url images.
+- Datetimes are (optionally) normalized to ISO 8601 format.
+- Extended JSON-encoding
+  - Unquoted literal `undefined` can be used to represent non-existent values (leaving property out works too but preserving structure might be easier e.g. when translating data).
+- CSV
+  - Comma-separated, doublequotes.
+  - Unquoted literal `null` represents null values.
+  - Unquoted empty string represents undefined values.
+- Form data
+  - Multipart-mixed and binary files not supported.
+  - Non-existent value line (i.e. nothing after the empty line) treated as a null value.
+- Url-encoded
+  - No null values, missing properties treated as undefined.
+  - Multiple lines could be used to post multiple rows.
+
+
+## Database Abstraction
+OINO functions as a database abstraction, providing a consistent interface for working with different databases. It abstracts out different conventions in connecting, making queries and formatting data.
+
+Currently supported databases:
+- Bun Sqlite through Bun native implementation
+- Postgresql through [pg](https://www.npmjs.com/package/pg)-package
+- Mariadb / Mysql-support through [mariadb](https://www.npmjs.com/package/mariadb)-package
+- Sql Server through [mssql](https://www.npmjs.com/package/mssql)-package
+
+## Composite Keys
+To support tables with multipart primary keys OINO generates a composite key `_OINOID_` that is included in the result and can be used as the REST ID. For example in the example above table `OrderDetails` has two primary keys `OrderID` and `ProductID` making the `_OINOID_` of form `11077:99`. 
+
+## Power Of SQL
+Since OINO is just generating SQL, WHERE-conditions can be defined with [`OINODbSqlFilter`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlFilter.html), order with [`OINODbSqlOrder`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlOrder.html), limits/paging with [`OINODbSqlLimit`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlLimit.html) and aggregation with [`OINODbSqlAggregate`](https://pragmatta.github.io/oino-ts/classes/db_src.OINODbSqlAggregate.html) that are passed as HTTP request parameters. No more API development where you make unique API endpoints for each filter that fetch all data with original API and filter in backend code. Every API can be filtered when and as needed without unnessecary data tranfer and utilizing SQL indexing when available.
+
+## Swagger Support
+Swagger is great as long as the definitions are updated and with OINO you can automatically get a Swagger definition including a data model schema.
+```
+if (url.pathname == "/swagger.json") {
+  return new Response(JSON.stringify(OINOSwagger.getApiDefinition(api_array)))
+}
+```
+![Swagger definition with a data model schema](img/readme-swagger.png)
+
+## Node support
+OINO is developped Typescript first but compiles to standard CommonJS and the NPM packages should work on either ESM / CommonJS. Checkout sample apps `readmeApp` (ESM) and `nodeApp` (CommonJS).
+
+## HTMX support
+OINO is [htmx.org](https://htmx.org) friendly, allowing easy translation of [`OINODataRow`](https://pragmatta.github.io/oino-ts/types/db_src.OINODataRow.html) to HTML output using templates (cf. the [htmx sample app](https://github.com/pragmatta/oino-ts/tree/main/samples/htmxApp)).
+
+## Hashids
+Autoinc numeric id's are very pragmatic and fit well with OINO (e.g. using a form without primary key fields to insert new rows with database assigned ids). However it's not always sensible to share information about the sequence. Hashids solve this by masking the original values by encrypting the ids using AES-128 and some randomness. Length of the hashid can be chosen from 12-32 characters where longer ids provide more security. However this should not be considereded a cryptographic solution for keeping ids secret but rather making it infeasible to iterate all ids.
+
+
+# STATUS
+OINO is currently a side project which should considered in beta status. That means that semantic versioning is the goal but backwards incompatible changes can still happen in point releases if serious architectual issues are discovered.
+
+## Roadmap
+Major features that are considered in future releases ()
+
+### Support for views
+Simple cases of views probably work already in some databases but edge cases might get complicated.
+
+For example issues could be
+- How to handle a view which does not have a complete private key?
+- What edge cases exist in updating views?
+- Can views be handled transparently to the DBMS or is there some fundamentally platform specific behavior?
+
+### Batch updates
+Supporting batch updates similar to batch inserts is slightly bending the RESTfull principles but would still be a useful optional feature in some situations.
+
+### Streaming
+One core idea is to be efficient in not making unnecessary copies of the data and minimizing garbage collection debt. This can be taken further by implementing streaming, allowing large dataset to be written to HTTP response as SQL result rows are received.
+
+### SQL generation callbacks
+It would be useful to allow developer to validate / override SQL generation to cover cases OINO does not support or even workaround issues.
+
+### Transactions
+Even though the basic case for OINO is executing SQL operations on individual rows, having an option to use SQL transactions could make sense at least for batch operations.
+
+
+# HELP
+
+## Bug reports
+Fixing bugs is a priority and getting good quality bug reports helps. It's recommended to use the sample Northwind database included with project to replicate issues or make an SQL script export of the relevant table.
+
+## Feedback
+Understanding and prioritizing the use cases for OINO is also important and feedback about how you'd use OINO is interesting. Feel free to raise issues and feature requests in Github, but understand that short term most of the effort goes towards reaching the beta stage.
+
+## Typescript / Javascript architecture
+Typescript building with different targets and module-systemts and a ton of configuration is a complex domain and something I have little experience un so help in fixing problems and how thing ought to be done is appreciated.
+
+# LINKS
+- [Github repository](https://github.com/pragmatta/oino-ts)
+- [NPM repository](https://www.npmjs.com/org/oino-ts) 
+
+
+# ACKNOWLEDGEMENTS
+
+## Libraries
+OINO uses the following open source libraries and npm packages and I would like to thank everyone for their contributions:
+- Postgresql [node-postgres package](https://www.npmjs.com/package/pg)
+- Mariadb / Mysql [mariadb package](https://www.npmjs.com/package/mariadb)
+- Sql Server [mssql package](https://www.npmjs.com/package/mssql)
+- Custom base encoding [base-x package](https://www.npmjs.com/package/base-x)
+
+## Bun
+OINO has been developed using the Bun runtime, not because of the speed improvements but for the first class Typescript support and integrated developper experience. Kudos on the bun team for making Typescript work more exiting again.
+
+## SQL Scripts
+The SQL scripts for creating the sample Northwind database are based on [Google Code archive](https://code.google.com/archive/p/northwindextended/downloads) and have been further customized to ensure they would have identical data (in the scope of the automated testing).

package/package.json

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

package/src/OINOHashid.test.ts

@@ -1,79 +1,79 @@
-/*
- * 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/.
- */
-
-import { expect, test } from "bun:test";
-
-import { OINOHASHID_MAX_LENGTH, OINOHashid } from "./OINOHashid";
-import { OINOLog, OINOConsoleLog, OINOLogLevel } from "@oino-ts/common"
-
-Math.random()
-
-OINOLog.setInstance(new OINOConsoleLog(OINOLogLevel.error))
-
-function benchmarkOINOHashId(hashid: OINOHashid, id: string, iterations: number = 1000): number {
-    const start = performance.now();
-
-    for (let i = 0; i < iterations; i++) {
-        const h = hashid.encode(id, '');
-        hashid.decode(h)
-    }
-
-    const end = performance.now();
-    const duration = end - start;
-    return Math.round(iterations / duration)
-}   
-
-await test("OINOHashId persistent", async () => {
-
-    let hps_min = Number.MAX_VALUE
-    let hps_max = 0
-    
-    for (let j=12; j<=OINOHASHID_MAX_LENGTH; j++) {
-        const hashid:OINOHashid = new OINOHashid('c7a87c6a5df870842eb6ef6d7937f0b4', 'OINOHashIdTestApp-persistent', j, true) 
-        let i:number = 1
-        let id:string = ''
-        while (i <= j) {
-            id += i % 10
-            const hashed_id = hashid.encode(id, '')
-            const id2 = hashid.decode(hashed_id)
-            // console.log("j: " + j + ", i: " + i + ", id: " + id + ", hashed_id: " + hashed_id)
-            expect(id).toMatch(id2)
-            i++
-        }
-        const hps = benchmarkOINOHashId(hashid, id, 2000)
-        hps_min = Math.min(hps, hps_min)
-        hps_max = Math.max(hps, hps_max)
-        expect(hps_min).toBeGreaterThanOrEqual(30)
-        expect(hps_max).toBeLessThanOrEqual(150)
-    }
-    console.log("OINOHashId persistent performance: " + hps_min + "k - " + hps_max + "k hashes per second")
-})
-    
-await test("OINOHashId random", async () => {
-
-    let hps_min = Number.MAX_VALUE
-    let hps_max = 0
-    
-    for (let j=12; j<=OINOHASHID_MAX_LENGTH; j++) {
-        const hashid:OINOHashid = new OINOHashid('c7a87c6a5df870842eb6ef6d7937f0b4', 'OINOHashIdTestApp-random', j, false) 
-        let i:number = 1
-        let id:string = ''
-        while (i <= j) {
-            id += i % 10
-            const hashed_id = hashid.encode(id, '')
-            const id2 = hashid.decode(hashed_id)
-            // console.log("j: " + j + ", i: " + i + ", id: " + id + ", hashed_id: " + hashed_id)
-            expect(id).toMatch(id2)
-            i++
-        }
-        const hps = benchmarkOINOHashId(hashid, id, 2000)
-        hps_min = Math.min(hps, hps_min)
-        hps_max = Math.max(hps, hps_max)
-    }
-    console.log("OINOHashId random performance: " + hps_min + "k - " + hps_max + "k hashes per second")
-})
-
-
+/*
+ * 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/.
+ */
+
+import { expect, test } from "bun:test";
+
+import { OINOHASHID_MAX_LENGTH, OINOHashid } from "./OINOHashid";
+import { OINOLog, OINOConsoleLog, OINOLogLevel } from "@oino-ts/common"
+
+Math.random()
+
+OINOLog.setInstance(new OINOConsoleLog(OINOLogLevel.error))
+
+function benchmarkOINOHashId(hashid: OINOHashid, id: string, iterations: number = 1000): number {
+    const start = performance.now();
+
+    for (let i = 0; i < iterations; i++) {
+        const h = hashid.encode(id, '');
+        hashid.decode(h)
+    }
+
+    const end = performance.now();
+    const duration = end - start;
+    return Math.round(iterations / duration)
+}   
+
+await test("OINOHashId persistent", async () => {
+
+    let hps_min = Number.MAX_VALUE
+    let hps_max = 0
+    
+    for (let j=12; j<=OINOHASHID_MAX_LENGTH; j++) {
+        const hashid:OINOHashid = new OINOHashid('c7a87c6a5df870842eb6ef6d7937f0b4', 'OINOHashIdTestApp-persistent', j, true) 
+        let i:number = 1
+        let id:string = ''
+        while (i <= j) {
+            id += i % 10
+            const hashed_id = hashid.encode(id, '')
+            const id2 = hashid.decode(hashed_id)
+            // console.log("j: " + j + ", i: " + i + ", id: " + id + ", hashed_id: " + hashed_id)
+            expect(id).toMatch(id2)
+            i++
+        }
+        const hps = benchmarkOINOHashId(hashid, id, 2000)
+        hps_min = Math.min(hps, hps_min)
+        hps_max = Math.max(hps, hps_max)
+        expect(hps_min).toBeGreaterThanOrEqual(30)
+        expect(hps_max).toBeLessThanOrEqual(150)
+    }
+    console.log("OINOHashId persistent performance: " + hps_min + "k - " + hps_max + "k hashes per second")
+})
+    
+await test("OINOHashId random", async () => {
+
+    let hps_min = Number.MAX_VALUE
+    let hps_max = 0
+    
+    for (let j=12; j<=OINOHASHID_MAX_LENGTH; j++) {
+        const hashid:OINOHashid = new OINOHashid('c7a87c6a5df870842eb6ef6d7937f0b4', 'OINOHashIdTestApp-random', j, false) 
+        let i:number = 1
+        let id:string = ''
+        while (i <= j) {
+            id += i % 10
+            const hashed_id = hashid.encode(id, '')
+            const id2 = hashid.decode(hashed_id)
+            // console.log("j: " + j + ", i: " + i + ", id: " + id + ", hashed_id: " + hashed_id)
+            expect(id).toMatch(id2)
+            i++
+        }
+        const hps = benchmarkOINOHashId(hashid, id, 2000)
+        hps_min = Math.min(hps, hps_min)
+        hps_max = Math.max(hps, hps_max)
+    }
+    console.log("OINOHashId random performance: " + hps_min + "k - " + hps_max + "k hashes per second")
+})
+
+

package/src/OINOHashid.ts

@@ -1,113 +1,113 @@
-/*
- * 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/.
- */
-
-import { BinaryLike, createCipheriv, createDecipheriv, createHmac, randomFillSync } from 'node:crypto';
-import basex from 'base-x'
-
-export const OINOHASHID_MIN_LENGTH:number = 12
-export const OINOHASHID_MAX_LENGTH:number = 42
-const OINOHASHID_ALPHABET:string = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
-const hashidEncoder = basex(OINOHASHID_ALPHABET)
-
-/**
- * Hashid implementation for OINO API:s for the purpose of making it infeasible to scan 
- * through numeric autoinc keys. It's not a solution to keeping the id secret in insecure
- * channels, just making it hard enough to not iterate through the entire key space. Half 
- * of the the hashid length is nonce and half cryptotext, i.e. 16 char hashid 8 chars of 
- * base64 encoded nonce ~ 6 bytes or 48 bits of entropy. 
- *
- */
-export class OINOHashid {
-
-    private _key:Buffer
-    private _iv:Buffer
-    private _domainId:string
-    private _minLength:number
-    private _staticIds
-
-    /**
-     * Hashid constructor
-     * 
-     * @param key AES128 key (32 char hex-string)
-     * @param domainId a sufficiently unique domain ID in which row-Id's are unique
-     * @param minLength minimum length of nonce and crypto
-     * @param staticIds whether hash values should remain static per row or random values 
-     * 
-     */
-    constructor (key: string, domainId:string, minLength:number = OINOHASHID_MIN_LENGTH, staticIds:boolean = false) {
-        this._domainId = domainId
-        if ((minLength < OINOHASHID_MIN_LENGTH) || (minLength > OINOHASHID_MAX_LENGTH)) {
-            throw Error("OINOHashid minLength (" + minLength + ")needs to be between " + OINOHASHID_MIN_LENGTH + " and " + OINOHASHID_MAX_LENGTH + "!")
-        }
-        this._minLength = Math.ceil(minLength/2)
-        if (key.length != 32) {
-            throw Error("OINOHashid key needs to be a 32 character hex-string!")
-        }
-        this._staticIds = staticIds
-        this._key = Buffer.from(key, 'hex')
-        this._iv = Buffer.alloc(16)
-    }
-
-    /**
-     * Encode given id value as a hashid either using random data or given seed value for nonce.
-     * 
-     * @param id numeric value
-     * @param cellSeed a sufficiently unique seed for the current cell to keep hashids unique but persistent (e.g. fieldname + primarykey values)
-     * 
-     */
-    encode(id:string, cellSeed:string = ""):string {
-
-        // if seed was given use it for pseudorandom chars, otherwise generate them
-        let random_chars:string = ""
-        if (this._staticIds) {
-            const hmac_seed = createHmac('sha256', this._key as BinaryLike)
-            hmac_seed.update(this._domainId + " " + cellSeed)
-            random_chars = hashidEncoder.encode(hmac_seed.digest() as Uint8Array) 
-            
-        } else {
-            randomFillSync(this._iv as Uint8Array, 0, 16)
-            random_chars = hashidEncoder.encode(this._iv as Uint8Array) 
-        }
-        const hmac = createHmac('sha256', this._key as Uint8Array)
-        let iv_seed:string = random_chars.substring(0, this._minLength)
-        hmac.update(this._domainId + " " + iv_seed)
-        const iv_data:Buffer = hmac.digest()
-        iv_data.copy(this._iv as Uint8Array, 0, 0, 16) 
-
-        let plaintext = id.toString()
-        if (plaintext.length < this._minLength) {
-            plaintext += " " + random_chars.substring(random_chars.length - (this._minLength - plaintext.length - 1))
-        }
-
-        const cipher = createCipheriv('aes-128-gcm', this._key as Uint8Array, this._iv as Uint8Array)
-        const cryptotext = hashidEncoder.encode(cipher.update(plaintext, 'utf8') as Uint8Array) + hashidEncoder.encode(cipher.final() as Uint8Array)
-        return iv_seed + cryptotext
-    }
-
-    /**
-     * Decode given hashid.
-     * 
-     * @param hashid value
-     * 
-     */
-    decode(hashid:string):string {
-        // reproduce nonce from seed
-        const hmac = createHmac('sha256', this._key as Uint8Array)
-        const iv_seed = hashid.substring(0, this._minLength)
-        hmac.update(this._domainId + " " + iv_seed)
-        const hash:Buffer = hmac.digest()
-        hash.copy(this._iv as Uint8Array, 0, 0, 16)
-
-        const cryptotext:string = hashid.substring(this._minLength)
-        const cryptobytes:Buffer = Buffer.from(hashidEncoder.decode(cryptotext))
-        const decipher = createDecipheriv('aes-128-gcm', this._key as Uint8Array, this._iv as Uint8Array)
-        const plaintext = decipher.update(cryptobytes as Uint8Array, undefined, 'utf8') 
-        
-        return plaintext.split(" ")[0]
-    }
-
-
-}
+/*
+ * 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/.
+ */
+
+import { BinaryLike, createCipheriv, createDecipheriv, createHmac, randomFillSync } from 'node:crypto';
+import basex from 'base-x'
+
+export const OINOHASHID_MIN_LENGTH:number = 12
+export const OINOHASHID_MAX_LENGTH:number = 42
+const OINOHASHID_ALPHABET:string = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+const hashidEncoder = basex(OINOHASHID_ALPHABET)
+
+/**
+ * Hashid implementation for OINO API:s for the purpose of making it infeasible to scan 
+ * through numeric autoinc keys. It's not a solution to keeping the id secret in insecure
+ * channels, just making it hard enough to not iterate through the entire key space. Half 
+ * of the the hashid length is nonce and half cryptotext, i.e. 16 char hashid 8 chars of 
+ * base64 encoded nonce ~ 6 bytes or 48 bits of entropy. 
+ *
+ */
+export class OINOHashid {
+
+    private _key:Buffer
+    private _iv:Buffer
+    private _domainId:string
+    private _minLength:number
+    private _staticIds
+
+    /**
+     * Hashid constructor
+     * 
+     * @param key AES128 key (32 char hex-string)
+     * @param domainId a sufficiently unique domain ID in which row-Id's are unique
+     * @param minLength minimum length of nonce and crypto
+     * @param staticIds whether hash values should remain static per row or random values 
+     * 
+     */
+    constructor (key: string, domainId:string, minLength:number = OINOHASHID_MIN_LENGTH, staticIds:boolean = false) {
+        this._domainId = domainId
+        if ((minLength < OINOHASHID_MIN_LENGTH) || (minLength > OINOHASHID_MAX_LENGTH)) {
+            throw Error("OINOHashid minLength (" + minLength + ")needs to be between " + OINOHASHID_MIN_LENGTH + " and " + OINOHASHID_MAX_LENGTH + "!")
+        }
+        this._minLength = Math.ceil(minLength/2)
+        if (key.length != 32) {
+            throw Error("OINOHashid key needs to be a 32 character hex-string!")
+        }
+        this._staticIds = staticIds
+        this._key = Buffer.from(key, 'hex')
+        this._iv = Buffer.alloc(16)
+    }
+
+    /**
+     * Encode given id value as a hashid either using random data or given seed value for nonce.
+     * 
+     * @param id numeric value
+     * @param cellSeed a sufficiently unique seed for the current cell to keep hashids unique but persistent (e.g. fieldname + primarykey values)
+     * 
+     */
+    encode(id:string, cellSeed:string = ""):string {
+
+        // if seed was given use it for pseudorandom chars, otherwise generate them
+        let random_chars:string = ""
+        if (this._staticIds) {
+            const hmac_seed = createHmac('sha256', this._key as BinaryLike)
+            hmac_seed.update(this._domainId + " " + cellSeed)
+            random_chars = hashidEncoder.encode(hmac_seed.digest() as Uint8Array) 
+            
+        } else {
+            randomFillSync(this._iv as Uint8Array, 0, 16)
+            random_chars = hashidEncoder.encode(this._iv as Uint8Array) 
+        }
+        const hmac = createHmac('sha256', this._key as Uint8Array)
+        let iv_seed:string = random_chars.substring(0, this._minLength)
+        hmac.update(this._domainId + " " + iv_seed)
+        const iv_data:Buffer = hmac.digest()
+        iv_data.copy(this._iv as Uint8Array, 0, 0, 16) 
+
+        let plaintext = id.toString()
+        if (plaintext.length < this._minLength) {
+            plaintext += " " + random_chars.substring(random_chars.length - (this._minLength - plaintext.length - 1))
+        }
+
+        const cipher = createCipheriv('aes-128-gcm', this._key as Uint8Array, this._iv as Uint8Array)
+        const cryptotext = hashidEncoder.encode(cipher.update(plaintext, 'utf8') as Uint8Array) + hashidEncoder.encode(cipher.final() as Uint8Array)
+        return iv_seed + cryptotext
+    }
+
+    /**
+     * Decode given hashid.
+     * 
+     * @param hashid value
+     * 
+     */
+    decode(hashid:string):string {
+        // reproduce nonce from seed
+        const hmac = createHmac('sha256', this._key as Uint8Array)
+        const iv_seed = hashid.substring(0, this._minLength)
+        hmac.update(this._domainId + " " + iv_seed)
+        const hash:Buffer = hmac.digest()
+        hash.copy(this._iv as Uint8Array, 0, 0, 16)
+
+        const cryptotext:string = hashid.substring(this._minLength)
+        const cryptobytes:Buffer = Buffer.from(hashidEncoder.decode(cryptotext))
+        const decipher = createDecipheriv('aes-128-gcm', this._key as Uint8Array, this._iv as Uint8Array)
+        const plaintext = decipher.update(cryptobytes as Uint8Array, undefined, 'utf8') 
+        
+        return plaintext.split(" ")[0]
+    }
+
+
+}

package/src/index.ts

@@ -1 +1 @@
-export { OINOHashid } from "./OINOHashid.js"
+export { OINOHashid } from "./OINOHashid.js"