pinokiod 3.170.0 → 3.181.0

package/server/index.js

@@ -230,8 +230,40 @@ class Server {
                 }
                 running_dynamic.push(obj)
               } else {
+                const normalizedFilepath = path.normalize(filepath)
+                const hasMenuCwd = typeof cwd === 'string'
+                const normalizedMenuCwd = hasMenuCwd ? (cwd.length === 0 ? '' : path.normalize(cwd)) : null
+                const matchesRunningEntry = (runningKey) => {
+                  if (typeof runningKey !== 'string' || runningKey.length === 0) {
+                    return false
+                  }
+                  const questionIndex = runningKey.indexOf('?')
+                  const runningPath = questionIndex >= 0 ? runningKey.slice(0, questionIndex) : runningKey
+                  if (path.normalize(runningPath) !== normalizedFilepath) {
+                    return false
+                  }
+                  if (!hasMenuCwd) {
+                    return questionIndex === -1
+                  }
+                  if (questionIndex === -1) {
+                    return normalizedMenuCwd === ''
+                  }
+                  const params = querystring.parse(runningKey.slice(questionIndex + 1))
+                  const rawCwd = typeof params.cwd === 'string' ? params.cwd : null
+                  if (normalizedMenuCwd === '') {
+                    return rawCwd !== null && rawCwd.length === 0
+                  }
+                  if (!rawCwd || rawCwd.length === 0) {
+                    return false
+                  }
+                  try {
+                    return path.normalize(rawCwd) === normalizedMenuCwd
+                  } catch (_) {
+                    return false
+                  }
+                }
                 for(let running_id in this.kernel.api.running) {
-                  if (running_id.startsWith(id)) {
+                  if (matchesRunningEntry(running_id)) {
                     let obj2 = structuredClone(obj)
                     obj2.running = true
                     obj2.display = "indent"
@@ -526,9 +558,13 @@ class Server {
     }
 
     let currentBranch = null
+    let isDetached = false
     try {
       currentBranch = await git.currentBranch({ fs, dir, fullname: false })
     } catch (_) {}
+    if (!currentBranch) {
+      isDetached = true
+    }
 
     let branches = []
     if (branchList.length > 0) {
@@ -595,6 +631,7 @@ class Server {
       branch: currentBranch,
       branches,
       dir,
+      detached: isDetached,
       logError: logError ? String(logError.message || logError) : null
     }
   }
@@ -812,6 +849,7 @@ class Server {
     let run_tab = "/p/" + name
     let dev_tab = "/p/" + name + "/dev"
     let review_tab = "/p/" + name + "/review"
+    let files_tab = "/p/" + name + "/files"
 
     let editor_tab = `/pinokio/fileview/${encodeURIComponent(name)}`
     let savedTabs = []
@@ -867,6 +905,7 @@ class Server {
       run_tab,
       dev_tab,
       review_tab,
+      files_tab,
 //        paths,
       theme: this.theme,
       agent: req.agent,
@@ -1470,10 +1509,15 @@ class Server {
           drive: path.resolve(this.kernel.homedir, "drive"),
         }
       }
+      const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+      let peer_qr = null
+      try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
       let list = this.getPeers()
       res.render("settings", {
         list,
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
         platform,
         version: this.version,
         logo: this.logo,
@@ -2195,6 +2239,10 @@ class Server {
         qr_cloudflare = await QRCode.toDataURL(this.cloudflare_pub)
       }
 
+      const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+      let peer_qr = null
+      try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
+
       // custom theme
       let exists = await fse.pathExists(this.kernel.path("web"))
       if (exists) {
@@ -2224,6 +2272,8 @@ class Server {
         res.render("index", {
           list,
           current_host: this.kernel.peer.host,
+          peer_url,
+          peer_qr,
           current_urls,
           portal: this.portal,
           install: this.install,
@@ -3885,6 +3935,9 @@ class Server {
     }))
     */
     this.app.get("/tools", ex(async (req, res) => {
+      const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+      let peer_qr = null
+      try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
       let list = this.getPeers()
       let installs = []
       for(let key in this.kernel.bin.installed) {
@@ -3916,6 +3969,8 @@ class Server {
       }
       res.render("tools", {
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
         pending,
         installs,
         bundles,
@@ -4000,9 +4055,14 @@ class Server {
         return (a.name || '').localeCompare(b.name || '')
       })
 
+      const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+      let peer_qr = null
+      try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
       const list = this.getPeers()
       res.render("terminals", {
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
         pluginMenu,
         apps,
         portal: this.portal,
@@ -4016,9 +4076,14 @@ class Server {
       res.redirect(301, "/terminals")
     })
     this.app.get("/screenshots", ex(async (req, res) => {
+      const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+      let peer_qr = null
+      try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
       let list = this.getPeers()
       res.render("screenshots", {
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
         version: this.version,
         portal: this.portal,
         logo: this.logo,
@@ -4105,6 +4170,7 @@ class Server {
         // if <app_name>.localhost
         // otherwise => redirect
 
+        console.log("Chunks", chunks)
 
         if (chunks.length >= 2) {
 
@@ -4151,29 +4217,31 @@ class Server {
         } else {
           nameChunks = chunks
         }
-        let name = nameChunks.join(".")
-        let api_path = this.kernel.path("api", name)
-        let exists = await this.exists(api_path)
-        if (exists) {
-          let meta = await this.kernel.api.meta(name)
-          let launcher = await this.kernel.api.launcher(name)
-          let pinokio = launcher.script
-          let launchable = false
-          if (pinokio && pinokio.menu && pinokio.menu.length > 0) {
-            launchable = true
-          }
-          res.render("start", {
-            url,
-            launchable,
-            autolaunch,
-            logo: this.logo,
-            theme: this.theme,
-            agent: req.agent,
-            name: meta.title,
-            image: meta.icon,
-            link: `/p/${name}?autolaunch=${autolaunch ? "1" : "0"}`,
-          })
-          return
+        if (nameChunks) {
+          let name = nameChunks.join(".")
+          let api_path = this.kernel.path("api", name)
+          let exists = await this.exists(api_path)
+          if (exists) {
+            let meta = await this.kernel.api.meta(name)
+            let launcher = await this.kernel.api.launcher(name)
+            let pinokio = launcher.script
+            let launchable = false
+            if (pinokio && pinokio.menu && pinokio.menu.length > 0) {
+              launchable = true
+            }
+            res.render("start", {
+              url,
+              launchable,
+              autolaunch,
+              logo: this.logo,
+              theme: this.theme,
+              agent: req.agent,
+              name: meta.title,
+              image: meta.icon,
+              link: `/p/${name}?autolaunch=${autolaunch ? "1" : "0"}`,
+            })
+            return
+          }
         }
       }
       res.render("start", {
@@ -4286,9 +4354,14 @@ class Server {
             drive: path.resolve(this.kernel.homedir, "drive"),
           }
         }
+        const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+        let peer_qr = null
+        try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
         let list = this.getPeers()
         res.render("settings", {
           current_host: this.kernel.peer.host,
+          peer_url,
+          peer_qr,
           list,
           platform,
           version: this.version,
@@ -4404,6 +4477,9 @@ class Server {
         return
       }
 
+      const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+      let peer_qr = null
+      try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
       let list = this.getPeers()
       let ai = await this.kernel.proto.ai()
       ai = [{
@@ -4417,6 +4493,8 @@ class Server {
         list,
         ai,
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
         cwd: this.kernel.path("api"),
         name: null,
 //        name: req.params.name,
@@ -4517,9 +4595,14 @@ class Server {
         } catch (e) {
         }
       }
+      const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+      let peer_qr = null
+      try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
       res.render(`connect`, {
         current_urls,
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
         list,
         portal: this.portal,
         logo: this.logo,
@@ -4661,6 +4744,13 @@ class Server {
     this.app.post("/push", ex(async (req, res) => {
       try {
         const payload = { ...(req.body || {}) }
+        // Normalise audience and device targeting
+        if (typeof payload.audience === 'string') {
+          payload.audience = payload.audience.trim() || undefined
+        }
+        if (typeof payload.device_id === 'string') {
+          payload.device_id = payload.device_id.trim() || undefined
+        }
         const resolveAssetPath = (raw) => {
           if (typeof raw !== 'string') {
             return null
@@ -4743,6 +4833,19 @@ class Server {
         }
         delete payload.soundUrl
         delete payload.soundPath
+        // For device-scoped notifications, suppress host OS notifier for remote origins,
+        // but allow it when the request originates from the local machine
+        if (payload.audience === 'device' && typeof payload.device_id === 'string' && payload.device_id) {
+          try {
+            if (this.socket && typeof this.socket.isLocalDevice === 'function') {
+              payload.host = !!this.socket.isLocalDevice(payload.device_id)
+            } else {
+              payload.host = false
+            }
+          } catch (_) {
+            payload.host = false
+          }
+        }
         Util.push(payload)
         res.json({ success: true })
       } catch (e) {
@@ -5304,6 +5407,9 @@ class Server {
       let static_routes = Object.keys(this.kernel.router.rewrite_mapping).map((key) => {
         return this.kernel.router.rewrite_mapping[key]
       })
+      const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+      let peer_qr = null
+      try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
       res.render("net", {
         static_routes,
         selected_name: req.params.name,
@@ -5322,6 +5428,8 @@ class Server {
         peer,
         protocol,
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
       })
     }))
     this.app.get("/network", ex(async (req, res) => {
@@ -5463,6 +5571,9 @@ class Server {
       let static_routes = Object.keys(this.kernel.router.rewrite_mapping).map((key) => {
         return this.kernel.router.rewrite_mapping[key]
       })
+      const peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+      let peer_qr = null
+      try { peer_qr = await QRCode.toDataURL(peer_url) } catch (_) {}
       res.render("network", {
         static_routes,
         host,
@@ -5488,6 +5599,8 @@ class Server {
         peer_active: this.kernel.peer.active,
         port_mapping: this.kernel.router.port_mapping,
 //        port_mapping: this.kernel.caddy.port_mapping,
+        peer_url,
+        peer_qr,
 //        ip_mapping: this.kernel.caddy.ip_mapping,
         lan: this.kernel.router.local_network_mapping,
         agent: req.agent,
@@ -6246,8 +6359,84 @@ class Server {
       res.json(response)
     }))
     this.app.get("/info/git/:ref/*", ex(async (req, res) => {
-      let response = await this.getGit(req.params.ref, req.params[0])
-      res.json(response)
+      const repoParam = req.params[0]
+      const ref = req.params.ref || 'HEAD'
+      const summary = await this.getGit(ref, repoParam)
+
+      const repoDir = summary && summary.dir ? summary.dir : this.kernel.path('api', repoParam)
+
+      if (ref === 'HEAD') {
+        try {
+          const { changes: headChanges, git_commit_url } = await this.getRepoHeadStatus(repoParam)
+          summary.changes = headChanges || []
+          summary.git_commit_url = git_commit_url || null
+        } catch (error) {
+          console.error('[git-info] head status error', repoParam, error)
+          summary.changes = []
+        }
+      } else {
+        let changes = []
+        try {
+          const commitOid = await this.kernel.git.resolveCommitOid(repoDir, ref)
+          const parentOid = await this.kernel.git.getParentCommit(repoDir, commitOid)
+          let entries
+          if (parentOid !== commitOid) {
+            entries = await git.walk({
+              fs,
+              dir: repoDir,
+              trees: [git.TREE({ ref: parentOid }), git.TREE({ ref: commitOid })],
+              map: async (filepath, [A, B]) => {
+                if (filepath === '.') return
+                if (!A && B) return { filepath, type: 'added' }
+                if (A && !B) return { filepath, type: 'deleted' }
+                if (A && B) {
+                  const Aoid = await A.oid()
+                  const Boid = await B.oid()
+                  if (Aoid !== Boid) return { filepath, type: 'modified' }
+                }
+              },
+            })
+          } else {
+            entries = await git.walk({
+              fs,
+              dir: repoDir,
+              trees: [git.TREE({ ref: commitOid })],
+              map: async (filepath, [B]) => {
+                if (filepath === '.') return
+                return { filepath, type: 'added' }
+              },
+            })
+          }
+          const diffFiles = (entries || []).filter(Boolean)
+          for (const { filepath, type } of diffFiles) {
+            const fullPath = path.join(repoDir, filepath)
+            const stats = await fs.promises.stat(fullPath).catch(() => null)
+            if (!stats || stats.isDirectory()) {
+              continue
+            }
+            const relpath = path.relative(this.kernel.path('api'), fullPath)
+            changes.push({
+              ref,
+              webpath: "/asset/" + path.relative(this.kernel.homedir, fullPath),
+              file: filepath,
+              path: fullPath,
+              diffpath: `/gitdiff/${ref}/${repoParam}/${filepath}`,
+              status: type,
+              relpath,
+            })
+          }
+        } catch (error) {
+          console.error('[git-info] diff error', repoParam, ref, error)
+        }
+        summary.changes = changes
+      }
+
+      if (!summary.git_commit_url) {
+        summary.git_commit_url = `/run/scripts/git/commit.json?cwd=${repoDir}&callback_target=parent&callback=$location.href`
+      }
+      summary.dir = repoDir
+
+      res.json(summary)
     }))
     this.app.get("/info/gitstatus/:name", ex(async (req, res) => {
       try {
@@ -6944,6 +7133,35 @@ class Server {
       let current_peer_info = await this.kernel.peer.current_host()
       res.json(current_peer_info)
     }))
+    this.app.get("/info/router", ex(async (req, res) => {
+      try {
+        // Lightweight router mapping without favicon or installed scans
+        const https_active = this.kernel.peer.https_active
+        const router_info = await this.kernel.peer.router_info_lite()
+        const rewrite_mapping = this.kernel.router.rewrite_mapping
+        const router = this.kernel.router.published()
+        res.json({ https_active, router_info, rewrite_mapping, router })
+      } catch (err) {
+        res.json({ https_active: false, router_info: [], rewrite_mapping: {}, router: {} })
+      }
+    }))
+    this.app.get("/qr", ex(async (req, res) => {
+      try {
+        const data = typeof req.query.data === 'string' ? req.query.data : ''
+        if (!data) {
+          res.status(400).json({ error: 'Missing data parameter' })
+          return
+        }
+        const scale = Math.max(2, Math.min(10, parseInt(req.query.s || '4', 10) || 4))
+        const margin = Math.max(0, Math.min(4, parseInt(req.query.m || '0', 10) || 0))
+        const buf = await QRCode.toBuffer(data, { type: 'png', scale, margin })
+        res.setHeader('Content-Type', 'image/png')
+        res.setHeader('Cache-Control', 'no-store')
+        res.send(buf)
+      } catch (err) {
+        res.status(500).json({ error: 'Failed to generate QR' })
+      }
+    }))
     this.app.get("/info/api", ex(async (req,res) => {
       // api related info
       let repo = this.kernel.git.find(req.query.git)
@@ -7052,10 +7270,12 @@ class Server {
       let run_tab = "/p/" + name
       let dev_tab = "/p/" + name + "/dev"
       let review_tab = "/p/" + name + "/review"
+      let files_tab = "/p/" + name + "/files"
       res.render("review", {
         run_tab,
         dev_tab,
         review_tab,
+        files_tab,
         name: req.params.name,
         type: "review",
         title: name,
@@ -7070,6 +7290,9 @@ class Server {
     this.app.get("/p/:name/dev", ex(async (req, res) => {
       await this.chrome(req, res, "browse")
     }))
+    this.app.get("/p/:name/files", ex(async (req, res) => {
+      await this.chrome(req, res, "files")
+    }))
     this.app.get("/p/:name/browse", ex(async (req, res) => {
       await this.chrome(req, res, "browse")
     }))