pinokiod 3.159.0 → 3.160.0

package/package.json

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

package/server/public/Socket.js

@@ -91,11 +91,22 @@ class Socket {
         });
         this.ws.addEventListener('close', () => {
           console.log('Disconnected from WebSocket endpoint', { error: this.error, result: this.result });
-          if (typeof window !== 'undefined' && window.parent && window.parent !== window) {
-            try {
-              window.parent.postMessage({ type: 'pinokio:socket-closed' }, '*')
-            } catch (err) {
-              console.debug('postMessage error', err)
+          if (typeof window !== 'undefined') {
+            const payload = { type: 'pinokio:socket-closed' }
+            let dispatched = false
+            if (typeof window.PinokioBroadcastMessage === 'function') {
+              try {
+                dispatched = window.PinokioBroadcastMessage(payload, '*', window)
+              } catch (err) {
+                console.debug('postMessage error', err)
+              }
+            }
+            if (!dispatched && window.parent && window.parent !== window) {
+              try {
+                window.parent.postMessage(payload, '*')
+              } catch (err) {
+                console.debug('postMessage error', err)
+              }
             }
           }
           resolve()

package/server/public/common.js

@@ -1,5 +1,58 @@
 const CAPTURE_MIN_SIZE = 32;
 
+function collectPostMessageTargets(contextWindow) {
+  const ctx = contextWindow || window;
+  const targets = new Set();
+  const addTarget = (candidate) => {
+    if (!candidate || candidate === ctx) {
+      return;
+    }
+    try {
+      if (typeof candidate.postMessage !== 'function') {
+        return;
+      }
+    } catch (_) {
+      return;
+    }
+    targets.add(candidate);
+  };
+  try {
+    addTarget(ctx.parent);
+  } catch (_) {}
+  try {
+    addTarget(ctx.top);
+  } catch (_) {}
+  try {
+    addTarget(ctx.opener);
+  } catch (_) {}
+  return targets;
+}
+
+function pinokioBroadcastMessage(payload, targetOrigin = '*', contextWindow = null) {
+  const ctx = (contextWindow && typeof contextWindow === 'object') ? contextWindow : window;
+  let dispatched = false;
+  let targets;
+  try {
+    targets = collectPostMessageTargets(ctx);
+  } catch (_) {
+    targets = new Set();
+  }
+  if (targets.size === 0) {
+    return dispatched;
+  }
+  targets.forEach((target) => {
+    try {
+      target.postMessage(payload, targetOrigin);
+      dispatched = true;
+    } catch (_) {}
+  });
+  return dispatched;
+}
+
+if (typeof window !== 'undefined' && typeof window.PinokioBroadcastMessage !== 'function') {
+  window.PinokioBroadcastMessage = pinokioBroadcastMessage;
+}
+
 async function uploadCapture(blob, filename) {
   const fd = new FormData();
   fd.append('file', blob, filename);
@@ -1716,9 +1769,22 @@ if (typeof hotkeys === 'function') {
   attemptLeadership();
 })();
 const refreshParent = (e) => {
-//  if (window.parent === window.top) {
-    window.parent.postMessage(e, "*")
-//  }
+  let dispatched = false;
+  if (typeof window !== 'undefined' && typeof window.PinokioBroadcastMessage === 'function') {
+    try {
+      dispatched = window.PinokioBroadcastMessage(e, '*', window);
+    } catch (_) {
+      dispatched = false;
+    }
+  }
+  if (dispatched) {
+    return;
+  }
+  try {
+    if (window.parent && window.parent !== window && typeof window.parent.postMessage === 'function') {
+      window.parent.postMessage(e, '*');
+    }
+  } catch (_) {}
 }
 let tippyInstances = [];
 const COMPACT_LAYOUT_QUERY = '(max-width: 768px)';

package/server/public/terminal_input_tracker.js

@@ -44,7 +44,7 @@
 
     submit(line, meta = {}) {
       const win = this.getWindow()
-      if (!win || !win.parent || typeof win.parent.postMessage !== "function") {
+      if (!win) {
         return
       }
       const safeLine = (line || "").replace(/[\x00-\x1F\x7F]/g, "")
@@ -52,12 +52,29 @@
       const truncated = preview.length > this.limit ? `${preview.slice(0, this.limit)}...` : preview
       const hadLineBreak = Boolean(meta && meta.hadLineBreak)
       const meaningful = truncated.length > 0 || hadLineBreak
-      win.parent.postMessage({
+      const payload = {
         type: "terminal-input",
         frame: this.getFrameName(),
         line: truncated,
         hasContent: meaningful
-      }, "*")
+      }
+
+      let dispatched = false
+      if (typeof global.PinokioBroadcastMessage === "function") {
+        try {
+          dispatched = global.PinokioBroadcastMessage(payload, "*", win)
+        } catch (_) {
+          dispatched = false
+        }
+      }
+      if (dispatched) {
+        return
+      }
+      try {
+        if (win.parent && win.parent !== win && typeof win.parent.postMessage === "function") {
+          win.parent.postMessage(payload, "*")
+        }
+      } catch (_) {}
     }
   }
 

package/server/views/app.ejs

@@ -6386,6 +6386,7 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
     init.click()
   }
   window.addEventListener('message', (event) => {
+    console.log("EVENT", event)
 
     // only process the event it's coming from pinokio
     let origin = event.origin

package/server/views/shell.ejs

@@ -206,18 +206,47 @@ body.dark #status-window b {
 <script>
 let shell_id
 let lastNotifiedShellId = null
+const postMessageToAncestors = (payload) => {
+  if (!payload || typeof payload !== "object") {
+    return false
+  }
+  if (typeof window !== "undefined" && typeof window.PinokioBroadcastMessage === "function") {
+    try {
+      if (window.PinokioBroadcastMessage(payload, "*", window)) {
+        return true
+      }
+    } catch (_) {}
+  }
+  const targets = new Set()
+  try {
+    if (window.parent && window.parent !== window && typeof window.parent.postMessage === "function") {
+      targets.add(window.parent)
+    }
+  } catch (_) {}
+  try {
+    if (window.top && window.top !== window && typeof window.top.postMessage === "function") {
+      targets.add(window.top)
+    }
+  } catch (_) {}
+  let dispatched = false
+  targets.forEach((target) => {
+    try {
+      target.postMessage(payload, "*")
+      dispatched = true
+    } catch (_) {}
+  })
+  return dispatched
+}
 const notifyShellSession = (id) => {
   if (!id || id === lastNotifiedShellId) {
     return
   }
   lastNotifiedShellId = id
-  if (window && window.parent && typeof window.parent.postMessage === "function") {
-    window.parent.postMessage({
-      type: "shell-session-id",
-      frame: window.name || null,
-      shellId: id
-    }, "*")
-  }
+  postMessageToAncestors({
+    type: "shell-session-id",
+    frame: window.name || null,
+    shellId: id
+  })
 }
 function buildBinaryRpcPayload(rpc, fileEntries) {
   const metadata = {
@@ -299,19 +328,16 @@ document.addEventListener("DOMContentLoaded", async () => {
         this.inputTracker.submit(line)
         return
       }
-      if (!window || !window.parent || typeof window.parent.postMessage !== "function") {
-        return
-      }
       const safeLine = (line || "").replace(/[\x00-\x1F\x7F]/g, "")
       const preview = safeLine.trim()
       const limit = 200
       const truncated = preview.length > limit ? preview.slice(0, limit) + "..." : preview
-      window.parent.postMessage({
+      postMessageToAncestors({
         type: "terminal-input",
         frame: window.name || null,
         line: truncated,
         hasContent: truncated.length > 0
-      }, "*")
+      })
     }
     write(text) {
       if (text !== "\u0007") {

package/server/views/terminal.ejs

@@ -182,6 +182,38 @@ body.frozen {
 <script>
 let shell_id
 Dropzone.autoDiscover = false;
+function postMessageToAncestors(payload) {
+  if (!payload || typeof payload !== "object") {
+    return false
+  }
+  if (typeof window !== "undefined" && typeof window.PinokioBroadcastMessage === "function") {
+    try {
+      if (window.PinokioBroadcastMessage(payload, "*", window)) {
+        return true
+      }
+    } catch (_) {}
+  }
+  const targets = new Set()
+  try {
+    if (window.parent && window.parent !== window && typeof window.parent.postMessage === "function") {
+      targets.add(window.parent)
+    }
+  } catch (_) {}
+  try {
+    if (window.top && window.top !== window && typeof window.top.postMessage === "function") {
+      targets.add(window.top)
+    }
+  } catch (_) {}
+  let dispatched = false
+  targets.forEach((target) => {
+    try {
+      target.postMessage(payload, "*")
+      dispatched = true
+    } catch (_) {}
+  })
+  return dispatched
+}
+
 function buildBinaryRpcPayload(rpc, fileEntries) {
   const metadata = {
     rpc,
@@ -288,21 +320,18 @@ document.addEventListener("DOMContentLoaded", async () => {
         this.inputTracker.submit(line, meta)
         return
       }
-      if (!window || !window.parent || typeof window.parent.postMessage !== "function") {
-        return
-      }
       const safeLine = (line || "").replace(/[\x00-\x1F\x7F]/g, "")
       const preview = safeLine.trim()
       const limit = 200
       const truncated = preview.length > limit ? preview.slice(0, limit) + "..." : preview
       const hadLineBreak = Boolean(meta && meta.hadLineBreak)
       const meaningful = truncated.length > 0 || hadLineBreak
-      window.parent.postMessage({
+      postMessageToAncestors({
         type: "terminal-input",
         frame: window.name || null,
         line: truncated,
         hasContent: meaningful
-      }, "*")
+      })
     }
     write(text) {
       if (text !== "\u0007") {