pinokiod 0.1.31 → 0.1.33

package/kernel/api/index.js

@@ -381,6 +381,8 @@ class Api {
   }
   async step (request, rawrpc, input, i, total) {
 
+    console.log("STEP", { request, rawrpc, input, i, total })
+
     // clear global regular expression object RegExp.lastMatch (memory leak prevention)
     let r = /\s*/g.exec("");
 
@@ -795,6 +797,7 @@ class Api {
       // API Call
 
       request.path = this.resolvePath(this.userdir, request.uri)
+      console.log("#PROCESS", { request, userdir: this.userdir })
       let { cwd, script } = await this.resolveScript(request.path)
       request.cwd = cwd
 
@@ -880,8 +883,10 @@ class Api {
       filename = path.parse(scriptpath).base
     }
 
+
     // get the core script
     let script = (await this.loader.load(scriptpath)).resolved
+    console.log("##### ", { scriptpath, script })
 
     // if the sccript is a function, instantiate first
     if (typeof script === "function") {

package/kernel/api/key/index.js

@@ -0,0 +1,26 @@
+/*
+# 1. key.set => pops up key + password input
+{
+  "method": "key.set"
+}
+
+# 2. key.get => pops up key + password input
+# 2.1. Publick key/val
+{
+  "method": "key.get"
+}
+*/
+const fs = require('fs')
+const { createStore } = require('key-store')
+class Key {
+  async set(req, ondata, kernel) {
+    ondata(req.params, "key.set")
+    let { key, password } = await kernel.api.wait(req.parent.path)
+  }
+  async get(req, ondata, kernel) {
+    ondata(req.params, "key.get")
+    let { key, password } = await kernel.api.wait(req.parent.path)
+    return response
+  }
+}
+module.exports = Key

package/kernel/index.js

@@ -11,6 +11,7 @@ const Bin = require('./bin')
 const Api = require("./api")
 const Template = require('./template')
 const Shells = require("./shells")
+const Key = require("./key")
 const Config = require("./pinokio.json")
 const VARS = {
   pip: {
@@ -26,7 +27,7 @@ class Kernel {
     this.store = store
     this.arch = os.arch()
     this.platform = os.platform()
-
+    this.key = new Key()
   }
   resumeprocess(uri) {
     let proc = this.procs[uri]
@@ -174,6 +175,9 @@ class Kernel {
     }
     console.log("this.vars", this.vars)
 
+//    let keyfile = path.resolve(this.homedir, "keys.json")
+//    await this.key.init(keyfile)
+
 //    let home = this.store.get("home")
 //    if (home) {
 //      this.homedir = home

package/kernel/key.js

@@ -0,0 +1,43 @@
+const { createStore } = require('key-store')
+class Key {
+  async init(filePath) {
+    const saveKeys = (data) => {
+      return fs.promises.writeFile(filePath, JSON.stringify(data, null, 2), 'utf8')
+    }
+    const readKeys = async () => {
+      try {
+        let s = await fs.promises.readFile(filePath, "utf8")
+        return JSON.parse(s)
+      } catch (e) {
+        return {}
+      }
+    }
+    let keys = await readKeys()
+
+    this.store = await createStore(saveKeys, keys)
+  }
+  keys() {
+    return this.store.getKeyIDs()
+  }
+  get(key, password) {
+    if (password) {
+      return this.store.getPrivateKeyData(key, password)
+    } else {
+      return this.store.getPublicKeyData(key)
+    }
+  }
+  set(key, val, password) {
+    if (password) {
+      console.log({ key, val, password})
+      return this.store.saveKey(key, password, String(val))
+    } else {
+      console.log({ key, val})
+      //return this.store.savePublicKeyData(key, String(val))
+      return this.store.saveKey(key, "", "", String(val))
+    }
+  }
+  del(key) {
+    this.store.removeKey(key)
+  }
+}
+module.exports = Key

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -32,6 +32,7 @@
     "http-terminator": "^3.2.0",
     "isomorphic-git": "^1.23.0",
     "jsonpath-plus": "^7.2.0",
+    "key-store": "^1.2.0",
     "localtunnel": "^2.0.2",
     "lodash": "^4.17.21",
     "marked": "^5.0.1",

package/server/index.js

@@ -23,11 +23,13 @@ const multer = require('multer');
 const localtunnel = require('localtunnel');
 
 
+
 const Socket = require('./socket')
 const Kernel = require("../kernel")
 const packagejson = require("../package.json")
 class Server {
   constructor(config) {
+    this.tabs = {}
     this.agent = config.agent
     this.port = config.port
     this.kernel = new Kernel(config.store)
@@ -169,7 +171,8 @@ class Server {
     }
 
     // check if it's a folder or a file
-    let p = "/api"
+    let p = "/api"    // run mode
+    let _p = "/_api"   // edit mode
     let paths = [{
       name: '<i class="fa-solid fa-house"></i>',
       path: "/",
@@ -337,6 +340,7 @@ class Server {
         val: this.theme,
         options: ["light", "dark"]
       }]
+      console.log("agent", this.agent)
       res.render("settings", {
         version: this.version,
         logo: this.logo,
@@ -480,6 +484,11 @@ class Server {
         let template
         template = "fullscreen_editor"
 
+        if (req.query && req.query.mode === "source") {
+          template = "editor"
+        }
+
+
 // Deprecate source view and form view => Everything is full screen by default
 //        if (req.query && req.query.mode === "source") {
 //          if (req.query && req.query.fullscreen) {
@@ -681,6 +690,16 @@ class Server {
 //          })
 //        }
         console.log("mem", mem)
+        console.log("originalUrl", req.originalUrl)
+        let edu = new URL("http://localhost" + req.originalUrl)
+        edu.searchParams.set("mode", "source")
+        let editorUrl = edu.pathname + edu.search
+        console.log("editorUrl", editorUrl)
+        console.log("req.query", req.query)
+
+
+
+
         const result = {
           error,
           memory: mem,
@@ -688,7 +707,8 @@ class Server {
           logo: this.logo,
           theme: this.theme,
           //run: (req.query && req.query.run ? true : false),
-          run: true,    // run mode by default
+          //run: true,    // run mode by default
+          run: (req.query && req.query.mode === "source" ? false : true),
           stop: (req.query && req.query.stop ? true : false),
           pinokioPath,
           runnable,
@@ -709,6 +729,8 @@ class Server {
           install_required,
           //current: encodeURIComponent(req.originalUrl),
           current: req.originalUrl,
+          editorUrl,
+          execUrl: "~" + req.originalUrl.replace(/^\/_api/, "\/api")
         }
         console.log("RESULT", result)
 
@@ -936,6 +958,12 @@ class Server {
       // items
 
 
+      console.log("ITEMS", items)
+
+
+      let U = `${_p}/${pathComponents.join("/")}`
+      console.log("*******", { filepath, pathComponents, U })
+
 
       res.render("index", {
         error: error,
@@ -956,43 +984,45 @@ class Server {
         notRunning,
         readme,
         filepath,
-//        items: items.map((x) => {
-//          //let name = (x.name.startsWith("0x") ? Buffer.from(x.name.slice(2), "hex").toString() : x.name)
-//          let name
-//          let description
-//          let icon
-//          let uri
-//          if (meta) {
-//            let m = meta[x.name]
-//            name = (m && m.title ? m.title : x.name)
-//            description = (m && m.description ? m.description : "")
-//            if (m && m.icon) {
-//              icon = m.icon
-//            } else {
-//              icon = null
-//            }
-//            uri = x.name
-//          } else {
-//            if (x.isDirectory()) {
-//              icon = "fa-solid fa-folder"
-//            } else {
-//              icon = "fa-regular fa-file"
-//            }
-//            name = x.name
-//            description = ""
-//          }
-//          return {
-//            icon,
-//            menu: x.menu,
-//            //icon: (x.isDirectory() ? "fa-solid fa-folder" : "fa-regular fa-file"),
-//            name,
-//            uri,
-//            //description: x.path,
-//            description,
-//            url: p + "/" + x.name,
-//            browser_url: "/pinokio/browser/" + x.name
-//          }
-//        }),
+        items: items.map((x) => {
+          //let name = (x.name.startsWith("0x") ? Buffer.from(x.name.slice(2), "hex").toString() : x.name)
+          let name
+          let description
+          let icon
+          let uri
+          if (meta) {
+            let m = meta[x.name]
+            name = (m && m.title ? m.title : x.name)
+            description = (m && m.description ? m.description : "")
+            if (m && m.icon) {
+              icon = m.icon
+            } else {
+              icon = null
+            }
+            uri = x.name
+          } else {
+            if (x.isDirectory()) {
+              icon = "fa-solid fa-folder"
+            } else {
+              icon = "fa-regular fa-file"
+            }
+            name = x.name
+            description = ""
+          }
+          return {
+            icon,
+            menu: x.menu,
+            //icon: (x.isDirectory() ? "fa-solid fa-folder" : "fa-regular fa-file"),
+            name,
+            uri,
+            //description: x.path,
+            description,
+            //url: p + "/" + x.name,
+//            url: _p + "/" + x.name,
+            url: `${U}/${x.name}`,
+            browser_url: "/pinokio/browser/" + x.name
+          }
+        }),
       })
     }
   }
@@ -1585,6 +1615,15 @@ class Server {
         res.status(404).send(e.message);
       }
     })
+    this.app.get("/_api/*", async (req, res) => {
+      let pathComponents = req.params[0].split("/")
+      req.query.mode = "source"
+      try {
+        await this.render(req, res, pathComponents)
+      } catch (e) {
+        res.status(404).send(e.message)
+      }
+    })
     this.app.get("/api/*", async (req, res) => {
       let pathComponents = req.params[0].split("/")
       try {
@@ -1660,6 +1699,10 @@ class Server {
         res.json({ error: e.message })
       }
     })
+    this.app.post("/pinokio/tabs", async (req, res) => {
+      this.tabs[req.body.name] = req.body.tabs
+      res.json({ success: true })
+    })
     this.app.get("/pinokio/browser/:name", async (req, res) => {
       let name = req.params.name
       let app_path = this.kernel.path("api", name, "pinokio.js")
@@ -1689,12 +1732,14 @@ class Server {
         memory: this.kernel.memory,
         sidebar: "/pinokio/sidebar/" + name,
         name,
+        tabs: (this.tabs[name] || []),
         config,
 //        sidebar_url: "/pinokio/sidebar/" + name,
         home: req.originalUrl,
 //        paths,
         theme: this.theme,
         agent: this.agent,
+        src: "/_api/" + name,
         rawpath
       })
     })

package/server/public/modalinput.js

@@ -4,6 +4,8 @@ const ModalInput = async (params) => {
     title,
     type: "modal" (default) |"notify"
     form: [{
+      type,
+      items,
       key,
       title,
       description,
@@ -21,6 +23,13 @@ const ModalInput = async (params) => {
       let input
       if (type === 'textarea') {
         input = `<textarea oninput="autoExpand(this)" data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}"></textarea>`
+      } else if (type === 'select') {
+        if (field.items && Array.isArray(field.items)) {
+          let items = field.items.map((item) => {
+            return `<option value="${item}">${item}</option>`
+          }).join("")
+          input = `<select>${items}</select>`
+        }
       } else {
         input = `<input type='${type}' data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}">`
       }

package/server/public/style.css

@@ -784,6 +784,9 @@ body.dark .line {
 }
 body.dark .line.selected {
   background: rgba(0,0,0, 0.2);
+/*
+  border-left: 6px solid white;
+  */
 }
 body.dark .line:hover {
   background: rgba(0,0,0, 0.2);
@@ -792,8 +795,10 @@ body.dark .line:hover {
   background: rgba(200,0,0, 0.04);
 }
 .line.selected {
-  border-left: 6px solid gold;
-  background: rgba(0,0,250, 0.03);
+  background: rgba(0,0,100, 0.03);
+  /*
+  border-left: 6px solid black;
+  */
 }
 .line {
   text-decoration: none;
@@ -824,9 +829,11 @@ body.dark a.line {
 a.line {
   color: var(--light-color);
 }
+/*
 body.dark .line i {
   color: var(--dark-link-color);
 }
+*/
 .line .title i {
 /*
   color: #54aeff;
@@ -959,7 +966,10 @@ button {
   cursor: pointer;
 }
 body.dark .btn {
+/*
   color: var(--dark-btn-color);
+  */
+  color: white;
   background: var(--dark-btn-bg);
 }
 .btn {
@@ -1279,7 +1289,10 @@ b {
   background: royalblue;
 }
 body.dark #new-window {
+/*
   color: var(--dark-btn-color);
+  */
+  color: white;
 }
 #new-window {
   padding: 10px;
@@ -1289,7 +1302,10 @@ body.dark #new-window {
   color: var(--light-color);
 }
 body.dark .btn2 {
+/*
   color: var(--dark-btn-color);
+  */
+  color: white;
 }
 .btn2:hover {
   background: rgba(0,0,0,0.06);
@@ -1357,7 +1373,7 @@ body.dark .header-label {
   top: 0;
   padding: 10px;
   /*
-  border-top: 5px solid rgba(0,0,0,0.04);
+  border-top: 2px solid rgba(0,0,0,0.04);
   */
 }
 
@@ -1367,17 +1383,46 @@ nav.error-message {
   color: rgba(0,0,0,0.7);
   font-weight: bold;
 }
+.not-running-apps {
+}
 /*
 .running-apps {
+  background: rgba(0,0,100, 0.03);
   background: rgba(255,215, 0, 0.2);
 }
 */
+/*
+body.dark .running-apps {
+  border-left: 6px solid gold;
+}
+*/
+.running-apps {
+  border-left: 10px solid gold;
+/*
+  background: rgba(255,215,0,0.03);
+  */
+}
+/*
+.running-apps .description {
+  color: yellowgreen;
+}
+.running-apps .title {
+  color: yellowgreen;
+}
+*/
 .running-apps .spinner {
   width: 50px;
   text-align: center;
+  font-size: 20px;
+  /*
+  color: yellowgreen;
+  */
 }
 body.dark header .home {
+  /*
   color: var(--dark-btn-color);
+  */
+  color: white;
 }
 header .home {
   color: var(--light-color);