pinokiod 0.1.46 → 0.1.48

package/kernel/api/fs/index.js

@@ -1,7 +1,10 @@
 const path = require('path')
 //const decompress = require('decompress');
 const fs = require("fs")
+const Pdrive = require('pdrive')
 const { DownloaderHelper } = require('node-downloader-helper');
+const symlinkDir = require('symlink-dir')
+
 class FS {
   async read(req, ondata, kernel) {
     /*
@@ -30,6 +33,88 @@ class FS {
 //    }
 //    await decompress(...req.params)
 //  }
+
+
+
+  async share(req, ondata, kernel) {
+    /////////////////////////////////////////////////////////////////////////////
+    //
+    //    1. 1:1 Interface mapping (1 interface, 1 file path)
+    //    {
+    //      “method”: “fs.share”,
+    //      “params”: {
+    //        "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" ]
+    //      }
+    //    }
+    //
+    /////////////////////////////////////////////////////////////////////////////
+
+
+    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
+        }
+
+        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` })
+    }
+
+  }
   async rm(req, ondata, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
     let filepath = path.resolve(cwd, req.params.path)
@@ -161,6 +246,10 @@ class FS {
       console.log("folder", folder)
       await fs.promises.mkdir(folder, { recursive: true }).catch((e) => { })
       dl = new DownloaderHelper(url, folder, {
+        override: {
+          skip: true,
+          skipSmaller: false,
+        },
         resumeIfFileExists: true,
         removeOnStop: false,
         removeOnFail: false,
@@ -173,6 +262,10 @@ class FS {
       await fs.promises.mkdir(folder, { recursive: true }).catch((e) => { })
       let filename = path.basename(filepath)
       dl = new DownloaderHelper(url, folder, {
+        override: {
+          skip: true,
+          skipSmaller: false,
+        },
         fileName: filename,
         resumeIfFileExists: true,
         removeOnStop: false,
@@ -189,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) => {
@@ -203,9 +296,40 @@ class FS {
         }
         ondata({ raw: `\r${str}` })
       })
+      dl.on('download', (downloadInfo) => {
+        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\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\n[Retrying] " + JSON.stringify({
+          RetryAttempt: `${attempt}/${opts.maxRetries}`,
+          StartsOn: `${opts.delay / 1000} secs`,
+          Reason: err ? err.message : 'unknown'
+        }) + "\r\n";
+        console.log(msg)
+        ondata({ raw: msg })
+      })
+      dl.on('stateChanged', (state) => {
+        const msg = "\r\n[State changed] " + state + "\r\n"
+        console.log(msg)
+        ondata({ raw: msg })
+      })
+      dl.on('redirected', (newUrl, oldUrl) => {
+        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/kernel/api/index.js

@@ -140,6 +140,7 @@ class Api {
         }
       }
     }
+    console.log("gitPath", this.gitPath)
   }
   denormalize(gitRemote) {
     let denormalized
@@ -160,6 +161,16 @@ class Api {
     return normalized
   }
 
+  parentGitURI(requestPath) {
+    for(let repo in this.gitPath) {
+      let val = this.gitPath[repo] 
+      if (requestPath.includes(val)) {
+        return repo
+      }
+    }
+    return null
+  }
+
   resolveWebPath(uri) {
     let repos = Object.keys(this.gitPath)
     let matched_repo = repos.filter((repo) => {
@@ -461,6 +472,7 @@ class Api {
         rpc.parent = {
           uri: request.uri,
           path: request.path,
+          git: this.parentGitURI(request.path),
           body: script 
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "0.1.46",
+  "version": "0.1.48",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -40,12 +40,14 @@
     "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.8",
     "portfinder": "^1.0.32",
     "rimraf": "^5.0.0",
     "sanitize-filename": "^1.6.3",
     "semver": "^7.5.4",
     "shell-path": "^2.0.0",
     "sudo-prompt-programfiles-x86": "^9.2.8",
+    "symlink-dir": "^5.2.1",
     "systeminformation": "^5.18.4",
     "uuid": "^9.0.0",
     "watcher": "^2.2.2",

package/server/views/browser.ejs

@@ -48,7 +48,9 @@ body.dark aside {
 aside {
   display: flex;
   flex-direction: column;
+  /*
   width: 200px;
+  */
   overflow: auto;
   box-sizing: border-box;
 }
@@ -149,7 +151,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 +212,10 @@ body.dark .frame-link.selected {
 }
 .frame-link .tab {
   flex-grow: 1;
+  /*
   width: 100%;
+  */
+  margin-right: 5px;
 }
 .frame-link .tab .flexible {
   min-width: 5px;
@@ -332,21 +337,9 @@ body.dark #new-tab {
     </a>
   </div>
   <div class='menu'>
+    <% if (config.menu) { %>
     <%- include('./partials/menu', { menu: config.menu }) %>
-    <!--
-    <% config.menu.forEach((item, index) => { %>
-      <% if (item.btn) { %>
-        <a data-index="<%=index+1%>" target="<%=item.src%>" href="<%=item.href%>" class='btn header-item frame-link'>
-          <div class='tab'><%-item.btn%></div>
-          <% if (item.running) { %>
-            <i class='fa-solid fa-spin fa-circle-notch'></i>
-          <% } %>
-        </a>
-      <% } else if (item.label) { %>
-        <label class='btn label header-item'><%-item.label%></label>
-      <% } %>
-    <% }) %>
-    -->
+    <% } %>
   </div>
   <div class='temp-menu'>
     <%tabs.forEach((tab) => { %>
@@ -391,14 +384,13 @@ body.dark #new-tab {
     -->
   </nav>
   <main class='browserview'>
-    <!--
-    <pre><%=JSON.stringify({ memory, running }, null, 2)%></pre>
-    <% config.menu.forEach((item) => { %>
-      <% if (item.btn && item.src) { %>
-        <iframe name='<%=item.src%>' class='hidden'></iframe>
-      <% } %>
-    <% }) %>
-    -->
+    <% if (false && config.menu) { %>
+      <% config.menu.forEach((item) => { %>
+        <% if (item.btn && item.src) { %>
+          <iframe name='<%=item.src%>' class='hidden'></iframe>
+        <% } %>
+      <% }) %>
+    <% } %>
   </main>
 </div>
 <script>

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>
     <% } %>