npm - @jitsu/js - Versions diffs - 1.9.10 → 1.9.12 - Mend

@jitsu/js 1.9.10 → 1.9.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/.turbo/turbo-build.log +9 -9
package/.turbo/turbo-clean.log +1 -1
package/.turbo/turbo-test.log +1134 -463
package/__tests__/node/nodejs.test.ts +27 -0
package/__tests__/playwright/cases/anonymous-id-bug.html +26 -0
package/__tests__/playwright/cases/basic.html +5 -0
package/__tests__/playwright/cases/reset.html +1 -0
package/__tests__/playwright/integration.test.ts +46 -0
package/dist/jitsu.cjs.js +76 -14
package/dist/jitsu.es.js +76 -14
package/dist/web/p.js.txt +76 -14
package/package.json +4 -4
package/src/analytics-plugin.ts +90 -18

package/__tests__/node/nodejs.test.ts CHANGED Viewed

@@ -214,6 +214,33 @@ describe("Test Jitsu NodeJS client", () => {
     expect((p.body.anonymousId ?? "").length).toBeGreaterThan(0);
   });
+  test("test defaultPayloadContext", async () => {
+    const config = {
+      host: server.baseUrl,
+      writeKey: "key:secret",
+      debug: true,
+      defaultPayloadContext: {
+        awesomeIdentifier: "awesome-identifier",
+        awesome: {
+          nestedKey: "awesome-key",
+        },
+      },
+    };
+    const client = jitsuAnalytics(config);
+    expect(requestLog.length).toBe(0);
+    await client.identify("myUserId", { email: "myUserId@example.com" });
+    await client.group("myGroupId", { name: "myGroupId" });
+    await client.track("myEvent", { prop1: "value1" });
+    await new Promise(resolve => setTimeout(resolve, 1000));
+    expect(requestLog.length).toBe(3);
+    expect(requestLog[0].body.context.awesomeIdentifier).toBe("awesome-identifier");
+    expect(requestLog[0].body.context.awesome.nestedKey).toBe("awesome-key");
+    expect(requestLog[1].body.context.awesomeIdentifier).toBe("awesome-identifier");
+    expect(requestLog[1].body.context.awesome.nestedKey).toBe("awesome-key");
+    expect(requestLog[2].body.context.awesomeIdentifier).toBe("awesome-identifier");
+    expect(requestLog[2].body.context.awesome.nestedKey).toBe("awesome-key");
+  });
   test("node js", async () => {
     const jitsu: AnalyticsInterface = jitsuAnalytics({
       writeKey: "key:secret",

package/__tests__/playwright/cases/anonymous-id-bug.html ADDED Viewed

@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <title>Tracking page</title>
+    <script>
+      window.testOnload = async j => {
+        j.track("pageLoaded");
+      };
+    </script>
+    <script
+      type="text/javascript"
+      src="<%=trackingBase%>/p.js"
+      data-onload="testOnload"
+      data-debug="true"
+      defer
+    ></script>
+  </head>
+  <body>
+    <h1>Test</h1>
+  </body>
+</html>

package/__tests__/playwright/cases/basic.html CHANGED Viewed

@@ -7,6 +7,11 @@
     <title>Tracking page</title>
     <script>
+      window.jitsuConfig = {
+        cookieCapture: {
+          ttp: "_ttp",
+        },
+      };
       window.testOnload = async j => {
         j.identify("john-doe-id-1", { email: "john.doe@gmail.com" });
         j.track("pageLoaded", { trackParam: "trackValue" });

package/__tests__/playwright/cases/reset.html CHANGED Viewed

@@ -10,6 +10,7 @@
       window.testOnload = async j => {
         await j.setAnonymousId("john-doe-id-1");
         await j.identify("john-nondoe", { email: "john@example.com" });
+        await j.identify("john-nondoe", { email: "john2@example.com", $doNotSend: true });
         await j.track("pageLoaded", { trackParam: "trackValue" });
         await j.reset();
         await j.track("pageLoaded", { trackParam: "trackValue" });

package/__tests__/playwright/integration.test.ts CHANGED Viewed

@@ -273,6 +273,9 @@ test("reset", async ({ browser }) => {
   const newAnonymousId = cookies[0].value;
   console.log(`🍪Cookies`, cookies);
+  //second identify call should not reach the server, but it should change the traits
+  expect(firstTrack.body.context.traits?.email).toEqual("john2@example.com");
   expect(secondTrack.body.anonymousId).not.toBeNull();
   expect(secondTrack.body.anonymousId).toBeDefined();
   expect(secondTrack.body.anonymousId).toEqual(newAnonymousId);
@@ -447,9 +450,46 @@ test("disable-user-ids-then-consent", async ({ browser }) => {
   expect((p.body.anonymousId ?? "").length).toBeGreaterThan(0);
 });
+test("anonymous-id-bug", async ({ browser }) => {
+  clearRequestLog();
+  const anonymousId = "1724633695283.638279";
+  const browserContext = await browser.newContext();
+  await browserContext.addCookies([{ name: "__eventn_id", value: anonymousId, url: server.baseUrl }]);
+  const { page, uncaughtErrors } = await createLoggingPage(browserContext);
+  const [pageResult] = await Promise.all([page.goto(`${server.baseUrl}/anonymous-id-bug.html`)]);
+  await page.waitForFunction(() => window["jitsu"] !== undefined, undefined, {
+    timeout: 1000,
+    polling: 100,
+  });
+  expect(pageResult.status()).toBe(200);
+  const cookies = (await browserContext.cookies()).reduce(
+    (res, cookie) => ({
+      ...res,
+      [cookie.name]: cookie.value,
+    }),
+    {}
+  );
+  console.log("🍪 Jitsu Cookies", cookies);
+  //wait for some time since the server has an artificial latency of 30ms
+  await new Promise(resolve => setTimeout(resolve, 1000));
+  expect(uncaughtErrors.length).toEqual(0);
+  console.log(
+    `📝 Request log size of ${requestLog.length}`,
+    requestLog.map(x => describeEvent(x.type, x.body))
+  );
+  const p = requestLog[0];
+  console.log(chalk.bold("📝 Checking page event"), JSON.stringify(p, null, 3));
+  expect(p.body.anonymousId).toEqual(anonymousId);
+});
 test("basic", async ({ browser }) => {
   clearRequestLog();
   const browserContext = await browser.newContext();
+  await browserContext.addCookies([
+    { name: "_fbc", value: "fbc-id", url: server.baseUrl },
+    { name: "_fbp", value: "fbp-id", url: server.baseUrl },
+    { name: "_ttp", value: "ttp-id", url: server.baseUrl },
+  ]);
   const { page: firstPage, uncaughtErrors: firstPageErrors } = await createLoggingPage(browserContext);
   const [pageResult] = await Promise.all([
@@ -495,6 +535,9 @@ test("basic", async ({ browser }) => {
   console.log(chalk.bold("📝 Checking track event"), JSON.stringify(track, null, 3));
   expect(track.properties.trackParam).toEqual("trackValue");
   expect(track.type).toEqual("track");
+  expect(track.context.clientIds).toHaveProperty("fbc", "fbc-id");
+  expect(track.context.clientIds).toHaveProperty("fbp", "fbp-id");
+  expect(track.context.clientIds).toHaveProperty("ttp", "ttp-id");
   expect(track.context.traits.email).toEqual("john.doe@gmail.com");
   expect(track.userId).toEqual("john-doe-id-1");
   expect(track.event).toEqual("pageLoaded");
@@ -506,6 +549,9 @@ test("basic", async ({ browser }) => {
   console.log(chalk.bold("📝 Checking page event"), JSON.stringify(page, null, 3));
   expect(page.anonymousId).toEqual(anonymousId);
+  expect(page.context.clientIds).toHaveProperty("fbc", "fbc-id");
+  expect(page.context.clientIds).toHaveProperty("fbp", "fbp-id");
+  expect(page.context.clientIds).toHaveProperty("ttp", "ttp-id");
   expect(page.context.traits.email).toEqual("john.doe@gmail.com");
   expect(page.userId).toEqual("john-doe-id-1");

package/dist/jitsu.cjs.js CHANGED Viewed

@@ -1061,10 +1061,13 @@ const defaultConfig = {
     fetch: null,
     echoEvents: false,
     cookieDomain: undefined,
+    cookieCapture: {},
     runtime: undefined,
     fetchTimeoutMs: undefined,
     s2s: undefined,
     idEndpoint: undefined,
+    errorPolicy: "log",
+    defaultPayloadContext: {},
     privacy: {
         dontSend: false,
         disableUserIds: false,
@@ -1149,6 +1152,14 @@ function getCookie(name) {
     const parts = value.split(`; ${name}=`);
     return parts.length === 2 ? parts.pop().split(";").shift() : undefined;
 }
+function getClientIds(runtime, customCookieCapture) {
+    const cookieCapture = Object.assign({ fbc: "_fbc", fbp: "_fbp" }, customCookieCapture);
+    const clientIds = Object.entries(cookieCapture).reduce((acc, [key, cookieName]) => {
+        acc[key] = runtime.getCookie(cookieName);
+        return acc;
+    }, {});
+    return Object.assign(Object.assign({}, clientIds), getGa4Ids(runtime));
+}
 function getGa4Ids(runtime) {
     var _a;
     const allCookies = runtime.getCookies();
@@ -1226,6 +1237,10 @@ const cookieStorage = (cookieDomain, key2cookie) => {
         getItem(key) {
             const cookieName = key2cookie[key] || key;
             const result = getCookie(cookieName);
+            if (key === "__anon_id") {
+                //anonymous id must always be a string, so we don't parse it to preserve its exact value
+                return result;
+            }
             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")) || {};
@@ -1401,18 +1416,19 @@ function urlPath(url) {
     return "/" + pathMatch;
 }
 function adjustPayload(payload, config, storage, s2s) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     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) : {};
     const properties = payload.properties || {};
-    if (payload.type === "page" && url) {
-        properties.url = url.replace(hashRegex, "");
-        properties.path = fixPath(urlPath(url));
+    if (payload.type === "page" && (properties.url || url)) {
+        const targetUrl = properties.url || url;
+        properties.url = targetUrl.replace(hashRegex, "");
+        properties.path = fixPath(urlPath(targetUrl));
     }
-    const customContext = ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || {};
-    (_b = payload.properties) === null || _b === void 0 ? true : delete _b.context;
+    const customContext = deepMerge(config.defaultPayloadContext, ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || ((_b = payload.options) === null || _b === void 0 ? void 0 : _b.context) || {});
+    (_c = payload.properties) === null || _c === void 0 ? true : delete _c.context;
     const referrer = runtime.referrer();
     const context = {
         library: {
@@ -1420,7 +1436,7 @@ function adjustPayload(payload, config, storage, s2s) {
             version: jitsuVersion,
             env: isInBrowser() ? "browser" : "node",
         },
-        consent: ((_c = config.privacy) === null || _c === void 0 ? void 0 : _c.consentCategories)
+        consent: ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories)
             ? {
                 categoryPreferences: config.privacy.consentCategories,
             }
@@ -1439,14 +1455,13 @@ function adjustPayload(payload, config, storage, s2s) {
             url: properties.url || url,
             encoding: properties.encoding || runtime.documentEncoding(),
         },
-        clientIds: !((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.disableUserIds)
-            ? Object.assign({ fbc: runtime.getCookie("_fbc"), fbp: runtime.getCookie("_fbp") }, getGa4Ids(runtime)) : undefined,
+        clientIds: !((_e = config.privacy) === null || _e === void 0 ? void 0 : _e.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
         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: maskWriteKey(config.writeKey), groupId: storage.getItem("__group_id"), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
-    if ((_e = config.privacy) === null || _e === void 0 ? void 0 : _e.disableUserIds) {
+    if ((_f = config.privacy) === null || _f === void 0 ? void 0 : _f.disableUserIds) {
         delete withContext.userId;
         delete withContext.anonymousId;
         delete withContext.context.traits;
@@ -1555,6 +1570,23 @@ function maskWriteKey(writeKey) {
     }
     return writeKey;
 }
+function getErrorHandler(opts) {
+    const configuredHandler = opts.errorPolicy || "log";
+    if (typeof configuredHandler === "function") {
+        return configuredHandler;
+    }
+    else if (configuredHandler === "rethrow") {
+        return (msg, ...args) => {
+            //ignore args, not clear what to do with them
+            throw new Error(msg);
+        };
+    }
+    else {
+        return (msg, ...args) => {
+            console.error(msg, ...args);
+        };
+    }
+}
 function send(method, payload, jitsuConfig, instance, store) {
     return __awaiter$1(this, void 0, void 0, function* () {
         var _a, _b;
@@ -1566,6 +1598,7 @@ function send(method, payload, jitsuConfig, instance, store) {
         const url = s2s ? `${jitsuConfig.host}/api/s/s2s/${method}` : `${jitsuConfig.host}/api/s/${method}`;
         const fetch = jitsuConfig.fetch || globalThis.fetch;
         if (!fetch) {
+            //don't run it through error handler since error is critical and should be addressed
             throw new Error("Please specify fetch function in jitsu plugin initialization, fetch isn't available in global scope");
         }
         const debugHeader = jitsuConfig.debug ? { "X-Enable-Debug": "true" } : {};
@@ -1596,7 +1629,8 @@ function send(method, payload, jitsuConfig, instance, store) {
             }
         }
         catch (e) {
-            throw new Error(`Calling ${url} failed: ${e.message}`);
+            getErrorHandler(jitsuConfig)(`Call to ${url} failed with error ${e.message}`);
+            return Promise.resolve();
         }
         let responseText;
         try {
@@ -1609,14 +1643,16 @@ function send(method, payload, jitsuConfig, instance, store) {
             console.log(`[JITSU DEBUG] ${url} replied ${fetchResult.status}: ${responseText}. Original payload:\n${JSON.stringify(adjustedPayload, null, 2)}`);
         }
         if (!fetchResult.ok) {
-            throw new Error(`Jitsu ${url} replied ${fetchResult.status} - ${fetchResult.statusText}: ${responseText}`);
+            getErrorHandler(jitsuConfig)(`Call to ${url} failed with error: ${fetchResult.status} - ${fetchResult.statusText}: ${responseText}`);
+            return Promise.resolve();
         }
         let responseJson;
         try {
             responseJson = JSON.parse(responseText);
         }
         catch (e) {
-            return Promise.reject(`Can't parse JSON: ${responseText}: ${e === null || e === void 0 ? void 0 : e.message}`);
+            getErrorHandler(jitsuConfig)(`Can't parse JSON: ${responseText}: ${e === null || e === void 0 ? void 0 : e.message}`);
+            return Promise.resolve();
         }
         if (responseJson.destinations && responseJson.destinations.length > 0) {
             if (jitsuConfig.s2s) {
@@ -1635,6 +1671,22 @@ function send(method, payload, jitsuConfig, instance, store) {
         return adjustedPayload;
     });
 }
+const controllingTraits = ["$doNotSend"];
+/**
+ * Remove all members of traits that controls identify/group behavior (see analytics.d.ts), and should not be recorded. Returns
+ * copy of the object with these members removed.
+ *
+ * Do not modify traits object, but creates one
+ * @param traits
+ */
+function stripControllingTraits(traits) {
+    const res = Object.assign({}, traits);
+    // see Traits definition in analytics.d.ts. We cannot define const here, so here's a little code duplication
+    for (const key of controllingTraits) {
+        delete res[key];
+    }
+    return res;
+}
 const jitsuAnalyticsPlugin = (jitsuOptions = {}, storage) => {
     // just to make sure that all undefined values are replaced with defaultConfig values
     mergeConfig(jitsuOptions, jitsuOptions);
@@ -1693,16 +1745,21 @@ const jitsuAnalyticsPlugin = (jitsuOptions = {}, storage) => {
             return send("track", payload, config, instance, storage);
         },
         identify: args => {
-            var _a, _b;
+            var _a, _b, _c;
             const { payload, config, instance } = args;
             if (((_a = config.privacy) === null || _a === void 0 ? void 0 : _a.dontSend) || ((_b = config.privacy) === null || _b === void 0 ? void 0 : _b.disableUserIds)) {
                 return;
             }
             // Store traits in cache to be able to use them in page and track events that run asynchronously with current identify.
             storage.setItem("__user_id", payload.userId);
+            const doNotSend = (_c = payload.traits) === null || _c === void 0 ? void 0 : _c.$doNotSend;
             if (payload.traits && typeof payload.traits === "object") {
+                payload.traits = stripControllingTraits(payload.traits);
                 storage.setItem("__user_traits", payload.traits);
             }
+            if (doNotSend) {
+                return Promise.resolve();
+            }
             return send("identify", payload, config, instance, storage);
         },
         reset: args => {
@@ -1747,9 +1804,14 @@ const jitsuAnalyticsPlugin = (jitsuOptions = {}, storage) => {
                 const userId = (options === null || options === void 0 ? void 0 : options.userId) || (user === null || user === void 0 ? void 0 : user.userId);
                 const anonymousId = (options === null || options === void 0 ? void 0 : options.anonymousId) || (user === null || user === void 0 ? void 0 : user.anonymousId) || storage.getItem("__anon_id");
                 storage.setItem("__group_id", groupId);
+                const doNotSend = traits === null || traits === void 0 ? void 0 : traits.$doNotSend;
                 if (traits && typeof traits === "object") {
+                    traits = stripControllingTraits(traits);
                     storage.setItem("__group_traits", traits);
                 }
+                if (doNotSend) {
+                    return Promise.resolve();
+                }
                 return send("group", Object.assign(Object.assign({ type: "group", groupId, traits }, (anonymousId ? { anonymousId } : {})), (userId ? { userId } : {})), jitsuOptions, instance, storage);
             },
         },

package/dist/jitsu.es.js CHANGED Viewed

@@ -1059,10 +1059,13 @@ const defaultConfig = {
     fetch: null,
     echoEvents: false,
     cookieDomain: undefined,
+    cookieCapture: {},
     runtime: undefined,
     fetchTimeoutMs: undefined,
     s2s: undefined,
     idEndpoint: undefined,
+    errorPolicy: "log",
+    defaultPayloadContext: {},
     privacy: {
         dontSend: false,
         disableUserIds: false,
@@ -1147,6 +1150,14 @@ function getCookie(name) {
     const parts = value.split(`; ${name}=`);
     return parts.length === 2 ? parts.pop().split(";").shift() : undefined;
 }
+function getClientIds(runtime, customCookieCapture) {
+    const cookieCapture = Object.assign({ fbc: "_fbc", fbp: "_fbp" }, customCookieCapture);
+    const clientIds = Object.entries(cookieCapture).reduce((acc, [key, cookieName]) => {
+        acc[key] = runtime.getCookie(cookieName);
+        return acc;
+    }, {});
+    return Object.assign(Object.assign({}, clientIds), getGa4Ids(runtime));
+}
 function getGa4Ids(runtime) {
     var _a;
     const allCookies = runtime.getCookies();
@@ -1224,6 +1235,10 @@ const cookieStorage = (cookieDomain, key2cookie) => {
         getItem(key) {
             const cookieName = key2cookie[key] || key;
             const result = getCookie(cookieName);
+            if (key === "__anon_id") {
+                //anonymous id must always be a string, so we don't parse it to preserve its exact value
+                return result;
+            }
             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")) || {};
@@ -1399,18 +1414,19 @@ function urlPath(url) {
     return "/" + pathMatch;
 }
 function adjustPayload(payload, config, storage, s2s) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     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) : {};
     const properties = payload.properties || {};
-    if (payload.type === "page" && url) {
-        properties.url = url.replace(hashRegex, "");
-        properties.path = fixPath(urlPath(url));
+    if (payload.type === "page" && (properties.url || url)) {
+        const targetUrl = properties.url || url;
+        properties.url = targetUrl.replace(hashRegex, "");
+        properties.path = fixPath(urlPath(targetUrl));
     }
-    const customContext = ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || {};
-    (_b = payload.properties) === null || _b === void 0 ? true : delete _b.context;
+    const customContext = deepMerge(config.defaultPayloadContext, ((_a = payload.properties) === null || _a === void 0 ? void 0 : _a.context) || ((_b = payload.options) === null || _b === void 0 ? void 0 : _b.context) || {});
+    (_c = payload.properties) === null || _c === void 0 ? true : delete _c.context;
     const referrer = runtime.referrer();
     const context = {
         library: {
@@ -1418,7 +1434,7 @@ function adjustPayload(payload, config, storage, s2s) {
             version: jitsuVersion,
             env: isInBrowser() ? "browser" : "node",
         },
-        consent: ((_c = config.privacy) === null || _c === void 0 ? void 0 : _c.consentCategories)
+        consent: ((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.consentCategories)
             ? {
                 categoryPreferences: config.privacy.consentCategories,
             }
@@ -1437,14 +1453,13 @@ function adjustPayload(payload, config, storage, s2s) {
             url: properties.url || url,
             encoding: properties.encoding || runtime.documentEncoding(),
         },
-        clientIds: !((_d = config.privacy) === null || _d === void 0 ? void 0 : _d.disableUserIds)
-            ? Object.assign({ fbc: runtime.getCookie("_fbc"), fbp: runtime.getCookie("_fbp") }, getGa4Ids(runtime)) : undefined,
+        clientIds: !((_e = config.privacy) === null || _e === void 0 ? void 0 : _e.disableUserIds) ? getClientIds(runtime, config.cookieCapture) : undefined,
         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: maskWriteKey(config.writeKey), groupId: storage.getItem("__group_id"), context: deepMerge(context, customContext) });
     delete withContext.meta;
     delete withContext.options;
-    if ((_e = config.privacy) === null || _e === void 0 ? void 0 : _e.disableUserIds) {
+    if ((_f = config.privacy) === null || _f === void 0 ? void 0 : _f.disableUserIds) {
         delete withContext.userId;
         delete withContext.anonymousId;
         delete withContext.context.traits;
@@ -1553,6 +1568,23 @@ function maskWriteKey(writeKey) {
     }
     return writeKey;
 }
+function getErrorHandler(opts) {
+    const configuredHandler = opts.errorPolicy || "log";
+    if (typeof configuredHandler === "function") {
+        return configuredHandler;
+    }
+    else if (configuredHandler === "rethrow") {
+        return (msg, ...args) => {
+            //ignore args, not clear what to do with them
+            throw new Error(msg);
+        };
+    }
+    else {
+        return (msg, ...args) => {
+            console.error(msg, ...args);
+        };
+    }
+}
 function send(method, payload, jitsuConfig, instance, store) {
     return __awaiter$1(this, void 0, void 0, function* () {
         var _a, _b;
@@ -1564,6 +1596,7 @@ function send(method, payload, jitsuConfig, instance, store) {
         const url = s2s ? `${jitsuConfig.host}/api/s/s2s/${method}` : `${jitsuConfig.host}/api/s/${method}`;
         const fetch = jitsuConfig.fetch || globalThis.fetch;
         if (!fetch) {
+            //don't run it through error handler since error is critical and should be addressed
             throw new Error("Please specify fetch function in jitsu plugin initialization, fetch isn't available in global scope");
         }
         const debugHeader = jitsuConfig.debug ? { "X-Enable-Debug": "true" } : {};
@@ -1594,7 +1627,8 @@ function send(method, payload, jitsuConfig, instance, store) {
             }
         }
         catch (e) {
-            throw new Error(`Calling ${url} failed: ${e.message}`);
+            getErrorHandler(jitsuConfig)(`Call to ${url} failed with error ${e.message}`);
+            return Promise.resolve();
         }
         let responseText;
         try {
@@ -1607,14 +1641,16 @@ function send(method, payload, jitsuConfig, instance, store) {
             console.log(`[JITSU DEBUG] ${url} replied ${fetchResult.status}: ${responseText}. Original payload:\n${JSON.stringify(adjustedPayload, null, 2)}`);
         }
         if (!fetchResult.ok) {
-            throw new Error(`Jitsu ${url} replied ${fetchResult.status} - ${fetchResult.statusText}: ${responseText}`);
+            getErrorHandler(jitsuConfig)(`Call to ${url} failed with error: ${fetchResult.status} - ${fetchResult.statusText}: ${responseText}`);
+            return Promise.resolve();
         }
         let responseJson;
         try {
             responseJson = JSON.parse(responseText);
         }
         catch (e) {
-            return Promise.reject(`Can't parse JSON: ${responseText}: ${e === null || e === void 0 ? void 0 : e.message}`);
+            getErrorHandler(jitsuConfig)(`Can't parse JSON: ${responseText}: ${e === null || e === void 0 ? void 0 : e.message}`);
+            return Promise.resolve();
         }
         if (responseJson.destinations && responseJson.destinations.length > 0) {
             if (jitsuConfig.s2s) {
@@ -1633,6 +1669,22 @@ function send(method, payload, jitsuConfig, instance, store) {
         return adjustedPayload;
     });
 }
+const controllingTraits = ["$doNotSend"];
+/**
+ * Remove all members of traits that controls identify/group behavior (see analytics.d.ts), and should not be recorded. Returns
+ * copy of the object with these members removed.
+ *
+ * Do not modify traits object, but creates one
+ * @param traits
+ */
+function stripControllingTraits(traits) {
+    const res = Object.assign({}, traits);
+    // see Traits definition in analytics.d.ts. We cannot define const here, so here's a little code duplication
+    for (const key of controllingTraits) {
+        delete res[key];
+    }
+    return res;
+}
 const jitsuAnalyticsPlugin = (jitsuOptions = {}, storage) => {
     // just to make sure that all undefined values are replaced with defaultConfig values
     mergeConfig(jitsuOptions, jitsuOptions);
@@ -1691,16 +1743,21 @@ const jitsuAnalyticsPlugin = (jitsuOptions = {}, storage) => {
             return send("track", payload, config, instance, storage);
         },
         identify: args => {
-            var _a, _b;
+            var _a, _b, _c;
             const { payload, config, instance } = args;
             if (((_a = config.privacy) === null || _a === void 0 ? void 0 : _a.dontSend) || ((_b = config.privacy) === null || _b === void 0 ? void 0 : _b.disableUserIds)) {
                 return;
             }
             // Store traits in cache to be able to use them in page and track events that run asynchronously with current identify.
             storage.setItem("__user_id", payload.userId);
+            const doNotSend = (_c = payload.traits) === null || _c === void 0 ? void 0 : _c.$doNotSend;
             if (payload.traits && typeof payload.traits === "object") {
+                payload.traits = stripControllingTraits(payload.traits);
                 storage.setItem("__user_traits", payload.traits);
             }
+            if (doNotSend) {
+                return Promise.resolve();
+            }
             return send("identify", payload, config, instance, storage);
         },
         reset: args => {
@@ -1745,9 +1802,14 @@ const jitsuAnalyticsPlugin = (jitsuOptions = {}, storage) => {
                 const userId = (options === null || options === void 0 ? void 0 : options.userId) || (user === null || user === void 0 ? void 0 : user.userId);
                 const anonymousId = (options === null || options === void 0 ? void 0 : options.anonymousId) || (user === null || user === void 0 ? void 0 : user.anonymousId) || storage.getItem("__anon_id");
                 storage.setItem("__group_id", groupId);
+                const doNotSend = traits === null || traits === void 0 ? void 0 : traits.$doNotSend;
                 if (traits && typeof traits === "object") {
+                    traits = stripControllingTraits(traits);
                     storage.setItem("__group_traits", traits);
                 }
+                if (doNotSend) {
+                    return Promise.resolve();
+                }
                 return send("group", Object.assign(Object.assign({ type: "group", groupId, traits }, (anonymousId ? { anonymousId } : {})), (userId ? { userId } : {})), jitsuOptions, instance, storage);
             },
         },