pinokiod 3.8.100 → 3.8.102

package/kernel/index.js

@@ -266,28 +266,56 @@ class Kernel {
     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 })
+    console.log("kernel.refresh", { active, notify_peers })
     if (active) {
 
+      // 1. get the process list
+      console.log("Step 1: Get process list")
+      await this.processes.refresh()
+      console.log("Process info", this.processes.info)
+
+      // 2. refresh peer info to reflect the proc info
+      await this.peer.refresh()
+
+      // 3. set current local host router info
+      console.log("Step 3: Set current local host router")
+      await this.router.local()
+      console.log("router mapping after step 3", this.router.info())
 
-      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()
+      // 4. refresh peer info to reflect the updated router info
+      await this.peer.refresh()
 
+      // 4. tell peers to refresh
       if (notify_peers) {
-        // broadcast to peers to refresh
+        console.log("Step 4: notify peers to refresh")
         await this.peer.notify_peers()
       }
+
+      // 4. update remote router
+      console.log("Step 5: Set remote routers")
+      await this.router.remote()
+      console.log("router mapping after step 5", this.router.info())
+
+      await this.router.update()
+
+
+//      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/kernel/procs.js

@@ -81,6 +81,7 @@ class Procs {
   }
   async refresh() {
     console.time("Get list")
+    let map = {}
     let list = await new Promise((resolve, reject) => {
       this.getPortPidList((err, portPidList) => {
         if (err) {
@@ -97,6 +98,7 @@ class Procs {
           let list = portPidList.map(({ port, pid, ip }) => {
             const fullname = pidToName[pid] || 'Unknown';
             const name = fullname.split(path.sep).pop()
+            map["" + pid] =  fullname
             return { port, pid , name, fullname, ip }
           })
           list = list.filter((item) => {
@@ -108,6 +110,7 @@ class Procs {
     })
     console.timeEnd("Get list")
     this.info = list
+    this.map = map
   }
 }
 module.exports = Procs

package/kernel/router/connector.js

@@ -4,7 +4,7 @@ class Connector {
   }
   handle ({ match, connector, dial, }) {
     console.log("connector.handle", { match, connector, dial })
-    let connector_name = connector.host + ":" + connector.port
+    let connector_name = connector.host + "-" + connector.port
     let listener = "0.0.0.0:PORT_PLACEHOLDER_" + connector_name
     let listener_pointer = connector.host + ":PORT_PLACEHOLDER_" + connector_name
     if(!this.router.config.apps.http.servers[connector_name]) {
@@ -16,12 +16,12 @@ class Connector {
               "handler": "reverse_proxy",
               "upstreams": [{ "dial": dial }],
               "headers": {
-                "request": {
-                  "set": {
-                    "X-Forwarded-Proto": ["https"],
-                    "X-Forwarded-Host": ["{http.request.host}"]
-                  }
-                },
+//                "request": {
+//                  "set": {
+//                    "X-Forwarded-Proto": ["https"],
+//                    "X-Forwarded-Host": ["{http.request.host}"]
+//                  }
+//                },
                 "response": {
                   "set": {
                     "Access-Control-Allow-Origin": ["*"],

package/kernel/router/index.js

@@ -89,10 +89,12 @@ class Router {
   async fill() {
     const jsonString = JSON.stringify(this.config)
     // find all PORT_PLACEHOLDER patterns
-    const matches = jsonString.match(/:PORT_PLACEHOLDER_[0-9.:]+/g)
+    const matches = jsonString.match(/:PORT_PLACEHOLDER_[0-9.-]+/g)
+
 
     // iterate through them and see if the port already exists
     let count = matches ? new Set(matches).size : 0
+    console.log("fill matches", { matches, count })
     /*
     let count = 0
     if (matches) {
@@ -109,11 +111,13 @@ class Router {
     */
 
 
+
     let new_config
  
     if (count > 0) {
       let ports = await this.kernel.ports(count)
       let response = Util.fill_object(this.config, /PORT_PLACEHOLDER_.+/, ports, this.port_cache)
+      console.log("fill_object response", response)
       this.config = response.result
       let replaced_map = response.replaced_map
       for(let key in replaced_map) {
@@ -131,12 +135,66 @@ class Router {
 
         //let original_port = key.replace("PORT_PLACEHOLDER_", "")
         this.port_mapping[original_port] = replaced_map[key]
+        console.log("set port_mapping", { original_port, key, replaced_map })
       }
       this.port_cache = replaced_map
     }
 
   }
 
+
+  // set local config
+  async local() {
+    this._mapping = {}
+    this.localhost_home_router.handle()
+    this.localhost_variable_router.handle(this.kernel.memory.local)
+    for(let proc of this.kernel.processes.info) {
+      this.localhost_port_router.handle(proc)
+    }
+    //this.mapping = this._mapping
+
+    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()
+    this.mapping = this._mapping
+  }
+
+  // set remote config
+  async remote() {
+    for(let host in this.kernel.peer.info) {
+      let peer = this.kernel.peer.info[host]
+      if (peer.host !== this.kernel.peer.host) {
+        this.peer_peer_router.handle(peer)
+      }
+    }
+    //await this.fill()
+    this.mapping = this._mapping
+  }
+
+  // update caddy config
+  async update() {
+    console.log("this.config", this.config)
+    console.log("this.old_config", this.old_config)
+    if (JSON.stringify(this.config) === JSON.stringify(this.old_config)) {
+      console.log("config hasn't updated")
+    } else {
+      console.log("config has updated")
+      let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
+        headers: { 'Content-Type': 'application/json' }
+      }).catch((e) => {
+        console.log("EEEEEEEEEEEEE", e.message)
+      })
+      console.log("Caddy Response", { response })
+      this.old_config = this.config
+    }
+  }
+
   async refresh() {
     console.log("router.refresh")
     console.time("router.refresh")

package/kernel/router/localhost_port_router.js

@@ -1,10 +1,11 @@
 const Common = require('./common')
-class LocalhostHomeRouter {
+class LocalhostPortRouter {
   constructor(router) {
     this.router = router
     this.common = new Common(router)
   }
   handle (proc) {
+    console.log("LocalhostPortRouter", proc)
     this.common.handle({
       match: `${proc.port}.localhost`,
       dial: proc.ip,
@@ -12,4 +13,4 @@ class LocalhostHomeRouter {
     })
   }
 }
-module.exports = LocalhostHomeRouter
+module.exports = LocalhostPortRouter

package/kernel/router/localhost_variable_router.js

@@ -8,7 +8,7 @@ class LocalhostVariableRouter extends Processor {
     this.common = new Common(router)
   }
   handle (local) {
-    console.log("localhost_variable_router", { local })
+    console.log("LocalhostVariableRouter", local)
     for(let script_path in local) {
       let local_variables_for_script = local[script_path]
       for(let key in local_variables_for_script) {

package/kernel/router/peer_home_router.js

@@ -5,6 +5,7 @@ class PeerHomeRouter {
     this.common = new Common(router)
   }
   handle(peer) {
+    console.log("PeerHomeRouter", peer)
     this.common.handle({
       match: `${this.router.default_prefix}.${peer.name}.${this.router.default_suffix}`,
       dial: `${peer.host}:${this.router.default_port}`,

package/kernel/router/peer_peer_router.js

@@ -5,6 +5,7 @@ class PeerPeerRouter {
     this.common = new Common(router)
   }
   handle(peer) {
+    console.log("PeerPeerRouter", peer)
     for(let dial in peer.router) {
       let matches = peer.router[dial]
       let exposed_matches = matches.filter((m) => {

package/kernel/router/peer_port_router.js

@@ -8,6 +8,7 @@ class PeerPortRouter extends Processor {
     this.connector = new Connector(router)
   }
   handle(peer) {
+    console.log("PeerPortRouter", peer)
     let https_domains_mapping = this.router.info()[peer.host]
     for(let dial in https_domains_mapping) {
       let parsed_dial = this.parse_ip(dial)

package/kernel/shell.js

@@ -979,7 +979,8 @@ class Shell {
     this.queue.killAndDrain()
     if (this.ptyProcess) {
       if (cb) {
-        kill(this.ptyProcess.pid, 'SIGKILL', () => {
+        let map = this.kernel.processes.map || {}
+        kill(this.ptyProcess.pid, map, 'SIGKILL', () => {
           console.log("child procs killed for", this.ptyProcess.pid)
           this.ptyProcess.kill()
           this.ptyProcess = undefined
@@ -989,7 +990,8 @@ class Shell {
           cb()
         });
       } else {
-        kill(this.ptyProcess.pid, 'SIGKILL');
+        let map = this.kernel.processes.map || {}
+        kill(this.ptyProcess.pid, map, 'SIGKILL');
         console.log("child procs killed for", this.ptyProcess.pid)
         this.ptyProcess.kill()
         this.ptyProcess = undefined

package/kernel/tree-kill.js

@@ -5,7 +5,7 @@ var spawn = childProcess.spawn;
 var exec = childProcess.exec;
 var execSync = childProcess.execSync;
 
-module.exports = function (pid, signal, callback) {
+module.exports = function (pid, map, signal, callback) {
     if (typeof signal === 'function' && callback === undefined) {
         callback = signal;
         signal = undefined;
@@ -31,7 +31,7 @@ module.exports = function (pid, signal, callback) {
         break;
     case 'darwin':
         buildProcessTreeMacOS(pid, tree, pidsToProcess, function () {
-          killAll(tree, signal, callback);
+          killAll(tree, map, signal, callback);
         });
         break;
     // case 'sunos':
@@ -43,19 +43,20 @@ module.exports = function (pid, signal, callback) {
         buildProcessTree(pid, tree, pidsToProcess, function (parentPid) {
           return spawn('ps', ['-o', 'pid', '--no-headers', '--ppid', parentPid]);
         }, function () {
-            killAll(tree, signal, callback);
+            killAll(tree, map, signal, callback);
         });
         break;
     }
 };
 
-function killAll (tree, signal, callback) {
+function killAll (tree, map, signal, callback) {
+    console.log("KillAll", tree)
     var killed = {};
     try {
         Object.keys(tree).forEach(function (pid) {
             tree[pid].forEach(function (pidpid) {
                 if (!killed[pidpid]) {
-                    killPid(pidpid, signal);
+                    killPid(pidpid, map, signal);
                     killed[pidpid] = 1;
                 }
             });
@@ -65,7 +66,7 @@ function killAll (tree, signal, callback) {
               return
             }
             if (!killed[pid]) {
-                killPid(pid, signal);
+                killPid(pid, map, signal);
                 killed[pid] = 1;
             }
         });
@@ -81,8 +82,9 @@ function killAll (tree, signal, callback) {
     }
 }
 
-function killPid(pid, signal) {
+function killPid(pid, map, signal) {
     try {
+        console.log("kill", pid, map[pid])
         process.kill(parseInt(pid, 10), signal);
     }
     catch (err) {

package/package.json

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

package/server/index.js

@@ -1377,7 +1377,6 @@ class Server {
         }
       })
 
-      console.log("ITEMS", items)
 
 //      if (req.query && req.query.mode === "task") {
 //        running = running.filter((x) => {
@@ -3522,7 +3521,6 @@ class Server {
       let info = Object.assign({}, this.kernel.i)
       info.launch_complete = this.kernel.launch_complete
       console.log("kernel.launch_complete", this.kernel.launch_complete)
-      console.log({ info })
       delete info.vars
       delete info.shell_env
       delete info.memory
@@ -3947,6 +3945,7 @@ class Server {
       })
     });
     process.on('SIGINT', () => {
+      console.log("[SigInt event]")
       //if (this.kernel && this.kernel.shell) {
       //  console.log("shell reset")
       //  this.kernel.shell.reset(() => {
@@ -3955,13 +3954,15 @@ class Server {
       //} else {
       //  process.exit()
       //}
-      kill(process.pid, 'SIGKILL', () => {
+      let map = this.kernel.processes.map || {}
+      kill(process.pid, map, 'SIGKILL', () => {
         console.log("child procs killed for", process.pid)
         process.exit()
       });
     })
 
     process.on('SIGTERM', () => {
+      console.log("[Sigterm event]")
 //      if (this.kernel && this.kernel.shell) {
 //        console.log("shell reset")
 //        this.kernel.shell.reset(() => {
@@ -3970,7 +3971,16 @@ class Server {
 //      } else {
 //        process.exit()
 //      }
-      kill(process.pid, 'SIGKILL', () => {
+      let map = this.kernel.processes.map || {}
+      kill(process.pid, map, 'SIGKILL', () => {
+        console.log("child procs killed for", process.pid)
+        process.exit()
+      });
+    })
+    process.on('exit', () => {
+      console.log("[Exit event]")
+      let map = this.kernel.processes.map || {}
+      kill(process.pid, map, 'SIGKILL', () => {
         console.log("child procs killed for", process.pid)
         process.exit()
       });