Merge remote-tracking branch 'origin/npm-node-forge-xpra' into pr-20251208

Author: haraldschilly

src/packages/frontend/cspell.json

@@ -43,6 +43,7 @@
     "onprem",
     "pdflatex",
     "plotly",
+    "pulseaudio",
     "pythontex",
     "rclass",
     "rereturn",
@@ -81,7 +82,8 @@
     "undeletes",
     "undeleting",
     "xelatex",
-    "xetex"
+    "xetex",
+    "xpra"
   ],
   "ignoreWords": [
     "antd",
@@ -110,6 +112,7 @@
     "noconf",
     "nprocs",
     "pchildren",
+    "pgrep",
     "pids",
     "Popconfirm",
     "PoweroffOutlined",

src/packages/frontend/frame-editors/x11-editor/xpra-client.ts

@@ -156,17 +156,18 @@ export class XpraClient extends EventEmitter {
     // Get origin, but with http[s] stripped.
     // Do not use window.location.hostname, since that doesn't
     // include the port, if there is one.
-    let origin = window.location.origin;
+    const { origin, protocol: pageProtocol } = window.location;
     const i = origin.indexOf(":");
-    origin = origin.slice(i);
+    const originTail = origin.slice(i);
+    const wsProtocol = pageProtocol === "https:" ? "wss" : "ws";
 
     const path = join(
       appBasePath,
       this.options.project_id,
       "server",
       `${port}`,
     );
-    const uri = `wss${origin}${path}`;
+    const uri = `${wsProtocol}${originTail}${path}`;
     const dpi = Math.round(BASE_DPI * window.devicePixelRatio);
     return { uri, dpi };
   }

src/packages/frontend/package.json

@@ -116,7 +116,7 @@
     "md5": "^2",
     "memoize-one": "^5.1.1",
     "mermaid": "^11.10.0",
-    "node-forge": "^1.0.0",
+    "node-forge": "^1.3.2",
     "onecolor": "^3.1.0",
     "pdfjs-dist": "^4.6.82",
     "plotly.js": "^2.29.1",

src/packages/package.json

@@ -27,6 +27,7 @@
       "langchain": "^0.3.34",
       "katex@<0.16.9": "^0.16.10",
       "nanoid@<3.3.8": "^3.3.8",
+      "node-forge@<=1.3.1": "^1.3.2",
       "tar-fs@<=2.1.3": "2.1.4",
       "[email protected]": "3.0.9",
       "@types/[email protected]": "2.48.13",