pinokiod 3.4.26 → 3.4.28

package/kernel/bin/index.js

@@ -507,7 +507,7 @@ class Bin {
   //  await this.mod(name).rm({}, ondata)
   //  await this.mod(name).install(options, ondata)
   //}
-  async tryInstall(requirement, i, total, ondata) {
+  async tryInstall(requirement, x, i, total, ondata) {
     let current_platform = os.platform()
     let current_arch = os.arch()
     let current_gpu = this.kernel.gpu
@@ -566,6 +566,7 @@ class Bin {
               const message = `${m.mod.description ? '<br>' + m.mod.description : ''}`
               ondata({ html: `<b><i class="fas fa-circle-notch fa-spin"></i> ${progress} Installing ${name}</b>${message}` }, "notify2")
               console.log("## Before m.mod.install", requirement)
+              requirement._attempt = x
               await m.mod.install(requirement, ondata, this.kernel)
 
 //                // 2 second delay to fix conda issue
@@ -617,7 +618,7 @@ class Bin {
           console.log("already installed. skip.")
         } else {
           console.log("not installed. install.")
-          await this.tryInstall(requirement, i, requirements.length, ondata)
+          await this.tryInstall(requirement, x, i, requirements.length, ondata)
         }
       }
 

package/kernel/bin/vs.js

@@ -7,6 +7,38 @@ class VS {
   async install(req, ondata) {
     // 3. Run installer
     if (os.release().startsWith("10")) {
+
+      ondata({ raw: `[0] VS Installation Attempt ${req._attempt}\r\n` })
+      let attempt = req._attempt;
+      console.log("VS Installation attempt " + attempt)
+
+      // 1. wait 3 seconds
+      // 2. check installed
+      // 3. if NOT installed, j
+
+      if (attempt > 0) {
+        let WARNING = `<div><div>[NOTICE] Visual Studio install step keeps repeating?</div>
+  <ol style="padding-inline-start:20px">
+    <li>Launch <b>Visual Studio Installer</b> on Windows</li>
+    <li>Find <b>Visual Studio Build Tools 2019</b> and <b>Uninstall</b></li>
+    <li>And relaunch Pinokio</li>
+  </ol></div>`
+        /*
+        ondata({
+          raw: `\r\n\x1b[33m${WARNING}\x1b[0m\r\n\r\n`
+        })
+        */
+
+        let html = `<div>
+  <img src="/vsinstaller.gif">
+  <div style="padding:5px; font-size:12px">${WARNING}</div>
+  </div>`
+        ondata({
+          html,
+  //        href: <link location to open>,
+        }, "notify")
+      }
+
       // Download installer
       const installer_url = "https://github.com/cocktailpeanut/bin/releases/download/vs_buildtools/vs_buildtools.exe"
       const installer = "vs_buildtools.exe"
@@ -23,26 +55,8 @@ class VS {
         ondata(stream)
       })
       ondata({ raw: `Install finished\r\n\r\n` })
-      let WARNING = `<div><div>[NOTICE] Visual Studio install step keeps repeating?</div>
-<ol style="padding-inline-start:20px">
-  <li>Launch <b>Visual Studio Installer</b> on Windows</li>
-  <li>Find <b>Visual Studio Build Tools 2019</b> and <b>Uninstall</b></li>
-  <li>And relaunch Pinokio</li>
-</ol></div>`
-      /*
-      ondata({
-        raw: `\r\n\x1b[33m${WARNING}\x1b[0m\r\n\r\n`
-      })
-      */
 
-      let html = `<div>
-<img src="/vsinstaller.gif">
-<div style="padding:5px; font-size:12px">${WARNING}</div>
-</div>`
-      ondata({
-        html,
-//        href: <link location to open>,
-      }, "notify")
+
       return this.kernel.bin.rm(installer, ondata)
     } else {
       ondata({ raw: `Must be Windows 10 or above\r\n` })

package/package.json

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

package/script/index.js

@@ -37,6 +37,7 @@ class Store {
   }
 }
 const server = new Server({
+  port: 41999,
   //port: 42000,
   agent: "web",
   store: new Store()

package/server/index.js

@@ -2101,27 +2101,28 @@ class Server {
     if (options && options.port) {
       this.port = options.port
     } else {
-      let platform = os.platform()
-      if (platform === 'linux') {
-        // on linux you are not allowed to listen on ports below 1024
-        this.port = 42000
-      } else {
-        const primary_port = 80
-        const secondary_port = 42000
-        const available = await Util.is_port_available(primary_port)
-        //const running = await Util.is_port_running(primary_port)
-//        const running1 = await Util.port_running("localhost", primary_port)
-//        const running2 = await Util.port_running("127.0.0.1", primary_port)
-//        const running = running1 || running2
-//        const available = !running
-        //const available = await portfinder.isAvailablePromise({ host: "0.0.0.0", port: primary_port })
-        console.log("check available", { primary_port, available })
-        if (available) {
-          this.port = primary_port
-        } else {
-          this.port = secondary_port 
-        }
-      }
+      this.port = 42000
+//      let platform = os.platform()
+//      if (platform === 'linux') {
+//        // on linux you are not allowed to listen on ports below 1024
+//        this.port = 42000
+//      } else {
+//        const primary_port = 80
+//        const secondary_port = 42000
+//        const available = await Util.is_port_available(primary_port)
+//        //const running = await Util.is_port_running(primary_port)
+////        const running1 = await Util.port_running("localhost", primary_port)
+////        const running2 = await Util.port_running("127.0.0.1", primary_port)
+////        const running = running1 || running2
+////        const available = !running
+//        //const available = await portfinder.isAvailablePromise({ host: "0.0.0.0", port: primary_port })
+//        console.log("check available", { primary_port, available })
+//        if (available) {
+//          this.port = primary_port
+//        } else {
+//          this.port = secondary_port 
+//        }
+//      }
     }
 
     console.log("available port", this.port)