pinokiod 2.15.19 → 2.15.21

package/kernel/api/fs/index.js

@@ -38,6 +38,23 @@ class FS {
     let data = await fs.promises.readFile(filepath, req.params.encoding)
     return data
   }
+  async cat(req, ondata, kernel) {
+    /*
+      params := {
+        path: <filepath>,
+      }
+    */
+    let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
+    let filepath = kernel.api.filePath(req.params.path, cwd)
+    //let filepath = path.resolve(cwd, req.params.path)
+    let data = await fs.promises.readFile(filepath, "utf8")
+    ondata({
+      raw: data.replace(/\n/g, "\r\n")
+    })
+    ondata({
+      raw: "\r\n"
+    })
+  }
 //  async unzip(req, ondata, kernel) {
 //    /*
 //    params := {
@@ -67,7 +84,6 @@ class FS {
   }
 
   async link(req, ondata, kernel) {
-    console.log("FS.link", req)
     let response = await this.share(req, ondata, kernel)
     return response
   }
@@ -277,7 +293,7 @@ class FS {
           }
 
 
-          
+          // fs.link should overwrite by default.
           if (req.params.options) {
             d.options = req.params.options 
           } else {
@@ -311,7 +327,6 @@ class FS {
           ondata({
             raw: "\r\nLINKING DRIVES:\r\n" + JSON.stringify(d, null, 2).replace(/\n/g, "\r\n")
           })
-          console.log("CREATE", JSON.stringify(d, null, 2))
           await drive.create(d)
           ondata({
             raw: "Done.\r\n"

package/kernel/api/index.js

@@ -56,14 +56,12 @@ class Api {
     this.checkProxy({ uri, name })
     // if the name exists, throw error
     // if the uri exists, throw error
-    console.log("lproxy start", uri, options)
     let proxy_uri = await this.lproxy.start(uri, options)
     if (this.proxies[scriptPath]) {
       this.proxies[scriptPath].push({ target: uri, proxy: proxy_uri, name})
     } else {
       this.proxies[scriptPath] = [{ target: uri, proxy: proxy_uri, name }]
     }
-    console.log("this.proxies", JSON.stringify(this.proxies, null, 2))
     return {
       target: uri,
       proxy: proxy_uri
@@ -92,7 +90,6 @@ class Api {
         })
       }
     }
-    console.log("this.proxies", JSON.stringify(this.proxies, null, 2))
   }
   async init() {
     if (this.kernel.homedir) {
@@ -519,7 +516,6 @@ class Api {
       mods.push(r)
     }
     let mod = _.zipObjectDeep(paths, mods)
-    console.log("MOD", mod)
     return mod
 
   }
@@ -559,7 +555,7 @@ class Api {
     // get fully resolved env
     let env = await Environment.get2(request.path, this.kernel)
     // set template
-    this.kernel.template.update({ env })
+    this.kernel.template.update({ envs: env, env })
 
     // render until `{{ }}` pattern does not exist
     // 1. render once
@@ -567,6 +563,7 @@ class Api {
     let pass = 0;
     while(true) {
       rpc = this.kernel.template.render(rpc, memory)
+      let test = this.kernel.template.istemplate(rpc)
       if (this.kernel.template.istemplate(rpc)) {
         pass++;
         if (pass >= 4) {
@@ -1215,7 +1212,6 @@ class Api {
 //      }
 //    }
 //    script = Object.assign(script, merge)
-    console.log("SCRIPT", script)
 
     return { cwd, script }
   }

package/kernel/api/json/index.js

@@ -0,0 +1,112 @@
+const path = require('path')
+const set = require("../set")
+const rm = require("../rm")
+class J {
+  async get(req, ondata, kernel) {
+    /*
+      // set local variables from json
+      req := {
+        "method": "json.get",
+        "params": {
+          "<key1>": <filepath1>,
+          "<key1>": <filepath2>
+        }
+      }
+    */
+    let params = {}
+    for(let key in req.params) {
+      let filepath = path.resolve(req.cwd, req.params[key])
+      if (filepath.endsWith(".json")) {
+        let j = (await kernel.loader.load(filepath)).resolved
+        params[key] = j
+      }
+    }
+    let converted = Object.assign({}, req, {
+      params: {
+        local: params
+      }
+    })
+    await set(converted, ondata, kernel)
+  }
+  async set(req, ondata, kernel) {
+    /*
+      req := {
+        "method": "json.set",
+        "params": {
+          "index.json": {
+            <key>: <val>,
+            <key>: <val>,
+          },
+          "data/models.json": {
+            <key>: <val>,
+            <key>: <val>,
+          }
+        }
+      }
+
+      equivalent to:
+
+      req := {
+        "method": "set",
+        "params": {
+          "json": {
+            "index.json": {
+              <key>: <val>,
+              <key>: <val>,
+            },
+            "data/models.json": {
+              <key>: <val>,
+              <key>: <val>,
+            }
+          }
+        }
+      }
+    */
+    let converted = Object.assign({}, req, {
+      params: {
+        json: req.params
+      }
+    })
+    let res = await set(converted, ondata, kernel)
+    return res
+  }
+  async rm(req, ondata, kernel) {
+    /*
+      req := {
+        "method": "json.rm",
+        "params": {
+          "index.json": {
+            "abc": "def"
+          },
+          "data/models.json": {
+            [ "attr", "a.b.c" ]
+          }
+        }
+      }
+
+      equivalent to:
+
+      req := {
+        "method": "rm",
+        "params": {
+          "json": {
+            "index.json": {
+              "abc": "def"
+            },
+            "data/models.json": {
+              [ "attr", "a.b.c" ]
+            }
+          }
+        }
+      }
+    */
+    let converted = Object.assign({}, req, {
+      params: {
+        json: req.params
+      }
+    })
+    let res = await rm(converted, ondata, kernel)
+    return res
+  }
+}
+module.exports = J

package/kernel/api/local/index.js

@@ -25,7 +25,6 @@ class Local {
     return res
   }
   async set(req, ondata, kernel) {
-    console.log("SET", req)
     /*
       req := {
         "method": "local.set",
@@ -96,7 +95,6 @@ class Local {
             }
           }
           const p = new Proxy()
-          console.log("> proxy", req)
           await p.start(req, ondata, kernel)
         }
       }

package/kernel/api/rm/index.js

@@ -3,8 +3,31 @@ const fs = require('fs')
 const rm = (old, keys) => {
   for (let key of keys) {
     try {
-      let fun = new Function('old', 'key', `delete old.${key}; return old;`);
-      old = fun(old, key);
+//      let fun = new Function('old', 'key', `delete old.${key}; return old;`);
+//      old = fun(old, key);
+      let keypath = String(key).split(".")
+      // multiple keys. check if that path exists.
+      // if not, create the path
+      let next = old
+      for(let i=0; i<keypath.length; i++) {
+        if (i === keypath.length-1) {
+          // last
+          let path_key = keypath[i]
+          if (/^[0-9]+$/.test(path_key)) {
+            if (Array.isArray(next)) {
+              // array index
+              let index = Number(path_key)
+              next.splice(index, 1)
+            }
+          } else {
+            // key
+            delete next[path_key]
+          }
+        } else {
+          const key = keypath[i];
+          next = next[key];
+        }
+      }
     } catch (e) {
     }
   }
@@ -52,8 +75,12 @@ module.exports = async (req, ondata, kernel) => {
   }
   */
 
-  if (req.params.self) {
-    for(let relative_filepath in req.params.self) {
+  let self = req.params.self
+  if (!self) {
+    self = req.params.json
+  }
+  if (self) {
+    for(let relative_filepath in self) {
       let filepath = path.resolve(req.cwd, relative_filepath)
       // ensure that the filepath is .json
       if (filepath.endsWith(".json")) {
@@ -66,7 +93,7 @@ module.exports = async (req, ondata, kernel) => {
           let folder = path.dirname(filepath)
           await fs.promises.mkdir(folder, { recursive: true }).catch((e) => { })
         }
-        let kv = req.params.self[relative_filepath]
+        let kv = self[relative_filepath]
 
 
         old = rm(old, kv)

package/kernel/api/set/index.js

@@ -1,42 +1,64 @@
 const path = require('path')
 const fs = require('fs')
 const set = async (old, kv, kernel, req, ondata) => {
-  for (let key in kv) {
-    try {
-      if (key.startsWith('[')) {
-        // array
-        let fun = new Function(
-          'old',
-          'key',
-          'val',
-          `old${key} = val; return old;`
-        );
-        old = fun(old, key, kv[key]);
-      } else {
-        let fun = new Function(
-          'old',
-          'key',
-          'val',
-          //`old.${key} = val; return old;`
-          `old["${key}"] = val; return old;`
-        );
-        old = fun(old, key, kv[key]);
-      }
+  if (Array.isArray(kv)) {
+    old = kv
+  } else {
+    for (let key in kv) {
+      try {
+        if (key.startsWith('[')) {
+          // array
+          let fun = new Function(
+            'old',
+            'key',
+            'val',
+            `old${key} = val; return old;`
+          );
+          old = fun(old, key, kv[key]);
+        } else {
+
+          let keypath = key.split(".")
+          // multiple keys. check if that path exists.
+          // if not, create the path
+          let next = old
+          for(let i=0; i<keypath.length; i++) {
+            if (i === keypath.length-1) {
+              // last
+              next[keypath[i]] = kv[key]
+            } else {
+              const key = keypath[i];
+              if (!(key in next)) {
+                next[key] = {}
+              }
+              next = next[key];
+            }
+          }
 
+  //        let fun = new Function(
+  //          'old',
+  //          'key',
+  //          'val',
+  //          //`old.${key} = val; return old;`
+  //          `old["${key}"] = val; return old;`
+  //        );
+  //        old = fun(old, key, kv[key]);
+        }
 
-//      // reserved variable: "url"
-//      if (key === "url") {
-//        // start proxy
-//        ondata({
-//          raw: `\r\n[Start proxy] ${kv[key]}\r\n`
-//        })
-//        let response = await kernel.api.startProxy(req.parent.path, kv[key], "Shared")
-//        console.log("Response", response)
-//        ondata({
-//          raw: `Proxy Started ${JSON.stringify(response)}\r\n`
-//        })
-//      }
-    } catch (e) {
+
+  //      // reserved variable: "url"
+  //      if (key === "url") {
+  //        // start proxy
+  //        ondata({
+  //          raw: `\r\n[Start proxy] ${kv[key]}\r\n`
+  //        })
+  //        let response = await kernel.api.startProxy(req.parent.path, kv[key], "Shared")
+  //        console.log("Response", response)
+  //        ondata({
+  //          raw: `Proxy Started ${JSON.stringify(response)}\r\n`
+  //        })
+  //      }
+      } catch (e) {
+      }
     }
   }
   return old
@@ -89,7 +111,6 @@ module.exports = async (req, ondata, kernel) => {
 //      }
     }
   }
-
   // set self => save to the file
 
 /*
@@ -110,8 +131,12 @@ module.exports = async (req, ondata, kernel) => {
   }
   */
 
-  if (req.params.self) {
-    for(let relative_filepath in req.params.self) {
+  let self = req.params.self
+  if (!self) {
+    self = req.params.json
+  }
+  if (self) {
+    for(let relative_filepath in self) {
       let filepath = path.resolve(req.cwd, relative_filepath)
       // ensure that the filepath is .json
       if (filepath.endsWith(".json")) {
@@ -124,7 +149,7 @@ module.exports = async (req, ondata, kernel) => {
           let folder = path.dirname(filepath)
           await fs.promises.mkdir(folder, { recursive: true }).catch((e) => { })
         }
-        let kv = req.params.self[relative_filepath]
+        let kv = self[relative_filepath]
 
         old = await set(old, kv, kernel, req, ondata)
 

package/kernel/bin/index.js

@@ -207,7 +207,6 @@ class Bin {
       })
       let pipconfig_path = path.resolve(this.kernel.homedir, "pipconfig")
       let pipconfig_exists = await this.kernel.api.exists(pipconfig_path)
-      console.log("pipconfig exists?", { pipconfig_path, pipconfig_exists })
       // if not, create one
       if (!pipconfig_exists) {
         const pipconfigStr = `[global]
@@ -371,9 +370,6 @@ class Bin {
 //    console.log("metaFiles", metaFiles)
 //    console.log("paths", paths)
 
-    console.log("this.installed", this.installed)
-
-
 
     this.installed_initialized = true
 

package/kernel/bin/uv.js

@@ -0,0 +1,20 @@
+const fs = require('fs')
+const fetch = require('cross-fetch')
+const { rimraf } = require('rimraf')
+const decompress = require('decompress');
+class UV {
+  async install(req, ondata) {
+    await this.kernel.bin.exec({
+      message: "conda install -y -c conda-forge uv",
+    }, ondata)
+  }
+  async installed() {
+    return this.kernel.bin.installed.conda.has("uv")
+  }
+  async uninstall(req, ondata) {
+    await this.kernel.bin.exec({
+      message: "conda remove uv",
+    }, ondata)
+  }
+}
+module.exports = UV

package/kernel/index.js

@@ -1,5 +1,4 @@
 const fs = require('fs')
-//const {JSONPath} = require('jsonpath-plus');
 const os = require("os")
 const jsdom = require("jsdom");
 const path = require('path')
@@ -359,6 +358,8 @@ class Kernel {
           system,
           platform: this.platform,
           arch: this.arch,
+          env: this.envs,
+          envs: this.envs,
           proxy: (port) => {
             return this.api.get_proxy_url("/proxy", port)
           },

package/kernel/shell.js

@@ -403,9 +403,9 @@ class Shell {
         })
         cb()
       }, 1)
-      term.onExit((result) => {
-        console.log("onExit", { result })
-      })
+//      term.onExit((result) => {
+//        console.log("onExit", { result })
+//      })
       term.onData((data) => {
         if (ready) {
           queue.push(data)
@@ -670,9 +670,9 @@ class Shell {
               this.queue.push(data)
             }
           });
-          this.ptyProcess.onExit((result) => {
-            console.log("onExit", result)
-          })
+//          this.ptyProcess.onExit((result) => {
+//            console.log("onExit", result)
+//          })
         }
       } catch (e) {
         console.log("** Error", e)

package/kernel/shells.js

@@ -41,8 +41,16 @@ class Shells {
     }, async (stream) => {
       process.stdout.write(stream.raw)
     })
-    console.log(">>> sh.env =", sh.env)
+
     this.kernel.envs = sh.env
+    // also set the uppercase variables if they're not set
+    for(let key in sh.env) {
+      let up = key.toUpperCase()
+      if (!this.kernel.envs[up]) {
+        this.kernel.envs[up] = sh.env[key]
+      }
+    }
+
   }
   async launch(params, options, ondata) {
     // iterate through all the envs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "2.15.19",
+  "version": "2.15.21",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -35,7 +35,7 @@
     "http-proxy-middleware": "^3.0.0",
     "http-terminator": "^3.2.0",
     "isomorphic-git": "^1.23.0",
-    "jimini": "^0.0.6",
+    "jimini": "^0.0.7",
     "jsdom": "^24.0.0",
     "key-store": "^1.2.0",
     "kleur": "^4.1.5",