pinokiod 3.86.0 → 3.88.0

package/server/public/window_storage.js

@@ -1,30 +1,99 @@
-const WINDOW_ID = (() => {
-  // Try to get existing window ID or create a new one
-  let id = sessionStorage.getItem('__window_id');
-  if (!id) {
-    id = Date.now() + '_' + Math.random().toString(36).substr(2, 9);
-    try { sessionStorage.setItem('__window_id', id); } catch (_) {}
-  }
-  return id;
-})();
+(() => {
+  const SESSION_NAMESPACE = (() => {
+    const extractSession = (loc) => {
+      try {
+        const url = new URL(loc);
+        const value = url.searchParams.get('session');
+        return typeof value === 'string' && value.length > 0 ? value : null;
+      } catch (_) {
+        return null;
+      }
+    };
+
+    let sessionId = extractSession(window.location.href);
+
+    if (!sessionId && window.parent && window.parent !== window) {
+      try {
+        sessionId = extractSession(window.parent.location.href);
+      } catch (_) {
+        try {
+          if (typeof window.parent.PinokioLayout?.getSessionId === 'function') {
+            sessionId = window.parent.PinokioLayout.getSessionId() || null;
+          }
+        } catch (_) {}
+      }
+    }
+
+    if (!sessionId && window.top && window.top !== window) {
+      try {
+        sessionId = extractSession(window.top.location.href);
+      } catch (_) {}
+    }
 
-// Window-specific storage wrapper
-window.windowStorage = {
-  setItem: (key, value) => {
-    try { 
-      sessionStorage.setItem(`${WINDOW_ID}:${key}`, value); 
-    } catch (_) {}
-  },
-  removeItem: (key, value) => {
-    try { 
-      sessionStorage.removeItem(`${WINDOW_ID}:${key}`)
-    } catch (_) {}
-  },
-  getItem: (key) => {
-    try { 
-      return sessionStorage.getItem(`${WINDOW_ID}:${key}`); 
-    } catch (_) { 
-      return null; 
+    if (sessionId) {
+      return `pinokio:session:${sessionId}`;
     }
-  }
-};
+
+    let fallbackId = null;
+    try {
+      fallbackId = localStorage.getItem('pinokio:window:fallback');
+      if (!fallbackId) {
+        fallbackId = `${Date.now()}_${Math.random().toString(36).slice(2)}`;
+        localStorage.setItem('pinokio:window:fallback', fallbackId);
+      }
+    } catch (_) {
+      fallbackId = `${Date.now()}_${Math.random().toString(36).slice(2)}`;
+    }
+    return `pinokio:window:${fallbackId}`;
+  })();
+
+  const prefixKey = (key) => {
+    if (!key || typeof key !== 'string') {
+      return null;
+    }
+    return `${SESSION_NAMESPACE}:${key}`;
+  };
+
+  window.windowStorage = {
+    setItem: (key, value) => {
+      const namespaced = prefixKey(key);
+      if (!namespaced) {
+        return;
+      }
+      try {
+        localStorage.setItem(namespaced, value);
+      } catch (_) {}
+    },
+    removeItem: (key) => {
+      const namespaced = prefixKey(key);
+      if (!namespaced) {
+        return;
+      }
+      try {
+        localStorage.removeItem(namespaced);
+      } catch (_) {}
+    },
+    getItem: (key) => {
+      const namespaced = prefixKey(key);
+      if (!namespaced) {
+        return null;
+      }
+      try {
+        return localStorage.getItem(namespaced);
+      } catch (_) {
+        return null;
+      }
+    },
+    clearNamespace: () => {
+      try {
+        const targetPrefix = `${SESSION_NAMESPACE}:`;
+        for (let i = localStorage.length - 1; i >= 0; i -= 1) {
+          const key = localStorage.key(i);
+          if (key && key.startsWith(targetPrefix)) {
+            localStorage.removeItem(key);
+          }
+        }
+      } catch (_) {}
+    },
+  };
+})();

package/server/socket.js

@@ -1,3 +1,4 @@
+const querystring = require("querystring");
 const WebSocket = require('ws');
 const path = require('path')
 const Util = require("../kernel/util")
@@ -35,7 +36,7 @@ class Socket {
           if (sepIndex === -1) throw new Error("Missing metadata separator");
           const metaStr = buffer.slice(0, sepIndex).toString('utf-8');
           const meta = JSON.parse(metaStr);
-          const bufferKeys = meta.buffer_keys;
+          const bufferKeys = meta.buffer_keys || [];
           const resultBuffers = {};
           let offset = sepIndex + 1;
           for (const key of bufferKeys) {
@@ -47,11 +48,27 @@ class Socket {
             resultBuffers[key] = fileBuf;
             offset += len;
           }
-          // Now you can save files
-          for (const [key, buf] of Object.entries(resultBuffers)) {
-            meta.response[key] = buf
+          if (meta.rpc) {
+            req = meta.rpc
+            if (!req.params) {
+              req.params = {}
+            }
+            if (!req.params.buffers) {
+              req.params.buffers = {}
+            }
+            for (const [key, buf] of Object.entries(resultBuffers)) {
+              req.params.buffers[key] = buf
+            }
+          } else {
+            // legacy path keeps response semantics
+            if (!meta.response) {
+              meta.response = {}
+            }
+            for (const [key, buf] of Object.entries(resultBuffers)) {
+              meta.response[key] = buf
+            }
+            req = meta
           }
-          req = meta
         } else {
           req = JSON.parse(message)
         }
@@ -205,10 +222,23 @@ class Socket {
   trigger(e) {
     // send to id session
     let id
-    if (e.kernel) {
-      id = e.id
+    if (typeof e.id === "string") {
+      if (e.id.includes("session=")) {
+        id = e.id
+      } else if (e.id.startsWith("shell/")) {
+        id = e.id
+      } else if (e.kernel && !(e.id.startsWith("~/") || e.id.startsWith("/") || e.id.startsWith("http"))) {
+        // kernel method ids such as "kernel.api.stop" are not paths
+        id = e.id
+      } else {
+        try {
+          id = this.parent.kernel.api.filePath(e.id)
+        } catch (error) {
+          id = e.id
+        }
+      }
     } else {
-      id = this.parent.kernel.api.filePath(e.id)
+      id = e.id
     }
 
     const subscribers = this.subscriptions.get(id) || new Set();
@@ -327,7 +357,8 @@ class Socket {
           let root = await Environment.get_root({ path: cwd }, this.parent.kernel)
           cwd = root.root
           let session = this.sessions[key]
-          let logpath = path.resolve(cwd, "logs/dev", path.parse(relative).base)
+          //let logpath = path.resolve(cwd, "logs/dev", path.parse(relative).base)
+          let logpath = path.resolve(cwd, "logs/dev", relative)
           await Util.log(logpath, buf, session)
         }
       } else if (relative.startsWith("api")) {

package/server/views/500.ejs

@@ -44,8 +44,8 @@ body.error-body footer.error-footer a {
   <div>You may want to try:</div>
   <ol>
     <li>Update Pinokio: Simply install the latest version, it should only update the app binary while keeping all the data in tact. <a href="<%=install%>" target="_blank">Go to Download Page</a></li>
-    <li>Try troubleshooting: <a href="/?mode=settings#troubleshoot">Troubleshoot</a></li>
-    <li>Ask in community Discord: <a href="http://localhost/?mode=help" target="_blank">Community</a></li>
+    <li>Try troubleshooting: <a href="/home?mode=settings#troubleshoot">Troubleshoot</a></li>
+    <li>Ask in community Discord: <a href="http://localhost/home?mode=help" target="_blank">Community</a></li>
   </ol>
 </footer>
 </body>