pinokiod 0.1.45 → 0.1.47

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,45 @@ class FS {
 //    }
 //    await decompress(...req.params)
 //  }
+
+
+
+  async share(req, ondata, kernel) {
+    /////////////////////////////////////////////////////////////////////////////
+    //
+    //    {
+    //      “method”: “fs.share”,
+    //      “params”: {
+    //        "fs": "app/models/checkpoints",
+    //        “drive": “models/checkpoints",
+    //        “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
+    }
+
+    const drivePath = kernel.path("drive")
+    const drive = new Pdrive(drivePath)
+    const fsPath = path.resolve(req.cwd, req.params.fs)
+
+    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)
     let filepath = path.resolve(cwd, req.params.path)
@@ -161,6 +203,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 +219,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,
@@ -203,6 +253,37 @@ 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`
+        console.log(msg)
+        ondata({ raw: msg })
+      })
+      dl.on('skip', (skipInfo) => {
+        const msg = `\r\nDownload 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({
+          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\nstate changed: " + state + "\r\n"
+        console.log(msg)
+        ondata({ raw: msg })
+      })
+      dl.on('redirected', (newUrl, oldUrl) => {
+        const msg = `\r\nRedirect from '${newUrl}' => '${oldUrl}'\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` })

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.45",
+  "version": "0.1.47",
   "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.1",
     "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

@@ -332,21 +332,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 +379,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/editor.ejs

@@ -626,12 +626,14 @@ document.addEventListener("DOMContentLoaded", async () => {
       <% } %>
     <% } %>
   <% } %>
+  /*
   document.querySelector("#explore").addEventListener("click", async (e) => {
     e.preventDefault()
     e.stopPropagation()
     location.href = "/?mode=explore"
   })
   Reporter()
+  */
   document.querySelector(".memory").addEventListener("click", async (e) => {
     let target = e.target.classList.contains("tunnel") ? e.target : e.target.closest(".tunnel")
     let target2 = e.target.classList.contains("tunnel-stop") ? e.target : e.target.closest(".tunnel-stop")
@@ -705,11 +707,13 @@ const reloadMemory = async () => {
       <a class='path' href="<%=path.path%>"><%-path.name%></a>
     <% } %>
   <% }) %>
+  <!--
   <div class='flexible'></div>
   <button class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></button>
   <button class='btn2' id='report'><div><i class="fa-solid fa-bug"></i></div><div>Report Bug</div></button>
   <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
   <button id='new-window' title='open a new window'><i class="fa-solid fa-plus"></i></button>
+  -->
   </h1>
   <a class='gitremote' data-filepath="<%=filepath%>"><%=filepath%></a>
   <% if (pinokioPath) { %>