pinokiod 3.2.129 → 3.2.131

package/kernel/bin/index.js

@@ -229,6 +229,66 @@ class Bin {
       this.installed.brew = Set()
     */
   }
+  async tryList() {
+    let res
+    let conda_check = {}
+    let conda = new Set()
+    res = await this.exec({ message: `conda list` }, (stream) => {
+//        console.log("conda list check", { stream })
+    })
+
+    console.log("CONDA", res.response)
+    lines = res.response.split(/[\r\n]+/)
+    for(let line of lines) {
+      if (start) {
+        let chunks = line.split(/\s+/).filter(x => x)
+        if (chunks.length > 1) {
+          let name = chunks[0]
+          let version = chunks[1]
+          conda.add(name)
+          if (name === "conda") {
+            if (String(version) === "24.11.1") {
+              conda_check.conda = true
+            }
+          }
+          if (name === "conda-libmamba-solver") {
+            //if (String(version) === "24.7.0") {
+            let channel = chunks[3]
+            let coerced = semver.coerce(version)
+            let mamba_requirement = ">=24.11.1"
+            console.log({ name, channel, version })
+            if (semver.satisfies(coerced, mamba_requirement) && channel === "conda-forge") {
+              conda_check.mamba = true
+            }
+          }
+          // Use sqlite to check if `conda update -y --all` went through successfully
+          // sometimes it just fails silently so need to check
+          if (name === "sqlite") {
+            let coerced = semver.coerce(version)
+            let sqlite_requirement = ">=3.47.2"
+            console.log({ coerced, version, sqlite_requirement })
+            if (semver.satisfies(coerced, sqlite_requirement)) {
+              console.log("semver satisfied")
+              conda_check.sqlite = true
+            } else {
+              console.log("semver NOT satisfied")
+            }
+          }
+        }
+      } else {
+        if (/name.*version.*build.*channel/i.test(line)) {
+          start = true 
+        }
+      }
+    }
+
+    console.log({ conda_check })
+    if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
+      this.correct_conda = true
+    }
+
+    this.installed.conda = conda
+  }
   async refreshInstalled() {
 
     console.log("refreshInstalled start")
@@ -249,88 +309,21 @@ class Bin {
     let conda_exists = await this.exists(conda_path)
     console.log({ conda_path, conda_exists })
 
-    let conda = new Set()
     let start
     let res
     let lines
-    let conda_check = {}
     if (conda_exists) {
-      res = await this.exec({ message: `conda list` }, (stream) => {
-//        console.log("conda list check", { stream })
-      })
-
-      console.log("CONDA", res.response)
-      lines = res.response.split(/[\r\n]+/)
-      for(let line of lines) {
-        if (start) {
-          let chunks = line.split(/\s+/).filter(x => x)
-          if (chunks.length > 1) {
-            let name = chunks[0]
-            let version = chunks[1]
-            conda.add(name)
-            if (name === "conda") {
-              if (String(version) === "24.11.1") {
-              //if (String(version) === "24.11.3") {
-              //if (String(version) === "24.9.0") {
-              //if (String(version) === "24.7.1") {
-              //if (String(version) === "24.11.2") {
-                conda_check.conda = true
-              }
-            }
-
-//            // check conda-libmamba-solver is up to date
-//            // sometimes it just fails silently so need to check
-//            if (name === "conda-libmamba-solver") {
-//              //if (String(version) === "24.7.0") {
-//              let channel = chunks[3]
-//              console.log({ name, channel, version })
-//              if (String(version) === "24.11.1" && channel === "conda-forge") {
-//                conda_check.mamba = true
-//              }
-//            }
-            if (name === "conda-libmamba-solver") {
-              //if (String(version) === "24.7.0") {
-              let channel = chunks[3]
-              let coerced = semver.coerce(version)
-              let mamba_requirement = ">=24.11.1"
-              console.log({ name, channel, version })
-              if (semver.satisfies(coerced, mamba_requirement) && channel === "conda-forge") {
-                conda_check.mamba = true
-              }
-            }
-
-
-            // Use sqlite to check if `conda update -y --all` went through successfully
-            // sometimes it just fails silently so need to check
-            if (name === "sqlite") {
-              let coerced = semver.coerce(version)
-              let sqlite_requirement = ">=3.47.2"
-              console.log({ coerced, version, sqlite_requirement })
-              if (semver.satisfies(coerced, sqlite_requirement)) {
-                console.log("semver satisfied")
-                conda_check.sqlite = true
-              } else {
-                console.log("semver NOT satisfied")
-              }
-            }
-          }
-        } else {
-          if (/name.*version.*build.*channel/i.test(line)) {
-            start = true 
-          }
+      // Try 3 times, because sometimes conda just silently quits with no error message
+      for(let i=0; i<3; i++) {
+        console.log("tryList", i)
+        await this.tryList()
+        console.log("> conda list", this.installed.conda)
+        if (this.installed.conda.size > 0) {
+          break 
         }
       }
     }
 
-    console.log({ conda_check })
-    if (conda_check.conda && conda_check.mamba && conda_check.sqlite) {
-    //if (conda_check.conda && conda_check.sqlite) {
-    //if (conda_check.conda) {
-      this.correct_conda = true
-    }
-
-    this.installed.conda = conda
-
     // 2. pip
     let pip = new Set()
     if (conda_exists) {

package/kernel/shell.js

@@ -689,7 +689,6 @@ class Shell {
           this.done = false
           this.ptyProcess = pty.spawn(this.shell, this.args, config)
           this.ptyProcess.onData((data) => {
-            console.log("****** onData", data)
             if (!this.done) {
               this.queue.push(data)
             }

package/package.json

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