pinokiod 3.6.33 → 3.6.35

package/kernel/api/index.js

@@ -567,18 +567,10 @@ class Api {
 
   }
   async step (request, rawrpc, input, i, total, args) {
-    console.log("####### step")
-
     console.time("STEP INIT")
     await Promise.all([this.init(), this.kernel.update_sysinfo()])
     console.timeEnd("STEP INIT")
 
-//    await this.init()
-//
-//    console.time("api.update_sysinfo")
-//    await this.kernel.update_sysinfo()
-//    console.timeEnd("api.update_sysinfo")
-
     // clear global regular expression object RegExp.lastMatch (memory leak prevention)
     let r = /\s*/g.exec("");
 

package/kernel/bin/conda.js

@@ -80,8 +80,8 @@ report_errors: false`)
 //      }
       let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
       if (pinned_exists) {
-        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3
-sqlite ==3.47.2`)
+        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3`)
+//sqlite ==3.47.2`)
 //        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
 //        await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
 //conda-libmamba-solver=24.11.1`)
@@ -139,14 +139,14 @@ sqlite ==3.47.2`)
           // Use sqlite to check if `conda update -y --all` went through successfully
           // sometimes it just fails silently so need to check
           if (name === "sqlite") {
-            if (String(version) === "3.47.2") {
-            //let coerced = semver.coerce(version)
-            //let sqlite_requirement = ">=3.47.2"
-            //if (semver.satisfies(coerced, sqlite_requirement)) {
-              console.log("sqlite version satisfied")
+            let coerced = semver.coerce(version)
+            let sqlite_requirement = ">=3.47.2"
+            if (semver.satisfies(coerced, sqlite_requirement)) {
+              console.log("semver satisfied")
+
               conda_check.sqlite = true
             } else {
-              console.log("sqlite version NOT satisfied")
+              console.log("semver NOT satisfied")
             }
           }
         }
@@ -207,8 +207,8 @@ sqlite ==3.47.2`)
     let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
     if (pinned_exists) {
       //await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.1`)
-      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3
-sqlite ==3.47.2`)
+      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda ==24.11.3`)
+//sqlite ==3.47.2`)
 //      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.9.0`)
 //      await fs.promises.writeFile(this.kernel.path('bin/miniconda/conda-meta/pinned'), `conda=24.11.2
 //conda-libmamba-solver=24.11.1`)
