pinokiod 2.15.88 → 2.15.89

package/kernel/bin/conda.js

@@ -140,7 +140,6 @@ create_default_packages:
     }, (stream) => {
       ondata(stream)
     })
-    console.log(">>>>>>>>>> Finished 'conda update-y --all'")
     if (this.kernel.platform === "win32") {
       // copy python.exe to python3.exe so you can run with both python3 and python
       await fs.promises.copyFile(
@@ -148,10 +147,8 @@ create_default_packages:
         this.kernel.bin.path("miniconda", "python3.exe"),
       )
     }
-    console.log(">>>>>>>>>> Finished 'copyFile'")
     ondata({ raw: `Install finished\r\n` })
     await this.kernel.bin.rm(installer, ondata)
-    console.log(">>>>>>>>>> RM Finished")
   }
   async exists(pattern) {
     let paths = this.paths[this.kernel.platform]
@@ -171,7 +168,6 @@ create_default_packages:
     let e
     for(let p of this.paths[this.kernel.platform]) {
       let e = await this.kernel.bin.exists(p)
-      console.log("checking installed", { p, e })
       if (e) return true
     }
     return false

package/kernel/index.js

@@ -337,18 +337,14 @@ class Kernel {
 
 //      let contents = await fs.promises.readdir(this.homedir)
       //await this.bin.init()
-      console.log("> bin.init()")
       this.bin.init()
-      console.log("> api.init()")
       await this.api.init()
-      console.log("> shell.init()")
 
       //await this.shell.init()
       this.shell.init()
 
       if (this.homedir) {
         this.sys = new Sysinfo()
-        console.log("> sys.init()")
         await this.sys.init(this)
         let info = this.sys.info
         await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
@@ -359,7 +355,6 @@ class Kernel {
           ...info
         }, null, 2))
         this.sysinfo = info
-        console.log("> template.init()")
         await this.template.init({
           kernel: this,
           system,
@@ -372,7 +367,6 @@ class Kernel {
           },
           ...info
         })
-        console.log("> update_sysinfo")
         await this.update_sysinfo()
       }
 
@@ -385,7 +379,6 @@ class Kernel {
       }
       process.env.PLAYWRIGHT_BROWSERS_PATH = this.bin.path("playwright/browsers")
       this.playwright = (await this.loader.load(pwpath)).resolved
-      console.log("Kernel.init finished")
 
 //      await this.template.init()
 

package/kernel/shell.js

