pinokiod 2.15.51 → 2.15.53

package/kernel/bin/playwright.js

@@ -1,38 +1,56 @@
 const fs = require('fs')
+const path = require('path')
 const { rimraf } = require('rimraf')
 class Playwright {
   async install(req, ondata) {
-    let c
+//    let c
+//    if (this.kernel.platform === "win32") {
+//      c = `npm config --global set prefix ${this.kernel.bin.path("miniconda")}`
+//    } else {
+//      c = [
+//        `npm config --global set prefix ${this.kernel.bin.path("miniconda")} --loglevel verbose`,
+//        `npm config set prefix ${this.kernel.bin.path("miniconda")} --loglevel verbose`
+//      ]
+//    }
+//    await this.kernel.exec({
+//      message: c,
+////      path: this.kernel.bin.path("playwright"),
+//      env: {
+//        PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
+//      }
+//    }, ondata)
+
+
+    let p
     if (this.kernel.platform === "win32") {
-      c = `npm config set prefix ${this.kernel.bin.path("miniconda")}`
+      p = this.kernel.path("bin/miniconda")
     } else {
-      c = `npm config set prefix ${this.kernel.bin.path("miniconda/lib")}`
+      p = this.kernel.path("bin/miniconda/lib")
     }
     await this.kernel.exec({
       message: [
 //        "npm init -y",
-        c
-      ],
-      path: this.kernel.bin.path("playwright"),
-      env: {
-        PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
-      }
-    }, ondata)
-    await this.kernel.exec({
-      message: [
-//        "npm init -y",
-        "npm install -g playwright@1.49.0",
+        "which npm",
+//        "npm config get userconfig",
+//        "npm config get globalconfig",
+//        "npm config list -l --loglevel verbose",
+//        "env",
+        //"npm install -g playwright@1.49.0 --loglevel verbose",
+        "npm install playwright@1.49.1 --loglevel verbose",
 //        "playwright install chromium",
       ],
-      //path: this.kernel.bin.path("playwright"),
+      path: p,
       env: {
         PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
       }
     }, ondata)
+    let pw_path = path.resolve(p, "node_modules/playwright/cli.js")
     await this.kernel.exec({
       message: [
 //        "npm init -y",
-        "playwright install firefox",
+        `${pw_path} install firefox`,
+//        "playwright install firefox",
+//        "npx -y playwright install firefox"
       ],
       //path: this.kernel.bin.path("playwright"),
       env: {
@@ -52,16 +70,16 @@ class Playwright {
 //        PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
 //      }
 //    }, ondata)
-    await this.kernel.exec({
-      message: [
-        "pip install playwright==1.48.0",
-//        "playwright install"
-//        "npm install playwright --ignore-scripts"
-      ],
-      env: {
-        PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
-      }
-    }, ondata)
+//    await this.kernel.exec({
+//      message: [
+//        "pip install playwright==1.48.0",
+////        "playwright install"
+////        "npm install playwright --ignore-scripts"
+//      ],
+//      env: {
+//        PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
+//      }
+//    }, ondata)
 
     let pwpath
     if (this.kernel.platform === "win32") {

package/kernel/index.js

@@ -369,7 +369,13 @@ class Kernel {
       }
 
 
-      let pwpath = this.bin.path("miniconda/lib/node_modules/playwright")
+      let pwpath
+      if (this.platform === "win32") {
+        pwpath = this.bin.path("miniconda/node_modules/playwright")
+      } else {
+        pwpath = this.bin.path("miniconda/lib/node_modules/playwright")
+      }
+      console.log("pwpath", pwpath)
       process.env.PLAYWRIGHT_BROWSERS_PATH = this.bin.path("playwright/browsers")
       this.playwright = (await this.loader.load(pwpath)).resolved
 

package/kernel/shell.js

@@ -112,6 +112,10 @@ class Shell {
 
     this.env.CMAKE_OBJECT_PATH_MAX = 1024
     this.env.PYTORCH_ENABLE_MPS_FALLBACK = 1
+//    this.env.NPM_CONFIG_USERCONFIG = this.kernel.path("user_npmrc")
+//    this.env.NPM_CONFIG_GLOBALCONFIG = this.kernel.path("global_npmrc")
+//    this.env.npm_config_userconfig = this.kernel.path("user_npmrc")
+//    this.env.npm_config_globalconfig = this.kernel.path("global_npmrc")
 
     // First override this.env with system env
     let system_env = await Environment.get(this.kernel.homedir)

package/package.json

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

package/server/index.js

@@ -2140,14 +2140,22 @@ class Server {
       origin: '*'
     }));
 
-    this.app.use(express.static(this.kernel.path("web/public")))
+    if (this.kernel.homedir) {
+      this.app.use(express.static(this.kernel.path("web/public")))
+    }
     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');
-    this.app.set("views", [
-      this.kernel.path("web/views"),
-      path.resolve(__dirname, "views")
-    ])
+    if (this.kernel.homedir) {
+      this.app.set("views", [
+        this.kernel.path("web/views"),
+        path.resolve(__dirname, "views")
+      ])
+    } else {
+      this.app.set("views", [
+        path.resolve(__dirname, "views")
+      ])
+    }
     this.app.use(express.json());
     this.app.use(express.urlencoded({ extended: true }));
     this.app.use(cookieParser());

package/server/views/download.ejs

@@ -255,7 +255,7 @@ document.addEventListener("DOMContentLoaded", async () => {
           alert(res.error)
         } else {
           //location.href = location.href
-          document.queyrSelector("#install-form").submit()
+          document.querySelector("#install-form").submit()
         }
       }
     })

package/server/views/editor.ejs

@@ -770,7 +770,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         if (res.error) {
           alert(res.error)
         } else {
-          document.queyrSelector("#install-form").submit()
+          document.querySelector("#install-form").submit()
           //location.href = location.href
         }
       }

package/server/views/fullscreen_editor.ejs

@@ -740,7 +740,7 @@ document.addEventListener("DOMContentLoaded", async () => {
           alert(res.error)
         } else {
           //location.href = location.href
-          document.queyrSelector("#install-form").submit()
+          document.querySelector("#install-form").submit()
         }
       }
     })