pinokiod 7.3.14 → 7.4.0

package/server/views/partials/launch_requirements_status_styles.ejs

@@ -0,0 +1,171 @@
+.launch-requirements-status {
+  position: absolute;
+  inset: 0;
+  z-index: 10001;
+  display: grid;
+  place-items: center;
+  box-sizing: border-box;
+  padding: 24px;
+  pointer-events: none;
+  color: rgba(17, 24, 39, 0.92);
+}
+.launch-requirements-status[hidden] {
+  display: none !important;
+}
+.launch-requirements-card {
+  width: min(520px, calc(100vw - 64px));
+  box-sizing: border-box;
+  padding: 0;
+  text-align: center;
+  pointer-events: auto;
+}
+body.dark .launch-requirements-card {
+  color: rgba(248, 250, 252, 0.92);
+}
+.launch-requirements-title {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 8px;
+  margin-bottom: 6px;
+  font-size: 14px;
+  font-weight: 750;
+}
+.launch-requirements-title i {
+  color: #2563eb;
+}
+.launch-requirements-detail {
+  color: rgba(100, 116, 139, 0.96);
+  font-size: 12px;
+  line-height: 1.35;
+  margin-bottom: 12px;
+}
+body.dark .launch-requirements-detail {
+  color: rgba(203, 213, 225, 0.86);
+}
+.launch-requirements-list {
+  display: grid;
+  gap: 6px;
+  margin-top: 14px;
+  text-align: left;
+}
+.launch-requirements-row {
+  display: grid;
+  grid-template-columns: 26px minmax(0, 1fr) auto;
+  align-items: center;
+  gap: 8px;
+  min-height: 38px;
+  padding: 6px 8px;
+  border: 1px solid rgba(148, 163, 184, 0.18);
+  border-radius: 8px;
+  background: rgba(148, 163, 184, 0.08);
+}
+body.dark .launch-requirements-row {
+  border-color: rgba(148, 163, 184, 0.12);
+  background: rgba(148, 163, 184, 0.07);
+}
+.launch-requirements-row img {
+  width: 26px;
+  height: 26px;
+  border-radius: 6px;
+  object-fit: cover;
+}
+.launch-requirements-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 12px;
+  font-weight: 700;
+}
+.launch-requirements-state {
+  display: inline-flex;
+  align-items: center;
+  justify-content: flex-end;
+  gap: 6px;
+  color: rgba(100, 116, 139, 0.96);
+  font-size: 11px;
+  white-space: nowrap;
+}
+.launch-requirements-choose-script {
+  appearance: none;
+  border: 1px solid rgba(148, 163, 184, 0.34);
+  border-radius: 6px;
+  background: rgba(255, 255, 255, 0.72);
+  color: rgba(30, 41, 59, 0.92);
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 5px;
+  min-height: 24px;
+  margin-left: 2px;
+  padding: 0 8px;
+  font: inherit;
+  font-size: 11px;
+  font-weight: 750;
+  line-height: 1;
+  cursor: pointer;
+  white-space: nowrap;
+}
+.launch-requirements-choose-script i {
+  color: rgba(71, 85, 105, 0.9);
+  font-size: 10px;
+}
+.launch-requirements-choose-script:hover {
+  border-color: rgba(100, 116, 139, 0.5);
+  background: rgba(248, 250, 252, 0.96);
+  color: rgba(15, 23, 42, 0.96);
+}
+.launch-requirements-choose-script:focus-visible {
+  outline: 2px solid rgba(37, 99, 235, 0.34);
+  outline-offset: 2px;
+}
+.launch-requirements-state.is-active i {
+  color: #2563eb;
+}
+.launch-requirements-state.is-ready i {
+  color: #16a34a;
+}
+body.dark .launch-requirements-state {
+  color: rgba(203, 213, 225, 0.82);
+}
+body.dark .launch-requirements-choose-script {
+  border-color: rgba(148, 163, 184, 0.22);
+  background: rgba(15, 23, 42, 0.7);
+  color: rgba(226, 232, 240, 0.92);
+}
+body.dark .launch-requirements-choose-script i {
+  color: rgba(203, 213, 225, 0.82);
+}
+body.dark .launch-requirements-choose-script:hover {
+  border-color: rgba(148, 163, 184, 0.36);
+  background: rgba(30, 41, 59, 0.78);
+  color: rgba(248, 250, 252, 0.96);
+}
+.launch-requirements-actions {
+  display: flex;
+  justify-content: center;
+  margin-top: 12px;
+}
+.launch-requirements-stop {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 7px;
+  min-height: 30px;
+  padding: 0 11px;
+  border: 1px solid rgba(148, 163, 184, 0.28);
+  border-radius: 8px;
+  color: inherit;
+  background: rgba(148, 163, 184, 0.1);
+  font-size: 12px;
+  font-weight: 700;
+  cursor: pointer;
+}
+.launch-requirements-stop:hover {
+  background: rgba(148, 163, 184, 0.16);
+}
+.launch-requirements-stop:disabled {
+  cursor: default;
+  opacity: 0.65;
+}

