@jitsu/js 1.9.3 → 1.9.5

package/dist/web/p.js.txt

@@ -72,7 +72,23 @@
       const scripts = Array.prototype.slice.call(window.document.querySelectorAll("script"));
       return scripts.find(s => s.src === src);
   }
-  function loadScript(src, attributes) {
+  function buildScriptSrc(src, options) {
+      let result = src;
+      if (!result.startsWith("http")) {
+          result = `https://${(options === null || options === void 0 ? void 0 : options.www) ? "www." : ""}${result}`;
+      }
+      if (options === null || options === void 0 ? void 0 : options.min) {
+          result = result + ".min.js";
+      }
+      else if (options === null || options === void 0 ? void 0 : options.js) {
+          result = result + ".js";
+      }
+      if (options === null || options === void 0 ? void 0 : options.query) {
+          result += "?" + options.query;
+      }
+      return result;
+  }
+  function loadScript(src, options) {
       const found = findScript(src);
       if (found !== undefined) {
           const status = found === null || found === void 0 ? void 0 : found.getAttribute("status");
@@ -87,13 +103,13 @@
           }
       }
       return new Promise((resolve, reject) => {
-          var _a;
+          var _a, _b;
           const script = window.document.createElement("script");
           script.type = "text/javascript";
-          script.src = src;
+          script.src = buildScriptSrc(src, options);
           script.async = true;
           script.setAttribute("status", "loading");
-          for (const [k, v] of Object.entries(attributes !== null && attributes !== void 0 ? attributes : {})) {
+          for (const [k, v] of Object.entries((_a = options === null || options === void 0 ? void 0 : options.attributes) !== null && _a !== void 0 ? _a : {})) {
               script.setAttribute(k, v);
           }
           script.onload = () => {
@@ -107,7 +123,7 @@
               reject(new Error(`Failed to load ${src}`));
           };
           const tag = window.document.getElementsByTagName("script")[0];
-          (_a = tag.parentElement) === null || _a === void 0 ? void 0 : _a.insertBefore(script, tag);
+          (_b = tag.parentElement) === null || _b === void 0 ? void 0 : _b.insertBefore(script, tag);
       });
   }
 
@@ -207,6 +223,7 @@
           step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
   };
