pinokiod 8.2.2 → 8.2.4

package/kernel/index.js

@@ -35,6 +35,7 @@ const Plugin = require('./plugin')
 const Router = require("./router")
 const PinokioDomainRouter = require("./router/pinokio_domain_router")
 const Procs = require('./procs')
+const Anywhere = require('./anywhere')
 const Peer = require('./peer')
 const Git = require('./git')
 const Vault = require('./vault')
@@ -711,6 +712,15 @@ class Kernel {
 
       }
     }
+    // 8b. Pinokio Anywhere: refresh the tailscale serve config from the apps'
+    // published URLs. No-op unless Anywhere is on and its daemon is running.
+    if (this.anywhere) {
+      try {
+        await this.anywhere.sync()
+      } catch (err) {
+        console.warn('[anywhere] sync failed:', err && err.message ? err.message : err)
+      }
+    }
     // 6. tell peers to refresh
     let changed
     let new_config = JSON.stringify(await this.peer.current_host())
@@ -1103,12 +1113,17 @@ class Kernel {
     if (this.peer) {
       this.peer.stop()
     }
+    if (this.anywhere) {
+      // re-initializing the kernel (home change): drop the old daemon
+      await this.anywhere.stop().catch(() => {})
+    }
 
     this.info = new Info(this)
     this.pipe = new Pipe(this)
     this.proto = new Proto(this)
     this.plugin = new Plugin(this)
     this.processes = new Procs(this)
+    this.anywhere = new Anywhere(this)
     this.kv = new KV(this)
     this.cloudflare = new Cloudflare()
     this.peer = new Peer(this)

package/kernel/shell.js

@@ -21,7 +21,7 @@ const ShellParser = require('./shell_parser')
 const AnsiStreamTracker = require('./ansi_stream_tracker')
 const ShellStateSync = require('./shell_state_sync')
 const ShellRunTemplate = require('./api/shell_run_template')
-const { PYTHON_INSTALL_SPEC } = require('./bin/conda-pins')
+const { PYTHON_INSTALL_SPEC, PIP_INSTALL_COMMAND, PIP_MIN_VERSION } = require('./bin/conda-pins')
 const CondaRuntimeGuard = require('./shell_conda_runtime_guard')
 const home = os.homedir()
 const WINDOWS_CMD_CONDA_COMMAND_PATTERN = /(?:^|[&|()]\s*)@?\s*(?:call\s+)?(?:"[^"]*[\\/]conda(?:\.bat|\.exe)?"|(?:[a-z]:)?[^&|()\s"]*[\\/]conda(?:\.bat|\.exe)?|conda(?:\.bat|\.exe)?)\s+/i
@@ -1399,10 +1399,17 @@ class Shell {
               deactivate_path,
 //              timeout,
               activate_command,
+              this.isPowerShell()
+                ? `${PIP_INSTALL_COMMAND}; if ($LASTEXITCODE -ne 0) { exit 1 }`
+                : `${PIP_INSTALL_COMMAND} || exit 1`,
 //              timeout,
             ]
           }
         }
+        if (!use_uv) {
+          const checkPip = `python -I -c "from importlib.metadata import distributions; assert all(tuple(map(int, d.version.split('.')[:3])) >= (${PIP_MIN_VERSION.split(".").join(", ")}) for d in distributions(name='pip')), 'Update pip in this app environment before running it.'"`
+          venv_activation.push(this.isPowerShell() ? `${checkPip}; if ($LASTEXITCODE -ne 0) { exit 1 }` : `${checkPip} || exit 1`)
+        }
       } else {
         venv_activation = []
       }

package/package.json

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

package/server/index.js

