@terascope/teraslice-messaging 0.42.2 → 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 +3 -2
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { AggregatedExecutionAnalytics } from '@terascope/types';
|
|
2
|
-
import * as i from './interfaces';
|
|
3
|
-
import * as core from '../messenger';
|
|
2
|
+
import * as i from './interfaces.js';
|
|
3
|
+
import * as core from '../messenger/index.js';
|
|
4
4
|
export declare class Client extends core.Client {
|
|
5
5
|
readonly exId: string;
|
|
6
6
|
constructor(opts: i.ClientOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C,qBAAa,MAAO,SAAQ,IAAI,CAAC,MAAM;IACnC,SAAgB,IAAI,EAAE,MAAM,CAAC;gBAEjB,IAAI,EAAE,CAAC,CAAC,aAAa;IAwC3B,KAAK;IAIX,oBAAoB,CAAC,KAAK,EAAE,4BAA4B,EAAE,OAAO,CAAC,EAAE,MAAM;IAe1E,qBAAqB,CAAC,KAAK,CAAC,EAAE,MAAM;IAYpC,oBAAoB,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc;IAI5C,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc;IAIxC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc;CAG5C"}
|
|
@@ -1,41 +1,16 @@
|
|
|
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 __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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.Client = void 0;
|
|
27
|
-
const utils_1 = require("@terascope/utils");
|
|
28
|
-
const core = __importStar(require("../messenger"));
|
|
29
|
-
class Client extends core.Client {
|
|
1
|
+
import { isString, isNumber } from '@terascope/utils';
|
|
2
|
+
import * as core from '../messenger/index.js';
|
|
3
|
+
export class Client extends core.Client {
|
|
4
|
+
exId;
|
|
30
5
|
constructor(opts) {
|
|
31
6
|
const { clusterMasterUrl, socketOptions, nodeDisconnectTimeout, networkLatencyBuffer, actionTimeout, exId, connectTimeout, logger } = opts;
|
|
32
|
-
if (!clusterMasterUrl || !
|
|
7
|
+
if (!clusterMasterUrl || !isString(clusterMasterUrl)) {
|
|
33
8
|
throw new Error('ClusterMaster.Client requires a valid clusterMasterUrl');
|
|
34
9
|
}
|
|
35
|
-
if (!exId || !
|
|
10
|
+
if (!exId || !isString(exId)) {
|
|
36
11
|
throw new Error('ClusterMaster.Client requires a valid exId');
|
|
37
12
|
}
|
|
38
|
-
if (!
|
|
13
|
+
if (!isNumber(nodeDisconnectTimeout)) {
|
|
39
14
|
throw new Error('ClusterMaster.Client requires a valid nodeDisconnectTimeout');
|
|
40
15
|
}
|
|
41
16
|
super({
|
|
@@ -82,5 +57,4 @@ class Client extends core.Client {
|
|
|
82
57
|
this.handleResponse(this.socket, 'execution:resume', fn);
|
|
83
58
|
}
|
|
84
59
|
}
|
|
85
|
-
exports.Client = Client;
|
|
86
60
|
//# sourceMappingURL=client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/cluster-master/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/cluster-master/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAGtD,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;YAClD,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;SAC7E;QAED,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;SACjE;QAED,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;YAClC,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;SAClF;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,4 +1,4 @@
|
|
|
1
|
-
export * from './client';
|
|
2
|
-
export * from './interfaces';
|
|
3
|
-
export * from './server';
|
|
1
|
+
export * from './client.js';
|
|
2
|
+
export * from './interfaces.js';
|
|
3
|
+
export * from './server.js';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC"}
|
|
@@ -1,20 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
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("./interfaces"), exports);
|
|
19
|
-
__exportStar(require("./server"), exports);
|
|
1
|
+
export * from './client.js';
|
|
2
|
+
export * from './interfaces.js';
|
|
3
|
+
export * from './server.js';
|
|
20
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cluster-master/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cluster-master/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="socket.io-client" />
|
|
2
2
|
import { Logger } from '@terascope/utils';
|
|
3
3
|
import { ExecutionAnalytics, AggregatedExecutionAnalytics } from '@terascope/types';
|
|
4
|
-
import { Message, RequestListener } from '../messenger/interfaces';
|
|
4
|
+
import { Message, RequestListener } from '../messenger/interfaces.js';
|
|
5
5
|
export interface ClientOptions {
|
|
6
6
|
exId: string;
|
|
7
7
|
clusterMasterUrl: string;
|
|
@@ -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,
|
|
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;IACb,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,5 +1,5 @@
|
|
|
1
|
-
import * as i from './interfaces';
|
|
2
|
-
import * as core from '../messenger';
|
|
1
|
+
import * as i from './interfaces.js';
|
|
2
|
+
import * as core from '../messenger/index.js';
|
|
3
3
|
export declare class Server extends core.Server {
|
|
4
4
|
private clusterAnalytics;
|
|
5
5
|
constructor(opts: i.ServerOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C,qBAAa,MAAO,SAAQ,IAAI,CAAC,MAAM;IACnC,OAAO,CAAC,gBAAgB,CAAqB;gBAEjC,IAAI,EAAE,CAAC,CAAC,aAAa;IAuC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5B,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAC,IAAI,CAAC;IAI5D,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAC,IAAI,CAAC;IAI7D,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAC,IAAI,CAAC;IAIvE,mBAAmB,IAAI,CAAC,CAAC,gBAAgB;IAIzC,mBAAmB,CAAC,EAAE,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,IAAI;IAMrF,OAAO,CAAC,YAAY;CAkCvB"}
|
|
@@ -1,35 +1,10 @@
|
|
|
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 __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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.Server = void 0;
|
|
27
|
-
const utils_1 = require("@terascope/utils");
|
|
28
|
-
const core = __importStar(require("../messenger"));
|
|
29
|
-
class Server extends core.Server {
|
|
1
|
+
import { isNumber, cloneDeep } from '@terascope/utils';
|
|
2
|
+
import * as core from '../messenger/index.js';
|
|
3
|
+
export class Server extends core.Server {
|
|
4
|
+
clusterAnalytics;
|
|
30
5
|
constructor(opts) {
|
|
31
6
|
const { port, actionTimeout, networkLatencyBuffer, nodeDisconnectTimeout, requestListener, serverTimeout, logger, } = opts;
|
|
32
|
-
if (!
|
|
7
|
+
if (!isNumber(nodeDisconnectTimeout)) {
|
|
33
8
|
throw new Error('ClusterMaster.Server requires a valid nodeDisconnectTimeout');
|
|
34
9
|
}
|
|
35
10
|
super({
|
|
@@ -70,7 +45,7 @@ class Server extends core.Server {
|
|
|
70
45
|
return this.send(exId, 'execution:analytics');
|
|
71
46
|
}
|
|
72
47
|
getClusterAnalytics() {
|
|
73
|
-
return
|
|
48
|
+
return cloneDeep(this.clusterAnalytics);
|
|
74
49
|
}
|
|
75
50
|
onExecutionFinished(fn) {
|
|
76
51
|
this.on('execution:finished', (msg) => {
|
|
@@ -108,5 +83,4 @@ class Server extends core.Server {
|
|
|
108
83
|
});
|
|
109
84
|
}
|
|
110
85
|
}
|
|
111
|
-
exports.Server = Server;
|
|
112
86
|
//# sourceMappingURL=server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/cluster-master/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { SliceCompletePayload, Slice } from '@terascope/types';
|
|
2
|
-
import * as core from '../messenger';
|
|
3
|
-
import * as i from './interfaces';
|
|
2
|
+
import * as core from '../messenger/index.js';
|
|
3
|
+
import * as i from './interfaces.js';
|
|
4
4
|
export declare class Client extends core.Client {
|
|
5
5
|
workerId: string;
|
|
6
6
|
constructor(opts: i.ClientOptions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAC9C,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AAIrC,qBAAa,MAAO,SAAQ,IAAI,CAAC,MAAM;IAC5B,QAAQ,EAAE,MAAM,CAAC;gBAEZ,IAAI,EAAE,CAAC,CAAC,aAAa;IAyC3B,KAAK;IA4BX,mBAAmB,CAAC,EAAE,EAAE,MAAM,IAAI;IAIlC,iBAAiB,CAAC,OAAO,EAAE,oBAAoB;IAOzC,YAAY,CACd,EAAE,GAAE,CAAC,CAAC,WAAyB,EAC/B,SAAS,SAAc,GACxB,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;CAsChC"}
|
|
@@ -1,42 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
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 __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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.Client = void 0;
|
|
27
|
-
const utils_1 = require("@terascope/utils");
|
|
28
|
-
const core = __importStar(require("../messenger"));
|
|
1
|
+
import { isString, withoutNil, isNumber } from '@terascope/utils';
|
|
2
|
+
import * as core from '../messenger/index.js';
|
|
29
3
|
const ONE_MIN = 60 * 1000;
|
|
30
|
-
class Client extends core.Client {
|
|
4
|
+
export class Client extends core.Client {
|
|
5
|
+
workerId;
|
|
31
6
|
constructor(opts) {
|
|
32
7
|
const { executionControllerUrl, socketOptions, workerId, workerDisconnectTimeout, networkLatencyBuffer, actionTimeout, connectTimeout, logger } = opts;
|
|
33
|
-
if (!
|
|
8
|
+
if (!isString(executionControllerUrl)) {
|
|
34
9
|
throw new Error('ExecutionController.Client requires a valid executionControllerUrl');
|
|
35
10
|
}
|
|
36
|
-
if (!
|
|
11
|
+
if (!isString(workerId)) {
|
|
37
12
|
throw new Error('ExecutionController.Client requires a valid workerId');
|
|
38
13
|
}
|
|
39
|
-
if (!
|
|
14
|
+
if (!isNumber(workerDisconnectTimeout)) {
|
|
40
15
|
throw new Error('ExecutionController.Client requires a valid workerDisconnectTimeout');
|
|
41
16
|
}
|
|
42
17
|
super({
|
|
@@ -81,7 +56,7 @@ class Client extends core.Client {
|
|
|
81
56
|
this.on('execution:finished', fn);
|
|
82
57
|
}
|
|
83
58
|
sendSliceComplete(payload) {
|
|
84
|
-
return this.send('worker:slice:complete',
|
|
59
|
+
return this.send('worker:slice:complete', withoutNil(payload), {
|
|
85
60
|
response: true,
|
|
86
61
|
volatile: false,
|
|
87
62
|
});
|
|
@@ -118,5 +93,4 @@ class Client extends core.Client {
|
|
|
118
93
|
return slice;
|
|
119
94
|
}
|
|
120
95
|
}
|
|
121
|
-
exports.Client = Client;
|
|
122
96
|
//# sourceMappingURL=client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/execution-controller/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/execution-controller/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from './client';
|
|
2
|
-
export * from './interfaces';
|
|
3
|
-
export * from './server';
|
|
1
|
+
export * from './client.js';
|
|
2
|
+
export * from './interfaces.js';
|
|
3
|
+
export * from './server.js';
|
|
4
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/index.ts"],"names":[],"mappings":"AAAA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/execution-controller/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC"}
|
|
@@ -1,20 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
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("./interfaces"), exports);
|
|
19
|
-
__exportStar(require("./server"), exports);
|
|
1
|
+
export * from './client.js';
|
|
2
|
+
export * from './interfaces.js';
|
|
3
|
+
export * from './server.js';
|
|
20
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution-controller/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/execution-controller/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,aAAa,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Queue } from '@terascope/utils';
|
|
2
2
|
import { SliceCompletePayload, EnqueuedWorker, Slice } from '@terascope/types';
|
|
3
|
-
import * as core from '../messenger';
|
|
4
|
-
import * as i from './interfaces';
|
|
3
|
+
import * as core from '../messenger/index.js';
|
|
4
|
+
import * as i from './interfaces.js';
|
|
5
5
|
export declare class Server extends core.Server {
|
|
6
6
|
private _activeWorkers;
|
|
7
7
|
queue: Queue<EnqueuedWorker>;
|
|
@@ -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,
|
|
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;gBAEjB,IAAI,EAAE,CAAC,CAAC,aAAa;IAsB3B,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"}
|
|
@@ -1,36 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
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 __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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
exports.Server = void 0;
|
|
27
|
-
const utils_1 = require("@terascope/utils");
|
|
28
|
-
const core = __importStar(require("../messenger"));
|
|
1
|
+
import { isNumber, get, Queue } from '@terascope/utils';
|
|
2
|
+
import * as core from '../messenger/index.js';
|
|
29
3
|
const { Available, Unavailable } = core.ClientState;
|
|
30
|
-
class Server extends core.Server {
|
|
4
|
+
export class Server extends core.Server {
|
|
5
|
+
_activeWorkers;
|
|
6
|
+
queue;
|
|
31
7
|
constructor(opts) {
|
|
32
8
|
const { port, actionTimeout, networkLatencyBuffer, workerDisconnectTimeout, logger } = opts;
|
|
33
|
-
if (!
|
|
9
|
+
if (!isNumber(workerDisconnectTimeout)) {
|
|
34
10
|
throw new Error('ExecutionController.Server requires a valid workerDisconnectTimeout');
|
|
35
11
|
}
|
|
36
12
|
super({
|
|
@@ -41,7 +17,7 @@ class Server extends core.Server {
|
|
|
41
17
|
serverName: 'ExecutionController',
|
|
42
18
|
logger,
|
|
43
19
|
});
|
|
44
|
-
this.queue = new
|
|
20
|
+
this.queue = new Queue();
|
|
45
21
|
this._activeWorkers = {};
|
|
46
22
|
}
|
|
47
23
|
async start() {
|
|
@@ -126,7 +102,7 @@ class Server extends core.Server {
|
|
|
126
102
|
onConnection(workerId, socket) {
|
|
127
103
|
this.handleResponse(socket, 'worker:slice:complete', async (msg) => {
|
|
128
104
|
const { payload } = msg;
|
|
129
|
-
const sliceId =
|
|
105
|
+
const sliceId = get(payload, 'slice.slice_id');
|
|
130
106
|
if (payload.error) {
|
|
131
107
|
this.emit('slice:failure', { scope: workerId, payload });
|
|
132
108
|
}
|
|
@@ -173,5 +149,4 @@ class Server extends core.Server {
|
|
|
173
149
|
return true;
|
|
174
150
|
}
|
|
175
151
|
}
|
|
176
|
-
exports.Server = Server;
|
|
177
152
|
//# sourceMappingURL=server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/execution-controller/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/execution-controller/server.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as ClusterMaster from './cluster-master';
|
|
2
|
-
import * as ExecutionController from './execution-controller';
|
|
3
|
-
import * as Messenger from './messenger';
|
|
4
|
-
export * from './utils';
|
|
1
|
+
import * as ClusterMaster from './cluster-master/index.js';
|
|
2
|
+
import * as ExecutionController from './execution-controller/index.js';
|
|
3
|
+
import * as Messenger from './messenger/index.js';
|
|
4
|
+
export * from './utils/index.js';
|
|
5
5
|
export { ClusterMaster, ExecutionController, Messenger, };
|
|
6
6
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/src/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,mBAAmB,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC;AAElD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EACH,aAAa,EACb,mBAAmB,EACnB,SAAS,GACZ,CAAC"}
|
package/dist/src/index.js
CHANGED
|
@@ -1,37 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
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 __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 __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
26
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.Messenger = exports.ExecutionController = exports.ClusterMaster = void 0;
|
|
30
|
-
const ClusterMaster = __importStar(require("./cluster-master"));
|
|
31
|
-
exports.ClusterMaster = ClusterMaster;
|
|
32
|
-
const ExecutionController = __importStar(require("./execution-controller"));
|
|
33
|
-
exports.ExecutionController = ExecutionController;
|
|
34
|
-
const Messenger = __importStar(require("./messenger"));
|
|
35
|
-
exports.Messenger = Messenger;
|
|
36
|
-
__exportStar(require("./utils"), exports);
|
|
1
|
+
import * as ClusterMaster from './cluster-master/index.js';
|
|
2
|
+
import * as ExecutionController from './execution-controller/index.js';
|
|
3
|
+
import * as Messenger from './messenger/index.js';
|
|
4
|
+
export * from './utils/index.js';
|
|
5
|
+
export { ClusterMaster, ExecutionController, Messenger, };
|
|
37
6
|
//# sourceMappingURL=index.js.map
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,aAAa,MAAM,2BAA2B,CAAC;AAC3D,OAAO,KAAK,mBAAmB,MAAM,iCAAiC,CAAC;AACvE,OAAO,KAAK,SAAS,MAAM,sBAAsB,CAAC;AAElD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EACH,aAAa,EACb,mBAAmB,EACnB,SAAS,GACZ,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="socket.io-client" />
|
|
2
|
-
import * as i from './interfaces';
|
|
3
|
-
import { Core } from './core';
|
|
2
|
+
import * as i from './interfaces.js';
|
|
3
|
+
import { Core } from './core.js';
|
|
4
4
|
export declare class Client extends Core {
|
|
5
5
|
readonly socket: SocketIOClient.Socket;
|
|
6
6
|
readonly clientId: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/messenger/client.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/messenger/client.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,CAAC,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAKjC,qBAAa,MAAO,SAAQ,IAAI;IAC5B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC;IACvC,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;gBAEtB,IAAI,EAAE,CAAC,CAAC,aAAa,EAAE,eAAe,CAAC,EAAE,MAAM;IA0E3D,gBAAgB,CAAC,EAAE,EAAE,MAAM,IAAI,GAAG,IAAI;IAchC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YA4DhB,QAAQ;IA+DhB,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,GAAC,IAAI,GAAC,SAAS,CAAC;IASrE,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,GAAC,IAAI,GAAC,SAAS,CAAC;cAS7D,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;IA4B5B,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;CASlC"}
|