pinokiod 3.51.0 → 3.53.0

package/server/index.js

@@ -23,7 +23,7 @@ const fse = require('fs-extra')
 const QRCode = require('qrcode')
 const axios = require('axios')
 const crypto = require('crypto')
-const serveIndex = require('serve-index')
+const serveIndex = require('./serveIndex')
 
 const git = require('isomorphic-git')
 const http = require('isomorphic-git/http/node')
@@ -280,6 +280,52 @@ class Server {
       }
     })
   }
+  async processMenu(name, config) {
+    let cfg = config
+    if (cfg) {
+      if (cfg.menu) {
+        if (typeof cfg.menu === "function") {
+          if (cfg.menu.constructor.name === "AsyncFunction") {
+            cfg.menu = await cfg.menu(this.kernel, this.kernel.info)
+          } else {
+            cfg.menu = cfg.menu(this.kernel, this.kernel.info)
+          }
+        }
+      } else {
+        cfg = await this.renderIndex(name)
+      }
+    } else {
+      cfg = await this.renderIndex(name)
+    }
+    return cfg
+  }
+  async renderIndex(name) {
+    let p = this.kernel.path("api", name)
+    let html_path = path.resolve(p, "index.html")
+    let html_exists = await this.kernel.exists(html_path)
+    console.log({ html_path, html_exists })
+    if (html_exists) {
+      return {
+        title: name, 
+        menu: [{
+          default: true,
+          icon: "fa-solid fa-link",
+          text: "index.html",
+          href: "index.html?raw=true",
+        }]
+      }
+    } else {
+      return {
+        title: name, 
+        menu: [{
+          default: true,
+          icon: "fa-solid fa-link",
+          text: "Project Files",
+          href: `/files/api/${name}`,
+        }]
+      }
+    }
+  }
   async getGit(ref, filepath) {
     let dir = this.kernel.path("api", filepath)
     let branches = await git.listBranches({ fs, dir });
@@ -310,6 +356,14 @@ class Server {
       remote = config["remote \"origin\""].url
     }
 
+    // Get all remotes
+    let remotes = []
+    try {
+      remotes = await git.listRemotes({ fs, dir, verbose: true })
+    } catch (e) {
+      console.log("Remotes error", e)
+    }
+
     let branch = await git.currentBranch({ fs, dir, fullname: false });
 
     const remote2 = await git.getConfig({
@@ -350,7 +404,7 @@ class Server {
         }
       })
     }
-    return { ref, config, remote, connected, log, branch, branches, dir }
+    return { ref, config, remote, remotes, connected, log, branch, branches, dir }
   }
   async init_env(env_dir_path, options) {
     let current = this.kernel.path(env_dir_path, "ENVIRONMENT")
@@ -455,31 +509,21 @@ class Server {
       }
     }
 
-    let menu = config.menu || []
-    try {
-      if (typeof config.menu === "function") {
-        if (config.menu.constructor.name === "AsyncFunction") {
-          config.menu = await config.menu(this.kernel, this.kernel.info)
-        } else {
-          config.menu = config.menu(this.kernel, this.kernel.info)
-        }
-      }
-    } catch (e) {
-      err = e.stack
-      config.menu = []
-    }
-
 
     let uri = this.kernel.path("api")
     try {
       let launcher = await this.kernel.api.launcher(name)
       req.launcher_root = launcher.launcher_root
-      await this.renderMenu(req, uri, name, config, [])
+      config = await this.processMenu(name, config)
     } catch(e) {
       config.menu = []
       err = e.stack
     }
 
+    console.log("renderMenu before", config)
+    await this.renderMenu(req, uri, name, config, [])
+    console.log("renderMenu after", config)
+
     let platform = os.platform()
 
     await Environment.init({ name }, this.kernel)
