aesirx-analytics 2.1.1 → 2.2.1

package/dist/{chunk-OGDZQCIU.js → chunk-ZYCOHH2R.js}

@@ -144,6 +144,7 @@ function warn() {
     }
     if (typeof args[0] === "string")
       args[0] = `react-i18next:: ${args[0]}`;
+    console.warn(...args);
   }
 }
 var alreadyWarned = {};
@@ -473,7 +474,7 @@ var common_default2 = {
   txt_revoke_consent: "Revoke Consent",
   txt_yes_i_consent: "Yes, I consent",
   txt_reject_consent: "Reject Consent",
-  txt_please_connect: "Please connect your Concordium wallet",
+  txt_please_connect: "Please connect your Web3 wallet",
   txt_please_sign: "Please sign the message on your wallet twice and wait for it to be saved.",
   txt_saving: "Saving...",
   txt_please_connect_your_wallet: "Please connect to your wallet",

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   AnalyticsContext,
   AnalyticsContextProvider_default
-} from "./chunk-OGDZQCIU.js";
+} from "./chunk-ZYCOHH2R.js";
 
 // src/AnalyticsNext/index.tsx
 import React2 from "react";
@@ -41,6 +41,9 @@ var createRequest = (endpoint, task) => {
 var createRequestV2 = (endpoint, task) => {
   return `${endpoint}/visitor/v2/${task}`;
 };
+var rememberFlow = (endpoint, flow) => {
+  return `${endpoint}/remember_flow/${flow}`;
+};
 var startTracker = async (endpoint, url, referer, user_agent) => {
   const allow = sessionStorage.getItem("aesirx-analytics-allow");
   if (allow === "0") {
@@ -72,8 +75,8 @@ var startTracker = async (endpoint, url, referer, user_agent) => {
       return await trackerService(createRequestV2(endpoint, "start"), {
         fingerprint,
         url,
-        ...referer && referer !== url && {
-          referer
+        ...referer && (referer !== url || document2.referrer) && {
+          referer: referer !== url ? referer : document2.referrer
         },
         user_agent,
         ip,
@@ -88,8 +91,16 @@ var startTracker = async (endpoint, url, referer, user_agent) => {
         }
       });
     });
+    if (window["aesirxTrackEcommerce"] === "true" && sessionStorage.getItem("aesirx-analytics-flow") !== (await responseStart)?.flow_uuid) {
+      sessionStorage.setItem("aesirx-analytics-flow", (await responseStart)?.flow_uuid);
+      await trackerService(
+        rememberFlow(window.location.origin, (await responseStart)?.flow_uuid),
+        {}
+      );
+    }
     return responseStart;
   } catch (error) {
+    console.error("Analytics Error: ", error);
   }
 };
 var trackEvent = async (endpoint, referer, data) => {
@@ -108,26 +119,30 @@ var trackEvent = async (endpoint, referer, data) => {
   const device = browser?.platform?.model ?? browser?.platform?.type;
   const ip = "";
   const fpPromise = FingerprintJS.load({ monitoring: false });
-  const body = fpPromise.then((fp) => fp.get()).then(async (result) => {
+  const responseStart = fpPromise.then((fp) => fp.get()).then(async (result) => {
     const fingerprint = result.visitorId;
-    return {
-      fingerprint,
-      url,
-      ...referer !== "/" && referer && {
-        referer
-      },
-      user_agent,
-      ip,
-      browser_name,
-      browser_version,
-      lang,
-      device,
-      ...data
-    };
+    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 headers = { type: "application/json" };
-  const blob = new Blob([JSON.stringify(body)], headers);
-  const responseStart = navigator.sendBeacon(createRequestV2(endpoint, "start"), blob);
   return responseStart;
 };
 var endTracker = (endPoint, event_uuid, visitor_uuid) => {
@@ -180,6 +195,7 @@ var AnalyticsHandle = ({ router, children }) => {
   useEffect(() => {
     const init = async () => {
       if (!AnalyticsStore.visitor_uuid) {
+        setPrevRoute(router.asPath);
         await handleStartTracker(router.asPath);
       }
     };
@@ -217,9 +233,15 @@ var handle_default = AnalyticsHandle;
 
 // src/AnalyticsNext/index.tsx
 import dynamic from "next/dynamic";
-var ConsentComponent = dynamic(() => import("./Consent-MKSHHJAP.js"), { ssr: false });
+var ConsentComponent = dynamic(() => import("./Consent-3FMR7JQE.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 }))));
+  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,
+      aesirXEndpoint: process.env.NEXT_PUBLIC_ENDPOINT_URL ?? "https://api.aesirx.io"
+    }
+  ))));
 };
 var AnalyticsNext_default = AnalyticsNext;
 
@@ -263,9 +285,15 @@ var AnalyticsHandle2 = ({ location, history, children }) => {
 var handle_default2 = AnalyticsHandle2;
 
 // src/AnalyticsReact/index.tsx
-var ConsentComponent2 = React4.lazy(() => import("./Consent-MKSHHJAP.js"));
+var ConsentComponent2 = React4.lazy(() => import("./Consent-3FMR7JQE.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 }))));
+  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,
+      aesirXEndpoint: process.env.REACT_APP_ENDPOINT_URL ?? "https://api.aesirx.io"
+    }
+  ))));
 };
 var AnalyticsReact_default = AnalyticsReact;
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aesirx-analytics",
-  "version": "2.1.1",
+  "version": "2.2.1",
   "license": "GPL-3.0-only",
   "author": "AesirX",
   "repository": "https://gitlab.redweb.dk/aesirx/analytics",
@@ -12,32 +12,36 @@
     "@concordium/browser-wallet-api-helpers": "^2",
     "@concordium/react-components": "^0.3.0",
     "@concordium/web-sdk": "^6",
-    "@fingerprintjs/fingerprintjs": "^4.0.1",
-    "aesirx-sso": "^1.2.1",
+    "@fingerprintjs/fingerprintjs": "3.4.2",
+    "@web3modal/ethereum": "^2.7.0",
+    "@web3modal/react": "^2.7.0",
+    "aesirx-sso": "^1.4.1",
     "axios": "^1.4.0",
-    "bootstrap": "^5.3.0",
+    "bootstrap": "^5.3.2",
     "bowser": "^2.11.0",
     "buffer": "^6.0.3",
+    "ethers": "^6.6.5",
     "i18next": "^23.4.4",
     "i18next-browser-languagedetector": "^7.1.0",
-    "next": "^13.4.19",
+    "next": "^13.5.4",
     "query-string": "^7.1.1",
     "react": "^18.2.0",
     "react-bootstrap": "^2.8.0",
     "react-content-loader": "^6.2.1",
     "react-device-detect": "^2.2.3",
     "react-dom": "18",
-    "react-toastify": "^9.1.3"
+    "react-toastify": "^9.1.3",
+    "wagmi": "^1.3.2"
   },
   "scripts": {
-    "dev": "tsup --watch --onSuccess 'yalc push --changed --no-scripts'",
+    "dev": "NODE_ENV=development tsup --watch",
     "build": "tsup",
     "lint": "eslint --fix \"src/**/\"",
     "lint:check": "eslint \"src/**/\"",
     "lint:nowarns": "eslint --quiet \"src/**/\"",
     "prepublishOnly": "yarn run build",
-    "format:check": "prettier --check 'src/**/*.{js,jsx,ts,tsx}'",
-    "format:write": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'",
+    "format:check": "prettier --check \"./src/**/*.{js,jsx,ts,tsx}\"",
+    "format:write": "prettier --write \"./src/**/*.{js,jsx,ts,tsx}\"",
     "test": "jest"
   },
   "eslintConfig": {
@@ -60,10 +64,10 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.21.5",
-    "@babel/preset-typescript": "^7.21.5",
-    "@jest/globals": "^29.6.4",
+    "@babel/preset-typescript": "^7.23.0",
+    "@jest/globals": "^29.7.0",
     "@types/jest": "^29.5.0",
-    "@types/node": "^20.1.4",
+    "@types/node": "^20.8.0",
     "@types/react": "^18.2.21",
     "@types/react-dom": "^18.2.4",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
@@ -71,7 +75,7 @@
     "@walletconnect/types": "^2.10.0",
     "dotenv": "^16.0.3",
     "esbuild-plugin-inline-image": "^0.0.9",
-    "esbuild-sass-plugin": "^2.10.0",
+    "esbuild-sass-plugin": "^2.15.0",
     "esbuild-scss-modules-plugin": "^1.1.1",
     "eslint": "^8.48.0",
     "eslint-plugin-react": "^7.31.10",
@@ -86,5 +90,8 @@
   },
   "files": [
     "dist"
-  ]
+  ],
+  "resolutions": {
+    "postcss": "^8"
+  }
 }