pinokiod 3.5.3 → 3.5.4

package/kernel/bin/conda.js

@@ -15,8 +15,8 @@ class Conda {
     },
     win32: {
       //x64: "https://github.com/cocktailpeanut/miniconda/releases/download/v23.5.2/Miniconda3-py310_23.5.2-0-Windows-x86_64.exe",
-      x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Windows-x86_64.exe"
-      //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-Windows-x86_64.exe"
+      //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.5.0-0-Windows-x86_64.exe"
+      x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_24.11.1-0-Windows-x86_64.exe"
     },
     linux: {
       //x64: "https://repo.anaconda.com/miniconda/Miniconda3-py310_23.5.2-0-Linux-x86_64.sh",
@@ -69,13 +69,14 @@ class Conda {
   - conda-forge
   - defaults
 create_default_packages:
-  - python=3.10`)
-  /*
+  - python=3.10
 remote_connect_timeout_secs: 20.0
 remote_read_timeout_secs: 300.0
 remote_max_retries: 6
 report_errors: false`)
-*/
+//repodata_threads: 4
+//fetch_threads: 5
+//report_errors: false`)
 //      }
       let pinned_exists = await this.kernel.exists("bin/miniconda/conda-meta")
       if (pinned_exists) {

package/kernel/index.js

@@ -370,7 +370,28 @@ class Kernel {
       return which.sync(name, { nothrow: true, path: this.envs.PATH })
     }
   }
-
+  async initHome() {
+    // first make dir
+    await fs.promises.mkdir(this.homedir, { recursive: true }).catch((e) => {})
+    // then wait until the app launches, and when it launches, grant access
+    if (this.platform === "win32") {
+      console.log("[initHome] Wait until the app launches")
+      let interval = setInterval(() => {
+        console.log("[initHome] Has the app launched?", this.launch_complete)
+        if (this.launch_complete) {
+          console.log("[initHome] 1 Give full permission")
+          await this.bin.exec({
+            sudo: true,
+            message: `icacls ${this.homedir} /grant Users:(OI)(CI)F /T`
+          }, (stream) => {
+            ondata(stream)
+          })
+          console.log("[initHome] 2 Give full permission done")
+          clearInterval(interval)
+        }
+      }, 1000)
+    }
+  }
   async init(options) {
     let home = this.store.get("home")
 
@@ -439,17 +460,13 @@ class Kernel {
     this.procs = {}
     this.template = new Template()
     try {
-      let grant_permission = false
       if (this.homedir) {
 
         // 0. create homedir
         let home_exists = await this.exists(this.homedir)
         console.log({ home_exists, homedir: this.homedir })
         if (!home_exists) {
-          await fs.promises.mkdir(this.homedir, { recursive: true }).catch((e) => {})
-
-          // If the homedir was newly created, give full permission to pinokio folder on windows
-          grant_permission = true
+          await this.initHome()
         }
 
 
@@ -547,19 +564,6 @@ class Kernel {
                 }, 1000)
               }
             }
-//            console.log({ grant_permission })
-//            if (grant_permission) {
-//              if (this.platform === "win32") {
-//                console.log("2 Give full permission")
-//                await this.bin.exec({
-//                  sudo: true,
-//                  message: `icacls ${this.homedir} /grant Users:(OI)(CI)F /T`
-//                }, (stream) => {
-//                  ondata(stream)
-//                })
-//                console.log("2 Give full permission done")
-//              }
-//            }
           })
         }
       })

package/package.json

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

package/server/index.js

@@ -2025,6 +2025,7 @@ class Server {
         console.log({ homedir })
         let logsdir = path.resolve(homedir, "logs")
         console.log({ logsdir })
+        await this.kernel.initHome()
         await fs.promises.mkdir(logsdir, { recursive: true }).catch((e) => { console.log(e) })
         console.log("this.log", this.log)
         if (!this.log) {