pinokiod 0.1.53 → 0.1.55

package/kernel/api/fs/index.js

@@ -39,11 +39,11 @@ class FS {
   async share(req, ondata, kernel) {
     /////////////////////////////////////////////////////////////////////////////
     //
-    //    1. 1:1 Interface mapping (1 interface, 1 file path)
+    //    1. 1:1 Drive mapping (1 file path per 1 drive folder)
     //    {
     //      “method”: “fs.share”,
     //      “params”: {
-    //        "interface": {
+    //        "drive": {
     //          “models/checkpoints": "app/models/checkpoints",
     //          “models/vae": "app/models/VAE",
     //        },
@@ -52,11 +52,11 @@ class FS {
     //    }
     //
     //
-    //    2. 1:N Interface mapping (1 interface, N file paths)
+    //    2. 1:N Drive mapping (N file paths per 1 drive folder)
     //    {
     //      “method”: “fs.share”,
     //      “params”: {
-    //        "interface": {
+    //        "drive": {
     //          “models/checkpoints": "app/models/checkpoints",
     //          “models/loras": [ "app/models/Lora", "app/models/LyCORIS" ],
     //        },
@@ -67,11 +67,11 @@ class FS {
     /////////////////////////////////////////////////////////////////////////////
 
 
-    if (req.params.interface) {
+    if (req.params.drive) {
       const drivePath = kernel.path("drive")
       const drive = new Pdrive(drivePath)
-      for(const route in req.params.interface) {
-        const link = req.params.interface[route]
+      for(const route in req.params.drive) {
+        const link = req.params.drive[route]
         // Link path validation
         if (Array.isArray(link)) {
           let toContinue = false;
@@ -87,7 +87,7 @@ class FS {
             continue
           }
         }
-        // Interface path validation
+        // Drive path validation
         if (path.isAbsolute(route) || route.startsWith(".")) {
           toContinue = true
           break
@@ -102,16 +102,16 @@ class FS {
           linkPath = path.resolve(req.cwd, link)
         }
 
-        req.params.interface[route] = linkPath
+        req.params.drive[route] = linkPath
       }
       await drive.create({
         uri: req.parent.git,
-        interface: req.params.interface,
+        drive: req.params.drive,
         peers: (req.params.peers ? req.params.peers : [])
       })
       ondata({ raw: `\r\nDone!` })
     } else {
-      ondata({ raw: `\r\nMust pass an 'interface' mapping` })
+      ondata({ raw: `\r\nMust pass an 'drive' mapping` })
     }
 
   }

package/kernel/api/tab/index.js

@@ -0,0 +1,15 @@
+/*
+  {
+    method: "tab.open",
+    params: {
+      target:
+      url
+    }
+  }
+(*/
+class Tab {
+  async open(req, ondata, kernel) {
+    ondata(req.params, "tab.open")
+  }
+}
+module.exports = Tab

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "0.1.53",
+  "version": "0.1.55",
   "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.9",
+    "pdrive": "^0.0.10",
     "portfinder": "^1.0.32",
     "rimraf": "^5.0.0",
     "sanitize-filename": "^1.6.3",

package/server/index.js

@@ -40,6 +40,7 @@ class Server {
       pinokiod: packagejson.version,
       pinokio: config.version
     }
+    this.kernel.version = this.version
     this.upload = multer();
 
     // sometimes the C:\Windows\System32 is not in PATH, need to add
@@ -260,6 +261,7 @@ class Server {
     let stat = await fs.promises.stat(filepath)
     if (pathComponents.length === 0 && req.query.mode === "explore") {
       res.render("explore", {
+        version: this.version,
         logo: this.logo,
         theme: this.theme,
         agent: this.agent,

package/server/views/browser.ejs

@@ -471,6 +471,13 @@ const renderSelection = (e, force) => {
 
         // if the iframe already exists, do not 
         if (loaded[target.target]){
+
+          let mode = target.getAttribute("data-mode")
+          if (mode === "refresh") {
+            targetFrame.src = target.href
+            return
+          }
+
           if (e) {
             // triggered with a click
             // do not reload iframe if the href and the src is the same
@@ -696,6 +703,7 @@ window.addEventListener('message', (event) => {
       addTab(event.data.action.url)
     }
   } else {
+    console.log("data", event.data)
     refresh()
   }
 });

package/server/views/editor.ejs

@@ -333,6 +333,8 @@ document.addEventListener("DOMContentLoaded", async () => {
                 }]
               }
             */
+          } else if (packet.type === "tab.open") {
+            refreshParent(packet)
           } else if (packet.type === "browser.open") {
           /*
             {

package/server/views/fullscreen_editor.ejs

@@ -312,6 +312,8 @@ document.addEventListener("DOMContentLoaded", async () => {
                 }]
               }
             */
+          } else if (packet.type === "tab.open") {
+            refreshParent(packet)
           } else if (packet.type === "browser.open") {
           /*
             {

package/server/views/partials/menu.ejs

@@ -10,7 +10,7 @@
     </div>
   <% } else { %>
     <% if (item.btn) { %>
-      <a data-index="<%=index%>" target="<%=item.src%>" href="<%=item.href%>" class='btn header-item frame-link'>
+      <a data-index="<%=index%>" target="<%=item.src%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link'>
         <div class='tab'><%-item.btn%></div>
         <% if (item.running) { %>
           <div class='loader'>