pinokiod 3.8.44 → 3.8.46

package/kernel/api/index.js

@@ -186,7 +186,7 @@ class Api {
       type: "disconnect"
     })
     console.timeEnd("stop 4")
-    await this.kernel.caddy.update()
+    await this.kernel.router.refresh()
     return true
   }
   async startScripts() {
@@ -1074,7 +1074,7 @@ class Api {
             })
           }
         }
-        await this.kernel.caddy.update()
+        await this.kernel.router.refresh()
       } catch (e) {
         ondata({ raw: e.toString() })
       }

package/kernel/bin/caddy.js

@@ -42,7 +42,7 @@ class Caddy {
           }
         })
       })
-      await this.kernel.caddy.update()
+      await this.kernel.router.refresh()
     }
 //    const config = {
 //      "apps": {

package/kernel/bin/index.js

@@ -38,17 +38,14 @@ class Bin {
     this.platform = os.platform()
   }
   async shell_kill(params, ondata) {
-    console.log("shell_kill", params)
     this.kernel.shell.kill(params.params)
   }
   async shell_start(params, ondata) {
     params.path = params.path || this.path()
-    console.log("this.client?", this.client)
     if (this.client) {
       params.cols = this.client.cols
       params.rows = this.client.rows
     }
-    console.log({ params })
     let response = await this.kernel.shell.start(params, null, ondata)
     return response
   }
@@ -58,7 +55,6 @@ class Bin {
       params.cols = this.client.cols
       params.rows = this.client.rows
     }
-    console.log({ params })
     let response = await this.kernel.shell.run(params, null, ondata)
     return response
   }
