@terascope/teraslice-messaging 1.2.0 → 1.3.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/src/execution-controller/interfaces.d.ts +6 -0
- package/dist/src/execution-controller/interfaces.d.ts.map +1 -1
- package/dist/src/execution-controller/server.d.ts +1 -0
- package/dist/src/execution-controller/server.d.ts.map +1 -1
- package/dist/src/execution-controller/server.js +5 -2
- package/dist/src/execution-controller/server.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
/// <reference types="socket.io-client" />
|
|
2
|
+
/// <reference types="node" />
|
|
2
3
|
import { Logger } from '@terascope/utils';
|
|
4
|
+
import http from 'node:http';
|
|
3
5
|
export interface ClientOptions {
|
|
4
6
|
executionControllerUrl: string;
|
|
5
7
|
workerId: string;
|
|
@@ -15,8 +17,12 @@ export interface ServerOptions {
|
|
|
15
17
|
workerDisconnectTimeout: number;
|
|
16
18
|
networkLatencyBuffer?: number;
|
|
17
19
|
actionTimeout: number;
|
|
20
|
+
requestListener?: RequestListener;
|
|
18
21
|
logger?: Logger;
|
|
19
22
|
}
|
|
23
|
+
export interface RequestListener {
|
|
24
|
+
(request: http.IncomingMessage, response: http.ServerResponse): void;
|
|
25
|
+
}
|
|
20
26
|
export interface Worker {
|
|
21
27
|
workerId: string;
|
|
22
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/interfaces.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/interfaces.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,WAAW,aAAa;IAC1B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,cAAc,CAAC,WAAW,CAAC;IAC1C,uBAAuB,EAAE,MAAM,CAAC;IAChC,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,uBAAuB,EAAE,MAAM,CAAC;IAChC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAe;IAC5B,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;CACxE;AACD,MAAM,WAAW,MAAM;IACnB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC1B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,oBAAoB;IACjC,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AACD,MAAM,WAAW,gBAAgB;IAC7B,CAAC,KAAK,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IACxB,IAAI,OAAO,CAAC;CACf"}
|
|
@@ -5,6 +5,7 @@ import * as i from './interfaces.js';
|
|
|
5
5
|
export declare class Server extends core.Server {
|
|
6
6
|
private _activeWorkers;
|
|
7
7
|
queue: Queue<EnqueuedWorker>;
|
|
8
|
+
executionReady: boolean;
|
|
8
9
|
constructor(opts: i.ServerOptions);
|
|
9
10
|
start(): Promise<void>;
|
|
10
11
|
shutdown(): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAC9C,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,qBAAa,MAAO,SAAQ,IAAI,CAAC,MAAM;IACnC,OAAO,CAAC,cAAc,CAAkB;IACxC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAC9C,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,qBAAa,MAAO,SAAQ,IAAI,CAAC,MAAM;IACnC,OAAO,CAAC,cAAc,CAAkB;IACxC,KAAK,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAC7B,cAAc,EAAE,OAAO,CAAC;gBAEZ,IAAI,EAAE,CAAC,CAAC,aAAa;IAyB3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBtB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAU/B,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAKpC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAkCrE,cAAc,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,GAAG,IAAI;IAMnF,cAAc,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,GAAG,IAAI;IAMnF,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,GAAC,IAAI,CAAC,EAAE,CAAC;IAWxE,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,OAAO,CAAC,YAAY;IAoBpB,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,cAAc;IAkBtB,OAAO,CAAC,aAAa;CAOxB"}
|
|
@@ -4,21 +4,24 @@ const { Available, Unavailable } = core.ClientState;
|
|
|
4
4
|
export class Server extends core.Server {
|
|
5
5
|
_activeWorkers;
|
|
6
6
|
queue;
|
|
7
|
+
executionReady;
|
|
7
8
|
constructor(opts) {
|
|
8
|
-
const { port, actionTimeout, networkLatencyBuffer, workerDisconnectTimeout, logger } = opts;
|
|
9
|
+
const { port, actionTimeout, networkLatencyBuffer, workerDisconnectTimeout, logger, requestListener } = opts;
|
|
9
10
|
if (!isNumber(workerDisconnectTimeout)) {
|
|
10
11
|
throw new Error('ExecutionController.Server requires a valid workerDisconnectTimeout');
|
|
11
12
|
}
|
|
12
13
|
super({
|
|
13
14
|
port,
|
|
14
15
|
actionTimeout,
|
|
16
|
+
requestListener,
|
|
15
17
|
networkLatencyBuffer,
|
|
16
18
|
clientDisconnectTimeout: workerDisconnectTimeout,
|
|
17
19
|
serverName: 'ExecutionController',
|
|
18
|
-
logger
|
|
20
|
+
logger
|
|
19
21
|
});
|
|
20
22
|
this.queue = new Queue();
|
|
21
23
|
this._activeWorkers = {};
|
|
24
|
+
this.executionReady = false;
|
|
22
25
|
}
|
|
23
26
|
async start() {
|
|
24
27
|
this.on('connection', (msg) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/execution-controller/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAExD,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAG9C,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;AAEpD,MAAM,OAAO,MAAO,SAAQ,IAAI,CAAC,MAAM;IAC3B,cAAc,CAAkB;IACxC,KAAK,CAAwB;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/execution-controller/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.
|
|
4
|
+
"version": "1.3.0",
|
|
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": {
|