pinokiod 3.8.1532 → 3.8.1534

package/LICENSE

@@ -0,0 +1,7 @@
+Copyright 2023 Pinokio
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/kernel/api/fs/index.js

@@ -75,18 +75,16 @@ class FS {
     /*
       params := {
         path: <filepath>,
-        command: "view(default)|open|<any command in PATH>"
+        mode: "view(default)|open"
       }
       open finder/file explorer at path
     */
     let dirPath = path.resolve(req.cwd, req.params.path)
     ondata({ raw: `\r\nopening path: ${dirPath}\r\n` })
-    if (req.params.command) {
-      Util.openfs(dirPath, req.params, kernel)
-    } else if (req.params.mode) {
-      Util.openfs(dirPath, req.params, kernel)
+    if (req.params.mode) {
+      Util.openfs(dirPath, req.params.mode)
     } else {
-      Util.openfs(dirPath, {}, kernel)
+      Util.openfs(dirPath)
     }
   }
 

package/kernel/api/index.js

@@ -28,21 +28,6 @@ class Api {
     this.child_procs = {}
     this.lproxy = new Lproxy()
   }
-  async meta(name) {
-    let p = this.kernel.path("api", name, "pinokio.js")
-    let pinokio = (await this.kernel.loader.load(p)).resolved
-    let p2 = this.kernel.path("api", name, "pinokio_meta.json")
-    let pinokio2 = (await this.kernel.loader.load(p2)).resolved
-    let p3 = this.kernel.path("api", name, "pinokio.json")
-    let pinokio3 = (await this.kernel.loader.load(p3)).resolved
-    let meta = Object.assign({}, pinokio, pinokio2, pinokio3)
-    meta.iconpath = meta.icon ? this.kernel.path("api", name, meta.icon) : null
-    meta.icon = meta.icon ? `/api/${name}/${meta.icon}?raw=true` : "/pinokio-black.png"
-    meta.path = this.kernel.path("api", name)
-    meta.name = meta.title
-    meta.link = `/pinokio/browser/${name}/browse#n1`
-    return meta
-  }
   get_proxy_url(root, port) {
     if (this.proxies) {
       let proxies = this.proxies[root]
@@ -139,12 +124,16 @@ class Api {
 
     let requestPath = this.filePath(req.params.uri)
 
+
+
     let { cwd, script } = await this.resolveScript(requestPath)
+    console.log("STOP", { script })
     if (script.on) {
       if (script.on.stop) {
         await this.process(script.on.stop) 
       }
     }
+
     // reset modules
     let modpath = this.resolvePath(cwd, req.params.uri)
     console.log("STOP modpath", modpath)
@@ -190,7 +179,6 @@ class Api {
       id: requestPath,
       type: "disconnect"
     })
-    this.kernel.refresh(true)
     return true
   }
   async startScripts() {
@@ -364,20 +352,13 @@ class Api {
     let modpath
     if (matched_repo.length > 0) {
       let repo_uri = matched_repo[0]
-      if (!repo_uri.endsWith(".git")) {
-        repo_uri = repo_uri + ".git"
-      }
 
-      let repopath = this.gitPath[repo_uri]
-      if (uri === repo_uri) {
-        modpath = path.resolve(repopath)
-      } else {
-        let relative_path = uri
-          .replace(repo_uri, "")    // remove the git repo uri
-          .slice(1)                 // remove the leading '/' for relative path
-        modpath = path.resolve(repopath, relative_path)
-      }
+      let relative_path = uri
+        .replace(repo_uri, "")    // remove the git repo uri
+        .slice(1)                 // remove the leading '/' for relative path
 
+      let repopath = this.gitPath[repo_uri]
+      modpath = path.resolve(repopath, relative_path)
     } else {
       //console.log("no matching gitpath")
     }
@@ -445,18 +426,14 @@ class Api {
     let method
     let dirname
     let mod
-    if (req.method && typeof req.method === "function") {
-      modpath = null
-      method = req.method
-      dirname = __dirname
-      mod = null
-    } else if (req.uri) {
+    if (req.uri) {
       modpath = this.resolvePath(cwd, req.uri)
       let m = (await this.loader.load(modpath))
       const stats = await fs.promises.stat(modpath)
       if (!this.child_procs[req.parent.path]) {
         this.child_procs[req.parent.path] = new Set()
       }
+      console.log("SCRIPT RESOLVE METHOD", req)
       if (this.mods[modpath]) {
         // use the cached module if unchanged
         if (String(stats.mtime) === String(this.mods[modpath].updated)) {
@@ -590,19 +567,15 @@ class Api {
 
   }
   async step (request, rawrpc, input, i, total, args) {
+    console.time("STEP INIT")
     await Promise.all([this.init(), this.kernel.update_sysinfo()])
+    console.timeEnd("STEP INIT")
 
     // clear global regular expression object RegExp.lastMatch (memory leak prevention)
     let r = /\s*/g.exec("");
 
-    let port = await this.kernel.port()
-
     let { cwd, script } = await this.resolveScript(request.path)
 
-    if (request.cwd) {
-      cwd = request.cwd
-    }
-
     let memory = {
       script: this.kernel.script,
       input,
@@ -614,7 +587,6 @@ class Api {
       uri: request.uri,
       cwd,
       self: script,
-      port,
       ...this.kernel.vars,
     }
 
@@ -655,6 +627,7 @@ class Api {
         break;
       }
     }
+
     // replace {{{ }}} with {{ }}
     rpc = this.kernel.template.flatten(rpc)
 
@@ -788,7 +761,6 @@ class Api {
                     uri: request.path
                   }
                 })
-                console.log(">>>>>> STOPPED", request)
               }
               return { request, input: null, step: rpc.next, total: script.run.length, args }
             } else {
@@ -1007,7 +979,6 @@ class Api {
                   uri: request.path
                 }
               })
-              console.log("<<<<<< STOPPED", request)
               return { request, input: result, step: rpc.next, total: script.run.length, args }
             }
 
@@ -1085,7 +1056,6 @@ class Api {
             })
           }
         }
-        this.kernel.refresh(true)
       } catch (e) {
         ondata({ raw: e.toString() })
       }
