pinokiod 3.163.0 → 3.164.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.163.0",
+  "version": "3.164.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, includeCurrent = false) {
+function pinokioBroadcastMessage(payload, targetOrigin = '*', contextWindow = null) {
   const ctx = (contextWindow && typeof contextWindow === 'object') ? contextWindow : window;
   let dispatched = false;
   let targets;
@@ -37,11 +37,6 @@ 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/app.ejs

@@ -4979,28 +4979,6 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
     }
     return null
   }
-  const forwardEventToParent = (payload) => {
-    if (!payload || typeof payload !== 'object' || payload === null) {
-      return
-    }
-    if (window.parent === window) {
-      return
-    }
-    const forwardingPayload = Object.assign({}, payload, { __pinokioForwarded: true })
-    let forwarded = false
-    if (typeof window.PinokioBroadcastMessage === 'function') {
-      try {
-        forwarded = window.PinokioBroadcastMessage(forwardingPayload, '*', window)
-      } catch (_) {
-        forwarded = false
-      }
-    }
-    if (!forwarded) {
-      try {
-        window.parent.postMessage(forwardingPayload, '*')
-      } catch (_) {}
-    }
-  }
   const getTarget = (href) => {
     let u
     if (href.startsWith("http")) {
@@ -5157,17 +5135,10 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
       }
     }
 
-    console.log('[renderSelection] init', {
-      triggeredByUser,
-      resolvedByGlobalSelector,
-      skipPersistedSelection,
-      hasPersistedSelection,
-      explicitTarget: Boolean(explicitTarget),
-      targetInitial: target ? target.outerHTML : null
-    })
+    console.log({ target, skipPersistedSelection })
     if (!target && !skipPersistedSelection) {
       preselected = document.querySelector('#devtab.frame-link.selected') || document.querySelector('.frame-link.selected')
-      console.log('[renderSelection] preselected candidate', preselected ? preselected.outerHTML : null)
+      console.log({ preselected })
     }
 
     if (!target && persistedSelectionPayload) {
@@ -5243,7 +5214,7 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
       target = preselected
     }
 
-    console.log('[renderSelection] target after resolution', target ? target.outerHTML : null)
+    console.log({ targetAfter: target })
 
     if (!target) {
       target = document.querySelector(".frame-link")
@@ -6221,16 +6192,7 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
   const navContainers = [document.querySelector("aside"), document.querySelector("#fs-status")]
   navContainers.forEach((container) => {
     if (container) {
-      container.addEventListener("click", (event) => {
-        const frameLink = event.target?.closest && event.target.closest('.frame-link')
-        if (frameLink) {
-          console.log('[handleMenuClick] triggered', {
-            origin: event.target && event.target.className,
-            frameLink: frameLink.outerHTML
-          })
-        }
-        handleMenuClick(event)
-      })
+      container.addEventListener("click", handleMenuClick)
     }
   })
   setupTabLinkHover()
@@ -6309,7 +6271,6 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
       status = res.status
       return res.text()
     })
