@ada-support/embed2 1.2.1 → 1.2.4

package/dist/npm-entry/common/lib/fc/index.d.ts

@@ -19,6 +19,7 @@ export declare class FrameChannel extends Channel {
     constructor(name: string, targetWindow: Window, targetOrigin?: string);
     private static isMessageEvent;
     postMessage<T extends EmbedEvent>(eventName: T, data?: PayloadByEvent[T], id?: string, status?: FetchEventStatusType): void;
+    isValidMessageEvent(event: MessageEvent | object): boolean;
     addEventListener(handler: (type: string, payload?: object, id?: string, status?: FetchEventStatusType) => void): Refhandler;
     constructObjectToSend(eventName?: string, payload?: unknown, id?: string, status?: FetchEventStatusType): string;
 }

package/dist/npm-entry/index.js

@@ -15635,7 +15635,7 @@ const client = new error_tracker_BrowserClient({
   },
 
   environment: "production",
-  release: "1.2.1-509b342",
+  release: "1.2.4-cd36657",
   sampleRate: 0.25,
   autoSessionTracking: false,
   // Integrations don't seem to work with Sentry: https://github.com/getsentry/sentry-javascript/issues/2541
@@ -15911,11 +15911,25 @@ class FrameChannel extends Channel {
     this.targetWindow.postMessage(this.constructObjectToSend(eventName, data, id, status), this.targetOrigin);
   }
 
+  isValidMessageEvent(event) {
+    if (false) {}
+
+    if (this.targetOrigin === "*") {
+      return true;
+    }
+
+    if (!("origin" in event)) {
+      return false;
+    }
+
+    return event.origin === this.targetOrigin;
+  }
+
   addEventListener(handler) {
     const handleRef = event => {
       let parsedData;
 
-      if ( true && this.targetOrigin !== "*" && (!("origin" in event) || this.targetOrigin.indexOf(event.origin) < 0)) {
+      if (!this.isValidMessageEvent(event)) {
         return;
       }
 
@@ -16235,7 +16249,7 @@ function getEmbedURL(_ref) {
     host = "http://".concat(window.location.hostname, ":9001");
   }
 
-  return "".concat(host, "/embed/").concat(frameName, "/").concat("509b342", "/index.html");
+  return "".concat(host, "/embed/").concat(frameName, "/").concat("cd36657", "/index.html");
 }
 /**
  * Generate the Chat / API URL
@@ -17791,12 +17805,15 @@ async function log(message, extra, options) {
       service: "embed",
       env: "production",
       embedVersion: 2,
-      version: "1.2.1",
+      version: "1.2.4",
       isNpm: true,
-      commitHash: "509b342"
+      commitHash: "cd36657"
     }))
   });
 }
+// EXTERNAL MODULE: ./node_modules/@babel/runtime-corejs3/core-js-stable/url.js
+var url = __webpack_require__(9969);
+var url_default = /*#__PURE__*/__webpack_require__.n(url);
 ;// CONCATENATED MODULE: ./src/client/components/IFrame/index.tsx
 
 
@@ -17805,6 +17822,8 @@ async function log(message, extra, options) {
 
 
 
+
+
 class IFrame extends d {
   constructor() {
     super(...arguments);
@@ -17814,6 +17833,23 @@ class IFrame extends d {
     _defineProperty(this, "channel", void 0);
   }
 
+  getChannel() {
+    const {
+      name,
+      store,
+      messageService
+    } = this.props;
+
+    if (this.channel) {
+      return this.channel;
+    }
+
+    const targetOrigin = new (url_default())(this.iframeRef.current.src).origin;
+    const channel = messageService.registerFrameChannel(name, this.iframeRef.current.contentWindow, targetOrigin);
+    store.addChannelListener(name);
+    return channel;
+  }
+
   componentDidMount() {
     this.connectFrame();
   }
@@ -17824,7 +17860,7 @@ class IFrame extends d {
     } = this.props;
 
     if (appConnectionState === ConnectionState.Done) {
-      this.channel.postMessage(ALL_FRAMES_LOADED);
+      this.getChannel().postMessage(ALL_FRAMES_LOADED);
     }
   }
 
@@ -17843,6 +17879,11 @@ class IFrame extends d {
       domain,
       cluster
     } = this.props;
+
+    if (!handle) {
+      throw new AdaEmbedError("`handle` is undefined");
+    }
+
     return getEmbedURL({
       frameName: name,
       handle,
@@ -17854,13 +17895,10 @@ class IFrame extends d {
   async connectFrame() {
     const {
       name,
-      store,
       setState,
-      messageService,
       setConnectionState
     } = this.props;
-    this.channel = messageService.registerFrameChannel(name, this.iframeRef.current.contentWindow, this.iframeRef.current.src);
-    store.addChannelListener(name);
+    this.channel = this.getChannel();
     await setConnectionState({
       [name]: ConnectionState.Loading
     });
@@ -17870,9 +17908,9 @@ class IFrame extends d {
     const initMessageHandler = (type, payload) => {
       (async () => {
         if (type === "".concat(name, "_INIT")) {
-          this.channel.removeEventListener(handlerRef);
-          this.channel.clearTrackedTimeout(timeout);
-          this.channel.isConnected = true;
+          this.getChannel().removeEventListener(handlerRef);
+          this.getChannel().clearTrackedTimeout(timeout);
+          this.getChannel().isConnected = true;
           /**
            * Set initial state (if any).
            * This is mostly useful for XStorage to set state based on storage values
@@ -17890,7 +17928,7 @@ class IFrame extends d {
     };
 
     timeout = window.setTimeout(() => {
-      this.channel.removeEventListener(handlerRef);
+      this.getChannel().removeEventListener(handlerRef);
       setConnectionState({
         [name]: ConnectionState.Failure
       });
@@ -18067,9 +18105,6 @@ function ButtonFrame_mapStateToProps(storeState) {
 }
 
 /* harmony default export */ var components_ButtonFrame = (connect(ButtonFrame_mapStateToProps)(ButtonFrame));
-// EXTERNAL MODULE: ./node_modules/@babel/runtime-corejs3/core-js-stable/url.js
-var url = __webpack_require__(9969);
-var url_default = /*#__PURE__*/__webpack_require__.n(url);
 ;// CONCATENATED MODULE: ./src/common/constants/timeouts.ts
 const ANIMATION_DELAY = 50;
 ;// CONCATENATED MODULE: ./src/common/helpers/is-mobile.ts
@@ -18124,7 +18159,8 @@ class ChatFrame extends d {
     } = this.props;
     this.rememberInitialPageStyle();
     setChatHasBeenRendered();
-    this.channel = messageService.registerFrameChannel("chat", this.iframeRef.current.contentWindow, this.iframeRef.current.src);
+    const targetOrigin = new (url_default())(this.iframeRef.current.src).origin;
+    this.channel = messageService.registerFrameChannel("chat", this.iframeRef.current.contentWindow, targetOrigin);
     store.addChannelListener("chat");
     this.bindChatEventHandlers();
     this.handleScrollLock(); // We use this log to track number of chat impressions (times when users see chat iFrame render first time).
@@ -18198,7 +18234,7 @@ class ChatFrame extends d {
     const hostPageUrlParams = new (url_default())(window.location.href).searchParams;
     const smsToken = hostPageUrlParams.get("adaSMSToken");
     const queryParams = {
-      embedVersion: "509b342".slice(0, 7),
+      embedVersion: "cd36657".slice(0, 7),
       greeting,
       language,
       skipGreeting,
@@ -20342,7 +20378,7 @@ class Embed {
 
 }
 
-_defineProperty(Embed, "embed2Version", "509b342");
+_defineProperty(Embed, "embed2Version", "cd36657");
 ;// CONCATENATED MODULE: ./src/common/helpers/startup.ts
 
 
@@ -20373,17 +20409,17 @@ function createEmbedObject() {
       startEmbed = new Promise(resolve => {
         startEmbedResolve = resolve;
       });
-
-      if (window.adaEmbedLoadedCallback) {
-        window.adaEmbedLoadedCallback();
-      }
-
       embed = new Embed(adaSettings, () => {
         // Remove Embed instance in teardown callback
         startEmbed = null;
         embed = null;
       });
       startEmbedResolve();
+
+      if (window.adaEmbedLoadedCallback) {
+        window.adaEmbedLoadedCallback();
+      }
+
       log("Embed start", {
         handle: adaSettings.handle,
         embedSettings: adaSettings,

package/package.json

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