pinokiod 3.6.34 → 3.6.37

package/kernel/bin/index.js

@@ -4,6 +4,7 @@ const _ = require('lodash')
 const path = require('path')
 const { rimraf } = require('rimraf')
 const { DownloaderHelper } = require('node-downloader-helper');
+const { ProxyAgent } = require('proxy-agent');
 
 //const Cmake = require("./cmake")
 const Python = require('./python')
@@ -23,7 +24,7 @@ const { glob } = require('glob')
 const fakeUa = require('fake-useragent');
 const fse = require('fs-extra')
 const semver = require('semver')
-const { bootstrap } = require('global-agent')
+//const { bootstrap } = require('global-agent')
 const Environment = require('../environment')
 //const imageToAscii = require("image-to-ascii");
 
@@ -54,15 +55,27 @@ class Bin {
 //    })
 //  }
   async download(url, dest, ondata) {
+    console.log("DOWNLOAD process.env", process.env)
+    const agent = new ProxyAgent();
     const userAgent = fakeUa()
     console.log("download userAgent", userAgent)
-    const dl = new DownloaderHelper(url, this.path(), {
+    const opts = {
       fileName: dest,
       override: true,
       headers: {
         "User-Agent": userAgent
       }
-    })
+    }
+    if (process.env.HTTP_PROXY && process.env.HTTP_PROXY.length > 0) {
+      opts.httpRequestOptions = { agent }
+      opts.httpsRequestOptions = { agent }
+    }
+    if (process.env.HTTPS_PROXY && process.env.HTTPS_PROXY.length > 0) {
+      opts.httpRequestOptions = { agent }
+      opts.httpsRequestOptions = { agent }
+    }
+    console.log("opts", opts)
+    const dl = new DownloaderHelper(url, this.path(), opts)
     ondata({ raw: `\r\nDownloading ${url} to ${this.path()}...\r\n` })
     let res = await new Promise((resolve, reject) => {
       dl.on('end', () => {
@@ -174,6 +187,7 @@ class Bin {
     return e
   }
   async init() {
+    console.log("kernel.bin.init", this.kernel.homedir)
     if (this.kernel.homedir) {
       const bin_folder = this.path()
       await fs.promises.mkdir(bin_folder, { recursive: true }).catch((e) => { })
@@ -182,36 +196,34 @@ class Bin {
         process.env.PLAYWRIGHT_BROWSERS_PATH = playwright_folder
       }
 //      await fs.promises.mkdir(playwright_folder, { recursive: true }).catch((e) => { })
-    }
+      let system_env = await Environment.get(this.kernel.homedir)
+      console.log("***********", { system_env })
 
-    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.HTTP_PROXY) {
+        process.env.HTTP_PROXY = system_env.HTTP_PROXY
+      } else {
+        if (process.env.HTTP_PROXY) {
+          delete process.env.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.HTTPS_PROXY) {
+        process.env.HTTPS_PROXY = system_env.HTTPS_PROXY
+      } else {
+        if (process.env.HTTPS_PROXY) {
+          delete process.env.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
+      if (system_env.NO_PROXY) {
+        process.env.NO_PROXY = system_env.NO_PROXY
+      } else {
+        if (process.env.NO_PROXY) {
+          delete process.env.NO_PROXY
+        }
       }
     }
 
-    bootstrap();
 
-    console.log("process.env", process.env)
+//    bootstrap();
 
     // ORDERING MATTERS.
     // General purpose package managers like conda, conda needs to come at the end

package/kernel/index.js

@@ -480,6 +480,16 @@ class Kernel {
           let str = await Environment.ENV("system", this.homedir)
           await fs.promises.writeFile(path.resolve(this.homedir, "ENVIRONMENT"), str)
         }
+
+        const updated = {
+          HTTP_PROXY: (this.store.get("HTTP_PROXY") || ""),
+          HTTPS_PROXY: (this.store.get("HTTPS_PROXY") || ""),
+          NO_PROXY: (this.store.get("NO_PROXY") || "")
+        }
+        let fullpath = path.resolve(this.homedir, "ENVIRONMENT")
+        console.log("> update env", { fullpath, updated })
+        await Util.update_env(fullpath, updated)
+
         // 2. mkdir all the folders if not already created
         await Environment.init_folders(this.homedir)
 
@@ -604,10 +614,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))
+        let pwpath = this.bin.path("playwright/node_modules/playwright")
+        this.playwright = (await this.loader.load(pwpath)).resolved
       }
 
-      let pwpath = this.bin.path("playwright/node_modules/playwright")
-      this.playwright = (await this.loader.load(pwpath)).resolved
     } catch (e) {
       console.log("### ERROR", e)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.6.34",
+  "version": "3.6.37",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -31,7 +31,6 @@
     "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",
@@ -50,6 +49,7 @@
     "node-gradio-client": "^0.14.6",
     "pdrive": "^0.0.26",
     "portfinder-cp": "^1.0.34",
+    "proxy-agent": "^6.5.0",
     "qrcode": "^1.5.3",
     "random-useragent": "^0.5.0",
     "rimraf": "^5.0.0",

package/server/index.js

@@ -573,7 +573,10 @@ class Server {
         query: req.query
       })
     } else if (pathComponents.length === 0 && req.query.mode === "settings") {
-      let system_env = await Environment.get(this.kernel.homedir)
+      let system_env = {}
+      if (this.kernel.homedir) {
+        system_env = await Environment.get(this.kernel.homedir)
+      }
       let configArray = [{
         key: "home",
         description: [
@@ -1978,6 +1981,7 @@ class Server {
     }
   }
   async setConfig(config) {
+    console.log("setConfig", config)
     let home = this.kernel.store.get("home")
     let theme = this.kernel.store.get("theme")
 //    let drive = this.kernel.store.get("drive")
@@ -2047,14 +2051,11 @@ class Server {
 //    if (config.HTTPS_PROXY) {
 //      updated.HTTPS_PROXY = config.HTTPS_PROXY
 //    }
-    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)
+
+
+    this.kernel.store.set("HTTP_PROXY", config.HTTP_PROXY)
+    this.kernel.store.set("HTTPS_PROXY", config.HTTPS_PROXY)
+    this.kernel.store.set("NO_PROXY", config.NO_PROXY)
   }
   async startLogging(homedir) {
     console.log(">>>>>>> startLogging", homedir)
@@ -2366,7 +2367,10 @@ class Server {
         } else {
           _home = path.resolve(os.homedir(), "pinokio")
         }
-        let system_env = await Environment.get(this.kernel.homedir)
+        let system_env = {}
+        if (this.kernel.homedir) {
+          system_env = await Environment.get(this.kernel.homedir)
+        }
         let configArray = [{
           key: "home",
           description: [