pinokiod 1.0.11 → 1.0.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -34,7 +34,6 @@
     "isomorphic-git": "^1.23.0",
     "jsonpath-plus": "^7.2.0",
     "key-store": "^1.2.0",
-    "localtunnel": "^2.0.2",
     "lodash": "^4.17.21",
     "marked": "^5.0.1",
     "mime-types": "^2.1.35",

package/server/index.js

@@ -20,7 +20,9 @@ const git = require('isomorphic-git')
 const http = require('isomorphic-git/http/node')
 const marked = require('marked')
 const multer = require('multer');
-const localtunnel = require('localtunnel');
+//const localtunnel = require('localtunnel');
+//const ngrok = require("@ngrok/ngrok");
+
 const ejs = require('ejs');
 
 
@@ -35,7 +37,7 @@ class Server {
     this.agent = config.agent
     this.port = config.port
     this.kernel = new Kernel(config.store)
-    this.tunnels = {}
+//    this.tunnels = {}
     this.version = {
       pinokiod: packagejson.version,
       pinokio: config.version
@@ -95,23 +97,24 @@ class Server {
     for(let key in localMem) {
       let val = localMem[key]
       // check for localhost url
-      let localhost = false
-      let tunnel
-      try {
-        let url = new URL(val)
-        if (localhosts.includes(url.hostname)) {
-          localhost = true
-          if (this.tunnels[val]) {
-            tunnel = this.tunnels[val].url
-          }
-        }
-      } catch (e) { }
+//      let localhost = false
+//      let tunnel
+//      try {
+//        let url = new URL(val)
+//        if (localhosts.includes(url.hostname)) {
+//          localhost = true
+//          if (this.tunnels[val]) {
+//            tunnel = this.tunnels[val].url()
+//            //tunnel = this.tunnels[val].url
+//          }
+//        }
+//      } catch (e) { }
       mem.push({
         type: "local",
         key,
         val,
-        tunnel,
-        localhost,
+//        tunnel,
+//        localhost,
       })
     }
     return mem
@@ -262,6 +265,7 @@ class Server {
     if (pathComponents.length === 0 && req.query.mode === "explore") {
       res.render("explore", {
         version: this.version,
+        schema: this.kernel.schema,
         logo: this.logo,
         theme: this.theme,
         agent: this.agent,
@@ -1752,41 +1756,57 @@ class Server {
       let mem = this.getMemory(filepath)
       res.json(mem)
     })
-    this.app.post("/pinokio/tunnel", async (req, res) => {
-      let port
-      let local_host
-      try {
-        let u = new URL(req.body.url)
-        port = u.port
-        local_host = u.hostname
-        console.log({ local_host, port })
-        if (req.body.action === "start") {
-          //const tunnel = await localtunnel({ local_host, port: parseInt(port) });
-          //const tunnel = await localtunnel({ local_host: "127.0.0.1", port: parseInt(port) });
-          const tunnel = await localtunnel({ port: parseInt(port) });
-          let url = req.body.url
-          this.tunnels[url] = tunnel
-          tunnel.on('error', (err) => {
-            console.log(err)
-            delete this.tunnels[url]
-          })
-          tunnel.on('close', () => {
-            // tunnels are closed
-            console.log("tunnel closed", { url, tunnel_url: tunnel.url })
-            delete this.tunnels[url]
-          });
-          res.json({ url: tunnel.url })
-        } else if (req.body.action === "stop") {
-          let url = req.body.url
-          console.log({ tunnels: this.tunnels, url })
-          this.tunnels[url].close()
-          res.json({ url })
-        }
-      } catch (e) {
-        console.log("ERROR", e)
-        res.json({ error: e.message })
-      }
-    })
+//    this.app.post("/pinokio/tunnel", async (req, res) => {
+//      let port
+//      let local_host
+//      try {
+//        let u = new URL(req.body.url)
+//        port = u.port
+//        local_host = u.hostname
+//        console.log({ local_host, port })
+//        if (req.body.action === "start") {
+//          // Output ngrok url to console
+//
+//          let url = req.body.url
+//          console.log("tunnel", req.body)
+//          const tunnel = await ngrok.forward({ addr: port, authtoken: req.body.token });
+//          console.log("created", tunnel)
+//          console.log("url", tunnel.url())
+//          this.tunnels[url] = tunnel
+//          res.json({ url: tunnel.url() })
+//
+//
+//          // localtunnel
+//          //const tunnel = await localtunnel({ local_host, port: parseInt(port) });
+//          //const tunnel = await localtunnel({ local_host: "127.0.0.1", port: parseInt(port) });
+//
+//          //const tunnel = await localtunnel({ port: parseInt(port) });
+//          //this.tunnels[url] = tunnel
+//          //tunnel.on('error', (err) => {
+//          //  console.log(err)
+//          //  delete this.tunnels[url]
+//          //})
+//          //tunnel.on('close', () => {
+//          //  // tunnels are closed
+//          //  console.log("tunnel closed", { url, tunnel_url: tunnel.url })
+//          //  delete this.tunnels[url]
+//          //});
+//          //res.json({ url: tunnel.url })
+//        } else if (req.body.action === "stop") {
+//          let url = req.body.url
+//          await this.tunnels[url].close()
+//          delete this.tunnels[url]
+//          res.json({ url })
+////          let url = req.body.url
+////          console.log({ tunnels: this.tunnels, url })
+////          this.tunnels[url].close()
+////          res.json({ url })
+//        }
+//      } catch (e) {
+//        console.log("ERROR", e)
+//        res.json({ error: e.message })
+//      }
+//    })
     this.app.post("/pinokio/tabs", async (req, res) => {
       this.tabs[req.body.name] = req.body.tabs
       res.json({ success: true })

package/server/public/install.js

@@ -53,7 +53,6 @@ const install = async (name, url, term, socket, options) => {
       url = url + ".git"
     }
 
-console.log({ url , branch })
     let cmd
     if (branch) {
       cmd = `git clone -b ${branch} ${url} ${name}`

package/server/public/style.css

@@ -666,6 +666,7 @@ body.dark .memory {
 }
 */
 .memory {
+  display: none;
   position: absolute;
   z-index: 10000;
   top: 10px;

package/server/views/editor.ejs

@@ -636,40 +636,43 @@ document.addEventListener("DOMContentLoaded", async () => {
   })
   Reporter()
   */
-  document.querySelector(".memory").addEventListener("click", async (e) => {
-    let target = e.target.classList.contains("tunnel") ? e.target : e.target.closest(".tunnel")
-    let target2 = e.target.classList.contains("tunnel-stop") ? e.target : e.target.closest(".tunnel-stop")
-    if (target) {
-      e.preventDefault()
-      e.stopPropagation()
-      let url = target.getAttribute("data-url")
-      let response = await fetch("/pinokio/tunnel", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ url, action: "start" })
-      }).then((res) => {
-        return res.json()
-      })
-      await reloadMemory()
-    } else if (target2) {
-      console.log("target2", target2)
-      e.preventDefault()
-      e.stopPropagation()
-      let url = target2.getAttribute("data-url")
-      let response = await fetch("/pinokio/tunnel", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ url, action: "stop" })
-      }).then((res) => {
-        return res.json()
-      })
-      await reloadMemory()
-    }
-  })
+//  document.querySelector(".memory").addEventListener("click", async (e) => {
+//    let target = e.target.classList.contains("tunnel") ? e.target : e.target.closest(".tunnel")
+//    let target2 = e.target.classList.contains("tunnel-stop") ? e.target : e.target.closest(".tunnel-stop")
+//    if (target) {
+//      e.preventDefault()
+//      e.stopPropagation()
+//      let url = target.getAttribute("data-url")
+//      const token = prompt("Enter an Ngrok auth token to expose your machine to the public Internet https://ngrok.com/")
+//      if (token && token.length > 0) {
+//        let response = await fetch("/pinokio/tunnel", {
+//          method: "POST",
+//          headers: {
+//            "Content-Type": "application/json"
+//          },
+//          body: JSON.stringify({ url, action: "start", token })
+//        }).then((res) => {
+//          return res.json()
+//        })
+//        await reloadMemory()
+//      }
+//    } else if (target2) {
+//      console.log("target2", target2)
+//      e.preventDefault()
+//      e.stopPropagation()
+//      let url = target2.getAttribute("data-url")
+//      let response = await fetch("/pinokio/tunnel", {
+//        method: "POST",
+//        headers: {
+//          "Content-Type": "application/json"
+//        },
+//        body: JSON.stringify({ url, action: "stop" })
+//      }).then((res) => {
+//        return res.json()
+//      })
+//      await reloadMemory()
+//    }
+//  })
   document.querySelector("#lv").addEventListener("click", (e) => {
     let m = e.target.closest(".memory")
     m.classList.toggle("collapsed")

package/server/views/explore.ejs

@@ -145,9 +145,12 @@ body main iframe {
 </header>
 <main>
 <% if (theme === "dark") { %>
-  <iframe name="<%=version.pinokiod%>" src="https://pinokio.computer/dark"></iframe>
+  <iframe name="<%=schema%>" src="https://pinokio.computer/dark"></iframe>
 <% } else { %>
-  <iframe name="<%=version.pinokiod%>" src="https://pinokio.computer/app"></iframe>
+<!--
+  <iframe name="<%=schema%>" src="https://pinokio.computer/app"></iframe>
+  -->
+  <iframe name="<%=schema%>" src="http://127.0.0.1:3000/app"></iframe>
 <% } %>
 </main>
 <link href="/xterm.min.css" rel="stylesheet" />

package/server/views/fullscreen_editor.ejs

@@ -619,40 +619,46 @@ document.addEventListener("DOMContentLoaded", async () => {
   })
   Reporter()
   */
-  document.querySelector(".memory").addEventListener("click", async (e) => {
-    let target = e.target.classList.contains("tunnel") ? e.target : e.target.closest(".tunnel")
-    let target2 = e.target.classList.contains("tunnel-stop") ? e.target : e.target.closest(".tunnel-stop")
-    if (target) {
-      e.preventDefault()
-      e.stopPropagation()
-      let url = target.getAttribute("data-url")
-      let response = await fetch("/pinokio/tunnel", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ url, action: "start" })
-      }).then((res) => {
-        return res.json()
-      })
-      await reloadMemory()
-    } else if (target2) {
-      console.log("target2", target2)
-      e.preventDefault()
-      e.stopPropagation()
-      let url = target2.getAttribute("data-url")
-      let response = await fetch("/pinokio/tunnel", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ url, action: "stop" })
-      }).then((res) => {
-        return res.json()
-      })
-      await reloadMemory()
-    }
-  })
+
+
+
+//  document.querySelector(".memory").addEventListener("click", async (e) => {
+//    let target = e.target.classList.contains("tunnel") ? e.target : e.target.closest(".tunnel")
+//    let target2 = e.target.classList.contains("tunnel-stop") ? e.target : e.target.closest(".tunnel-stop")
+//    if (target) {
+//      e.preventDefault()
+//      e.stopPropagation()
+//      let url = target.getAttribute("data-url")
+//      const token = prompt("Enter an Ngrok auth token to expose your machine to the public Internet https://ngrok.com/")
+//      if (token && token.length > 0) {
+//        let response = await fetch("/pinokio/tunnel", {
+//          method: "POST",
+//          headers: {
+//            "Content-Type": "application/json"
+//          },
+//          body: JSON.stringify({ url, action: "start", token })
+//        }).then((res) => {
+//          return res.json()
+//        })
+//        await reloadMemory()
+//      }
+//    } else if (target2) {
+//      console.log("target2", target2)
+//      e.preventDefault()
+//      e.stopPropagation()
+//      let url = target2.getAttribute("data-url")
+//      let response = await fetch("/pinokio/tunnel", {
+//        method: "POST",
+//        headers: {
+//          "Content-Type": "application/json"
+//        },
+//        body: JSON.stringify({ url, action: "stop" })
+//      }).then((res) => {
+//        return res.json()
+//      })
+//      await reloadMemory()
+//    }
+//  })
   /*
   document.querySelector("#source").addEventListener("click", (e) => {
     refreshParent({