cry-ebus2 4.0.12 → 4.0.13
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/EbusRequestOptions.d.mts +2 -0
- package/dist/EbusRequestOptions.d.mts.map +1 -1
- package/dist/broker.d.mts +1 -1
- package/dist/broker.d.mts.map +1 -1
- package/dist/broker.mjs +5 -4
- package/dist/broker.mjs.map +1 -1
- package/dist/service.d.mts +4 -2
- package/dist/service.d.mts.map +1 -1
- package/dist/service.mjs +69 -16
- package/dist/service.mjs.map +1 -1
- package/dist/test/timing.test.mjs +16 -0
- package/dist/test/timing.test.mjs.map +1 -1
- package/package.json +1 -1
- package/src/EbusRequestOptions.mts +3 -1
- package/src/broker.mts +5 -4
- package/src/service.mts +64 -17
- package/src/test/timing.test.mts +18 -0
|
@@ -4,5 +4,7 @@ export interface EbusRequestOptions {
|
|
|
4
4
|
raw: boolean;
|
|
5
5
|
prepacked: boolean;
|
|
6
6
|
returningError?: boolean;
|
|
7
|
+
/** Milliseconds to hold the request on the broker before dispatching to a worker. Expiry is extended by this amount. */
|
|
8
|
+
delayMs?: number;
|
|
7
9
|
}
|
|
8
10
|
//# sourceMappingURL=EbusRequestOptions.d.mts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EbusRequestOptions.d.mts","sourceRoot":"","sources":["../src/EbusRequestOptions.mts"],"names":[],"mappings":"AACA,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"EbusRequestOptions.d.mts","sourceRoot":"","sources":["../src/EbusRequestOptions.mts"],"names":[],"mappings":"AACA,MAAM,WAAW,kBAAkB;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,wHAAwH;IACxH,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB"}
|
package/dist/broker.d.mts
CHANGED
|
@@ -19,7 +19,7 @@ export declare class Broker {
|
|
|
19
19
|
handleWorker(type: Buffer, worker?: Buffer, ...rest: Buffer[]): Promise<void>;
|
|
20
20
|
private publishWorkersAndServices;
|
|
21
21
|
register(worker: Buffer, service: Buffer): void;
|
|
22
|
-
dispatchRequest(reqId: Buffer, client: Buffer, service: Buffer, timeout: number, opts: Buffer, req: Buffer): Promise<void>;
|
|
22
|
+
dispatchRequest(reqId: Buffer, client: Buffer, service: Buffer, timeout: number, opts: Buffer, req: Buffer, delayMs?: number): Promise<void>;
|
|
23
23
|
dispatchReply(type: Buffer, worker: Buffer, client: Buffer, ...rep: Buffer[]): Promise<void>;
|
|
24
24
|
deregister(worker: Buffer): void;
|
|
25
25
|
updateHeartbeatForWorker(worker: Buffer): void;
|
package/dist/broker.d.mts.map
CHANGED
|
@@ -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;AAMvC,qBAAa,MAAM;IACf,MAAM,EAAG,MAAM,CAAA;IACf,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;IAEpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;gBAE/C,aAAa,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAYpD,IAAI;IAaV,uBAAuB;IA8BjB,KAAK;IAmCL,IAAI;IA2CJ,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;
|
|
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,EAAG,MAAM,CAAA;IACf,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;IAEpD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;gBAE/C,aAAa,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAYpD,IAAI;IAaV,uBAAuB;IA8BjB,KAAK;IAmCL,IAAI;IA2CJ,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;IAqCnE,iBAAiB,CAAC,IAAI,EAAC,MAAM;IAkC7B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE;YAuCrD,yBAAyB;IAUvC,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,EAAE,OAAO,GAAE,MAAU;IAM/H,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE;IAQlF,UAAU,CAAC,MAAM,EAAE,MAAM;IAOzB,wBAAwB,CAAC,MAAM,EAAE,MAAM;IAMvC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAa7C,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAIhD,qBAAqB,IAAI,MAAM,EAAE;IAQjC,iBAAiB;cACS,MAAM;iBAAW,MAAM;kBAAY,MAAM;;IAOnE,eAAe;cACW,MAAM;kBAAY,MAAM;mBAAa,MAAM;;CAMxE"}
|
package/dist/broker.mjs
CHANGED
|
@@ -141,8 +141,9 @@ export class Broker {
|
|
|
141
141
|
let [service, reqId, optsBuff, req] = rest;
|
|
142
142
|
let opts = serialize.unpack(optsBuff);
|
|
143
143
|
let timeout = opts.receiveTimeout || this.configuration.receiveTimeout;
|
|
144
|
-
|
|
145
|
-
|
|
144
|
+
let delayMs = opts.delayMs && opts.delayMs > 0 ? opts.delayMs : 0;
|
|
145
|
+
log.debug(`broker received client request id ${reqId} for service ${service}${delayMs ? ` (delayMs=${delayMs})` : ""}`);
|
|
146
|
+
await this.dispatchRequest(reqId, client, service, timeout, optsBuff, req, delayMs);
|
|
146
147
|
break;
|
|
147
148
|
case Message.Services:
|
|
148
149
|
let workers = serialize.pack(this.getActiveWorkes());
|
|
@@ -245,10 +246,10 @@ export class Broker {
|
|
|
245
246
|
this.setWorkerService(worker, service);
|
|
246
247
|
(_a = this.getService(service)) === null || _a === void 0 ? void 0 : _a.register(worker);
|
|
247
248
|
}
|
|
248
|
-
async dispatchRequest(reqId, client, service, timeout, opts, req) {
|
|
249
|
+
async dispatchRequest(reqId, client, service, timeout, opts, req, delayMs = 0) {
|
|
249
250
|
let svc = this.getService(service);
|
|
250
251
|
if (svc)
|
|
251
|
-
await svc.dispatchRequest(reqId, client, timeout, opts, req);
|
|
252
|
+
await svc.dispatchRequest(reqId, client, timeout, opts, req, delayMs);
|
|
252
253
|
else
|
|
253
254
|
log.error(`broker cannot dispatch request id ${reqId} for ${service} from client `, client);
|
|
254
255
|
}
|
package/dist/broker.mjs.map
CHANGED
|
@@ -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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"}
|
package/dist/service.d.mts
CHANGED
|
@@ -6,14 +6,16 @@ export declare class Service {
|
|
|
6
6
|
workers: Map<string, Buffer>;
|
|
7
7
|
loads: Map<string, number>;
|
|
8
8
|
heartbeats: Map<string, number>;
|
|
9
|
-
requests: Array<[Buffer, Buffer, Buffer, Buffer, number]>;
|
|
9
|
+
requests: Array<[Buffer, Buffer, Buffer, Buffer, number, number]>;
|
|
10
10
|
log: Log;
|
|
11
11
|
dispatched: number;
|
|
12
|
+
private rescheduleTimer;
|
|
12
13
|
constructor(socket: Router, name: string, log: Log);
|
|
13
|
-
dispatchRequest(reqId: Buffer, client: Buffer, timeout: number, opts: Buffer, req: Buffer): Promise<void>;
|
|
14
|
+
dispatchRequest(reqId: Buffer, client: Buffer, timeout: number, opts: Buffer, req: Buffer, delayMs?: number): Promise<void>;
|
|
14
15
|
dispatchReply(type: Buffer, worker: Buffer, client: Buffer, ...rep: Buffer[]): Promise<void>;
|
|
15
16
|
printLoad(): void;
|
|
16
17
|
dispatchPending(): Promise<void>;
|
|
18
|
+
private scheduleRecheck;
|
|
17
19
|
register(worker: Buffer): void;
|
|
18
20
|
deregister(worker: Buffer): void;
|
|
19
21
|
updateHeartbeat(worker: Buffer): void;
|
package/dist/service.d.mts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.mts","sourceRoot":"","sources":["../src/service.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAa,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAM/B,qBAAa,OAAO;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IAEd,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;IACxC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;IACtC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;
|
|
1
|
+
{"version":3,"file":"service.d.mts","sourceRoot":"","sources":["../src/service.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAa,MAAM,aAAa,CAAA;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAM/B,qBAAa,OAAO;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IAEd,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;IACxC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;IACtC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;IAG3C,QAAQ,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAK;IACtE,GAAG,EAAE,GAAG,CAAA;IACR,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,CAAC,eAAe,CAA2C;gBAEtD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG;IAO5C,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,MAAU;IAO9G,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE;IAalF,SAAS;IAQH,eAAe;IA8ErB,OAAO,CAAC,eAAe;IAmBvB,QAAQ,CAAC,MAAM,EAAE,MAAM;IASvB,UAAU,CAAC,MAAM,EAAE,MAAM;IAWzB,eAAe,CAAC,MAAM,EAAE,MAAM;IAM9B,OAAO;YAWO,uBAAuB;CAexC"}
|
package/dist/service.mjs
CHANGED
|
@@ -7,15 +7,17 @@ export class Service {
|
|
|
7
7
|
this.workers = new Map();
|
|
8
8
|
this.loads = new Map();
|
|
9
9
|
this.heartbeats = new Map();
|
|
10
|
+
// tuple: [client, req, reqId, opts, expireAt, notBefore]
|
|
10
11
|
this.requests = [];
|
|
11
12
|
this.socket = socket;
|
|
12
13
|
this.name = name;
|
|
13
14
|
this.log = log;
|
|
14
15
|
this.dispatched = 0;
|
|
15
16
|
}
|
|
16
|
-
async dispatchRequest(reqId, client, timeout, opts, req) {
|
|
17
|
-
const
|
|
18
|
-
|
|
17
|
+
async dispatchRequest(reqId, client, timeout, opts, req, delayMs = 0) {
|
|
18
|
+
const now = Date.now();
|
|
19
|
+
const absoluteTimeout = timeout * 10 + delayMs;
|
|
20
|
+
this.requests.push([client, req, reqId, opts, now + absoluteTimeout, now + delayMs]);
|
|
19
21
|
await this.dispatchPending();
|
|
20
22
|
}
|
|
21
23
|
async dispatchReply(type, worker, client, ...rep) {
|
|
@@ -56,6 +58,16 @@ export class Service {
|
|
|
56
58
|
}
|
|
57
59
|
this.requests.length = writeIdx;
|
|
58
60
|
while (this.workers.size && this.requests.length) {
|
|
61
|
+
// find first request whose notBefore has elapsed (preserves FIFO among ready entries)
|
|
62
|
+
let readyIdx = -1;
|
|
63
|
+
for (let i = 0; i < this.requests.length; i++) {
|
|
64
|
+
if (this.requests[i][5] <= Date.now()) {
|
|
65
|
+
readyIdx = i;
|
|
66
|
+
break;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
if (readyIdx < 0)
|
|
70
|
+
break;
|
|
59
71
|
// find least loaded worker
|
|
60
72
|
let least = Infinity;
|
|
61
73
|
let worker = undefined;
|
|
@@ -70,9 +82,9 @@ export class Service {
|
|
|
70
82
|
}
|
|
71
83
|
if (!worker || !workerKey) {
|
|
72
84
|
log.info("no worker for " + this.name);
|
|
73
|
-
|
|
85
|
+
break;
|
|
74
86
|
}
|
|
75
|
-
const [client, req, reqId, opts] = this.requests.
|
|
87
|
+
const [client, req, reqId, opts] = this.requests.splice(readyIdx, 1)[0];
|
|
76
88
|
// stamp dispatch time into opts so worker can measure from dispatch, not from receive
|
|
77
89
|
let parsedOpts;
|
|
78
90
|
try {
|
|
@@ -86,18 +98,55 @@ export class Service {
|
|
|
86
98
|
this.dispatched++;
|
|
87
99
|
this.loads.set(workerKey, (this.loads.get(workerKey) || 0) + 1);
|
|
88
100
|
this.printLoad();
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
101
|
+
try {
|
|
102
|
+
await this.socket.send([
|
|
103
|
+
worker,
|
|
104
|
+
null,
|
|
105
|
+
Header.Worker,
|
|
106
|
+
Message.Request,
|
|
107
|
+
client,
|
|
108
|
+
null,
|
|
109
|
+
reqId,
|
|
110
|
+
stampedOpts,
|
|
111
|
+
req,
|
|
112
|
+
]);
|
|
113
|
+
}
|
|
114
|
+
catch (err) {
|
|
115
|
+
log.error(`broker failed to dispatch reqId to worker for ${this.name}`);
|
|
116
|
+
log.error(err);
|
|
117
|
+
// roll back load increment since the worker never received the request
|
|
118
|
+
const currentLoad = this.loads.get(workerKey) || 0;
|
|
119
|
+
if (currentLoad > 0)
|
|
120
|
+
this.loads.set(workerKey, currentLoad - 1);
|
|
121
|
+
// notify client so it doesn't wait for its own receiveTimeout
|
|
122
|
+
try {
|
|
123
|
+
await this.socket.send([client, null, Header.Client, Message.Error, reqId]);
|
|
124
|
+
}
|
|
125
|
+
catch ( /* client may have disconnected */_d) { /* client may have disconnected */ }
|
|
126
|
+
}
|
|
100
127
|
}
|
|
128
|
+
this.scheduleRecheck();
|
|
129
|
+
}
|
|
130
|
+
scheduleRecheck() {
|
|
131
|
+
if (this.rescheduleTimer) {
|
|
132
|
+
clearTimeout(this.rescheduleTimer);
|
|
133
|
+
this.rescheduleTimer = undefined;
|
|
134
|
+
}
|
|
135
|
+
if (!this.requests.length || !this.workers.size)
|
|
136
|
+
return;
|
|
137
|
+
const now = Date.now();
|
|
138
|
+
let earliest = Infinity;
|
|
139
|
+
for (const entry of this.requests) {
|
|
140
|
+
if (entry[5] > now && entry[5] < earliest)
|
|
141
|
+
earliest = entry[5];
|
|
142
|
+
}
|
|
143
|
+
if (earliest === Infinity)
|
|
144
|
+
return;
|
|
145
|
+
const delay = Math.max(1, earliest - now);
|
|
146
|
+
this.rescheduleTimer = setTimeout(() => {
|
|
147
|
+
this.rescheduleTimer = undefined;
|
|
148
|
+
this.dispatchPending().catch(err => log.error(`delayed dispatch error for ${this.name}`, err));
|
|
149
|
+
}, delay);
|
|
101
150
|
}
|
|
102
151
|
register(worker) {
|
|
103
152
|
const workerKey = worker.toString("hex");
|
|
@@ -121,6 +170,10 @@ export class Service {
|
|
|
121
170
|
this.dispatchPending();
|
|
122
171
|
}
|
|
123
172
|
destroy() {
|
|
173
|
+
if (this.rescheduleTimer) {
|
|
174
|
+
clearTimeout(this.rescheduleTimer);
|
|
175
|
+
this.rescheduleTimer = undefined;
|
|
176
|
+
}
|
|
124
177
|
this.workers.clear();
|
|
125
178
|
this.loads.clear();
|
|
126
179
|
this.heartbeats.clear();
|
package/dist/service.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.mjs","sourceRoot":"","sources":["../src/service.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAE5C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAG7C,MAAM,QAAQ,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;AACxC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAA;AAC7B,MAAM,OAAO,OAAO;
|
|
1
|
+
{"version":3,"file":"service.mjs","sourceRoot":"","sources":["../src/service.mts"],"names":[],"mappings":"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"}
|
|
@@ -62,5 +62,21 @@ describe('timing', function () {
|
|
|
62
62
|
const cnt = resolved.filter(a => a).length;
|
|
63
63
|
expect(cnt).to.eq(4);
|
|
64
64
|
});
|
|
65
|
+
it('should hold request on broker for delayMs before dispatching', async () => {
|
|
66
|
+
const start = Date.now();
|
|
67
|
+
const rep = await client.request("echo", { delay: 0 }, { receiveTimeout: 5000, delayMs: 500 });
|
|
68
|
+
const elapsed = Date.now() - start;
|
|
69
|
+
expect(rep === null || rep === void 0 ? void 0 : rep.delay).to.eq(0);
|
|
70
|
+
expect(elapsed).to.be.greaterThan(480);
|
|
71
|
+
});
|
|
72
|
+
it('should not block non-delayed requests behind a delayed one', async () => {
|
|
73
|
+
const delayed = client.request("echo", { delay: 0 }, { receiveTimeout: 5000, delayMs: 1000 });
|
|
74
|
+
const start = Date.now();
|
|
75
|
+
const fast = await client.request("echo", { delay: 0 }, { receiveTimeout: 5000 });
|
|
76
|
+
const fastElapsed = Date.now() - start;
|
|
77
|
+
expect(fast === null || fast === void 0 ? void 0 : fast.delay).to.eq(0);
|
|
78
|
+
expect(fastElapsed).to.be.lessThan(500);
|
|
79
|
+
await delayed;
|
|
80
|
+
});
|
|
65
81
|
});
|
|
66
82
|
//# sourceMappingURL=timing.test.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timing.test.mjs","sourceRoot":"","sources":["../../src/test/timing.test.mts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"timing.test.mjs","sourceRoot":"","sources":["../../src/test/timing.test.mts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
|
|
2
|
-
export interface EbusRequestOptions {
|
|
2
|
+
export interface EbusRequestOptions {
|
|
3
3
|
receiveTimeout: number,
|
|
4
4
|
zip: boolean,
|
|
5
5
|
raw: boolean,
|
|
6
6
|
prepacked: boolean,
|
|
7
7
|
returningError?: boolean,
|
|
8
|
+
/** Milliseconds to hold the request on the broker before dispatching to a worker. Expiry is extended by this amount. */
|
|
9
|
+
delayMs?: number,
|
|
8
10
|
}
|
package/src/broker.mts
CHANGED
|
@@ -161,8 +161,9 @@ export class Broker {
|
|
|
161
161
|
let [service, reqId, optsBuff, req] = rest
|
|
162
162
|
let opts = serialize.unpack(optsBuff) as EbusRequestOptions
|
|
163
163
|
let timeout = opts.receiveTimeout || this.configuration.receiveTimeout
|
|
164
|
-
|
|
165
|
-
|
|
164
|
+
let delayMs = opts.delayMs && opts.delayMs > 0 ? opts.delayMs : 0
|
|
165
|
+
log.debug(`broker received client request id ${reqId} for service ${service}${delayMs ? ` (delayMs=${delayMs})` : ""}`)
|
|
166
|
+
await this.dispatchRequest(reqId, client, service, timeout, optsBuff, req, delayMs)
|
|
166
167
|
break;
|
|
167
168
|
case Message.Services:
|
|
168
169
|
let workers = serialize.pack(this.getActiveWorkes())
|
|
@@ -277,9 +278,9 @@ export class Broker {
|
|
|
277
278
|
this.getService(service)?.register(worker)
|
|
278
279
|
}
|
|
279
280
|
|
|
280
|
-
async dispatchRequest(reqId: Buffer, client: Buffer, service: Buffer, timeout: number, opts: Buffer, req: Buffer) {
|
|
281
|
+
async dispatchRequest(reqId: Buffer, client: Buffer, service: Buffer, timeout: number, opts: Buffer, req: Buffer, delayMs: number = 0) {
|
|
281
282
|
let svc = this.getService(service)
|
|
282
|
-
if (svc) await svc.dispatchRequest(reqId, client, timeout, opts, req)
|
|
283
|
+
if (svc) await svc.dispatchRequest(reqId, client, timeout, opts, req, delayMs)
|
|
283
284
|
else log.error(`broker cannot dispatch request id ${reqId} for ${service} from client `,client)
|
|
284
285
|
}
|
|
285
286
|
|
package/src/service.mts
CHANGED
|
@@ -13,9 +13,11 @@ export class Service {
|
|
|
13
13
|
loads: Map<string, number> = new Map()
|
|
14
14
|
heartbeats: Map<string, number> = new Map()
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
// tuple: [client, req, reqId, opts, expireAt, notBefore]
|
|
17
|
+
requests: Array<[Buffer, Buffer, Buffer, Buffer, number, number]> = []
|
|
17
18
|
log: Log
|
|
18
19
|
dispatched: number
|
|
20
|
+
private rescheduleTimer: ReturnType<typeof setTimeout> | undefined
|
|
19
21
|
|
|
20
22
|
constructor(socket: Router, name: string, log: Log) {
|
|
21
23
|
this.socket = socket
|
|
@@ -24,9 +26,10 @@ export class Service {
|
|
|
24
26
|
this.dispatched = 0
|
|
25
27
|
}
|
|
26
28
|
|
|
27
|
-
async dispatchRequest(reqId: Buffer, client: Buffer, timeout: number, opts: Buffer, req: Buffer) {
|
|
28
|
-
const
|
|
29
|
-
|
|
29
|
+
async dispatchRequest(reqId: Buffer, client: Buffer, timeout: number, opts: Buffer, req: Buffer, delayMs: number = 0) {
|
|
30
|
+
const now = Date.now()
|
|
31
|
+
const absoluteTimeout = timeout * 10 + delayMs
|
|
32
|
+
this.requests.push([client, req, reqId, opts, now + absoluteTimeout, now + delayMs])
|
|
30
33
|
await this.dispatchPending()
|
|
31
34
|
}
|
|
32
35
|
|
|
@@ -69,6 +72,13 @@ export class Service {
|
|
|
69
72
|
this.requests.length = writeIdx
|
|
70
73
|
|
|
71
74
|
while (this.workers.size && this.requests.length) {
|
|
75
|
+
// find first request whose notBefore has elapsed (preserves FIFO among ready entries)
|
|
76
|
+
let readyIdx = -1
|
|
77
|
+
for (let i = 0; i < this.requests.length; i++) {
|
|
78
|
+
if (this.requests[i][5] <= Date.now()) { readyIdx = i; break }
|
|
79
|
+
}
|
|
80
|
+
if (readyIdx < 0) break
|
|
81
|
+
|
|
72
82
|
// find least loaded worker
|
|
73
83
|
let least = Infinity;
|
|
74
84
|
let worker: Buffer | undefined = undefined;
|
|
@@ -79,10 +89,10 @@ export class Service {
|
|
|
79
89
|
}
|
|
80
90
|
if (!worker || !workerKey) {
|
|
81
91
|
log.info("no worker for " + this.name)
|
|
82
|
-
|
|
92
|
+
break;
|
|
83
93
|
}
|
|
84
94
|
|
|
85
|
-
const [client, req, reqId, opts] = this.requests.
|
|
95
|
+
const [client, req, reqId, opts] = this.requests.splice(readyIdx, 1)[0]!
|
|
86
96
|
|
|
87
97
|
// stamp dispatch time into opts so worker can measure from dispatch, not from receive
|
|
88
98
|
let parsedOpts: Partial<EbusRequestOptions> & { _dispatchedAt?: number }
|
|
@@ -94,18 +104,51 @@ export class Service {
|
|
|
94
104
|
this.loads.set(workerKey, (this.loads.get(workerKey)||0)+1)
|
|
95
105
|
this.printLoad()
|
|
96
106
|
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
107
|
+
try {
|
|
108
|
+
await this.socket.send([
|
|
109
|
+
worker,
|
|
110
|
+
null,
|
|
111
|
+
Header.Worker,
|
|
112
|
+
Message.Request,
|
|
113
|
+
client,
|
|
114
|
+
null,
|
|
115
|
+
reqId,
|
|
116
|
+
stampedOpts,
|
|
117
|
+
req,
|
|
118
|
+
])
|
|
119
|
+
} catch (err) {
|
|
120
|
+
log.error(`broker failed to dispatch reqId to worker for ${this.name}`)
|
|
121
|
+
log.error(err)
|
|
122
|
+
// roll back load increment since the worker never received the request
|
|
123
|
+
const currentLoad = this.loads.get(workerKey) || 0
|
|
124
|
+
if (currentLoad > 0) this.loads.set(workerKey, currentLoad - 1)
|
|
125
|
+
// notify client so it doesn't wait for its own receiveTimeout
|
|
126
|
+
try {
|
|
127
|
+
await this.socket.send([client, null, Header.Client, Message.Error, reqId])
|
|
128
|
+
} catch { /* client may have disconnected */ }
|
|
129
|
+
}
|
|
108
130
|
}
|
|
131
|
+
|
|
132
|
+
this.scheduleRecheck()
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
private scheduleRecheck() {
|
|
136
|
+
if (this.rescheduleTimer) {
|
|
137
|
+
clearTimeout(this.rescheduleTimer)
|
|
138
|
+
this.rescheduleTimer = undefined
|
|
139
|
+
}
|
|
140
|
+
if (!this.requests.length || !this.workers.size) return
|
|
141
|
+
const now = Date.now()
|
|
142
|
+
let earliest = Infinity
|
|
143
|
+
for (const entry of this.requests) {
|
|
144
|
+
if (entry[5] > now && entry[5] < earliest) earliest = entry[5]
|
|
145
|
+
}
|
|
146
|
+
if (earliest === Infinity) return
|
|
147
|
+
const delay = Math.max(1, earliest - now)
|
|
148
|
+
this.rescheduleTimer = setTimeout(() => {
|
|
149
|
+
this.rescheduleTimer = undefined
|
|
150
|
+
this.dispatchPending().catch(err => log.error(`delayed dispatch error for ${this.name}`, err))
|
|
151
|
+
}, delay)
|
|
109
152
|
}
|
|
110
153
|
|
|
111
154
|
register(worker: Buffer) {
|
|
@@ -135,6 +178,10 @@ export class Service {
|
|
|
135
178
|
}
|
|
136
179
|
|
|
137
180
|
destroy() {
|
|
181
|
+
if (this.rescheduleTimer) {
|
|
182
|
+
clearTimeout(this.rescheduleTimer)
|
|
183
|
+
this.rescheduleTimer = undefined
|
|
184
|
+
}
|
|
138
185
|
this.workers.clear()
|
|
139
186
|
this.loads.clear()
|
|
140
187
|
this.heartbeats.clear()
|
package/src/test/timing.test.mts
CHANGED
|
@@ -72,4 +72,22 @@ describe('timing', function () {
|
|
|
72
72
|
const cnt = resolved.filter(a => a).length
|
|
73
73
|
expect(cnt).to.eq(4)
|
|
74
74
|
});
|
|
75
|
+
|
|
76
|
+
it('should hold request on broker for delayMs before dispatching', async () => {
|
|
77
|
+
const start = Date.now()
|
|
78
|
+
const rep = await client.request<{ delay: number }>("echo", { delay: 0 }, { receiveTimeout: 5000, delayMs: 500 })
|
|
79
|
+
const elapsed = Date.now() - start
|
|
80
|
+
expect(rep?.delay).to.eq(0)
|
|
81
|
+
expect(elapsed).to.be.greaterThan(480)
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
it('should not block non-delayed requests behind a delayed one', async () => {
|
|
85
|
+
const delayed = client.request<{ delay: number }>("echo", { delay: 0 }, { receiveTimeout: 5000, delayMs: 1000 })
|
|
86
|
+
const start = Date.now()
|
|
87
|
+
const fast = await client.request<{ delay: number }>("echo", { delay: 0 }, { receiveTimeout: 5000 })
|
|
88
|
+
const fastElapsed = Date.now() - start
|
|
89
|
+
expect(fast?.delay).to.eq(0)
|
|
90
|
+
expect(fastElapsed).to.be.lessThan(500)
|
|
91
|
+
await delayed
|
|
92
|
+
});
|
|
75
93
|
});
|