@terascope/teraslice-messaging 1.6.0 → 1.6.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/src/cluster-master/interfaces.d.ts +1 -1
- package/dist/src/cluster-master/interfaces.d.ts.map +1 -1
- package/dist/src/cluster-master/server.d.ts +9 -9
- package/dist/src/cluster-master/server.d.ts.map +1 -1
- package/dist/src/cluster-master/server.js +8 -7
- package/dist/src/cluster-master/server.js.map +1 -1
- package/package.json +2 -2
|
@@ -25,7 +25,7 @@ export interface ClusterAnalytics {
|
|
|
25
25
|
controllers: AggregatedExecutionAnalytics;
|
|
26
26
|
}
|
|
27
27
|
export interface ExecutionAnalyticsMessage extends Message {
|
|
28
|
-
kind:
|
|
28
|
+
kind: keyof ClusterAnalytics;
|
|
29
29
|
stats: ExecutionAnalytics;
|
|
30
30
|
}
|
|
31
31
|
export interface OnExecutionAnalyticsFn {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/interfaces.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,cAAc,CAAC,WAAW,CAAC;IAC3C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,WAAW,EAAE,4BAA4B,CAAC;CAC7C;AAED,MAAM,WAAW,yBAA0B,SAAQ,OAAO;IACtD,IAAI,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/interfaces.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AACpF,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAEtE,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,CAAC,EAAE,cAAc,CAAC,WAAW,CAAC;IAC3C,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC7B,WAAW,EAAE,4BAA4B,CAAC;CAC7C;AAED,MAAM,WAAW,yBAA0B,SAAQ,OAAO;IACtD,IAAI,EAAE,MAAM,gBAAgB,CAAC;IAC7B,KAAK,EAAE,kBAAkB,CAAC;CAC7B;AAED,MAAM,WAAW,sBAAsB;IACnC,IAAI,OAAO,CAAC,kBAAkB,CAAC,GAAG,kBAAkB,CAAC;CACxD;AAED,MAAM,WAAW,eAAe;IAC5B,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC7B,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACxB"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
export declare class Server extends
|
|
1
|
+
import { Message, ResponseError, Server as _Server } from '../messenger/index.js';
|
|
2
|
+
import { ClusterAnalytics, ServerOptions } from './interfaces.js';
|
|
3
|
+
export declare class Server extends _Server {
|
|
4
4
|
private clusterAnalytics;
|
|
5
|
-
constructor(opts:
|
|
5
|
+
constructor(opts: ServerOptions);
|
|
6
6
|
start(): Promise<void>;
|
|
7
|
-
sendExecutionPause(exId: string): Promise<
|
|
8
|
-
sendExecutionResume(exId: string): Promise<
|
|
9
|
-
sendExecutionAnalyticsRequest(exId: string): Promise<
|
|
10
|
-
getClusterAnalytics():
|
|
11
|
-
onExecutionFinished(fn: (clientId: string, error?:
|
|
7
|
+
sendExecutionPause(exId: string): Promise<Message | null>;
|
|
8
|
+
sendExecutionResume(exId: string): Promise<Message | null>;
|
|
9
|
+
sendExecutionAnalyticsRequest(exId: string): Promise<Message | null>;
|
|
10
|
+
getClusterAnalytics(): ClusterAnalytics;
|
|
11
|
+
onExecutionFinished(fn: (clientId: string, error?: ResponseError) => void): void;
|
|
12
12
|
private onConnection;
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAA6B,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE7F,qBAAa,MAAO,SAAQ,OAAO;IAC/B,OAAO,CAAC,gBAAgB,CAAmB;gBAE/B,IAAI,EAAE,aAAa;IAuCzB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5B,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAIzD,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAI1D,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAIpE,mBAAmB,IAAI,gBAAgB;IAIvC,mBAAmB,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,aAAa,KAAK,IAAI,GAAG,IAAI;IAMhF,OAAO,CAAC,YAAY;CAmCvB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import
|
|
3
|
-
export class Server extends
|
|
1
|
+
import { cloneDeep, isKey, isNumber } from '@terascope/utils';
|
|
2
|
+
import { Server as _Server } from '../messenger/index.js';
|
|
3
|
+
export class Server extends _Server {
|
|
4
4
|
clusterAnalytics;
|
|
5
5
|
constructor(opts) {
|
|
6
6
|
const { port, actionTimeout, networkLatencyBuffer, nodeDisconnectTimeout, requestListener, serverTimeout, logger, } = opts;
|
|
@@ -62,19 +62,20 @@ export class Server extends core.Server {
|
|
|
62
62
|
});
|
|
63
63
|
this.handleResponse(socket, 'cluster:analytics', (msg) => {
|
|
64
64
|
const data = msg.payload;
|
|
65
|
-
if (!this.clusterAnalytics
|
|
65
|
+
if (!(data.kind in this.clusterAnalytics)) {
|
|
66
66
|
return;
|
|
67
67
|
}
|
|
68
|
+
const current = this.clusterAnalytics[data.kind];
|
|
68
69
|
for (const [field, value] of Object.entries(data.stats)) {
|
|
69
|
-
if (
|
|
70
|
-
|
|
70
|
+
if (isKey(current, field)) {
|
|
71
|
+
current[field] += value;
|
|
71
72
|
}
|
|
72
73
|
}
|
|
73
74
|
this.emit('cluster:analytics', {
|
|
74
75
|
scope: exId,
|
|
75
76
|
payload: {
|
|
76
77
|
diff: data.stats,
|
|
77
|
-
current
|
|
78
|
+
current,
|
|
78
79
|
},
|
|
79
80
|
});
|
|
80
81
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@terascope/teraslice-messaging",
|
|
3
3
|
"displayName": "Teraslice Messaging",
|
|
4
|
-
"version": "1.6.
|
|
4
|
+
"version": "1.6.2",
|
|
5
5
|
"description": "An internal teraslice messaging library using socket.io",
|
|
6
6
|
"homepage": "https://github.com/terascope/teraslice/tree/master/packages/teraslice-messaging#readme",
|
|
7
7
|
"bugs": {
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@terascope/types": "^1.2.0",
|
|
39
|
-
"@terascope/utils": "^1.3.
|
|
39
|
+
"@terascope/utils": "^1.3.2",
|
|
40
40
|
"ms": "^2.1.3",
|
|
41
41
|
"nanoid": "^5.0.7",
|
|
42
42
|
"p-event": "^6.0.1",
|