pinokiod 3.2.192 → 3.2.194

package/kernel/bin/py.js

@@ -1,4 +1,5 @@
 const fse = require('fs-extra')
+const path = require('path')
 class Py {
   async install(req, ondata) {
     await fse.remove(this.kernel.path('bin/py'))
@@ -14,15 +15,27 @@ class Py {
   }
   async installed() {
     let exists = await this.kernel.exists(this.kernel.bin.path("py"))
-    try {
-      if (exists) {
-        return this.kernel.bin.installed.pip.has("fastapi") && this.kernel.bin.installed.pip.has("uvicorn") && this.kernel.bin.installed.pip.has("importlib_metadata")
-      } else {
-        return false
+    let exists2 = await this.kernel.exists(this.kernel.bin.path("py/env"))
+    let site_packages_root
+    if (this.kernel.platform === "win32") {
+      site_packages_root = this.kernel.bin.path("py/env/Lib/site-packages")
+    } else {
+      site_packages_root = this.kernel.bin.path("py/env/lib/python3.10/site-packages")
+    }
+    let module_paths = ["fastapi", "uvicorn", "importlib_metadata"].map((name) => {
+      return path.resolve(site_packages_root, name)
+    })
+    let exists3 = await this.kernel.exists(site_packages_root)
+    let exists4 = true
+    for(let module_path of module_paths) {
+      let exists = await this.kernel.exists(module_path)
+      if (!exists) {
+        exists4 = false
+        break;
       }
-    } catch (e) {
-      return false
     }
+    console.log({ exists, exists2, exists3, exists4 })
+    return exists && exists2 && exists3 && exists4
   }
   async uninstall(req, ondata) {
     await this.kernel.bin.rm(this.kernel.bin.path("py"), ondata)

package/package.json

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

package/server/index.js

@@ -2149,7 +2149,7 @@ class Server {
             sudo: true,
             message: `icacls ${this.kernel.homedir} /grant Users:(OI)(CI)F /T`
           }, (stream) => {
-            ondata(stream)
+            console.log({ stream })
           })
           console.log("1 Give full permission done")
         }