@jitsu/js 1.9.0-canary.581.20240115194116 → 1.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jitsu/js",
-  "version": "1.9.0-canary.581.20240115194116",
+  "version": "1.9.0",
   "description": "",
   "author": "Jitsu Dev Team <dev@jitsu.com>",
   "main": "dist/jitsu.cjs.js",
@@ -34,7 +34,8 @@
     "rollup": "^3.2.5",
     "ts-jest": "29.0.5",
     "typescript": "^5.3.3",
-    "@jitsu/protocols": "1.9.0-canary.581.20240115194116"
+    "jsondiffpatch": "1.9.0",
+    "@jitsu/protocols": "1.9.0"
   },
   "dependencies": {
     "analytics": "0.8.9"

package/src/analytics-plugin.ts

@@ -9,6 +9,9 @@ import { loadScript } from "./script-loader";
 import { internalDestinationPlugins } from "./destination-plugins";
 import { jitsuLibraryName, jitsuVersion } from "./version";
 import { getTopLevelDomain } from "./tlds";
+import * as jsondiffpatch from "jsondiffpatch";
+
+const diff = jsondiffpatch.create();
 
 const defaultConfig: Required<JitsuOptions> = {
   /* Your segment writeKey */
@@ -20,6 +23,7 @@ const defaultConfig: Required<JitsuOptions> = {
   echoEvents: false,
   cookieDomain: undefined,
   runtime: undefined,
+  fetchTimeoutMs: undefined,
   s2s: undefined,
 };
 
@@ -390,6 +394,11 @@ export type InternalPluginDescriptor = {
 
 export type DeviceOptions = AnalyticsPluginDescriptor | InternalPluginDescriptor;
 
+function isDiff(obj: any) {
+  const keys = Object.keys(obj);
+  return keys.length === 1 && keys[0] === "__diff";
+}
+
 async function processDestinations(
   destinations: DestinationDescriptor[],
   method: string,
@@ -402,7 +411,13 @@ async function processDestinations(
   for (const destination of destinations) {
     let newEvents = [originalEvent];
     if (destination.newEvents) {
-      newEvents = destination.newEvents.map(e => (e === "same" ? originalEvent : e));
+      try {
+        newEvents = destination.newEvents.map(e =>
+          e === "same" ? originalEvent : isDiff(e) ? diff.patch(originalEvent, e.__diff) : e
+        );
+      } catch (e) {
+        console.error(`[JITSU] Error applying '${destination.id}' changes to event: ${e?.message}`, e);
+      }
     }
     const credentials = { ...destination.credentials, ...destination.options };
 
@@ -533,6 +548,12 @@ async function send(
   //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
   // }
   const adjustedPayload = adjustPayload(payload, jitsuConfig, store, s2s);
+  const abortController = jitsuConfig.fetchTimeoutMs ? new AbortController() : undefined;
+  const abortTimeout = jitsuConfig.fetchTimeoutMs
+    ? setTimeout(() => {
+        abortController.abort();
+      }, jitsuConfig.fetchTimeoutMs)
+    : undefined;
 
   const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": jitsuConfig.writeKey } : {};
   let fetchResult;
@@ -546,7 +567,11 @@ async function send(
         ...debugHeader,
       },
       body: JSON.stringify(adjustedPayload),
+      signal: abortController?.signal,
     });
+    if (abortTimeout) {
+      clearTimeout(abortTimeout);
+    }
   } catch (e: any) {
     throw new Error(`Calling ${url} failed: ${e.message}`);
   }

package/src/browser.ts

@@ -1,4 +1,4 @@
-import { JitsuOptions } from "./jitsu";
+import type { AnalyticsInterface, JitsuOptions } from "./jitsu";
 import { jitsuAnalytics } from "./index";
 
 export type JitsuBrowserOptions = {
@@ -40,6 +40,21 @@ function getScriptAttributes(scriptElement: HTMLScriptElement) {
     );
 }
 
+function runCallback(callback: any, jitsu: AnalyticsInterface) {
+  if (typeof callback === "function") {
+    callback(jitsu);
+  } else if (Array.isArray(callback) && typeof callback[0] === "string") {
+    const [method, ...args] = callback;
+    if (typeof jitsu[method] === "function") {
+      jitsu[method](...args);
+    } else {
+      console.warn(`Method ${method} is not supported, ignoring callback`);
+    }
+  } else {
+    console.warn(`Invalid jitsu queue callback`, callback);
+  }
+}
+
 (function () {
   function readJitsuOptions(): JitsuBrowserOptions {
     const scriptElement = window.document.currentScript as HTMLScriptElement;
@@ -93,7 +108,7 @@ function getScriptAttributes(scriptElement: HTMLScriptElement) {
   }
   callbackQueue.forEach((callback: any) => {
     try {
-      callback(jitsu);
+      runCallback(callback, jitsu);
     } catch (e: any) {
       console.warn(`Error processing callback from Jitsu queue`, e);
     }

package/src/destination-plugins/gtm.ts

@@ -2,15 +2,9 @@ import { loadScript } from "../script-loader";
 import { AnalyticsClientEvent } from "@jitsu/protocols/analytics";
 import { applyFilters, CommonDestinationCredentials, InternalPlugin } from "./index";
 
-const defaultScriptSrc = "https://www.googletagmanager.com/gtag/js";
-
 export type GtmDestinationCredentials = {
-  debug?: boolean;
   containerId?: string;
   dataLayerName?: string;
-  preview?: string;
-  auth?: string;
-  customScriptSrc?: string;
 } & CommonDestinationCredentials;
 
 export const gtmPlugin: InternalPlugin<GtmDestinationCredentials> = {
@@ -83,31 +77,26 @@ async function initGtmIfNeeded(config: GtmDestinationCredentials, payload: Analy
   setGtmState("loading");
 
   const dlName = config.dataLayerName || "dataLayer";
-  const dlParam = dlName !== "dataLayer" ? "&l=" + dlName : "";
-  const previewParams = config.preview
-    ? `&gtm_preview=${config.preview}&gtm_auth=${config.auth}&gtm_cookies_win=x`
-    : "";
   const tagId = config.containerId;
-  const scriptSrc = `${config.customScriptSrc || defaultScriptSrc}?id=${tagId}${dlParam}${previewParams}`;
-
-  window[dlName] = window[dlName] || [];
-  const gtag = function () {
-    window[dlName].push(arguments);
-  };
-  window[dlName].push({
-    user_id: payload.userId,
-  });
-  // @ts-ignore
-  gtag("js", new Date());
-  // @ts-ignore
-  gtag("config", tagId);
 
-  loadScript(scriptSrc)
-    .then(() => {
-      setGtmState("loaded");
-    })
-    .catch(e => {
-      console.warn(`GTM (containerId=${tagId}) init failed: ${e.message}`, e);
-      setGtmState("failed");
+  (function (w, l, i) {
+    w[l] = w[l] || [];
+    w[l].push({
+      user_id: payload.userId,
+    });
+    w[l].push({
+      "gtm.start": new Date().getTime(),
+      event: "gtm.js",
     });
+    const dl = l != "dataLayer" ? "&l=" + l : "";
+    const scriptSrc = "https://www.googletagmanager.com/gtm.js?id=" + i + dl;
+    loadScript(scriptSrc)
+      .then(() => {
+        setGtmState("loaded");
+      })
+      .catch(e => {
+        console.warn(`GTM (containerId=${tagId}) init failed: ${e.message}`, e);
+        setGtmState("failed");
+      });
+  })(window, dlName, tagId);
 }

package/src/index.ts

@@ -16,7 +16,7 @@ export default function parse(input) {
     if (parseFloat(value) === value) {
       value = parseFloat(value);
     }
-  } catch (e) {}
+  } catch (e) { }
   if (value === null || value === "") {
     return;
   }
@@ -24,7 +24,7 @@ export default function parse(input) {
 }
 
 export const emptyAnalytics: AnalyticsInterface = {
-  setAnonymousId: () => {},
+  setAnonymousId: () => { },
   track: () => Promise.resolve(),
   page: () => Promise.resolve(),
   user: () => ({}),
@@ -123,15 +123,15 @@ function createUnderlyingAnalyticsInstance(
     setAnonymousId: (id: string) => {
       if (opts.debug) {
         console.log("[JITSU DEBUG] Setting anonymous id to " + id);
-        //Workaround for analytics.js bug. Underlying setAnonymousId doesn't work set the id immediately,
-        //so we got to it manually here. See https://github.com/jitsucom/jitsu/issues/1060
-        storage.setItem("__anon_id", id);
-        const userState = analytics.user();
-        if (userState) {
-          userState.anonymousId = id;
-        }
-        (analytics as any).setAnonymousId(id);
       }
+      //Workaround for analytics.js bug. Underlying setAnonymousId doesn't work set the id immediately,
+      //so we got to it manually here. See https://github.com/jitsucom/jitsu/issues/1060
+      storage.setItem("__anon_id", id);
+      const userState = analytics.user();
+      if (userState) {
+        userState.anonymousId = id;
+      }
+      (analytics as any).setAnonymousId(id);
     },
     async group(
       groupId?: ID,

package/src/jitsu.ts

@@ -45,6 +45,11 @@ type JitsuOptions = {
    * If not set at all, it will be detected automatically by presence of `window` object
    */
   s2s?: boolean;
+
+  /**
+   * Timeout for fetch requests. Default value: 5000
+   */
+  fetchTimeoutMs?: number;
 };
 
 type PersistentStorage = {

package/src/version.ts

@@ -1,6 +1,6 @@
-//import pkg from "../package.json";
+import pkg from "../package.json";
 
-const jitsuVersion = "0.0.0";
+const jitsuVersion = pkg.version !== "0.0.0" ? pkg.version : "2.0.0";
 const jitsuLibraryName = "@jitsu/js";
 
 export { jitsuVersion, jitsuLibraryName };