pinokiod 1.1.7 → 1.1.9

package/kernel/bin/conda.js

@@ -74,8 +74,8 @@ class Conda {
         (this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
         (this.platform === 'win32' ? `activate base` : `conda activate base`),
         "conda config --add create_default_packages python=3.10",
+        "conda install -y pip brotli brotlipy",
         "conda update -y --all",
-        "conda install -y pip",
       ]
     }, (stream) => {
       ondata(stream)

package/kernel/index.js

@@ -29,6 +29,7 @@ class Kernel {
     this.fetch = fetch
     this.store = store
     this.arch = os.arch()
+    this.os = os
     this.platform = os.platform()
     this.key = new Key()
   }

package/kernel/template.js

@@ -1,17 +1,16 @@
-const os = require("os")
 const system = require('systeminformation');
 const path = require("path")
-const si = require('systeminformation')
 const fs = require("fs")
 const _ = require("lodash")
 class Template {
   constructor(kernel) {
     this.kernel = kernel
-    this.platform = os.platform()
-    this.arch = os.arch()
+    this.platform = kernel.platform
+    this.arch = kernel.arch
+    this.os = kernel.os
   }
   async init() {
-    let g = await si.graphics()
+    let g = await system.graphics()
     let gpus
     if (g && g.controllers && g.controllers.length > 0) {
       gpus = g.controllers.map((x) => { return x.vendor.toLowerCase() })
@@ -216,7 +215,7 @@ class Template {
     let fun = new Function("uri", "cwd", "key", "local", "global", "self", "input", "current", "next", "event", "_", "os", "path", "system", "pip", "platform", "arch", "gpu", "gpus", "kernel", `return ${o}`)
     try {
       console.log("fun", fun.toString())
-      let response = fun(vars.uri, vars.cwd, vars.key, vars.local, vars.global, vars.self, vars.input, vars.current, vars.next, vars.event, _, os, path, system, vars.pip, this.platform, this.arch, this.gpu, this.gpus, this.kernel)
+      let response = fun(vars.uri, vars.cwd, vars.key, vars.local, vars.global, vars.self, vars.input, vars.current, vars.next, vars.event, _, this.os, path, system, vars.pip, this.platform, this.arch, this.gpu, this.gpus, this.kernel)
       console.log("response", response)
       if (typeof response === "undefined") {
         return `{{${o}}}`

package/package.json

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

package/server/index.js

@@ -1918,7 +1918,7 @@ class Server {
       if (req.body.name) {
         let folderPath = this.kernel.path("api", req.body.name)
         console.log("delete", folderPath)
-        await rimraf(folderPath)
+        await fse.remove(folderPath)
         await new Promise((resolve, reject) => {
           setTimeout(() => {
             resolve()

package/server/views/browser.ejs

@@ -952,17 +952,23 @@ document.querySelector("#new-tab").addEventListener("click", async (e) => {
   const u = prompt("url")
 
   if (u) {
-    let o = {}
-    if (/^[0-9.:]/.test(u)) {
-      o.forceHttp = true
-    } else if (/^localhost/.test(u)) {
-      o.forceHttp = true
+    let url
+    if (/^[ ]*http:/i.test(u)) {
+      url = u
+    } else if (/^[ ]*https:/i.test(u)) {
+      url = u
     } else {
-      o.forceHttps = true
+      let o = {}
+      if (/^[0-9.:]/.test(u)) {
+        o.forceHttp = true
+      } else if (/^localhost/.test(u)) {
+        o.forceHttp = true
+      } else {
+        o.forceHttps = true
+      }
+      url = normalizeURL(u, o)
     }
 
-    const url = normalizeURL(u, o)
-
     if (url && url.trim().length > 0) {
       console.log("url", url)
       const { tab, frame } = await addTab(url)