cry-ebus2 4.0.1 → 4.0.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.
@@ -0,0 +1,8 @@
1
+ {
2
+ "permissions": {
3
+ "allow": [
4
+ "Bash(git add:*)",
5
+ "Bash(git commit:*)"
6
+ ]
7
+ }
8
+ }
package/dist/broker.d.mts CHANGED
@@ -1,7 +1,6 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
2
  /// <reference types="node" resolution-mode="require"/>
3
3
  /// <reference types="node" resolution-mode="require"/>
4
- /// <reference types="bun-types" resolution-mode="require"/>
5
4
  import { Publisher, Router } from "zeromq";
6
5
  import { EbusConfiguration } from "./EbusConfiguration.mjs";
7
6
  import { Service } from "./service.mjs";
@@ -1 +1 @@
1
- {"version":3,"file":"broker.d.mts","sourceRoot":"","sources":["../src/broker.mts"],"names":[],"mappings":";;;;AACA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAI3D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAOvC,qBAAa,MAAM;IACf,MAAM,EAAE,MAAM,CAAuD;IACrE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAY;IAC1C,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;IACxC,aAAa,EAAE,iBAAiB,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,GAAG,SAAS,CAAA;gBAExC,aAAa,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAQpD,IAAI;IAaV,uBAAuB;IA+BjB,KAAK;IAmCL,IAAI;IAyBJ,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;IAoCnE,iBAAiB,CAAC,IAAI,EAAC,MAAM;IAgC7B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;YAuCrD,yBAAyB;IAKvC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAKlC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAM1G,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE;IAOlF,UAAU,CAAC,MAAM,EAAE,MAAM;IAMzB,wBAAwB,CAAC,MAAM,EAAE,MAAM;IAKvC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAa7C,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIxC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAIhD,qBAAqB;IAOrB,iBAAiB;;;;;IAYjB,eAAe;;;;;CAWlB"}
1
+ {"version":3,"file":"broker.d.mts","sourceRoot":"","sources":["../src/broker.mts"],"names":[],"mappings":";;;AACA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAI3D,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAMvC,qBAAa,MAAM;IACf,MAAM,EAAE,MAAM,CAAuD;IACrE,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAY;IAC1C,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;IACxC,aAAa,EAAE,iBAAiB,CAAA;IAChC,SAAS,EAAE,SAAS,CAAA;IACpB,QAAQ,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,GAAG,SAAS,CAAA;gBAExC,aAAa,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAQpD,IAAI;IAaV,uBAAuB;IA8BjB,KAAK;IAmCL,IAAI;IAyBJ,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;IAoCnE,iBAAiB,CAAC,IAAI,EAAC,MAAM;IAkC7B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;YAuCrD,yBAAyB;IAKvC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAKlC,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAM1G,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE;IAOlF,UAAU,CAAC,MAAM,EAAE,MAAM;IAMzB,wBAAwB,CAAC,MAAM,EAAE,MAAM;IAKvC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAa7C,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAIxC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAIhD,qBAAqB;IAOrB,iBAAiB;;;;;IAYjB,eAAe;;;;;CAWlB"}
package/dist/broker.mjs CHANGED
@@ -18,7 +18,7 @@ export class Broker {
18
18
  process.on("SIGABRT", async () => { await this.exit(); });
19
19
  }
