pinokiod 0.1.47 → 0.1.49

package/kernel/api/fs/index.js

@@ -39,38 +39,81 @@ class FS {
   async share(req, ondata, kernel) {
     /////////////////////////////////////////////////////////////////////////////
     //
+    //    1. 1:1 Interface mapping (1 interface, 1 file path)
     //    {
     //      “method”: “fs.share”,
     //      “params”: {
-    //        "fs": "app/models/checkpoints",
-    //        “drive": “models/checkpoints",
+    //        "interface": {
+    //          “models/checkpoints": "app/models/checkpoints",
+    //          “models/vae": "app/models/VAE",
+    //        },
+    //        “peers”: [ “https://github.com/cocktailpeanut/comfyui.git" ]
+    //      }
+    //    }
+    //
+    //
+    //    2. 1:N Interface mapping (1 interface, N file paths)
+    //    {
+    //      “method”: “fs.share”,
+    //      “params”: {
+    //        "interface": {
+    //          “models/checkpoints": "app/models/checkpoints",
+    //          “models/loras": [ "app/models/Lora", "app/models/LyCORIS" ],
+    //        },
     //        “peers”: [ “https://github.com/cocktailpeanut/comfyui.git" ]
     //      }
     //    }
     //
     /////////////////////////////////////////////////////////////////////////////
 
-    console.log("fs.share", req)
-     
 
-    if (path.isAbsolute(req.params.fs) || req.params.fs.startsWith(".")) {
-      return
-    }
-    if (path.isAbsolute(req.params.drive) || req.params.drive.startsWith(".")) {
-      return
-    }
+    if (req.params.interface) {
+      const drivePath = kernel.path("drive")
+      const drive = new Pdrive(drivePath)
+      for(const route in req.params.interface) {
+        const link = req.params.interface[route]
+        // Link path validation
+        if (Array.isArray(link)) {
+          let toContinue = false;
+          for(let ln of link) {
+            if (path.isAbsolute(ln) || ln.startsWith(".")) {
+              toContinue = true
+              break
+            }
+          }
+          if (toContinue) continue
+        } else {
+          if (path.isAbsolute(link) || link.startsWith(".")) {
+            continue
+          }
+        }
+        // Interface path validation
+        if (path.isAbsolute(route) || route.startsWith(".")) {
+          toContinue = true
+          break
+        }
 
-    const drivePath = kernel.path("drive")
-    const drive = new Pdrive(drivePath)
-    const fsPath = path.resolve(req.cwd, req.params.fs)
+        let linkPath
+        if (Array.isArray(link)) {
+          linkPath = link.map((ln) => {
+            return path.resolve(req.cwd, ln)
+          })
+        } else {
+          linkPath = path.resolve(req.cwd, link)
+        }
+
+        req.params.interface[route] = linkPath
+      }
+      await drive.create({
+        uri: req.parent.git,
+        interface: req.params.interface,
+        peers: (req.params.peers ? req.params.peers : [])
+      })
+      ondata({ raw: `\r\nDone!` })
+    } else {
+      ondata({ raw: `\r\nMust pass an 'interface' mapping` })
+    }
 
-    ondata({ raw: `\r\nLinking ${fsPath} to ${drivePath}...\r\n` })
-    await drive.create(fsPath, {
-      uri: req.parent.git,
-      path: req.params.drive,
-      peers: (req.params.peers ? req.params.peers : [])
-    })
-    ondata({ raw: `\r\nDone!` })
   }
   async rm(req, ondata, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
@@ -239,7 +282,7 @@ class FS {
       })
       dl.on('error', (err) => {
         console.log('Download Failed', err)
-        ondata({ raw: `\r\nDownload Failed: ${err.message}!\r\n` })
+        ondata({ raw: `\r\n[Download Failed] ${err.message}!\r\n` })
         reject(err)
       })
       dl.on('progress', (stats) => {
@@ -254,18 +297,18 @@ class FS {
         ondata({ raw: `\r${str}` })
       })
       dl.on('download', (downloadInfo) => {
-        const msg = `\r\nDownload Begins: ${JSON.stringify({ name: downloadInfo.fileName, total: downloadInfo.totalSize })}\r\n`
+        const msg = `\r\n[Download Started] ${JSON.stringify({ name: downloadInfo.fileName, total: downloadInfo.totalSize })}\r\n`
         console.log(msg)
         ondata({ raw: msg })
       })
       dl.on('skip', (skipInfo) => {
-        const msg = `\r\nDownload skipped, file already exists: ${JSON.stringify(skipInfo)}\r\n`
+        const msg = `\r\n[Download Skipped] File already exists: ${JSON.stringify(skipInfo)}\r\n`
         console.log(msg)
         ondata({ raw: msg })
         resolve()
       })
       dl.on('retry', (attempt, opts, err) => {
-        const msg = "\r\nRetrying... " + JSON.stringify({
+        const msg = "\r\n[Retrying] " + JSON.stringify({
           RetryAttempt: `${attempt}/${opts.maxRetries}`,
           StartsOn: `${opts.delay / 1000} secs`,
           Reason: err ? err.message : 'unknown'
@@ -274,19 +317,19 @@ class FS {
         ondata({ raw: msg })
       })
       dl.on('stateChanged', (state) => {
-        const msg = "\r\nstate changed: " + state + "\r\n"
+        const msg = "\r\n[State changed] " + state + "\r\n"
         console.log(msg)
         ondata({ raw: msg })
       })
       dl.on('redirected', (newUrl, oldUrl) => {
-        const msg = `\r\nRedirect from '${newUrl}' => '${oldUrl}'\r\n`
+        const msg = `\r\n[Redirected] '${oldUrl}' => '${newUrl}'\r\n`
         console.log(msg)
         ondata({ raw: msg })
       })
 
       dl.start().catch((err) => {
         console.log('Download Failed', err)
-        ondata({ raw: `\r\nDownload Failed: ${err.message}!\r\n` })
+        ondata({ raw: `\r\n[Download Failed] ${err.message}!\r\n` })
         reject(err)
       })
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "0.1.47",
+  "version": "0.1.49",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -40,7 +40,7 @@
     "multer": "^1.4.5-lts.1",
     "node-downloader-helper": "^2.1.9",
     "node-pty-prebuilt-multiarch-cp": "^0.10.1-pre.48",
-    "pdrive": "^0.0.1",
+    "pdrive": "^0.0.8",
     "portfinder": "^1.0.32",
     "rimraf": "^5.0.0",
     "sanitize-filename": "^1.6.3",

package/server/views/browser.ejs

@@ -149,7 +149,7 @@ body.dark #new-window {
   text-align: center;;
   font-weight: bold;
   align-items: center;
-  padding: 10px 5px;
+  padding: 20px 0px;
 }
 .app-info > * {
   padding: 5px;
@@ -210,7 +210,11 @@ body.dark .frame-link.selected {
 }
 .frame-link .tab {
   flex-grow: 1;
+  /*
   width: 100%;
+  */
+  word-break: break-word;
+  margin-right: 10px;
 }
 .frame-link .tab .flexible {
   min-width: 5px;
@@ -419,16 +423,6 @@ const renderSelection = (e, force) => {
     document.querySelector(".bar").classList.remove("hidden")
     let id = getTarget(location.hash.slice(1))
 
-    //document.querySelector("#location").innerHTML = id
-    document.querySelector("#location").innerHTML = location.hash.slice(1)
-
-    if (location.hash.slice(1).startsWith("/")) {
-      document.querySelector("#open-browser").classList.add("hidden")
-    } else {
-      document.querySelector("#open-browser").classList.remove("hidden")
-      //document.querySelector("#open-browser").href = id
-      document.querySelector("#open-browser").href = location.hash.slice(1)
-    }
 
     // select the selected link
 //    document.querySelectorAll(".frame-link").forEach((el) => {
@@ -447,7 +441,27 @@ const renderSelection = (e, force) => {
       }
     }
 
+
+    if (!target) {
+      // find target by id
+      target = document.querySelector("aside [target='" + id + "']")
+    }
+
+    debugger
     if (target) {
+
+      //document.querySelector("#location").innerHTML = id
+      document.querySelector("#location").innerHTML = location.hash.slice(1)
+
+      if (location.hash.slice(1).startsWith("/")) {
+        document.querySelector("#open-browser").classList.add("hidden")
+      } else {
+        document.querySelector("#open-browser").classList.remove("hidden")
+        //document.querySelector("#open-browser").href = id
+        document.querySelector("#open-browser").href = location.hash.slice(1)
+      }
+
+
       target.classList.add("selected")
 
       // select the iframe
@@ -469,9 +483,9 @@ const renderSelection = (e, force) => {
             }
           } else {
             if (force) {
-              if (targetFrame.src !== target.href) {
+//              if (targetFrame.src !== target.href) {
                 targetFrame.src = target.href
-              }
+//              }
             }
           }
         } else {
@@ -494,6 +508,11 @@ const renderSelection = (e, force) => {
         document.querySelector("main").appendChild(frame)
         loaded[target.target] = true
       }
+    } else {
+      // couldn't find item,
+      // clear the hash
+      // 
+      location.hash = ""
     }
   } else {
     document.querySelector(".bar").classList.add("hidden")

package/server/views/partials/menu.ejs

@@ -13,7 +13,9 @@
       <a data-index="<%=index%>" target="<%=item.src%>" href="<%=item.href%>" class='btn header-item frame-link'>
         <div class='tab'><%-item.btn%></div>
         <% if (item.running) { %>
+          <div class='loader'>
           <i class='fa-solid fa-spin fa-circle-notch'></i>
+          </div>
         <% } %>
       </a>
     <% } %>