mybase 1.1.45 → 1.1.47

package/ip6addr.d.ts

@@ -1,4 +1,4 @@
-declare module 'ip6addr' {
+declare module '@7c/node-ip6addr' {
     export interface ToStringOpts {
         format?: "auto" | "v4" | "v4-mapped" | "v6" | undefined;
         zeroElide?: boolean | undefined;

package/mybase.js

@@ -9,7 +9,7 @@ const chalk = require('chalk')
 const _validURL = require('@7c/validurl')
 const validator = require('validator')
 const sha512 = require('js-sha512')
-const ip6addr = require('ip6addr')
+const ip6addr = require('@7c/node-ip6addr')
 
 const private_network_cidrs = [ip6addr.createCIDR('10.0.0.0/8')
             ,ip6addr.createCIDR('172.16.0.0/12')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mybase",
-  "version": "1.1.45",
+  "version": "1.1.47",
   "description": "",
   "main": "mybase.js",
   "scripts": {
@@ -9,6 +9,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@7c/node-ip6addr": "https://github.com/7c/node-ip6addr.git",
     "@7c/validurl": "0.0.3",
     "@types/debug": "^4.1.12",
     "@types/ip6addr": "^0.2.6",
@@ -21,7 +22,6 @@
     "debug": "^4.3.4",
     "ip-range-check": "^0.2.0",
     "ip6": "=0.2.7",
-    "ip6addr": "github:7c/node-ip6addr#db6d558af1f314bcb0a733fd61611fa85e1a3eff",
     "js-sha512": "^0.8.0",
     "knex": "^3.1.0",
     "mysql": "^2.18.1",
@@ -33,11 +33,11 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/jest": "^29.5.11",
+    "@types/jest": "^29.5.14",
     "chai": "^4.2.0",
     "jest": "^29.7.0",
-    "mocha": "^8.2.1",
+    "mocha": "^11.1.0",
     "should": "^13.2.3",
-    "ts-jest": "^29.1.1"
+    "ts-jest": "^29.2.5"
   }
 }

package/ts/funcs/isLANIp.d.ts

@@ -1,3 +1,3 @@
-import ip6addr from 'ip6addr';
+import ip6addr from '@7c/node-ip6addr';
 export declare const private_network_cidrs: ip6addr.CIDR[];
 export declare function isLANIp(ip: string): boolean;

package/ts/funcs/isLANIp.js

@@ -5,14 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.private_network_cidrs = void 0;
 exports.isLANIp = isLANIp;
-const ip6addr_1 = __importDefault(require("ip6addr"));
+const node_ip6addr_1 = __importDefault(require("@7c/node-ip6addr"));
 const net_1 = __importDefault(require("net"));
 exports.private_network_cidrs = [
-    ip6addr_1.default.createCIDR('10.0.0.0/8'),
-    ip6addr_1.default.createCIDR('172.16.0.0/12'),
-    ip6addr_1.default.createCIDR('192.168.0.0/16'),
-    ip6addr_1.default.createCIDR('fd00::/8'), // Reserved by IETF for future use, but not currently in active use.
-    ip6addr_1.default.createCIDR('fc00::/8'), // The range currently in use for local communications within a site or organization.
+    node_ip6addr_1.default.createCIDR('10.0.0.0/8'),
+    node_ip6addr_1.default.createCIDR('172.16.0.0/12'),
+    node_ip6addr_1.default.createCIDR('192.168.0.0/16'),
+    node_ip6addr_1.default.createCIDR('fd00::/8'), // Reserved by IETF for future use, but not currently in active use.
+    node_ip6addr_1.default.createCIDR('fc00::/8'), // The range currently in use for local communications within a site or organization.
 ];
 function isLANIp(ip) {
     ip = normalizeIp(ip);

package/ts/funcs/isLANIp.ts

@@ -1,4 +1,4 @@
-import ip6addr from 'ip6addr'
+import ip6addr from '@7c/node-ip6addr'
 import net from 'net'
 
 export const private_network_cidrs = [

package/ts/funcs/isLoopbackIP.d.ts

@@ -1,3 +1,3 @@
-import ip6addr from 'ip6addr';
+import ip6addr from '@7c/node-ip6addr';
 export declare const local_network_cidrs: ip6addr.CIDR[];
 export declare function isLoopbackIP(ip: string): boolean;

package/ts/funcs/isLoopbackIP.js

@@ -5,11 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.local_network_cidrs = void 0;
 exports.isLoopbackIP = isLoopbackIP;
-const ip6addr_1 = __importDefault(require("ip6addr"));
+const node_ip6addr_1 = __importDefault(require("@7c/node-ip6addr"));
 const net_1 = __importDefault(require("net"));
 exports.local_network_cidrs = [
-    ip6addr_1.default.createCIDR('127.0.0.0/8'),
-    ip6addr_1.default.createCIDR('::1/128')
+    node_ip6addr_1.default.createCIDR('127.0.0.0/8'),
+    node_ip6addr_1.default.createCIDR('::1/128')
 ];
 function isLoopbackIP(ip) {
     ip = normalizeIp(ip);

package/ts/funcs/isLoopbackIP.ts

@@ -1,4 +1,4 @@
-import ip6addr from 'ip6addr'
+import ip6addr from '@7c/node-ip6addr'
 import net from 'net'
 
 export const local_network_cidrs = [

package/ts/funcs/vaultRead.js

@@ -7,7 +7,7 @@ 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`);

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/models/IPAddress.d.ts

@@ -1,4 +1,4 @@
-import ip6addr, { ToStringOpts } from 'ip6addr';
+import ip6addr, { ToStringOpts } from '@7c/node-ip6addr';
 export declare class IPAddress {
     private _ip;
     static loopback_cidrs4: ip6addr.CIDR[];

package/ts/models/IPAddress.js

@@ -7,7 +7,7 @@ exports.IPAddress = void 0;
 /// <reference path="./../../ip6addr.d.ts" />
 const debug_1 = __importDefault(require("debug"));
 const __1 = require("./../");
-const ip6addr_1 = __importDefault(require("ip6addr"));
+const node_ip6addr_1 = __importDefault(require("@7c/node-ip6addr"));
 const net_1 = __importDefault(require("net"));
 const ip6 = require('ip6'); // "url": "https://github.com/elgs/ip6"
 const dbg = (0, debug_1.default)('_IPAddress');
@@ -18,10 +18,10 @@ class IPAddress {
         if (ip === '-')
             ip = '0.0.0.0'; // is this really required?
         try {
-            this._ip = ip6addr_1.default.parse(ip);
+            this._ip = node_ip6addr_1.default.parse(ip);
             if (this._ip._attrs.ipv4Mapped) {
                 // we wany to convert it to ipv4
-                this._ip = ip6addr_1.default.parse(this._ip.toString({ format: 'v4' }));
+                this._ip = node_ip6addr_1.default.parse(this._ip.toString({ format: 'v4' }));
             }
         }
         catch (err) {
@@ -157,7 +157,7 @@ class IPAddress {
         const randomBigInt = BigInt(Math.floor(Math.random() * (Number(range) + 1))) + start;
         // dbg('randomBigInt', randomBigInt)
         // Convert the BigInt back to an IP address
-        const randomIp = ip6addr_1.default.parse(randomBigInt);
+        const randomIp = node_ip6addr_1.default.parse(randomBigInt);
         // dbg('randomCIDRIp', randomIp.toString())
         return new IPAddress(randomIp.toString());
     }
@@ -233,20 +233,20 @@ class IPAddress {
 }
 exports.IPAddress = IPAddress;
 IPAddress.loopback_cidrs4 = [
-    ip6addr_1.default.createCIDR('127.0.0.0/8'),
+    node_ip6addr_1.default.createCIDR('127.0.0.0/8'),
 ];
 IPAddress.loopback_cidrs6 = [
-    ip6addr_1.default.createCIDR('::1/128') // yes ipv6 has single address
+    node_ip6addr_1.default.createCIDR('::1/128') // yes ipv6 has single address
 ];
 IPAddress.loopback_cidrs = IPAddress.loopback_cidrs4.concat(IPAddress.loopback_cidrs6);
 IPAddress.lan_cidrs4 = [
-    ip6addr_1.default.createCIDR('10.0.0.0/8'),
-    ip6addr_1.default.createCIDR('172.16.0.0/12'),
-    ip6addr_1.default.createCIDR('192.168.0.0/16'),
+    node_ip6addr_1.default.createCIDR('10.0.0.0/8'),
+    node_ip6addr_1.default.createCIDR('172.16.0.0/12'),
+    node_ip6addr_1.default.createCIDR('192.168.0.0/16'),
 ];
 IPAddress.lan_cidrs6 = [
-    ip6addr_1.default.createCIDR('fd00::/8'), // Reserved by IETF for future use, but not currently in active use.
-    ip6addr_1.default.createCIDR('fc00::/8'), // The range currently in use for local communications within a site or organization.
+    node_ip6addr_1.default.createCIDR('fd00::/8'), // Reserved by IETF for future use, but not currently in active use.
+    node_ip6addr_1.default.createCIDR('fc00::/8'), // The range currently in use for local communications within a site or organization.
 ];
 IPAddress.lan_cidrs = IPAddress.lan_cidrs4.concat(IPAddress.lan_cidrs6);
 IPAddress.local_cidrs = IPAddress.loopback_cidrs.concat(IPAddress.lan_cidrs);

package/ts/models/IPAddress.test.ts

@@ -1,4 +1,4 @@
-import ip6addr from 'ip6addr'
+import ip6addr from '@7c/node-ip6addr'
 import { IPAddress } from './IPAddress'
 import { randomIP, randomIP6 } from '../'
 

package/ts/models/IPAddress.ts

@@ -1,7 +1,7 @@
 /// <reference path="./../../ip6addr.d.ts" />
 import debug from 'debug'
 import { randomIP, randomIP6, } from "./../"
-import ip6addr, { Addr, ToStringOpts } from 'ip6addr'
+import ip6addr, { Addr, ToStringOpts } from '@7c/node-ip6addr'
 import net from 'net'
 const ip6 = require('ip6') // "url": "https://github.com/elgs/ip6"
 const dbg = debug('_IPAddress')

package/ts/models/OTPGenerator.test.ts

@@ -9,7 +9,7 @@ describe('OTPGenerator', () => {
         const otp = otpGenerator.generateOTP();
         // length should be 5  + 13
         expect(otp.length).toBe(18);
-        console.log(otp);
+        // console.log(otp);
     })
 
     it('should generate different OTPs in milliseconds', async () => {

package/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"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"}