pinokiod 1.3.97 → 1.3.99

package/kernel/api/cloudflare/index.js

@@ -16,6 +16,7 @@ class C {
       => cloudflared tunnel --url http://localhost:8080
     */
 
+    console.log("*tunnel", req.params)
 
     let pipe_uri
     if (req.params.passcode) {

package/kernel/api/local/index.js

@@ -64,6 +64,7 @@ class Local {
     */
 
     let current_env = await Environment.get2(req.parent.path, kernel)
+    console.log({ current_env })
 
     // if the key at current_env.PINOKIO_SHARE_VAR (by default it's 'url') is the variable being set, trigger the share logic
     if (current_env.PINOKIO_SHARE_VAR && current_env.PINOKIO_SHARE_VAR in req.params) {

package/kernel/environment.js

@@ -293,10 +293,12 @@ const init_folders = async (homedir) => {
 
 // Get the actual environment variable at specific path
 const get2 = async (filepath, kernel) => {
+  console.log("Get2")
   let api_path = Util.api_path(filepath, kernel)
   let default_env = await get(kernel.homedir)
   let api_env = await get(api_path)
-  let current_env = Object.assign(process.env, default_env, api_env)
+  console.log({ api_path, default_env, api_env, process_env: process.env })
+  let current_env = Object.assign({}, process.env, default_env, api_env)
   return current_env
 }
 const get = async (homedir) => {

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.97",
+  "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/pipe/views/login.ejs

@@ -15,7 +15,7 @@ body {
   color: white;
 }
 main {
-  max-width: 500px;
+  max-width: 300px;
   width: 100%;
   text-align: center;
   text-transform: lowercase;
@@ -35,8 +35,8 @@ main input {
   /*
   background: rgba(0,0,0,0.06);
   */
-  font-size: 14px;
-  border-radius: 0;
+  font-size: 16px;
+  border-radius: 10px 0 0 10px;
 
 }
 main button {
@@ -45,6 +45,8 @@ main button {
   padding: 10px;
   box-sizing: border-box;
   border: none;
+  font-size: 16px;
+  border-radius: 0 10px 10px 0;
 }
 .error {
   border-left: 3px solid red;
@@ -67,7 +69,7 @@ h1 {
   -->
   <h1>PINOKIO</h1>
   <form method="POST" action="/pinokio/login">
-    <input autofocus placeholder="enter passcode" type="password" name="password" required>
+    <input autofocus placeholder="Enter passcode" type="password" name="password" required>
     <button type="submit">Login</button>
   </form>
   <% if (error) { %>

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

@@ -173,6 +173,7 @@ h1 {
   font-size: 50px;
   font-family: georgia;
   font-style: italic;
+  padding-bottom: 20px;
 }
 footer {
   background: none;
@@ -263,6 +264,7 @@ document.addEventListener("DOMContentLoaded", async () => {
       </header>
     <% } %>
     <div id='editor' class='<%=init ? "hidden" : ''%>'>
+      <h1>Configure</h1>
       <% items.forEach((item) => { %>
         <% if (item.type === "comment") { %>
           <div class='comment'><%=item.val.replaceAll(/^[ #]+/g, "")%></div>

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

@@ -74,9 +74,10 @@ td.key {
   
 }
 #editor {
+  margin: 0 auto;
   box-sizing: border-box;
   max-width: 800px;
-  padding: 20px;
+  padding: 50px;
 }
 header .runner {
   padding: 10px 0 0;
@@ -203,6 +204,12 @@ body.dark .cloudflare-running {
   box-sizing: border-box;
   border: 1px solid rgba(0,0,0,0.1);
 }
+h1 {
+  font-size: 50px;
+  font-family: georgia;
+  font-style: italic;
+  padding-bottom: 10px;
+}
 
 </style>
 <script>
@@ -293,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>