@scrypted/server 0.128.0 → 0.128.2
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/plugin-npm-dependencies.js +9 -4
- package/dist/plugin/plugin-npm-dependencies.js.map +1 -1
- package/dist/plugin/plugin-remote-worker.js +12 -7
- package/dist/plugin/plugin-remote-worker.js.map +1 -1
- package/package.json +1 -1
- package/src/plugin/plugin-npm-dependencies.ts +11 -4
- package/src/plugin/plugin-remote-worker.ts +13 -7
|
@@ -13,7 +13,6 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
13
13
|
const os_1 = __importDefault(require("os"));
|
|
14
14
|
const path_1 = __importDefault(require("path"));
|
|
15
15
|
const process_1 = __importDefault(require("process"));
|
|
16
|
-
const semver_1 = __importDefault(require("semver"));
|
|
17
16
|
const plugin_volume_1 = require("./plugin-volume");
|
|
18
17
|
function defaultNpmExec(args, options) {
|
|
19
18
|
let npm = 'npm';
|
|
@@ -32,8 +31,14 @@ function setNpmExecFunction(f) {
|
|
|
32
31
|
}
|
|
33
32
|
function getPluginNodePath(name) {
|
|
34
33
|
const pluginVolume = (0, plugin_volume_1.ensurePluginVolume)(name);
|
|
35
|
-
const
|
|
36
|
-
let
|
|
34
|
+
const abi = process_1.default.versions.modules;
|
|
35
|
+
let runtime = process_1.default.env.npm_config_runtime;
|
|
36
|
+
if (!runtime && process_1.default.versions.electron)
|
|
37
|
+
runtime = 'electron';
|
|
38
|
+
if (!runtime)
|
|
39
|
+
runtime = 'node';
|
|
40
|
+
const { platform, arch } = process_1.default;
|
|
41
|
+
let nodeVersionedDirectory = `n-${runtime}-v${abi}-${platform}-${arch}`;
|
|
37
42
|
const scryptedBase = process_1.default.env.SCRYPTED_BASE_VERSION;
|
|
38
43
|
if (scryptedBase)
|
|
39
44
|
nodeVersionedDirectory += '-' + scryptedBase;
|
|
@@ -94,7 +99,7 @@ async function installOptionalDependencies(console, packageJson) {
|
|
|
94
99
|
if (!de.isDirectory())
|
|
95
100
|
return;
|
|
96
101
|
if (de.name.startsWith('linux') || de.name.startsWith('darwin') || de.name.startsWith('win32')
|
|
97
|
-
|| de.name.startsWith('python') || de.name.startsWith('node')) {
|
|
102
|
+
|| de.name.startsWith('python') || de.name.startsWith('node') || de.name.startsWith('n-')) {
|
|
98
103
|
console.log('Removing old dependencies:', filePath);
|
|
99
104
|
try {
|
|
100
105
|
await fs_1.default.promises.rm(filePath, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-npm-dependencies.js","sourceRoot":"","sources":["../../src/plugin/plugin-npm-dependencies.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"plugin-npm-dependencies.js","sourceRoot":"","sources":["../../src/plugin/plugin-npm-dependencies.ts"],"names":[],"mappings":"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"}
|
|
@@ -49,6 +49,7 @@ const cluster_fork_worker_1 = require("./runtime/cluster-fork-worker");
|
|
|
49
49
|
const node_thread_worker_1 = require("./runtime/node-thread-worker");
|
|
50
50
|
const node_worker_common_1 = require("./runtime/node-worker-common");
|
|
51
51
|
const runtime_host_1 = require("./runtime/runtime-host");
|
|
52
|
+
const deferred_1 = require("../deferred");
|
|
52
53
|
const serverVersion = require('../../package.json').version;
|
|
53
54
|
let scryptedStatic;
|
|
54
55
|
function getScryptedStatic() {
|
|
@@ -266,6 +267,13 @@ function startPluginRemote(mainFilename, pluginId, peerSend, startPluginRemoteOp
|
|
|
266
267
|
runtimeWorker.setupRpcPeer(localPeer);
|
|
267
268
|
forkPeer = Promise.resolve(localPeer);
|
|
268
269
|
}
|
|
270
|
+
const exitDeferred = new deferred_1.Deferred();
|
|
271
|
+
runtimeWorker.on('exit', () => {
|
|
272
|
+
exitDeferred.resolve('worker exited');
|
|
273
|
+
});
|
|
274
|
+
runtimeWorker.on('error', e => {
|
|
275
|
+
exitDeferred.resolve('worker error' + e);
|
|
276
|
+
});
|
|
269
277
|
// thread workers inherit main console. pipe anything else.
|
|
270
278
|
if (!(runtimeWorker instanceof node_thread_worker_1.NodeThreadWorker)) {
|
|
271
279
|
const console = options?.id ? getMixinConsole(options.id, options.nativeId) : undefined;
|
|
@@ -273,6 +281,9 @@ function startPluginRemote(mainFilename, pluginId, peerSend, startPluginRemoteOp
|
|
|
273
281
|
}
|
|
274
282
|
const result = (async () => {
|
|
275
283
|
const threadPeer = await forkPeer;
|
|
284
|
+
exitDeferred.promise.then(reason => {
|
|
285
|
+
threadPeer.kill(reason);
|
|
286
|
+
});
|
|
276
287
|
// todo: handle nested forks and skip wrap. this is probably buggy.
|
|
277
288
|
class PluginForkAPI extends plugin_api_1.PluginAPIProxy {
|
|
278
289
|
[rpc_1.RpcPeer.PROPERTY_PROXY_ONEWAY_METHODS] = api[rpc_1.RpcPeer.PROPERTY_PROXY_ONEWAY_METHODS];
|
|
@@ -290,13 +301,7 @@ function startPluginRemote(mainFilename, pluginId, peerSend, startPluginRemoteOp
|
|
|
290
301
|
const forkApi = new PluginForkAPI(api);
|
|
291
302
|
const remote = await (0, plugin_remote_1.setupPluginRemote)(threadPeer, forkApi, pluginId, { serverVersion }, () => systemManager.getSystemState());
|
|
292
303
|
forks.add(remote);
|
|
293
|
-
|
|
294
|
-
threadPeer.kill('worker exited');
|
|
295
|
-
forkApi.removeListeners();
|
|
296
|
-
forks.delete(remote);
|
|
297
|
-
});
|
|
298
|
-
runtimeWorker.on('error', e => {
|
|
299
|
-
threadPeer.kill('worker error ' + e);
|
|
304
|
+
exitDeferred.promise.then(reason => {
|
|
300
305
|
forkApi.removeListeners();
|
|
301
306
|
forks.delete(remote);
|
|
302
307
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-remote-worker.js","sourceRoot":"","sources":["../../src/plugin/plugin-remote-worker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"plugin-remote-worker.js","sourceRoot":"","sources":["../../src/plugin/plugin-remote-worker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,6 @@ import fs from 'fs';
|
|
|
4
4
|
import os from 'os';
|
|
5
5
|
import path from 'path';
|
|
6
6
|
import process from 'process';
|
|
7
|
-
import semver from 'semver';
|
|
8
7
|
import { ensurePluginVolume } from "./plugin-volume";
|
|
9
8
|
|
|
10
9
|
export function defaultNpmExec(args: string[], options: child_process.SpawnOptions) {
|
|
@@ -26,8 +25,16 @@ export function setNpmExecFunction(f: typeof npmExecFunction) {
|
|
|
26
25
|
|
|
27
26
|
export function getPluginNodePath(name: string) {
|
|
28
27
|
const pluginVolume = ensurePluginVolume(name);
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
|
|
29
|
+
const abi = process.versions.modules;
|
|
30
|
+
let runtime = process.env.npm_config_runtime;
|
|
31
|
+
if (!runtime && process.versions.electron)
|
|
32
|
+
runtime = 'electron';
|
|
33
|
+
if (!runtime)
|
|
34
|
+
runtime = 'node';
|
|
35
|
+
const { platform, arch } = process;
|
|
36
|
+
let nodeVersionedDirectory = `n-${runtime}-v${abi}-${platform}-${arch}`;
|
|
37
|
+
|
|
31
38
|
const scryptedBase = process.env.SCRYPTED_BASE_VERSION;
|
|
32
39
|
if (scryptedBase)
|
|
33
40
|
nodeVersionedDirectory += '-' + scryptedBase;
|
|
@@ -98,7 +105,7 @@ export async function installOptionalDependencies(console: Console, packageJson:
|
|
|
98
105
|
if (!de.isDirectory())
|
|
99
106
|
return;
|
|
100
107
|
if (de.name.startsWith('linux') || de.name.startsWith('darwin') || de.name.startsWith('win32')
|
|
101
|
-
|| de.name.startsWith('python') || de.name.startsWith('node')) {
|
|
108
|
+
|| de.name.startsWith('python') || de.name.startsWith('node') || de.name.startsWith('n-')) {
|
|
102
109
|
console.log('Removing old dependencies:', filePath);
|
|
103
110
|
try {
|
|
104
111
|
await fs.promises.rm(filePath, {
|
|
@@ -24,6 +24,7 @@ import { NodeThreadWorker } from './runtime/node-thread-worker';
|
|
|
24
24
|
import { prepareZip } from './runtime/node-worker-common';
|
|
25
25
|
import { getBuiltinRuntimeHosts } from './runtime/runtime-host';
|
|
26
26
|
import { RuntimeWorker, RuntimeWorkerOptions } from './runtime/runtime-worker';
|
|
27
|
+
import { Deferred } from '../deferred';
|
|
27
28
|
|
|
28
29
|
const serverVersion = require('../../package.json').version;
|
|
29
30
|
|
|
@@ -291,6 +292,14 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
|
|
|
291
292
|
forkPeer = Promise.resolve(localPeer);
|
|
292
293
|
}
|
|
293
294
|
|
|
295
|
+
const exitDeferred = new Deferred<string>();
|
|
296
|
+
runtimeWorker.on('exit', () => {
|
|
297
|
+
exitDeferred.resolve('worker exited');
|
|
298
|
+
});
|
|
299
|
+
runtimeWorker.on('error', e => {
|
|
300
|
+
exitDeferred.resolve('worker error' + e);
|
|
301
|
+
});
|
|
302
|
+
|
|
294
303
|
// thread workers inherit main console. pipe anything else.
|
|
295
304
|
if (!(runtimeWorker instanceof NodeThreadWorker)) {
|
|
296
305
|
const console = options?.id ? getMixinConsole(options.id, options.nativeId) : undefined;
|
|
@@ -299,6 +308,9 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
|
|
|
299
308
|
|
|
300
309
|
const result = (async () => {
|
|
301
310
|
const threadPeer = await forkPeer;
|
|
311
|
+
exitDeferred.promise.then(reason => {
|
|
312
|
+
threadPeer.kill(reason);
|
|
313
|
+
});
|
|
302
314
|
|
|
303
315
|
// todo: handle nested forks and skip wrap. this is probably buggy.
|
|
304
316
|
class PluginForkAPI extends PluginAPIProxy {
|
|
@@ -319,13 +331,7 @@ export function startPluginRemote(mainFilename: string, pluginId: string, peerSe
|
|
|
319
331
|
|
|
320
332
|
const remote = await setupPluginRemote(threadPeer, forkApi, pluginId, { serverVersion }, () => systemManager.getSystemState());
|
|
321
333
|
forks.add(remote);
|
|
322
|
-
|
|
323
|
-
threadPeer.kill('worker exited');
|
|
324
|
-
forkApi.removeListeners();
|
|
325
|
-
forks.delete(remote);
|
|
326
|
-
});
|
|
327
|
-
runtimeWorker.on('error', e => {
|
|
328
|
-
threadPeer.kill('worker error ' + e);
|
|
334
|
+
exitDeferred.promise.then(reason => {
|
|
329
335
|
forkApi.removeListeners();
|
|
330
336
|
forks.delete(remote);
|
|
331
337
|
});
|