@@ -612,11 +656,14 @@ class Server {
       theme: this.theme,
       agent: this.agent,
       src: "/_api/" + name,
-      asset: "/asset/api/" + name,
+      //asset: "/asset/api/" + name,
+      asset: "/files/api/" + name,
       logs: "/_api/" + name + "/logs",
       execUrl: "/api/" + name,
       git_monitor_url: `/gitcommit/HEAD/${name}`,
       git_history_url: `/info/git/HEAD/${name}`,
+      git_push_url: `/run/scripts/git/push.json?cwd=${encodeURIComponent(this.kernel.path('api', name))}`,
+      git_create_url: `/run/scripts/git/create.json?cwd=${encodeURIComponent(this.kernel.path('api', name))}`
 //      rawpath,
     }
 //    if (!this.kernel.proto.config) {
@@ -2620,10 +2667,10 @@ class Server {
   getPeers() {
     let list = []
     for(let key in this.kernel.peer.info) {
-      if (key !== this.kernel.peer.host) {
+//      if (key !== this.kernel.peer.host) {
         let info = this.kernel.peer.info[key]
         list.push(info)
-      }
+//      }
     }
     return list
   }
@@ -2916,14 +2963,26 @@ class Server {
         this.kernel.path("web/views"),
         path.resolve(__dirname, "views")
       ])
-      let serve = express.static(this.kernel.homedir, { fallthrough: true })
+      let serve = express.static(this.kernel.homedir, { fallthrough: true, })
+      let serve2 = express.static(this.kernel.homedir, { index: false, fallthrough: true, })
       let http_serve = express.static(this.kernel.homedir, {
         redirect: true,
       })
       let https_serve = express.static(this.kernel.homedir, {
         redirect: false,
       })