@@ -539,8 +539,6 @@ class Shell {
       if (env_exists) {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-//          `conda deactivate`,
-//          `conda deactivate`,
           `conda deactivate`,
           `conda activate ${env_path}`,
         ]
@@ -548,8 +546,6 @@ class Shell {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
           `conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
-//          `conda deactivate`,
-//          `conda deactivate`,
           `conda deactivate`,
           `conda activate ${env_path}`,
         ]
@@ -558,8 +554,6 @@ class Shell {
       if (conda_name === "base") {
         conda_activation = [
           (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-//          `conda deactivate`,
-//          `conda deactivate`,
           `conda deactivate`,
           `conda activate ${conda_name}`,
         ]
@@ -570,8 +564,6 @@ class Shell {
         if (env_exists) {
           conda_activation = [
             (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
-//            `conda deactivate`,
-//            `conda deactivate`,
             `conda deactivate`,
             `conda activate ${conda_name}`,
           ]
@@ -579,8 +571,6 @@ class Shell {
           conda_activation = [
             (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
             `conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
-//            `conda deactivate`,
-//            `conda deactivate`,
             `conda deactivate`,
             `conda activate ${conda_name}`,
           ]

package/kernel/util.js

@@ -15,12 +15,6 @@ const returnPattern = /\r/g;
 const returnReplacement = "\\r";
 
 
-const { promisify } = require('util')
-const fastFolderSize = require('fast-folder-size')
-
-//const { fdir } = require("fdir");
-const { getDirSize, getDirSizeSync } = require('fast-dir-size')
-
 // asar handling for go-get-folder-size
 let g
 if( __dirname.includes(".asar") ) {
@@ -30,54 +24,13 @@ if( __dirname.includes(".asar") ) {
   g = require('go-get-folder-size');
 }
 const { getFolderSize, getFolderSizeBin, getFolderSizeWasm, } = g
-
-const fastFolderSizeAsync = promisify(fastFolderSize)
-
 const du = async (folderpath) => {
-  
-  //return getDirSize(folderpath)
-
-  let totalSize
-
-//  console.time("1")
-//  totalSize = await fastFolderSizeAsync(folderpath)
-//  console.timeEnd("1")
-//
-////  console.time(folderpath)
-//  console.time("2")
-//  totalSize = await getDirSize(folderpath)
-//  console.timeEnd("2")
-////  console.log({ totalSize })
-
-  console.time("3")
-  totalSize = await getFolderSizeBin(folderpath)
-  console.timeEnd("3")
+  console.time("disk size calc")
+  let totalSize = await getFolderSizeBin(folderpath)
+  console.timeEnd("disk size calc")
   console.log("totalSize", totalSize)
-
-//  console.time(folderpath + 2)
-//  const api = new fdir().withFullPaths().crawl(folderpath);
-//  const files = api.sync();
-//
-//  totalSize = 0;
-//
-//  for (const file of files) {
-//      try {
-//          const stats = await fs.promises.stat(file);
-//          if (stats.isFile()) {
-//              totalSize += stats.size; // Add file size in bytes
-//          }
-//      } catch (err) {
-//          console.error(`Error reading file: ${file}`, err);
-//      }
-//  }
-//  console.timeEnd(folderpath + 2)
-//  console.log({ totalSize })
-//
   return totalSize;
 }
-
-
-
 const port_running = async (host, port) => {
   const timeout = 1000
   const promise = new Promise((resolve, reject) => {
@@ -193,11 +146,8 @@ const parse_env_detail = async (filename) => {
 const log_path = (fullpath, kernel) => {
   let api_path = `${kernel.homedir}${path.sep}api`
   let rel_path = path.relative(api_path, fullpath)
-  console.log({ rel_path })
   let log_root = `${kernel.homedir}${path.sep}logs`
-  console.log({ log_root })
   let current_log_path = path.resolve(log_root, "shell/cleaned/api", rel_path)
-  console.log({ current_log_path })
   return current_log_path
 }
 const api_path = (fullpath, kernel) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "2.15.88",
+  "version": "2.15.89",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -27,10 +27,7 @@
     "express-http-proxy-cp": "^2.0.3",
     "express-session": "^1.17.3",
     "fake-useragent": "^1.0.1",
-    "fast-dir-size": "^1.3.0",
-    "fast-folder-size": "^2.3.0",
     "fastq": "^1.15.0",
-    "fdir": "^6.4.2",
     "fs-extra": "^11.1.1",
     "glob": "^10.3.3",
     "glob-gitignore": "^1.0.14",

package/server/index.js

@@ -1965,19 +1965,15 @@ class Server {
     let new_home = this.kernel.store.get("new_home")
   }
   async startLogging() {
-    console.log("> startLogging", {debug: this.debug, homedir: this.kernel.homedir})
     if (!this.debug) {
       if (this.logInterval) {
         clearInterval(this.logInterval)
       }
       if (this.kernel.homedir) {
         let exists = await this.exists(this.kernel.homedir)
-        console.log({ exists })
         if (exists) {
           let logsdir = path.resolve(this.kernel.homedir, "logs")
-          console.log({ logsdir })
           await fs.promises.mkdir(logsdir, { recursive: true }).catch((e) => { })
-          console.log("this.log", this.log)
           if (!this.log) {
             this.log = fs.createWriteStream(path.resolve(this.kernel.homedir, "logs/stdout.txt"))
             process.stdout.write = process.stderr.write = this.log.write.bind(this.log)
@@ -2076,16 +2072,8 @@ class Server {
         let str = await Environment.ENV("system", this.kernel.homedir)
         await fs.promises.writeFile(path.resolve(this.homedir, "ENVIRONMENT"), str)
       }
-
-
-
-//      let env = await Environment.get(this.kernel.homedir)
-//      if (env && env.PINOKIO_PORT) {
-//        this.port = env.PINOKIO_PORT
-//      }
     }
 
-    console.log("using port", this.port)
 
 
     // start proxy for Pinokio itself
@@ -2102,9 +2090,7 @@ class Server {
 //        });
 //      }
 //    }
-    console.log("Before startLogging")
     await this.startLogging()
-    console.log("After startLogging")
 
     // check version from this.store
     let version = this.kernel.store.get("version")
@@ -2151,28 +2137,22 @@ class Server {
       origin: '*'
     }));
 
-    console.log(">> 00")
     if (this.kernel.homedir) {
       this.app.use(express.static(this.kernel.path("web/public")))
     }
-    console.log(">> 01")
     this.app.use(express.static(path.resolve(__dirname, 'public')));
     this.app.use("/web", express.static(path.resolve(__dirname, "..", "..", "web")))
     this.app.set('view engine', 'ejs');
-    console.log(">> 1")
     if (this.kernel.homedir) {
-      console.log(">> 2")
       this.app.set("views", [
         this.kernel.path("web/views"),
         path.resolve(__dirname, "views")
       ])
     } else {
-      console.log(">> 3")
       this.app.set("views", [
         path.resolve(__dirname, "views")
       ])
     }
-    console.log(">> 4")
     this.app.use(express.json());
     this.app.use(express.urlencoded({ extended: true }));
     this.app.use(cookieParser());
@@ -2392,7 +2372,6 @@ class Server {
       })
     }))
     this.app.get("/getlog", ex(async (req, res) => {
-      console.log("query", req.query)
       let str = await fs.promises.readFile(req.query.logpath, "utf8")
       res.send(str)
     }))
@@ -3284,7 +3263,6 @@ class Server {
     // install
     this.server = httpserver.createServer(this.app);
     this.socket = new Socket(this)
-    console.log(">> 100")
     await new Promise((resolve, reject) => {
       this.listening = this.server.listen(this.port, () => {
         console.log(`Server listening on port ${this.port}`)

package/server/public/browser.css

@@ -0,0 +1,2 @@
+body {
+}

package/server/views/browser.ejs

@@ -10,6 +10,7 @@
 <link href="/markdown.css" rel="stylesheet"/>
 <link href="/noty.css" rel="stylesheet"/>
 <link href="/style.css" rel="stylesheet"/>
+<link href="/browser.css" rel="stylesheet"/>
 <script src="/hotkeys.min.js"></script>
 <script src="/sweetalert2.js"></script>
 <script src="/nav.js"></script>