@@ -497,6 +497,13 @@ class Server {
     if (this.kernel && this.kernel.processes && this.kernel.processes.caddy_pid) {
       this.killProcessTree(this.kernel.processes.caddy_pid, 'kill caddy')
     }
+    if (this.kernel && this.kernel.anywhere) {
+      try {
+        this.kernel.anywhere.killSync()
+      } catch (error) {
+        console.error('Failed to kill tailscaled', error)
+      }
+    }
     this.killProcessTree(process.pid, 'kill self')
   }
   exists (s) {
@@ -1011,6 +1018,64 @@ class Server {
     routes.sort((a, b) => String(a.name || "").localeCompare(String(b.name || "")))
     return routes
   }
+  // ---------------- Pinokio Anywhere ----------------
+  portFromUrl(value) {
+    if (!value || typeof value !== "string") return null
+    try {
+      const parsed = new URL(value)
+      if (parsed.port) return Number(parsed.port)
+      if (parsed.protocol === "https:") return 443
+      if (parsed.protocol === "http:") return 80
+    } catch (_) { }
+    return null
+  }
+  async composeAnywhereStatus({ light } = {}) {
+    const anywhere = this.kernel ? this.kernel.anywhere : null
+    if (!anywhere) {
+      return { phase: "setup", installed: false, enabled: false, running: false }
+    }
+    let snap
+    try {
+      snap = await anywhere.snapshot()
+    } catch (error) {
+      return { phase: "error", installed: true, enabled: true, running: false, error: error && error.message ? error.message : String(error) }
+    }
+    if (light) {
+      return snap
+    }
+    snap.apps = []
+    if (snap.phase === "ready") {
+      const serveByLocalPort = new Map((snap.serve || []).map((entry) => [entry.local, entry]))
+      let running = []
+      try {
+        running = await this.collectHomeServerApps()
+      } catch (_) {
+        running = []
+      }
+      for (const app of running) {
+        const port = this.portFromUrl(app.ready_url || app.url)
+        const entry = port ? serveByLocalPort.get(port) : null
+        snap.apps.push({
+          name: app.name,
+          icon: app.icon,
+          state: app.state,
+          remote: entry ? entry.url : null,
+          exposed: !!entry,
+        })
+      }
+    }
+    if (snap.connectUrl) {
+      if (!this.anywhereQrCache || this.anywhereQrCache.url !== snap.connectUrl) {
+        try {
+          this.anywhereQrCache = { url: snap.connectUrl, data: await QRCode.toDataURL(snap.connectUrl, { margin: 1, scale: 6 }) }
+        } catch (_) {
+          this.anywhereQrCache = { url: snap.connectUrl, data: null }
+        }
+      }
+      snap.qr = this.anywhereQrCache.data
+    }
+    return snap
+  }
   async collectHomeServerApps() {
     const apps = []
     if (!this.kernel || !this.kernel.api || typeof this.kernel.api.listApps !== "function") {
@@ -4900,6 +4965,12 @@ class Server {
 //          config.icon = "/pinokio-white.png"
 //        }
 //      }
+      // Pinokio Anywhere: a visitor on the node's own Tailscale name gets each
+      // published app's fixed https address; any other host is left for the
+      // Home Server rewrite below, exactly as before.
+      if (this.kernel.anywhere) {
+        await this.kernel.anywhere.rewriteMenu(req.$source && req.$source.host, config.menu)
+      }
       config = Util.rewrite_localhost(this.kernel, config, req.$source)
       return config
     } else {
@@ -6757,6 +6828,8 @@ class Server {
         protocol,
         host: forwardedHost || req.get("host")
       }
+      // Pinokio Anywhere: only a visitor on the node's own Tailscale name gets the web-app manifest
+      res.locals.anywhere_host = !!(this.kernel && this.kernel.anywhere && this.kernel.anywhere.isNodeHost(req.$source.host))
       next()
     })
     if (this.kernel.homedir) {
@@ -14159,6 +14232,56 @@ class Server {
         allow_dns_creation,
       })
     }))
+    this.app.get("/anywhere", ex(async (req, res) => {
+      let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({
+        bin: this.kernel.bin.preset("anywhere"),
+      })
+      if (!requirements_pending && install_required) {
+        res.redirect("/setup/anywhere?callback=/anywhere")
+        return
+      }
+      const anywhere = this.kernel.anywhere
+      // first visit after install: switch it on, the page then walks the user
+      // through sign-in. Later visits respect the on/off switch.
+      if (anywhere && !requirements_pending && !(await anywhere.configured())) {
+        anywhere.enable().catch((err) => {
+          console.log("[anywhere] enable failed", err && err.message ? err.message : err)
+        })
+      }
+      const status = await this.composeAnywhereStatus()
+      res.render("anywhere", {
+        status,
+        requirements_pending,
+        install_required,
+        error,
+        docs: this.docs,
+        portal: this.portal,
+        logo: this.logo,
+        theme: this.theme,
+        agent: req.agent,
+      })
+    }))
+    this.app.get("/anywhere/status", ex(async (req, res) => {
+      res.set("Cache-Control", "no-store")
+      res.json(await this.composeAnywhereStatus({ light: req.query.light === "1" }))
+    }))
+    const anywhereAction = (label, fn) => ex(async (req, res) => {
+      const anywhere = this.kernel.anywhere
+      if (!anywhere) {
+        res.status(500).json({ success: false, error: "Pinokio Anywhere is not available" })
+        return
+      }
+      try {
+        await fn(anywhere, req)
+        res.json({ success: true, status: await this.composeAnywhereStatus() })
+      } catch (error) {
+        console.log(`[anywhere] ${label} failed`, error)
+        res.status(500).json({ success: false, error: error && error.message ? error.message : String(error) })
+      }
+    })
+    this.app.post("/anywhere/start", anywhereAction("start", (anywhere) => anywhere.enable()))
+    this.app.post("/anywhere/stop", anywhereAction("stop", (anywhere) => anywhere.disable()))
+    this.app.post("/anywhere/logout", anywhereAction("logout", (anywhere) => anywhere.logout()))
     this.app.get("/network", ex(async (req, res) => {
       let protocol = req.get('X-Forwarded-Proto') || "http"
       let { requirements, install_required, requirements_pending, error } = await this.kernel.bin.check({

package/server/public/anywhere.webmanifest

@@ -0,0 +1 @@
+{"name":"Pinokio","short_name":"Pinokio","start_url":"/","scope":"/","display":"standalone","background_color":"#ffffff","theme_color":"#000000","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png","purpose":"any maskable"},{"src":"/apple-touch-icon.png","sizes":"180x180","type":"image/png"}]}