@@ -251,7 +251,8 @@ sqlite ==3.47.2`)
       //"conda install -y conda-libmamba-solver=24.11.1 conda=24.7.1",
       //"conda install -y conda-libmamba-solver=24.11.1 conda=24.11.2",
       //"conda update -y conda-libmamba-solver",
-      "conda update -y conda sqlite",// -vvv --debug",
+      //"conda update -y conda sqlite",// -vvv --debug",
+      "conda update -y conda",// -vvv --debug",
       "conda update -y --all",// -vvv --debug",
 //      "python -m pip install --upgrade pip setuptools wheel",
 //      "python -m ensurepip --upgrade",

package/kernel/bin/index.js

@@ -23,6 +23,8 @@ const { glob } = require('glob')
 const fakeUa = require('fake-useragent');
 const fse = require('fs-extra')
 const semver = require('semver')
+const { bootstrap } = require('global-agent')
+const Environment = require('../environment')
 //const imageToAscii = require("image-to-ascii");
 
 
@@ -181,6 +183,36 @@ class Bin {
       }
 //      await fs.promises.mkdir(playwright_folder, { recursive: true }).catch((e) => { })
     }
+
+    let system_env = await Environment.get(this.kernel.homedir)
+    console.log("***********", { system_env })
+
+    if (system_env.HTTP_PROXY) {
+      process.env.GLOBAL_AGENT_HTTP_PROXY = system_env.HTTP_PROXY
+    } else {
+      if (process.env.GLOBAL_AGENT_HTTP_PROXY) {
+        delete process.env.GLOBAL_AGENT_HTTP_PROXY
+      }
+    }
+    if (system_env.HTTPS_PROXY) {
+      process.env.GLOBAL_AGENT_HTTPS_PROXY = system_env.HTTPS_PROXY
+    } else {
+      if (process.env.GLOBAL_AGENT_HTTPS_PROXY) {
+        delete process.env.GLOBAL_AGENT_HTTPS_PROXY
+      }
+    }
+    if (system_env.NO_PROXY) {
+      process.env.GLOBAL_AGENT_NO_PROXY = system_env.NO_PROXY
+    } else {
+      if (process.env.GLOBAL_AGENT_NO_PROXY) {
+        delete process.env.GLOBAL_AGENT_NO_PROXY
+      }
+    }
+
+    bootstrap();
+
+    console.log("process.env", process.env)
+
     // ORDERING MATTERS.
     // General purpose package managers like conda, conda needs to come at the end
 
@@ -309,15 +341,15 @@ class Bin {
             // Use sqlite to check if `conda update -y --all` went through successfully
             // sometimes it just fails silently so need to check
             if (name === "sqlite") {
-//              let coerced = semver.coerce(version)
-//              let sqlite_requirement = ">=3.47.2"
-//  //            console.log({ coerced, version, sqlite_requirement })
-//              if (semver.satisfies(coerced, sqlite_requirement)) {
-              if (String(version) === "3.47.2") {
-                console.log("sqlite version satisfied")
+              let coerced = semver.coerce(version)
+              let sqlite_requirement = ">=3.47.2"
+  //            console.log({ coerced, version, sqlite_requirement })
+              if (semver.satisfies(coerced, sqlite_requirement)) {
+                console.log("semver satisfied")
+
                 conda_check.sqlite = true
               } else {
-                console.log("sqlite version NOT satisfied")
+                console.log("semver NOT satisfied")
               }
             }
           }

package/kernel/environment.js

@@ -400,6 +400,12 @@ const get2 = async (filepath, kernel) => {
   let api_env = await get(api_path)
   let process_env = kernel.envs || process.env
   let current_env = Object.assign({}, process_env, default_env, api_env)
+  for(let key in current_env) {
+    let val = current_env[key]
+    if (typeof val === 'String' && val.trim() === "") {
+      delete current_env[key]
+    }
+  }
   return current_env
 }
 

package/kernel/index.js

@@ -234,9 +234,14 @@ class Kernel {
   async wait(options) {
     await waitOn(options)
   }
-  async getInfo(){
+  async getInfo(refresh){
     let info = this.sysinfo
-    await this.update_sysinfo()
+    console.time(">>>>> updateSysinfo")
+    console.log("refresh", refresh)
+    if (refresh) {
+      await this.update_sysinfo()
+    }
+    console.timeEnd(">>>>> updateSysinfo")
     let i = {
       version: this.version,
       platform: this.platform,
@@ -599,68 +604,10 @@ class Kernel {
 
         await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
         await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify(this.i, null, 2))
-
-      /*
-        this.sys = new Sysinfo()
-        await this.sys.init(this)
-        let info = this.sys.info
-        await fs.promises.mkdir(this.path("logs"), { recursive: true }).catch((e) => { })
-        await fs.promises.writeFile(this.path("logs/system.json"), JSON.stringify({
-          platform: this.platform,
-          arch: this.arch,
-          home: this.homedir,
-          ...info
-        }, null, 2))
-        this.sysinfo = info
-        console.time("template.init")
-        await this.template.init({
-          kernel: this,
-          system,
-          platform: this.platform,
-          arch: this.arch,
-          proxy: (port) => {
-            return this.api.get_proxy_url("/proxy", port)
-          },
-          ...info
-        })
-        console.timeEnd("template.init")
-        console.time("update_sysinfo")
-        await this.update_sysinfo()
-        console.timeEnd("update_sysinfo")
-        */
-//        console.log("> 4")
-//        this.shell.init().then(() => {
-//          if (this.envs) {
-//            this.template.update({
-//              env: this.envs,
-//              envs: this.envs
-//            })
-//          }
-//        })
-        //await this.shell.init()
       }
 
-      //let pwpath = this.bin.path("playwright/js/node_modules/playwright")
       let pwpath = this.bin.path("playwright/node_modules/playwright")
       this.playwright = (await this.loader.load(pwpath)).resolved
-
-
-//      let pwpath
-//      if (this.platform === "win32") {
-//        pwpath = this.bin.path("miniconda/node_modules/playwright")
-//      } else {
-//        pwpath = this.bin.path("miniconda/lib/node_modules/playwright")
-//      }
-
-//      await this.template.init()
-
-
-//      let PuppeteerPath = this.bin.path("puppet", "node_modules", "puppeteer")
-//      this.puppet = (await this.loader.load(PuppeteerPath)).resolved
-//      this.puppet.setGlobalOptions({
-//        userDataDir: this.bin.path("puppet")
-//      });
-
     } catch (e) {
       console.log("### ERROR", e)
     }
@@ -676,7 +623,6 @@ class Kernel {
     try {
       await this.sys.refresh()
       let info = this.sys.info
-      console.log({ info })
       this.template.update(info)
       this.sysinfo = info
       this.gpu = info.gpu

package/kernel/sysinfo.js

@@ -36,7 +36,6 @@ class Sysinfo {
 //    await this.net()
   }
   async gpus() {
-    console.log("SYSINFO GPUS")
     let g = await system.graphics()
     let gpus
     if (g && g.controllers && g.controllers.length > 0) {

package/kernel/util.js

@@ -200,6 +200,7 @@ const escapeStringRegexp = (string) => {
 }
 
 const update_env = async (filepath, changes) => {
+  console.log("UPDATE_ENV", { filepath, changes })
   const env = await fs.promises.readFile(filepath, "utf8")
   let append = false;
   const newval = Object.keys(changes).reduce((result, varname) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.6.33",
+  "version": "3.6.35",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -31,6 +31,7 @@
     "fs-extra": "^11.1.1",
     "glob": "^10.3.3",
     "glob-gitignore": "^1.0.14",
+    "global-agent": "^3.0.0",
     "go-get-folder-size": "^0.5.5",
     "http-proxy": "^1.18.1",
     "http-proxy-middleware": "^3.0.0",

package/server/index.js

@@ -75,6 +75,7 @@ class Server {
       process.env.WEBKIT_DISABLE_DMABUF_RENDERER = 1
     }
 
+      
 //    process.env.CONDA_LIBMAMBA_SOLVER_DEBUG_LIBSOLV = 1
   }
   stop() {
@@ -572,6 +573,10 @@ class Server {
         query: req.query
       })
     } else if (pathComponents.length === 0 && req.query.mode === "settings") {
+      let system_env = {}
+      if (this.kernel.homedir) {
+        system_env = await Environment.get(this.kernel.homedir)
+      }
       let configArray = [{
         key: "home",
         description: [
@@ -588,6 +593,21 @@ class Server {
         key: "theme",
         val: this.theme,
         options: ["light", "dark"]
+      }, {
+        key: "HTTP_PROXY",
+        val: (system_env.HTTP_PROXY || ""),
+        show_on_click: "#proxy",
+        placeholder: "(Advanced) Only set if you are behind a proxy"
+      }, {
+        key: "HTTPS_PROXY",
+        val: (system_env.HTTPS_PROXY || ""),
+        show_on_click: "#proxy",
+        placeholder: "(Advanced) Only set if you are behind a proxy"
+      }, {
+        key: "NO_PROXY",
+        val: (system_env.NO_PROXY || ""),
+        show_on_click: "#proxy",
+        placeholder: "(Advanced) Only set if you are behind a proxy"
       }]
       let folders = {}
       if (this.kernel.homedir) {
@@ -597,6 +617,7 @@ class Server {
           drive: path.resolve(this.kernel.homedir, "drive"),
         }
       }
+      console.log({ configArray })
       res.render("settings", {
         platform,
         version: this.version,
@@ -2018,6 +2039,27 @@ class Server {
     home = this.kernel.store.get("home")
     theme = this.kernel.store.get("theme")
     let new_home = this.kernel.store.get("new_home")
+
+    // Handle environment variables
+    // HTTP_PROXY
+    // HTTPS_PROXY
+//    const updated = { }
+//    if (config.HTTP_PROXY) {
+//      updated.HTTP_PROXY = config.HTTP_PROXY
+//    }
+//    if (config.HTTPS_PROXY) {
+//      updated.HTTPS_PROXY = config.HTTPS_PROXY
+//    }
+    if (this.kernel.homedir) {
+      const updated = {
+        HTTP_PROXY: config.HTTP_PROXY,
+        HTTPS_PROXY: config.HTTPS_PROXY,
+        NO_PROXY: config.NO_PROXY,
+      }
+      let fullpath = path.resolve(this.kernel.homedir, "ENVIRONMENT")
+      console.log({ updated })
+      await Util.update_env(fullpath, updated)
+    }
   }
   async startLogging(homedir) {
     console.log(">>>>>>> startLogging", homedir)
@@ -2329,6 +2371,10 @@ class Server {
         } else {
           _home = path.resolve(os.homedir(), "pinokio")
         }
+        let system_env = {}
+        if (this.kernel.homedir) {
+          system_env = await Environment.get(this.kernel.homedir)
+        }
         let configArray = [{
           key: "home",
           description: [
@@ -2346,6 +2392,21 @@ class Server {
           key: "theme",
           val: this.theme,
           options: ["light", "dark"]
+        }, {
+          key: "HTTP_PROXY",
+          val: (system_env.HTTP_PROXY || ""),
+          show_on_click: "#proxy",
+          placeholder: "(Advanced) Only set if you are behind a proxy"
+        }, {
+          key: "HTTPS_PROXY",
+          val: (system_env.HTTPS_PROXY || ""),
+          show_on_click: "#proxy",
+          placeholder: "(Advanced) Only set if you are behind a proxy"
+        }, {
+          key: "NO_PROXY",
+          val: (system_env.NO_PROXY || ""),
+          show_on_click: "#proxy",
+          placeholder: "(Advanced) Only set if you are behind a proxy"
         }]
         let folders = {}
         if (this.kernel.homedir) {
@@ -3137,7 +3198,7 @@ class Server {
       res.json({ success: true })
     }))
     this.app.get("/pinokio/info", ex(async (req, res) => {
-      await this.kernel.getInfo()
+      await this.kernel.getInfo(true)
       let info = Object.assign({}, this.kernel.i)
       info.launch_complete = this.kernel.launch_complete
       console.log("kernel.launch_complete", this.kernel.launch_complete)
@@ -3391,7 +3452,6 @@ class Server {
       this.start({ debug: this.debug, browser: this.browser })
     }))
     this.app.post("/config", ex(async (req, res) => {
-      console.log("/config", { body: req.body })
       try {
         await this.setConfig(req.body)
         res.json({ success: true })

package/server/socket.js

@@ -16,7 +16,6 @@ class Socket {
         });
       });
       ws.on('message', async (message) => {
-        console.log("MESSAGE", message)
         const req = JSON.parse(message);
         if (req.response) {
           this.parent.kernel.api.respond(req)

package/server/views/settings.ejs

@@ -194,6 +194,12 @@ hr {
   margin-bottom: 10px;
   text-align: center;
 }
+#proxy {
+  text-decoration: underline;
+  margin-left: 10px;
+  display: inline-block;
+  cursor: pointer;
+}
 </style>
 <script src="/hotkeys.min.js"></script>
 <script src="/sweetalert2.js"></script>
@@ -266,7 +272,7 @@ hr {
   </div>
   <form>
     <% config.forEach((c) => { %>
-      <div class='item'>
+      <div class='item <%=c.show_on_click ? "hidden" : ""%>' <%=c.show_on_click ? "data-onclick=" + c.show_on_click : ""%>>
         <label><%=c.key%></label>
         <% if (c.options) { %>
           <select name="<%=c.key%>">
@@ -298,6 +304,7 @@ hr {
     <% }) %>
     <br>
     <button id='save' class='btn disabled'>Save</button>
+    <a id='proxy'>Running behind proxy?</a>
   </form>
   <div class='loading hidden'>
     <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
@@ -485,6 +492,11 @@ document.addEventListener("DOMContentLoaded", async () => {
 //    let sep = "<%=platform === 'win32' ? '\\' : '/'%>" 
 //    document.querySelector("[name=drive]").value = e.target.value + sep + "drive"
 //  })
+  document.querySelector("#proxy").addEventListener("click", (e) => {
+    document.querySelectorAll("[data-onclick='#proxy']").forEach((el) => {
+      el.classList.remove("hidden")
+    })
+  })
   document.querySelector("#back").addEventListener("click", (e) => {
     history.back()
   })
@@ -523,6 +535,11 @@ document.addEventListener("DOMContentLoaded", async () => {
       document.querySelector("[name=home]").focus()
       return
     }
+    if (val.length === 0) {
+      alert("Please set the home path")
+      document.querySelector("[name=home]").focus()
+      return
+    }
 
 //    let drive = document.querySelector(`[name=drive]`).value
 //    if (/.*\s+.*/.test(drive)) {
@@ -536,15 +553,30 @@ document.addEventListener("DOMContentLoaded", async () => {
     document.querySelector("#save").classList.add("hidden")
     document.querySelector("[name=home]").setAttribute("disabled", "disabled")
 //    document.querySelector("[name=drive]").setAttribute("disabled", "disabled")
-    let theme = document.querySelector(`[name=theme]`).value
+//    let theme = document.querySelector(`[name=theme]`).value
+
+
+    let body = {}
+    let els = document.querySelectorAll(".item [name]")
+    for(let el of els) {
+      let name = el.getAttribute("name")
+//      if (el.value && el.value.length > 0) {
+      body[name] = el.value
+//      }
+    }
+
+console.log("body", body)
+
+
     let r = await fetch("/config", {
       method: "post",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({
-        home: (val && val.length > 0 ? val : null),
-//        drive: (drive && drive.length > 0 ? drive : null),
-        theme 
-      })
+      body: JSON.stringify(body)
+//      body: JSON.stringify({
+//        home: (val && val.length > 0 ? val : null),
+////        drive: (drive && drive.length > 0 ? drive : null),
+//        theme 
+//      })
     }).then((res) => {
       return res.json()
     })