@jitsu/js 0.0.0-alpha.98 → 0.0.1-alpha.120

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
-@jitsu/js:build: cache hit, replaying output 1a9a20c9353ea7f7
+@jitsu/js:build: cache hit, replaying output d0a9e8b6bb4cbc1a
 @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 src/jitsu.d.ts dist
@@ -7,9 +7,9 @@
 @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 539ms
+@jitsu/js:build: created dist/web/p.js.txt in 218ms
 @jitsu/js:build: 
 @jitsu/js:build: ./compiled/src/index.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 416ms
+@jitsu/js:build: created dist/jitsu.es.js, dist/jitsu.cjs.js in 119ms

package/.turbo/turbo-clean.log

@@ -1,4 +1,4 @@
-@jitsu/js:clean: cache hit, replaying output ba79a39d6c375556
+@jitsu/js:clean: cache hit, replaying output a743e35d3f6db643
 @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

package/__tests__/node/nodejs.test.ts

@@ -2,7 +2,7 @@ import fs from "fs";
 import path from "path";
 import { createServer, SimpleSyrup } from "../simple-syrup";
 import process from "process";
-import { AnalyticsClientEvent, AnalyticsInterface } from "@jitsu/types/analytics";
+import { AnalyticsClientEvent, AnalyticsInterface } from "@jitsu/analytics-types/analytics";
 
 const jitsuAnalytics = require("../../dist/jitsu.cjs.js").jitsuAnalytics;
 const fetchImpl = require("node-fetch-commonjs");
