@jitsu/js 1.1.1 → 1.1.2

package/dist/web/p.js.txt

@@ -111,7 +111,7 @@
       });
   }
 
-  var __awaiter$1 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+  var __awaiter$3 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
       function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
       return new (P || (P = Promise))(function (resolve, reject) {
           function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
@@ -120,18 +120,10 @@
           step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
   };
-  function satisfyFilter(filter, subject) {
-      return filter === "*" || filter.toLowerCase().trim() === (subject || "").trim().toLowerCase();
-  }
-  function applyFilters(event, creds) {
-      const { hosts = ["*"], events = ["*"] } = creds;
-      return (!!hosts.find(hostFilter => { var _a; return satisfyFilter(hostFilter, (_a = event.context) === null || _a === void 0 ? void 0 : _a.host); }) &&
-          !!events.find(eventFilter => satisfyFilter(eventFilter, event.type)));
-  }
   const tagPlugin = {
       id: "tag",
       handle(config, payload) {
-          return __awaiter$1(this, void 0, void 0, function* () {
+          return __awaiter$3(this, void 0, void 0, function* () {
               if (!applyFilters(payload, config)) {
                   return;
               }
@@ -139,6 +131,96 @@
           });
       },
   };
+  function insertTags(code, event, opts = {}) {
+      let tag;
+      try {
+          tag = JSON.parse(code);
+      }
+      catch (e) {
+          tag = { code, lang: "javascript" };
+      }
+      const debug = opts.debug || false;
+      if (isInBrowser()) {
+          if (tag.lang === "javascript") {
+              execJs(tag.code, event);
+          }
+          else {
+              const codeHolder = document.createElement("span");
+              codeHolder.innerHTML = replaceMacro(tag.code, event);
+              document.body.insertAdjacentElement("beforeend", codeHolder);
+              const scripts = codeHolder.querySelectorAll("script");
+              scripts.forEach(script => {
+                  const scriptClone = document.createElement("script");
+                  scriptClone.type = scriptClone.type || "text/javascript";
+                  if (script.hasAttribute("src")) {
+                      scriptClone.src = script.src;
+                  }
+                  scriptClone.text = script.text;
+                  if (debug) {
+                      console.log(`[JITSU] Executing script${script.hasAttribute("src") ? ` ${script.src}` : ""}`, scriptClone.text);
+                  }
+                  document.head.appendChild(scriptClone);
+                  document.head.removeChild(scriptClone);
+              });
+          }
+      }
+      else {
+          if (debug) {
+              console.log(`[JITSU] insertTags(): cannot insert tags in non-browser environment`);
+          }
+      }
+  }
+  function execJs(code, event) {
+      const varName = `jitsu_event_${randomId()}`;
+      window[varName] = event;
+      const iif = `(function(){
+      const event = ${varName};
+      ${code}
+  })()`;
+      try {
+          eval(iif);
+      }
+      catch (e) {
+          console.error(`[JITSU] Error executing JS code: ${e.message}. Code: `, iif);
+      }
+      finally {
+          delete window[varName];
+      }
+      return iif;
+  }
+  function replaceMacro(code, event) {
+      return code.replace(/{{\s*event\s*}}/g, JSON.stringify(event));
+  }
+
+  var __awaiter$2 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+      function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+      return new (P || (P = Promise))(function (resolve, reject) {
+          function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+          function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+          function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+          step((generator = generator.apply(thisArg, _arguments || [])).next());
+      });
+  };
+  const logrocketPlugin = {
+      id: "logrocket",
+      handle(config, payload) {
+          return __awaiter$2(this, void 0, void 0, function* () {
+              if (!applyFilters(payload, config)) {
+                  return;
+              }
+              initLogrocketIfNeeded(config.appId);
+              const action = logRocket => {
+                  if (payload.type === "identify" && payload.userId) {
+                      logRocket.identify(payload.userId, payload.traits || {});
+                  }
+              };
+              getLogRocketQueue().push(action);
+              if (getLogRocketState() === "loaded") {
+                  flushLogRocketQueue(window["LogRocket"]);
+              }
+          });
+      },
+  };
   function getLogRocketState() {
       return window["__jitsuLrState"] || "fresh";
   }
@@ -164,7 +246,7 @@
       }
   }
   function initLogrocketIfNeeded(appId) {
-      return __awaiter$1(this, void 0, void 0, function* () {
+      return __awaiter$2(this, void 0, void 0, function* () {
           if (getLogRocketState() !== "fresh") {
               return;
           }
@@ -189,88 +271,135 @@
           });
       });
   }
