pinokiod 1.1.49 → 1.1.51

package/kernel/api/proxy/index.js

@@ -10,16 +10,24 @@ class P {
         }
       }
     */
-    ondata({
-      raw: `\r\n[Start proxy] ${req.params.name} ${req.params.uri}\r\n`
-    })
-    let { name, uri, ...o } = req.params
-    console.log("proxy.start", { name, uri, o })
-    let response = await kernel.api.startProxy(req.parent.path, req.params.uri, req.params.name, o)
-    ondata({
-      raw: "Proxy Started\r\n"
-    })
-    return response
+    try {
+      // check proxy
+      kernel.api.checkProxy({ uri, name })
+      // if exists, don't do anything
+    } catch (e) {
+      ondata({
+        raw: `\r\n[Start proxy] ${req.params.name} ${req.params.uri}\r\n`
+      })
+      let { name, uri, ...o } = req.params
+      console.log("proxy.start", { name, uri, o })
+      let response = await kernel.api.startProxy(req.parent.path, req.params.uri, req.params.name, o)
+
+      ondata({
+        raw: `Proxy Started ${JSON.stringify(response)}\r\n`
+      })
+
+      return response
+    }
   }
   async stop (req, ondata, kernel) {
     /*

package/kernel/api/set/index.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const fs = require('fs')
-const set = (old, kv) => {
+const set = async (old, kv, kernel, req, ondata) => {
   for (let key in kv) {
     try {
       if (key.startsWith('[')) {
@@ -22,6 +22,20 @@ const set = (old, kv) => {
         );
         old = fun(old, key, kv[key]);
       }
+
+
+//      // reserved variable: "url"
+//      if (key === "url") {
+//        // start proxy
+//        ondata({
+//          raw: `\r\n[Start proxy] ${kv[key]}\r\n`
+//        })
+//        let response = await kernel.api.startProxy(req.parent.path, kv[key], "Shared")
+//        console.log("Response", response)
+//        ondata({
+//          raw: `Proxy Started ${JSON.stringify(response)}\r\n`
+//        })
+//      }
     } catch (e) {
     }
   }
@@ -64,7 +78,7 @@ module.exports = async (req, ondata, kernel) => {
       if (!old) {
         old = {}
       }
-      old = set(old, kv)
+      old = await set(old, kv, kernel, req, ondata)
       kernel.memory[type][req.parent.path] = old
 
 //      if (!kernel.memory[type][req.uri]) {
@@ -112,7 +126,7 @@ module.exports = async (req, ondata, kernel) => {
         }
         let kv = req.params.self[relative_filepath]
 
-        old = set(old, kv)
+        old = await set(old, kv, kernel, req, ondata)
 
         // write to the filepath
 
@@ -148,7 +162,7 @@ module.exports = async (req, ondata, kernel) => {
 
       let newkv = req.params.key[host_url]
 
-      oldkv = set(oldkv, newkv)
+      oldkv = await set(oldkv, newkv, kernel, req, ondata)
 
       old[host_url] = oldkv
 

package/kernel/shells.js

@@ -170,7 +170,9 @@ class Shells {
                 stream.matches = rendered_event
                 if (typeof handler.return !== "undefined") {
                   session.clear()
+                  console.log("RENDER", { stream })
                   let return_value = this.kernel.template.render(handler.return, { event: stream })
+                  console.log("return_value", return_value)
 
                   if (session.resolve) {
                     session.resolve(return_value)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.1.49",
+  "version": "1.1.51",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "http-proxy": "^1.18.1",
     "http-terminator": "^3.2.0",
     "isomorphic-git": "^1.23.0",
-    "jimini": "^0.0.2",
+    "jimini": "^0.0.4",
     "jsdom": "^24.0.0",
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
@@ -47,6 +47,7 @@
     "open": "8.4.2",
     "pdrive": "^0.0.23",
     "portfinder": "^1.0.32",
+    "qrcode": "^1.5.3",
     "random-useragent": "^0.5.0",
     "rimraf": "^5.0.0",
     "sanitize-filename": "^1.6.3",

package/server/index.js

@@ -14,6 +14,8 @@ const os = require('os')
 const { fork } = require('child_process');
 const semver = require('semver')
 const fse = require('fs-extra')
+const QRCode = require('qrcode')
+
 
 const git = require('isomorphic-git')
 const http = require('isomorphic-git/http/node')
@@ -1011,8 +1013,16 @@ class Server {
 
       let pinokio_proxy = this.kernel.api.proxies["/"]
 
+      console.log("pinokio_proxy", pinokio_proxy)
+      let qr = null
+      if (pinokio_proxy && pinokio_proxy.length > 0) {
+        qr = await QRCode.toDataURL(pinokio_proxy[0].proxy)
+      }
+
+
       res.render("index", {
         proxy: pinokio_proxy[0],
+        qr,
         error: error,
         logo: this.logo,
 //        memory: mem,

package/server/public/style.css

@@ -81,6 +81,27 @@ footer .toggle-expand {
 footer pre {
   background: none !important;
 }
+.swal2-popup.min-popup a {
+  outline: none;
+}
+.swal2-popup.min-popup img {
+  margin: 10px 0;
+}
+.swal2-popup.min-popup {
+  width: 300px;
+  text-align: center !important;
+  padding: 30px 0 !important;
+  box-sizing: border-box;
+}
+.swal2-title.min-title {
+  box-sizing: border-box;
+  text-align: center !important;
+  padding: 0 0 !important;
+}
+.min-modal {
+  text-align: center;
+  font-size: 14px;
+}
 .wait-modal {
   padding: 20px;
   text-align: center;

package/server/views/index.ejs

@@ -119,7 +119,10 @@ header .runner {
 <% if (ishome) { %>
   <div class='nav-btns'>
     <a class='btn2' id='explore'><div><i class="fa-solid fa-globe"></i></div><div>Discover</div></a>
+    <a id='wifi' data-proxy="<%=proxy.proxy%>" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>WiFi</div></a>
+    <!--
     <a class='btn2' href="<%=proxy.proxy%>" target="_blank"><div><i class="fa-solid fa-wifi"></i></div><div>WiFi</div></a>
+    -->
     <a class='btn2' id='report'><div><i class="fa-solid fa-bug"></i></div><div>Report Bug</div></a>
     <a class='btn2' href='https://discord.gg/TQdNwadtE4' target="_blank"><div><i class="fa-brands fa-discord"></i></div><div>Discord</div></a>
     <a class='btn2' href='https://twitter.com/cocktailpeanut' target="_blank"><div><i class="fa-brands fa-twitter"></i></div><div>Twitter</div></a>
@@ -618,6 +621,22 @@ document.addEventListener("click", (e) => {
     target.closest(".line").classList.add("selected")
   }
 })
+<% if (qr) { %>
+  document.querySelector("#wifi").addEventListener("click", async (e) => {
+    await Swal.fire({
+      title: "Wifi Sharing",
+      customClass: {
+        popup: "min-popup",
+        title: "min-title"
+      },
+      showConfirmButton: false,
+      html: `<div class='min-modal'>
+      <div><img src="<%=qr%>"></div>
+  <a href="<%=proxy.proxy%>" target="_blank"><%=proxy.proxy%></a>
+  </div>`
+    })
+  })
+<% } %>
 <% } %>
 
 </script>

package/kernel/template.js

@@ -1,223 +0,0 @@
-const system = require('systeminformation');
-const path = require("path")
-const fs = require("fs")
-const _ = require("lodash")
-class Template {
-  constructor(kernel) {
-    this.kernel = kernel
-    this.platform = kernel.platform
-    this.arch = kernel.arch
-    this.os = kernel.os
-  }
-  async init() {
-    let g = await system.graphics()
-    let gpus
-    if (g && g.controllers && g.controllers.length > 0) {
-      gpus = g.controllers.map((x) => { return x.vendor.toLowerCase() })
-    } else {
-      gpus = []
-    }
-    this.gpus = gpus
-
-    let is_nvidia = gpus.find(gpu => /nvidia/i.test(gpu))
-    let is_amd = gpus.find(gpu => /(amd|advanced micro devices)/i.test(gpu))
-    let is_apple = gpus.find(gpu => /apple/i.test(gpu))
-
-    if (is_nvidia) {
-      this.gpu = "nvidia"
-    } else if (is_amd) {
-      this.gpu = "amd"
-    } else if (is_apple) {
-      this.gpu = "apple"
-    } else if (gpus.length > 0) {
-      this.gpu = gpus[0]
-    } else {
-      this.gpu = "none"
-    }
-
-//    if (gpus.find((gpu) => { return gpu.includes("nvidia") }) {
-//      this.gpu = "nvidia"
-//    } else if (gpus.includes("amd") || gpus.includes("advanced micro devices")){
-//      this.gpu = "amd"
-//    } else if (gpus.includes("apple")) {
-//      this.gpu = "apple"
-//    } else if (gpus.length > 0) {
-//      this.gpu = gpus[0]
-//    } else {
-//      this.gpu = "none"
-//    }
-  }
-  regex(str) {
-    let matches = /^\/(.+)\/([dgimsuy]*)$/gs.exec(str)
-    if (!/g/.test(matches[2])) {
-      matches[2] += "g"   // if g option is not included, include it (need it for matchAll)
-    }
-    let re = new RegExp(matches[1], matches[2])
-    return re
-  }
-  istemplate(o) {
-    let check
-    _.forOwn(o, (val, key) => {
-      if (typeof key === 'string') {
-        let test = /\{\{.*\}\}/g.test(key)
-        if (test) {
-          check = true
-        }
-      }
-      if (typeof val === 'string') {
-        let test = /\{\{.*\}\}/g.test(val)
-        if (test) {
-          check = true
-        }
-      }
-    });
-    return check
-  }
-  flatten(template) {
-    let result
-    if (typeof template === "string") {
-      result = template.replaceAll(/\{\{\{(.*?)\}\}\}/g, '{{$1}}');
-    } else if (Array.isArray(template)) {
-      result = template.map((item) => {
-        return this.flatten(item)
-      })
-    } else if (typeof template === "object") {
-      try {
-        if (template.constructor.name === 'Object') {
-          try {
-            result = {}
-            for (let key in template) {
-              let flattenedKey = this.flatten(key)
-              let flattenedVal = this.flatten(template[key])
-              if (flattenedKey !== null && flattenedKey !== false) {
-                result[flattenedKey] = flattenedVal;
-              }
-            }
-          } catch (e) {
-            result = template
-          }
-        } else {
-          result = template
-        }
-      } catch (e2) {
-        result = template
-      }
-    } else {
-      result = template
-    }
-    return result
-  }
-  render(template, vars) {
-    let result
-
-    // CASE 1. String type => can be a regular string or a template string
-    if (typeof template === "string") {
-
-      if (/^\{\{\{(.+)\}\}\}$/g.test(template)) {
-        // CASE 1.0. {{{ }}} raw expression => don't parse
-        return template
-
-      } 
-
-      else if (/^\{\{.+\}\}$/g.test(template)) {
-        // CASE 1.1. the template expression is a pure template (starts with {{ and ends with }})
-
-        // Example:
-        //  "{{buf}}" where buf is a Buffer object
-        //  "{{items}}" where items is an Array
-        //  "{{int}}" where the int is an integer
-
-        // get only the variables out
-        let v = template.slice(2, -2)
-        let r = this.raw_get(v, vars)
-        return r
-      }
-
-      // CASE 1.2. if the template expression is part of a string "... {{ .. }} ..." => can only be string
-      else {
-        try {
-          const pattern = /{{(.*?)}}/g;
-          const matches = [...template.matchAll(pattern)].map((x) => { return x[1] })
-          if (matches && matches.length > 0) {
-            let vals = []
-            for(let v of matches) {
-              let val = this.raw_get(v, vars)
-              vals.push({
-                key: "{{" + v + "}}",
-                val
-              })
-            }
-            let res = template
-            for(let val of vals) {
-              res = res.replaceAll(val.key, val.val)
-            }
-            return res
-          } else {
-            return template
-          }
-
-        } catch (e) {
-          result = template
-        }
-      }
-
-    }
-    // Case 2: Array
-    else if (Array.isArray(template)) {
-      result = []
-      for(let item of template) {
-        let renderedVal = this.render(item, vars);
-        if (typeof renderedVal !== "undefined") {
-          result.push(renderedVal) 
-        }
-      }
-    }
-    // Case 2: the template is an object => need to traverse further
-    else if (typeof template === "object") {
-      try {
-        if (template.constructor.name === 'Object') {
-          try {
-            result = {}
-            for (let key in template) {
-              let renderedKey = this.render(key, vars);
-              let renderedVal = this.render(template[key], vars);
-              if (renderedKey !== null && renderedKey !== false) {
-                result[renderedKey] = renderedVal;
-              }
-            }
-          } catch (e) {
-            console.log("template render log [1]", e)
-            result = template
-          }
-        } else {
-          result = template
-        }
-      } catch (e2) {
-        console.log("template render log [2]", e2)
-        result = template
-      }
-    }
-
-    // Case 3: terminal node => can just use the value
-    else {
-      result = template
-    }
-    return result
-  }
-  raw_get(o, vars) {
-    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 {
-      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)
-      if (typeof response === "undefined") {
-        return `{{${o}}}`
-      } else {
-        return response
-      }
-    } catch (e) {
-      console.log("ERROR", e)
-      return `{{${o}}}`
-    }
-
-  }
-}
-module.exports = Template