pinokiod 3.233.0 → 3.235.0

package/package.json

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

package/server/index.js

@@ -3042,7 +3042,7 @@ class Server {
 
     if (this.theme === "dark") {
       this.colors = {
-        color: "rgb(27, 28, 29)",
+        color: "#252527",
 //        symbolColor: "white"
         symbolColor: "#F4F4F4"
 //        color: "rgb(31, 29, 39)",

package/server/views/app.ejs

@@ -4212,7 +4212,9 @@ body.dark .pinokio-fork-dropdown-remote, body.dark .pinokio-publish-dropdown-rem
     const devTab = document.querySelector('#devtab.frame-link')
     if (!triggeredByUser && !resolvedByGlobalSelector && !target && devRouteActive && devTab) {
       const defaultCandidate = getDefaultSelection()
-      if (!(pluginLaunchActive && defaultCandidate)) {
+      if (pluginLaunchActive && defaultCandidate) {
+        target = defaultCandidate
+      } else {
         target = devTab
       }
     }

package/server/views/network.ejs

@@ -1220,7 +1220,7 @@ document.querySelector("#reset-label").addEventListener("click", async (e) => {
         method: "post"
       }, () => {
       })
-      setInterval(async () => {
+      let i2 = setInterval(async () => {
         try {
           let res = await fetch("/check_peer").then((res) => {
             return res.json()
@@ -1228,12 +1228,13 @@ document.querySelector("#reset-label").addEventListener("click", async (e) => {
           console.log("RES", res)
           if (res.success) {
             document.querySelector(".loading").classList.add("hidden")
+            clearInterval(i2)
             if (res.peer_name) {
               console.log("> 1")
               location.href = "/net/" + res.peer_name
             } else {
               console.log("> 2")
-              location.href = location.href
+              location.reload()
             }
           }
         } catch (e) {
@@ -1242,7 +1243,7 @@ document.querySelector("#reset-label").addEventListener("click", async (e) => {
       }, 1000)
     } else if (r.error) {
       alert(r.error)
-      location.href = location.href
+      location.reload()
     }
   }
 
@@ -1385,19 +1386,20 @@ document.querySelector("main").addEventListener("click", async (e) => {
         method: "post"
       }, () => {
       })
-      setInterval(async () => {
+      let i3 = setInterval(async () => {
         try {
           let res = await fetch("/check_peer").then((res) => {
             return res.json()
           })
           if (res.success) {
             document.querySelector(".loading").classList.add("hidden")
+            clearInterval(i3)
             if (res.peer_name) {
               console.log("> 1")
               location.href = "/net/" + res.peer_name
             } else {
               console.log("> 2")
-              location.href = location.href
+              location.reload()
             }
           }
         } catch (e) {
@@ -1406,7 +1408,7 @@ document.querySelector("main").addEventListener("click", async (e) => {
       }, 1000)
     } else if (r.error) {
       alert(r.error)
-      location.href = location.href
+      location.reload()
     }
     return
   }
@@ -1431,7 +1433,7 @@ document.querySelector("main").addEventListener("click", async (e) => {
     }).then((res) => {
       return res.json()
     })
-    location.href = location.href
+    location.reload()
     return
   }
 
@@ -1455,7 +1457,7 @@ document.querySelector("main").addEventListener("click", async (e) => {
     }).then((res) => {
       return res.json()
     })
-    location.href = location.href
+    location.reload()
   }
 
   if (e.target.classList.contains("wifi-qr")) {
@@ -1510,7 +1512,7 @@ if (document.querySelector("#forward")) {
         return res.json()
       })
       console.log(res)
-      location.href = location.href
+      location.reload()
     })
   }
 <% } else { %>
@@ -1530,21 +1532,22 @@ if (document.querySelector("#wifi")) {
       return res.json()
     })
     console.log(res)
-    location.href = location.href
+    location.reload()
   })
 }
 <% } %>
 <% if (requirements_pending) { %>
-setInterval(() => {
+let i1 = setInterval(() => {
   fetch("/requirements_check/network").then((res) => {
     return res.json()
   }).then((res) => {
     console.log(res)
     if (!res.requirements_pending) {
+      clearInterval(i1)
       if (res.install_required) {
         location.href = "/setup/network?callback=/network"
       } else {
-        location.href = location.href
+        location.reload()
       }
     }
   })
@@ -1556,7 +1559,8 @@ interval = setInterval(() => {
     return res.json()
   }).then((res) => {
     if (res.updated) {
-      location.href = location.href
+      clearInterval(interval)
+      location.reload()
     }
   })
 }, 2000)