+  const cdn = "cdn.lr-ingest.io/";
   const logrocketPlugin = {
       id: "logrocket",
       handle(config, payload) {
@@ -257,7 +274,7 @@
               return;
           }
           setLogRocketState("loading");
-          loadScript(`https://cdn.lr-ingest.io/LogRocket.min.js`, { crossOrigin: "anonymous" })
+          loadScript(`${cdn}LogRocket`, { min: true, attributes: { crossOrigin: "anonymous" } })
               .then(() => {
               if (window["LogRocket"]) {
                   try {
@@ -380,8 +397,8 @@
                   event: "gtm.js",
               });
               const dl = l != "dataLayer" ? "&l=" + l : "";
-              const scriptSrc = "https://www.googletagmanager.com/gtm.js?id=" + i + dl;
-              loadScript(scriptSrc)
+              const scriptSrc = "googletagmanager.com/gtm";
+              loadScript(scriptSrc, { www: true, js: true, query: "id=" + i + dl })
                   .then(() => {
                   setGtmState("loaded");
               })
@@ -402,7 +419,7 @@
           step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
   };
-  const defaultScriptSrc = "https://www.googletagmanager.com/gtag/js";
+  const defaultScriptSrc = "googletagmanager.com/gtag/js";
   const ga4Plugin = {
       id: "ga4-tag",
       handle(config, payload) {
@@ -464,7 +481,6 @@
           const dlParam = dlName !== "dataLayer" ? "&l=" + dlName : "";
           // to work with both GA4 and GTM
           const tagId = config.measurementIds;
-          const scriptSrc = `${defaultScriptSrc}?id=${tagId}${dlParam}`;
           window[dlName] = window[dlName] || [];
           const gtag = function () {
               window[dlName].push(arguments);
@@ -474,7 +490,7 @@
           gtag(
           // @ts-ignore
           "config", tagId, Object.assign(Object.assign({}, (payload.userId ? { user_id: payload.userId } : {})), (!config.autoPageView ? { send_page_view: false } : {})));
-          loadScript(scriptSrc)
+          loadScript(defaultScriptSrc, { query: `id=${tagId}${dlParam}`, www: true })
               .then(() => {
               setGa4State("loaded");
           })
@@ -1113,8 +1129,15 @@
           return undefined;
       }
   }
-  function removeCookie(name) {
-      document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:01 GMT;";
+  function removeCookie(name, { domain, secure }) {
+      document.cookie =
+          name +
+              "=;domain=" +
+              domain +
+              ";path=/" +
+              ";expires=Thu, 01 Jan 1970 00:00:01 GMT;SameSite=" +
+              (secure ? "None" : "Lax") +
+              (secure ? ";secure" : "");
   }
   function setCookie(name, val, { domain, secure }) {
       document.cookie =
@@ -1156,7 +1179,18 @@
               return parse(result);
           },
           removeItem(key) {
-              removeCookie(key2cookie[key] || key);
+              removeCookie(key2cookie[key] || key, {
+                  domain: cookieDomain,
+                  secure: window.location.protocol === "https:",
+              });
+          },
+          reset() {
+              for (const v of Object.values(key2cookie)) {
+                  removeCookie(v, {
+                      domain: cookieDomain,
+                      secure: window.location.protocol === "https:",
+                  });
+              }
           },
       };
   };
@@ -1227,6 +1261,9 @@
       store() {
           const storage = {};
           return {
+              reset() {
+                  Object.keys(storage).forEach(key => delete storage[key]);
+              },
               setItem(key, val) {
                   if (config.debug) {
                       console.log(`[JITSU EMPTY RUNTIME] Set storage item ${key}=${JSON.stringify(val)}`);
@@ -1292,6 +1329,17 @@
       }
       return path;
   }
+  const hashRegex = /#.*$/;
+  /**
+   * for compatibility with path produced by analytics.js
+   * @param url
+   */
+  function urlPath(url) {
+      const regex = /(http[s]?:\/\/)?([^\/\s]+\/)(.*)/g;
+      const matches = regex.exec(url);
+      const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
+      return "/" + pathMatch;
+  }
   function adjustPayload(payload, config, storage, s2s) {
       var _a, _b;
       const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
@@ -1299,8 +1347,9 @@
       const parsedUrl = safeCall(() => new URL(url), undefined);
       const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
       const properties = payload.properties || {};
-      if (properties.path) {
-          properties.path = fixPath(properties.path);
+      if (payload.type === "page" && url) {
+          properties.url = url.replace(hashRegex, "");
+          properties.path = fixPath(urlPath(url));
       }
       const customContext = ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || {};
       (_b = payload.properties) === null || _b === void 0 ? true : delete _b.context;
@@ -1498,10 +1547,13 @@
                   console.warn(`[JITSU] ${payload.type} responded with list of ${responseJson.destinations.length} destinations. However, this code is running in server-to-server mode, so destinations will be ignored`, jitsuConfig.debug ? JSON.stringify(responseJson.destinations, null, 2) : undefined);
               }
               else {
-                  if (jitsuConfig.debug) {
-                      console.log(`[JITSU] Processing device destinations: `, JSON.stringify(responseJson.destinations, null, 2));
+                  //double protection, ingest should not return destinations in s2s mode
+                  if (isInBrowser()) {
+                      if (jitsuConfig.debug) {
+                          console.log(`[JITSU] Processing device destinations: `, JSON.stringify(responseJson.destinations, null, 2));
+                      }
+                      return processDestinations(responseJson.destinations, method, adjustedPayload, !!jitsuConfig.debug, instance);
                   }
-                  return processDestinations(responseJson.destinations, method, adjustedPayload, !!jitsuConfig.debug, instance);
               }
           }
           return adjustedPayload;
@@ -1541,9 +1593,11 @@
               return send("identify", payload, config, instance, storage);
           },
           reset: args => {
-              //clear storage cache
-              if (pluginConfig.storageWrapper) {
-                  pluginConfig.storageWrapper(args.instance.storage).reset();
+              const { config, instance } = args;
+              const storage = pluginConfig.storageWrapper ? pluginConfig.storageWrapper(instance.storage) : instance.storage;
+              storage === null || storage === void 0 ? void 0 : storage.reset();
+              if (config.debug) {
+                  console.log("[JITSU DEBUG] Resetting Jitsu plugin storage");
               }
           },
           methods: {
@@ -1646,9 +1700,9 @@
           },
           reset() {
               for (const key of [...Object.keys(storageCache)]) {
-                  storage.removeItem(key);
                   delete storageCache[key];
               }
+              storage.reset();
           },
           removeItem(key) {
               if (opts.debug) {
@@ -1705,7 +1759,20 @@
                   userState.anonymousId = id;
               }
               analytics.setAnonymousId(id);
-          }, group(groupId, traits, options, callback) {
+          }, reset() {
+              return __awaiter(this, void 0, void 0, function* () {
+                  if (opts.debug) {
+                      console.log("[JITSU DEBUG] Called reset(). Storage state", JSON.stringify(analytics.user()));
+                  }
+                  storage.reset();
+                  yield analytics.reset();
+                  this.setAnonymousId(uuid());
+                  if (opts.debug) {
+                      console.log("[JITSU DEBUG] User state after reset", JSON.stringify(analytics.user()));
+                  }
+              });
+          },
+          group(groupId, traits, options, callback) {
               return __awaiter(this, void 0, void 0, function* () {
                   const results = [];
                   for (const plugin of Object.values(analytics.plugins)) {
@@ -1754,6 +1821,15 @@
       //   result.loaded(createUnderlyingAnalyticsInstance(opts, rt));
       // }
   }
+  function uuid() {
+      var u = "", m = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx", i = 0, rb = (Math.random() * 0xffffffff) | 0;
+      while (i++ < 36) {
+          var c = m[i - 1], r = rb & 0xf, v = c == "x" ? r : (r & 0x3) | 0x8;
+          u += c == "-" || c == "4" ? c : v.toString(16);
+          rb = i % 8 == 0 ? (Math.random() * 0xffffffff) | 0 : rb >> 4;
+      }
+      return u;
+  }
 
   function snakeToCamel(s) {
       return s.replace(/([-_][a-z])/gi, $1 => {

package/package.json

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

package/src/analytics-plugin.ts

@@ -123,8 +123,15 @@ function getGa4Ids(runtime: RuntimeFacade) {
   }
 }
 
-function removeCookie(name: string) {
-  document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:01 GMT;";
+function removeCookie(name: string, { domain, secure }: { domain: string; secure: boolean }) {
+  document.cookie =
+    name +
+    "=;domain=" +
+    domain +
+    ";path=/" +
+    ";expires=Thu, 01 Jan 1970 00:00:01 GMT;SameSite=" +
+    (secure ? "None" : "Lax") +
+    (secure ? ";secure" : "");
 }
 
 function setCookie(name: string, val: string, { domain, secure }: { domain: string; secure: boolean }) {
@@ -169,7 +176,18 @@ const cookieStorage: StorageFactory = (cookieDomain, key2cookie) => {
       return parse(result);
     },
     removeItem(key: string) {
-      removeCookie(key2cookie[key] || key);
+      removeCookie(key2cookie[key] || key, {
+        domain: cookieDomain,
+        secure: window.location.protocol === "https:",
+      });
+    },
+    reset() {
+      for (const v of Object.values(key2cookie)) {
+        removeCookie(v, {
+          domain: cookieDomain,
+          secure: window.location.protocol === "https:",
+        });
+      }
     },
   };
 };
@@ -244,6 +262,9 @@ export const emptyRuntime = (config: JitsuOptions): RuntimeFacade => ({
   store(): PersistentStorage {
     const storage = {};
     return {
+      reset(): void {
+        Object.keys(storage).forEach(key => delete storage[key]);
+      },
       setItem(key: string, val: any) {
         if (config.debug) {
           console.log(`[JITSU EMPTY RUNTIME] Set storage item ${key}=${JSON.stringify(val)}`);
@@ -313,6 +334,19 @@ function fixPath(path: string): string {
   return path;
 }
 
+const hashRegex = /#.*$/;
+
+/**
+ * for compatibility with path produced by analytics.js
+ * @param url
+ */
+function urlPath(url) {
+  const regex = /(http[s]?:\/\/)?([^\/\s]+\/)(.*)/g;
+  const matches = regex.exec(url);
+  const pathMatch = matches && matches[3] ? matches[3].split("?")[0].replace(hashRegex, "") : "";
+  return "/" + pathMatch;
+}
+
 function adjustPayload(
   payload: any,
   config: JitsuOptions,
@@ -325,8 +359,9 @@ function adjustPayload(
   const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
   const properties = payload.properties || {};
 
-  if (properties.path) {
-    properties.path = fixPath(properties.path);
+  if (payload.type === "page" && url) {
+    properties.url = url.replace(hashRegex, "");
+    properties.path = fixPath(urlPath(url));
   }
 
   const customContext = payload.properties?.context || {};
@@ -610,19 +645,22 @@ async function send(
         jitsuConfig.debug ? JSON.stringify(responseJson.destinations, null, 2) : undefined
       );
     } else {
-      if (jitsuConfig.debug) {
-        console.log(`[JITSU] Processing device destinations: `, JSON.stringify(responseJson.destinations, null, 2));
+      //double protection, ingest should not return destinations in s2s mode
+      if (isInBrowser()) {
+        if (jitsuConfig.debug) {
+          console.log(`[JITSU] Processing device destinations: `, JSON.stringify(responseJson.destinations, null, 2));
+        }
+        return processDestinations(responseJson.destinations, method, adjustedPayload, !!jitsuConfig.debug, instance);
       }
-      return processDestinations(responseJson.destinations, method, adjustedPayload, !!jitsuConfig.debug, instance);
     }
   }
   return adjustedPayload;
 }
 
 export type JitsuPluginConfig = JitsuOptions & {
-  storageWrapper?: (persistentStorage: PersistentStorage) => PersistentStorage & { reset: () => void };
+  storageWrapper?: (persistentStorage: PersistentStorage) => PersistentStorage;
 };
-const jitsuAnalyticsPlugin = (pluginConfig: JitsuPluginConfig = {}): AnalyticsPlugin => {
+export const jitsuAnalyticsPlugin = (pluginConfig: JitsuPluginConfig = {}): AnalyticsPlugin => {
   const instanceConfig = {
     ...defaultConfig,
     ...pluginConfig,
@@ -672,9 +710,11 @@ const jitsuAnalyticsPlugin = (pluginConfig: JitsuPluginConfig = {}): AnalyticsPl
       return send("identify", payload, config, instance, storage);
     },
     reset: args => {
-      //clear storage cache
-      if (pluginConfig.storageWrapper) {
-        pluginConfig.storageWrapper(args.instance.storage).reset();
+      const { config, instance } = args;
+      const storage = pluginConfig.storageWrapper ? pluginConfig.storageWrapper(instance.storage) : instance.storage;
+      storage?.reset();
+      if (config.debug) {
+        console.log("[JITSU DEBUG] Resetting Jitsu plugin storage");
       }
     },
     methods: {
@@ -735,5 +775,3 @@ function hash(str: string, seed: number = 0): number {
 
   return 4294967296 * (2097151 & h2) + (h1 >>> 0);
 }
-
-export default jitsuAnalyticsPlugin;

package/src/destination-plugins/ga4.ts

@@ -2,7 +2,7 @@ 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";
+const defaultScriptSrc = "googletagmanager.com/gtag/js";
 
 export type Ga4DestinationCredentials = {
   debug?: boolean;
@@ -94,7 +94,6 @@ async function initGa4IfNeeded(config: Ga4DestinationCredentials, payload: Analy
 
   // to work with both GA4 and GTM
   const tagId = config.measurementIds;
-  const scriptSrc = `${defaultScriptSrc}?id=${tagId}${dlParam}`;
 
   window[dlName] = window[dlName] || [];
   const gtag = function () {
@@ -112,7 +111,7 @@ async function initGa4IfNeeded(config: Ga4DestinationCredentials, payload: Analy
     }
   );
 
-  loadScript(scriptSrc)
+  loadScript(defaultScriptSrc, { query: `id=${tagId}${dlParam}`, www: true })
     .then(() => {
       setGa4State("loaded");
     })

package/src/destination-plugins/gtm.ts

@@ -129,8 +129,8 @@ async function initGtmIfNeeded(config: GtmDestinationCredentials, payload: Analy
       event: "gtm.js",
     });
     const dl = l != "dataLayer" ? "&l=" + l : "";
-    const scriptSrc = "https://www.googletagmanager.com/gtm.js?id=" + i + dl;
-    loadScript(scriptSrc)
+    const scriptSrc = "googletagmanager.com/gtm";
+    loadScript(scriptSrc, { www: true, js: true, query: "id=" + i + dl })
       .then(() => {
         setGtmState("loaded");
       })

package/src/destination-plugins/logrocket.ts

@@ -6,6 +6,8 @@ export type LogRocketDestinationCredentials = {
   appId: string;
 } & CommonDestinationCredentials;
 
+const cdn = "cdn.lr-ingest.io/";
+
 export const logrocketPlugin: InternalPlugin<LogRocketDestinationCredentials> = {
   id: "logrocket",
   async handle(config, payload: AnalyticsClientEvent) {
@@ -63,7 +65,7 @@ async function initLogrocketIfNeeded(appId: string) {
     return;
   }
   setLogRocketState("loading");
-  loadScript(`https://cdn.lr-ingest.io/LogRocket.min.js`, { crossOrigin: "anonymous" })
+  loadScript(`${cdn}LogRocket`, { min: true, attributes: { crossOrigin: "anonymous" } })
     .then(() => {
       if (window["LogRocket"]) {
         try {

package/src/index.ts

@@ -1,6 +1,6 @@
 import Analytics from "analytics";
 import { AnalyticsInterface, JitsuOptions, PersistentStorage, RuntimeFacade } from "./jitsu";
-import jitsuAnalyticsPlugin, { emptyRuntime, isInBrowser, windowRuntime } from "./analytics-plugin";
+import { jitsuAnalyticsPlugin, emptyRuntime, isInBrowser, windowRuntime } from "./analytics-plugin";
 import { Callback, DispatchedEvent, ID, JSONObject, Options } from "@jitsu/protocols/analytics";
 
 export default function parse(input) {
@@ -64,9 +64,9 @@ function createUnderlyingAnalyticsInstance(
     },
     reset() {
       for (const key of [...Object.keys(storageCache)]) {
-        storage.removeItem(key);
         delete storageCache[key];
       }
+      storage.reset();
     },
     removeItem(key: string) {
       if (opts.debug) {
@@ -133,6 +133,17 @@ function createUnderlyingAnalyticsInstance(
       }
       (analytics as any).setAnonymousId(id);
     },
+    async reset() {
+      if (opts.debug) {
+        console.log("[JITSU DEBUG] Called reset(). Storage state", JSON.stringify(analytics.user()));
+      }
+      storage.reset();
+      await analytics.reset();
+      this.setAnonymousId(uuid());
+      if (opts.debug) {
+        console.log("[JITSU DEBUG] User state after reset", JSON.stringify(analytics.user()));
+      }
+    },
     async group(
       groupId?: ID,
       traits?: JSONObject | null,
@@ -194,5 +205,22 @@ export function jitsuAnalytics(_opts: JitsuOptions): AnalyticsInterface {
   // }
 }
 
+function uuid() {
+  var u = "",
+    m = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx",
+    i = 0,
+    rb = (Math.random() * 0xffffffff) | 0;
+
+  while (i++ < 36) {
+    var c = m[i - 1],
+      r = rb & 0xf,
+      v = c == "x" ? r : (r & 0x3) | 0x8;
+
+    u += c == "-" || c == "4" ? c : v.toString(16);
+    rb = i % 8 == 0 ? (Math.random() * 0xffffffff) | 0 : rb >> 4;
+  }
+  return u;
+}
+
 export * from "./jitsu";
 export * from "./analytics-plugin";

package/src/jitsu.ts

@@ -1,5 +1,4 @@
 import type { AnalyticsInterface } from "@jitsu/protocols/analytics";
-import type { AnalyticsPlugin } from "analytics";
 
 type JitsuOptions = {
   /**
@@ -56,6 +55,7 @@ type PersistentStorage = {
   getItem: (key: string, options?: any) => any;
   setItem: (key: string, value: any, options?: any) => void;
   removeItem: (key: string, options?: any) => void;
+  reset: () => void;
 };
 
 type RuntimeFacade = {
@@ -83,6 +83,4 @@ type RuntimeFacade = {
 
 export declare function jitsuAnalytics(opts: JitsuOptions): AnalyticsInterface;
 
-export declare const jitsuAnalyticsPlugin: AnalyticsPlugin;
-
 export { AnalyticsInterface, JitsuOptions, PersistentStorage, RuntimeFacade };

package/src/script-loader.ts

@@ -3,7 +3,32 @@ function findScript(src: string): HTMLScriptElement | undefined {
   return scripts.find(s => s.src === src);
 }
 
-export function loadScript(src: string, attributes?: Record<string, string>): Promise<HTMLScriptElement> {
+export type ScriptOptions = {
+  attributes?: Record<string, string>;
+  www?: boolean;
+  js?: boolean;
+  min?: boolean;
+  query?: string;
+};
+
+function buildScriptSrc(src: string, options?: ScriptOptions): string {
+  let result = src;
+  if (!result.startsWith("http")) {
+    result = `https://${options?.www ? "www." : ""}${result}`;
+  }
+  if (options?.min) {
+    result = result + ".min.js";
+  } else if (options?.js) {
+    result = result + ".js";
+  }
+
+  if (options?.query) {
+    result += "?" + options.query;
+  }
+  return result;
+}
+
+export function loadScript(src: string, options?: ScriptOptions): Promise<HTMLScriptElement> {
   const found = findScript(src);
 
   if (found !== undefined) {
@@ -25,11 +50,11 @@ export function loadScript(src: string, attributes?: Record<string, string>): Pr
     const script = window.document.createElement("script");
 
     script.type = "text/javascript";
-    script.src = src;
+    script.src = buildScriptSrc(src, options);
     script.async = true;
 
     script.setAttribute("status", "loading");
-    for (const [k, v] of Object.entries(attributes ?? {})) {
+    for (const [k, v] of Object.entries(options?.attributes ?? {})) {
       script.setAttribute(k, v);
     }