mybase 1.2.2 → 1.2.3

package/ts/models/Unixtime.ts

@@ -1,208 +0,0 @@
-import { Timespan } from "./Timespan"
-
-// this will be a class to work with short and long version of unixtime format
-export class Unixtime {
-    private value: Date
-
-
-    static EMPTY = new Unixtime(new Date(0))
-
-    static NOW() {
-        return new Unixtime(Date.now())
-    }
-
-    static now() {
-        return new Unixtime(Date.now())
-    }
-
-    greaterThan(other: Unixtime) {
-        return this.toLongUnixtime() > other.toLongUnixtime()
-    }
-
-    isEmpty() {
-        return this.toLongUnixtime() == 0
-    }
-
-    lessThan(other: Unixtime) {
-        return this.toLongUnixtime() < other.toLongUnixtime()
-    }
-
-    get elapsed():Timespan {
-        return new Timespan(Date.now() - this.toLongUnixtime())
-    }
-
-    toJSON() {
-        return {
-            __type:'Unixtime',
-            value:this.toLongUnixtime()
-        }
-    }
-
-
-    constructor(value: Date | string | number) {
-        if (typeof value === 'string') {
-            this.value = new Date(value)
-        } else if (typeof value === 'number') {
-            // the number might be short or long form(from nodejs Date.now()
-            if (value < 10000000000) value *= 1000
-            else
-                value = Math.round(value)
-            // set the value
-            this.value = new Date(value)
-        }
-        else if (value instanceof Date) {
-            this.value = value
-        } 
-        else {
-            throw new Error('Invalid value')
-        }
-
-        if (isNaN(this.value.getTime())) {
-            throw new Error('Invalid date')
-        }
-    }
-
-    public addTimespan(timespan: Timespan): Unixtime {
-        this.value = new Date(this.value.getTime() + timespan.miliseconds)
-        return this
-    }
-
-    public subtractTimespan(timespan: Timespan): Unixtime {
-        this.value = new Date(this.value.getTime() - timespan.miliseconds)
-        return this
-    }
-
-    public addMiliseconds(miliseconds: number = 1): Unixtime {
-        this.value = new Date(this.value.getTime() + miliseconds)
-        return this
-    }
-
-    public addSeconds(seconds: number = 1): Unixtime {
-        this.value = new Date(this.value.getTime() + seconds * 1000)
-        return this
-    }
-
-    public addMinutes(minutes: number = 1): Unixtime {
-        this.value = new Date(this.value.getTime() + minutes * 60000)
-        return this
-    }
-
-    public addHours(hours: number = 1): Unixtime {
-        this.value = new Date(this.value.getTime() + hours * 3600000)
-        return this
-    }
-
-    public addDays(days: number = 1): Unixtime {
-        this.value = new Date(this.value.getTime() + days * 86400000)
-        return this
-    }
-
-    public addMonths(months: number = 1): Unixtime {
-        this.value.setUTCMonth(this.value.getMonth() + months)
-        return this
-    }
-
-    public addYears(years: number = 1): Unixtime {
-        this.value.setUTCFullYear(this.year + years)
-        return this
-    }
-
-    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(seperator)
-    }
-
-    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(seperator)
-    }
-
-    /**
-    @deprecated use 'day' instead
-    */
-    public getDay() : number {return this.value.getUTCDay()}
-
-    get day(): number {  return this.value.getUTCDate() }
-    get month(): number { return this.value.getUTCMonth() + 1 }
-    get year(): number { return this.value.getUTCFullYear() }
-    get hours(): number { return this.value.getUTCHours() }
-    get minutes(): number { return this.value.getUTCMinutes() }
-    get seconds(): number { return this.value.getUTCSeconds() }
-
-    static from(value: Date | string | number) {
-        return new Unixtime(value)
-    }
-
-    public toShortUnixtime(): number {
-        return Math.round(this.toLongUnixtime() / 1000)
-    }
-
-    public toLongUnixtime(): number {
-        return this.value.getTime()
-    }
-
-    public toDate(): Date {
-        return this.value
-    }
-
-    public toISOString(): string {
-        return this.value.toISOString()
-    }
-
-    public elapsedSeconds(): number {
-        return Math.round((Date.now() - this.toLongUnixtime()) / 1000)
-    }
-
-    public elapsedMinutes(): number {
-        return Math.round(this.elapsedSeconds() / 60)
-    }
-
-    clone():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')
-        let year = parseInt(value.substring(0, 4))
-        let month = parseInt(value.substring(4, 6)) - 1
-        let day = parseInt(value.substring(6, 8))
-        if (isNaN(year) || isNaN(month) || isNaN(day)) throw new Error('Invalid yyyymmdd value')
-        if (month < 0 || month > 11) throw new Error('Invalid month')
-        if (day < 1 || day > 31) throw new Error('Invalid day')
-        return new Unixtime(new Date(Date.UTC(year, month, day)))
-    }
-
-    static try(value: Date | string | number): Unixtime | null {
-        try {
-            return new Unixtime(value)
-        } catch (e) {
-            return null
-        }
-    }
-}

