devicer.js 1.0.5 → 1.0.7

package/package.json

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

package/src/libs/confidence.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateConfidence = void 0;
 const tlsh_1 = require("./tlsh");
-function compareDataSets(data1, data2) {
+function compareDatasets(data1, data2) {
     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], data2[key]);
+            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];
             }
@@ -22,7 +23,7 @@ function compareDataSets(data1, data2) {
 }
 function calculateConfidence(data1, data2) {
     // Compare how many fields are the same in both datasets
-    const [fields, matches] = compareDataSets(data1, data2);
+    const [fields, matches] = compareDatasets(data1, data2);
     if (fields === 0 || matches === 0) {
         return 0;
     }
@@ -32,7 +33,7 @@ function calculateConfidence(data1, data2) {
     // Compare the hashes to get their difference
     const differenceScore = (0, tlsh_1.compareHashes)(hash1, hash2);
     const inverseMatchScore = 1 - (matches / fields);
-    const x = (differenceScore / 1.5) * inverseMatchScore;
+    const x = differenceScore * inverseMatchScore;
     if (inverseMatchScore === 0 || differenceScore === 0) {
         return 100;
     }

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];
       }
@@ -22,7 +25,7 @@ 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);
+  const [fields, matches] = compareDatasets(data1, data2);
 
   if (fields === 0 || matches === 0) {
     return 0;
@@ -36,7 +39,7 @@ export function calculateConfidence(data1: FPDataSet, data2: FPDataSet): number
   const differenceScore = compareHashes(hash1, hash2);
 
   const inverseMatchScore = 1 - (matches / fields);
-  const x = (differenceScore / 1.5) * inverseMatchScore
+  const x = differenceScore * inverseMatchScore
   if (inverseMatchScore === 0 || differenceScore === 0) {
     return 100;
   }

package/tests/confidence.test.ts

@@ -98,4 +98,15 @@ describe('Confidence Calculation', () => {
     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
+  });
 });