-    console.log('[try_dynamic] fetched', { status, length: dynamic ? dynamic.length : 0 })
     if (status == 500) {
       ModalInput({
         description: dynamic,
@@ -6329,10 +6290,8 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
       }
       let default_selection = document.querySelector(".dynamic .submenu [data-default]")
       if (default_selection) {
-        console.log('[try_dynamic] clicking default', default_selection.outerHTML)
+        console.log("CLICK default")
         default_selection.click()
-      } else {
-        console.log('[try_dynamic] no default selection found after update')
       }
       rendered = true
     } else {
@@ -6429,105 +6388,80 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
   window.addEventListener('message', (event) => {
     console.log("EVENT", event)
 
-    const data = event.data
-    const dataIsObject = data && typeof data === 'object' && data !== null
-    const frameHint = dataIsObject && typeof data.frame === 'string' ? data.frame : null
-
-    let matchedFrameName = null
-    if (frameHint) {
-      matchedFrameName = resolveFrameName(frameHint, event.source)
-    }
-    if (!matchedFrameName) {
-      matchedFrameName = resolveFrameName(null, event.source)
-    }
-
-    let allowEvent = false
-    const origin = event.origin
-    if (!origin) {
-      allowEvent = true
-    } else {
-      try {
-        const originUrl = new URL(origin)
-        const originPort = originUrl.port || (originUrl.protocol === 'https:' ? '443' : '80')
-        if (String(originPort) === String(location.port)) {
-          allowEvent = true
-        }
-      } catch (_) {}
-      if (!allowEvent && /https:\/\/.*pinokio\..*(localhost|co)/.test(origin)) {
-        allowEvent = true
-      }
-    }
-    if (!allowEvent && matchedFrameName) {
-      allowEvent = true
-    }
-    if (!allowEvent) {
-      return
-    }
-    if (!dataIsObject) {
-      return
-    }
-    if (!data.__pinokioForwarded) {
-      forwardEventToParent(data)
-    }
-
-    if (data.action) {
-      if (data.action.type === "newtab") {
-        addTab(data.action.url)
-      } else if (data.action.type === "title") {
-      } else if (data.action.type === "location") {
-        let url = data.action.url
-        let pathname = new URL(url).pathname
-        if (pathname.startsWith("/run")) {
-          document.querySelector("#location").value = pathname.slice(4)
+    // only process the event it's coming from pinokio
+    let origin = event.origin
+    if (origin) {
+      let port = new URL(origin).port || 80
+      if (String(port) === String(location.port) || /https:\/\/.*pinokio\..*(localhost|co)/.test(origin)) {
+      //if (String(port) === "<%=port%>" || /https:\/\/pinokio\..*localhost/.test(origin)) {
+      //if (String(port) === "<%=port%>") {
+        if (event.data) {
+          if (event.data.action) {
+            if (event.data.action.type === "newtab") {
+              addTab(event.data.action.url)
+            } else if (event.data.action.type === "title") {
+            } else if (event.data.action.type === "location") {
+              let url = event.data.action.url
+              //document.querySelector("#location").value = url
+              let pathname = new URL(url).pathname
+              if (pathname.startsWith("/run")) {
+                document.querySelector("#location").value = pathname.slice(4)
+              } else {
+                document.querySelector("#location").value = pathname
+              }
+            }
+          } else if (event.data.launch) {
+            const rawName = event.data.launch.name
+            const escapedSelector = escapeTargetSelector(rawName)
+            if (escapedSelector) {
+              global_selector = `.frame-link[target="${escapedSelector}"]`
+            } else {
+              global_selector = null
+            }
+          const frameExists = Array.from(document.querySelectorAll("main.browserview iframe")).some((frame) => {
+            return frame.name === rawName
+          })
+            if (!frameExists) {
+              create_iframe(rawName, event.data.launch.href)
+            }
+            refresh()
+          } else if (event.data.type === "shell-session-id") {
+            const frameName = resolveFrameName(event.data.frame, event.source)
+            if (frameName && event.data.shellId) {
+              const link = getTabLink(frameName)
+              if (link) {
+                link.setAttribute("data-shell", event.data.shellId)
+                link.dataset.shell = event.data.shellId
+              }
+            }
+            return
+          } else if (event.data.type === "terminal-input") {
+            const frameName = resolveFrameName(event.data.frame, event.source)
+            const hasContent = typeof event.data.hasContent === "boolean" ? event.data.hasContent : Boolean(event.data.line && event.data.line.length > 0)
+            updateTabPreview(frameName, event.data.line || "", hasContent, Date.now())
+            return
+          } else if (event.data.type) {
+            if (event.data.type === 'stream') {
+              const frameName = resolveFrameName(null, event.source)
+              updateTabTimestamp(frameName, Date.now())
+            } else if (event.data.type === 'result') {
+              refresh()
+              refresh_du()
+              refresh_du("logs")
+            } else {
+              if (event.data.type === 'start') {
+                ignorePersistedSelection = true
+              }
+              refresh()
+            }
+          }
         } else {
-          document.querySelector("#location").value = pathname
-        }
-      }
-    } else if (data.launch) {
-      const rawName = data.launch.name
-      const escapedSelector = escapeTargetSelector(rawName)
-      if (escapedSelector) {
-        global_selector = `.frame-link[target="${escapedSelector}"]`
-      } else {
-        global_selector = null
-      }
-      const frameExists = Array.from(document.querySelectorAll("main.browserview iframe")).some((frame) => {
-        return frame.name === rawName
-      })
-      if (!frameExists) {
-        create_iframe(rawName, data.launch.href)
-      }
-      refresh()
-    } else if (data.type === "shell-session-id") {
-      const frameName = matchedFrameName || (typeof data.frame === 'string' ? data.frame : null)
-      if (frameName && data.shellId) {
-        const link = getTabLink(frameName)
-        if (link) {
-          link.setAttribute("data-shell", data.shellId)
-          link.dataset.shell = data.shellId
+          refresh()
         }
       }
-      return
-    } else if (data.type === "terminal-input") {
-      const frameName = matchedFrameName || (typeof data.frame === 'string' ? data.frame : null)
-      const hasContent = typeof data.hasContent === "boolean" ? data.hasContent : Boolean(data.line && data.line.length > 0)
-      updateTabPreview(frameName, data.line || "", hasContent, Date.now())
-      return
-    } else if (data.type) {
-      if (data.type === 'stream') {
-        if (matchedFrameName) {
-          updateTabTimestamp(matchedFrameName, Date.now())
-        }
-      } else if (data.type === 'result') {
-        refresh()
-        refresh_du()
-        refresh_du("logs")
-      } else {
-        refresh()
-      }
-    } else {
-      refresh()
     }
+
+
   });
   refresh_du()
   refresh_du("logs")

package/server/views/d.ejs

@@ -593,32 +593,12 @@ const launchTab = (tab) => {
   const href = appendSessionParam(baseHref, session)
   const target = appendSessionParam(baseTarget, session)
 
-  const payload = {
+  window.parent.postMessage({
     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
 }