pinokiod 3.19.5 → 3.19.6

package/kernel/bin/cli.js

@@ -9,9 +9,9 @@ class CLI {
     console.log("Check installed")
     if (this.kernel.which('pinokio')) {
       let res = await this.kernel.exec({
-        message: "pinokio version"
+        message: "pinokio version terminal"
       }, ondata)
-      if (/.*v0\.0\.5.*/.test(res.stdout)) {
+      if (/.*pterm@0\.0\.6.*/.test(res.stdout)) {
         console.log("Installed")
         return true
       } else {

package/kernel/bin/index.js

@@ -684,7 +684,6 @@ class Bin {
     } else {
       this.client = null
     }
-    console.log("Client", this.client)
     let requirements = JSON.parse(req.params)
     for(let x=0; x<10; x++) {
       console.log(`## Install Attempt ${x}`)
@@ -994,9 +993,18 @@ class Bin {
         let r = requirements[i]
         let fingerprint = JSON.stringify(r)
         let installed
-        if (this.requirements_cache[fingerprint]) {
-          installed = true
-          requirements[i].installed = true
+        if (fingerprint in this.requirements_cache) {
+          let relevant = this.relevant(r)
+          requirements[i].relevant = relevant
+          if (relevant) {
+            let dependencies
+            if (r.name === "conda") {
+              dependencies = config.bin.conda_requirements
+              requirements[i].dependencies = dependencies
+            }
+            installed = this.requirements_cache[fingerprint]
+            requirements[i].installed = this.requirements_cache[fingerprint]
+          }
         } else {
           //let installed = await this.installed(r)
           //requirements[i].installed = installed
@@ -1012,10 +1020,11 @@ class Bin {
               requirements[i].dependencies = dependencies
             }
             installed = await this.check_installed(r, dependencies)
-            if (installed) {
-              // cache if true
-              this.requirements_cache[fingerprint] = true
-            }
+            this.requirements_cache[fingerprint] = installed
+            //if (installed) {
+            //  // cache if true
+            //  this.requirements_cache[fingerprint] = true
+            //}
             requirements[i].installed = installed
           }
         }

package/kernel/index.js

@@ -927,10 +927,13 @@ class Kernel {
   }
   async exec(params, ondata) {
 //    params.path = this.path()
-//    if (this.client) {
-//      params.cols = this.client.cols
-//      params.rows = this.client.rows
-//    }
+    if (this.client) {
+      params.cols = this.client.cols
+      params.rows = this.client.rows
+    } else if (this.bin.client) {
+      params.cols = this.bin.client.cols
+      params.rows = this.bin.client.rows
+    }
     let response = await this.shell.run(params, null, ondata)
     return response
   }

package/kernel/shells.js

@@ -302,6 +302,7 @@ class Shells {
       }
     */
     let session = this.get(params.id)
+    console.log({ session })
     if (session) {
       session.resize(params.resize)
     }

package/kernel/util.js

@@ -32,10 +32,9 @@ if( __dirname.includes(".asar") ) {
 }
 const { getFolderSize, getFolderSizeBin, getFolderSizeWasm, } = g
 const du = async (folderpath) => {
-  console.time("disk size calc")
+//  console.time("disk size calc")
   let totalSize = await getFolderSizeBin(folderpath)
-  console.timeEnd("disk size calc")
-  console.log("totalSize", totalSize)
+//  console.timeEnd("disk size calc")
   return totalSize;
 }
 

package/package.json

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

package/server/index.js

@@ -4897,6 +4897,9 @@ class Server {
       await compressing.zip.compressDir(folder, zipPath)
       res.json({ success: true })
     }))
+    this.app.get("/pinokio/version", ex(async (req, res) => {
+      res.json(this.version)
+    }))
     this.app.get("/pinokio/info", ex(async (req, res) => {
       await this.kernel.getInfo(true)
       let info = Object.assign({}, this.kernel.i)

package/server/socket.js

@@ -157,6 +157,7 @@ class Socket {
               paste: req.paste
             })
           } else if (req.resize && req.id) {
+            console.log("RESIZE", req)
             this.parent.kernel.shell.resize({
               id: req.id,
               resize: req.resize

package/server/views/install.ejs

@@ -244,6 +244,7 @@ document.addEventListener("DOMContentLoaded", async () => {
   });
   observer.observe(document.body)
   await new Promise((resolve, reject) => {
+    console.log({ cols: term.cols, rows: term.rows })
     socket.run({
       id: location.pathname,
       method: "kernel.bin.install",