pinokiod 2.15.50 → 2.15.52

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.50",
+  "version": "2.15.52",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/views/download.ejs

@@ -165,11 +165,17 @@ body {
             </div>
           <% }) %>
         </div>
-        <form method="post" action="/pinokio/install">
+        <form id='install-form' method="post" action="/pinokio/install">
           <input type='hidden' name="requirements" value="<%=JSON.stringify(requirements)%>">
           <input type='hidden' name='callback' value="<%=current%>">
           <button class='btn'>Install</button>
         </form>
+        <div class='item'>
+          <div class='d'>Not working? <a id='del-bin'>Try a fresh install</a></div>
+          <div class='reset-bin-loading hidden'>
+            <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
+          </div>
+        </div>
       </div>
     </div>
   <% } else { %>
@@ -227,6 +233,33 @@ document.addEventListener("DOMContentLoaded", async () => {
       }
     <% } %>
   <% } %>
+  if (document.querySelector("#del-bin")) {
+    document.querySelector("#del-bin").addEventListener("click", async (e) => {
+      console.log("del-bin")
+      let proceed = confirm("Are you sure you wish to delete the bin folder?")
+      if (proceed) {
+        document.querySelector(".reset-bin-loading").classList.remove("hidden")
+        document.querySelector("#del-bin").classList.add("hidden")
+        let res = await fetch("/pinokio/delete", {
+          method: "post",
+          headers: {
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify({ type: "bin" })
+        }).then((res) => {
+          return res.json()
+        })
+        console.log(res)
+        document.querySelector(".reset-bin-loading").classList.add("hidden")
+        if (res.error) {
+          alert(res.error)
+        } else {
+          //location.href = location.href
+          document.querySelector("#install-form").submit()
+        }
+      }
+    })
+  }
 })
 </script>
 </body>

package/server/views/editor.ejs

@@ -770,7 +770,8 @@ document.addEventListener("DOMContentLoaded", async () => {
         if (res.error) {
           alert(res.error)
         } else {
-          location.href = location.href
+          document.querySelector("#install-form").submit()
+          //location.href = location.href
         }
       }
     })
@@ -875,7 +876,7 @@ const reloadMemory = async () => {
               </div>
             <% }) %>
           </div>
-          <form method="post" action="/pinokio/install">
+          <form id='install-form' method="post" action="/pinokio/install">
             <input type='hidden' name="requirements" value="<%=JSON.stringify(requirements)%>">
             <input type='hidden' name='callback' value="<%=current%>">
             <button class='btn'>Install</button>

package/server/views/fullscreen_editor.ejs

@@ -739,7 +739,8 @@ document.addEventListener("DOMContentLoaded", async () => {
         if (res.error) {
           alert(res.error)
         } else {
-          location.href = location.href
+          //location.href = location.href
+          document.querySelector("#install-form").submit()
         }
       }
     })
@@ -827,7 +828,7 @@ const reloadMemory = async () => {
               </div>
             <% }) %>
           </div>
-          <form method="post" action="/pinokio/install">
+          <form id='install-form' method="post" action="/pinokio/install">
             <input type='hidden' name="requirements" value="<%=JSON.stringify(requirements)%>">
             <input type='hidden' name='callback' value="<%=current%>">
             <button class='btn'>Install</button>