aesirx-analytics 2.2.3 → 2.2.5

package/dist/index.d.ts

@@ -3,9 +3,13 @@ import { NextRouter } from 'next/router';
 
 interface AnalyticsNext {
     router: NextRouter;
+    attributes: any;
+    oldLayout?: boolean;
+    loginApp?: any;
+    isLoggedApp?: boolean;
     children?: ReactNode;
 }
-declare const AnalyticsNext: ({ router, children }: AnalyticsNext) => React.JSX.Element;
+declare const AnalyticsNext: ({ router, attributes, oldLayout, loginApp, isLoggedApp, children, }: AnalyticsNext) => React.JSX.Element;
 
 interface AnalyticsReact {
     location: {
@@ -16,8 +20,9 @@ interface AnalyticsReact {
         replace: (_: object) => void;
     };
     children?: ReactNode;
+    oldLayout?: boolean;
 }
-declare const AnalyticsReact: ({ location, history, children }: AnalyticsReact) => React.JSX.Element;
+declare const AnalyticsReact: ({ location, history, oldLayout, children }: AnalyticsReact) => React.JSX.Element;
 
 declare const trackEvent: (endpoint: string, referer?: string, data?: object) => Promise<boolean>;
 
@@ -26,6 +31,7 @@ interface AnalyticsContextType {
     visitor_uuid: string;
     setEventID: Dispatch<SetStateAction<string>>;
     setUUID: Dispatch<SetStateAction<string>>;
+    ref: any;
 }
 declare const AnalyticsContext: React.Context<AnalyticsContextType>;
 

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   AnalyticsContext,
   AnalyticsContextProvider_default
-} from "./chunk-ZYCOHH2R.js";
+} from "./chunk-JH54YDTD.js";
 
 // src/AnalyticsNext/index.tsx
 import React2 from "react";