package/ts/types.ts

@@ -1,42 +0,0 @@
-export type UnixtimeShort = number
-
-//#region mybase
-export type MysqlConfig = {
-  host: string
-  port?: number
-  login: string
-  password: string
-  db: string
-}
-
-export type MysqlConnection = {
-  connect: (callback: (err: NodeJS.ErrnoException | null) => void) => void
-  ping: (callback: (err?: NodeJS.ErrnoException | Error | null) => void) => void
-}
-
-export type MysqlConnector = {
-  createConnection: (opts: {
-    host: string
-    port: number
-    user: string
-    password: string
-    database: string
-  }) => MysqlConnection
-}
-
-export type VaultClient = {
-  endpoint?: string
-  read: (key: string) => Promise<{ data?: unknown }>
-}
-
-export type SqlQueryable = {
-  query: (q: string, values: unknown[], callback: (err: Error | null, res?: unknown) => void) => void
-}
-
-export type Geoip2PathMap = {
-  country: string | false
-  city: string | false
-  isp: string | false
-  ct: string | false
-}
-//#endregion

package/tsconfig.jest.json

@@ -1,11 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "noEmit": true,
-    "allowJs": true,
-    "types": ["jest", "node"],
-    "noImplicitAny": false
-  },
-  "include": ["**/*.test.ts", "mybase.ts", "ts/**/*.ts"],
-  "exclude": ["node_modules"]
-}

package/tsconfig.json

@@ -1,37 +0,0 @@
-{
-  "compilerOptions": {
-    // "ignoreDeprecations": "6.0",
-    "target": "es2017",          
-    "experimentalDecorators": true,                   
-    "emitDecoratorMetadata": true,                    
-    "module": "commonjs",        
-    "moduleResolution" : "Node",
-    "esModuleInterop": true,                  
-    "forceConsistentCasingInFileNames": true,            
-    "strict": true,
-    "declaration": true, // Generates corresponding .d.ts file
-    "noImplicitReturns": true, // Report error when not all code paths in function return a value
-    "noUnusedLocals": true, // Report errors on unused locals
-    // "noUnusedParameters": true, // Report errors on unused parameters
-    "noFallthroughCasesInSwitch": true, // Report errors for fallthrough cases in switch statement
-    // "noUncheckedIndexedAccess": true, // Include 'undefined' in index signature results
-    "noImplicitAny": true, // Raise error on expressions and declarations with an implied 'any' type
-    "strictNullChecks": true, // Enable strict null checking
-    "strictFunctionTypes": true, // Ensure function parameter types match
-    "strictBindCallApply": true, // Ensure 'bind', 'call', and 'apply' methods match function types
-    "strictPropertyInitialization": true, // Ensure non-undefined class properties are initialized in the constructor
-    "alwaysStrict": true, // Parse in strict mode and emit "use strict" for each source file
-    "sourceMap": true,
-    "skipLibCheck": true,      
-    "baseUrl": ".",
-    "paths": {
-      "@root/*": ["./*"],
-      "@models/*": ["./models/*"],
-      "@inc/*": ["./inc/ts/*"]
-    },
-    "typeRoots": ["./node_modules/@types", "./types/"]
-  },
-  "exclude": [
-    "**/*.test.ts"
-  ]
-}

package/types/third-party.d.ts

@@ -1,21 +0,0 @@
-declare module '@7c/validurl' {
-  function validURL(host: unknown): boolean
-  export = validURL
-}
-
-declare module 'ip6' {
-  export function normalize(a: string): string
-  export function abbreviate(a: string): string
-}
-
-declare module 'aes-js' {
-  const aesjs: {
-    utils: {
-      utf8: { toBytes(s: string): Uint8Array; fromBytes(b: Uint8Array): string }
-      hex: { fromBytes(b: Uint8Array): string; toBytes(s: string): Uint8Array }
-    }
-    padding: { pkcs7: { pad(b: Uint8Array, n: number): Uint8Array; strip(b: Uint8Array): Uint8Array } }
-    ModeOfOperation: { cbc: new (key: Uint8Array) => { encrypt(b: Uint8Array): Uint8Array; decrypt(b: Uint8Array): Uint8Array } }
-  }
-  export = aesjs
-}