pinokiod 3.2.137 → 3.2.140

package/kernel/bin/index.js

@@ -135,6 +135,7 @@ class Bin {
     // return a single merged env object, constructed from all the modules
 
     // 1. get the module envs
+    console.log("this.mods=",this.mods)
     let envs = this.mods.map((mod) => {
       if (mod.name === "vs") {
         // don't include vs now
@@ -165,6 +166,9 @@ class Bin {
     if (this.kernel.homedir) {
       const bin_folder = this.path()
       await fs.promises.mkdir(bin_folder, { recursive: true }).catch((e) => { })
+      const playwright_folder = path.resolve(bin_folder, "playwright/browsers")
+      process.env.PLAYWRIGHT_BROWSERS_PATH = playwright_folder
+      await fs.promises.mkdir(playwright_folder, { recursive: true }).catch((e) => { })
     }
     // ORDERING MATTERS.
     // General purpose package managers like conda, conda needs to come at the end
@@ -173,6 +177,7 @@ class Bin {
       return file.endsWith(".js") && file !== "index.js" && file !== "cmake.js"
     })
 
+    console.log("*bin.init")
 
     this.mods = []
     for(let filename of modfiles) {
@@ -466,6 +471,82 @@ class Bin {
   //  await this.mod(name).rm({}, ondata)
   //  await this.mod(name).install(options, ondata)
   //}
+  async tryInstall(requirement, i, total, ondata) {
+    let current_platform = os.platform()
+    let current_arch = os.arch()
+    let current_gpu = this.kernel.gpu
+    let type = requirement.type
+    let platform = requirement.platform
+    let arch = requirement.arch
+    let gpu = requirement.gpu
+    let name = requirement.name
+
+    // name := ["protobuf", "rust", "cmake"]
+    //  => 'conda install protobuf rust cmake'
+    if (Array.isArray(name)) {
+      name = name.join(" ")
+    }
+
+    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)
+      /*
+        {
+          platform: win32|darwin|linux|<none>,
+          arch: x64|arm64,
+          gpu: nvidia|amd|null,
+          type: conda|pip|brew|npm,
+          name: <package name>,
+          install: <custom install command>, // example: "brew install hashicorp/tap/vault"
+          args: <install flags>
+        }
+      */
+      console.log({ gpu, current_gpu })
+      //let percent = Math.floor(( i / requirements.length ) * 100)
+      let progress = `(${i}/${total})`
+      if ( (!platform ||platform === current_platform || (Array.isArray(platform) && platform.includes(current_platform))) &&
+            (!arch || arch === current_arch) &&
+            (!gpu || gpu === current_gpu) ) {
+        if (type === "conda") {
+          const message = (install ? install : `conda install ${name} -y ${args}`)
+          ondata({ html: `<b>${progress} Installing ${name}</b><br>${message}` }, "notify")
+          await this.exec({ message }, ondata)
+        } else if (type === "pip") {
+          const message = (install ? install : `pip install ${name} ${args}`)
+          ondata({ html: `<b>${progress} Installing ${name}</b><br>${message}` }, "notify")
+          await this.exec({ message }, ondata)
+        } else if (type === "brew") {
+          const message = (install ? install : `brew install ${name} ${args}`)
+          ondata({ html: `<b>${progress} Installing ${name}</b><br>${message}` }, "notify")
+          await this.exec({ message }, ondata)
+        } else {
+          // find the mod
+          for(let m of this.mods) {
+            if (m.name === name) {
+              //await m.mod.install(this, ondata)
+              const message = `${m.mod.description ? '<br>' + m.mod.description : ''}`
+              ondata({ html: `<b>${progress} Installing ${name}</b>${message}` }, "notify")
+              console.log("## Before m.mod.install", requirement)
+              await m.mod.install(requirement, ondata, this.kernel)
+
+//                // 2 second delay to fix conda issue
+//                await new Promise((resolve, reject) => {
+//                  setTimeout(() => {
+//                    resolve()
+//                  }, 2000)
+//                })
+              console.log("## After m.mod.install", requirement)
+              break
+            }
+          }
+        }
+
+      }
+    }
+  }
   async install(req, ondata) {
     /*
       req.params := {
@@ -486,85 +567,46 @@ class Bin {
     }
 
     let requirements = JSON.parse(req.params)
-    let current_platform = os.platform()
-    let current_arch = os.arch()
-    let current_gpu = this.kernel.gpu
     let i = 0;
     for(let requirement of requirements) {
       i++;
-      let type = requirement.type
-      let platform = requirement.platform
-      let arch = requirement.arch
-      let gpu = requirement.gpu
-      let name = requirement.name
-
-      // name := ["protobuf", "rust", "cmake"]
-      //  => 'conda install protobuf rust cmake'
-      if (Array.isArray(name)) {
-        name = name.join(" ")
-      }
-
-      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)
-        /*
-          {
-            platform: win32|darwin|linux|<none>,
-            arch: x64|arm64,
-            gpu: nvidia|amd|null,
-            type: conda|pip|brew|npm,
-            name: <package name>,
-            install: <custom install command>, // example: "brew install hashicorp/tap/vault"
-            args: <install flags>
-          }
-        */
-        console.log({ gpu, current_gpu })
-        //let percent = Math.floor(( i / requirements.length ) * 100)
-        let progress = `(${i}/${requirements.length})`
-        if ( (!platform ||platform === current_platform || (Array.isArray(platform) && platform.includes(current_platform))) &&
-             (!arch || arch === current_arch) &&
-             (!gpu || gpu === current_gpu) ) {
-          if (type === "conda") {
-            const message = (install ? install : `conda install ${name} -y ${args}`)
-            ondata({ html: `<b>${progress} Installing ${name}</b><br>${message}` }, "notify")
-            await this.exec({ message }, ondata)
-          } else if (type === "pip") {
-            const message = (install ? install : `pip install ${name} ${args}`)
-            ondata({ html: `<b>${progress} Installing ${name}</b><br>${message}` }, "notify")
-            await this.exec({ message }, ondata)
-          } else if (type === "brew") {
-            const message = (install ? install : `brew install ${name} ${args}`)
-            ondata({ html: `<b>${progress} Installing ${name}</b><br>${message}` }, "notify")
-            await this.exec({ message }, ondata)
-          } else {
-            // find the mod
-            for(let m of this.mods) {
-              if (m.name === name) {
-                //await m.mod.install(this, ondata)
-                const message = `${m.mod.description ? '<br>' + m.mod.description : ''}`
-                ondata({ html: `<b>${progress} Installing ${name}</b>${message}` }, "notify")
-                console.log("## Before m.mod.install", requirement)
-                await m.mod.install(requirement, ondata, this.kernel)
-
-//                // 2 second delay to fix conda issue
-//                await new Promise((resolve, reject) => {
-//                  setTimeout(() => {
-//                    resolve()
-//                  }, 2000)
-//                })
-                console.log("## After m.mod.install", requirement)
-                break
-              }
-            }
-          }
+      // Retry at least 5 times until it succeeds
+      for(let x=0; x<5; x++) {
+        console.log(`## Install Interation: ${x}`)
+        console.log("## Install Step 1: Try Install", requirement)
+        await this.tryInstall(requirement, i, requirements.length, ondata)
+        console.log("## Install Step 2: Refresh Installed")
+        await this.refreshInstalled()
+        console.log("## Install Step 3: Check Installed", requirement)
+        let installed = await this._installed(requirement.name, requirement.type)
+        if (installed) {
+          console.log("## Install Step 4: Installed Successful. Break")
+          break;
+        } else {
+          console.log("## Install Step 3: Install Unsuccessful. Retry")
         }
       }
     }
     await this.init()
   }
+  async _installed(name, type) {
+    if (type === "conda") {
+      return this.kernel.bin.installed.conda.has(name)
+    } else if (type === "pip") {
+      return this.kernel.bin.installed.pip.has(name)
+    } else if (type === "brew") {
+      return this.kernel.bin.installed.brew.has(name)
+    } else {
+      // check kernel/bin/<module>.installed()
+      let filepath = path.resolve(__dirname, "..", "kernel", "bin", name + ".js")
+      let mod = this.kernel.bin.mod[name]
+      let installed = false
+      if (mod.installed) {
+        installed = await mod.installed()
+      }
+      return installed
+    }
+  }
   async sh(params, ondata) {
     let response = await this.kernel.shell.run(params, null, ondata)
     return response

package/kernel/bin/node.js

@@ -8,7 +8,7 @@ class Node {
       //message: "conda install -y nodejs=22.12.0 -c conda-forge"
       message: [
         "conda clean -y --all",
-        "conda install -y nodejs=20.17.0 -c conda-forge"
+        "conda install -y nodejs=20.17.0 pnpm -c conda-forge"
       ]
 //      conda: {
 //        name: "base",
@@ -17,11 +17,11 @@ class Node {
     }, ondata)
   }
   async installed() {
-    return this.kernel.bin.installed.conda.has("nodejs")
+    return this.kernel.bin.installed.conda.has("nodejs") && this.kernel.bin.installed.conda.has("pnpm")
   }
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda remove nodejs",
+      message: "conda remove nodejs pnpm",
     }, ondata)
   }
 }