package/server/views/partials/launch_settings_dependency_save_factory.ejs

@@ -0,0 +1,45 @@
+const createLaunchSettingsDependencySaver = ({
+  getAppId,
+  isSaving,
+  setSaving,
+  setBusy,
+  setFeedback,
+  onSaved,
+  render
+}) => async (dependencies, successMessage = "Dependencies saved.") => {
+  const appId = typeof getAppId === "function" ? getAppId() : ""
+  if (!appId || (typeof isSaving === "function" && isSaving())) return
+  if (typeof setSaving === "function") setSaving(true)
+  if (typeof setBusy === "function") setBusy(true)
+  if (typeof setFeedback === "function") setFeedback("Saving dependencies...")
+  let feedbackMessage = successMessage
+  let feedbackError = false
+  let saved = false
+  try {
+    const response = await fetch("/autolaunch/dependencies", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        "Accept": "application/json"
+      },
+      body: JSON.stringify({
+        app: appId,
+        dependencies: Array.isArray(dependencies) ? dependencies : []
+      })
+    })
+    const data = await response.json()
+    if (!response.ok || !data.ok) {
+      throw new Error(data.error || "Failed to save dependencies.")
+    }
+    if (typeof onSaved === "function") onSaved(data.app)
+    saved = true
+  } catch (error) {
+    feedbackMessage = error && error.message ? error.message : "Failed to save dependencies."
+    feedbackError = true
+  } finally {
+    if (typeof setSaving === "function") setSaving(false)
+    if (typeof render === "function") render()
+    if (typeof setFeedback === "function") setFeedback(feedbackMessage, feedbackError)
+  }
+  return saved
+}

package/server/views/partials/launch_settings_dependency_script_loader_factory.ejs

@@ -0,0 +1,25 @@
+const createLaunchSettingsDependencyScriptLoader = ({
+  getCache,
+  render
+}) => async (appId) => {
+  const cache = typeof getCache === "function" ? getCache() : null
+  if (!appId || !cache || cache[appId]) return
+  cache[appId] = { loading: true }
+  if (typeof render === "function") render()
+  try {
+    const response = await fetch(`/autolaunch/candidates?app=${encodeURIComponent(appId)}`, {
+      headers: { "Accept": "application/json" }
+    })
+    const data = await response.json()
+    if (!response.ok || !data.ok) {
+      throw new Error(data.error || "Failed to load script choices.")
+    }
+    cache[appId] = data
+  } catch (error) {
+    cache[appId] = {
+      error: error && error.message ? error.message : "Failed to load script choices."
+    }
+  } finally {
+    if (typeof render === "function") render()
+  }
+}

package/server/views/terminal.ejs

@@ -62,6 +62,7 @@
   <link href="/electron.css" rel="stylesheet"/>
 <% } %>
 <style>
