pinokiod 3.2.152 → 3.2.154

package/kernel/bin/conda.js

@@ -99,45 +99,56 @@ create_default_packages:
     console.log("CONDA", res.response)
     let lines = res.response.split(/[\r\n]+/)
     let conda_check = {}
+    let conda = new Set()
+    let start = false
     for(let line of lines) {
-      let chunks = line.split(/\s+/).filter(x => x)
-      if (chunks.length > 1) {
-        let name = chunks[0]
-        let version = chunks[1]
-        if (name === "conda") {
-          if (String(version) === "24.11.1") {
-            conda_check.conda = true
+      console.log({ line, start })
+      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
+            }
           }
-        }
-        // 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]
-          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
+          // 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]
+            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")
+          // 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("> Check", { conda_check })
+    console.log("> Check", { conda_check, conda })
+    this.kernel.bin.installed.conda = conda
     return conda_check.conda && conda_check.mamba && conda_check.sqlite
   }
   async install(req, ondata) {

package/kernel/bin/index.js

@@ -244,6 +244,7 @@ class Bin {
     console.log("CONDA", res.response)
     let lines = res.response.split(/[\r\n]+/)
     for(let line of lines) {
+      console.log({ line, start })
       if (start) {
         let chunks = line.split(/\s+/).filter(x => x)
         if (chunks.length > 1) {
@@ -280,7 +281,7 @@ class Bin {
           }
         }
       } else {
-        if (/name.*version.*build.*channel/i.test(line)) {
+        if (/.*name.*version.*build.*channel/i.test(line)) {
           start = true 
         }
       }
@@ -486,10 +487,10 @@ class Bin {
 
     let install = requirement.install // custom install command
     let args = requirement.args || ""
-    if (requirement.installed) {
-      console.log("Already installed", requirement)
-    } else {
-      console.log("Not yet installed", requirement)
+//    if (requirement.installed) {
+//      console.log("Already installed", requirement)
+//    } else {
+//      console.log("Not yet installed", requirement)
       /*
         {
           platform: win32|darwin|linux|<none>,
@@ -542,7 +543,7 @@ class Bin {
         }
 
       }
-    }
+//    }
   }
   async install(req, ondata) {
     /*
@@ -564,31 +565,76 @@ class Bin {
     }
 
     let requirements = JSON.parse(req.params)
-    let i = 0;
-    for(let requirement of requirements) {
-      i++;
-      // Retry at least 5 times until it succeeds
-      for(let x=0; x<10; x++) {
-        console.log(`## Install Interation: ${x}`)
-        console.log(`## [${x}] Install Step 1: Try Install`, requirement)
-        await this.tryInstall(requirement, i, requirements.length, ondata)
-        console.log(`## [${x}] Install Step 2: Refresh Installed`)
-        await this.refreshInstalled()
-        console.log(`## [${x}] Install Step 3: Check Installed`, requirement)
+
+    for(let x=0; x<10; x++) {
+      console.log(`## Install Attempt ${x}`)
+      let i = 0;
+      for(let requirement of requirements) {
+        i++;
+        // Retry at least 5 times until it succeeds
+        let installed = await this._installed(requirement.name, requirement.type)
+        console.log(`## [${x}] Install Step 1: Check installed before installing`, requirement.name, installed)
+        if (installed) {
+          // skip
+          console.log("already installed. skip.")
+        } else {
+          console.log("not installed. install.")
+          await this.tryInstall(requirement, i, requirements.length, ondata)
+        }
+      }
+
+      // refresh installed
+      await this.refreshInstalled()
+
+      // check all requirements if they're installed
+
+      let install_success = true
+      for(let requirement of requirements) {
         let installed = await this._installed(requirement.name, requirement.type)
+        console.log(`## [${x}] Install Step 2: Check installed after installing`, requirement.name, installed)
         if (installed) {
-          console.log(`## [${x}] Install Step 4: Installed Successful. Break`, requirement)
-          break;
+          console.log("already installed.")
         } else {
-          console.log(`## [${x}] Install Step 4: Install Unsuccessful. Retrying in 2 seconds`, requirement)
-          await new Promise((resolve, reject) => {
-            setTimeout(()=> {
-              resolve()
-            }, 2000)
-          })
+          console.log("not installed.")
+          install_success = false
+          break
         }
       }
+
+      // if install successful, break.
+      // otherwise repeat
+      console.log(`## [${x}] Install Step 3: All Installed? ${install_success}`)
+      if (install_success) {
+        console.log("Successful. Break")
+        break
+      } else {
+        console.log("Not Successful. Retry.")
+      }
     }
+    //for(let requirement of requirements) {
+    //  i++;
+    //  // Retry at least 5 times until it succeeds
+    //  for(let x=0; x<10; x++) {
+    //    console.log(`## Install Interation: ${x}`)
+    //    console.log(`## [${x}] Install Step 1: Try Install`, requirement)
+    //    await this.tryInstall(requirement, i, requirements.length, ondata)
+    //    console.log(`## [${x}] Install Step 2: Refresh Installed`)
+    //    await this.refreshInstalled()
+    //    console.log(`## [${x}] Install Step 3: Check Installed`, requirement)
+    //    let installed = await this._installed(requirement.name, requirement.type)
+    //    if (installed) {
+    //      console.log(`## [${x}] Install Step 4: Installed Successful. Break`, requirement)
+    //      break;
+    //    } else {
+    //      console.log(`## [${x}] Install Step 4: Install Unsuccessful. Retrying in 2 seconds`, requirement)
+    //      await new Promise((resolve, reject) => {
+    //        setTimeout(()=> {
+    //          resolve()
+    //        }, 2000)
+    //      })
+    //    }
+    //  }
+    //}
     await this.init()
   }
   async _installed(name, type) {

package/package.json

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

package/server/index.js

@@ -234,7 +234,7 @@ class Server {
         console.log("semver satisfied", config.version, this.kernel.schema)
       } else {
         console.log("semver NOT satisfied", config.version, this.kernel.schema)
-        error = `Please update Pinokio to the latest version (current script version: ${config.version}, supported: ${this.kernel.schema}`
+        error = `Please update to the latest Pinokio (current script version: ${config.version}, supported: ${this.kernel.schema})`
       }
     }
 

package/server/views/app.ejs

@@ -399,23 +399,30 @@ nav .logo {
   font-size: 14px;
   padding: 10px;
 }
-nav.error-message .btn i {
-  margin-right: 5px;
+.error-message .btn i {
+  margin-right: 10px;
 }
-nav.error-message .btn {
+.error-message .btn {
+  margin-top: 20px;
   align-items: center;
   display: flex;
   letter-spacing: 0px;
   background: black;
   color: yellow;
   font-size: 20px;
-  padding: 10px 20px;
+  padding: 10px 30px;
 }
-nav.error-message {
+.error-message {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-weight: bold;
   background: yellow !important;
   flex-grow: 1;
-  padding: 50px;
+  padding: 0 50px;
   font-size: 40px;
+  line-height: 40px;
   color: black;
   letter-spacing: -2px;
 }
@@ -635,11 +642,11 @@ body.dark .loader-container {
   -->
 </aside>
 <% if (error) { %>
-  <nav class='error-message'>
-    <div><i class="fa-solid fa-rotate"></i> <%=error%></div>
-    <div class='flexible'></div>
+  <div class='error-message'>
+    <h1><i class="fa-solid fa-rotate"></i></h1>
+    <div><%=error%></div>
     <a class='btn' target="_blank" href="https://program.pinokio.computer/#/?id=install"><i class="fa-solid fa-square-arrow-up-right"></i> Download</a>
-  </nav>
+  </div>
 <% } else { %>
   <div class='container'>
     <nav>