@scrypted/server 0.123.64 → 0.123.65
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.
|
@@ -45,13 +45,16 @@ class NodeForkWorker extends child_process_worker_1.ChildProcessWorker {
|
|
|
45
45
|
isNodePluginWorkerProcess() || (0, cluster_setup_1.getScryptedClusterMode)()?.[0] === 'client' ? exports.NODE_PLUGIN_FORK_PROCESS : exports.NODE_PLUGIN_CHILD_PROCESS,
|
|
46
46
|
this.pluginId
|
|
47
47
|
];
|
|
48
|
+
const nodePaths = [path_1.default.resolve(__dirname, '..', '..', '..', 'node_modules')];
|
|
49
|
+
if (env.NODE_PATH)
|
|
50
|
+
nodePaths.push(env.NODE_PATH);
|
|
51
|
+
if (process.env.NODE_PATH)
|
|
52
|
+
nodePaths.push(process.env.NODE_PATH);
|
|
48
53
|
this.worker = child_process_1.default.fork(mainFilename, args, {
|
|
49
54
|
stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
|
|
50
|
-
env: Object.assign({}, process.env, {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
NODE_PATH: path_1.default.resolve(__dirname, '..', '..', '..', 'node_modules'),
|
|
54
|
-
}, env),
|
|
55
|
+
env: Object.assign({}, process.env, env, {
|
|
56
|
+
NODE_PATH: nodePaths.join(path_1.default.delimiter),
|
|
57
|
+
}),
|
|
55
58
|
serialization: 'advanced',
|
|
56
59
|
execArgv,
|
|
57
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-fork-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/node-fork-worker.ts"],"names":[],"mappings":";;;;;;AAaA,8DAEC;AAED,0DAEC;AAED,8DAEC;AAED,4DAEC;AA3BD,kEAA0C;AAC1C,8CAAsB;AACtB,gDAAwB;AACxB,+DAAqE;AAErE,4DAAgE;AAChE,iEAA4D;AAG/C,QAAA,yBAAyB,GAAG,OAAO,CAAC;AACpC,QAAA,wBAAwB,GAAG,MAAM,CAAC;AAClC,QAAA,0BAA0B,GAAG,cAAc,CAAC;AAEzD,SAAgB,yBAAyB;IACrC,OAAO,wBAAwB,EAAE,IAAI,uBAAuB,EAAE,IAAI,yBAAyB,EAAE,CAAC;AAClG,CAAC;AAED,SAAgB,uBAAuB;IACnC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,gCAAwB,CAAC;AACxD,CAAC;AAED,SAAgB,yBAAyB;IACrC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,kCAA0B,CAAC;AAC1D,CAAC;AAED,SAAgB,wBAAwB;IACpC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,iCAAyB,CAAC;AACzD,CAAC;AAED,MAAa,cAAe,SAAQ,yCAAkB;IAElD,YAAY,YAAoB,EAAE,OAA6B;QAC3D,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAErC,iFAAiF;QACjF,0FAA0F;QAC1F,MAAM,QAAQ,GAAa,OAAO,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;QACjG,IAAI,WAAW,EAAE,CAAC;YACd,QAAQ,CAAC,IAAI,CAAC,qBAAqB,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,IAAI,GAAG;YACT,2FAA2F;YAC3F,+DAA+D;YAC/D,yBAAyB,EAAE,IAAI,IAAA,sCAAsB,GAAE,EAAE,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,gCAAwB,CAAC,CAAC,CAAC,iCAAyB;YAChI,IAAI,CAAC,QAAQ;SAChB,CAAC;QAEF,IAAI,CAAC,MAAM,GAAG,uBAAa,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE;YACjD,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC;YACtC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE
|
|
1
|
+
{"version":3,"file":"node-fork-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/node-fork-worker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -48,13 +48,19 @@ export class NodeForkWorker extends ChildProcessWorker {
|
|
|
48
48
|
this.pluginId
|
|
49
49
|
];
|
|
50
50
|
|
|
51
|
+
const nodePaths: string[] = [path.resolve(__dirname, '..', '..', '..', 'node_modules')];
|
|
52
|
+
if (env.NODE_PATH)
|
|
53
|
+
nodePaths.push(env.NODE_PATH);
|
|
54
|
+
if (process.env.NODE_PATH)
|
|
55
|
+
nodePaths.push(process.env.NODE_PATH);
|
|
56
|
+
|
|
51
57
|
this.worker = child_process.fork(mainFilename, args, {
|
|
52
58
|
stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
|
|
53
|
-
env: Object.assign({}, process.env,
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
59
|
+
env: Object.assign({}, process.env, env,
|
|
60
|
+
{
|
|
61
|
+
NODE_PATH: nodePaths.join(path.delimiter),
|
|
62
|
+
}
|
|
63
|
+
),
|
|
58
64
|
serialization: 'advanced',
|
|
59
65
|
execArgv,
|
|
60
66
|
});
|