pinokiod 1.1.50 → 1.1.52

package/kernel/api/proxy/index.js

@@ -21,9 +21,11 @@ class P {
       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"
+        raw: `Proxy Started ${JSON.stringify(response)}\r\n`
       })
+
       return response
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.1.50",
+  "version": "1.1.52",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
     "lodash": "^4.17.21",
-    "lproxy": "^0.0.7",
+    "lproxy": "^0.0.8",
     "marked": "^5.0.1",
     "mime-types": "^2.1.35",
     "multer": "^1.4.5-lts.1",
@@ -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')
@@ -349,8 +351,8 @@ class Server {
       let configArray = [{
         key: "home",
         description: [
-          "* Do NOT use a path that includes white spaces (' ').",
-          "* Do NOT use exFAT drives.",
+          "* NO white spaces (' ')",
+          "* NO exFAT drives",
         ],
         val: this.kernel.homedir,
         placeholder: "Enter the absolute path to use as your Pinokio home folder (D:\\pinokio, /Users/alice/pinokiofs, etc.)"
@@ -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,
@@ -1690,8 +1700,8 @@ class Server {
         let configArray = [{
           key: "home",
           description: [
-            "* Do NOT use a path that includes white spaces (' ').",
-            "* Do NOT use exFAT drives.",
+            "* NO white spaces (' ')",
+            "* NO exFAT drives",
           ],
           val: this.kernel.homedir ? this.kernel.homedir : path.resolve(os.homedir(), "pinokio"),
           placeholder: "Enter the absolute path to use as your Pinokio home folder (D:\\pinokio, /Users/alice/pinokiofs, etc.)"

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/browser.ejs

@@ -922,7 +922,6 @@ const renderSelection = (e, force) => {
     }
   } else {
     console.log("# 14")
-//    document.querySelector(".bar").classList.add("hidden")
     document.querySelector(".container").classList.remove("active")
     document.querySelector("aside").classList.add("active")
   }
@@ -1051,7 +1050,8 @@ const addTab = async (url) => {
 if (document.querySelector("#menu")) {
   document.querySelector("#menu").addEventListener("click", async (e) => {
     location.hash = ""
-    renderSelection()
+    refresh()
+//    renderSelection()
   })
 }
 document.querySelector(".app-info").addEventListener("click", async (e) => {
@@ -1199,54 +1199,13 @@ document.querySelector("aside").addEventListener("click", async (e) => {
 
 })
 const refresh = async () => {
+  console.log("REFRESH")
   const html = await fetch("<%=sidebar%>").then((res) => {
     return res.text()
   })
-  /*
-  const res = await fetch("<%=sidebar%>").then((res) => {
-    return res.json()
-  })
-  const html = res.config.menu.map((item, index) => {
-    console.log("item", item)
-    if (item.btn) {
-      return `<a data-index="${index+1}" target="${item.src}" href="${item.href}" class='btn header-item selectable frame-link'>
-  <div class='tab'>${item.btn}</div>
-  ${item.running ?  "<i class='fa-solid fa-spin fa-circle-notch'></i>" : ""}
-</a>`
-    } else if (item.label) {
-      return ""
-    }
-  }).join("")
-  console.log("refresh", html)
-  */
   document.querySelector(".menu").innerHTML = html
-
-
-  // update the frames so the name matches the tab links
-
-  // 1. iterate through all the "h" menu items
-  // 2. for each tab that starts with "h" (hard), iterate through all iframes
-  // 3. to find a frame whose src.includes(item.href)
-  // 4. update the frame's name to the target attribute
-
-//  let hardFrames = document.querySelectorAll(".browserview iframe[name^=h]")
-//  for(let frame of hardFrames) {
-//    frame.removeAttribute("name")
-//    location.hash = ""
-//  }
-
-
   location.hash = ""
-
-
-
-
-  // 
-
   renderSelection()
-//  cursorIndex = 0
-  //renderCursor()
-
 }
 window.addEventListener('message', (event) => {
   console.log("Message received from the child: ", event.data); // Message received from child
@@ -1265,11 +1224,16 @@ window.addEventListener('message', (event) => {
         document.querySelector("#location").value = url
       }
     } else if (event.data.type) {
-      if (event.data.type === 'disconnect') {
-//        location.hash = ""
-        refresh()
-      } else {
-        refresh()
+      let asideHidden = (window.getComputedStyle(document.querySelector("aside")).display === "none")
+      console.log("asideHidden", asideHidden)
+      if (!asideHidden) {
+        // refresh only if aside 
+
+        if (event.data.type === 'disconnect') {
+          refresh()
+        } else {
+          refresh()
+        }
       }
     }
   } else {

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/server/views/settings.ejs

@@ -66,9 +66,10 @@
   padding: 20px 0;
 }
 .titleview h1 {
+  word-break: break-word;
   font-size: 40px;
   text-transform: uppercase;
-  letter-spacing: 0;
+  letter-spacing: -1px;
 }
 .item > .d {
   padding-bottom: 10px;
@@ -84,11 +85,11 @@
   padding-bottom: 5px;
 }
 .item .explanation {
-  white-space: pre;
   padding-top: 5px;
   color: brown;
-  font-size: 14px;
+  font-size: 12px;
   font-weight: bold;
+  font-family: verdana;
 }
 body.dark .item input[type=text] {
   background: rgba(255,255,255,0.1);
@@ -106,6 +107,10 @@ body.dark .item select {
   width: 100%;
 }
 .item select {
+  -webkit-appearance: none;
+  -moz-appearance:    none;
+  appearance:         none;
+
   background: rgba(0,0,0,0.05);
   padding: 10px;
   box-sizing: border-box;
@@ -174,6 +179,18 @@ hr {
   height: 1px;
   border: none;
 }
+.reset-cache-loading {
+  padding: 10px;
+  background: rgba(0,0,0,0.1);
+  margin-bottom: 10px;
+  text-align: center;
+}
+.reset-bin-loading {
+  padding: 10px;
+  background: rgba(0,0,0,0.1);
+  margin-bottom: 10px;
+  text-align: center;
+}
 </style>
 <script src="/hotkeys.min.js"></script>
 <script src="/sweetalert2.js"></script>
@@ -318,7 +335,7 @@ document.addEventListener("DOMContentLoaded", async () => {
   <% if (locals.bin) { %>
     document.querySelector("#del-bin").addEventListener("click", async (e) => {
       console.log("del-bin")
-      let proceeed = confirm("Are you sure you wish to delete the bin folder?")
+      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")
@@ -342,7 +359,7 @@ document.addEventListener("DOMContentLoaded", async () => {
     })
     document.querySelector("#del-cache").addEventListener("click", async (e) => {
       console.log("del-cache")
-      let proceeed = confirm("Are you sure you wish to delete the cache folder?")
+      let proceed = confirm("Are you sure you wish to delete the cache folder?")
       if (proceed) {
         document.querySelector(".reset-cache-loading").classList.remove("hidden")
         document.querySelector("#del-cache").classList.add("hidden")