pinokiod 3.8.149 → 3.8.151

package/kernel/router/connector.js

@@ -5,12 +5,10 @@ class Connector extends Processor {
     this.router = router
   }
   handle ({ match, connector, dial, }) {
-//    console.log("connector.handle", { match, connector, dial })
     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
     let port_placeholder = "PORT_PLACEHOLDER_" + connector_name
-//    console.log("CONNECTING", { listener, dial, listener_pointer, match })
 
     let handler = [{
       "handler": "reverse_proxy",
@@ -18,7 +16,6 @@ class Connector extends Processor {
       "headers": {
         "request": {
           "set": {
-//            "Origin": ["http://127.0.0.1:11434"],
             "X-Forwarded-Proto": ["{http.request.header.X-Forwarded-Proto}"],
             //"X-Forwarded-Proto": ["{http.request.scheme}"],
             //"X-Forwarded-Proto": ["https"],
@@ -34,23 +31,6 @@ class Connector extends Processor {
           }
         }
       }
-//            {
-//              "handler": "headers",
-//              "request": {
-//                "set": {
-//                  "X-Forwarded-Proto": ["https"],
-//                  "X-Forwarded-Host": ["{http.request.host}"]
-//                }
-//              },
-//              "response": {
-//                "set": {
-//                  "Access-Control-Allow-Origin": ["*"],
-//                  "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
-//                  "Access-Control-Allow-Headers": ["*"],
-//                  "Vary": ["Origin"]
-//                }
-//              }
-//            }
     }]
     // if the dial port has been overridden by router.custom_routers, use that instead
     let parsed_dial = this.parse_ip(dial)
@@ -93,28 +73,9 @@ class Connector extends Processor {
             }
           }
         },
-//        {
-//          "handler": "headers",
-//          "request": {
-//            "set": {
-//              "X-Forwarded-Proto": ["https"],
-//              "X-Forwarded-Host": ["{http.request.host}"]
-//            }
-//          },
-//          "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: listener_pointer, match })
-//    this.router._tree[connector_name] = dial
-//    this.router._tree[connector_name] = dial
   }
 }
 module.exports = Connector

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
@@ -61,15 +62,21 @@ class Router {
       }
     */
     this.custom_routers = {}
-    console.log({ router_paths })
     for(let router_path of router_paths) {
       let router_abs_path = this.kernel.path("network", router_path)
       let config = await this.kernel.require(router_abs_path)
-      console.log({ config })
       for(let port in config) {
         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]) {
@@ -91,8 +98,6 @@ class Router {
         mapping[host][url] = Array.from(internal_maps[url])
       }
     }
-
-
     let host_mapping = mapping[this.kernel.peer.host]
     if (host_mapping) {
       for(let key in host_mapping) {
@@ -101,36 +106,13 @@ class Router {
             let transformed = key.replace(":" + cache_key, '')
             let port = this.port_cache[cache_key]
             host_mapping[transformed + ":" + port] = host_mapping[key]
-//            console.log("replacing", transformed + ":" + port, "with", host_mapping[key])
             delete host_mapping[key]
           }
         }
       }
       mapping[this.kernel.peer.host] = host_mapping
-//      let json = JSON.stringify(host_mapping)
-//      for(let key in this.port_cache) {
-//        console.log("replacing", key, "with", this.port_cache[key])
-//        json = json.replaceAll(key, this.port_cache[key])
-//      }
-//      console.log("json", json)
-//      let m = JSON.parse(json)
-//
-//      mapping[this.kernel.peer.host] = m
-//      console.log("AFTER REPLACING", mapping)
     }
-
-
     return mapping
-
-//    let json = JSON.stringify(mapping)
-//    for(let key in this.port_cache) {
-//      console.log("replacing", key, "with", this.port_cache[key])
-//      json = json.replaceAll(key, this.port_cache[key])
-//    }
-//    let m = JSON.parse(json)
-//
-//    console.log("AFTER REPLACING", m)
-//    return m
   }
   /*
     returns only the published peer info
@@ -147,17 +129,12 @@ class Router {
   */
   published() {
     let pub = {}
-//    console.log("published info", this.info)
     if (this.info) {
       let routes = this.info[this.kernel.peer.host]
       for(let dial in routes) {
         let matches = routes[dial]
-        // current host => the single source of truth
-//        if (dial.startsWith(this.kernel.peer.host)) {
-          pub[dial] = matches
-//        }
+        pub[dial] = matches
       }
-//      console.log({ pub })
     }
     return pub
   }
