kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

clientonly and wayland, hotfix electron tests (#3677)

Browse Source 
clientonly:
- did work only with xserver and `DISPLAY` env var
- now checks for `WAYLAND_DISPLAY` or `DISPLAY` env var before running
- if `WAYLAND_DISPLAY` is set now starts with wayland parameters

electron tests see #3676
This commit is contained in:
Karsten Hassel
2025-01-03 21:52:10 +01:00
committed by GitHub
parent 75dbe67167
commit 0f6efac8e6
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/automated-tests.yaml vendored
View File

@@ -34,7 +34,7 @@ jobs:
npm run test:css npm run test:css
npm run test:markdown npm run test:markdown
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
timeout-minutes: 30 timeout-minutes: 30
strategy: strategy:
matrix: matrix:

2
CHANGELOG.md
View File

@@ -17,6 +17,8 @@ planned for 2025-04-01
### Changed ### Changed
- [core] starting clientonly now checks for needed env var `WAYLAND_DISPLAY` or `DISPLAY` and starts electron with needed parameters (if both are set wayland is used)
### Removed ### Removed
### Updated ### Updated

13
clientonly/index.js
View File

@@ -83,6 +83,17 @@
if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) === -1) { if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].indexOf(config.address) === -1) {
getServerConfig(`${prefix}${config.address}:${config.port}/config/`) getServerConfig(`${prefix}${config.address}:${config.port}/config/`)
.then(function (configReturn) { .then(function (configReturn) {
// check environment for DISPLAY or WAYLAND_DISPLAY
const elecParams = ["js/electron.js"];
if (process.env.WAYLAND_DISPLAY !== "") {
console.log(`Client: Using WAYLAND_DISPLAY=${process.env.WAYLAND_DISPLAY}`);
elecParams.push("--enable-features=UseOzonePlatform");
elecParams.push("--ozone-platform=wayland");
} else if (process.env.DISPLAY !== "") {
console.log(`Client: Using DISPLAY=${process.env.DISPLAY}`);
} else {
fail("Error: Requires environment variable WAYLAND_DISPLAY or DISPLAY, none is provided.");
}
// Pass along the server config via an environment variable // Pass along the server config via an environment variable
const env = Object.create(process.env); const env = Object.create(process.env);
env.clientonly = true; // set to pass to electron.js env.clientonly = true; // set to pass to electron.js
@@ -94,7 +105,7 @@
// Spawn electron application // Spawn electron application
const electron = require("electron"); const electron = require("electron");
const child = require("node:child_process").spawn(electron, ["js/electron.js"], options); const child = require("node:child_process").spawn(electron, elecParams, options);
// Pipe all child process output to current stdout // Pipe all child process output to current stdout
child.stdout.on("data", function (buf) { child.stdout.on("data", function (buf) {