pinokiod 3.18.2 → 3.18.3

package/kernel/index.js

@@ -354,6 +354,8 @@ class Kernel {
       await this.router.remote()
 //      console.timeEnd("> 7. Router Remote"+ts)
 
+      await this.router.custom_domain()
+
       // 8. update caddy config
 //      console.time("> 8. Router Update"+ts)
       await this.router.update()

package/kernel/router/custom_domain_router.js

@@ -0,0 +1,29 @@
+const path = require('path')
+const Common = require('./common')
+const Processor = require('./processor')
+class CustomDomainRouter extends Processor {
+  constructor(router) {
+    super()
+    this.router = router
+    this.common = new Common(router)
+  }
+  handle (peer) {
+    console.log("CustomDomainRouter", peer)
+    for(let domain in this.router.custom_domains) {
+      let port = this.router.custom_domains[domain]
+      this.common.handle({
+        match: `${domain}.localhost`,
+        dial: `127.0.0.1:${port}`,
+        host: this.router.kernel.peer.host,
+      })
+      /*
+      this.common.handle({
+        match: `${domain}.${peer.name}.localhost`,
+        dial: `${peer.host}:${port"127.0.0.1",
+        host: this.router.kernel.peer.host,
+      })
+      */
+    }
+  }
+}
+module.exports = CustomDomainRouter

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 CustomDomainRouter = require('./custom_domain_router')
 const Environment = require("../environment")
 class Router {
   constructor(kernel) {
@@ -20,6 +21,7 @@ class Router {
     this.peer_variable_router = new PeerVariableRouter(this)
     this.peer_port_router = new PeerPortRouter(this)
     this.peer_peer_router = new PeerPeerRouter(this)
+    this.custom_domain_router = new CustomDomainRouter(this)
     this.default_prefix = "pinokio"
     this.default_suffix = "localhost"
     this.default_match = this.default_prefix + "." + this.default_suffix
@@ -55,18 +57,41 @@ class Router {
 
     // create a custom_map that maps port to custom router declarations
     /*
+
       custom_routers = {
-        PORT1: <caddy handler>,
-        PORT2: <caddy handler>,
+        ports: {
+          PORT1: <caddy handler>,
+          PORT2: <caddy handler>,
+        }
+        ...
+      }
+
+      custom_domains = {
+        domains: {
+          NAME1: PORT1,
+          NAME2: PORT2,
+          ...
+        }
         ...
       }
+
     */
     this.custom_routers = {}
+    this.custom_domains = {}
     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)
-      for(let port in config) {
-        this.custom_routers[port] = config[port]
+      if (config.ports) {
+        let ports = config.ports
+        for(let key in ports) {
+          this.custom_routers[key] = ports[key]
+        }
+      }
+      if (config.domains) {
+        let domains = config.domains
+        for(let key in domains) {
+          this.custom_domains[key] = domains[key]
+        }
       }
     }
 
@@ -181,6 +206,7 @@ class Router {
     if (this.kernel.peer.active) {
       for(let host in this.kernel.peer.info) {
         let peer = this.kernel.peer.info[host]
+        console.log(">>>>>>>>>>>>>>>>PEER", peer)
         if (peer.host === this.kernel.peer.host) {
           this.peer_home_router.handle(peer)
           this.peer_variable_router.handle(peer)
@@ -204,6 +230,14 @@ class Router {
     this.mapping = this._mapping
     this.info = this._info()
   }
+  async custom_domain() {
+    for(let host in this.kernel.peer.info) {
+      let peer = this.kernel.peer.info[host]
+      this.custom_domain_router.handle(peer)
+    }
+    //await this.fill()
+    this.mapping = this._mapping
+  }
 
   // update caddy config
   async update() {

package/package.json

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

package/server/index.js

@@ -2490,12 +2490,15 @@ class Server {
         await fse.remove(p)
         console.log(`[DONE] reset ${p}`)
 
-        let p2 = path.resolve(home, "prototype")
+        let p2 = path.resolve(home, "prototype/system")
         await fse.remove(p2)
 
         let p3 = path.resolve(home, "plugin")
         await fse.remove(p3)
 
+        let p4 = path.resolve(home, "network/system")
+        await fse.remove(p4)
+
         let gitconfig = path.resolve(home, "gitconfig")
         await fse.remove(gitconfig)
         

package/server/public/electron.css

@@ -26,7 +26,10 @@ aside {
   cursor: auto !important;
 }
 header.grabbable {
+/*
   padding: 32px 10px 0 !important;
+  */
+  padding: 22px 10px 0 !important;
 }
 /*
 header {