pinokiod 1.3.37 → 1.3.39

package/kernel/api/cloudflare/index.js

@@ -0,0 +1,60 @@
+const { yellow, green, blue  } = require('kleur');
+const QRCode = require('qrcode');
+class C {
+  async tunnel (req, ondata, kernel) {
+    /*
+      {
+        "method": "cloundflare.tunnel",
+        "params": {
+          "uri": "{{local.url}}"
+        }
+      }
+
+      => cloudflared tunnel --url http://localhost:8080
+    */
+    const message = `cloudflared tunnel --url ${req.params.uri}`
+    let params = {
+      id: message,
+      message
+    }
+    if (req.client) {
+      params.rows = req.client.rows
+      params.cols = req.client.cols
+    }
+    let options = {}
+    if (req.cwd) options.cwd = req.cwd
+    if (req.parent && req.parent.path) options.group = req.parent.path
+    console.log("shells before", kernel.shell.shells)
+    let pattern = /(https:.+?trycloudflare\.com)/
+    let cloudflare_url = await new Promise((resolve, reject) => {
+      kernel.shell.start(params, options, (e) => {
+        ondata(e)
+        let test = pattern.exec(e.cleaned)
+        if (test && test.length > 0) {
+          resolve(test[1])
+        }
+      })
+    })
+    console.log("cloudflare_url", cloudflare_url)
+
+    ondata({ raw: yellow("\r\n## Scan the QR code to open in any device\r\n\r\n") })
+    ondata({ raw: blue(`${cloudflare_url}\r\n\r\n`) })
+
+    await new Promise((resolve, reject) => {
+      QRCode.toString(cloudflare_url, {
+        type: "terminal"
+      }, function(err, data) {
+        ondata({ raw: green(data).replaceAll("\n", "\r\n") })
+        ondata({ raw: "\r\n" })
+        setTimeout(() => {
+          resolve()
+        }, 2000)
+      });
+    })
+
+    return { uri: cloudflare_url }
+  }
+  async stop (req, ondata, kernel) {
+  }
+}
+module.exports = C

package/kernel/api/web/index.js

@@ -0,0 +1,25 @@
+const path = require('path')
+class Web {
+  /*
+  {
+    method: "web.expose",
+    params: {
+      uri: "{{local.uri}}"
+    }
+  }
+  */
+  async expose(req, ondata, kernel) {
+    let parent_path = req.parent.path
+    let userdir = path.resolve(kernel.homedir, "api")
+    let rel_path= path.relative(userdir, parent_path)
+    let app = rel_path.split(path.sep)[0]
+    let uri = req.params.uri
+    console.log({ userdir, rel_path, app })
+    ondata({
+      raw: `\r\n[Exposing Web URL] /app/${app} => ${req.params.uri}\r\n`
+    })
+    kernel.exposed[app] = req.params.uri
+    console.log("kernel.exposed", kernel.exposed)
+  }
+}
+module.exports = Web

package/kernel/bin/cloudflared.js

@@ -0,0 +1,54 @@
+const fs = require('fs')
+class Cloudflared {
+  async uninstall(req, ondata) {
+    ondata({ raw: "cleaning up\r\n" })
+    let bin = this.kernel.bin
+    if (bin.platform === "darwin") {
+      await this.kernel.bin.exec({
+        message: "brew uninstall cloudflared",
+      }, ondata)
+    } else if (bin.platform === "win32") {
+      const folder = this.kernel.bin.path("cloudflared.exe")
+      await fs.promises.rm(folder).catch((e) => {
+      })
+    } else {
+      const folder = this.kernel.bin.path("cloudflared")
+      await fs.promises.rm(folder).catch((e) => {
+      })
+    }
+    ondata({ raw: "finished cleaning up\r\n" })
+  }
+  async install(req, ondata) {
+    let bin = this.kernel.bin
+    if (bin.platform === "darwin") {
+      await this.kernel.bin.exec({
+        message: "brew install cloudflared",
+      }, ondata)
+    } else if (bin.platform === "win32") {
+      const url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-windows-amd64.exe"
+      const dest = "cloudflared.exe"
+      await this.kernel.bin.download(url, dest, ondata)
+    } else {
+      let url
+      if (bin.arch === "x64") {
+        url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64"
+      } else if (bin.arch === "arm64") {
+        url = "https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-arm64"
+      }
+      const dest = "cloudflared"
+      await this.kernel.bin.download(url, dest, ondata)
+    }
+  }
+  async installed() {
+    if (this.kernel.platform === 'win32') {
+      let e = await this.kernel.bin.exists("cloudflared.exe")
+      return e
+    } else if (this.kernel.platform === "darwin") {
+      return this.kernel.bin.installed.brew.has("cloudflared")
+    } else {
+      let e = await this.kernel.bin.exists("cloudflared")
+      return e
+    }
+  }
+}
+module.exports = Cloudflared

