@terascope/teraslice-messaging 0.42.1 → 1.0.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/cluster-master/client.d.ts +2 -2
- package/dist/src/cluster-master/client.d.ts.map +1 -1
- package/dist/src/cluster-master/client.js +7 -33
- package/dist/src/cluster-master/client.js.map +1 -1
- package/dist/src/cluster-master/index.d.ts +3 -3
- package/dist/src/cluster-master/index.d.ts.map +1 -1
- package/dist/src/cluster-master/index.js +3 -19
- package/dist/src/cluster-master/index.js.map +1 -1
- 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/interfaces.js +1 -2
- package/dist/src/cluster-master/server.d.ts +2 -2
- package/dist/src/cluster-master/server.d.ts.map +1 -1
- package/dist/src/cluster-master/server.js +6 -32
- package/dist/src/cluster-master/server.js.map +1 -1
- package/dist/src/execution-controller/client.d.ts +2 -2
- package/dist/src/execution-controller/client.d.ts.map +1 -1
- package/dist/src/execution-controller/client.js +8 -34
- package/dist/src/execution-controller/client.js.map +1 -1
- package/dist/src/execution-controller/index.d.ts +3 -3
- package/dist/src/execution-controller/index.d.ts.map +1 -1
- package/dist/src/execution-controller/index.js +3 -19
- package/dist/src/execution-controller/index.js.map +1 -1
- package/dist/src/execution-controller/interfaces.js +1 -2
- package/dist/src/execution-controller/server.d.ts +2 -2
- package/dist/src/execution-controller/server.d.ts.map +1 -1
- package/dist/src/execution-controller/server.js +8 -33
- package/dist/src/execution-controller/server.js.map +1 -1
- package/dist/src/index.d.ts +4 -4
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +5 -36
- package/dist/src/index.js.map +1 -1
- package/dist/src/messenger/client.d.ts +2 -2
- package/dist/src/messenger/client.d.ts.map +1 -1
- package/dist/src/messenger/client.js +27 -48
- package/dist/src/messenger/client.js.map +1 -1
- package/dist/src/messenger/core.d.ts +2 -2
- package/dist/src/messenger/core.d.ts.map +1 -1
- package/dist/src/messenger/core.js +15 -19
- package/dist/src/messenger/core.js.map +1 -1
- package/dist/src/messenger/index.d.ts +4 -4
- package/dist/src/messenger/index.d.ts.map +1 -1
- package/dist/src/messenger/index.js +4 -20
- package/dist/src/messenger/index.js.map +1 -1
- package/dist/src/messenger/interfaces.d.ts +1 -1
- package/dist/src/messenger/interfaces.d.ts.map +1 -1
- package/dist/src/messenger/interfaces.js +3 -6
- package/dist/src/messenger/interfaces.js.map +1 -1
- package/dist/src/messenger/server.d.ts +3 -3
- package/dist/src/messenger/server.d.ts.map +1 -1
- package/dist/src/messenger/server.js +29 -51
- package/dist/src/messenger/server.js.map +1 -1
- package/dist/src/utils/index.js +9 -17
- package/dist/src/utils/index.js.map +1 -1
- package/package.json +5 -4
|
@@ -1,40 +1,20 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.Client = void 0;
|
|
30
|
-
const ms_1 = __importDefault(require("ms"));
|
|
31
|
-
const socket_io_client_1 = __importDefault(require("socket.io-client"));
|
|
32
|
-
const utils_1 = require("@terascope/utils");
|
|
33
|
-
const i = __importStar(require("./interfaces"));
|
|
34
|
-
const core_1 = require("./core");
|
|
35
|
-
const utils_2 = require("../utils");
|
|
36
|
-
const _logger = (0, utils_1.debugLogger)('teraslice-messaging:client');
|
|
37
|
-
class Client extends core_1.Core {
|
|
1
|
+
import ms from 'ms';
|
|
2
|
+
import SocketIOClient from 'socket.io-client';
|
|
3
|
+
import { isString, isInteger, debugLogger, toString } from '@terascope/utils';
|
|
4
|
+
import * as i from './interfaces.js';
|
|
5
|
+
import { Core } from './core.js';
|
|
6
|
+
import { newMsgId } from '../utils/index.js';
|
|
7
|
+
const _logger = debugLogger('teraslice-messaging:client');
|
|
8
|
+
export class Client extends Core {
|
|
9
|
+
socket;
|
|
10
|
+
clientId;
|
|
11
|
+
clientType;
|
|
12
|
+
serverName;
|
|
13
|
+
connectTimeout;
|
|
14
|
+
hostUrl;
|
|
15
|
+
available;
|
|
16
|
+
ready;
|
|
17
|
+
serverShutdown;
|
|
38
18
|
constructor(opts, _connectTimeout) {
|
|
39
19
|
const { hostUrl, clientId, clientType, serverName, socketOptions = {}, connectTimeout, clientDisconnectTimeout, logger, ...coreOpts } = opts;
|
|
40
20
|
super({
|
|
@@ -45,19 +25,19 @@ class Client extends core_1.Core {
|
|
|
45
25
|
: _logger,
|
|
46
26
|
...coreOpts,
|
|
47
27
|
});
|
|
48
|
-
if (!
|
|
28
|
+
if (!isString(hostUrl)) {
|
|
49
29
|
throw new Error('Messenger.Client requires a valid hostUrl');
|
|
50
30
|
}
|
|
51
|
-
if (!
|
|
31
|
+
if (!isString(clientId)) {
|
|
52
32
|
throw new Error('Messenger.Client requires a valid clientId');
|
|
53
33
|
}
|
|
54
|
-
if (!
|
|
34
|
+
if (!isString(clientType)) {
|
|
55
35
|
throw new Error('Messenger.Client requires a valid clientType');
|
|
56
36
|
}
|
|
57
|
-
if (!
|
|
37
|
+
if (!isString(serverName)) {
|
|
58
38
|
throw new Error('Messenger.Client requires a valid serverName');
|
|
59
39
|
}
|
|
60
|
-
if (!
|
|
40
|
+
if (!isInteger(connectTimeout)) {
|
|
61
41
|
throw new Error('Messenger.Client requires a valid connectTimeout');
|
|
62
42
|
}
|
|
63
43
|
// The pingTimeout should be the client disconnect timeout
|
|
@@ -75,7 +55,7 @@ class Client extends core_1.Core {
|
|
|
75
55
|
query: { clientId, clientType },
|
|
76
56
|
timeout: _connectTimeout
|
|
77
57
|
});
|
|
78
|
-
this.socket = (
|
|
58
|
+
this.socket = SocketIOClient(hostUrl, options);
|
|
79
59
|
this.socket.on('error', (err) => {
|
|
80
60
|
this.logger.error(err, 'unhandled socket.io-client error');
|
|
81
61
|
});
|
|
@@ -170,7 +150,7 @@ class Client extends core_1.Core {
|
|
|
170
150
|
let timer;
|
|
171
151
|
let cleanup;
|
|
172
152
|
const onError = (err) => {
|
|
173
|
-
const errStr =
|
|
153
|
+
const errStr = toString(err).replace('Error: ', '');
|
|
174
154
|
if (errStr.includes('xhr poll error')) {
|
|
175
155
|
// it still connecting so this is probably okay
|
|
176
156
|
this.logger.debug(`${errStr} when connecting to ${connectToStr}`);
|
|
@@ -180,7 +160,7 @@ class Client extends core_1.Core {
|
|
|
180
160
|
}
|
|
181
161
|
};
|
|
182
162
|
const onTimeoutError = (timeout) => {
|
|
183
|
-
this.logger.debug(`timeout of ${(
|
|
163
|
+
this.logger.debug(`timeout of ${ms(timeout)} when connecting to ${connectToStr}, reconnecting...`);
|
|
184
164
|
cleanup();
|
|
185
165
|
resolve();
|
|
186
166
|
};
|
|
@@ -202,7 +182,7 @@ class Client extends core_1.Core {
|
|
|
202
182
|
if (this.socket.connected)
|
|
203
183
|
return;
|
|
204
184
|
cleanup();
|
|
205
|
-
reject(new Error(`Unable to connect to ${connectToStr} after ${(
|
|
185
|
+
reject(new Error(`Unable to connect to ${connectToStr} after ${ms(this.connectTimeout)}`));
|
|
206
186
|
}, remainingTimeout);
|
|
207
187
|
});
|
|
208
188
|
const elapsed = Date.now() - startTime;
|
|
@@ -235,7 +215,7 @@ class Client extends core_1.Core {
|
|
|
235
215
|
const response = options.response != null ? options.response : true;
|
|
236
216
|
const respondBy = Date.now() + this.getTimeout(options.timeout);
|
|
237
217
|
const message = {
|
|
238
|
-
id: await
|
|
218
|
+
id: await newMsgId(),
|
|
239
219
|
eventName,
|
|
240
220
|
from: this.clientId,
|
|
241
221
|
to: this.serverName,
|
|
@@ -285,5 +265,4 @@ class Client extends core_1.Core {
|
|
|
285
265
|
});
|
|
286
266
|
}
|
|
287
267
|
}
|
|
288
|
-
exports.Client = Client;
|
|
289
268
|
//# sourceMappingURL=client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/messenger/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/messenger/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { EventEmitter } from 'events';
|
|
2
|
+
import { EventEmitter } from 'node:events';
|
|
3
3
|
import { Logger } from '@terascope/utils';
|
|
4
|
-
import * as i from './interfaces';
|
|
4
|
+
import * as i from './interfaces.js';
|
|
5
5
|
export declare class Core extends EventEmitter {
|
|
6
6
|
closed: boolean;
|
|
7
7
|
protected networkLatencyBuffer: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/messenger/core.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"core.d.ts","sourceRoot":"","sources":["../../../src/messenger/core.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAC+B,MAAM,EAC3C,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,qBAAa,IAAK,SAAQ,YAAY;IAC3B,MAAM,UAAS;IAEtB,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvC,SAAS,CAAC,aAAa,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;gBAEb,IAAI,EAAE,CAAC,CAAC,WAAW;IAoB/B,KAAK,IAAI,IAAI;cAKG,kBAAkB,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;IAqB9E,SAAS,CAAC,cAAc,CACpB,MAAM,EAAE,CAAC,CAAC,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,cAAc,GACjE,IAAI;IAqCP,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO;IAKnC,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAc9E,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAK7C,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAKpC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,YAAY,GAAG,IAAI;IAO5C,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;CAY3E"}
|
|
@@ -1,25 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const _logger = (0, utils_1.debugLogger)('teraslice-messaging:core');
|
|
12
|
-
class Core extends events_1.EventEmitter {
|
|
1
|
+
import ms from 'ms';
|
|
2
|
+
import pEvent from 'p-event';
|
|
3
|
+
import { EventEmitter } from 'node:events';
|
|
4
|
+
import { toString, isInteger, debugLogger } from '@terascope/utils';
|
|
5
|
+
const _logger = debugLogger('teraslice-messaging:core');
|
|
6
|
+
export class Core extends EventEmitter {
|
|
7
|
+
closed = false;
|
|
8
|
+
networkLatencyBuffer;
|
|
9
|
+
actionTimeout;
|
|
10
|
+
logger;
|
|
13
11
|
constructor(opts) {
|
|
14
12
|
super();
|
|
15
|
-
this.closed = false;
|
|
16
13
|
this.logger = opts.logger || _logger;
|
|
17
14
|
this.networkLatencyBuffer = opts.networkLatencyBuffer || 0;
|
|
18
15
|
this.actionTimeout = opts.actionTimeout;
|
|
19
|
-
if (!
|
|
16
|
+
if (!isInteger(this.actionTimeout) || !this.actionTimeout) {
|
|
20
17
|
throw new Error('Messenger requires a valid actionTimeout');
|
|
21
18
|
}
|
|
22
|
-
if (!
|
|
19
|
+
if (!isInteger(this.networkLatencyBuffer)) {
|
|
23
20
|
throw new Error('Messenger requires a valid networkLatencyBuffer');
|
|
24
21
|
}
|
|
25
22
|
this.on('error', (err) => {
|
|
@@ -40,7 +37,7 @@ class Core extends events_1.EventEmitter {
|
|
|
40
37
|
if (sent.volatile || this.closed) {
|
|
41
38
|
return null;
|
|
42
39
|
}
|
|
43
|
-
throw new Error(`Timed out after ${(
|
|
40
|
+
throw new Error(`Timed out after ${ms(remaining)}, waiting for message "${sent.eventName}"`);
|
|
44
41
|
}
|
|
45
42
|
if (response.error) {
|
|
46
43
|
throw new Error(`${sent.eventName} Message Response Failure: ${response.error}`);
|
|
@@ -62,7 +59,7 @@ class Core extends events_1.EventEmitter {
|
|
|
62
59
|
}
|
|
63
60
|
}
|
|
64
61
|
catch (err) {
|
|
65
|
-
message.error =
|
|
62
|
+
message.error = toString(err);
|
|
66
63
|
}
|
|
67
64
|
if (!msg.response) {
|
|
68
65
|
return;
|
|
@@ -113,7 +110,7 @@ class Core extends events_1.EventEmitter {
|
|
|
113
110
|
async onceWithTimeout(eventName, timeout) {
|
|
114
111
|
const timeoutMs = this.getTimeout(timeout);
|
|
115
112
|
try {
|
|
116
|
-
const { payload } = (await (
|
|
113
|
+
const { payload } = (await pEvent(this, eventName, {
|
|
117
114
|
rejectionEvents: [],
|
|
118
115
|
timeout: timeoutMs,
|
|
119
116
|
}));
|
|
@@ -124,5 +121,4 @@ class Core extends events_1.EventEmitter {
|
|
|
124
121
|
}
|
|
125
122
|
}
|
|
126
123
|
}
|
|
127
|
-
exports.Core = Core;
|
|
128
124
|
//# sourceMappingURL=core.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/messenger/core.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/messenger/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export * from './client';
|
|
2
|
-
export * from './core';
|
|
3
|
-
export * from './interfaces';
|
|
4
|
-
export * from './server';
|
|
1
|
+
export * from './client.js';
|
|
2
|
+
export * from './core.js';
|
|
3
|
+
export * from './interfaces.js';
|
|
4
|
+
export * from './server.js';
|
|
5
5
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/messenger/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/messenger/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC"}
|
|
@@ -1,21 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./client"), exports);
|
|
18
|
-
__exportStar(require("./core"), exports);
|
|
19
|
-
__exportStar(require("./interfaces"), exports);
|
|
20
|
-
__exportStar(require("./server"), exports);
|
|
1
|
+
export * from './client.js';
|
|
2
|
+
export * from './core.js';
|
|
3
|
+
export * from './interfaces.js';
|
|
4
|
+
export * from './server.js';
|
|
21
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/messenger/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/messenger/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/messenger/interfaces.ts"],"names":[],"mappings":";AAAA,OAAO,kBAAkB,CAAC;AAC1B,OAAO,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/messenger/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.ClientState = void 0;
|
|
4
|
-
require("socket.io-client");
|
|
5
|
-
var ClientState;
|
|
1
|
+
import 'socket.io-client';
|
|
2
|
+
export var ClientState;
|
|
6
3
|
(function (ClientState) {
|
|
7
4
|
ClientState["Online"] = "online";
|
|
8
5
|
ClientState["Disconnected"] = "disconnected";
|
|
9
6
|
ClientState["Available"] = "available";
|
|
10
7
|
ClientState["Unavailable"] = "unavailable";
|
|
11
8
|
ClientState["Shutdown"] = "shutdown";
|
|
12
|
-
})(ClientState || (
|
|
9
|
+
})(ClientState || (ClientState = {}));
|
|
13
10
|
//# sourceMappingURL=interfaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/messenger/interfaces.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../src/messenger/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAwE1B,MAAM,CAAN,IAAY,WAMX;AAND,WAAY,WAAW;IACnB,gCAAiB,CAAA;IACjB,4CAA6B,CAAA;IAC7B,sCAAuB,CAAA;IACvB,0CAA2B,CAAA;IAC3B,oCAAqB,CAAA;AACzB,CAAC,EANW,WAAW,KAAX,WAAW,QAMtB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/// <reference types="socket.io" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import http from 'http';
|
|
4
|
-
import * as i from './interfaces';
|
|
5
|
-
import { Core } from './core';
|
|
3
|
+
import http from 'node:http';
|
|
4
|
+
import * as i from './interfaces.js';
|
|
5
|
+
import { Core } from './core.js';
|
|
6
6
|
export declare class Server extends Core {
|
|
7
7
|
isShuttingDown: boolean;
|
|
8
8
|
readonly port: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/messenger/server.ts"],"names":[],"mappings":";;AAAA,OAAO,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/messenger/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,44 +1,23 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.Server = void 0;
|
|
30
|
-
const http_1 = __importDefault(require("http"));
|
|
31
|
-
const porty_1 = __importDefault(require("porty"));
|
|
32
|
-
const socket_io_1 = __importDefault(require("socket.io"));
|
|
33
|
-
const utils_1 = require("@terascope/utils");
|
|
34
|
-
const utils_2 = require("../utils");
|
|
35
|
-
const i = __importStar(require("./interfaces"));
|
|
36
|
-
const core_1 = require("./core");
|
|
37
|
-
const _logger = (0, utils_1.debugLogger)('teraslice-messaging:server');
|
|
1
|
+
import http from 'node:http';
|
|
2
|
+
import porty from 'porty';
|
|
3
|
+
import SocketIOServer from 'socket.io';
|
|
4
|
+
import { get, isTest, isString, isNumber, debugLogger, pDelay, pRetry, } from '@terascope/utils';
|
|
5
|
+
import { newMsgId } from '../utils/index.js';
|
|
6
|
+
import * as i from './interfaces.js';
|
|
7
|
+
import { Core } from './core.js';
|
|
8
|
+
const _logger = debugLogger('teraslice-messaging:server');
|
|
38
9
|
const disconnectedStates = [i.ClientState.Disconnected, i.ClientState.Shutdown];
|
|
39
10
|
const unavailableStates = [i.ClientState.Unavailable, ...disconnectedStates];
|
|
40
11
|
const onlineStates = [i.ClientState.Online, i.ClientState.Available, i.ClientState.Unavailable];
|
|
41
|
-
class Server extends
|
|
12
|
+
export class Server extends Core {
|
|
13
|
+
isShuttingDown;
|
|
14
|
+
port;
|
|
15
|
+
server;
|
|
16
|
+
httpServer;
|
|
17
|
+
serverName;
|
|
18
|
+
clientDisconnectTimeout;
|
|
19
|
+
_cleanupClients;
|
|
20
|
+
_clients;
|
|
42
21
|
constructor(opts) {
|
|
43
22
|
const { port, serverName, serverTimeout, clientDisconnectTimeout, requestListener = defaultRequestListener, logger = _logger, ...coreOpts } = opts;
|
|
44
23
|
super({
|
|
@@ -49,13 +28,13 @@ class Server extends core_1.Core {
|
|
|
49
28
|
: _logger,
|
|
50
29
|
...coreOpts,
|
|
51
30
|
});
|
|
52
|
-
if (!
|
|
31
|
+
if (!isNumber(port)) {
|
|
53
32
|
throw new Error('Messenger.Server requires a valid port');
|
|
54
33
|
}
|
|
55
|
-
if (!
|
|
34
|
+
if (!isString(serverName)) {
|
|
56
35
|
throw new Error('Messenger.Server requires a valid serverName');
|
|
57
36
|
}
|
|
58
|
-
if (!
|
|
37
|
+
if (!isNumber(clientDisconnectTimeout)) {
|
|
59
38
|
throw new Error('Messenger.Server requires a valid clientDisconnectTimeout');
|
|
60
39
|
}
|
|
61
40
|
this.port = port;
|
|
@@ -63,7 +42,7 @@ class Server extends core_1.Core {
|
|
|
63
42
|
this.clientDisconnectTimeout = clientDisconnectTimeout;
|
|
64
43
|
const pingTimeout = this.actionTimeout;
|
|
65
44
|
const pingInterval = this.actionTimeout + this.networkLatencyBuffer;
|
|
66
|
-
this.server = (
|
|
45
|
+
this.server = SocketIOServer({
|
|
67
46
|
pingTimeout,
|
|
68
47
|
pingInterval,
|
|
69
48
|
perMessageDeflate: false,
|
|
@@ -72,7 +51,7 @@ class Server extends core_1.Core {
|
|
|
72
51
|
this.server.on('error', (err) => {
|
|
73
52
|
this.logger.error(err, 'unhandled socket.io error');
|
|
74
53
|
});
|
|
75
|
-
this.httpServer =
|
|
54
|
+
this.httpServer = http.createServer(requestListener);
|
|
76
55
|
if (serverTimeout) {
|
|
77
56
|
this.httpServer.timeout = serverTimeout;
|
|
78
57
|
}
|
|
@@ -81,13 +60,13 @@ class Server extends core_1.Core {
|
|
|
81
60
|
this._onConnection = this._onConnection.bind(this);
|
|
82
61
|
}
|
|
83
62
|
async listen() {
|
|
84
|
-
await
|
|
85
|
-
const portAvailable = await
|
|
63
|
+
await pRetry(async () => {
|
|
64
|
+
const portAvailable = await porty.test(this.port);
|
|
86
65
|
if (!portAvailable) {
|
|
87
66
|
throw new Error(`Port ${this.port} is already in-use`);
|
|
88
67
|
}
|
|
89
68
|
}, {
|
|
90
|
-
retries:
|
|
69
|
+
retries: isTest ? 1 : 5,
|
|
91
70
|
endWithFatal: true,
|
|
92
71
|
logError: (err, ...args) => {
|
|
93
72
|
this.logger.warn(err, ...args);
|
|
@@ -120,7 +99,7 @@ class Server extends core_1.Core {
|
|
|
120
99
|
this.updateClientState(clientId, i.ClientState.Disconnected);
|
|
121
100
|
}
|
|
122
101
|
}
|
|
123
|
-
},
|
|
102
|
+
}, isTest ? 100 : 5000);
|
|
124
103
|
}
|
|
125
104
|
async shutdown() {
|
|
126
105
|
this.isShuttingDown = true;
|
|
@@ -133,7 +112,7 @@ class Server extends core_1.Core {
|
|
|
133
112
|
return;
|
|
134
113
|
}
|
|
135
114
|
this.server.volatile.emit('shutdown');
|
|
136
|
-
await
|
|
115
|
+
await pDelay(isTest ? 100 : 5000);
|
|
137
116
|
this.server.close();
|
|
138
117
|
this.httpServer.close();
|
|
139
118
|
this._clients = {};
|
|
@@ -199,7 +178,7 @@ class Server extends core_1.Core {
|
|
|
199
178
|
});
|
|
200
179
|
}
|
|
201
180
|
isClientReady(clientId) {
|
|
202
|
-
const clientState =
|
|
181
|
+
const clientState = get(this._clients, [clientId, 'state']);
|
|
203
182
|
return onlineStates.includes(clientState);
|
|
204
183
|
}
|
|
205
184
|
sendToAll(eventName, payload, options = { volatile: true, response: true }) {
|
|
@@ -223,7 +202,7 @@ class Server extends core_1.Core {
|
|
|
223
202
|
const response = options.response != null ? options.response : true;
|
|
224
203
|
const respondBy = Date.now() + this.getTimeout(options.timeout);
|
|
225
204
|
const message = {
|
|
226
|
-
id: await
|
|
205
|
+
id: await newMsgId(),
|
|
227
206
|
eventName,
|
|
228
207
|
from: this.serverName,
|
|
229
208
|
to: clientId,
|
|
@@ -345,7 +324,6 @@ class Server extends core_1.Core {
|
|
|
345
324
|
});
|
|
346
325
|
}
|
|
347
326
|
}
|
|
348
|
-
exports.Server = Server;
|
|
349
327
|
function defaultRequestListener(req, res) {
|
|
350
328
|
res.writeHead(501);
|
|
351
329
|
res.end('Not Implemented');
|