-  const logrocketPlugin = {
-      id: "logrocket",
+
+  var __awaiter$1 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+      function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+      return new (P || (P = Promise))(function (resolve, reject) {
+          function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+          function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+          function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+          step((generator = generator.apply(thisArg, _arguments || [])).next());
+      });
+  };
+  const defaultScriptSrc = "https://www.googletagmanager.com/gtag/js";
+  const gtmPlugin = {
+      id: "gtm",
       handle(config, payload) {
+          var _a, _b;
           return __awaiter$1(this, void 0, void 0, function* () {
               if (!applyFilters(payload, config)) {
                   return;
               }
-              initLogrocketIfNeeded(config.appId);
-              const action = logRocket => {
-                  if (payload.type === "identify" && payload.userId) {
-                      logRocket.identify(payload.userId, payload.traits || {});
-                  }
-              };
-              getLogRocketQueue().push(action);
-              if (getLogRocketState() === "loaded") {
-                  flushLogRocketQueue(window["LogRocket"]);
+              yield initGtmIfNeeded(config);
+              const dataLayer = window[config.dataLayerName || "dataLayer"];
+              switch (payload.type) {
+                  case "page":
+                      const { properties: pageProperties, context } = payload;
+                      const pageEvent = {
+                          event: "page_view",
+                          url: pageProperties.url,
+                          title: pageProperties.title,
+                          referer: (_b = (_a = context === null || context === void 0 ? void 0 : context.page) === null || _a === void 0 ? void 0 : _a.referrer) !== null && _b !== void 0 ? _b : "",
+                      };
+                      if (config.debug) {
+                          console.log("gtag push", pageEvent);
+                      }
+                      dataLayer.push(pageEvent);
+                      break;
+                  case "track":
+                      const { properties: trackProperties } = payload;
+                      const trackEvent = Object.assign({ event: payload.event }, trackProperties);
+                      if (payload.userId) {
+                          trackEvent.userId = payload.userId;
+                      }
+                      if (payload.anonymousId) {
+                          trackEvent.anonymousId = payload.anonymousId;
+                      }
+                      if (config.debug) {
+                          console.log("gtag push", trackEvent);
+                      }
+                      dataLayer.push(trackEvent);
+                      break;
+                  case "identify":
+                      const { traits } = payload;
+                      const identifyEvent = Object.assign({ event: "identify" }, traits);
+                      if (payload.userId) {
+                          identifyEvent.userId = payload.userId;
+                      }
+                      if (payload.anonymousId) {
+                          identifyEvent.anonymousId = payload.anonymousId;
+                      }
+                      if (config.debug) {
+                          console.log("gtag push", identifyEvent);
+                      }
+                      dataLayer.push(identifyEvent);
+                      break;
               }
           });
       },
   };
-  function insertTags(code, event, opts = {}) {
-      let tag;
-      try {
-          tag = JSON.parse(code);
-      }
-      catch (e) {
-          tag = { code, lang: "javascript" };
-      }
-      const debug = opts.debug || false;
-      if (isInBrowser()) {
-          if (tag.lang === "javascript") {
-              execJs(tag.code, event);
-          }
-          else {
-              const codeHolder = document.createElement("span");
-              codeHolder.innerHTML = replaceMacro(tag.code, event);
-              document.body.insertAdjacentElement("beforeend", codeHolder);
-              const scripts = codeHolder.querySelectorAll("script");
-              scripts.forEach(script => {
-                  const scriptClone = document.createElement("script");
-                  scriptClone.type = scriptClone.type || "text/javascript";
-                  if (script.hasAttribute("src")) {
-                      scriptClone.src = script.src;
-                  }
-                  scriptClone.text = script.text;
-                  if (debug) {
-                      console.log(`[JITSU] Executing script${script.hasAttribute("src") ? ` ${script.src}` : ""}`, scriptClone.text);
-                  }
-                  document.head.appendChild(scriptClone);
-                  document.head.removeChild(scriptClone);
-              });
-          }
-      }
-      else {
-          if (debug) {
-              console.log(`[JITSU] insertTags(): cannot insert tags in non-browser environment`);
+  function getGtmState() {
+      return window["__jitsuGtmState"] || "fresh";
+  }
+  function setGtmState(s) {
+      window["__jitsuGtmState"] = s;
+  }
+  function initGtmIfNeeded(config) {
+      return __awaiter$1(this, void 0, void 0, function* () {
+          if (getGtmState() !== "fresh") {
+              return;
           }
-      }
+          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 scriptSrc = `${config.customScriptSrc || defaultScriptSrc}?id=${config.containerId}${dlParam}${previewParams}`;
+          window[dlName] = window[dlName] || [];
+          const gtag = function () {
+              window[dlName].push(arguments);
+          };
+          // @ts-ignore
+          gtag("js", new Date());
+          // @ts-ignore
+          gtag("config", config.containerId);
+          loadScript(scriptSrc)
+              .then(() => {
+              setGtmState("loaded");
+          })
+              .catch(e => {
+              console.warn(`GTM (containerId=${config.containerId}) init failed: ${e.message}`, e);
+              setGtmState("failed");
+          });
+      });
   }
-  function execJs(code, event) {
-      const varName = `jitsu_event_${randomId()}`;
-      window[varName] = event;
-      const iif = `(function(){
-      const event = ${varName};
-      ${code}
-  })()`;
-      try {
-          eval(iif);
+
+  function satisfyFilter(filter, subject) {
+      return filter === "*" || filter.toLowerCase().trim() === (subject || "").trim().toLowerCase();
+  }
+  function satisfyDomainFilter(filter, subject) {
+      if (filter === "*") {
+          return true;
       }
-      catch (e) {
-          console.error(`[JITSU] Error executing JS code: ${e.message}. Code: `, iif);
+      subject = subject || "";
+      if (filter.startsWith("*.")) {
+          return subject.endsWith(filter.substring(1));
       }
-      finally {
-          delete window[varName];
+      else {
+          return filter === subject;
       }
-      return iif;
   }
-  function replaceMacro(code, event) {
-      return code.replace(/{{\s*event\s*}}/g, JSON.stringify(event));
+  function applyFilters(event, creds) {
+      const { hosts = "*", events = "*" } = creds;
+      const eventsArray = events.split("\n");
+      return (!!hosts.split("\n").find(hostFilter => { var _a; return satisfyDomainFilter(hostFilter, (_a = event.context) === null || _a === void 0 ? void 0 : _a.host); }) &&
+          (!!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.type)) ||
+              !!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.event))));
   }
   const internalDestinationPlugins = {
       [tagPlugin.id]: tagPlugin,
+      [gtmPlugin.id]: gtmPlugin,
       [logrocketPlugin.id]: logrocketPlugin,
   };
 
@@ -287,7 +416,7 @@
           step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
   };
-  const config = {
+  const defaultConfig = {
       /* Your segment writeKey */
       writeKey: null,
       /* Disable anonymous MTU */
@@ -594,10 +723,13 @@
           }
       });
   }
+  function looksLikeCuid(id) {
+      return id.length === 25 && id.charAt(0) === "c";
+  }
   function validateWriteKey(writeKey) {
       if (writeKey) {
           const [, secret] = writeKey.split(":", 2);
-          if (!secret) {
+          if (!secret && !looksLikeCuid(writeKey)) {
               throw new Error(`Legacy write key detected - ${writeKey}! This format doesn't work anymore, it should be 'key:secret'. Please download a new key from Jitsu UI`);
           }
       }
@@ -618,7 +750,7 @@
       //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
       // }
       const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
-      const authHeader = config.writeKey ? { "X-Write-Key": validateWriteKey(config.writeKey) } : {};
+      const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": validateWriteKey(jitsuConfig.writeKey) } : {};
       return fetch(url, {
           method: "POST",
           headers: Object.assign(Object.assign({ "Content-Type": "application/json" }, authHeader), debugHeader),
@@ -674,7 +806,7 @@
               persistentStorage.removeItem(key);
           },
       });
-      const instanceConfig = Object.assign(Object.assign({}, config), pluginConfig);
+      const instanceConfig = Object.assign(Object.assign({}, defaultConfig), pluginConfig);
       return {
           name: "jitsu",
           config: instanceConfig,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jitsu/js",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "",
   "author": "Jitsu Dev Team <dev@jitsu.com>",
   "main": "dist/jitsu.cjs.js",
@@ -12,7 +12,7 @@
   "license": "MIT",
   "private": false,
   "devDependencies": {
-    "@playwright/test": "1.30.0",
+    "@playwright/test": "1.31.2",
     "@rollup/plugin-commonjs": "^23.0.2",
     "@rollup/plugin-json": "^5.0.1",
     "@rollup/plugin-multi-entry": "^6.0.0",
@@ -34,7 +34,7 @@
     "rollup": "^3.2.5",
     "ts-jest": "29.0.5",
     "typescript": "^4.9.5",
-    "@jitsu/protocols": "1.1.1"
+    "@jitsu/protocols": "1.1.2"
   },
   "dependencies": {
     "analytics": "^0.8.1"

package/src/analytics-plugin.ts

@@ -8,7 +8,7 @@ import { loadScript } from "./script-loader";
 import { internalDestinationPlugins } from "./destination-plugins";
 import { jitsuLibraryName, jitsuVersion } from "./version";
 
-const config: Required<JitsuOptions> = {
+const defaultConfig: Required<JitsuOptions> = {
   /* Your segment writeKey */
   writeKey: null,
   /* Disable anonymous MTU */
@@ -387,10 +387,14 @@ async function processDestinations(
   }
 }
 
+function looksLikeCuid(id: string) {
+  return id.length === 25 && id.charAt(0) === "c";
+}
+
 function validateWriteKey(writeKey?: string): string | undefined {
   if (writeKey) {
     const [, secret] = writeKey.split(":", 2);
-    if (!secret) {
+    if (!secret && !looksLikeCuid(writeKey)) {
       throw new Error(
         `Legacy write key detected - ${writeKey}! This format doesn't work anymore, it should be 'key:secret'. Please download a new key from Jitsu UI`
       );
@@ -398,7 +402,6 @@ function validateWriteKey(writeKey?: string): string | undefined {
   }
   return writeKey;
 }
-
 function send(
   method,
   payload,
@@ -424,7 +427,9 @@ function send(
   //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
   // }
   const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
-  const authHeader = config.writeKey ? { "X-Write-Key": validateWriteKey(config.writeKey) } : {};
+
+  const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": validateWriteKey(jitsuConfig.writeKey) } : {};
+
   return fetch(url, {
     method: "POST",
     headers: {
@@ -488,7 +493,7 @@ const jitsuAnalyticsPlugin = (pluginConfig: JitsuOptions = {}): AnalyticsPlugin
     },
   });
   const instanceConfig = {
-    ...config,
+    ...defaultConfig,
     ...pluginConfig,
   };
   return {

package/dist/destination-plugins.d.ts

@@ -1,17 +0,0 @@
-import { AnalyticsClientEvent } from "@jitsu/protocols/analytics";
-export type InternalPlugin<T> = {
-    id: string;
-    handle(config: T, payload: AnalyticsClientEvent): Promise<void>;
-};
-export type CommonDestinationCredentials = {
-    hosts?: string[];
-    events?: string[];
-};
-export type TagDestinationCredentials = {
-    code: string;
-} & CommonDestinationCredentials;
-export type LogRocketDestinationCredentials = {
-    appId: string;
-} & CommonDestinationCredentials;
-export type LogRocket = any;
-export declare const internalDestinationPlugins: Record<string, InternalPlugin<any>>;