@scrypted/server 0.123.30 → 0.123.31
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/cluster/cluster-labels.js +1 -0
- package/dist/cluster/cluster-labels.js.map +1 -1
- package/dist/plugin/runtime/cluster-fork-worker.js +4 -1
- package/dist/plugin/runtime/cluster-fork-worker.js.map +1 -1
- package/package.json +1 -1
- package/python/plugin_remote.py +3 -1
- package/src/cluster/cluster-labels.ts +1 -0
- package/src/plugin/runtime/cluster-fork-worker.ts +4 -1
|
@@ -39,6 +39,7 @@ function getClusterLabels() {
|
|
|
39
39
|
}
|
|
40
40
|
function needsClusterForkWorker(options) {
|
|
41
41
|
return process.env.SCRYPTED_CLUSTER_ADDRESS
|
|
42
|
+
&& options
|
|
42
43
|
&& (!matchesClusterLabels(options, getClusterLabels()) || options.clusterWorkerId);
|
|
43
44
|
}
|
|
44
45
|
//# sourceMappingURL=cluster-labels.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster-labels.js","sourceRoot":"","sources":["../../src/cluster/cluster-labels.ts"],"names":[],"mappings":";;;;;AAGA,oDAyBC;AAED,4CAKC;AAED,
|
|
1
|
+
{"version":3,"file":"cluster-labels.js","sourceRoot":"","sources":["../../src/cluster/cluster-labels.ts"],"names":[],"mappings":";;;;;AAGA,oDAyBC;AAED,4CAKC;AAED,wDAIC;AAzCD,4CAAoB;AAGpB,SAAgB,oBAAoB,CAAC,OAA2B,EAAE,MAAgB;IAC9E,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,MAAM,EAAE,OAAO,IAAI,EAAE,EAAE,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YACvB,OAAO,CAAC,CAAC;IACjB,CAAC;IAED,2DAA2D;IAC3D,IAAI,QAAQ,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC;IAC7C,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC;QAC5C,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO,EAAE,CAAC;YACV,QAAQ,GAAG,IAAI,CAAC;QACpB,CAAC;IACL,CAAC;IACD,IAAI,CAAC,QAAQ;QACT,OAAO,CAAC,CAAC;IAEb,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,EAAE,EAAE,CAAC;QAChD,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;YACtB,OAAO,EAAE,CAAC;IAClB,CAAC;IACD,0BAA0B;IAC1B,OAAO,EAAE,CAAC;IACV,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAgB,gBAAgB;IAC5B,IAAI,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IACnE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,YAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC3D,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9B,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,SAAgB,sBAAsB,CAAC,OAA2B;IAC9D,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB;WACpC,OAAO;WACP,CAAC,CAAC,oBAAoB,CAAC,OAAO,EAAE,gBAAgB,EAAE,CAAC,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;AAC3F,CAAC"}
|
|
@@ -27,7 +27,10 @@ function createClusterForkWorker(forkComponentPromise, zipHash, getZip, options,
|
|
|
27
27
|
runtimeWorker.pid = undefined;
|
|
28
28
|
});
|
|
29
29
|
const peerLiveness = new scrypted_cluster_main_1.PeerLiveness(waitKilled.promise);
|
|
30
|
-
const clusterForkResultPromise = forkComponentPromise.then(forkComponent => forkComponent.fork(peerLiveness,
|
|
30
|
+
const clusterForkResultPromise = forkComponentPromise.then(forkComponent => forkComponent.fork(peerLiveness, {
|
|
31
|
+
runtime: options.runtime || 'node',
|
|
32
|
+
...options,
|
|
33
|
+
}, packageJson, zipHash, getZip));
|
|
31
34
|
clusterForkResultPromise.catch(() => { });
|
|
32
35
|
const clusterWorkerId = clusterForkResultPromise.then(clusterForkResult => clusterForkResult.clusterWorkerId);
|
|
33
36
|
clusterWorkerId.catch(() => { });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster-fork-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/cluster-fork-worker.ts"],"names":[],"mappings":";;AAQA,
|
|
1
|
+
{"version":3,"file":"cluster-fork-worker.js","sourceRoot":"","sources":["../../../src/plugin/runtime/cluster-fork-worker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/python/plugin_remote.py
CHANGED
|
@@ -777,7 +777,9 @@ class PluginRemote:
|
|
|
777
777
|
peerLiveness = PeerLiveness(self.loop)
|
|
778
778
|
async def startClusterFork():
|
|
779
779
|
forkComponent = await self.api.getComponent("cluster-fork")
|
|
780
|
-
|
|
780
|
+
sanitizedOptions = options.copy()
|
|
781
|
+
sanitizedOptions["runtime"] = sanitizedOptions.get("runtime", "python")
|
|
782
|
+
clusterForkResult = await forkComponent.fork(peerLiveness, sanitizedOptions, packageJson, zipHash, lambda: zipAPI.getZip())
|
|
781
783
|
|
|
782
784
|
async def waitPeerLiveness():
|
|
783
785
|
try:
|
|
@@ -37,5 +37,6 @@ export function getClusterLabels() {
|
|
|
37
37
|
|
|
38
38
|
export function needsClusterForkWorker(options: ClusterForkOptions) {
|
|
39
39
|
return process.env.SCRYPTED_CLUSTER_ADDRESS
|
|
40
|
+
&& options
|
|
40
41
|
&& (!matchesClusterLabels(options, getClusterLabels()) || options.clusterWorkerId);
|
|
41
42
|
}
|
|
@@ -37,7 +37,10 @@ export function createClusterForkWorker(
|
|
|
37
37
|
});
|
|
38
38
|
|
|
39
39
|
const peerLiveness = new PeerLiveness(waitKilled.promise);
|
|
40
|
-
const clusterForkResultPromise = forkComponentPromise.then(forkComponent => forkComponent.fork(peerLiveness,
|
|
40
|
+
const clusterForkResultPromise = forkComponentPromise.then(forkComponent => forkComponent.fork(peerLiveness, {
|
|
41
|
+
runtime: options.runtime || 'node',
|
|
42
|
+
...options,
|
|
43
|
+
}, packageJson, zipHash, getZip));
|
|
41
44
|
clusterForkResultPromise.catch(() => {});
|
|
42
45
|
|
|
43
46
|
const clusterWorkerId = clusterForkResultPromise.then(clusterForkResult => clusterForkResult.clusterWorkerId);
|