From 8557638030fde329a7f645b06abd4370122c9d2c Mon Sep 17 00:00:00 2001 From: Harald Schilly Date: Thu, 27 Nov 2025 11:07:54 +0100 Subject: [PATCH 1/2] npm: update older node-forge 1.3.1 to 1.3.2 --- src/packages/frontend/cspell.json | 5 ++++- src/packages/frontend/package.json | 2 +- src/packages/package.json | 1 + src/packages/pnpm-lock.yaml | 17 ++++++++++------- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/packages/frontend/cspell.json b/src/packages/frontend/cspell.json index 1fa2c0fb60c..ab68c4b2b0e 100644 --- a/src/packages/frontend/cspell.json +++ b/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", diff --git a/src/packages/frontend/package.json b/src/packages/frontend/package.json index 56f237e6522..63d7f8b3b06 100644 --- a/src/packages/frontend/package.json +++ b/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", diff --git a/src/packages/package.json b/src/packages/package.json index 19eb7bddbbf..1285ac60971 100644 --- a/src/packages/package.json +++ b/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", "tar-fs@3.0.8": "3.0.9", "@types/request@2.48.12": "2.48.13", diff --git a/src/packages/pnpm-lock.yaml b/src/packages/pnpm-lock.yaml index 91710cdd4e3..e451b2b9902 100644 --- a/src/packages/pnpm-lock.yaml +++ b/src/packages/pnpm-lock.yaml @@ -14,6 +14,7 @@ overrides: 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 tar-fs@3.0.8: 3.0.9 '@types/request@2.48.12': 2.48.13 @@ -562,8 +563,8 @@ importers: specifier: ^11.10.0 version: 11.10.0 node-forge: - specifier: ^1.0.0 - version: 1.3.1 + specifier: ^1.3.2 + version: 1.3.2 onecolor: specifier: ^3.1.0 version: 3.1.0 @@ -5358,6 +5359,7 @@ packages: bootstrap@3.4.1: resolution: {integrity: sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==} engines: {node: '>=6'} + deprecated: This version of Bootstrap is no longer supported. Please upgrade to the latest version. brace-expansion@1.1.12: resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==} @@ -8536,6 +8538,7 @@ packages: keygrip@1.1.0: resolution: {integrity: sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==} engines: {node: '>= 0.6'} + deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} @@ -9153,8 +9156,8 @@ packages: encoding: optional: true - node-forge@1.3.1: - resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==} + node-forge@1.3.2: + resolution: {integrity: sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==} engines: {node: '>= 6.13.0'} node-gyp-build@4.8.4: @@ -21099,7 +21102,7 @@ snapshots: optionalDependencies: encoding: 0.1.13 - node-forge@1.3.1: {} + node-forge@1.3.2: {} node-gyp-build@4.8.4: {} @@ -21112,7 +21115,7 @@ snapshots: es6-promise: 4.2.8 lodash: 4.17.21 long: 5.3.2 - node-forge: 1.3.1 + node-forge: 1.3.2 pako: 2.1.0 process: 0.11.10 uuid: 9.0.1 @@ -22905,7 +22908,7 @@ snapshots: selfsigned@2.4.1: dependencies: '@types/node-forge': 1.3.14 - node-forge: 1.3.1 + node-forge: 1.3.2 semver@5.7.2: {} From 4f313968d5b926099e6cb41c51f4ef99416fe9be Mon Sep 17 00:00:00 2001 From: Harald Schilly Date: Thu, 27 Nov 2025 11:21:21 +0100 Subject: [PATCH 2/2] frontend/x11: select wss vs ws for https vs http -- useful for local dev! --- .../frontend/frame-editors/x11-editor/xpra-client.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/packages/frontend/frame-editors/x11-editor/xpra-client.ts b/src/packages/frontend/frame-editors/x11-editor/xpra-client.ts index d60e32f6e00..16676eba344 100644 --- a/src/packages/frontend/frame-editors/x11-editor/xpra-client.ts +++ b/src/packages/frontend/frame-editors/x11-editor/xpra-client.ts @@ -156,9 +156,10 @@ 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, @@ -166,7 +167,7 @@ export class XpraClient extends EventEmitter { "server", `${port}`, ); - const uri = `wss${origin}${path}`; + const uri = `${wsProtocol}${originTail}${path}`; const dpi = Math.round(BASE_DPI * window.devicePixelRatio); return { uri, dpi }; }