pinokiod 3.3.4 → 3.3.6

package/kernel/bin/index.js

@@ -165,8 +165,10 @@ class Bin {
     if (this.kernel.homedir) {
       const bin_folder = this.path()
       await fs.promises.mkdir(bin_folder, { recursive: true }).catch((e) => { })
-      const playwright_folder = path.resolve(bin_folder, "playwright/browsers")
-      process.env.PLAYWRIGHT_BROWSERS_PATH = playwright_folder
+      if (this.platform !== "linux") {
+        const playwright_folder = path.resolve(bin_folder, "playwright/browsers")
+        process.env.PLAYWRIGHT_BROWSERS_PATH = playwright_folder
+      }
 //      await fs.promises.mkdir(playwright_folder, { recursive: true }).catch((e) => { })
     }
     // ORDERING MATTERS.

package/kernel/bin/playwright.js

@@ -6,69 +6,38 @@ class Playwright {
     let p = this.kernel.path("bin/playwright")
     await rimraf(p)
     await fs.promises.mkdir(p, { recursive: true }).catch((e) => { })
-    let cmd
-    if (this.kernel.platform === "linux") {
-      cmd = {
-        message: [
-          "npm init -y",
-          "npm install playwright@latest --lang js --quiet",
-          //"npm install npm corepack playwright@1.49.1 --loglevel verbose",
-          //"npm install playwright --loglevel verbose",
-          //"playwright install firefox",
-  //        "playwright install chromium",
-        ],
-        on: [{
-          event: "/error:/i",
-          break: false
-        }],
-        path: p,
-        env: {
-          PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
-        }
-      }
-    } else {
-      cmd = {
-        message: [
-          "npm init -y playwright@latest -- --lang js --quiet --install-deps",
-          //"npm install npm corepack playwright@1.49.1 --loglevel verbose",
-          //"npm install playwright --loglevel verbose",
-          //"playwright install firefox",
-  //        "playwright install chromium",
-        ],
-        on: [{
-          event: "/error:/i",
-          break: false
-        }],
-        path: p,
-        env: {
-          PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
-        }
+    await this.kernel.bin.exec({
+      message: [
+        "npm init -y playwright@latest -- --lang js --quiet --install-deps",
+        //"npm install npm corepack playwright@1.49.1 --loglevel verbose",
+        //"npm install playwright --loglevel verbose",
+        //"playwright install firefox",
+//        "playwright install chromium",
+      ],
+      on: [{
+        event: "/error:/i",
+        break: false
+      }],
+      path: p,
+      env: {
+        PLAYWRIGHT_BROWSERS_PATH: this.kernel.bin.path("playwright/browsers")
       }
-    }
-    await this.kernel.bin.exec(cmd, ondata)
+    }, ondata)
     console.log("INSTALL FINISHED")
     let pwpath = this.kernel.bin.path("playwright/js/node_modules/playwright")
     this.kernel.playwright = (await this.kernel.loader.load(pwpath)).resolved
   }
   async installed() {
-    let browsers = this.kernel.path("bin/playwright/browsers")
-    let e1 = await this.kernel.bin.exists(browsers)
-    let node_modules = this.kernel.path("bin/playwright/js/node_modules/playwright")
-    let e2 = await this.kernel.bin.exists(node_modules)
-    console.log({ e1, e2 })
-    return e1 && e2
-    //if (this.kernel.platform === "linux") {
-    //  let pwpath = this.kernel.path("bin/playwright")
-    //  let e1 = await this.kernel.bin.exists(pwpath)
-    //  return e1
-    //} else {
-    //  let browsers = this.kernel.path("bin/playwright/browsers")
-    //  let e1 = await this.kernel.bin.exists(browsers)
-    //  let node_modules = this.kernel.path("bin/playwright/js/node_modules/playwright")
-    //  let e2 = await this.kernel.bin.exists(node_modules)
-    //  console.log({ e1, e2 })
-    //  return e1 && e2
-    //}
+    if (this.kernel.platform === "linux") {
+      return true
+    } else {
+      let browsers = this.kernel.path("bin/playwright/browsers")
+      let node_modules = this.kernel.path("bin/playwright/js/node_modules/playwright")
+      let e1 = await this.kernel.bin.exists(browsers)
+      let e2 = await this.kernel.bin.exists(node_modules)
+      console.log({ e1, e2 })
+      return e1 && e2
+    }
   }
   async uninstall(req, ondata) {
     ondata({ raw: "cleaning up\r\n" })

package/kernel/index.js

@@ -611,12 +611,12 @@ class Kernel {
       }
 
       let pwpath
-      if (this.platform === "win32") {
-        pwpath = this.bin.path("playwright/js/node_modules/playwright")
+      if (this.platform === "linux") {
+        this.playwright = null
       } else {
         pwpath = this.bin.path("playwright/js/node_modules/playwright")
+        this.playwright = (await this.loader.load(pwpath)).resolved
       }
-      this.playwright = (await this.loader.load(pwpath)).resolved
 
 
 //      let pwpath

package/package.json

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