pinokiod 3.180.0 → 3.182.0

package/server/index.js

@@ -38,6 +38,7 @@ const ini = require('ini')
 const ejs = require('ejs');
 
 const DEFAULT_PORT = 42000
+const NOTIFICATION_SOUND_EXTENSIONS = new Set(['.aac', '.flac', '.m4a', '.mp3', '.ogg', '.wav', '.webm'])
 
 const ex = fn => (req, res, next) => {
   Promise.resolve(fn(req, res, next)).catch(next);
@@ -1509,10 +1510,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,
@@ -2234,6 +2240,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) {
@@ -2263,6 +2273,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,
@@ -3433,8 +3445,8 @@ class Server {
       }
       terminal = {
         icon: "fa-solid fa-terminal",
-        title: "User Terminal",
-        subtitle: "Open the terminal in the browser",
+        title: "Shell",
+        subtitle: "Open an interactive terminal in the browser",
         menu: terminals
       }
     } else {
@@ -3901,6 +3913,46 @@ class Server {
       getTheme: () => this.theme,
       exists: (target) => this.exists(target),
     });
+
+    this.app.get('/pinokio/notification-sounds', ex(async (req, res) => {
+      const soundRoot = path.resolve(__dirname, 'public', 'sound');
+      let entries = [];
+      try {
+        const dirEntries = await fs.promises.readdir(soundRoot, { withFileTypes: true });
+        entries = dirEntries
+          .filter((entry) => entry.isFile())
+          .map((entry) => entry.name)
+          .filter((name) => NOTIFICATION_SOUND_EXTENSIONS.has(path.extname(name).toLowerCase()))
+          .sort((a, b) => a.localeCompare(b, undefined, { sensitivity: 'base' }));
+      } catch (error) {
+        if (error && error.code === 'ENOENT') {
+          return res.json({ sounds: [] });
+        }
+        return res.status(500).json({
+          error: 'Failed to enumerate notification sounds',
+          details: error && error.message ? error.message : String(error || ''),
+        });
+      }
+
+      const normalizeLabel = (filename) => {
+        const withoutExt = filename.replace(/\.[^.]+$/, '');
+        return withoutExt
+          .replace(/[-_]+/g, ' ')
+          .replace(/\b\w/g, (char) => char.toUpperCase());
+      };
+
+      const sounds = entries.map((filename) => {
+        const encoded = filename.split('/').map(encodeURIComponent).join('/');
+        return {
+          id: filename,
+          label: normalizeLabel(filename),
+          url: `/sound/${encoded}`,
+          filename,
+        };
+      });
+
+      res.json({ sounds });
+    }));
     /*
     this.app.get("/asset/*", ex((req, res) => {
       let pathComponents = req.params[0].split("/")
@@ -3924,6 +3976,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) {
@@ -3955,6 +4010,8 @@ class Server {
       }
       res.render("tools", {
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
         pending,
         installs,
         bundles,
@@ -3966,7 +4023,7 @@ class Server {
         list,
       })
     }))
-    this.app.get("/terminals", ex(async (req, res) => {
+    this.app.get("/agents", ex(async (req, res) => {
       if (!this.kernel.plugin.config) {
         try {
           await this.kernel.plugin.init()
@@ -4039,9 +4096,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", {
+      res.render("agents", {
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
         pluginMenu,
         apps,
         portal: this.portal,
@@ -4051,13 +4113,35 @@ class Server {
         list,
       })
     }))
+    this.app.get("/api/plugin/menu", ex(async (req, res) => {
+      try {
+        if (!this.kernel.plugin.config) {
+          await this.kernel.plugin.init()
+        }
+        const pluginMenu = this.kernel.plugin && this.kernel.plugin.config && Array.isArray(this.kernel.plugin.config.menu)
+          ? this.kernel.plugin.config.menu
+          : []
+        res.json({ menu: pluginMenu })
+      } catch (error) {
+        console.warn('Failed to load plugin menu for create launcher modal', error)
+        res.json({ menu: [] })
+      }
+    }))
     this.app.get("/plugins", (req, res) => {
-      res.redirect(301, "/terminals")
+      res.redirect(301, "/agents")
+    })
+    this.app.get("/terminals", (req, res) => {
+      res.redirect(301, "/agents")
     })
     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,
@@ -4144,6 +4228,7 @@ class Server {
         // if <app_name>.localhost
         // otherwise => redirect
 
+        console.log("Chunks", chunks)
 
         if (chunks.length >= 2) {
 
@@ -4190,29 +4275,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", {
@@ -4325,9 +4412,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,
@@ -4443,6 +4535,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 = [{
@@ -4456,6 +4551,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,
@@ -4556,9 +4653,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,
@@ -4700,6 +4802,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
@@ -4782,6 +4891,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) {
@@ -5343,6 +5465,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,
@@ -5361,6 +5486,8 @@ class Server {
         peer,
         protocol,
         current_host: this.kernel.peer.host,
+        peer_url,
+        peer_qr,
       })
     }))
     this.app.get("/network", ex(async (req, res) => {
@@ -5502,6 +5629,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,
@@ -5527,6 +5657,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,
@@ -6417,6 +6549,40 @@ class Server {
       let exec_menus = []
       let shell_menus = []
       let href_menus = []
+      const normalizeForSort = (value) => {
+        if (typeof value !== 'string') {
+          return ''
+        }
+        return value.trim().toLocaleLowerCase()
+      }
+      const compareMenuItems = (a = {}, b = {}) => {
+        const titleDiff = normalizeForSort(a.title).localeCompare(normalizeForSort(b.title))
+        if (titleDiff !== 0) {
+          return titleDiff
+        }
+        const subtitleDiff = normalizeForSort(a.subtitle).localeCompare(normalizeForSort(b.subtitle))
+        if (subtitleDiff !== 0) {
+          return subtitleDiff
+        }
+        return normalizeForSort(a.href || a.link).localeCompare(normalizeForSort(b.href || b.link))
+      }
+      const sortMenuEntries = (menuArray) => {
+        if (!Array.isArray(menuArray) || menuArray.length < 2) {
+          return
+        }
+        menuArray.sort(compareMenuItems)
+      }
+      const sortNestedMenus = (menuArray) => {
+        if (!Array.isArray(menuArray)) {
+          return
+        }
+        sortMenuEntries(menuArray)
+        for (const entry of menuArray) {
+          if (entry && Array.isArray(entry.menu)) {
+            sortNestedMenus(entry.menu)
+          }
+        }
+      }
       if (plugin_menu.length > 0) {
         for(let item of plugin_menu) {
           // if shell.run method exists
@@ -6444,30 +6610,37 @@ class Server {
             href_menus.push(item)
           }
         }
-        exec_menus.sort((a, b) => { return a > b })
-        shell_menus.sort((a, b) => { return a > b })
-        href_menus.sort((a, b) => { return a > b })
+        sortNestedMenus(exec_menus)
+        sortNestedMenus(shell_menus)
+        sortNestedMenus(href_menus)
       }
 
 //      let terminal = await this.terminals(filepath)
 //      let online_terminal = await this.getPluginGlobal(req, terminal, filepath)
 //      console.log("online_terminal", online_terminal)
       terminal.menus = href_menus
+      sortNestedMenus(terminal.menu)
+      sortNestedMenus(terminal.menus)
       let dynamic = [
         terminal,
         {
           icon: "fa-solid fa-robot",
-          title: "AI Terminal",
-          subtitle: "Let AI work on this app",
+          title: "Terminal Agents",
+          subtitle: "Start a session in Pinokio",
           menu: shell_menus
         },
         {
           icon: "fa-solid fa-arrow-up-right-from-square",
-          title: "External apps",
-          subtitle: "Open this project in 3rd party apps",
+          title: "IDE Agents",
+          subtitle: "Open the project in external IDEs",
           menu: exec_menus
         },
       ]
+      for (const item of dynamic) {
+        if (item && Array.isArray(item.menu)) {
+          sortNestedMenus(item.menu)
+        }
+      }
 
       let spec = ""
       try {
@@ -7059,6 +7232,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)