raiutils 9.0.6 → 9.1.1

package/src/utils.ts

@@ -1,12 +1,10 @@
 //https://github.com/Pecacheu/Utils.js; GNU GPL v3
 
 //Node.js compat
-type P = [typeof window, typeof history, typeof DOMRect, typeof HTMLCollection,
-	typeof Element, typeof NodeList, typeof addEventListener]
+//@ts-ignore
+type P = [typeof document, typeof HTMLCollection];
 //@ts-expect-error
-const IsNode=typeof window==='undefined', P:P=IsNode?
-	[{}, {back:()=>{},forward:()=>{}}, class{}, class{}, class{}, class{}, ()=>{}]:
-	[window, history, DOMRect, HTMLCollection, Element, NodeList, addEventListener];
+const IsNode=typeof window==='undefined', P:P=IsNode?[{}, class{}]:[document, HTMLCollection];
 
 //-------------------------------------------- Types --------------------------------------------
 
@@ -39,19 +37,6 @@ export interface Array<T> {
 	at(idx: number): T | undefined;
 }
 
-export interface HTMLCollection {
-	each: <R>(fn: (itm: Element, idx: number, len: number) => R | "!",
-	st?: number, en?: number) => (R | undefined);
-	eachAsync: <R>(fn: (itm: Element, idx: number, len: number) => R | "!",
-	st?: number, en?: number, pe?: boolean) => Promise<R | undefined>;
-}
-export interface NodeList {
-	each: <R>(fn: (itm: Node, idx: number, len: number) => R | "!",
-	st?: number, en?: number) => (R | undefined);
-	eachAsync: <R>(fn: (itm: Node, idx: number, len: number) => R | "!",
-	st?: number, en?: number, pe?: boolean) => Promise<R | undefined>;
-}
-
 export interface Function {
 	/** Wrap a function so that it always has a preset argument list when called.
 	In the called function, `this` is set to the caller's arguments, granting access to both */
@@ -68,11 +53,6 @@ export interface RegExpConstructor {
 	escape(s: string): string;
 }
 
-export interface TouchList {
-	/** Get touch by id, if it exists */
-	get(id: number): Touch | undefined;
-}
-
 interface Base64Opts {
 	alphabet?: 'base64'|'base64url';
 	omitPadding?: boolean;
@@ -83,17 +63,6 @@ export interface Uint8ArrayConstructor {
 export interface Uint8Array {
 	toBase64(opts: Base64Opts): string;
 }
-
-export interface Element {
-	/** Get an element's index in its parent. Returns -1 if the element has no parent */
-	index: number;
-	/** Insert child at index */
-	insertChildAt(el: Element, i: number): void;
-	/** Get element bounding rect as UtilRect object */
-	boundingRect: utils.UtilRect;
-	/** Get element inner rect (excluding border and padding) as UtilRect object */
-	innerRect: utils.UtilRect;
-}
 }
 
 export interface AnyMap {[k: string]: any};
@@ -103,12 +72,10 @@ export interface QueryMap {[k: string]: true | string | string[]};
 //-------------------------------------------- Extensions --------------------------------------------
 
 export namespace utils {
-
-const [window, history, DOMRect, HTMLCollection,
-	Element, NodeList, addEventListener] = P;
+const [document, HTMLCollection] = P;
 
 /** Current library version */
-export const VER = "v9.0.6";
+export const VER = "v9.1.1";
 
 /** Whether the environment is Node.js or Browser */
 export const isNode = IsNode;
@@ -243,7 +210,9 @@ async function eachAsync(this: any[], fn: (itm: any, idx: number, len: number) =
 		this instanceof HTMLCollection?this[i].remove():this.splice(i,1); --i,--l;
 	} else if(r[n]!=null) return r[n];
 }
-[Array, HTMLCollection, NodeList].forEach(p => {proto(p,'each',each), proto(p,'eachAsync',eachAsync)});
+
+proto(Array, 'each', each);
+proto(Array, 'eachAsync', eachAsync);
 
 //==== Numbers ====
 
@@ -422,108 +391,30 @@ if(!('at' in Array.prototype)) proto(Array, 'at', function(this: any[], idx: num
 	if(i>=0 && i<l) return this[i];
 });
 
-//==== Other Extensions ====
+//==== Utility ====
 
 proto(Function, 'wrap', function(this: any, ...args: any[]) {
 	const f=this; return function() {return f.apply(arguments, args)}
 }, false, true);
 
-if(window.TouchList) proto(TouchList, 'get', function(this: any, id: number) {
-	for(const t of this) if(t.identifier === id) return t;
-});
-
-define(Element.prototype, 'index', function(this: any) {
-	const p=this.parentElement; if(!p) return -1;
-	return Array.prototype.indexOf.call(p.children, this);
-});
-
-
-proto(Element, 'insertChildAt', function(this: any, el: Element, i: number) {
-	if(i<0) i=0; if(i >= this.children.length) this.appendChild(el);
-	else this.insertBefore(el, this.children[i]);
-});
-
-/** Get element bounding rect as UtilRect object */
-export const boundingRect = (e: Element) => new UtilRect(e.getBoundingClientRect());
-
-/** Get element inner rect (excluding border and padding) as UtilRect object */
-export function innerRect(e: Element) {
-	let r=e.getBoundingClientRect(), s=getComputedStyle(e);
-	return new UtilRect(r.top+parseFloat(s.paddingTop)+parseFloat(s.borderTopWidth),
-		r.bottom-parseFloat(s.paddingBottom)-parseFloat(s.borderBottomWidth),
-		r.left+parseFloat(s.paddingLeft)+parseFloat(s.borderLeftWidth),
-		r.right-parseFloat(s.paddingRight)-parseFloat(s.borderRightWidth));
-};
-
-define(Element.prototype, 'boundingRect', function(this: any) {return boundingRect(this)});
-define(Element.prototype, 'innerRect', function(this: any) {return innerRect(this)});
-
-//-------------------------------------------- DOM Model --------------------------------------------
-
-//==== General ====
-
-/** Better class for bounding boxes */
-export class UtilRect {
-	x!: number; left!: number;
-	y!: number; top!: number;
-	x2!: number; right!: number;
-	y2!: number; bottom!: number;
-	w!: number; width!: number;
-	h!: number; height!: number;
-	centerX!: number; centerY!: number;
-
-	constructor(t: number | DOMRect | UtilRect, b?: number, l?: number, r?: number) {
-		const f=Number.isFinite; let tt=0,bb=0,ll=0,rr=0;
-		define(this,'x',			()=>ll,		v=>{f(v)?(rr+=v-ll,ll=v):0});
-		define(this,'y',			()=>tt,		v=>{f(v)?(bb+=v-tt,tt=v):0});
-		define(this,'top',			()=>tt,		v=>{tt=f(v)?v:0});
-		define(this,['bottom','y2'],()=>bb,		v=>{bb=f(v)?v:0});
-		define(this,'left',			()=>ll,		v=>{ll=f(v)?v:0});
-		define(this,['right','x2'],	()=>rr,		v=>{rr=f(v)?v:0});
-		define(this,['width','w'],	()=>rr-ll,	v=>{rr=v>=0?ll+v:0});
-		define(this,['height','h'],	()=>bb-tt,	v=>{bb=v>=0?tt+v:0});
-		define(this,'centerX',		()=>ll/2+rr/2);
-		define(this,'centerY',		()=>tt/2+bb/2);
-		if(t instanceof DOMRect || t instanceof UtilRect)
-			tt=t.top, bb=t.bottom, ll=t.left, rr=t.right;
-		else tt=t, bb=b!, ll=l!, rr=r!;
-	}
-
-	/** Check if rect contains point, other rect, or Element */
-	contains(x: number | UtilRect | Element, y?: number): boolean {
-		if(x instanceof Element) return this.contains(x.boundingRect);
-		if(x instanceof UtilRect) return x.x >= this.x && x.x2 <= this.x2 && x.y >= this.y && x.y2 <= this.y2;
-		return x >= this.x && x <= this.x2 && y! >= this.y && y! <= this.y2;
-	}
+const R_ES = /\S/;
 
-	/** Check if rect overlaps rect or Element */
-	overlaps(r: UtilRect | Element): boolean {
-		if(r instanceof Element) return this.overlaps(r.boundingRect);
-		if(!(r instanceof UtilRect)) return false;
-		let x: any, y: any;
-		if(r.x2-r.x >= this.x2-this.x) x = this.x >= r.x && this.x <= r.x2 || this.x2 >= r.x && this.x2 <= r.x2;
-		else x = r.x >= this.x && r.x <= this.x2 || r.x2 >= this.x && r.x2 <= this.x2;
-		if(r.y2-r.y >= this.y2-this.y) y = this.y >= r.y && this.y <= r.y2 || this.y2 >= r.y && this.y2 <= r.y2;
-		else y = r.y >= this.y && r.y <= this.y2 || r.y2 >= this.y && r.y2 <= this.y2;
-		return x&&y;
+/** Check if string, array, or object is empty.
+Returns false for all other types */
+export function isBlank(s: any) {
+	if(s == null) return true;
+	if(typeof s === 'string') return !R_ES.test(s);
+	if(typeof s === 'object') {
+		if(typeof s.length === 'number') return s.length === 0;
+		return Object.keys(s).length === 0;
 	}
+	return false;
+}
 
-	/** Get distance from this rect to point, other rect, or Element */
-	dist(x: number | UtilRect | Element, y?: number): number {
-		if(x instanceof Element) return this.dist(x.boundingRect);
-		const n = x instanceof UtilRect;
-		y = Math.abs((n?(x as UtilRect).centerY:y as number)-this.centerY),
-		x = Math.abs((n?(x as UtilRect).centerX:x as number)-this.centerX);
-		return Math.sqrt(x*x+y*y);
-	}
+/** setTimeout but async */
+export const delay = (ms: number): Promise<void> => new Promise(r => setTimeout(r,ms));
 
-	/** Expand (or contract if negative) a UtilRect by num of pixels. Useful for using UtilRect objects as element hitboxes
-	@returns self for chaining */
-	expand(by: number) {
-		this.top -= by, this.left -= by, this.bottom += by, this.right += by;
-		return this;
-	}
-}
+//-------------------------------------------- DOM Model --------------------------------------------
 
 export interface UserAgentInfo {
 	os?: string;
@@ -568,107 +459,6 @@ export function deviceInfo(ua?: string) {
 	return d;
 }
 
-export const device = IsNode ? null : deviceInfo();
-export const mobile = device?.mobile;
-
-const R_CTR = /translate(?:x|y)?\(.+?\)/gi;
-
-/** Center element with JS
-
-Modes:
-- `trans`: Uses transform: translate. Responsive, no container
-- Default: New flexbox method
-@param only `x` for only x axis centering, `y` for only y axis, null for both */
-export function center(el: HTMLElement, only?: "x" | "y", mode?: "trans") {
-	const os = el.style;
-	if(mode == 'trans') {
-		if(!os.position) os.position='absolute';
-		let tr = os.transform.replace(R_CTR,'').trim();
-		if(!only || only === 'x') os.left='50%', tr+=' translateX(-50%)';
-		if(!only || only === 'y') os.top='50%', tr+=' translateY(-50%)';
-		os.transform=tr;
-	} else {
-		const cont = mkDiv(el.parentNode, null, {display:'flex', top:0, left:0}), cs = cont.style;
-		cont.appendChild(el);
-		if(!only || only === 'x') cs.justifyContent='center', cs.width='100%';
-		if(!only || only === 'y') cs.alignItems='center',
-			cs.height='100%', cs.position='absolute';
-	}
-}
-
-//==== Navigation ====
-
-/** Called when a virtual navigation event occurs, including on page load */
-export let onNav: (state: any) => void;
-
-/** Generate a virtual navigation event, updating the URL bar
-@param state Optional data given to `onNav` whenever the user returns to this history entry */
-export function go(url: string | URL, state?: any) {
-	history.pushState(state, '', url), doNav(state);
-}
-
-addEventListener('popstate', e => doNav(e.state));
-addEventListener('load', () => setTimeout(() => doNav(history.state),1));
-function doNav(s: any) {if(onNav) onNav.call(null,s)}
-
-//==== DOM Creation ====
-
-/** Create elements with ease! Just remember **PCSI** - Parent, class, style, innerHTML */
-export function mkEl<K extends keyof HTMLElementTagNameMap>(tag: K, parent?: Node | null, cls?: string | null,
-style?: CSSStyleDeclaration | AnyMap | null, inner?: string | null): HTMLElementTagNameMap[K] {
-	const e = document.createElement(tag);
-	if(cls != null) e.className = cls;
-	if(inner != null) e.innerHTML = inner;
-	if(style && typeof style === 'object') for(const k in style) {
-		if(k in e.style) (e.style as any)[k] = (style as any)[k];
-		else e.style.setProperty(k, (style as any)[k]);
-	}
-	if(parent != null) parent.appendChild(e);
-	return e;
-}
-
-/** Shorthand for `mkEl` with div tag */
-export const mkDiv = (parent?: Node | null, cls?: string | null, style?: CSSStyleDeclaration | AnyMap | null,
-	inner?: string | null) => mkEl('div', parent, cls, style, inner);
-
-/** Add text node to the DOM */
-export const addText = (parent: Node, text: string) => parent.appendChild(document.createTextNode(text));
-
-//==== CSS ====
-
-let TWCanvas: HTMLCanvasElement;
-
-/** Get predicted width of text w/ given CSS font style */
-export function textWidth(txt: string, font: string) {
-	const c = TWCanvas||(TWCanvas=mkEl('canvas')), ctx = c.getContext('2d')!;
-	ctx.font = font; return ctx.measureText(txt).width;
-}
-
-const R_SK = /[A-Z]/g, R_SR=(s: string) => '-'+s.toLowerCase();
-function defSty() {
-	for(const s of document.styleSheets as any) try {s.cssRules; return s} catch(e) {}
-	//let ns=mkEl('style',document.head); addText(ns,''); return ns.sheet!;
-	return mkEl('style', document.head).sheet;
-}
-
-/** Create a CSS rule and append it to the current document
-@param sel CSS selector, eg. `.class` or `#id` */
-export function addCSS(sel: string, style: CSSStyleDeclaration | AnyMap, sheet?: CSSStyleSheet) {
-	if(!sheet) sheet=defSty(); let k,s=[];
-	for(k in style) s.push(`${k.replace(R_SK, R_SR)}:${(style as AnyMap)[k]}`);
-	sheet!.insertRule(`${sel}{${s.join(';')}}`);
-}
-
-/** Remove a CSS selector from **all** stylesheets */
-export function remCSS(sel: string) {
-	let s,rl;
-	for(s of document.styleSheets as any) {
-		try {rl=s.cssRules} catch(e) {continue}
-		for(let i=0,l=rl.length; i<l; ++i) if(rl[i] instanceof CSSStyleRule
-			&& rl[i].selectorText===sel) s.deleteRule(i);
-	}
-}
-
 //==== Cookies! (Yum) ====
 
 /** Set a cookie
@@ -677,12 +467,14 @@ export function remCSS(sel: string) {
 @param secure Only allow in HTTPS context */
 export function setCookie(key: string, val?: string, exp?: Date | number, secure?: boolean) {
 	let c=`${encodeURIComponent(key)}=${val==null?'':encodeURIComponent(val)};path=/`;
-	if(exp != null) {
-		if(exp === -1) exp=new Date(9e14);
-		if(exp instanceof Date) c+=';expires='+exp.toUTCString();
-		else c+=';max-age='+exp;
+	if(val) {
+		if(exp != null) {
+			if(exp === -1) exp=new Date(9e14);
+			if(exp instanceof Date) c+=';expires='+exp.toUTCString();
+			else c+=';max-age='+exp;
+		}
+		if(secure) c+=';secure';
 	}
-	if(secure) c+=';secure';
 	if(!IsNode) document.cookie = c;
 	return c;
 }
@@ -692,7 +484,7 @@ export function setCookie(key: string, val?: string, exp?: Date | number, secure
 export function getCookie(key: string, ckStr?: string) {
 	if(ckStr == null) ckStr=document.cookie;
 	key=encodeURIComponent(key)+'=';
-	let l=ckStr.split('; '), c: string;
+	let l=ckStr!.split('; '), c: string;
 	for(c of l) if(c.startsWith(key))
 		return decodeURIComponent(c.slice(key.length));
 }
@@ -759,123 +551,6 @@ export function toQuery(data: QueryMap, sep='&') {
 	return q.join(sep);
 }
 
-//==== Inputs ====
-
-const R_NFZ=/\.0*$/;
-
-export interface NumField extends HTMLInputElement {
-	num: number;
-	ns: string | null;
-	set: (num: number | string) => void;
-	setRange: (min?: number, max?: number, decMax?: number) => void;
-	onnuminput?: (this: GlobalEventHandlers, ev?: Event) => any;
-}
-
-/** Turns your boring <input> into a mobile-friendly number entry field with max/min & negative support!
-
-Tips:
-- Use `field.onnuminput` in place of oninput, get number value with field.num
-- On mobile, use star key for decimal point and pound key for negative
-- You can set `field.nStep` in order to change the up/down arrow step size
-- Use `field.setRange` to change min, max, and decMax
-
-@param min Min value, default min safe int
-@param max Max value, default max safe int
-@param decMax Max decimal precision (eg. 3 is 0.001), default 0
-@param sym If a symbol (eg. '$') is given, uses currency mode */
-export function numField(field: HTMLInputElement, min?: number, max?: number, decMax?: number, sym?: string) {
-	const f = field as NumField, RM = RegExp(`[,${sym?RegExp.escape(sym):''}]`, 'g');
-	f.type = (mobile||decMax||sym)?'tel':'number';
-	f.setAttribute('pattern', "\\d*");
-	//@ts-expect-error
-	if(!f.step) f.step = 1;
-	f.addEventListener('keydown', e => {
-		if(e.ctrlKey) return;
-		let k=e.key, kn=k.length===1&&Number.isFinite(Number(k)),
-			ns=f.ns, len=ns!.length, dec=ns!.indexOf('.');
-
-		if(k==='Tab' || k==='Enter') return;
-		else if(kn) {if(dec===-1 || len-dec < decMax!+1) ns+=k} //Number
-		else if(k==='.' || k==='*') {if(decMax && dec==-1
-				&& f.num!=max && (min!>=0 || f.num!=min)) { //Decimal
-			if(!len && min!>0) ns=Math.floor(min!)+'.';
-			else ns+='.';
-		}} else if(k==='Backspace' || k==='Delete') { //Backspace
-			if(min!>0 && f.num===min && ns!.endsWith('.')) ns='';
-			else ns=ns!.slice(0,-1);
-		} else if(k==='-' || k==='#') {if(min!<0 && !len) ns='-'} //Negative
-		else if(k==='ArrowUp') ns=null, f.set(f.num+Number(f.step)); //Up
-		else if(k==='ArrowDown') ns=null, f.set(f.num-Number(f.step)); //Down
-
-		if(ns !== null && ns !== f.ns) {
-			len=ns.length, dec=ns.indexOf('.');
-			let neg=ns==='-'||ns==='-.', s=neg?'0':ns+(ns.endsWith('.')?'0':''),
-				nr=Number(s), n=bounds(nr, min, max);
-			if(!kn || !ns || f.num !== n || (dec!==-1 && len-dec < decMax!+1)) {
-				f.ns=ns, f.num=n;
-				f.value = sym ? neg?sym+'-0.00':formatCost(n,sym):
-					(ns[0]==='-'?'-':'')+Math.floor(Math.abs(n))
-					+(dec!==-1?ns.slice(dec)+(R_NFZ.test(ns)?'0':''):'');
-				if(f.onnuminput) f.onnuminput.call(f,e);
-			}
-		}
-		e.preventDefault();
-	});
-	function numRng(n: any) {
-		if(typeof n==='string') n=n.replace(RM,'');
-		n=bounds(Number(n)||0, min, max);
-		return decMax?Number(n.toFixed(decMax)):Math.round(n);
-	}
-	f.set=n => {
-		f.num = numRng(n);
-		f.ns = f.num.toString();
-		f.value = sym?formatCost(f.num,sym):f.ns;
-		f.ns=f.ns.replace(/^(-?)0+/,'$1');
-		if(f.onnuminput) f.onnuminput.call(f);
-	}
-	f.setRange=(nMin, nMax, nDecMax) => {
-		min=nMin==null ? Number.MIN_SAFE_INTEGER : nMin;
-		max=nMax==null ? Number.MAX_SAFE_INTEGER : nMax;
-		decMax=nDecMax==null ? sym?2:0 : nDecMax;
-		if(numRng(f.num) !== f.num) f.set(f.num);
-	}
-	f.addEventListener('input', () => f.set(f.value));
-	f.addEventListener('paste', e => {f.set(e.clipboardData!.getData('text')); e.preventDefault()});
-	f.setRange(min, max, decMax);
-	return f;
-}
-
-export interface TextArea extends HTMLTextAreaElement {
-	set: (val: string) => void;
-}
-
-//By Rick Kukiela @ StackOverflow
-/** Auto-resizing textarea, dynamically scales lineHeight based on input.
-Use `el.set(value)` to set value & update size */
-export function autosize(el: HTMLTextAreaElement, maxRows=5, minRows=1) {
-	const e = el as TextArea;
-	e.set = v => {e.value=v,cb()};
-	let s=e.style;
-	s.maxHeight=s.resize='none', s.minHeight='0', s.height='auto';
-	e.setAttribute('rows', minRows as any);
-	function cb() {
-		if(e.scrollHeight===0) return setTimeout(cb,1); //Still loading
-		e.setAttribute('rows', 1 as any);
-		//Override style
-		let cs=getComputedStyle(e);
-		s.setProperty('overflow', 'hidden', 'important');
-		s.width=e.innerRect.w+'px', s.boxSizing='content-box', s.borderWidth=s.paddingInline='0';
-		//Calc scroll height
-		let pad=parseFloat(cs.paddingTop) + parseFloat(cs.paddingBottom),
-		lh=cs.lineHeight==='normal' ? parseFloat(cs.height) : parseFloat(cs.lineHeight),
-		rows=Math.round((Math.round(e.scrollHeight) - pad)/lh);
-		//Undo overrides & apply
-		s.overflow=s.width=s.boxSizing=s.borderWidth=s.paddingInline='';
-		e.setAttribute('rows', bounds(rows, minRows, maxRows) as any);
-	}
-	e.addEventListener('input', cb);
-}
-
 //==== Dates ====
 
 export const months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
@@ -924,89 +599,4 @@ export function suffix(n: number) {
 	if(j==3 && k!=13) return n+"rd";
 	return n+"th";
 }
-
-/** Set `datetime-local` or `date` input from JS Date object or string, adjusting for local timezone */
-export function setDateTime(el: HTMLInputElement, date: Date | string | number) {
-	if(!(date instanceof Date)) date=new Date(date);
-	el.value = new Date(date.getTime() - date.getTimezoneOffset()*60000).
-		toISOString().slice(0, el.type==='date'?10:19);
-}
-
-/** Get value of `datetime-local` or `date` input as JS Date */
-export const getDateTime = (el: HTMLInputElement) => new Date(el.value+(el.type==='date'?'T00:00':''));
-
-//==== Utility ====
-
-const R_ES = /\S/;
-
-/** Check if string, array, or object is empty.
-Returns false for all other types */
-export function isBlank(s: any) {
-	if(s == null) return true;
-	if(typeof s === 'string') return !R_ES.test(s);
-	if(typeof s === 'object') {
-		if(typeof s.length === 'number') return s.length === 0;
-		return Object.keys(s).length === 0;
-	}
-	return false;
-}
-
-/** Trigger browser download of file. If `data` is a string or URL,
-it is treated as a URL. Otherwise, it is downloaded as Blob data */
-export async function download(data: string | URL | Blob | ArrayBuffer, name?: string) {
-	const a = mkEl('a');
-	if(typeof data === 'string' || data instanceof URL) {
-		a.href = data.toString();
-		a.download = name || a.href.split('/').at(-1)!;
-		a.click();
-	} else {
-		if(!(data instanceof Blob)) data = new Blob([data]);
-		const u = URL.createObjectURL(data);
-		a.href=u, a.download=name||'file', a.click();
-		URL.revokeObjectURL(u);
-	}
-}
-
-/** setTimeout but async */
-export const delay = (ms: number): Promise<void> => new Promise(r => setTimeout(r,ms));
-
-//-------------------------------------------- NodeJS --------------------------------------------
-
-let os: typeof import('os');
-async function importNode() {
-	if(os) return;
-	os = await import('os');
-}
-
-/** Get list of system IPs */
-export async function getIPs() {
-	await importNode();
-	const ip: string[]=[], fl=os.networkInterfaces();
-	for(let k in fl) fl[k]!.forEach(f => {
-		if(!f.internal && f.family == 'IPv4' && f.mac != '00:00:00:00:00:00' && f.address) ip.push(f.address);
-	});
-	return ip;
-}
-
-/** Get system info
-@returns [sysOS, arch, cpuInfo] */
-export async function getOS() {
-	await importNode();
-	let sysOS, arch;
-	switch(os.platform()) {
-		case 'win32': sysOS="Windows"; break;
-		case 'darwin': sysOS="MacOS"; break;
-		case 'linux': sysOS="Linux"; break;
-		default: sysOS=os.platform();
-	}
-	switch(os.arch()) {
-		case 'ia32': arch="32-bit"; break;
-		case 'x64': arch="64-bit"; break;
-		case 'arm': arch="ARM"; break;
-		default: arch=os.arch();
-	}
-	return [sysOS, arch, os.cpus()[0]?.model||''];
-}
-}
-
-export default utils;
+}

package/src/uuid.ts

@@ -3,16 +3,15 @@
 import { Buffer } from 'buffer';
 import utils from 'raiutils';
 
-const [os, fs, cRand] = utils.isNode ? [
-	await import('os'),
-	await import('fs/promises'),
-	(await import('util')).promisify((await import('crypto')).randomBytes)
-] : [];
+declare type os = typeof import('os');
+declare type fs = typeof import('fs/promises');
+interface Long {unsigned: boolean; toString(r: number): string}
+
+const [os, fs, U, C] = await utils.importNode('os', 'fs/promises', 'util', 'crypto');
+const cRand = utils.isNode ? U.promisify(C.randomBytes) : null;
 
 let Long: any;
-//@ts-expect-error
-try {Long = (await import('mongodb')).Long} catch(e) {}
-interface Long {unsigned: boolean; toString(r: number): string}
+try {Long = (await utils.importNode('mongodb'))[0].Long} catch(e) {}
 
 const ID_FN = import.meta.dirname+'/uuid';
 let Cnt: number, CLT: number, LT: number,
@@ -21,7 +20,7 @@ LD: number, UT: NodeJS.Timeout | boolean;
 //64-bit UUID Format
 //<U8 Uptime><U8 Magic><U8 CryptoRand><U8 Counter><U32 Date>
 
-function swapHex(h: string) {return h.match(/.{2}/g)!.reverse().join('')}
+const swapHex = (h: string) => h.match(/.{2}/g)!.reverse().join('');
 
 async function loadId() {
 	if(!fs) return Cnt = utils.rand(0,255);
@@ -74,8 +73,8 @@ export default class UUID {
 	}
 
 	/** Async `crypto.randomBytes` with browser fallback */
-	static randBytes = async (size: number) => cRand ? cRand(size)
-		: crypto.getRandomValues(Buffer.allocUnsafe(size));
+	static randBytes = async (size: number) => (cRand ? cRand(size)
+		: crypto.getRandomValues(Buffer.allocUnsafe(size))) as Promise<Buffer>;
 
 	/** Generate new random UUID
 	@param date Optional Date or Unix ms timestamp; default is current time