pinokiod 3.9.0 → 3.9.2

package/server/public/install.js

@@ -109,26 +109,23 @@ const install = async (name, url, term, socket, options) => {
 
   }
 }
-const createTerm = () => {
-  const term = new Terminal({
-    //theme: xtermTheme.Piatto_Light,
-    //theme: xtermTheme.Github,
-    //theme: xtermTheme.Cobalt_Neon,      // top legibility
-    //theme: xtermTheme.Duotone_Dark,
-    theme: xtermTheme.FrontEndDelight,
-    //theme: xtermTheme.Seafoam_Pastel,
-    //theme: xtermTheme.IC_Green_PPL,
-    //theme: xtermTheme.FunForrest,
-    //theme: xtermTheme.Jackie_Brown,
-    //theme: xtermTheme.Ocean,
-
-    //theme: xtermTheme.Blazer,
-    //theme: xtermTheme.BirdsOfParadise,
-    //theme: xtermTheme.AtelierSulphurpool,
-    //theme: xtermTheme.Borland,
-    rows: 20,
-    fontSize: 12
-  });
+const createTerm = async (_theme) => {
+  const theme = Object.assign({ }, _theme, {
+    selectionBackground: "red",
+    selectionForeground: "white"
+  })
+  let config = {
+    scrollback: 9999999,
+    fontSize: 14,
+    theme,
+  }
+  let res = await fetch("/xterm_config").then((res) => {
+    return res.json()
+  })
+  if (res && res.config) {
+    config = res.config
+  }
+  const term = new Terminal(config)
   const fitAddon = new FitAddon.FitAddon();
   term.loadAddon(fitAddon);
   term.loadAddon(new WebLinksAddon.WebLinksAddon());

package/server/public/modalinput.js

@@ -1,4 +1,4 @@
-const ModalInput = async (params) => {
+const ModalInput = async (params, uri) => {
 /*
   {
     title,
@@ -15,23 +15,32 @@ const ModalInput = async (params) => {
   }
 */
   let form = params.form || []
+  let dropzones = []
   let description = (params.description ? `<div class='desc'>${params.description}</div>` : "")
   let result = await Swal.fire({
     title: (params.title || ""),
     html: description + form.map((field) => {
       let type = (field.type ? field.type : "text")
+      let autofocus = (field.autofocus ? "autofocus" : "")
       let input
       if (type === 'textarea') {
-        input = `<textarea oninput="autoExpand(this)" data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}"></textarea>`
+        input = `<textarea ${autofocus} oninput="autoExpand(this)" data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}"></textarea>`
       } else if (type === 'select') {
         if (field.items && Array.isArray(field.items)) {
           let items = field.items.map((item) => {
-            return `<option value="${item}">${item}</option>`
+            if (typeof item === "object" && item.value && item.text) {
+              return `<option value="${item.value}">${item.text}</option>`
+            } else {
+              return `<option value="${item}">${item}</option>`
+            }
           }).join("")
-          input = `<select>${items}</select>`
+          input = `<select data-id="${field.key}">${items}</select>`
         }
+      } else if (type === 'file') {
+        input = `<div class='dropzone' data-type='file' data-id='${field.key}'></div>`
+        //input = `<input type='file' data-id="${field.key}" />`
       } else {
-        input = `<input type='${type}' data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}">`
+        input = `<input ${autofocus} type='${type}' data-id="${field.key}" class="swal2-input" placeholder="${field.placeholder ? field.placeholder : ''}">`
       }
       return [
         "<div class='field'>",
@@ -43,6 +52,22 @@ const ModalInput = async (params) => {
     }).join("\n"),
     //focusConfirm: false,
     confirmButtonText: 'Done',
+    didRender: () => {
+      Swal.getPopup().querySelectorAll('[data-type=file]').forEach((el, index) => {
+        const dz = new Dropzone(el, {
+          url: '/no-op', // dummy, not used
+          autoProcessQueue: false,
+          uploadMultiple: false,
+          maxFiles: 1,
+          addRemoveLinks: true,
+          dictDefaultMessage: "Drag and drop or click to upload a file",
+          init: function () {
+            console.log(`Dropzone ${index + 1} ready`);
+          }
+        });
+        dropzones.push(dz);
+      });
+    },
     didOpen: () => {
       for(let field of form) {
         if (field.default) {
@@ -53,14 +78,85 @@ const ModalInput = async (params) => {
       }
       document.querySelector(".swal2-confirm").blur()
     },
-    preConfirm: () => {
+    preConfirm: async () => {
       let response = {}
+      let buffer_response = {}
       for(let field of form) {
-        debugger
         let input = Swal.getPopup().querySelector("[data-id='" + field.key + "']")
-        response[field.key] = input.value
+        let type = input.getAttribute("data-type")
+        if (type !== 'file') {
+          response[field.key] = input.value
+        }
+
+//        let type = input.getAttribute("type")
+//        if (type === 'file') {
+//          const file = input.files[0];
+//          const reader = new FileReader();
+//          let buffer = await new Promise((resolve, reject) => {
+//            reader.onload = () => {
+//              resolve(new Uint8Array(reader.result))
+//            };
+//            reader.readAsArrayBuffer(file);
+//          })
+//          buffer_response[field.key] = buffer
+//        } else {
+//          response[field.key] = input.value
+//        }
+      }
+
+
+      for(let dz of dropzones) {
+        const id = dz.element.getAttribute("data-id");
+        const fileList = dz.getAcceptedFiles(); // array of File
+        const file = fileList[0]; // actual File object (like from <input>)
+        let buffer = await new Promise((resolve, reject) => {
+          const reader = new FileReader();
+          reader.onload = () => {
+            resolve(new Uint8Array(reader.result))
+          };
+          reader.readAsArrayBuffer(file);
+        })
+        buffer_response[id] = buffer
+      }
+
+
+      if (Object.keys(buffer_response).length > 0) {
+
+
+        const fileKeys = Object.keys(buffer_response);
+        const metadata = {
+          uri,
+          response,
+          buffer_keys: fileKeys
+        };
+
+        const metaJson = JSON.stringify(metadata);
+        const metaBuffer = new TextEncoder().encode(metaJson);
+        const separator = new Uint8Array([0]);
+
+        const parts = [metaBuffer, separator];
+
+        for (const key of fileKeys) {
+          const buf = buffer_response[key];
+          const lenBytes = new Uint8Array(4);
+          new DataView(lenBytes.buffer).setUint32(0, buf.byteLength); // big-endian length
+          parts.push(lenBytes, new Uint8Array(buf));
+        }
+
+        // Calculate total length
+        const totalLen = parts.reduce((sum, part) => sum + part.length, 0);
+        const combined = new Uint8Array(totalLen);
+
+        let offset = 0;
+        for (const part of parts) {
+          combined.set(part, offset);
+          offset += part.length;
+        }
+
+        return combined.buffer
+      } else {
+        return response
       }
-      return response
     }
   })
   if (result) {

package/server/public/opener.js

@@ -9,13 +9,15 @@ document.addEventListener("click", async (e) => {
   }
   if (el) {
     let filepath = el.getAttribute("data-filepath")
+    let command = el.getAttribute("data-command")
     await fetch("/openfs", {
       method: "post",
       headers: {
         "Content-Type": "application/json"
       },
       body: JSON.stringify({
-        path: filepath
+        path: filepath,
+        command
       })
     }).then((res) => {
       return res.json()