aesirx-analytics 2.2.1 → 2.2.3

package/dist/index.d.ts

@@ -29,4 +29,10 @@ interface AnalyticsContextType {
 }
 declare const AnalyticsContext: React.Context<AnalyticsContextType>;
 
-export { AnalyticsContext, AnalyticsNext, AnalyticsReact, trackEvent };
+/**
+ * Function to get browser finger print
+ * @returns
+ */
+declare const getFingerprint: () => string;
+
+export { AnalyticsContext, AnalyticsNext, AnalyticsReact, getFingerprint, trackEvent };

package/dist/index.js

@@ -34,7 +34,293 @@ var trackerService = async (endpoint, payload) => {
 
 // src/utils/index.ts
 import Bowser from "bowser";
-import * as FingerprintJS from "@fingerprintjs/fingerprintjs";
+
+// src/lib/envHelper.ts
+var getHashKey = () => {
+  let value = null;
+  try {
+    if (typeof process.env != "undefined") {
+      value = process.env.SECURE_LOCAL_STORAGE_HASH_KEY || process.env.REACT_APP_SECURE_LOCAL_STORAGE_HASH_KEY || process.env.NEXT_PUBLIC_SECURE_LOCAL_STORAGE_HASH_KEY || process.env.VITE_SECURE_LOCAL_STORAGE_HASH_KEY;
+    } else {
+      console.warn(`react-secure-storage : process is not defined! Just a warning!`);
+    }
+  } catch (ex) {
+    return null;
+  }
+  return value;
+};
+var getStoragePrefix = () => {
+  let value = null;
+  try {
+    if (typeof process.env != "undefined") {
+      value = process.env.SECURE_LOCAL_STORAGE_PREFIX || process.env.REACT_APP_SECURE_LOCAL_STORAGE_PREFIX || process.env.NEXT_PUBLIC_SECURE_LOCAL_STORAGE_PREFIX || process.env.VITE_SECURE_LOCAL_STORAGE_PREFIX;
+    } else {
+      console.warn(`react-secure-storage : process is not defined! Just a warning!`);
+    }
+  } catch (ex) {
+    return null;
+  }
+  return value;
+};
+var getDisabledKeys = () => {
+  let value = null;
+  try {
+    if (typeof process.env != "undefined") {
+      value = process.env.SECURE_LOCAL_STORAGE_DISABLED_KEYS || process.env.REACT_APP_SECURE_LOCAL_STORAGE_DISABLED_KEYS || process.env.NEXT_PUBLIC_SECURE_LOCAL_STORAGE_DISABLED_KEYS || process.env.VITE_SECURE_LOCAL_STORAGE_DISABLED_KEYS;
+    } else {
+      console.warn(`react-secure-storage : process is not defined! Just a warning!`);
+    }
+  } catch (ex) {
+    return null;
+  }
+  return value;
+};
+var envHelper = {
+  getHashKey,
+  getStoragePrefix,
+  getDisabledKeys
+};
+var envHelper_default = envHelper;
+
+// src/lib/fingerpint.lib.ts
+import murmurhash3_32_gc from "murmurhash-js/murmurhash3_gc";
+
+// src/lib/utils.ts
+var FINGERPRINT_KEYS = {
+  USERAGENT: "UserAgent",
+  SCREEN_PRINT: "ScreenPrint",
+  PLUGINS: "Plugins",
+  FONTS: "Fonts",
+  LOCAL_STORAGE: "LocalStorage",
+  SESSION_STORAGE: "SessionStorage",
+  TIMEZONE: "TimeZone",
+  LANGUAGE: "Language",
+  SYSTEM_LANGUAGE: "SystemLanguage",
+  COOKIE: "Cookie",
+  CANVAS: "Canvas",
+  HOSTNAME: "Hostname"
+};
+var getDisabledKeys2 = () => {
+  const DISABLED_KEYS = envHelper_default.getDisabledKeys() || "";
+  if (DISABLED_KEYS === "")
+    return [];
+  const allOptions = [
+    FINGERPRINT_KEYS.USERAGENT,
+    FINGERPRINT_KEYS.SCREEN_PRINT,
+    FINGERPRINT_KEYS.PLUGINS,
+    FINGERPRINT_KEYS.FONTS,
+    FINGERPRINT_KEYS.LOCAL_STORAGE,
+    FINGERPRINT_KEYS.SESSION_STORAGE,
+    FINGERPRINT_KEYS.TIMEZONE,
+    FINGERPRINT_KEYS.LANGUAGE,
+    FINGERPRINT_KEYS.SYSTEM_LANGUAGE,
+    FINGERPRINT_KEYS.COOKIE,
+    FINGERPRINT_KEYS.CANVAS,
+    FINGERPRINT_KEYS.HOSTNAME
+  ];
+  const response = [];
+  DISABLED_KEYS.split("|").forEach((key) => {
+    if (key === "") {
+      console.log("test");
+    } else if (allOptions.includes(key))
+      response.push(key);
+    else
+      console.warn(
+        `react-secure-storage : ${key} is not present in the available disabled keys options! Please go through the documentation`
+      );
+  });
+  return response;
+};
+
+// src/lib/fingerpint.lib.ts
+var ClientJS = class {
+  //
+  // MAIN METHODS
+  //
+  // Get Fingerprint.  Return a 32-bit integer representing the browsers fingerprint.
+  getFingerprint() {
+    const bar = "|";
+    const disabledKeys = getDisabledKeys2();
+    let key = "";
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.USERAGENT)) {
+      key += navigator.userAgent + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.HOSTNAME)) {
+      key += window.location.hostname + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.SCREEN_PRINT)) {
+      key += this.getScreenPrint() + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.PLUGINS)) {
+      key += this.getPlugins() + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.FONTS)) {
+      key += this.getFonts() + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.LOCAL_STORAGE)) {
+      key += this.isLocalStorage() + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.SESSION_STORAGE)) {
+      key += this.isSessionStorage() + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.TIMEZONE)) {
+      key += this.getTimeZone() + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.LANGUAGE)) {
+      key += this.getLanguage() + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.SYSTEM_LANGUAGE)) {
+      key += this.getSystemLanguage() + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.COOKIE)) {
+      key += this.isCookie() + bar;
+    }
+    if (!disabledKeys.includes(FINGERPRINT_KEYS.CANVAS)) {
+      key += this.getCanvasPrint();
+    }
+    if (key.endsWith(bar))
+      key = key.substring(0, key.length - 1);
+    const seed = 256;
+    return murmurhash3_32_gc(key, seed);
+  }
+  //
+  // SCREEN METHODS
+  //
+  // Get Screen Print.  Return a string containing screen information.
+  getScreenPrint() {
+    return "Color Depth: " + this.getColorDepth() + ", Device XDPI: " + this.getDeviceXDPI() + ", Device YDPI: " + this.getDeviceYDPI();
+  }
+  // Get Color Depth.  Return a string containing the color depth.
+  getColorDepth() {
+    return window.screen.colorDepth;
+  }
+  // Get Current Resolution.  Return a string containing the current resolution.
+  getCurrentResolution() {
+    return window.screen.width + "x" + window.screen.height;
+  }
+  // Get Available Resolution.  Return a string containing the available resolution.
+  getAvailableResolution() {
+    return window.screen.availWidth + "x" + window.screen.availHeight;
+  }
+  // Get Device XPDI.  Return a string containing the device XPDI.
+  getDeviceXDPI() {
+    return "";
+  }
+  // Get Device YDPI.  Return a string containing the device YDPI.
+  getDeviceYDPI() {
+    return "";
+  }
+  //
+  // PLUGIN METHODS
+  //
+  // Get Plugins.  Return a string containing a list of installed plugins.
+  getPlugins() {
+    let pluginsList = "";
+    for (let i = 0; i < navigator.plugins.length; i++) {
+      if (i === navigator.plugins.length - 1) {
+        pluginsList += navigator.plugins[i].name;
+      } else {
+        pluginsList += navigator.plugins[i].name + ", ";
+      }
+    }
+    return pluginsList;
+  }
+  //
+  // FONT METHODS
+  //
+  // Get Fonts.  Return a string containing a list of installed fonts.
+  getFonts() {
+    const fontString = "";
+    return fontString;
+  }
+  //
+  // STORAGE METHODS
+  //
+  // Is Local Storage.  Check if local storage is enabled.
+  isLocalStorage() {
+    try {
+      return !!localStorage;
+    } catch (e) {
+      return true;
+    }
+  }
+  // Is Session Storage.  Check if session storage is enabled.
+  isSessionStorage() {
+    try {
+      return !!sessionStorage;
+    } catch (e) {
+      return true;
+    }
+  }
+  // Is Cookie.  Check if cookies are enabled.
+  isCookie() {
+    return navigator.cookieEnabled;
+  }
+  //
+  // TIME METHODS
+  //
+  // Get Time Zone.  Return a string containing the time zone.
+  getTimeZone() {
+    const rightNow = /* @__PURE__ */ new Date();
+    let myNumber, formattedNumber, result;
+    myNumber = String(-(rightNow.getTimezoneOffset() / 60));
+    if (myNumber < 0) {
+      myNumber = myNumber * -1;
+      formattedNumber = ("0" + myNumber).slice(-2);
+      result = "-" + formattedNumber;
+    } else {
+      formattedNumber = ("0" + myNumber).slice(-2);
+      result = "+" + formattedNumber;
+    }
+    return result;
+  }
+  //
+  // LANGUAGE METHODS
+  //
+  // Get Language.  Return a string containing the user language.
+  getLanguage() {
+    return navigator.language;
+  }
+  // Get System Language.  Return a string containing the system language.
+  getSystemLanguage() {
+    return navigator.language || window.navigator.language;
+  }
+  // Get Canvas Print.  Return a string containing the canvas URI data.
+  getCanvasPrint() {
+    const canvas = document.createElement("canvas");
+    let ctx;
+    try {
+      ctx = canvas.getContext("2d");
+    } catch (e) {
+      return "";
+    }
+    const txt = "ClientJS,org <canvas> 1.0";
+    ctx.textBaseline = "top";
+    ctx.font = "14px 'Arial'";
+    ctx.textBaseline = "alphabetic";
+    ctx.fillStyle = "#f60";
+    ctx.fillRect(125, 1, 62, 20);
+    ctx.fillStyle = "#069";
+    ctx.fillText(txt, 2, 15);
+    ctx.fillStyle = "rgba(102, 204, 0, 0.7)";
+    ctx.fillText(txt, 4, 17);
+    return canvas.toDataURL();
+  }
+};
+var clientJS = new ClientJS();
+var fingerpint_lib_default = clientJS;
+
+// src/lib/fingerprint.ts
+var HASH_KEY = "E86E2612010258B35137";
+var getFingerprint = () => {
+  const HASH_KEY_CUSTOM = envHelper_default.getHashKey() || HASH_KEY;
+  if (typeof window === "undefined")
+    return HASH_KEY_CUSTOM;
+  return fingerpint_lib_default.getFingerprint() + HASH_KEY_CUSTOM;
+};
+var fingerprint_default = getFingerprint;
+
+// src/utils/index.ts
 var createRequest = (endpoint, task) => {
   return `${endpoint}/visitor/v1/${task}`;
 };
