pinokiod 3.250.0 → 3.251.0

package/kernel/peer.js

@@ -10,6 +10,8 @@ class PeerDiscovery {
     this.kill_message = Buffer.from("kill")
     this.interval = interval;
     this.peers = new Set();
+    this.interface_addresses = []
+    this.host_candidates = []
     this.host = this._getLocalIPAddress()
     this.default_port = 42000
     this.peers.add(this.host)
@@ -261,8 +263,11 @@ class PeerDiscovery {
           let internal_host = chunks.slice(0, chunks.length-1).join(":")
           let external_port = port_mapping[internal_port]
           let merged
+          const external_hosts = this._buildExternalHostEntries(external_port)
           let external_ip
-          if (external_port) {
+          if (external_hosts.length > 0) {
+            external_ip = external_hosts[0].url
+          } else if (external_port) {
             external_ip = `${this.host}:${external_port}`
           }
           let internal_router = []
@@ -285,9 +290,10 @@ class PeerDiscovery {
           let info = {
             external_router: router[external_ip] || [],
             internal_router,
+            external_hosts,
             external_ip,
-            external_port: parseInt(external_port),
-            internal_port: parseInt(internal_port),
+            external_port: external_port ? parseInt(external_port, 10) : undefined,
+            internal_port: internal_port ? parseInt(internal_port, 10) : undefined,
             ...proc,
           }
           const usingCustomDomain = this.kernel.router_kind === 'custom-domain'
@@ -349,7 +355,11 @@ class PeerDiscovery {
           let internal_port = chunks[chunks.length - 1]
           let internal_host = chunks.slice(0, chunks.length - 1).join(":")
           let external_port = port_mapping ? port_mapping[internal_port] : undefined
-          let external_ip = external_port ? `${this.host}:${external_port}` : undefined
+          const external_hosts = this._buildExternalHostEntries(external_port)
+          let external_ip = external_hosts.length > 0 ? external_hosts[0].url : undefined
+          if (!external_ip && external_port) {
+            external_ip = `${this.host}:${external_port}`
+          }
 
           let internal_router = []
           // Check common local keys
@@ -367,9 +377,10 @@ class PeerDiscovery {
           const info = {
             external_router: (router && external_ip && router[external_ip]) ? router[external_ip] : [],
             internal_router,
+            external_hosts,
             external_ip,
-            external_port: external_port ? parseInt(external_port) : undefined,
-            internal_port: internal_port ? parseInt(internal_port) : undefined,
+            external_port: external_port ? parseInt(external_port, 10) : undefined,
+            internal_port: internal_port ? parseInt(internal_port, 10) : undefined,
             ...proc,
           }
 
@@ -489,6 +500,7 @@ class PeerDiscovery {
       name: this.name,
       host: this.host,
       peers: peers,
+      host_candidates: this.host_candidates,
       port_mapping: this.kernel.router.port_mapping,
       rewrite_mapping: this.kernel.router.rewrite_mapping,
       proc: this.kernel.processes.info,
@@ -554,29 +566,170 @@ class PeerDiscovery {
 //    }
   }
   _isLocalLAN(ip) {
-    return ip.startsWith('192.168.') || ip.startsWith('10.') || (ip.startsWith('172.') && is172Private(ip));
+    return this.isRFC1918(ip)
   }
   _getLocalIPAddress() {
-    const interfaces = os.networkInterfaces();
-    for (const ifaceList of Object.values(interfaces)) {
+    this.interface_addresses = this._collectInterfaceAddresses()
+    const shareable = this.interface_addresses.filter((entry) => entry.shareable)
+    this.host_candidates = shareable
+    const lanCandidate = shareable.find((entry) => entry.scope === 'lan')
+    if (lanCandidate) {
+      return lanCandidate.address
+    }
+    const cgnatCandidate = shareable.find((entry) => entry.scope === 'cgnat')
+    if (cgnatCandidate) {
+      return cgnatCandidate.address
+    }
+    const publicCandidate = shareable.find((entry) => entry.scope === 'public')
+    if (publicCandidate) {
+      return publicCandidate.address
+    }
+    return shareable.length > 0 ? shareable[0].address : null
+  }
+  isPrivateOrCGNAT(ip) {
+    return this.isRFC1918(ip) || this.isCGNAT(ip)
+  }
+  isRFC1918(ip) {
+    if (!ip || typeof ip !== 'string') {
+      return false
+    }
+    const octets = ip.split('.').map(Number)
+    if (octets.length !== 4 || octets.some((value) => Number.isNaN(value))) {
+      return false
+    }
+    if (octets[0] === 10) return true
+    if (octets[0] === 172 && this.is172Private(octets[1])) return true
+    if (octets[0] === 192 && octets[1] === 168) return true
+    return false
+  }
+  isCGNAT(ip) {
+    if (!ip || typeof ip !== 'string') {
+      return false
+    }
+    const octets = ip.split('.').map(Number)
+    if (octets.length !== 4 || octets.some((value) => Number.isNaN(value))) {
+      return false
+    }
+    return octets[0] === 100 && octets[1] >= 64 && octets[1] <= 127
+  }
+  is172Private(secondOctet) {
+    if (typeof secondOctet !== 'number' || Number.isNaN(secondOctet)) {
+      return false
+    }
+    return secondOctet >= 16 && secondOctet <= 31
+  }
+  _collectInterfaceAddresses() {
+    const interfaces = os.networkInterfaces()
+    const results = []
+    const seen = new Set()
+    for (const [ifaceName, ifaceList] of Object.entries(interfaces)) {
+      if (!Array.isArray(ifaceList)) {
+        continue
+      }
       for (const iface of ifaceList) {
-        if (iface.family === 'IPv4' && !iface.internal) {
-          const ip = iface.address;
-          if (this.isPrivateOrCGNAT(ip)) {
-            return ip;
-          }
+        if (!iface || iface.family !== 'IPv4') {
+          continue
         }
+        const address = String(iface.address || '').trim()
+        if (!address) {
+          continue
+        }
+        if (seen.has(address)) {
+          continue
+        }
+        seen.add(address)
+        const classification = this.classifyAddress(address, Boolean(iface.internal))
+        results.push({
+          address,
+          interface: ifaceName,
+          internal: Boolean(iface.internal),
+          scope: classification.scope,
+          shareable: classification.shareable
+        })
       }
     }
-    return null;
+    return results
   }
-  isPrivateOrCGNAT(ip) {
-    const octets = ip.split('.').map(Number);
-    if (octets[0] === 10) return true;
-    if (octets[0] === 172 && octets[1] >= 16 && octets[1] <= 31) return true;
-    if (octets[0] === 192 && octets[1] === 168) return true;
-    if (octets[0] === 100 && octets[1] >= 64 && octets[1] <= 127) return true; // CGNAT
-    return false;
+  classifyAddress(address, isInternal = false) {
+    if (!address || typeof address !== 'string') {
+      return { scope: 'unknown', shareable: false }
+    }
+    if (isInternal || address.startsWith('127.')) {
+      return { scope: 'loopback', shareable: false }
+    }
+    if (this.isRFC1918(address)) {
+      return { scope: 'lan', shareable: true }
+    }
+    if (this.isCGNAT(address)) {
+      return { scope: 'cgnat', shareable: true }
+    }
+    if (address.startsWith('169.254.')) {
+      return { scope: 'linklocal', shareable: false }
+    }
+    const octets = address.split('.').map(Number)
+    if (octets.length !== 4 || octets.some((value) => Number.isNaN(value))) {
+      return { scope: 'unknown', shareable: false }
+    }
+    if (octets[0] === 0) {
+      return { scope: 'unspecified', shareable: false }
+    }
+    return { scope: 'public', shareable: true }
+  }
+  _buildExternalHostEntries(externalPort) {
+    if (!externalPort && externalPort !== 0) {
+      return []
+    }
+    const normalizedPort = parseInt(externalPort, 10)
+    if (!Number.isFinite(normalizedPort) || normalizedPort <= 0) {
+      return []
+    }
+    const prioritize = []
+    const pushCandidate = (candidate) => {
+      if (!candidate || !candidate.shareable || !candidate.address) {
+        return
+      }
+      if (prioritize.some((entry) => entry.address === candidate.address)) {
+        return
+      }
+      prioritize.push(candidate)
+    }
+    if (this.host && Array.isArray(this.host_candidates)) {
+      const primary = this.host_candidates.find((candidate) => candidate.address === this.host)
+      if (primary) {
+        pushCandidate(primary)
+      }
+    }
+    if (Array.isArray(this.host_candidates)) {
+      this.host_candidates.forEach((candidate) => pushCandidate(candidate))
+    }
+    if (prioritize.length === 0 && this.host) {
+      pushCandidate({
+        address: this.host,
+        scope: this.classifyAddress(this.host, false).scope,
+        shareable: true
+      })
+    }
+    const seen = new Set()
+    const entries = []
+    for (const candidate of prioritize) {
+      const host = candidate.address
+      if (!host) {
+        continue
+      }
+      const url = `${host}:${normalizedPort}`
+      if (seen.has(url)) {
+        continue
+      }
+      seen.add(url)
+      entries.push({
+        host,
+        port: normalizedPort,
+        scope: candidate.scope,
+        interface: candidate.interface || null,
+        url
+      })
+    }
+    return entries
   }
 }
 

package/package.json

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

package/server/index.js

@@ -1539,15 +1539,12 @@ 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 (_) {}
+      const peerAccess = await this.composePeerAccessPayload()
       let list = this.getPeers()
       res.render("settings", {
         list,
         current_host: this.kernel.peer.host,
-        peer_url,
-        peer_qr,
+        ...peerAccess,
         platform,
         version: this.version,
         logo: this.logo,
@@ -2286,9 +2283,7 @@ 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 (_) {}
+      const peerAccess = await this.composePeerAccessPayload()
 
       // custom theme
       let exists = await fse.pathExists(this.kernel.path("web"))
@@ -2319,8 +2314,7 @@ class Server {
         res.render("index", {
           list,
           current_host: this.kernel.peer.host,
-          peer_url,
-          peer_qr,
+          ...peerAccess,
           current_urls,
           portal: this.portal,
           install: this.install,
@@ -3036,6 +3030,99 @@ class Server {
     }
     return list
   }
+  scopeLabelForAccessPoint(scope) {
+    if (!scope || typeof scope !== 'string') {
+      return ''
+    }
+    const normalized = scope.trim().toLowerCase()
+    switch (normalized) {
+      case 'lan':
+        return 'LAN'
+      case 'cgnat':
+        return 'VPN'
+      case 'public':
+        return 'Public'
+      case 'loopback':
+        return 'Local'
+      case 'linklocal':
+        return 'Link-Local'
+      default:
+        return ''
+    }
+  }
+  async buildPeerAccessPoints() {
+    const hostMap = new Map()
+    const addHost = (candidate = {}) => {
+      const raw = candidate && candidate.host ? candidate.host : candidate.address
+      if (!raw || typeof raw !== 'string') {
+        return
+      }
+      const host = raw.trim()
+      if (!host) {
+        return
+      }
+      if (candidate.shareable === false) {
+        return
+      }
+      const existing = hostMap.get(host)
+      const classify = () => {
+        if (candidate.scope) {
+          return candidate.scope
+        }
+        if (this.kernel && this.kernel.peer && typeof this.kernel.peer.classifyAddress === 'function') {
+          const classification = this.kernel.peer.classifyAddress(host, false)
+          return classification && classification.scope ? classification.scope : undefined
+        }
+        return undefined
+      }
+      const mergedScope = existing && existing.scope ? existing.scope : classify() || 'unknown'
+      const mergedInterface = existing && existing.interface ? existing.interface : (candidate.interface || null)
+      hostMap.set(host, {
+        host,
+        scope: mergedScope,
+        interface: mergedInterface
+      })
+    }
+
+    addHost({ host: this.kernel.peer.host })
+    const candidates = Array.isArray(this.kernel.peer.host_candidates) ? this.kernel.peer.host_candidates : []
+    candidates.forEach((candidate) => addHost(candidate))
+
+    const accessPoints = []
+    for (const meta of hostMap.values()) {
+      const url = `http://${meta.host}:${DEFAULT_PORT}`
+      let qr = null
+      try {
+        qr = await QRCode.toDataURL(url)
+      } catch (_) {}
+      accessPoints.push({
+        ...meta,
+        url,
+        qr,
+        scope_label: this.scopeLabelForAccessPoint(meta.scope)
+      })
+    }
+    return accessPoints
+  }
+  async composePeerAccessPayload() {
+    let peer_access_points = []
+    try {
+      peer_access_points = await this.buildPeerAccessPoints()
+    } catch (error) {
+      peer_access_points = []
+    }
+    let peer_url = `http://${this.kernel.peer.host}:${DEFAULT_PORT}`
+    let peer_qr = null
+    if (peer_access_points.length > 0) {
+      peer_url = peer_access_points[0].url
+      peer_qr = peer_access_points[0].qr
+    } else {
+      try {
+        peer_qr = await QRCode.toDataURL(peer_url)
+      } catch (_) {}
+    }
+    return { peer_access_points, peer_url, peer_qr }
+  }
 
 
   async syncConfig() {
@@ -4033,9 +4120,7 @@ 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 (_) {}
+      const peerAccess = await this.composePeerAccessPayload()
       let list = this.getPeers()
       let installs = []
       for(let key in this.kernel.bin.installed) {
@@ -4067,8 +4152,7 @@ class Server {
       }
       res.render("tools", {
         current_host: this.kernel.peer.host,
-        peer_url,
-        peer_qr,
+        ...peerAccess,
         pending,
         installs,
         bundles,
@@ -4153,14 +4237,11 @@ 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 peerAccess = await this.composePeerAccessPayload()
       const list = this.getPeers()
       res.render("agents", {
         current_host: this.kernel.peer.host,
-        peer_url,
-        peer_qr,
+        ...peerAccess,
         pluginMenu,
         apps,
         portal: this.portal,
@@ -4191,14 +4272,11 @@ class Server {
       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 (_) {}
+      const peerAccess = await this.composePeerAccessPayload()
       let list = this.getPeers()
       res.render("screenshots", {
         current_host: this.kernel.peer.host,
-        peer_url,
-        peer_qr,
+        ...peerAccess,
         version: this.version,
         portal: this.portal,
         logo: this.logo,
@@ -4469,14 +4547,11 @@ 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 (_) {}
+        const peerAccess = await this.composePeerAccessPayload()
         let list = this.getPeers()
         res.render("settings", {
           current_host: this.kernel.peer.host,
-          peer_url,
-          peer_qr,
+          ...peerAccess,
           list,
           platform,
           version: this.version,
@@ -4592,9 +4667,7 @@ 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 (_) {}
+      const peerAccess = await this.composePeerAccessPayload()
       let list = this.getPeers()
       let ai = await this.kernel.proto.ai()
       ai = [{
@@ -4608,8 +4681,7 @@ class Server {
         list,
         ai,
         current_host: this.kernel.peer.host,
-        peer_url,
-        peer_qr,
+        ...peerAccess,
         cwd: this.kernel.path("api"),
         name: null,
 //        name: req.params.name,
@@ -4710,14 +4782,11 @@ 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 (_) {}
+      const peerAccess = await this.composePeerAccessPayload()
       res.render(`connect`, {
         current_urls,
         current_host: this.kernel.peer.host,
-        peer_url,
-        peer_qr,
+        ...peerAccess,
         list,
         portal: this.portal,
         logo: this.logo,
@@ -5609,9 +5678,7 @@ 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 (_) {}
+      const peerAccess = await this.composePeerAccessPayload()
       const allow_dns_creation = req.params.name === this.kernel.peer.name
       res.render("net", {
         static_routes,
@@ -5631,8 +5698,7 @@ class Server {
         peer,
         protocol,
         current_host: this.kernel.peer.host,
-        peer_url,
-        peer_qr,
+        ...peerAccess,
         cwd: this.kernel.path("api"),
         allow_dns_creation,
       })
@@ -5776,9 +5842,7 @@ 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 (_) {}
+      const peerAccess = await this.composePeerAccessPayload()
       res.render("network", {
         static_routes,
         host,
@@ -5804,8 +5868,7 @@ 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,
+        ...peerAccess,
 //        ip_mapping: this.kernel.caddy.ip_mapping,
         lan: this.kernel.router.local_network_mapping,
         agent: req.agent,

package/server/public/style.css

@@ -2581,6 +2581,19 @@ body.dark .mode-selector .btn2.selected {
   border-radius: 5px;
 }
 
+body.dark aside .qr {
+}
+aside .qr {
+  text-align: center;
+  padding: 15px;
+}
+body.dark aside .qr img {
+  border: 2px solid rgba(255,255,255,0.1);
+}
+aside .qr img {
+  margin-bottom: 5px;
+  border: 2px solid rgba(0,0,0,0.1);
+}
 
 
 @media only screen and (max-width: 768px) {