pinokiod 1.3.38 → 1.3.40

package/kernel/api/cloudflare/index.js

@@ -1,5 +1,7 @@
+const { yellow, green, blue  } = require('kleur');
+const QRCode = require('qrcode');
 class C {
-  async start (req, ondata, kernel) {
+  async tunnel (req, ondata, kernel) {
     /*
       {
         "method": "cloundflare.tunnel",
@@ -10,6 +12,47 @@ class C {
 
       => cloudflared tunnel --url http://localhost:8080
     */
+    const message = `cloudflared tunnel --url ${req.params.uri}`
+    let params = {
+      id: message,
+      message
+    }
+    if (req.client) {
+      params.rows = req.client.rows
+      params.cols = req.client.cols
+    }
+    let options = {}
+    if (req.cwd) options.cwd = req.cwd
+    if (req.parent && req.parent.path) options.group = req.parent.path
+    console.log("shells before", kernel.shell.shells)
+    let pattern = /(https:.+?trycloudflare\.com)/
+    let cloudflare_url = await new Promise((resolve, reject) => {
+      kernel.shell.start(params, options, (e) => {
+        ondata(e)
+        let test = pattern.exec(e.cleaned)
+        if (test && test.length > 0) {
+          resolve(test[1])
+        }
+      })
+    })
+    console.log("cloudflare_url", cloudflare_url)
+
+    ondata({ raw: yellow("\r\n## Scan the QR code to open in any device\r\n\r\n") })
+    ondata({ raw: blue(`${cloudflare_url}\r\n\r\n`) })
+
+    await new Promise((resolve, reject) => {
+      QRCode.toString(cloudflare_url, {
+        type: "terminal"
+      }, function(err, data) {
+        ondata({ raw: green(data).replaceAll("\n", "\r\n") })
+        ondata({ raw: "\r\n" })
+        setTimeout(() => {
+          resolve()
+        }, 2000)
+      });
+    })
+
+    return { uri: cloudflare_url }
   }
   async stop (req, ondata, kernel) {
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.3.38",
+  "version": "1.3.40",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -37,6 +37,7 @@
     "jsdom": "^24.0.0",
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
+    "kleur": "^4.1.5",
     "lodash": "^4.17.21",
     "lproxy": "^0.0.9",
     "marked": "^5.0.1",

package/server/index.js

@@ -355,10 +355,6 @@ class Server {
         type: "conda",
         name: ["nodejs", "ffmpeg"],
         args: "-c conda-forge"
-      }, {
-        name: "py"
-      }, {
-        name: "cloudflared"
       }]
       let platform = os.platform()
       if (platform === "win32") {
@@ -369,11 +365,22 @@ class Server {
           name: "vs"
         })
       }
+      if (platform === "darwin") {
+        requirements.push({
+          name: "brew"
+        })
+      }
       if (this.kernel.gpu === "nvidia") {
         requirements.push({
           name: "cuda"
         })
       }
+      requirements = requirements.concat([{
+        name: "py"
+      }, {
+        name: "cloudflared"
+      }])
+
       let requirements_pending = !this.kernel.bin.installed_initialized
 
 
@@ -616,16 +623,15 @@ class Server {
           type: "conda",
           name: ["nodejs", "ffmpeg"],
           args: "-c conda-forge"
-        }, {
-          name: "py"
-        }, {
-          name: "cloudflared"
         }]
         let platform = os.platform()
         if (platform === "win32") {
           requirements.push({
             name: "registry"
           })
+          requirements.push({
+            name: "vs"
+          })
         }
         if (platform === "darwin") {
           requirements.push({
@@ -637,6 +643,11 @@ class Server {
             name: "cuda"
           })
         }
+        requirements = requirements.concat([{
+          name: "py"
+        }, {
+          name: "cloudflared"
+        }])
 //        if (platform === "linux") {
 //          requirements.push({
 //            name: "brew"