pinokiod 7.1.67 → 7.1.68

package/package.json

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

package/server/index.js

@@ -5480,43 +5480,53 @@ class Server {
     return list
   }
   async check_router_up() {
-    // check if caddy is runnign properly
-    //    try https://pinokio.localhost
-    //    if it works, proceed
-    //    if not, redirect
-    let https_running = false
+    let response
+    let config
     try {
       let res = await axios.get(`http://127.0.0.1:2019/config/`, {
         timeout: 2000
       })
-      let test = /pinokio\.localhost/.test(JSON.stringify(res.data))
-      if (test) {
-        https_running = true
-      }
+      config = res.data
     } catch (e) {
-//      console.log(e)
-    }
-//    console.log({ https_running })
-    if (!https_running) {
-      return { error: "pinokio.host not yet available" }
+      response = {
+        stage: "caddy_admin_unavailable",
+        error: "caddy admin unavailable",
+        detail: e && e.message ? e.message : String(e)
+      }
     }
-
-
-    // check if pinokio.localhost router is running
-    let router_running = false
-    let router = this.kernel.router.published()
-    for(let ip in router) {
-      let domains = router[ip]
-      if (domains.includes("pinokio.localhost")) {
-        router_running = true
-        break
+    if (!response) {
+      if (config === null || typeof config === "undefined") {
+        response = {
+          stage: "caddy_config_empty",
+          error: "caddy config not yet loaded"
+        }
+      } else if (!/pinokio\.localhost/.test(JSON.stringify(config))) {
+        response = {
+          stage: "caddy_route_missing",
+          error: "pinokio.localhost missing from caddy config"
+        }
+      } else {
+        let router_running = false
+        let router = this.kernel.router.published()
+        for (let ip in router) {
+          let domains = router[ip]
+          if (domains.includes("pinokio.localhost")) {
+            router_running = true
+            break
+          }
+        }
+        if (!router_running) {
+          response = {
+            stage: "pinokio_router_missing",
+            error: "pinokio.localhost not yet published by Pinokio router"
+          }
+        }
       }
     }
-    if (!router_running) {
-      return { error: "pinokio.localhost not yet available" }
+    if (!response) {
+      response = { success: true, stage: "ready" }
     }
-
-    return { success: true }
+    return response
   }
   async start(options) {
     this.debug = false
@@ -11428,37 +11438,8 @@ class Server {
         return
       }
 
-      let https_running = false
-      try {
-        let res = await axios.get(`http://127.0.0.1:2019/config/`, {
-          timeout: 2000
-        })
-        let test = /pinokio\.localhost/.test(JSON.stringify(res.data))
-        if (test) {
-          https_running = true
-        }
-      } catch (e) {
-        console.log(e)
-      }
-      if (!https_running) {
-//        res.json({ error: "pinokio.host not yet available" })
-        res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
-        return
-      }
-
-
-      // check if pinokio.localhost router is running
-      let router_running = false
-      let router = this.kernel.router.published()
-      for(let ip in router) {
-        let domains = router[ip]
-        if (domains.includes("pinokio.localhost")) {
-          router_running = true
-          break
-        }
-      }
-      if (!router_running) {
-//        res.json({ error: "pinokio.localhost not yet available" })
+      const routerStatus = await this.check_router_up()
+      if (!routerStatus.success) {
         res.redirect("/setup/connect?callback=/connect/" + req.params.provider)
         return
       }
@@ -15576,6 +15557,13 @@ class Server {
           server_ready: true,
           phase: this.getStartupStatus().phase === "idle" ? "ready" : this.getStartupStatus().phase
         })
+        if (this.kernel && this.kernel.peer && this.kernel.peer.https_active) {
+          this.kernel.refresh(true).then(() => {
+            return this.check_router_up()
+          }).catch((error) => {
+            console.warn("[Pinokiod] initial secure router refresh failed", error && error.message ? error.message : error)
+          })
+        }
         resolve()
       });
       this.httpTerminator = createHttpTerminator({

package/server/views/setup.ejs

@@ -243,6 +243,12 @@ document.addEventListener("DOMContentLoaded", async () => {
     const waitRoot = document.querySelector(".requirements .content")
     const waitLabel = document.querySelector(".requirements .content .loading span")
     const WAIT_TIMEOUT_MS = 120000
+    const ROUTER_STAGE_MESSAGES = {
+      caddy_admin_unavailable: "Restarting Pinokio... (waiting for Caddy)",
+      caddy_config_empty: "Restarting Pinokio... (publishing secure router)",
+      caddy_route_missing: "Restarting Pinokio... (loading pinokio.localhost)",
+      pinokio_router_missing: "Restarting Pinokio... (waiting for Pinokio router)"
+    }
     const setWaitLabel = (message) => {
       if (waitLabel) {
         waitLabel.textContent = message
@@ -314,10 +320,13 @@ document.addEventListener("DOMContentLoaded", async () => {
               lastKnownError = startupStatus.error
             }
             if (startupStatus && startupStatus.phase) {
-              lastKnownPhase = startupStatus.phase
-              const phaseMessage = startupStatus.phase === "ready"
+              lastKnownPhase = (routerStatus && routerStatus.stage) || startupStatus.phase
+              const routerStageMessage = routerStatus && routerStatus.stage
+                ? ROUTER_STAGE_MESSAGES[routerStatus.stage]
+                : null
+              const phaseMessage = routerStageMessage || (startupStatus.phase === "ready"
                 ? "Secure router is almost ready..."
-                : `Restarting Pinokio... (${startupStatus.phase.replace(/_/g, " ")})`
+                : `Restarting Pinokio... (${startupStatus.phase.replace(/_/g, " ")})`)
               setWaitLabel(phaseMessage)
             }