package/kernel/index.js

@@ -39,6 +39,7 @@ class Kernel {
     this.platform = os.platform()
     this.key = new Key()
     this.jsdom = jsdom
+    this.exposed = {}
   }
   resumeprocess(uri) {
     let proc = this.procs[uri]

package/kernel/shell.js

@@ -146,6 +146,9 @@ class Shell {
         this.env[PATH_KEY]
       ].join(':');
     }
+
+    this.env[PATH_KEY] = this.env[PATH_KEY] + path.delimiter + path.resolve(this.kernel.homedir, 'bin')
+
     // custom env was passed in
 
     // override cache folders if cache is specified

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.3.37",
+  "version": "1.3.39",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -37,6 +37,7 @@
     "jsdom": "^24.0.0",
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
+    "kleur": "^4.1.5",
     "lodash": "^4.17.21",
     "lproxy": "^0.0.9",
     "marked": "^5.0.1",

package/script/index.js

@@ -35,8 +35,8 @@ class Store {
   }
 }
 const server = new Server({
-  //port: 42000,
-  port: 80,
+  port: 42000,
+  //port: 80,
   agent: "web",
   store: new Store()
 })

package/server/index.js

@@ -1,4 +1,5 @@
 const express = require('express');
+const portfinder = require('portfinder');
 const proxy = require('express-http-proxy-cp');
 const sudo = require("sudo-prompt-programfiles-x86");
 const compressing = require('compressing');
