mybase 1.1.40 → 1.1.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.1.40",
+  "version": "1.1.41",
   "description": "",
   "main": "mybase.js",
   "scripts": {
@@ -23,6 +23,7 @@
     "ip6": "=0.2.7",
     "ip6addr": "github:7c/node-ip6addr#db6d558af1f314bcb0a733fd61611fa85e1a3eff",
     "js-sha512": "^0.8.0",
+    "knex": "^3.1.0",
     "mysql": "^2.18.1",
     "mysql2": "^3.9.1",
     "node-vault": "^0.10.2",

package/ts/funcs/knexConnection.d.ts

@@ -0,0 +1,8 @@
+import knex from "knex";
+export declare function knexConnection(connection: {
+    host: string;
+    port: number;
+    password: string;
+    db: string;
+    login: string;
+}, poolConfiguration?: knex.Knex.PoolConfig, acquireConnectionTimeout?: number, debug?: boolean): knex.Knex<any, unknown[]>;

package/ts/funcs/knexConnection.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.knexConnection = void 0;
+const debug_1 = __importDefault(require("debug"));
+const knex_1 = __importDefault(require("knex"));
+const dbg = (0, debug_1.default)('_knexConnection');
+function knexConnection(connection, poolConfiguration = {
+    min: 1,
+    max: 10
+}, acquireConnectionTimeout = 10000, debug = false) {
+    return (0, knex_1.default)({
+        client: 'mysql2',
+        debug,
+        connection: {
+            host: connection.host,
+            port: connection.port,
+            password: connection.password,
+            database: connection.db,
+            user: connection.login
+        },
+        pool: poolConfiguration,
+        acquireConnectionTimeout,
+        log: {
+            warn(message) {
+                dbg('knex warn', message);
+            },
+            error(message) {
+                dbg('knex error', message);
+            },
+            deprecate(message) {
+                dbg('knex deprecate', message);
+            },
+            debug(message) {
+                if (debug)
+                    console.log('knex debug', message);
+            },
+        }
+    });
+}
+exports.knexConnection = knexConnection;
+//# sourceMappingURL=knexConnection.js.map

package/ts/funcs/knexConnection.ts

@@ -0,0 +1,42 @@
+import debug from "debug"
+import knex from "knex"
+const dbg = debug('_knexConnection')
+
+export function knexConnection(connection:{
+    host: string,
+    port: number,
+    password: string,
+    db: string,
+    login: string
+}, poolConfiguration:knex.Knex.PoolConfig= {
+    min: 1,
+    max: 10
+}, acquireConnectionTimeout:number=10000, debug: boolean = false) {
+    return knex({
+        client: 'mysql2',
+        debug,
+        connection:{ 
+            host: connection.host,
+            port: connection.port,
+            password: connection.password,
+            database: connection.db, 
+            user: connection.login
+        },
+        pool: poolConfiguration,
+        acquireConnectionTimeout,
+        log: {
+            warn(message: string) {
+                dbg('knex warn', message)
+            },
+            error(message: string) {
+                dbg('knex error', message)
+            },
+            deprecate(message: string) {
+                dbg('knex deprecate', message)
+            },
+            debug(message: string) {
+                if (debug) console.log('knex debug', message)
+            },
+          }
+    } as knex.Knex.Config)
+}

package/ts/index.d.ts

@@ -25,6 +25,7 @@ export * from "./funcs/initMysql2Pool";
 export * from "./funcs/randomUTFString";
 export * from "./funcs/MaxRuntimeHours";
 export * from "./funcs/ensureFolder";
+export * from "./funcs/knexConnection";
 export * from "./models/Unixtime";
 export * from "./models/Timespan";
 export * from "./models/IPAddress";

package/ts/index.js

@@ -41,6 +41,7 @@ __exportStar(require("./funcs/initMysql2Pool"), exports);
 __exportStar(require("./funcs/randomUTFString"), exports);
 __exportStar(require("./funcs/MaxRuntimeHours"), exports);
 __exportStar(require("./funcs/ensureFolder"), exports);
+__exportStar(require("./funcs/knexConnection"), exports);
 // models
 __exportStar(require("./models/Unixtime"), exports);
 __exportStar(require("./models/Timespan"), exports);

package/ts/index.ts

@@ -25,6 +25,7 @@ export * from "./funcs/initMysql2Pool"
 export * from "./funcs/randomUTFString"
 export * from "./funcs/MaxRuntimeHours"
 export * from "./funcs/ensureFolder"
+export * from "./funcs/knexConnection"
 
 
 // models