pinokiod 3.4.18 → 3.4.20

package/kernel/bin/index.js

@@ -23,6 +23,7 @@ const { glob } = require('glob')
 const fakeUa = require('fake-useragent');
 const fse = require('fs-extra')
 const semver = require('semver')
+const terminalImage = require('terminal-image');
 
 
 //const Puppet = require("./puppeteer")
@@ -41,6 +42,15 @@ class Bin {
     let response = await this.kernel.shell.run(params, null, ondata)
     return response
   }
+  async img2Txt(imgPath, options, ondata) {
+    if (imgPath.endsWith(".gif")) {
+      let data = await terminalImage.gifFile(imgPath, options)
+      ondata({ raw: data })
+    } else {
+      let data = await terminalImage.file(imgPath, options)
+      ondata({ raw: data })
+    }
+  }
   async download(url, dest, ondata) {
     const userAgent = fakeUa()
     console.log("download userAgent", userAgent)

package/kernel/bin/vs.js

@@ -23,10 +23,11 @@ class VS {
         ondata(stream)
       })
       ondata({ raw: `Install finished\r\n\r\n` })
-      let WARNING = "[NOTICE] If this step keeps repeating, try opening the 'Visual Studio Installer' app on Windows, and check if there are failed installations, and uninstall them and retry."
+      let WARNING = "[NOTICE] If this step keeps repeating, try opening the 'Visual Studio Installer' app on Windows, and check if there are failed installations, and uninstall them and retry.\r\n"
       ondata({
         raw: `\r\n\x1b[33m${WARNING}\x1b[0m\r\n\r\n`
       })
+      await this.kernel.bin.img2Txt(path.resolve(__dirname, "./vsinstaller.gif"), { width: "60%" }, ondata)
       return this.kernel.bin.rm(installer, ondata)
     } else {
       ondata({ raw: `Must be Windows 10 or above\r\n` })

package/kernel/shell.js

@@ -103,6 +103,9 @@ class Shell {
     if (this.env.CMAKE_GENERATOR) {
       delete this.env.CMAKE_GENERATOR
     }
+    if (this.env.SSLKEYLOGFILE) {
+      delete this.env.SSLKEYLOGFILE
+    }
     
 //    if (this.env.CUDA_HOME) {
 //      delete this.env.CUDA_HOME
@@ -225,8 +228,6 @@ class Shell {
     // automatically add self to the shells registry
     this.kernel.shell.add(this)
 
-    console.log("this.env", this.env)
-
     if (params.sudo) {
       let options = {
         name: "Pinokio",
@@ -672,7 +673,6 @@ class Shell {
     if (this.platform === "win32") {
       try {
         let vcvars_path = this.kernel.bin.vs_path_env.VCVARSALL_PATH
-        console.log(`[shell] vcvars_path = ${vcvars_path}`)
         if (vcvars_path) {
           const architecture = os.arch().toLowerCase();  // 'x64', 'ia32' (32-bit), etc.
           const armArchitecture = process.arch.toLowerCase(); // For ARM-based architectures (on Windows), process.arch might be 'arm64', 'arm', etc.
@@ -769,12 +769,8 @@ class Shell {
       let python_version = ""
       let use_uv = false
       if (typeof params.venv === "string") {
-        console.log("params =" ,params)
         env_path = path.resolve(params.path, params.venv)
-        console.log({ env_path })
         if (params.venv_python) {
-          console.log("isNumber", isNumber(params.venv_python))
-          console.log({ venv_python: params.venv_python })
           python_version = ` --python ${params.venv_python}`
           use_uv = true
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.4.18",
+  "version": "3.4.20",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -9,6 +9,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "terminal-image": "1.2.1",
     "@homebridge/node-pty-prebuilt-multiarch": "0.12.0-beta.5",
     "7zip-min-win-asar-support": "^1.4.4",
     "async-retry": "^1.3.3",

package/server/index.js

@@ -2029,7 +2029,6 @@ class Server {
         console.log("this.log", this.log)
         if (!this.log) {
           this.log = fs.createWriteStream(path.resolve(homedir, "logs/stdout.txt"))
-          console.log("created this.log", this.log)
           process.stdout.write = process.stderr.write = this.log.write.bind(this.log)
           process.on('uncaughtException', (err) => {
             console.error((err && err.stack) ? err.stack : err);