pinokiod 3.259.0 → 3.261.0

package/kernel/peer.js

@@ -37,8 +37,16 @@ class PeerDiscovery {
     }
   }
   announce() {
-    if (this.socket) {
-      this.socket.send(this.message, 0, this.message.length, this.port, '192.168.1.255');
+    if (!this.socket) {
+      return
+    }
+    const targets = this._broadcastTargets()
+    for (const target of targets) {
+      try {
+        this.socket.send(this.message, 0, this.message.length, this.port, target)
+      } catch (err) {
+        console.error('peer broadcast failed', { target, err })
+      }
     }
   }
   async check(kernel) {
@@ -641,6 +649,7 @@ class PeerDiscovery {
         const classification = this.classifyAddress(address, Boolean(iface.internal))
         results.push({
           address,
+          netmask: String(iface.netmask || '').trim() || null,
           interface: ifaceName,
           internal: Boolean(iface.internal),
           scope: classification.scope,
@@ -731,6 +740,51 @@ class PeerDiscovery {
     }
     return entries
   }
+  _broadcastTargets() {
+    const addresses = this._collectInterfaceAddresses()
+    this.interface_addresses = addresses
+    const targets = new Set()
+    for (const entry of addresses) {
+      if (!entry || !entry.shareable) {
+        continue
+      }
+      const broadcast = this._deriveBroadcastAddress(entry.address, entry.netmask)
+      if (broadcast) {
+        targets.add(broadcast)
+      }
+    }
+    targets.add('255.255.255.255')
+    return Array.from(targets)
+  }
+  _deriveBroadcastAddress(address, netmask) {
+    const addrOctets = this._parseIPv4(address)
+    if (!addrOctets) {
+      return null
+    }
+    let maskOctets = this._parseIPv4(netmask)
+    if (!maskOctets) {
+      maskOctets = [255, 255, 255, 0]
+    }
+    const broadcastOctets = addrOctets.map((octet, idx) => {
+      const mask = maskOctets[idx]
+      return ((octet & mask) | (~mask & 255)) & 255
+    })
+    const candidate = broadcastOctets.join('.')
+    if (candidate.startsWith('127.') || candidate.startsWith('169.254.') || candidate === '0.0.0.0') {
+      return null
+    }
+    return candidate
+  }
+  _parseIPv4(value) {
+    if (!value || typeof value !== 'string') {
+      return null
+    }
+    const octets = value.split('.').map(Number)
+    if (octets.length !== 4 || octets.some((val) => Number.isNaN(val) || val < 0 || val > 255)) {
+      return null
+    }
+    return octets
+  }
 }
 
 module.exports = PeerDiscovery;

package/package.json

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

package/server/index.js

@@ -3250,7 +3250,6 @@ class Server {
       this.kernel.store.set("theme", config.theme)
       //this.theme = config.theme
     }
-    console.log("THEME CHANGED", theme_changed)
     // 2. Handle HOME
     if (config.home) {
       // set "new_home"
@@ -3335,9 +3334,7 @@ class Server {
     this.kernel.store.set("NO_PROXY", config.NO_PROXY)
 
     if (theme_changed) {
-      console.log("> syncConfig")
       await this.syncConfig()
-      console.log("onrefresh", this.onrefresh)
       if (this.onrefresh) {
         try {
           this.onrefresh({ theme: this.theme, colors: this.colors })
@@ -8208,7 +8205,6 @@ class Server {
 
     this.app.post("/config", ex(async (req, res) => {
       try {
-        console.log("POST /config", req.body)
         let message = await this.setConfig(req.body)
         res.json({ success: true, message })
       } catch (e) {

package/server/public/common.js

@@ -2932,6 +2932,13 @@ document.addEventListener("DOMContentLoaded", () => {
       header.appendChild(iconWrapper);
       header.appendChild(headingStack);
 
+      const closeButton = document.createElement('button');
+      closeButton.type = 'button';
+      closeButton.className = 'create-launcher-modal-close';
+      closeButton.setAttribute('aria-label', 'Close create launcher modal');
+      closeButton.innerHTML = '<i class="fa-solid fa-xmark"></i>';
+      header.appendChild(closeButton);
+
       const promptLabel = document.createElement('label');
       promptLabel.className = 'create-launcher-modal-label';
       promptLabel.textContent = 'What do you want to do?';
@@ -3190,12 +3197,8 @@ document.addEventListener("DOMContentLoaded", () => {
       });
 
       cancelButton.addEventListener('click', hideCreateLauncherModal);
+      closeButton.addEventListener('click', hideCreateLauncherModal);
       confirmButton.addEventListener('click', submitCreateLauncherModal);
-      overlay.addEventListener('click', (event) => {
-        if (event.target === overlay) {
-          hideCreateLauncherModal();
-        }
-      });
 
       advancedLink.addEventListener('click', () => {
         hideCreateLauncherModal();

package/server/public/urldropdown.css

@@ -200,6 +200,7 @@ body.dark .url-dropdown-empty-description {
   font-family: "SF Pro Text", -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
   -webkit-backdrop-filter: blur(28px);
   backdrop-filter: blur(28px);
+  position: relative;
 }
 body.dark .create-launcher-modal {
   background: rgba(17, 24, 39, 0.82);
@@ -215,6 +216,33 @@ body.dark .create-launcher-modal {
   align-items: center;
   gap: 18px;
   padding-bottom: 4px;
+  position: relative;
+}
+.create-launcher-modal-close {
+  position: absolute;
+  top: 0;
+  right: 0;
+  border: none;
+  background: transparent;
+  color: #6b7280;
+  font-size: 18px;
+  padding: 6px;
+  cursor: pointer;
+  line-height: 1;
+}
+.create-launcher-modal-close:hover {
+  color: #4f46e5;
+}
+.create-launcher-modal-close:focus-visible {
+  outline: 2px solid #4f46e5;
+  outline-offset: 2px;
+  border-radius: 4px;
+}
+body.dark .create-launcher-modal-close {
+  color: rgba(255,255,255,0.75);
+}
+body.dark .create-launcher-modal-close:hover {
+  color: #a5b4fc;
 }
 .create-launcher-modal-icon {
   width: 44px;

package/server/public/urldropdown.js

@@ -1163,6 +1163,12 @@ function initUrlDropdown(config = {}) {
     modalContent.setAttribute('role', 'dialog');
     modalContent.setAttribute('aria-modal', 'true');
 
+    const closeButton = document.createElement('button');
+    closeButton.type = 'button';
+    closeButton.className = 'create-launcher-modal-close';
+    closeButton.setAttribute('aria-label', 'Close create launcher modal');
+    closeButton.innerHTML = '<i class="fa-solid fa-xmark"></i>';
+
     const title = document.createElement('h3');
     title.id = 'quick-create-launcher-title';
     title.textContent = 'Create';
@@ -1204,6 +1210,7 @@ function initUrlDropdown(config = {}) {
     actions.appendChild(confirmButton);
 
     label.appendChild(input);
+    modalContent.appendChild(closeButton);
     modalContent.appendChild(title);
     modalContent.appendChild(description);
     modalContent.appendChild(label);
@@ -1212,13 +1219,8 @@ function initUrlDropdown(config = {}) {
     overlay.appendChild(modalContent);
     document.body.appendChild(overlay);
 
-    overlay.addEventListener('click', function(event) {
-      if (event.target === overlay) {
-        hideCreateLauncherModal();
-      }
-    });
-
     cancelButton.addEventListener('click', hideCreateLauncherModal);
+    closeButton.addEventListener('click', hideCreateLauncherModal);
     confirmButton.addEventListener('click', confirmCreateLauncherModal);
     input.addEventListener('keydown', handleCreateModalKeydown);
 

package/server/views/connect.ejs

@@ -322,8 +322,10 @@ body.dark .browser-options-row {
 }
 */
 body.dark .context-menu-wrapper {
-  background: rgba(0,0,0,0.9);
-  color: white;
+  background: rgba(0,0,0,0.9) !important;
+  color: white !important;
+  border: 1px solid rgba(255,255,255,0.1);
+  box-shadow: 0 12px 30px rgba(0,0,0,0.45);
 }
 .context-menu-wrapper {
   background: rgba(0,0,0,0.06) !important;

package/server/views/index.ejs

@@ -158,8 +158,10 @@ body.dark .browser-options-row {
 }
 */
 body.dark .context-menu-wrapper {
-  background: rgba(0,0,0,0.9);
-  color: white;
+  background: rgba(0,0,0,0.9) !important;
+  color: white !important;
+  border: 1px solid rgba(255,255,255,0.1);
+  box-shadow: 0 12px 30px rgba(0,0,0,0.45);
 }
 .context-menu-wrapper {
   background: whitesmoke !important;
@@ -194,6 +196,7 @@ body.dark .context-menu-wrapper {
   padding: 6px 10px !important;
   text-align: left;
   color: black;
+  margin: 0 !important;
 }
 body.dark .btn {
   background: rgba(255,255,255,0.05) !important;
@@ -209,6 +212,7 @@ body.dark .btn {
 }
 body.dark .context-menu .btn {
   color: white;
+  background: none !important;
 }
 body.dark .open-menu, body.dark .browse {
   border: none !important;

package/server/views/index2.ejs

@@ -128,8 +128,10 @@ body.dark .browser-options-row {
 }
 */
 body.dark .context-menu-wrapper {
-  background: rgba(0,0,0,0.9);
-  color: white;
+  background: rgba(0,0,0,0.9) !important;
+  color: white !important;
+  border: 1px solid rgba(255,255,255,0.1);
+  box-shadow: 0 12px 30px rgba(0,0,0,0.45);
 }
 .context-menu-wrapper {
   background: rgba(0,0,0,0.06) !important;

package/server/views/net.ejs

@@ -135,8 +135,10 @@ body.dark .browser-options-row {
 }
 */
 body.dark .context-menu-wrapper {
-  background: rgba(0,0,0,0.9);
-  color: white;
+  background: rgba(0,0,0,0.9) !important;
+  color: white !important;
+  border: 1px solid rgba(255,255,255,0.1);
+  box-shadow: 0 12px 30px rgba(0,0,0,0.45);
 }
 .context-menu-wrapper {
   background: rgba(0,0,0,0.06) !important;
@@ -782,9 +784,12 @@ document.addEventListener('DOMContentLoaded', function() {
                   %>
                   <% if (directHosts.length > 0) { %>
                     <ul class="access-point-list">
-                      <% directHosts.forEach((point) => { %>
+                      <% directHosts.forEach((point) => {
+                           const hasProtocol = /^https?:\/\//i.test(point.url)
+                           const hrefValue = hasProtocol ? point.url : `http://${point.url}`
+                      %>
                         <li>
-                          <a class='net' target="_blank" href="<%= point.url %>"><%= point.url %></a>
+                          <a class='net' target="_blank" href="<%= hrefValue %>"><%= point.url %></a>
                           <% if (point.badge) { %>
                             <span class="badge"><%= point.badge %></span>
                           <% } %>

package/server/views/network.ejs

@@ -651,8 +651,10 @@ body.dark .browser-options-row {
 }
 */
 body.dark .context-menu-wrapper {
-  background: rgba(0,0,0,0.9);
-  color: white;
+  background: rgba(0,0,0,0.9) !important;
+  color: white !important;
+  border: 1px solid rgba(255,255,255,0.1);
+  box-shadow: 0 12px 30px rgba(0,0,0,0.45);
 }
 .context-menu-wrapper {
   background: rgba(0,0,0,0.06) !important;