@ada-support/embed2 1.7.37 → 1.8.0

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

@@ -1,4 +1,4 @@
-import type { URLMatchTriggerCondition } from "common/types/helpers";
+import type { URLMatchTriggerCondition } from "campaigns/types";
 export interface BusinessEvent {
     event_key: string;
     value: number;

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

@@ -1,6 +1,23 @@
-import type { TriggerCondition } from "common/types/helpers";
 export declare type GoalEvent = unknown;
 export declare type CampaignFrequency = "every-time" | "once-per-session" | "once-per-user";
+export declare type TriggerCondition = URLMatchTriggerCondition | DateTimeTriggerCondition;
+export interface URLMatchTriggerCondition {
+    type: "url-match";
+    conditions_any: [
+        {
+            type: "ends-with" | "contains" | "equals" | "regex";
+            value: string;
+        }
+    ];
+}
+export interface DateTimeTriggerCondition {
+    type: "datetime";
+    timezone: string;
+    condition: {
+        operator: "before-exclusive" | "after-inclusive";
+        datetime: string;
+    };
+}
 export interface MarketingCampaign {
     _id: string;
     version: "2021-01-12";

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

@@ -77,6 +77,7 @@ export declare const SET_DEVICE_TOKEN_RESPONSE = "SET_DEVICE_TOKEN_RESPONSE";
 export declare const TRIGGER_PROACTIVE = "TRIGGER_PROACTIVE";
 export declare const TRIGGER_PROACTIVE_RESPONSE = "TRIGGER_PROACTIVE_RESPONSE";
 export declare const SEND_GREETING = "SEND_GREETING";
+export declare const INJECT_PROACTIVE_CONVERSATION = "INJECT_PROACTIVE_CONVERSATION";
 /**
  * Fetch Event Status
  */

package/dist/npm-entry/common/helpers/TriggerConditionEvaluator.d.ts

@@ -1,4 +1,5 @@
-import type { DateTimeTriggerCondition, TriggerCondition, URLMatchTriggerCondition } from "common/types/helpers";
-export declare const evalUrlMatchTriggerCondition: (triggerCondition: URLMatchTriggerCondition, url: string) => boolean;
+import type { DateTimeTriggerCondition, TriggerCondition } from "campaigns/types";
+import type { UrlTriggerCondition } from "proactiveConversations/types";
+export declare const evalUrlMatchTriggerCondition: (triggerConditions: UrlTriggerCondition[], url: string) => boolean;
 export declare const evalDatetimeTriggerCondition: (triggerCondition: DateTimeTriggerCondition, currentDateTime: Date) => boolean;
 export declare const evalTriggerCondition: (triggerCondition: TriggerCondition) => boolean;

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

@@ -35,6 +35,9 @@ export interface EmbedRequestPayloadByEvent {
         language: string;
     };
     TRIGGER_PROACTIVE: TriggerProactiveParams;
+    INJECT_PROACTIVE_CONVERSATION: {
+        key: string;
+    };
 }
 export declare type EmbedRequestEvent = keyof EmbedRequestPayloadByEvent;
 export interface EmbedResponsePayloadByEvent {

package/dist/npm-entry/common/types/helpers.d.ts

@@ -1,21 +1,3 @@
 export declare type PartialRecord<K extends keyof any, T> = {
     [P in K]?: T;
 };
-export declare type TriggerCondition = URLMatchTriggerCondition | DateTimeTriggerCondition;
-export interface URLMatchTriggerCondition {
-    type: "url-match";
-    conditions_any: [
-        {
-            type: "ends-with" | "contains" | "equals" | "regex";
-            value: string;
-        }
-    ];
-}
-export interface DateTimeTriggerCondition {
-    type: "datetime";
-    timezone: string;
-    condition: {
-        operator: "before-exclusive" | "after-inclusive";
-        datetime: string;
-    };
-}

package/dist/npm-entry/index.js

@@ -13949,7 +13949,7 @@ const client = new BrowserClient({
     return event;
   },
   environment: "production",
-  release: "1.7.37-29ccb35",
+  release: "1.8.0-65176dc",
   sampleRate: 0.25,
   autoSessionTracking: false,
   // Integrations don't seem to work with Sentry: https://github.com/getsentry/sentry-javascript/issues/2541
@@ -14069,6 +14069,7 @@ const TRIGGER_PROACTIVE_RESPONSE = "TRIGGER_PROACTIVE_RESPONSE";
 
 // Tells chat to send a greeting
 const SEND_GREETING = "SEND_GREETING";
+const INJECT_PROACTIVE_CONVERSATION = "INJECT_PROACTIVE_CONVERSATION";
 
 /**
  * Fetch Event Status
@@ -14523,7 +14524,7 @@ function getEmbedURL(_ref) {
   } else {
     host = `http://${handle}.localhost:9001`;
   }
-  return `${host}/embed/${frameName}/${"29ccb35"}/index.html`;
+  return `${host}/embed/${frameName}/${"65176dc"}/index.html`;
 }
 function constructQueryString(query) {
   return Object.keys(query).map(key => {
@@ -15072,7 +15073,7 @@ function doesUrlMatchPath(url, path) {
 ;// CONCATENATED MODULE: ./src/common/helpers/TriggerConditionEvaluator.ts
 
 const stripTrailingSlash = url => url.endsWith("/") ? url.slice(0, -1) : url;
-const evalUrlMatchTriggerCondition = (triggerCondition, url) => {
+const evalUrlMatchTriggerCondition = (triggerConditions, url) => {
   /**
    * Behaviour
    * regex       Regex match (as per javascript string .match) over the whole string including
@@ -15082,7 +15083,7 @@ const evalUrlMatchTriggerCondition = (triggerCondition, url) => {
    * equals      Matches the exact URL, without query params
    */
   const urlWithoutQueryParams = url.split("?")[0];
-  return triggerCondition.conditions_any.some(condition => {
+  return triggerConditions.some(condition => {
     switch (condition.type) {
       case "ends-with":
         {
@@ -15121,7 +15122,7 @@ const evalDatetimeTriggerCondition = (triggerCondition, currentDateTime) => {
 const evalTriggerCondition = triggerCondition => {
   switch (triggerCondition.type) {
     case "url-match":
-      return evalUrlMatchTriggerCondition(triggerCondition, window.location.href);
+      return evalUrlMatchTriggerCondition(triggerCondition.conditions_any, window.location.href);
     case "datetime":
       return evalDatetimeTriggerCondition(triggerCondition, new Date());
     // If an unknown trigger type is found, ignore the trigger condition - do not block campaign
@@ -15701,9 +15702,9 @@ async function log(message, extra, options) {
       service: "embed",
       env: "production",
       embedVersion: 2,
-      version: "1.7.37",
+      version: "1.8.0",
       isNpm: true,
-      commitHash: "29ccb35"
+      commitHash: "65176dc"
     }))
   });
 }
@@ -16235,6 +16236,7 @@ function proactiveConversation_objectSpread(e) { for (var r = 1; r < arguments.l
 
 
 
+
 function proactiveShownWithinFrequency(proactiveConversationKey, frequency, handle) {
   switch (frequency) {
     case "always":
@@ -16275,7 +16277,8 @@ function proactiveTriggerImpl(_ref) {
     messageKey,
     adaSettings,
     messageService,
-    clearProactiveMessage
+    setRecentProactiveConversationKey,
+    clearProactiveConversation
   } = _ref;
   const {
     handle
@@ -16294,7 +16297,8 @@ function proactiveTriggerImpl(_ref) {
 
   // Record the proactive message as being shown
   recordProactiveTrigger(messageKey, frequency, handle);
-  clearProactiveMessage();
+  setRecentProactiveConversationKey(messageKey);
+  clearProactiveConversation();
   const localChannel = messageService.getChannel("local");
   const lang = adaSettings.language || get_browser_language();
   const message = proactiveConversation.messages[lang][0];
@@ -16305,20 +16309,10 @@ function proactiveTriggerImpl(_ref) {
   });
 }
 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;
-    }
-  });
+  if (!conditions.length) {
+    return false;
+  }
+  return evalUrlMatchTriggerCondition(conditions, url);
 }
 ;// CONCATENATED MODULE: ./src/services/chat-versioning/manifest.ts
 
@@ -16846,7 +16840,7 @@ class ChatFrame extends d {
     const hostPageUrlParams = new URL(window.location.href).searchParams;
     const smsToken = hostPageUrlParams.get("adaSMSToken");
     const queryParams = {
-      embedVersion: "29ccb35".slice(0, 7),
+      embedVersion: "65176dc".slice(0, 7),
       greeting,
       language,
       skipGreeting,
@@ -17722,7 +17716,8 @@ class Container extends d {
       followUpResponseId: null,
       chatVersion: undefined,
       readyToRenderChatFrame: false,
-      proactiveConversation: null
+      proactiveConversation: null,
+      recentProactiveConversationKey: null
     });
     _defineProperty(this, "resetChatBound", this.resetChat.bind(this));
     _defineProperty(this, "locationChangeHandlerBound", this.locationChangeHandler.bind(this));
@@ -17837,7 +17832,8 @@ class Container extends d {
       campaignToTrigger,
       campaignTriggerOptions,
       followUpResponseId,
-      proactiveConversation
+      proactiveConversation,
+      recentProactiveConversationKey
     } = this.state;
 
     /* We wait for all necessary preconditions (e.g. necessary connections established) to be true,
@@ -17869,7 +17865,10 @@ class Container extends d {
         messageKey: proactiveConversation.key,
         adaSettings,
         messageService,
-        clearProactiveMessage: () => this.setState({
+        setRecentProactiveConversationKey: key => this.setState({
+          recentProactiveConversationKey: key
+        }),
+        clearProactiveConversation: () => this.setState({
           proactiveConversation: null
         })
       });
@@ -17893,6 +17892,17 @@ class Container extends d {
         });
       }
     }
+    if (isChatWebsocketConnected && isDrawerOpen && recentProactiveConversationKey) {
+      const chatChannel = messageService.getChannel(CHAT_IFRAME);
+      if (chatChannel) {
+        chatChannel.postMessage(INJECT_PROACTIVE_CONVERSATION, {
+          key: recentProactiveConversationKey
+        });
+        this.setState({
+          recentProactiveConversationKey: null
+        });
+      }
+    }
     if (prevProps.isDrawerOpen !== isDrawerOpen && toggleCallback) {
       toggleCallback(isDrawerOpen);
     }

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

@@ -1,11 +1,12 @@
 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, }: {
+export declare function proactiveTriggerImpl({ proactiveConversation, messageKey, adaSettings, messageService, setRecentProactiveConversationKey, clearProactiveConversation, }: {
     proactiveConversation: ProactiveConversation;
     messageKey: string;
     adaSettings: StartOptions;
     messageService: MessageService;
-    clearProactiveMessage: () => void;
+    setRecentProactiveConversationKey: (key: string) => void;
+    clearProactiveConversation: () => void;
 }): void;
 export declare function evaluateUrlTriggerConditions(conditions: UrlTriggerCondition[], url: string): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ada-support/embed2",
-  "version": "1.7.37",
+  "version": "1.8.0",
   "description": "",
   "main": "dist/npm-entry",
   "typings": "dist/npm-entry/index-npm.d.ts",