@ada-support/embed2 1.11.3 → 1.11.11

package/dist/npm-entry/client/helpers/event-subscriptions/index.d.ts

@@ -1,4 +1,5 @@
 import type { AdaEventDataKeyedByEvent, AdaEventKey, AdaEventSubscriptionCallback } from "@ada-support/embed-types";
+export declare function hasEventSubscription(eventKey: AdaEventKey): boolean;
 export declare function unsubscribeEvent(id: number): void;
 export declare function subscribeEvent<K extends AdaEventKey>(eventKey: K, callback: AdaEventSubscriptionCallback<K>): number;
 export declare function publishEvent<K extends AdaEventKey>(eventKey: K, data: AdaEventDataKeyedByEvent[K]): void;

package/dist/npm-entry/common/constants/timeouts.d.ts

@@ -1,2 +1,3 @@
 export declare const ANIMATION_DELAY = 50;
-export declare const CHAT_FALLBACK_DELAY_MS = 5000;
+export declare const CHAT_FRAME_TIMEOUT_EVENT_MS = 5000;
+export declare const CHAT_FALLBACK_DELAY_MS = 10000;

package/dist/npm-entry/index.js

@@ -15919,7 +15919,7 @@ const client = new BrowserClient({
     return event;
   },
   environment: "production",
-  release: "1.11.3-8cc0a0d",
+  release: "1.11.11-96768c4",
   sampleRate: 0.25,
   autoSessionTracking: false,
   // Integrations don't seem to work with Sentry: https://github.com/getsentry/sentry-javascript/issues/2541
@@ -16368,22 +16368,48 @@ let ActionTypes = /*#__PURE__*/function (ActionTypes) {
   ActionTypes["FOCUS_OFF_ADA_TYPE"] = "FOCUS_OFF_ADA";
   return ActionTypes;
 }({});
-;// CONCATENATED MODULE: ./src/services/helpers.ts
-const NO_OP_FUNCTION = () => {
-  // Do nothing
-};
-function isStartOptions(input) {
-  if (!(typeof input === "object")) {
-    return false;
-  }
-  if (input === null) {
-    return false;
-  }
-  return typeof input.handle === "string";
+;// CONCATENATED MODULE: ./src/client/helpers/event-subscriptions/index.ts
+let subscriptions = [];
+function hasEventSubscription(eventKey) {
+  return subscriptions.some(subscription => subscription.eventKey === eventKey);
+}
+const getNextUniqueId = (() => {
+  let lastId = 0;
+  return () => {
+    lastId += 1;
+    return lastId;
+  };
+})();
+function unsubscribeEvent(id) {
+  subscriptions = subscriptions.filter(s => s.id !== id);
+}
+function subscribeEvent(eventKey, callback) {
+  const id = getNextUniqueId();
+  subscriptions.push({
+    eventKey,
+    callback,
+    id
+  });
+  return id;
+}
+function publishEvent(eventKey, data) {
+  subscriptions.forEach(subscription => {
+    // Using startsWith instead of === allows subscribing to a specific event OR a namespace,
+    // e.g. ada:campaigns subscribes to ada:campaigns:opened, ada:campaigns:engaged, and
+    // ada:campaigns:shown. Broadcasting this way simultaneously reaches subscriptions
+    // that have subscribed to a specific event, and those that have subscribed to a namespace
+    if (eventKey.startsWith(subscription.eventKey)) {
+      // try/catch to guard against missing or bad callbacks
+      try {
+        subscription.callback(data, {
+          eventKey
+        });
+      } catch {
+        // silently fail and proceed with remaining callbacks
+      }
+    }
+  });
 }
-// EXTERNAL MODULE: ./node_modules/lodash.memoize/index.js
-var lodash_memoize = __webpack_require__(7654);
-var lodash_memoize_default = /*#__PURE__*/__webpack_require__.n(lodash_memoize);
 ;// CONCATENATED MODULE: ./src/common/helpers/http.ts
 /**
  * Vanilla HTTP request. Returns a Promise.
@@ -16428,102 +16454,6 @@ function httpRequest(obj) {
     xhr.send(obj.body);
   });
 }
-;// CONCATENATED MODULE: ./src/services/logger/index.ts
-
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-
-
-const DEFAULT_LOG_SAMPLE_RATE = 0.01;
-const DD_BASE_URL = "https://browser-http-intake.logs.datadoghq.com/v1/input/";
-const DD_TOKEN = "pubfe23baedd2ea322bebb5ed2020fa2fa1";
-
-// We need memoization to ensure consistency of logs
-const shouldLog = lodash_memoize_default()(sampleRate => {
-  if (!DD_TOKEN || sampleRate === 0) {
-    return false;
-  }
-  return Math.random() < (sampleRate || DEFAULT_LOG_SAMPLE_RATE);
-});
-
-/**
- * Sends log to Datadog
- */
-async function log(message, extra, options) {
-  if (!shouldLog(options === null || options === void 0 ? void 0 : options.sampleRate)) {
-    return;
-  }
-  await httpRequest({
-    url: `${DD_BASE_URL}${DD_TOKEN}?ddsource=browser&ddtags=version:1.5.0,env:${"production"}`,
-    method: "POST",
-    body: JSON.stringify(_objectSpread(_objectSpread({
-      message
-    }, extra), {}, {
-      level: (options === null || options === void 0 ? void 0 : options.level) || "info",
-      sampleRate: (options === null || options === void 0 ? void 0 : options.sampleRate) || DEFAULT_LOG_SAMPLE_RATE,
-      service: "embed",
-      env: "production",
-      embedVersion: 2,
-      version: "1.11.3",
-      isNpm: true,
-      commitHash: "8cc0a0d"
-    }))
-  });
-}
-;// CONCATENATED MODULE: ./src/client/helpers/event-subscriptions/index.ts
-
-
-let subscriptions = [];
-const getNextUniqueId = (() => {
-  let lastId = 0;
-  return () => {
-    lastId += 1;
-    return lastId;
-  };
-})();
-function unsubscribeEvent(id) {
-  subscriptions = subscriptions.filter(s => s.id !== id);
-}
-function subscribeEvent(eventKey, callback) {
-  const id = getNextUniqueId();
-
-  // Log chat_frame_timeout event subscriptions
-  if (eventKey === "ada:chat_frame_timeout") {
-    var _document$getElementB;
-    const domHandle = (_document$getElementB = document.getElementById("__ada")) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.getAttribute("data-handle");
-    log("Client subscribed to chat_frame_timeout event", {
-      handle: domHandle || (isStartOptions(window.adaSettings) ? window.adaSettings.handle : undefined),
-      hostPage: window.location.href
-    }, {
-      sampleRate: 0.1,
-      level: "info"
-    });
-  }
-  subscriptions.push({
-    eventKey,
-    callback,
-    id
-  });
-  return id;
-}
-function publishEvent(eventKey, data) {
-  subscriptions.forEach(subscription => {
-    // Using startsWith instead of === allows subscribing to a specific event OR a namespace,
-    // e.g. ada:campaigns subscribes to ada:campaigns:opened, ada:campaigns:engaged, and
-    // ada:campaigns:shown. Broadcasting this way simultaneously reaches subscriptions
-    // that have subscribed to a specific event, and those that have subscribed to a namespace
-    if (eventKey.startsWith(subscription.eventKey)) {
-      // try/catch to guard against missing or bad callbacks
-      try {
-        subscription.callback(data, {
-          eventKey
-        });
-      } catch {
-        // silently fail and proceed with remaining callbacks
-      }
-    }
-  });
-}
 ;// CONCATENATED MODULE: ./src/common/helpers/config-info.ts
 const isProduction = "production" === "production";
 ;// CONCATENATED MODULE: ./src/common/helpers/url/constants.ts
@@ -16541,8 +16471,8 @@ const ports = {
 };
 ;// CONCATENATED MODULE: ./src/common/helpers/url/index.ts
 
-function url_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function url_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? url_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : url_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 
 
 const DEFAULT_ADA_DOMAIN = "ada";
@@ -16569,7 +16499,7 @@ function getEmbedURL(_ref) {
   } else {
     host = `http://${handle}.localhost:9001`;
   }
-  return `${host}/embed/${frameName}/${"8cc0a0d"}/index.html`;
+  return `${host}/embed/${frameName}/${"96768c4"}/index.html`;
 }
 function constructQueryString(query) {
   return Object.keys(query).map(key => {
@@ -16617,7 +16547,7 @@ function getChatURL(_ref3) {
     domain,
     qp
   } = _ref3;
-  const queryParams = url_objectSpread(url_objectSpread({}, qp), {}, {
+  const queryParams = _objectSpread(_objectSpread({}, qp), {}, {
     version
   });
   const queryString = constructQueryString(queryParams);
@@ -17110,7 +17040,7 @@ const getInitialState = adaSettings => ({
   wasCampaignShownButNowClosed: false,
   proactiveCampaignHadMessages: false,
   deviceToken: null,
-  showFallbackOnTimeout: false
+  showFallbackOnTimeout: true
 });
 ;// CONCATENATED MODULE: ./src/common/helpers/get-intro-for-url.ts
 function getProcessedPath(path) {
@@ -17376,6 +17306,19 @@ const get_browser_language_getBrowserLanguage = () => {
   return browserLanguageString;
 };
 /* harmony default export */ var get_browser_language = (get_browser_language_getBrowserLanguage);
+;// CONCATENATED MODULE: ./src/services/helpers.ts
+const NO_OP_FUNCTION = () => {
+  // Do nothing
+};
+function isStartOptions(input) {
+  if (!(typeof input === "object")) {
+    return false;
+  }
+  if (input === null) {
+    return false;
+  }
+  return typeof input.handle === "string";
+}
 ;// CONCATENATED MODULE: ./src/campaigns/campaign.ts
 
 function campaign_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -17698,6 +17641,51 @@ function getButtonText(client) {
   }
   return buttonTextMap[languageKey];
 }
+// EXTERNAL MODULE: ./node_modules/lodash.memoize/index.js
+var lodash_memoize = __webpack_require__(7654);
+var lodash_memoize_default = /*#__PURE__*/__webpack_require__.n(lodash_memoize);
+;// CONCATENATED MODULE: ./src/services/logger/index.ts
+
+function logger_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function logger_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? logger_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : logger_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+
+
+const DEFAULT_LOG_SAMPLE_RATE = 0.01;
+const DD_BASE_URL = "https://browser-http-intake.logs.datadoghq.com/v1/input/";
+const DD_TOKEN = "pubfe23baedd2ea322bebb5ed2020fa2fa1";
+
+// We need memoization to ensure consistency of logs
+const shouldLog = lodash_memoize_default()(sampleRate => {
+  if (!DD_TOKEN || sampleRate === 0) {
+    return false;
+  }
+  return Math.random() < (sampleRate || DEFAULT_LOG_SAMPLE_RATE);
+});
+
+/**
+ * Sends log to Datadog
+ */
+async function log(message, extra, options) {
+  if (!shouldLog(options === null || options === void 0 ? void 0 : options.sampleRate)) {
+    return;
+  }
+  await httpRequest({
+    url: `${DD_BASE_URL}${DD_TOKEN}?ddsource=browser&ddtags=version:1.5.0,env:${"production"}`,
+    method: "POST",
+    body: JSON.stringify(logger_objectSpread(logger_objectSpread({
+      message
+    }, extra), {}, {
+      level: (options === null || options === void 0 ? void 0 : options.level) || "info",
+      sampleRate: (options === null || options === void 0 ? void 0 : options.sampleRate) || DEFAULT_LOG_SAMPLE_RATE,
+      service: "embed",
+      env: "production",
+      embedVersion: 2,
+      version: "1.11.11",
+      isNpm: true,
+      commitHash: "96768c4"
+    }))
+  });
+}
 ;// CONCATENATED MODULE: ./src/client/helpers/alternative-bot-rollout/index.ts
 
 function alternative_bot_rollout_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -18354,8 +18342,8 @@ const loadChatManifest = async () => {
         hostPage: window.location.href,
         manifestUrl: CHAT_MANIFEST_PATH
       }, {
-        level: "error",
-        sampleRate: 1.0
+        level: "warn",
+        sampleRate: 0.01
       });
       return undefined;
     }
@@ -18367,8 +18355,8 @@ const loadChatManifest = async () => {
       hostPage: window.location.href,
       manifestUrl: CHAT_MANIFEST_PATH
     }, {
-      level: "error",
-      sampleRate: 1.0
+      level: "warn",
+      sampleRate: 0.01
     });
     return undefined;
   }
@@ -18750,7 +18738,8 @@ function ButtonFrame_mapStateToProps(storeState) {
 /* harmony default export */ var components_ButtonFrame = (connect(ButtonFrame_mapStateToProps)(ButtonFrame));
 ;// CONCATENATED MODULE: ./src/common/constants/timeouts.ts
 const ANIMATION_DELAY = 50;
-const CHAT_FALLBACK_DELAY_MS = 5000;
+const CHAT_FRAME_TIMEOUT_EVENT_MS = 5000;
+const CHAT_FALLBACK_DELAY_MS = 10000;
 ;// CONCATENATED MODULE: ./src/common/helpers/is-mobile.ts
 const isMobile = /(iPhone)|(iPod)|(android)|(webOS)/i.exec(navigator.userAgent) !== null;
 ;// CONCATENATED MODULE: ./src/client/components/ChatFrame/chatFrameEvents/chatterEvent/index.ts
@@ -18961,7 +18950,7 @@ class ChatFrame extends d {
     log("Chat frame mount", {
       handle,
       chatUrl: this.url,
-      embedVersion: "8cc0a0d".slice(0, 7),
+      embedVersion: "96768c4".slice(0, 7),
       embedSettings: adaSettings
     });
 
@@ -19049,7 +19038,7 @@ class ChatFrame extends d {
     const hostPageUrlParams = new URL(window.location.href).searchParams;
     const smsToken = hostPageUrlParams.get("adaSMSToken");
     const queryParams = {
-      embedVersion: "8cc0a0d".slice(0, 7),
+      embedVersion: "96768c4".slice(0, 7),
       greeting,
       language,
       skipGreeting,
@@ -19646,8 +19635,6 @@ class ChatFrame extends d {
     if (currentSrc !== null && currentSrc !== void 0 && currentSrc.startsWith("data:text/html")) {
       return;
     }
-
-    // Clear any existing timeout before starting new one (prevents orphaned timeouts)
     this.clearFallbackTimeout();
     this.chatRenderTimeout = window.setTimeout(() => {
       var _this$channel;
@@ -19655,13 +19642,13 @@ class ChatFrame extends d {
         isDrawerOpen: drawerIsOpen
       } = this.props;
 
-      // Only show fallback if drawer is STILL open and chat hasn't connected
+      // Only fire event if drawer is STILL open and chat hasn't connected
       if (!((_this$channel = this.channel) !== null && _this$channel !== void 0 && _this$channel.isConnected) && drawerIsOpen) {
         log("Chat frame took over 5 seconds to respond", {
           handle
         }, {
-          level: "error",
-          sampleRate: 1.0
+          level: "warn",
+          sampleRate: 0.01
         });
 
         // SUP-1141- TODO: Remove chatFrameTimeoutCallback
@@ -19669,30 +19656,29 @@ class ChatFrame extends d {
           chatFrameTimeoutCallback();
         }
         publishEvent("ada:chat_frame_timeout", undefined);
-        if (showFallbackOnTimeout) {
-          this.setState({
-            showFallback: true
-          });
-        }
       }
-    }, CHAT_FALLBACK_DELAY_MS);
+    }, CHAT_FRAME_TIMEOUT_EVENT_MS);
     this.chatRenderTimeoutLater = window.setTimeout(() => {
       var _this$channel2;
       const {
         isDrawerOpen: drawerIsOpen
       } = this.props;
-
-      // REMOVE: ONLY FOR LOGGING PURPOSES
-      // Only show fallback if drawer is STILL open and chat hasn't connected - 10 second check
       if (!((_this$channel2 = this.channel) !== null && _this$channel2 !== void 0 && _this$channel2.isConnected) && drawerIsOpen) {
         log("Chat frame took over 10 seconds to respond", {
           handle
         }, {
-          level: "error",
-          sampleRate: 1.0
+          level: "warn",
+          sampleRate: 0.01
         });
+        const hasTimeoutEventSubscription = hasEventSubscription("ada:chat_frame_timeout");
+        const shouldShowFallback = showFallbackOnTimeout !== false && !hasTimeoutEventSubscription;
+        if (shouldShowFallback) {
+          this.setState({
+            showFallback: true
+          });
+        }
       }
-    }, CHAT_FALLBACK_DELAY_MS + 5000);
+    }, CHAT_FALLBACK_DELAY_MS);
   }
   render() {
     const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ada-support/embed2",
-  "version": "1.11.3",
+  "version": "1.11.11",
   "description": "",
   "main": "dist/npm-entry",
   "typings": "dist/npm-entry/index-npm.d.ts",
@@ -34,7 +34,6 @@
     "bundle-report-intro": "webpack-bundle-analyzer --port 4204 dist/embed/intro/local/stats.json dist/embed/intro/local",
     "bundle-report-x-storage": "webpack-bundle-analyzer --port 4205 dist/embed/x-storage/local/stats.json dist/embed/x-storage/local",
     "bundle-report": "DATADOG_TOKEN=test BUNDLE_ANALYSER=true yarn build && run-p bundle-report-entry bundle-report-button bundle-report-mask bundle-report-intro bundle-report-x-storage",
-    "prepare": "husky install",
     "check-package-version": "./check-package-version.sh",
     "audit-dependencies": "yarn audit --groups dependencies"
   },
@@ -75,10 +74,8 @@
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-sonarjs": "^0.11.0",
     "html-webpack-plugin": "^5.5.0",
-    "husky": "^7.0.0",
     "jest": "^27.5.1",
     "jest-localstorage-mock": "^2.4.0",
-    "lint-staged": "^11.2.3",
     "mock-xmlhttprequest": "^7.0.4",
     "npm-run-all": "^4.1.5",
     "prettier": "2.7.1",
@@ -111,14 +108,16 @@
     "terser": ">=5.14.2",
     "@babel/traverse": ">=7.23.2",
     "semver": ">=7.5.2",
-    "form-data": ">=4.0.4"
+    "form-data": ">=4.0.4",
+    "diff": "^4.0.4"
   },
   "files": [
     "dist/npm-entry"
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/AdaSupport/embed-2.git"
+    "url": "https://github.com/AdaSupport/monorepo.git",
+    "directory": "embed-2"
   },
   "publishConfig": {
     "access": "public"