@jitsu/js 1.1.0-canary.391.20230523080206 → 1.1.0-canary.404.20230526224724

package/dist/web/p.js.txt

@@ -111,7 +111,7 @@
       });
   }
 
-  var __awaiter$3 = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+  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); } }
@@ -120,10 +120,18 @@
           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$3(this, void 0, void 0, function* () {
+          return __awaiter$1(this, void 0, void 0, function* () {
               if (!applyFilters(payload, config)) {
                   return;
               }
@@ -131,96 +139,6 @@
           });
       },
   };
-  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";
   }
@@ -246,7 +164,7 @@
       }
   }
   function initLogrocketIfNeeded(appId) {
-      return __awaiter$2(this, void 0, void 0, function* () {
+      return __awaiter$1(this, void 0, void 0, function* () {
           if (getLogRocketState() !== "fresh") {
               return;
           }
@@ -271,126 +189,94 @@
           });
       });
   }
-
-  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",
+  const logrocketPlugin = {
+      id: "logrocket",
       handle(config, payload) {
-          var _a, _b;
           return __awaiter$1(this, void 0, void 0, function* () {
               if (!applyFilters(payload, config)) {
                   return;
               }
-              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;
+              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 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;
+  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);
           }
-          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");
-          });
-      });
+          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 satisfyFilter(filter, subject) {
-      return filter === "*" || filter.toLowerCase().trim() === (subject || "").trim().toLowerCase();
+  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 applyFilters(event, creds) {
-      const { hosts = "*", events = "*" } = creds;
-      const eventsArray = events.split("\n");
-      return (!!hosts.split("\n").find(hostFilter => { var _a; return satisfyFilter(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))));
+  function replaceMacro(code, event) {
+      return code.replace(/{{\s*event\s*}}/g, JSON.stringify(event));
   }
   const internalDestinationPlugins = {
       [tagPlugin.id]: tagPlugin,
-      [gtmPlugin.id]: gtmPlugin,
       [logrocketPlugin.id]: logrocketPlugin,
   };
 
+  var name = "@jitsu/js";
+  var version = "0.0.0";
+
   /* global analytics */
   var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
       function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -628,8 +514,8 @@
       const referrer = runtime.referrer();
       const context = {
           library: {
-              name: "jitsu-js",
-              version: "1.0.0",
+              name: name,
+              version: version,
           },
           userAgent: runtime.userAgent(),
           locale: runtime.language(),
@@ -647,7 +533,7 @@
           },
           campaign: parseUtms(query),
       };
-      const withContext = Object.assign(Object.assign({}, payload), { timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: config.writeKey, context: deepMerge(context, customContext) });
+      const withContext = Object.assign(Object.assign({}, payload), { timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)), writeKey: validateWriteKey(config.writeKey), context: deepMerge(context, customContext) });
       delete withContext.meta;
       delete withContext.options;
       return withContext;
@@ -661,7 +547,6 @@
                   const plugin = internalDestinationPlugins[destination.deviceOptions.name];
                   if (plugin) {
                       try {
-                          //to support old versions, where credentials were stored in root
                           promises.push(plugin.handle(credentials, event));
                       }
                       catch (e) {
@@ -709,6 +594,15 @@
           }
       });
   }
