pinokiod 3.9.0 → 3.9.3

package/server/views/swaggerui.ejs

@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>API Docs</title>
+    <link rel="stylesheet" type="text/css" href="/swagger-ui.css" />
+  </head>
+  <body>
+    <% if (spec) { %>
+      <div id="swagger-ui"></div>
+      <script src="/swagger-ui-bundle.js"></script>
+      <script>
+        const spec = <%- spec %>;
+        SwaggerUIBundle({ spec, dom_id: '#swagger-ui' });
+      </script>
+    <% } else { %>
+      <h1>url required</h1>
+    <% } %>
+  </body>
+</html>

package/server/views/terminal.ejs

@@ -26,6 +26,7 @@
 <script src="/notifyinput.js"></script>
 <script src="/report.js"></script>
 <script src="/mark.min.js"></script>
+<script src="/dropzone-min.js"></script>
 <link href="/xterm.min.css" rel="stylesheet" />
 <link href="/css/fontawesome.min.css" rel="stylesheet">
 <link href="/css/solid.min.css" rel="stylesheet">
@@ -33,6 +34,7 @@
 <link href="/css/brands.min.css" rel="stylesheet">
 <link href="/style.css" rel="stylesheet"/>
 <link href="/noty.css" rel="stylesheet"/>
+<link href="/dropzone.css" rel="stylesheet"/>
 <% if (agent === "electron") { %>
   <link href="/electron.css" rel="stylesheet"/>
 <% } %>