@@ -1151,35 +1121,6 @@ class Api {
       this.process(request, resolve)
     })
   }
-  async get_default(repo_path) {
-    let p = path.resolve(repo_path, "pinokio.js")
-    // call 'process' based on the current status
-    let config = (await this.loader.load(p)).resolved
-    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)
-        }
-      }
-      // find the default item in the menu
-      let running = config.menu.filter((item) => {
-        return item.default
-      })
-      if (running.length > 0) {
-        let r = running[0]
-        if (r.href) {
-          if (r.href.startsWith("http")) {
-            return r.href
-          } else {
-            let href = path.resolve(repo_path, r.href)
-            return href
-          }
-        }
-      }
-    }
-  }
   async process(request, done) {
     /**************************************************************
     *
@@ -1221,66 +1162,43 @@ class Api {
 //    this.kernel.keys = (await this.loader.load(keypath)).resolved
 
     // init shell before running just to make sure the environment variables are fresh
+    console.time("shell.init")
     await this.kernel.shell.init()
+    console.timeEnd("shell.init")
 
     if (request.uri){
-
       this.counter++;
       // API Call
 
       request.path = this.resolvePath(this.userdir, request.uri)
+      let { cwd, script } = await this.resolveScript(request.path)
+      request.cwd = cwd
 
-
-      // if the path is 
-      let relative = path.relative(this.kernel.homedir, request.path)
-      let chunks = relative.split(path.sep)
-      console.log({ chunks })
-      if (chunks.length == 2) {
-        // the script is requesting a uri of the git repo
-        // look for pinokio.js
-        let p = path.resolve(request.path, "pinokio.js")
-        let exists = await this.exists(p)
-        console.log({ p, exists })
-        if (exists) {
-          await this.launch(request, p)
-        } else {
-          this.ondata({
-            id: request.path,
-            type: "error",
-            data: "uri doesn't exist \r\n" + JSON.stringify(request, null, 2)
-          })
-        }
+      if (!script) {
+        this.ondata({
+          id: request.path,
+          type: "error",
+          data: "the endpoint does not exist: " + request.uri,
+        })
       } else {
-        console.log({ request })
-        let { cwd, script } = await this.resolveScript(request.path)
+        // 3. Check if the resolved endpoint has the "run" attribute and it's an array
+        //if (script.run && Array.isArray(script.run)) {
+        if (script.run) {
+
+          this.running[request.path] = true
 
-        if (!script) {
+          this.done[request.path] = done
+
+          this.queue(request, script.run[0], request.input, 0, script.run.length, cwd, request.input)
+
+        } else {
           this.ondata({
             id: request.path,
             type: "error",
-            data: "the endpoint does not exist: " + request.uri,
+            data: "missing attribute: run"
           })
-        } else {
-          // 3. Check if the resolved endpoint has the "run" attribute and it's an array
-          //if (script.run && Array.isArray(script.run)) {
-          if (script.run) {
-
-            this.running[request.path] = true
-
-            this.done[request.path] = done
-
-            this.queue(request, script.run[0], request.input, 0, script.run.length, cwd, request.input)
-
-          } else {
-            this.ondata({
-              id: request.path,
-              type: "error",
-              data: "missing attribute: run"
-            })
-          }
         }
       }
-
     } else if (request.method) {
       let pass = 0;
       while(true) {
@@ -1311,16 +1229,12 @@ class Api {
 
       // Kernel Call
       let resolved = await this.resolveMethod(request)
-      let id = request.id ? request.id : request.method 
-      if (request.id) {
-        this.running[request.id] = true
-      }
       try {
         resolved.dirname = resolved.dirname
         let result = await this.run(resolved.method, request, (stream, type) => {
           this.ondata({
             kernel: true,
-            id,
+            id: request.method,
             type: (type ? type : "stream"),
             data: stream,
             rpc: request,
@@ -1329,7 +1243,7 @@ class Api {
         })
         this.ondata({
           kernel: true,
-          id,
+          id: request.method,
           type: "result",
           data: result,
           rpc: request,

package/kernel/api/input/index.js

@@ -1,7 +1,5 @@
 module.exports = async (req, ondata, kernel) => {
-  // send "input" type event so the frontend triggers a modal
   ondata(req.params, "input")
-  // then, wait until the frontend responds
   let response = await kernel.api.wait(req.parent.path)
   return response
 }

package/kernel/api/web/index.js

@@ -21,11 +21,5 @@ class Web {
     kernel.exposed[app] = req.params.uri
     console.log("kernel.exposed", kernel.exposed)
   }
-  async open(req, ondata, kernel) {
-    ondata(req.params, "browser.open")
-  }
-  async close(req, ondata, kernel) {
-    ondata(req.params, "browser.close")
-  }
 }
 module.exports = Web

package/kernel/bin/cloudflared.js

@@ -1,6 +1,5 @@
 const fs = require('fs')
 class Cloudflared {
-  description = "Cloudflared lets you expose your local apps to the outside world via Cloudflare Tunnel."
   async uninstall(req, ondata) {
     ondata({ raw: "cleaning up\r\n" })
     let bin = this.kernel.bin

package/kernel/bin/conda.js

@@ -4,7 +4,6 @@ const fetch = require('cross-fetch')
 const { glob } = require('glob')
 const semver = require('semver')
 class Conda {
-  description = "Pinokio uses Conda to install various useful programs in an isolated manner."
   urls = {
     darwin: {
       //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_23.5.2-0-MacOSX-x86_64.sh",
@@ -120,7 +119,6 @@ report_errors: false`)
 //  }
   async check() {
     let res = await this.kernel.bin.exec({ message: `conda list` }, (stream) => {
-//      process.stdout.write(stream.raw)
 //        console.log("conda list check", { stream })
     })
 
@@ -178,6 +176,7 @@ report_errors: false`)
         }
       }
     }
+    console.log("> Check", { conda_check, conda })
     this.kernel.bin.installed.conda = conda
     return conda_check.conda && conda_check.mamba && conda_check.sqlite
     //return conda_check.conda && conda_check.mamba
@@ -251,18 +250,11 @@ report_errors: false`)
     // 2. The pinned file says conda-libmamba-solver=24.11.1
     // 3. so after conda update --all, it should be conda-libmamba-solver=24.11.1
 
-    let mods = this.kernel.bin.mods.filter((m) => {
-      return req.dependencies.includes(m.name)
-//      return ["zip", "uv", "node", "huggingface", "gxx", "git", "ffmpeg", "caddy"].includes(m.name)
-    }).map((m) => {
-      return m.mod.cmd()
-    }).join(" ")
-    console.log("Conda dependencies to install", { mods })
 
     let cmds = [
       //"conda clean -y --index-cache",
       "conda clean -y --all",
-      `conda install -y -c conda-forge sqlite=3.47.2 ${mods}`,
+      "conda install -y -c conda-forge sqlite=3.47.2",
 
 //      `conda config --file ${this.kernel.path('condarc')} --set remote_connect_timeout_secs 20`,
 //      `conda config --file ${this.kernel.path('condarc')} --set remote_read_timeout_secs 300`,

package/kernel/bin/cuda.js

@@ -6,12 +6,20 @@ class Cuda {
           "conda clean -y --all",
           "conda install -y cudnn libzlib-wapi -c conda-forge",
         ]
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
       await this.kernel.bin.exec({
         message: [
           "conda clean -y --all",
           "conda install -y cuda -c nvidia/label/cuda-12.1.0",
         ]
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
     } else {
       await this.kernel.bin.exec({
@@ -19,12 +27,20 @@ class Cuda {
           "conda clean -y --all",
           "conda install -y cudnn -c conda-forge",
         ]
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
       await this.kernel.bin.exec({
         message: [
           "conda clean -y --all",
           "conda install -y cuda -c nvidia/label/cuda-12.1.0",
         ]
+//        conda: {
+//          name: "base",
+//          activate: "minimal"
+//        }
       }, ondata)
       if (this.kernel.platform === "linux") {
         await this.kernel.bin.exec({

package/kernel/bin/ffmpeg.js

@@ -3,15 +3,17 @@ const fetch = require('cross-fetch')
 const { rimraf } = require('rimraf')
 const decompress = require('decompress');
 class Ffmpeg {
-  cmd() {
-    return "ffmpeg"
-  }
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
-        `conda install -y -c conda-forge ${this.cmd()}`
+        //"conda install -y -c conda-forge ffmpeg=5.1.2",
+        "conda install -y -c conda-forge ffmpeg"
       ]
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/git.js

@@ -4,69 +4,43 @@ const fetch = require('cross-fetch')
 const { rimraf } = require('rimraf')
 const path = require("path")
 class Git {
-  cmd() {
-    if (this.kernel.platform === "darwin") {
-      return "git git-lfs"
-    } else {
-      return "git git-lfs gh"
-    }
-  }
   async install(req, ondata) {
-    if (this.kernel.platform === "darwin") {
-      await this.kernel.bin.exec({
-        conda: { skip: true },
-        message: "brew install gh",
-      }, ondata)
-    } else {
-      await this.kernel.bin.exec({
-        message: [
-          "conda clean -y --all",
-          `conda install -y -c conda-forge ${this.cmd()}`
-        ]
-      }, ondata)
-    }
-    await fs.promises.mkdir(this.kernel.path("config/gh"), { recursive: true }).catch((e) => { })
-//    if (this.kernel.platform === 'win32') {
-//      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-//      // check if gitconfig exists
-//      let exists = await this.kernel.api.exists(gitconfig_path)
-//      // if not, create one
-//      if (!exists) {
-//        await fs.promises.copyFile(
-//          path.resolve(__dirname, "..", "gitconfig_template"),
-//          gitconfig_path
-//        )
+    await this.kernel.bin.exec({
+      message: [
+        "conda clean -y --all",
+        "conda install --no-shortcuts -y -c conda-forge git git-lfs"
+      ]
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
 //      }
-//    }
+    }, ondata)
+    if (this.kernel.platform === 'win32') {
+      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+      // check if gitconfig exists
+      let exists = await this.kernel.api.exists(gitconfig_path)
+      // if not, create one
+      if (!exists) {
+        await fs.promises.copyFile(
+          path.resolve(__dirname, "..", "gitconfig_template"),
+          gitconfig_path
+        )
+      }
+    }
   }
   async installed() {
-    if (this.kernel.platform === "darwin") {
-      let gh_config_exists = await this.kernel.exists("config/gh")
-      console.log("conda installed", this.kernel.bin.installed.conda)
-      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.brew.has("gh") && gh_config_exists
-    } else {
-      let gh_config_exists = await this.kernel.exists("config/gh")
-      console.log("conda installed", this.kernel.bin.installed.conda)
-      return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh") && gh_config_exists
-    }
+    return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")
   }
   async uninstall(req, ondata) {
-    if (this.kernel.platform === "darwin") {
-      await this.kernel.bin.exec({ message: "conda remove git" }, ondata)
-      await this.kernel.bin.exec({
-        conda: { skip: true },
-        message: "brew uninstall gh",
-      })
-    } else {
-      await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
-    }
+    await this.kernel.bin.exec({ message: "conda remove git" }, ondata)
   }
   env() {
-    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
-    return {
-      GIT_CONFIG_GLOBAL: gitconfig_path,
-      GH_CONFIG_DIR: this.kernel.path("config/gh")
-    }
+//    if (this.kernel.platform === 'win32') {
+      let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+      return {
+        GIT_CONFIG_GLOBAL: gitconfig_path
+      }
+//    }
   }
   async requires() {
     return ["conda"]

package/kernel/bin/gxx.js

@@ -1,17 +1,15 @@
 class GXX {
-  cmd() {
-    if (this.kernel.platform === "linux") {
-      return "'gxx<12'"
-    } else {
-      return ""
-    }
-  }
   async install(req, ondata) {
     await this.kernel.bin.exec({
+      //message: "conda install -y nodejs=22.12.0 -c conda-forge"
       message: [
         "conda clean -y --all",
-        `conda install -y -c conda-forge ${this.cmd()}`
+        "conda install -y -c conda-forge 'gxx<12'"
       ]
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/huggingface.js

@@ -1,13 +1,14 @@
 class Huggingface {
-  cmd() {
-    return "huggingface_hub"
-  }
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
-        `conda install -y -c conda-forge ${this.cmd()}`
+        "conda install -y -c conda-forge huggingface_hub"
       ]
+//      conda: {
+//        name: "base",
+//        activate: "minimal"
+//      }
     }, ondata)
   }
   async installed() {