cry-ebus2 4.0.8 → 4.0.12

package/dist/worker.mjs

@@ -11,14 +11,16 @@ export class Worker {
     constructor(service, config = {}) {
         this.service = "";
         this.exitingAfterTimeout = false;
+        this.stopped = false;
+        this.onExit = async () => { await this.exit(); };
         this.service = service || this.service;
         this.configuration = loadConfiguration(prefixes, config);
         this.address = this.configuration.address;
         this.lastHeartbeat = Date.now();
         this.processing = false;
-        process.on("SIGINT", async () => { await this.exit(); });
-        process.on("SIGTERM", async () => { await this.exit(); });
-        process.on("SIGABRT", async () => { await this.exit(); });
+        process.on("SIGINT", this.onExit);
+        process.on("SIGTERM", this.onExit);
+        process.on("SIGABRT", this.onExit);
     }
     async exit() {
         setTimeout(() => {
@@ -26,7 +28,7 @@ export class Worker {
             process.exit(1);
         }, 1000);
         try {
-            await this.stop();
+            await this.shutdown();
             log.status(`worker for ${this.service} stopped`);
             process.exit(0);
         }
@@ -62,13 +64,13 @@ export class Worker {
         }, this.configuration.heartbeatInterval);
     }
     async start() {
+        this.stopped = false;
         log.debug(`worker for ${this.service} is starting`);
         const loop = async () => {
             this.socket = new Dealer();
             this.socket.reconnectInterval = 100;
             await this.socket.connect(this.configuration.address);
             await this.socket.send([null, Header.Worker, Message.Ready, this.service]);
-            await this.socket.receive();
             log.status(`started worker for ${this.service} on ${this.configuration.address}`);
             this.startHeartbeat();
             for await (const [blank1, header, type, client, blank2, reqId, optBuff, req] of this.socket) {
@@ -109,6 +111,8 @@ export class Worker {
                 log.error(`worker for '${this.service} error in internal loop`);
                 log.error(err);
             }
+            if (this.stopped)
+                break;
             try {
                 await this.stop();
             }
@@ -126,11 +130,14 @@ export class Worker {
     async processRequest(reqId, optBuff, type, req, client) {
         let opts = serialize.unpack(optBuff);
         log.debug(`worker for ${this.service} received request ${type} with opts`, opts);
-        let timeout = opts.receiveTimeout || this.configuration.receiveTimeout;
+        const requestedTimeout = opts.receiveTimeout || this.configuration.receiveTimeout;
+        const dispatchedAt = opts._dispatchedAt || Date.now();
+        const elapsed = Date.now() - dispatchedAt;
+        const timeout = Math.max(0, requestedTimeout - elapsed);
         let responseMessageType = Message.Reply;
-        let promises = [
+        const promises = [
             this.process(unpack(req, opts), opts),
-            sleep(timeout, new EbusRejectError("timeout", `timeout in worker for '${this.service}' after ${timeout} ms`, opts))
+            sleep(timeout, new EbusRejectError("timeout", `timeout in worker for '${this.service}' after ${requestedTimeout} ms (${elapsed}ms in queue, ${timeout}ms remaining)`, opts))
         ];
         let rep;
         try {
@@ -215,23 +222,37 @@ export class Worker {
         }
         process.nextTick(() => process.exit(1));
     }
+    /** Closes the current connection. Worker will reconnect unless shutdown() was called. */
     async stop() {
         log.debug(`worker for ${this.service} is stopping`);
         if (this.interval)
             clearInterval(this.interval);
         this.interval = undefined;
         if (this.socket && !this.socket.closed) {
-            await this.socket.send([
-                null,
-                Header.Worker,
-                Message.Disconnect,
-                this.service,
-            ]);
+            try {
+                await this.socket.send([
+                    null,
+                    Header.Worker,
+                    Message.Disconnect,
+                    this.service,
+                ]);
+            }
+            catch (_a) {
+                log.debug(`worker for ${this.service} disconnect send failed (expected during shutdown)`);
+            }
             log.debug(`worker for ${this.service} is closing socket`);
             this.socket.close();
         }
         this.socket = undefined;
     }
+    /** Permanently stops the worker, preventing reconnection. */
+    async shutdown() {
+        this.stopped = true;
+        process.off("SIGINT", this.onExit);
+        process.off("SIGTERM", this.onExit);
+        process.off("SIGABRT", this.onExit);
+        await this.stop();
+    }
     async publish(channel, message) {
         if (!this.socket) {
             log.error(`worker for '${this.service}' not connected, cannot publish to ${channel}`, message);

package/dist/worker.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"worker.mjs","sourceRoot":"","sources":["../src/worker.mts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worker.mjs","sourceRoot":"","sources":["../src/worker.mts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "cry-ebus2",
-  "version": "4.0.8",
+  "version": "4.0.12",
   "description": "",
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.mts",
   "type": "module",
   "scripts": {
     "build": "tsc",
-    "test": "mocha 'dist/test/**/*.test.mjs' --exit",
+    "test": "mocha 'dist/test/**/*.test.mjs' --exit --timeout 30000",
+    "test:single": "mocha --exit --timeout 30000",
     "pretest": "npm run build"
   },
   "repository": {

package/src/EbusConfiguration.mts

@@ -2,8 +2,8 @@
 export interface EbusConfiguration {
     address: string;
     pubAddress: string;
-    sendHighWaterMark: 1;
-    sendTimeout: 1;
+    sendHighWaterMark: number;
+    sendTimeout: number;
     port: number;
     pubPort: number;
     server: string;

package/src/broker.mts

@@ -11,19 +11,25 @@ const prefixes = ["EBUS_BROKER", "EBUS"]
 const log = new Log(prefixes)
 
 export class Broker {
-    socket: Router = new Router({ sendHighWaterMark: 1, sendTimeout: 1 })
+    socket!: Router
     services: Map<string, Service> = new Map()
     workers: Map<string, Buffer> = new Map()
     configuration: EbusConfiguration
     publisher: Publisher
     interval: ReturnType<typeof setInterval> | undefined
 
+    private readonly onExit = async () => { await this.exit() }
+
     constructor(configuration: Partial<EbusConfiguration> = {} ) {
         this.configuration = loadConfiguration(prefixes, configuration)
+        this.socket = new Router({
+            sendHighWaterMark: this.configuration.sendHighWaterMark,
+            sendTimeout: this.configuration.sendTimeout,
+        })
         this.publisher = new Publisher
-        process.on("SIGINT", async () => { await this.exit() })
-        process.on("SIGTERM", async () => { await this.exit() })
-        process.on("SIGABRT", async () => { await this.exit() })
+        process.on("SIGINT", this.onExit)
+        process.on("SIGTERM", this.onExit)
+        process.on("SIGABRT", this.onExit)
     }
 
     async exit() 
@@ -105,27 +111,45 @@ export class Broker {
     }
 
     async stop() {
+        process.off("SIGINT", this.onExit)
+        process.off("SIGTERM", this.onExit)
+        process.off("SIGABRT", this.onExit)
 
         if (this.interval) clearInterval(this.interval)
         this.interval = undefined;
 
         log.status("broker stopping")
-        await this.publisher.send(['ebus/stop', pack(new Date(), {})])
+
+        try {
+            if (!this.publisher.closed)
+                await this.publisher.send(['ebus/stop', pack(new Date(), {})])
+        } catch {
+            log.debug("broker failed to publish stop event")
+        }
 
         // notify all workers that we're shutting down
         for (const service of this.services.values()) {
             for (const [, buff] of service.workers.entries()) {
-                await this.socket.send([
-                    buff,
-                    null,
-                    Header.Worker,
-                    Message.Shutdown,
-                ])
+                try {
+                    if (!this.socket.closed)
+                        await this.socket.send([
+                            buff,
+                            null,
+                            Header.Worker,
+                            Message.Shutdown,
+                        ])
+                } catch {
+                    log.debug("broker failed to notify worker during shutdown")
+                }
             }
         }
 
-        if (!this.socket.closed) await this.socket.close()
-        if (!this.publisher.closed) await this.publisher.close()
+        for (const service of this.services.values()) service.destroy()
+        this.services.clear()
+        this.workers.clear()
+
+        if (!this.socket.closed) this.socket.close()
+        if (!this.publisher.closed) this.publisher.close()
         log.status("broker stopped")
     }
 
@@ -239,8 +263,13 @@ export class Broker {
     }
 
     private async publishWorkersAndServices() {
-        await this.publisher.send(['ebus/workers', pack(this.getServicesWithWorkes(), {})])
-        await this.publisher.send(['ebus/services', pack(this.getServicesStatus(), {})])
+        if (this.publisher.closed) return
+        try {
+            await this.publisher.send(['ebus/workers', pack(this.getServicesWithWorkes(), {})])
+            await this.publisher.send(['ebus/services', pack(this.getServicesStatus(), {})])
+        } catch {
+            log.debug("broker failed to publish workers/services (expected during shutdown)")
+        }
     }
 
     register(worker: Buffer, service: Buffer) {
@@ -255,21 +284,24 @@ export class Broker {
     }
 
     async dispatchReply(type: Buffer, worker: Buffer, client: Buffer, ...rep: Buffer[]) {
-        const service = this.getWorkerService(worker)
-        let serviceOfWorker = this.getService(service)
+        const workerKey = worker.toString("hex")
+        const service = this.workers.get(workerKey)
+        let serviceOfWorker = this.getService(service!)
         if (serviceOfWorker) await serviceOfWorker.dispatchReply(type, worker, client, ...rep)
         else log.error(`cannot dispatch reply for  ${service} ${serviceOfWorker} to client`,client)
     }
 
     deregister(worker: Buffer) {
-        const service = this.getWorkerService(worker)
-        this.getService(service)?.deregister(worker)
-        this.workers.delete(worker.toString("hex"))
+        const workerKey = worker.toString("hex")
+        const service = this.workers.get(workerKey)
+        this.getService(service!)?.deregister(worker)
+        this.workers.delete(workerKey)
     }
 
     updateHeartbeatForWorker(worker: Buffer) {
-        const service = this.getWorkerService(worker)
-        this.getService(service)?.updateHeartbeat(worker)
+        const workerKey = worker.toString("hex")
+        const service = this.workers.get(workerKey)
+        this.getService(service!)?.updateHeartbeat(worker)
     }
 
     getService(name: Buffer): Service | undefined {
@@ -285,42 +317,31 @@ export class Broker {
         }
     }
 
-    getWorkerService(worker: Buffer): Buffer {
-        return this.workers.get(worker.toString("hex"))!
-    }
-
     setWorkerService(worker: Buffer, service: Buffer) {
         this.workers.set(worker.toString("hex"), service)
     }
 
-    getServicesWithWorkes()
-    {
-        let services = Array.from(this.services.values()).filter(v => v.workers.size)
-        let names = [... new Set(services.map(s => s.name))];
+    getServicesWithWorkes(): string[] {
+        const names: string[] = []
+        for (const service of this.services.values()) {
+            if (service.workers.size) names.push(service.name)
+        }
         return names
     }
 
     getServicesStatus() {
-        let services = Array.from(this.services.values())
-        let names = services.map(s => {
-            return {
-                name: s.name,
-                workers: s.workers.size,
-                requests: s.requests.length
-            }
-        })
-        return names
+        const result: { name: string, workers: number, requests: number }[] = []
+        for (const s of this.services.values()) {
+            result.push({ name: s.name, workers: s.workers.size, requests: s.requests.length })
+        }
+        return result
     }
 
     getActiveWorkes() {
-        let workers = Array.from(this.services.values()).map(service =>
-        {
-            return {
-                name: service.name,
-                nWorkers: service.workers.size,
-                nRequests: service.requests.length
-            }
-        })
-        return workers
+        const result: { name: string, nWorkers: number, nRequests: number }[] = []
+        for (const s of this.services.values()) {
+            result.push({ name: s.name, nWorkers: s.workers.size, nRequests: s.requests.length })
+        }
+        return result
     }
 }

package/src/clientNonBlocking.mts

@@ -15,6 +15,10 @@ import { TypedEmitter } from 'tiny-typed-emitter';
 const prefixes = ["EBUS_CLIENT", "EBUS"]
 let log = new Log(prefixes)
 
+const TIMEOUT_BUFFER = Buffer.from(Message.Timeout)
+const ERROR_BUFFER = Buffer.from(Message.Error)
+const EMPTY_BUFFER = Buffer.from([0])
+
 
 declare type ResultProcessor<T> = (this:ClientNonBlocking,{ data, opts, type }: { data: any, opts: Partial<EbusRequestOptions>, type: Buffer }) => T | undefined | EbusUnpackedResult<T>;
 
@@ -260,12 +264,12 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
                     if (err?.errno === 35) {
                         this.lastError = new EbusRejectError("timeout", `timeout in client requesting '${service}' after ${receiveTimeout} ms`)
                         log.debug(`request expired at client waiting for '${service}' after ${receiveTimeout} ms`, req)
-                        let processed = processResult.bind(this)({ data: undefined, opts: {}, type: Buffer.from(Message.Timeout) })
+                        let processed = processResult.bind(this)({ data: undefined, opts: {}, type: TIMEOUT_BUFFER })
                         promise.resolve(processed)
                     } else {
                         this.lastError = new EbusRejectError("error", `error in client requesting '${service}' after ${receiveTimeout} ms`)
                         log.debug(`request errored at client waiting for '${service}' after ${receiveTimeout} ms`, req)
-                        let processed = processResult.bind(this)({ data: undefined, opts: {}, type: Buffer.from(Message.Error) })
+                        let processed = processResult.bind(this)({ data: undefined, opts: {}, type: ERROR_BUFFER })
                         promise.resolve(processed);
                     }
                     
@@ -298,7 +302,7 @@ export class ClientNonBlocking extends TypedEmitter<EbusClientEvents> {
                     requestRecord[1][4] = undefined
                 }
                 // resolve and return
-                promise.resolve({ data: undefined, opts: {}, type: Buffer.from([0]) });
+                promise.resolve({ data: undefined, opts: {}, type: EMPTY_BUFFER });
             }
         }
     }

package/src/run/call.mts

@@ -1,8 +1,7 @@
 
 import { objStrToJson } from "cry-helpers";
 import { config } from "dotenv";
-import { Command, program } from "commander"
-import { exit } from "process";
+import { program } from "commander"
 import { Client } from "../client.mjs";
 import { EbusRequestOptions } from "../EbusRequestOptions.mjs";
 
@@ -12,26 +11,18 @@ program.version('0.0.2');
 
 let client = new Client()
 
-interface MyCommand extends Command {
+interface ProgramOpts {
     timeout: number
     repeat: string
-    silent: string
-    dryRun: string
+    silent: boolean
+    dryRun: boolean
     depth: string
-    measure: string
-}
-
-const myProgram = program as MyCommand
-
-function exitProgram(message: string) 
-{
-    console.error(message)
-    exit(2)
+    measure: boolean
 }
 
 program
     .description('calls a worker')
-    .option('-t, --timeout <ms>', 'timeout in milliseconds', Number.parseInt, 2000)
+    .option('-t, --timeout <ms>', 'timeout in milliseconds', (v: string) => parseInt(v, 10), 2000)
     .option('-r, --repeat <repeat>', 'repeat n times', "1")
     .option('-d, --depth <depth>', 'json output depth', "3")
     .option('-n, --dry-run', 'do not call, just report')
@@ -39,38 +30,35 @@ program
     .option('-S, --silent', 'do not output progress')
     .arguments('<worker> [params]')
     .action(async (worker,params) => {
-       
+        const o = program.opts<ProgramOpts>()
         let workload = tryParseJson(params || '')
-        let opts: Partial<EbusRequestOptions> | undefined = {}
-        let repeat = parseInt(myProgram.repeat)
+        let reqOpts: Partial<EbusRequestOptions> | undefined = {}
+        let repeat = parseInt(o.repeat)
         let start = new Date().valueOf()
         if (isNaN(repeat)) repeat = 1;
-        
-        console.log('myProgram.timeout', myProgram.timeout, typeof myProgram.timeout);
-        
-        if (isNaN(myProgram.timeout)) myProgram.timeout = 1000;
-        if (typeof myProgram.timeout==="number") opts.receiveTimeout=myProgram.timeout
-        if (Object.keys(opts).length === 0) opts = undefined;
-        if (!myProgram.silent) {
+
+        reqOpts.receiveTimeout = o.timeout
+        if (Object.keys(reqOpts).length === 0) reqOpts = undefined;
+        if (!o.silent) {
             console.log('');
-            console.log(`${myProgram.dryRun ? 'would ' : ''}call \x1b[7m ${worker} \x1b[27m`, opts)
+            console.log(`${o.dryRun ? 'would ' : ''}call \x1b[7m ${worker} \x1b[27m`, reqOpts)
             if (repeat!==1)
-                console.log(`repeat \x1b[7m ${repeat} \x1b[27m times`, opts)
+                console.log(`repeat \x1b[7m ${repeat} \x1b[27m times`, reqOpts)
             if (workload) console.log(`with ${typeof workload} message`, workload)
             console.log('')
         }
-        
-        if (!myProgram.dryRun) {
+
+        if (!o.dryRun) {
             try {
 
                 for (let i = 0; i < repeat; i++ ) {
-                    let res = await client.request(worker, workload, opts)
-                    let depth = Number.parseInt(myProgram.depth) || 3
+                    let res = await client.request(worker, workload, reqOpts)
+                    let depth = Number.parseInt(o.depth) || 3
                     console.dir(res, { depth });
                     if (client.lastError) console.log(client.lastError);
-                    if (!myProgram.silent) console.log();
+                    if (!o.silent) console.log();
                 }
-            
+
             } catch (err: any) {
                 console.error(`\x1b[31munexpected error\x1b[0m  ${err.message}`)
                 console.log(err)
@@ -78,7 +66,7 @@ program
             }
         }
 
-        if (myProgram.measure) console.log("elapsed time: ", new Date().valueOf() - start, "ms\n");
+        if (o.measure) console.log("elapsed time: ", new Date().valueOf() - start, "ms\n");
 
         process.exit(0)
     })

package/src/service.mts

@@ -1,6 +1,7 @@
-import { Log } from "cry-helpers"
+import { Log, serialize } from "cry-helpers"
 import { Router } from "zeromq"
 import { Header, Message } from "./types.mjs"
+import type { EbusRequestOptions } from "./EbusRequestOptions.mjs"
 
 const prefixes = ["EBUS_BROKER", "EBUS"]
 const log = new Log(prefixes)
@@ -24,7 +25,8 @@ export class Service {
     }
 
     async dispatchRequest(reqId: Buffer, client: Buffer, timeout: number, opts: Buffer, req: Buffer) {
-        this.requests.push([client, req, reqId, opts, (Date.now()+timeout) ])
+        const absoluteTimeout = timeout * 10
+        this.requests.push([client, req, reqId, opts, (Date.now() + absoluteTimeout)])
         await this.dispatchPending()
     }
 
@@ -51,9 +53,20 @@ export class Service {
 
     async dispatchPending() {
 
-        // purge time-outed requests
+        // purge expired requests in-place and notify clients
         const now = Date.now()
-        this.requests = this.requests.filter( ([v1,v2,v3,v4,until]) => until >= now)
+        let writeIdx = 0
+        for (let i = 0; i < this.requests.length; i++) {
+            const entry = this.requests[i]
+            if (entry[4] < now) {
+                try {
+                    await this.socket.send([entry[0], null, Header.Client, Message.Timeout, entry[2]])
+                } catch { /* client may have disconnected */ }
+            } else {
+                this.requests[writeIdx++] = entry
+            }
+        }
+        this.requests.length = writeIdx
 
         while (this.workers.size && this.requests.length) {
             // find least loaded worker
@@ -69,7 +82,13 @@ export class Service {
                 continue;
             }
 
-            const [client, req, reqId, opts, until] = this.requests.shift()!
+            const [client, req, reqId, opts] = this.requests.shift()!
+
+            // stamp dispatch time into opts so worker can measure from dispatch, not from receive
+            let parsedOpts: Partial<EbusRequestOptions> & { _dispatchedAt?: number }
+            try { parsedOpts = serialize.unpack(opts) ?? {} } catch { parsedOpts = {} }
+            parsedOpts._dispatchedAt = Date.now()
+            const stampedOpts = serialize.pack(parsedOpts)
 
             this.dispatched++;
             this.loads.set(workerKey, (this.loads.get(workerKey)||0)+1)
@@ -83,7 +102,7 @@ export class Service {
                 client,
                 null,
                 reqId,
-                opts,
+                stampedOpts,
                 req,
             ])
         }
@@ -123,14 +142,18 @@ export class Service {
     }
 
     private async returnHeartbeatToWorker(worker: Buffer) {
-        await this.socket.send([
-            worker,
-            null,
-            Header.Worker,
-            Message.Heartbeat,
-            null,
-            null,
-            null,
-        ])
+        try {
+            await this.socket.send([
+                worker,
+                null,
+                Header.Worker,
+                Message.Heartbeat,
+                null,
+                null,
+                null,
+            ])
+        } catch {
+            log.debug(`broker failed to return heartbeat to worker for ${this.name}`)
+        }
     }
 }

package/src/test/config.test.mts

@@ -15,7 +15,7 @@ describe('config', function () {
     let client: Client
 
     before(async () => {
-        const config = { port: TEST_PORT }
+        const config = { port: TEST_PORT, pubPort: TEST_PORT + 100, sendHighWaterMark: 100, sendTimeout: 500 }
         broker = new Broker(config)
         broker.start()
         worker = new EchoWorker(undefined, config)
@@ -27,9 +27,8 @@ describe('config', function () {
 
     after(async () => {
         client.stop()
-        await worker.stop()
-        broker.stop()
-        // Give time for cleanup
+        await worker.shutdown()
+        await broker.stop()
         await new Promise(resolve => setTimeout(resolve, 100))
     })
 

package/src/test/echo.test.mts

@@ -17,7 +17,7 @@ describe('echo worker', function () {
     let client: Client
 
     before(async () => {
-        const config = { port: TEST_PORT }
+        const config = { port: TEST_PORT, pubPort: TEST_PORT + 100, sendHighWaterMark: 100, sendTimeout: 500 }
         broker = new Broker(config)
         broker.start()
         echoWorker = new EchoWorker(undefined, config)
@@ -31,10 +31,9 @@ describe('echo worker', function () {
 
     after(async () => {
         client.stop()
-        await echoWorker.stop()
-        await delayWorker.stop()
-        broker.stop()
-        // Give time for cleanup
+        await echoWorker.shutdown()
+        await delayWorker.shutdown()
+        await broker.stop()
         await new Promise(resolve => setTimeout(resolve, 100))
     })