pinokiod 3.6.29 → 3.6.30

package/server/socket.js

@@ -1,8 +1,10 @@
 const WebSocket = require('ws');
+const Util = require("../kernel/util")
 class Socket {
   constructor(parent) {
     this.buffer = {}
     this.connected = {}
+    this.active_shell = {}
     this.parent = parent
     this.server = parent.server
 //    this.kernel = parent.kernel
@@ -25,42 +27,65 @@ class Socket {
           // look for repos that match
 
           if (req.uri) {
-            /******************************************************************
-            *
-            *  req.uri is ALWAYS either of the two:
-            *  1. ~/...
-            *  2. https://github.com/...
-            *
-            *  Need to turn it into absolute file path before subscribing
-            *
-            ******************************************************************/
-
-            // req.uri is always http or absolute path
-            let id = this.parent.kernel.api.filePath(req.uri)
-
-            if (req.status) {
-              ws.send(JSON.stringify({
-                data: this.parent.kernel.api.running[id] ? true : false
-              }))
-            } else if (req.stop) {
-              this.parent.kernel.api.stop({ params: req })
+            if (req.mode === "open") {
+              // get the default script and respond
+              let id = this.parent.kernel.api.filePath(req.uri)
+              try {
+                let default_url = await this.parent.kernel.api.get_default(id)
+                console.log({ id, default_url })
+                ws.send(JSON.stringify({
+                  data: {
+                    uri: default_url 
+                  }
+                }))
+              } catch (e) {
+                console.log(e)
+              }
             } else {
-              this.subscribe(ws, id)
-
-              if (req.mode !== "listen") {
-                // Run only if currently not running
-                if (!this.parent.kernel.api.running[id]) {
-
-                  // clear the log first
-
-                  await this.parent.kernel.clearLog(id)
-
-
-                  this.parent.kernel.api.process(req)
+              console.log("REQ.URI", req.uri)
+              if (req.uri.startsWith("http")) {
+                // open
+                Util.openfs(req.uri, { mode: "open" })
+              } else {
+                /******************************************************************
+                *
+                *  req.uri is ALWAYS either of the two:
+                *  1. ~/...
+                *  2. https://github.com/...
+                *
+                *  Need to turn it into absolute file path before subscribing
+                *
+                ******************************************************************/
+
+                // req.uri is always http or absolute path
+                let id = this.parent.kernel.api.filePath(req.uri)
+
+                if (req.status) {
+                  ws.send(JSON.stringify({
+                    data: this.parent.kernel.api.running[id] ? true : false
+                  }))
+                } else if (req.stop) {
+                  this.parent.kernel.api.stop({ params: req })
+                } else {
+                  let buf = this.buffer[id]
+                  let sh = this.active_shell[id]
+                  this.subscribe(ws, id, buf, sh)
+                  if (req.mode !== "listen") {
+                    // Run only if currently not running
+                    if (!this.parent.kernel.api.running[id]) {
+
+                      // clear the log first
+
+                      await this.parent.kernel.clearLog(id)
+
+
+                      this.parent.kernel.api.process(req)
+                    }
+                  }
                 }
               }
-            }
 
+            }
           } else if (req.method) {
             this.subscribe(ws, req.method)
             if (req.mode !== "listen") {
@@ -68,6 +93,11 @@ class Socket {
             }
           } else if (req.emit) {
             this.parent.kernel.shell.emit(req)
+          } else if (req.key && req.id) {
+            this.parent.kernel.shell.emit({
+              id: req.id,
+              emit: req.key
+            })
           }
         }
 
@@ -78,11 +108,16 @@ class Socket {
       headers.push('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept');
     });
   }
-  subscribe(ws, id) {
+  subscribe(ws, id, buf, sh) {
 
     if (this.parent.kernel.api.running[id]) {
       ws.send(JSON.stringify({
-        type: "connect"
+        type: "connect",
+        data: {
+          id,
+          state: buf,
+          shell: sh
+        }
       }))
     }
 
@@ -120,6 +155,15 @@ class Socket {
       });
     }
 
+    if (!this.buffer[id]) {
+      this.buffer[id] = ""
+    }
+    if (e.data && e.data.raw) this.buffer[id] += e.data.raw
+
+    if (e.data && e.data.shell_id) {
+      this.active_shell[id] = e.data.shell_id
+    }
+
     // send to caller session
     if (e.caller) {
       let caller
@@ -148,6 +192,15 @@ class Socket {
           }
         });
       }
+
+      if (!this.buffer[caller]) {
+        this.buffer[caller] = ""
+      }
+      if (e.data.raw) this.buffer[caller] += e.data.raw
+
+      if (e.data && e.data.shell_id) {
+        this.active_shell[caller] = e.data.shell_id
+      }
     }
   }
 }

