pinokiod 3.51.0 → 3.52.0

package/3

@@ -0,0 +1 @@
+ack: No regular expression found.

package/kernel/gitconfig_template

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

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.52.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",

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')
@@ -310,6 +310,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 +358,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")
@@ -612,11 +620,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) {
@@ -2916,14 +2927,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 +2954,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 +3630,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) => {

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' });
   }
 }

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>