pinokiod 2.1.25 → 2.1.26

package/kernel/api/fs/index.js

@@ -54,6 +54,17 @@ class FS {
 //    await decompress(...req.params)
 //  }
 
+  async open(req, ondata, kernel) {
+    /*
+      params := {
+        path: <filepath>,
+      }
+      open finder/file explorer at path
+    */
+    let dirPath = path.resolve(req.cwd, req.params.path)
+    ondata({ raw: `\r\nopening path: ${dirPath}\r\n` })
+    Util.openfs(dirPath)
+  }
 
   async link(req, ondata, kernel) {
     let response = await this.share(req, ondata, kernel)

package/kernel/util.js

@@ -1,7 +1,8 @@
 const fs = require('fs')
+const os = require('os')
 const path = require('path')
 const dotenv = require('dotenv')
-
+const child_process = require('node:child_process');
 const {auto: normalizeEOL} = require("eol");
 const {EOL} = require("os");
 const breakPattern = /\n/g;
@@ -21,6 +22,24 @@ const parse_env = async (filename) => {
     return {}
   }
 }
+const openfs = (dirPath) => {
+  let command = '';
+  const platform = os.platform()
+  switch (platform) {
+    case 'darwin':
+      command = 'open';
+      break;
+    case 'win32':
+      command = 'explorer';
+      break;
+    default:
+      command = 'xdg-open';
+      break;
+  }
+  let c = `${command} "${dirPath}"`
+  console.log(c)
+  child_process.exec(c)
+}
 
 const parse_env_detail = async (filename) => {
   // takes env and returns an array
@@ -123,5 +142,5 @@ const update_env = async (filepath, changes) => {
   await fs.promises.writeFile(filepath, newval)
 };
 module.exports = {
-  parse_env, api_path, update_env, parse_env_detail
+  parse_env, api_path, update_env, parse_env_detail, openfs
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "2.1.25",
+  "version": "2.1.26",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -1281,11 +1281,16 @@ class Server {
           if (menuitem.href && !menuitem.href.startsWith("http")) {
 
             // href resolution
-            let absolute = path.resolve(__dirname, ...pathComponents, menuitem.href)
-            let seed = path.resolve(__dirname)
-            let p = absolute.replace(seed, "")
-            let link = p.split(/[\/\\]/).filter((x) => { return x }).join("/")
-            config.menu[i].href = "/api/" + name + "/" + link
+            if (menuitem.fs) {
+              // file explorer
+              config.menu[i].href = path.resolve(this.kernel.homedir, "api", name, menuitem.href)
+            } else {
+              let absolute = path.resolve(__dirname, ...pathComponents, menuitem.href)
+              let seed = path.resolve(__dirname)
+              let p = absolute.replace(seed, "")
+              let link = p.split(/[\/\\]/).filter((x) => { return x }).join("/")
+              config.menu[i].href = "/api/" + name + "/" + link
+            }
           }
         }
 
@@ -1307,7 +1312,6 @@ class Server {
             menuitem.src = u.pathname
           }
 
-
           // check running
           let fullpath = this.kernel.path(menuitem.src.slice(1))
           if (this.kernel.api.running[fullpath]) {
@@ -2099,6 +2103,12 @@ class Server {
 //      }
     }))
 
+    this.app.post("/openfs", ex(async (req, res) => {
+      console.log("openfs", req.body.path)
+      Util.openfs(req.body.path)
+      res.json({ success: true })
+    }))
+
     this.app.post("/unpublish", ex(async (req, res) => {
       /*
         req.body := {

package/server/public/opener.js

@@ -7,9 +7,23 @@ document.addEventListener("click", async (e) => {
       el = e.target
     }
   }
+  console.log({ el })
   if (el) {
     let filepath = el.getAttribute("data-filepath")
-    window.open("about:blank", "_blank", "file://" + filepath)
+    console.log("filepath", filepath)
+    await fetch("/openfs", {
+      method: "post",
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({
+        path: filepath
+      })
+    }).then((res) => {
+      return res.json()
+    })
+//    let filepath = el.getAttribute("data-filepath")
+//    window.open("about:blank", "_blank", "file://" + filepath)
     return
   }
 

package/server/views/browser-experimental.ejs

@@ -1348,6 +1348,8 @@ document.querySelector("aside").addEventListener("click", async (e) => {
           }
         })
       }
+    } else if (target.getAttribute("data-filepath")) {
+      return
     } else if (target.target === "_blank") {
       // nothing
     } else {

package/server/views/partials/menu.ejs

@@ -14,6 +14,10 @@
         <div <%=item.default ? 'data-default' : ''%> data-action="<%=JSON.stringify(item.action)%>" class='btn header-item frame-link'>
           <div class='tab'><%-item.btn%></div>
         </div>
+      <% } else if (item.fs) { %>
+        <div data-filepath="<%=item.href%>" class='btn header-item frame-link'>
+          <div class='tab'><%-item.btn%></div>
+        </div>
       <% } else if (item.target === "_blank") { %>
         <a <%=item.default ? 'data-default' : ''%> data-confirm="<%=item.confirm%>" data-index="<%=index%>" target="<%=item.target%>" data-mode="<%=item.mode%>" href="<%=item.href%>" class='btn header-item frame-link'>
           <div class='tab'><%-item.btn%></div>