@scrypted/server 0.115.29 → 0.115.30
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/plugin/runtime/child-process-worker.js +0 -3
- package/dist/plugin/runtime/child-process-worker.js.map +1 -1
- package/dist/plugin/runtime/electron/electron-plugin-remote.js +0 -7
- package/dist/plugin/runtime/electron/electron-plugin-remote.js.map +1 -1
- package/dist/plugin/runtime/electron-worker.js +6 -2
- package/dist/plugin/runtime/electron-worker.js.map +1 -1
- package/dist/plugin/runtime/node-thread-worker.js +0 -3
- package/dist/plugin/runtime/node-thread-worker.js.map +1 -1
- package/package.json +1 -1
- package/src/plugin/runtime/child-process-worker.ts +0 -3
- package/src/plugin/runtime/electron/electron-plugin-remote.ts +0 -8
- package/src/plugin/runtime/electron-worker.ts +15 -4
- package/src/plugin/runtime/node-thread-worker.ts +0 -3
|
@@ -31,9 +31,6 @@ class ChildProcessWorker extends ws_1.EventEmitter {
|
|
|
31
31
|
if (!this.worker)
|
|
32
32
|
return;
|
|
33
33
|
this.worker.kill('SIGKILL');
|
|
34
|
-
this.worker.removeAllListeners();
|
|
35
|
-
this.worker.stdout.removeAllListeners();
|
|
36
|
-
this.worker.stderr.removeAllListeners();
|
|
37
34
|
this.worker = undefined;
|
|
38
35
|
}
|
|
39
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-process-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/child-process-worker.ts"],"names":[],"mappings":";;;AACA,2BAAkC;AAIlC,MAAsB,kBAAmB,SAAQ,iBAAY;IAOtC;IANT,MAAM,CAA6B;IAE7C,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,YAAmB,QAAgB,EAAE,OAA6B;QAC9D,KAAK,EAAE,CAAC;QADO,aAAQ,GAAR,QAAQ,CAAQ;IAEnC,CAAC;IAED,WAAW;QACP,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAmB,EAAE,MAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAClH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,OAAO;QACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"child-process-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/child-process-worker.ts"],"names":[],"mappings":";;;AACA,2BAAkC;AAIlC,MAAsB,kBAAmB,SAAQ,iBAAY;IAOtC;IANT,MAAM,CAA6B;IAE7C,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAED,YAAmB,QAAgB,EAAE,OAA6B;QAC9D,KAAK,EAAE,CAAC;QADO,aAAQ,GAAR,QAAQ,CAAQ;IAEnC,CAAC;IAED,WAAW;QACP,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,IAAmB,EAAE,MAA6B,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAClH,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAChF,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC1E,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI,MAAM;QACN,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC9B,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,OAAO;QACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;IAC5B,CAAC;CAIJ;AAvCD,gDAuCC"}
|
|
@@ -16,10 +16,6 @@ let win;
|
|
|
16
16
|
const winQueue = [];
|
|
17
17
|
const createWindow = (firstMessage) => {
|
|
18
18
|
const message = firstMessage;
|
|
19
|
-
const { options } = message;
|
|
20
|
-
if (options?.pluginDebug) {
|
|
21
|
-
console.warn('debugging', options);
|
|
22
|
-
}
|
|
23
19
|
win = new electron_1.BrowserWindow({
|
|
24
20
|
width: 800,
|
|
25
21
|
height: 600,
|
|
@@ -30,9 +26,6 @@ const createWindow = (firstMessage) => {
|
|
|
30
26
|
nodeIntegration: true,
|
|
31
27
|
webSecurity: false,
|
|
32
28
|
allowRunningInsecureContent: true,
|
|
33
|
-
additionalArguments: options?.pluginDebug ? [
|
|
34
|
-
`--remote-debugging-port=9222`,
|
|
35
|
-
] : undefined,
|
|
36
29
|
}
|
|
37
30
|
});
|
|
38
31
|
win.webContents.send('scrypted-init', message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-plugin-remote.js","sourceRoot":"","sources":["../../../../src/plugin/runtime/electron/electron-plugin-remote.ts"],"names":[],"mappings":";;;;;AAAA,uCAA8C;AAC9C,gDAAwB;AACxB,gDAA6C;AAG7C,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;IAChC,kIAAkI;IAClI,yBAAyB;IACzB,qBAAqB;IACrB,cAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AACpB,CAAC;AAED,IAAI,GAAkB,CAAC;AACvB,MAAM,QAAQ,GAAU,EAAE,CAAC;AAE3B,MAAM,YAAY,GAAG,CAAC,YAAkE,EAAE,EAAE;IACxF,MAAM,OAAO,GAAyD,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"electron-plugin-remote.js","sourceRoot":"","sources":["../../../../src/plugin/runtime/electron/electron-plugin-remote.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,11 @@ class ElectronForkWorker extends child_process_worker_1.ChildProcessWorker {
|
|
|
17
17
|
const { env } = options;
|
|
18
18
|
// @ts-expect-error
|
|
19
19
|
const electronBin = require('electron');
|
|
20
|
-
const args = [
|
|
20
|
+
const args = [
|
|
21
|
+
electronBin,
|
|
22
|
+
'--disable-features=BlockInsecurePrivateNetworkRequests,PrivateNetworkAccessSendPreflights',
|
|
23
|
+
'--enable-features=SharedArrayBuffer',
|
|
24
|
+
];
|
|
21
25
|
if (process.platform === 'linux') {
|
|
22
26
|
// crappy but should work.
|
|
23
27
|
for (let i = 50; i < 100; i++) {
|
|
@@ -41,7 +45,7 @@ class ElectronForkWorker extends child_process_worker_1.ChildProcessWorker {
|
|
|
41
45
|
// <string>1</string>
|
|
42
46
|
}
|
|
43
47
|
if (options?.pluginDebug) {
|
|
44
|
-
args.push(
|
|
48
|
+
args.push(`--remote-debugging-port=${options?.pluginDebug.inspectPort}`);
|
|
45
49
|
}
|
|
46
50
|
args.push(path_1.default.join(__dirname, 'electron', 'electron-plugin-remote.js'), '--', 'child', this.pluginId);
|
|
47
51
|
const bin = args.shift();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/electron-worker.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,kEAA0C;AAC1C,8CAAsB;AAEtB,4DAAgE;AAChE,iEAA4D;AAI5D,MAAa,kBAAmB,SAAQ,yCAAkB;IACtD,MAAM,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7C,gBAAgB,CAAS;IAEzB,YAAY,aAAqB,EAAE,QAAgB,EAAE,OAA6B,EAAE,OAAwB;QACxG,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAEzB,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QAExB,mBAAmB;QACnB,MAAM,WAAW,GAAW,OAAO,CAAC,UAAU,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"electron-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/electron-worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,9 +85,6 @@ class NodeThreadWorker extends events_1.EventEmitter {
|
|
|
85
85
|
if (!this.worker)
|
|
86
86
|
return;
|
|
87
87
|
this.worker.terminate();
|
|
88
|
-
this.worker.removeAllListeners();
|
|
89
|
-
this.worker.stdout.removeAllListeners();
|
|
90
|
-
this.worker.stderr.removeAllListeners();
|
|
91
88
|
this.port.close();
|
|
92
89
|
this.port = undefined;
|
|
93
90
|
this.worker = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-thread-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/node-thread-worker.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"node-thread-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/node-thread-worker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -37,9 +37,6 @@ export abstract class ChildProcessWorker extends EventEmitter implements Runtime
|
|
|
37
37
|
if (!this.worker)
|
|
38
38
|
return;
|
|
39
39
|
this.worker.kill('SIGKILL');
|
|
40
|
-
this.worker.removeAllListeners();
|
|
41
|
-
this.worker.stdout.removeAllListeners();
|
|
42
|
-
this.worker.stderr.removeAllListeners();
|
|
43
40
|
this.worker = undefined;
|
|
44
41
|
}
|
|
45
42
|
|
|
@@ -15,11 +15,6 @@ const winQueue: any[] = [];
|
|
|
15
15
|
|
|
16
16
|
const createWindow = (firstMessage: { plugindId: string, options: RuntimeWorkerOptions }) => {
|
|
17
17
|
const message: { plugindId: string, options: RuntimeWorkerOptions } = firstMessage;
|
|
18
|
-
const { options } = message;
|
|
19
|
-
|
|
20
|
-
if (options?.pluginDebug) {
|
|
21
|
-
console.warn('debugging', options);
|
|
22
|
-
}
|
|
23
18
|
|
|
24
19
|
win = new BrowserWindow({
|
|
25
20
|
width: 800,
|
|
@@ -31,9 +26,6 @@ const createWindow = (firstMessage: { plugindId: string, options: RuntimeWorkerO
|
|
|
31
26
|
nodeIntegration: true,
|
|
32
27
|
webSecurity: false,
|
|
33
28
|
allowRunningInsecureContent: true,
|
|
34
|
-
additionalArguments: options?.pluginDebug ? [
|
|
35
|
-
`--remote-debugging-port=9222`,
|
|
36
|
-
] : undefined,
|
|
37
29
|
}
|
|
38
30
|
});
|
|
39
31
|
win.webContents.send('scrypted-init', message);
|
|
@@ -18,7 +18,12 @@ export class ElectronForkWorker extends ChildProcessWorker {
|
|
|
18
18
|
|
|
19
19
|
// @ts-expect-error
|
|
20
20
|
const electronBin: string = require('electron');
|
|
21
|
-
const args = [
|
|
21
|
+
const args = [
|
|
22
|
+
electronBin,
|
|
23
|
+
|
|
24
|
+
'--disable-features=BlockInsecurePrivateNetworkRequests,PrivateNetworkAccessSendPreflights',
|
|
25
|
+
'--enable-features=SharedArrayBuffer',
|
|
26
|
+
];
|
|
22
27
|
if (process.platform === 'linux') {
|
|
23
28
|
// crappy but should work.
|
|
24
29
|
for (let i = 50; i < 100; i++) {
|
|
@@ -37,7 +42,13 @@ export class ElectronForkWorker extends ChildProcessWorker {
|
|
|
37
42
|
// dummy up a DISPLAY env variable. this value numerical because of the way it is.
|
|
38
43
|
args.unshift('xvfb-run', '-n', this.allocatedDisplay.toString());
|
|
39
44
|
// https://github.com/gpuweb/gpuweb/wiki/Implementation-Status#chromium-chrome-edge-etc
|
|
40
|
-
args.push(
|
|
45
|
+
args.push(
|
|
46
|
+
'--no-sandbox',
|
|
47
|
+
'--enable-unsafe-webgpu',
|
|
48
|
+
'--ignore-gpu-blocklist',
|
|
49
|
+
'--enable-features=Vulkan',
|
|
50
|
+
'--disable-vulkan-surface',
|
|
51
|
+
);
|
|
41
52
|
}
|
|
42
53
|
|
|
43
54
|
if (process.platform === 'darwin') {
|
|
@@ -47,7 +58,7 @@ export class ElectronForkWorker extends ChildProcessWorker {
|
|
|
47
58
|
}
|
|
48
59
|
|
|
49
60
|
if (options?.pluginDebug) {
|
|
50
|
-
args.push(
|
|
61
|
+
args.push(`--remote-debugging-port=${options?.pluginDebug.inspectPort}`);
|
|
51
62
|
}
|
|
52
63
|
|
|
53
64
|
args.push(
|
|
@@ -77,7 +88,7 @@ export class ElectronForkWorker extends ChildProcessWorker {
|
|
|
77
88
|
...options.pluginDebug,
|
|
78
89
|
// dont want to send/serialize this.
|
|
79
90
|
waitDebug: null,
|
|
80
|
-
}: undefined,
|
|
91
|
+
} : undefined,
|
|
81
92
|
},
|
|
82
93
|
});
|
|
83
94
|
|
|
@@ -98,9 +98,6 @@ export class NodeThreadWorker extends EventEmitter implements RuntimeWorker {
|
|
|
98
98
|
if (!this.worker)
|
|
99
99
|
return;
|
|
100
100
|
this.worker.terminate();
|
|
101
|
-
this.worker.removeAllListeners();
|
|
102
|
-
this.worker.stdout.removeAllListeners();
|
|
103
|
-
this.worker.stderr.removeAllListeners();
|
|
104
101
|
this.port.close();
|
|
105
102
|
this.port = undefined;
|
|
106
103
|
this.worker = undefined;
|