@raydiant/playlist-window-manager 0.17.0 → 0.18.0

package/build/IFrameRenderer.d.ts

@@ -15,4 +15,5 @@ export default class IFrameRenderer implements PresentationWindowRenderer {
     destroy(): void;
     private getWindow;
     private globalMessageHandler;
+    private deserializeMessage;
 }

package/build/IFrameRenderer.js

@@ -35,34 +35,28 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var messagePrefix = 'raydiant:';
 var IFrameRenderer = /** @class */ (function () {
     function IFrameRenderer(container) {
         var _this = this;
         this.container = container;
         this.windows = {};
         this.globalMessageHandler = function (event) {
-            var _a;
-            var windowId;
-            var type;
-            var payload;
-            try {
-                (_a = JSON.parse(event.data), windowId = _a.windowId, type = _a.type, payload = _a.payload);
-            }
-            catch (err) {
-                console.warn("Invalid message received from iframe '" + JSON.stringify(event.data) + "', ignoring message");
-                return;
-            }
-            if (!windowId) {
-                // ignore messages that don't have windowId
-                // such message are comming from 3rd party IFrames like google
-                return;
-            }
-            var window = _this.getWindow(windowId);
-            if (!window) {
-                throw new Error("Failed add receive message callback to window, window with window id: '" + windowId + "' was not found");
-            }
-            if (window.receiveMessageCallback) {
-                window.receiveMessageCallback(type, payload);
+            // Ignore messages that don't start with the message prefix.
+            if (typeof event.data === 'string' &&
+                event.data.startsWith(messagePrefix)) {
+                var _a = _this.deserializeMessage(event.data), windowId = _a.windowId, type = _a.type, payload = _a.payload;
+                if (!windowId || !type) {
+                    console.warn("Invalid message received from child window '" + event.data + "'");
+                    return;
+                }
+                var window_1 = _this.getWindow(windowId);
+                if (!window_1) {
+                    throw new Error("Failed add receive message callback to window, window with window id: '" + windowId + "' was not found");
+                }
+                if (window_1.receiveMessageCallback) {
+                    window_1.receiveMessageCallback(type, payload);
+                }
             }
         };
         // Post message is a single channel for all window so we need to
@@ -178,7 +172,7 @@ var IFrameRenderer = /** @class */ (function () {
         if (!window.frame.contentWindow) {
             throw new Error("Failed to send message '" + message + "', contentWindow missing for '" + windowId + "'");
         }
-        window.frame.contentWindow.postMessage(message, '*');
+        window.frame.contentWindow.postMessage("" + messagePrefix + message, '*');
     };
     IFrameRenderer.prototype.muteWindow = function (windowId) {
         var window = this.getWindow(windowId);
@@ -202,6 +196,21 @@ var IFrameRenderer = /** @class */ (function () {
     IFrameRenderer.prototype.getWindow = function (windowId) {
         return this.windows[windowId];
     };
+    IFrameRenderer.prototype.deserializeMessage = function (message) {
+        var _a;
+        var windowId = '';
+        var type = '';
+        var payload;
+        var json = message.substring(messagePrefix.length);
+        try {
+            // Messages are sent as json in the format of { type: string, payload: unknown }.
+            (_a = JSON.parse(json), windowId = _a.windowId, type = _a.type, payload = _a.payload);
+        }
+        catch (err) {
+            // Not a valid message, return empty type and payload.
+        }
+        return { windowId: windowId, type: type, payload: payload };
+    };
     return IFrameRenderer;
 }());
 exports.default = IFrameRenderer;

package/build/PresentationWindow.js

@@ -63,7 +63,7 @@ var PlaylistWindowManager_1 = __importDefault(require("./PlaylistWindowManager")
 var WindowTimeoutError_1 = __importDefault(require("./WindowTimeoutError"));
 var WindowLoadError_1 = __importDefault(require("./WindowLoadError"));
 // TODO: Automatically inject latest version when building in CI.
-var defaultAppRendererUrl = 'https://apps.raydiant.com/2.0.0/index.html';
+var defaultAppRendererUrl = 'https://apps.raydiant.com/3.0.0/index.html';
 var isValidNumber = function (value) {
     return typeof value === 'number' && !isNaN(value);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raydiant/playlist-window-manager",
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "Window manager for playlist playback.",
   "main": "build/index.js",
   "scripts": {

package/src/IFrameRenderer.ts

@@ -9,6 +9,8 @@ interface IFrameRendererWindow {
   receiveMessageCallback?: (type: string, payload?: any) => void;
 }
 
+const messagePrefix = 'raydiant:';
+
 export default class IFrameRenderer implements PresentationWindowRenderer {
   private windows: {
     [windowId: string]: IFrameRendererWindow;
@@ -153,7 +155,7 @@ export default class IFrameRenderer implements PresentationWindowRenderer {
       );
     }
 
-    window.frame.contentWindow.postMessage(message, '*');
+    window.frame.contentWindow.postMessage(`${messagePrefix}${message}`, '*');
   }
 
   public muteWindow(windowId: string) {
@@ -187,36 +189,46 @@ export default class IFrameRenderer implements PresentationWindowRenderer {
   }
 
   private globalMessageHandler = (event: MessageEvent) => {
-    let windowId: string;
-    let type: string;
-    let payload: any;
-
-    try {
-      ({ windowId, type, payload } = JSON.parse(event.data));
-    } catch (err) {
-      console.warn(
-        `Invalid message received from iframe '${JSON.stringify(
-          event.data
-        )}', ignoring message`
-      );
-      return;
+    // Ignore messages that don't start with the message prefix.
+    if (
+      typeof event.data === 'string' &&
+      event.data.startsWith(messagePrefix)
+    ) {
+      const { windowId, type, payload } = this.deserializeMessage(event.data);
+
+      if (!windowId || !type) {
+        console.warn(
+          `Invalid message received from child window '${event.data}'`
+        );
+        return;
+      }
+
+      const window = this.getWindow(windowId);
+      if (!window) {
+        throw new Error(
+          `Failed add receive message callback to window, window with window id: '${windowId}' was not found`
+        );
+      }
+
+      if (window.receiveMessageCallback) {
+        window.receiveMessageCallback(type, payload);
+      }
     }
+  };
 
-    if (!windowId) {
-      // ignore messages that don't have windowId
-      // such message are comming from 3rd party IFrames like google
-      return;
-    }
+  private deserializeMessage(message: string) {
+    let windowId = '';
+    let type = '';
+    let payload: unknown;
 
-    const window = this.getWindow(windowId);
-    if (!window) {
-      throw new Error(
-        `Failed add receive message callback to window, window with window id: '${windowId}' was not found`
-      );
+    const json = message.substring(messagePrefix.length);
+    try {
+      // Messages are sent as json in the format of { type: string, payload: unknown }.
+      ({ windowId, type, payload } = JSON.parse(json));
+    } catch (err) {
+      // Not a valid message, return empty type and payload.
     }
 
-    if (window.receiveMessageCallback) {
-      window.receiveMessageCallback(type, payload);
-    }
-  };
+    return { windowId, type, payload };
+  }
 }

package/src/PresentationWindow.ts

@@ -51,7 +51,7 @@ export interface PresentationWindowOptions {
 }
 
 // TODO: Automatically inject latest version when building in CI.
-const defaultAppRendererUrl = 'https://apps.raydiant.com/2.0.0/index.html';
+const defaultAppRendererUrl = 'https://apps.raydiant.com/3.0.0/index.html';
 
 const isValidNumber = (value: any) =>
   typeof value === 'number' && !isNaN(value);