package/server/views/app.ejs

@@ -29,7 +29,9 @@
   */
 }
 #menu.margin {
+/*
   padding: 5px;
+  */
 }
 #menu.margin i {
   display: none;
@@ -580,7 +582,7 @@ body.dark .loader-container {
   <div class='header-top header-item'>
     <div class='app-info'>
       <% if (config.icon) { %>
-        <img src="<%=rawpath%>/<%=config.icon%>?raw=true"/>
+        <img src="<%=config.icon%>"/>
       <% } else { %>
         <i class="fa-regular fa-circle-dot"></i>
       <% } %>
@@ -595,6 +597,15 @@ body.dark .loader-container {
     <a target="<%=src%>" href="<%=src%>" class='btn header-item frame-link' data-index="0">
       <div class='tab'><i class="fa-regular fa-folder-open"></i> Files <div class='disk-usage'></div></div>
     </a>
+    <div class='shells'>
+      <% shells.forEach((shell, index) => { %>
+        <a target="SHELL<%=index%>" data-mode="" href="<%=shell%>" class='btn header-item frame-link'>
+          <div class='tab'>
+            <i class='fa-solid fa-terminal'></i> <%=shell%></i>
+          </div>
+        </a>
+      <% }) %>
+    </div>
     <a target="/share/<%=name%>" href="/share/<%=name%>", class="btn header-item frame-link" data-index="1" data-mode="refresh">
       <div class='tab'><i class="fa-solid fa-wifi"></i> Share</div>
     </a>
@@ -653,7 +664,7 @@ body.dark .loader-container {
       <div class='bar'>
         <button class='btn2' id='menu-mobile'><i class="fa-solid fa-bars"></i></button>
         <button class='btn2' id='menu'>
-          <img src="<%=rawpath%>/<%=config.icon%>?raw=true"/>
+          <img src="<%=config.icon%>"/>
           <i class="fa-solid fa-arrow-right-to-bracket fa-rotate-180"></i>
         </button>
         <% if (agent === "electron") { %>
@@ -1510,6 +1521,7 @@ body.dark .loader-container {
             console.log("asideHidden", asideHidden)
             if (!asideHidden) {
               // refresh only if aside 
+              console.log("type", event.data.type)
               if (event.data.type === 'disconnect') {
                 console.log("Refresh 1")
                 refresh()

package/server/views/editor.ejs

@@ -113,6 +113,7 @@ body.frozen {
 }
 </style>
 <script>
+let shell_id
 document.addEventListener("DOMContentLoaded", async () => {
   <% if (error) { %>
     document.querySelector(".requirements .content").innerHTML = '<div class="loading"><i class="fa-solid fa-circle-exclamation"></i> <%=error%></div>'
@@ -331,8 +332,17 @@ document.addEventListener("DOMContentLoaded", async () => {
 
           } else if (packet.type === 'connect') {
 //            document.querySelector(".terminal-container").classList.remove("hidden")
-            const message = "..........Connected!\r\n"
-            this.term.write(message)
+            if (packet.data.id) {
+              shell_id = packet.data.id
+            }
+            if (packet.data) {
+              if (packet.data.shell) {
+                shell_id = packet.data.shell
+              }
+              if (packet.data.state) {
+                this.write(packet.data.state)
+              }
+            }
             /*
             for(let i=0; i<message.length; i++) {
               await new Promise((r, reject) => {

package/server/views/index.ejs

@@ -246,32 +246,6 @@ body.dark .browser-options-row {
           <div>Serve Pinokio, installed apps, and even external apps (example: Ollama) to any device on the same network.</div>
         </div>
       </div>
-      <!--
-      <div class='browser-options-row'>
-        <a href="/proxy" class='flexible'>
-          <h3><i class="fa-solid fa-wifi"></i> Local Share</h3>
-          <div>Access Pinokio, Ollama, and other 3rd party apps from any device on the same network. By default it's off.</div>
-        </a>
-        <% if (false) { %>
-          <% if (proxy) { %>
-            <a id='wifi-stop' data-proxy="<%=proxy.proxy%>" class='btn'><div><i class="fa-solid fa-stop"></i> Stop</div></a>
-            <div class='flexible'>
-              <h3><i class="fa-solid fa-wifi"></i> Local Share</h3>
-              <div>Access Pinokio from any device on the same network. By default it's off.</div>
-              <span class='badge'><i class="fa-solid fa-circle-notch fa-spin"></i> Running at <a href="<%=proxy.proxy%>" target="_blank" features="browser"><%=proxy.proxy%></a></span>
-              <a id='wifi-qr' class='badge'><i class="fa-solid fa-qrcode"></i> Scan QR Code</a>
-            </div>
-          <% } else { %>
-            <a id='wifi' class='btn'><div><i class="fa-solid fa-play"></i> Start</div></a>
-            <a id='wifi-starting' class='btn disabled hidden'><div><i class="fa-solid fa-circle-notch fa-spin"></i> Starting</div></a>
-            <div class='flexible'>
-              <h3><i class="fa-solid fa-wifi"></i> Local Share</h3>
-              <div>Access Pinokio from any device on the same network. By default it's off.</div>
-            </div>
-          <% } %>
-        <% } %>
-      </div>
-        -->
       <div class='browser-options-row hidden'>
         <% if (cloudflare_pub) { %>
           <a id='cloudflare-stop' class='btn'><div><i class="fa-solid fa-stop"></i> Stop</div></a>
@@ -292,17 +266,10 @@ body.dark .browser-options-row {
       </div>
     </div>
   <% } %>
-  <!--
-  <div class='type-tabs'>
-    <% if (mode === "task") { %>
-      <a class='type-tab' href="/"><img src='/pinokio-<%=theme=='dark' ? 'white' : 'black'%>.png'> Apps</a>
-      <a class='type-tab selected' href="/?mode=task"> <img src='/<%=theme=='dark' ? 'term-dark.png' : 'term-white.png'%>'> Tasks</a>
-    <% } else { %>
-      <a class='type-tab selected' href="/"><img src='/pinokio-<%=theme=='dark' ? 'white' : 'black'%>.png'> Apps</a>
-      <a class='type-tab' href="/?mode=task"> <img src='/<%=theme=='dark' ? 'term-dark.png' : 'term-white.png'%>'> Tasks</a>
-    <% } %>
+  <div id='fsmenu'>
+    <div class='flexible'></div>
+    <button id='newfolder' class='btn'><i class="fa-solid fa-folder-plus"></i> New Folder</button>
   </div>
-  -->
   <% if (running.length > 0) { %>
     <div class='running-apps'>
       <div class='header-label'>Running</div>
@@ -1094,6 +1061,30 @@ if (document.querySelector("#genlog")) {
     })
   })
 }
+document.querySelector("#newfolder").addEventListener("click", async (e) => {
+  let folder = prompt("Enter a folder name for the new folder")
+  if (folder.includes(' ')) {
+    alert("Please use a folder name without a space")
+    return
+  }
+  let res = await fetch("/mkdir", {
+    method: "post",
+    headers: {
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      folder
+    })
+  }).then((res) => {
+    return res.json()
+  })
+  if (res.error) {
+    alert(res.error)
+  } else {
+    console.log(res)
+    location.href = res.success
+  }
+})
 
 </script>
 </body>

package/server/views/terminal.ejs

@@ -111,6 +111,7 @@ body.frozen {
 </style>
 <link href="/terminal.css" rel="stylesheet"/>
 <script>
+let shell_id
 document.addEventListener("DOMContentLoaded", async () => {
   <% if (error) { %>
     document.querySelector(".requirements .content").innerHTML = '<div class="loading"><i class="fa-solid fa-circle-exclamation"></i> <%=error%></div>'
@@ -137,9 +138,22 @@ document.addEventListener("DOMContentLoaded", async () => {
   class RPC {
     constructor() {
       this.socket = new Socket()
+      this.buffer = []
     }
     write(text) {
-      this.term.write(text)
+//      console.log(text)
+//      this.buffer += text;
+//      if (!this.timeout) {
+//        this.timeout = setTimeout(() => {
+//          console.log("write", this.buffer)
+//          this.term.write(this.buffer);
+//          this.buffer = "";
+//          this.timeout = null;
+//        }, 50);
+//      }
+      if (text !== "\u0007") {
+        this.term.write(text)
+      }
       this.dirty = true
     }
     finished() {
@@ -234,7 +248,12 @@ document.addEventListener("DOMContentLoaded", async () => {
 //              </div>`
             }
           } else if (packet.type === "stream") {
+            // set the current shell id
+            if (packet.data.id) {
+              shell_id = packet.data.id
+            }
             if (packet.data.raw) {
+//              console.log({ packet })
               this.write(packet.data.raw)
             } else if (packet.data.json) {
               this.write(JSON.stringify(packet.data.json).replace(/\n/g, "\r\n"))
@@ -255,8 +274,14 @@ document.addEventListener("DOMContentLoaded", async () => {
             document.querySelector(".run .play").classList.remove("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
           } else if (packet.type === 'connect') {
-            const message = "..........Connected!\r\n"
-            this.write(message)
+            if (packet.data) {
+              if (packet.data.shell) {
+                shell_id = packet.data.shell
+              }
+              if (packet.data.state) {
+                this.write(packet.data.state)
+              }
+            }
             /*
             for(let i=0; i<message.length; i++) {
               await new Promise((r, reject) => {
@@ -465,7 +490,6 @@ document.addEventListener("DOMContentLoaded", async () => {
               document.querySelector("#error-screen").classList.add("hidden")
             })
             */
-            console.log("instance", instance)
             instance.mark(packet.event)
             let element = document.querySelector("mark")
             element.scrollIntoView({ behavior: "smooth", block: "center" });
@@ -572,13 +596,19 @@ document.addEventListener("DOMContentLoaded", async () => {
         }
         const term = new Terminal(config)
         term.open(document.querySelector("#terminal"))
-
         term.attachCustomKeyEventHandler(event => {
-          if (event.ctrlKey && event.key === 'c' && term.hasSelection()) {
-            return false;
+          if ((event.ctrlKey || event.metaKey) && event.key === 'c') {
+            const selection = term.getSelection();
+            if (selection) {
+              navigator.clipboard.writeText(selection);
+              return false;
+            }
           }
-          if (event.ctrlKey && event.key === 'v' && this._options.pasteWithCtrlV) {
-            return false;
+          if ((event.ctrlKey || event.metaKey) && event.key === 'v') {
+            navigator.clipboard.readText().then((text) => {
+              term.write(text);
+            })
+            return false
           }
           return true;
         });
@@ -589,6 +619,17 @@ document.addEventListener("DOMContentLoaded", async () => {
         ////term.resize(cols, rows-5);
         //term.resize(cols, rows);
 
+        term.onKey(({ key }) => {
+          if (this.socket) {
+            if (shell_id) {
+              this.socket.run({
+                key,
+                id: shell_id
+              })
+            }
+          }
+        });
+
         const fitAddon = new FitAddon.FitAddon();
 //        const searchAddon = new SearchAddon.SearchAddon();
 //        const searchAddonBar = new SearchBarAddon.SearchBarAddon({searchAddon});
@@ -606,6 +647,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         fitAddon.fit();
         this.term = term
         this.fit = fitAddon
+
       }
       this.term.focus()
     }
@@ -782,14 +824,16 @@ const reloadMemory = async () => {
         <span class='starting hidden'><i class="fa-solid fa-circle-notch fa-spin"></i> Starting...</span>
         <span class='stop hidden'><i class="fa-solid fa-stop"></i> Stop</span>
       </div>
-      <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
+      <% if (locals.filepath) { %>
+        <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> View File</button>
+      <% } %>
       <!--
       <button class='btn' id='open-log' data-logpath="<%=logpath%>"><i class="fa-solid fa-align-left"></i> View Logs</button>
       -->
     </div>
   <% } %>
   </header>
-  <% if (requirements_pending) { %>
+  <% if (locals.requirements_pending) { %>
     <div class='requirements'>
       <div class='content'>
         <div class='loading'>
@@ -798,7 +842,7 @@ const reloadMemory = async () => {
       </div>
     </div>
   <% } else { %>
-    <% if (install_required) { %>
+    <% if (locals.install_required) { %>
       <div class='requirements'>
         <div class='content'>
           <div class='title'><i class="fa-solid fa-circle-exclamation"></i> Installation required</div>