@jitsu/js 0.0.1-alpha.136 → 0.0.1-alpha.183

package/.turbo/turbo-build.log

@@ -1,15 +1,33 @@
-@jitsu/js:build: cache hit, replaying output 28c829c71eac02d2
-@jitsu/js:build: 
-@jitsu/js:build: > @jitsu/js@0.0.0 build /Users/ildarnurislamov/Projects/onetag/libs/jitsu-js
-@jitsu/js:build: > tsc -p . && rollup -c && cp compiled/src/*.d.ts dist
-@jitsu/js:build: 
-@jitsu/js:build: 
-@jitsu/js:build: ./compiled/src/browser.js → dist/web/p.js.txt...
-@jitsu/js:build: (!) Circular dependency
-@jitsu/js:build: compiled/src/index.js -> compiled/src/analytics-plugin.js -> compiled/src/index.js
-@jitsu/js:build: created dist/web/p.js.txt in 321ms
-@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: (!) Circular dependency
-@jitsu/js:build: compiled/src/index.js -> compiled/src/analytics-plugin.js -> compiled/src/index.js
-@jitsu/js:build: created dist/jitsu.es.js, dist/jitsu.cjs.js in 169ms
+@jitsu/js:build: cache hit, replaying output 8244893c54c61c31
+@jitsu/js:build: 
+@jitsu/js:build: > @jitsu/js@0.0.0 build /Users/ildarnurislamov/Projects/onetag/libs/jitsu-js
+@jitsu/js:build: > tsc -p . && rollup -c && cp compiled/src/*.d.ts dist
+@jitsu/js:build: 
+@jitsu/js:build: 
+@jitsu/js:build: ./compiled/src/browser.js → dist/web/p.js.txt...
+@jitsu/js:build: (!) Circular dependency
+@jitsu/js:build: compiled/src/index.js -> compiled/src/analytics-plugin.js -> compiled/src/index.js
+@jitsu/js:build: (!) Use of eval is strongly discouraged
+@jitsu/js:build: https://rollupjs.org/guide/en/#avoiding-eval
+@jitsu/js:build: compiled/src/analytics-plugin.js
+@jitsu/js:build: 258:   })()`;
+@jitsu/js:build: 259:     try {
+@jitsu/js:build: 260:         eval(iif);
+@jitsu/js:build:              ^
+@jitsu/js:build: 261:     }
+@jitsu/js:build: 262:     catch (e) {
+@jitsu/js:build: created dist/web/p.js.txt in 214ms
+@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: (!) Circular dependency
+@jitsu/js:build: compiled/src/index.js -> compiled/src/analytics-plugin.js -> compiled/src/index.js
+@jitsu/js:build: (!) Use of eval is strongly discouraged
+@jitsu/js:build: https://rollupjs.org/guide/en/#avoiding-eval
+@jitsu/js:build: compiled/src/analytics-plugin.js
+@jitsu/js:build: 258:   })()`;
+@jitsu/js:build: 259:     try {
+@jitsu/js:build: 260:         eval(iif);
+@jitsu/js:build:              ^
+@jitsu/js:build: 261:     }
+@jitsu/js:build: 262:     catch (e) {
+@jitsu/js:build: created dist/jitsu.es.js, dist/jitsu.cjs.js in 145ms

package/.turbo/turbo-clean.log

@@ -1,5 +1,5 @@
-@jitsu/js:clean: cache hit, replaying output 4b09f8b5fadef595
-@jitsu/js:clean: 
-@jitsu/js:clean: > @jitsu/js@0.0.0 clean /Users/ildarnurislamov/Projects/onetag/libs/jitsu-js
-@jitsu/js:clean: > rm -rf ./dist
-@jitsu/js:clean: 
+@jitsu/js:clean: cache hit, replaying output e08f10d98a117543
+@jitsu/js:clean: 
+@jitsu/js:clean: > @jitsu/js@0.0.0 clean /Users/ildarnurislamov/Projects/onetag/libs/jitsu-js
+@jitsu/js:clean: > rm -rf ./dist
+@jitsu/js:clean: 

package/__tests__/simple-syrup.ts

@@ -90,9 +90,15 @@ function generateX509Certificate(altNames: { type: number; value: string }[]) {
 
 function shutdownFunction(server): Promise<void> {
   return new Promise<void>(resolve => {
-    server.close(() => {
-      resolve();
-    });
+    let resolved = false;
+    const resolveIfNeeded = () => {
+      if (!resolved) {
+        resolved = true;
+        resolve();
+      }
+    };
+    setTimeout(resolveIfNeeded, 5000);
+    server.close(resolveIfNeeded);
   });
 }
 

package/dist/jitsu.cjs.js

@@ -317,6 +317,61 @@ function adjustPayload(payload, config, storage) {
     delete withContext.options;
     return withContext;
 }
+function execJs(code, event) {
+    const varName = `jitsu_event_${randomId()}`;
+    window[varName] = event;
+    const iif = `(function(){
+      ${code}
+      onEvent(${varName});
+  })()`;
+    try {
+        eval(iif);
+    }
+    catch (e) {
+        console.error(`[JITSU] Error executing JS code: ${e.message}`);
+    }
+    finally {
+        delete window[varName];
+    }
+    return iif;
+}
+function replaceMacro(code, event) {
+    return code.replace(/{{\s*event\s*}}/g, JSON.stringify(event));
+}
+function insertTags(tags, event, opts = {}) {
+    const debug = opts.debug || false;
+    if (isInBrowser()) {
+        Object.values(tags).forEach(tag => {
+            if (tag.mode === "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(`Executing script${script.hasAttribute("src") ? ` ${script.src}` : ""}`, scriptClone.text);
+                    }
+                    document.head.appendChild(scriptClone);
+                    document.head.removeChild(scriptClone);
+                });
+            }
+        });
+    }
+    else {
+        if (debug) {
+            console.log(`insertTags: cannot insert tags in non-browser environment`);
+        }
+    }
+}
 function send(method, payload, jitsuConfig, store) {
     if (jitsuConfig.echoEvents) {
         console.log(`[JITSU] sending '${method}' event:`, payload);
@@ -329,9 +384,9 @@ function send(method, payload, jitsuConfig, store) {
     }
     const authHeader = {};
     const debugHeader = jitsuConfig.debug ? { "X-Enable-Debug": "true" } : {};
-    if (jitsuConfig.debug) {
-        console.log(`Sending jitsu event to ${url}: `, JSON.stringify(payload, null, 2));
-    }
+    // if (jitsuConfig.debug) {
+    //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
+    // }
     const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
     return fetch(url, {
         method: "POST",
@@ -340,7 +395,27 @@ function send(method, payload, jitsuConfig, store) {
     })
         .then(res => {
         if (jitsuConfig.debug) {
-            console.debug(`Jitsu ${url} replied ${res.status}. Original payload: `, JSON.stringify(adjustedPayload, null, 2));
+            console.log(`[JITSU] ${url} replied ${res.status}. Original payload: `, JSON.stringify(adjustedPayload, null, 2));
+        }
+        if (res.ok) {
+            return res.text();
+        }
+        else {
+            return Promise.reject(res.text());
+        }
+    })
+        .then(responseText => {
+        try {
+            const response = JSON.parse(responseText);
+            if (response.tags) {
+                if (jitsuConfig.debug) {
+                    console.log(`[JITSU] Response Tags: `, JSON.stringify(response.tags, null, 2));
+                }
+                insertTags(response.tags, payload, { debug: jitsuConfig.debug });
+            }
+        }
+        catch (e) {
+            return Promise.reject(`Can't parse JSON: ${responseText}: ${e === null || e === void 0 ? void 0 : e.message}`);
         }
     })
         .catch(err => {

package/dist/jitsu.es.js

@@ -315,6 +315,61 @@ function adjustPayload(payload, config, storage) {
     delete withContext.options;
     return withContext;
 }
+function execJs(code, event) {
+    const varName = `jitsu_event_${randomId()}`;
+    window[varName] = event;
+    const iif = `(function(){
+      ${code}
+      onEvent(${varName});
+  })()`;
+    try {
+        eval(iif);
+    }
+    catch (e) {
+        console.error(`[JITSU] Error executing JS code: ${e.message}`);
+    }
+    finally {
+        delete window[varName];
+    }
+    return iif;
+}
+function replaceMacro(code, event) {
+    return code.replace(/{{\s*event\s*}}/g, JSON.stringify(event));
+}
+function insertTags(tags, event, opts = {}) {
+    const debug = opts.debug || false;
+    if (isInBrowser()) {
+        Object.values(tags).forEach(tag => {
+            if (tag.mode === "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(`Executing script${script.hasAttribute("src") ? ` ${script.src}` : ""}`, scriptClone.text);
+                    }
+                    document.head.appendChild(scriptClone);
+                    document.head.removeChild(scriptClone);
+                });
+            }
+        });
+    }
+    else {
+        if (debug) {
+            console.log(`insertTags: cannot insert tags in non-browser environment`);
+        }
+    }
+}
 function send(method, payload, jitsuConfig, store) {
     if (jitsuConfig.echoEvents) {
         console.log(`[JITSU] sending '${method}' event:`, payload);
@@ -327,9 +382,9 @@ function send(method, payload, jitsuConfig, store) {
     }
     const authHeader = {};
     const debugHeader = jitsuConfig.debug ? { "X-Enable-Debug": "true" } : {};
-    if (jitsuConfig.debug) {
-        console.log(`Sending jitsu event to ${url}: `, JSON.stringify(payload, null, 2));
-    }
+    // if (jitsuConfig.debug) {
+    //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
+    // }
     const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
     return fetch(url, {
         method: "POST",
@@ -338,7 +393,27 @@ function send(method, payload, jitsuConfig, store) {
     })
         .then(res => {
         if (jitsuConfig.debug) {
-            console.debug(`Jitsu ${url} replied ${res.status}. Original payload: `, JSON.stringify(adjustedPayload, null, 2));
+            console.log(`[JITSU] ${url} replied ${res.status}. Original payload: `, JSON.stringify(adjustedPayload, null, 2));
+        }
+        if (res.ok) {
+            return res.text();
+        }
+        else {
+            return Promise.reject(res.text());
+        }
+    })
+        .then(responseText => {
+        try {
+            const response = JSON.parse(responseText);
+            if (response.tags) {
+                if (jitsuConfig.debug) {
+                    console.log(`[JITSU] Response Tags: `, JSON.stringify(response.tags, null, 2));
+                }
+                insertTags(response.tags, payload, { debug: jitsuConfig.debug });
+            }
+        }
+        catch (e) {
+            return Promise.reject(`Can't parse JSON: ${responseText}: ${e === null || e === void 0 ? void 0 : e.message}`);
         }
     })
         .catch(err => {

package/dist/web/p.js.txt

@@ -318,6 +318,61 @@
       delete withContext.options;
       return withContext;
   }
+  function execJs(code, event) {
+      const varName = `jitsu_event_${randomId()}`;
+      window[varName] = event;
+      const iif = `(function(){
+      ${code}
+      onEvent(${varName});
+  })()`;
+      try {
+          eval(iif);
+      }
+      catch (e) {
+          console.error(`[JITSU] Error executing JS code: ${e.message}`);
+      }
+      finally {
+          delete window[varName];
+      }
+      return iif;
+  }
+  function replaceMacro(code, event) {
+      return code.replace(/{{\s*event\s*}}/g, JSON.stringify(event));
+  }
+  function insertTags(tags, event, opts = {}) {
+      const debug = opts.debug || false;
+      if (isInBrowser()) {
+          Object.values(tags).forEach(tag => {
+              if (tag.mode === "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(`Executing script${script.hasAttribute("src") ? ` ${script.src}` : ""}`, scriptClone.text);
+                      }
+                      document.head.appendChild(scriptClone);
+                      document.head.removeChild(scriptClone);
+                  });
+              }
+          });
+      }
+      else {
+          if (debug) {
+              console.log(`insertTags: cannot insert tags in non-browser environment`);
+          }
+      }
+  }
   function send(method, payload, jitsuConfig, store) {
       if (jitsuConfig.echoEvents) {
           console.log(`[JITSU] sending '${method}' event:`, payload);
@@ -330,9 +385,9 @@
       }
       const authHeader = {};
       const debugHeader = jitsuConfig.debug ? { "X-Enable-Debug": "true" } : {};
-      if (jitsuConfig.debug) {
-          console.log(`Sending jitsu event to ${url}: `, JSON.stringify(payload, null, 2));
-      }
+      // if (jitsuConfig.debug) {
+      //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
+      // }
       const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
       return fetch(url, {
           method: "POST",
@@ -341,7 +396,27 @@
       })
           .then(res => {
           if (jitsuConfig.debug) {
-              console.debug(`Jitsu ${url} replied ${res.status}. Original payload: `, JSON.stringify(adjustedPayload, null, 2));
+              console.log(`[JITSU] ${url} replied ${res.status}. Original payload: `, JSON.stringify(adjustedPayload, null, 2));
+          }
+          if (res.ok) {
+              return res.text();
+          }
+          else {
+              return Promise.reject(res.text());
+          }
+      })
+          .then(responseText => {
+          try {
+              const response = JSON.parse(responseText);
+              if (response.tags) {
+                  if (jitsuConfig.debug) {
+                      console.log(`[JITSU] Response Tags: `, JSON.stringify(response.tags, null, 2));
+                  }
+                  insertTags(response.tags, payload, { debug: jitsuConfig.debug });
+              }
+          }
+          catch (e) {
+              return Promise.reject(`Can't parse JSON: ${responseText}: ${e === null || e === void 0 ? void 0 : e.message}`);
           }
       })
           .catch(err => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jitsu/js",
-  "version": "0.0.1-alpha.136",
+  "version": "0.0.1-alpha.183",
   "description": "",
   "author": "Jitsu Dev Team <dev@jitsu.com>",
   "main": "dist/jitsu.cjs.js",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "analytics": "^0.8.1",
-    "@jitsu/protocols": "0.0.1-alpha.136"
+    "@jitsu/protocols": "0.0.1-alpha.183"
   },
   "scripts": {
     "clean": "rm -rf ./dist",

package/src/analytics-plugin.ts

@@ -285,6 +285,64 @@ function adjustPayload(payload: any, config: JitsuOptions, storage: PersistentSt
   return withContext;
 }
 
+function execJs(code: string, event: any) {
+  const varName = `jitsu_event_${randomId()}`;
+  window[varName] = event;
+  const iif = `(function(){
+      ${code}
+      onEvent(${varName});
+  })()`;
+  try {
+    eval(iif);
+  } catch (e) {
+    console.error(`[JITSU] Error executing JS code: ${e.message}`);
+  } finally {
+    delete window[varName];
+  }
+  return iif;
+}
+
+function replaceMacro(code, event) {
+  return code.replace(/{{\s*event\s*}}/g, JSON.stringify(event));
+}
+
+function insertTags(
+  tags: Record<string, { mode: "javascript" | "html"; code }>,
+  event: any,
+  opts: { debug?: boolean } = {}
+) {
+  const debug = opts.debug || false;
+  if (isInBrowser()) {
+    Object.values(tags).forEach(tag => {
+      if (tag.mode === "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(`Executing script${script.hasAttribute("src") ? ` ${script.src}` : ""}`, scriptClone.text);
+          }
+          document.head.appendChild(scriptClone);
+          document.head.removeChild(scriptClone);
+        });
+      }
+    });
+  } else {
+    if (debug) {
+      console.log(`insertTags: cannot insert tags in non-browser environment`);
+    }
+  }
+}
+
 function send(method, payload, jitsuConfig: Required<JitsuOptions>, store: PersistentStorage): Promise<void> {
   if (jitsuConfig.echoEvents) {
     console.log(`[JITSU] sending '${method}' event:`, payload);
@@ -301,9 +359,9 @@ function send(method, payload, jitsuConfig: Required<JitsuOptions>, store: Persi
   const authHeader = {};
   const debugHeader = jitsuConfig.debug ? { "X-Enable-Debug": "true" } : {};
 
-  if (jitsuConfig.debug) {
-    console.log(`Sending jitsu event to ${url}: `, JSON.stringify(payload, null, 2));
-  }
+  // if (jitsuConfig.debug) {
+  //   console.log(`[JITSU] Sending event to ${url}: `, JSON.stringify(payload, null, 2));
+  // }
   const adjustedPayload = adjustPayload(payload, jitsuConfig, store);
   return fetch(url, {
     method: "POST",
@@ -317,11 +375,29 @@ function send(method, payload, jitsuConfig: Required<JitsuOptions>, store: Persi
   })
     .then(res => {
       if (jitsuConfig.debug) {
-        console.debug(
-          `Jitsu ${url} replied ${res.status}. Original payload: `,
+        console.log(
+          `[JITSU] ${url} replied ${res.status}. Original payload: `,
           JSON.stringify(adjustedPayload, null, 2)
         );
       }
+      if (res.ok) {
+        return res.text();
+      } else {
+        return Promise.reject(res.text());
+      }
+    })
+    .then(responseText => {
+      try {
+        const response = JSON.parse(responseText);
+        if (response.tags) {
+          if (jitsuConfig.debug) {
+            console.log(`[JITSU] Response Tags: `, JSON.stringify(response.tags, null, 2));
+          }
+          insertTags(response.tags, payload, { debug: jitsuConfig.debug });
+        }
+      } catch (e) {
+        return Promise.reject(`Can't parse JSON: ${responseText}: ${e?.message}`);
+      }
     })
     .catch(err => {
       if (jitsuConfig.debug) {