@jitsu/js 1.1.2 → 1.2.0

package/.turbo/turbo-build.log

@@ -1,6 +1,6 @@
-@jitsu/js:build: cache hit, replaying output 528cebbe5d911d11
+@jitsu/js:build: cache hit, replaying output edacae6711c3e992
 @jitsu/js:build: 
-@jitsu/js:build: > @jitsu/js@0.0.0 build /Users/vklmn/dev2/newjitsu/libs/jitsu-js
+@jitsu/js:build: > @jitsu/js@0.0.0 build /Users/ildarnurislamov/Projects/newjitsu/libs/jitsu-js
 @jitsu/js:build: > tsc -p . && rollup -c && cp compiled/src/*.d.ts dist
 @jitsu/js:build: 
 @jitsu/js:build: 
@@ -20,13 +20,13 @@
 @jitsu/js:build: 2:     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 @jitsu/js:build: 3:     return new (P || (P = Promise))(function (resolve, reject) {
 @jitsu/js:build: ...and 1 other occurrence
-@jitsu/js:build: compiled/src/destination-plugins/logrocket.js
+@jitsu/js:build: compiled/src/destination-plugins/gtm.js
 @jitsu/js:build: 1: var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
 @jitsu/js:build:                     ^
 @jitsu/js:build: 2:     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 @jitsu/js:build: 3:     return new (P || (P = Promise))(function (resolve, reject) {
 @jitsu/js:build: ...and 1 other occurrence
-@jitsu/js:build: compiled/src/destination-plugins/gtm.js
+@jitsu/js:build: compiled/src/destination-plugins/logrocket.js
 @jitsu/js:build: 1: var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
 @jitsu/js:build:                     ^
 @jitsu/js:build: 2:     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -47,7 +47,7 @@
 @jitsu/js:build:             ^
 @jitsu/js:build: 71:     }
 @jitsu/js:build: 72:     catch (e) {
-@jitsu/js:build: created dist/web/p.js.txt in 212ms
+@jitsu/js:build: created dist/web/p.js.txt in 221ms
 @jitsu/js:build: 
 @jitsu/js:build: ./compiled/src/index.js, ./compiled/src/jitsu.js, ./compiled/src/analytics-plugin.js → dist/jitsu.es.js, dist/jitsu.cjs.js...
 @jitsu/js:build: (!) "this" has been rewritten to "undefined"
@@ -59,13 +59,13 @@
 @jitsu/js:build: 3:     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 @jitsu/js:build: 4:     return new (P || (P = Promise))(function (resolve, reject) {
 @jitsu/js:build: ...and 1 other occurrence
-@jitsu/js:build: compiled/src/destination-plugins/tag.js
+@jitsu/js:build: compiled/src/destination-plugins/gtm.js
 @jitsu/js:build: 1: var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
 @jitsu/js:build:                     ^
 @jitsu/js:build: 2:     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 @jitsu/js:build: 3:     return new (P || (P = Promise))(function (resolve, reject) {
 @jitsu/js:build: ...and 1 other occurrence
-@jitsu/js:build: compiled/src/destination-plugins/gtm.js
+@jitsu/js:build: compiled/src/destination-plugins/tag.js
 @jitsu/js:build: 1: var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
 @jitsu/js:build:                     ^
 @jitsu/js:build: 2:     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -92,4 +92,4 @@
 @jitsu/js:build:             ^
 @jitsu/js:build: 71:     }
 @jitsu/js:build: 72:     catch (e) {
-@jitsu/js:build: created dist/jitsu.es.js, dist/jitsu.cjs.js in 139ms
+@jitsu/js:build: created dist/jitsu.es.js, dist/jitsu.cjs.js in 148ms

package/.turbo/turbo-clean.log

@@ -1,5 +1,5 @@
-@jitsu/js:clean: cache hit, replaying output 87482d9c6faf899c
+@jitsu/js:clean: cache hit, replaying output b68b755cf7d79e69
 @jitsu/js:clean: 
-@jitsu/js:clean: > @jitsu/js@0.0.0 clean /Users/vklmn/dev2/newjitsu/libs/jitsu-js
+@jitsu/js:clean: > @jitsu/js@0.0.0 clean /Users/ildarnurislamov/Projects/newjitsu/libs/jitsu-js
 @jitsu/js:clean: > rm -rf ./dist
 @jitsu/js:clean: 

package/dist/jitsu.cjs.js

@@ -391,10 +391,17 @@ function satisfyDomainFilter(filter, subject) {
 }
 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))));
+    try {
+        const eventsArray = Array.isArray(events) ? events : events.split("\n");
+        const hostsArray = Array.isArray(hosts) ? hosts : hosts.split("\n");
+        return (!!hostsArray.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))));
+    }
+    catch (e) {
+        console.warn(`Failed to apply filters: ${e.message}. Typeof events: ${typeof events}, typeof hosts: ${typeof hosts}. Values`, events, hosts);
+        throw new Error(`Failed to apply filters: ${e.message}. Typeof events: ${typeof events}, typeof hosts: ${typeof hosts}`);
+    }
 }
 const internalDestinationPlugins = {
     [tagPlugin.id]: tagPlugin,
@@ -506,7 +513,7 @@ const defaultCookie2Key = {
 const cookieStorage = (cookieDomain, key2cookie) => {
     return {
         setItem(key, val) {
-            const strVal = typeof val === "object" && val !== null ? JSON.stringify(val) : val;
+            const strVal = typeof val === "object" && val !== null ? encodeURIComponent(JSON.stringify(val)) : val;
             const cookieName = key2cookie[key] || key;
             setCookie(cookieName, strVal, {
                 domain: cookieDomain,
@@ -661,7 +668,7 @@ function adjustPayload(payload, config, storage) {
         },
         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: validateWriteKey(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: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
     return withContext;
@@ -734,6 +741,18 @@ function validateWriteKey(writeKey) {
     }
     return writeKey;
 }
+function maskWriteKey(writeKey) {
+    if (writeKey) {
+        const [id, secret] = writeKey.split(":", 2);
+        if (secret) {
+            return `${id}:***`;
+        }
+        else {
+            return id;
+        }
+    }
+    return writeKey;
+}
 function send(method, payload, jitsuConfig, instance, store) {
     if (jitsuConfig.echoEvents) {
         console.log(`[JITSU] sending '${method}' event:`, payload);
@@ -749,7 +768,7 @@ function send(method, payload, jitsuConfig, instance, store) {
     //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
     // }
     const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
-    const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": validateWriteKey(jitsuConfig.writeKey) } : {};
+    const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": jitsuConfig.writeKey } : {};
     return fetch(url, {
         method: "POST",
         headers: Object.assign(Object.assign({ "Content-Type": "application/json" }, authHeader), debugHeader),
@@ -817,6 +836,7 @@ const jitsuAnalyticsPlugin = (pluginConfig = {}) => {
             if (!config.host && !config.echoEvents) {
                 throw new Error("Please specify host variable in jitsu plugin initialization, or set echoEvents to true");
             }
+            validateWriteKey(config.writeKey);
         },
         page: args => {
             const { payload, config, instance } = args;

package/dist/jitsu.es.js

@@ -389,10 +389,17 @@ function satisfyDomainFilter(filter, subject) {
 }
 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))));
+    try {
+        const eventsArray = Array.isArray(events) ? events : events.split("\n");
+        const hostsArray = Array.isArray(hosts) ? hosts : hosts.split("\n");
+        return (!!hostsArray.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))));
+    }
+    catch (e) {
+        console.warn(`Failed to apply filters: ${e.message}. Typeof events: ${typeof events}, typeof hosts: ${typeof hosts}. Values`, events, hosts);
+        throw new Error(`Failed to apply filters: ${e.message}. Typeof events: ${typeof events}, typeof hosts: ${typeof hosts}`);
+    }
 }
 const internalDestinationPlugins = {
     [tagPlugin.id]: tagPlugin,
@@ -504,7 +511,7 @@ const defaultCookie2Key = {
 const cookieStorage = (cookieDomain, key2cookie) => {
     return {
         setItem(key, val) {
-            const strVal = typeof val === "object" && val !== null ? JSON.stringify(val) : val;
+            const strVal = typeof val === "object" && val !== null ? encodeURIComponent(JSON.stringify(val)) : val;
             const cookieName = key2cookie[key] || key;
             setCookie(cookieName, strVal, {
                 domain: cookieDomain,
@@ -659,7 +666,7 @@ function adjustPayload(payload, config, storage) {
         },
         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: validateWriteKey(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: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
     return withContext;
@@ -732,6 +739,18 @@ function validateWriteKey(writeKey) {
     }
     return writeKey;
 }
+function maskWriteKey(writeKey) {
+    if (writeKey) {
+        const [id, secret] = writeKey.split(":", 2);
+        if (secret) {
+            return `${id}:***`;
+        }
+        else {
+            return id;
+        }
+    }
+    return writeKey;
+}
 function send(method, payload, jitsuConfig, instance, store) {
     if (jitsuConfig.echoEvents) {
         console.log(`[JITSU] sending '${method}' event:`, payload);
@@ -747,7 +766,7 @@ function send(method, payload, jitsuConfig, instance, store) {
     //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
     // }
     const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
-    const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": validateWriteKey(jitsuConfig.writeKey) } : {};
+    const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": jitsuConfig.writeKey } : {};
     return fetch(url, {
         method: "POST",
         headers: Object.assign(Object.assign({ "Content-Type": "application/json" }, authHeader), debugHeader),
@@ -815,6 +834,7 @@ const jitsuAnalyticsPlugin = (pluginConfig = {}) => {
             if (!config.host && !config.echoEvents) {
                 throw new Error("Please specify host variable in jitsu plugin initialization, or set echoEvents to true");
             }
+            validateWriteKey(config.writeKey);
         },
         page: args => {
             const { payload, config, instance } = args;

package/dist/web/p.js.txt

@@ -392,10 +392,17 @@
   }
   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))));
+      try {
+          const eventsArray = Array.isArray(events) ? events : events.split("\n");
+          const hostsArray = Array.isArray(hosts) ? hosts : hosts.split("\n");
+          return (!!hostsArray.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))));
+      }
+      catch (e) {
+          console.warn(`Failed to apply filters: ${e.message}. Typeof events: ${typeof events}, typeof hosts: ${typeof hosts}. Values`, events, hosts);
+          throw new Error(`Failed to apply filters: ${e.message}. Typeof events: ${typeof events}, typeof hosts: ${typeof hosts}`);
+      }
   }
   const internalDestinationPlugins = {
       [tagPlugin.id]: tagPlugin,
@@ -507,7 +514,7 @@
   const cookieStorage = (cookieDomain, key2cookie) => {
       return {
           setItem(key, val) {
-              const strVal = typeof val === "object" && val !== null ? JSON.stringify(val) : val;
+              const strVal = typeof val === "object" && val !== null ? encodeURIComponent(JSON.stringify(val)) : val;
               const cookieName = key2cookie[key] || key;
               setCookie(cookieName, strVal, {
                   domain: cookieDomain,
@@ -662,7 +669,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: validateWriteKey(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: maskWriteKey(config.writeKey), context: deepMerge(context, customContext) });
       delete withContext.meta;
       delete withContext.options;
       return withContext;
@@ -735,6 +742,18 @@
       }
       return writeKey;
   }
+  function maskWriteKey(writeKey) {
+      if (writeKey) {
+          const [id, secret] = writeKey.split(":", 2);
+          if (secret) {
+              return `${id}:***`;
+          }
+          else {
+              return id;
+          }
+      }
+      return writeKey;
+  }
   function send(method, payload, jitsuConfig, instance, store) {
       if (jitsuConfig.echoEvents) {
           console.log(`[JITSU] sending '${method}' event:`, payload);
@@ -750,7 +769,7 @@
       //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
       // }
       const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
-      const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": validateWriteKey(jitsuConfig.writeKey) } : {};
+      const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": jitsuConfig.writeKey } : {};
       return fetch(url, {
           method: "POST",
           headers: Object.assign(Object.assign({ "Content-Type": "application/json" }, authHeader), debugHeader),
@@ -818,6 +837,7 @@
               if (!config.host && !config.echoEvents) {
                   throw new Error("Please specify host variable in jitsu plugin initialization, or set echoEvents to true");
               }
+              validateWriteKey(config.writeKey);
           },
           page: args => {
               const { payload, config, instance } = args;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jitsu/js",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "",
   "author": "Jitsu Dev Team <dev@jitsu.com>",
   "main": "dist/jitsu.cjs.js",
@@ -34,7 +34,7 @@
     "rollup": "^3.2.5",
     "ts-jest": "29.0.5",
     "typescript": "^4.9.5",
-    "@jitsu/protocols": "1.1.2"
+    "@jitsu/protocols": "1.2.0"
   },
   "dependencies": {
     "analytics": "^0.8.1"

package/src/analytics-plugin.ts

@@ -116,7 +116,7 @@ const defaultCookie2Key = {
 const cookieStorage: StorageFactory = (cookieDomain, key2cookie) => {
   return {
     setItem(key: string, val: any) {
-      const strVal = typeof val === "object" && val !== null ? JSON.stringify(val) : val;
+      const strVal = typeof val === "object" && val !== null ? encodeURIComponent(JSON.stringify(val)) : val;
       const cookieName = key2cookie[key] || key;
       setCookie(cookieName, strVal, {
         domain: cookieDomain,
@@ -282,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: validateWriteKey(config.writeKey),
+    writeKey: maskWriteKey(config.writeKey),
     context: deepMerge(context, customContext),
   };
   delete withContext.meta;
@@ -402,6 +402,19 @@ function validateWriteKey(writeKey?: string): string | undefined {
   }
   return writeKey;
 }
+
+function maskWriteKey(writeKey?: string): string | undefined {
+  if (writeKey) {
+    const [id, secret] = writeKey.split(":", 2);
+    if (secret) {
+      return `${id}:***`;
+    } else {
+      return id;
+    }
+  }
+  return writeKey;
+}
+
 function send(
   method,
   payload,
@@ -428,7 +441,7 @@ function send(
   // }
   const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
 
-  const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": validateWriteKey(jitsuConfig.writeKey) } : {};
+  const authHeader = jitsuConfig.writeKey ? { "X-Write-Key": jitsuConfig.writeKey } : {};
 
   return fetch(url, {
     method: "POST",
@@ -507,6 +520,7 @@ const jitsuAnalyticsPlugin = (pluginConfig: JitsuOptions = {}): AnalyticsPlugin
       if (!config.host && !config.echoEvents) {
         throw new Error("Please specify host variable in jitsu plugin initialization, or set echoEvents to true");
       }
+      validateWriteKey(config.writeKey);
     },
     page: args => {
       const { payload, config, instance } = args;

package/src/destination-plugins/index.ts

@@ -32,12 +32,24 @@ export function satisfyDomainFilter(filter: string, subject: string | undefined)
 
 export function applyFilters(event: AnalyticsClientEvent, creds: CommonDestinationCredentials): boolean {
   const { hosts = "*", events = "*" } = creds;
-  const eventsArray = events.split("\n");
-  return (
-    !!hosts.split("\n").find(hostFilter => satisfyDomainFilter(hostFilter, event.context?.host)) &&
-    (!!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.type)) ||
-      !!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.event)))
-  );
+  try {
+    const eventsArray = Array.isArray(events) ? events : events.split("\n");
+    const hostsArray = Array.isArray(hosts) ? hosts : hosts.split("\n");
+    return (
+      !!hostsArray.find(hostFilter => satisfyDomainFilter(hostFilter, event.context?.host)) &&
+      (!!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.type)) ||
+        !!eventsArray.find(eventFilter => satisfyFilter(eventFilter, event.event)))
+    );
+  } catch (e) {
+    console.warn(
+      `Failed to apply filters: ${e.message}. Typeof events: ${typeof events}, typeof hosts: ${typeof hosts}. Values`,
+      events,
+      hosts
+    );
+    throw new Error(
+      `Failed to apply filters: ${e.message}. Typeof events: ${typeof events}, typeof hosts: ${typeof hosts}`
+    );
+  }
 }
 
 export const internalDestinationPlugins: Record<string, InternalPlugin<any>> = {