@jitsu/js 1.2.0 → 1.3.0

package/package.json

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

package/src/analytics-plugin.ts

@@ -3,6 +3,7 @@
 import { JitsuOptions, PersistentStorage, RuntimeFacade } from "./jitsu";
 import { AnalyticsClientEvent, Callback, ID, JSONObject, Options } from "@jitsu/protocols/analytics";
 import parse from "./index";
+import { parse as parseTLD } from "tldts";
 import { AnalyticsInstance, AnalyticsPlugin } from "analytics";
 import { loadScript } from "./script-loader";
 import { internalDestinationPlugins } from "./destination-plugins";
@@ -73,12 +74,11 @@ export function getTopLevelDomain(opts: JitsuOptions = {}) {
   if (opts.cookieDomain) {
     return opts.cookieDomain;
   }
-  const [domain] = window.location.hostname.split(":");
-  const parts = domain.split(".");
-  if (parts[parts.length - 1] === "localhost" || parts.length < 2) {
-    return parts[parts.length - 1];
+  const tld = parseTLD(window.location.hostname);
+  if (tld.domain === null) {
+    return tld.hostname;
   } else {
-    return parts[parts.length - 2] + "." + parts[parts.length - 1];
+    return tld.domain;
   }
 }
 
@@ -409,7 +409,7 @@ function maskWriteKey(writeKey?: string): string | undefined {
     if (secret) {
       return `${id}:***`;
     } else {
-      return id;
+      return "***";
     }
   }
   return writeKey;

package/src/browser.ts

@@ -2,6 +2,7 @@ import { JitsuOptions } from "./jitsu";
 import { jitsuAnalytics } from "./index";
 
 export type JitsuBrowserOptions = {
+  namespace?: string;
   userId?: string;
   onload?: string;
   initOnly?: boolean;
@@ -40,9 +41,6 @@ function getScriptAttributes(scriptElement: HTMLScriptElement) {
 }
 
 (function () {
-  if (window["jitsu"]) {
-    console.log("Jitsu is already initialized");
-  }
   function readJitsuOptions(): JitsuBrowserOptions {
     const scriptElement = window.document.currentScript as HTMLScriptElement;
     if (!scriptElement) {
@@ -54,6 +52,11 @@ function getScriptAttributes(scriptElement: HTMLScriptElement) {
   }
 
   const options = readJitsuOptions();
+  const JITSU_V2_ID: string = options.namespace || "jitsu";
+
+  if (window[JITSU_V2_ID]) {
+    console.log("Jitsu is already initialized");
+  }
   if (options.debug) {
     console.log(`Jitsu options: `, JSON.stringify(options));
   }
@@ -70,7 +73,7 @@ function getScriptAttributes(scriptElement: HTMLScriptElement) {
       console.warn(`onload function ${options.onload} is not callable: ${typeof onloadFunction}`);
     }
   }
-  window["jitsu"] = jitsu;
+  window[JITSU_V2_ID] = jitsu;
 
   if (!options.initOnly) {
     jitsu.page();