20
20
  async exit() {
21
- setInterval(() => {
21
+ setTimeout(() => {
22
22
  log.error(`broker stopped forcefully`);
23
23
  process.exit(1);
24
24
  }, 1000);
@@ -41,8 +41,7 @@ export class Broker {
41
41
  if (since > this.configuration.brokerHeartbeatTimeout) {
42
42
  let worker = service.workers.get(key);
43
43
  if (worker) {
44
- log.error(`broker removing time-outted worker for ${service.name}`);
45
- log.status(`broker removing time-outted worker for ${service.name}`);
44
+ log.status(`broker removing timed-out worker for ${service.name}`);
46
45
  this.deregister(worker);
47
46
  this.publishWorkersAndServices();
48
47
  }
@@ -63,7 +62,7 @@ export class Broker {
63
62
  await this.socket.bind(this.configuration.address);
64
63
  await this.publisher.bind(this.configuration.pubAddress);
65
64
  log.status(`started broker on ${this.configuration.address}`);
66
- log.status(`publisher ready on ${this.configuration.address}`);
65
+ log.status(`publisher ready on ${this.configuration.pubAddress}`);
67
66
  await this.publisher.send(['ebus/start', pack(new Date(), {})]);
68
67
  if (this.configuration.brokerChecksWorkersWithHeartbeat)
69
68
  this.checkWorkersOnHeartbeat();
@@ -87,7 +86,7 @@ export class Broker {
87
86
  }
88
87
  }
89
88
  };
90
- loop();
89
+ await loop();
91
90
  }
92
91
  async stop() {
93
92
  if (this.interval)
@@ -154,19 +153,22 @@ export class Broker {
154
153
  if (whom === "all" || whom === name.toLowerCase()) {
155
154
  for (let [_, worker] of service.workers) {
156
155
  log.debug(`send ShutdownAndRestart to worker ${name}`, worker);
157
- // request worker to shutdown and
156
+ // request worker to shutdown and restart
158
157
  this.socket.sendTimeout = 100;
159
- this.socket.send([
160
- worker,
161
- null,
162
- Header.Worker,
163
- Message.ShutdownAndRestart,
164
- null,
165
- null,
166
- null,
167
- ]).catch(err => {
168
- log.error(`error sending ShutdownAndRestart from deregister: ${err.message}`);
169
- });
158
+ try {
159
+ await this.socket.send([
160
+ worker,
161
+ null,
162
+ Header.Worker,
163
+ Message.ShutdownAndRestart,
164
+ null,
165
+ null,
166
+ null,
167
+ ]);
168
+ }
169
+ catch (err) {
170
+ log.error(`error sending ShutdownAndRestart: ${err.message}`);
171
+ }
170
172
  this.deregister(worker);
171
173
  }
172
174
  }
@@ -1 +1 @@
1
- {"version":3,"file":"broker.mjs","sourceRoot":"","sources":["../src/broker.mts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"broker.mjs","sourceRoot":"","sources":["../src/broker.mts"],"names":[],"mappings":"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"}
@@ -18,7 +18,10 @@ export declare class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
18
18
  ebusOnline: boolean;
19
19
  requestId: number;
20
20
  requests: Map<number, [promise: RequestPromise, until: number, requestId: number, service: string, socked: Request | undefined]>;
21
+ private heartbeatInterval;
22
+ private heartbeatSocket;
21
23
  constructor(config?: Partial<EbusConfiguration>);
24
+ stop(): void;
22
25
  publish(channel: string, message: any): Promise<void>;
23
26
  services(): Promise<any>;
24
27
  restartAllWorkers(whom: string): Promise<void>;
@@ -35,6 +38,10 @@ export declare class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
35
38
  rid: string;
36
39
  }>;
37
40
  request<T>(service: string, req: any, reqOpts?: Partial<EbusRequestOptions>): Promise<T | undefined>;
41
+ requestUnpacked<T>(service: string, req: any, reqOpts: Partial<EbusRequestOptions>): Promise<EbusUnpackedResult<T> | undefined>;
42
+ /**
43
+ * @deprecated Use requestUnpacked instead
44
+ */
38
45
  requestUpacked<T>(service: string, req: any, reqOpts: Partial<EbusRequestOptions>): Promise<EbusUnpackedResult<T> | undefined>;
39
46
  private transformPackedRequestResult;
40
47
  private transformUnpackedRequestResult;
@@ -1 +1 @@
1
- {"version":3,"file":"clientNonBlocking.d.mts","sourceRoot":"","sources":["../src/clientNonBlocking.mts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAI7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,eAAe,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQlD,cAAM,cAAe,SAAQ,eAAe,CAAC,GAAG,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAA;gBACL,SAAS,EAAE,MAAM;CAIhC;AAED,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IAEjE,aAAa,EAAE,iBAAiB,CAAA;IAChC,OAAO,CAAC,UAAU,CAAC,CAA6B;IAChD,IAAW,SAAS,IAAI,eAAe,GAAG,SAAS,CAElD;IACD,IAAW,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,EAEtD;IACD,UAAU,EAAE,OAAO,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAC,SAAS,CAAC,CAAC,CAAA;gBAElH,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAS7C,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;IASrC,QAAQ;IAWR,iBAAiB,CAAC,IAAI,EAAC,MAAM;IAQ7B,OAAO;IAYb;;;;;;OAMG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;;;;IAM7E,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,OAAO,CAAC,kBAAkB,CAAM,GAC/E,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAmBtB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACnF,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAmB9C,OAAO,CAAC,4BAA4B;IAmBpC,OAAO,CAAC,8BAA8B;YAMxB,QAAQ;IAqEtB,OAAO,CAAC,+BAA+B;IAmBvC,OAAO,CAAC,cAAc;CAyCzB"}
1
+ {"version":3,"file":"clientNonBlocking.d.mts","sourceRoot":"","sources":["../src/clientNonBlocking.mts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAI7D,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,eAAe,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAQlD,cAAM,cAAe,SAAQ,eAAe,CAAC,GAAG,CAAC;IAC7C,SAAS,EAAE,MAAM,CAAA;gBACL,SAAS,EAAE,MAAM;CAIhC;AAED,qBAAa,iBAAkB,SAAQ,YAAY,CAAC,gBAAgB,CAAC;IAEjE,aAAa,EAAE,iBAAiB,CAAA;IAChC,OAAO,CAAC,UAAU,CAAC,CAA6B;IAChD,IAAW,SAAS,IAAI,eAAe,GAAG,SAAS,CAElD;IACD,IAAW,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,SAAS,EAEtD;IACD,UAAU,EAAE,OAAO,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAC,SAAS,CAAC,CAAC,CAAA;IAC9H,OAAO,CAAC,iBAAiB,CAA4C;IACrE,OAAO,CAAC,eAAe,CAAqB;gBAEhC,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM;IASnD,IAAI;IAmBE,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG;IASrC,QAAQ;IAWR,iBAAiB,CAAC,IAAI,EAAC,MAAM;IAS7B,OAAO;IAYb;;;;;;OAMG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;;;;IAM7E,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,GAAE,OAAO,CAAC,kBAAkB,CAAM,GAC/E,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAmBtB,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACpF,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAmB9C;;OAEG;IACG,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,kBAAkB,CAAC,GACnF,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAI9C,OAAO,CAAC,4BAA4B;IAmBpC,OAAO,CAAC,8BAA8B;YAMxB,QAAQ;IAqEtB,OAAO,CAAC,+BAA+B;IAmBvC,OAAO,CAAC,cAAc;CAwCzB"}
@@ -31,6 +31,32 @@ export class ClientNonBlocking extends TypedEmitter {
31
31
  this.requestId = 0;
32
32
  this.requests = new Map();
33
33
  }
34
+ stop() {
35
+ if (this.heartbeatInterval) {
36
+ clearInterval(this.heartbeatInterval);
37
+ this.heartbeatInterval = undefined;
38
+ }
39
+ // Close heartbeat socket
40
+ if (this.heartbeatSocket) {
41
+ try {
42
+ if (!this.heartbeatSocket.closed)
43
+ this.heartbeatSocket.close();
44
+ }
45
+ catch ( /* intentional */_a) { /* intentional */ }
46
+ this.heartbeatSocket = undefined;
47
+ }
48
+ // Close any pending request sockets
49
+ for (const [, requestRecord] of this.requests) {
50
+ if (requestRecord[4]) {
51
+ try {
52
+ if (!requestRecord[4].closed)
53
+ requestRecord[4].close();
54
+ }
55
+ catch ( /* intentional */_b) { /* intentional */ }
56
+ }
57
+ }
58
+ this.requests.clear();
59
+ }
34
60
  async publish(channel, message) {
35
61
  let receiveTimeout = this.configuration.receiveTimeout;
36
62
  let socket = new Request({ receiveTimeout });
@@ -63,6 +89,11 @@ export class ClientNonBlocking extends TypedEmitter {
63
89
  await socket.connect(this.configuration.address);
64
90
  await socket.send([Header.Client, Message.RestartAllWorkers, whom]);
65
91
  log.debug(`ebus client requested restart ${whom} workers with receiveTimeout ${receiveTimeout}`);
92
+ try {
93
+ if (!socket.closed)
94
+ socket.close();
95
+ }
96
+ catch ( /* intentional */_a) { /* intentional */ }
66
97
  }
67
98
  async workers() {
68
99
  let receiveTimeout = this.configuration.receiveTimeout;
@@ -108,7 +139,7 @@ export class ClientNonBlocking extends TypedEmitter {
108
139
  log.debug("ebuClient returns from request", ret, "using opts", reqOpts);
109
140
  return ret;
110
141
  }
111
- async requestUpacked(service, req, reqOpts) {
142
+ async requestUnpacked(service, req, reqOpts) {
112
143
  var _a;
113
144
  try {
114
145
  if (reqOpts === null || reqOpts === void 0 ? void 0 : reqOpts.receiveTimeout)
@@ -116,16 +147,22 @@ export class ClientNonBlocking extends TypedEmitter {
116
147
  }
117
148
  catch (err) {
118
149
  reqOpts.receiveTimeout = 2000;
119
- console.log("requestUpacked receiveTimeout error", err.message || err);
150
+ console.log("requestUnpacked receiveTimeout error", err.message || err);
120
151
  }
121
152
  if (this.requests.size > this.configuration.requestQueueSizeLimit) {
122
153
  this.lastError = new EbusRejectError("error", "too many waiting request at client");
123
154
  return undefined;
124
155
  }
125
156
  let ret = this._request(service, req, reqOpts, this.transformUnpackedRequestResult);
126
- log.debug("ebusClient return from requestUpacked", ret);
157
+ log.debug("ebusClient return from requestUnpacked", ret);
127
158
  return ret;
128
159
  }
160
+ /**
161
+ * @deprecated Use requestUnpacked instead
162
+ */
163
+ async requestUpacked(service, req, reqOpts) {
164
+ return this.requestUnpacked(service, req, reqOpts);
165
+ }
129
166
  transformPackedRequestResult({ data, opts, type }) {
130
167
  switch (type && type.toString()) {
131
168
  case Message.Timeout:
@@ -228,17 +265,16 @@ export class ClientNonBlocking extends TypedEmitter {
228
265
  }
229
266
  startHeartbeat() {
230
267
  let receiveTimeout = this.configuration.heartbeatTimeout;
231
- let socket;
232
- setInterval(async () => {
268
+ this.heartbeatInterval = setInterval(async () => {
233
269
  try {
234
- if (!socket) {
270
+ if (!this.heartbeatSocket) {
235
271
  log.status("client connected new heartbeat socket");
236
- socket = new Request({ receiveTimeout });
237
- await socket.connect(this.configuration.address);
272
+ this.heartbeatSocket = new Request({ receiveTimeout });
273
+ await this.heartbeatSocket.connect(this.configuration.address);
238
274
  }
239
275
  try {
240
- await socket.send([Header.Client, Message.Heartbeat]);
241
- await socket.receive();
276
+ await this.heartbeatSocket.send([Header.Client, Message.Heartbeat]);
277
+ await this.heartbeatSocket.receive();
242
278
  if (!this.ebusOnline) {
243
279
  this.ebusOnline = true;
244
280
  log.status("client noted ebus/start");
@@ -252,22 +288,22 @@ export class ClientNonBlocking extends TypedEmitter {
252
288
  this.emit("ebus/stop");
253
289
  }
254
290
  try {
255
- if (socket && !socket.closed)
256
- socket.close();
291
+ if (this.heartbeatSocket && !this.heartbeatSocket.closed)
292
+ this.heartbeatSocket.close();
257
293
  }
258
294
  catch ( /* intentional */_a) { /* intentional */ }
259
- socket = undefined;
295
+ this.heartbeatSocket = undefined;
260
296
  }
261
297
  }
262
298
  catch (err) {
263
299
  log.error("client heartbeat error");
264
300
  log.error(err);
265
301
  try {
266
- if (socket && !socket.closed)
267
- socket.close();
302
+ if (this.heartbeatSocket && !this.heartbeatSocket.closed)
303
+ this.heartbeatSocket.close();
268
304
  }
269
305
  catch ( /* intentional */_b) { /* intentional */ }
270
- socket = undefined;
306
+ this.heartbeatSocket = undefined;
271
307
  }
272
308
  }, this.configuration.heartbeatInterval);
273
309
  }
@@ -1 +1 @@
1
- {"version":3,"file":"clientNonBlocking.mjs","sourceRoot":"","sources":["../src/clientNonBlocking.mts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"clientNonBlocking.mjs","sourceRoot":"","sources":["../src/clientNonBlocking.mts"],"names":[],"mappings":"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"}
package/dist/service.mjs CHANGED
@@ -28,8 +28,8 @@ export class Service {
28
28
  this.dispatchPending();
29
29
  }
30
30
  printLoad() {
31
- let workers = [...this.workers.values()].map(w => w.toString("hex")).sort();
32
- let loads = [...this.workers.values()].map(w => w.toString("hex")).sort();
31
+ let workers = [...this.workers.keys()].sort();
32
+ let loads = [...this.loads.keys()].sort();
33
33
  if (workers.join() !== loads.join()) {
34
34
  log.error(`broker services workers/loads mismatch ${workers} / ${loads}`);
35
35
  }
@@ -41,7 +41,7 @@ export class Service {
41
41
  this.requests = this.requests.filter(([v1, v2, v3, v4, until]) => until >= now);
42
42
  while (this.workers.size && this.requests.length) {
43
43
  // find least loaded worker
44
- let least = 999999;
44
+ let least = Infinity;
45
45
  let worker = undefined;
46
46
  for (let [key, val] of this.workers.entries()) {
47
47
  let load = this.loads.get(val.toString("hex")) || 0;
@@ -1 +1 @@
1
- {"version":3,"file":"service.mjs","sourceRoot":"","sources":["../src/service.mts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"service.mjs","sourceRoot":"","sources":["../src/service.mts"],"names":[],"mappings":"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"}
package/dist/sub.d.mts CHANGED
@@ -13,6 +13,8 @@ export declare class Sub extends TypedEmitter<EbusSubscriptionEvent> {
13
13
  sock: Subscriber;
14
14
  interval: NodeJS.Timeout | undefined;
15
15
  subscriptions: Set<string>;
16
+ private boundOnConnect;
17
+ private boundOnDisconnect;
16
18
  constructor(config?: Partial<EbusConfiguration>);
17
19
  private connect;
18
20
  subscribe(channel: string): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"sub.d.mts","sourceRoot":"","sources":["../src/sub.mts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAO3D,MAAM,WAAW,qBAAqB;IAElC,OAAO,EAAE,CAAE,OAAO,EAAE,CAAC,OAAO,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,CAAC,KAAM,IAAI,CAAC;IAC5D,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,IAAI,CAAC;CAC1B;AACD,qBAAa,GAAI,SAAQ,YAAY,CAAC,qBAAqB,CAAC;IAExD,aAAa,EAAE,iBAAiB,CAAA;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAG,UAAU,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;gBAEd,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM;YAOrC,OAAO;IAaf,SAAS,CAAC,OAAO,EAAE,MAAM;IAQzB,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC;IAWtC,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,YAAY;CAKvB"}
1
+ {"version":3,"file":"sub.d.mts","sourceRoot":"","sources":["../src/sub.mts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAO3D,MAAM,WAAW,qBAAqB;IAElC,OAAO,EAAE,CAAE,OAAO,EAAE,CAAC,OAAO,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,CAAC,KAAM,IAAI,CAAC;IAC5D,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,UAAU,EAAE,MAAM,IAAI,CAAC;CAC1B;AACD,qBAAa,GAAI,SAAQ,YAAY,CAAC,qBAAqB,CAAC;IAExD,aAAa,EAAE,iBAAiB,CAAA;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAG,UAAU,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;IAC1B,OAAO,CAAC,cAAc,CAAY;IAClC,OAAO,CAAC,iBAAiB,CAAY;gBAEzB,MAAM,GAAE,OAAO,CAAC,iBAAiB,CAAM;YASrC,OAAO;IAiBf,SAAS,CAAC,OAAO,EAAE,MAAM;IAQzB,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC;IAWtC,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,SAAS;IAOjB,OAAO,CAAC,YAAY;CAKvB"}
package/dist/sub.mjs CHANGED
@@ -11,17 +11,21 @@ export class Sub extends TypedEmitter {
11
11
  this.configuration = loadConfiguration(prefixes, config);
12
12
  this.address = this.configuration.pubAddress;
13
13
  this.subscriptions = new Set();
14
+ this.boundOnConnect = () => this.onConnect();
15
+ this.boundOnDisconnect = () => this.onDisconnect();
14
16
  }
15
17
  async connect() {
16
18
  if (this.sock && !this.sock.closed) {
19
+ this.sock.events.off("connect", this.boundOnConnect);
20
+ this.sock.events.off("disconnect", this.boundOnDisconnect);
17
21
  try {
18
22
  this.sock.close();
19
23
  }
20
24
  catch (_a) { }
21
25
  }
22
26
  this.sock = new Subscriber;
23
- this.sock.events.on("connect", () => this.onConnect());
24
- this.sock.events.on("disconnect", () => this.onDisconnect());
27
+ this.sock.events.on("connect", this.boundOnConnect);
28
+ this.sock.events.on("disconnect", this.boundOnDisconnect);
25
29
  this.sock.reconnectInterval = 100;
26
30
  await this.sock.connect(this.address);
27
31
  log.status("subscriber started on", this.address);
package/dist/sub.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sub.mjs","sourceRoot":"","sources":["../src/sub.mts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sub.mjs","sourceRoot":"","sources":["../src/sub.mts"],"names":[],"mappings":"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"}
package/dist/worker.d.mts CHANGED
@@ -1,5 +1,4 @@
1
1
  /// <reference types="node" resolution-mode="require"/>
2
- /// <reference types="bun-types" resolution-mode="require"/>
3
2
  import { Dealer } from "zeromq";
4
3
  import { EbusConfiguration } from "./EbusConfiguration.mjs";
5
4
  import { EbusRequestOptions } from "./EbusRequestOptions.mjs";
@@ -1 +1 @@
1
- {"version":3,"file":"worker.d.mts","sourceRoot":"","sources":["../src/worker.mts"],"names":[],"mappings":";;AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAU7D,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,UAAU,CAAC,OAAO,WAAW,CAAC,GAAG,SAAS,CAAA;IACpD,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,CAAC,mBAAmB,CAAQ;gBAEvB,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAM;IAYhE,IAAI;IAYV,cAAc;IAgCR,KAAK;IAsFE,OAAO,CAAC,GAAG,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;YAKnC,cAAc;YAwDd,WAAW;YAkBX,gBAAgB;IA8BxB,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"}
1
+ {"version":3,"file":"worker.d.mts","sourceRoot":"","sources":["../src/worker.mts"],"names":[],"mappings":";AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAU7D,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,UAAU,CAAC,OAAO,WAAW,CAAC,GAAG,SAAS,CAAA;IACpD,aAAa,EAAE,MAAM,CAAA;IACrB,UAAU,EAAE,OAAO,CAAA;IACnB,OAAO,CAAC,mBAAmB,CAAQ;gBAEvB,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAM;IAYhE,IAAI;IAYV,cAAc;IAgCR,KAAK;IAsFE,OAAO,CAAC,GAAG,EAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG;YAKnC,cAAc;YAwDd,WAAW;YAkBX,gBAAgB;IA8BxB,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.mjs CHANGED
@@ -21,7 +21,7 @@ export class Worker {
21
21
  process.on("SIGABRT", async () => { await this.exit(); });
22
22
  }
23
23
  async exit() {
24
- setInterval(() => {
24
+ setTimeout(() => {
25
25
  log.error(`worker for ${this.service} stopped forcefully`);
26
26
  process.exit(1);
27
27
  }, 1000);
@@ -52,7 +52,7 @@ export class Worker {
52
52
  let timeSinceLast = new Date().valueOf() - this.lastHeartbeat;
53
53
  if (timeSinceLast > this.configuration.heartbeatTimeout) {
54
54
  log.status("worker missed heartbeats from broker, restarting");
55
- this.stop();
55
+ await this.stop();
56
56
  }
57
57
  }
58
58
  catch (err) {
@@ -96,8 +96,8 @@ export class Worker {
96
96
  }
97
97
  }
98
98
  catch (err) {
99
- console.error(`error in worker for '${this.service}'`, err);
100
- return;
99
+ log.error(`error in worker for '${this.service}' processing message`);
100
+ log.error(err);
101
101
  }
102
102
  }
103
103
  };
@@ -1 +1 @@
1
- {"version":3,"file":"worker.mjs","sourceRoot":"","sources":["../src/worker.mts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worker.mjs","sourceRoot":"","sources":["../src/worker.mts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cry-ebus2",
3
- "version": "4.0.1",
3
+ "version": "4.0.3",
4
4
  "description": "",
5
5
  "main": "./dist/index.mjs",
6
6
  "types": "./dist/index.d.mts",
package/src/broker.mts CHANGED
@@ -6,7 +6,6 @@ import { loadConfiguration } from "./loadConfiguration.mjs"
6
6
  import { pack } from "./serialize.mjs"
7
7
  import { Service } from "./service.mjs"
8
8
  import { Header, Message } from "./types.mjs"
9
- import { type } from "microsoft-cognitiveservices-speech-sdk/distrib/lib/src/common.speech/SpeechServiceConfig.js"
10
9
 
11
10
  const prefixes = ["EBUS_BROKER", "EBUS"]
12
11
  const log = new Log(prefixes)
@@ -29,7 +28,7 @@ export class Broker {
29
28
 
30
29
  async exit()
31
30
  {
32
- setInterval(() => {
31
+ setTimeout(() => {
33
32
  log.error(`broker stopped forcefully`)
34
33
  process.exit(1)
35
34
  }, 1000)
@@ -53,8 +52,7 @@ export class Broker {
53
52
  if (since > this.configuration.brokerHeartbeatTimeout) {
54
53
  let worker = service.workers.get(key)
55
54
  if (worker) {
56
- log.error(`broker removing time-outted worker for ${service.name}`)
57
- log.status(`broker removing time-outted worker for ${service.name}`)
55
+ log.status(`broker removing timed-out worker for ${service.name}`)
58
56
  this.deregister(worker)
59
57
  this.publishWorkersAndServices()
60
58
  } else {
@@ -76,7 +74,7 @@ export class Broker {
76
74
  await this.socket.bind(this.configuration.address)
77
75
  await this.publisher.bind(this.configuration.pubAddress)
78
76
  log.status(`started broker on ${this.configuration.address}`)
79
- log.status(`publisher ready on ${this.configuration.address}`)
77
+ log.status(`publisher ready on ${this.configuration.pubAddress}`)
80
78
  await this.publisher.send(['ebus/start', pack(new Date(), {})])
81
79
 
82
80
  if (this.configuration.brokerChecksWorkersWithHeartbeat)
@@ -102,7 +100,7 @@ export class Broker {
102
100
  }
103
101
  }
104
102
 
105
- loop()
103
+ await loop()
106
104
 
107
105
  }
108
106
 
@@ -178,19 +176,21 @@ export class Broker {
178
176
  for (let [_, worker] of service.workers) {
179
177
  log.debug(`send ShutdownAndRestart to worker ${name}`, worker)
180
178
 
181
- // request worker to shutdown and
179
+ // request worker to shutdown and restart
182
180
  this.socket.sendTimeout = 100;
183
- this.socket.send([
184
- worker,
185
- null,
186
- Header.Worker,
187
- Message.ShutdownAndRestart,
188
- null,
189
- null,
190
- null,
191
- ]).catch(err => {
192
- log.error(`error sending ShutdownAndRestart from deregister: ${err.message}`)
193
- })
181
+ try {
182
+ await this.socket.send([
183
+ worker,
184
+ null,
185
+ Header.Worker,
186
+ Message.ShutdownAndRestart,
187
+ null,
188
+ null,
189
+ null,
190
+ ])
191
+ } catch (err: any) {
192
+ log.error(`error sending ShutdownAndRestart: ${err.message}`)
193
+ }
194
194
 
195
195
  this.deregister(worker);
196
196
  }
@@ -39,6 +39,8 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
39
39
  ebusOnline: boolean
40
40
  requestId: number
41
41
  requests: Map<number, [promise: RequestPromise, until: number, requestId: number, service: string, socked: Request|undefined]>
42
+ private heartbeatInterval: ReturnType<typeof setInterval> | undefined
43
+ private heartbeatSocket: Request | undefined
42
44
 
43
45
  constructor(config: Partial<EbusConfiguration> = {}) {
44
46
  super()
@@ -49,6 +51,25 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
49
51
  this.requests = new Map<number, [promise: RequestPromise, until: number, requestId: number, service: string, socket:Request|undefined]>()
50
52
  }
51
53
 
54
+ stop() {
55
+ if (this.heartbeatInterval) {
56
+ clearInterval(this.heartbeatInterval)
57
+ this.heartbeatInterval = undefined
58
+ }
59
+ // Close heartbeat socket
60
+ if (this.heartbeatSocket) {
61
+ try { if (!this.heartbeatSocket.closed) this.heartbeatSocket.close() } catch { /* intentional */ }
62
+ this.heartbeatSocket = undefined
63
+ }
64
+ // Close any pending request sockets
65
+ for (const [, requestRecord] of this.requests) {
66
+ if (requestRecord[4]) {
67
+ try { if (!requestRecord[4].closed) requestRecord[4].close() } catch { /* intentional */ }
68
+ }
69
+ }
70
+ this.requests.clear()
71
+ }
72
+
52
73
  async publish(channel: string, message: any) {
53
74
  let receiveTimeout = this.configuration.receiveTimeout;
54
75
  let socket = new Request({ receiveTimeout })
@@ -75,6 +96,7 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
75
96
  await socket.connect(this.configuration.address)
76
97
  await socket.send([Header.Client, Message.RestartAllWorkers, whom])
77
98
  log.debug(`ebus client requested restart ${whom} workers with receiveTimeout ${receiveTimeout}`)
99
+ try { if (!socket.closed) socket.close() } catch { /* intentional */ }
78
100
  }
79
101
 
80
102
  async workers() {
@@ -122,14 +144,14 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
122
144
  return ret
123
145
  }
124
146
 
125
- async requestUpacked<T>(service: string, req: any, reqOpts: Partial<EbusRequestOptions>):
147
+ async requestUnpacked<T>(service: string, req: any, reqOpts: Partial<EbusRequestOptions>):
126
148
  Promise<EbusUnpackedResult<T> | undefined> {
127
-
149
+
128
150
  try {
129
151
  if (reqOpts?.receiveTimeout) reqOpts.receiveTimeout = parseInt(reqOpts?.receiveTimeout?.toString());
130
152
  } catch (err: any) {
131
153
  reqOpts.receiveTimeout = 2000;
132
- console.log("requestUpacked receiveTimeout error",err.message||err)
154
+ console.log("requestUnpacked receiveTimeout error",err.message||err)
133
155
  }
134
156
 
135
157
  if (this.requests.size > this.configuration.requestQueueSizeLimit) {
@@ -138,10 +160,18 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
138
160
  }
139
161
 
140
162
  let ret = this._request(service, req, reqOpts, this.transformUnpackedRequestResult) as Promise<EbusUnpackedResult<T>>
141
- log.debug("ebusClient return from requestUpacked", ret)
163
+ log.debug("ebusClient return from requestUnpacked", ret)
142
164
  return ret
143
165
  }
144
166
 
167
+ /**
168
+ * @deprecated Use requestUnpacked instead
169
+ */
170
+ async requestUpacked<T>(service: string, req: any, reqOpts: Partial<EbusRequestOptions>):
171
+ Promise<EbusUnpackedResult<T> | undefined> {
172
+ return this.requestUnpacked<T>(service, req, reqOpts)
173
+ }
174
+
145
175
  private transformPackedRequestResult<T>(this: ClientNonBlocking,{ data, opts, type }: { data: any, opts: Partial<EbusRequestOptions>, type: Buffer })
146
176
  : T | undefined
147
177
  {
@@ -258,21 +288,20 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
258
288
  private startHeartbeat() {
259
289
 
260
290
  let receiveTimeout = this.configuration.heartbeatTimeout;
261
- let socket: Request | undefined
262
291
 
263
- setInterval(async () => {
292
+ this.heartbeatInterval = setInterval(async () => {
264
293
 
265
294
  try {
266
295
 
267
- if (!socket) {
296
+ if (!this.heartbeatSocket) {
268
297
  log.status("client connected new heartbeat socket")
269
- socket = new Request({ receiveTimeout })
270
- await socket.connect(this.configuration.address)
298
+ this.heartbeatSocket = new Request({ receiveTimeout })
299
+ await this.heartbeatSocket.connect(this.configuration.address)
271
300
  }
272
301
 
273
302
  try {
274
- await socket.send([Header.Client, Message.Heartbeat])
275
- await socket.receive()
303
+ await this.heartbeatSocket.send([Header.Client, Message.Heartbeat])
304
+ await this.heartbeatSocket.receive()
276
305
  if (!this.ebusOnline) {
277
306
  this.ebusOnline = true;
278
307
  log.status("client noted ebus/start")
@@ -284,14 +313,14 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
284
313
  log.status("client noted ebus/stop")
285
314
  this.emit("ebus/stop")
286
315
  }
287
- try { if (socket && !socket.closed) socket.close() } catch { /* intentional */ }
288
- socket = undefined
316
+ try { if (this.heartbeatSocket && !this.heartbeatSocket.closed) this.heartbeatSocket.close() } catch { /* intentional */ }
317
+ this.heartbeatSocket = undefined
289
318
  }
290
319
  } catch (err) {
291
320
  log.error("client heartbeat error")
292
321
  log.error(err)
293
- try { if (socket && !socket.closed) socket.close() } catch { /* intentional */ }
294
- socket = undefined
322
+ try { if (this.heartbeatSocket && !this.heartbeatSocket.closed) this.heartbeatSocket.close() } catch { /* intentional */ }
323
+ this.heartbeatSocket = undefined
295
324
  }
296
325
 
297
326
  }, this.configuration.heartbeatInterval)
package/src/service.mts CHANGED
@@ -41,10 +41,10 @@ export class Service {
41
41
  }
42
42
 
43
43
  printLoad() {
44
- let workers = [...this.workers.values()].map(w => w.toString("hex")).sort();
45
- let loads = [...this.workers.values()].map(w => w.toString("hex")).sort();
44
+ let workers = [...this.workers.keys()].sort();
45
+ let loads = [...this.loads.keys()].sort();
46
46
  if (workers.join() !== loads.join()) { log.error(`broker services workers/loads mismatch ${workers} / ${loads}`); }
47
-
47
+
48
48
  log.trace(workers.map(w => `${w}:\x1b[31m${this.loads.get(w)}\x1b[0m`).join(", ") )
49
49
  }
50
50
 
@@ -56,7 +56,7 @@ export class Service {
56
56
 
57
57
  while (this.workers.size && this.requests.length) {
58
58
  // find least loaded worker
59
- let least = 999999;
59
+ let least = Infinity;
60
60
  let worker: Buffer | undefined = undefined;
61
61
  for (let [key, val] of this.workers.entries()) {
62
62
  let load = this.loads.get(val.toString("hex")) || 0;
package/src/sub.mts CHANGED
@@ -21,19 +21,27 @@ export class Sub extends TypedEmitter<EbusSubscriptionEvent> {
21
21
  sock!: Subscriber
22
22
  interval: NodeJS.Timeout | undefined
23
23
  subscriptions: Set<string>
24
+ private boundOnConnect: () => void
25
+ private boundOnDisconnect: () => void
24
26
 
25
27
  constructor(config: Partial<EbusConfiguration> = {}) {
26
28
  super()
27
29
  this.configuration = loadConfiguration(prefixes, config)
28
30
  this.address = this.configuration.pubAddress
29
31
  this.subscriptions = new Set<string>()
32
+ this.boundOnConnect = () => this.onConnect()
33
+ this.boundOnDisconnect = () => this.onDisconnect()
30
34
  }
31
35
 
32
36
  private async connect() {
33
- if (this.sock && !this.sock.closed) { try { this.sock.close()} catch {} }
37
+ if (this.sock && !this.sock.closed) {
38
+ this.sock.events.off("connect", this.boundOnConnect)
39
+ this.sock.events.off("disconnect", this.boundOnDisconnect)
40
+ try { this.sock.close() } catch {}
41
+ }
34
42
  this.sock = new Subscriber
35
- this.sock.events.on("connect", () => this.onConnect())
36
- this.sock.events.on("disconnect", () => this.onDisconnect())
43
+ this.sock.events.on("connect", this.boundOnConnect)
44
+ this.sock.events.on("disconnect", this.boundOnDisconnect)
37
45
  this.sock.reconnectInterval = 100
38
46
  await this.sock.connect(this.address)
39
47
  log.status("subscriber started on", this.address)
package/src/worker.mts CHANGED
@@ -34,7 +34,7 @@ export class Worker {
34
34
  }
35
35
 
36
36
  async exit() {
37
- setInterval(() => {
37
+ setTimeout(() => {
38
38
  log.error(`worker for ${this.service} stopped forcefully`)
39
39
  process.exit(1)
40
40
  }, 1000)
@@ -67,7 +67,7 @@ export class Worker {
67
67
  let timeSinceLast = new Date().valueOf() - this.lastHeartbeat;
68
68
  if (timeSinceLast > this.configuration.heartbeatTimeout) {
69
69
  log.status("worker missed heartbeats from broker, restarting")
70
- this.stop()
70
+ await this.stop()
71
71
  }
72
72
  } catch (err) {
73
73
  log.error(`worker for ${this.service} heartbeat error`)
@@ -132,8 +132,8 @@ export class Worker {
132
132
 
133
133
 
134
134
  } catch (err) {
135
- console.error(`error in worker for '${this.service}'`, err)
136
- return
135
+ log.error(`error in worker for '${this.service}' processing message`)
136
+ log.error(err)
137
137
  }
138
138
 
139
139
  }