pinokiod 6.0.79 → 6.0.80

package/package.json

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

package/server/views/app.ejs

@@ -5326,23 +5326,62 @@ header.navheader .mode-selector .community-mode-toggle {
       return []
     }
   }
-  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"))
+  const normalizeInjectTarget = (target) => {
+    if (!target || typeof target !== "object") {
+      return null
+    }
+    const name = typeof target.name === "string" ? target.name : ""
+    const src = typeof target.src === "string" ? target.src : ""
+    const inject = Array.isArray(target.inject) ? target.inject : []
+    if (!name && !src) {
+      return null
+    }
+    return {
+      name,
+      src,
+      inject
+    }
+  }
+  const buildFrameInjectTarget = (frame, overrides = {}) => {
+    if (!frame || typeof frame.getAttribute !== "function") {
+      return null
+    }
+    return normalizeInjectTarget({
+      name: typeof overrides.name === "string" ? overrides.name : (frame.name || frame.getAttribute("name") || ""),
+      src: typeof overrides.src === "string" ? overrides.src : (frame.getAttribute("src") || frame.src || ""),
+      inject: Array.isArray(overrides.inject) ? overrides.inject : parseInjectDescriptors(frame.getAttribute("data-pinokio-inject"))
+    })
+  }
+  const upsertInjectTarget = (targets, entry) => {
+    const normalized = normalizeInjectTarget(entry)
+    if (!normalized) {
+      return
+    }
+    const index = targets.findIndex((target) => {
+      if (normalized.name && target.name === normalized.name) {
+        return true
       }
-    }).filter(Boolean)
+      return normalized.src && target.src === normalized.src
+    })
+    if (index >= 0) {
+      targets[index] = normalized
+    } else {
+      targets.push(normalized)
+    }
+  }
+  const buildBrowserviewInjectTargets = (extraTargets = []) => {
+    const targets = Array.from(document.querySelectorAll("main.browserview iframe"))
+      .map((frame) => buildFrameInjectTarget(frame))
+      .filter(Boolean)
+    for (const entry of Array.isArray(extraTargets) ? extraTargets : []) {
+      upsertInjectTarget(targets, entry)
+    }
+    return targets
   }
-  const publishBrowserviewInjectTargets = () => {
+  const publishBrowserviewInjectTargets = (extraTargets = []) => {
     const payload = {
       pageUrl: window.location.href,
-      targets: buildBrowserviewInjectTargets()
+      targets: buildBrowserviewInjectTargets(extraTargets)
     }
     try {
       if (window.electronAPI && typeof window.electronAPI.send === "function") {
@@ -5351,43 +5390,6 @@ header.navheader .mode-selector .community-mode-toggle {
     } catch (_) {
     }
   }
-  const schedulePublishBrowserviewInjectTargets = () => {
-    if (injectTargetPublishScheduled) {
-      return
-    }
-    injectTargetPublishScheduled = true
-    setTimeout(() => {
-      injectTargetPublishScheduled = false
-      publishBrowserviewInjectTargets()
-    }, 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()
-      }
-    })
-    observer.observe(root, {
-      subtree: true,
-      childList: true,
-      attributes: true,
-      attributeFilter: ["src", "name", "data-pinokio-inject", "class"]
-    })
-    schedulePublishBrowserviewInjectTargets()
-  }
   const readLinkInjectDescriptors = (node) => {
     if (!node || typeof node.getAttribute !== "function") {
       return []
@@ -5418,8 +5420,6 @@ header.navheader .mode-selector .community-mode-toggle {
     })
     let frame = document.createElement("iframe")
     frame.name = name
-    refreshTerminalSessions(href)
-    frame.src = href
     frame.classList.add("selected")
     iframe_onerror(frame)
     frame.setAttribute(
@@ -5428,6 +5428,11 @@ header.navheader .mode-selector .community-mode-toggle {
     )
     frame.setAttribute("allowfullscreen", "")
     writeFrameInjectDescriptors(frame, injectDescriptors)
+    publishBrowserviewInjectTargets([
+      buildFrameInjectTarget(frame, { src: href, inject: injectDescriptors })
+    ])
+    refreshTerminalSessions(href)
+    frame.src = href
     document.querySelector("main").appendChild(frame)
     loaded[name] = true
   }
@@ -5442,7 +5447,6 @@ header.navheader .mode-selector .community-mode-toggle {
       return false
     }
   }
-  installBrowserviewInjectTargetObserver()
   document.addEventListener("click", (e) => {
     interacted = true
   })
@@ -6637,6 +6641,9 @@ const rerenderMenuSection = (container, html) => {
 
 	    if (targetFrame) {
 	      writeFrameInjectDescriptors(targetFrame, targetInjectDescriptors)
+          publishBrowserviewInjectTargets([
+            buildFrameInjectTarget(targetFrame, { src: target.href, inject: targetInjectDescriptors })
+          ])
 	      targetFrame.classList.remove("hidden")
 	      let mode = target.getAttribute("data-mode")
       if (mode === "refresh") {
@@ -6690,8 +6697,6 @@ const rerenderMenuSection = (container, html) => {
 	        } else {
 	          let frame = document.createElement("iframe")
 	          frame.name = target.target
-	          refreshTerminalSessions(target.href)
-	          frame.src = target.href
           iframe_onerror(frame)
           frame.setAttribute(
             "allow", 
@@ -6699,6 +6704,11 @@ const rerenderMenuSection = (container, html) => {
 	          )
 	          frame.setAttribute("allowfullscreen", "")
             writeFrameInjectDescriptors(frame, targetInjectDescriptors)
+            publishBrowserviewInjectTargets([
+              buildFrameInjectTarget(frame, { src: target.href, inject: targetInjectDescriptors })
+            ])
+	          refreshTerminalSessions(target.href)
+	          frame.src = target.href
 	          document.querySelector("main").appendChild(frame)
 	          loaded[target.target] = true
 	          lastForegroundSignature = null