@prosopo/provider 5.13.4 → 5.15.0

package/dist/tests/unit/utils/tarpitPadding.unit.test.js

@@ -1,39 +1,62 @@
+import { EventEmitter } from "node:events";
 import { MAX_PAD_BYTES } from "@prosopo/types";
 import { describe, expect, it, vi } from "vitest";
 import { padResponseMiddleware } from "../../../utils/tarpitPadding.js";
-const makeRes = (padBytes) => {
+const makeRes = ({ padBytes, highWaterMark }) => {
     const chunks = [];
     const headers = {};
+    const emitter = new EventEmitter();
+    let written = 0;
     let ended = false;
+    let destroyed = false;
     const jsonMock = vi.fn();
-    const res = {
+    const res = Object.assign(emitter, {
         locals: { padBytes },
         json: jsonMock,
+        get writableEnded() {
+            return ended;
+        },
+        get destroyed() {
+            return destroyed;
+        },
         setHeader: (name, value) => {
             headers[name.toLowerCase()] = value;
         },
         write: (chunk) => {
             chunks.push(chunk);
-            return true;
+            written += chunk.length;
+            return highWaterMark === undefined || written < highWaterMark;
         },
         end: () => {
             ended = true;
             return res;
         },
-    };
+        destroy: () => {
+            destroyed = true;
+        },
+    });
     return {
         res,
+        emitter,
         body: () => chunks.join(""),
+        written: () => written,
         jsonMock,
         headers,
         ended: () => ended,
+        destroyed: () => destroyed,
+        close: () => {
+            destroyed = true;
+            emitter.emit("close");
+        },
     };
 };
-const send = (fake, body) => {
+const flush = () => new Promise((resolve) => setImmediate(resolve));
+const send = async (fake, body) => {
     const next = vi.fn();
     padResponseMiddleware({}, fake.res, next);
     expect(next).toHaveBeenCalled();
     fake.res.json(body);
+    await flush();
 };
 const CHALLENGE = {
     status: "ok",
@@ -41,59 +64,118 @@ const CHALLENGE = {
     difficulty: 9,
     timestamp: "1764000000000",
 };
+const padOf = (parsed) => Object.entries(parsed)
+    .filter(([key]) => !(key in CHALLENGE))
+    .map(([, value]) => String(value));
 describe("padResponseMiddleware", () => {
-    it("leaves the response untouched when no padding was resolved", () => {
-        const fake = makeRes(undefined);
-        send(fake, CHALLENGE);
+    it("leaves the response untouched when no padding was resolved", async () => {
+        const fake = makeRes({ padBytes: undefined });
+        await send(fake, CHALLENGE);
         expect(fake.jsonMock).toHaveBeenCalledWith(CHALLENGE);
         expect(fake.body()).toBe("");
     });
-    it("leaves the response untouched for a zero or negative padBytes", () => {
+    it("leaves the response untouched for a zero or negative padBytes", async () => {
         for (const padBytes of [0, -1]) {
-            const fake = makeRes(padBytes);
-            send(fake, CHALLENGE);
+            const fake = makeRes({ padBytes });
+            await send(fake, CHALLENGE);
             expect(fake.jsonMock).toHaveBeenCalledWith(CHALLENGE);
             expect(fake.body()).toBe("");
         }
     });
-    it("appends the requested padding and keeps every real field", () => {
-        const fake = makeRes(4096);
-        send(fake, CHALLENGE);
+    it("emits the requested total padding and keeps every real field", async () => {
+        const fake = makeRes({ padBytes: 4096 });
+        await send(fake, CHALLENGE);
         expect(fake.jsonMock).not.toHaveBeenCalled();
         const parsed = JSON.parse(fake.body());
-        expect(parsed.pad).toHaveLength(4096);
         expect(parsed).toMatchObject(CHALLENGE);
+        expect(padOf(parsed).join("")).toHaveLength(4096);
         expect(fake.headers["content-type"]).toBe("application/json; charset=utf-8");
         expect(fake.ended()).toBe(true);
     });
-    it("writes the padding before any real field, so a scraper cannot read a prefix and abort", () => {
-        const fake = makeRes(2048);
-        send(fake, CHALLENGE);
+    it("interleaves the padding so no real field arrives before some of it", async () => {
+        const fake = makeRes({ padBytes: 4096 });
+        await send(fake, CHALLENGE);
         const body = fake.body();
-        expect(body.indexOf('"pad"')).toBe(1);
-        expect(body.indexOf('"challenge"')).toBeGreaterThan(2048);
+        const parsed = JSON.parse(fake.body());
+        const pads = padOf(parsed);
+        expect(pads).toHaveLength(Object.keys(CHALLENGE).length);
+        for (const field of Object.keys(CHALLENGE)) {
+            expect(body.indexOf(`"${field}"`)).toBeGreaterThan(0);
+        }
+        const lastPad = pads[pads.length - 1] ?? "";
+        expect(body.indexOf('"timestamp"')).toBeGreaterThan(4096 - lastPad.length);
     });
-    it("pads with incompressible bytes", () => {
-        const fake = makeRes(8192);
-        send(fake, CHALLENGE);
-        const pad = JSON.parse(fake.body()).pad;
-        expect(new Set(pad).size).toBeGreaterThan(50);
+    it("uses unpredictable pad keys rather than a fixed marker", async () => {
+        const keysFor = async () => {
+            const fake = makeRes({ padBytes: 512 });
+            await send(fake, CHALLENGE);
+            const parsed = JSON.parse(fake.body());
+            return Object.keys(parsed).filter((key) => !(key in CHALLENGE));
+        };
+        const first = await keysFor();
+        const second = await keysFor();
+        expect(first).not.toContain("pad");
+        expect(first).not.toEqual(second);
     });
-    it("clamps padding to the 5 MiB ceiling so it cannot be used as an amplifier", () => {
-        const fake = makeRes(MAX_PAD_BYTES * 10);
-        send(fake, CHALLENGE);
-        expect(JSON.parse(fake.body()).pad).toHaveLength(MAX_PAD_BYTES);
+    it("pads with incompressible bytes", async () => {
+        const fake = makeRes({ padBytes: 8192 });
+        await send(fake, CHALLENGE);
+        const parsed = JSON.parse(fake.body());
+        expect(new Set(padOf(parsed).join("")).size).toBeGreaterThan(50);
+    });
+    it("clamps padding to the 5 MiB ceiling so it cannot be used as an amplifier", async () => {
+        const fake = makeRes({ padBytes: MAX_PAD_BYTES * 10 });
+        await send(fake, CHALLENGE);
+        const parsed = JSON.parse(fake.body());
+        expect(padOf(parsed).join("")).toHaveLength(MAX_PAD_BYTES);
     });
-    it("emits valid JSON for a body with no fields", () => {
-        const fake = makeRes(64);
-        send(fake, {});
-        expect(JSON.parse(fake.body()).pad).toHaveLength(64);
+    it("emits valid JSON for a body with no fields", async () => {
+        const fake = makeRes({ padBytes: 64 });
+        await send(fake, {});
+        const parsed = JSON.parse(fake.body());
+        expect(padOf(parsed).join("")).toHaveLength(64);
     });
-    it("does not pad a non-object body, which has no fields to splice into", () => {
-        const fake = makeRes(64);
-        send(fake, ["a", "b"]);
+    it("does not pad a non-object body, which has no fields to splice into", async () => {
+        const fake = makeRes({ padBytes: 64 });
+        await send(fake, ["a", "b"]);
         expect(fake.jsonMock).toHaveBeenCalledWith(["a", "b"]);
         expect(fake.body()).toBe("");
     });
+    it("stops writing once the socket reports backpressure and resumes on drain", async () => {
+        const fake = makeRes({ padBytes: 512 * 1024, highWaterMark: 64 * 1024 });
+        await send(fake, CHALLENGE);
+        const paused = fake.written();
+        expect(paused).toBeLessThan(128 * 1024);
+        expect(fake.ended()).toBe(false);
+        fake.emitter.emit("drain");
+        await flush();
+        expect(fake.written()).toBeGreaterThan(paused);
+    });
+    it("abandons the pad when the peer stops reading, instead of buffering it", async () => {
+        const fake = makeRes({
+            padBytes: MAX_PAD_BYTES,
+            highWaterMark: 64 * 1024,
+        });
+        await send(fake, CHALLENGE);
+        const paused = fake.written();
+        fake.close();
+        await flush();
+        expect(fake.written()).toBe(paused);
+        expect(fake.written()).toBeLessThan(128 * 1024);
+        expect(fake.ended()).toBe(false);
+    });
+    it("does not resume writing after a drain that follows a close", async () => {
+        const fake = makeRes({
+            padBytes: MAX_PAD_BYTES,
+            highWaterMark: 64 * 1024,
+        });
+        await send(fake, CHALLENGE);
+        fake.close();
+        await flush();
+        const paused = fake.written();
+        fake.emitter.emit("drain");
+        await flush();
+        expect(fake.written()).toBe(paused);
+    });
 });
 //# sourceMappingURL=tarpitPadding.unit.test.js.map

package/dist/tests/unit/utils/tarpitPadding.unit.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"tarpitPadding.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/utils/tarpitPadding.unit.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tarpitPadding.unit.test.js","sourceRoot":"","sources":["../../../../src/tests/unit/utils/tarpitPadding.unit.test.ts"],"names":[],"mappings":"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"}

package/dist/utils/tarpitPadding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tarpitPadding.d.ts","sourceRoot":"","sources":["../../src/utils/tarpitPadding.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAuB/D,eAAO,MAAM,qBAAqB,SAC3B,OAAO,OACR,QAAQ,QACP,YAAY,KAChB,IAYF,CAAC"}
+{"version":3,"file":"tarpitPadding.d.ts","sourceRoot":"","sources":["../../src/utils/tarpitPadding.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAgH/D,eAAO,MAAM,qBAAqB,SAC3B,OAAO,OACR,QAAQ,QACP,YAAY,KAChB,IAkBF,CAAC"}

package/dist/utils/tarpitPadding.js

@@ -2,22 +2,93 @@ import { MAX_PAD_BYTES } from "@prosopo/types";
 import { randomBytes } from "node:crypto";
 //#region src/utils/tarpitPadding.ts
 var POOL = randomBytes(Math.ceil(MAX_PAD_BYTES * 3 / 4)).toString("base64");
+var CHUNK_BYTES = 64 * 1024;
+var KEY_ALPHABET = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+var MIN_KEY_LENGTH = 3;
+var MAX_KEY_LENGTH = 12;
 var clampPadBytes = (padBytes) => padBytes && padBytes > 0 ? Math.min(Math.floor(padBytes), MAX_PAD_BYTES) : 0;
-var streamWithPad = (res, body, n) => {
-	const offset = Math.floor(Math.random() * (POOL.length - n + 1));
-	const fields = JSON.stringify(body).slice(1, -1);
+var isPlainObject = (body) => typeof body === "object" && body !== null && !Array.isArray(body);
+var bodyMembers = (body) => {
+	const serialised = JSON.stringify(body);
+	if (serialised === void 0 || !serialised.startsWith("{")) return void 0;
+	const normalised = JSON.parse(serialised);
+	return Object.entries(normalised).map(([key, value]) => ({
+		key,
+		encoded: `${JSON.stringify(key)}:${JSON.stringify(value)}`
+	}));
+};
+var randomKey = (taken) => {
+	for (;;) {
+		const length = MIN_KEY_LENGTH + Math.floor(Math.random() * (MAX_KEY_LENGTH - MIN_KEY_LENGTH + 1));
+		let key = "";
+		for (let index = 0; index < length; index++) key += KEY_ALPHABET.charAt(Math.floor(Math.random() * KEY_ALPHABET.length));
+		if (!taken.has(key)) {
+			taken.add(key);
+			return key;
+		}
+	}
+};
+var partition = (total, parts) => {
+	const cuts = [0, total];
+	for (let index = 1; index < parts; index++) cuts.push(Math.floor(Math.random() * (total + 1)));
+	cuts.sort((a, b) => a - b);
+	const sizes = [];
+	for (let index = 1; index < cuts.length; index++) sizes.push((cuts[index] ?? 0) - (cuts[index - 1] ?? 0));
+	return sizes;
+};
+var awaitDrain = (res) => new Promise((resolve) => {
+	const settle = (drained) => {
+		res.removeListener("drain", onDrain);
+		res.removeListener("close", onClose);
+		resolve(drained);
+	};
+	const onDrain = () => settle(true);
+	const onClose = () => settle(false);
+	res.once("drain", onDrain);
+	res.once("close", onClose);
+});
+var write = async (res, chunk) => {
+	if (res.writableEnded || res.destroyed) return false;
+	return res.write(chunk) ? true : await awaitDrain(res);
+};
+var writePad = async (res, size) => {
+	const offset = Math.floor(Math.random() * (POOL.length - size + 1));
+	for (let written = 0; written < size; written += CHUNK_BYTES) {
+		const from = offset + written;
+		const to = offset + Math.min(written + CHUNK_BYTES, size);
+		if (!await write(res, POOL.slice(from, to))) return false;
+	}
+	return true;
+};
+var streamWithPad = async (res, members, total) => {
+	const segments = Math.max(members.length, 1);
+	const sizes = partition(total, segments);
+	const taken = new Set(members.map((member) => member.key));
 	res.setHeader("content-type", "application/json; charset=utf-8");
-	res.write("{\"pad\":\"");
-	res.write(POOL.slice(offset, offset + n));
-	res.write(fields ? `",${fields}}` : "\"}");
-	return res.end();
+	let separator = "{";
+	for (let index = 0; index < segments; index++) {
+		if (!await write(res, `${separator}"${randomKey(taken)}":"`)) return;
+		if (!await writePad(res, sizes[index] ?? 0)) return;
+		const member = members[index];
+		if (!await write(res, member ? `",${member.encoded}` : "\"")) return;
+		separator = ",";
+	}
+	if (!await write(res, "}")) return;
+	res.end();
 };
-var isPlainObject = (body) => typeof body === "object" && body !== null && !Array.isArray(body);
 var padResponseMiddleware = (_req, res, next) => {
 	const originalJson = res.json.bind(res);
 	res.json = (body) => {
-		const n = clampPadBytes(res.locals.padBytes);
-		return n === 0 || !isPlainObject(body) ? originalJson(body) : streamWithPad(res, body, n);
+		const total = clampPadBytes(res.locals.padBytes);
+		if (total === 0 || !isPlainObject(body)) return originalJson(body);
+		const members = bodyMembers(body);
+		if (members === void 0) return originalJson(body);
+		const swallow = () => void 0;
+		res.on("error", swallow);
+		streamWithPad(res, members, total).catch(() => {
+			if (!res.destroyed) res.destroy();
+		}).finally(() => res.removeListener("error", swallow));
+		return res;
 	};
 	next();
 };

package/dist/utils/tarpitPadding.js.map

@@ -1 +1 @@
-{"version":3,"file":"tarpitPadding.js","sourceRoot":"","sources":["../../src/utils/tarpitPadding.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAEhF,MAAM,aAAa,GAAG,CAAC,QAA4B,EAAU,EAAE,CAC9D,QAAQ,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9E,MAAM,aAAa,GAAG,CAAC,GAAa,EAAE,IAAY,EAAE,CAAS,EAAY,EAAE;IAC1E,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAIjE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjD,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,iCAAiC,CAAC,CAAC;IACjE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACtB,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IAC1C,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,IAAa,EAAkB,EAAE,CACvD,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACpC,IAAa,EACb,GAAa,EACb,IAAkB,EACX,EAAE;IACT,MAAM,YAAY,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACxC,GAAG,CAAC,IAAI,GAAG,CAAC,IAAY,EAAY,EAAE;QACrC,MAAM,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAI7C,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;YACrC,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC;YACpB,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC;IACF,IAAI,EAAE,CAAC;AACR,CAAC,CAAC"}
+{"version":3,"file":"tarpitPadding.js","sourceRoot":"","sources":["../../src/utils/tarpitPadding.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,104 +1,106 @@
 {
-	"name": "@prosopo/provider",
-	"version": "5.13.4",
-	"author": "PROSOPO LIMITED <info@prosopo.io>",
-	"license": "Apache-2.0",
-	"type": "module",
-	"engines": {
-		"node": "^24",
-		"npm": "^11"
-	},
-	"scripts": {
-		"clean": "del-cli --verbose dist tsconfig.tsbuildinfo",
-		"build": "npm run build:cross-env -- --mode ${NODE_ENV:-development}",
-		"build:cross-env": "vite build --config vite.esm.config.ts",
-		"build:tsc": "tsc --build --verbose",
-		"build:cjs": "NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV",
-		"build:edge": "node ./scripts/buildEdgeScript.mjs",
-		"typecheck": "tsc --project tsconfig.types.json",
-		"test:unit": "NODE_ENV=${NODE_ENV:-test}; TEST_TYPE=unit npx vitest run --config ./vite.test.config.ts",
-		"test:integration": "NODE_ENV=${NODE_ENV:-test}; TEST_TYPE=integration DECISION_MACHINE_ARTIFACT_CACHE_TTL_MS=1 npx vitest run --config ./vite.threads.test.config.ts",
-		"test": "npm run test:unit && npm run test:integration",
-		"mnemonic": "tsx ./scripts/generateMnemonic.ts"
-	},
-	"dependencies": {
-		"@noble/hashes": "2.4.0",
-		"@polkadot/util": "14.0.3",
-		"@prosopo/api": "4.3.7",
-		"@prosopo/api-express-router": "3.1.98",
-		"@prosopo/api-route": "2.6.61",
-		"@prosopo/captcha-severity": "1.1.2",
-		"@prosopo/common": "3.1.60",
-		"@prosopo/database": "4.1.2",
-		"@prosopo/datasets": "3.1.93",
-		"@prosopo/env": "3.6.67",
-		"@prosopo/ipinfo": "0.4.12",
-		"@prosopo/keyring": "2.9.99",
-		"@prosopo/load-balancer": "2.11.3",
-		"@prosopo/locale": "3.6.1",
-		"@prosopo/logger": "2.1.1",
-		"@prosopo/native-ja4": "0.0.7",
-		"@prosopo/native-merkle": "0.0.6",
-		"@prosopo/native-puzzle": "0.1.0",
-		"@prosopo/puzzle-assets": "0.1.4",
-		"@prosopo/redis-client": "1.0.38",
-		"@prosopo/types": "5.11.1",
-		"@prosopo/types-database": "5.7.2",
-		"@prosopo/types-env": "2.11.13",
-		"@prosopo/user-access-policy": "3.14.13",
-		"@prosopo/util": "3.3.12",
-		"@prosopo/util-crypto": "13.5.33",
-		"@prosopo/web-bot-auth": "0.1.3",
-		"cron": "3.1.7",
-		"express": "4.22.2",
-		"express-rate-limit": "7.4.0",
-		"geolib": "3.3.14",
-		"i18next": "26.4.2",
-		"ip-address": "10.7.0",
-		"mongoose": "9.10.0",
-		"prom-client": "15.1.3",
-		"uuid": "14.0.2",
-		"zod": "3.23.8"
-	},
-	"devDependencies": {
-		"@noble/curves": "2.4.0",
-		"@prosopo/config": "3.4.2",
-		"@types/node": "22.5.5",
-		"@types/pg": "8.23.1",
-		"@types/uuid": "11.0.0",
-		"@vitest/coverage-v8": "4.1.11",
-		"concurrently": "9.0.1",
-		"cors": "2.8.6",
-		"del-cli": "6.0.0",
-		"dotenv": "16.4.5",
-		"esbuild": "0.28.2",
-		"npm-run-all": "4.1.5",
-		"testcontainers": "12.1.0",
-		"tslib": "2.7.0",
-		"tsx": "4.20.3",
-		"typescript": "5.6.2",
-		"undici": "6.29.0",
-		"vite": "8.1.5",
-		"vitest": "4.1.11"
-	},
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/prosopo/captcha.git",
-		"directory": "packages/provider"
-	},
-	"description": "The easiest way to deploy the Prosopo contract and run the Provider node is via the [captcha repository](https://github.com/prosopo/captcha/).",
-	"bugs": {
-		"url": "https://github.com/prosopo/captcha/issues"
-	},
-	"homepage": "https://github.com/prosopo/captcha#readme",
-	"sideEffects": false,
-	"main": "dist/index.js",
-	"types": "dist/index.d.ts",
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"import": "./dist/index.js",
-			"require": "./dist/cjs/index.cjs"
-		}
-	}
-}
+  "name": "@prosopo/provider",
+  "version": "5.15.0",
+  "author": "PROSOPO LIMITED <info@prosopo.io>",
+  "license": "Apache-2.0",
+  "type": "module",
+  "engines": {
+    "node": "^24"
+  },
+  "dependencies": {
+    "@noble/hashes": "2.4.0",
+    "@polkadot/util": "14.0.3",
+    "@prosopo/api": "4.4.0",
+    "@prosopo/api-express-router": "3.2.1",
+    "@prosopo/api-route": "2.6.63",
+    "@prosopo/captcha-severity": "1.2.0",
+    "@prosopo/common": "3.1.62",
+    "@prosopo/database": "4.1.4",
+    "@prosopo/datasets": "3.2.1",
+    "@prosopo/env": "3.6.69",
+    "@prosopo/ipinfo": "0.4.14",
+    "@prosopo/keyring": "2.10.1",
+    "@prosopo/load-balancer": "2.11.5",
+    "@prosopo/locale": "3.7.0",
+    "@prosopo/logger": "2.1.3",
+    "@prosopo/native-ja4": "0.0.7",
+    "@prosopo/native-merkle": "0.0.6",
+    "@prosopo/native-puzzle": "0.1.0",
+    "@prosopo/puzzle-assets": "0.2.0",
+    "@prosopo/redis-client": "1.0.40",
+    "@prosopo/types": "5.13.0",
+    "@prosopo/types-database": "5.8.0",
+    "@prosopo/types-env": "2.11.15",
+    "@prosopo/user-access-policy": "3.14.15",
+    "@prosopo/util": "3.3.14",
+    "@prosopo/util-crypto": "13.6.0",
+    "@prosopo/web-bot-auth": "0.1.3",
+    "cron": "3.1.7",
+    "express": "4.22.2",
+    "express-rate-limit": "7.4.0",
+    "geolib": "3.3.14",
+    "i18next": "26.4.2",
+    "ip-address": "10.7.0",
+    "mongoose": "9.10.0",
+    "prom-client": "15.1.3",
+    "uuid": "14.0.2",
+    "zod": "3.23.8"
+  },
+  "devDependencies": {
+    "@noble/curves": "2.4.0",
+    "@prosopo/config": "3.4.3",
+    "@types/cors": "2.8.19",
+    "@types/express": "4.17.25",
+    "@types/node": "22.5.5",
+    "@types/pg": "8.23.1",
+    "@types/uuid": "11.0.0",
+    "@vitest/coverage-v8": "4.1.11",
+    "@vitest/spy": "4.1.11",
+    "concurrently": "9.0.1",
+    "cors": "2.8.6",
+    "del-cli": "6.0.0",
+    "dotenv": "16.4.5",
+    "esbuild": "0.28.2",
+    "npm-run-all": "4.1.5",
+    "testcontainers": "12.1.0",
+    "tslib": "2.7.0",
+    "tsx": "4.20.3",
+    "typescript": "5.6.2",
+    "undici": "6.29.0",
+    "vite": "8.1.5",
+    "vitest": "4.1.11"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/prosopo/captcha.git",
+    "directory": "packages/provider"
+  },
+  "description": "The easiest way to deploy the Prosopo contract and run the Provider node is via the [captcha repository](https://github.com/prosopo/captcha/).",
+  "bugs": {
+    "url": "https://github.com/prosopo/captcha/issues"
+  },
+  "homepage": "https://github.com/prosopo/captcha#readme",
+  "sideEffects": false,
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/cjs/index.cjs"
+    }
+  },
+  "scripts": {
+    "clean": "del-cli --verbose dist tsconfig.tsbuildinfo",
+    "build": "pnpm run build:cross-env --mode ${NODE_ENV:-development}",
+    "build:cross-env": "vite build --config vite.esm.config.ts",
+    "build:tsc": "tsc --build --verbose",
+    "build:cjs": "NODE_ENV=${NODE_ENV:-development}; vite build --config vite.cjs.config.ts --mode $NODE_ENV",
+    "build:edge": "node ./scripts/buildEdgeScript.mjs",
+    "typecheck": "tsc --project tsconfig.types.json",
+    "test:unit": "NODE_ENV=${NODE_ENV:-test}; TEST_TYPE=unit pnpm exec vitest run --config ./vite.test.config.ts",
+    "test:integration": "NODE_ENV=${NODE_ENV:-test}; TEST_TYPE=integration DECISION_MACHINE_ARTIFACT_CACHE_TTL_MS=1 pnpm exec vitest run --config ./vite.threads.test.config.ts",
+    "test": "pnpm run test:unit && pnpm run test:integration",
+    "mnemonic": "tsx ./scripts/generateMnemonic.ts"
+  }
+}