+<%- include('./partials/launch_requirements_status_styles') %>
 html {
   scroll-behavior: smooth;
   height: 100%;
@@ -1491,6 +1492,83 @@ document.addEventListener("DOMContentLoaded", async () => {
   if (activeProcessWait && (activeProcessWait.title || activeProcessWait.description || activeProcessWait.message) && window.PinokioWaitFooterStatus) {
     window.PinokioWaitFooterStatus.show(activeProcessWait)
   }
+  const resolveCurrentApiScript = () => {
+    let parsed
+    try {
+      parsed = new URL(window.location.href)
+    } catch (_) {
+      return null
+    }
+    const prefix = "/api/"
+    if (!parsed.pathname.startsWith(prefix)) {
+      return null
+    }
+    const parts = parsed.pathname.slice(prefix.length).split("/").filter(Boolean).map((part) => {
+      try {
+        return decodeURIComponent(part)
+      } catch (_) {
+        return part
+      }
+    })
+    if (parts.length < 2) {
+      return null
+    }
+    const appId = parts[0]
+    const script = parts.slice(1).join("/")
+    if (!appId || !script) {
+      return null
+    }
+    return {
+      appId,
+      script,
+      homePath: `api/${appId}/${script}`
+    }
+  }
+  const fetchJsonNoStore = async (url) => {
+    try {
+      const response = await fetch(url, {
+        cache: "no-store",
+        headers: {
+          "Accept": "application/json"
+        }
+      })
+      if (!response.ok) {
+        return null
+      }
+      return response.json().catch(() => null)
+    } catch (_) {
+      return null
+    }
+  }
+  const findRunningScriptEntry = (status, scriptInfo) => {
+    const runningScripts = status && Array.isArray(status.running_scripts) ? status.running_scripts : []
+    return runningScripts.find((entry) => {
+      if (!entry || typeof entry !== "object") {
+        return false
+      }
+      if (entry.home_path === scriptInfo.homePath) {
+        return true
+      }
+      return entry.app === scriptInfo.appId && entry.script_path === scriptInfo.script
+    }) || null
+  }
+  const hasLiveShellForScript = (shells, runningEntry) => {
+    if (!runningEntry || !runningEntry.id || !Array.isArray(shells)) {
+      return false
+    }
+    const scriptId = String(runningEntry.id)
+    return shells.some((shell) => {
+      if (!shell || shell.done === true) {
+        return false
+      }
+      const group = typeof shell.group === "string" ? shell.group : ""
+      const id = typeof shell.id === "string" ? shell.id : ""
+      return group === scriptId || id === scriptId || id.startsWith(`${scriptId}?`)
+    })
+  }
+  const normalizeLogText = (value) => {
+    return String(value || "").replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/\n/g, "\r\n")
+  }
   const shouldBypassAiConsent = () => {
     const normalize = (value) => (typeof value === "string" ? value.replace(/\\/g, "/") : "")
     const uri = normalize(scriptUri || "")
@@ -1518,6 +1596,33 @@ document.addEventListener("DOMContentLoaded", async () => {
     initialEnabled: initialProtectionEnabled,
     runControls
   })
+  const settleLaunchRequirementsControl = (packet) => {
+    refreshParent(packet || {})
+    pluginTerminalDiscoveryRefresher.clear()
+    document.querySelector("#status-window").innerHTML = "<b>Ready</b>"
+    document.querySelector("#progress-window").classList.add("hidden")
+    document.querySelector("#progress-bar").style.width = "0%"
+    runControls.set("idle")
+    if (rpc && rpc.resizeSync) {
+      rpc.resizeSync.reset()
+    }
+  }
+  window.addEventListener("pinokio:launch-requirements-control", (event) => {
+    settleLaunchRequirementsControl({
+      type: "launch.requirements.control",
+      data: event && event.detail ? event.detail : {}
+    })
+  })
+  window.addEventListener("message", (event) => {
+    const data = event && event.data ? event.data : null
+    if (!data || data.type !== "pinokio:launch-requirements-control") {
+      return
+    }
+    settleLaunchRequirementsControl({
+      type: "launch.requirements.control",
+      data: data.detail || {}
+    })
+  })
   consentManager.showChipIfRemembered()
   class RPC {
     constructor() {
@@ -1532,6 +1637,7 @@ document.addEventListener("DOMContentLoaded", async () => {
       }
       this.baseScriptId = baseScriptId
       this.currentId = baseScriptId
+      this.latestLogFallbackActive = false
       this.pendingInput = []
       this.inputBuffer = ""
       this.inputTracker = window.TerminalInputTracker ? new window.TerminalInputTracker({
@@ -1636,6 +1742,39 @@ document.addEventListener("DOMContentLoaded", async () => {
       if (runId) {
         params.id = runId
       }
+      if (this.latestLogFallbackActive) {
+        let settled = false
+        const settleFallbackStop = (packet) => {
+          if (settled) {
+            return
+          }
+          settled = true
+          this.latestLogFallbackActive = false
+          if (packet) {
+            refreshParent(packet)
+          }
+          pluginTerminalDiscoveryRefresher.clear()
+          document.querySelector("#status-window").innerHTML = "<b>Ready</b>"
+          document.querySelector("#progress-window").classList.add("hidden")
+          document.querySelector("#progress-bar").style.width = "0%"
+          runControls.set("idle")
+          this.resizeSync.reset()
+          this.socket.close()
+        }
+        this.socket.run({
+          method: "kernel.api.stop",
+          params
+        }, (packet) => {
+          if (packet && (packet.type === "disconnect" || packet.type === "event" || packet.type === "result" || packet.type === "error")) {
+            settleFallbackStop(packet)
+          }
+        }).then(() => {
+          settleFallbackStop()
+        }).catch(() => {
+          settleFallbackStop()
+        })
+        return
+      }
       this.socket.run({
         method: "kernel.api.stop",
         params
@@ -1903,6 +2042,8 @@ document.addEventListener("DOMContentLoaded", async () => {
             }
             */
             runControls.set("running")
+          } else if (packet.type === "launch.requirements.control") {
+            settleLaunchRequirementsControl(packet)
           } else if (packet.type === 'resize') {
             this.resizeSync.handleResizePacket(packet)
 //          } else if (packet.type === "key.set") {
@@ -2242,8 +2383,57 @@ document.addEventListener("DOMContentLoaded", async () => {
 //          pageBottom.scrollIntoView()
         })
     }
-    async run (mode) {
+    async showLatestLogFallback() {
+      try {
+        const scriptInfo = resolveCurrentApiScript()
+        if (!scriptInfo) {
+          return false
+        }
+        const status = await fetchJsonNoStore("/pinokio/home_status")
+        const runningEntry = findRunningScriptEntry(status, scriptInfo)
+        if (!runningEntry) {
+          return false
+        }
+        const shells = await fetchJsonNoStore("/info/shells")
+        if (hasLiveShellForScript(shells, runningEntry)) {
+          return false
+        }
+        const logUrl = `/apps/logs/${encodeURIComponent(scriptInfo.appId)}?script=${encodeURIComponent(scriptInfo.script)}&tail=400`
+        const logData = await fetchJsonNoStore(logUrl)
+        const text = logData && typeof logData.text === "string" ? logData.text : ""
+        if (!text.trim()) {
+          return false
+        }
+        this.currentId = runningEntry.id || this.baseScriptId || null
+        <% if (theme === "dark") { %>
+        await this.createTerm(xtermTheme.FrontEndDelight)
+        <% } else { %>
+        await this.createTerm(xtermTheme.Tomorrow)
+        <% } %>
+        const fileLabel = logData.file || `logs/api/${scriptInfo.script}/latest`
+        this.write(`Latest log: ${fileLabel}\r\nNo live terminal session is available for this running script.\r\n\r\n`)
+        this.write(normalizeLogText(text))
+        this.write("\r\n")
+        document.querySelector("#status-window").innerHTML = "<b>Latest log</b><div class='flexible content'>No live terminal session</div>"
+        document.querySelector("#progress-window").classList.add("hidden")
+        document.querySelector("#progress-bar").style.width = "0%"
+        this.latestLogFallbackActive = true
+        runControls.set("running")
+        return true
+      } catch (_) {
+        this.latestLogFallbackActive = false
+        return false
+      }
+    }
+    async run (mode, options = {}) {
       this.mode = (mode ? mode : "run")
+      if (options && options.allowLatestLogFallback) {
+        const showedFallback = await this.showLatestLogFallback()
+        if (showedFallback) {
+          return true
+        }
+      }
+      this.latestLogFallbackActive = false
       const allowed = aiConsentRequired ? await consentManager.ensureAllowed() : true
       if (!allowed) {
         pluginTerminalDiscoveryRefresher.clear()
@@ -3086,7 +3276,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     <% } else { %>
       <% if (run) { %>
         // run (query params run=true)
-        await rpc.run()
+        await rpc.run(undefined, { allowLatestLogFallback: true })
       <% } else { %>
         await rpc.run("listen")
       <% } %>
@@ -3280,6 +3470,7 @@ const reloadMemory = async () => {
       </div>
     <% } else { %>
       <div class='terminal-container'>
+        <div id="launch-requirements-status" class="launch-requirements-status" data-launch-requirements-status hidden aria-live="polite"></div>
         <% if (memory.length > 0) { %>
           <div class='memory'>
             <div class='memory-header'>
@@ -3334,5 +3525,8 @@ const reloadMemory = async () => {
       </a>
     </div>
   </div>
+  <script>
+<%- include('partials/launch_requirements_status_client') %>
+  </script>
 </body>
 </html>