cry-ebus2 3.1.2 → 3.1.3
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/EbusClientEvents.js +1 -2
- package/dist/EbusConfiguration.js +1 -2
- package/dist/EbusReject.js +1 -5
- package/dist/EbusReject.js.map +1 -1
- package/dist/EbusRejectReason.js +1 -2
- package/dist/EbusRequestOptions.js +1 -2
- package/dist/EbusUnpackedResult.d.ts +1 -1
- package/dist/EbusUnpackedResult.js +8 -12
- package/dist/EbusUnpackedResult.js.map +1 -1
- package/dist/block.js +1 -5
- package/dist/block.js.map +1 -1
- package/dist/broker.d.ts +2 -2
- package/dist/broker.js +42 -46
- package/dist/broker.js.map +1 -1
- package/dist/client.js +1 -5
- package/dist/client.js.map +1 -1
- package/dist/clientBlocking.js +35 -39
- package/dist/clientBlocking.js.map +1 -1
- package/dist/clientNonBlocking.js +44 -51
- package/dist/clientNonBlocking.js.map +1 -1
- package/dist/consts.js +1 -4
- package/dist/consts.js.map +1 -1
- package/dist/delayWorker.js +6 -10
- package/dist/delayWorker.js.map +1 -1
- package/dist/echoWorker.js +4 -8
- package/dist/echoWorker.js.map +1 -1
- package/dist/errorWorker.js +6 -10
- package/dist/errorWorker.js.map +1 -1
- package/dist/index.js +15 -33
- package/dist/index.js.map +1 -1
- package/dist/loadConfiguration.js +4 -8
- package/dist/loadConfiguration.js.map +1 -1
- package/dist/pub.js +9 -13
- package/dist/pub.js.map +1 -1
- package/dist/rejectWorker.js +6 -10
- package/dist/rejectWorker.js.map +1 -1
- package/dist/run/all.js +12 -14
- package/dist/run/all.js.map +1 -1
- package/dist/run/call.js +13 -15
- package/dist/run/call.js.map +1 -1
- package/dist/run/calling.js +6 -8
- package/dist/run/calling.js.map +1 -1
- package/dist/run/callingBurst.js +6 -8
- package/dist/run/callingBurst.js.map +1 -1
- package/dist/run/pub.js +6 -8
- package/dist/run/pub.js.map +1 -1
- package/dist/run/reject.js +4 -6
- package/dist/run/reject.js.map +1 -1
- package/dist/run/sub.js +12 -17
- package/dist/run/sub.js.map +1 -1
- package/dist/run/termimalCommands.js +1 -3
- package/dist/run/termimalCommands.js.map +1 -1
- package/dist/run/workers.js +6 -8
- package/dist/run/workers.js.map +1 -1
- package/dist/serialize.js +11 -19
- package/dist/serialize.js.map +1 -1
- package/dist/service.d.ts +1 -1
- package/dist/service.js +9 -13
- package/dist/service.js.map +1 -1
- package/dist/sleep.js +1 -5
- package/dist/sleep.js.map +1 -1
- package/dist/sub.d.ts +1 -1
- package/dist/sub.js +10 -14
- package/dist/sub.js.map +1 -1
- package/dist/test/config.js +10 -12
- package/dist/test/config.js.map +1 -1
- package/dist/test/echo.js +19 -21
- package/dist/test/echo.js.map +1 -1
- package/dist/test/index.js +1 -2
- package/dist/test/index.js.map +1 -1
- package/dist/test/pack.js +33 -35
- package/dist/test/pack.js.map +1 -1
- package/dist/test/performance.js +7 -9
- package/dist/test/performance.js.map +1 -1
- package/dist/test/pub.js +14 -16
- package/dist/test/pub.js.map +1 -1
- package/dist/test/pub2.js +8 -10
- package/dist/test/pub2.js.map +1 -1
- package/dist/test/reject.js +16 -18
- package/dist/test/reject.js.map +1 -1
- package/dist/test/services.js +19 -21
- package/dist/test/services.js.map +1 -1
- package/dist/test/stress.js +7 -9
- package/dist/test/stress.js.map +1 -1
- package/dist/test/timing.js +27 -29
- package/dist/test/timing.js.map +1 -1
- package/dist/types.js +4 -7
- package/dist/types.js.map +1 -1
- package/dist/worker.d.ts +1 -1
- package/dist/worker.js +43 -47
- package/dist/worker.js.map +1 -1
- package/package.json +3 -2
package/dist/test/services.js
CHANGED
|
@@ -1,43 +1,41 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const echoWorker_js_1 = require("../echoWorker.js");
|
|
6
|
-
const index_js_1 = require("../index.js");
|
|
1
|
+
import { expect } from "chai";
|
|
2
|
+
import { Client } from "../client.js";
|
|
3
|
+
import { EchoWorker } from "../echoWorker.js";
|
|
4
|
+
import { Broker, DelayWorker } from "../index.js";
|
|
7
5
|
describe('services', async function () {
|
|
8
6
|
this.timeout(4000);
|
|
9
|
-
let client = new
|
|
7
|
+
let client = new Client();
|
|
10
8
|
let echo = undefined;
|
|
11
9
|
it('should start services', async () => {
|
|
12
|
-
new
|
|
13
|
-
echo = new
|
|
10
|
+
new Broker().start();
|
|
11
|
+
echo = new EchoWorker();
|
|
14
12
|
echo.start();
|
|
15
|
-
new
|
|
16
|
-
new
|
|
17
|
-
new
|
|
13
|
+
new DelayWorker().start();
|
|
14
|
+
new DelayWorker().start();
|
|
15
|
+
new DelayWorker().start();
|
|
18
16
|
});
|
|
19
17
|
it('should return services', async () => {
|
|
20
18
|
let rep = await client.services();
|
|
21
19
|
console.log('rep', rep);
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
expect(rep.find((n) => n.name === "echo").nWorkers).to.eq(1);
|
|
21
|
+
expect(rep.find((n) => n.name === "delay").nWorkers).to.eq(3);
|
|
24
22
|
});
|
|
25
23
|
it('should return workers', async () => {
|
|
26
24
|
let rep = await client.workers();
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
25
|
+
expect(rep).to.include("delay");
|
|
26
|
+
expect(rep).to.include("echo");
|
|
27
|
+
expect(rep).to.not.include("xxx");
|
|
30
28
|
});
|
|
31
29
|
it('should not return stopped workers', async () => {
|
|
32
30
|
await echo.stop();
|
|
33
31
|
let rep = await client.workers();
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
32
|
+
expect(rep).to.include("delay");
|
|
33
|
+
expect(rep).to.not.include("echo");
|
|
34
|
+
expect(rep).to.not.include("xxx");
|
|
37
35
|
});
|
|
38
36
|
it('should reject non-existing service', async () => {
|
|
39
37
|
let rep = await client.request("x", null);
|
|
40
|
-
|
|
38
|
+
expect(rep).to.be.undefined;
|
|
41
39
|
});
|
|
42
40
|
it('exists', () => {
|
|
43
41
|
process.exit();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/test/services.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"services.js","sourceRoot":"","sources":["../../src/test/services.ts"],"names":[],"mappings":"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"}
|
package/dist/test/stress.js
CHANGED
|
@@ -1,13 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const client_js_1 = require("../client.js");
|
|
5
|
-
const index_js_1 = require("../index.js");
|
|
1
|
+
import { expect } from "chai";
|
|
2
|
+
import { Client } from "../client.js";
|
|
3
|
+
import { Broker, DelayWorker } from "../index.js";
|
|
6
4
|
describe('stress', async function () {
|
|
7
5
|
this.timeout(10000);
|
|
8
|
-
new
|
|
9
|
-
new
|
|
10
|
-
let client = new
|
|
6
|
+
new Broker().start();
|
|
7
|
+
new DelayWorker().start();
|
|
8
|
+
let client = new Client();
|
|
11
9
|
let bigRequest = Array(10 * 1000);
|
|
12
10
|
for (let i = 0; i < bigRequest.length; i++)
|
|
13
11
|
bigRequest[i] = { i };
|
|
@@ -19,7 +17,7 @@ describe('stress', async function () {
|
|
|
19
17
|
let resolved = await Promise.all(promises);
|
|
20
18
|
let ok = resolved.filter(f => f).length;
|
|
21
19
|
console.log('ok', ok, "of", promises.length);
|
|
22
|
-
|
|
20
|
+
expect(ok > promises.length / 5).to.be.true;
|
|
23
21
|
});
|
|
24
22
|
it('exit', () => {
|
|
25
23
|
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":"
|
|
1
|
+
{"version":3,"file":"stress.js","sourceRoot":"","sources":["../../src/test/stress.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAgB,MAAM,aAAa,CAAC;AAEhE,QAAQ,CAAC,QAAQ,EAAE,KAAK;IAEpB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAEnB,IAAI,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IACpB,IAAI,WAAW,EAAE,CAAC,KAAK,EAAE,CAAA;IAEzB,IAAI,MAAM,GAAG,IAAI,MAAM,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,MAAM,CAAE,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
|
@@ -1,49 +1,47 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
const rejectWorker_js_1 = require("../rejectWorker.js");
|
|
8
|
-
const index_js_1 = require("../index.js");
|
|
1
|
+
import { expect } from "chai";
|
|
2
|
+
import { Client } from "../client.js";
|
|
3
|
+
import { EchoWorker } from "../echoWorker.js";
|
|
4
|
+
import { ErrorWorker } from "../errorWorker.js";
|
|
5
|
+
import { RejectWorker } from "../rejectWorker.js";
|
|
6
|
+
import { Broker, DelayWorker } from "../index.js";
|
|
9
7
|
describe('timing', async function () {
|
|
10
8
|
this.timeout(4000);
|
|
11
|
-
new
|
|
12
|
-
new
|
|
13
|
-
new
|
|
14
|
-
new
|
|
15
|
-
new
|
|
16
|
-
new
|
|
17
|
-
let client = new
|
|
9
|
+
new Broker().start();
|
|
10
|
+
new EchoWorker().start();
|
|
11
|
+
new DelayWorker().start();
|
|
12
|
+
new DelayWorker().start();
|
|
13
|
+
new ErrorWorker().start();
|
|
14
|
+
new RejectWorker().start();
|
|
15
|
+
let client = new Client();
|
|
18
16
|
it('should return passed-in object', async () => {
|
|
19
17
|
let rep = await client.request("delay", { delay: 100 }, { receiveTimeout: 1000 });
|
|
20
|
-
|
|
18
|
+
expect(rep === null || rep === void 0 ? void 0 : rep.delay).to.eq(100);
|
|
21
19
|
});
|
|
22
20
|
it('should not return passed-in object', async () => {
|
|
23
21
|
var _a;
|
|
24
22
|
let rep = await client.request("delay", { delay: 200 }, { receiveTimeout: 100 });
|
|
25
|
-
|
|
26
|
-
|
|
23
|
+
expect(rep).to.eq(undefined);
|
|
24
|
+
expect((_a = client === null || client === void 0 ? void 0 : client.lastError) === null || _a === void 0 ? void 0 : _a.reason).to.eq("timeout");
|
|
27
25
|
});
|
|
28
26
|
it('should not return object for non-existing worker', async () => {
|
|
29
27
|
let rep = await client.request("delayxx", { delay: 200 }, { receiveTimeout: 100 });
|
|
30
|
-
|
|
28
|
+
expect(rep).to.eq(undefined);
|
|
31
29
|
});
|
|
32
30
|
it('should not return data if error in worker', async () => {
|
|
33
31
|
var _a, _b, _c;
|
|
34
32
|
let rep = await client.request("error", { delay: 50, message: "test error", more: 1 }, { receiveTimeout: 100 });
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
33
|
+
expect(rep).to.eq(undefined);
|
|
34
|
+
expect((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("test error");
|
|
35
|
+
expect((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.reason).to.eq("error");
|
|
36
|
+
expect((_c = client.lastError) === null || _c === void 0 ? void 0 : _c.more).to.eq(1);
|
|
39
37
|
});
|
|
40
38
|
it('should not return reject', async () => {
|
|
41
39
|
var _a, _b, _c;
|
|
42
40
|
let rep = await client.request("reject", { delay: 50, message: "test reject", more: 1 }, { receiveTimeout: 1000 });
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
41
|
+
expect(rep).to.eq(undefined);
|
|
42
|
+
expect((_a = client.lastError) === null || _a === void 0 ? void 0 : _a.rejectMessage).to.eq("test reject");
|
|
43
|
+
expect((_b = client.lastError) === null || _b === void 0 ? void 0 : _b.reason).to.eq("reject");
|
|
44
|
+
expect((_c = client.lastError) === null || _c === void 0 ? void 0 : _c.more).to.eq(1);
|
|
47
45
|
});
|
|
48
46
|
it('should not block worker', async () => {
|
|
49
47
|
var _a;
|
|
@@ -60,8 +58,8 @@ describe('timing', async function () {
|
|
|
60
58
|
];
|
|
61
59
|
let resolved = await Promise.all(promises);
|
|
62
60
|
let cnt = resolved.filter(a => a).length;
|
|
63
|
-
|
|
64
|
-
|
|
61
|
+
expect(cnt).to.eq(6);
|
|
62
|
+
expect((_a = client === null || client === void 0 ? void 0 : client.lastError) === null || _a === void 0 ? void 0 : _a.reason).to.eq("timeout");
|
|
65
63
|
});
|
|
66
64
|
it('exists', () => {
|
|
67
65
|
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":"
|
|
1
|
+
{"version":3,"file":"timing.js","sourceRoot":"","sources":["../../src/test/timing.ts"],"names":[],"mappings":"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"}
|
package/dist/types.js
CHANGED
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Message = exports.Header = void 0;
|
|
4
|
-
var Header;
|
|
1
|
+
export var Header;
|
|
5
2
|
(function (Header) {
|
|
6
3
|
Header["Client"] = "C01";
|
|
7
4
|
Header["Worker"] = "W01";
|
|
8
|
-
})(Header =
|
|
9
|
-
var Message;
|
|
5
|
+
})(Header = Header || (Header = {}));
|
|
6
|
+
export var Message;
|
|
10
7
|
(function (Message) {
|
|
11
8
|
Message["None"] = "\0";
|
|
12
9
|
Message["Ready"] = "\u0001";
|
|
@@ -24,5 +21,5 @@ var Message;
|
|
|
24
21
|
Message["Shutdown"] = "\u0014";
|
|
25
22
|
Message["ShutdownAndRestart"] = "\u0015";
|
|
26
23
|
Message["RestartAllWorkers"] = "\u0016";
|
|
27
|
-
})(Message =
|
|
24
|
+
})(Message = Message || (Message = {}));
|
|
28
25
|
//# 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":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,MAAM,CAAN,IAAY,MAGX;AAHD,WAAY,MAAM;IACd,wBAAc,CAAA;IACd,wBAAc,CAAA;AAClB,CAAC,EAHW,MAAM,GAAN,MAAM,KAAN,MAAM,QAGjB;AAED,MAAM,CAAN,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,OAAO,KAAP,OAAO,QAiBlB"}
|
package/dist/worker.d.ts
CHANGED
package/dist/worker.js
CHANGED
|
@@ -1,20 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const serialize_js_1 = require("./serialize.js");
|
|
9
|
-
const sleep_js_1 = require("./sleep.js");
|
|
10
|
-
const EbusReject_js_1 = require("./EbusReject.js");
|
|
1
|
+
import { Log, serialize } from "cry-helpers";
|
|
2
|
+
import { Dealer } from "zeromq";
|
|
3
|
+
import { loadConfiguration } from "./loadConfiguration.js";
|
|
4
|
+
import { Header, Message } from "./types.js";
|
|
5
|
+
import { pack, unpack } from "./serialize.js";
|
|
6
|
+
import { sleep } from "./sleep.js";
|
|
7
|
+
import { EbusRejectError } from "./EbusReject.js";
|
|
11
8
|
const prefixes = ["EBUS_WORKER", "EBUS"];
|
|
12
|
-
const log = new
|
|
13
|
-
class Worker {
|
|
9
|
+
const log = new Log(prefixes);
|
|
10
|
+
export class Worker {
|
|
14
11
|
constructor(service, config = {}) {
|
|
15
12
|
this.service = "";
|
|
16
13
|
this.service = service || this.service;
|
|
17
|
-
this.configuration =
|
|
14
|
+
this.configuration = loadConfiguration(prefixes, config);
|
|
18
15
|
this.address = this.configuration.address;
|
|
19
16
|
this.lastHeartbeat = new Date().valueOf();
|
|
20
17
|
this.processing = false;
|
|
@@ -44,7 +41,7 @@ class Worker {
|
|
|
44
41
|
try {
|
|
45
42
|
try {
|
|
46
43
|
if (this.socket) {
|
|
47
|
-
await this.socket.send([null,
|
|
44
|
+
await this.socket.send([null, Header.Worker, Message.Heartbeat, this.service, null, null]);
|
|
48
45
|
}
|
|
49
46
|
}
|
|
50
47
|
catch (err) {
|
|
@@ -66,10 +63,10 @@ class Worker {
|
|
|
66
63
|
async start() {
|
|
67
64
|
log.debug(`worker for ${this.service} is starting`);
|
|
68
65
|
const loop = async () => {
|
|
69
|
-
this.socket = new
|
|
66
|
+
this.socket = new Dealer();
|
|
70
67
|
this.socket.reconnectInterval = 100;
|
|
71
68
|
await this.socket.connect(this.configuration.address);
|
|
72
|
-
await this.socket.send([null,
|
|
69
|
+
await this.socket.send([null, Header.Worker, Message.Ready, this.service]);
|
|
73
70
|
await this.socket.receive();
|
|
74
71
|
log.status(`started worker for ${this.service} on ${this.configuration.address}`);
|
|
75
72
|
this.startHeartbeat();
|
|
@@ -77,17 +74,17 @@ class Worker {
|
|
|
77
74
|
this.lastHeartbeat = new Date().valueOf();
|
|
78
75
|
try {
|
|
79
76
|
switch (type.toString()) {
|
|
80
|
-
case
|
|
77
|
+
case Message.Shutdown:
|
|
81
78
|
log.status(`worker for ${this.service} received broker shutdown signal`);
|
|
82
79
|
break;
|
|
83
|
-
case
|
|
80
|
+
case Message.Heartbeat:
|
|
84
81
|
log.trace(`worker for ${this.service} received heartbeat from broker`);
|
|
85
82
|
break;
|
|
86
|
-
case
|
|
83
|
+
case Message.ShutdownAndRestart:
|
|
87
84
|
log.status(`worker for ${this.service} received ShutdownAndRestart from broker`);
|
|
88
85
|
process.exit(1);
|
|
89
86
|
break;
|
|
90
|
-
case
|
|
87
|
+
case Message.Request:
|
|
91
88
|
this.processing = true;
|
|
92
89
|
await this.processRequest(reqId, optBuff, type, req, client);
|
|
93
90
|
this.processing = false;
|
|
@@ -127,41 +124,41 @@ class Worker {
|
|
|
127
124
|
console.log('worker/onError - should override');
|
|
128
125
|
}
|
|
129
126
|
async processRequest(reqId, optBuff, type, req, client) {
|
|
130
|
-
let opts =
|
|
127
|
+
let opts = serialize.unpack(optBuff);
|
|
131
128
|
log.debug(`worker for ${this.service} received request ${type} with opts`, opts);
|
|
132
129
|
let timeout = opts.receiveTimeout || this.configuration.receiveTimeout;
|
|
133
|
-
let responseMessageType =
|
|
130
|
+
let responseMessageType = Message.Reply;
|
|
134
131
|
let promises = [
|
|
135
|
-
this.process(
|
|
136
|
-
|
|
132
|
+
this.process(unpack(req, opts), opts),
|
|
133
|
+
sleep(timeout, new EbusRejectError("timeout", `timeout in worker for '${this.service}' after ${timeout} ms`, opts))
|
|
137
134
|
];
|
|
138
135
|
let rep;
|
|
139
136
|
try {
|
|
140
137
|
rep = await Promise.race(promises);
|
|
141
|
-
if (rep instanceof
|
|
142
|
-
log.warn(`request expired at worker for '${this.service}' after ${timeout} ms with opts ${
|
|
138
|
+
if (rep instanceof EbusRejectError && rep.reason === "timeout") {
|
|
139
|
+
log.warn(`request expired at worker for '${this.service}' after ${timeout} ms with opts ${serialize.pack(opts)}`);
|
|
143
140
|
console.log('opts', opts);
|
|
144
|
-
log.warn(
|
|
145
|
-
responseMessageType =
|
|
146
|
-
this.onError("timeout",
|
|
141
|
+
log.warn(unpack(req, opts));
|
|
142
|
+
responseMessageType = Message.Timeout;
|
|
143
|
+
this.onError("timeout", unpack(req, opts), opts);
|
|
147
144
|
}
|
|
148
145
|
}
|
|
149
146
|
catch (err) {
|
|
150
147
|
rep = err;
|
|
151
|
-
if (!(rep instanceof
|
|
152
|
-
rep = new
|
|
153
|
-
responseMessageType =
|
|
148
|
+
if (!(rep instanceof EbusRejectError)) {
|
|
149
|
+
rep = new EbusRejectError("error", `error in worker for '${this.service}' process method: '${err.message}'`, err);
|
|
150
|
+
responseMessageType = Message.Error;
|
|
154
151
|
}
|
|
155
|
-
if (rep instanceof
|
|
156
|
-
responseMessageType =
|
|
157
|
-
if (rep instanceof
|
|
158
|
-
responseMessageType =
|
|
159
|
-
if (rep instanceof
|
|
160
|
-
responseMessageType =
|
|
161
|
-
this.onError(err,
|
|
152
|
+
if (rep instanceof EbusRejectError && rep.reason === "timeout")
|
|
153
|
+
responseMessageType = Message.Timeout;
|
|
154
|
+
if (rep instanceof EbusRejectError && rep.reason === "reject")
|
|
155
|
+
responseMessageType = Message.Reject;
|
|
156
|
+
if (rep instanceof EbusRejectError && rep.reason === "error")
|
|
157
|
+
responseMessageType = Message.Error;
|
|
158
|
+
this.onError(err, unpack(req, opts), opts);
|
|
162
159
|
}
|
|
163
160
|
let data = rep;
|
|
164
|
-
if (rep instanceof
|
|
161
|
+
if (rep instanceof EbusRejectError)
|
|
165
162
|
opts = { zip: false, raw: false, returningError: true, };
|
|
166
163
|
if ((rep === null || rep === void 0 ? void 0 : rep.data) !== undefined && (rep === null || rep === void 0 ? void 0 : rep.opts) !== undefined) {
|
|
167
164
|
opts = req.opts;
|
|
@@ -174,13 +171,13 @@ class Worker {
|
|
|
174
171
|
try {
|
|
175
172
|
await this.socket.send([
|
|
176
173
|
null,
|
|
177
|
-
|
|
174
|
+
Header.Worker,
|
|
178
175
|
responseMessageType,
|
|
179
176
|
client,
|
|
180
177
|
null,
|
|
181
178
|
reqId,
|
|
182
|
-
|
|
183
|
-
|
|
179
|
+
serialize.pack(opts),
|
|
180
|
+
pack(data, opts),
|
|
184
181
|
]);
|
|
185
182
|
}
|
|
186
183
|
catch (err) {
|
|
@@ -197,8 +194,8 @@ class Worker {
|
|
|
197
194
|
if (this.socket && !this.socket.closed) {
|
|
198
195
|
await this.socket.send([
|
|
199
196
|
null,
|
|
200
|
-
|
|
201
|
-
|
|
197
|
+
Header.Worker,
|
|
198
|
+
Message.Disconnect,
|
|
202
199
|
this.service,
|
|
203
200
|
]);
|
|
204
201
|
log.debug(`worker for ${this.service} is closing socket`);
|
|
@@ -210,7 +207,7 @@ class Worker {
|
|
|
210
207
|
log.error(`worker for '${this.service}' not connected, cannot publish to ${channel}`, message);
|
|
211
208
|
return;
|
|
212
209
|
}
|
|
213
|
-
await this.socket.send([null,
|
|
210
|
+
await this.socket.send([null, Header.Worker, Message.Publish, channel, pack(message, {})]);
|
|
214
211
|
log.debug(`ebus worker published on '${channel}'`, message);
|
|
215
212
|
// let socket = new Request()
|
|
216
213
|
// await socket.connect(this.configuration.address)
|
|
@@ -222,5 +219,4 @@ class Worker {
|
|
|
222
219
|
throw new Error(`worker for service ${this.service} must implement process()`);
|
|
223
220
|
}
|
|
224
221
|
}
|
|
225
|
-
exports.Worker = Worker;
|
|
226
222
|
//# sourceMappingURL=worker.js.map
|
package/dist/worker.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../src/worker.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cry-ebus2",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.3",
|
|
4
4
|
"description": "",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"main": "./dist/index.js",
|
|
6
7
|
"types": "./dist/index.d.ts",
|
|
7
8
|
"scripts": {
|
|
@@ -29,7 +30,7 @@
|
|
|
29
30
|
"chai": "^4.3.6",
|
|
30
31
|
"commander": "^9.4.0",
|
|
31
32
|
"cry-crm-logic": "^2.0.1",
|
|
32
|
-
"cry-helpers": "^2.1.
|
|
33
|
+
"cry-helpers": "^2.1.65",
|
|
33
34
|
"dotenv": "^16.0.1",
|
|
34
35
|
"mocha": "^10.0.0",
|
|
35
36
|
"notepack.io": "^3.0.1",
|