pinokiod 1.0.15 → 1.0.17

package/kernel/api/index.js

@@ -20,6 +20,7 @@ class Api {
     this.running = {}
     this.done = {}
     this.waiter = {}
+    this.prosies = {}
   }
   async init() {
     console.log("api.init", { homedir: this.kernel.homedir })

package/kernel/api/proxy/index.js

@@ -0,0 +1,31 @@
+const Lproxy = require('lproxy')
+class P {
+  constructor() {
+    this.proxy = new Lproxy()
+  }
+  async start (req, ondata, kernel) {
+    /*
+      {
+        "method": "proxy.start",
+        "params": {
+          "uri": "http://localhost:8192"
+        }
+      }
+    */
+    let { proxy, url } = await this.proxy.start(req.params.uri)
+    this.kernel.api.proxies[req.parent.path] = proxy
+    return { proxy, url }
+  }
+  async stop (req, ondata, kernel) {
+    /*
+      {
+        "method": "proxy.stop",
+        "params": {
+          "uri": "http://localhost:8192"
+        }
+      }
+    */
+    this.proxy.stop(req.params.uri)
+  }
+}
+module.exports = P

package/kernel/bin/cuda.js

@@ -2,18 +2,21 @@ class Cuda {
   async install(req, ondata) {
     if (this.kernel.platform === "win32") {
       await this.kernel.bin.exec({
-        message: "conda install -y cudnn libzlib-wapi -c conda-forge"
-
+        message: "conda install -y cudnn libzlib-wapi -c conda-forge",
+        conda: "base",
       }, ondata)
       await this.kernel.bin.exec({
-        message: "conda install -y cuda -c nvidia/label/cuda-11.8.0"
+        message: "conda install -y cuda -c nvidia/label/cuda-11.8.0",
+        conda: "base",
       }, ondata)
     } else {
       await this.kernel.bin.exec({
-        message: "conda install -y cudnn -c conda-forge"
+        message: "conda install -y cudnn -c conda-forge",
+        conda: "base",
       }, ondata)
       await this.kernel.bin.exec({
-        message: "conda install -y cuda -c nvidia/label/cuda-11.8.0"
+        message: "conda install -y cuda -c nvidia/label/cuda-11.8.0",
+        conda: "base",
       }, ondata)
     }
   }
@@ -38,7 +41,8 @@ class Cuda {
 //  }
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda remove cudnn cuda"
+      message: "conda remove cudnn cuda",
+      conda: "base",
     }, ondata)
   }
 }

package/kernel/bin/ffmpeg.js

@@ -5,7 +5,8 @@ const decompress = require('decompress');
 class Ffmpeg {
   async install(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda install -y -c conda-forge ffmpeg"
+      message: "conda install -y -c conda-forge ffmpeg",
+      conda: "base"
     }, ondata)
   }
   async installed() {
@@ -13,7 +14,8 @@ class Ffmpeg {
   }
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({
-      message: "conda remove ffmpeg"
+      message: "conda remove ffmpeg",
+      conda: "base"
     }, ondata)
   }
 }

package/kernel/bin/llvm.js

@@ -3,7 +3,7 @@ class LLVM {
     if (this.kernel.platform === 'darwin') {
       await bin.exec({ message: "brew install llvm" }, ondata)
     } else {
-      await bin.exec({ message: "conda install -y -c conda-forge llvm" }, ondata)
+      await bin.exec({ message: "conda install -y -c conda-forge llvm", conda: "base" }, ondata)
     }
   }
   async installed() {
@@ -14,7 +14,7 @@ class LLVM {
     }
   }
   async uninstall(req, ondata) {
-    await this.kernel.bin.exec({ message: "conda remove llvm" }, ondata)
+    await this.kernel.bin.exec({ message: "conda remove llvm", conda: "base" }, ondata)
   }
 }
 module.exports = LLVM

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -30,11 +30,13 @@
     "glob": "^10.3.3",
     "glob-gitignore": "^1.0.14",
     "handlebars": "^4.7.7",
+    "http-proxy": "^1.18.1",
     "http-terminator": "^3.2.0",
     "isomorphic-git": "^1.23.0",
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
     "lodash": "^4.17.21",
+    "lproxy": "^0.0.1",
     "marked": "^5.0.1",
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",

package/server/views/browser.ejs

@@ -544,6 +544,10 @@ const renderSelection = (e, force) => {
         let frame = document.createElement("iframe")
         frame.name = target.target
         frame.src = target.href
+        frame.setAttribute(
+          "allow", 
+          "clipboard-read; clipboard-write; accelerometer; ambient-light-sensor; autoplay; battery; camera; display-capture; gamepad; geolocation; gyroscope; hid; identity-credentials-get; microphone; midi; otp-credentials; serial;"
+        )
         document.querySelector("main").appendChild(frame)
         loaded[target.target] = true
       }