@@ -92,12 +94,16 @@ header {
 .xterm .xterm-viewport {
   width: initial !important;
 }
+/*
 .navheader {
   background: var(--dark-bg);
 }
+*/
+/*
 .btn {
   background: royalblue;
 }
+*/
 #del-bin {
   color: royalblue;
   cursor: pointer;
@@ -111,6 +117,8 @@ body.frozen {
 </style>
 <link href="/terminal.css" rel="stylesheet"/>
 <script>
+let shell_id
+Dropzone.autoDiscover = false;
 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 +145,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() {
@@ -158,14 +179,22 @@ document.addEventListener("DOMContentLoaded", async () => {
         params: {
           //uri: "<%-uri%>",
           //uri: location.pathname.slice(1).replace("api/", ""),
-          uri: "~" + location.pathname
+          <% if (script_path) { %>
+            uri: "<%=script_path%>",
+          <% } else { %>
+            uri: "~" + location.pathname,
+          <% } %>
         }
       }, (stream) => {
       })
     }
     save() {
       return new Promise((resolve, reject) => {
-        let cwd = "~" + location.pathname
+        <% if (script_path) { %>
+          let cwd = "<%=script_path%>"
+        <% } else { %>
+          let cwd = "~" + location.pathname
+        <% } %>
 
         this.socket.close()
         this.socket.run({
@@ -194,7 +223,12 @@ document.addEventListener("DOMContentLoaded", async () => {
 
         this.socket.run({
           //uri: location.pathname.slice(1).replace("api/", ""),
-          uri: "~" + location.pathname,
+          <% if (script_path) { %>
+            uri: "<%=script_path%>",
+            cwd: "<%=cwd%>",
+          <% } else { %>
+            uri: "~" + location.pathname,
+          <% } %>
           //uri: "<%-uri%>",
           mode,
           input: query,
@@ -206,6 +240,9 @@ document.addEventListener("DOMContentLoaded", async () => {
           if (packet.type === 'start') {
             refreshParent(packet)
             reloadMemory()
+            document.querySelector(".run .play").classList.add("hidden")
+            document.querySelector(".run .starting").classList.add("hidden")
+            document.querySelector(".run .stop").classList.remove("hidden")
             if (packet.data && packet.data.description) {
               if ('current' in packet.data) {
                 document.querySelector("footer").innerHTML = `<b>
@@ -234,7 +271,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"))
@@ -254,9 +296,33 @@ document.addEventListener("DOMContentLoaded", async () => {
             this.socket.close()
             document.querySelector(".run .play").classList.remove("hidden")
             document.querySelector(".run .stop").classList.add("hidden")
+
+            <% if (kill_message) { %>
+              n.Noty({
+                text: "<%-kill_message%>",
+  //              timeout: 3000,
+                <% if (callback) { %>
+                callbacks: {
+                  onClose: () => {
+                    location.href = "<%=callback%>"
+                  }
+                }
+                <% } %>
+              })
+            <% } else { %>
+              <% if (callback) { %>
+              location.href = "<%=callback%>"
+              <% } %>
+            <% } %>
           } 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) => {
@@ -316,17 +382,21 @@ document.addEventListener("DOMContentLoaded", async () => {
             let type = (params.type ? params.type : "modal")
             let input
             if (type === "modal") {
-              input = await ModalInput(packet.data)
+              input = await ModalInput(packet.data, packet.id)
             } else if (type === "notify") {
               input = await NotifyInput(packet.data, n)
             }
             if (input) {
-              this.socket.respond({
-                response: input,
-                uri: packet.id
-//                uri: "~" + location.pathname,
-//                uri: (packet.caller ? packet.caller : packet.id)
-              })
+              if (input.constructor.name === "ArrayBuffer") {
+                this.socket.respond(input)
+              } else {
+                this.socket.respond({
+                  response: input,
+                  uri: packet.id
+  //                uri: "~" + location.pathname,
+  //                uri: (packet.caller ? packet.caller : packet.id)
+                })
+              }
             }
             /*
               params := {
@@ -340,6 +410,25 @@ document.addEventListener("DOMContentLoaded", async () => {
             */
           } else if (packet.type === "tab.open") {
             refreshParent(packet)
+          } else if (packet.type === "web.open") {
+          /*
+            {
+              "method": "web.open",
+              "params": {
+                "uri",
+                "target": "_self (default)"|"_blank"|"_parent"|"_top",
+                "features"
+              }
+            }
+            */
+
+            refreshParent()
+            let params = packet.data
+            window.open(
+              params.uri,
+              (params.target || "_self"),
+              params.features
+            )
           } else if (packet.type === "browser.open") {
           /*
             {
@@ -444,10 +533,10 @@ document.addEventListener("DOMContentLoaded", async () => {
 
 
             //document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>${packet.data}</pre>`
-            document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>ERROR</pre>`
+            //document.querySelector("footer .content").innerHTML = document.querySelector("footer .content").innerHTML +  `<pre class='error'>ERROR</pre>`
 //            document.querySelector("footer .toggle-expand i").className = "fa-solid fa-circle-chevron-down"
 //            document.querySelector("footer").classList.add("expanded")
-            document.querySelector("footer i").className = "fa-solid fa-triangle-exclamation"
+            //document.querySelector("footer i").className = "fa-solid fa-triangle-exclamation"
 
             document.querySelector(".run .play").classList.remove("hidden")
             document.querySelector(".run .starting").classList.add("hidden")
@@ -465,7 +554,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" });
@@ -554,15 +642,36 @@ document.addEventListener("DOMContentLoaded", async () => {
 //        })
 //      }
 
-      await this.createTerm()
+      <% if (theme === "dark") { %>
+      await this.createTerm(xtermTheme.FrontEndDelight)
+      <% } else { %>
+      await this.createTerm(xtermTheme.Tomorrow)
+      <% } %>
       await this.start(mode)
     }
-    async createTerm () {
+    async createTerm (_theme) {
       if (!this.term) {
+        const theme = Object.assign({ }, _theme, {
+          selectionBackground: "red",
+          selectionForeground: "white"
+        })
+
         let config = {
           scrollback: 9999999,
-          fontSize: 12,
-          theme: xtermTheme.FrontEndDelight
+          //fontSize: 12,
+          fontSize: 14,
+          theme,
+          //theme: xtermTheme.FrontEndDelight
+          //theme: xtermTheme.Afterglow
+
+          //theme: xtermTheme.PencilLight
+
+          //theme: xtermTheme.Flatland
+          //theme: xtermTheme.OneHalfLight
+          //theme: xtermTheme.Piatto_Light
+          //theme: xtermTheme.Spring
+          //theme: xtermTheme.Terminal_Basic
+          //theme: xtermTheme.Tomorrow
         }
         let res = await fetch("/xterm_config").then((res) => {
           return res.json()
@@ -572,13 +681,22 @@ 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) => {
+              this.socket.run({
+                key: "\x1b[200~" + text + "\x1b[201~",
+                id: shell_id
+              })
+            })
+            return false
           }
           return true;
         });
@@ -589,6 +707,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 +735,7 @@ document.addEventListener("DOMContentLoaded", async () => {
         fitAddon.fit();
         this.term = term
         this.fit = fitAddon
+
       }
       this.term.focus()
     }
@@ -771,25 +901,27 @@ const reloadMemory = async () => {
 <% } else { %>
 <body class='<%=theme%>'>
 <% } %>
-  <header class='navheader'>
   <% if (!install_required) { %>
-    <div class='runner'>
-      <% if (locals.prev) { %>
-        <a class='btn' href="<%=prev%>"><i class="fa-solid fa-arrow-left"></i> Back</a>
-      <% } %>
-      <div class='btn run <%= mod && runnable ? "" : "hidden" %>'>
-        <span class='play'><i class="fa-solid fa-play"></i> Start</span>
-        <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>
+    <header class='navheader2'>
+      <div class='runner'>
+        <% if (locals.prev) { %>
+          <a class='btn' href="<%=prev%>"><i class="fa-solid fa-arrow-left"></i> Back</a>
+        <% } %>
+        <div class='btn run <%= mod && runnable ? "" : "hidden" %>'>
+          <span class='play'><i class="fa-solid fa-play"></i> Start</span>
+          <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>
+        <% 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>
-      <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>
   <% } %>
-  </header>
-  <% if (requirements_pending) { %>
+  <% if (locals.requirements_pending) { %>
     <div class='requirements'>
       <div class='content'>
         <div class='loading'>
@@ -798,7 +930,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>

package/LICENSE

@@ -1,7 +0,0 @@
-Copyright 2023 Pinokio
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.