@@ -330,7 +330,7 @@ var createRequestV2 = (endpoint, task) => {
 var rememberFlow = (endpoint, flow) => {
   return `${endpoint}/remember_flow/${flow}`;
 };
-var startTracker = async (endpoint, url, referer, user_agent) => {
+var startTracker = async (endpoint, url, referer, user_agent, attributesVisit) => {
   const allow = sessionStorage.getItem("aesirx-analytics-allow");
   if (allow === "0") {
     return null;
@@ -356,9 +356,14 @@ var startTracker = async (endpoint, url, referer, user_agent) => {
         urlParams.get(key) && attributes.push({ name: key, value: urlParams.get(key) });
       }
     }
+    if (attributesVisit?.length) {
+      attributesVisit?.forEach((element) => {
+        element?.name && attributes.push({ name: element?.name, value: element?.value });
+      });
+    }
     const responseStart = await trackerService(createRequestV2(endpoint, "start"), {
       fingerprint,
-      url,
+      url: url?.replace(/^(https?:\/\/)?(www\.)?/, "$1"),
       ...referer && (referer !== url || document2.referrer) && {
         referer: referer !== url ? referer : document2.referrer
       },
@@ -458,15 +463,15 @@ var endTrackerVisibilityState = (endPoint) => {
 };
 
 // src/AnalyticsNext/handle.tsx
-var AnalyticsHandle = ({ router, children }) => {
+var AnalyticsHandle = ({ router, attributes, children }) => {
   const AnalyticsStore = React.useContext(AnalyticsContext);
   const endPoint = process.env.NEXT_PUBLIC_ENDPOINT_ANALYTICS_URL;
   const [prevRoute, setPrevRoute] = useState("");
   const handleStartTracker = useCallback(
-    async (prevRoute2) => {
+    async (prevRoute2, attributes2) => {
       const referer = prevRoute2 ? prevRoute2 : "";
       window["referer"] = referer;
-      const responseStart = await startTracker(endPoint, "", referer);
+      const responseStart = await startTracker(endPoint, "", referer, "", attributes2);
       responseStart?.event_uuid && AnalyticsStore.setEventID(responseStart.event_uuid);
       responseStart?.visitor_uuid && AnalyticsStore.setUUID(responseStart.visitor_uuid);
     },
@@ -476,7 +481,7 @@ var AnalyticsHandle = ({ router, children }) => {
     const init = async () => {
       if (!AnalyticsStore.visitor_uuid) {
         setPrevRoute(router.asPath);
-        await handleStartTracker(router.asPath);
+        await handleStartTracker(router.asPath, attributes);
       }
     };
     init();
@@ -486,7 +491,7 @@ var AnalyticsHandle = ({ router, children }) => {
       setPrevRoute(router.asPath);
       if (AnalyticsStore.visitor_uuid) {
         endTracker(endPoint, window["event_uuid"], AnalyticsStore.visitor_uuid);
-        await handleStartTracker(prevRoute);
+        await handleStartTracker(prevRoute, attributes);
       }
     };
     router.events.on("routeChangeComplete", handleRouteChange);
@@ -513,16 +518,35 @@ var handle_default = AnalyticsHandle;
 
 // src/AnalyticsNext/index.tsx
 import dynamic from "next/dynamic";
-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(
+var ConsentComponent = dynamic(() => import("./Consent-ZWVGMKB7.js"), { ssr: false });
+var ConsentComponentCustom = dynamic(() => import("./ConsentCustom-P3FMYMS3.js"), { ssr: false });
+var AnalyticsNext = ({
+  router,
+  attributes,
+  oldLayout = false,
+  loginApp,
+  isLoggedApp,
+  children
+}) => {
+  return /* @__PURE__ */ React2.createElement(React2.Fragment, null, /* @__PURE__ */ React2.createElement(AnalyticsContextProvider_default, null, /* @__PURE__ */ React2.createElement(handle_default, { router, attributes }, children, process.env.NEXT_PUBLIC_DISABLE_ANALYTICS_CONSENT !== "true" && /* @__PURE__ */ React2.createElement(React2.Fragment, null, oldLayout ? /* @__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"
+      aesirXEndpoint: process.env.NEXT_PUBLIC_ENDPOINT_URL ?? "https://api.aesirx.io",
+      loginApp,
+      isLoggedApp
     }
-  ))));
+  ) : /* @__PURE__ */ React2.createElement(
+    ConsentComponentCustom,
+    {
+      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",
+      loginApp,
+      isLoggedApp
+    }
+  )))));
 };
 var AnalyticsNext_default = AnalyticsNext;
 
@@ -566,15 +590,23 @@ var AnalyticsHandle2 = ({ location, history, children }) => {
 var handle_default2 = AnalyticsHandle2;
 
 // src/AnalyticsReact/index.tsx
-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(
+var ConsentComponent2 = React4.lazy(() => import("./Consent-ZWVGMKB7.js"));
+var ConsentComponentCustom2 = React4.lazy(() => import("./ConsentCustom-P3FMYMS3.js"));
+var AnalyticsReact = ({ location, history, oldLayout = false, 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) }, oldLayout ? /* @__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"
     }
+  ) : /* @__PURE__ */ React4.createElement(
+    ConsentComponentCustom2,
+    {
+      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"
+    }
   ))));
 };
 var AnalyticsReact_default = AnalyticsReact;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aesirx-analytics",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "license": "GPL-3.0-only",
   "author": "AesirX",
   "repository": "https://gitlab.redweb.dk/aesirx/analytics",
@@ -14,20 +14,20 @@
     "@concordium/web-sdk": "^7.0.4-rc.3",
     "@web3modal/ethereum": "^2.7.0",
     "@web3modal/react": "^2.7.0",
-    "aesirx-sso": "^1.4.5",
+    "aesirx-sso": "^1.4.6",
     "axios": "^1.6.0",
     "bootstrap": "^5.3.2",
     "bowser": "^2.11.0",
     "buffer": "^6.0.3",
     "ethers": "^6.6.5",
     "i18next": "^23.6.0",
-    "i18next-browser-languagedetector": "^7.1.0",
+    "i18next-browser-languagedetector": "^7.2.1",
     "murmurhash-js": "^1.0.0",
-    "next": "^13.5.4",
+    "next": "^14.1.0",
     "query-string": "^7.1.1",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-bootstrap": "^2.8.0",
-    "react-content-loader": "^6.2.1",
+    "react-content-loader": "^7.0.0",
     "react-device-detect": "^2.2.3",
     "react-dom": "18",
     "react-toastify": "^9.1.3",
@@ -63,20 +63,20 @@
     ]
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.21.5",
+    "@babel/preset-env": "^7.24.5",
     "@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": "^18.3.1",
     "@types/react-dom": "^18.2.14",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
     "@typescript-eslint/parser": "^5.57.0",
     "@walletconnect/types": "^2.10.0",
     "dotenv": "^16.0.3",
     "esbuild-plugin-inline-image": "^0.0.9",
-    "esbuild-sass-plugin": "^2.15.0",
+    "esbuild-sass-plugin": "^3.0.0",
     "esbuild-scss-modules-plugin": "^1.1.1",
     "eslint": "^8.48.0",
     "eslint-plugin-react": "^7.33.2",