@ada-support/embed2 1.7.29 → 1.7.32

package/dist/npm-entry/common/lib/channel.d.ts

@@ -8,6 +8,7 @@ export interface EmbedRequestPayloadByEvent {
     CREATE_PROACTIVE: {
         body: string;
         duration: number | null;
+        delay?: number;
         responseId?: string | null;
     };
     DELETE_HISTORY: undefined;

package/dist/npm-entry/index.js

@@ -13949,7 +13949,7 @@ const client = new BrowserClient({
     return event;
   },
   environment: "production",
-  release: "1.7.29-6752092",
+  release: "1.7.32-26543c8",
   sampleRate: 0.25,
   autoSessionTracking: false,
   // Integrations don't seem to work with Sentry: https://github.com/getsentry/sentry-javascript/issues/2541
@@ -14523,7 +14523,7 @@ function getEmbedURL(_ref) {
   } else {
     host = `http://${handle}.localhost:9001`;
   }
-  return `${host}/embed/${frameName}/${"6752092"}/index.html`;
+  return `${host}/embed/${frameName}/${"26543c8"}/index.html`;
 }
 function constructQueryString(query) {
   return Object.keys(query).map(key => {
@@ -14928,7 +14928,7 @@ class StoreProxy {
   }
 }
 ;// CONCATENATED MODULE: ./src/client/helpers/local-notifications/index.ts
-const browserHasNotificationSupport = ("Notification" in window);
+const browserHasNotificationSupport = "Notification" in window;
 function checkIfUserHasGivenPermission() {
   if (!browserHasNotificationSupport) {
     return false;
@@ -15467,7 +15467,6 @@ function triggerCampaignImpl(_ref) {
     }).catch(NO_OP_FUNCTION); // we don't want to log errors here, it may fail because of rate limiting
   }
 }
-
 const getCampaignToTrigger = (adaSettings, marketingCampaigns, options, onlyBasic) => {
   const {
     ignoreStatus = false,
@@ -15702,9 +15701,9 @@ async function log(message, extra, options) {
       service: "embed",
       env: "production",
       embedVersion: 2,
-      version: "1.7.29",
+      version: "1.7.32",
       isNpm: true,
-      commitHash: "6752092"
+      commitHash: "26543c8"
     }))
   });
 }
@@ -16229,6 +16228,98 @@ function setBrowserStorageItem(key, value, persistenceSetting) {
     dist/* adaSessionStorage */.ad.setItem(key, value);
   }
 }
+;// CONCATENATED MODULE: ./src/proactiveConversations/proactiveConversation.ts
+
+function proactiveConversation_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 proactiveConversation_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? proactiveConversation_ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : proactiveConversation_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+
+
+
+function proactiveShownWithinFrequency(proactiveConversationKey, frequency, handle) {
+  switch (frequency) {
+    case "always":
+      return false;
+    case "session":
+      {
+        const storageValue = dist/* adaSessionStorage */.ad.getFnItem("marketing_campaigns_shown");
+        const perSessionProactives = storageValue ? (storageValue[handle] || "").split(",") : [];
+        return perSessionProactives.includes(proactiveConversationKey);
+      }
+    default:
+      return false;
+  }
+}
+function addProactiveToStorageString(oldStorageValue, proactiveConversationId) {
+  return oldStorageValue ? `${oldStorageValue},${proactiveConversationId}` : proactiveConversationId;
+}
+function recordProactiveTrigger(proactiveConversationKey, frequency, handle) {
+  switch (frequency) {
+    case "always":
+      break;
+    case "session":
+      {
+        const currentStorageValue = dist/* adaSessionStorage */.ad.getFnItem("marketing_campaigns_shown");
+        const newStorageValue = addProactiveToStorageString(currentStorageValue ? currentStorageValue[handle] || "" : "", proactiveConversationKey);
+        dist/* adaSessionStorage */.ad.setFnItem("marketing_campaigns_shown", proactiveConversation_objectSpread(proactiveConversation_objectSpread({}, currentStorageValue), {}, {
+          [handle]: newStorageValue
+        }));
+        break;
+      }
+    default:
+      break;
+  }
+}
+function proactiveTriggerImpl(_ref) {
+  let {
+    proactiveConversation,
+    messageKey,
+    adaSettings,
+    messageService,
+    clearProactiveMessage
+  } = _ref;
+  const {
+    handle
+  } = adaSettings;
+  const {
+    duration,
+    delay,
+    frequency
+  } = proactiveConversation.modality_config.chat;
+
+  // Check if the proactive message has been shown within the specified frequency
+  const doesPassFrequencyCheck = !proactiveShownWithinFrequency(messageKey, frequency, handle);
+  if (!doesPassFrequencyCheck) {
+    return;
+  }
+
+  // Record the proactive message as being shown
+  recordProactiveTrigger(messageKey, frequency, handle);
+  clearProactiveMessage();
+  const localChannel = messageService.getChannel("local");
+  const lang = adaSettings.language || get_browser_language();
+  const message = proactiveConversation.messages[lang][0];
+  localChannel.postMessage(CREATE_PROACTIVE, {
+    body: message,
+    duration,
+    delay
+  });
+}
+function evaluateUrlTriggerConditions(conditions, url) {
+  return conditions.every(condition => {
+    switch (condition.type) {
+      case "equals":
+        return url === condition.value;
+      case "ends-with":
+        return url.endsWith(condition.value);
+      case "regex":
+        return new RegExp(condition.value).test(url);
+      case "contains":
+        return url.includes(condition.value);
+      default:
+        return false;
+    }
+  });
+}
 ;// CONCATENATED MODULE: ./src/services/chat-versioning/manifest.ts
 
 
