@jitsu/js 1.6.1 → 1.7.1

package/src/analytics-plugin.ts

@@ -77,23 +77,25 @@ function getCookie(name: string) {
   return parts.length === 2 ? parts.pop().split(";").shift() : undefined;
 }
 
-function getGa4Sessions(): Record<string, string> | undefined {
-  const value = `; ${document.cookie}`;
-  const matches = value.matchAll(/_ga_(\w+)=([^;]+)/g);
-  const sessions: Record<string, string> = {};
-  let matchesCount = 0;
-  for (const match of matches) {
-    const parts = match[2].split(".");
-    if (parts.length < 3) {
-      continue;
-    }
-    sessions[match[1]] = parts[2];
-    matchesCount++;
-  }
-  if (matchesCount === 0) {
+function getGa4Sessions(allCookies: Record<string, string>): Record<string, string> | undefined {
+  const gaCookies = Object.entries(allCookies).filter(([key]) => key.startsWith("_ga_"));
+  if (gaCookies.length === 0) {
     return undefined;
   }
-  return sessions;
+  return Object.fromEntries(
+    gaCookies
+      .map(([key, value]) => {
+        if (typeof value !== "string") {
+          return null;
+        }
+        const parts = value.split(".");
+        if (parts.length < 3) {
+          return null;
+        }
+        return [key.substring("_ga_".length), parts[2]];
+      })
+      .filter(v => v !== null)
+  );
 }
 
 function removeCookie(name: string) {
@@ -149,6 +151,20 @@ const cookieStorage: StorageFactory = (cookieDomain, key2cookie) => {
 
 export function windowRuntime(opts: JitsuOptions): RuntimeFacade {
   return {
+    getCookie(name: string): string | undefined {
+      const value = `; ${document.cookie}`;
+      const parts = value.split(`; ${name}=`);
+      return parts.length === 2 ? parts.pop().split(";").shift() : undefined;
+    },
+    getCookies(): Record<string, string> {
+      const value = `; ${document.cookie}`;
+      const cookies: Record<string, string> = {};
+      const matches = value.matchAll(/(\w+)=([^;]+)/g);
+      for (const match of matches) {
+        cookies[match[1]] = match[2];
+      }
+      return cookies;
+    },
     documentEncoding(): string | undefined {
       return window.document.characterSet;
     },
@@ -193,6 +209,12 @@ export const emptyRuntime = (config: JitsuOptions): RuntimeFacade => ({
   timezoneOffset(): number | undefined {
     return undefined;
   },
+  getCookie(name: string): string | undefined {
+    return undefined;
+  },
+  getCookies(): Record<string, string> {
+    return {};
+  },
 
   store(): PersistentStorage {
     const storage = {};
@@ -284,11 +306,11 @@ function adjustPayload(payload: any, config: JitsuOptions, storage: PersistentSt
       encoding: properties.encoding || runtime.documentEncoding(),
     },
     clientIds: {
-      fbc: getCookie("_fbc"),
-      fbp: getCookie("_fbp"),
+      fbc: runtime.getCookie("_fbc"),
+      fbp: runtime.getCookie("_fbp"),
       ga4: {
-        clientId: getCookie("_ga")?.split(".").slice(-2).join("."), //last 2 parts of GA cookie
-        sessions: getGa4Sessions(),
+        clientId: runtime.getCookie("_ga")?.split(".").slice(-2).join("."), //last 2 parts of GA cookie
+        sessions: getGa4Sessions(runtime.getCookies()),
       },
     },
     campaign: parseUtms(query),

package/src/browser.ts

@@ -53,14 +53,35 @@ function getScriptAttributes(scriptElement: HTMLScriptElement) {
 
   const options = readJitsuOptions();
   const JITSU_V2_ID: string = options.namespace || "jitsu";
-
+  const queue = [];
   if (window[JITSU_V2_ID]) {
-    console.log("Jitsu is already initialized");
+    if (Array.isArray(window[JITSU_V2_ID])) {
+      //processing queue of events
+      if (options.debug) {
+        console.log(
+          `Initializing Jitsu with prior events queue size of ${window[JITSU_V2_ID].length}`,
+          window[JITSU_V2_ID]
+        );
+      }
+      queue.push(...window[JITSU_V2_ID]);
+    } else {
+      console.warn("Attempted to initialize Jitsu twice. Returning the existing instance");
+    }
   }
   if (options.debug) {
     console.log(`Jitsu options: `, JSON.stringify(options));
   }
   const jitsu = jitsuAnalytics(options);
+  for (const [method, args] of queue) {
+    if (options.debug) {
+      console.log(`Processing event ${method} from Jitsu queue on`, args);
+    }
+    try {
+      jitsu[method](...args);
+    } catch (e: any) {
+      console.warn(`Error processing event ${method} from Jitsu queue on`, args, e);
+    }
+  }
 
   if (options.onload) {
     const onloadFunction = window[options.onload] as any;
@@ -75,6 +96,18 @@ function getScriptAttributes(scriptElement: HTMLScriptElement) {
   }
   window[JITSU_V2_ID] = jitsu;
 
+  //new callback based queue
+  const callbackQueue = window[JITSU_V2_ID + "Q"] || [];
+  if (options.debug) {
+    console.log(`Jitsu callback queue size: ${callbackQueue.length}`, callbackQueue);
+  }
+  callbackQueue.forEach((callback: any) => {
+    try {
+      callback(jitsu);
+    } catch (e: any) {
+      console.warn(`Error processing callback from Jitsu queue`, e);
+    }
+  });
   if (!options.initOnly) {
     jitsu.page();
   }

package/src/index.ts

@@ -98,5 +98,3 @@ export function jitsuAnalytics(opts: JitsuOptions): AnalyticsInterface {
 
 export * from "./jitsu";
 export * from "./analytics-plugin";
-export { applyFilters } from "./destination-plugins";
-export { getTopLevelDomain } from "./tlds";

package/src/jitsu.ts

@@ -52,6 +52,9 @@ type RuntimeFacade = {
   language(): string | undefined;
   pageUrl(): string | undefined;
   documentEncoding(): string | undefined;
+  getCookie(name: string): string | undefined;
+  getCookies(): Record<string, string>;
+
   timezoneOffset(): number | undefined;
   screen():
     | {