pinokiod 3.8.10 → 3.8.12

package/LICENSE

@@ -1,7 +0,0 @@
-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/index.js

@@ -588,6 +588,8 @@ class Api {
     // 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)
 
     let memory = {
@@ -601,6 +603,7 @@ class Api {
       uri: request.uri,
       cwd,
       self: script,
+      port,
       ...this.kernel.vars,
     }
 

package/kernel/api/input/index.js

@@ -1,5 +1,7 @@
 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/script/index.js

@@ -1,6 +1,7 @@
 const path = require('path')
 class Script {
   async start(req, ondata, kernel) {
+    console.log(">>>>>>>>> script.start", req)
     let res = await this.run(req, ondata, kernel)
     return res
   }
@@ -43,6 +44,7 @@ class Script {
     */
     // if already running, print that it's already running
     let id = kernel.api.filePath(req.params.uri, req.cwd)
+    console.log({ id , uri: req.params.uri, cwd: req.cwd })
     if (kernel.api.running[id]) {
       let msg = `${req.params.uri} already running. Continuing...\r\n`
       ondata({ raw: msg })

package/kernel/bin/caddy.js

@@ -0,0 +1,381 @@
+const axios = require('axios')
+const selfsigned = require('selfsigned')
+const fs = require('fs')
+
+class Caddy {
+  cmd() {
+    if (this.kernel.platform === "win32") {
+      return "caddy"
+    } else {
+      return "caddy nss"
+    }
+  }
+  async running() {
+    try {
+      let response = await axios.get('http://localhost:2019/config')
+      return true
+    } catch (e) {
+      return false
+    }
+  }
+  async start() {
+    let running = await this.running()
+    console.log("Running", running)
+    if (running) {
+      return
+    } 
+    let installed = await this.installed()
+    console.log("Caddy Installed?", installed)
+    if (installed) {
+      let resolved
+      await new Promise((resolve, reject) => {
+        this.kernel.exec({
+          message: `caddy run --watch`,
+          path: this.kernel.homedir,
+          kill: [{
+            message: "caddy stop"
+          }]
+        }, (e) => {
+          console.log("[CADDY] " + e.cleaned)
+          if (!resolved) {
+            if (/endpoint started/i.test(e.cleaned)) {
+              console.log("######### match")
+              resolved = true
+              resolve()
+            }
+          }
+        })
+      })
+    }
+    const config = {
+      "apps": {
+        "http": {
+          "servers": {
+            "main": {
+              "listen": [":443"],
+              "routes": [
+                {
+                  "match": [{ "method": ["OPTIONS"] }],
+                  "handle": [
+                    {
+                      "handler": "headers",
+                      "response": {
+                        "set": {
+                          "Access-Control-Allow-Origin": ["*"],
+                          "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                          "Access-Control-Allow-Headers": ["*"]
+                        }
+                      }
+                    },
+                    {
+                      "handler": "static_response",
+                      "status_code": 204
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:42000" }]
+                    },
+                    {
+                      "handler": "headers",
+                      "response": {
+                        "set": {
+                          "Access-Control-Allow-Origin": ["*"],
+                          "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                          "Access-Control-Allow-Headers": ["*"]
+                        }
+                      }
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["l.pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:1234" }]
+                    },
+                    {
+                      "handler": "headers",
+                      "response": {
+                        "set": {
+                          "Access-Control-Allow-Origin": ["*"],
+                          "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                          "Access-Control-Allow-Headers": ["*"]
+                        }
+                      }
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["o.pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:11434" }]
+                    },
+                    {
+                      "handler": "headers",
+                      "response": {
+                        "set": {
+                          "Access-Control-Allow-Origin": ["*"],
+                          "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                          "Access-Control-Allow-Headers": ["*"]
+                        }
+                      }
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["b.pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:7861" }]
+                    },
+                    {
+                      "handler": "headers",
+                      "response": {
+                        "set": {
+                          "Access-Control-Allow-Origin": ["*"],
+                          "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                          "Access-Control-Allow-Headers": ["*"]
+                        }
+                      }
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["c.pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:7862" }]
+                    },
+                    {
+                      "handler": "headers",
+                      "response": {
+                        "set": {
+                          "Access-Control-Allow-Origin": ["*"],
+                          "Access-Control-Allow-Methods": ["GET, POST, OPTIONS, PUT, DELETE"],
+                          "Access-Control-Allow-Headers": ["*"]
+                        }
+                      }
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        }
+      }
+    }
+
+    const config2 = {
+      "apps": {
+        "http": {
+          "servers": {
+            "main": {
+              "listen": [":443"],
+              //"listen": [":80"],
+              "handle_response": [
+                {
+                  "handler": "headers",
+                  "headers": {
+                    "Access-Control-Allow-Origin": ["*"],
+                    "Access-Control-Allow-Methods": ["GET", "POST", "OPTIONS", "PUT", "DELETE"],
+                    "Access-Control-Allow-Headers": ["*"]
+                  }
+                }
+              ],
+              "routes": [
+                {
+                  "match": [{ "method": ["OPTIONS"] }],
+                  "handle": [
+                    {
+                      "handler": "static_response",
+                      "headers": {
+                        "Access-Control-Allow-Origin": ["*"],
+                        "Access-Control-Allow-Methods": ["GET", "POST", "OPTIONS", "PUT", "DELETE"],
+                        "Access-Control-Allow-Headers": ["*"]
+                      },
+                      "status_code": 204
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:42000" }]
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["l.pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:1234" }]
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["a.pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:7860" }]
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["b.pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:7861" }]
+                    }
+                  ]
+                },
+                {
+                  "match": [{ "host": ["c.pinokio.localhost"] }],
+                  "handle": [
+                    {
+                      "handler": "reverse_proxy",
+                      "upstreams": [{ "dial": "localhost:7862" }]
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        },
+//        "tls": {
+//          "automation": {
+//            "policies": [
+//              {
+//                "subjects": [
+//                  "pinokio.localhost",
+//                  "a.pinokio.localhost",
+//                  "b.pinokio.localhost",
+//                  "c.pinokio.localhost"
+//                ],
+//                "issuers": [
+//                  {
+//                    "module": "internal"
+//                  }
+//                ]
+//              }
+//            ]
+//          }
+//        }
+      }
+    }
+
+
+
+
+    console.log("Make request to caddy", config)
+    let response = await axios.post('http://127.0.0.1:2019/load', config, {
+      headers: { 'Content-Type': 'application/json' }
+    }).catch((e) => {
+      console.log("EEEEEEEEEEEEE", e)
+    })
+    console.log("Caddy Response", { response })
+  }
+  async install(req, ondata, kernel, id) {
+    await this.kernel.bin.exec({
+      message: [
+        "conda clean -y --all",
+        `conda install -y -c conda-forge ${this.cmd()}`
+      ]
+    }, ondata)
+    let resolved
+    await new Promise((resolve, reject) => {
+      this.kernel.exec({
+        message: `caddy run --watch`,
+        path: this.kernel.homedir,
+        kill: [{
+          message: "caddy stop"
+        }]
+      }, (e) => {
+        resolve()
+        console.log("[CADDY] " + e.cleaned)
+        if (!resolved) {
+          if (/endpoint started/i.test(e.cleaned)) {
+            console.log("######### match")
+            resolved = true
+            resolve()
+          }
+        }
+      })
+    })
+    console.log("req", req)
+    ondata({
+      title: "Password",
+      description: "Enter your system password to add the HTTPS certificate",
+      form: [{
+        type: "password",
+        autofocus: true,
+        key: "password",
+        placeholder: "System password",
+      }]
+    }, "input")
+    console.log("Wait until", id)
+    let response = await this.kernel.api.wait(id)
+    console.log({ response })
+    if (this.kernel.ploatform === "win32") {
+      await this.kernel.exec({
+        message: `caddy trust`,
+        path: this.kernel.homedir
+      }, (e) => {
+        ondata(e)
+  //      console.log(e)
+  //        if (/Caddy Local Authority/i.test(e.cleaned)) {
+  //          trusted = true
+  //        }
+      })
+    } else {
+      await this.kernel.exec({
+        message: `echo ${response.password} | sudo -S caddy trust`,
+        path: this.kernel.homedir
+      }, (e) => {
+  //        ondata(e)
+  //      console.log(e)
+  //        if (/Caddy Local Authority/i.test(e.cleaned)) {
+  //          trusted = true
+  //        }
+      })
+    }
+    console.log("FINISHED")
+  }
+  async installed() {
+//    let e = true
+    let e = await this.kernel.exists(this.kernel.path("cache/XDG_DATA_HOME/caddy/pki/authorities/local/root.crt"))
+//    let exists = await this.kernel.exists(this.kernel.path("cache/XDG_DATA_HOME/caddy/certificates/local/pinokio.localhost/pinokio.localhost.crt"))
+//    let exists2 = await this.kernel.exists(this.kernel.path("cache/XDG_DATA_HOME/caddy/certificates/local/pinokio.localhost/pinokio.localhost.key"))
+//    if (exists && exists2) {
+    console.log("checking installed", e)
+    if (e) {
+      if (this.kernel.platform === "win32") {
+        return this.kernel.bin.installed.conda.has("caddy")
+      } else {
+        return this.kernel.bin.installed.conda.has("caddy") && this.kernel.bin.installed.conda.has("nss")
+      }
+    } else {
+      return false
+    }
+  }
+  async uninstall(req, ondata) {
+    await this.kernel.bin.exec({
+      message: `conda remove ${this.cmd()}`,
+    }, ondata)
+  }
+}
+module.exports = Caddy

package/kernel/bin/cloudflared.js

@@ -1,5 +1,6 @@
 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,6 +4,7 @@ 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",
@@ -250,11 +251,18 @@ 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 ["zip", "uv", "node", "huggingface", "gxx", "git", "ffmpeg", "caddy"].includes(m.name)
+    }).map((m) => {
+      return m.mod.cmd()
+    }).join(" ")
+    console.log("To install", { mods })
 
     let cmds = [
       //"conda clean -y --index-cache",
       "conda clean -y --all",
-      "conda install -y -c conda-forge sqlite=3.47.2",
+      //"conda install -y -c conda-forge sqlite=3.47.2",
+      `conda install -y -c conda-forge sqlite=3.47.2 ${mods}`,
 
 //      `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,20 +6,12 @@ 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({
@@ -27,20 +19,12 @@ 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,17 +3,15 @@ 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 ffmpeg=5.1.2",
-        "conda install -y -c conda-forge ffmpeg"
+        `conda install -y -c conda-forge ${this.cmd()}`
       ]
-//      conda: {
-//        name: "base",
-//        activate: "minimal"
-//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/git.js

@@ -4,35 +4,34 @@ const fetch = require('cross-fetch')
 const { rimraf } = require('rimraf')
 const path = require("path")
 class Git {
+  cmd() {
+    return "git git-lfs gh"
+  }
   async install(req, ondata) {
     await this.kernel.bin.exec({
       message: [
         "conda clean -y --all",
-        "conda install --no-shortcuts -y -c conda-forge git git-lfs"
+        `conda install -y -c conda-forge ${this.cmd()}`
       ]
-//      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
-        )
-      }
-    }
+//    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() {
-    return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git")
+    return this.kernel.bin.installed.conda && this.kernel.bin.installed.conda.has("git") && this.kernel.bin.installed.conda.has("gh")
   }
   async uninstall(req, ondata) {
-    await this.kernel.bin.exec({ message: "conda remove git" }, ondata)
+    await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
   }
   env() {
 //    if (this.kernel.platform === 'win32') {

package/kernel/bin/gxx.js

@@ -1,15 +1,17 @@
 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 'gxx<12'"
+        `conda install -y -c conda-forge ${this.cmd()}`
       ]
-//      conda: {
-//        name: "base",
-//        activate: "minimal"
-//      }
     }, ondata)
   }
   async installed() {

package/kernel/bin/huggingface.js

@@ -1,14 +1,13 @@
 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 huggingface_hub"
+        `conda install -y -c conda-forge ${this.cmd()}`
       ]
-//      conda: {
-//        name: "base",
-//        activate: "minimal"
-//      }
     }, ondata)
   }
   async installed() {