pinokiod 3.51.0 → 3.53.0

package/kernel/gitconfig_template

@@ -13,4 +13,6 @@
   name = pinokio
   email = pinokio
 [init]
-	defaultBranch = main
+  defaultBranch = main
+[push]
+  autoSetupRemote = true

package/kernel/index.js

@@ -366,6 +366,10 @@ class Kernel {
     await this.peer.check(this)
     return this.peer.active
   }
+  async peer_active() {
+    await this.peer.check(this)
+    return this.peer.peer_active
+  }
   async network_installed() {
     let installed = await this.bin.check_installed({ name: "caddy" })
     return installed
@@ -386,61 +390,79 @@ class Kernel {
   }
   async refresh(notify_peers) {
     const ts = Date.now()
-    let network_active = await this.network_active()
-    if (!network_active) {
-      return
-    }
-    let network_running = await this.network_running()
-    if (network_running) {
-      let ts = Date.now()
-      if (this.processes.refreshing) {
-        // process list refreshing. try again later
-        return
-      }
 
+    await this.peer.check(this)
+
+    if (this.peer.peer_active) {
       // 1. get the process list
       await this.processes.refresh()
 
       // 2. refresh peer info to reflect the proc info
       //await this.peer.refresh()
       await this.peer.refresh_host(this.peer.host)
+      
+    }
 
-      // 3. load custom routers from ~/pinokio/network
-      await this.router.init()
 
-      // 4. set current local host router info
-      await this.router.local()
+//    let network_active = await this.network_active()
+//    if (!network_active) {
+//      return
+//    }
 
-      // 7. update remote router
-      await this.router.remote()
+    if (this.peer.https_active) {
+      let network_running = await this.network_running()
+      if (network_running) {
+        let ts = Date.now()
+        if (this.processes.refreshing) {
+          // process list refreshing. try again later
+          return
+        }
 
-      await this.router.static()
+  //      // 1. get the process list
+  //      await this.processes.refresh()
+  //
+  //      // 2. refresh peer info to reflect the proc info
+  //      //await this.peer.refresh()
+  //      console.log("peer refresh_host")
+  //      await this.peer.refresh_host(this.peer.host)
 
-      await this.router.custom_domain()
+        // 3. load custom routers from ~/pinokio/network
+        await this.router.init()
 
+        // 4. set current local host router info
+        await this.router.local()
 
-      this.router.fallback()
+        // 7. update remote router
+        await this.router.remote()
 
-      // 8. update caddy config
-      await this.router.update()
+        await this.router.static()
+
+        await this.router.custom_domain()
+
+
+        this.router.fallback()
+
+        // 8. update caddy config
+        await this.router.update()
 
-      // 6. tell peers to refresh
-      let changed
-      let new_config = JSON.stringify(await this.peer.current_host())
-      if (this.old_config !== new_config) {
-        console.log("Proc config has changed. update router.")
-        changed = true
-      } else {
-//        console.log("Proc config is the same")
-        changed = false
-      }
-      this.old_config = new_config
-      if (changed) {
-        await this.peer.notify_refresh()
       }
-      // 9. announce self to the peer network
-      this.peer.announce()
     }
+    // 6. tell peers to refresh
+    let changed
+    let new_config = JSON.stringify(await this.peer.current_host())
+    if (this.old_config !== new_config) {
+      console.log("Proc config has changed. update router.")
+      changed = true
+    } else {
+//        console.log("Proc config is the same")
+      changed = false
+    }
+    this.old_config = new_config
+    if (changed) {
+      await this.peer.notify_refresh()
+    }
+    // 9. announce self to the peer network
+    this.peer.announce()
   }
   async clearLog(group) {
     let relativePath = path.relative(this.homedir, group)
@@ -879,11 +901,11 @@ class Kernel {
 //      let contents = await fs.promises.readdir(this.homedir)
       //await this.bin.init()
       let ts = Date.now()
-      this.git.index(this).then(() => {
-        //console.log(this.git.mapping)
-      })
       this.bin.init().then(() => {
         if (this.homedir) {
+          this.git.index(this).then(() => {
+            //console.log(this.git.mapping)
+          })
           this.shell.init().then(async () => {
             this.bin.check({
               bin: this.bin.preset("ai"),
@@ -990,8 +1012,8 @@ class Kernel {
         if (this.refresh_interval) {
           clearInterval(this.refresh_interval)
         }
-        let network_active = await this.network_active()
-        if (network_active) {
+        //let network_active = await this.network_active()
+        //if (network_active) {
           this.refresh_interval = setInterval(() => {
             if (this.server_running) {
               this.refresh(true)    
@@ -999,7 +1021,7 @@ class Kernel {
               console.log("server not running yet. retry network refresh in 5 secs")
             }
           }, 5000)
-        }
+        //}
 
       }
 

package/kernel/peer.js

@@ -40,8 +40,8 @@ class PeerDiscovery {
   }
   async check(kernel) {
     let env = await Environment.get(kernel.homedir, kernel)
-    //let peer_active = true
-    let peer_active = false
+    let peer_active = true
+    //let peer_active = false
     if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="1" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="true")) {
     //if (env && env.PINOKIO_NETWORK_ACTIVE && (env.PINOKIO_NETWORK_ACTIVE==="0" || env.PINOKIO_NETWORK_ACTIVE.toLowerCase()==="false")) {
       peer_active = true
@@ -54,10 +54,14 @@ class PeerDiscovery {
       //https_active = false 
     }
 //    console.log("kernel.refresh", { active, notify_peers })
-    this.name = os.userInfo().username
+
+    //this.name = os.userInfo().username
+    this.name = "p" + this.host.split(".").pop()
     if (env && env.PINOKIO_NETWORK_NAME && env.PINOKIO_NETWORK_NAME.length > 0) {
       this.name = env.PINOKIO_NETWORK_NAME
     }
+    this.peer_active = peer_active
+    this.https_active = https_active
     if (peer_active && https_active) {
       this.active = true
     } else {
@@ -77,7 +81,8 @@ class PeerDiscovery {
 //      this.active = true
 //    }
 
-    if (this.active) {
+    //if (this.active) {
+    if (this.peer_active) {
       // Listen for incoming pings
       this.socket = dgram.createSocket('udp4');
       this.socket.on('message', (msg, rinfo) => {
@@ -319,8 +324,8 @@ class PeerDiscovery {
       */
       let http_icon = null
       let https_icon = null
-      let http_href = null
-      let https_href = null
+      let https_href = `https://pinokio.${this.name}.localhost/p/${folder}`
+      let http_href = `http://${this.host}:42000/p/${folder}`
       let app_href = null
       if (meta && !meta.init_required) {
         if (meta.title) {
@@ -330,8 +335,6 @@ class PeerDiscovery {
             https_icon = `https://pinokio.${this.name}.localhost/asset/api/${folder}/${meta.iconpath}`
           }
           //https_href = `https://${folder}.${this.name}.localhost`
-          https_href = `https://pinokio.${this.name}.localhost/p/${folder}`
-          http_href = `http://${this.host}:42000/p/${folder}`
           app_href = `https://${folder}.${this.name}.localhost`
           installed.push({
             folder,
@@ -342,8 +345,18 @@ class PeerDiscovery {
             http_href,
             ...meta 
           })
+          continue
         }
       }
+
+      installed.push({
+        folder,
+        https_href,
+        http_href,
+        ...meta 
+      })
+
+
     }
     return installed
   }

package/kernel/router/index.js

@@ -217,16 +217,16 @@ class Router {
   }
 
   async static() {
-    this.localhost_static_router.handle()
-    for(let host in this.kernel.peer.info) {
-      let info = this.kernel.peer.info[host]
-      if (info.rewrite_mapping) {
-        for(let name in info.rewrite_mapping) {
-          this.peer_static_router.handle(info.rewrite_mapping[name])
-        }
-      }
-    }
-    this.mapping = this._mapping
+//    this.localhost_static_router.handle()
+//    for(let host in this.kernel.peer.info) {
+//      let info = this.kernel.peer.info[host]
+//      if (info.rewrite_mapping) {
+//        for(let name in info.rewrite_mapping) {
+//          this.peer_static_router.handle(info.rewrite_mapping[name])
+//        }
+//      }
+//    }
+//    this.mapping = this._mapping
   }
 
   // set local config

package/kernel/router/localhost_static_router.js

@@ -12,6 +12,7 @@ class LocalhostStaticRouter extends Processor {
     this.rewriter = new Rewriter(router)
   }
   handle () {
+    console.log("LOCALHOST STATIC ROUTER")
     let configs = []
     for(let api_name in this.router.kernel.pinokio_configs) {
       let config = this.router.kernel.pinokio_configs[api_name]
@@ -41,11 +42,13 @@ class LocalhostStaticRouter extends Processor {
             let local_dial = `${this.router.default_host}:${this.router.default_port}`
             let peer_dial = `${this.router.kernel.peer.host}:${this.router.default_port}`
             let rewrite = `/asset/api/${api_name}`
+            console.log("LOCALHOST REWRITE HANDLE", { rewrite, localhost_match, local_dial })
             this.rewriter.handle({
               route: rewrite,
               match: [localhost_match],
               dial: local_dial,
             })
+            console.log("LOCALHOST REWRITE HANDLE", { rewrite, peer_match, peer_dial })
             this.rewriter.handle({
               route: rewrite,
               match: [peer_match],

package/kernel/router/peer_static_router.js

@@ -30,6 +30,7 @@ class PeerStaticRouter extends Processor {
         rewrite: /asset/api/test
         match: test.x.localhost
     */ 
+    console.log("PEER STATIC ROUTER", rewrite_mapping)
     let url = new URL("http://" + rewrite_mapping.external_ip)
     let dial = url.host
     let rewrite = url.pathname

package/kernel/scripts/git/create

@@ -3,9 +3,8 @@
     "method": "shell.run",
     "params": {
       "path": "{{args.cwd}}",
-      "input": true,
       "message": [
-        "gh repo create"
+        "gh repo create {{args.name}} --{{args.visibility}} --source {{args.cwd}}"
       ]
     }
   }]

package/kernel/scripts/git/push

@@ -5,7 +5,7 @@
       "chain": "*",
       "path": "{{args.cwd}}",
       "message": [
-        "git push"
+        "git push -u"
       ]
     }
   }]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.51.0",
+  "version": "3.53.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -13,8 +13,10 @@
     "@homebridge/node-pty-prebuilt-multiarch": "0.12.0-beta.5",
     "@xterm/headless": "^5.5.0",
     "7zip-min-win-asar-support": "^1.4.4",
+    "accepts": "^1.3.8",
     "async-retry": "^1.3.3",
     "axios": "^1.4.0",
+    "batch": "^0.6.1",
     "clear-module": "^4.1.2",
     "compressing": "^1.10.0",
     "cookie-parser": "^1.4.6",
@@ -27,6 +29,7 @@
     "dotenv": "^16.4.5",
     "ejs": "^3.1.9",
     "eol": "^0.9.1",
+    "escape-html": "^1.0.3",
     "express": "^4.18.2",
     "express-http-proxy-cp": "^2.0.3",
     "express-session": "^1.17.3",
@@ -38,6 +41,7 @@
     "glob-gitignore": "^1.0.14",
     "go-get-folder-size": "^0.5.5",
     "gray-matter": "^4.0.3",
+    "http-errors": "^2.0.0",
     "http-proxy": "^1.18.1",
     "http-proxy-middleware": "^3.0.0",
     "http-terminator": "^3.2.0",
@@ -59,6 +63,7 @@
     "node-notifier": "^10.0.1",
     "normalize-path": "^3.0.0",
     "p-limit": "^3.1.0",
+    "parseurl": "^1.3.3",
     "pdrive": "^0.0.27",
     "portfinder-cp": "^1.0.34",
     "proxy-agent": "^6.5.0",
@@ -67,7 +72,6 @@
     "rimraf": "^5.0.0",
     "sanitize-filename": "^1.6.3",
     "semver": "^7.5.4",
-    "serve-index": "^1.9.1",
     "shell-path": "^2.0.0",
     "sudo-prompt-programfiles-x86": "^9.2.10",
     "symlink-dir": "^5.2.1",