+  function validateWriteKey(writeKey) {
+      if (writeKey) {
+          const [, secret] = writeKey.split(":", 2);
+          if (!secret) {
+              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`);
+          }
+      }
+      return writeKey;
+  }
   function send(method, payload, jitsuConfig, instance, store) {
       if (jitsuConfig.echoEvents) {
           console.log(`[JITSU] sending '${method}' event:`, payload);
@@ -724,7 +618,7 @@
       //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
       // }
       const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
-      const authHeader = adjustedPayload.writeKey ? { "X-Write-Key": adjustedPayload.writeKey } : {};
+      const authHeader = config.writeKey ? { "X-Write-Key": validateWriteKey(config.writeKey) } : {};
       return fetch(url, {
           method: "POST",
           headers: Object.assign(Object.assign({ "Content-Type": "application/json" }, authHeader), debugHeader),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jitsu/js",
-  "version": "1.1.0-canary.391.20230523080206",
+  "version": "1.1.0-canary.404.20230526224724",
   "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.31.2",
+    "@playwright/test": "1.30.0",
     "@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.0-canary.391.20230523080206"
+    "@jitsu/protocols": "1.1.0-canary.404.20230526224724"
   },
   "dependencies": {
     "analytics": "^0.8.1"

package/src/analytics-plugin.ts

@@ -6,6 +6,7 @@ import parse from "./index";
 import { AnalyticsInstance, AnalyticsPlugin } from "analytics";
 import { loadScript } from "./script-loader";
 import { internalDestinationPlugins } from "./destination-plugins";
+import { jitsuLibraryName, jitsuVersion } from "./version";
 
 const config: Required<JitsuOptions> = {
   /* Your segment writeKey */
@@ -257,8 +258,8 @@ function adjustPayload(payload: any, config: JitsuOptions, storage: PersistentSt
   const referrer = runtime.referrer();
   const context = {
     library: {
-      name: "jitsu-js",
-      version: "1.0.0",
+      name: jitsuLibraryName,
+      version: jitsuVersion,
     },
     userAgent: runtime.userAgent(),
     locale: runtime.language(),
@@ -281,7 +282,7 @@ function adjustPayload(payload: any, config: JitsuOptions, storage: PersistentSt
     timestamp: new Date().toISOString(),
     sentAt: new Date().toISOString(),
     messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)),
-    writeKey: config.writeKey,
+    writeKey: validateWriteKey(config.writeKey),
     context: deepMerge(context, customContext),
   };
   delete withContext.meta;
@@ -386,6 +387,18 @@ async function processDestinations(
   }
 }
 
+function validateWriteKey(writeKey?: string): string | undefined {
+  if (writeKey) {
+    const [, secret] = writeKey.split(":", 2);
+    if (!secret) {
+      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`
+      );
+    }
+  }
+  return writeKey;
+}
+
 function send(
   method,
   payload,
@@ -411,7 +424,7 @@ function send(
   //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
   // }
   const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
-  const authHeader = adjustedPayload.writeKey ? { "X-Write-Key": adjustedPayload.writeKey } : {};
+  const authHeader = config.writeKey ? { "X-Write-Key": validateWriteKey(config.writeKey) } : {};
   return fetch(url, {
     method: "POST",
     headers: {

package/src/destination-plugins/index.ts

@@ -17,11 +17,24 @@ export function satisfyFilter(filter: string, subject: string | undefined): bool
   return filter === "*" || filter.toLowerCase().trim() === (subject || "").trim().toLowerCase();
 }
 
+export function satisfyDomainFilter(filter: string, subject: string | undefined): boolean {
+  if (filter === "*") {
+    return true;
+  }
+  subject = subject || "";
+
+  if (filter.startsWith("*.")) {
+    return subject.endsWith(filter.substring(1));
+  } else {
+    return filter === subject;
+  }
+}
+
 export function applyFilters(event: AnalyticsClientEvent, creds: CommonDestinationCredentials): boolean {
   const { hosts = "*", events = "*" } = creds;
   const eventsArray = events.split("\n");
   return (
-    !!hosts.split("\n").find(hostFilter => satisfyFilter(hostFilter, event.context?.host)) &&
+    !!hosts.split("\n").find(hostFilter => satisfyDomainFilter(hostFilter, event.context?.host)) &&
     (!!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.type)) ||
       !!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.event)))
   );

package/src/version.ts

@@ -0,0 +1,3 @@
+import { name as jitsuLibraryName, version as jitsuVersion } from "../package.json";
+
+export { jitsuVersion, jitsuLibraryName };

package/tsconfig.json

@@ -5,6 +5,7 @@
     "declaration": true,
     "esModuleInterop": true,
     "moduleResolution": "Node",
+    "resolveJsonModule": true,
     "target": "ES2015",
     "lib": ["es2017", "dom"],
     //this makes typescript igore @types/node during compilation

package/.pnpm-debug.log

@@ -1,23 +0,0 @@
-{
-  "0 debug pnpm:scope": {
-    "selected": 1,
-    "workspacePrefix": "/Users/ildarnurislamov/Projects/onetag"
-  },
-  "1 error pnpm": {
-    "code": "ELIFECYCLE",
-    "errno": "ENOENT",
-    "syscall": "spawn",
-    "file": "sh",
-    "pkgid": "@jitsu/js@0.0.0",
-    "stage": "build",
-    "script": "tsc -p . && rollup -c && cp src/jitsu.d.ts dist",
-    "pkgname": "@jitsu/js",
-    "err": {
-      "name": "pnpm",
-      "message": "@jitsu/js@0.0.0 build: `tsc -p . && rollup -c && cp src/jitsu.d.ts dist`\nspawn ENOENT",
-      "code": "ELIFECYCLE",
-      "stack": "pnpm: @jitsu/js@0.0.0 build: `tsc -p . && rollup -c && cp src/jitsu.d.ts dist`\nspawn ENOENT\n    at ChildProcess.<anonymous> (/opt/homebrew/lib/node_modules/pnpm/dist/pnpm.cjs:93535:22)\n    at ChildProcess.emit (node:events:527:28)\n    at maybeClose (node:internal/child_process:1092:16)\n    at Process.ChildProcess._handle.onexit (node:internal/child_process:302:5)"
-    }
-  },
-  "2 warn pnpm:global": " Local package.json exists, but node_modules missing, did you mean to install?"
-}