pinokiod 3.160.0 → 3.161.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.160.0",
+  "version": "3.161.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/public/common.js

@@ -28,7 +28,7 @@ function collectPostMessageTargets(contextWindow) {
   return targets;
 }
 
-function pinokioBroadcastMessage(payload, targetOrigin = '*', contextWindow = null) {
+function pinokioBroadcastMessage(payload, targetOrigin = '*', contextWindow = null, includeCurrent = false) {
   const ctx = (contextWindow && typeof contextWindow === 'object') ? contextWindow : window;
   let dispatched = false;
   let targets;
@@ -37,6 +37,11 @@ function pinokioBroadcastMessage(payload, targetOrigin = '*', contextWindow = nu
   } catch (_) {
     targets = new Set();
   }
+  if (includeCurrent) {
+    try {
+      targets.add(ctx);
+    } catch (_) {}
+  }
   if (targets.size === 0) {
     return dispatched;
   }

package/server/views/d.ejs

@@ -593,12 +593,32 @@ const launchTab = (tab) => {
   const href = appendSessionParam(baseHref, session)
   const target = appendSessionParam(baseTarget, session)
 
-  window.parent.postMessage({
+  const payload = {
     launch: {
       name: target,
       href
     }
-  }, "*")
+  }
+
+  let posted = false
+  if (typeof window !== 'undefined' && typeof window.PinokioBroadcastMessage === 'function') {
+    try {
+      posted = window.PinokioBroadcastMessage(payload, '*', window, true)
+    } catch (_) {
+      posted = false
+    }
+  }
+
+  if (!posted) {
+    try {
+      window.parent.postMessage(payload, '*')
+    } catch (_) {}
+    if (window.parent && window.parent !== window && typeof window.postMessage === 'function') {
+      try {
+        window.postMessage(payload, '*')
+      } catch (_) {}
+    }
+  }
 
   return true
 }