@@ -166,27 +143,9 @@ class Router {
     // find all PORT_PLACEHOLDER patterns
     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) {
-      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++
-        }
-      }
-    }
-    */
-
     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)
@@ -198,47 +157,40 @@ class Router {
         let chunks = local_share_key.split(":")
         let original_port = chunks[chunks.length-1]
         let local_share_ip = chunks.slice(0, chunks.length-1).join(":")
-
         let local_share_port = replaced_map[key]
         if (!this.local_network_mapping[local_share_ip]) {
           this.local_network_mapping[local_share_ip] = {}
         }
         this.local_network_mapping[local_share_ip][original_port] = local_share_port
-
-
         //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._tree = {}
     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)
+    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
-//    this.tree = this._tree
+    console.log("after local()", JSON.stringify(this.mapping, null, 2))
   }
 
   // set remote config
@@ -251,9 +203,7 @@ class Router {
     }
     //await this.fill()
     this.mapping = this._mapping
-//    this.tree = this._tree
     this.info = this._info()
-//    console.log("TREE", JSON.stringify(this.tree, null, 2))
   }
 
   // update caddy config
@@ -269,64 +219,9 @@ class Router {
         console.log("Caddy Response", { response })
         this.old_config = this.config
       } catch (e) {
-        console.log("EEEEEEEEEEEEE", e.message)
+        console.log("EEEEEEEEEEEEE", e)
       }
     }
   }
-
-//  async refresh() {
-////    console.log("router.refresh")
-////    console.time("router.refresh")
-////    console.log("> procs", this.kernel.processes.info)
-////    console.log("> peers", this.kernel.peer.info)
-//    this._mapping = {}
-////    this.port_mapping = {}   // 127.0.0.1 => 192.168,..
-////    this.local_network_mapping = {}
-//
-//    let old_config = this.config
-//
-//    // 1. Localhost handling
-//    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
-//
-//    // 2. Peers handling
-//    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)
-//      } else {
-//        this.peer_peer_router.handle(peer)
-//      }
-//    }
-//    // replace :PORT_PLACEHOLDER with available ports
-//
-//
-//    await this.fill()
-//    this.mapping = this._mapping
-//    console.timeEnd("router.refresh")
-//
-//
-//    // compare old config with new config
-//    // if it hasn't changed, don't do anything
-//    // if it has changed, refresh
-//
-//    if (JSON.stringify(this.config) === JSON.stringify(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 })
-//    }
-//  }
 }
 module.exports = Router

package/kernel/router/localhost_home_router.js

@@ -54,23 +54,6 @@ class LocalhostHomeRouter {
                         }
                       }
                     },
-                    //{
-                    //  "handler": "headers",
-                    //  "request": {
-                    //    "set": {
-                    //      "X-Forwarded-Proto": ["https"],
-                    //      "X-Forwarded-Host": ["{http.request.host}"]
-                    //    }
-                    //  },
-                    //  "response": {
-                    //    "set": {
-                    //      "Access-Control-Allow-Origin": ["*"],
-                    //      "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
-                    //      "Access-Control-Allow-Headers": ["*"],
-                    //      "Vary": ["Origin"]
-                    //    }
-                    //  }
-                    //}
                   ]
                 },
               ]