@@ -62,34 +348,31 @@ var startTracker = async (endpoint, url, referer, user_agent) => {
   const queryString = window.location.search;
   const urlParams = new URLSearchParams(queryString);
   const ip = "";
-  const fpPromise = FingerprintJS.load({ monitoring: false });
   try {
-    const responseStart = fpPromise.then((fp) => fp.get()).then(async (result) => {
-      const fingerprint = result.visitorId;
-      const attributes = [];
-      for (const key of urlParams.keys()) {
-        if (key.startsWith("utm_")) {
-          urlParams.get(key) && attributes.push({ name: key, value: urlParams.get(key) });
-        }
+    const fingerprint = fingerprint_default();
+    const attributes = [];
+    for (const key of urlParams.keys()) {
+      if (key.startsWith("utm_")) {
+        urlParams.get(key) && attributes.push({ name: key, value: urlParams.get(key) });
+      }
+    }
+    const responseStart = await trackerService(createRequestV2(endpoint, "start"), {
+      fingerprint,
+      url,
+      ...referer && (referer !== url || document2.referrer) && {
+        referer: referer !== url ? referer : document2.referrer
+      },
+      user_agent,
+      ip,
+      browser_name,
+      browser_version,
+      lang,
+      device,
+      ...attributes?.length && {
+        event_name: "visit",
+        event_type: "action",
+        attributes
       }
-      return await trackerService(createRequestV2(endpoint, "start"), {
-        fingerprint,
-        url,
-        ...referer && (referer !== url || document2.referrer) && {
-          referer: referer !== url ? referer : document2.referrer
-        },
-        user_agent,
-        ip,
-        browser_name,
-        browser_version,
-        lang,
-        device,
-        ...attributes?.length && {
-          event_name: "visit",
-          event_type: "action",
-          attributes
-        }
-      });
     });
     if (window["aesirxTrackEcommerce"] === "true" && sessionStorage.getItem("aesirx-analytics-flow") !== (await responseStart)?.flow_uuid) {
       sessionStorage.setItem("aesirx-analytics-flow", (await responseStart)?.flow_uuid);
@@ -118,31 +401,28 @@ var trackEvent = async (endpoint, referer, data) => {
   const lang = window.navigator["userLanguage"] || window.navigator.language;
   const device = browser?.platform?.model ?? browser?.platform?.type;
   const ip = "";
-  const fpPromise = FingerprintJS.load({ monitoring: false });
-  const responseStart = fpPromise.then((fp) => fp.get()).then(async (result) => {
-    const fingerprint = result.visitorId;
-    const headers = { type: "application/json" };
-    const blobData = new Blob(
-      [
-        JSON.stringify({
-          fingerprint,
-          url,
-          ...referer !== "/" && referer && {
-            referer
-          },
-          user_agent,
-          ip,
-          browser_name,
-          browser_version,
-          lang,
-          device,
-          ...data
-        })
-      ],
-      headers
-    );
-    return navigator.sendBeacon(createRequestV2(endpoint, "start"), blobData);
-  });
+  const fingerprint = fingerprint_default();
+  const headers = { type: "application/json" };
+  const blobData = new Blob(
+    [
+      JSON.stringify({
+        fingerprint,
+        url,
+        ...referer !== "/" && referer && {
+          referer
+        },
+        user_agent,
+        ip,
+        browser_name,
+        browser_version,
+        lang,
+        device,
+        ...data
+      })
+    ],
+    headers
+  );
+  const responseStart = navigator.sendBeacon(createRequestV2(endpoint, "start"), blobData);
   return responseStart;
 };
 var endTracker = (endPoint, event_uuid, visitor_uuid) => {
@@ -233,12 +513,13 @@ var handle_default = AnalyticsHandle;
 
 // src/AnalyticsNext/index.tsx
 import dynamic from "next/dynamic";
-var ConsentComponent = dynamic(() => import("./Consent-3FMR7JQE.js"), { ssr: false });
+var ConsentComponent = dynamic(() => import("./Consent-HRGYMPE6.js"), { ssr: false });
 var AnalyticsNext = ({ router, children }) => {
   return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(AnalyticsContextProvider_default, null, /* @__PURE__ */ React2.createElement(handle_default, { router }, children, process.env.NEXT_PUBLIC_DISABLE_ANALYTICS_CONSENT !== "true" && /* @__PURE__ */ React2.createElement(
     ConsentComponent,
     {
       endpoint: process.env.NEXT_PUBLIC_ENDPOINT_ANALYTICS_URL,
+      networkEnv: process.env.NEXT_PUBLIC_CONCORDIUM_NETWORK,
       aesirXEndpoint: process.env.NEXT_PUBLIC_ENDPOINT_URL ?? "https://api.aesirx.io"
     }
   ))));
@@ -285,12 +566,13 @@ var AnalyticsHandle2 = ({ location, history, children }) => {
 var handle_default2 = AnalyticsHandle2;
 
 // src/AnalyticsReact/index.tsx
-var ConsentComponent2 = React4.lazy(() => import("./Consent-3FMR7JQE.js"));
+var ConsentComponent2 = React4.lazy(() => import("./Consent-HRGYMPE6.js"));
 var AnalyticsReact = ({ location, history, children }) => {
   return /* @__PURE__ */ React4.createElement(AnalyticsContextProvider_default, null, /* @__PURE__ */ React4.createElement(handle_default2, { location, history }, children, process.env.REACT_APP_DISABLE_ANALYTICS_CONSENT !== "true" && /* @__PURE__ */ React4.createElement(Suspense, { fallback: /* @__PURE__ */ React4.createElement(React4.Fragment, null) }, /* @__PURE__ */ React4.createElement(
     ConsentComponent2,
     {
       endpoint: process.env.REACT_APP_ENDPOINT_ANALYTICS_URL,
+      networkEnv: process.env.REACT_APP_CONCORDIUM_NETWORK,
       aesirXEndpoint: process.env.REACT_APP_ENDPOINT_URL ?? "https://api.aesirx.io"
     }
   ))));
@@ -300,5 +582,6 @@ export {
   AnalyticsContext,
   AnalyticsNext_default as AnalyticsNext,
   AnalyticsReact_default as AnalyticsReact,
+  fingerprint_default as getFingerprint,
   trackEvent
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aesirx-analytics",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "license": "GPL-3.0-only",
   "author": "AesirX",
   "repository": "https://gitlab.redweb.dk/aesirx/analytics",
@@ -9,20 +9,20 @@
   "types": "dist/index.d.ts",
   "type": "module",
   "dependencies": {
-    "@concordium/browser-wallet-api-helpers": "^2",
-    "@concordium/react-components": "^0.3.0",
-    "@concordium/web-sdk": "^6",
-    "@fingerprintjs/fingerprintjs": "3.4.2",
+    "@concordium/browser-wallet-api-helpers": "^3.0.0",
+    "@concordium/react-components": "^0.4.0-rc.7",
+    "@concordium/web-sdk": "^7.0.4-rc.3",
     "@web3modal/ethereum": "^2.7.0",
     "@web3modal/react": "^2.7.0",
-    "aesirx-sso": "^1.4.1",
-    "axios": "^1.4.0",
+    "aesirx-sso": "^1.4.5",
+    "axios": "^1.6.0",
     "bootstrap": "^5.3.2",
     "bowser": "^2.11.0",
     "buffer": "^6.0.3",
     "ethers": "^6.6.5",
-    "i18next": "^23.4.4",
+    "i18next": "^23.6.0",
     "i18next-browser-languagedetector": "^7.1.0",
+    "murmurhash-js": "^1.0.0",
     "next": "^13.5.4",
     "query-string": "^7.1.1",
     "react": "^18.2.0",
@@ -67,9 +67,10 @@
     "@babel/preset-typescript": "^7.23.0",
     "@jest/globals": "^29.7.0",
     "@types/jest": "^29.5.0",
+    "@types/murmurhash-js": "^1.0.3",
     "@types/node": "^20.8.0",
     "@types/react": "^18.2.21",
-    "@types/react-dom": "^18.2.4",
+    "@types/react-dom": "^18.2.14",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "@walletconnect/types": "^2.10.0",
@@ -78,7 +79,7 @@
     "esbuild-sass-plugin": "^2.15.0",
     "esbuild-scss-modules-plugin": "^1.1.1",
     "eslint": "^8.48.0",
-    "eslint-plugin-react": "^7.31.10",
+    "eslint-plugin-react": "^7.33.2",
     "jest": "^29.4.3",
     "jest-environment-jsdom": "^29.4.3",
     "node-fetch": "^3.3.1",