@scrypted/server 0.135.0 → 0.137.0
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/cluster.d.ts +1 -0
- package/dist/plugin/cluster.js +3 -0
- package/dist/plugin/cluster.js.map +1 -1
- package/dist/services/cluster-fork.js +2 -1
- package/dist/services/cluster-fork.js.map +1 -1
- package/package.json +2 -2
- package/python/plugin_remote.py +3 -0
- package/src/plugin/cluster.ts +4 -0
- package/src/services/cluster-fork.ts +2 -1
package/dist/plugin/cluster.d.ts
CHANGED
|
@@ -10,6 +10,7 @@ export declare class ClusterManagerImpl implements ClusterManager {
|
|
|
10
10
|
private clusterServicePromise;
|
|
11
11
|
constructor(clusterMode: undefined | 'client' | 'server', api: PluginAPI, clusterWorkerId: string);
|
|
12
12
|
getClusterWorkerId(): string;
|
|
13
|
+
getClusterAddress(): string;
|
|
13
14
|
getClusterMode(): 'server' | 'client' | undefined;
|
|
14
15
|
getClusterWorkers(): Promise<Record<string, ClusterWorker>>;
|
|
15
16
|
private getClusterService;
|
package/dist/plugin/cluster.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/plugin/cluster.ts"],"names":[],"mappings":";;;AAOA,MAAa,kBAAkB;IAGR;IAAsD;IAAwB;IAFzF,qBAAqB,CAAuC;IAEpE,YAAmB,WAA4C,EAAU,GAAc,EAAU,eAAuB;QAArG,gBAAW,GAAX,WAAW,CAAiC;QAAU,QAAG,GAAH,GAAG,CAAW;QAAU,oBAAe,GAAf,eAAe,CAAQ;IACxH,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACnD,OAAO,WAAW,CAAC,iBAAiB,EAAE,CAAC;IAC3C,CAAC;IAEO,iBAAiB;QACrB,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACtC,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"cluster.js","sourceRoot":"","sources":["../../src/plugin/cluster.ts"],"names":[],"mappings":";;;AAOA,MAAa,kBAAkB;IAGR;IAAsD;IAAwB;IAFzF,qBAAqB,CAAuC;IAEpE,YAAmB,WAA4C,EAAU,GAAc,EAAU,eAAuB;QAArG,gBAAW,GAAX,WAAW,CAAiC;QAAU,QAAG,GAAH,GAAG,CAAW;QAAU,oBAAe,GAAf,eAAe,CAAQ;IACxH,CAAC;IAED,kBAAkB;QACd,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAED,iBAAiB;QACb,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IAChD,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,iBAAiB;QACnB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACnD,OAAO,WAAW,CAAC,iBAAiB,EAAE,CAAC;IAC3C,CAAC;IAEO,iBAAiB;QACrB,IAAI,CAAC,qBAAqB,KAAK,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QACrE,OAAO,IAAI,CAAC,qBAAqB,CAAC;IACtC,CAAC;CACJ;AA3BD,gDA2BC"}
|
|
@@ -7,6 +7,7 @@ exports.ClusterForkService = void 0;
|
|
|
7
7
|
const fs_1 = __importDefault(require("fs"));
|
|
8
8
|
const cluster_labels_1 = require("../cluster/cluster-labels");
|
|
9
9
|
const rpc_1 = require("../rpc");
|
|
10
|
+
const ip_1 = require("../ip");
|
|
10
11
|
class WrappedForkResult {
|
|
11
12
|
clusterWorkerId;
|
|
12
13
|
forkResult;
|
|
@@ -99,7 +100,7 @@ class ClusterForkService {
|
|
|
99
100
|
labels: worker.labels,
|
|
100
101
|
forks: [...worker.forks],
|
|
101
102
|
mode: worker.mode,
|
|
102
|
-
address: worker.address,
|
|
103
|
+
address: (0, ip_1.removeIPv4EmbeddedIPv6)(worker.address),
|
|
103
104
|
};
|
|
104
105
|
}
|
|
105
106
|
return ret;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cluster-fork.js","sourceRoot":"","sources":["../../src/services/cluster-fork.ts"],"names":[],"mappings":";;;;;;AACA,4CAAoB;AACpB,8DAAiE;AAEjE,gCAAiC;
|
|
1
|
+
{"version":3,"file":"cluster-fork.js","sourceRoot":"","sources":["../../src/services/cluster-fork.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@scrypted/server",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.137.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@scrypted/ffmpeg-static": "^6.1.0-build3",
|
|
7
7
|
"@scrypted/node-pty": "^1.0.22",
|
|
8
|
-
"@scrypted/types": "^0.3.
|
|
8
|
+
"@scrypted/types": "^0.3.105",
|
|
9
9
|
"adm-zip": "^0.5.16",
|
|
10
10
|
"body-parser": "^1.20.3",
|
|
11
11
|
"cookie-parser": "^1.4.7",
|
package/python/plugin_remote.py
CHANGED
|
@@ -243,6 +243,9 @@ class ClusterManager(scrypted_python.scrypted_sdk.types.ClusterManager):
|
|
|
243
243
|
def getClusterMode(self) -> Any | Any:
|
|
244
244
|
return os.getenv("SCRYPTED_CLUSTER_MODE", None)
|
|
245
245
|
|
|
246
|
+
def getClusterAddress(self) -> str:
|
|
247
|
+
return os.getenv("SCRYPTED_CLUSTER_ADDRESS", None)
|
|
248
|
+
|
|
246
249
|
def getClusterWorkerId(self) -> str:
|
|
247
250
|
return self.remote.clusterSetup.clusterWorkerId
|
|
248
251
|
|
package/src/plugin/cluster.ts
CHANGED
|
@@ -15,6 +15,10 @@ export class ClusterManagerImpl implements ClusterManager {
|
|
|
15
15
|
return this.clusterWorkerId;
|
|
16
16
|
}
|
|
17
17
|
|
|
18
|
+
getClusterAddress(): string {
|
|
19
|
+
return process.env.SCRYPTED_CLUSTER_ADDRESS;
|
|
20
|
+
}
|
|
21
|
+
|
|
18
22
|
getClusterMode(): 'server' | 'client' | undefined {
|
|
19
23
|
return this.clusterMode;
|
|
20
24
|
}
|
|
@@ -5,6 +5,7 @@ import type { RuntimeWorkerOptions } from "../plugin/runtime/runtime-worker";
|
|
|
5
5
|
import { RpcPeer } from "../rpc";
|
|
6
6
|
import type { ScryptedRuntime } from "../runtime";
|
|
7
7
|
import type { ClusterForkOptions, ClusterForkParam, ClusterForkResultInterface, PeerLiveness, RunningClusterWorker } from "../scrypted-cluster-main";
|
|
8
|
+
import { removeIPv4EmbeddedIPv6 } from "../ip";
|
|
8
9
|
|
|
9
10
|
class WrappedForkResult implements ClusterForkResultInterface {
|
|
10
11
|
[RpcPeer.PROPERTY_PROXY_PROPERTIES] = {
|
|
@@ -109,7 +110,7 @@ export class ClusterForkService {
|
|
|
109
110
|
labels: worker.labels,
|
|
110
111
|
forks: [...worker.forks] as ClusterFork[],
|
|
111
112
|
mode: worker.mode,
|
|
112
|
-
address: worker.address,
|
|
113
|
+
address: removeIPv4EmbeddedIPv6(worker.address),
|
|
113
114
|
};
|
|
114
115
|
}
|
|
115
116
|
return ret;
|