pinokiod 1.3.41 → 1.3.42

package/kernel/api/index.js

@@ -1053,10 +1053,18 @@ class Api {
     } else if (request.method) {
 
       if (request.params && request.params.path) {
-        request.params.path = this.resolvePath(this.userdir, request.params.path)
+        if (request.cwd) {
+          console.log("request.cwd", request.cwd)
+          let rendered_cwd = this.kernel.template.render(request.cwd, { kernel: this.kernel }, { allow_undefined: true })
+          console.log("rendered_cwd", rendered_cwd)
+          request.params.path = this.resolvePath(rendered_cwd, request.params.path)
+        } else {
+          request.params.path = this.resolvePath(this.userdir, request.params.path)
+        }
       }
 
       // Kernel Call
+      console.log("REQUEST", request)
       let resolved = await this.resolveMethod(request)
       try {
         resolved.dirname = resolved.dirname

package/package.json

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

package/server/index.js

@@ -2020,9 +2020,18 @@ class Server {
 //      }
     })
 
-
-
-
+    this.app.get("/edit/*", async (req, res) => {
+      let pathComponents = req.params[0].split("/")
+      let filepath = path.resolve(this.kernel.homedir, req.params[0])
+      const content = await fs.promises.readFile(filepath, "utf8")
+      console.log({ pathComponents, content })
+      res.render("general_editor", {
+        theme: this.theme,
+        filepath,
+        content,
+        agent: this.agent,
+      })
+    })
     this.app.get("/script/:name", (req, res) => {
       if (req.params.name === "start") {
         res.json(this.startScripts)

package/server/views/general_editor.ejs

@@ -0,0 +1,208 @@
+<html class='columns'>
+<head>
+<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+<script src="/hotkeys.min.js"></script>
+<script src="/ace/ace.js"></script>
+<script src="/noty.js"></script>
+<script src="/notyq.js"></script>
+<script src="/xterm.js"></script>
+<script src="/xterm-addon-fit.js"></script>
+<script src="/xterm-addon-web-links.js"></script>
+<script src="/xterm-theme.js"></script>
+<script src="/xterm-addon-search.js"></script>
+<script src="/xterm-addon-search-bar.js"></script>
+<script src="/sweetalert2.js"></script>
+<script src="/Socket.js"></script>
+<script src="/common.js"></script>
+<script src="/he.js"></script>
+<script src="/opener.js"></script>
+<script src="/nav.js"></script>
+<script src="/autoexpand.js"></script>
+<script src="/modalinput.js"></script>
+<script src="/simplemodal.js"></script>
+<script src="/waitmodal.js"></script>
+<script src="/notifyinput.js"></script>
+<script src="/report.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">
+<link href="/css/regular.min.css" rel="stylesheet">
+<link href="/css/brands.min.css" rel="stylesheet">
+<link href="/style.css" rel="stylesheet"/>
+<link href="/noty.css" rel="stylesheet"/>
+<% if (agent === "electron") { %>
+  <link href="/electron.css" rel="stylesheet"/>
+<% } %>
+<style>
+body.frozen {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+#table > table {
+  border-left: 2px solid black;
+  padding-left: 5px;
+  margin: 10px 0;
+}
+.highlight {
+  background: yellow;
+  width: 100px;
+}
+th {
+  background: rgba(0,0,0,0.1);
+  padding: 10px;
+  font-size: 12px;
+}
+td {
+  font-size: 12px;
+  padding: 10px;
+}
+td.val {
+  background: rgba(0,0,0,0.06);
+}
+td.key {
+  background: rgba(0,0,0,0.1);
+}
+.button {
+  cursor: pointer; 
+  background: rgba(0,0,0,0.8);
+  color: white;
+  padding: 5px 10px;
+  border-radius: 4px;
+}
+.button:hover {
+  
+}
+#editor {
+  background: var(--dark-bg);
+}
+header .runner {
+  padding: 10px 0 0;
+}
+.disabled {
+  opacity: 0.7;
+}
+</style>
+<script>
+document.addEventListener("DOMContentLoaded", async () => {
+  let editor = ace.edit("editor");
+  //editor.setTheme("ace/theme/tomorrow");
+  //editor.setTheme("ace/theme/ambiance");
+  //editor.setTheme("ace/theme/idle_fingers");
+  editor.setTheme("ace/theme/nord_dark");
+  //editor.setTheme("ace/theme/textmate");
+  editor.setOptions({
+    maxLines: Infinity, // set to a large number
+    minLines: 1 // set to a small number
+  });
+  console.log("location.pathname", location.pathname)
+  if (location.pathname.endsWith("ENVIRONMENT")) {
+    editor.session.setMode("ace/mode/python");
+  }
+  //editor.session.setMode("ace/mode/javascript");
+  //editor.setValue(file)
+  editor.clearSelection()
+  if (location.hash && location.hash.length > 1) {
+    let parsedHash = location.hash.slice(1)
+    let line_re = /L([0-9]+)/
+    let line_match = line_re.exec(parsedHash)
+    if (line_match && line_match.length > 0) {
+      let line = parseInt(line_match[1])
+      editor.gotoLine(line)
+      editor.selection.selectLine()
+      editor.gotoLine(line)
+      editor.focus()
+    }
+//    let range_re = /L[0-9]+-L[0-9]+/
+
+//    let range_match = range_re.exec(parsedHash)
+//    if (range_match && range_match.length > 0) {
+//      
+//    }
+  }
+  let dirty
+  let str;
+  let original = editor.getValue()
+  editor.getSession().on("change", () => {
+    let v = editor.getValue()
+    if (original === v) {
+      dirty = false
+      document.querySelector("#save").classList.add("disabled")
+    } else {
+      dirty = true
+      document.querySelector("#save").classList.remove("disabled")
+    }
+    str = v
+  });
+  const n = new N()
+  class RPC {
+    constructor() {
+      this.socket = new Socket()
+    }
+    save() {
+      return new Promise((resolve, reject) => {
+        // remove `/edit/`
+        let filepath = location.pathname.slice(6)
+        this.socket.close()
+        this.socket.run({
+          method: "fs.write",
+          cwd: "{{kernel.homedir}}",
+          params: {
+            path: filepath,
+            text: str,
+          }
+        }, (packet) => {
+          if (packet.type === "result" && packet.id === "fs.write") {
+            dirty = false
+            document.querySelector("#save").classList.add("disabled")
+            resolve()
+          }
+        })
+      })
+    }
+  }
+  const rpc = new RPC()
+  if (document.querySelector("#save")) {
+    document.querySelector("#save").addEventListener("click", async (e) => {
+      console.log("SAVE")
+      await rpc.save()
+      n.Noty({
+        text: `saved`,
+      })
+    })
+  }
+  if (document.querySelector("#lv")) {
+    document.querySelector("#lv").addEventListener("click", (e) => {
+      let m = e.target.closest(".memory")
+      m.classList.toggle("collapsed")
+      if (m.classList.contains("collapsed")) {
+        m.querySelector("i").className = "fa-solid fa-sort-down"
+      } else {
+        m.querySelector("i").className = "fa-solid fa-sort-up"
+      }
+    })
+  }
+})
+</script>
+</head>
+<body class='columns <%=theme%>'>
+  <header class='navheader grabbable'>
+  <h1>
+    <a class='home' href="/"><i class="fa-solid fa-house"></i></a>
+    <%=filepath%>
+  </h1>
+  <div class='runner'>
+    <div id='save' class='btn disabled'>
+      <span class='save'><i class="fa-solid fa-check"></i> Save</span>
+    </div>
+    <button class='btn' id='open-fs' data-filepath="<%=filepath%>"><i class="fa-solid fa-eye"></i> Open in File Explorer</button>
+  </div>
+  </header>
+  <div class='containers'>
+    <main>
+      <div id='editor'><%=content%></div>
+    </main>
+  </div>
+  <footer><b>Ready</b></footer>
+</body>
+</html>

package/server/views/index.ejs

@@ -126,9 +126,9 @@ header .runner {
     <a class='btn2' href="/?mode=help"><div><i class="fa-regular fa-face-smile"></i></div><div>Community</div></a>
     <% if (agent === "electron") { %>
       <a class='btn2' data-filepath="<%=filepath%>"><div><i class="fa-regular fa-folder-open"></i></div><div>Files</div></a>
+      <a href="/" target="_blank" class='btn2' features="browser"><div><i class="fa-solid fa-arrow-up-right-from-square"></i></div><div>Popout</div></a>
     <% } %>
     <a id='wifi' data-proxy="<%=proxy.proxy%>" class='btn2'><div><i class="fa-solid fa-wifi"></i></div><div>WiFi Share</div></a>
-    <a href="/" target="_blank" class='btn2'><div><i class="fa-solid fa-arrow-up-right-from-square"></i></div><div>Popout</div></a>
     <!--
     <a class='btn2' id='report'><div><i class="fa-solid fa-bug"></i></div><div>Report Bug</div></a>
     <a class='btn2' href='https://discord.gg/TQdNwadtE4' target="_blank"><div><i class="fa-brands fa-discord"></i></div><div>Discord</div></a>

package/server/views/settings.ejs

@@ -291,6 +291,15 @@ hr {
     <i class="fa-solid fa-circle-notch fa-spin"></i> Stand by. Do not close this window..
   </div>
   <hr/>
+  <div class='advanced'>
+    <h1>Advanced Settings</h1>
+    <br>
+    <br>
+    <div>Edit the system ENVIRONMENT file to customize pinokio system wide settings, such as where files are stored, terminal behavior, etc.</div>
+    <br>
+    <a class='btn' href="/edit/ENVIRONMENT">Edit ENVIRONMENT</a>
+  </div>
+  <hr/>
   <% if (locals.bin) { %>
     <div class='troubleshoot'>
       <h1>Troubleshoot</h1>