@terascope/teraslice-messaging 2.0.0-dev.1 → 2.0.0-dev.11
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.js +1 -1
- package/dist/src/cluster-master/client.js.map +1 -1
- package/dist/src/cluster-master/interfaces.d.ts +3 -2
- package/dist/src/cluster-master/interfaces.d.ts.map +1 -1
- package/dist/src/cluster-master/server.d.ts.map +1 -1
- package/dist/src/cluster-master/server.js +1 -1
- package/dist/src/cluster-master/server.js.map +1 -1
- package/dist/src/execution-controller/client.js +1 -1
- package/dist/src/execution-controller/client.js.map +1 -1
- package/dist/src/execution-controller/interfaces.d.ts +3 -2
- package/dist/src/execution-controller/interfaces.d.ts.map +1 -1
- package/dist/src/execution-controller/server.d.ts +1 -1
- package/dist/src/execution-controller/server.d.ts.map +1 -1
- package/dist/src/execution-controller/server.js +1 -1
- package/dist/src/execution-controller/server.js.map +1 -1
- package/dist/src/messenger/client.d.ts +2 -1
- package/dist/src/messenger/client.d.ts.map +1 -1
- package/dist/src/messenger/client.js +41 -29
- package/dist/src/messenger/client.js.map +1 -1
- package/dist/src/messenger/core.d.ts +1 -1
- package/dist/src/messenger/core.d.ts.map +1 -1
- package/dist/src/messenger/core.js +1 -1
- package/dist/src/messenger/core.js.map +1 -1
- package/dist/src/messenger/interfaces.d.ts +12 -3
- package/dist/src/messenger/interfaces.d.ts.map +1 -1
- package/dist/src/messenger/interfaces.js +0 -1
- package/dist/src/messenger/interfaces.js.map +1 -1
- package/dist/src/messenger/server.d.ts +4 -3
- package/dist/src/messenger/server.d.ts.map +1 -1
- package/dist/src/messenger/server.js +8 -6
- package/dist/src/messenger/server.js.map +1 -1
- package/package.json +6 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/cluster-master/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/cluster-master/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAG3D,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C,MAAM,OAAO,MAAO,SAAQ,IAAI,CAAC,MAAM;IACnB,IAAI,CAAS;IAE7B,YAAY,IAAqB;QAC7B,MAAM,EACF,gBAAgB,EAChB,aAAa,EACb,qBAAqB,EACrB,oBAAoB,EACpB,aAAa,EACb,IAAI,EACJ,cAAc,EACd,MAAM,EACT,GAAG,IAAI,CAAC;QAET,IAAI,CAAC,gBAAgB,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACnF,CAAC;QAED,KAAK,CAAC;YACF,aAAa;YACb,oBAAoB;YACpB,aAAa;YACb,cAAc;YACd,uBAAuB,EAAE,qBAAqB;YAC9C,OAAO,EAAE,gBAAgB;YACzB,UAAU,EAAE,sBAAsB;YAClC,QAAQ,EAAE,IAAI;YACd,UAAU,EAAE,eAAe;YAC3B,MAAM;SACT,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;IAED,oBAAoB,CAAC,KAAmC,EAAE,OAAgB;QACtE,OAAO,IAAI,CAAC,IAAI,CACZ,mBAAmB,EACnB;YACI,KAAK;YACL,IAAI,EAAE,aAAa;SACtB,EACD;YACI,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,IAAI;YACd,OAAO;SACV,CACJ,CAAC;IACN,CAAC;IAED,qBAAqB,CAAC,KAAc;QAChC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE;YAAE,OAAO;QAElC,OAAO,IAAI,CAAC,IAAI,CACZ,oBAAoB,EACpB,EAAE,KAAK,EAAE,EACT;YACI,QAAQ,EAAE,IAAI;SACjB,CACJ,CAAC;IACN,CAAC;IAED,oBAAoB,CAAC,EAAuB;QACxC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,gBAAgB,CAAC,EAAuB;QACpC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,iBAAiB,EAAE,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,iBAAiB,CAAC,EAAuB;QACrC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC;IAC7D,CAAC;CACJ"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
import { Logger } from '@terascope/utils';
|
|
1
|
+
import { Logger } from '@terascope/core-utils';
|
|
2
|
+
import { ManagerOptions, SocketOptions } from 'socket.io-client';
|
|
2
3
|
import { ExecutionAnalytics, AggregatedExecutionAnalytics } from '@terascope/types';
|
|
3
4
|
import { Message, RequestListener } from '../messenger/interfaces.js';
|
|
4
5
|
export interface ClientOptions {
|
|
5
6
|
exId: string;
|
|
6
7
|
clusterMasterUrl: string;
|
|
7
8
|
nodeDisconnectTimeout: number;
|
|
8
|
-
socketOptions?:
|
|
9
|
+
socketOptions?: Partial<ManagerOptions & SocketOptions>;
|
|
9
10
|
networkLatencyBuffer?: number;
|
|
10
11
|
actionTimeout: number;
|
|
11
12
|
connectTimeout: number;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,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,OAAO,CAAC,cAAc,GAAG,aAAa,CAAC,CAAC;IACxD,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"AAEA,OAAO,EACmB,OAAO,EAAE,aAAa,EACtB,MAAM,IAAI,OAAO,EAC1C,MAAM,uBAAuB,CAAC;AAC/B,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;IAW5B,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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/execution-controller/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/execution-controller/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ManagerOptions, SocketOptions } from 'socket.io-client';
|
|
2
|
+
import { Logger } from '@terascope/core-utils';
|
|
2
3
|
import http from 'node:http';
|
|
3
4
|
export interface ClientOptions {
|
|
4
5
|
executionControllerUrl: string;
|
|
5
6
|
workerId: string;
|
|
6
|
-
socketOptions:
|
|
7
|
+
socketOptions: Partial<ManagerOptions & SocketOptions>;
|
|
7
8
|
workerDisconnectTimeout: number;
|
|
8
9
|
networkLatencyBuffer?: number;
|
|
9
10
|
actionTimeout: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,WAAW,aAAa;IAC1B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC,cAAc,GAAG,aAAa,CAAC,CAAC;IACvD,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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE/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;IAyBtB,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,GAAG,IAAI,CAAC,EAAE,CAAC;IAW1E,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,eAAe,IAAI,MAAM,CAE5B;IAED,OAAO,CAAC,YAAY;IAuBpB,OAAO,CAAC,cAAc;IActB,OAAO,CAAC,cAAc;IAkBtB,OAAO,CAAC,aAAa;CAOxB"}
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/execution-controller/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { Socket } from 'socket.io-client';
|
|
1
2
|
import * as i from './interfaces.js';
|
|
2
3
|
import { Core } from './core.js';
|
|
3
4
|
export declare class Client extends Core {
|
|
4
|
-
readonly socket:
|
|
5
|
+
readonly socket: Socket<i.ServerToClientEvents, i.ClientToServerEvents>;
|
|
5
6
|
readonly clientId: string;
|
|
6
7
|
readonly clientType: string;
|
|
7
8
|
readonly serverName: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/messenger/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/messenger/client.ts"],"names":[],"mappings":"AAGA,OAAO,EAEH,MAAM,EACT,MAAM,kBAAkB,CAAC;AAI1B,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAKjC,qBAAa,MAAO,SAAQ,IAAI;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,oBAAoB,CAAC,CAAC;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC;gBAGtB,IAAI,EAAE,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,MAAM;IAwE3D,gBAAgB,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI;IAchC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAwEhB,QAAQ;IA6DhB,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;IASzE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;cASjE,IAAI,CAChB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,CAAC,CAAC,OAAY,EACvB,OAAO,GAAE,CAAC,CAAC,WAAgC,GAC5C,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;IA8B5B,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,GAAE,CAAC,CAAC,kBAAoC,GAAG,IAAI;IAK1E,aAAa,IAAI,OAAO;IAIlB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B/B,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;CAQlC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* eslint-disable prefer-const */
|
|
2
2
|
import ms from 'ms';
|
|
3
|
-
import SocketIOClient from 'socket.io-client';
|
|
4
|
-
import { isString, isInteger, debugLogger, toString } from '@terascope/utils';
|
|
3
|
+
import { io as SocketIOClient } from 'socket.io-client';
|
|
4
|
+
import { isString, isInteger, debugLogger, toString } from '@terascope/core-utils';
|
|
5
5
|
import * as i from './interfaces.js';
|
|
6
6
|
import { Core } from './core.js';
|
|
7
7
|
import { newMsgId } from '../utils/index.js';
|
|
@@ -16,6 +16,7 @@ export class Client extends Core {
|
|
|
16
16
|
available;
|
|
17
17
|
ready;
|
|
18
18
|
serverShutdown;
|
|
19
|
+
// _connectTimeout overrides the default socketIO client connect timeout, used for testing only
|
|
19
20
|
constructor(opts, _connectTimeout) {
|
|
20
21
|
const { hostUrl, clientId, clientType, serverName, socketOptions = {}, connectTimeout, clientDisconnectTimeout, logger, ...coreOpts } = opts;
|
|
21
22
|
super({
|
|
@@ -41,24 +42,24 @@ export class Client extends Core {
|
|
|
41
42
|
if (!isInteger(connectTimeout)) {
|
|
42
43
|
throw new Error('Messenger.Client requires a valid connectTimeout');
|
|
43
44
|
}
|
|
44
|
-
// The pingTimeout should be the client disconnect timeout
|
|
45
|
-
// (which is greater than the pingTimeout on the server which uses actionTimeout)
|
|
46
|
-
// to avoid disconnecting from the server before the connection
|
|
47
|
-
// is considered
|
|
48
|
-
const pingTimeout = clientDisconnectTimeout;
|
|
49
|
-
const pingInterval = clientDisconnectTimeout + this.networkLatencyBuffer;
|
|
50
45
|
const options = Object.assign({}, socketOptions, {
|
|
51
46
|
autoConnect: false,
|
|
52
47
|
forceNew: true,
|
|
53
|
-
pingTimeout,
|
|
54
|
-
pingInterval,
|
|
55
48
|
perMessageDeflate: false,
|
|
56
|
-
|
|
49
|
+
auth: { clientId, clientType },
|
|
57
50
|
timeout: _connectTimeout
|
|
58
51
|
});
|
|
59
52
|
this.socket = SocketIOClient(hostUrl, options);
|
|
60
|
-
this.socket.on('error', (err) => {
|
|
61
|
-
this.
|
|
53
|
+
this.socket.io.on('error', (err) => {
|
|
54
|
+
if (this.ready) {
|
|
55
|
+
this.logger.error(err, 'unhandled socket.io-client error');
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
// If this.ready === false then the error is connection related. Two events are
|
|
59
|
+
// now emitted, the more specific error events are already listened for, so this
|
|
60
|
+
// generic error can be logged as a trace.
|
|
61
|
+
this.logger.trace(err.message, 'socket io-client generic error. This should coincide with an underlying connect_error');
|
|
62
|
+
}
|
|
62
63
|
});
|
|
63
64
|
this.hostUrl = hostUrl;
|
|
64
65
|
this.connectTimeout = connectTimeout;
|
|
@@ -88,11 +89,21 @@ export class Client extends Core {
|
|
|
88
89
|
return;
|
|
89
90
|
}
|
|
90
91
|
await this._connect(this.connectTimeout);
|
|
91
|
-
this.socket.on('
|
|
92
|
-
this.logger.
|
|
92
|
+
this.socket.io.on('reconnect_attempt', () => {
|
|
93
|
+
this.logger.info(`client ${this.clientId} is reconnecting...`);
|
|
94
|
+
this.ready = false;
|
|
95
|
+
});
|
|
96
|
+
this.socket.io.on('reconnect_error', () => {
|
|
97
|
+
this.logger.debug(`client ${this.clientId} reconnect error, will retry`);
|
|
98
|
+
this.ready = false;
|
|
99
|
+
});
|
|
100
|
+
// this will only trigger if we set the 'reconnectionAttempts'
|
|
101
|
+
// socketIOClient option - defaults to 'infinity'
|
|
102
|
+
this.socket.io.on('reconnect_failed', () => {
|
|
103
|
+
this.logger.warn(`client ${this.clientId} failed to reconnect`);
|
|
93
104
|
this.ready = false;
|
|
94
105
|
});
|
|
95
|
-
this.socket.on('reconnect', () => {
|
|
106
|
+
this.socket.io.on('reconnect', () => {
|
|
96
107
|
this.logger.info(`client ${this.clientId} reconnected`);
|
|
97
108
|
this.serverShutdown = false;
|
|
98
109
|
this.ready = true;
|
|
@@ -113,7 +124,7 @@ export class Client extends Core {
|
|
|
113
124
|
this.ready = false;
|
|
114
125
|
});
|
|
115
126
|
this.socket.on('shutdown', () => {
|
|
116
|
-
this.logger.
|
|
127
|
+
this.logger.info(`server ${this.serverName} shutdown`);
|
|
117
128
|
this.ready = false;
|
|
118
129
|
this.serverShutdown = true;
|
|
119
130
|
this.emit('server:shutdown');
|
|
@@ -131,7 +142,7 @@ export class Client extends Core {
|
|
|
131
142
|
});
|
|
132
143
|
this.ready = true;
|
|
133
144
|
this.emit('ready');
|
|
134
|
-
this.logger.
|
|
145
|
+
this.logger.info(`client ${this.clientId} connect`);
|
|
135
146
|
}
|
|
136
147
|
async _connect(remainingTimeout, attempt = 1) {
|
|
137
148
|
const connectToStr = `${this.serverName} at ${this.hostUrl}`;
|
|
@@ -152,7 +163,13 @@ export class Client extends Core {
|
|
|
152
163
|
let cleanup;
|
|
153
164
|
const onError = (err) => {
|
|
154
165
|
const errStr = toString(err).replace('Error: ', '');
|
|
155
|
-
|
|
166
|
+
// connect_timeout event replaced by connect_error event with timeout message
|
|
167
|
+
if (errStr.includes('timeout')) {
|
|
168
|
+
this.logger.info(`timeout when connecting to ${connectToStr}, reconnecting...`);
|
|
169
|
+
cleanup();
|
|
170
|
+
resolve();
|
|
171
|
+
}
|
|
172
|
+
else if (errStr.includes('xhr poll error')) {
|
|
156
173
|
// it still connecting so this is probably okay
|
|
157
174
|
this.logger.debug(`${errStr} when connecting to ${connectToStr}`);
|
|
158
175
|
}
|
|
@@ -160,15 +177,9 @@ export class Client extends Core {
|
|
|
160
177
|
this.logger.warn(`${errStr} when connecting to ${connectToStr}`);
|
|
161
178
|
}
|
|
162
179
|
};
|
|
163
|
-
const onTimeoutError = (timeout) => {
|
|
164
|
-
this.logger.debug(`timeout of ${ms(timeout)} when connecting to ${connectToStr}, reconnecting...`);
|
|
165
|
-
cleanup();
|
|
166
|
-
resolve();
|
|
167
|
-
};
|
|
168
180
|
cleanup = () => {
|
|
169
181
|
clearTimeout(timer);
|
|
170
182
|
this.socket.removeListener('connect_error', onError);
|
|
171
|
-
this.socket.removeListener('connect_timeout', onTimeoutError);
|
|
172
183
|
this.socket.removeListener('connect', onConnect);
|
|
173
184
|
};
|
|
174
185
|
function onConnect() {
|
|
@@ -176,7 +187,6 @@ export class Client extends Core {
|
|
|
176
187
|
resolve();
|
|
177
188
|
}
|
|
178
189
|
this.socket.on('connect_error', onError);
|
|
179
|
-
this.socket.once('connect_timeout', onTimeoutError);
|
|
180
190
|
this.socket.once('connect', onConnect);
|
|
181
191
|
this.socket.connect();
|
|
182
192
|
timer = setTimeout(() => {
|
|
@@ -187,7 +197,8 @@ export class Client extends Core {
|
|
|
187
197
|
}, remainingTimeout);
|
|
188
198
|
});
|
|
189
199
|
const elapsed = Date.now() - startTime;
|
|
190
|
-
|
|
200
|
+
const remaining = remainingTimeout - elapsed;
|
|
201
|
+
return this._connect(remaining, attempt + 1);
|
|
191
202
|
}
|
|
192
203
|
async sendAvailable(payload) {
|
|
193
204
|
if (this.available)
|
|
@@ -210,8 +221,10 @@ export class Client extends Core {
|
|
|
210
221
|
return null;
|
|
211
222
|
if (!this.ready && !options.volatile) {
|
|
212
223
|
const connected = this.socket.connected ? 'connected' : 'not-connected';
|
|
213
|
-
this.logger.
|
|
224
|
+
this.logger.info(`server is not ready and ${connected}, waiting for the ready event before sending ${eventName} message`);
|
|
214
225
|
await this.onceWithTimeout(`ready:${this.serverName}`);
|
|
226
|
+
// TODO: In the case where the timeout is reached, should we really continue with
|
|
227
|
+
// sending the message to a server that is not ready?
|
|
215
228
|
}
|
|
216
229
|
const response = options.response != null ? options.response : true;
|
|
217
230
|
const respondBy = Date.now() + this.getTimeout(options.timeout);
|
|
@@ -261,7 +274,6 @@ export class Client extends Core {
|
|
|
261
274
|
this.socket.io.once('reconnect', () => {
|
|
262
275
|
resolve();
|
|
263
276
|
});
|
|
264
|
-
// @ts-expect-error
|
|
265
277
|
this.socket.io.engine.close();
|
|
266
278
|
});
|
|
267
279
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/messenger/client.ts"],"names":[],"mappings":"AAAA,iCAAiC;AAEjC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,cAAc,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/messenger/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
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,EAEH,MAAM,EACT,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,EAEH,MAAM,EACT,MAAM,uBAAuB,CAAC;AAC/B,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,CAC9B,IAAI,EAAE,CAAC,CAAC,OAAO,EACf,eAAe,UAAQ,GACxB,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;IA8C5B,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,CACjB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,WAAW,GAC1B,OAAO,CAAC,GAAG,CAAC;CAalB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import ms from 'ms';
|
|
2
2
|
import { pEvent } from 'p-event';
|
|
3
3
|
import { EventEmitter } from 'node:events';
|
|
4
|
-
import { toString, isInteger, debugLogger, TSError } from '@terascope/utils';
|
|
4
|
+
import { toString, isInteger, debugLogger, TSError } from '@terascope/core-utils';
|
|
5
5
|
const _logger = debugLogger('teraslice-messaging:core');
|
|
6
6
|
export class Core extends EventEmitter {
|
|
7
7
|
closed = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/messenger/core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EACH,QAAQ,EAAE,SAAS,EAAE,WAAW,EACxB,OAAO,EAClB,MAAM,
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../../src/messenger/core.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import 'socket.io-client';
|
|
1
|
+
import { ManagerOptions, SocketOptions } from 'socket.io-client';
|
|
2
2
|
import http from 'node:http';
|
|
3
|
-
import { Logger } from '@terascope/utils';
|
|
3
|
+
import { Logger } from '@terascope/core-utils';
|
|
4
4
|
export interface CoreOptions {
|
|
5
5
|
networkLatencyBuffer?: number;
|
|
6
6
|
actionTimeout: number;
|
|
@@ -13,7 +13,7 @@ export interface ClientOptions extends CoreOptions {
|
|
|
13
13
|
serverName: string;
|
|
14
14
|
clientDisconnectTimeout: number;
|
|
15
15
|
connectTimeout: number;
|
|
16
|
-
socketOptions?:
|
|
16
|
+
socketOptions?: Partial<ManagerOptions & SocketOptions>;
|
|
17
17
|
}
|
|
18
18
|
export interface ServerOptions extends CoreOptions {
|
|
19
19
|
port: number;
|
|
@@ -99,4 +99,13 @@ export interface SocketEmitter {
|
|
|
99
99
|
on(eventName: string, fn: (msg: Message) => void): void;
|
|
100
100
|
emit(eventName: string, msg: Message): void;
|
|
101
101
|
}
|
|
102
|
+
export interface ClientToServerEvents {
|
|
103
|
+
'message:response': (msg: Message) => void;
|
|
104
|
+
[eventName: string]: (message: Message) => void;
|
|
105
|
+
}
|
|
106
|
+
export interface ServerToClientEvents {
|
|
107
|
+
'message:response': (msg: Message) => void;
|
|
108
|
+
shutdown: () => void;
|
|
109
|
+
[eventName: string]: (message: Message) => void;
|
|
110
|
+
}
|
|
102
111
|
//# sourceMappingURL=interfaces.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/messenger/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../../src/messenger/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"AAyEA,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,10 +1,11 @@
|
|
|
1
1
|
import http from 'node:http';
|
|
2
|
+
import { Server as SocketIOServer, type Socket } from 'socket.io';
|
|
2
3
|
import * as i from './interfaces.js';
|
|
3
4
|
import { Core } from './core.js';
|
|
4
5
|
export declare class Server extends Core {
|
|
5
6
|
isShuttingDown: boolean;
|
|
6
7
|
readonly port: number;
|
|
7
|
-
readonly server:
|
|
8
|
+
readonly server: SocketIOServer<i.ClientToServerEvents, i.ServerToClientEvents>;
|
|
8
9
|
readonly httpServer: http.Server;
|
|
9
10
|
readonly serverName: string;
|
|
10
11
|
readonly clientDisconnectTimeout: number;
|
|
@@ -32,11 +33,11 @@ export declare class Server extends Core {
|
|
|
32
33
|
protected sendToAll(eventName: string, payload?: i.Payload, options?: i.SendOptions): Promise<(i.Message | null)[]>;
|
|
33
34
|
protected send(clientId: string, eventName: string, payload?: i.Payload, options?: i.SendOptions): Promise<i.Message | null>;
|
|
34
35
|
isClientConnected(clientId: string): boolean;
|
|
35
|
-
protected getClientMetadataFromSocket(socket:
|
|
36
|
+
protected getClientMetadataFromSocket(socket: Socket<i.ClientToServerEvents, i.ServerToClientEvents>): i.ClientSocketMetadata;
|
|
36
37
|
private filterClientsByState;
|
|
37
38
|
private countClientsByState;
|
|
38
39
|
protected updateClientState(clientId: string, state: i.ClientState): boolean;
|
|
39
|
-
protected ensureClient(socket:
|
|
40
|
+
protected ensureClient(socket: Socket<i.ClientToServerEvents, i.ServerToClientEvents>): i.ConnectedClient;
|
|
40
41
|
private _onConnection;
|
|
41
42
|
}
|
|
42
43
|
//# sourceMappingURL=server.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/messenger/server.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/messenger/server.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,IAAI,cAAc,EAAE,KAAK,MAAM,EAAiB,MAAM,WAAW,CAAC;AAWjF,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAUjC,qBAAa,MAAO,SAAQ,IAAI;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,oBAAoB,CAAC,CAAC;IAChF,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,uBAAuB,EAAE,MAAM,CAAC;IACzC,OAAO,CAAC,eAAe,CAAM;IAC7B,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC,gBAAgB,CAAC;gBAE3B,IAAI,EAAE,CAAC,CAAC,aAAa;IA8D3B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAgFvB,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB/B,IAAI,aAAa,IAAI,CAAC,CAAC,eAAe,EAAE,CAEvC;IAED,IAAI,iBAAiB,IAAI,MAAM,CAE9B;IAED,IAAI,mBAAmB,IAAI,CAAC,CAAC,eAAe,EAAE,CAE7C;IAED,IAAI,uBAAuB,IAAI,MAAM,CAEpC;IAED,IAAI,gBAAgB,IAAI,CAAC,CAAC,eAAe,EAAE,CAE1C;IAED,IAAI,oBAAoB,IAAI,MAAM,CAEjC;IAED,IAAI,kBAAkB,IAAI,CAAC,CAAC,eAAe,EAAE,CAE5C;IAED,IAAI,sBAAsB,IAAI,MAAM,CAEnC;IAED,cAAc,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAMpD,iBAAiB,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAMvD,mBAAmB,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAMzD,kBAAkB,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAMxD,gBAAgB,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAMtD,iBAAiB,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAMvD,aAAa,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;IAMnD,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAKxC,SAAS,CAAC,SAAS,CACf,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,EACnB,OAAO,GAAE,CAAC,CAAC,WAAgD,GAC5D,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;cAOhB,IAAI,CAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,CAAC,CAAC,OAAY,EACvB,OAAO,GAAE,CAAC,CAAC,WAAgC,GAC5C,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;IAoC5B,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAM5C,SAAS,CAAC,2BAA2B,CACjC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,oBAAoB,CAAC,GAC/D,CAAC,CAAC,oBAAoB;IAOzB,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,mBAAmB;IAU3B,SAAS,CAAC,iBAAiB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,WAAW,GAAG,OAAO;IAiC5E,SAAS,CAAC,YAAY,CAClB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,oBAAoB,EAAE,CAAC,CAAC,oBAAoB,CAAC,GAC/D,CAAC,CAAC,eAAe;IAqBpB,OAAO,CAAC,aAAa;CAiDxB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import http from 'node:http';
|
|
2
|
-
import SocketIOServer from 'socket.io';
|
|
3
|
-
import { get, isTest, isString, isNumber, debugLogger, pDelay, pRetry, } from '@terascope/utils';
|
|
2
|
+
import { Server as SocketIOServer } from 'socket.io';
|
|
3
|
+
import { get, isTest, isString, isNumber, debugLogger, pDelay, pRetry, } from '@terascope/core-utils';
|
|
4
4
|
import { newMsgId } from '../utils/index.js';
|
|
5
5
|
import * as i from './interfaces.js';
|
|
6
6
|
import { Core } from './core.js';
|
|
@@ -41,11 +41,12 @@ export class Server extends Core {
|
|
|
41
41
|
this.clientDisconnectTimeout = clientDisconnectTimeout;
|
|
42
42
|
const pingTimeout = this.actionTimeout;
|
|
43
43
|
const pingInterval = this.actionTimeout + this.networkLatencyBuffer;
|
|
44
|
-
this.server = SocketIOServer({
|
|
44
|
+
this.server = new SocketIOServer({
|
|
45
45
|
pingTimeout,
|
|
46
46
|
pingInterval,
|
|
47
47
|
perMessageDeflate: false,
|
|
48
48
|
serveClient: false,
|
|
49
|
+
maxHttpBufferSize: 1e8, // 100MB - socketIO v1 default
|
|
49
50
|
});
|
|
50
51
|
this.server.on('error', (err) => {
|
|
51
52
|
this.logger.error(err, 'unhandled socket.io error');
|
|
@@ -101,7 +102,8 @@ export class Server extends Core {
|
|
|
101
102
|
});
|
|
102
103
|
this.server.attach(this.httpServer);
|
|
103
104
|
this.server.use((socket, next) => {
|
|
104
|
-
socket.join(socket.handshake.
|
|
105
|
+
socket.join(socket.handshake.auth.clientId);
|
|
106
|
+
next();
|
|
105
107
|
});
|
|
106
108
|
this.server.on('connection', this._onConnection);
|
|
107
109
|
this.onClientReconnect((clientId) => {
|
|
@@ -240,8 +242,8 @@ export class Server extends Core {
|
|
|
240
242
|
}
|
|
241
243
|
getClientMetadataFromSocket(socket) {
|
|
242
244
|
return {
|
|
243
|
-
clientId: socket.handshake.
|
|
244
|
-
clientType: socket.handshake.
|
|
245
|
+
clientId: socket.handshake.auth.clientId,
|
|
246
|
+
clientType: socket.handshake.auth.clientType,
|
|
245
247
|
};
|
|
246
248
|
}
|
|
247
249
|
filterClientsByState(states) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/messenger/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/messenger/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": "2.0.0-dev.
|
|
4
|
+
"version": "2.0.0-dev.11",
|
|
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": {
|
|
@@ -35,19 +35,17 @@
|
|
|
35
35
|
"ms": "~2.1.3"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@terascope/
|
|
39
|
-
"@terascope/
|
|
38
|
+
"@terascope/core-utils": "~2.0.0-dev.10",
|
|
39
|
+
"@terascope/types": "~2.0.0-dev.8",
|
|
40
40
|
"get-port": "~7.1.0",
|
|
41
41
|
"ms": "~2.1.3",
|
|
42
42
|
"nanoid": "~5.1.5",
|
|
43
43
|
"p-event": "~7.0.0",
|
|
44
|
-
"socket.io": "~
|
|
45
|
-
"socket.io-client": "~
|
|
44
|
+
"socket.io": "~4.8.1",
|
|
45
|
+
"socket.io-client": "~4.8.1"
|
|
46
46
|
},
|
|
47
47
|
"devDependencies": {
|
|
48
|
-
"@types/ms": "~0.7.34"
|
|
49
|
-
"@types/socket.io": "~2.1.13",
|
|
50
|
-
"@types/socket.io-client": "~1.4.36"
|
|
48
|
+
"@types/ms": "~0.7.34"
|
|
51
49
|
},
|
|
52
50
|
"engines": {
|
|
53
51
|
"node": ">=22.0.0",
|