package/kernel/index.js

@@ -340,6 +340,14 @@ class Kernel {
       let ts = Date.now()
       this.bin.init().then(() => {
         console.log("bin init finished")
+        this.shell.init().then(() => {
+          if (this.envs) {
+            this.template.update({
+              env: this.envs,
+              envs: this.envs
+            })
+          }
+        })
       })
       let ts2 = Date.now()
       await this.api.init()
@@ -401,16 +409,15 @@ class Kernel {
         await this.update_sysinfo()
         console.timeEnd("update_sysinfo")
         */
-        console.log("> 4")
-        let ts3 = Date.now()
-        this.shell.init().then(() => {
-          if (this.envs) {
-            this.template.update({
-              env: this.envs,
-              envs: this.envs
-            })
-          }
-        })
+//        console.log("> 4")
+//        this.shell.init().then(() => {
+//          if (this.envs) {
+//            this.template.update({
+//              env: this.envs,
+//              envs: this.envs
+//            })
+//          }
+//        })
         //await this.shell.init()
       }
 
@@ -422,9 +429,6 @@ class Kernel {
 //      } else {
 //        pwpath = this.bin.path("miniconda/lib/node_modules/playwright")
 //      }
-      let pwpath = this.bin.path("playwright/browsers")
-      process.env.PLAYWRIGHT_BROWSERS_PATH = pwpath
-      await fs.promises.mkdir(pwpath, { recursive: true }).catch((e) => { })
 
 //      await this.template.init()
 

package/package.json

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

package/server/views/download.ejs

@@ -157,11 +157,11 @@ body {
           <% requirements.map((r) => { %>
             <div class='requirement-item'>
               <% if (r.installed) { %>
-                <div class='name'><%=r.type ? `${r.type} : ${r.name}` : r.name%></div>
+                <div class='name'><%=r.name%></div>
                 <div class='flexible'></div>
                 <div class='label'>Installed</div>
               <% } else { %>
-                <div class='name highlighted'><%=r.type ? `${r.type} : ${r.name}` : r.name%></div>
+                <div class='name highlighted'><%=r.name%></div>
                 <div class='flexible'></div>
                 <div class='label highlighted'>Not Installed</div>
               <% } %>