pinokiod 3.2.208 → 3.2.210

package/kernel/bin/conda.js

@@ -110,7 +110,7 @@ report_errors: false`)
     for(let line of lines) {
       if (start) {
         let chunks = line.split(/\s+/).filter(x => x)
-        if (chunks.length > 1) {
+        if (chunks.length > 2) {
           let name = chunks[0]
           let version = chunks[1]
           conda.add(name)

package/kernel/bin/index.js

@@ -167,7 +167,7 @@ class Bin {
       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
-      await fs.promises.mkdir(playwright_folder, { recursive: true }).catch((e) => { })
+//      await fs.promises.mkdir(playwright_folder, { recursive: true }).catch((e) => { })
     }
     // ORDERING MATTERS.
     // General purpose package managers like conda, conda needs to come at the end
@@ -272,7 +272,7 @@ class Bin {
       for(let line of lines) {
         if (start) {
           let chunks = line.split(/\s+/).filter(x => x)
-          if (chunks.length > 1) {
+          if (chunks.length > 2) {
             let name = chunks[0]
             let version = chunks[1]
             conda.add(name)

package/kernel/bin/playwright.js

@@ -3,40 +3,15 @@ const path = require('path')
 const { rimraf } = require('rimraf')
 class Playwright {
   async install(req, ondata) {
-//    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") {
-      p = this.kernel.path("bin/miniconda")
-    } else {
-      p = this.kernel.path("bin/miniconda/lib")
-    }
+    let p = this.kernel.path("bin/playwright")
+    await rimraf(p)
+    await fs.promises.mkdir(p, { recursive: true }).catch((e) => { })
     await this.kernel.exec({
       message: [
-//        "npm init -y",
-//        "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 npm corepack playwright@1.49.1 --loglevel verbose",
+        "npm init -y",
+        //"npm install npm corepack playwright@1.49.1 --loglevel verbose",
+        "npm install playwright --loglevel verbose",
+        "playwright install firefox",
 //        "playwright install chromium",
       ],
       path: p,
@@ -44,56 +19,13 @@ class Playwright {
         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",
-        `node ${pw_path} install firefox`,
-//        "playwright install firefox",
-//        "npx -y playwright install firefox"
-      ],
-      //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 @playwright/browser-chromium@1.47.0",
-//        "npm install @playwright/browser-firefox@1.47.0",
-//        "npm install @playwright/browser-webkit@1.47.0"
-////        "npx playwright install chromium"
-//      ],
-//      path: this.kernel.bin.path("playwright"),
-//      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") {
-      pwpath = this.kernel.bin.path("miniconda/node_modules/playwright")
-    } else {
-      pwpath = this.kernel.bin.path("miniconda/lib/node_modules/playwright")
-    }
-    process.env.PLAYWRIGHT_BROWSERS_PATH = this.kernel.bin.path("playwright/browsers")
-    this.kernel.playwright = (await this.kernel.loader.load(pwpath)).resolved
   }
   async installed() {
-    let p = this.kernel.bin.path("playwright/browsers")
-    let e = await this.kernel.bin.exists(p)
-    return e
+    let browsers = this.kernel.bin.path("playwright/browsers")
+    let node_modules = this.kernel.bin.path("playwright/node_modules")
+    let e1 = await this.kernel.bin.exists(browsers)
+    let e2 = await this.kernel.bin.exists(node_modules)
+    return e1 && e2
   }
   async uninstall(req, ondata) {
     ondata({ raw: "cleaning up\r\n" })

package/kernel/index.js

@@ -236,6 +236,8 @@ class Kernel {
         return { cols, rows, id, group, path, index, cmd, done }
       }),
       proxies: [],
+      api: [],
+      bin: {},
       vars: this.vars,
       memory: this.memory,
       procs: this.procs,
@@ -288,8 +290,32 @@ class Kernel {
         })
       }
     }
-      this.api.proxies,
 
+    let files = await fs.promises.readdir(this.api.userdir, { withFileTypes: true })
+    let folders = files.filter((f) => { return f.isDirectory() }).map((x) => { return x.name })
+    let meta = {}
+    for(let folder of folders) {
+      let p = path.resolve(this.api.userdir, folder, "pinokio.js")
+      let pinokio = (await this.loader.load(p)).resolved
+      if (pinokio) {
+        i.api.push({
+          path: folder,
+          title: pinokio.title,
+          description: pinokio.description,
+          icon: pinokio.icon ? `/api/${folder}/${pinokio.icon}?raw=true` : null
+        })
+      } else {
+        i.api.push({
+          path: folder,
+        })
+      }
+    }
+    for(let key in this.bin.installed) {
+      let s = this.bin.installed[key]
+      i.bin[key] = {
+        installed: Array.from(s)
+      }
+    }
     this.i = i
   }
 
@@ -516,6 +542,13 @@ class Kernel {
         //await this.shell.init()
       }
 
+      let pwpath
+      if (this.platform === "win32") {
+        pwpath = this.bin.path("playwright/node_modules/playwright")
+      } else {
+        pwpath = this.bin.path("playwright/lib/node_modules/playwright")
+      }
+      this.kernel.playwright = (await this.kernel.loader.load(pwpath)).resolved
 
 
 //      let pwpath

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.2.208",
+  "version": "3.2.210",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -35,6 +35,7 @@
     "http-proxy": "^1.18.1",
     "http-proxy-middleware": "^3.0.0",
     "http-terminator": "^3.2.0",
+    "https": "^1.0.0",
     "isomorphic-git": "^1.23.0",
     "jimini": "^0.0.7",
     "jsdom": "^24.0.0",

package/server/index.js

@@ -516,8 +516,8 @@ class Server {
         name: "py"
       }, {
         name: "cloudflared"
-//      }, {
-//        name: "playwright"
+      }, {
+        name: "playwright"
       }, {
         name: "huggingface"
       }, {
@@ -798,8 +798,8 @@ class Server {
           name: "py"
         }, {
           name: "cloudflared"
- //       }, {
- //         name: "playwright"
+        }, {
+          name: "playwright"
         }, {
           name: "huggingface"
         }, {