@@ -17,7 +17,7 @@ describe("Test Jitsu NodeJS client", () => {
       port: 3088,
       https: false,
       handlers: {
-        "/s/:type": (req, res) => {
+        "/api/s/:type": (req, res) => {
           res.setHeader("Content-Type", "text/javascript");
           res.send({ ok: true });
           requestLog.push({

package/__tests__/playwright/integration.test.ts

@@ -6,7 +6,7 @@ import ejs from "ejs";
 import chalk from "chalk";
 import * as process from "process";
 import * as console from "console";
-import { AnalyticsClientEvent, AnalyticsInterface } from "@jitsu/types/analytics.d";
+import { AnalyticsClientEvent, AnalyticsInterface } from "@jitsu/analytics-types/analytics.d";
 import type { AnalyticsCore } from "@segment/analytics-next/src/core/analytics/interfaces";
 import { response } from "express";
 
@@ -49,7 +49,7 @@ test.beforeAll(async () => {
         res.setHeader("Content-Type", "text/javascript");
         res.send(fs.readFileSync(path.join(__dirname, "../../dist/web/p.js.txt")).toString());
       },
-      "/s/:type": (req, res) => {
+      "/api/s/:type": (req, res) => {
         res.setHeader("Content-Type", "text/javascript");
         res.send({ ok: true });
         requestLog.push({

package/dist/jitsu.cjs.js

@@ -166,6 +166,11 @@ const cookieStorage = (cookieDomain, key2cookie) => {
         getItem(key) {
             const cookieName = key2cookie[key] || key;
             const result = getCookie(cookieName);
+            if (typeof result === "undefined" && key === "__user_id") {
+                //backward compatibility with old jitsu cookie. get user id if from traits
+                const traits = parse(getCookie("__eventn_id_usr")) || {};
+                return traits.internal_id || traits.user_id || traits.id || traits.userId;
+            }
             return parse(result);
         },
         removeItem(key) {
@@ -202,7 +207,7 @@ function windowRuntime(opts) {
                 height: window.screen.height,
                 innerWidth: window.innerWidth,
                 innerHeight: window.innerHeight,
-                density: window.devicePixelRatio,
+                density: Math.floor(window.devicePixelRatio),
             };
         },
         userAgent() {
@@ -272,9 +277,12 @@ function deepMerge(target, source) {
         return acc;
     }, target);
 }
+function isInBrowser() {
+    return typeof document !== "undefined";
+}
 function adjustPayload(payload, config, storage) {
     var _a, _b;
-    const runtime = config.runtime || (typeof window === "undefined" ? emptyRuntime(config) : windowRuntime(config));
+    const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
     const url = runtime.pageUrl();
     const parsedUrl = safeCall(() => new URL(url), undefined);
     const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
@@ -303,7 +311,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(), 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)), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
     return withContext;
@@ -386,21 +394,26 @@ const jitsuAnalyticsPlugin = (pluginConfig = {}) => {
         },
     };
 };
-function randomId(digits = 24) {
-    let id = "";
-    for (let i = 0; i < digits; i++) {
-        id += randomChar(i === 0);
-    }
-    return id;
+function getSeed() {
+    var _a;
+    const defaultSeed = Date.now() % 2147483647;
+    return isInBrowser() ? ((_a = window === null || window === void 0 ? void 0 : window.performance) === null || _a === void 0 ? void 0 : _a.now()) || defaultSeed : defaultSeed;
 }
-function randomChar(noDigits) {
-    const chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    while (true) {
-        const index = Math.floor(Math.random() * chars.length);
-        if (!noDigits || index > 9) {
-            return chars[index];
-        }
+function randomId(hashString = "") {
+    const d = Date.now();
+    return (((Math.random() * d * hash(hashString !== null && hashString !== void 0 ? hashString : "", getSeed())) % Number.MAX_SAFE_INTEGER).toString(36) +
+        ((Math.random() * d * hash(hashString !== null && hashString !== void 0 ? hashString : "", getSeed())) % Number.MAX_SAFE_INTEGER).toString(36));
+}
+function hash(str, seed = 0) {
+    let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+    for (let i = 0, ch; i < str.length; i++) {
+        ch = str.charCodeAt(i);
+        h1 = Math.imul(h1 ^ ch, 2654435761);
+        h2 = Math.imul(h2 ^ ch, 1597334677);
     }
+    h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^ Math.imul(h2 ^ (h2 >>> 13), 3266489909);
+    h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^ Math.imul(h1 ^ (h1 >>> 13), 3266489909);
+    return 4294967296 * (2097151 & h2) + (h1 >>> 0);
 }
 
 function parse(input) {
@@ -409,7 +422,7 @@ function parse(input) {
         value = decodeURIComponent(input);
     }
     try {
-        value = JSON.parse(input);
+        value = JSON.parse(value);
         if (value === "true")
             return true;
         if (value === "false")

package/dist/jitsu.d.ts

@@ -1,4 +1,4 @@
-import { AnalyticsInterface } from "@jitsu/types/analytics";
+import { AnalyticsInterface } from "@jitsu/analytics-types/analytics";
 import type { AnalyticsPlugin } from "analytics";
 
 export type JitsuOptions = {

package/dist/jitsu.es.js

@@ -164,6 +164,11 @@ const cookieStorage = (cookieDomain, key2cookie) => {
         getItem(key) {
             const cookieName = key2cookie[key] || key;
             const result = getCookie(cookieName);
+            if (typeof result === "undefined" && key === "__user_id") {
+                //backward compatibility with old jitsu cookie. get user id if from traits
+                const traits = parse(getCookie("__eventn_id_usr")) || {};
+                return traits.internal_id || traits.user_id || traits.id || traits.userId;
+            }
             return parse(result);
         },
         removeItem(key) {
@@ -200,7 +205,7 @@ function windowRuntime(opts) {
                 height: window.screen.height,
                 innerWidth: window.innerWidth,
                 innerHeight: window.innerHeight,
-                density: window.devicePixelRatio,
+                density: Math.floor(window.devicePixelRatio),
             };
         },
         userAgent() {
@@ -270,9 +275,12 @@ function deepMerge(target, source) {
         return acc;
     }, target);
 }
+function isInBrowser() {
+    return typeof document !== "undefined";
+}
 function adjustPayload(payload, config, storage) {
     var _a, _b;
-    const runtime = config.runtime || (typeof window === "undefined" ? emptyRuntime(config) : windowRuntime(config));
+    const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
     const url = runtime.pageUrl();
     const parsedUrl = safeCall(() => new URL(url), undefined);
     const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
@@ -301,7 +309,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(), 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)), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
     return withContext;
@@ -384,21 +392,26 @@ const jitsuAnalyticsPlugin = (pluginConfig = {}) => {
         },
     };
 };
-function randomId(digits = 24) {
-    let id = "";
-    for (let i = 0; i < digits; i++) {
-        id += randomChar(i === 0);
-    }
-    return id;
+function getSeed() {
+    var _a;
+    const defaultSeed = Date.now() % 2147483647;
+    return isInBrowser() ? ((_a = window === null || window === void 0 ? void 0 : window.performance) === null || _a === void 0 ? void 0 : _a.now()) || defaultSeed : defaultSeed;
 }
-function randomChar(noDigits) {
-    const chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    while (true) {
-        const index = Math.floor(Math.random() * chars.length);
-        if (!noDigits || index > 9) {
-            return chars[index];
-        }
+function randomId(hashString = "") {
+    const d = Date.now();
+    return (((Math.random() * d * hash(hashString !== null && hashString !== void 0 ? hashString : "", getSeed())) % Number.MAX_SAFE_INTEGER).toString(36) +
+        ((Math.random() * d * hash(hashString !== null && hashString !== void 0 ? hashString : "", getSeed())) % Number.MAX_SAFE_INTEGER).toString(36));
+}
+function hash(str, seed = 0) {
+    let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+    for (let i = 0, ch; i < str.length; i++) {
+        ch = str.charCodeAt(i);
+        h1 = Math.imul(h1 ^ ch, 2654435761);
+        h2 = Math.imul(h2 ^ ch, 1597334677);
     }
+    h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^ Math.imul(h2 ^ (h2 >>> 13), 3266489909);
+    h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^ Math.imul(h1 ^ (h1 >>> 13), 3266489909);
+    return 4294967296 * (2097151 & h2) + (h1 >>> 0);
 }
 
 function parse(input) {
@@ -407,7 +420,7 @@ function parse(input) {
         value = decodeURIComponent(input);
     }
     try {
-        value = JSON.parse(input);
+        value = JSON.parse(value);
         if (value === "true")
             return true;
         if (value === "false")

package/dist/web/p.js.txt

@@ -167,6 +167,11 @@
           getItem(key) {
               const cookieName = key2cookie[key] || key;
               const result = getCookie(cookieName);
+              if (typeof result === "undefined" && key === "__user_id") {
+                  //backward compatibility with old jitsu cookie. get user id if from traits
+                  const traits = parse(getCookie("__eventn_id_usr")) || {};
+                  return traits.internal_id || traits.user_id || traits.id || traits.userId;
+              }
               return parse(result);
           },
           removeItem(key) {
@@ -203,7 +208,7 @@
                   height: window.screen.height,
                   innerWidth: window.innerWidth,
                   innerHeight: window.innerHeight,
-                  density: window.devicePixelRatio,
+                  density: Math.floor(window.devicePixelRatio),
               };
           },
           userAgent() {
@@ -273,9 +278,12 @@
           return acc;
       }, target);
   }
+  function isInBrowser() {
+      return typeof document !== "undefined";
+  }
   function adjustPayload(payload, config, storage) {
       var _a, _b;
-      const runtime = config.runtime || (typeof window === "undefined" ? emptyRuntime(config) : windowRuntime(config));
+      const runtime = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
       const url = runtime.pageUrl();
       const parsedUrl = safeCall(() => new URL(url), undefined);
       const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
@@ -304,7 +312,7 @@
           },
           campaign: parseUtms(query),
       };
-      const withContext = Object.assign(Object.assign({}, payload), { timestamp: new Date().toISOString(), sentAt: new Date().toISOString(), messageId: randomId(), 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)), context: deepMerge(context, customContext) });
       delete withContext.meta;
       delete withContext.options;
       return withContext;
@@ -387,21 +395,26 @@
           },
       };
   };
-  function randomId(digits = 24) {
-      let id = "";
-      for (let i = 0; i < digits; i++) {
-          id += randomChar(i === 0);
-      }
-      return id;
+  function getSeed() {
+      var _a;
+      const defaultSeed = Date.now() % 2147483647;
+      return isInBrowser() ? ((_a = window === null || window === void 0 ? void 0 : window.performance) === null || _a === void 0 ? void 0 : _a.now()) || defaultSeed : defaultSeed;
   }
-  function randomChar(noDigits) {
-      const chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-      while (true) {
-          const index = Math.floor(Math.random() * chars.length);
-          if (!noDigits || index > 9) {
-              return chars[index];
-          }
+  function randomId(hashString = "") {
+      const d = Date.now();
+      return (((Math.random() * d * hash(hashString !== null && hashString !== void 0 ? hashString : "", getSeed())) % Number.MAX_SAFE_INTEGER).toString(36) +
+          ((Math.random() * d * hash(hashString !== null && hashString !== void 0 ? hashString : "", getSeed())) % Number.MAX_SAFE_INTEGER).toString(36));
+  }
+  function hash(str, seed = 0) {
+      let h1 = 0xdeadbeef ^ seed, h2 = 0x41c6ce57 ^ seed;
+      for (let i = 0, ch; i < str.length; i++) {
+          ch = str.charCodeAt(i);
+          h1 = Math.imul(h1 ^ ch, 2654435761);
+          h2 = Math.imul(h2 ^ ch, 1597334677);
       }
+      h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^ Math.imul(h2 ^ (h2 >>> 13), 3266489909);
+      h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^ Math.imul(h1 ^ (h1 >>> 13), 3266489909);
+      return 4294967296 * (2097151 & h2) + (h1 >>> 0);
   }
 
   function parse(input) {
@@ -410,7 +423,7 @@
           value = decodeURIComponent(input);
       }
       try {
-          value = JSON.parse(input);
+          value = JSON.parse(value);
           if (value === "true")
               return true;
           if (value === "false")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jitsu/js",
-  "version": "0.0.0-alpha.98",
+  "version": "0.0.1-alpha.120",
   "description": "",
   "author": "Jitsu Dev Team <dev@jitsu.com>",
   "main": "dist/jitsu.cjs.js",
@@ -32,11 +32,11 @@
     "node-forge": "^1.3.1",
     "raw-loader": "^4.0.2",
     "rollup": "^3.2.5",
-    "ts-jest": "^29.0.3",
-    "@jitsu/types": "0.0.0-alpha.98"
+    "ts-jest": "^29.0.3"
   },
   "dependencies": {
-    "analytics": "^0.8.1"
+    "analytics": "^0.8.1",
+    "@jitsu/analytics-types": "0.0.1-alpha.120"
   },
   "scripts": {
     "clean": "rm -rf ./dist",

package/src/analytics-plugin.ts

@@ -1,7 +1,7 @@
 /* global analytics */
 
 import { JitsuOptions, PersistentStorage, RuntimeFacade } from "./jitsu";
-import { AnalyticsClientEvent } from "@jitsu/types/analytics";
+import { AnalyticsClientEvent } from "@jitsu/analytics-types/analytics";
 import parse from "./index";
 import { AnalyticsPlugin } from "analytics";
 
@@ -120,6 +120,11 @@ const cookieStorage: StorageFactory = (cookieDomain, key2cookie) => {
     getItem(key: string) {
       const cookieName = key2cookie[key] || key;
       const result = getCookie(cookieName);
+      if (typeof result === "undefined" && key === "__user_id") {
+        //backward compatibility with old jitsu cookie. get user id if from traits
+        const traits = parse(getCookie("__eventn_id_usr")) || {};
+        return traits.internal_id || traits.user_id || traits.id || traits.userId;
+      }
       return parse(result);
     },
     removeItem(key: string) {
@@ -158,7 +163,7 @@ export function windowRuntime(opts: JitsuOptions): RuntimeFacade {
         height: window.screen.height,
         innerWidth: window.innerWidth,
         innerHeight: window.innerHeight,
-        density: window.devicePixelRatio,
+        density: Math.floor(window.devicePixelRatio),
       };
     },
     userAgent(): string {
@@ -232,9 +237,12 @@ function deepMerge(target: any, source: any) {
   }, target);
 }
 
+function isInBrowser() {
+  return typeof document !== "undefined";
+}
+
 function adjustPayload(payload: any, config: JitsuOptions, storage: PersistentStorage): AnalyticsClientEvent {
-  const runtime: RuntimeFacade =
-    config.runtime || (typeof window === "undefined" ? emptyRuntime(config) : windowRuntime(config));
+  const runtime: RuntimeFacade = config.runtime || (isInBrowser() ? windowRuntime(config) : emptyRuntime(config));
   const url = runtime.pageUrl();
   const parsedUrl = safeCall(() => new URL(url), undefined);
   const query = parsedUrl ? parseQuery(parsedUrl.search) : {};
@@ -267,7 +275,7 @@ function adjustPayload(payload: any, config: JitsuOptions, storage: PersistentSt
     ...payload,
     timestamp: new Date().toISOString(),
     sentAt: new Date().toISOString(),
-    messageId: randomId(),
+    messageId: randomId(properties.path || (parsedUrl && parsedUrl.pathname)),
     context: deepMerge(context, customContext),
   };
   delete withContext.meta;
@@ -368,22 +376,33 @@ const jitsuAnalyticsPlugin = (pluginConfig: JitsuOptions = {}): AnalyticsPlugin
     },
   };
 };
-export function randomId(digits: number = 24): string {
-  let id = "";
-  for (let i = 0; i < digits; i++) {
-    id += randomChar(i === 0);
-  }
-  return id;
+
+function getSeed() {
+  const defaultSeed = Date.now() % 2147483647;
+  return isInBrowser() ? window?.performance?.now() || defaultSeed : defaultSeed;
 }
 
-function randomChar(noDigits?: boolean) {
-  const chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  while (true) {
-    const index = Math.floor(Math.random() * chars.length);
-    if (!noDigits || index > 9) {
-      return chars[index];
-    }
+export function randomId(hashString: string | undefined = ""): string {
+  const d = Date.now();
+  return (
+    ((Math.random() * d * hash(hashString ?? "", getSeed())) % Number.MAX_SAFE_INTEGER).toString(36) +
+    ((Math.random() * d * hash(hashString ?? "", getSeed())) % Number.MAX_SAFE_INTEGER).toString(36)
+  );
+}
+
+function hash(str: string, seed: number = 0): number {
+  let h1 = 0xdeadbeef ^ seed,
+    h2 = 0x41c6ce57 ^ seed;
+  for (let i = 0, ch; i < str.length; i++) {
+    ch = str.charCodeAt(i);
+    h1 = Math.imul(h1 ^ ch, 2654435761);
+    h2 = Math.imul(h2 ^ ch, 1597334677);
   }
+
+  h1 = Math.imul(h1 ^ (h1 >>> 16), 2246822507) ^ Math.imul(h2 ^ (h2 >>> 13), 3266489909);
+  h2 = Math.imul(h2 ^ (h2 >>> 16), 2246822507) ^ Math.imul(h1 ^ (h1 >>> 13), 3266489909);
+
+  return 4294967296 * (2097151 & h2) + (h1 >>> 0);
 }
 
 export default jitsuAnalyticsPlugin;

package/src/index.ts

@@ -1,4 +1,4 @@
-import { AnalyticsInterface } from "@jitsu/types/analytics.d";
+import { AnalyticsInterface } from "@jitsu/analytics-types/analytics.d";
 import Analytics from "analytics";
 import { JitsuOptions, PersistentStorage } from "./jitsu";
 import jitsuAnalyticsPlugin, { emptyRuntime, windowRuntime } from "./analytics-plugin";
@@ -9,7 +9,7 @@ export default function parse(input) {
     value = decodeURIComponent(input);
   }
   try {
-    value = JSON.parse(input);
+    value = JSON.parse(value);
     if (value === "true") return true;
     if (value === "false") return false;
     if (typeof value === "object") return value;

package/src/jitsu.d.ts

@@ -1,4 +1,4 @@
-import { AnalyticsInterface } from "@jitsu/types/analytics";
+import { AnalyticsInterface } from "@jitsu/analytics-types/analytics";
 import type { AnalyticsPlugin } from "analytics";
 
 export type JitsuOptions = {