@anonympins/fingerprint 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anonympins/fingerprint",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "An HTTP(S) client mitigation and anti-bot protection library for Node.js/Express, based on digital fingerprinting and dynamic Proof-of-Work (PoW) challenges.",
   "main": "fingerprint.js",
   "type": "module",

package/pow.solver.js

@@ -16,12 +16,15 @@
  * @returns {Promise<number>} La solution (un nombre entier).
  */
 export async function solveCpuTargetInline(clientIp, nonce, target, clientSecret = null, progressCallback) {
-    const cpuTarget = BigInt(target);
+    // Le 'target' est déjà un BigInt lorsqu'il est appelé depuis la page de challenge.
+    // On s'assure juste qu'il est bien de ce type.
+    const cpuTarget = typeof target === 'bigint' ? target : BigInt('0x' + target);
     let cpuSolution = 0;
-    while (true) {
-        const msg = clientSecret 
-            ? `${clientIp}:${nonce}:${cpuSolution}:${clientSecret}`
-            : `${clientIp}:${nonce}:${cpuSolution}`;
+    const ipPart = clientIp || ''; // Use empty string if IP is null/undefined
+    while (true) { // When a clientSecret is used, the IP is omitted from the hash to make it independent of the network.
+        const msg = clientSecret ?
+            `${nonce}:${cpuSolution}:${clientSecret}` :
+            `${ipPart}:${nonce}:${cpuSolution}`;
         const buf = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(msg));
         const hashHex = Array.from(new Uint8Array(buf)).map(b => b.toString(16).padStart(2, '0')).join('');
         if (BigInt('0x' + hashHex) < cpuTarget) break;
@@ -76,18 +79,28 @@ export async function solveCpuTarget(message, target) {
  * @returns {Promise<number>} La solution (nombre entier).
  */
 export async function solveMemory(seed, difficulty) {
+    // On définit un seuil pour savoir quand faire une pause, afin de ne pas bloquer le thread UI.
+    const YIELD_THRESHOLD = 100000;
     const size = difficulty * 1024 * 1024;
     const buffer = new Uint32Array(size / 4);
     let h = new TextEncoder().encode(seed).reduce((acc, v) => acc + v, 0);
+
     for (let i = 0; i < buffer.length; i++) {
         buffer[i] = (h = Math.imul(h ^ i, 1597334677));
+        if (i % YIELD_THRESHOLD === 0) {
+            await new Promise(r => setTimeout(r, 0)); // Respiration pour ne pas geler l'UI
+        }
     }
+
     let solution = 0;
     const iterations = size / 16;
     let addr = buffer.length > 0 ? buffer[0] % buffer.length : 0;
     for (let i = 0; i < iterations; i++) {
         addr = buffer[addr] % buffer.length;
         solution ^= addr;
+        if (i % YIELD_THRESHOLD === 0) {
+            await new Promise(r => setTimeout(r, 0)); // Respiration pour ne pas geler l'UI
+        }
     }
     return solution;
 }
@@ -162,12 +175,16 @@ export async function solveTsp(cities, targetMaxDistance) {
  * @returns {Promise<object>} Un objet contenant la ou les solutions.
  */
 export async function solveChallenge(challenge) {
-    const { type, nonce, clientSecret, target, memDifficulty, cities, clientIp, targetMaxDistance } = challenge;
+    const { type, nonce, clientSecret, cpuTarget, memDifficulty, cities, clientIp, targetMaxDistance } = challenge;
     const solutions = {};
 
     switch (type) {
         case 'cpu_target':
             const baseMessageCpu = `:${nonce}`; // L'IP est gérée côté serveur
+            if (!cpuTarget) {
+                throw new Error("Challenge data is missing 'cpuTarget' property.");
+            }
+            const target = cpuTarget; // Keep variable name for consistency below
             solutions.cpu = await solveCpuTarget(baseMessageCpu, BigInt('0x' + target));
             break;
         case 'cpu_mem':
@@ -175,8 +192,10 @@ export async function solveChallenge(challenge) {
             const baseMessageCombined = `${nonce}:${clientSecret}`;
             const memSeed = `:${nonce}:${clientSecret}`;
             const [cpuSol, memSol] = await Promise.all([
-                // On utilise une version de solveCpuTarget qui n'a pas besoin de l'IP
-                solveCpuTargetInline(null, nonce, target, clientSecret),
+                (async () => {
+                    if (!cpuTarget) throw new Error("Challenge data is missing 'cpuTarget' property.");
+                    return solveCpuTargetInline(null, nonce, cpuTarget, clientSecret);
+                })(),
                 solveMemory(memSeed, memDifficulty)
             ]);
             solutions.cpu = cpuSol;
@@ -186,7 +205,10 @@ export async function solveChallenge(challenge) {
             // Version inline pour compatibilité HTML avec IP incluse
             const memSeedInline = `${nonce}:${clientSecret}`;
             const [cpuSolInline, memSolInline] = await Promise.all([
-                solveCpuTargetInline(clientIp, nonce, target, clientSecret),
+                (async () => {
+                    if (!cpuTarget) throw new Error("Challenge data is missing 'cpuTarget' property.");
+                    return solveCpuTargetInline(clientIp, nonce, cpuTarget, clientSecret);
+                })(),
                 solveMemory(memSeedInline, memDifficulty)
             ]);
             solutions.cpu = cpuSolInline;