pinokiod 3.4.20 → 3.4.21

package/kernel/api/log/index.js

@@ -5,10 +5,12 @@ module.exports = async (req, ondata, kernel) => {
       params: {
         raw: <raw string (including ANSI)>,
         json: <object>,   // single line
-        json2: <object>   // multiline
+        json2: <object>   // multiline,
+        img: <image file path>
       }
     }
   */
+  console.log("log req.params", req.params)
   if (req.params) {
     if (typeof req.params.raw !== "undefined") {
       ondata({
@@ -26,6 +28,13 @@ module.exports = async (req, ondata, kernel) => {
       ondata({
         raw: JSON.stringify(req.params.json2, null, 2).replace(/\n/g, "\r\n")
       })
+//    } else if (typeof req.params.img !== "undefined") {
+//      let cwd = (req.cwd ? req.cwd : kernel.api.userdir)
+//      let filepath = kernel.api.filePath(req.params.img, cwd)
+//      let { img, ...options } = req.params
+//      let data = await kernel.bin.img2Txt(filepath, options)
+//      console.log("### imgData", { data })
+//      ondata({ raw: data })
     }
     ondata({
       raw: "\r\n"

package/kernel/bin/index.js

@@ -23,7 +23,8 @@ const { glob } = require('glob')
 const fakeUa = require('fake-useragent');
 const fse = require('fs-extra')
 const semver = require('semver')
-const terminalImage = require('terminal-image');
+//const imageToAscii = require("image-to-ascii");
+
 
 
 //const Puppet = require("./puppeteer")
@@ -42,15 +43,14 @@ 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 })
-    }
-  }
+//  img2Txt(imgPath, options) {
+//    return new Promise((resolve, reject) => {
+//      imageToAscii(imgPath, options, (err, converted) => {
+//        console.log("ImgToAscii Error", err)
+//        resolve(converted)
+//      })
+//    })
+//  }
   async download(url, dest, ondata) {
     const userAgent = fakeUa()
     console.log("download userAgent", userAgent)

package/kernel/bin/vs.js

@@ -23,11 +23,19 @@ 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.\r\n"
+      let WARNING = "[NOTICE] If the Visual Studio Install step keeps repeating, open the 'Visual Studio Installer' app on Windows, uninstall it, 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)
+
+      let html = `<div>
+<img src="/vsinstaller.gif">
+<div>${WARNING}</div>
+</div>`
+      ondata({
+        html,
+//        href: <link location to open>,
+      })
       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.20",
+  "version": "3.4.21",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,6 @@
   "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/views/terminal.ejs

@@ -203,6 +203,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             rows: this.term.rows,
           }
         }, async (packet) => {
+          console.log({ packet })
           if (packet.type === 'start') {
             refreshParent(packet)
             reloadMemory()
@@ -235,6 +236,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             }
           } else if (packet.type === "stream") {
             if (packet.data.raw) {
+              console.log("write", packet.data.raw)
               this.write(packet.data.raw)
             } else if (packet.data.json) {
               this.write(JSON.stringify(packet.data.json).replace(/\n/g, "\r\n"))