@ztimson/momentum 1.5.7 → 1.5.9

package/dist/index.mjs

@@ -235,30 +235,37 @@ function includes(target, values, allowMissing = false) {
 	if (type == "function") return target.toString() == values.toString();
 	return target == values;
 }
-function isEqual(a, b, seen = /* @__PURE__ */ new WeakMap()) {
-	if (a === b) return true;
-	if (a instanceof Date && b instanceof Date) return a.getTime() === b.getTime();
-	if (a instanceof RegExp && b instanceof RegExp) return a.source === b.source && a.flags === b.flags;
-	if (typeof a !== "object" || a === null || typeof b !== "object" || b === null) {
-		if (Number.isNaN(a) && Number.isNaN(b)) return true;
-		if (typeof a === "function" && typeof b === "function") return a.toString() === b.toString();
-		return false;
-	}
-	if (seen.has(a)) return seen.get(a) === b;
-	seen.set(a, b);
-	const isArrayA = Array.isArray(a);
-	const isArrayB = Array.isArray(b);
-	if (isArrayA && isArrayB) {
-		if (a.length !== b.length) return false;
-		for (let i = 0; i < a.length; i++) if (!isEqual(a[i], b[i], seen)) return false;
+function isEqual(a, b, compare) {
+	const eq = (a2, b2, compare2, seen, path) => {
+		if (Array.isArray(compare2)) {
+			if (compare2.some((p) => new RegExp(`^${p.replace(/[.+^${}()|[\]\\]/g, "\\$&").replace(/\*/g, "[^.]*")}(\\.|$)`).test(path))) return true;
+		} else if (typeof compare2 === "function") {
+			const r = compare2(path, a2, b2);
+			if (r !== void 0) return r;
+		}
+		if (a2 === b2) return true;
+		if (a2 instanceof Date && b2 instanceof Date) return a2.getTime() === b2.getTime();
+		if (a2 instanceof RegExp && b2 instanceof RegExp) return a2.source === b2.source && a2.flags === b2.flags;
+		if (typeof a2 !== "object" || a2 === null || typeof b2 !== "object" || b2 === null) {
+			if (Number.isNaN(a2) && Number.isNaN(b2)) return true;
+			if (typeof a2 === "function" && typeof b2 === "function") return a2.toString() === b2.toString();
+			return false;
+		}
+		if (seen.has(a2)) return seen.get(a2) === b2;
+		seen.set(a2, b2);
+		const isArrayA = Array.isArray(a2), isArrayB = Array.isArray(b2);
+		if (isArrayA && isArrayB) {
+			if (a2.length !== b2.length) return false;
+			for (let i = 0; i < a2.length; i++) if (!eq(a2[i], b2[i], compare2, seen, path ? `${path}.${i}` : `${i}`)) return false;
+			return true;
+		}
+		if (isArrayA !== isArrayB) return false;
+		const keysA = Object.keys(a2), keysB = Object.keys(b2);
+		if (keysA.length !== keysB.length) return false;
+		for (const key of keysA) if (!Object.prototype.hasOwnProperty.call(b2, key) || !eq(a2[key], b2[key], compare2, seen, path ? `${path}.${key}` : key)) return false;
 		return true;
-	}
-	if (isArrayA !== isArrayB) return false;
-	const keysA = Object.keys(a);
-	const keysB = Object.keys(b);
-	if (keysA.length !== keysB.length) return false;
-	for (const key of keysA) if (!Object.prototype.hasOwnProperty.call(b, key) || !isEqual(a[key], b[key], seen)) return false;
-	return true;
+	};
+	return eq(a, b, compare, /* @__PURE__ */ new WeakMap(), "");
 }
 var ASet = class ASet extends Array {
 	/** Number of elements in set */
@@ -1133,34 +1140,88 @@ var Table = class {
 };
 var PromiseProgress = class PromiseProgress extends Promise {
 	listeners = [];
-	_progress = 0;
+	_meta = {
+		start: Date.now(),
+		end: null,
+		elapsed: 0,
+		speed: 0,
+		progress: 0,
+		size: 0,
+		total: 0,
+		eta: null
+	};
+	get meta() {
+		return this._meta;
+	}
+	get start() {
+		return this._meta.start;
+	}
+	get end() {
+		return this._meta.end;
+	}
+	get elapsed() {
+		return this._meta.elapsed;
+	}
+	get speed() {
+		return this._meta.speed;
+	}
 	get progress() {
-		return this._progress;
+		return this._meta.progress;
 	}
-	set progress(p) {
-		if (p == this._progress) return;
-		this._progress = p;
-		this.listeners.forEach((l) => l(p));
+	get size() {
+		return this._meta.size;
+	}
+	get total() {
+		return this._meta.total;
+	}
+	get eta() {
+		return this._meta.eta;
+	}
+	update(size, total) {
+		const elapsed = (Date.now() - this._meta.start) / 1e3;
+		const speed = elapsed ? size / elapsed : 0;
+		const progress = total ? size / total : this._meta.progress;
+		this._meta = {
+			...this._meta,
+			size,
+			total,
+			progress,
+			elapsed,
+			speed,
+			eta: speed && total ? (total - size) / speed : null
+		};
+		(this.listeners ||= []).forEach((l) => l(this._meta));
 	}
 	constructor(executor) {
-		super((resolve, reject) => executor((value) => resolve(value), (reason) => reject(reason), (progress) => this.progress = progress));
+		super((resolve, reject) => executor((value) => {
+			this._meta = {
+				...this._meta,
+				end: Date.now()
+			};
+			resolve(value);
+		}, (reason) => {
+			this._meta = {
+				...this._meta,
+				end: Date.now()
+			};
+			reject(reason);
+		}, (size, total) => this.update(size, total ?? this._meta.total)));
 	}
 	static from(promise) {
 		if (promise instanceof PromiseProgress) return promise;
-		return new PromiseProgress((res, rej) => promise.then((...args) => res(...args)).catch((...args) => rej(...args)));
+		return new PromiseProgress((res, rej) => promise.then(res).catch(rej));
 	}
 	from(promise) {
 		const newPromise = PromiseProgress.from(promise);
-		this.onProgress((p) => newPromise.progress = p);
+		this.onProgress((m) => newPromise.update(m.size, m.total));
 		return newPromise;
 	}
 	onProgress(callback) {
-		this.listeners.push(callback);
+		(this.listeners ||= []).push(callback);
 		return this;
 	}
 	then(res, rej) {
-		const resp = super.then(res, rej);
-		return this.from(resp);
+		return this.from(super.then(res, rej));
 	}
 	catch(rej) {
 		return this.from(super.catch(rej));
@@ -1209,7 +1270,7 @@ function uploadWithProgress(options) {
 		const formData2 = new FormData();
 		options.files.forEach((f) => formData2.append("files", f));
 		xhr.withCredentials = !!options.withCredentials;
-		xhr.upload.addEventListener("progress", (event) => event.lengthComputable ? prog(event.loaded / event.total) : null);
+		xhr.upload.addEventListener("progress", (event) => event.lengthComputable ? prog(event.loaded, event.total) : null);
 		xhr.addEventListener("loadend", () => res(JSONAttemptParse(xhr.responseText)));
 		xhr.addEventListener("error", () => rej(JSONAttemptParse(xhr.responseText)));
 		xhr.addEventListener("timeout", () => rej({ error: "Request timed out" }));
@@ -2247,6 +2308,182 @@ var Ai = class extends PathEventEmitter {
 	}
 };
 //#endregion
+//#region src/captcha.ts
+var Captcha = class {
+	start = Date.now();
+	events = {
+		mouse: [],
+		keys: [],
+		clicks: [],
+		scroll: [],
+		focus: []
+	};
+	lastMouse = null;
+	velocities = [];
+	_score = .5;
+	onScoreChange;
+	set score(v) {
+		const next = +Math.max(0, Math.min(1, Number.isFinite(v) ? v : .5)).toFixed(2);
+		if (next == this._score) return;
+		this._score = next;
+		this.onScoreChange?.(next);
+	}
+	get score() {
+		return this._score;
+	}
+	get verdict() {
+		if (this.score >= .45 && this.score <= .55) return "unknown";
+		if (this.score > .5) return "human";
+		return "bot";
+	}
+	constructor(onScoreChange) {
+		this.onScoreChange = onScoreChange;
+		if (typeof window === "undefined" || !document) {
+			this._score = 0;
+			return;
+		}
+		document.addEventListener("pointermove", (e) => {
+			const now = Date.now();
+			const curr = {
+				x: e.clientX,
+				y: e.clientY,
+				t: now
+			};
+			this.events.mouse.push(curr);
+			if (this.lastMouse) {
+				const dt = now - this.lastMouse.t;
+				const dx = curr.x - this.lastMouse.x;
+				const dy = curr.y - this.lastMouse.y;
+				const dist = Math.sqrt(dx * dx + dy * dy);
+				if (dt > 0 && dt < 1e3) this.velocities.push(dist / dt);
+			}
+			this.lastMouse = curr;
+			if (this.events.mouse.length > 80) this.events.mouse.shift();
+			if (this.velocities.length > 40) this.velocities.shift();
+		}, { passive: true });
+		document.addEventListener("keydown", () => {
+			this.events.keys.push(Date.now());
+			if (this.events.keys.length > 30) this.events.keys.shift();
+			this.update();
+		});
+		document.addEventListener("pointerdown", (e) => {
+			this.events.clicks.push({
+				x: e.clientX,
+				y: e.clientY,
+				t: Date.now()
+			});
+			if (this.events.clicks.length > 20) this.events.clicks.shift();
+			this.update();
+		}, { passive: true });
+		window.addEventListener("scroll", () => {
+			this.events.scroll.push({
+				x: window.scrollX,
+				y: window.scrollY,
+				t: Date.now()
+			});
+			if (this.events.scroll.length > 20) this.events.scroll.shift();
+		}, { passive: true });
+		document.addEventListener("visibilitychange", () => {
+			this.events.focus.push({
+				visible: document.visibilityState == "visible",
+				t: Date.now()
+			});
+			if (this.events.focus.length > 20) this.events.focus.shift();
+			this.update();
+		});
+		window.addEventListener("focus", () => {
+			this.events.focus.push({
+				visible: true,
+				t: Date.now()
+			});
+			this.update();
+		});
+		window.addEventListener("blur", () => {
+			this.events.focus.push({
+				visible: false,
+				t: Date.now()
+			});
+			this.update();
+		});
+		setInterval(() => this.update(), 2e3);
+	}
+	update() {
+		if (navigator?.webdriver) {
+			this._score = 0;
+			this.onScoreChange?.(0);
+			return;
+		}
+		let delta = 0;
+		const elapsed = (Date.now() - this.start) / 1e3;
+		delta += elapsed > 30 ? .08 : elapsed > 10 ? .04 : elapsed > 3 ? .01 : -.05;
+		if (this.events.mouse.length >= 6) {
+			const recent = this.events.mouse.slice(-30);
+			const buckets = new Array(8).fill(0);
+			for (let i = 1; i < recent.length; i++) {
+				const dx = recent[i].x - recent[i - 1].x;
+				const dy = recent[i].y - recent[i - 1].y;
+				if (dx == 0 && dy == 0) continue;
+				let angle = Math.atan2(dy, dx);
+				if (angle < 0) angle += Math.PI * 2;
+				buckets[Math.min(7, Math.floor(angle / (Math.PI * 2) * 8))]++;
+			}
+			const total = buckets.reduce((a, b) => a + b, 0);
+			if (total >= 4) {
+				let entropy = 0;
+				for (const count of buckets) {
+					if (!count) continue;
+					const p = count / total;
+					entropy -= p * Math.log2(p);
+				}
+				entropy /= Math.log2(8);
+				if (entropy > .65) delta += .12;
+				else if (entropy > .4) delta += .05;
+				else delta -= .07;
+			}
+		} else if (this.events.mouse.length == 0) delta -= .01;
+		if (this.velocities.length >= 5) {
+			const avg = this.velocities.reduce((a, b) => a + b, 0) / this.velocities.length;
+			const variance = this.velocities.reduce((a, b) => a + Math.pow(b - avg, 2), 0) / this.velocities.length;
+			const cv = avg > 0 ? Math.sqrt(variance) / avg : 0;
+			if (cv > .45) delta += .1;
+			else if (cv > .18) delta += .04;
+			else if (avg > 0) delta -= .08;
+		}
+		if (this.events.clicks.length > 0) {
+			const lastClick = this.events.clicks.at(-1);
+			const mouseBeforeClick = this.events.mouse.some((m) => m.t < lastClick.t && lastClick.t - m.t < 2e3);
+			delta += mouseBeforeClick ? .06 : -.08;
+			const suspiciousClicks = this.events.clicks.filter((c) => Number.isInteger(c.x) && Number.isInteger(c.y) && c.x % 10 == 0 && c.y % 10 == 0).length;
+			if (this.events.clicks.length >= 4 && suspiciousClicks / this.events.clicks.length > .5) delta -= .06;
+		}
+		if (this.events.keys.length >= 4) {
+			const intervals = [];
+			for (let i = 1; i < this.events.keys.length; i++) intervals.push(this.events.keys[i] - this.events.keys[i - 1]);
+			const avg = intervals.reduce((a, b) => a + b, 0) / intervals.length;
+			const stdDev = Math.sqrt(intervals.reduce((a, b) => a + Math.pow(b - avg, 2), 0) / intervals.length);
+			if (avg < 20) delta -= .15;
+			else if (stdDev < 5) delta -= .1;
+			else if (avg < 50) delta -= .04;
+			else if (avg < 1e3 && stdDev > 20) delta += .08;
+		}
+		if (this.events.scroll.length >= 4) {
+			let directionChanges = 0;
+			let previousDirection = 0;
+			for (let i = 1; i < this.events.scroll.length; i++) {
+				const direction = Math.sign(this.events.scroll[i].y - this.events.scroll[i - 1].y);
+				if (direction && previousDirection && direction != previousDirection) directionChanges++;
+				if (direction) previousDirection = direction;
+			}
+			if (directionChanges >= 2) delta += .04;
+		}
+		if (this.events.focus.length >= 2) {
+			const visible = this.events.focus.filter((x) => x.visible).length;
+			delta += visible / this.events.focus.length > .4 ? .02 : -.02;
+		}
+		this.score = this.score + delta * .25;
+	}
+};
+//#endregion
 //#region src/dialog.ts
 var dialogCount = 0;
 var closed = 0;
@@ -2459,6 +2696,16 @@ function createDialog(html, opts = {}) {
 var Analytics = class extends AssetController {
 	momentum;
 	lastPage;
+	captcha = new Captcha((score) => this.updateCaptcha(score));
+	captchaSecret;
+	captchaSequence = 0;
+	captchaUpdate;
+	get captchaScore() {
+		return this.captcha.score;
+	}
+	get actorType() {
+		return this.captcha.verdict;
+	}
 	_ready;
 	ready = new Promise((res) => this._ready = res);
 	_performance = {
@@ -2537,6 +2784,9 @@ var Analytics = class extends AssetController {
 				this._id = "";
 				this._consent = void 0;
 				this._new = true;
+				this.captchaSecret = void 0;
+				this.captchaSequence = 0;
+				delete this.momentum.api.headers["X-Captcha"];
 			});
 			this.momentum.auth.on("login:c", async () => {
 				if (this.consent) await this.init();
@@ -2613,7 +2863,7 @@ var Analytics = class extends AssetController {
 	async init() {
 		if (!this.momentum.opts.analytics) return;
 		const performance = await this.performance;
-		this.id = await this.momentum.api.request({
+		const response = await this.momentum.api.request({
 			url: `api/analytics`,
 			body: [
 				navigator?.language,
@@ -2631,6 +2881,10 @@ var Analytics = class extends AssetController {
 				performance.total
 			]
 		});
+		this.id = response.id;
+		this.captchaSecret = response.captchaSecret;
+		this.captchaSequence = response.captchaSequence;
+		await this.updateCaptcha(this.captcha.score, true);
 		if (this._ready) {
 			this._ready();
 			this._ready = null;
@@ -2640,6 +2894,25 @@ var Analytics = class extends AssetController {
 		window.addEventListener("beforeunload", () => this.page("CLOSED"));
 		return this.id;
 	}
+	updateCaptcha(score, initial = false) {
+		if (!this.captchaSecret || !this.id || !globalThis.crypto?.subtle) return Promise.resolve();
+		const update = this.captchaUpdate?.catch(() => {}) || Promise.resolve();
+		this.captchaUpdate = update.then(() => this.attestCaptcha(score, initial)).catch(() => {});
+		return this.captchaUpdate;
+	}
+	async attestCaptcha(score, initial) {
+		if (!this.captchaSecret || !this.id) return;
+		if (!initial) this.captchaSequence++;
+		const canonical = Math.max(0, Math.min(1, Number.isFinite(score) ? score : .5)).toFixed(2);
+		const payload = `${canonical}:${this.captchaSequence}`;
+		const key = await crypto.subtle.importKey("raw", new TextEncoder().encode(this.captchaSecret), {
+			name: "HMAC",
+			hash: "SHA-256"
+		}, false, ["sign"]);
+		const signature = await crypto.subtle.sign("HMAC", key, new TextEncoder().encode(payload));
+		const proof = btoa(String.fromCharCode(...new Uint8Array(signature))).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+		this.momentum.api.headers["X-Captcha"] = `${canonical},${this.captchaSequence},${proof}`;
+	}
 	async consentPrompt(content) {
 		const settings = await this.momentum.settings.map();
 		const { close, dialog, result } = createDialog(`
@@ -3013,19 +3286,29 @@ var Auth = class extends PathEventEmitter {
 	loginRedirect(host = location.origin) {
 		return new Promise((res, rej) => {
 			let listener, win;
+			const loginOrigin = new URL(this.momentum.opts.loginUrl, location.href).origin;
+			const hostOrigin = new URL(host, location.href).origin;
 			window.addEventListener("message", listener = async (event) => {
+				if (event.origin !== loginOrigin || event?.data?.sender !== loginOrigin) return;
 				const data = event?.data || {};
-				if (event.origin != origin || data.sender != origin) return;
-				if (!data.token) return rej("Unknown response from login");
+				if (!data.token) {
+					window.removeEventListener("message", listener);
+					return rej(/* @__PURE__ */ new Error("Unknown response from login"));
+				}
 				window.removeEventListener("message", listener);
-				await this.readSession(data.token, true);
-				win.close();
-				res(data.token);
+				try {
+					await this.readSession(data.token, true);
+					win?.close();
+					res(data.token);
+				} catch (err) {
+					win?.close();
+					rej(err);
+				}
 			});
-			win = window.open(`${this.momentum.opts.loginUrl}?redirect=postmessage&host=${encodeURI(host)}`, "_blank");
+			win = window.open(`${this.momentum.opts.loginUrl}?redirect=postmessage&host=${encodeURIComponent(hostOrigin)}`, "_blank");
 			if (!win) {
 				window.removeEventListener("message", listener);
-				return rej("Unable to open login");
+				return rej(/* @__PURE__ */ new Error("Unable to open login"));
 			}
 		});
 	}
@@ -3151,174 +3434,20 @@ var Call = class extends PathEventEmitter {
 	}
 };
 //#endregion
-//#region src/captcha.ts
-var Captcha = class {
-	start = Date.now();
-	events = {
-		mouse: [],
-		keys: [],
-		clicks: []
-	};
-	lastMouse = null;
-	velocities = [];
-	_score = .5;
-	set score(v) {
-		this._score = v;
-	}
-	get score() {
-		return this._score;
-	}
-	get verdict() {
-		if (this.score == .5) return "unknown";
-		if (this.score > .5) return "human";
-		return "bot";
-	}
-	constructor() {
-		if (typeof window === "undefined" || !window.innerWidth || !this.validUserAgent()) {
-			this.score = 0;
-			return;
-		}
-		document.addEventListener("mousemove", (e) => {
-			const now = Date.now();
-			const curr = {
-				x: e.clientX,
-				y: e.clientY,
-				t: now
-			};
-			this.events.mouse.push(curr);
-			if (this.lastMouse) {
-				const dt = now - this.lastMouse.t;
-				const dx = curr.x - this.lastMouse.x;
-				const dy = curr.y - this.lastMouse.y;
-				const dist = Math.sqrt(dx * dx + dy * dy);
-				if (dt > 0) this.velocities.push(dist / dt);
-			}
-			this.lastMouse = curr;
-			if (this.events.mouse.length > 50) this.events.mouse.shift();
-			if (this.velocities.length > 30) this.velocities.shift();
-		});
-		document.addEventListener("keydown", (e) => {
-			this.events.keys.push(Date.now());
-			if (this.events.keys.length > 20) this.events.keys.shift();
-		});
-		document.addEventListener("click", (e) => {
-			this.events.clicks.push({
-				x: e.clientX,
-				y: e.clientY,
-				t: Date.now()
-			});
-			if (this.events.clicks.length > 15) this.events.clicks.shift();
-		});
-		setInterval(() => this.update(), 1e3);
-	}
-	validUserAgent() {
-		if (!navigator?.userAgent) return false;
-		const ua = navigator.userAgent.toLowerCase();
-		if ([
-			"bot",
-			"crawler",
-			"spider",
-			"scraper",
-			"headless",
-			"phantom",
-			"selenium",
-			"webdriver",
-			"puppeteer",
-			"playwright",
-			"cypress",
-			"automation"
-		].some((pattern) => ua.includes(pattern))) return false;
-		if (![
-			"chrome",
-			"firefox",
-			"safari",
-			"edge",
-			"opera"
-		].some((browser) => ua.includes(browser))) return false;
-		if (![
-			"windows",
-			"mac",
-			"linux",
-			"android",
-			"ios"
-		].some((os) => ua.includes(os))) return false;
-		return ua.length > 20 && ua.length < 1e3;
-	}
-	update() {
-		if (navigator.webdriver) {
-			this.score = 0;
-			return;
-		}
-		let delta = 0;
-		const elapsed = (Date.now() - this.start) / 1e3;
-		delta += elapsed > 30 ? .08 : elapsed > 10 ? .04 : elapsed > 3 ? .01 : -.05;
-		if (this.events.mouse.length >= 5) {
-			const recent = this.events.mouse.slice(-20);
-			let changes = 0;
-			let maxStraightRun = 0;
-			let currentRun = 0;
-			for (let i = 2; i < recent.length; i++) {
-				const a1 = Math.atan2(recent[i - 1].y - recent[i - 2].y, recent[i - 1].x - recent[i - 2].x);
-				const a2 = Math.atan2(recent[i].y - recent[i - 1].y, recent[i].x - recent[i - 1].x);
-				if (Math.abs(a1 - a2) > .3) {
-					changes++;
-					currentRun = 0;
-				} else {
-					currentRun++;
-					maxStraightRun = Math.max(maxStraightRun, currentRun);
-				}
-			}
-			const entropy = changes / (recent.length - 2);
-			if (entropy > .4) delta += .12;
-			else if (entropy > .2) delta += .05;
-			else delta -= .08;
-			if (maxStraightRun > 8) delta -= .1;
-		} else if (this.events.mouse.length === 0) delta -= .03;
-		if (this.velocities.length >= 5) {
-			const avg = this.velocities.reduce((a, b) => a + b, 0) / this.velocities.length;
-			const variance = this.velocities.reduce((a, b) => a + Math.pow(b - avg, 2), 0) / this.velocities.length;
-			const cv = avg > 0 ? Math.sqrt(variance) / avg : 0;
-			if (cv > .4) delta += .1;
-			else if (cv > .15) delta += .04;
-			else if (avg > 0) delta -= .1;
-		}
-		if (this.events.clicks.length > 0) {
-			const lastClick = this.events.clicks[this.events.clicks.length - 1];
-			const mouseBeforeClick = this.events.mouse.some((m) => m.t < lastClick.t && lastClick.t - m.t < 2e3);
-			delta += mouseBeforeClick ? .08 : -.12;
-			if (this.events.clicks.filter((c) => Number.isInteger(c.x) && Number.isInteger(c.y) && c.x % 10 === 0 && c.y % 10 === 0).length / this.events.clicks.length > .5) delta -= .08;
-		}
-		if (this.events.keys.length >= 3) {
-			const intervals = [];
-			for (let i = 1; i < this.events.keys.length; i++) intervals.push(this.events.keys[i] - this.events.keys[i - 1]);
-			const avg = intervals.reduce((a, b) => a + b, 0) / intervals.length;
-			const stdDev = Math.sqrt(intervals.reduce((a, b) => a + Math.pow(b - avg, 2), 0) / intervals.length);
-			if (avg < 20) delta -= .15;
-			else if (stdDev < 5) delta -= .12;
-			else if (avg < 50) delta -= .05;
-			else if (avg < 1e3 && stdDev > 20) delta += .1;
-		}
-		const raw = this.score + delta;
-		this.score = this.score * .75 + raw * .25;
-		this.score = Math.max(.05, Math.min(.95, this.score));
-	}
-};
-//#endregion
 //#region src/client.ts
 /** Handle device settings */
 var Client = class Client extends PathEventEmitter {
 	momentum;
-	captcha = new Captcha();
 	installTimeout;
 	nativePwaPrompt;
 	pendingInstall = null;
 	speed;
 	updating = false;
 	get actorType() {
-		return this.captcha.verdict;
+		return this.momentum.analytics.actorType;
 	}
 	get captchaScore() {
-		return this.captcha.score;
+		return this.momentum.analytics.captchaScore;
 	}
 	/** Check for updates */
 	updateReady = new Promise((res) => {
@@ -4837,7 +4966,7 @@ var Storage = class extends PathEventEmitter {
 				headers: this.momentum.api.headers,
 				files: f
 			}).onProgress((p) => {
-				prog(p);
+				prog(p.progress);
 			}).then((resp) => {
 				this.emit(PES`${this.module}/${path}:c`, resp);
 				res(resp);
@@ -5015,7 +5144,7 @@ var Static = class extends Storage {
 };
 //#endregion
 //#region package.json
-var version = "1.5.7";
+var version = "1.5.9";
 //#endregion
 //#region src/webRtc.ts
 var WebRtc = class extends PathEventEmitter {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/momentum",
-	"version": "1.5.7",
+	"version": "1.5.9",
 	"description": "Client library for momentum",
 	"keywords": [
 		"Momentum"
@@ -33,7 +33,7 @@
 		"postbuild": "npm run build:docs && node -e \"const fs=require('fs');fs.cpSync('dist/index.mjs','../server/public/momentum.mjs');fs.cpSync('dist/index.js','../server/public/momentum.js');fs.cpSync('dist/momentum.worker.mjs','../server/public/momentum.worker.mjs')\""
 	},
 	"dependencies": {
-		"@ztimson/utils": "^0.30.8"
+		"@ztimson/utils": "^0.31.1"
 	},
 	"devDependencies": {
 		"@types/node": "^26.1.1",