cry-ebus2 2.2.5 → 3.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/EbusConfiguration.d.ts +1 -0
- package/dist/EbusConfiguration.d.ts.map +1 -1
- package/dist/broker.d.ts +1 -0
- package/dist/broker.d.ts.map +1 -1
- package/dist/broker.js +38 -6
- package/dist/broker.js.map +1 -1
- package/dist/clientBlocking.js +5 -5
- package/dist/clientBlocking.js.map +1 -1
- package/dist/clientNonBlocking.d.ts +1 -0
- package/dist/clientNonBlocking.d.ts.map +1 -1
- package/dist/clientNonBlocking.js +12 -5
- package/dist/clientNonBlocking.js.map +1 -1
- package/dist/consts.d.ts.map +1 -1
- package/dist/consts.js +2 -1
- package/dist/consts.js.map +1 -1
- package/dist/delayWorker.js +2 -2
- package/dist/delayWorker.js.map +1 -1
- package/dist/echoWorker.js +1 -1
- package/dist/echoWorker.js.map +1 -1
- package/dist/errorWorker.js +1 -1
- package/dist/errorWorker.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/loadConfiguration.js +1 -1
- package/dist/loadConfiguration.js.map +1 -1
- package/dist/pub.js +2 -2
- package/dist/pub.js.map +1 -1
- package/dist/rejectWorker.js +1 -1
- package/dist/rejectWorker.js.map +1 -1
- package/dist/run/all.js +1 -1
- package/dist/run/all.js.map +1 -1
- package/dist/run/broker.js +1 -1
- package/dist/run/broker.js.map +1 -1
- package/dist/run/call.js +3 -3
- package/dist/run/call.js.map +1 -1
- package/dist/run/calling.js +2 -2
- package/dist/run/calling.js.map +1 -1
- package/dist/run/callingBurst.js +2 -2
- package/dist/run/callingBurst.js.map +1 -1
- package/dist/run/delay.js +1 -1
- package/dist/run/delay.js.map +1 -1
- package/dist/run/echo.js +1 -1
- package/dist/run/echo.js.map +1 -1
- package/dist/run/error.js +1 -1
- package/dist/run/error.js.map +1 -1
- package/dist/run/ping.js +3 -3
- package/dist/run/ping.js.map +1 -1
- package/dist/run/pub.js +2 -2
- package/dist/run/pub.js.map +1 -1
- package/dist/run/reject.js +1 -1
- package/dist/run/reject.js.map +1 -1
- package/dist/run/sub.js +1 -1
- package/dist/run/sub.js.map +1 -1
- package/dist/run/workers.js +38 -9
- package/dist/run/workers.js.map +1 -1
- package/dist/serialize.d.ts.map +1 -1
- package/dist/serialize.js +12 -14
- package/dist/serialize.js.map +1 -1
- package/dist/sub.js +2 -2
- package/dist/sub.js.map +1 -1
- package/dist/test/config.js +3 -3
- package/dist/test/config.js.map +1 -1
- package/dist/test/echo.js +15 -21
- package/dist/test/echo.js.map +1 -1
- package/dist/test/pack.js +16 -12
- package/dist/test/pack.js.map +1 -1
- package/dist/test/performance.js +9 -9
- package/dist/test/performance.js.map +1 -1
- package/dist/test/pub.js.map +1 -1
- package/dist/test/reject.js +7 -7
- package/dist/test/reject.js.map +1 -1
- package/dist/test/services.js +9 -9
- package/dist/test/services.js.map +1 -1
- package/dist/test/stress.js +1 -1
- package/dist/test/stress.js.map +1 -1
- package/dist/test/timing.js +14 -14
- package/dist/test/timing.js.map +1 -1
- package/dist/types.d.ts +3 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +2 -0
- package/dist/types.js.map +1 -1
- package/dist/worker.d.ts +1 -1
- package/dist/worker.d.ts.map +1 -1
- package/dist/worker.js +29 -23
- package/dist/worker.js.map +1 -1
- package/package.json +13 -12
- package/src/EbusConfiguration.ts +1 -0
- package/src/broker.ts +37 -2
- package/src/clientNonBlocking.ts +8 -0
- package/src/consts.ts +2 -1
- package/src/index.ts +0 -3
- package/src/run/all.ts +0 -2
- package/src/run/call.ts +1 -1
- package/src/run/ping.ts +1 -1
- package/src/run/workers.ts +47 -11
- package/src/serialize.ts +9 -10
- package/src/src/notepack.d.ts +2 -0
- package/src/test/echo.ts +15 -18
- package/src/test/pack.ts +9 -8
- package/src/test/performance.ts +13 -12
- package/src/test/pub.ts +1 -3
- package/src/types.ts +2 -0
- package/src/worker.ts +38 -24
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../src/test/performance.ts"],"names":[],"mappings":";;AACA,sCAAmC;AAEnC,8CAA2C;AAC3C,oCAA6D;AAE7D,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../src/test/performance.ts"],"names":[],"mappings":";;AACA,sCAAmC;AAEnC,8CAA2C;AAC3C,oCAA6D;AAE7D,QAAQ,CAAC,aAAa,EAAE,KAAK;IAEzB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;IACpB,IAAI,cAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,uBAAU,EAAE,CAAC,KAAK,EAAE,CAAA;IACxB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IAEzB,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IAEzB,IAAI,YAAY,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC,CAAA;IAEpD,SAAS,OAAO,CAAC,IAAY;QACzB,IAAI,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,CAAA;QAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE;YAAE,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAA;QACpD,OAAO,UAAU,CAAA;IACrB,CAAC;IAGD,SAAS,SAAS,CAAE,IAAW;QAC3B,OAAO,CAAC,GAAG,CAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAE,CAAA;IAClC,CAAC;IAGD,KAAK,UAAU,OAAO,CAAC,IAAY,EAAE,IAAiC;QAClE,IAAI,aAAa,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAA;QACrD,IAAI,IAAI,GAAU,CAAC,IAAI,CAAC,CAAA;QAExB,KAAK,IAAI,GAAG,IAAI,aAAa,EAAE;YAC3B,IAAI,KAAK,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;YAChC,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAM,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,CAAA;YACtE,IAAI,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;YAC9B,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,KAAG,GAAG,CAAC,MAAM;gBAAE,OAAO,CAAC,KAAK,CAAC,wBAAwB,EAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChF,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,CAAA;SAEzB;QACF,SAAS,CAAC,IAAI,CAAC,CAAA;IAClB,CAAC;IAED,EAAE,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;QAEhC,SAAS,CAAC,CAAE,MAAM,EAAE,GAAG,YAAY,CAAE,CAAC,CAAA;QACtC,MAAM,OAAO,CAAC,cAAc,EAAC,EAAE,GAAG,EAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QAC7E,+EAA+E;QAC/E,MAAM,OAAO,CAAC,cAAc,EAAC,EAAE,GAAG,EAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QAC5E,8EAA8E;IAElF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;QACZ,OAAO,CAAC,IAAI,EAAE,CAAA;IAClB,CAAC,CAAC,CAAA;AAIN,CAAC,CAAC,CAAC"}
|
package/dist/test/pub.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pub.js","sourceRoot":"","sources":["../../src/test/pub.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"pub.js","sourceRoot":"","sources":["../../src/test/pub.ts"],"names":[],"mappings":";;AAAA,sCAAmC;AACnC,8CAA2C;AAC3C,gDAA6C;AAC7C,oCAA+C;AAC/C,kDAA+C;AAC/C,gCAA6B;AAE7B,QAAQ,CAAC,SAAS,EAAE,KAAK;IAErB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAElB,IAAI,MAAM,GAAG,IAAI,cAAM,EAAE,CAAA;IAEzB,IAAI,MAAM,GAAG,IAAI,uBAAU,EAAE,CAAA;IAC7B,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IACzB,IAAI,GAAG,GAAG,IAAI,SAAG,EAAE,CAAA;IACnB,MAAM,CAAC,KAAK,EAAE,CAAA;IAEd,GAAG,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,EAAC,OAAO,CAAC,EAAE,EAAE;QACpC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC,CAAC,CAAA;IAEF,WAAW,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;QACrC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,CAAA;IACxC,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,IAAI,EAAE,GAAG,IAAI,mBAAW,EAAE,CAAA;IAC1B,IAAI,EAAE,GAAG,IAAI,uBAAU,EAAE,CAAA;IACzB,IAAI,EAAE,GAAG,IAAI,yBAAW,EAAE,CAAA;IAC1B,IAAI,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAA;IAE3B,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,CAAC,KAAK,EAAE,CAAA;IAClB,CAAC,EAAC,GAAG,CAAC,CAAA;IAEN,UAAU,CAAC,GAAG,EAAE;QACZ,EAAE,CAAC,KAAK,EAAE,CAAA;IACd,CAAC,EAAE,GAAG,CAAC,CAAA;IACP,UAAU,CAAC,GAAG,EAAE;QACZ,EAAE,CAAC,KAAK,EAAE,CAAA;IACd,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,UAAU,CAAC,GAAG,EAAE;QACZ,EAAE,CAAC,IAAI,EAAE,CAAA;QACT,EAAE,CAAC,KAAK,EAAE,CAAA;QACV,EAAE,CAAC,KAAK,EAAE,CAAA;IACd,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,UAAU,CAAC,GAAG,EAAE;QACZ,EAAE,CAAC,IAAI,EAAE,CAAA;QACT,EAAE,CAAC,IAAI,EAAE,CAAA;IACb,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,UAAU,CAAC,GAAG,EAAE;QACZ,EAAE,CAAC,IAAI,EAAE,CAAA;IACb,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,UAAU,CAAC,GAAG,EAAE;QACZ,MAAM,CAAC,IAAI,EAAE,CAAA;IACjB,CAAC,EAAE,IAAI,CAAC,CAAA;IAER,UAAU,CAAC,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QAE/B,MAAM,CAAC,KAAK,EAAE,CAAA;IAClB,CAAC,EAAE,IAAI,CAAC,CAAA;IAGR,MAAM,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC3B,MAAM,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC3B,MAAM,GAAG,CAAC,cAAc,EAAE,CAAA;AAE9B,CAAC,CAAC,CAAC"}
|
package/dist/test/reject.js
CHANGED
|
@@ -12,21 +12,21 @@ describe('timing', async function () {
|
|
|
12
12
|
new errorWorker_1.ErrorWorker().start();
|
|
13
13
|
it('should reject on no-service', async () => {
|
|
14
14
|
let rep = await client.request("x", {}, { receiveTimeout: 1000 });
|
|
15
|
-
chai_1.expect(rep).to.eq(undefined);
|
|
15
|
+
(0, chai_1.expect)(rep).to.eq(undefined);
|
|
16
16
|
});
|
|
17
17
|
it('should reject from reject service', async () => {
|
|
18
18
|
var _a, _b;
|
|
19
19
|
let rep = await client.request("reject", { message: "a", more: 1 }, { receiveTimeout: 1000 });
|
|
20
|
-
chai_1.expect(rep).to.eq(undefined);
|
|
21
|
-
chai_1.expect((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("a");
|
|
22
|
-
chai_1.expect((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.more).to.eq(1);
|
|
20
|
+
(0, chai_1.expect)(rep).to.eq(undefined);
|
|
21
|
+
(0, chai_1.expect)((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("a");
|
|
22
|
+
(0, chai_1.expect)((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.more).to.eq(1);
|
|
23
23
|
});
|
|
24
24
|
it('should reject from error service', async () => {
|
|
25
25
|
var _a, _b;
|
|
26
26
|
let rep = await client.request("error", { message: "a", more: 1 }, { receiveTimeout: 1000 });
|
|
27
|
-
chai_1.expect(rep).to.eq(undefined);
|
|
28
|
-
chai_1.expect((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("a");
|
|
29
|
-
chai_1.expect((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.more).to.eq(1);
|
|
27
|
+
(0, chai_1.expect)(rep).to.eq(undefined);
|
|
28
|
+
(0, chai_1.expect)((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("a");
|
|
29
|
+
(0, chai_1.expect)((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.more).to.eq(1);
|
|
30
30
|
});
|
|
31
31
|
it('exists', () => {
|
|
32
32
|
process.exit();
|
package/dist/test/reject.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reject.js","sourceRoot":"","sources":["../../src/test/reject.ts"],"names":[],"mappings":";;AACA,+BAA6B;AAC7B,sCAAmC;AAEnC,gDAA6C;AAC7C,oCAA6D;AAC7D,kDAA+C;AAE/C,QAAQ,CAAC,QAAQ,EAAE,KAAK;IAEpB,IAAI,cAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IACzB,IAAI,2BAAY,EAAE,CAAC,KAAK,EAAE,CAAA;IAC1B,IAAI,yBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IAEzB,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QACzC,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,GAAG,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QACpF,aAAM,
|
|
1
|
+
{"version":3,"file":"reject.js","sourceRoot":"","sources":["../../src/test/reject.ts"],"names":[],"mappings":";;AACA,+BAA6B;AAC7B,sCAAmC;AAEnC,gDAA6C;AAC7C,oCAA6D;AAC7D,kDAA+C;AAE/C,QAAQ,CAAC,QAAQ,EAAE,KAAK;IAEpB,IAAI,cAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IACzB,IAAI,2BAAY,EAAE,CAAC,KAAK,EAAE,CAAA;IAC1B,IAAI,yBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IAEzB,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QACzC,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,GAAG,EAAE,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QACpF,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;;QAC/C,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,QAAQ,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QAChH,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;QAC5B,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;QAClD,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAC;IAGH,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;;QAC9C,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QAC/G,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;QAC5B,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;QAClD,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAC;IAIH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACd,OAAO,CAAC,IAAI,EAAE,CAAA;IAClB,CAAC,CAAC,CAAA;AAEN,CAAC,CAAC,CAAC"}
|
package/dist/test/services.js
CHANGED
|
@@ -15,25 +15,25 @@ describe('services', async function () {
|
|
|
15
15
|
let client = new client_1.Client();
|
|
16
16
|
it('should return services', async () => {
|
|
17
17
|
let rep = await client.services();
|
|
18
|
-
chai_1.expect(rep.find((n) => n.name === "echo").nWorkers).to.eq(1);
|
|
19
|
-
chai_1.expect(rep.find((n) => n.name === "delay").nWorkers).to.eq(3);
|
|
18
|
+
(0, chai_1.expect)(rep.find((n) => n.name === "echo").nWorkers).to.eq(1);
|
|
19
|
+
(0, chai_1.expect)(rep.find((n) => n.name === "delay").nWorkers).to.eq(3);
|
|
20
20
|
});
|
|
21
21
|
it('should return workers', async () => {
|
|
22
22
|
let rep = await client.workers();
|
|
23
|
-
chai_1.expect(rep).to.include("delay");
|
|
24
|
-
chai_1.expect(rep).to.include("echo");
|
|
25
|
-
chai_1.expect(rep).to.not.include("xxx");
|
|
23
|
+
(0, chai_1.expect)(rep).to.include("delay");
|
|
24
|
+
(0, chai_1.expect)(rep).to.include("echo");
|
|
25
|
+
(0, chai_1.expect)(rep).to.not.include("xxx");
|
|
26
26
|
});
|
|
27
27
|
it('should not return stopped workers', async () => {
|
|
28
28
|
await echo.stop();
|
|
29
29
|
let rep = await client.workers();
|
|
30
|
-
chai_1.expect(rep).to.include("delay");
|
|
31
|
-
chai_1.expect(rep).to.not.include("echo");
|
|
32
|
-
chai_1.expect(rep).to.not.include("xxx");
|
|
30
|
+
(0, chai_1.expect)(rep).to.include("delay");
|
|
31
|
+
(0, chai_1.expect)(rep).to.not.include("echo");
|
|
32
|
+
(0, chai_1.expect)(rep).to.not.include("xxx");
|
|
33
33
|
});
|
|
34
34
|
it('should reject non-existing service', async () => {
|
|
35
35
|
let rep = await client.request("x", null);
|
|
36
|
-
chai_1.expect(rep).to.be.undefined;
|
|
36
|
+
(0, chai_1.expect)(rep).to.be.undefined;
|
|
37
37
|
});
|
|
38
38
|
it('exists', () => {
|
|
39
39
|
process.exit();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/test/services.ts"],"names":[],"mappings":";;AACA,+BAA8B;AAC9B,sCAAmC;AACnC,8CAA2C;AAC3C,oCAA+C;AAE/C,QAAQ,CAAC,UAAU,EAAE,KAAK;IAEtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAElB,IAAI,cAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,IAAI,GAAG,IAAI,uBAAU,EAAE,CAAA;IAC3B,IAAI,CAAC,KAAK,EAAE,CAAA;IACZ,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IAEzB,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IAEzB,EAAE,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QACpC,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAA;QACjC,aAAM,
|
|
1
|
+
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/test/services.ts"],"names":[],"mappings":";;AACA,+BAA8B;AAC9B,sCAAmC;AACnC,8CAA2C;AAC3C,oCAA+C;AAE/C,QAAQ,CAAC,UAAU,EAAE,KAAK;IAEtB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAElB,IAAI,cAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,IAAI,GAAG,IAAI,uBAAU,EAAE,CAAA;IAC3B,IAAI,CAAC,KAAK,EAAE,CAAA;IACZ,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IAEzB,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IAEzB,EAAE,CAAC,wBAAwB,EAAE,KAAK,IAAI,EAAE;QACpC,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAA;QACjC,IAAA,aAAM,EAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAK,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAG,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QAC/D,IAAA,aAAM,EAAC,GAAG,CAAC,IAAI,CAAE,CAAC,CAAK,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAG,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAEpE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;QACnC,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;QAChC,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAC/B,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC9B,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;QAC/C,MAAM,IAAI,CAAC,IAAI,EAAE,CAAA;QACjB,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE,CAAA;QAChC,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QAC/B,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAClC,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAChD,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAA;QACzC,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAA;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACd,OAAO,CAAC,IAAI,EAAE,CAAA;IAClB,CAAC,CAAC,CAAA;AAGN,CAAC,CAAC,CAAC"}
|
package/dist/test/stress.js
CHANGED
|
@@ -19,7 +19,7 @@ describe('stress', async function () {
|
|
|
19
19
|
let resolved = await Promise.all(promises);
|
|
20
20
|
let ok = resolved.filter(f => f).length;
|
|
21
21
|
console.log('ok', ok, "of", promises.length);
|
|
22
|
-
chai_1.expect(ok > promises.length / 5).to.be.true;
|
|
22
|
+
(0, chai_1.expect)(ok > promises.length / 5).to.be.true;
|
|
23
23
|
});
|
|
24
24
|
it('exit', () => {
|
|
25
25
|
process.exit();
|
package/dist/test/stress.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stress.js","sourceRoot":"","sources":["../../src/test/stress.ts"],"names":[],"mappings":";;AACA,+BAA6B;AAC7B,sCAAmC;AACnC,oCAA6D;AAE7D,QAAQ,CAAC,QAAQ,EAAE,KAAK;IAEpB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAEnB,IAAI,cAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IAEzB,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IAEzB,IAAI,UAAU,GAAG,KAAK,CAAC,EAAE,GAAC,IAAI,CAAC,CAAA;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE;QAAG,UAAU,CAAC,CAAC,CAAC,GAAE,EAAE,CAAC,EAAE,CAAA;IAEjE,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAC9C,IAAI,QAAQ,GAAG,EAAE,CAAA;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC1B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAM,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,cAAc,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;SAC3G;QACD,IAAI,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC1C,IAAI,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7C,aAAM,
|
|
1
|
+
{"version":3,"file":"stress.js","sourceRoot":"","sources":["../../src/test/stress.ts"],"names":[],"mappings":";;AACA,+BAA6B;AAC7B,sCAAmC;AACnC,oCAA6D;AAE7D,QAAQ,CAAC,QAAQ,EAAE,KAAK;IAEpB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAEnB,IAAI,cAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IAEzB,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IAEzB,IAAI,UAAU,GAAG,KAAK,CAAC,EAAE,GAAC,IAAI,CAAC,CAAA;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE;QAAG,UAAU,CAAC,CAAC,CAAC,GAAE,EAAE,CAAC,EAAE,CAAA;IAEjE,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAC9C,IAAI,QAAQ,GAAG,EAAE,CAAA;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAC1B,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAM,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,cAAc,EAAC,IAAI,EAAE,CAAC,CAAC,CAAA;SAC3G;QACD,IAAI,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC1C,IAAI,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7C,IAAA,aAAM,EAAE,EAAE,GAAG,QAAQ,CAAC,MAAM,GAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAA;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;QACZ,OAAO,CAAC,IAAI,EAAE,CAAA;IAClB,CAAC,CAAC,CAAA;AAIN,CAAC,CAAC,CAAC"}
|
package/dist/test/timing.js
CHANGED
|
@@ -17,33 +17,33 @@ describe('timing', async function () {
|
|
|
17
17
|
let client = new client_1.Client();
|
|
18
18
|
it('should return passed-in object', async () => {
|
|
19
19
|
let rep = await client.request("delay", { delay: 100 }, { receiveTimeout: 1000 });
|
|
20
|
-
chai_1.expect(rep === null || rep === void 0 ? void 0 : rep.delay).to.eq(100);
|
|
20
|
+
(0, chai_1.expect)(rep === null || rep === void 0 ? void 0 : rep.delay).to.eq(100);
|
|
21
21
|
});
|
|
22
22
|
it('should not return passed-in object', async () => {
|
|
23
23
|
var _a;
|
|
24
24
|
let rep = await client.request("delay", { delay: 200 }, { receiveTimeout: 100 });
|
|
25
|
-
chai_1.expect(rep).to.eq(undefined);
|
|
26
|
-
chai_1.expect((_a = client === null || client === void 0 ? void 0 : client.lastError) === null || _a === void 0 ? void 0 : _a.reason).to.eq("timeout");
|
|
25
|
+
(0, chai_1.expect)(rep).to.eq(undefined);
|
|
26
|
+
(0, chai_1.expect)((_a = client === null || client === void 0 ? void 0 : client.lastError) === null || _a === void 0 ? void 0 : _a.reason).to.eq("timeout");
|
|
27
27
|
});
|
|
28
28
|
it('should not return object for non-existing worker', async () => {
|
|
29
29
|
let rep = await client.request("delayxx", { delay: 200 }, { receiveTimeout: 100 });
|
|
30
|
-
chai_1.expect(rep).to.eq(undefined);
|
|
30
|
+
(0, chai_1.expect)(rep).to.eq(undefined);
|
|
31
31
|
});
|
|
32
32
|
it('should not return data if error in worker', async () => {
|
|
33
33
|
var _a, _b, _c;
|
|
34
34
|
let rep = await client.request("error", { delay: 50, message: "test error", more: 1 }, { receiveTimeout: 100 });
|
|
35
|
-
chai_1.expect(rep).to.eq(undefined);
|
|
36
|
-
chai_1.expect((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("test error");
|
|
37
|
-
chai_1.expect((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.reason).to.eq("error");
|
|
38
|
-
chai_1.expect((_c = client.lastError) === null || _c === void 0 ? void 0 : _c.more).to.eq(1);
|
|
35
|
+
(0, chai_1.expect)(rep).to.eq(undefined);
|
|
36
|
+
(0, chai_1.expect)((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("test error");
|
|
37
|
+
(0, chai_1.expect)((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.reason).to.eq("error");
|
|
38
|
+
(0, chai_1.expect)((_c = client.lastError) === null || _c === void 0 ? void 0 : _c.more).to.eq(1);
|
|
39
39
|
});
|
|
40
40
|
it('should not return reject', async () => {
|
|
41
41
|
var _a, _b, _c;
|
|
42
42
|
let rep = await client.request("reject", { delay: 50, message: "test reject", more: 1 }, { receiveTimeout: 1000 });
|
|
43
|
-
chai_1.expect(rep).to.eq(undefined);
|
|
44
|
-
chai_1.expect((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("test reject");
|
|
45
|
-
chai_1.expect((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.reason).to.eq("reject");
|
|
46
|
-
chai_1.expect((_c = client.lastError) === null || _c === void 0 ? void 0 : _c.more).to.eq(1);
|
|
43
|
+
(0, chai_1.expect)(rep).to.eq(undefined);
|
|
44
|
+
(0, chai_1.expect)((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("test reject");
|
|
45
|
+
(0, chai_1.expect)((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.reason).to.eq("reject");
|
|
46
|
+
(0, chai_1.expect)((_c = client.lastError) === null || _c === void 0 ? void 0 : _c.more).to.eq(1);
|
|
47
47
|
});
|
|
48
48
|
it('should not block worker', async () => {
|
|
49
49
|
var _a;
|
|
@@ -60,8 +60,8 @@ describe('timing', async function () {
|
|
|
60
60
|
];
|
|
61
61
|
let resolved = await Promise.all(promises);
|
|
62
62
|
let cnt = resolved.filter(a => a).length;
|
|
63
|
-
chai_1.expect(cnt).to.eq(6);
|
|
64
|
-
chai_1.expect((_a = client === null || client === void 0 ? void 0 : client.lastError) === null || _a === void 0 ? void 0 : _a.reason).to.eq("timeout");
|
|
63
|
+
(0, chai_1.expect)(cnt).to.eq(6);
|
|
64
|
+
(0, chai_1.expect)((_a = client === null || client === void 0 ? void 0 : client.lastError) === null || _a === void 0 ? void 0 : _a.reason).to.eq("timeout");
|
|
65
65
|
});
|
|
66
66
|
it('exists', () => {
|
|
67
67
|
process.exit();
|
package/dist/test/timing.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timing.js","sourceRoot":"","sources":["../../src/test/timing.ts"],"names":[],"mappings":";;AACA,+BAA6B;AAC7B,sCAAmC;AACnC,8CAA2C;AAC3C,gDAA6C;AAC7C,kDAA+C;AAC/C,oCAA6D;AAE7D,QAAQ,CAAC,QAAQ,EAAE,KAAK;IAEpB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAGlB,IAAI,cAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,uBAAU,EAAE,CAAC,KAAK,EAAE,CAAA;IACxB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,yBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,2BAAY,EAAE,CAAC,KAAK,EAAE,CAAA;IAE1B,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IAEzB,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC5C,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QACpG,aAAM,
|
|
1
|
+
{"version":3,"file":"timing.js","sourceRoot":"","sources":["../../src/test/timing.ts"],"names":[],"mappings":";;AACA,+BAA6B;AAC7B,sCAAmC;AACnC,8CAA2C;AAC3C,gDAA6C;AAC7C,kDAA+C;AAC/C,oCAA6D;AAE7D,QAAQ,CAAC,QAAQ,EAAE,KAAK;IAEpB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAGlB,IAAI,cAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,uBAAU,EAAE,CAAC,KAAK,EAAE,CAAA;IACxB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,mBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,yBAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IACzB,IAAI,2BAAY,EAAE,CAAC,KAAK,EAAE,CAAA;IAE1B,IAAI,MAAM,GAAG,IAAI,eAAM,EAAE,CAAA;IAEzB,EAAE,CAAC,gCAAgC,EAAE,KAAK,IAAI,EAAE;QAC5C,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QACpG,IAAA,aAAM,EAAC,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;;QAChD,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,CAAA;QACnG,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;QAC5B,IAAA,aAAM,EAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;IAEtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAC9D,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,SAAS,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,CAAA;QACrG,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;;QACvD,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,CAAA;QAClI,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;QAC5B,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAA;QAC3D,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAA;QAC/C,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;;QACtC,IAAI,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAoB,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QACrI,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;QAC5B,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,aAAa,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,CAAA;QAC5D,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAA;QAChD,IAAA,aAAM,EAAC,MAAA,MAAM,CAAC,SAAS,0CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yBAAyB,EAAE,KAAK,IAAI,EAAE;;QACrC,IAAI,QAAQ,GAAG;YACX,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC;YACnF,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC;YACnF,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC;YAEnF,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YACpF,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YACpF,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YACpF,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YACpF,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;YACpF,MAAM,CAAC,OAAO,CAAoB,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;SACvF,CAAA;QACD,IAAI,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC1C,IAAI,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;QACxC,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;QACpB,IAAA,aAAM,EAAC,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,0CAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC,CAAA;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACd,OAAO,CAAC,IAAI,EAAE,CAAA;IAClB,CAAC,CAAC,CAAA;AAEN,CAAC,CAAC,CAAC"}
|
package/dist/types.d.ts
CHANGED
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,oBAAY,MAAM;IACd,MAAM,QAAQ;IACd,MAAM,QAAQ;CACjB;AAED,oBAAY,OAAO;IACf,IAAI,OAAS;IACb,KAAK,WAAS;IACd,OAAO,WAAS;IAChB,KAAK,WAAS;IACd,KAAK,WAAS;IACd,MAAM,WAAS;IACf,OAAO,WAAS;IAChB,SAAS,WAAS;IAClB,UAAU,OAAS;IACnB,QAAQ,WAAS;IACjB,OAAO,WAAS;IAChB,SAAS,WAAS;IAClB,OAAO,WAAS;IAChB,QAAQ,WAAS;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,oBAAY,MAAM;IACd,MAAM,QAAQ;IACd,MAAM,QAAQ;CACjB;AAED,oBAAY,OAAO;IACf,IAAI,OAAS;IACb,KAAK,WAAS;IACd,OAAO,WAAS;IAChB,KAAK,WAAS;IACd,KAAK,WAAS;IACd,MAAM,WAAS;IACf,OAAO,WAAS;IAChB,SAAS,WAAS;IAClB,UAAU,OAAS;IACnB,QAAQ,WAAS;IACjB,OAAO,WAAS;IAChB,SAAS,WAAS;IAClB,OAAO,WAAS;IAChB,QAAQ,WAAS;IACjB,kBAAkB,WAAS;IAC3B,iBAAiB,WAAS;CAC7B"}
|
package/dist/types.js
CHANGED
|
@@ -22,5 +22,7 @@ var Message;
|
|
|
22
22
|
Message["Subscribe"] = "\u0012";
|
|
23
23
|
Message["Publish"] = "\u0013";
|
|
24
24
|
Message["Shutdown"] = "\u0014";
|
|
25
|
+
Message["ShutdownAndRestart"] = "\u0015";
|
|
26
|
+
Message["RestartAllWorkers"] = "\u0016";
|
|
25
27
|
})(Message = exports.Message || (exports.Message = {}));
|
|
26
28
|
//# sourceMappingURL=types.js.map
|
package/dist/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AACA,IAAY,MAGX;AAHD,WAAY,MAAM;IACd,wBAAc,CAAA;IACd,wBAAc,CAAA;AAClB,CAAC,EAHW,MAAM,GAAN,cAAM,KAAN,cAAM,QAGjB;AAED,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AACA,IAAY,MAGX;AAHD,WAAY,MAAM;IACd,wBAAc,CAAA;IACd,wBAAc,CAAA;AAClB,CAAC,EAHW,MAAM,GAAN,cAAM,KAAN,cAAM,QAGjB;AAED,IAAY,OAiBX;AAjBD,WAAY,OAAO;IACf,sBAAa,CAAA;IACb,2BAAc,CAAA;IACd,6BAAgB,CAAA;IAChB,2BAAc,CAAA;IACd,2BAAc,CAAA;IACd,4BAAe,CAAA;IACf,6BAAgB,CAAA;IAChB,+BAAkB,CAAA;IAClB,4BAAmB,CAAA;IACnB,8BAAiB,CAAA;IACjB,6BAAgB,CAAA;IAChB,+BAAkB,CAAA;IAClB,6BAAgB,CAAA;IAChB,8BAAiB,CAAA;IACjB,wCAA2B,CAAA;IAC3B,uCAA0B,CAAA;AAC9B,CAAC,EAjBW,OAAO,GAAP,eAAO,KAAP,eAAO,QAiBlB"}
|
package/dist/worker.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export declare class Worker {
|
|
|
14
14
|
exit(): Promise<void>;
|
|
15
15
|
startHeartbeat(): void;
|
|
16
16
|
start(): Promise<void>;
|
|
17
|
-
onError(err: any): Promise<void>;
|
|
17
|
+
onError(err: any, req: any, opts: any): Promise<void>;
|
|
18
18
|
private processRequest;
|
|
19
19
|
private returnReply;
|
|
20
20
|
stop(): Promise<void>;
|
package/dist/worker.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAUzD,qBAAa,MAAM;IACf,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,SAAK;IACZ,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;IAC1B,aAAa,EAAE,iBAAiB,CAAA;IAChC,QAAQ,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,OAAO,CAAA;gBAEP,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAM;IAYhE,IAAI;IAYV,cAAc;IAgCR,KAAK;IAuFE,OAAO,CAAC,GAAG,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;YAMnC,cAAc;YAwDd,WAAW;IAmBnB,IAAI;IAoBJ,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;IAerC,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAG,OAAO,CAAC,kBAAkB,CAAC,GAAG,OAAO,CAAC,GAAG,GAAG;QAAC,IAAI,EAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAAC,IAAI,EAAE,GAAG,CAAA;KAAC,CAAC;CAG9H"}
|
package/dist/worker.js
CHANGED
|
@@ -14,7 +14,7 @@ class Worker {
|
|
|
14
14
|
constructor(service, config = {}) {
|
|
15
15
|
this.service = "";
|
|
16
16
|
this.service = service || this.service;
|
|
17
|
-
this.configuration = loadConfiguration_1.loadConfiguration(prefixes, config);
|
|
17
|
+
this.configuration = (0, loadConfiguration_1.loadConfiguration)(prefixes, config);
|
|
18
18
|
this.address = this.configuration.address;
|
|
19
19
|
this.lastHeartbeat = new Date().valueOf();
|
|
20
20
|
this.processing = false;
|
|
@@ -76,20 +76,25 @@ class Worker {
|
|
|
76
76
|
for await (const [blank1, header, type, client, blank2, reqId, optBuff, req] of this.socket) {
|
|
77
77
|
this.lastHeartbeat = new Date().valueOf();
|
|
78
78
|
try {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
79
|
+
switch (type.toString()) {
|
|
80
|
+
case types_1.Message.Shutdown:
|
|
81
|
+
log.status(`worker for ${this.service} received broker shutdown signal`);
|
|
82
|
+
break;
|
|
83
|
+
case types_1.Message.Heartbeat:
|
|
84
|
+
log.trace(`worker for ${this.service} received heartbeat from broker`);
|
|
85
|
+
break;
|
|
86
|
+
case types_1.Message.ShutdownAndRestart:
|
|
87
|
+
log.status(`worker for ${this.service} received ShutdownAndRestart from broker`);
|
|
88
|
+
process.exit(1);
|
|
89
|
+
break;
|
|
90
|
+
case types_1.Message.Request:
|
|
91
|
+
this.processing = true;
|
|
92
|
+
await this.processRequest(reqId, optBuff, type, req, client);
|
|
93
|
+
this.processing = false;
|
|
94
|
+
break;
|
|
95
|
+
default:
|
|
96
|
+
log.error(`worker for ${this.service} cannot process message type ${type}`, [blank1, header, type, client, blank2, reqId, optBuff, req]);
|
|
97
|
+
log.error([blank1, header, type, client, blank2, reqId, optBuff, req]);
|
|
93
98
|
}
|
|
94
99
|
}
|
|
95
100
|
catch (err) {
|
|
@@ -118,7 +123,7 @@ class Worker {
|
|
|
118
123
|
}
|
|
119
124
|
}
|
|
120
125
|
// to be implemented at the actual worker
|
|
121
|
-
async onError(err) {
|
|
126
|
+
async onError(err, req, opts) {
|
|
122
127
|
console.log('worker/onError - should override');
|
|
123
128
|
}
|
|
124
129
|
async processRequest(reqId, optBuff, type, req, client) {
|
|
@@ -127,17 +132,18 @@ class Worker {
|
|
|
127
132
|
let timeout = opts.receiveTimeout || this.configuration.receiveTimeout;
|
|
128
133
|
let responseMessageType = types_1.Message.Reply;
|
|
129
134
|
let promises = [
|
|
130
|
-
this.process(serialize_1.unpack(req, opts), opts),
|
|
131
|
-
sleep_1.sleep(timeout, new EbusReject_1.EbusRejectError("timeout", `timeout in worker for '${this.service}' after ${timeout} ms`, opts))
|
|
135
|
+
this.process((0, serialize_1.unpack)(req, opts), opts),
|
|
136
|
+
(0, sleep_1.sleep)(timeout, new EbusReject_1.EbusRejectError("timeout", `timeout in worker for '${this.service}' after ${timeout} ms`, opts))
|
|
132
137
|
];
|
|
133
138
|
let rep;
|
|
134
139
|
try {
|
|
135
140
|
rep = await Promise.race(promises);
|
|
136
141
|
if (rep instanceof EbusReject_1.EbusRejectError && rep.reason === "timeout") {
|
|
137
142
|
log.warn(`request expired at worker for '${this.service}' after ${timeout} ms with opts ${cry_helpers_1.serialize.pack(opts)}`);
|
|
138
|
-
log
|
|
143
|
+
console.log('opts', opts);
|
|
144
|
+
log.warn((0, serialize_1.unpack)(req, opts));
|
|
139
145
|
responseMessageType = types_1.Message.Timeout;
|
|
140
|
-
this.onError("timeout");
|
|
146
|
+
this.onError("timeout", (0, serialize_1.unpack)(req, opts), opts);
|
|
141
147
|
}
|
|
142
148
|
}
|
|
143
149
|
catch (err) {
|
|
@@ -152,7 +158,7 @@ class Worker {
|
|
|
152
158
|
responseMessageType = types_1.Message.Reject;
|
|
153
159
|
if (rep instanceof EbusReject_1.EbusRejectError && rep.reason === "error")
|
|
154
160
|
responseMessageType = types_1.Message.Error;
|
|
155
|
-
this.onError(err);
|
|
161
|
+
this.onError(err, (0, serialize_1.unpack)(req, opts), opts);
|
|
156
162
|
}
|
|
157
163
|
let data = rep;
|
|
158
164
|
if (rep instanceof EbusReject_1.EbusRejectError)
|
|
@@ -174,7 +180,7 @@ class Worker {
|
|
|
174
180
|
null,
|
|
175
181
|
reqId,
|
|
176
182
|
cry_helpers_1.serialize.pack(opts),
|
|
177
|
-
serialize_1.pack(data, opts),
|
|
183
|
+
(0, serialize_1.pack)(data, opts),
|
|
178
184
|
]);
|
|
179
185
|
}
|
|
180
186
|
catch (err) {
|
|
@@ -204,7 +210,7 @@ class Worker {
|
|
|
204
210
|
log.error(`worker for '${this.service}' not connected, cannot publish to ${channel}`, message);
|
|
205
211
|
return;
|
|
206
212
|
}
|
|
207
|
-
await this.socket.send([null, types_1.Header.Worker, types_1.Message.Publish, channel, serialize_1.pack(message, {})]);
|
|
213
|
+
await this.socket.send([null, types_1.Header.Worker, types_1.Message.Publish, channel, (0, serialize_1.pack)(message, {})]);
|
|
208
214
|
log.debug(`ebus worker published on '${channel}'`, message);
|
|
209
215
|
// let socket = new Request()
|
|
210
216
|
// await socket.connect(this.configuration.address)
|
package/dist/worker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":";;;AAAA,6CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cry-ebus2",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -14,20 +14,21 @@
|
|
|
14
14
|
"author": "Primož Krajnik",
|
|
15
15
|
"license": "ISC",
|
|
16
16
|
"devDependencies": {
|
|
17
|
-
"@types/node": "^
|
|
18
|
-
"typescript": "^4.
|
|
17
|
+
"@types/node": "^16.11.9",
|
|
18
|
+
"typescript": "^4.5.2"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@types/chai": "^4.2.
|
|
22
|
-
"@types/mocha": "^
|
|
23
|
-
"@types/pako": "^1.0.
|
|
24
|
-
"chai": "^4.
|
|
21
|
+
"@types/chai": "^4.2.22",
|
|
22
|
+
"@types/mocha": "^9.0.0",
|
|
23
|
+
"@types/pako": "^1.0.2",
|
|
24
|
+
"chai": "^4.3.4",
|
|
25
25
|
"commander": "^6.2.1",
|
|
26
|
-
"cry-helpers": "^2.1.
|
|
27
|
-
"dotenv": "^
|
|
28
|
-
"mocha": "^
|
|
29
|
-
"
|
|
30
|
-
"
|
|
26
|
+
"cry-helpers": "^2.1.35",
|
|
27
|
+
"dotenv": "^10.0.0",
|
|
28
|
+
"mocha": "^9.1.3",
|
|
29
|
+
"notepack.io": "^2.3.0",
|
|
30
|
+
"pako": "^2.0.4",
|
|
31
|
+
"tiny-typed-emitter": "^2.1.0",
|
|
31
32
|
"zeromq": "^6.0.0-beta.6"
|
|
32
33
|
}
|
|
33
34
|
}
|
package/src/EbusConfiguration.ts
CHANGED
|
@@ -10,6 +10,7 @@ export interface EbusConfiguration {
|
|
|
10
10
|
receiveTimeout: number;
|
|
11
11
|
heartbeatInterval: number;
|
|
12
12
|
heartbeatTimeout: number;
|
|
13
|
+
brokerHeartbeatTimeout: number;
|
|
13
14
|
clientChecksBrokerWithHeartbeat: boolean;
|
|
14
15
|
brokerChecksWorkersWithHeartbeat: boolean;
|
|
15
16
|
requestQueueSizeLimit: number;
|
package/src/broker.ts
CHANGED
|
@@ -25,7 +25,6 @@ export class Broker {
|
|
|
25
25
|
process.on("SIGABRT", async () => { await this.exit() })
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
|
|
29
28
|
async exit()
|
|
30
29
|
{
|
|
31
30
|
setInterval(() => {
|
|
@@ -49,9 +48,10 @@ export class Broker {
|
|
|
49
48
|
for (let [name, service] of this.services) {
|
|
50
49
|
for (let [key, val] of service.heartbeats) {
|
|
51
50
|
let since = now - val
|
|
52
|
-
if (since > this.configuration.
|
|
51
|
+
if (since > this.configuration.brokerHeartbeatTimeout) {
|
|
53
52
|
let worker = service.workers.get(key)
|
|
54
53
|
if (worker) {
|
|
54
|
+
log.error(`broker removing time-outted worker for ${service.name}`)
|
|
55
55
|
log.status(`broker removing time-outted worker for ${service.name}`)
|
|
56
56
|
this.deregister(worker)
|
|
57
57
|
this.publishWorkersAndServices()
|
|
@@ -157,11 +157,46 @@ export class Broker {
|
|
|
157
157
|
await this.publisher.send([channel, message])
|
|
158
158
|
//await this.socket.send([client, null, Header.Client, "ok" ])
|
|
159
159
|
break;
|
|
160
|
+
case Message.RestartAllWorkers:
|
|
161
|
+
await this.restartAllWorkers(rest?.[0]?.toString());
|
|
162
|
+
break;
|
|
160
163
|
default:
|
|
161
164
|
log.error(`Unknow message request from client`, messageType)
|
|
162
165
|
}
|
|
163
166
|
}
|
|
164
167
|
|
|
168
|
+
async restartAllWorkers(whom:string) {
|
|
169
|
+
|
|
170
|
+
console.log(`broker restarting ${whom} workers`)
|
|
171
|
+
log.status(`broker restarting ${whom} workers`)
|
|
172
|
+
|
|
173
|
+
whom = whom?.toLowerCase();
|
|
174
|
+
for (let [name, service] of this.services) {
|
|
175
|
+
if (whom === "all" || whom === name.toLowerCase()) {
|
|
176
|
+
for (let [_, worker] of service.workers) {
|
|
177
|
+
log.debug(`send ShutdownAndRestart to worker ${name}`, worker)
|
|
178
|
+
|
|
179
|
+
// request worker to shutdown and
|
|
180
|
+
this.socket.sendTimeout = 100;
|
|
181
|
+
this.socket.send([
|
|
182
|
+
worker,
|
|
183
|
+
null,
|
|
184
|
+
Header.Worker,
|
|
185
|
+
Message.ShutdownAndRestart,
|
|
186
|
+
null,
|
|
187
|
+
null,
|
|
188
|
+
null,
|
|
189
|
+
]).catch(err => {
|
|
190
|
+
log.error(`error sending ShutdownAndRestart from deregister: ${err.message}`)
|
|
191
|
+
})
|
|
192
|
+
|
|
193
|
+
this.deregister(worker);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
};
|
|
197
|
+
|
|
198
|
+
}
|
|
199
|
+
|
|
165
200
|
async handleWorker(type: Buffer, worker?: Buffer, ...rest: Buffer[]) {
|
|
166
201
|
|
|
167
202
|
switch (type && type.toString()) {
|
package/src/clientNonBlocking.ts
CHANGED
|
@@ -69,6 +69,14 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
|
|
|
69
69
|
return serialize.unpack(services);
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
+
async restartAllWorkers(whom:string) {
|
|
73
|
+
let receiveTimeout = this.configuration.receiveTimeout;
|
|
74
|
+
let socket = new Request({ receiveTimeout })
|
|
75
|
+
await socket.connect(this.configuration.address)
|
|
76
|
+
await socket.send([Header.Client, Message.RestartAllWorkers, whom])
|
|
77
|
+
log.debug(`ebus client requested restart ${whom} workers with receiveTimeout ${receiveTimeout}`)
|
|
78
|
+
}
|
|
79
|
+
|
|
72
80
|
async workers() {
|
|
73
81
|
let receiveTimeout = this.configuration.receiveTimeout;
|
|
74
82
|
let socket = new Request({ receiveTimeout })
|
package/src/consts.ts
CHANGED
|
@@ -11,7 +11,8 @@ export const defaults: EbusConfiguration = {
|
|
|
11
11
|
receiveTimeout: 2000,
|
|
12
12
|
heartbeatInterval: 400,
|
|
13
13
|
heartbeatTimeout: 10000,
|
|
14
|
+
brokerHeartbeatTimeout: 15000,
|
|
14
15
|
clientChecksBrokerWithHeartbeat: true,
|
|
15
|
-
brokerChecksWorkersWithHeartbeat:
|
|
16
|
+
brokerChecksWorkersWithHeartbeat: true,
|
|
16
17
|
requestQueueSizeLimit: 500,
|
|
17
18
|
}
|
package/src/index.ts
CHANGED
package/src/run/all.ts
CHANGED
package/src/run/call.ts
CHANGED