pinokiod 3.8.11 → 3.8.13

package/server/index.js

@@ -17,6 +17,7 @@ const { fork } = require('child_process');
 const semver = require('semver')
 const fse = require('fs-extra')
 const QRCode = require('qrcode')
+const axios = require('axios')
 
 const git = require('isomorphic-git')
 const http = require('isomorphic-git/http/node')
@@ -799,6 +800,8 @@ class Server {
           name: "node",
         }, {
           name: "ffmpeg",
+        }, {
+          name: "caddy",
 //          type: "conda",
 //          name: "ffmpeg",
 //          args: "-c conda-forge"
@@ -828,15 +831,15 @@ class Server {
           })
         }
         requirements = requirements.concat([{
-          name: "py"
-        }, {
           name: "cloudflared"
-        }, {
-          name: "playwright"
+//        }, {
+//          name: "playwright"
         }, {
           name: "huggingface"
         }, {
           name: "uv"
+        }, {
+          name: "py"
         }])
 //        if (platform === "linux") {
 //          requirements.push({
@@ -971,6 +974,19 @@ class Server {
           let env = await Environment.get2(filepath, this.kernel)
           for(let item of resolved.pre) {
             if (item.env) {
+
+              if (!item.index) {
+                item.index = 0
+              }
+              if (item.key) {
+                const hasProtocol = /^[a-zA-Z][a-zA-Z\d+\-.]*:\/\//.test(item.key);
+                const url = new URL(hasProtocol ? item.key : `https://${item.key}`);
+                item.host = url.host
+                item.val = await this.kernel.kv.get(item.host, item.index)
+              } else {
+                item.host = ""
+              }
+
               if (env[item.env]) {
                 item.val = env[item.env]
               } else {
@@ -989,6 +1005,7 @@ class Server {
           if (platform === "win32") {
             p = p.replace(/\\/g, '\\\\')
           }
+          console.log({ pre_items })
           res.render("required_env_editor", {
             agent: this.agent,
             theme: this.theme,
@@ -2572,6 +2589,66 @@ class Server {
       Util.openfs(req.body.path, req.body, this.kernel)
       res.json({ success: true })
     }))
+    this.app.get("/docs", ex(async (req, res) => {
+      let url = req.query.url
+      const possiblePaths = [
+        '/openapi.json',
+        '/swagger.json',
+        '/v1/openapi.json',
+        '/v1/swagger.json',
+        '/docs/openapi.json',
+        '/api-docs',
+        '/api-docs.json',
+      ];
+      let selected = null
+      if (req.query.url) {
+        const localHosts = ['localhost', '127.0.0.1', '::1'];
+        const urlObj = new URL(req.query.url)
+        const baseOrigins = [urlObj.origin];
+        if (urlObj.hostname === 'localhost' || urlObj.hostname === '::1' || urlObj.hostname.startsWith('127.')) {
+          for (const host of localHosts) {
+            const origin = urlObj.origin.replace(urlObj.hostname, host);
+            if (!baseOrigins.includes(origin)) {
+              baseOrigins.push(origin);
+            }
+          }
+        }
+
+        for (const origin of baseOrigins) {
+          for (const possiblePath of possiblePaths) {
+            try {
+              const url = new URL(possiblePath, origin).href;
+              const res = await axios.get(url, { timeout: 500 });
+              const contentType = res.headers['content-type'];
+              if (contentType?.includes('application/json')) {
+                const json = res.data;
+                if (json.openapi || json.swagger) {
+                  selected = json
+                  break
+                }
+              }
+            } catch (e) {
+              console.log("error", e)
+              // ignore errors
+            }
+          }
+          if (selected) break
+        }
+      }
+      let type = "redoc" // "swaggerui"
+      if (req.query.type) {
+        type = req.query.type
+      }
+      if (selected) {
+        res.render(type, {
+          spec: JSON.stringify(selected)
+        })
+      } else {
+        res.render(type, {
+          spec: null
+        })
+      }
+    }))
     this.app.get("/terminal/:api/:id", ex(async (req, res) => {
       res.render("minterm", {
         theme: this.theme,
@@ -2813,8 +2890,12 @@ class Server {
       let script = this.kernel.proto.kv[req.params.type]
       console.log({ script, body: req.body })
       try {
-        const folder = await script.run(this.kernel, req.body) 
-        res.json({ success: folder })
+        if (script.create) {
+          const folder = await script.create(this.kernel, req.body) 
+          res.json({ success: folder })
+        } else {
+          res.json({ error: "pinokio.js is missing a create function" })
+        }
       } catch (e) {
         res.json({ error: e.message })
       }
@@ -2822,7 +2903,16 @@ class Server {
     this.app.post("/env", ex(async (req, res) => {
       let fullpath = path.resolve(this.kernel.homedir, req.body.filepath, "ENVIRONMENT")
       let updated = req.body.vals
+      let hosts = req.body.hosts
       await Util.update_env(fullpath, updated)
+      // for all environment variables that have hosts, save the key as well
+      // hosts := { env_key: host }
+      for(let env in hosts) {
+        let host = hosts[env]
+        let val = updated[env]
+        console.log({ hosts, updated, host, val })
+        await this.kernel.kv.set(host.value, val, host.index)
+      }
       res.json({})
     }))
     this.app.get("/env", ex(async (req, res) => {
@@ -3372,6 +3462,7 @@ class Server {
       let info = Object.assign({}, this.kernel.i)
       info.launch_complete = this.kernel.launch_complete
       console.log("kernel.launch_complete", this.kernel.launch_complete)
+      console.log({ info })
       delete info.vars
       delete info.shell_env
       delete info.memory
@@ -3753,16 +3844,16 @@ class Server {
         stack: err.stack
       })
     });
-//    process.on('SIGINT', () => {
-//      console.log("SIGINT Event")
-//      if (this.kernel && this.kernel.shell) this.kernel.shell.reset()
-//      process.exit()
-//    })
-//    process.on('SIGTERM', () => {
-//      console.log("SIGTERM Event")
-//      if (this.kernel && this.kernel.shell) this.kernel.shell.reset()
-//      process.exit()
-//    })
+    process.on('SIGINT', () => {
+      console.log("SIGINT Event")
+      if (this.kernel && this.kernel.shell) this.kernel.shell.reset()
+      process.exit()
+    })
+    process.on('SIGTERM', () => {
+      console.log("SIGTERM Event")
+      if (this.kernel && this.kernel.shell) this.kernel.shell.reset()
+      process.exit()
+    })
 //    process.on('exit', () => {
 //      console.log("exit Event")
 //      if (this.kernel && this.kernel.shell) {
@@ -3787,6 +3878,7 @@ class Server {
     })
     console.timeEnd("SERVER START")
 
+
   }
 }
 module.exports = Server

package/server/public/modalinput.js

@@ -20,9 +20,10 @@ const ModalInput = async (params) => {
     title: (params.title || ""),
     html: description + form.map((field) => {
       let type = (field.type ? field.type : "text")
+      let autofocus = (field.autofocus ? "autofocus" : "")
       let input
       if (type === 'textarea') {
-        input = `<textarea oninput="autoExpand(this)" data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}"></textarea>`
+        input = `<textarea ${autofocus} 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) => {
@@ -31,7 +32,7 @@ const ModalInput = async (params) => {
           input = `<select>${items}</select>`
         }
       } else {
-        input = `<input type='${type}' data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}">`
+        input = `<input ${autofocus} type='${type}' data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}">`
       }
       return [
         "<div class='field'>",