@thumbmarkjs/thumbmarkjs 1.0.0-rc.0 → 1.0.0-rc.2

package/src/{fingerprint/functions.ts → functions/index.ts}

@@ -15,7 +15,7 @@
  */
 
 // ===================== Imports =====================
-import { defaultOptions, optionsInterface } from "./options";
+import { defaultOptions, optionsInterface } from "../options";
 import { 
     timeoutInstance,
     componentInterface,
@@ -26,7 +26,7 @@ import {
 import { hash } from "../utils/hash";
 import { raceAllPerformance } from "../utils/raceAll";
 import * as packageJson from '../../package.json';
-import { filterThumbmarkData } from '../utils/filterComponents'
+import { filterThumbmarkData } from './filterComponents'
 
 // ===================== Types & Interfaces =====================
 
@@ -48,7 +48,8 @@ interface infoInterface {
     },
     uniqueness?: {
         score: number | string
-    }
+    },
+    timed_out?: boolean; // added for timeout handling
 }
 
 /**
@@ -106,9 +107,9 @@ export const getApiPromise = (
         return currentApiPromise;
     }
 
-    // 3. Otherwise, initiate a new API call.
-    const endpoint = 'https://api-dev.thumbmarkjs.com/thumbmark';
-    currentApiPromise = fetch(endpoint, {
+    // 3. Otherwise, initiate a new API call with timeout.
+    const endpoint = 'https://api.thumbmarkjs.com/thumbmark';
+    const fetchPromise = fetch(endpoint, {
         method: 'POST',
         headers: {
             'x-api-key': options.api_key!,
@@ -135,6 +136,19 @@ export const getApiPromise = (
             return null;
         });
 
+    // Timeout logic
+    const timeoutMs = options.timeout || 5000;
+    const timeoutPromise = new Promise<apiResponse>((resolve) => {
+        setTimeout(() => {
+            resolve({
+                thumbmark: hash(JSON.stringify(components)),
+                info: { timed_out: true },
+                version: packageJson.version,
+            });
+        }, timeoutMs);
+    });
+
+    currentApiPromise = Promise.race([fetchPromise, timeoutPromise]);
     return currentApiPromise;
 };
 
@@ -201,8 +215,8 @@ export async function resolveClientComponents(
         : opts?.include?.length === 0 || opts?.include?.includes(key)
     );
   const keys = filtered.map(([key]) => key);
-  const promises = filtered.map(([_, fn]) => fn());
-  const resolvedValues = await raceAllPerformance(promises, opts?.timeout || 1000, timeoutInstance);
+  const promises = filtered.map(([_, fn]) => fn(options));
+  const resolvedValues = await raceAllPerformance(promises, opts?.timeout || 5000, timeoutInstance);
 
   const elapsed: Record<string, number> = {};
   const resolvedComponentsRaw: Record<string, componentInterface> = {};

package/src/{fingerprint → functions}/legacy_functions.ts

@@ -4,8 +4,8 @@
  */
 
 import { componentInterface } from '../factory'
-import { options} from './options'
-import { resolveClientComponents, getThumbmark } from './functions';
+import { options} from '../options'
+import { resolveClientComponents, getThumbmark } from '.';
 import { tm_component_promises } from "../factory";
 
 /**

package/src/index.ts

@@ -2,9 +2,9 @@ import {
     getFingerprint,
     getFingerprintData,
     getFingerprintPerformance
- } from './fingerprint/legacy_functions'
-import { getThumbmark, getVersion } from './fingerprint/functions'
-import { setOption } from './fingerprint/options'
+ } from './functions/legacy_functions'
+import { getThumbmark, getVersion } from './functions'
+import { setOption } from './options'
 import { includeComponent } from './factory'
 import { Thumbmark } from './thumbmark'
 

package/src/{fingerprint/options.ts → options.ts}

@@ -1,11 +1,8 @@
 export interface optionsInterface {
     exclude?: string[],
     include?: string[],
-    webgl_runs?: number,
-    canvas_runs?: number,
-    permissions_to_check?: PermissionName[], // new option
-    retries?: number, // new option
-    timeout?: number, // new option
+    permissions_to_check?: PermissionName[],
+    timeout?: number,
     logging?: boolean,
     api_key?: string,
     cache_api_call?: boolean,

package/src/thumbmark.ts

@@ -1,6 +1,6 @@
-import { optionsInterface } from "./fingerprint/options";
-import { getThumbmark, getVersion, includeComponent as globalIncludeComponent } from './fingerprint/functions';
-import { defaultOptions } from "./fingerprint/options";
+import { optionsInterface } from "./options";
+import { getThumbmark, getVersion, includeComponent as globalIncludeComponent } from './functions';
+import { defaultOptions } from "./options";
 import { componentInterface } from "./factory";
 
 /**