pinokiod 1.1.46 → 1.1.48

package/kernel/api/index.js

@@ -33,9 +33,6 @@ class Api {
         if (p.target === config.uri) {
           throw new Error(`A proxy for the uri ${config.uri} already exists`)
         }
-//        if (p.name === config.name) {
-//          throw new Error(`A proxy with the name ${config.name} already exists`)
-//        }
       }
     }
   }
@@ -45,7 +42,6 @@ class Api {
     // if the uri exists, throw error
     console.log("startProxy", { scriptPath, uri, proxies: this.proxies })
     let proxy_uri = await this.lproxy.start(uri, options)
-    console.log({ proxy_uri, uri })
     if (this.proxies[scriptPath]) {
       this.proxies[scriptPath].push({ target: uri, proxy: proxy_uri, name})
     } else {
@@ -62,7 +58,6 @@ class Api {
       // stop all proxies for the script
       if (this.proxies[config.script]) {
         for(let p of this.proxies[config.script]) {
-          console.log("P", p)
           this.stopProxy({ uri: p.target })
         }
       }
@@ -74,7 +69,6 @@ class Api {
       // remove the uri from the proxies array
       for(let scriptPath in this.proxies) {
         let p = this.proxies[scriptPath]
-        console.log("pp", p)
         // iterate through p and find the one whose target matches config.uri
         // and remove it
         this.proxies[scriptPath] = this.proxies[scriptPath].filter((item) => {
@@ -702,7 +696,6 @@ class Api {
             // kill all connected shells
             // if not daemon
             if (script.daemon) {
-              console.log("## DONE")
               this.ondata({
                 id: request.path,
                 type: "start",

package/kernel/api/process/index.js

@@ -124,26 +124,71 @@ class Process {
   async wait (req, ondata, kernel) {
     /*
     params := {
-      <sec>|<min>: <num>
+      sec: <SECONDS>,
+      message: (optional) Description to display while waiting,
+      menu: (optional) menu to display in the modal while waiting,
+//      ok: (optional) <ok button text> (if not specified, no ok button),
+//      cancel: (optional) <cancel button text> (if not specified, no cancel button)
     }
+
+    or 
+
+    params := {
+      min: <MINUTES>,
+      message: (optional) Description to display while waiting,
+      menu: (optional) menu to display in the modal while waiting,
+//      ok: (optional) <ok button text> (if not specified, no ok button),
+//      cancel: (optional) <cancel button text> (if not specified, no cancel button)
+    }
+
+    or
+
+    params := {
+      on: <wait-on condition https://github.com/jeffbski/wait-on>,
+      message: (optional) Description to display while waiting,
+      menu: (optional) menu to display in the modal while waiting,
+//      ok: (optional) <ok button text> (if not specified, no ok button),
+//      cancel: (optional) <cancel button text> (if not specified, no cancel button)
+    }
+
+
+    if 'ok' is pressed before the condition is met, goes to the next step
+    if 'cancel' is pressed before the condition is met, stops the script
+
     */
     let ms 
     if (req.params) {
-      if (req.params.sec) {
-        ms = req.params.sec * 1000
-      } else if (req.params.min) {
-        ms = req.params.min * 60 * 1000
-      }
-      await new Promise((resolve, reject) => {
-        this.resolve = resolve
+      // Display modal
+      if (req.params.sec || req.params.min) {
+        // Wait
+        if (req.params.sec) {
+          ms = req.params.sec * 1000
+        } else if (req.params.min) {
+          ms = req.params.min * 60 * 1000
+        }
+        await new Promise((resolve, reject) => {
+          this.resolve = resolve
 
-        // register the process with the root uri so it can be manually resolved (with this.resolve()) later
-        kernel.procs[req.parent.path] = this
+          // register the process with the root uri so it can be manually resolved (with this.resolve()) later
+          kernel.procs[req.parent.path] = this
 
-        setTimeout(() => {
-          this.resolve()
-        }, ms)
-      })
+          setTimeout(() => {
+            this.resolve()
+          }, ms)
+        })
+      } else if (req.params.on) {
+        // Wait
+        if (req.params.message) {
+          ondata({
+            raw: `\r\nWaiting: ${JSON.stringify(req.params.on)}\r\n`
+          })
+          ondata(req.params, "wait")
+        }
+        console.log("Wait", req.params.on)
+        await waitOn(req.params.on)
+        console.log("Wait finished")
+        ondata(req.params, "wait.end")
+      }
     } else {
       await new Promise((resolve, reject) => {
         this.resolve = resolve

package/kernel/api/proxy/index.js

@@ -17,7 +17,7 @@ class P {
     console.log("proxy.start", { name, uri, o })
     let response = await kernel.api.startProxy(req.parent.path, req.params.uri, req.params.name, o)
     ondata({
-      raw: "Proxy Started"
+      raw: "Proxy Started\r\n"
     })
     return response
   }
@@ -35,7 +35,7 @@ class P {
     })
     kernel.api.stopProxy({ uri: req.params.uri })
     ondata({
-      raw: "Proxy Stopped"
+      raw: "Proxy Stopped\r\n"
     })
   }
 }

package/kernel/shell.js

@@ -191,8 +191,6 @@ class Shell {
     // automatically add self to the shells registry
     this.kernel.shell.add(this)
 
-    console.log("** this.env", this.env)
-
     if (params.sudo) {
       let options = {
         name: "Pinokio",
@@ -465,7 +463,6 @@ class Shell {
     }
   }
   async activate(params) {
-    console.log("activate", params)
     if (params.conda) {
       if (params.conda === "base") {
         // using the base env
@@ -475,7 +472,7 @@ class Shell {
           `conda deactivate`,
           `conda deactivate`,
           `conda activate ${params.conda}`,
-          'pip install --upgrade wheel pip setuptools',
+//          'pip install --upgrade wheel pip setuptools',
         ].concat(params.message)
       } else {
         if (typeof params.conda === "string") {
@@ -489,7 +486,7 @@ class Shell {
               `conda deactivate`,
               `conda deactivate`,
               `conda activate ${env_path}`,
-              'pip install --upgrade wheel pip setuptools',
+//              'pip install --upgrade wheel pip setuptools',
             ].concat(params.message)
           } else {
             params.message = [
@@ -500,7 +497,7 @@ class Shell {
               `conda deactivate`,
               `conda deactivate`,
               `conda activate ${env_path}`,
-              'pip install --upgrade wheel pip setuptools',
+//              'pip install --upgrade wheel pip setuptools',
             ].concat(params.message)
           }
         } else if (typeof params.conda === "object" && params.conda.path) {
@@ -513,7 +510,7 @@ class Shell {
               `conda deactivate`,
               `conda deactivate`,
               `conda activate ${env_path}`,
-              'pip install --upgrade wheel pip setuptools',
+//              'pip install --upgrade wheel pip setuptools',
             ].concat(params.message)
           } else {
             let create_command
@@ -529,7 +526,7 @@ class Shell {
               `conda deactivate`,
               `conda deactivate`,
               `conda activate ${env_path}`,
-              'pip install --upgrade wheel pip setuptools',
+//              'pip install --upgrade wheel pip setuptools',
             ].concat(params.message)
           }
         }
@@ -550,14 +547,14 @@ class Shell {
         params.message = [
           (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
           //'pip install --upgrade pip',
-          'pip install --upgrade wheel pip setuptools',
+ //         'pip install --upgrade wheel pip setuptools',
         ].concat(params.message)
       } else {
         params.message = [
           `python -m venv ${env_path}`,
           (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
           //'pip install --upgrade pip',
-          'pip install --upgrade wheel pip setuptools',
+//          'pip install --upgrade wheel pip setuptools',
         ].concat(params.message)
       }
     }
@@ -566,7 +563,6 @@ class Shell {
   }
   async exec(params) {
     params = await this.activate(params)
-    console.log("** params", params)
 
     this.cmd = this.build(params)
     let res = await new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.1.46",
+  "version": "1.1.48",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
     "lodash": "^4.17.21",
-    "lproxy": "^0.0.6",
+    "lproxy": "^0.0.7",
     "marked": "^5.0.1",
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",

package/server/index.js

@@ -92,8 +92,6 @@ class Server {
     }
   }
   getMemory(filepath) {
-    console.log("memory", this.kernel.memory.local)
-    console.log("filepath", filepath)
     let localMem = this.kernel.memory.local[filepath]
     let globalMem = this.kernel.memory.global[filepath]
 
@@ -267,7 +265,6 @@ class Server {
 
 
     let stat = await fs.promises.stat(filepath)
-    console.log("ST", { stat, filepath, isfile: stat.isFile() })
     if (pathComponents.length === 0 && req.query.mode === "explore") {
       res.render("explore", {
         version: this.version,
@@ -442,8 +439,6 @@ class Server {
 
       let runner = json || js
 
-      console.log({ runner, json, js, editmode, m })
-
       let rawpath = `/raw/${pathComponents.join('/')}` + "?frame=true"
       if (editmode) {
         let content = await fs.promises.readFile(filepath, "utf8")
@@ -776,7 +771,6 @@ class Server {
 
         res.render(template, result)
       } else {
-        console.log("FRAME", rawpath)
         res.render("frame", {
           logo: this.logo,
           theme: this.theme,

package/server/public/common.js

@@ -6,13 +6,3 @@ const refreshParent = (e) => {
     window.parent.postMessage(e, "*")
   }
 }
-//window.addEventListener('message', (event) => {
-//  console.log("Message received from the child: ", event.data); // Message received from child
-//  if (event.data && event.data.action) {
-//    if (event.data.action === "back") {
-//      history.back()
-//    } else if (event.data.action === "forward") {
-//      history.forward()
-//    } 
-//  }
-//});

package/server/public/simplemodal.js

@@ -15,13 +15,5 @@ const SimpleModal = async (params) => {
 ${params.description || ""}
 </div>
 <div class='simple-modal-content'>${btns}</div>`,
-//    showConfirmButton: false,
-//    footer: `<div class='simple-modal-footer'>
-//<div class='flexible'></div>
-//<div id='simple-modal-close'>Done</div>
-//</div>`,
-//    didClose: (result) => {
-//      // Optional: Handle overall modal closing if needed
-//    }
   })
 }

package/server/public/style.css

@@ -81,6 +81,17 @@ footer .toggle-expand {
 footer pre {
   background: none !important;
 }
+.wait-modal {
+  padding: 20px;
+  text-align: center;
+}
+.wait-modal-desc h1 {
+  padding-right: 10px;
+}
+.wait-modal-desc {
+  display: flex;
+  align-items: center;
+}
 .simple-modal-desc {
   padding-bottom: 15px;
   text-align: left;

package/server/public/waitmodal.js

@@ -0,0 +1,24 @@
+const WaitModal = async (params) => {
+  let menu = (params.menu ? params.menu : [])
+  let btns = menu.map((item) => {
+    if (item.href) {
+      let icon = (item.icon ? `<i class="${item.icon}"></i> ` : "")
+      return `<a class='btn' href='${item.href}' target='_blank'>${icon}${item.text}</a>`
+    } else if (item.action) {
+      return `<a class='btn' target='_blank'>${item.text}</a>`
+    }
+  }).join("")
+  let c = {
+    html: `<div class='wait-modal'>
+  <div class='simple-modal-desc wait-modal-desc'>
+    <h1><i class="fa-solid fa-spin fa-circle-notch"></i></h1>
+    <div>${params.message || ""}</div>
+  </div>
+  <div class='simple-modal-content'>${btns}</div>
+</div>`,
+    allowOutsideClick: false,
+    allowEscapeKey: false,
+    showConfirmButton: false
+  }
+  await Swal.fire(c)
+}

package/server/views/editor.ejs

@@ -1,5 +1,6 @@
 <html class='columns'>
 <head>
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 <script src="/hotkeys.min.js"></script>
 <script src="/ace/ace.js"></script>
 <script src="/noty.js"></script>
@@ -19,6 +20,7 @@
 <script src="/autoexpand.js"></script>
 <script src="/modalinput.js"></script>
 <script src="/simplemodal.js"></script>
+<script src="/waitmodal.js"></script>
 <script src="/notifyinput.js"></script>
 <script src="/report.js"></script>
 <link href="/xterm.min.css" rel="stylesheet" />
@@ -309,6 +311,14 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .play").classList.add("hidden")
             document.querySelector(".run .starting").classList.add("hidden")
             document.querySelector(".run .stop").classList.remove("hidden")
+          } else if (packet.type === 'wait.end') {
+            Swal.close()
+          } else if (packet.type === 'wait') {
+            await WaitModal(packet.data)
+            this.socket.respond({
+              response: {},
+              uri: "~" + location.pathname,
+            })
           } else if (packet.type === "modal") {
             await SimpleModal(packet.data)
           } else if (packet.type === "input") {

package/server/views/explore.ejs

@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 <style>
 body {
 }

package/server/views/frame.ejs

@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
 <link href="/css/regular.min.css" rel="stylesheet">

package/server/views/fullscreen_editor.ejs

@@ -1,5 +1,6 @@
 <html>
 <head>
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 <script src="/hotkeys.min.js"></script>
 <script src="/ace/ace.js"></script>
 <script src="/noty.js"></script>
@@ -21,6 +22,7 @@
 <script src="/autoexpand.js"></script>
 <script src="/modalinput.js"></script>
 <script src="/simplemodal.js"></script>
+<script src="/waitmodal.js"></script>
 <script src="/notifyinput.js"></script>
 <script src="/report.js"></script>
 <link href="/xterm.min.css" rel="stylesheet" />
@@ -288,6 +290,17 @@ document.addEventListener("DOMContentLoaded", async () => {
 //                uri: "~" + location.pathname,
 //              })
 //            }
+          } else if (packet.type === 'wait.end') {
+            try {
+              Swal.close()
+            } catch (e) {
+            }
+            this.socket.respond({
+              response: {},
+              uri: "~" + location.pathname,
+            })
+          } else if (packet.type === 'wait') {
+            await WaitModal(packet.data)
           } else if (packet.type === "modal") {
             await SimpleModal(packet.data)
             this.socket.respond({

package/server/views/install.ejs

@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 <link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">

package/server/views/launch.ejs

@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 <link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">

package/server/views/settings.ejs

@@ -1,7 +1,7 @@
 <html>
 <head>
 <meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1" />
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 <link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
@@ -66,7 +66,6 @@
   padding: 20px 0;
 }
 .titleview h1 {
-  font-family: verdana;
   font-size: 40px;
   text-transform: uppercase;
   letter-spacing: 0;
@@ -78,7 +77,6 @@
   padding: 10px 20px;
 }
 .item label {
-  font-family: verdana;
   display: block;
   text-transform: capitalize;
   font-size: 20px;

package/kernel/python/mod.py

@@ -1,40 +0,0 @@
-import sys
-import importlib
-import importlib_metadata
-import os
-# Get all the pip packages for the base path
-def get(sitepackages_base):
-  sys.path=[sitepackages_base]
-  importlib.invalidate_caches()
-  dists = importlib_metadata.packages_distributions()
-  dict = {}
-  for package_name in dists:
-    for dist_name in dists[package_name]:
-      dict[dist_name] = {}
-      # get package path
-      try:
-        meta = importlib_metadata.metadata(dist_name)
-        files = importlib_metadata.files(dist_name)
-        move = set()
-        copy = set()
-        for file in files:
-          filepath = os.path.join(sitepackages_base, file)
-          dirpath = os.path.abspath(os.path.dirname(filepath))
-          try:
-            relpath = Path(dirpath).relative_to(sitepackages_base)
-            # site package handling
-            chunks = str(relpath).split(os.sep)
-            if len(chunks) > 1:
-              folder = chunks[0]
-              move.add(os.path.join(sitepackages_base, folder))
-          except:
-            # non site package handling
-            # add the full file paths => so they can be copied
-            copy.add(str(filepath))
-        dict[dist_name]["copy"] = list(copy)
-        dict[dist_name]["move"] = list(move)
-      except Exception as error:
-        print(f"#ERR {error}")
-  return dict
-if __name__ == "__main__":
-  get("/Users/x/pinokio/api/comfyui.git/app/env/lib/python3.10/site-packages")

package/kernel/python/server.py

@@ -1,27 +0,0 @@
-from fastapi import FastAPI, Body
-from typing import List
-from pydantic import BaseModel
-import sys
-import os
-
-import importlib
-class Params(BaseModel):
-  values: List[str]
-
-app = FastAPI()
-#@app.get("/")
-#async def root():
-# return {"greeting":"Hello world"}
-
- # { name: "pip.py", method: "list", params: [ ] }
-@app.post("/call")
-async def call(item: dict = Body(...)):
-  print(f"item={item}")
-  sys.path.insert(0, os.path.dirname(item["path"]))
-#async def call(path: str, method: str, params: Params):
-  mod = importlib.import_module(item["name"], item["path"])
-  print(f"Mod = {mod}")
-  fun = getattr(mod, item["method"])
-  print(f"Fun = {fun}")
-  result = fun(*item["params"])
-  return result