mybase 1.1.46 → 1.1.49

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.46",
+  "version": "1.1.49",
   "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/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/ts/models/Timespan.d.ts

@@ -15,6 +15,7 @@ export declare class Timespan {
     static days(days: number): Timespan;
     static weeks(weeks: number): Timespan;
     static months(months: number): Timespan;
+    static years(years: number): Timespan;
     add(timespan: Timespan): Timespan;
     subtract(timespan: Timespan): Timespan;
     toJSON(): {

package/ts/models/Timespan.js

@@ -47,6 +47,9 @@ class Timespan {
     static months(months) {
         return new Timespan(months * 30 * 24 * 60 * 60 * 1000);
     }
+    static years(years) {
+        return new Timespan(years * 365 * 24 * 60 * 60 * 1000);
+    }
     add(timespan) {
         return new Timespan(this.ms + timespan.ms);
     }

package/ts/models/Timespan.ts

@@ -58,6 +58,10 @@ export class Timespan {
         return new Timespan(months * 30 * 24 * 60 * 60 * 1000)
     }
 
+    static years(years: number): Timespan {
+        return new Timespan(years * 365 * 24 * 60 * 60 * 1000)
+    }
+
     add(timespan: Timespan): Timespan {
         return new Timespan(this.ms + timespan.ms)
     }

package/ts/models/Unixtime.d.ts

@@ -22,8 +22,8 @@ export declare class Unixtime {
     addDays(days?: number): Unixtime;
     addMonths(months?: number): Unixtime;
     addYears(years?: number): Unixtime;
-    yyyymmdd(): string;
-    yyymmddhh(): string;
+    yyyymmdd(seperator?: string): string;
+    yyyymmddhh(seperator?: string): string;
     /**
     @deprecated use 'day' instead
     */
@@ -42,6 +42,16 @@ export declare class Unixtime {
     elapsedSeconds(): number;
     elapsedMinutes(): number;
     clone(): Unixtime;
+    /**
+     * @param max maximum timespan to subtract
+     * @returns returns random time in the past within given timespan
+     */
+    static randomPast(max?: Timespan, base?: Unixtime): Unixtime;
+    /**
+     * @param max maximum timespan to add
+     * @returns returns random time in the future within given timespan
+     */
+    static randomFuture(max?: Timespan, base?: Unixtime): Unixtime;
     static fromYYYYMMDD(value: string): Unixtime;
     static try(value: Date | string | number): Unixtime | null;
 }

package/ts/models/Unixtime.js

@@ -87,23 +87,23 @@ class Unixtime {
         this.value.setUTCFullYear(this.year + years);
         return this;
     }
-    yyyymmdd() {
+    yyyymmdd(seperator = "") {
         let mm = this.month;
         let dd = this.day;
         return [this.value.getFullYear(),
             (mm > 9 ? '' : '0') + mm,
-            (dd > 9 ? '' : '0') + dd
-        ].join('');
+            (dd > 9 ? '' : '0') + dd,
+        ].join(seperator);
     }
-    yyymmddhh() {
+    yyyymmddhh(seperator = "") {
         let mm = this.month;
         let dd = this.day;
         let hh = this.hours;
         return [this.year,
             (mm > 9 ? '' : '0') + mm,
             (dd > 9 ? '' : '0') + dd,
-            (hh > 9 ? '' : '0') + hh
-        ].join('');
+            (hh > 9 ? '' : '0') + hh,
+        ].join(seperator);
     }
     /**
     @deprecated use 'day' instead
@@ -139,6 +139,20 @@ class Unixtime {
     clone() {
         return new Unixtime(this.toLongUnixtime());
     }
+    /**
+     * @param max maximum timespan to subtract
+     * @returns returns random time in the past within given timespan
+     */
+    static randomPast(max = Timespan_1.Timespan.years(1), base = Unixtime.now()) {
+        return base.addSeconds(Math.random() * max.seconds * -1);
+    }
+    /**
+     * @param max maximum timespan to add
+     * @returns returns random time in the future within given timespan
+     */
+    static randomFuture(max = Timespan_1.Timespan.years(1), base = Unixtime.now()) {
+        return base.addSeconds(Math.random() * max.seconds);
+    }
     static fromYYYYMMDD(value) {
         if (value.length != 8)
             throw new Error('Invalid yyyymmdd value');

package/ts/models/Unixtime.test.ts

@@ -1,3 +1,4 @@
+import { Timespan } from './Timespan';
 import { Unixtime } from './Unixtime';
 
 describe('Unixtime', () => {
@@ -123,6 +124,40 @@ describe('Unixtime', () => {
     expect(unixtime.toISOString()).toEqual('2024-10-11T00:00:00.000Z');
   })
 
+  it('yyyymmddhh should return correct values',() => {
+    const unixtime = new Unixtime("2024-10-11T12:13:14Z");
+    expect(unixtime.yyyymmdd()).toEqual('20241011');
+    expect(unixtime.yyyymmddhh()).toEqual('2024101112');
+    // should also work with optional seperators
+    expect(unixtime.yyyymmddhh('-')).toEqual('2024-10-11-12');
+  })
+
+  it('randomPast should return random time in the past', () => {
+    const end = Unixtime.now()
+    const begin = end.clone().addYears(-1)
+    for(let i=0;i<100000;i++) {
+      const rand = Unixtime.randomPast(Timespan.years(1))
+      expect(rand.toLongUnixtime()).toBeGreaterThan(begin.toLongUnixtime());
+      expect(rand.toLongUnixtime()).toBeLessThan(end.toLongUnixtime());
+    }
+  })
+
+  it('randomFuture should return random time in the future within given timespan of 1 year', () => {
+    const begin = Unixtime.now()
+    const end = begin.clone().addYears(1)
+    for(let i=0;i<100000;i++) {
+      const rand = Unixtime.randomFuture(Timespan.years(1))
+      expect(rand.toLongUnixtime()).toBeGreaterThan(begin.toLongUnixtime());
+      expect(rand.toLongUnixtime()).toBeLessThan(end.toLongUnixtime());
+    }
+  })
+
+  it('yyyymmdd should work as designed',() => {
+    const unixtime = new Unixtime("2024-10-11T12:13:14Z");
+    expect(unixtime.yyyymmdd()).toEqual('20241011');
+    expect(unixtime.yyyymmdd('-')).toEqual('2024-10-11');
+  })
+
   it('fromYYYYMMDD should throw error when invalid date', () => {
     expect(() => Unixtime.fromYYYYMMDD('20243131')).toThrow('Invalid month');
     expect(() => Unixtime.fromYYYYMMDD('20241233')).toThrow('Invalid day');

package/ts/models/Unixtime.ts

@@ -107,24 +107,24 @@ export class Unixtime {
         return this
     }
 
-    public yyyymmdd(): string {
+    public yyyymmdd(seperator: string=""): string {
         let mm = this.month
         let dd = this.day
         return [this.value.getFullYear(),
         (mm > 9 ? '' : '0') + mm,
-        (dd > 9 ? '' : '0') + dd
-        ].join('')
+        (dd > 9 ? '' : '0') + dd,
+        ].join(seperator)
     }
 
-    public yyymmddhh(): string {
+    public yyyymmddhh(seperator: string=""): string {
         let mm = this.month
         let dd = this.day
         let hh = this.hours
         return [this.year,
         (mm > 9 ? '' : '0') + mm,
         (dd > 9 ? '' : '0') + dd,
-        (hh > 9 ? '' : '0') + hh
-        ].join('')
+        (hh > 9 ? '' : '0') + hh,
+        ].join(seperator)
     }
 
     /**
@@ -171,6 +171,21 @@ export class Unixtime {
         return new Unixtime(this.toLongUnixtime())
     }
 
+    /**
+     * @param max maximum timespan to subtract
+     * @returns returns random time in the past within given timespan 
+     */
+    static randomPast(max: Timespan=Timespan.years(1), base: Unixtime=Unixtime.now()): Unixtime {
+        return base.addSeconds(Math.random()*max.seconds*-1)
+    }
+
+    /**
+     * @param max maximum timespan to add
+     * @returns returns random time in the future within given timespan
+     */
+    static randomFuture(max: Timespan=Timespan.years(1), base: Unixtime=Unixtime.now()): Unixtime {
+        return base.addSeconds(Math.random()*max.seconds)
+    }
 
     static fromYYYYMMDD(value: string): Unixtime {
         if (value.length != 8) throw new Error('Invalid yyyymmdd value')

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"}