@@ -356,6 +357,8 @@ class Server {
         args: "-c conda-forge"
       }, {
         name: "py"
+      }, {
+        name: "cloudflared"
       }]
       let platform = os.platform()
       if (platform === "win32") {
@@ -419,6 +422,10 @@ class Server {
         ],
         val: this.kernel.homedir,
         placeholder: "Enter the absolute path to use as your Pinokio home folder (D:\\pinokio, /Users/alice/pinokiofs, etc.)"
+//      }, {
+//        key: "drive",
+//        val: path.resolve(this.kernel.homedir, "drive"),
+//        placeholder: "Pinokio virtual drives folder"
       }, {
         key: "theme",
         val: this.theme,
@@ -433,6 +440,7 @@ class Server {
         }
       }
       res.render("settings", {
+        platform,
         version: this.version,
         logo: this.logo,
         theme: this.theme,
@@ -610,6 +618,8 @@ class Server {
           args: "-c conda-forge"
         }, {
           name: "py"
+        }, {
+          name: "cloudflared"
         }]
         let platform = os.platform()
         if (platform === "win32") {
@@ -1653,6 +1663,7 @@ class Server {
   async setConfig(config) {
     let home = this.kernel.store.get("home")
     let theme = this.kernel.store.get("theme")
+//    let drive = this.kernel.store.get("drive")
 
     // 1. Handle THEME
     if (config.theme) {
@@ -1682,6 +1693,28 @@ class Server {
       }
 
     }
+//    // 3. Handle Drive
+//    if (config.drive) {
+//      // if the home is different from the existing home, go forward
+//      if (config.drive !== drive) {
+//        const basename = path.basename(config.drive)
+//        // check for invalid path
+//        let isValidPath = (basename !== '' && basename !== config.drive)
+//        if (!isValidPath) {
+//          throw new Error("Invalid path: " + config.home)
+//        }
+//
+//        // check if the destination already exists => throw error
+//        let exists = await fse.pathExists(config.drive)
+//        if (exists) {
+//          throw new Error(`The path ${config.drive} already exists. Please remove the folder and retry`)
+//        }
+//
+//        this.kernel.store.set("drive", config.drive)
+//      }
+//
+//    }
+
 
     home = this.kernel.store.get("home")
     theme = this.kernel.store.get("theme")
@@ -1743,6 +1776,10 @@ class Server {
         await this.httpTerminator.terminate();
       } catch (e) {
       }
+//      try {
+//        await this.exposeTerminator.terminate();
+//      } catch (e) {
+//      }
     }
     console.log("** AA")
 
@@ -1819,10 +1856,10 @@ class Server {
     this.app.set("views", path.resolve(__dirname, "views"))
     this.app.use(express.json());
     this.app.use(express.urlencoded({ extended: true }));
-
     this.app.use(cookieParser());
     this.app.use(session({secret: "secret" }))
 
+
     //let home = this.kernel.homedir
     let home = this.kernel.store.get("home")
     this.app.get("/", async (req, res) => {
@@ -1867,6 +1904,11 @@ class Server {
           ],
           val: this.kernel.homedir ? this.kernel.homedir : _home,
           placeholder: "Enter the absolute path to use as your Pinokio home folder (D:\\pinokio, /Users/alice/pinokiofs, etc.)"
+//        }, {
+//          key: "drive",
+//          val: path.resolve(this.kernel.homedir, "drive"),
+//          description: ["Virtual drive folder (Don't change it unless you know what you're doing)"],
+//          placeholder: "Pinokio virtual drives folder"
         }, {
           key: "theme",
           val: this.theme,
@@ -1881,6 +1923,7 @@ class Server {
           }
         }
         res.render("settings", {
+          platform,
           version: this.version,
           logo: this.logo,
           theme: this.theme,
@@ -1950,76 +1993,6 @@ class Server {
 
 
 
-//    /*
-//
-//        Requirements
-//
-//        1. When entering /app/:name, it should open the app's page if it's running. If not running, start the app, and open the app's page at the end
-//
-//        /app/:name
-//
-//        - check the /api/:name folder
-//          - if it exists:
-//            - check pinokio.js for start attribute
-//              - if start exists, 
-//          - if it doesn't exist:
-//
-//        2. how about when i want to use the tab view?
-//
-//
-//        what if the browser view stays, but just add a "default" attribute for tabs, and select that by default
-//
-//
-//        what if every script after starting, checks for local.url, and if it exists, 
-//
-//    */
-//    this.app.get("/app/:name", async (req, res) => {
-//
-//      // 1. take req.params.name and resolve the folder name
-//      let name = req.params.name
-//      let app_path = this.kernel.path("api", name, "pinokio.js")
-//      // 2. open pinokio.js to check the start attribute
-//      let config  = (await this.kernel.loader.load(app_path)).resolved
-//      if (config && config.start) {
-//        if (typeof config.start === "function") {
-//          if (config.start.constructor.name === "AsyncFunction") {
-//            config.start = await config.start(this.kernel)
-//          } else {
-//            config.start = config.start(this.kernel)
-//          }
-//        }
-//        // 3. check if the start script is running
-//        let startScriptPath = this.kernel.path("api", name, config.start)
-//        if (this.kernel.running(startScriptPath)) {
-//          // 4.a. if running, route to the local.url for the start script
-//          let local = this.kernel.local(startScriptPath)
-//          if (local && local.url) {
-//            // if local.url exists, display that
-//            res.redirect(local.url)
-//          } else {
-//            // if local.url doesn't exist, display the app page
-//            res.redirect(`http://localhost:${this.port}/pinokio/browser/${req.params.name}`)
-//          }
-//        } else {
-//          // 4.b. if not running, start the script and render the loading screen
-//          //    => the loading screen will automatically reload after the script has started
-//          if (typeof config.start === 'object') {
-//            let url = config.start.url
-//            let params = config.start.params
-//            let queryStr = new URLSearchParams(params).toString()
-//            let u = `http://localhost:${this.port}/pinokio/launch/${req.params.name}/${url}?${queryStr}`
-//            console.log("u1", u)
-//            res.redirect(u)
-//          } else {
-//            let url = config.start
-//            let u = `http://localhost:${this.port}/pinokio/launch/${req.params.name}/${url}`
-//            //let u = `/api/${req.params.name}/${url}`
-//            console.log("u2", u)
-//            res.redirect(u)
-//          }
-//        }
-//      }
-//    })
 
     this.app.get("/script/:name", (req, res) => {
       if (req.params.name === "start") {
@@ -2561,6 +2534,48 @@ class Server {
         server: this.listening
       });
     })
+
+
+
+//    this.expose_app = express();
+//    this.expose_app.use(cors({
+//      origin: '*'
+//    }));
+//    this.expose_app.use('/', proxy(async (req) => {
+//      console.log("req.url", req.url)
+//      let tokens = req.url.split("/")
+//      console.log({ tokens })
+//      if (tokens.length >=2 ) {
+//        let app = tokens[1]
+//        console.log({ app })
+//        console.log("resolved = ", this.kernel.exposed[app])
+//        return this.kernel.exposed[app]
+//      }
+//    }, {
+////      proxyReqPathResolver: (req) => {
+////        console.log("proxyReqPathResolver", req.url)
+////        let chunks = req.url.split("/")
+////        let transformed
+////        if (chunks.length > 3) {
+////          transformed = "/" + chunks.slice(3).join("/")
+////        } else {
+////          transformed = "/"
+////        }
+////        console.log({ chunks, transformed })
+////        return transformed
+////      }
+//    }))
+//    this.expose_port = await portfinder.getPortPromise({ port: this.port })
+//    console.log("EXPOSE_PORT", this.expose_port)
+//    await new Promise((resolve, reject) => {
+//      this.expose_server = this.expose_app.listen(this.expose_port, () => {
+//        console.log(`Server listening on port ${this.expose_port}`)
+//        resolve()
+//      });
+//      this.exposeTerminator = createHttpTerminator({
+//        server: this.expose_server
+//      });
+//    })
   }
 }
 module.exports = Server

package/server/public/style.css

@@ -1073,6 +1073,8 @@ body.dark .line.align-top h3 .col .btn.label {
 .line.align-top h3 .col {
   padding-left: 10px;
   flex-grow: 1;
+  min-width: 0;
+  word-wrap: break-word;
 }
 .line.align-top h3 {
   display: flex;
@@ -1465,6 +1467,9 @@ body.dark .btn2 {
 body.dark .btn2:hover {
   background: rgba(255,255,255,0.06);
 }
+.browser-options {
+  padding: 10px;
+}
 .btn2 {
   background: none;
   font-weight: normal;

package/server/views/browser-experimental.ejs

@@ -561,10 +561,10 @@ body.dark .loader-container {
   </div>
   -->
   <div class='grid-btns'>
-    <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>help</div></a>
-    <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>config</div></a>
-    <a class='btn2' href="/"><div><i class="fa-solid fa-house"></i></div><div>home</div></a>
-    <button class='btn2' id='new-window' title='open a new window'><div><i class="fa-solid fa-plus"></i></div><div> window</div></button>
+    <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Community</div></a>
+    <a class='btn2' href="/?mode=settings"><div><i class="fa-solid fa-gear"></i></div><div>Settings</div></a>
+    <a class='btn2' href="/"><div><i class="fa-solid fa-house"></i></div><div>Home</div></a>
+    <button class='btn2' id='new-window' title='open a new window'><div><i class="fa-solid fa-plus"></i></div><div>Window</div></button>
   </div>
   <!--
   <div class='grid-btns'>

package/server/views/help.ejs

@@ -66,9 +66,10 @@
   padding: 20px 0;
 }
 .titleview h1 {
+  font-style: italic;
   word-break: break-word;
-  font-size: 40px;
-  text-transform: uppercase;
+  font-size: 50px;
+  font-family: Georgia;
   letter-spacing: -1px;
 }
 .item > .d {
@@ -261,7 +262,7 @@ body.dark .item .tile .badge {
   <div class='item'>
     <label><i class="fa-brands fa-discord"></i> Discord</label>
     <div>
-      Having issues? Generate a logs.zip file, and share it in <a class='link' href="https://discord.gg/TQdNwadtE4" target="_blank">Pinokio Discord</a>
+      Have questions? Something not working? Generate a logs.zip file, and share it in <a class='link' href="https://discord.gg/TQdNwadtE4" target="_blank">Pinokio Discord</a>
       <div class='footer'>
         <div id='genlog' class='btn'>Generate logs.zip</div>
         <a id='downloadlogs' download class='hidden btn' href="/pinokio/logs.zip"><i class="fa-solid fa-download"></i> Download logs.zip</a>

package/server/views/index.ejs

@@ -123,10 +123,12 @@ 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 class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Community</div></a>
     <% if (agent === "electron") { %>
       <a class='btn2' data-filepath="<%=filepath%>"><div><i class="fa-regular fa-folder-open"></i></div><div>Files</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 id='wifi' data-proxy="<%=proxy.proxy%>" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>WiFi Share</div></a>
+    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-arrow-up-right-from-square"></i></div><div>Popout</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>
@@ -137,7 +139,6 @@ header .runner {
     <!--
     <a class='btn2' id='report'><div><i class="fa-solid fa-question"></i></div><div>Help</div></a>
     -->
-    <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Help</div></a>
   </div>
   <button id='new-window' title='open a new window' class='btn2'><i class="fa-solid fa-plus"></i></button>
 <% } %>
@@ -172,6 +173,12 @@ header .runner {
 <div id='terminal' class='hidden'></div>
 <div class='container'>
 <% if (ishome) { %>
+<!--
+  <div class='browser-options'>
+    <a href="/" target="_blank" class='btn'><div><i class="fa-solid fa-arrow-up-right-from-square"></i> Open in Browser</div></a>
+    <a id='wifi' data-proxy="<%=proxy.proxy%>" class='btn'><div><i class="fa-solid fa-wifi"></i> WiFi Sharing</div></a>
+  </div>
+  -->
   <% if (running.length > 0) { %>
     <div class='running-apps'>
       <div class='header-label'>Running</div>
@@ -641,6 +648,8 @@ document.addEventListener("click", (e) => {
       console.log("packet", packet)
       if (packet.type === "result") {
         socket.close()
+        target.querySelector("i.fa-stop").className = "fa-solid fa-check"
+        target.querySelector("i.fa-spin").classList.add("hidden")
         n.Noty({
           text: `stopped ${src}`,
           silent: true
@@ -721,6 +730,8 @@ document.addEventListener("click", (e) => {
       },
       showConfirmButton: false,
       html: `<div class='min-modal'>
+      <div>Access Pinokio from</div>
+      <div>any local network device</div>
       <div><img src="<%=qr%>"></div>
   <a href="<%=proxy.proxy%>" target="_blank"><%=proxy.proxy%></a>
   </div>`

package/server/views/settings.ejs

@@ -66,9 +66,10 @@
   padding: 20px 0;
 }
 .titleview h1 {
+  font-style: italic;
   word-break: break-word;
-  font-size: 40px;
-  text-transform: uppercase;
+  font-size: 50px;
+  font-family: Georgia;
   letter-spacing: -1px;
 }
 .item > .d {
@@ -424,53 +425,68 @@ document.addEventListener("DOMContentLoaded", async () => {
       })
     }
   <% } %>
+//  document.querySelector("[name=home]").addEventListener("input", (e) => {
+//    let sep = "<%=platform === 'win32' ? '\\' : '/'%>" 
+//    document.querySelector("[name=drive]").value = e.target.value + sep + "drive"
+//  })
   document.querySelector("form").addEventListener("submit", async (e) => {
     e.preventDefault()
     e.stopPropagation()
     let val = document.querySelector(`[name=home]`).value
     if (/.*\s+.*/.test(val)) {
       alert("Please use a home path that does NOT include a space")
-      document.querySelector(".homepath").focus()
-    } else {
-      document.querySelector(".loading").classList.remove("hidden")
-      document.querySelector("#save").classList.add("hidden")
-      document.querySelector(".homepath").setAttribute("disabled", "disabled")
-      let theme = document.querySelector(`[name=theme]`).value
-      let r = await fetch("/config", {
-        method: "post",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-          home: (val && val.length > 0 ? val : null),
-          theme 
-        })
-      }).then((res) => {
-        return res.json()
+      document.querySelector("[name=home]").focus()
+      return
+    }
+
+//    let drive = document.querySelector(`[name=drive]`).value
+//    if (/.*\s+.*/.test(drive)) {
+//      alert("Please use a drive path that does NOT include a space")
+//      document.querySelector("[name=drive]").focus()
+//      return
+//    }
+
+
+    document.querySelector(".loading").classList.remove("hidden")
+    document.querySelector("#save").classList.add("hidden")
+    document.querySelector("[name=home]").setAttribute("disabled", "disabled")
+//    document.querySelector("[name=drive]").setAttribute("disabled", "disabled")
+    let theme = document.querySelector(`[name=theme]`).value
+    let r = await fetch("/config", {
+      method: "post",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        home: (val && val.length > 0 ? val : null),
+//        drive: (drive && drive.length > 0 ? drive : null),
+        theme 
       })
-      if (r.success) {
-        //alert("Successfully updated the pinokio home to " + val)
-        fetch("/restart", {
-          method: "post"
-        }, () => {
-        })
-        setInterval(async () => {
-          try {
-            let res = await fetch("/check").then((res) => {
-              return res.json()
-            })
-            if (res.success) {
-              document.querySelector(".loading").classList.add("hidden")
-              setTimeout(() => {
-                location.href = "/"
-              }, 1000)
-            }
-          } catch (e) {
-            console.log(e)
+    }).then((res) => {
+      return res.json()
+    })
+    if (r.success) {
+      //alert("Successfully updated the pinokio home to " + val)
+      fetch("/restart", {
+        method: "post"
+      }, () => {
+      })
+      setInterval(async () => {
+        try {
+          let res = await fetch("/check").then((res) => {
+            return res.json()
+          })
+          if (res.success) {
+            document.querySelector(".loading").classList.add("hidden")
+            setTimeout(() => {
+              location.href = "/"
+            }, 1000)
           }
-        }, 1000)
-      } else if (r.error) {
-        alert(r.error)
-        location.href = location.href
-      }
+        } catch (e) {
+          console.log(e)
+        }
+      }, 1000)
+    } else if (r.error) {
+      alert(r.error)
+      location.href = location.href
     }
   })
 })