devicer.js 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "devicer.js",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Open-Source Digital Fingerprinting Middleware",
   "main": "src/main.js",
   "scripts": {

package/src/libs/confidence.js

@@ -8,7 +8,8 @@ function compareDataSets(data1, data2) {
     for (const key in data1) {
         if (data1[key] !== undefined && data2[key] !== undefined) {
             fields++;
-            if (typeof data1[key] == "object") {
+            if ((typeof data1[key] == "object" && data1[key]) &&
+                (typeof data2[key] == "object" && data2[key])) {
                 const subData = compareDataSets(data1[key], data2[key]);
                 fields += subData[0] - 1; // Subtract 1 for the key itself
                 matches += subData[1];
@@ -21,18 +22,22 @@ function compareDataSets(data1, data2) {
     return [fields, matches];
 }
 function calculateConfidence(data1, data2) {
+    // Compare how many fields are the same in both datasets
+    const [fields, matches] = compareDataSets(data1, data2);
+    if (fields === 0 || matches === 0) {
+        return 0;
+    }
     // Calculate the hash for each user data
     const hash1 = (0, tlsh_1.getHash)(JSON.stringify(data1));
     const hash2 = (0, tlsh_1.getHash)(JSON.stringify(data2));
     // Compare the hashes to get their difference
     const differenceScore = (0, tlsh_1.compareHashes)(hash1, hash2);
-    // Compare how many fields are the same in both datasets
-    const [fields, matches] = compareDataSets(data1, data2);
     const inverseMatchScore = 1 - (matches / fields);
     const x = (differenceScore / 1.5) * inverseMatchScore;
     if (inverseMatchScore === 0 || differenceScore === 0) {
         return 100;
     }
-    return 100 / (1 + Math.E ** (-4.5 + (0.25 * x)));
+    const confidenceScore = 100 / (1 + Math.E ** (-4.5 + (0.25 * x)));
+    return confidenceScore;
 }
 exports.calculateConfidence = calculateConfidence;

package/src/libs/confidence.ts

@@ -1,14 +1,17 @@
 import { getHash, compareHashes } from "./tlsh";
 import { FPDataSet } from "../types/data";
 
-function compareDataSets(data1: FPDataSet, data2: FPDataSet): [number, number] {
+function compareDatasets(data1: FPDataSet, data2: FPDataSet): [number, number] {
   let fields = 0;
   let matches = 0;
   for (const key in data1) {
     if (data1[key] !== undefined && data2[key] !== undefined) {
       fields++;
-      if (typeof data1[key] == "object") {
-        const subData = compareDataSets(data1[key] as FPDataSet, data2[key] as FPDataSet);
+      if (
+        (typeof data1[key] == "object" && data1[key]) &&
+        (typeof data2[key] == "object" && data2[key])
+      ) {
+        const subData = compareDatasets(data1[key] as FPDataSet, data2[key] as FPDataSet);
         fields += subData[0] - 1; // Subtract 1 for the key itself
         matches += subData[1];
       }
@@ -21,6 +24,13 @@ function compareDataSets(data1: FPDataSet, data2: FPDataSet): [number, number] {
 }
 
 export function calculateConfidence(data1: FPDataSet, data2: FPDataSet): number {
+  // Compare how many fields are the same in both datasets
+  const [fields, matches] = compareDatasets(data1, data2);
+
+  if (fields === 0 || matches === 0) {
+    return 0;
+  }
+
   // Calculate the hash for each user data
   const hash1 = getHash(JSON.stringify(data1));
   const hash2 = getHash(JSON.stringify(data2));
@@ -28,13 +38,11 @@ export function calculateConfidence(data1: FPDataSet, data2: FPDataSet): number
   // Compare the hashes to get their difference
   const differenceScore = compareHashes(hash1, hash2);
 
-  // Compare how many fields are the same in both datasets
-  const [fields, matches] = compareDataSets(data1, data2);
-
   const inverseMatchScore = 1 - (matches / fields);
   const x = (differenceScore / 1.5) * inverseMatchScore
   if (inverseMatchScore === 0 || differenceScore === 0) {
     return 100;
   }
-  return 100 / (1 + Math.E ** (-4.5 + (0.25 * x)));
+  const confidenceScore = 100 / (1 + Math.E ** (-4.5 + (0.25 * x)));
+  return confidenceScore;
 }

package/tests/confidence.test.ts

@@ -1,6 +1,5 @@
 import { it, describe, expect } from 'vitest';
 import { FPUserDataSet } from '../src/types/data';
-import { getHash } from '../src/libs/tlsh';
 import { calculateConfidence } from '../src/libs/confidence';
 import { randomString } from './tlsh.test';
 
@@ -21,9 +20,9 @@ const sampleData1: FPUserDataSet = {
   ip: '157.185.170.244',
   languages: ['en-US', 'en'],
   plugins: ['Chrome PDF Viewer', 'Shockwave Flash'],
-  canvasHash: getHash(randomString(524)),
-  audioHash: getHash(randomString(524)),
-  webglHash: getHash(randomString(524))
+  canvasHash: randomString(524),
+  audioHash: randomString(524),
+  webglHash: randomString(524)
 };
 
 const sampleData2: FPUserDataSet = {
@@ -43,9 +42,9 @@ const sampleData2: FPUserDataSet = {
   ip: '178.238.11.6',
   languages: ['en-GB', 'en'],
   plugins: ['Chrome PDF Viewer', 'Shockwave Flash'],
-  canvasHash: getHash(randomString(524)),
-  audioHash: getHash(randomString(524)),
-  webglHash: getHash(randomString(524))
+  canvasHash: randomString(524),
+  audioHash: randomString(524),
+  webglHash: randomString(524)
 };
 
 describe('Confidence Calculation', () => {
@@ -85,19 +84,29 @@ describe('Confidence Calculation', () => {
     const partialData: FPUserDataSet = {
       ...sampleData1,
       hardware: {
-        ...sampleData1.hardware,
-        gpu: 'Intel HD Graphics' // Different GPU
-      },
-      screen: {
-        ...sampleData1.screen,
-        width: 1280, // Different screen width
-        height: 720 // Different screen height
+        cpu: 'Pentium 4',
+        gpu: 'Intel HD Graphics',
+        ram: 4096
       },
-      timezone: 'Europe/London', // Different timezone
+      timezone: 'Europe/London',
+      ip: '178.238.11.6',
+      languages: ['en-GB', 'en'],
+      userAgent: 'Mozilla/5.0 (compatible; Konqueror/2.2.2-3; Linux)'
     };
     const confidence = calculateConfidence(sampleData1, partialData);
     console.log('Confidence for partially similar data:', confidence);
     expect(confidence).toBeGreaterThan(10);
     expect(confidence).toBeLessThan(95);
   });
+
+  it('should handle empty datasets and nonetypes gracefully', () => {
+    const incompleteData = {
+      ...sampleData1,
+      hardware: {},
+      screen: null
+    };
+    const confidence = calculateConfidence(sampleData1, incompleteData);
+    expect(confidence).toBeGreaterThan(0); // Expecting some confidence even with missing data
+    expect(confidence).toBeLessThan(100); // Not identical, so confidence should not be 100
+  });
 });

package/tests/data.test.ts

@@ -20,9 +20,9 @@ const sampleData1: FPUserDataSet = {
   ip: '157.185.170.244',
   languages: ['en-US', 'en'],
   plugins: ['Chrome PDF Viewer', 'Shockwave Flash'],
-  canvasHash: getHash(randomString(524)),
-  audioHash: getHash(randomString(524)),
-  webglHash: getHash(randomString(524))
+  canvasHash: randomString(524),
+  audioHash: randomString(524),
+  webglHash: randomString(524)
 };
 
 const sampleData2: FPUserDataSet = {
@@ -42,9 +42,9 @@ const sampleData2: FPUserDataSet = {
   ip: '178.238.11.6',
   languages: ['en-GB', 'en'],
   plugins: ['Chrome PDF Viewer', 'Shockwave Flash'],
-  canvasHash: getHash(randomString(524)),
-  audioHash: getHash(randomString(524)),
-  webglHash: getHash(randomString(524))
+  canvasHash: randomString(524),
+  audioHash: randomString(524),
+  webglHash: randomString(524)
 };
 
 describe('User Data Fingerprinting', () => {