@@ -16751,7 +16842,7 @@ class ChatFrame extends d {
     const hostPageUrlParams = new URL(window.location.href).searchParams;
     const smsToken = hostPageUrlParams.get("adaSMSToken");
     const queryParams = {
-      embedVersion: "6752092".slice(0, 7),
+      embedVersion: "26543c8".slice(0, 7),
       greeting,
       language,
       skipGreeting,
@@ -17605,6 +17696,7 @@ function Container_objectSpread(e) { for (var r = 1; r < arguments.length; r++)
 
 
 
+
 
 
 class Container extends d {
@@ -17621,7 +17713,8 @@ class Container extends d {
       hideIntroOverride: false,
       followUpResponseId: null,
       chatVersion: undefined,
-      readyToRenderChatFrame: false
+      readyToRenderChatFrame: false,
+      proactiveConversation: null
     });
     _defineProperty(this, "resetChatBound", this.resetChat.bind(this));
     _defineProperty(this, "locationChangeHandlerBound", this.locationChangeHandler.bind(this));
@@ -17735,7 +17828,8 @@ class Container extends d {
     const {
       campaignToTrigger,
       campaignTriggerOptions,
-      followUpResponseId
+      followUpResponseId,
+      proactiveConversation
     } = this.state;
 
     /* We wait for all necessary preconditions (e.g. necessary connections established) to be true,
@@ -17761,6 +17855,17 @@ class Container extends d {
         messageService
       });
     }
+    if (proactiveConversation && appConnectionState === ConnectionState.Done) {
+      proactiveTriggerImpl({
+        proactiveConversation,
+        messageKey: proactiveConversation.key,
+        adaSettings,
+        messageService,
+        clearProactiveMessage: () => this.setState({
+          proactiveConversation: null
+        })
+      });
+    }
 
     // If a follow-up response has been queued by a triggered Campaign, tell chat to show it
     if (isChatWebsocketConnected && isDrawerOpen && followUpResponseId) {
@@ -17787,6 +17892,7 @@ class Container extends d {
     // Wait for client to be available, then set campaign to trigger
     if (client && !prevProps.client) {
       this.evaluateCampaignConditions({}, true);
+      this.evaluateProactiveConversationConditions();
     }
 
     /**
@@ -17983,6 +18089,28 @@ class Container extends d {
       }
     }
   }
+  evaluateProactiveConversationConditions() {
+    const {
+      client
+    } = this.props;
+    if (!client) {
+      throw new AdaEmbedError("`client` is not defined");
+    }
+    const proactiveConversations = client.proactive_conversations;
+    if (!proactiveConversations) {
+      return;
+    }
+    const currentUrl = window.location.href;
+    Object.entries(proactiveConversations).forEach(_ref => {
+      let [key, conversation] = _ref;
+      const chatConfig = conversation.modality_config.chat;
+      if (chatConfig.active && evaluateUrlTriggerConditions(chatConfig.url_trigger_conditions, currentUrl)) {
+        this.handleProactiveTrigger(Container_objectSpread({
+          key
+        }, conversation));
+      }
+    });
+  }
   async handleSettingDeviceToken(localChannel, payload, id) {
     const {
       setGlobalState,
@@ -18004,6 +18132,17 @@ class Container extends d {
     });
     localChannel.postMessage(SET_DEVICE_TOKEN_RESPONSE, null, id);
   }
+  handleProactiveTrigger(proactiveConversation) {
+    const {
+      isDrawerOpen
+    } = this.props;
+    if (isDrawerOpen) {
+      return;
+    }
+    this.setState({
+      proactiveConversation
+    });
+  }
   async handleEmbedAction(type, payload, id) {
     const {
       client,
@@ -18200,7 +18339,8 @@ class Container extends d {
           }
           const {
             body,
-            duration
+            duration,
+            delay
           } = payload;
           const EXTRA_PROACTIVE_DELAY = 1000;
           this.setState({
@@ -18212,7 +18352,7 @@ class Container extends d {
             const newClient = new Client(Container_objectSpread(Container_objectSpread({}, client), {}, {
               intro: {
                 body,
-                delay: 0,
+                delay: delay || 0,
                 // Not just duration || null because we want to preserve 0 duration
                 duration: duration || duration === 0 ? duration : null,
                 style: "Text",
@@ -18251,17 +18391,18 @@ class Container extends d {
           if (!client) {
             throw new AdaEmbedError("`client` is not defined");
           }
-          const language = adaSettings.language || get_browser_language();
           const {
             messageKey
           } = payload;
           if ((_client$proactive_con = client.proactive_conversations) !== null && _client$proactive_con !== void 0 && _client$proactive_con[messageKey]) {
-            // eslint-disable-next-line no-console
-            console.log("Proactive message: ", client.proactive_conversations[messageKey].messages[language]);
+            const proactiveConversation = client.proactive_conversations[messageKey];
+            this.handleProactiveTrigger(Container_objectSpread(Container_objectSpread({}, proactiveConversation), {}, {
+              key: messageKey
+            }));
           } else {
-            // eslint-disable-next-line no-console
-            console.log("Proactive message not found");
+            warn(`Proactive message with key ${messageKey} not found`);
           }
+          localChannel.postMessage(TRIGGER_PROACTIVE_RESPONSE, null, id);
           break;
         }
       default:
@@ -18292,6 +18433,7 @@ class Container extends d {
         });
         this.evaluateCampaignConditions({}, true);
         this.evaluateBusinessEventConditions();
+        this.evaluateProactiveConversationConditions();
       });
     });
   }

package/dist/npm-entry/proactiveConversations/proactiveConversation.d.ts

@@ -0,0 +1,11 @@
+import type { StartOptions } from "@ada-support/embed-types";
+import type { MessageService } from "client/lib/message-service";
+import type { ProactiveConversation, UrlTriggerCondition } from "./types";
+export declare function proactiveTriggerImpl({ proactiveConversation, messageKey, adaSettings, messageService, clearProactiveMessage, }: {
+    proactiveConversation: ProactiveConversation;
+    messageKey: string;
+    adaSettings: StartOptions;
+    messageService: MessageService;
+    clearProactiveMessage: () => void;
+}): void;
+export declare function evaluateUrlTriggerConditions(conditions: UrlTriggerCondition[], url: string): boolean;

package/dist/npm-entry/proactiveConversations/types.d.ts

@@ -1,16 +1,24 @@
-export interface ProactiveConversations {
-    [messageKey: string]: {
-        messages: {
-            [language: string]: string[];
-        };
-        modality_config: {
-            [modality: string]: {
-                active: boolean;
-                url_trigger_conditions: string[];
-                delay: number;
-                duration: number;
-                frequency: string;
-            };
+export interface ProactiveConversation {
+    messages: {
+        [language: string]: string[];
+    };
+    modality_config: {
+        [modality: string]: {
+            active: boolean;
+            url_trigger_conditions: UrlTriggerCondition[];
+            delay: number;
+            duration: number;
+            frequency: ProactiveConversationFrequency;
         };
     };
+    key?: string;
+}
+export interface ProactiveConversations {
+    [messageKey: string]: ProactiveConversation;
+}
+export declare type ProactiveConversationFrequency = "always" | "session";
+export declare type ProactiveConversationUrlTriggerConditionType = "equals" | "ends-with" | "regex" | "contains";
+export interface UrlTriggerCondition {
+    type: ProactiveConversationUrlTriggerConditionType;
+    value: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ada-support/embed2",
-  "version": "1.7.29",
+  "version": "1.7.32",
   "description": "",
   "main": "dist/npm-entry",
   "typings": "dist/npm-entry/index-npm.d.ts",
@@ -43,6 +43,15 @@
   "license": "ISC",
   "devDependencies": {
     "@ada-support/eslint-config-ada": "^1.2.5",
+    "@babel/core": "^7.23.2",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-numeric-separator": "^7.16.7",
+    "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
+    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
+    "@babel/plugin-transform-react-jsx": "^7.16.7",
+    "@babel/plugin-transform-runtime": "^7.16.10",
+    "@babel/preset-env": "^7.23.2",
+    "@babel/preset-typescript": "^7.23.2",
     "@testing-library/preact": "^2.0.1",
     "@types/enzyme": "^3.10.11",
     "@types/jest": "^27.0.2",
@@ -54,9 +63,12 @@
     "@types/webpack": "^5.28.0",
     "@types/webpack-bundle-analyzer": "^4.4.1",
     "@types/webpack-dev-server": "^4.7.2",
+    "babel-loader": "9.1.2",
+    "babel-preset-preact": "^2.0.0",
     "browserslist": "^4.17.4",
     "cypress": "^9.6.1",
     "depcheck": "^1.4.3",
+    "dotenv": "^8.2.0",
     "enzyme": "^3.11.0",
     "enzyme-adapter-preact-pure": "^4.0.1",
     "eslint": "^8.8.0",
@@ -66,6 +78,7 @@
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-sonarjs": "^0.11.0",
     "husky": "^7.0.0",
+    "html-webpack-plugin": "^5.5.0",
     "jest": "^27.5.1",
     "jest-localstorage-mock": "^2.4.0",
     "lint-staged": "^11.2.3",
@@ -75,38 +88,25 @@
     "start-server-and-test": "^2.0.4",
     "ts-node": "^10.2.1",
     "tsconfig-paths": "^3.11.0",
+    "typescript": "^4.6.2",
+    "webpack": "^5.76.0",
     "webpack-bundle-analyzer": "^4.5.0",
-    "webpack-dev-server": "^4.3.1"
+    "webpack-cli": "^5.1.4",
+    "webpack-dev-server": "^4.3.1",
+    "webpack-merge": "^5.8.0"
   },
   "dependencies": {
     "@ada-support/embed-types": "^1.8.0",
     "@ada-support/web-storage": "^1.2.6",
-    "@babel/core": "^7.23.2",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
-    "@babel/plugin-proposal-numeric-separator": "^7.16.7",
-    "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
-    "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-    "@babel/plugin-transform-react-jsx": "^7.16.7",
-    "@babel/plugin-transform-runtime": "^7.16.10",
-    "@babel/preset-env": "^7.23.2",
-    "@babel/preset-typescript": "^7.23.2",
     "@babel/runtime-corejs3": "^7.15.4",
     "@sentry/browser": "^8.33.0",
     "@sentry/types": "^8.33.1",
-    "babel-loader": "9.1.2",
-    "babel-preset-preact": "^2.0.0",
-    "dotenv": "^8.2.0",
     "focus-visible": "^5.2.0",
-    "html-webpack-plugin": "^5.5.0",
     "json-stable-stringify": "^1.0.1",
     "lodash.debounce": "^4.0.8",
     "lodash.memoize": "^4.1.2",
     "preact": "10.4.5",
-    "typescript": "^4.6.2",
-    "uniqid": "^5.3.0",
-    "webpack": "^5.76.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-merge": "^5.8.0"
+    "uniqid": "^5.3.0"
   },
   "resolutions": {
     "@lambdatest/node-tunnel": ">=3.0.2",