pinokiod 3.9.0 → 3.9.3

package/kernel/util.js

@@ -14,6 +14,9 @@ const groupReplacement = "$$$";
 const h = "[^\\S\\r\\n]";  // simulate `\h`
 const returnPattern = /\r/g;
 const returnReplacement = "\\r";
+const {
+  glob
+} = require('glob')
 
 
 // asar handling for go-get-folder-size
@@ -36,26 +39,20 @@ const du = async (folderpath) => {
 const is_port_available = async (port) => {
   return new Promise((resolve) => {
     const server = http.createServer();
-    console.log("> Checking port availability", port)
     try {
       server.listen(port, (err) => {
         if (err) {
-          console.log("> [1 port not available]", err)
           resolve(false); // Port is occupied
         } else {
-          console.log("> [2 port available] test server started. closing test server now.")
           server.close(() => {
-            console.log("> Test server closed.")
             resolve(true); // Port is free
           }); // Close the server immediately after testing
         }
       });
       server.on('error', (err) => {
-        console.log("> [3 port not available]", err);
         resolve(false); // Port is occupied
       });
     } catch (e) {
-      console.log("> [4 port not available]", err)
       resolve(false) // port not available
     }
   });
@@ -94,39 +91,89 @@ const parse_env = async (filename) => {
     return {}
   }
 }
-const openfs = (dirPath, options) => {
+const openfs = (dirPath, options, kernel) => {
   let command = '';
   const platform = os.platform()
-  let mode = "view"
-  if (options && options.mode) {
-    mode = options.mode
-  }
-  if (mode === "view") {
-    switch (platform) {
-      case 'darwin':
-        command = `open -R "${dirPath}"`;
-        break;
-      case 'win32':
-        command = `explorer /select,"${dirPath}" & timeout /t 1 >nul`;
-        break;
-      default:
-        command = `xdg-open "${dirPath}"`;
-        break;
+  console.log("openfs", dirPath, options)
+  if (options && options.command) {
+    let mode = "view"
+    if (options && options.command) {
+      mode = options.command
+    }
+    console.log("> mode", mode)
+    if (mode === "view") {
+      switch (platform) {
+        case 'darwin':
+          command = `open -R "${dirPath}"`;
+          break;
+        case 'win32':
+          command = `explorer /select,"${dirPath}" & timeout /t 1 >nul`;
+          break;
+        default:
+          command = `xdg-open "${dirPath}"`;
+          break;
+      }
+      child_process.exec(command)
+    } else if (mode === "open") {
+      switch (platform) {
+        case 'darwin':
+          command = `open "${dirPath}"`;
+          break;
+        case 'win32':
+          command = `explorer "${dirPath}"`;
+          break;
+        default:
+          command = `xdg-open "${dirPath}"`;
+          break;
+      }
+      child_process.exec(command)
+    } else {
+      command = `${mode} "${dirPath}"`
+      console.log("> command", command)
+      if (kernel) {
+        kernel.exec({
+          message: command,
+        }, (e) => {
+          process.stdout.write(e.raw)
+        }).then(() => {
+          console.log("DONE")
+        })
+      } else {
+        child_process.exec(command)
+      }
     }
-  } else if (mode === "open") {
-    switch (platform) {
-      case 'darwin':
-        command = `open "${dirPath}"`;
-        break;
-      case 'win32':
-        command = `explorer "${dirPath}"`;
-        break;
-      default:
-        command = `xdg-open "${dirPath}"`;
-        break;
+  } else {
+    let mode = "view"
+    if (options && options.mode) {
+      mode = options.mode
     }
+    if (mode === "view") {
+      switch (platform) {
+        case 'darwin':
+          command = `open -R "${dirPath}"`;
+          break;
+        case 'win32':
+          command = `explorer /select,"${dirPath}" & timeout /t 1 >nul`;
+          break;
+        default:
+          command = `xdg-open "${dirPath}"`;
+          break;
+      }
+    } else if (mode === "open") {
+      switch (platform) {
+        case 'darwin':
+          command = `open "${dirPath}"`;
+          break;
+        case 'win32':
+          command = `explorer "${dirPath}"`;
+          break;
+        default:
+          command = `xdg-open "${dirPath}"`;
+          break;
+      }
+    }
+    child_process.exec(command)
   }
-  child_process.exec(command)
 }
 const parse_env_detail = async (filename) => {
   // takes env and returns an array
@@ -199,8 +246,31 @@ const escapeStringRegexp = (string) => {
 		.replace(/-/g, '\\x2d');
 }
 
+const find_python = async (root) => {
+  let python_pattern
+  if (os.platform() === "win32") {
+    python_pattern = "**/python.exe";
+  } else {
+    python_pattern = "**/python"; // Matches python, python3, python3.x
+  }
+  const pythonBinaries = await glob(python_pattern, { nodir: true, cwd: root });
+  return pythonBinaries
+}
+const find_venv = async (root) => {
+  let python_pattern
+  if (os.platform() === "win32") {
+    python_pattern = "**/python.exe";
+  } else {
+    python_pattern = "**/python"; // Matches python, python3, python3.x
+  }
+  const pythonBinaries = await glob(python_pattern, { nodir: true, cwd: root, absolute: true });
+  const venvs = pythonBinaries.map((p) => {
+    return path.resolve(p, "../..") 
+  })
+  return venvs
+}
+
 const update_env = async (filepath, changes) => {
-  console.log("UPDATE_ENV", { filepath, changes })
   const env = await fs.promises.readFile(filepath, "utf8")
   let append = false;
   const newval = Object.keys(changes).reduce((result, varname) => {
@@ -236,6 +306,43 @@ const update_env = async (filepath, changes) => {
   }, normalizeEOL(env));
   await fs.promises.writeFile(filepath, newval)
 };
+function fill_object(obj, pattern, list, cache) {
+  const map = {};
+  const replaced_map = cache || {}
+  let index = 0;
+
+  function recurse(value) {
+    if (typeof value === 'string') {
+      return value.replace(pattern, (match) => {
+        if (!(match in map)) {
+          if (replaced_map[match]) {
+            map[match] = replaced_map[match]
+//            console.log("filling with cache", { match, replaced: replaced_map[match] })
+          } else {
+            if (index >= list.length) throw new Error("Not enough items provided");
+            map[match] = list[index++];
+            replaced_map[match] = map[match]
+//            console.log("filling with new", { match, replaced: replaced_map[match] })
+          }
+        }
+        return map[match];
+      });
+    } else if (Array.isArray(value)) {
+      return value.map(recurse);
+    } else if (value && typeof value === 'object') {
+      const newObj = {};
+      for (const [k, v] of Object.entries(value)) {
+        newObj[k] = recurse(v);
+      }
+      return newObj;
+    }
+    return value;
+  }
+
+  let res = recurse(obj);
+  return { result: res, replaced_map }
+}
+
 module.exports = {
-  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available
+  parse_env, log_path, api_path, update_env, parse_env_detail, openfs, port_running, du, is_port_available, find_python, find_venv, fill_object
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.9.0",
+  "version": "3.9.3",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -28,6 +28,7 @@
     "express-session": "^1.17.3",
     "fake-useragent": "^1.0.1",
     "fastq": "^1.15.0",
+    "form-data": "^4.0.2",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.3",
     "glob-gitignore": "^1.0.14",
@@ -40,6 +41,7 @@
     "jimini": "^0.0.7",
     "jsdom": "^24.0.0",
     "key-store": "^1.2.0",
+    "kill-sync": "^1.0.3",
     "kleur": "^4.1.5",
     "lodash": "^4.17.21",
     "marked": "^5.0.1",
@@ -59,6 +61,7 @@
     "sudo-prompt-programfiles-x86": "^9.2.10",
     "symlink-dir": "^5.2.1",
     "systeminformation": "^5.18.4",
+    "twitter-api-v2": "^1.23.2",
     "uuid": "^9.0.0",
     "wait-on": "^7.2.0",
     "which": "^5.0.0",

package/pipe/index.js

@@ -22,7 +22,6 @@ class Pipe {
   }
   // a pipe server for creating publicly shareable endpoints
   async start(url, scriptPath, passcode, config) {
-    console.log("pipe.start", { url, scriptPath, passcode, config })
 
     let port = await this.kernel.port()
     let app = express();
@@ -100,7 +99,6 @@ class Pipe {
 
 
     await new Promise((resolve, reject) => {
-      console.log("starting pipe server at port", port)
       let server = app.listen(port, () => {
         console.log(`Pipe server listening on port ${port}`)
         resolve()

package/script/index.js

@@ -4,6 +4,16 @@ const os = require('os')
 const platform = os.platform()
 const Server = require('../server')
 class Store {
+  constructor() {
+    let o
+    try {
+      let str = fs.readFileSync(path.resolve(__dirname, "pinokio.json"), "utf8")
+      o = JSON.parse(str)
+    } catch(e) {
+      o = {}
+    }
+    this.store =  o
+  }
   set(key, val) {
     let o
     try {
@@ -13,6 +23,7 @@ class Store {
       o = {}
     }
     o[key] = val
+    this.store = o
     fs.writeFileSync(path.resolve(__dirname, "pinokio.json"), JSON.stringify(o, null, 2))
   }
   get(key) {
@@ -31,6 +42,7 @@ class Store {
       console.log("before delete", o)
       delete o[key]
       console.log("after delete", o)
+      this.store = o
       fs.writeFileSync(path.resolve(__dirname, "pinokio.json"), JSON.stringify(o, null, 2))
     } catch (e) {
     }