pinokiod 6.0.73 → 6.0.75

package/package.json

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

package/server/lib/inject_router.js

@@ -7,7 +7,7 @@ const { resolveDesktopEventWorkspace } = require("./desktop_event_router")
 
 const VALID_INJECT_WORLDS = new Set(["main", "isolated"])
 const VALID_INJECT_WHEN = new Set(["start", "end", "idle"])
-const VALID_INJECT_FRAMES = new Set(["top", "all"])
+const VALID_INJECT_FRAMES = new Set(["self", "all", "top"])
 
 const normalizeInjectMatchList = (value) => {
   if (!value) {
@@ -48,7 +48,7 @@ const normalizeInjectEntry = (value) => {
   let match = []
   let world = "main"
   let when = "idle"
-  let frame = "top"
+  let frame = "self"
 
   if (typeof value === "string") {
     src = value.trim()
@@ -70,7 +70,7 @@ const normalizeInjectEntry = (value) => {
     if (typeof value.frame === "string") {
       const normalizedFrame = value.frame.trim().toLowerCase()
       if (VALID_INJECT_FRAMES.has(normalizedFrame)) {
-        frame = normalizedFrame
+        frame = normalizedFrame === "top" ? "self" : normalizedFrame
       }
     }
   }
@@ -214,7 +214,7 @@ const resolveInjectDescriptor = async ({ workspace, workspaceRoot, launcher, des
     match: Array.isArray(descriptor.match) ? descriptor.match.slice() : ["*"],
     world: descriptor.world || "main",
     when: descriptor.when || "idle",
-    frame: descriptor.frame || "top"
+    frame: descriptor.frame || "self"
   }
 }
 

package/server/views/app.ejs

@@ -5316,33 +5316,119 @@ header.navheader .mode-selector .community-mode-toggle {
     }
   }
   const parseInjectDescriptors = (value) => {
-    if (!value) {
+    if (typeof value !== "string" || !value.trim()) {
       return []
     }
     try {
-      const parsed = JSON.parse(value)
+      const parsed = JSON.parse(decodeURIComponent(value))
       return Array.isArray(parsed) ? parsed : []
     } catch (_) {
       return []
     }
   }
+  const logInjectDebug = (label, payload) => {
+    try {
+      console.log("[pinokio][inject][app]", label, payload)
+      console.log("[pinokio][inject][app:json]", label, JSON.stringify(payload))
+    } catch (_) {
+    }
+  }
+  let injectTargetPublishScheduled = false
+  const buildBrowserviewInjectTargets = () => {
+    return Array.from(document.querySelectorAll("main.browserview iframe")).map((frame) => {
+      if (!frame || typeof frame.getAttribute !== "function") {
+        return null
+      }
+      return {
+        name: frame.name || frame.getAttribute("name") || "",
+        src: frame.getAttribute("src") || frame.src || "",
+        inject: parseInjectDescriptors(frame.getAttribute("data-pinokio-inject"))
+      }
+    }).filter(Boolean)
+  }
+  const publishBrowserviewInjectTargets = (reason = "sync") => {
+    const payload = {
+      reason,
+      pageUrl: window.location.href,
+      targets: buildBrowserviewInjectTargets()
+    }
+    logInjectDebug("publish-targets", payload)
+    try {
+      if (window.electronAPI && typeof window.electronAPI.send === "function") {
+        window.electronAPI.send("pinokio:update-inject-targets", payload)
+      }
+    } catch (_) {
+    }
+  }
+  const schedulePublishBrowserviewInjectTargets = (reason = "sync") => {
+    if (injectTargetPublishScheduled) {
+      return
+    }
+    injectTargetPublishScheduled = true
+    setTimeout(() => {
+      injectTargetPublishScheduled = false
+      publishBrowserviewInjectTargets(reason)
+    }, 0)
+  }
+  const installBrowserviewInjectTargetObserver = () => {
+    if (typeof MutationObserver !== "function") {
+      return
+    }
+    const root = document.querySelector("main")
+    if (!root) {
+      return
+    }
+    const observer = new MutationObserver((records) => {
+      const relevant = records.some((record) => {
+        if (record.type === "childList") {
+          return true
+        }
+        return record.type === "attributes"
+      })
+      if (relevant) {
+        schedulePublishBrowserviewInjectTargets("mutation")
+      }
+    })
+    observer.observe(root, {
+      subtree: true,
+      childList: true,
+      attributes: true,
+      attributeFilter: ["src", "name", "data-pinokio-inject", "class"]
+    })
+    schedulePublishBrowserviewInjectTargets("observer:init")
+  }
   const readLinkInjectDescriptors = (node) => {
     if (!node || typeof node.getAttribute !== "function") {
       return []
     }
-    return parseInjectDescriptors(node.getAttribute("data-pinokio-inject"))
+    const raw = node.getAttribute("data-pinokio-inject")
+    const parsed = parseInjectDescriptors(raw)
+    logInjectDebug("read-link", {
+      text: node.textContent ? node.textContent.trim().slice(0, 120) : "",
+      href: node.getAttribute("href") || "",
+      target: node.getAttribute("target") || "",
+      hasInjectAttribute: node.hasAttribute("data-pinokio-inject"),
+      rawInjectAttribute: raw,
+      parsedInject: parsed
+    })
+    return parsed
   }
   const writeFrameInjectDescriptors = (frame, descriptors) => {
     if (!frame || !frame.dataset) {
       return
     }
     const normalized = Array.isArray(descriptors) ? descriptors : []
+    logInjectDebug("write-frame", {
+      frameName: frame.name || "",
+      frameSrc: frame.src || "",
+      descriptors: normalized
+    })
     if (normalized.length === 0) {
       delete frame.dataset.pinokioInject
       frame.removeAttribute("data-pinokio-inject")
       return
     }
-    const serialized = JSON.stringify(normalized)
+    const serialized = encodeURIComponent(JSON.stringify(normalized))
     frame.dataset.pinokioInject = serialized
     frame.setAttribute("data-pinokio-inject", serialized)
   }
@@ -5379,6 +5465,7 @@ header.navheader .mode-selector .community-mode-toggle {
       return false
     }
   }
+  installBrowserviewInjectTargetObserver()
   document.addEventListener("click", (e) => {
     interacted = true
   })
@@ -6453,17 +6540,24 @@ const rerenderMenuSection = (container, html) => {
       return
     }
 
-    document.querySelector(".container").classList.add("active")
-    document.querySelector("aside").classList.remove("active")
+	    document.querySelector(".container").classList.add("active")
+	    document.querySelector("aside").classList.remove("active")
 
 
-	    // Instantiate a frame with the selected target's href
-	    let url = target.href
-      const targetInjectDescriptors = readLinkInjectDescriptors(target)
+		    // Instantiate a frame with the selected target's href
+		    let url = target.href
+	      const targetInjectDescriptors = readLinkInjectDescriptors(target)
+      logInjectDebug("render-selection", {
+        href: target.href || "",
+        target: target.target || "",
+        text: target.textContent ? target.textContent.trim().slice(0, 120) : "",
+        rawInjectAttribute: target.getAttribute("data-pinokio-inject"),
+        parsedInject: targetInjectDescriptors
+      })
 
-	    if (!url) {
-	      return
-	    }
+		    if (!url) {
+		      return
+		    }
 //    document.querySelector("#open-browser").href = url
 //    document.querySelector("#clone-tab").setAttribute("data-href", url)
 
@@ -7985,6 +8079,11 @@ const rerenderMenuSection = (container, html) => {
             return frame.name === rawName
           })
             if (!frameExists) {
+              logInjectDebug("event-launch:create-iframe", {
+                name: rawName,
+                href: event.data.launch.href || "",
+                launch: event.data.launch || null
+              })
               create_iframe(rawName, event.data.launch.href)
             }
             refresh()
@@ -12396,9 +12495,22 @@ document.addEventListener("DOMContentLoaded", () => {
   const resolveFrameInjectFromSource = (sourceWindow) => {
     const record = resolveFrameSourceRecord(sourceWindow)
     if (!record || !record.root || !record.root.dataset) {
+      logInjectDebug("resolve-frame-inject:missing-record", {
+        hasRecord: Boolean(record),
+        hasRoot: Boolean(record && record.root),
+        sourceMatchesKnownFrame: Boolean(record)
+      })
       return []
     }
-    return parseInjectDescriptors(record.root.dataset.pinokioInject || record.root.getAttribute("data-pinokio-inject"))
+    const raw = record.root.dataset.pinokioInject || record.root.getAttribute("data-pinokio-inject")
+    const parsed = parseInjectDescriptors(raw)
+    logInjectDebug("resolve-frame-inject", {
+      frameName: record.root.name || "",
+      frameSrc: record.root.src || "",
+      rawInjectAttribute: raw,
+      parsedInject: parsed
+    })
+    return parsed
   }
 
   const resolveFrameRootUrlFromSource = (sourceWindow) => {
@@ -12483,6 +12595,10 @@ document.addEventListener("DOMContentLoaded", () => {
     }
     context.pageUrl = window.location.href
     context.currentUrl = window.location.href
+    logInjectDebug("dispatch-inject-request:start", {
+      context,
+      inject
+    })
     const response = await fetch("/pinokio/inject", {
       method: "POST",
       headers: {
@@ -12492,9 +12608,19 @@ document.addEventListener("DOMContentLoaded", () => {
       body: JSON.stringify({ context, inject })
     })
     if (!response.ok) {
+      logInjectDebug("dispatch-inject-request:non-ok", {
+        status: response.status,
+        context,
+        inject
+      })
       return null
     }
     const result = await response.json().catch(() => null)
+    logInjectDebug("dispatch-inject-request:done", {
+      context,
+      inject,
+      result
+    })
     return result && typeof result === "object" ? result : null
   }
 
@@ -12573,10 +12699,25 @@ document.addEventListener("DOMContentLoaded", () => {
         }
       }).catch(() => {})
     } else if (messageType === "pinokio:inject:request") {
+      logInjectDebug("message:inject-request", {
+        sourceFrameUrl: resolveFrameUrlFromSource(event.source),
+        payload: event.data
+      })
       dispatchPinokioInjectRequest(event.data, event.source).then((result) => {
         if (!result || !result.ok || !event.source || typeof event.source.postMessage !== "function") {
+          logInjectDebug("message:inject-request:skip-response", {
+            result
+          })
           return
         }
+        logInjectDebug("message:inject-request:respond", {
+          requestId: typeof event.data.requestId === "string" ? event.data.requestId : "",
+          inject: extractInjectDescriptors(result),
+          scripts: Array.isArray(result.scripts) ? result.scripts : [],
+          context: {
+            frameUrl: resolveFrameUrlFromSource(event.source) || ""
+          }
+        })
         event.source.postMessage({
           e: "pinokio:inject:load",
           requestId: typeof event.data.requestId === "string" ? event.data.requestId : "",

package/server/views/partials/menu.ejs

@@ -40,7 +40,7 @@
           <% } %>
         </div>
       <% } else if (item.target === "_blank") { %>
-        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %><%= item.project_slug ? ` data-project-slug="${item.project_slug}"` : '' %><%= item.inject ? ` data-pinokio-inject="${JSON.stringify(item.inject)}"` : '' %>>
+        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %><%= item.project_slug ? ` data-project-slug="${item.project_slug}"` : '' %><%- item.inject ? ` data-pinokio-inject="${encodeURIComponent(JSON.stringify(item.inject))}"` : '' %>>
           <div class='tab'><%-item.btn%></div>
           <% if (item.arrow) { %>
             <i class="fa-solid fa-angle-right"></i>
@@ -50,7 +50,7 @@
           </div>
         </a>
       <% } else { %>
-        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %> <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%><%= item.project_slug ? ` data-project-slug="${item.project_slug}"` : '' %><%= item.inject ? ` data-pinokio-inject="${JSON.stringify(item.inject)}"` : '' %>>
+        <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link <%=item.display || ""%>'<%= item.target_full ? ` data-target-full="${item.target_full}"` : '' %> <%=item.shell_id ? `data-shell=${item.shell_id}` : ""%> <%=item.script_id ? `data-script=${item.script_id}` : ''%><%= item.project_slug ? ` data-project-slug="${item.project_slug}"` : '' %><%- item.inject ? ` data-pinokio-inject="${encodeURIComponent(JSON.stringify(item.inject))}"` : '' %>>
           <% if (item.running) { %>
             <i class="fa-solid fa-circle"></i>
           <% } %>