michael/scrypted
1
0
Fork 0
mirror of https://github.com/koush/scrypted.git synced 2026-04-25 09:20:24 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server: Fix electron display var

Browse Source
This commit is contained in:
Koushik Dutta
2024-08-20 23:20:04 -07:00
parent fe3391c89c
commit 3c8f94ab2f
3 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
server/src/plugin/runtime/electron-worker.ts
View File

@@ -5,15 +5,17 @@ import { RpcMessage, RpcPeer } from "../../rpc";
import { SidebandSocketSerializer } from "../socket-serializer";
import { ChildProcessWorker } from "./child-process-worker";
import { RuntimeWorkerOptions } from "./runtime-worker";
import type { ScryptedRuntime } from '../../runtime';
export class ElectronForkWorker extends ChildProcessWorker {
static allocatedDisplays = new Set<number>();
allocatedDisplay: number;
constructor(mainFilename: string, pluginId: string, options: RuntimeWorkerOptions) {
constructor(mainFilename: string, pluginId: string, options: RuntimeWorkerOptions, runtime: ScryptedRuntime) {
super(pluginId, options);
const { env, pluginDebug } = options;
const execArgv: string[] = process.execArgv.slice();
if (pluginDebug) {
// execArgv.push(`--inspect=0.0.0.0:${pluginDebug.inspectPort}`);
@@ -23,8 +25,22 @@ export class ElectronForkWorker extends ChildProcessWorker {
const electronBin: string = require('electron');
const args = [electronBin];
if (process.platform === 'linux') {
// crappy but should work.
for (let i = 50; i < 100; i++) {
if (!ElectronForkWorker.allocatedDisplays.has(i)) {
this.allocatedDisplay = i;
break;
}
}
if (!this.allocatedDisplay)
throw new Error('unable to allocate DISPLAY for xvfb-run');
ElectronForkWorker.allocatedDisplays.add(this.allocatedDisplay);
// requires xvfb-run as electron does not support the chrome --headless flag.
args.unshift('xvfb-run', '-n', '0');
// dummy up a DISPLAY env variable. this value numerical because of the way it is.
args.unshift('xvfb-run', '-n', this.allocatedDisplay.toString());
// https://github.com/gpuweb/gpuweb/wiki/Implementation-Status#chromium-chrome-edge-etc
args.push('--no-sandbox', '--enable-unsafe-webgpu', '--ignore-gpu-blocklist', '--enable-features=Vulkan', '--disable-vulkan-surface');
}
@@ -47,6 +63,9 @@ export class ElectronForkWorker extends ChildProcessWorker {
// execArgv,
});
this.worker.on('exit', () => {
});
this.worker.send({
pluginId,
options,
@@ -55,6 +74,12 @@ export class ElectronForkWorker extends ChildProcessWorker {
this.setupWorker();
}
kill(): void {
super.kill();
if (this.worker)
ElectronForkWorker.allocatedDisplays.delete(this.allocatedDisplay);
}
setupRpcPeer(peer: RpcPeer): void {
this.worker.on('message', (message, sendHandle) => {
if ((message as any).type && sendHandle) {

2
server/src/plugin/runtime/runtime-host.ts
View File

@@ -13,7 +13,7 @@ export function getBuiltinRuntimeHosts() {
pluginHosts.set('custom', (_, pluginId, options, runtime) => new CustomRuntimeWorker(pluginId, options, runtime));
pluginHosts.set('python', (_, pluginId, options) => new PythonRuntimeWorker(pluginId, options));
pluginHosts.set('node', (mainFilename, pluginId, options) => new NodeForkWorker(mainFilename, pluginId, options));
pluginHosts.set('electron', (mainFilename, pluginId, options) => new ElectronForkWorker(mainFilename, pluginId, options));
pluginHosts.set('electron', (mainFilename, pluginId, options, runtime) => new ElectronForkWorker(mainFilename, pluginId, options, runtime));
return pluginHosts;
}