pinokiod 3.84.0 → 3.85.0

package/kernel/peer.js

@@ -28,7 +28,7 @@ class PeerDiscovery {
     for(let host of peer_array) {
       if (this.host !== host) {
         let result = await this._refresh(host)
-        console.log("check peeers", { host, result })
+        console.log("check peers", { host, result })
         if (!result) {
           console.log("delete host", host)
           this.peers.delete(host)
@@ -367,15 +367,21 @@ class PeerDiscovery {
     let d = Date.now()
     let router_info = await this.router_info()
     let installed = await this.installed()
-    let peers = Object.values(this.info).filter((info) => {
-      return info.host !== this.host
-    }).map((info) => {
-      return {
-        name: info.name,
-        host: info.host
-      }
-    })
+    let peers
+    if (this.info) {
+      peers = Object.values(this.info).filter((info) => {
+        return info.host !== this.host
+      }).map((info) => {
+        return {
+          name: info.name,
+          host: info.host
+        }
+      })
+    } else {
+      peers = []
+    }
     return {
+      active: this.active,
       version: this.kernel.version,
       home: this.kernel.homedir,
       arch: this.kernel.arch,

package/package.json

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

package/server/index.js

@@ -2664,11 +2664,13 @@ class Server {
   }
   getPeers() {
     let list = []
-    for(let key in this.kernel.peer.info) {
-//      if (key !== this.kernel.peer.host) {
+    if (this.kernel.peer.active) {
+      for(let key in this.kernel.peer.info) {
         let info = this.kernel.peer.info[key]
-        list.push(info)
-//      }
+        if (info.active) {
+          list.push(info)
+        }
+      }
     }
     return list
   }
@@ -4241,10 +4243,11 @@ class Server {
         return
       }
 
-
 //      let list = this.getPeerInfo()
 //      console.log("peeerInfo", JSON.stringify(list, null, 2))
+      console.time("check peers")
       await this.kernel.peer.check_peers()
+      console.timeEnd("check peers")
 
 
       let peers = []

package/server/public/urldropdown.css

@@ -3,7 +3,7 @@
   width: 100%;
 }
 .url-modal-overlay .url-dropdown {
-  max-height: 50%;
+  max-height: 50vh;
 }
 .url-dropdown {
   position: absolute;

package/server/public/urldropdown.js

@@ -335,10 +335,22 @@ function initUrlDropdown(config = {}) {
         const url = this.getAttribute('data-url');
         const type = this.getAttribute('data-host-type');
         urlInput.value = url;
-        urlInput.setAttribute("data-host-type", type)
+        urlInput.setAttribute("data-host-type", type);
         hideDropdown();
-        // Submit the form
-        urlInput.closest('form').dispatchEvent(new Event('submit'));
+        
+        // Navigate directly instead of dispatching submit event
+        if (type === "local") {
+          let redirect_uri = "/container?url=" + url;
+          location.href = redirect_uri;
+        } else {
+          let u = new URL(url);
+          if (String(u.port) === "42000") {
+            window.open(url, "_blank", 'self');
+          } else {
+            let redirect_uri = "/container?url=" + url;
+            location.href = redirect_uri;
+          }
+        }
       });
     });
 
@@ -558,10 +570,25 @@ function initUrlDropdown(config = {}) {
     modalDropdown.querySelectorAll('.url-dropdown-item:not(.non-selectable)').forEach(item => {
       item.addEventListener('click', function() {
         const url = this.getAttribute('data-url');
+        const type = this.getAttribute('data-host-type');
         modalInput.value = url;
         urlInput.value = url;
-        urlInput.closest('form').dispatchEvent(new Event('submit'));
+        urlInput.setAttribute("data-host-type", type);
         closeMobileModal();
+        
+        // Navigate directly instead of dispatching submit event
+        if (type === "local") {
+          let redirect_uri = "/container?url=" + url;
+          location.href = redirect_uri;
+        } else {
+          let u = new URL(url);
+          if (String(u.port) === "42000") {
+            window.open(url, "_blank", 'self');
+          } else {
+            let redirect_uri = "/container?url=" + url;
+            location.href = redirect_uri;
+          }
+        }
       });
     });
 

package/server/views/network.ejs

@@ -936,6 +936,7 @@ body.dark .troubleshoot {
   color: rgba(255,255,255,0.5);
 }
 .troubleshoot {
+  padding-top: 15px;
   color: rgba(0,0,0,0.5);
 }
 .network-name.expanded .btn {
@@ -1126,7 +1127,6 @@ document.addEventListener('DOMContentLoaded', function() {
         </div>
       </div>
         <div class='advanced'>
-          <br>
           <!--
             <div id='advanced-label' class='link-label label'>Advanced</div>
             <div id='reset-label' class='btn'>Reset</div>