-      this.app.use('/asset', serve, serveIndex(this.kernel.homedir, {icons: true, hidden: true}))
+      this.app.use('/asset', serve, serveIndex(this.kernel.homedir, {icons: true, hidden: true, theme: this.theme }))
+//      this.app.use("/asset", async (req, res, next) => {
+//        let asset_path = this.kernel.path(req.path.slice(1), "index.html")
+//        let exists = await this.exists(asset_path)
+//        if (exists) {
+//          return res.sendFile(asset_path)
+//        } else {
+//          let chunks = req.path.slice(1).split("/")
+//          let parent_path = chunks.slice(0, -1).join("/")
+//          res.redirect("/asset/" + parent_path)
+//        }
+//      })
       this.app.use('/asset', (req, res, next) => {
         if (req.path.match(/\.(png|jpg|jpeg|gif|ico|svg)$/)) {
           res.sendFile(path.resolve(__dirname, 'public', 'pinokio-black.png'));
@@ -2931,17 +2990,7 @@ class Server {
           next();
         }
       });
-      this.app.use("/asset", async (req, res, next) => {
-        let asset_path = this.kernel.path(req.path.slice(1), "index.html")
-        let exists = await this.exists(asset_path)
-        if (exists) {
-          return res.sendFile(asset_path)
-        } else {
-          let chunks = req.path.slice(1).split("/")
-          let parent_path = chunks.slice(0, -1).join("/")
-          res.redirect("/asset/" + parent_path)
-        }
-      })
+      this.app.use('/files', serve2, serveIndex(this.kernel.homedir, {icons: true, hidden: true, theme: this.theme }))
     } else {
       this.app.set("views", [
         path.resolve(__dirname, "views")
@@ -3617,7 +3666,19 @@ class Server {
     }))
     this.app.post("/openfs", ex(async (req, res) => {
       //Util.openfs(req.body.path, req.body.mode)
-      Util.openfs(req.body.path, req.body, this.kernel)
+      if (req.body.name) {
+        let filepath = this.kernel.path("api", req.body.name)
+        Util.openfs(filepath, req.body, this.kernel)
+      } else if (req.body.asset_path) {
+        // asset_path : /asset/...
+        // relpath : ...
+        let relpath = req.body.asset_path.split("/").filter((x) => { return x }).slice(1).join("/")
+        let filepath = this.kernel.path(relpath)
+        console.log({ filepath, relpath })
+        Util.openfs(filepath, req.body, this.kernel)
+      } else if (req.body.path) {
+        Util.openfs(req.body.path, req.body, this.kernel)
+      }
       res.json({ success: true })
     }))
     this.app.post("/keys", ex(async (req, res) => {
@@ -5442,60 +5503,20 @@ class Server {
       res.send(html)
     }))
     this.app.get("/pinokio/sidebar/:name", ex(async (req, res) => {
+
+      let uri = this.kernel.path("api")
       let name = req.params.name
       let launcher = await this.kernel.api.launcher(name)
-      let rawpath = "/api/" + name
       let config = launcher.script
-      req.launcher_root = launcher.launcher_root
-      if (config && config.menu) {
-        if (typeof config.menu === "function") {
-          if (config.menu.constructor.name === "AsyncFunction") {
-            config.menu = await config.menu(this.kernel, this.kernel.info)
-          } else {
-            config.menu = config.menu(this.kernel, this.kernel.info)
-          }
-        }
-
-        let uri = this.kernel.path("api")
-        await this.renderMenu(req, uri, name, config, [])
-      } else {
-        // if there is no menu, display all files
-        let p = this.kernel.path("api", name)
-
-        let html_path = path.resolve(p, "index.html")
-        let html_exists = await this.kernel.exists(html_path)
-        if (html_exists) {
-          config = {
-            title: name, 
-            menu: [{
-              default: true,
-              icon: "fa-solid fa-link",
-              text: "index.html",
-              href: "index.html?raw=true",
-            }]
-          }
-        } else {
-          let files = await fs.promises.readdir(p, { withFileTypes: true })
-          files = files.filter((file) => {
-            return file.name.endsWith(".json") || file.name.endsWith(".js")
-          }).filter((file) => {
-            return file.name !== "pinokio.js" && file.name !== "pinokio.json" && file.name !== "pinokio_meta.json"
-          })
-          config = {
-            title: name, 
-            menu: files.map((file) => {
-              return {
-                text: file.name,
-                href: file.name
-              }
-            })
-          }
-        }
-
-        let uri = this.kernel.path("api")
-        await this.renderMenu(req, uri, name, config, [])
+      try {
+        let rawpath = "/api/" + name
+        req.launcher_root = launcher.launcher_root
+        config = await this.processMenu(name, config)
+      } catch(e) {
+        config.menu = []
+        err = e.stack
       }
-
+      await this.renderMenu(req, uri, name, config, [])
 
       ejs.renderFile(path.resolve(__dirname, "views/partials/menu.ejs"), { menu: config.menu }, (err, html) => {
         res.send(html)
@@ -5542,11 +5563,81 @@ class Server {
 //    }))
 
     this.app.get("/info/procs", ex(async (req, res) => {
-      console.time("Refresh")
       await this.kernel.processes.refresh()
-      console.timeEnd("Refresh")
+
+      let info = []
+      for(let item of this.kernel.processes.info) {
+        info.push({
+          online: true,
+          host: {
+            ip: this.kernel.peer.host,
+            local: true,
+            name: this.kernel.peer.name,
+            platform: this.kernel.platform,
+            arch: this.kernel.arch,
+          },
+          ...item,
+        })
+      }
+      // get only the parts not from this peer
+      for(let host in this.kernel.peer.info) {
+        let host_info = this.kernel.peer.info[host]
+        let host_rewrites = host_info.rewrite_mapping
+        for(let key in host_rewrites) {
+          info.push({
+            online: true,
+            host: {
+              ip: host,
+              local: this.kernel.peer.host === host,
+              name: host_info.name,
+              platform: host_info.platform,
+              arch: host_info.arch
+            },
+            name: `[Files] ${host_rewrites[key].name}`,
+            ip: host_rewrites[key].external_ip
+          })
+        }
+        if (this.kernel.peer.host !== host) {
+          let host_routers = host_info.router_info
+          for(let host_router of host_routers) {
+            let ip
+            // the peer sharing works only if external_ip is available (caddy is installed)
+            if (host_router.external_ip) {
+              ip = host_router.external_ip
+            } else {
+              // if caddy is not turned on, set ip as null, so that it suggests turning on peer sharing
+              ip = null
+            }
+            info.push({
+              online: true,
+              host: {
+                ip: host,
+                name: host_info.name,
+                platform: host_info.platform,
+                arch: host_info.arch
+              },
+              name: host_router.title || host_router.name,
+              ip
+            })
+          }
+        }
+
+        for(let app of host_info.installed) {
+          info.push({
+            host: {
+              ip: host,
+              local: this.kernel.peer.host === host,
+              name: host_info.name,
+              platform: host_info.platform,
+              arch: host_info.arch
+            },
+            name: app.title || app.folder,
+            ip: app.http_href.replace("http://", "")
+          })
+        }
+      }
       res.json({
-        info: this.kernel.processes.info
+        info
       })
     }))
 

package/server/public/common.js

@@ -319,7 +319,6 @@ function initTippy() {
       }
     });
   } catch(e) {
-    console.log(e);
   }
 }
 
@@ -331,13 +330,10 @@ function updateTippyPlacement(instance) {
   
   //if (isHeaderElement && isMobileOrMinimized) {
   if (isMinimized) {
-    console.log(">1")
     instance.setProps({ placement: 'right' });
   } else if (isSidebarTab) {
-    console.log(">2")
     instance.setProps({ placement: 'left' });
   } else {
-    console.log(">3")
     instance.setProps({ placement: 'top' });
   }
 }
@@ -481,15 +477,6 @@ document.addEventListener("DOMContentLoaded", () => {
   }
 
 
-  if (document.querySelector(".urlbar")) {
-    document.querySelector(".urlbar").addEventListener("submit", (e) => {
-      debugger
-      e.preventDefault()
-      e.stopPropagation()
-      location.href = "/container?url=" + e.target.querySelector("input[type=url]").value
-    })
-  }
-
   if (document.querySelector("#genlog")) {
     document.querySelector("#genlog").addEventListener("click", (e) => {
       e.preventDefault()

package/server/public/serve/directory.html

@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset='utf-8'> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <title>listing directory {directory}</title>
+    <style>{style}</style>
+    <script>
+      function $(id){
+        var el = 'string' == typeof id
+          ? document.getElementById(id)
+          : id;
+
+        el.on = function(event, fn){
+          if ('content loaded' == event) {
+            event = window.attachEvent ? "load" : "DOMContentLoaded";
+          }
+          el.addEventListener
+            ? el.addEventListener(event, fn, false)
+            : el.attachEvent("on" + event, fn);
+        };
+
+        el.all = function(selector){
+          return $(el.querySelectorAll(selector));
+        };
+
+        el.each = function(fn){
+          for (var i = 0, len = el.length; i < len; ++i) {
+            fn($(el[i]), i);
+          }
+        };
+
+        el.getClasses = function(){
+          return this.getAttribute('class').split(/\s+/);
+        };
+
+        el.addClass = function(name){
+          var classes = this.getAttribute('class');
+          el.setAttribute('class', classes
+            ? classes + ' ' + name
+            : name);
+        };
+
+        el.removeClass = function(name){
+          var classes = this.getClasses().filter(function(curr){
+            return curr != name;
+          });
+          this.setAttribute('class', classes.join(' '));
+        };
+
+        return el;
+      }
+
+      function search() {
+        var str = $('search').value.toLowerCase();
+        var links = $('files').all('a');
+
+        if (str.length > 0) {
+          $('files').addClass("searching")
+        } else {
+          $('files').removeClass("searching")
+        }
+
+        links.each(function(link){
+          var text = link.textContent.toLowerCase();
+
+          if ('..' == text) return;
+          if (str.length && ~text.indexOf(str)) {
+            link.addClass('highlight');
+          } else {
+            link.removeClass('highlight');
+          }
+        });
+      }
+
+      $(window).on('content loaded', function(){
+        $('search').on('keyup', search);
+        $("open").on("click", async (e) => {
+          console.log("location", location)
+          await fetch("/openfs", {
+            method: "post",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              asset_path: location.pathname,              
+              mode: "open",
+            })
+          }).then((res) => {
+            return res.json()
+          })
+        })
+      });
+
+
+    </script>
+  </head>
+  <body class="directory {theme}">
+    <button id='open'>Open File Explorer</button>
+    <input id="search" type="text" placeholder="Search" autocomplete="off" />
+    <div id="wrapper">
+      <h1><a href="/">~</a>{linked-path}</h1>
+      {files}
+    </div>
+  </body>
+</html>