pinokiod 3.11.2 → 3.11.7

package/kernel/index.js

@@ -649,6 +649,13 @@ class Kernel {
         // 2. mkdir all the folders if not already created
         await Environment.init_folders(this.homedir)
 
+        // if key.json doesn't exist, create an empty json file
+        let ee = await this.exists(this.homedir, "key.json")
+        if (!ee) {
+          await fs.promises.writeFile(path.resolve(this.homedir, "key.json"), JSON.stringify({}))
+        }
+
+
 
 //        // 3. check if Caddyfile exists
 //        let e2 = await this.exists(this.homedir, "Caddyfile")

package/kernel/prototype.js

@@ -30,7 +30,7 @@ class Proto {
       console.log("--config", config)
       this.config = config
 
-      if (this.config.menu) {
+      if (this.config && this.config.menu) {
         this.config.menu.push({
           icon: "fa-solid fa-rotate",
           text: "Update",

package/kernel/shell.js

@@ -318,6 +318,11 @@ class Shell {
 
 //    return this.id
   }
+  resize({ cols, rows }) {
+    console.log("RESIZE", { cols, rows })
+    this.ptyProcess.resize(cols, rows)
+    this.vt.resize(cols, rows)
+  }
   emit2(message) {
     let i = 0;
     const interval = setInterval(() => {

package/kernel/shells.js

@@ -257,6 +257,21 @@ class Shells {
     let response = await this.send(params, ondata)
     return response
   }
+  resize(params) {
+    /*
+      params := {
+        "id": <shell id>,
+        "resize": {
+          "cols": <cols>,
+          "rows": <rows>,
+        }
+      }
+    */
+    let session = this.get(params.id)
+    if (session) {
+      session.resize(params.resize)
+    }
+  }
   emit(params) {
     /*
       params := {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.11.2",
+  "version": "3.11.7",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -2449,6 +2449,9 @@ class Server {
         let p2 = path.resolve(home, "prototype")
         await fse.remove(p2)
 
+        let p3 = path.resolve(home, "plugin")
+        await fse.remove(p3)
+
         let gitconfig = path.resolve(home, "gitconfig")
         await fse.remove(gitconfig)
 

package/server/socket.js

@@ -153,6 +153,11 @@ class Socket {
               id: req.id,
               emit: req.key
             })
+          } else if (req.resize && req.id) {
+            this.parent.kernel.shell.resize({
+              id: req.id,
+              resize: req.resize
+            })
           }
         }
 

package/server/views/app.ejs

@@ -811,11 +811,13 @@ body.dark .appcanvas {
     <a target="<%=src%>" href="<%=src%>" class='btn header-item frame-link' data-index="0" data-mode="refresh">
       <div class='tab'><i class="fa-regular fa-folder-open"></i> Files <div class='disk-usage'></div></div>
     </a>
-    <a <%=config.init_required ? 'data-init' : ''%> class='btn header-item frame-link' href="/prototype?type=init&path=<%=path%>" target="/prototype?type=init&path=<%=path%>" data-index="1" data-mode="refresh">
-      <div class='tab'>
-        <i class='fa-solid fa-bolt'></i> Initialize
-      </div>
-    </a>
+    <% if (config.init_required) { %>
+      <a data-init class='btn header-item frame-link' href="/prototype?type=init&path=<%=path%>" target="/prototype?type=init&path=<%=path%>" data-index="1" data-mode="refresh">
+        <div class='tab'>
+          <i class='fa-solid fa-bolt'></i> Initialize
+        </div>
+      </a>
+    <% } %>
     <% if (profile || feed) { %>
       <div class='btn header-item frame-link revealer' data-group='.info-group'>
         <div class='tab'>
@@ -1696,10 +1698,19 @@ body.dark .appcanvas {
           // nested menu
           e.preventDefault()
           e.stopPropagation()
+          debugger
           <% if (type === 'run') { %>
-            // run mode => switch to dev mode
-            location.hash = ""
-            location.pathname = location.pathname + "/dev"
+            if (target.closest(".dynamic")) {
+              // clicked dev mode menu => switch to dev
+              // run mode => switch to dev mode
+              location.hash = ""
+              location.pathname = location.pathname + "/dev"
+            } else {
+              // regular menu
+              target.closest(".nested-menu").querySelector(".submenu").classList.toggle("hidden")
+              target.querySelector(".loader .fa-angle-down").classList.toggle("hidden")
+              target.querySelector(".loader .fa-angle-up").classList.toggle("hidden")
+            }
           <% } else { %>
             // dev mode => already dev. reveal the hidden menu
             if (target.closest(".dynamic")) {

package/server/views/index.ejs

@@ -142,6 +142,7 @@ body.dark .context-menu-wrapper {
   transition: max-height 1s ease-in-out;
   */
   display: flex;
+  margin: 0 5px 0 0;
 }
 .context-menu .btn:hover {
   color: cornflowerblue !important;
@@ -245,6 +246,7 @@ body.dark .open-menu, body.dark .browse {
 <a class='home' href="/"><img class='icon' src="/pinokio-black.png"></a>
 <button class='btn2' id='back'><div><i class="fa-solid fa-chevron-left"></i></div><div>Prev</div></button>
 <button class='btn2' id='forward'><div><i class="fa-solid fa-chevron-right"></i></div><div>Next</div></button>
+<button class='btn2' id='refresh-page'><div><i class="fa-solid fa-rotate-right"></i></div><div>Refresh</div></button>
 <a class='btn2 create-new' id='create-new-folder'><div><i class="fa-solid fa-folder-plus"></i></div><div>Create</div></a>
 <!--
 <a href="/new" class='btn2'><div><i class='fa-solid fa-folder-plus'></i></div><div>Create</div></a>
@@ -387,9 +389,15 @@ body.dark .open-menu, body.dark .browse {
                     <button class='btn copy-menu' data-src="<%=item.browser_url%>/dev">
                       <i class='fa-solid fa-copy'></i> Copy
                     </button>
+                    <button class='btn move-menu' data-src="<%=item.browser_url%>/dev" data-disable="To move the folder, the app should not be running.">
+                      <i class="fa-solid fa-right-to-bracket"></i> Move
+                    </button>
                     <button class='btn edit-menu' data-src="<%=item.browser_url%>/dev">
                       <i class='fa-solid fa-pen-to-square'></i> Edit
                     </button>
+                    <button class='btn del' data-src="<%=item.url%>" data-disable="To delete the folder, the app should not be running.">
+                      <i class="fa-solid fa-trash-can"></i> Delete
+                    </button>
                   </div>
                 </div>
                 <% if (item.running_scripts) { %>
@@ -939,6 +947,13 @@ document.addEventListener("click", async (e) => {
   if (target) {
     e.preventDefault()
     e.stopPropagation()
+
+    let disable_message = target.getAttribute('data-disable')
+    if (disable_message && disable_message.length > 0) {
+      alert(disable_message)
+      return
+    }
+
     let line = target.closest(".line")
     let title = line.getAttribute("data-title")
     let icon = line.getAttribute("data-icon")
@@ -1043,6 +1058,13 @@ document.addEventListener("click", async (e) => {
   if (target) {
     e.preventDefault()
     e.stopPropagation()
+
+    let disable_message = target.getAttribute('data-disable')
+    if (disable_message && disable_message.length > 0) {
+      alert(disable_message)
+      return
+    }
+
     let confirmed = confirm("Are you sure you want to delete the folder? All files in the folder will be gone.")
     if (confirmed) {
       let itemEl = target.closest(".line[data-uri]")

package/server/views/install.ejs

@@ -143,6 +143,8 @@ body {
 //
 // /install_bin?type=bin&uri=conda
 //
+let shell_id
+let fitAddon
 const createTerm = async (_theme) => {
   //const theme = Object.assign({ }, xtermTheme.Terminal_Basic, {
   const theme = Object.assign({ }, _theme, {
@@ -173,7 +175,7 @@ const createTerm = async (_theme) => {
     return true;
   });
 
-  const fitAddon = new FitAddon.FitAddon();
+  fitAddon = new FitAddon.FitAddon();
   term.loadAddon(fitAddon);
   <% if (agent === "electron") { %>
     term.loadAddon(new WebLinksAddon.WebLinksAddon((event, uri) => {
@@ -187,7 +189,6 @@ const createTerm = async (_theme) => {
   return term
 }
 document.addEventListener("DOMContentLoaded", async () => {
-  debugger
   const n = new N()
   let socket = new Socket()
   <% if (theme === "dark") { %>
@@ -210,6 +211,24 @@ document.addEventListener("DOMContentLoaded", async () => {
       emit: e.key
     })
   })
+  let observer = new ResizeObserver(() => {
+    fitAddon.fit()
+    console.log(`Resized to ${term.cols}x${term.rows}`);
+    // Trigger your custom handler here
+    if (socket) {
+      console.log({ shell_id, cols: term.cols, rows: term.rows })
+      if (shell_id) {
+        socket.run({
+          resize: {
+            cols: term.cols,
+            rows: term.rows,
+          },
+          id: shell_id
+        })
+      }
+    }
+  });
+  observer.observe(document.body)
   await new Promise((resolve, reject) => {
     socket.run({
       id: location.pathname,
@@ -223,6 +242,9 @@ document.addEventListener("DOMContentLoaded", async () => {
     }, async (packet) => {
       console.log("packet", packet)
       if (packet.type === "stream") {
+        if (packet.data.id) {
+          shell_id = packet.data.id
+        }
         term.write(packet.data.raw)
       } else if (packet.type === "result") {
         resolve() 

package/server/views/keys.ejs

@@ -212,6 +212,17 @@ footer .btn.go-home {
 input[type=text] {
   margin-bottom: 5px;
 }
+main {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+main .empty {
+  flex-grow: 1;
+  justify-content: center;
+  align-items: center;
+  opacity: 1;
+}
 </style>
 <script>
 document.addEventListener("DOMContentLoaded", async () => {
@@ -254,23 +265,31 @@ document.addEventListener("DOMContentLoaded", async () => {
         <a class='home-button home' href="/"><i class='fa-solid fa-home'></i></a>
         <div class='flexible'></div>
         <div class='nav-btns'>
-          <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> Open in File Explorer</button>
+          <button class='btn' id='open-fs' data-filepath="<%=filepath%>" data-command="view"><i class="fa-solid fa-eye"></i> Open in File Explorer</button>
           <div id='save' class='btn'>
             <span class='save'><i class="fa-solid fa-check"></i> Save</span>
           </div>
         </div>
       </h1>
     </header>
-    <div id='editor'>
-      <% items.forEach((item) => { %>
-        <div class='env-item'>
-          <label for="<%=item.host%>"><%=item.host%></label>
-          <% item.vals.forEach((val, index) => { %>
-            <input data-host="<%=item.host%>" data-index="<%=index%>" type="text" value="<%=val%>">
-          <% }) %>
-        </div>
-      <% }) %>
-    </div>
+    <% if (items.length > 0) { %>
+      <div id='editor'>
+        <% items.forEach((item) => { %>
+          <div class='env-item'>
+            <label for="<%=item.host%>"><%=item.host%></label>
+            <% item.vals.forEach((val, index) => { %>
+              <input data-host="<%=item.host%>" data-index="<%=index%>" type="text" value="<%=val%>">
+            <% }) %>
+          </div>
+        <% }) %>
+      </div>
+    <% } else { %>
+      <div class='empty'>
+        <div>no keys are set</div>
+        <br>
+        <a target="_blank" href="https://pinokiocomputer.github.io/home/docs/#/?id=autofill-from-shared-key-store" class='btn'>Learn how this works</a>
+      </div>
+    <% } %>
   </main>
 </body>
 </html>

package/server/views/shell.ejs

@@ -495,6 +495,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             let element = document.querySelector("mark")
             element.scrollIntoView({ behavior: "smooth", block: "center" });
 
+            this.stop()
 
 
 
@@ -709,6 +710,23 @@ document.addEventListener("DOMContentLoaded", async () => {
 
       }
       this.term.focus()
+      this.observer = new ResizeObserver(() => {
+        this.fit.fit()
+        console.log(`Resized to ${this.term.cols}x${this.term.rows}`);
+        // Trigger your custom handler here
+        if (this.socket) {
+          if (shell_id) {
+            this.socket.run({
+              resize: {
+                cols: this.term.cols,
+                rows: this.term.rows,
+              },
+              id: shell_id
+            })
+          }
+        }
+      });
+      this.observer.observe(document.body)
     }
   }
   const rpc = new RPC()

package/server/views/terminal.ejs

@@ -186,6 +186,7 @@ document.addEventListener("DOMContentLoaded", async () => {
       document.querySelector(".run .starting").classList.add("hidden")
     }
     stop() {
+      console.log("STOP")
       this.socket.run({
         method: "kernel.api.stop",
         params: {
@@ -554,7 +555,7 @@ document.addEventListener("DOMContentLoaded", async () => {
             let element = document.querySelector("mark")
             element.scrollIntoView({ behavior: "smooth", block: "center" });
 
-
+            this.stop()
 
 
           } else if (packet.type === "event") {
@@ -734,6 +735,23 @@ document.addEventListener("DOMContentLoaded", async () => {
 
       }
       this.term.focus()
+      this.observer = new ResizeObserver(() => {
+        this.fit.fit()
+        console.log(`Resized to ${this.term.cols}x${this.term.rows}`);
+        // Trigger your custom handler here
+        if (this.socket) {
+          if (shell_id) {
+            this.socket.run({
+              resize: {
+                cols: this.term.cols,
+                rows: this.term.rows,
+              },
+              id: shell_id
+            })
+          }
+        }
+      });
+      this.observer.observe(document.body)
     }
   }
   <% if (!install_required) { %>