pinokiod 3.6.29 → 3.6.30

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
     }
   });
@@ -199,6 +196,30 @@ 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) => {
   const env = await fs.promises.readFile(filepath, "utf8")
   let append = false;
@@ -236,5 +257,5 @@ const update_env = async (filepath, changes) => {
   await fs.promises.writeFile(filepath, newval)
 };
 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
 }

package/package.json

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

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) {
     }