pinokiod 3.15.1 → 3.15.3

package/kernel/bin/caddy.js

@@ -1,6 +1,8 @@
 const axios = require('axios')
+const path = require('path')
 const fs = require('fs')
 const semver = require('semver')
+const Util = require('../util')
 
 class Caddy {
   cmd() {
@@ -12,6 +14,7 @@ class Caddy {
   }
   async running() {
     console.log("caddy running check")
+    console.log("stack", new Error().stack)
     try {
       let response = await axios.get('http://127.0.0.1:2019/config/')
       return true
@@ -37,6 +40,7 @@ class Caddy {
           message: `caddy run --watch`,
           path: this.kernel.homedir,
         }, (e) => {
+          process.stdout.write(e.raw)
           if (!resolved) {
             if (/endpoint started/i.test(e.cleaned)) {
               resolved = true
@@ -50,6 +54,11 @@ class Caddy {
     }
   }
   async install(req, ondata, kernel, id) {
+//    let fullpath = path.resolve(kernel.homedir, "ENVIRONMENT")
+//    await Util.update_env(fullpath, {
+//      PINOKIO_NETWORK_ACTIVE: "1",
+//      PINOKIO_HTTPS_ACTIVE: "1"
+//    })
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
@@ -103,21 +112,25 @@ class Caddy {
     }
   }
   async installed() {
-    let version = this.kernel.bin.installed.conda_versions.caddy
-    let coerced = semver.coerce(version)
-    let requirement = "<2.10.0"
-    let satisfied = semver.satisfies(coerced, requirement)
-    if (!satisfied) {
-      return false 
-    }
-    let e = await this.kernel.exists(this.kernel.path("cache/XDG_DATA_HOME/caddy/pki/authorities/local/root.crt"))
-    if (e) {
-      if (this.kernel.platform === "win32") {
-        return this.kernel.bin.installed.conda.has("caddy")
+    try {
+      let version = this.kernel.bin.installed.conda_versions.caddy
+      let coerced = semver.coerce(version)
+      let requirement = "<2.10.0"
+      let satisfied = semver.satisfies(coerced, requirement)
+      if (!satisfied) {
+        return false 
+      }
+      let e = await this.kernel.exists(this.kernel.path("cache/XDG_DATA_HOME/caddy/pki/authorities/local/root.crt"))
+      if (e) {
+        if (this.kernel.platform === "win32") {
+          return this.kernel.bin.installed.conda.has("caddy")
+        } else {
+          return this.kernel.bin.installed.conda.has("caddy") && this.kernel.bin.installed.conda.has("nss")
+        }
       } else {
-        return this.kernel.bin.installed.conda.has("caddy") && this.kernel.bin.installed.conda.has("nss")
+        return false
       }
-    } else {
+    } catch (e) {
       return false
     }
   }

package/kernel/index.js

@@ -3,6 +3,7 @@ const os = require("os")
 const jsdom = require("jsdom");
 const randomUseragent = require('random-useragent');
 const path = require('path')
+const axios = require('axios')
 const fastq = require('fastq')
 const fetch = require('cross-fetch');
 const waitOn = require('wait-on');
@@ -262,38 +263,35 @@ class Kernel {
   log(data, group, info) {
     this.log_queue.push({ data, group, info })
   }
-  async should_refresh() {
-    if (this.refresh_cached) {
-      return this.cached_refresh_value
-    } else {
-      let env = await Environment.get(this.homedir)
-      let peer_active = true
-      // if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
-      // By default it should be on.
-      // It's off if the value is set, and it's 0 or false
-
-      //if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
-      if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="0" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="false")) {
-        peer_active = false
-      }
-      let https_active = true
-      //if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="1" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="true")) {
-      if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="0" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="false")) {
-        //https_active = true
-        https_active = false 
+  async network_active() {
+    await this.peer.check(this)
+    return this.peer.active
+  }
+  async network_installed() {
+    let installed = await this.bin.check_installed({ name: "caddy" })
+    return installed
+  }
+  async network_running() {
+    let installed = await this.network_installed()
+    if (installed) {
+      try {
+        await axios.get(`http://127.0.0.1:2019/config/`, { timeout: 1000 });
+        return true;
+      } catch (err) {
+        return false;
       }
-  //    console.log("kernel.refresh", { active, notify_peers })
-
-      let caddy_installed = await this.bin.check_installed({ name: "caddy" })
-      this.refresh_cached = true
-      this.cached_refresh_value = caddy_installed && https_active
-      return this.cached_refresh_value
+    } else {
+      return false
     }
   }
   async refresh(notify_peers) {
     const ts = Date.now()
-    let should_refresh = await this.should_refresh()
-    if (should_refresh) {
+    let network_active = await this.network_active()
+    if (!network_active) {
+      return
+    }
+    let network_running = await this.network_running()
+    if (network_running) {
 
 
       let ts = Date.now()
@@ -803,14 +801,19 @@ class Kernel {
 //        }, 3000)
 
         // refresh every 5 second
-//        if (this.refresh_interval) {
-//          clearInterval(this.refresh_interval)
-//        }
-        this.refresh_cached = false
-        this.cached_refresh_value = false
-        this.refresh_interval = setInterval(() => {
-          this.refresh()    
-        }, 5000)
+        if (this.refresh_interval) {
+          clearInterval(this.refresh_interval)
+        }
+        let network_active = await this.network_active()
+        if (network_active) {
+          this.refresh_interval = setInterval(() => {
+            if (this.server_running) {
+              this.refresh()    
+            } else {
+              console.log("server not running yet. retry network refresh in 5 secs")
+            }
+          }, 5000)
+        }
 
       }
 

package/kernel/peer.js

@@ -25,21 +25,45 @@ class PeerDiscovery {
       this.socket.send(this.message, 0, this.message.length, this.port, '192.168.1.255');
     }
   }
-  async start(kernel) {
+  async check(kernel) {
     let env = await Environment.get(kernel.homedir)
-
-    // by default expose to the local network
-    this.active = true
-    // if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
-    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="0" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="false")) {
-    //if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
-      this.active = false
+    //let peer_active = true
+    let peer_active = false
+    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
+    //if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="0" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="false")) {
+      peer_active = true
     }
-
+    //let https_active = true
+    let https_active = false
+    if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="1" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="true")) {
+    //if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="0" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="false")) {
+      https_active = true
+      //https_active = false 
+    }
+//    console.log("kernel.refresh", { active, notify_peers })
     this.name = os.userInfo().username
     if (env && env.PINOKIO_NETWORK_NAME && env.PINOKIO_NETWORK_NAME.length > 0) {
       this.name = env.PINOKIO_NETWORK_NAME
     }
+    if (peer_active && https_active) {
+      this.active = true
+    } else {
+      this.active = false
+    }
+  }
+  async start(kernel) {
+    let env = await Environment.get(kernel.homedir)
+
+    // by default expose to the local network
+    //this.active = true
+    // if PINOKIO_NETWORK_SHARE is 0 or false, turn it off
+//    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="0" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="false")) {
+    await this.check(kernel)
+    console.log({ active: this.active, name: this.name })
+//    if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
+////      this.active = false
+//      this.active = true
+//    }
 
     if (this.active) {
       // Listen for incoming pings

package/kernel/procs.js

@@ -16,10 +16,11 @@ class Procs {
       return this.cache[localAddress]
     }
     try {
-      await axios.head(`http://${localAddress}`, { timeout: 1000 });
+      await axios.head(`http://${localAddress}`, { timeout: 3000 });
       this.cache[localAddress] = true
       return true;
     } catch (err) {
+//      console.log("HEAD ERROR",{ localAddress, err })
       this.cache[localAddress] = false
       return false;
     }
@@ -41,7 +42,6 @@ class Procs {
     let pids = new Set()
     let s = stdout.trim()
     const lines = s.split('\n');
-
     for(let line of lines) {
       if (isWin) {
         // Skip headers
@@ -194,11 +194,9 @@ class Procs {
       }
     }
     if (cached) {
-//      console.log("already cached")
       cb(this.port_map)
       return
     }
-//    console.log("not cached")
     const cmd = isWin ? 'tasklist /fo csv /nh' : 'ps -Ao pid,comm';
     let id = "Procs.getPidToNameMap"
     let sh = this.kernel.shell.get(id)
@@ -246,8 +244,6 @@ class Procs {
       this.getPortPidList((portPidList) => {
 //        console.timeEnd(">>>>>>>>GET PORTS " + ts)
 //        console.time(">>>>>>> GET PIDS " + ts)
-//        console.log({ portPidList })
-
         // if there's any new port, run getPidToNameMap
 
 

package/package.json

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

package/server/index.js

@@ -1723,9 +1723,7 @@ class Server {
           } else {
             currentIndexPath = "" + i
           }
-          console.log(">>", { indexPath, currentIndexPath, i })
           let shell_id = this.get_shell_id(name, currentIndexPath, rendered)
-          console.log(">>", { name, shell_id, })
 
 
 //          let hash = crypto.createHash('md5').update(JSON.stringify(rendered)).digest('hex')
@@ -4840,7 +4838,7 @@ class Server {
     this.app.post("/network", ex(async (req, res) => {
       if (this.kernel.homedir) {
         let fullpath = path.resolve(this.kernel.homedir, "ENVIRONMENT")
-        console.log("req.body", req.body)
+        console.log("POST /network", req.body)
         await Util.update_env(fullpath, req.body)
         res.json({ success: true })
       } else {
@@ -4938,6 +4936,7 @@ class Server {
     await new Promise((resolve, reject) => {
       this.listening = this.server.listen(this.port, () => {
         console.log(`Server listening on port ${this.port}`)
+        this.kernel.server_running = true
         resolve()
       });
       this.httpTerminator = createHttpTerminator({

package/server/views/network.ejs

@@ -875,6 +875,7 @@ if (document.querySelector("#wifi")) {
   })
 }
 <% } %>
+<% if (peer_active) { %>
 setInterval(() => {
   fetch("/peer_check").then((res) => {
     return res.json()
@@ -884,6 +885,7 @@ setInterval(() => {
     }
   })
 }, 2000)
+<% } %>
 </script>
 </body>
 </html>

package/server/views/setup.ejs

@@ -226,6 +226,7 @@ document.addEventListener("DOMContentLoaded", async () => {
   <% } %>
   <% if (!requirements_pending && !install_required && wait === "caddy") { %>
     console.log("RESTART")
+    alert("RESTART")
 
     let r = await fetch("/network", {
       method: "post",