@@ -71,10 +67,8 @@ class Bin {
 //    })
 //  }
   async download(url, dest, ondata) {
-    console.log("DOWNLOAD process.env", process.env)
     const agent = new ProxyAgent();
     const userAgent = fakeUa()
-    console.log("download userAgent", userAgent)
     const opts = {
       fileName: dest,
       override: true,
@@ -90,7 +84,6 @@ class Bin {
       opts.httpRequestOptions = { agent }
       opts.httpsRequestOptions = { agent }
     }
-    console.log("opts", opts)
     const dl = new DownloaderHelper(url, this.path(), opts)
     ondata({ raw: `\r\nDownloading ${url} to ${this.path()}...\r\n` })
     let res = await new Promise((resolve, reject) => {
@@ -203,7 +196,6 @@ class Bin {
     return e
   }
   async init() {
-    console.log("kernel.bin.init", this.kernel.homedir)
     if (this.kernel.homedir) {
       const bin_folder = this.path()
       await fs.promises.mkdir(bin_folder, { recursive: true }).catch((e) => { })
@@ -213,7 +205,6 @@ class Bin {
       }
 //      await fs.promises.mkdir(playwright_folder, { recursive: true }).catch((e) => { })
       let system_env = await Environment.get(this.kernel.homedir)
-      console.log("***********", { system_env })
 
       if (system_env.HTTP_PROXY) {
         process.env.HTTP_PROXY = system_env.HTTP_PROXY
@@ -339,13 +330,11 @@ class Bin {
     let to_reset_exists = false
     for(let module_path of module_paths) {
       let e = await this.kernel.exists(module_path)
-      console.log({ e, module_path })
       if (e) {
         to_reset_exists = true
         break;
       }
     }
-    console.log({ to_reset_exists })
     if (to_reset_exists) {
       this.correct_conda = false
     } else {
@@ -406,7 +395,6 @@ class Bin {
         }
       }
 
-      console.log({ conda_check })
       if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
       //if (conda_check.conda && conda_check.mamba) {
         this.correct_conda = true
@@ -417,23 +405,17 @@ class Bin {
   }
   async refreshInstalled() {
 
-    console.log("refreshInstalled start")
-
-
     /// A. installed packages detection
 
     this.installed_initialized = false
 
     //this.installed = {}
 
-    console.log("## check conda")
-
     // 1. conda
 
     // check conda location and see if it exists. only run if it exists
     let conda_path = path.resolve(this.kernel.homedir, "bin", "miniconda")
     let conda_exists = await this.exists(conda_path)
-    console.log({ conda_path, conda_exists })
 
     let start
     let res

package/kernel/{caddy.js → caddy2.js}

@@ -601,22 +601,17 @@ class Caddy {
     let count = 0
     if (matches) {
       for(let match of matches) {
-        console.log("testing", match)
         const port_match = match.match(/[0-9.]+:([0-9]+)/);
         let port = port_match ? port_match[1] : null
-        console.log({ port, port_match })
         if (port && !this.port_mapping[port]) {
           count++
         }
       }
     }
 
-    console.log("count", count)
-    console.log("&&", JSON.stringify(payload, null, 2))
  
     if (count > 0) {
       let ports = await this.kernel.ports(count)
-      console.log({ count, ports })
       console.log("PORT_CACHE", this.port_cache)
       let response = Util.fill_object(payload, /PORT_PLACEHOLDER_.+/, ports, this.port_cache)
       payload = response.result
@@ -628,7 +623,6 @@ class Caddy {
         let local_share_ip = chunks[0]
         let original_port = chunks[1]
         let local_share_port = replaced_map[key]
-        console.log({ local_share_ip, local_share_port })
         if (!this.local_network_mapping[local_share_ip]) {
           this.local_network_mapping[local_share_ip] = {}
         }

package/kernel/index.js

@@ -30,7 +30,7 @@ const Pipe = require("../pipe")
 const Cloudflare = require('./api/cloudflare')
 const Store = require('./store')
 const Proto = require('./prototype')
-const Caddy = require("./caddy")
+const Router = require("./router")
 const Procs = require('./procs')
 const Peer = require('./peer')
 const VARS = {
@@ -71,7 +71,6 @@ class Kernel {
       this.store.clone(store.store)
       // load from the store (this will be the last time this is used, since the next time it loads, it will load from the new store)
     }
-    console.log("this.store", this.store.store())
 
     this.arch = os.arch()
     this.os = os
@@ -88,6 +87,7 @@ class Kernel {
     this.cloudflare = new Cloudflare()
     this.shellpath = shellPath.sync()
 
+
     this.peer = new Peer()
   }
   /*
@@ -198,6 +198,16 @@ class Kernel {
     let id = this.api.filePath(uri, cwd)
     return this.api.running[id]
   }
+  start_port () {
+    if (this.router.port_mapping && this.router.port_mapping.length > 0) {
+      let max_caddy_port = Math.max(Object.values(this.router.port_mapping))
+      let start_port = Math.max(42003, max_caddy_port + 1)
+      console.log({ start_port })
+      return start_port
+    } else {
+      return 42003
+    }
+  }
   port(port) {
     // 1. if port is passed, check port
     // 2. if no port is passed, get the next available port
@@ -209,13 +219,13 @@ class Kernel {
     if (port) {
       return portfinder.isAvailablePromise({ host: "0.0.0.0", port })
     } else {
-      return portfinder.getPortPromise({ port: 42003 })
+      return portfinder.getPortPromise({ port: this.start_port() })
     }
   }
   ports(count) {
     // get "count" number of available ports
     return new Promise((resolve, reject) => {
-      portfinder.getPorts(count, { port: 42003 }, (err, ports) => {
+      portfinder.getPorts(count, { port: this.start_port() }, (err, ports) => {
         if (err) {
           reject(err)
         } else {
@@ -299,12 +309,9 @@ class Kernel {
   }
   async getInfo(refresh){
     let info = this.sysinfo
-    console.time(">>>>> updateSysinfo")
-    console.log("refresh", refresh)
     if (refresh) {
       await this.update_sysinfo()
     }
-    console.timeEnd(">>>>> updateSysinfo")
     let i = {
       version: this.version,
       platform: this.platform,
@@ -506,7 +513,7 @@ class Kernel {
     this.api = new Api(this)
     this.python = new Python(this)
     this.shell = new Shells(this)
-    this.caddy = new Caddy(this)
+    this.router = new Router(this)
     this.system = system
     this.keys = {}
     this.memory = {
@@ -526,7 +533,6 @@ class Kernel {
 
         // 0. create homedir
         let home_exists = await this.exists(this.homedir)
-        console.log({ home_exists, homedir: this.homedir })
         if (!home_exists) {
           // home didn't exist.
           // 1. mkdir
@@ -551,7 +557,6 @@ class Kernel {
           NO_PROXY: (this.store.get("NO_PROXY") || "")
         }
         let fullpath = path.resolve(this.homedir, "ENVIRONMENT")
-        console.log("> update env", { fullpath, updated })
         await Util.update_env(fullpath, updated)
 
         // 2. mkdir all the folders if not already created
@@ -574,10 +579,8 @@ class Kernel {
       //await this.bin.init()
       let ts = Date.now()
       this.bin.init().then(() => {
-        console.log("bin init finished")
         if (this.homedir) {
           this.shell.init().then(async () => {
-            console.log("shell init finished")
             this.bin.check_bin()
             if (this.envs) {
               this.template.update({
@@ -602,24 +605,18 @@ class Kernel {
                   }
                 }
               })
-              console.log("*******************")
 
               // get env
               if (!this.launch_complete) {
                 let interval = setInterval(async () => {
-                  console.log("this.i", this.i)
                   if (this.i) {
                     for(let api of this.i.api) {
-                      console.log({ api })
                       let env_path = path.resolve(this.api.userdir, api.path)
                       let e = await Environment.get(env_path)
-                      console.log(e)
                       if (e.PINOKIO_SCRIPT_AUTOLAUNCH && e.PINOKIO_SCRIPT_AUTOLAUNCH.trim().length > 0) {
                         let autolaunch_path = path.resolve(env_path, e.PINOKIO_SCRIPT_AUTOLAUNCH)
                         let exists = await this.exists(autolaunch_path)
-                        console.log("ATTEMPTING AUTOLAUNCH", autolaunch_path)
                         if (exists) {
-                          console.log("SCRIPT EXISTS. Starting...", autolaunch_path)
                           this.api.process({
                             uri: autolaunch_path,
                             input: {}
@@ -634,7 +631,6 @@ class Kernel {
                         }
                       }
                     }
-                    console.log("clear Interval")
                     clearInterval(interval)
                     setTimeout(() => {
                       this.launch_complete = true
@@ -648,14 +644,11 @@ class Kernel {
         }
       })
       let ts2 = Date.now()
-      console.time(">>>> 6 api.init")
       await this.api.init()
-      console.timeEnd(">>>> 6 api.init")
 
       //await this.shell.init()
 
       if (this.homedir) {
-        console.time(">>>> 7 template.init")
         await this.template.init({
           kernel: this,
           system,
@@ -665,20 +658,13 @@ class Kernel {
             return this.api.get_proxy_url("/proxy", port)
           },
         })
-        console.timeEnd(">>>> 7 template.init")
         this.sys = new Sysinfo()
-        console.time("sys init")
-        console.time(">>>> 8 sys.init")
         await this.sys.init(this)
-        console.timeEnd(">>>> 8 sys.init")
-        console.timeEnd("sys init")
         let info = this.sys.info
 
         this.sysinfo = info
 
-        console.time(">>>> 9 getInfo")
         await this.getInfo()
-        console.timeEnd(">>>> 9 getInfo")
 
         await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
         await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify(this.i, null, 2))

package/kernel/loader.js

@@ -48,7 +48,7 @@ class Loader {
   async requireJS(filepath) {
     let config
     try { config = require(filepath) } catch (e) {
-      console.log("load error", filepath, e)
+      console.log("load error", filepath, e.message)
     }
     try {
       // if the required module is a class, return the instantiated object

package/kernel/peer.js

@@ -8,43 +8,19 @@ class PeerDiscovery {
     this.interval = interval;
     this.socket = dgram.createSocket('udp4');
     this.peers = new Set();
-    this.current_account = os.userInfo()
-    this.current_ip = this._getLocalIPAddress()
+    this.name = os.userInfo().username
+    this.host = this._getLocalIPAddress()
+    this.default_port = 42000
 //    this.start();
   }
-  account(ip) {
-    return this.data[ip].account.username
-  }
-  homedir(ip) {
-    return this.data[ip].homedir
-  }
-  caddy(ip) {
-    return this.data[ip].proxy
-  }
-  local(ip) {
-    return this.data[ip].memory.local
-  }
-  global(ip) {
-    return this.data[ip].memory.global
-  }
   start() {
     // Listen for incoming pings
-    this.data = {}
     this.socket.on('message', (msg, rinfo) => {
       const ip = rinfo.address;
       if (msg.toString() === this.message.toString() && this._isLocalLAN(ip)) {
         if (!this.peers.has(ip)) {
           console.log(`Discovered peer: ${ip}`);
           this.peers.add(ip);
-          let interval = setInterval(() => {
-            axios.get(`http://${ip}:42000/pinokio/mem`).then((res) => {
-              this.data[ip] = res.data
-              console.log("this.data", { ip, data: this.data[ip] })
-              if (res.data.proxy) {
-//                clearInterval(interval)
-              }
-            })
-          }, 1000)
         }
       }
     });
@@ -59,11 +35,25 @@ class PeerDiscovery {
       }, this.interval);
     });
   }
-
-  get() {
-    return Array.from(this.peers);
+  _refresh(host) {
+    return axios.get(`http://${host}:${this.default_port}/pinokio/peer`).then((res) => {
+      return res.data
+    })
+  }
+  async refresh() {
+    this.info = {}
+    let peer_info = await Promise.all(Array.from(this.peers).map((host) => {
+      return this._refresh(host)
+    }))
+    for(let i=0; i<peer_info.length; i++) {
+      let host = this.peers[i]
+      this.info[host] = {
+        host,
+        ...peer_info[i],
+      }
+    }
+    return this.info
   }
-
   _isLocalLAN(ip) {
     return ip.startsWith('192.168.');
   }

package/kernel/peer2.js

@@ -0,0 +1,83 @@
+const dgram = require('dgram');
+const axios = require('axios');
+const os = require('os')
+class PeerDiscovery {
+  constructor(port = 41234, message = 'ping', interval = 1000) {
+    this.port = port;
+    this.message = Buffer.from(message);
+    this.interval = interval;
+    this.socket = dgram.createSocket('udp4');
+    this.peers = new Set();
+    this.current_account = os.userInfo()
+    this.current_ip = this._getLocalIPAddress()
+//    this.start();
+  }
+  account(ip) {
+    return this.data[ip].account.username
+  }
+  homedir(ip) {
+    return this.data[ip].homedir
+  }
+  caddy(ip) {
+    return this.data[ip].proxy
+  }
+  local(ip) {
+    return this.data[ip].memory.local
+  }
+  global(ip) {
+    return this.data[ip].memory.global
+  }
+  start() {
+    // Listen for incoming pings
+    this.data = {}
+    this.socket.on('message', (msg, rinfo) => {
+      const ip = rinfo.address;
+      if (msg.toString() === this.message.toString() && this._isLocalLAN(ip)) {
+        if (!this.peers.has(ip)) {
+          console.log(`Discovered peer: ${ip}`);
+          this.peers.add(ip);
+          let interval = setInterval(() => {
+            axios.get(`http://${ip}:42000/pinokio/mem`).then((res) => {
+              this.data[ip] = res.data
+              console.log("this.data", { ip, data: this.data[ip] })
+              if (res.data.proxy) {
+//                clearInterval(interval)
+              }
+            })
+          }, 1000)
+        }
+      }
+    });
+
+    // Enable broadcast
+    this.socket.bind(this.port, () => {
+      this.socket.setBroadcast(true);
+
+      // Send broadcast pings every interval
+      setInterval(() => {
+        this.socket.send(this.message, 0, this.message.length, this.port, '255.255.255.255');
+      }, this.interval);
+    });
+  }
+
+  get() {
+    return Array.from(this.peers);
+  }
+
+  _isLocalLAN(ip) {
+    return ip.startsWith('192.168.');
+  }
+  _getLocalIPAddress() {
+    const interfaces = os.networkInterfaces();
+    for (const ifaceList of Object.values(interfaces)) {
+      for (const iface of ifaceList) {
+        if (iface.family === 'IPv4' && !iface.internal && iface.address.startsWith('192.168.')) {
+          return iface.address;
+        }
+      }
+    }
+    return null;
+  }
+}
+
+module.exports = PeerDiscovery;

package/kernel/prototype.js

@@ -27,7 +27,6 @@ class Proto {
     for(let proto of prototypes) {
       let pinokiojs = path.resolve(prototype_dir, proto, "pinokio.js")
       let config = await this.kernel.require(pinokiojs)
-      console.log({ config })
       if (config && config.type === "prototype") {
         if (config.icon) {
           config.icon = "/prototype/" + proto + "/" + config.icon

package/kernel/router/common.js

@@ -0,0 +1,29 @@
+class Common {
+  constructor (router) {
+    this.router = router
+  }
+  handle({ match, dial, host }) {
+    this.router.config.apps.http.servers.main.routes.push({
+      "match": [{ "host": [match] }],
+      "handle": [
+        {
+          "handler": "reverse_proxy",
+          "upstreams": [{ "dial": dial }]
+        },
+        {
+          "handler": "headers",
+          "response": {
+            "set": {
+              "Access-Control-Allow-Origin": ["*"],
+              "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+              "Access-Control-Allow-Headers": ["*"],
+              "Vary": ["Origin"]
+            }
+          }
+        }
+      ]
+    })
+    this.router.add({ host, dial, match })
+  }
+}
+module.exports = Common

package/kernel/router/connector.js

@@ -0,0 +1,56 @@
+class Connector {
+  constructor(router) {
+    this.router = router
+  }
+  handle ({ match, connector, dial, }) {
+    let connector_name = connector.host + ":" + connector.port
+    if(!this.router.config.apps.http.servers[connector_name]) {
+      this.router.config.apps.http.servers[connector_name] = {
+        "listen": ["0.0.0.0:PORT_PLACEHOLDER_" + connector_name],
+        "routes": [{
+          "handle": [
+            {
+              "handler": "reverse_proxy",
+              "upstreams": [{ "dial": dial }]
+            },
+            {
+              "handler": "headers",
+              "response": {
+                "set": {
+                  "Access-Control-Allow-Origin": ["*"],
+                  "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                  "Access-Control-Allow-Headers": ["*"],
+                  "Vary": ["Origin"]
+                }
+              }
+            }
+          ]
+        }]
+      }
+    }
+    this.router.config.apps.http.servers.main.routes.push({
+      "match": [{
+        "host": [match],
+      }],
+      "handle": [
+        {
+          "handler": "reverse_proxy",
+          "upstreams": [{ "dial": connector.host + ":PORT_PLACEHOLDER_" + connector_name }]
+        },
+        {
+          "handler": "headers",
+          "response": {
+            "set": {
+              "Access-Control-Allow-Origin": ["*"],
+              "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+              "Access-Control-Allow-Headers": ["*"],
+              "Vary": ["Origin"]
+            }
+          }
+        }
+      ]
+    })
+    this.router.add({ host: connector.host, dial, match })
+  }
+}
+module.exports = Connector