@scrypted/server 0.115.30 → 0.115.32

package/electron/bin/31.4.0/target/version

@@ -0,0 +1 @@
+31.4.0

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@scrypted/server",
-  "version": "0.115.30",
+  "version": "0.115.32",
   "description": "",
   "dependencies": {
+    "@electron/get": "^3.1.0",
     "@mapbox/node-pre-gyp": "^1.0.11",
     "@scrypted/ffmpeg-static": "^6.1.0-build1",
     "@scrypted/node-pty": "^1.0.18",
@@ -11,9 +12,9 @@
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "dotenv": "^16.4.5",
-    "electron": "^31.4.0",
     "engine.io": "^6.6.0",
     "express": "^4.19.2",
+    "extract-zip": "^2.0.1",
     "follow-redirects": "^1.15.6",
     "http-auth": "^4.2.0",
     "level": "^8.0.1",
@@ -46,7 +47,8 @@
     "@types/semver": "^7.5.8",
     "@types/source-map-support": "^0.5.10",
     "@types/whatwg-mimetype": "^3.0.2",
-    "@types/ws": "^8.5.12"
+    "@types/ws": "^8.5.12",
+    "electron": "^31.4.0"
   },
   "bin": {
     "scrypted-serve": "bin/scrypted-serve"

package/src/plugin/media.ts

@@ -161,8 +161,11 @@ export abstract class MediaManagerBase implements MediaManager {
     }
 
     async convertMediaObjectToJSON<T>(mediaObject: MediaObjectInterface, toMimeType: string): Promise<T> {
-        const buffer = await this.convertMediaObjectToBuffer(mediaObject, toMimeType);
-        return JSON.parse(buffer.toString());
+        const json = await this.convertMediaObjectToBuffer(mediaObject, toMimeType);
+        // backcompat
+        if (json && (Buffer.isBuffer(json) || typeof json === 'string'))
+            return JSON.parse(json.toString());
+        return json as T;
     }
 
     abstract getSystemState(): { [id: string]: { [property: string]: SystemDeviceState } };

package/src/plugin/runtime/electron-worker.ts

@@ -1,3 +1,4 @@
+import fs from 'fs';
 import path from 'path';
 import child_process from 'child_process';
 import net from "net";
@@ -6,24 +7,30 @@ import { SidebandSocketSerializer } from "../socket-serializer";
 import { ChildProcessWorker } from "./child-process-worker";
 import { RuntimeWorkerOptions } from "./runtime-worker";
 import type { ScryptedRuntime } from '../../runtime';
+import { electronBin } from '../../../bin/electron-get';
 
 export class ElectronForkWorker extends ChildProcessWorker {
     static allocatedDisplays = new Set<number>();
     allocatedDisplay: number;
 
-    constructor(_mainFilename: string, pluginId: string, options: RuntimeWorkerOptions, runtime: ScryptedRuntime) {
+    constructor(_mainFilename: string, pluginId: string, options: RuntimeWorkerOptions, runtime: ScryptedRuntime, mode: 'default' | 'webgl' | 'webgpu') {
         super(pluginId, options);
 
         const { env } = options;
 
-        // @ts-expect-error
-        const electronBin: string = require('electron');
+        fs.chmodSync(electronBin, 0o755);
         const args = [
             electronBin,
-
             '--disable-features=BlockInsecurePrivateNetworkRequests,PrivateNetworkAccessSendPreflights',
             '--enable-features=SharedArrayBuffer',
         ];
+
+        if (mode !== 'default') {
+            args.push(
+                '--ignore-gpu-blocklist',
+            );
+        }
+
         if (process.platform === 'linux') {
             // crappy but should work.
             for (let i = 50; i < 100; i++) {
@@ -44,11 +51,15 @@ export class ElectronForkWorker extends ChildProcessWorker {
             // 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',
             );
+
+            if (mode === 'webgpu') {
+                args.push(
+                    '--enable-unsafe-webgpu',
+                    '--enable-features=Vulkan',
+                    '--disable-vulkan-surface',
+                );
+            }
         }
 
         if (process.platform === 'darwin') {

package/src/plugin/runtime/runtime-host.ts

@@ -13,7 +13,13 @@ 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, runtime) => new ElectronForkWorker(mainFilename, pluginId, options, runtime));
+
+    // safe
+    pluginHosts.set('electron', (mainFilename, pluginId, options, runtime) => new ElectronForkWorker(mainFilename, pluginId, options, runtime, 'default'));
+    // mostly safe
+    pluginHosts.set('electron-webgl', (mainFilename, pluginId, options, runtime) => new ElectronForkWorker(mainFilename, pluginId, options, runtime, 'webgl'));
+    // there be dragons
+    pluginHosts.set('electron-webgpu', (mainFilename, pluginId, options, runtime) => new ElectronForkWorker(mainFilename, pluginId, options, runtime, 'webgpu'));
 
     return pluginHosts;
 }