pinokiod 7.1.69 → 7.1.71

package/kernel/bin/caddy.js

@@ -79,12 +79,23 @@ class Caddy {
     console.log("Caddy Installed?", installed)
     if (installed) {
       let resolved
+      let startup_output = []
+      this.kernel.caddy_startup_output = startup_output
       await new Promise((resolve, reject) => {
         this.kernel.exec({
           message: `caddy run --watch`,
           path: this.kernel.homedir,
         }, (e) => {
           process.stdout.write(e.raw)
+          const cleaned = e && e.cleaned ? e.cleaned : ""
+          const lines = cleaned.split(/\r?\n/).map((line) => line.trim()).filter(Boolean)
+          for (let line of lines) {
+            startup_output.push(line)
+            if (startup_output.length > 20) {
+              startup_output.shift()
+            }
+          }
+          this.kernel.caddy_startup_output = startup_output.slice()
           if (!resolved) {
             if (/endpoint started/i.test(e.cleaned)) {
               resolved = true
@@ -93,6 +104,28 @@ class Caddy {
           }
         })
       })
+      let admin_running = false
+      const admin_wait_started = Date.now()
+      while ((Date.now() - admin_wait_started) < 5000) {
+        admin_running = await this.running()
+        if (admin_running) {
+          break
+        }
+        await new Promise((resolve) => {
+          setTimeout(resolve, 250)
+        })
+      }
+      if (!admin_running) {
+        console.log("caddy admin unavailable after startup")
+        if (startup_output.length > 0) {
+          console.log("recent caddy startup output:")
+          for (let line of startup_output) {
+            console.log(line)
+          }
+        }
+        return
+      }
+      this.kernel.caddy_startup_output = startup_output.slice()
       console.log("kernel.refresh bin.caddy.start")
       this.kernel.peer.announce()
       console.log("announced to peers")

package/package.json

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

package/server/index.js

@@ -79,6 +79,7 @@ const { createInjectRouter, resolveInjectList } = require("./lib/inject_router")
 const { createTaskPackageService } = require("./lib/task_packages")
 const { createTaskWorkspaceLinkService } = require("./lib/task_workspace_links")
 const { createContentValidationService } = require("./lib/content_validation")
+const { buildSecureRouterDebugSnapshot, createSecureRouterDebugStore } = require("./lib/secure_router_debug")
 const AppRegistryService = require("./lib/app_registry")
 const AppLogService = require("./lib/app_logs")
 const AppSearchService = require("./lib/app_search")
@@ -253,6 +254,7 @@ class Server {
       updated_at: new Date().toISOString()
     }
     this.startup_status_run_id = 0
+    this.secure_router_debug = createSecureRouterDebugStore()
     this.installFatalHandlers()
   }
   setStartupStatus(patch = {}) {
@@ -5517,44 +5519,6 @@ class Server {
 
     return { success: true }
   }
-  async ensureSecureRouterReady(timeout = 120000, interval = 500) {
-    if (!(this.kernel && this.kernel.peer && this.kernel.peer.https_active)) {
-      return { success: true, stage: "disabled" }
-    }
-    const caddy = this.kernel && this.kernel.bin && this.kernel.bin.mod
-      ? this.kernel.bin.mod.caddy
-      : null
-    const deadline = Date.now() + timeout
-    let startedCaddyManually = false
-    let refreshedRouter = false
-    let lastStatus = null
-    while (Date.now() < deadline) {
-      lastStatus = await this.check_router_up()
-      if (lastStatus && lastStatus.success) {
-        return lastStatus
-      }
-      if (
-        lastStatus &&
-        lastStatus.error === "caddy admin unavailable" &&
-        !startedCaddyManually &&
-        caddy &&
-        typeof caddy.start === "function"
-      ) {
-        startedCaddyManually = true
-        await caddy.start()
-        continue
-      }
-      if (!refreshedRouter) {
-        refreshedRouter = true
-        await this.kernel.refresh(true).catch(() => {})
-        continue
-      }
-      await new Promise((resolve) => {
-        setTimeout(resolve, interval)
-      })
-    }
-    throw new Error(lastStatus && lastStatus.error ? lastStatus.error : "secure router did not come up")
-  }
   async start(options) {
     this.debug = false
     if (options) {
@@ -5824,12 +5788,6 @@ class Server {
           phase: "initializing_environment"
         })
         await Environment.init({}, this.kernel)
-        if (this.kernel && this.kernel.peer && this.kernel.peer.https_active) {
-          setStartupStatus({
-            phase: "waiting_for_secure_router"
-          })
-          await this.ensureSecureRouterReady()
-        }
         setStartupStatus({
           sys_ready: this.getStartupStatus().sys_ready,
           managed_ready: true,
@@ -15483,6 +15441,9 @@ class Server {
     this.app.get("/pinokio/startup_status", ex((req, res) => {
       res.json(this.getStartupStatus())
     }))
+    this.app.get("/pinokio/secure_router_debug", ex(async (req, res) => {
+      res.json(await buildSecureRouterDebugSnapshot(this, this.secure_router_debug))
+    }))
     this.app.get("/pinokio/requirements_ready", ex((req, res) => {
       res.json(this.getStartupStatus())
     }))

package/server/lib/secure_router_debug.js

@@ -0,0 +1,120 @@
+function createSecureRouterDebugStore() {
+  return {
+    events: [],
+    state: {
+      active: false,
+      started_at: null,
+      updated_at: null,
+      last_status: null,
+      caddy_start_attempted: false,
+      caddy_start_finished: false,
+      caddy_start_error: null,
+      refresh_attempted: false,
+      refresh_finished: false,
+      refresh_error: null,
+    }
+  }
+}
+
+function clone(value) {
+  return JSON.parse(JSON.stringify(value))
+}
+
+function recordSecureRouterDebug(store, message, patch = {}) {
+  if (!store) {
+    return
+  }
+  const timestamp = new Date().toISOString()
+  store.state = {
+    ...(store.state || {}),
+    ...patch,
+    updated_at: timestamp
+  }
+  store.events.push({
+    at: timestamp,
+    message
+  })
+  if (store.events.length > 20) {
+    store.events.shift()
+  }
+}
+
+async function buildSecureRouterDebugSnapshot(server, store) {
+  const kernel = server && server.kernel ? server.kernel : null
+  const peer = kernel && kernel.peer ? kernel.peer : null
+  const router = kernel && kernel.router && typeof kernel.router.published === "function"
+    ? (kernel.router.published() || {})
+    : {}
+  const routerDialKeys = Object.keys(router)
+  const hasPinokioLocalhost = routerDialKeys.some((dial) => {
+    const domains = Array.isArray(router[dial]) ? router[dial] : []
+    return domains.includes("pinokio.localhost")
+  })
+  const caddy = kernel && kernel.bin && kernel.bin.mod
+    ? kernel.bin.mod.caddy
+    : null
+  let caddyInstalled = null
+  let caddyRunning = null
+  try {
+    if (caddy && typeof caddy.installed === "function") {
+      caddyInstalled = await caddy.installed()
+    }
+  } catch (error) {
+    caddyInstalled = { error: error && error.message ? error.message : String(error) }
+  }
+  try {
+    if (caddy && typeof caddy.running === "function") {
+      caddyRunning = await caddy.running()
+    }
+  } catch (error) {
+    caddyRunning = { error: error && error.message ? error.message : String(error) }
+  }
+  const startupStatus = server && typeof server.getStartupStatus === "function"
+    ? server.getStartupStatus()
+    : null
+  const caddyStartupOutput = kernel && Array.isArray(kernel.caddy_startup_output)
+    ? clone(kernel.caddy_startup_output)
+    : []
+  const state = store && store.state ? clone(store.state) : {}
+  const events = store && Array.isArray(store.events) ? clone(store.events) : []
+  return {
+    wait: state,
+    flags: {
+      peer_active: peer ? !!peer.peer_active : null,
+      https_active: peer ? !!peer.https_active : null,
+      active: peer ? !!peer.active : null,
+    },
+    caddy: {
+      installed: caddyInstalled,
+      running: caddyRunning,
+      start_attempted: !!state.caddy_start_attempted,
+      start_finished: !!state.caddy_start_finished,
+      start_error: state.caddy_start_error || null,
+      startup_output: caddyStartupOutput,
+    },
+    peer: {
+      host: peer && peer.host ? peer.host : null,
+      name: peer && peer.name ? peer.name : null,
+      has_info: !!(peer && peer.info),
+      has_host_info: !!(peer && peer.info && peer.host && peer.info[peer.host]),
+      refreshing: !!(peer && peer.refreshing),
+    },
+    router: {
+      published_count: routerDialKeys.length,
+      published_dials: routerDialKeys.slice(0, 10),
+      has_pinokio_localhost: hasPinokioLocalhost,
+      refresh_attempted: !!state.refresh_attempted,
+      refresh_finished: !!state.refresh_finished,
+      refresh_error: state.refresh_error || null,
+      last_status: state.last_status || null,
+    },
+    startup: startupStatus,
+    events
+  }
+}
+
+module.exports = {
+  buildSecureRouterDebugSnapshot,
+  createSecureRouterDebugStore,
+  recordSecureRouterDebug,
+}

package/server/public/setup-wait-debug.js

@@ -0,0 +1,112 @@
+(function () {
+  const HISTORY_LIMIT = 12
+
+  function create(waitRoot) {
+    const state = {
+      events: [],
+      phase: null,
+      router: null,
+      startupError: null,
+    }
+
+    function ensurePanel() {
+      if (!waitRoot) {
+        return null
+      }
+      let panel = waitRoot.querySelector(".wait-debug")
+      if (!panel) {
+        panel = document.createElement("div")
+        panel.className = "wait-debug"
+        panel.style.marginTop = "16px"
+        panel.style.padding = "12px"
+        panel.style.border = "1px solid rgba(255,255,255,0.12)"
+        panel.style.borderRadius = "8px"
+        panel.style.background = "rgba(255,255,255,0.04)"
+        panel.style.textAlign = "left"
+        panel.innerHTML = [
+          '<div style="font-size:12px;font-weight:600;letter-spacing:0.04em;text-transform:uppercase;opacity:0.75;margin-bottom:8px;">Debug</div>',
+          '<pre class="wait-debug-body" style="margin:0;text-align:left;white-space:pre-wrap;word-break:break-word;font-size:12px;line-height:1.5;opacity:0.9;"></pre>'
+        ].join("")
+        waitRoot.appendChild(panel)
+      }
+      return panel.querySelector(".wait-debug-body")
+    }
+
+    function event(message) {
+      const timestamp = new Date().toLocaleTimeString()
+      const entry = `[${timestamp}] ${message}`
+      if (state.events[state.events.length - 1] !== entry) {
+        state.events.push(entry)
+        if (state.events.length > HISTORY_LIMIT) {
+          state.events.shift()
+        }
+      }
+    }
+
+    function track({ routerStatus, startupStatus } = {}) {
+      if (startupStatus && startupStatus.phase && startupStatus.phase !== state.phase) {
+        state.phase = startupStatus.phase
+        event(`phase -> ${startupStatus.phase}`)
+      }
+      const routerSummary = routerStatus
+        ? (routerStatus.success ? "success" : (routerStatus.error || JSON.stringify(routerStatus)))
+        : null
+      if (routerSummary && routerSummary !== state.router) {
+        state.router = routerSummary
+        event(`router -> ${routerSummary}`)
+      }
+      if (startupStatus && startupStatus.error && startupStatus.error !== state.startupError) {
+        state.startupError = startupStatus.error
+        event(`startup error -> ${startupStatus.error}`)
+      }
+    }
+
+    function render({ startedAt, routerStatus, startupStatus, serverDebug } = {}) {
+      const body = ensurePanel()
+      if (!body) {
+        return
+      }
+      const elapsedSeconds = startedAt ? Math.max(0, Math.floor((Date.now() - startedAt) / 1000)) : 0
+      const lines = [
+        `Elapsed: ${elapsedSeconds}s`,
+        `Startup phase: ${startupStatus && startupStatus.phase ? startupStatus.phase : "-"}`,
+        `Startup error: ${startupStatus && startupStatus.error ? startupStatus.error : "-"}`,
+        `Router check: ${routerStatus ? JSON.stringify(routerStatus) : "-"}`,
+      ]
+      if (serverDebug) {
+        lines.push(`Flags: ${JSON.stringify(serverDebug.flags || null)}`)
+        lines.push(`Caddy: ${JSON.stringify(serverDebug.caddy || null)}`)
+        if (serverDebug.caddy && Array.isArray(serverDebug.caddy.startup_output) && serverDebug.caddy.startup_output.length > 0) {
+          lines.push("Caddy startup output:")
+          lines.push(...serverDebug.caddy.startup_output)
+        }
+        lines.push(`Peer: ${JSON.stringify(serverDebug.peer || null)}`)
+        lines.push(`Router: ${JSON.stringify(serverDebug.router || null)}`)
+        lines.push(`Wait: ${JSON.stringify(serverDebug.wait || null)}`)
+      }
+      if (state.events.length > 0) {
+        lines.push("")
+        lines.push("Recent page events:")
+        lines.push(...state.events)
+      }
+      if (serverDebug && Array.isArray(serverDebug.events) && serverDebug.events.length > 0) {
+        lines.push("")
+        lines.push("Recent server events:")
+        for (const entry of serverDebug.events) {
+          lines.push(`[${entry.at}] ${entry.message}`)
+        }
+      }
+      body.textContent = lines.join("\n")
+    }
+
+    return {
+      event,
+      render,
+      track,
+    }
+  }
+
+  window.PinokioSetupWaitDebug = {
+    create
+  }
+})();

package/server/views/setup.ejs

@@ -13,6 +13,7 @@
 <% if (agent === "electron") { %>
   <link href="/electron.css" rel="stylesheet"/>
 <% } %>
+<script src="/setup-wait-debug.js"></script>
 <style>
 html {
   scroll-behavior: smooth;
@@ -243,75 +244,44 @@ document.addEventListener("DOMContentLoaded", async () => {
     const waitRoot = document.querySelector(".requirements .content")
     const waitLabel = document.querySelector(".requirements .content .loading span")
     const WAIT_TIMEOUT_MS = 120000
-    const WAIT_DEBUG_HISTORY_LIMIT = 12
-    const waitDebugState = {
-      events: [],
-      phase: null,
-      router: null,
-      startupError: null,
-    }
+    const waitDebug = window.PinokioSetupWaitDebug ? window.PinokioSetupWaitDebug.create(waitRoot) : null
+    let lastRouterStatus = null
+    let lastStartupStatus = null
+    let lastServerDebug = null
     const setWaitLabel = (message) => {
       if (waitLabel) {
         waitLabel.textContent = message
       }
     }
     const pushWaitDebugEvent = (message) => {
-      const timestamp = new Date().toLocaleTimeString()
-      const entry = `[${timestamp}] ${message}`
-      if (waitDebugState.events[waitDebugState.events.length - 1] !== entry) {
-        waitDebugState.events.push(entry)
-        if (waitDebugState.events.length > WAIT_DEBUG_HISTORY_LIMIT) {
-          waitDebugState.events.shift()
-        }
+      if (waitDebug) {
+        waitDebug.event(message)
       }
     }
-    const ensureWaitDebugPanel = () => {
-      if (!waitRoot) {
-        return null
+    const renderWaitDebug = ({ startedAt, routerStatus, startupStatus, serverDebug } = {}) => {
+      if (typeof routerStatus !== "undefined") {
+        lastRouterStatus = routerStatus
       }
-      let panel = waitRoot.querySelector(".wait-debug")
-      if (!panel) {
-        panel = document.createElement("div")
-        panel.className = "wait-debug"
-        panel.style.marginTop = "16px"
-        panel.style.padding = "12px"
-        panel.style.border = "1px solid rgba(255,255,255,0.12)"
-        panel.style.borderRadius = "8px"
-        panel.style.background = "rgba(255,255,255,0.04)"
-        panel.style.textAlign = "left"
-        panel.innerHTML = `
-          <div style="font-size:12px;font-weight:600;letter-spacing:0.04em;text-transform:uppercase;opacity:0.75;margin-bottom:8px;">Debug</div>
-          <pre class="wait-debug-body" style="margin:0;text-align:left;white-space:pre-wrap;word-break:break-word;font-size:12px;line-height:1.5;opacity:0.9;"></pre>
-        `
-        waitRoot.appendChild(panel)
+      if (typeof startupStatus !== "undefined") {
+        lastStartupStatus = startupStatus
       }
-      return panel.querySelector(".wait-debug-body")
-    }
-    const renderWaitDebug = ({ startedAt, routerStatus, startupStatus } = {}) => {
-      const body = ensureWaitDebugPanel()
-      if (!body) {
+      if (typeof serverDebug !== "undefined") {
+        lastServerDebug = serverDebug
+      }
+      if (!waitDebug) {
         return
       }
-      const elapsedSeconds = startedAt ? Math.max(0, Math.floor((Date.now() - startedAt) / 1000)) : 0
-      const lines = [
-        `Elapsed: ${elapsedSeconds}s`,
-        `Startup phase: ${startupStatus && startupStatus.phase ? startupStatus.phase : "-"}`,
-        `Startup error: ${startupStatus && startupStatus.error ? startupStatus.error : "-"}`,
-        `Router check: ${routerStatus ? JSON.stringify(routerStatus) : "-"}`,
-        `Startup payload: ${startupStatus ? JSON.stringify({
-          phase: startupStatus.phase || null,
-          error: startupStatus.error || null,
-          startup_pending: startupStatus.startup_pending,
-          requirements_pending: startupStatus.requirements_pending,
-          updated_at: startupStatus.updated_at || null
-        }) : "-"}`,
-      ]
-      if (waitDebugState.events.length > 0) {
-        lines.push("")
-        lines.push("Recent events:")
-        lines.push(...waitDebugState.events)
+      waitDebug.render({
+        startedAt,
+        routerStatus: lastRouterStatus,
+        startupStatus: lastStartupStatus,
+        serverDebug: lastServerDebug,
+      })
+    }
+    const trackWaitDebug = ({ routerStatus, startupStatus } = {}) => {
+      if (waitDebug) {
+        waitDebug.track({ routerStatus, startupStatus })
       }
-      body.textContent = lines.join("\n")
     }
     const showWaitError = (message) => {
       if (waitRoot) {
@@ -369,9 +339,10 @@ document.addEventListener("DOMContentLoaded", async () => {
       await new Promise((resolve, reject) => {
         const interval = setInterval(async () => {
           try {
-            const [routerStatus, startupStatus] = await Promise.all([
+            const [routerStatus, startupStatus, serverDebug] = await Promise.all([
               fetch("/check_router_up").then((res) => res.json()),
-              fetch("/pinokio/startup_status").then((res) => res.json()).catch(() => null)
+              fetch("/pinokio/startup_status").then((res) => res.json()).catch(() => null),
+              fetch("/pinokio/secure_router_debug").then((res) => res.json()).catch(() => null)
             ])
 
             if (routerStatus && routerStatus.success) {
@@ -386,21 +357,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             if (startupStatus && startupStatus.error) {
               lastKnownError = startupStatus.error
             }
-            if (startupStatus && startupStatus.phase && startupStatus.phase !== waitDebugState.phase) {
-              waitDebugState.phase = startupStatus.phase
-              pushWaitDebugEvent(`phase -> ${startupStatus.phase}`)
-            }
-            const routerSummary = routerStatus
-              ? (routerStatus.success ? "success" : (routerStatus.error || JSON.stringify(routerStatus)))
-              : null
-            if (routerSummary && routerSummary !== waitDebugState.router) {
-              waitDebugState.router = routerSummary
-              pushWaitDebugEvent(`router -> ${routerSummary}`)
-            }
-            if (startupStatus && startupStatus.error && startupStatus.error !== waitDebugState.startupError) {
-              waitDebugState.startupError = startupStatus.error
-              pushWaitDebugEvent(`startup error -> ${startupStatus.error}`)
-            }
+            trackWaitDebug({ routerStatus, startupStatus })
             if (startupStatus && startupStatus.phase) {
               lastKnownPhase = startupStatus.phase
               const phaseMessage = startupStatus.phase === "ready"
@@ -408,7 +365,7 @@ document.addEventListener("DOMContentLoaded", async () => {
                 : `Restarting Pinokio... (${startupStatus.phase.replace(/_/g, " ")})`
               setWaitLabel(phaseMessage)
             }
-            renderWaitDebug({ startedAt, routerStatus, startupStatus })
+            renderWaitDebug({ startedAt, routerStatus, startupStatus, serverDebug })
 
             if (startupStatus && startupStatus.phase === "error") {
               clearInterval(interval)