pinokiod 3.147.0 → 3.150.0

package/kernel/prototype.js

@@ -75,7 +75,6 @@ class Proto {
     await fs.promises.rm(this.kernel.path("prototype"), { recursive: true })
   }
   async create(req, ondata) {
-    console.log("CREATE", req)
     try {
       if (req.client) {
         this.kernel.client = req.client

package/kernel/shell.js

@@ -1061,20 +1061,20 @@ class Shell {
             this.monitor = this.monitor + data
             this.monitor = this.monitor.slice(-300) // last 300
 
-            let notifications = this.parser.processData(data)
-            if (notifications.length > 0) {
-              console.log({ notifications })
-              for(let notif of notifications) {
-                if (notif.type !== "bell") {
-                  Util.push({
-                    image: path.resolve(__dirname, "../server/public/pinokio-black.png"),
-                    message: notif.title,
-                    sound: true,
-                    timeout: 30,
-                  })
-                }
-              }
-            }
+//            let notifications = this.parser.processData(data)
+//            if (notifications.length > 0) {
+//              console.log({ notifications })
+//              for(let notif of notifications) {
+//                if (notif.type !== "bell") {
+//                  Util.push({
+//                    image: path.resolve(__dirname, "../server/public/pinokio-black.png"),
+//                    message: notif.title,
+//                    sound: true,
+//                    timeout: 30,
+//                  })
+//                }
+//              }
+//            }
 
             if (!this.done) {
 

package/kernel/util.js

@@ -711,7 +711,6 @@ function push(params) {
 
   emitPushEvent(eventPayload)
 
-  console.log("notifyParams", notifyParams)
   notifier.notify(notifyParams)
 }
 function p2u(localPath) {

package/package.json

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

package/server/index.js

@@ -25,6 +25,7 @@ const QRCode = require('qrcode')
 const axios = require('axios')
 const crypto = require('crypto')
 const serveIndex = require('./serveIndex')
+const registerFileRoutes = require('./routes/files')
 
 const git = require('isomorphic-git')
 const http = require('isomorphic-git/http/node')
@@ -812,6 +813,12 @@ class Server {
     let dev_tab = "/p/" + name + "/dev"
     let review_tab = "/p/" + name + "/review"
 
+    let editor_tab = `/pinokio/fileview/${encodeURIComponent(name)}`
+    let savedTabs = []
+    if (Array.isArray(this.tabs[name])) {
+      savedTabs = this.tabs[name].filter((url) => url !== editor_tab)
+    }
+
     let dynamic_url = "/pinokio/dynamic/" + name;
     if (Object.values(req.query).length > 0) {
       let index = 0
@@ -852,7 +859,8 @@ class Server {
       name,
 //      profile,
 //      feed,
-      tabs: (this.tabs[name] || []),
+      tabs: savedTabs,
+      editor_tab: editor_tab,
       config,
 //        sidebar_url: "/pinokio/sidebar/" + name,
       home: req.originalUrl,
@@ -3267,14 +3275,14 @@ class Server {
       }
       terminal = {
         icon: "fa-solid fa-terminal",
-        title: "Terminal",
+        title: "User Terminal",
         subtitle: "Open the terminal in the browser",
         menu: terminals
       }
     } else {
       terminal = {
         icon: "fa-solid fa-terminal",
-        title: "Terminal",
+        title: "User Terminal",
         subtitle: "Work with the terminal directly in the browser",
         menu: [this.renderShell(filepath, 0, 0, {
           icon: "fa-solid fa-terminal",
@@ -3730,6 +3738,11 @@ class Server {
       };
       next();
     });
+    registerFileRoutes(this.app, {
+      kernel: this.kernel,
+      getTheme: () => this.theme,
+      exists: (target) => this.exists(target),
+    });
     /*
     this.app.get("/asset/*", ex((req, res) => {
       let pathComponents = req.params[0].split("/")
@@ -4527,7 +4540,6 @@ class Server {
       }
     }))
     this.app.post("/push", ex(async (req, res) => {
-      console.log("Push", req.body)
       try {
         const payload = { ...(req.body || {}) }
         const resolveAssetPath = (raw) => {
@@ -6222,6 +6234,7 @@ class Server {
           menu: exec_menus
         },
       ]
+
       let spec = ""
       try {
         spec = await fs.promises.readFile(path.resolve(filepath, "SPEC.md"), "utf8")

package/server/public/files-app/app.css

@@ -0,0 +1,317 @@
+.files-app {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background: var(--background-color, #f7f7f7);
+  color: var(--text-color, #111);
+}
+
+.files-app[data-theme='dark'] {
+  --background-color: var(--dark-bg);
+  --surface-color: #222327;
+  --sidebar-color: var(--dark-nav-bg);
+  --border-color: var(--dark-thin);
+  --text-color: var(--dark-color);
+  --muted-color: var(--dark-fade);
+  --accent-color: var(--dark-link-color);
+  --accent-color-soft: rgba(183, 161, 255, 0.18);
+  --accent-color-shadow: rgba(183, 161, 255, 0.35);
+}
+
+.files-app:not([data-theme='dark']) {
+  --background-color: #f7f7f7;
+  --surface-color: #ffffff;
+  --sidebar-color: #ffffff;
+  --border-color: rgba(15, 23, 42, 0.08);
+  --text-color: #111827;
+  --muted-color: #6b7280;
+  --accent-color: var(--light-link-color);
+  --accent-color-soft: rgba(127, 91, 243, 0.12);
+  --accent-color-shadow: rgba(127, 91, 243, 0.35);
+}
+
+.files-app__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 12px 18px;
+  background: var(--surface-color);
+  border-bottom: 1px solid var(--border-color);
+  gap: 12px;
+}
+
+.files-app__header-title {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  font-size: 15px;
+}
+
+.files-app__header-title i {
+  font-size: 18px;
+}
+
+.files-app__header-text {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.files-app__header-primary {
+  font-weight: 600;
+}
+
+.files-app__header-sub {
+  font-size: 12px;
+  color: var(--muted-color);
+  word-break: break-all;
+}
+
+.files-app__header-actions {
+  display: flex;
+  gap: 8px;
+}
+
+.files-app__save {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 12px;
+  border-radius: 6px;
+  border: 1px solid transparent;
+  background: var(--accent-color);
+  color: #ffffff;
+  font-weight: 600;
+  cursor: pointer;
+  transition: transform 0.15s ease, box-shadow 0.15s ease, opacity 0.15s ease;
+}
+
+.files-app__meta {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 12px;
+  border-radius: 6px;
+  border: 1px solid var(--border-color);
+  background: transparent;
+  color: var(--text-color);
+  font-weight: 600;
+  cursor: pointer;
+  transition: transform 0.15s ease, background 0.15s ease;
+}
+
+.files-app__meta:focus-visible {
+  outline: 2px solid var(--accent-color);
+  outline-offset: 2px;
+}
+
+.files-app__meta:hover {
+  background: var(--accent-color-soft);
+  transform: translateY(-1px);
+}
+
+.files-app__save[disabled] {
+  opacity: 0.55;
+  cursor: not-allowed;
+}
+
+.files-app__save:not([disabled]):hover {
+  box-shadow: 0 8px 18px var(--accent-color-shadow);
+  transform: translateY(-1px);
+}
+
+.files-app__body {
+  flex: 1;
+  display: flex;
+  min-height: 0;
+}
+
+.files-app__sidebar {
+  width: 280px;
+  background: var(--sidebar-color);
+  border-right: 1px solid var(--border-color);
+  display: flex;
+  flex-direction: column;
+}
+
+.files-app__sidebar-scroll {
+  flex: 1;
+  overflow: auto;
+  padding: 12px 0;
+}
+
+.files-app__main {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  background: var(--surface-color);
+}
+
+.files-app__tabs:empty {
+  display: none;
+}
+.files-app__tabs {
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  padding: 8px 10px;
+  border-bottom: 1px solid var(--border-color);
+  overflow-x: auto;
+  white-space: nowrap;
+}
+
+.files-app__tab {
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 6px 12px;
+  border-radius: 6px;
+  border: 1px solid transparent;
+  background: transparent;
+  color: var(--text-color);
+  cursor: pointer;
+  font-size: 13px;
+  transition: background 0.15s ease, border 0.15s ease;
+}
+
+.files-app__tab:hover {
+  background: rgba(127, 91, 243, 0.08);
+}
+
+.files-app__tab--active {
+  background: rgba(127, 91, 243, 0.14);
+  border-color: rgba(127, 91, 243, 0.25);
+}
+
+.files-app__tab--stale {
+  border-color: rgba(249, 115, 22, 0.45);
+  background: rgba(249, 115, 22, 0.18);
+}
+.files-app__tab--stale .files-app__tab-label::after {
+  content: ' •';
+  color: #f97316;
+  font-weight: 600;
+}
+body.dark .files-app__tab--stale {
+  border-color: rgba(250, 204, 21, 0.45);
+  background: rgba(250, 204, 21, 0.18);
+}
+body.dark .files-app__tab--stale .files-app__tab-label::after {
+  color: #facc15;
+}
+
+.files-app__tab-close {
+  border: none;
+  background: none;
+  color: inherit;
+  cursor: pointer;
+  font-size: 13px;
+  padding: 0;
+  line-height: 1;
+}
+
+.files-app__tab--dirty::after {
+  content: '•';
+  color: var(--accent-color);
+  margin-left: 4px;
+}
+
+.files-app__editor {
+  position: relative;
+  flex: 1;
+}
+
+.files-app__editor .ace_editor {
+  position: absolute;
+  inset: 0;
+}
+
+.files-app__status {
+  padding: 6px 12px;
+  font-size: 12px;
+  color: var(--muted-color);
+  border-top: 1px solid var(--border-color);
+}
+
+.files-app__tree {
+  list-style: none;
+  padding: 0 12px;
+  margin: 0;
+  font-size: 13px;
+}
+
+.files-app__tree-item {
+  margin: 0;
+  padding: 0;
+}
+
+.files-app__tree-row {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 4px 8px;
+  border-radius: 4px;
+  background: none;
+  border: none;
+  color: inherit;
+  text-align: left;
+  cursor: pointer;
+  transition: background 0.1s ease;
+}
+
+.files-app__tree-row:hover,
+.files-app__tree-row:focus-visible {
+  background: rgba(127, 91, 243, 0.12);
+  outline: none;
+}
+
+.files-app__tree-row[data-selected='true'] {
+  background: rgba(127, 91, 243, 0.2);
+}
+
+.files-app__tree-row i {
+  width: 16px;
+  text-align: center;
+}
+
+.files-app__tree-children {
+  list-style: none;
+  margin: 0;
+  padding: 0 0 0 16px;
+}
+
+.files-app__tree-item[data-type='directory'] > .files-app__tree-children {
+  display: none;
+}
+
+.files-app__tree-item[data-expanded='true'] > .files-app__tree-children {
+  display: block;
+}
+
+.files-app__empty-state {
+  padding: 16px;
+  font-size: 13px;
+  color: var(--muted-color);
+}
+
+@media (max-width: 900px) {
+  .files-app__body {
+    flex-direction: column;
+  }
+  .files-app__sidebar {
+    width: 100%;
+    max-height: 260px;
+    border-right: none;
+    border-bottom: 1px solid var(--border-color);
+  }
+}
+
+.files-app__status[data-state='error'] {
+  color: #ef4444;
+}
+
+.files-app__status[data-state='success'] {
+  color: #10b981;
+}