pinokiod 3.8.150 → 3.8.151

package/kernel/index.js

@@ -246,16 +246,23 @@ class Kernel {
   }
   async refresh(notify_peers) {
     let env = await Environment.get(this.homedir)
-    let active = false
+    let peer_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
+      peer_active = true
+    }
+    let https_active = false
+    if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="1" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="true")) {
+      https_active = true
     }
 //    console.log("kernel.refresh", { active, notify_peers })
 
-    let installed = await this.bin.check_installed({ name: "caddy" })
-    console.log("caddy installed?", installed)
-    if (installed && active) {
+//    let caddy_installed = await this.bin.check_installed({ name: "caddy" })
+
+    // 1. https
+    // 2. https + local share
+//    console.log("caddy installed?", caddy_installed)
+//    if (caddy_installed && https_active) {
 
       // 1. get the process list
       await this.processes.refresh()
@@ -285,8 +292,41 @@ class Kernel {
 
       // 9. announce self to the peer network
       this.peer.announce()
+      
+//    }
 
-    }
+    //if (https_installed && peer_active) {
+
+    //  // 1. get the process list
+    //  await this.processes.refresh()
+
+    //  // 2. refresh peer info to reflect the proc info
+    //  await this.peer.refresh()
+
+    //  // 3. load custom routers from ~/pinokio/network
+    //  await this.router.init()
+
+    //  // 4. set current local host router info
+    //  await this.router.local()
+
+    //  // 5. refresh peer info to reflect the updated router info
+    //  await this.peer.refresh()
+
+    //  // 6. tell peers to refresh
+    //  if (notify_peers) {
+    //    await this.peer.notify_peers()
+    //  }
+
+    //  // 7. update remote router
+    //  await this.router.remote()
+
+    //  // 8. update caddy config
+    //  await this.router.update()
+
+    //  // 9. announce self to the peer network
+    //  this.peer.announce()
+
+    //}
   }
   async clearLog(group) {
     let relativePath = path.relative(this.homedir, group)

package/kernel/peer.js

@@ -21,7 +21,9 @@ class PeerDiscovery {
     }
   }
   announce() {
-    this.socket.send(this.message, 0, this.message.length, this.port, '192.168.1.255');
+    if (this.socket) {
+      this.socket.send(this.message, 0, this.message.length, this.port, '192.168.1.255');
+    }
   }
   async start(kernel) {
     let env = await Environment.get(kernel.homedir)
@@ -104,7 +106,7 @@ class PeerDiscovery {
   }
   // refresh peer info
   async refresh(peers) {
-    if (this.active) {
+//    if (this.active) {
       this.refreshing = true
       let refresh_peers
       if (peers) {
@@ -127,7 +129,7 @@ class PeerDiscovery {
       }
       this.refreshing = false
       return this.info
-    }
+//    }
   }
   _isLocalLAN(ip) {
     return ip.startsWith('192.168.');

package/kernel/router/index.js

@@ -9,6 +9,7 @@ const PeerHomeRouter = require('./peer_home_router')
 const PeerVariableRouter = require('./peer_variable_router')
 const PeerPortRouter = require('./peer_port_router')
 const PeerPeerRouter = require('./peer_peer_router')
+const Environment = require("../environment")
 class Router {
   constructor(kernel) {
     this.kernel = kernel
@@ -68,6 +69,14 @@ class Router {
         this.custom_routers[port] = config[port]
       }
     }
+
+    let env = await Environment.get(this.kernel.homedir)
+    this.active = false
+    if (env && env.PINOKIO_HTTPS_ACTIVE && (env.PINOKIO_HTTPS_ACTIVE==="1" || env.PINOKIO_HTTPS_ACTIVE.toLowerCase()==="true")) {
+      this.active = true
+    }
+
+
   }
   async add({ host, match, dial }) {
     if (!this._mapping[host]) {
@@ -169,16 +178,19 @@ class Router {
     for(let proc of this.kernel.processes.info) {
       this.localhost_port_router.handle(proc)
     }
-    for(let host in this.kernel.peer.info) {
-      let peer = this.kernel.peer.info[host]
-      if (peer.host === this.kernel.peer.host) {
-        this.peer_home_router.handle(peer)
-        this.peer_variable_router.handle(peer)
-        this.peer_port_router.handle(peer)
+    if (this.kernel.peer.active) {
+      for(let host in this.kernel.peer.info) {
+        let peer = this.kernel.peer.info[host]
+        if (peer.host === this.kernel.peer.host) {
+          this.peer_home_router.handle(peer)
+          this.peer_variable_router.handle(peer)
+          this.peer_port_router.handle(peer)
+        }
       }
+      await this.fill()
     }
-    await this.fill()
     this.mapping = this._mapping
+    console.log("after local()", JSON.stringify(this.mapping, null, 2))
   }
 
   // set remote config

package/package.json

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

package/server/index.js

@@ -2622,7 +2622,8 @@ class Server {
         peers,
         list,
         name: this.kernel.peer.name,
-        active: this.kernel.peer.active,
+        https_active: this.kernel.router.active,
+        peer_active: this.kernel.peer.active,
         port_mapping: this.kernel.router.port_mapping,
 //        port_mapping: this.kernel.caddy.port_mapping,
 //        ip_mapping: this.kernel.caddy.ip_mapping,

package/server/views/network.ejs

@@ -381,16 +381,25 @@ input:checked + .slider:before {
     </div>
     <div class='config-body'>
       <div class='config-row'>
-        <div class='label'>Network Name</div>
-        <input id='name' type='text' value="<%=name%>">
+        <div class='label'>Instant HTTPS</div>
+        <label class="switcher">
+          <input id='https_active' type="checkbox" <%=https_active ? 'checked' : ''%>>
+          <span class="slider"></span>
+        </label>
       </div>
+    </div>
+    <div class='config-body'>
       <div class='config-row'>
         <div class='label'>Network Share</div>
         <label class="switcher">
-          <input id='active' type="checkbox" <%=active ? 'checked' : ''%>>
+          <input id='peer_active' type="checkbox" <%=peer_active ? 'checked' : ''%>>
           <span class="slider"></span>
         </label>
       </div>
+      <div class='config-row' id='network_name'>
+        <div class='label'>Network Name</div>
+        <input id='name' type='text' value="<%=name%>">
+      </div>
       <div class='flexible'></div>
       <button class='btn save'>Save</button>
     </div>
@@ -540,6 +549,21 @@ input:checked + .slider:before {
   </div>
 </main>
 <script>
+if (document.querySelector("#peer_active").checked) {
+  console.log("checked")
+  document.querySelector("#network_name").classList.remove("hidden")
+} else {
+  console.log("not checked")
+  document.querySelector("#network_name").classList.add("hidden")
+}
+document.querySelector("#peer_active").addEventListener("change", (e)=> {
+  console.log(e.target.checked)
+  if (e.target.checked) {
+    document.querySelector("#network_name").classList.remove("hidden")
+  } else {
+    document.querySelector("#network_name").classList.add("hidden")
+  }
+})
 document.querySelector("main").addEventListener("click", async (e) => {
   let target
 
@@ -551,8 +575,9 @@ document.querySelector("main").addEventListener("click", async (e) => {
 
   if (target) {
     let body = {
-      PINOKIO_NETWORK_NAME: document.querySelector("#name").value,
-      PINOKIO_NETWORK_ACTIVE: (document.querySelector("#active").checked ? "1": "0")
+      PINOKIO_NETWORK_NAME: document.querySelector("#network_name").value,
+      PINOKIO_NETWORK_ACTIVE: (document.querySelector("#peer_active").checked ? "1": "0"),
+      PINOKIO_HTTPS_ACTIVE: (document.querySelector("#https_active").checked ? "1": "0")
     }
     console.log(body)
     debugger