pinokiod 3.41.0 → 3.43.0

package/kernel/util.js

@@ -7,6 +7,8 @@ const os = require('os')
 const net = require('node:net')
 const path = require('path')
 const dotenv = require('dotenv')
+const symlinkDir = require('symlink-dir')
+const retry = require('async-retry');
 const child_process = require('node:child_process');
 const {auto: normalizeEOL} = require("eol");
 const {EOL} = require("os");
@@ -33,12 +35,20 @@ if( __dirname.includes(".asar") ) {
 }
 const { getFolderSize, getFolderSizeBin, getFolderSizeWasm, } = g
 const du = async (folderpath) => {
-//  console.time("disk size calc")
   let totalSize = await getFolderSizeBin(folderpath)
-//  console.timeEnd("disk size calc")
   return totalSize;
 }
 
+const symlink = async(req, ondata, kernel) => {
+/*
+  req := {
+    from: <the link path to create>,
+    to: <the path the link points to>
+  }
+*/
+  const result = await symlinkDir(req.to, req.from)
+  
+}
 const clipboard = async (req, ondata, kernel) => {
 /*
   req := {
@@ -106,6 +116,39 @@ const filepicker = async(req, ondata, kernel) => {
   return { paths: response }
 }
 
+let file_type = async (cwd, file) => {
+  if (file.isDirectory()) {
+    return {
+      directory: true,
+    }
+  } else if (file.isFile()) {
+    return {
+      file: true
+    }
+  } else if (file.isSymbolicLink()) {
+    try {
+      const fullPath = path.join(cwd, file.name);
+      const targetStats = await fs.promises.stat(fullPath);
+      if (targetStats.isDirectory()) {
+        return {
+          directory: true,
+          link: true,
+        }
+      } else if (targetStats.isFile()) {
+        return {
+          file: true,
+          link: true,
+        }
+      }
+    } catch (err) {
+      console.error(`${file.name} → broken symlink (${err.message})`);
+      return {
+        link: true
+      }
+    }
+  }
+}
+
 const is_port_available = async (port) => {
   return new Promise((resolve) => {
     const server = http.createServer();
@@ -364,6 +407,12 @@ const log_path = (fullpath, kernel) => {
   let current_log_path = path.resolve(log_root, "shell/cleaned/api", rel_path)
   return current_log_path
 }
+const api_name = (fullpath, kernel) => {
+  let api_path = `${kernel.homedir}${path.sep}api`
+  let rel_path = path.relative(api_path, fullpath)
+  let api_name = rel_path.split(path.sep)[0]
+  return api_name
+}
 const api_path = (fullpath, kernel) => {
   let api_path = `${kernel.homedir}${path.sep}api`
   let rel_path = path.relative(api_path, fullpath)
@@ -669,11 +718,11 @@ const mergeLines = async (existingFilepath, filepath2) => {
 
     let current = await fs.promises.readFile(existingFilepath, "utf8")
     if (current.trim() !== merged.trim()) {
-      console.log("merged has changed")
+      //console.log("merged has changed")
       // changed
       await fs.promises.writeFile(existingFilepath, merged)
     } else {
-      console.log(" no changes needed")
+      //console.log(" no changes needed")
     }
   } else {
     // does not exist, just copy 
@@ -758,6 +807,8 @@ const rewrite_localhost= (kernel, obj, source) => {
   let protocol = source.protocol
   let sourceHost = source.host
 
+  console.log("rewrite_localhost", { protocol, sourceHost, })
+
   let sourceIp
   let sourcePort
   if (protocol === "http") {
@@ -769,6 +820,7 @@ const rewrite_localhost= (kernel, obj, source) => {
   // find the 
 
   const fix = (url) => {
+    console.log("Fix url", url)
     /*
     url:
       http://localhost:8188
@@ -783,9 +835,13 @@ const rewrite_localhost= (kernel, obj, source) => {
         let port = u.port
         let hostname = u.hostname
         let host = u.host
+        console.log({ port, hostname, host })
         if (protocol === "https") {
           let proxyDomain
+          console.log("current_host", kernel.peer.host)
+          console.log("router_info", kernel.peer.info[kernel.peer.host].router_info)
           for(let item of kernel.peer.info[kernel.peer.host].router_info) {
+            console.log({ internal_port: item.internal_port, port })
             if (String(item.internal_port) === String(port)) {
               if (item.external_router && item.external_router.length > 0) {
                 console.log("Found", { item, port })
@@ -809,7 +865,10 @@ const rewrite_localhost= (kernel, obj, source) => {
         console.log("Fixed", u.toString())
         return u.toString();
       }
-    } catch { /* ignore invalid URLs */ }
+    } catch (e) {
+      console.log("ERROR", e)
+      
+    }
     return url;
   };
 
@@ -835,5 +894,5 @@ const rewrite_localhost= (kernel, obj, source) => {
 
 
 module.exports = {
-  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object, run, openURL, u2p, p2u, log, diffLinesWithContext, classifyChange, push, filepicker, exists, clipboard, mergeLines, ignore_subrepos, rewrite_localhost
+  parse_env, log_path, api_path, api_name, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object, run, openURL, u2p, p2u, log, diffLinesWithContext, classifyChange, push, filepicker, exists, clipboard, mergeLines, ignore_subrepos, rewrite_localhost, symlink, file_type
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.41.0",
+  "version": "3.43.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -67,6 +67,7 @@
     "rimraf": "^5.0.0",
     "sanitize-filename": "^1.6.3",
     "semver": "^7.5.4",
+    "serve-index": "^1.9.1",
     "shell-path": "^2.0.0",
     "sudo-prompt-programfiles-x86": "^9.2.10",
     "symlink-dir": "^5.2.1",