pinokiod 1.3.98 → 1.3.99

package/kernel/util.js

@@ -87,6 +87,7 @@ const escapeStringRegexp = (string) => {
 }
 
 const update_env = async (filepath, changes) => {
+  console.log("update_env", { filepath, changes })
   const env = await fs.promises.readFile(filepath, "utf8")
   let append = false;
   const newval = Object.keys(changes).reduce((result, varname) => {
@@ -95,6 +96,7 @@ const update_env = async (filepath, changes) => {
     .replace(returnPattern, returnReplacement)
     .trim();
     const safeName = escapeStringRegexp(varname);
+    console.log({ value, safeName, result, varname })
     const varPattern = new RegExp(`^(${h}*${safeName}${h}*=${h}*)\\S*(${h}*)$`, "gm");
     if (varPattern.test(result)) {
       const safeValue = value.replace(groupPattern, groupReplacement);

package/package.json

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

package/pipe/index.js

@@ -1,5 +1,5 @@
 const { createProxyMiddleware } = require('http-proxy-middleware');
-const { yellow, green, blue  } = require('kleur');
+const { red, yellow, green, blue  } = require('kleur');
 
 const path = require('path')
 const { createHttpTerminator } = require('http-terminator')
@@ -56,21 +56,25 @@ class Pipe {
           ip,
           agent
         }
-        let log = `\r\n[${event.time}] Login from ${event.ip} | ${event.agent}\r\n`
-        console.log(log)
-//        this.kernel.api.ondata({
-//          id: scriptPath,
-//          type: "notify",
-//          data: {
-//            html: `<div><h6>${event.time}</h6><div>IP: ${event.ip}</div>`
-//          }
-//        })
+        this.kernel.api.ondata({
+          id: scriptPath,
+          type: "notify",
+          data: {
+            silent: true,
+            html: `<div><b>[${password}] ${event.ip}</b><br><div>${event.time}</div><div>${event.agent}</div>`
+          }
+        })
+
+        let passcode_log = red(password)
+        let timestamp_log = yellow(event.time)
+        let ip_log = blue(event.ip)
+        let browser_log = event.agent
         this.kernel.api.ondata({
           type: "stream",
           kernel: true,
           id: scriptPath,
           data: {
-            raw: yellow(log)
+            raw: `\r\n[${passcode_log}]\t${timestamp_log}\t${ip_log}\t${browser_log}\r\n`
           }
         })
         req.session.authenticated = true;

package/server/index.js

@@ -1993,6 +1993,7 @@ class Server {
     //let home = this.kernel.homedir
     let home = this.kernel.store.get("home")
     this.app.get("/", async (req, res) => {
+      console.log("req", req)
       if (req.query.mode !== "settings" && !home) {
         res.redirect("/?mode=settings")
         return

package/server/views/fullscreen_editor.ejs

@@ -389,6 +389,7 @@ document.addEventListener("DOMContentLoaded", async () => {
               if (packet.data.type) {
                 payload.type = packet.data.type
               }
+              payload.silent = packet.data.silent
               payload.callbacks = {
                 onClick: () => {
                   let params = packet.data

package/server/views/settings.ejs

@@ -295,15 +295,6 @@ hr {
     <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
   </div>
   <% if (locals.bin) { %>
-    <hr/>
-    <div class='advanced'>
-      <h1>Advanced Settings</h1>
-      <br>
-      <br>
-      <div>Edit the system ENVIRONMENT file to customize pinokio system wide settings, such as where files are stored, terminal behavior, etc.</div>
-      <br>
-      <a class='btn' href="/env"><i class="fa-regular fa-pen-to-square"></i> Edit ENVIRONMENT</a>
-    </div>
     <hr/>
     <div class='troubleshoot'>
       <h1>Troubleshoot</h1>
@@ -352,6 +343,15 @@ hr {
       </div>
     </div>
     <hr/>
+    <div class='advanced'>
+      <h1>Advanced Settings</h1>
+      <br>
+      <br>
+      <div>Edit the system ENVIRONMENT file to customize pinokio system wide settings, such as where files are stored, terminal behavior, etc.</div>
+      <br>
+      <a class='btn' href="/env"><i class="fa-regular fa-pen-to-square"></i> Edit ENVIRONMENT</a>
+    </div>
+    <hr/>
   <% } %>
 </div>
 </div>

package/server/views/share_editor.ejs

@@ -300,9 +300,9 @@ document.addEventListener("DOMContentLoaded", async () => {
       </div>
       <div class='env-item'>
         <% if (config.PINOKIO_SHARE_LOCAL.toString() === "true") { %>
-          <input type="checkbox" id="PINOKIO_SHARE_LOCAL" name="local" checked />
+          <input type="checkbox" data-id="PINOKIO_SHARE_LOCAL" name="local" checked />
         <% } else { %>
-          <input type="checkbox" id="PINOKIO_SHARE_LOCAL" name="local" />
+          <input type="checkbox" data-id="PINOKIO_SHARE_LOCAL" name="local" />
         <% } %>
         <label for="local"><i class="fa-solid fa-network-wired"></i> Share with Local Network</label>
         <ul>