pinokiod 3.8.148 → 3.8.149

package/kernel/loader.js

@@ -40,30 +40,32 @@ class Loader {
           resolved = null
         }
       } catch (e) {
-        console.log(`[did not load] ${_path}`)
         resolved = null
       }
     }
+    if (!resolved) {
+      console.log(`[did not load] ${_path}`)
+    }
     return { resolved, extension, dirname }
   }
   async requireJSON(filepath) {
     let config
     try { config = require(filepath) } catch (e) {
-      console.log(`[did not load] ${filepath}`)
+//      console.log(`[did not load] ${filepath}`)
     }
     return config
   }
   async requireJS(filepath) {
     let config
     try { config = require(filepath) } catch (e) {
-      console.log(`[did not load] ${filepath}`)
+//      console.log(`[did not load] ${filepath}`)
     }
     try {
       // if the required module is a class, return the instantiated object
       return new config();
     } catch (e) {
       // otherwise return normally
-      console.log(`[did not load] ${filepath}`)
+//      console.log(`[did not load] ${filepath}`)
       return config
     }
   }

package/kernel/procs.js

@@ -98,6 +98,7 @@ class Procs {
             const fullname = pidToName[pid] || 'Unknown';
             const name = fullname.split(path.sep).pop()
             if (["caddy", "caddy.exe"].includes(name)) {
+              this.caddy_pid = pid
               return null
             } else {
               map["" + pid] =  fullname

package/kernel/prototype.js

@@ -1,5 +1,6 @@
 const fs = require('fs')
 const path = require('path')
+const { glob, sync, hasMagic } = require('glob-gitignore')
 class Proto {
   constructor(kernel) {
     this.kernel = kernel
@@ -10,24 +11,26 @@ class Proto {
     let exists = await this.kernel.exists("prototype")
     if (!exists) {
       console.log("prototype doesn't exist. cloning...")
+      await fs.promises.mkdir(this.kernel.path("prototype"), { recursive: true }).catch((e) => { })
       await this.kernel.exec({
-        message: "git clone https://github.com/peanutcocktail/prototype",
-        path: this.kernel.homedir
+        message: "git clone https://github.com/peanutcocktail/prototype system",
+        path: this.kernel.path("prototype")
       }, (e) => {
         process.stdout.write(e.raw)
       })
     }
-    // get all prototypes
+
+
+    let cwd = path.resolve(this.kernel.homedir, "prototype")
+    let prototype_paths = (await glob('**/pinokio.js', { cwd }))
     let prototype_dir = path.resolve(this.kernel.homedir, "prototype")
-    let prototypes = await fs.promises.readdir(prototype_dir, { withFileTypes: true })
-    prototypes = prototypes.filter(d => d.isDirectory()).map(d => d.name);
-    console.log({ prototypes })
     this.items = []
     this.kv = {}
-    for(let proto of prototypes) {
-      let pinokiojs = path.resolve(prototype_dir, proto, "pinokio.js")
+    for(let prototype_path of prototype_paths) {
+      let proto = path.dirname(prototype_path)
+      let pinokiojs = path.resolve(prototype_dir, prototype_path)
       let config = await this.kernel.require(pinokiojs)
-      if (config && config.type === "prototype") {
+      if (config && config.create && typeof config.create === "function") {
         if (config.icon) {
           config.icon = "/prototype/" + proto + "/" + config.icon
         } else {

package/kernel/router/common.js

@@ -1,50 +1,59 @@
-class Common {
+const Processor = require('./processor')
+class Common extends Processor {
   constructor (router) {
+    super()
     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 }],
-          "headers": {
-            "request": {
-              "set": {
-                "Origin": ["http://127.0.0.1:11434"],
-                "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"]
-              }
-            }
+    let handler = [{
+      "handler": "reverse_proxy",
+      "upstreams": [{ "dial": dial }],
+      "headers": {
+        "request": {
+          "set": {
+//            "Origin": ["http://127.0.0.1:11434"],
+            "X-Forwarded-Proto": ["https"],
+            "X-Forwarded-Host": ["{http.request.host}"]
           }
         },
-        //{
-        //  "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"]
-        //    }
-        //  }
-        //}
-      ]
+        "response": {
+          "set": {
+            "Access-Control-Allow-Origin": ["*"],
+            "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+            "Access-Control-Allow-Headers": ["*"],
+            "Vary": ["Origin"]
+          }
+        }
+      }
+    },
+    //{
+    //  "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)
+    let override_handler = this.router.custom_routers[String(parsed_dial.port)]
+    if (override_handler) {
+      handler = override_handler
+    }
+    this.router.config.apps.http.servers.main.routes.push({
+      "match": [{ "host": [match] }],
+      "handle": handler
     })
     this.router.add({ host, dial, match })
   }

package/kernel/router/connector.js

@@ -1,5 +1,7 @@
-class Connector {
+const Processor = require('./processor')
+class Connector extends Processor {
   constructor(router) {
+    super()
     this.router = router
   }
   handle ({ match, connector, dial, }) {
@@ -9,34 +11,29 @@ class Connector {
     let listener_pointer = connector.host + ":PORT_PLACEHOLDER_" + connector_name
     let port_placeholder = "PORT_PLACEHOLDER_" + connector_name
 //    console.log("CONNECTING", { listener, dial, listener_pointer, match })
-    if(!this.router.config.apps.http.servers[connector_name]) {
-      this.router.config.apps.http.servers[connector_name] = {
-        "listen": [listener],
-        "routes": [{
-          "handle": [
-            {
-              "handler": "reverse_proxy",
-              "upstreams": [{ "dial": dial }],
-              "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"],
-                    //"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"]
-                  }
-                }
-              }
-            },
+
+    let handler = [{
+      "handler": "reverse_proxy",
+      "upstreams": [{ "dial": dial }],
+      "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"],
+            //"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"]
+          }
+        }
+      }
 //            {
 //              "handler": "headers",
 //              "request": {
@@ -54,7 +51,18 @@ class Connector {
 //                }
 //              }
 //            }
-          ]
+    }]
+    // if the dial port has been overridden by router.custom_routers, use that instead
+    let parsed_dial = this.parse_ip(dial)
+    let override_handler = this.router.custom_routers[String(parsed_dial.port)]
+    if (override_handler) {
+      handler = override_handler
+    }
+    if(!this.router.config.apps.http.servers[connector_name]) {
+      this.router.config.apps.http.servers[connector_name] = {
+        "listen": [listener],
+        "routes": [{
+          "handle": handler
         }]
       }
     }

package/kernel/router/index.js

@@ -1,5 +1,6 @@
 const axios = require('axios')
 const path = require('path')
+const { glob, sync, hasMagic } = require('glob-gitignore')
 const Util = require('../util')
 const LocalhostHomeRouter = require('./localhost_home_router')
 const LocalhostVariableRouter = require('./localhost_variable_router')
@@ -28,6 +29,47 @@ class Router {
     this.mapping = {}
     this.port_mapping = {}   // 127.0.0.1 => 192.168,..
     this.local_network_mapping = {}
+    this.custom_routers = {}
+  }
+  async init() {
+    console.log("router.init")
+    // if ~/pinokio/network doesn't exist, clone
+    let exists = await this.kernel.exists("network/system")
+    if (!exists) {
+      console.log("network doesn't exist. cloning...")
+      await fs.promises.mkdir(this.kernel.path("network"), { recursive: true }).catch((e) => { })
+      await this.kernel.exec({
+        message: "git clone https://github.com/peanutcocktail/network system",
+        path: this.kernel.path("network")
+      }, (e) => {
+        process.stdout.write(e.raw)
+      })
+    }
+
+
+    let cwd = path.resolve(this.kernel.homedir, "network")
+    let router_paths = (await glob('**/*.json', { cwd }))
+    let router_dir = path.resolve(this.kernel.homedir, "network")
+
+
+    // create a custom_map that maps port to custom router declarations
+    /*
+      custom_routers = {
+        PORT1: <caddy handler>,
+        PORT2: <caddy handler>,
+        ...
+      }
+    */
+    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]
+      }
+    }
   }
   async add({ host, match, dial }) {
     if (!this._mapping[host]) {
@@ -219,14 +261,16 @@ class Router {
     if (JSON.stringify(this.config) === JSON.stringify(this.old_config)) {
 //      console.log("config hasn't updated")
     } else {
-      console.log("caddy 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("caddy config has updated", this.config)
+      try {
+        let response = await axios.post('http://127.0.0.1:2019/load', this.config, {
+          headers: { 'Content-Type': 'application/json' }
+        })
+        console.log("Caddy Response", { response })
+        this.old_config = this.config
+      } catch (e) {
         console.log("EEEEEEEEEEEEE", e.message)
-      })
-//      console.log("Caddy Response", { response })
-      this.old_config = this.config
+      }
     }
   }
 

package/kernel/router/peer_port_router.js

@@ -9,9 +9,10 @@ class PeerPortRouter extends Processor {
   }
   handle(peer) {
     let https_domains_mapping = this.router.info[peer.host]
+    console.log({ https_domains_mapping })
     for(let dial in https_domains_mapping) {
+      console.log({ dial })
       let parsed_dial = this.parse_ip(dial)
-
       if (parsed_dial.host !== peer.host) {
         // ONLY connect for 127.0.0.1 or localhost
         // DO NOT connect if it's the actual host => because it will keep creating proxies forever recursively. only need to create proxies for localhost
@@ -40,8 +41,6 @@ class PeerPortRouter extends Processor {
           })
         }
       }
-
-
     }
   }
 }

package/package.json

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