mybase 1.1.44 → 1.1.46

package/README.md

@@ -11,6 +11,12 @@ import { UnixtimeShort } from 'mybase/ts/types'
 var { isLocal } = require('mybase')
 ```
 
+## Models
+- Interfaces
+- Unixtime
+- Timespan
+- OTPGenerator
+- IPAddress
 
 # Methods
 `vaultRead(vaultHandle,key) <Promise>` : Reads Vault Key

package/mybase.js

@@ -118,6 +118,7 @@ function utcnow() { // ported
 }
 
 function validIp(str) { // ported
+    console.log(`WARNING: validIp is deprecated, use validIpNative or IPAddress model`)
     if (str && typeof str==='string') {
         let splitted
         if (splitted=str.match(/^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)$/)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.1.44",
+  "version": "1.1.46",
   "description": "",
   "main": "mybase.js",
   "scripts": {

package/ts/funcs/Geoip2Paths.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Geoip2Paths = void 0;
+exports.Geoip2Paths = Geoip2Paths;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 function Geoip2Paths() {
@@ -22,5 +22,4 @@ function Geoip2Paths() {
         ct: firstExisting(['/opt/geoip2/GeoIP2-Connection-Type.mmdb', '/usr/local/var/GeoIP/GeoIP2-Connection-Type.mmdb', '/var/lib/GeoIP/GeoIP2-Connection-Type.mmdb', '/usr/share/GeoIP/GeoIP2-Connection-Type.mmdb', path_1.default.join(__dirname, 'assets/GeoIP2-Connection-Type.mmdb'), path_1.default.join(((_d = require === null || require === void 0 ? void 0 : require.main) === null || _d === void 0 ? void 0 : _d.path) || __dirname, 'assets/GeoIP2-Connection-Type.mmdb')]),
     };
 }
-exports.Geoip2Paths = Geoip2Paths;
 //# sourceMappingURL=Geoip2Paths.js.map

package/ts/funcs/MaxRuntimeHours.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MaxRuntimeHours = void 0;
+exports.MaxRuntimeHours = MaxRuntimeHours;
 function MaxRuntimeHours(hours = 24) {
     setTimeout(() => {
         console.log(`Max runtime of ${hours} hours reached, exiting`);
         process.exit(0);
     }, hours * 60 * 60 * 1000);
 }
-exports.MaxRuntimeHours = MaxRuntimeHours;
 //# sourceMappingURL=MaxRuntimeHours.js.map

package/ts/funcs/asJSON.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.asJSON = void 0;
+exports.asJSON = asJSON;
 function asJSON(inputString) {
     if (!inputString || typeof inputString !== 'string')
         return false;
@@ -10,5 +10,4 @@ function asJSON(inputString) {
     catch (_) { }
     return false;
 }
-exports.asJSON = asJSON;
 //# sourceMappingURL=asJSON.js.map

package/ts/funcs/ensureFolder.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="node" />
 import { MakeDirectoryOptions } from 'fs';
 export declare function ensureFolder(folderPath: string, options?: MakeDirectoryOptions | null): string;

package/ts/funcs/ensureFolder.js

@@ -15,18 +15,28 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureFolder = void 0;
+exports.ensureFolder = ensureFolder;
 const debug_1 = __importDefault(require("debug"));
 const fs = __importStar(require("fs"));
 const dbg = (0, debug_1.default)('_mybase:ensureFolder');
@@ -46,5 +56,4 @@ function ensureFolder(folderPath, options) {
     fs.mkdirSync(folderPath, options);
     return folderPath;
 }
-exports.ensureFolder = ensureFolder;
 //# sourceMappingURL=ensureFolder.js.map

package/ts/funcs/fileCacheIsValid.js

@@ -15,15 +15,25 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileCacheIsValid = void 0;
+exports.fileCacheIsValid = fileCacheIsValid;
 const fs = __importStar(require("fs"));
 function fileCacheIsValid(cacheFileName, cache_in_minutes = 60) {
     if (fs.existsSync(cacheFileName)) {
@@ -36,5 +46,4 @@ function fileCacheIsValid(cacheFileName, cache_in_minutes = 60) {
     }
     return false;
 }
-exports.fileCacheIsValid = fileCacheIsValid;
 //# sourceMappingURL=fileCacheIsValid.js.map

package/ts/funcs/getMysql1.js

@@ -15,18 +15,28 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMysql1 = void 0;
+exports.getMysql1 = getMysql1;
 const mysql1 = __importStar(require("mysql"));
 const debug_1 = __importDefault(require("debug"));
 const dbg = (0, debug_1.default)("getMysql1");
@@ -58,5 +68,4 @@ async function getMysql1(config, pingInterval = 0) {
         });
     });
 }
-exports.getMysql1 = getMysql1;
 //# sourceMappingURL=getMysql1.js.map

package/ts/funcs/getMysql2.js

@@ -15,18 +15,28 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getMysql2 = void 0;
+exports.getMysql2 = getMysql2;
 const mysql2 = __importStar(require("mysql2"));
 const debug_1 = __importDefault(require("debug"));
 const dbg = (0, debug_1.default)("getMysql2");
@@ -58,5 +68,4 @@ async function getMysql2(config, pingInterval = 0) {
         });
     });
 }
-exports.getMysql2 = getMysql2;
 //# sourceMappingURL=getMysql2.js.map

package/ts/funcs/getWeekNumber.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWeekNumber = void 0;
+exports.getWeekNumber = getWeekNumber;
 // credit: https://stackoverflow.com/questions/6117814/get-week-of-year-in-javascript-like-in-php
 /* For a given date, get the ISO week number
  
@@ -32,5 +32,4 @@ function getWeekNumber(d = new Date()) {
     // Return the week number
     return weekNo;
 }
-exports.getWeekNumber = getWeekNumber;
 //# sourceMappingURL=getWeekNumber.js.map

package/ts/funcs/hash_sha512.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hash_sha512 = void 0;
+exports.hash_sha512 = hash_sha512;
 const js_sha512_1 = require("js-sha512");
 function hash_sha512(plainString) {
     if (typeof plainString === 'string')
         return (0, js_sha512_1.sha512)(plainString);
     return "";
 }
-exports.hash_sha512 = hash_sha512;
 //# sourceMappingURL=hash_sha512.js.map

package/ts/funcs/initMysql2Pool.js

@@ -15,18 +15,28 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.initMysql2Pool = void 0;
+exports.initMysql2Pool = initMysql2Pool;
 const mysql2 = __importStar(require("mysql2"));
 const debug_1 = __importDefault(require("debug"));
 const dbg = (0, debug_1.default)("initMysql2Pool");
@@ -35,5 +45,4 @@ function initMysql2Pool(sqlServer) {
     dbg(`creating mysql pool to ${sqlServer.host}@${sqlServer.db} as connectionUri=${connectionUri}`);
     return mysql2.createPool(connectionUri);
 }
-exports.initMysql2Pool = initMysql2Pool;
 //# sourceMappingURL=initMysql2Pool.js.map

package/ts/funcs/int2ip.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.int2ip = void 0;
+exports.int2ip = int2ip;
 const net_1 = __importDefault(require("net"));
 //we only support ipv4
 function int2ip(ipInt) {
@@ -14,5 +14,4 @@ function int2ip(ipInt) {
         throw new Error(`Invalid IP: ${ip4}`);
     return ip4;
 }
-exports.int2ip = int2ip;
 //# sourceMappingURL=int2ip.js.map

package/ts/funcs/ip2int.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ip2int = void 0;
+exports.ip2int = ip2int;
 const net_1 = __importDefault(require("net"));
 // function int2ip (ipInt) {
 //     return ( (ipInt>>>24) +'.' + (ipInt>>16 & 255) +'.' + (ipInt>>8 & 255) +'.' + (ipInt & 255) );
@@ -14,5 +14,4 @@ function ip2int(ip) {
         throw new Error(`Invalid IP: ${ip}`);
     return ip.split('.').reduce(function (ipInt, octet) { return (ipInt << 8) + parseInt(octet, 10); }, 0) >>> 0;
 }
-exports.ip2int = ip2int;
 //# sourceMappingURL=ip2int.js.map

package/ts/funcs/isLANIp.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@root/ip6addr" />
 import ip6addr from 'ip6addr';
 export declare const private_network_cidrs: ip6addr.CIDR[];
 export declare function isLANIp(ip: string): boolean;

package/ts/funcs/isLANIp.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLANIp = exports.private_network_cidrs = void 0;
+exports.private_network_cidrs = void 0;
+exports.isLANIp = isLANIp;
 const ip6addr_1 = __importDefault(require("ip6addr"));
 const net_1 = __importDefault(require("net"));
 exports.private_network_cidrs = [
@@ -35,7 +36,6 @@ function isLANIp(ip) {
     }
     return false;
 }
-exports.isLANIp = isLANIp;
 function normalizeIp(ip) {
     // also support ipv6
     if (net_1.default.isIP(ip) === 0)

package/ts/funcs/isLocal.js

@@ -3,10 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLocal = void 0;
+exports.isLocal = isLocal;
 const os_1 = __importDefault(require("os"));
 function isLocal() {
     return (os_1.default.type() === 'Darwin');
 }
-exports.isLocal = isLocal;
 //# sourceMappingURL=isLocal.js.map

package/ts/funcs/isLoopbackIP.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@root/ip6addr" />
 import ip6addr from 'ip6addr';
 export declare const local_network_cidrs: ip6addr.CIDR[];
 export declare function isLoopbackIP(ip: string): boolean;

package/ts/funcs/isLoopbackIP.js

@@ -3,7 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isLoopbackIP = exports.local_network_cidrs = void 0;
+exports.local_network_cidrs = void 0;
+exports.isLoopbackIP = isLoopbackIP;
 const ip6addr_1 = __importDefault(require("ip6addr"));
 const net_1 = __importDefault(require("net"));
 exports.local_network_cidrs = [
@@ -30,7 +31,6 @@ function isLoopbackIP(ip) {
     }
     return false;
 }
-exports.isLoopbackIP = isLoopbackIP;
 function normalizeIp(ip) {
     // also support ipv6
     if (net_1.default.isIP(ip) === 0)

package/ts/funcs/knexConnection.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.knexConnection = void 0;
+exports.knexConnection = knexConnection;
 const debug_1 = __importDefault(require("debug"));
 const knex_1 = __importDefault(require("knex"));
 const dbg = (0, debug_1.default)('_knexConnection');
@@ -40,5 +40,4 @@ function knexConnection(connection, poolConfiguration = {
         }
     });
 }
-exports.knexConnection = knexConnection;
 //# sourceMappingURL=knexConnection.js.map

package/ts/funcs/promiseTimeout.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promiseTimeout = void 0;
+exports.promiseTimeout = promiseTimeout;
 function promiseTimeout(miliseconds, inputPromise, onTimeout = 'TIMEDOUT') {
     // Create a promise that rejects in <miliseconds> milliseconds
     let timeout = new Promise((resolve, reject) => {
@@ -15,5 +15,4 @@ function promiseTimeout(miliseconds, inputPromise, onTimeout = 'TIMEDOUT') {
         timeout
     ]);
 }
-exports.promiseTimeout = promiseTimeout;
 //# sourceMappingURL=promiseTimeout.js.map

package/ts/funcs/randomIP.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomIP = void 0;
+exports.randomIP = randomIP;
 function randomIP() {
     function int2ip(ipInt) {
         return ((ipInt >>> 24) + '.' + (ipInt >> 16 & 255) + '.' + (ipInt >> 8 & 255) + '.' + (ipInt & 255));
     }
     return int2ip(Math.random() * Math.pow(2, 32));
 }
-exports.randomIP = randomIP;
 //# sourceMappingURL=randomIP.js.map

package/ts/funcs/randomIP6.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomIP6 = void 0;
+exports.randomIP6 = randomIP6;
 const crypto_1 = require("crypto");
 // const ip6 = require('ip6')
 //@ts-ignore
@@ -13,5 +13,4 @@ function randomIP6() {
     const bytes = (0, crypto_1.randomBytes)(16);
     return ip6_1.default.abbreviate(ip6_1.default.normalize(((_a = bytes.toString('hex').match(/.{1,4}/g)) === null || _a === void 0 ? void 0 : _a.join(':')) || '0000:0000:0000:0000:0000:0000:0000:0000'));
 }
-exports.randomIP6 = randomIP6;
 //# sourceMappingURL=randomIP6.js.map

package/ts/funcs/randomString.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomString = void 0;
+exports.randomString = randomString;
 function randomString(length = 10, charSet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789") {
     return Array.from({ length }, () => charSet.charAt(Math.floor(Math.random() * charSet.length))).join('');
 }
-exports.randomString = randomString;
 //# sourceMappingURL=randomString.js.map

package/ts/funcs/randomTCPPort.js

@@ -15,15 +15,25 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomTCPPort = void 0;
+exports.randomTCPPort = randomTCPPort;
 const net = __importStar(require("net"));
 /**
  * This function returns a random port number that is not in use and we should validate this port number by trying to listen to it and releasing
@@ -84,5 +94,4 @@ async function randomTCPPort(timeout = 1000, fromPort = 1025, untilPort = 65534,
             return resolve(false);
     });
 }
-exports.randomTCPPort = randomTCPPort;
 //# sourceMappingURL=randomTCPPort.js.map

package/ts/funcs/randomUTFString.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.randomUTFString = void 0;
+exports.randomUTFString = randomUTFString;
 function randomUTFString(minLength, maxLength, includeAscii = true) {
     // Extended characters set including various languages and symbols
     let characters = 'àáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ' + // Accented Latin characters
@@ -27,5 +27,4 @@ function randomUTFString(minLength, maxLength, includeAscii = true) {
         result += Array.from(characters)[Math.floor(Math.random() * charactersLength)];
     return result;
 }
-exports.randomUTFString = randomUTFString;
 //# sourceMappingURL=randomUTFString.js.map

package/ts/funcs/utcnow.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.utcnow = void 0;
+exports.utcnow = utcnow;
 function utcnow() {
     return Math.floor(Date.now() / 1000);
 }
-exports.utcnow = utcnow;
 //# sourceMappingURL=utcnow.js.map

package/ts/funcs/validEmail.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validEmail = void 0;
+exports.validEmail = validEmail;
 const validator_1 = __importDefault(require("validator"));
 function validEmail(email) {
     if (typeof email === 'string')
@@ -17,5 +17,4 @@ function validEmail(email) {
         email = email.toLowerCase().trim();
     return (/(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])/).test(email);
 }
-exports.validEmail = validEmail;
 //# sourceMappingURL=validEmail.js.map

package/ts/funcs/validIp.js

@@ -15,18 +15,27 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validIp = void 0;
+exports.validIp = validIp;
 const net = __importStar(require("net"));
 function validIp(IPAddress) {
     return net.isIP(IPAddress);
 }
-exports.validIp = validIp;
 //# sourceMappingURL=validIp.js.map

package/ts/funcs/vaultFill.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vaultFill = void 0;
+exports.vaultFill = vaultFill;
 const debug_1 = require("debug");
 const vaultRead_1 = require("./vaultRead");
 const dbg = (0, debug_1.debug)('vaultFill');
@@ -35,7 +35,6 @@ function vaultFill(vaultInstance, inputObject, ignoreError = false, keepCache =
         resolve(true);
     });
 }
-exports.vaultFill = vaultFill;
 function findVaultKeyMappings(config, keys = Array()) {
     for (var i in config) {
         if (config[i] !== null) {

package/ts/funcs/vaultRead.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vaultRead = void 0;
+exports.vaultRead = vaultRead;
 const debug_1 = require("debug");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const node_fs_1 = require("node:fs");
+const fs_2 = require("fs");
 const fileCacheIsValid_1 = require("./fileCacheIsValid");
 const global_1 = require("../global");
 const hash_sha512_1 = require("./hash_sha512");
@@ -18,7 +18,7 @@ function vaultRead(vaultInstance, vaultKey, cache_in_minutes = 10) {
     return new Promise((resolve, reject) => {
         let cache_file = path_1.default.join(global_1.vault_cache_folder, (0, hash_sha512_1.hash_sha512)(`${vaultInstance.endpoint}/${vaultKey}`));
         if (cache_in_minutes > 0 && (0, fileCacheIsValid_1.fileCacheIsValid)(cache_file, cache_in_minutes))
-            return resolve(JSON.parse((0, node_fs_1.readFileSync)(cache_file).toString()));
+            return resolve(JSON.parse((0, fs_2.readFileSync)(cache_file).toString()));
         vaultInstance.read(vaultKey).then((r) => {
             if (r.data) {
                 dbg(`vault ${vaultKey} - success`);
@@ -48,5 +48,4 @@ function vaultRead(vaultInstance, vaultKey, cache_in_minutes = 10) {
         });
     });
 }
-exports.vaultRead = vaultRead;
 //# sourceMappingURL=vaultRead.js.map

package/ts/funcs/vaultRead.ts

@@ -2,7 +2,7 @@ import { debug } from "debug"
 import nodeVault from "node-vault";
 import path from "path";
 import fs from "fs";
-import { readFileSync } from 'node:fs';
+import { readFileSync } from 'fs';
 import { fileCacheIsValid } from "./fileCacheIsValid";
 import { vault_cache_folder } from "../global";
 import { hash_sha512 } from "./hash_sha512";

package/ts/funcs/wait.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wait = void 0;
+exports.wait = wait;
 function wait(seconds = 1) {
     return new Promise((resolve, reject) => {
         setTimeout(resolve, seconds * 1000);
     });
 }
-exports.wait = wait;
 //# sourceMappingURL=wait.js.map

package/ts/index.d.ts

@@ -30,3 +30,4 @@ export * from "./models/Unixtime";
 export * from "./models/Timespan";
 export * from "./models/IPAddress";
 export * from "./models/OTPGenerator";
+export * from "./models/Interfaces";

package/ts/index.js

@@ -47,4 +47,5 @@ __exportStar(require("./models/Unixtime"), exports);
 __exportStar(require("./models/Timespan"), exports);
 __exportStar(require("./models/IPAddress"), exports);
 __exportStar(require("./models/OTPGenerator"), exports);
+__exportStar(require("./models/Interfaces"), exports);
 //# sourceMappingURL=index.js.map

package/ts/index.ts

@@ -28,10 +28,11 @@ export * from "./funcs/ensureFolder"
 export * from "./funcs/knexConnection"
 
 
+
 // models
 export * from "./models/Unixtime"
 export * from "./models/Timespan"
 export * from "./models/IPAddress"
 export * from "./models/OTPGenerator"
-
+export * from "./models/Interfaces"
 

package/ts/models/IPAddress.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@root/ip6addr" />
 import ip6addr, { ToStringOpts } from 'ip6addr';
 export declare class IPAddress {
     private _ip;

package/ts/models/Interfaces.d.ts

@@ -0,0 +1,16 @@
+interface NetworkInterfaceInfo {
+    name: string;
+    ipv4: string[];
+    ipv6: string[];
+}
+export declare class Interfaces {
+    static findByName(name: string): NetworkInterfaceInfo | null;
+    static findByNamePrefix(prefix: string): NetworkInterfaceInfo[];
+    static findByIp(ip: string): NetworkInterfaceInfo | null;
+    static asApiServerConfig(ifaces: string[], port: number): {
+        ip: string;
+        port: number;
+    }[];
+    static getInterfaces(): NetworkInterfaceInfo[];
+}
+export {};

package/ts/models/Interfaces.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Interfaces = void 0;
+const os_1 = require("os");
+class Interfaces {
+    static findByName(name) {
+        const ifaces = this.getInterfaces();
+        const iface = ifaces.find(iface => iface.name === name);
+        return iface || null;
+    }
+    static findByNamePrefix(prefix) {
+        const ifaces = this.getInterfaces();
+        return ifaces.filter(iface => iface.name.startsWith(prefix));
+    }
+    static findByIp(ip) {
+        const ifaces = this.getInterfaces();
+        const iface = ifaces.find(iface => iface.ipv4.includes(ip) || iface.ipv6.includes(ip));
+        return iface || null;
+    }
+    static asApiServerConfig(ifaces, port) {
+        const ret = [];
+        for (const iface of ifaces) {
+            const i = this.findByName(iface);
+            if (i)
+                ret.push({ ip: i.ipv4[0], port: port });
+        }
+        return ret;
+    }
+    static getInterfaces() {
+        const interfaces = (0, os_1.networkInterfaces)();
+        const result = [];
+        for (const name of Object.keys(interfaces)) {
+            const networkInterface = interfaces[name];
+            if (networkInterface) {
+                const ipv4 = networkInterface.filter(info => info.family === 'IPv4').map(info => info.address);
+                const ipv6 = networkInterface.filter(info => info.family === 'IPv6').map(info => info.address);
+                result.push({
+                    name,
+                    ipv4,
+                    ipv6
+                });
+            }
+        }
+        return result;
+    }
+}
+exports.Interfaces = Interfaces;
+//# sourceMappingURL=Interfaces.js.map

package/ts/models/Interfaces.ts

@@ -0,0 +1,58 @@
+import { networkInterfaces } from 'os';
+
+interface NetworkInterfaceInfo {
+    name: string;
+    ipv4: string[];
+    ipv6: string[];
+}
+
+
+export class Interfaces {
+
+    static findByName(name: string): NetworkInterfaceInfo | null {
+        const ifaces = this.getInterfaces()
+        const iface = ifaces.find(iface => iface.name === name)
+        return iface || null
+    }
+
+    static findByNamePrefix(prefix: string): NetworkInterfaceInfo[] {
+        const ifaces = this.getInterfaces()
+        return ifaces.filter(iface => iface.name.startsWith(prefix))
+    }
+
+    static findByIp(ip: string): NetworkInterfaceInfo | null {
+        const ifaces = this.getInterfaces()
+        const iface = ifaces.find(iface => iface.ipv4.includes(ip) || iface.ipv6.includes(ip))
+        return iface || null
+    }
+
+    static asApiServerConfig(ifaces:string[], port:number): {ip:string,port:number}[] {
+        const ret: {ip:string,port:number}[] = []
+        for (const iface of ifaces) {
+            const i = this.findByName(iface)
+            if (i) ret.push({ip:i.ipv4[0],port:port})
+        }
+        return ret
+    }
+
+    static getInterfaces(): NetworkInterfaceInfo[] {
+        const interfaces = networkInterfaces();
+        const result: NetworkInterfaceInfo[] = [];
+
+        for (const name of Object.keys(interfaces)) {
+            const networkInterface = interfaces[name];
+            if (networkInterface) {
+                const ipv4 = networkInterface.filter(info => info.family === 'IPv4').map(info => info.address);
+                const ipv6 = networkInterface.filter(info => info.family === 'IPv6').map(info => info.address);
+
+                result.push({
+                    name,
+                    ipv4,
+                    ipv6
+                });
+            }
+        }
+
+        return result;
+    }
+}

package/ts/models/OTPGenerator.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OTPGenerator = void 0;
 const crypto = __importStar(require("crypto"));

package/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"root":["./ip6addr.d.ts","./ts/global.ts","./ts/index.ts","./ts/types.ts","./ts/funcs/geoip2paths.ts","./ts/funcs/maxruntimehours.ts","./ts/funcs/asjson.ts","./ts/funcs/ensurefolder.ts","./ts/funcs/filecacheisvalid.ts","./ts/funcs/getmysql1.ts","./ts/funcs/getmysql2.ts","./ts/funcs/getweeknumber.ts","./ts/funcs/hash_sha512.ts","./ts/funcs/initmysql2pool.ts","./ts/funcs/int2ip.ts","./ts/funcs/ip2int.ts","./ts/funcs/islanip.ts","./ts/funcs/islocal.ts","./ts/funcs/isloopbackip.ts","./ts/funcs/knexconnection.ts","./ts/funcs/promisetimeout.ts","./ts/funcs/randomip.ts","./ts/funcs/randomip6.ts","./ts/funcs/randomstring.ts","./ts/funcs/randomtcpport.ts","./ts/funcs/randomutfstring.ts","./ts/funcs/utcnow.ts","./ts/funcs/validemail.ts","./ts/funcs/validip.ts","./ts/funcs/vaultfill.ts","./ts/funcs/vaultread.ts","./ts/funcs/wait.ts","./ts/models/ipaddress.ts","./ts/models/interfaces.ts","./ts/models/otpgenerator.ts","./ts/models/timespan.ts","./ts/models/unixtime.ts"],"version":"5.7.2"}