pinokiod 3.8.94 → 3.8.96

package/kernel/bin/caddy.js

@@ -20,11 +20,11 @@ class Caddy {
     }
   }
   async start() {
-    let running = await this.running()
-    console.log("Running", running)
-    if (running) {
-      return
-    } 
+//    let running = await this.running()
+//    console.log("Running", running)
+//    if (running) {
+//      return
+//    } 
     let installed = await this.installed()
     console.log("Caddy Installed?", installed)
     if (installed) {

package/kernel/index.js

@@ -260,22 +260,34 @@ class Kernel {
     this.log_queue.push({ data, group, info })
   }
   async refresh(notify_peers) {
-    console.log("kernel.refresh", { notify_peers })
-    await Promise.all([
-      // refresh proc info
-      this.processes.refresh(),
-      // refresh peer info
-      this.peer.refresh()
-    ])
-    console.log("proc info", this.processes.info)
-    console.log("peer info", this.peer.info)
-    // refresh router info
-    await this.router.refresh()
-    console.log("router info", this.router.published())
-
-    if (notify_peers) {
-      // broadcast to peers to refresh
-      await this.peer.notify_peers()
+    let env = await Environment.get(this.homedir)
+    let active = false
+    // if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
+    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
+      active = true
+    }
+
+      console.log("kernel.refresh", { active, notify_peers })
+    if (active) {
+
+
+      await Promise.all([
+        // refresh proc info
+        this.processes.refresh(),
+        // refresh peer info
+        this.peer.refresh()
+      ])
+      console.log("proc info", this.processes.info)
+      console.log("peer info", this.peer.info)
+      // refresh router info
+      await this.router.refresh()
+      console.log("router info", this.router.published())
+      await this.peer.refresh()
+
+      if (notify_peers) {
+        // broadcast to peers to refresh
+        await this.peer.notify_peers()
+      }
     }
   }
   async clearLog(group) {

package/package.json

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

package/server/index.js

@@ -3164,8 +3164,13 @@ class Server {
     }))
     this.app.get("/du/:name", ex(async (req, res) => {
       let p = this.kernel.path("api", req.params.name)
-      let d1 = await Util.du(p)
-      res.json({ du: d1 })
+      try {
+        let d1 = await Util.du(p)
+        res.json({ du: d1 })
+      } catch (e) {
+        console.log("disk usage error", e)
+        res.json({ du: 0 })
+      }
     }))
     this.app.get("/edit/*", ex(async (req, res) => {
       let pathComponents = req.params[0].split("/")
@@ -3875,6 +3880,7 @@ class Server {
       if (this.kernel.peer.active) {
         // if network is active, return success only if the router is up for all of its peers (including itself)
         console.log({ peer_info: this.kernel.peer.info })
+        console.time("check_peer")
         let ready = true
         if (this.kernel.peer.info) {
           for(let host in this.kernel.peer.info) {
@@ -3890,6 +3896,7 @@ class Server {
           ready = false;
         }
         console.log({ info: this.kernel.peer.info, ready })
+        console.timeEnd("check_peer")
         if (ready) {
           res.json({ success: true })
         } else {

package/server/views/app.ejs

@@ -1595,22 +1595,24 @@ body.dark .loader-container {
     fetch("/du/<%=name%>").then((res) => {
       return res.json()
     }).then((res) => {
-      let val
-      //let k = 1024
-      let k = 1000
-      if (res.du > k * k * k) {
-        // GB
-        val = `${Math.floor(res.du/k/k/k * 100) / 100} GB`
-      } else if (res.du > k * k) {
-        // MB
-        val = `${Math.floor(res.du/k/k * 100) / 100} MB`
+      if (res.du > 0) {
+        let val
+        //let k = 1024
+        let k = 1000
+        if (res.du > k * k * k) {
+          // GB
+          val = `${Math.floor(res.du/k/k/k * 100) / 100} GB`
+        } else if (res.du > k * k) {
+          // MB
+          val = `${Math.floor(res.du/k/k * 100) / 100} MB`
+        } else {
+          // KB
+          val = `${Math.floor(res.du/k * 100) / 100} KB`
+        }
+        console.log("DU VAL", val)
+        document.querySelector(".disk-usage").innerHTML = val
       } else {
-        // KB
-        val = `${Math.floor(res.du/k * 100) / 100} KB`
       }
-      console.log("DU VAL", val)
-      //document.querySelector(".disk-usage").innerHTML = `<i class="fa-regular fa-hard-drive"></i> ${val}`
-      document.querySelector(".disk-usage").innerHTML = val
     })
   }
   const refresh = async (silent, options) => {