pinokiod 3.3.6 → 3.3.8

package/kernel/api/fs/index.js

@@ -280,7 +280,8 @@ class FS {
             } else if (res[name].vcs_info) {
               let info = res[name].vcs_info
               log(["> VCS: ", { url, info }], ondata)
-              namespace = `${name}/${version}-${info.vcs}-${info.commit_id.slice(0, 4)}`
+              let id = info.commit_id || info.requested_revision
+              namespace = `${name}/${version}-${info.vcs}-${id.slice(0, 4)}`
             } else if (res[name].dir_info) {
               let info = res[name].dir_info
               log(["> Directory: ", { url, info }], ondata)

package/kernel/bin/playwright.js

@@ -6,39 +6,81 @@ class Playwright {
     let p = this.kernel.path("bin/playwright")
     await rimraf(p)
     await fs.promises.mkdir(p, { recursive: true }).catch((e) => { })
-    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")
-      }
-    }, 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() {
+
     if (this.kernel.platform === "linux") {
-      return true
+      await this.kernel.bin.exec({
+        message: [
+          //"npm init -y",
+          //"npm install playwright@latest"
+          "npm init -y playwright@latest -- --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")
+        }
+      }, ondata)
+      console.log("INSTALL FINISHED")
+      //let pwpath = this.kernel.bin.path("playwright/js/node_modules/playwright")
+      let pwpath = this.kernel.bin.path("playwright/node_modules/playwright")
+      this.kernel.playwright = (await this.kernel.loader.load(pwpath)).resolved
     } 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
+      await this.kernel.bin.exec({
+        message: [
+          //"npm init -y",
+          //"npm install playwright@latest --quiet --install-deps"
+          //"npm init -y playwright@latest -- --lang js --quiet --install-deps",
+          "npm init -y playwright@latest -- --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")
+        }
+      }, ondata)
+      console.log("INSTALL FINISHED")
+      //let pwpath = this.kernel.bin.path("playwright/js/node_modules/playwright")
+      let pwpath = this.kernel.bin.path("playwright/node_modules/playwright")
+      this.kernel.playwright = (await this.kernel.loader.load(pwpath)).resolved
     }
   }
+  async installed() {
+    let browsers = this.kernel.path("bin/playwright/browsers")
+    let node_modules = this.kernel.path("bin/playwright/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
+    //if (this.kernel.platform === "linux") {
+    //  let browsers = this.kernel.path("bin/playwright/browsers")
+    //  let node_modules = this.kernel.path("bin/playwright/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
+    //} 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" })
     const folder = this.kernel.bin.path("playwright")

package/kernel/index.js

@@ -610,13 +610,9 @@ class Kernel {
         //await this.shell.init()
       }
 
-      let pwpath
-      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
-      }
+      //let pwpath = this.bin.path("playwright/js/node_modules/playwright")
+      let pwpath = this.bin.path("playwright/node_modules/playwright")
+      this.playwright = (await this.loader.load(pwpath)).resolved
 
 
 //      let pwpath

package/package.json

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