@@ -83,7 +66,13 @@ class LocalhostHomeRouter {
           "default": {
             "writer": {
               "output": "file",
-              "filename": this.router.kernel.path("logs/caddy.log")
+              "filename": this.router.kernel.path("logs/caddy.log"),
+              "roll": true,
+              "roll_size_mb": 1,
+              "roll_keep": 1,
+              "roll_keep_days": 1,
+              "roll_gzip": false,
+              "roll_local_time": true
             },
             "level": "INFO"
           }

package/kernel/router/localhost_variable_router.js

@@ -15,7 +15,6 @@ class LocalhostVariableRouter extends Processor {
         if (val.startsWith("http")) {
           let dial = val.replace(/https?:\/\//, '')
           let name = this.api_name(this.router.kernel.platform, this.router.kernel.homedir, script_path)
-          console.log({ dial, name, has_port: this.has_port(dial), parsed_dial: this.parse_ip(dial) })
           if (this.has_port(dial)) {
             if (key === "url") {
               this.common.handle({

package/kernel/router/processor.js

@@ -5,7 +5,6 @@ class Processor {
     return chunks.length === 2
   }
   api_name(platform, home, str) {
-    console.log({ platform, home, str })
     let api_path
     let rel_path
     let name
@@ -19,9 +18,7 @@ class Processor {
       api_path = _path.resolve(home, "api")
       rel_path = _path.relative(api_path, str)
     }
-    console.log({ api_path, rel_path, })
     name = rel_path.split(_path.sep)[0]
-    console.log({ name })
     return name
   }
   parse_ip(str) {

package/kernel/shell.js

@@ -2,7 +2,6 @@ const { Terminal } = require('xterm-headless');
 const { SerializeAddon } = require("xterm-addon-serialize");
 const sanitize = require("sanitize-filename");
 const YAML = require('yaml')
-//const kill = require('./tree-kill');
 const kill = require('kill-sync')
 const fastq = require('fastq')
 const { v4: uuidv4 } = require('uuid');
@@ -988,18 +987,6 @@ class Shell {
         this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
         console.log("before cb 1")
         cb()
-
-//        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
-//          // automatically remove the shell from this.kernel.shells
-//          this.kernel.shell.rm(this.id)
-//          this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
-//          console.log("before cb 1")
-//          cb()
-//        });
       } else {
         kill(this.ptyProcess.pid, "SIGKILL", true)
         this.ptyProcess.kill()
@@ -1007,18 +994,8 @@ class Shell {
         // automatically remove the shell from this.kernel.shells
         this.kernel.shell.rm(this.id)
         this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
-
-//        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
-//        // automatically remove the shell from this.kernel.shells
-//        this.kernel.shell.rm(this.id)
-//        this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
       }
     } else {
-  //    // automatically remove the shell from this.kernel.shells
       this.kernel.shell.rm(this.id)
       this.ondata({ raw: `\r\n\r\n██ Terminated Shell ${this.id}\r\n████\r\n` })
     }

package/kernel/shells.js

@@ -35,20 +35,9 @@ class Shells {
     } else {
       m = "ls"
     }
-    console.time("init_env")
     await sh.init_env({
       env: this.kernel.bin.envs({}),
     })
-    console.timeEnd("init_env")
-//    let response = await sh.start({
-//      message: m,
-//      env: this.kernel.bin.envs({}),
-//      conda: {
-//        skip: true
-//      }
-//    }, async (stream) => {
-//      process.stdout.write(stream.raw)
-//    })
 
     this.kernel.envs = sh.env
     // also set the uppercase variables if they're not set
@@ -157,9 +146,6 @@ class Shells {
       }
       ondata(stream)
     })
-    console.log("SHELL RESPONSE", response)
-
-
     /*
       {
         method: "shell.run",
@@ -246,12 +232,10 @@ class Shells {
           line = line.replaceAll(err, "")
         }
       }
-      console.log("BEFORE SHELL RETURN 1")
 
       // don't return if there's an error
       return { id: sh.id, response, stdout: response, event: m, error: shortened_errs }
     } else {
-      console.log("BEFORE SHELL RETURN 2")
       // need to make a request
       return { id: sh.id, response, stdout: response, event: m }
     }

package/package.json

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

package/server/index.js

@@ -1,5 +1,4 @@
 const express = require('express');
-//const kill = require('../kernel/tree-kill');
 const kill = require('kill-sync')
 const portfinder = require('portfinder-cp');
 const proxy = require('express-http-proxy-cp');
@@ -2623,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/public/install.js

@@ -109,8 +109,8 @@ const install = async (name, url, term, socket, options) => {
 
   }
 }
-const createTerm = async () => {
-  const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+const createTerm = async (_theme) => {
+  const theme = Object.assign({ }, _theme, {
     selectionBackground: "red",
     selectionForeground: "white"
   })

package/server/public/style.css

@@ -111,7 +111,9 @@ body.dark .type-tabs {
 }
 .navheader2 {
   padding: 15px 10px;
+  /*
   background: white;
+  */
 }
 .navheader {
     backdrop-filter: blur(16px);
@@ -632,7 +634,9 @@ body.columns .containers {
 }
 .terminal-container {
   padding: 10px 0;
+  /*
   background: white;
+  */
   flex-grow: 1;
   position: relative;
   /*

package/server/socket.js

@@ -19,7 +19,6 @@ class Socket {
       });
       ws.on('message', async (message) => {
         const req = JSON.parse(message);
-        console.log({ req })
         if (req.response) {
           this.parent.kernel.api.respond(req)
         } else {
@@ -28,15 +27,11 @@ class Socket {
           // look for repos that match
 
           if (req.uri) {
-            console.log("## 1")
             if (req.mode === "open") {
-              console.log("## 2")
               // get the default script and respond
               let id = this.parent.kernel.api.filePath(req.uri)
               try {
-                console.log("## 3")
                 let default_url = await this.parent.kernel.api.get_default(id)
-                console.log({ id, default_url })
                 ws.send(JSON.stringify({
                   data: {
                     uri: default_url 
@@ -46,15 +41,10 @@ class Socket {
                 console.log(e)
               }
             } else {
-                console.log("## 4")
-              console.log("REQ.URI", req.uri)
               if (req.uri.startsWith("http")) {
-                  console.log("## 5")
                 // open
                 Util.openfs(req.uri, { mode: "open" })
               } else {
-                  console.log("## 6")
-                console.log("sdfsfsfsdfsd>>>>>>>>>>>>>>>>>>>>>>>>>>>")
                 /******************************************************************
                 *
                 *  req.uri is ALWAYS either of the two:
@@ -69,24 +59,18 @@ class Socket {
                 let id = this.parent.kernel.api.filePath(req.uri)
 
                 if (req.status) {
-                    console.log("## 7")
                   ws.send(JSON.stringify({
                     data: this.parent.kernel.api.running[id] ? true : false
                   }))
                 } else if (req.stop) {
-                    console.log("## 8")
-                  console.log(">>>>>>>>>>>>>>>>>>>>>")
                   this.parent.kernel.api.stop({ params: req })
                 } else {
-                    console.log("## 9")
                   let buf = this.buffer[id]
                   let sh = this.active_shell[id]
                   this.subscribe(ws, id, buf, sh)
                   if (req.mode !== "listen") {
-                    console.log("## 10")
                     // Run only if currently not running
                     if (!this.parent.kernel.api.running[id]) {
-                    console.log("## 11")
 
                       // clear the log first
 
@@ -102,32 +86,21 @@ class Socket {
             }
           } else if (req.method) {
             if (req.id) {
-              console.log("req.id", req.id)
               let buf = this.buffer[req.id]
               let sh = this.active_shell[req.id]
-              console.log({ buf, sh })
               this.subscribe(ws, req.id, buf, sh)
-              console.log("Process 2")
               if (!sh) {
-              //if (req.mode !== "listen") {
-                console.log("Process 3")
                 this.parent.kernel.api.process(req)
-                console.log("Process 4")
               }
             } else {
-              console.log("Process 1")
               this.subscribe(ws, req.method)
-              console.log("Process 2")
               if (req.mode !== "listen") {
-                console.log("Process 3")
                 this.parent.kernel.api.process(req)
-                console.log("Process 4")
               }
             }
           } else if (req.emit) {
             this.parent.kernel.shell.emit(req)
           } else if (req.key && req.id) {
-            console.log("SOCKET", req)
             this.parent.kernel.shell.emit({
               id: req.id,
               emit: req.key

package/server/views/bootstrap.ejs

@@ -125,7 +125,12 @@ document.addEventListener("DOMContentLoaded", () => {
       document.querySelector("#bootstrap").classList.add("hidden")
       document.querySelector(".explain").classList.add("hidden")
 
-      const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
+      <% if (theme === "dark") { %>
+      let _theme = xtermTheme.FrontEndDelight
+      <% } else { %>
+      let _theme = xtermTheme.Tomorrow
+      <% } %>
+      const theme = Object.assign({ }, _theme, {
         selectionBackground: "red",
         selectionForeground: "white"
       })

package/server/views/download.ejs

@@ -220,7 +220,13 @@ document.addEventListener("DOMContentLoaded", async () => {
     //  let name = "0x" + url.split("").map(c => c.charCodeAt(0).toString(16).padStart(2, "0")).join("");
       let name = await installname(url)
       if (name) {
-        if (!term) term = await createTerm()
+        if (!term) {
+          <% if (theme === "dark") { %>
+          term = await createTerm(xtermTheme.FrontEndDelight)
+          <% } else { %>
+          term = await createTerm(xtermTheme.Tomorrow)
+          <% } %>
+        }
         let params = new URLSearchParams(location.search)
         let entries = [...params.entries()]
         let options;