pinokiod 0.1.54 → 0.1.56

package/kernel/api/fs/index.js

@@ -1,6 +1,7 @@
 const path = require('path')
 //const decompress = require('decompress');
 const fs = require("fs")
+const fse = require('fs-extra')
 const Pdrive = require('pdrive')
 const { DownloaderHelper } = require('node-downloader-helper');
 const symlinkDir = require('symlink-dir')
@@ -39,11 +40,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 +53,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 +68,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 +88,7 @@ class FS {
             continue
           }
         }
-        // Interface path validation
+        // Drive path validation
         if (path.isAbsolute(route) || route.startsWith(".")) {
           toContinue = true
           break
@@ -102,23 +103,24 @@ 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` })
     }
 
   }
   async rm(req, ondata, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
     let filepath = path.resolve(cwd, req.params.path)
-    await fs.promises.rm(filepath)
+//    await fs.promises.rm(filepath)
+    await fse.remove(filepath)
   }
   async copy(req, ondata, kernel) {
     let cwd = (req.cwd ? req.cwd : kernel.api.userdir)

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.54",
+  "version": "0.1.56",
   "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/views/browser.ejs

@@ -703,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") {
           /*
             {