pinokiod 1.3.62 → 1.3.64

package/kernel/api/cloudflare/index.js

@@ -52,6 +52,14 @@ class C {
       });
     })
 
+    if (!kernel.memory.local[req.parent.path].$share) {
+      kernel.memory.local[req.parent.path].$share = {}
+    }
+    if (!kernel.memory.local[req.parent.path].$share.cloudflare) {
+      kernel.memory.local[req.parent.path].$share.cloudflare = {}
+    }
+    kernel.memory.local[req.parent.path].$share.cloudflare[req.params.uri] = cloudflare_url
+
     return { uri: cloudflare_url }
   }
   async stop (req, ondata, kernel) {

package/kernel/api/proxy/index.js

@@ -40,6 +40,14 @@ class P {
         });
       })
 
+      if (!kernel.memory.local[req.parent.path].$share) {
+        kernel.memory.local[req.parent.path].$share = {}
+      }
+      if (!kernel.memory.local[req.parent.path].$share.local) {
+        kernel.memory.local[req.parent.path].$share.local = {}
+      }
+      kernel.memory.local[req.parent.path].$share.local[req.params.uri] = response.proxy
+
       return response
     }
   }

package/kernel/environment.js

@@ -71,6 +71,11 @@ const ENVS = [{
   val: (home) => {
     return "true"
   }
+}, {
+  key: "PINOKIO_PORT",
+  val: (home) => {
+    return "80"
+  }
 }];
 const folders = ENVS.filter((env) => {
   return env.type === "cache_folder" || env.type === "folder"

package/kernel/index.js

@@ -21,6 +21,7 @@ const Script = require('./script')
 const Environment = require("./environment")
 const Util = require('./util')
 const Config = require("./pinokio.json")
+const Info = require('./info')
 const VARS = {
   pip: {
     install: {
@@ -28,6 +29,7 @@ const VARS = {
     }
   }
 }
+
 //const memwatch = require('@airbnb/node-memwatch');
 class Kernel {
   //schema = ">=1.0.0"
@@ -42,6 +44,7 @@ class Kernel {
     this.jsdom = jsdom
     this.exposed = {}
     this.envs = {}
+    this.info = new Info(this)
   }
   /*
     kernel.env() => return the system environment

package/kernel/info.js

@@ -0,0 +1,62 @@
+/*
+info.local(...args)
+info.running(...args)
+info.exists(...args)
+info.path(...args)
+*/
+const path = require('path')
+const fs = require("fs")
+class Info {
+  constructor(kernel) {
+    this.kernel = kernel
+  }
+  callsites () {
+    const _prepareStackTrace = Error.prepareStackTrace;
+    try {
+      let result = [];
+      Error.prepareStackTrace = (_, callSites) => {
+        const callSitesWithoutCurrent = callSites.slice(1);
+        result = callSitesWithoutCurrent;
+        return callSitesWithoutCurrent;
+      };
+
+      new Error().stack; // eslint-disable-line unicorn/error-message, no-unused-expressions
+      return result;
+    } finally {
+      Error.prepareStackTrace = _prepareStackTrace;
+    }
+  }
+  caller () {
+    return this.callsites()[2].getFileName()
+  }
+  // get the app path
+  app_path(...args) {
+  }
+  // get full path of the relative path
+  path(...args) {
+    let cwd = path.dirname(this.caller())
+    return path.resolve(cwd, ...args)
+  }
+  running(...args) {
+    let cwd = path.dirname(this.caller())
+    let resolved_path = path.resolve(cwd, ...args)
+    return this.kernel.api.running[resolved_path]
+  }
+  exists(...args) {
+    let cwd = path.dirname(this.caller())
+    let resolved_path = path.resolve(cwd, ...args)
+    return fs.existsSync(resolved_path)
+  }
+  local(...args) {
+    let cwd = path.dirname(this.caller())
+    let resolved_path = path.resolve(cwd, ...args)
+    return this.kernel.memory.local[resolved_path] || {}
+  }
+  global(...args) {
+    let cwd = path.dirname(this.caller())
+    let resolved_path = path.resolve(cwd, ...args)
+    return this.kernel.memory.global[resolved_path] || {}
+  }
+}
+
+module.exports = Info

package/package.json

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

package/server/index.js

@@ -180,9 +180,9 @@ class Server {
     if (config && config.menu) {
       if (typeof config.menu === "function") {
         if (config.menu.constructor.name === "AsyncFunction") {
-          config.menu = await config.menu(this.kernel)
+          config.menu = await config.menu(this.kernel, this.kernel.info)
         } else {
-          config.menu = config.menu(this.kernel)
+          config.menu = config.menu(this.kernel, this.kernel.info)
         }
       }
 
@@ -636,9 +636,9 @@ class Server {
         let resolved
         if (typeof runner === "function") {
           if (runner.constructor.name === "AsyncFunction") {
-            resolved = await runner(this.kernel)
+            resolved = await runner(this.kernel, this.kernel.info)
           } else {
-            resolved = runner(this.kernel)
+            resolved = runner(this.kernel, this.kernel.info)
           }
           runnable = resolved && resolved.run ? true : false
         } else {
@@ -969,9 +969,9 @@ class Server {
             if (config && config.menu) {
               if (typeof config.menu === "function") {
                 if (config.menu.constructor.name === "AsyncFunction") {
-                  config.menu = await config.menu(this.kernel)
+                  config.menu = await config.menu(this.kernel, this.kernel.info)
                 } else {
-                  config.menu = config.menu(this.kernel)
+                  config.menu = config.menu(this.kernel, this.kernel.info)
                 }
               }
 
@@ -991,9 +991,9 @@ class Server {
             if (config && config.update) {
               if (typeof config.update === "function") {
                 if (config.update.constructor.name === "AsyncFunction") {
-                  config.update = await config.update(this.kernel)
+                  config.update = await config.update(this.kernel, this.kernel.info)
                 } else {
-                  config.update = config.update(this.kernel)
+                  config.update = config.update(this.kernel, this.kernel.info)
                 }
               }
               let absolute = path.resolve(__dirname, ...pathComponents, config.update)
@@ -1082,9 +1082,9 @@ class Server {
             if (config.menu) {
               if (typeof config.menu === "function") {
                 if (config.menu.constructor.name === "AsyncFunction") {
-                  config.menu = await config.menu(this.kernel)
+                  config.menu = await config.menu(this.kernel, this.kernel.info)
                 } else {
-                  config.menu = config.menu(this.kernel)
+                  config.menu = config.menu(this.kernel, this.kernel.info)
                 }
               }
 
@@ -1096,9 +1096,9 @@ class Server {
             if (config.shortcuts) {
               if (typeof config.shortcuts === "function") {
                 if (config.shortcuts.constructor.name === "AsyncFunction") {
-                  config.shortcuts = await config.shortcuts(this.kernel)
+                  config.shortcuts = await config.shortcuts(this.kernel, this.kernel.info)
                 } else {
-                  config.shortcuts = config.shortcuts(this.kernel)
+                  config.shortcuts = config.shortcuts(this.kernel, this.kernel.info)
                 }
               }
               await this.renderShortcuts(uri, item.name, config, pathComponents)
@@ -1894,6 +1894,12 @@ class Server {
     // initialize kernel
     await this.kernel.init({ port: this.port})
 
+    let env = await Environment.get(this.kernel.homedir)
+    if (env && env.PINOKIO_PORT) {
+      this.port = env.PINOKIO_PORT
+    }
+
+
     // start proxy for Pinokio itself
 //    await this.kernel.api.startProxy("/", `http://127.0.0.1:${this.port}`, "/")
 
@@ -2183,7 +2189,44 @@ class Server {
           config[key] = ""
         }
       }
+      // find urls in the current app
+      let app_path = path.resolve(this.kernel.homedir, "api", req.params.name)
+      let scripts = Object.keys(this.kernel.memory.local).filter((x) => {
+        return x.startsWith(app_path)
+      })
+      let cloudflare_links = []
+      let local_links = []
+      console.log({ app_path, scripts })
+      for(let script in this.kernel.memory.local) {
+        let mem = this.kernel.memory.local[script]
+        console.log({ script, mem })
+        if (mem.$share) {
+          if (mem.$share.cloudflare) {
+            for(let key in mem.$share.cloudflare) {
+              let val = mem.$share.cloudflare[key]
+              let qr = await QRCode.toDataURL(val)
+              cloudflare_links.push({
+                url: val,
+                qr
+              })
+            }
+          }
+          if (mem.$share.local) {
+            for(let key in mem.$share.local) {
+              let val = mem.$share.local[key]
+              let qr = await QRCode.toDataURL(val)
+              local_links.push({
+                url: val,
+                qr
+              })
+            }
+          }
+        }
+      }
+      console.log({ cloudflare_links, local_links })
       res.render("share_editor", {
+        cloudflare_links,
+        local_links,
         keys,
         config,
         theme: this.theme,
@@ -2247,9 +2290,9 @@ class Server {
       if (config && config.menu) {
         if (typeof config.menu === "function") {
           if (config.menu.constructor.name === "AsyncFunction") {
-            config.menu = await config.menu(this.kernel)
+            config.menu = await config.menu(this.kernel, this.kernel.info)
           } else {
-            config.menu = config.menu(this.kernel)
+            config.menu = config.menu(this.kernel, this.kernel.info)
           }
         }
 

package/server/views/browser-experimental.ejs

@@ -1272,6 +1272,7 @@ document.querySelector("aside").addEventListener("click", async (e) => {
     e.stopPropagation()
     let link = target.closest("[href]")
     let src = new URL(link.href).pathname
+    target.querySelector("i.fa-square").className = "fa-solid fa-check"
     n.Noty({
       text: `stopping ${src}`,
       silent: true

package/server/views/index.ejs

@@ -223,7 +223,7 @@ body.dark .browser-options-row {
           <a href="/" target="_blank" class='btn' features="browser"><div><i class="fa-solid fa-square-up-right"></i> Open</div></a>
           <div class='flexible'>
             <h3><i class="fa-solid fa-bolt"></i> Instant Launch</h3>
-            <div>(Experimental) Directly open pinokio apps from your favorite browser address bar at http://localhost:42000. If an app you're trying to use is already running, it will instantly load. If it's not, the app will first launch and then load the website.</div>
+            <div>(Experimental) Directly open pinokio apps from your favorite browser address bar at localhost. If an app you're trying to use is already running, it will instantly load. If it's not, the app will first launch and then load the website.</div>
           </div>
         </div>
       <% } %>
@@ -283,9 +283,6 @@ body.dark .browser-options-row {
               <div class='title'><%=item.name%></div>
               <div class='description'><%=item.description%></div>
               <div>
-                <button class='btn browse' data-src="<%=item.browser_url%>/browse">
-                  <i class="fa-regular fa-folder-open"></i>
-                </button>
                 <% if (item.running_scripts) { %>
                   <% item.running_scripts.forEach((s) => { %>
                       <button class='btn shutdown' data-src="<%=s.path%>">
@@ -333,9 +330,6 @@ body.dark .browser-options-row {
               <div class='uri'><i class="fa-regular fa-folder"></i><%=item.url%></div>
               <div class='title'><%=item.name%></div>
               <div class='description'><%=item.description%></div>
-              <button class='btn browse' data-src="<%=item.browser_url%>/browse">
-                <i class="fa-regular fa-folder-open"></i>
-              </button>
               <% if (item.shortcuts && item.shortcuts.length > 0) { %>
                 <div class='btns'>
                   <% item.shortcuts.forEach((btn) => { %>

package/server/views/share_editor.ejs

@@ -109,6 +109,11 @@ body.dark .env-item label {
   display: inline-block;
   margin-bottom: 5px;
   font-weight: bold;
+  font-size: 20px;
+  letter-spacing: -1px;
+}
+.env-item ul {
+  margin: 5px 0;
 }
 .env-item {
   padding-top: 10px;
@@ -131,6 +136,17 @@ hr {
   border: none;
   height: 1px;
 }
+.shared {
+  margin-left: 30px;
+}
+.shared a {
+  display: block;
+  margin-bottom: 5px;
+}
+.shared img {
+  width: 200px;
+}
+
 </style>
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
@@ -173,8 +189,20 @@ document.addEventListener("DOMContentLoaded", async () => {
         <% } else { %>
           <input type="checkbox" id="PINOKIO_SHARE_CLOUDFLARE" name="cloudflare" />
         <% } %>
-        <label for="cloudflare">Share Publicly</label>
-        <div>This will set the PINOKIO_SHARE_CLOUDFLARE environment variable to true, and share your local app to the public internet, powered by <a href="https://www.cloudflare.com/products/tunnel/" target="_blank" features="browser">Cloudflare Tunnel</a></div>
+        <label for="cloudflare"><i class="fa-brands fa-cloudflare"></i> Run a Public Node</label>
+        <ul>
+          <li>This will turn this local app into a public node.</li>
+          <li>Anyone with a URL can access a public node.</li>
+          <li>Users can't access Pinokio itself, only can access each app's UI.</li>
+          <li>Powered by <a href="https://www.cloudflare.com/products/tunnel/" target="_blank" features="browser">Cloudflare Tunnel</a></li>
+          <li>You can manually configure this in through the Configure menu (set PINOKIO_SHARE_CLOUDFLARE to true)</li>
+        </ul>
+        <% cloudflare_links.forEach((link) => { %>
+          <div class='shared'>
+            <a href="<%=link.url%>" target="_blank" features="browser"><%=link.url%></a>
+            <img src="<%=link.qr%>">
+          </div>
+        <% }) %>
       </div>
       <div class='env-item'>
         <% if (config.PINOKIO_SHARE_LOCAL.toString() === "true") { %>
@@ -182,8 +210,18 @@ document.addEventListener("DOMContentLoaded", async () => {
         <% } else { %>
           <input type="checkbox" id="PINOKIO_SHARE_LOCAL" name="local" />
         <% } %>
-        <label for="local">Share with Local Network Devices</label>
-        <div>This will set the PINOKIO_SHARE_LOCAL environment variable to true, and share your local app to any device on the same local network</div>
+        <label for="local"><i class="fa-solid fa-network-wired"></i> Share with Local Network</label>
+        <ul>
+          <li>This will allow any device on the same local network to access the app.</li>
+          <li>A new IP will be provided when local sharing is on, which can be used to access from any device on the same network.</li>
+          <li>You can manually configure this through the Configure menu (set PINOKIO_SHARE_LOCAL to true)</li>
+        </ul>
+        <% local_links.forEach((link) => { %>
+          <div class='shared'>
+            <a href="<%=link.url%>" target="_blank" features="browser"><%=link.url%></a>
+            <img src="<%=link.qr%>">
+          </div>
+        <% }) %>
       </div>
       <div class='runner'>
         <div id='save' class='btn'>