mqtt-plus 1.4.16 → 1.4.18

package/dst-stage1/mqtt-plus-base.js

@@ -29,6 +29,8 @@ export class BaseTrait extends TraceTrait {
     /*  construct API class  */
     constructor(mqtt, options = {}) {
         super(options);
+        /*  lifecycle state  */
+        this.destroyed = false;
         /*  central message callback registries  */
         this.onRequest = new Map();
         this.onResponse = new Map();
@@ -56,6 +58,8 @@ export class BaseTrait extends TraceTrait {
         /*  hook into the MQTT message processing  */
         this.log("info", "hooking into MQTT client");
         this.messageHandler = (topic, message, packet) => {
+            if (this.destroyed)
+                return;
             /*  convert message to codec-specific input format
                 (NOTICE: MQTT.js uses Buffer in its handler signature only,
                 but internally supports string or Buffer, while we are
@@ -75,17 +79,20 @@ export class BaseTrait extends TraceTrait {
     }
     /*  destroy API class  */
     async destroy() {
+        this.destroyed = true;
         this.log("info", "un-hooking from MQTT client");
         this.mqtt.off("message", this.messageHandler);
         this.onRequest.clear();
         this.onResponse.clear();
     }
     /*  create a registration for subsequent destruction  */
-    makeRegistration(spool, kind, name, key) {
+    makeRegistration(spool, kind, name) {
+        let destroyed = false;
         return {
             destroy: async () => {
-                if (!this.onRequest.has(key))
-                    throw new Error(`destroy: ${kind} "${name}" not registered`);
+                if (destroyed)
+                    return;
+                destroyed = true;
                 await spool.unroll(false)?.catch((err) => {
                     const error = ensureError(err, `destroy: ${kind} "${name}" failed to cleanup`);
                     this.error(error);
@@ -160,6 +167,8 @@ export class BaseTrait extends TraceTrait {
     }
     /*  handle incoming MQTT message  */
     _onMessage(topic, data, _packet) {
+        if (this.destroyed)
+            return;
         /*  parse MQTT topic  */
         const topicMatch = this.options.topicMatch(topic);
         if (topicMatch === null)
@@ -187,13 +196,24 @@ export class BaseTrait extends TraceTrait {
             return;
         }
         this.log("debug", `received from MQTT topic "${topic}"`, { message });
+        /*  warn on receiver mismatch on direct topics  */
+        if (topicMatch.peerId !== undefined
+            && message.receiver !== undefined
+            && message.receiver !== topicMatch.peerId)
+            this.log("warning", `receiver mismatch on direct topic "${topic}"` +
+                ` (expected "${topicMatch.peerId}", got "${message.receiver}")`);
         /*  dispatch MQTT+ message  */
         if (this.msg.isRequest(message)) {
             /*  dispatch request message  */
             const handler = this.onRequest.get(`${message.type}:${message.name}`);
             if (handler !== undefined) {
-                Promise.resolve().then(() => handler(message, topicMatch.name)).catch((err) => {
-                    this.error(ensureError(err, `dispatching request message from MQTT topic "${topic}" failed`));
+                Promise.resolve().then(() => {
+                    if (this.destroyed)
+                        return;
+                    return handler(message, topicMatch.name);
+                }).catch((err) => {
+                    this.error(ensureError(err, `dispatching request message from MQTT topic "${topic}" ` +
+                        `(type: ${message.type}, id: ${message.id}, name: ${message.name}) failed`));
                 });
             }
         }
@@ -201,8 +221,13 @@ export class BaseTrait extends TraceTrait {
             /*  dispatch response message  */
             const handler = this.onResponse.get(`${message.type}:${message.id}`);
             if (handler !== undefined) {
-                Promise.resolve().then(() => handler(message, topicMatch.name)).catch((err) => {
-                    this.error(ensureError(err, `dispatching response message from MQTT topic "${topic}" failed`));
+                Promise.resolve().then(() => {
+                    if (this.destroyed)
+                        return;
+                    return handler(message, topicMatch.name);
+                }).catch((err) => {
+                    this.error(ensureError(err, `dispatching response message from MQTT topic "${topic}" ` +
+                        `(type: ${message.type}, id: ${message.id}, name: ${message.name}) failed`));
                 });
             }
         }

package/dst-stage1/mqtt-plus-base.js.map

@@ -1 +1 @@
-{"version":3,"file":"mqtt-plus-base.js","sourceRoot":"","sources":["../src/mqtt-plus-base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mqtt-plus-base.js","sourceRoot":"","sources":["../src/mqtt-plus-base.ts"],"names":[],"mappings":"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"}

package/dst-stage1/mqtt-plus-error.d.ts

@@ -1,6 +1,7 @@
 type SpoolCleanup<T = unknown> = (resource: T) => void | Promise<void>;
 export declare class Spool {
     private resources;
+    private pending;
     roll(cleanup: SpoolCleanup): void;
     roll<T>(resource: T, cleanup: SpoolCleanup<T>): void;
     sub(): Spool;

package/dst-stage1/mqtt-plus-error.js

@@ -26,6 +26,7 @@ export class Spool {
     constructor() {
         /*  internal state  */
         this.resources = [];
+        this.pending = null;
     }
     roll(...args) {
         /*  determine parameters  */
@@ -49,47 +50,74 @@ export class Spool {
         /*  create new spool  */
         const spool = new Spool();
         /*  roll sub-spool onto spool  */
-        this.roll(spool, () => { });
+        this.roll(spool, (s) => s.unroll());
         /*  return new spool  */
         return spool;
     }
     /*  unroll all cleanup procedures from spool  */
     unroll(suppress = true) {
+        /*  guard against concurrent unroll: if an unroll is already
+            in progress, return the existing promise so all callers
+            wait for the same completion  */
+        if (this.pending !== null) {
+            if (suppress)
+                return this.pending.catch(() => { });
+            return this.pending;
+        }
+        /*  atomically take ownership of the currently rolled
+            resources so re-entrant unroll() calls from within
+            a synchronous cleanup observe an empty spool  */
+        const resources = this.resources;
+        this.resources = [];
         /*  NOTICE: we operate synchronously until the first
             cleanup procedure returns a Promise. Then we continue
             asynchronously, regardless of whether the following
             cleanup procedures return a Promise or not!  */
-        try {
-            let promise;
-            while (this.resources.length > 0) {
-                const entry = this.resources.pop();
-                const resource = entry.resource;
-                const cleanup = entry.cleanup;
-                if (promise) {
-                    if (resource instanceof Spool)
-                        promise = promise.then(() => resource.unroll() /* RECURSION */);
-                    else
-                        promise = promise.then(() => cleanup(resource));
-                }
-                else {
-                    let result;
-                    if (resource instanceof Spool)
-                        result = resource.unroll(); /* RECURSION */
-                    else
-                        result = cleanup(resource);
+        const errors = [];
+        let promise;
+        while (resources.length > 0) {
+            const entry = resources.pop();
+            const resource = entry.resource;
+            const cleanup = entry.cleanup;
+            if (promise) {
+                /*  async continuation: isolate each cleanup so one rejection
+                    does not prevent remaining cleanups from executing  */
+                promise = promise.then(() => cleanup(resource))
+                    .catch((err) => { errors.push(err); });
+            }
+            else {
+                /*  sync start: wrap individually so a throw
+                    does not exit the while loop  */
+                try {
+                    const result = cleanup(resource);
                     if (result instanceof Promise)
-                        promise = result;
+                        promise = result.catch((err) => { errors.push(err); });
+                }
+                catch (err) {
+                    errors.push(err);
                 }
             }
-            if (promise)
-                return suppress ? promise.catch(() => { }) : promise;
-            else
-                return;
         }
-        catch (error) {
+        if (promise) {
+            /*  store the pending promise for concurrent-caller guard  */
+            this.pending = promise.then(() => {
+                if (errors.length === 1)
+                    throw errors[0];
+                else if (errors.length > 1)
+                    throw new AggregateError(errors, "multiple cleanup failures");
+            }).finally(() => {
+                this.pending = null;
+            });
             if (suppress)
-                return;
-            throw error;
+                return this.pending.catch(() => { });
+            return this.pending;
+        }
+        else {
+            if (!suppress && errors.length === 1)
+                throw errors[0];
+            else if (!suppress && errors.length > 1)
+                throw new AggregateError(errors, "multiple cleanup failures");
+            return;
         }
     }
 }
@@ -112,7 +140,7 @@ export function ensureError(error, prefix, debug = false) {
     else
         return new Error(msg);
 }
-function runFinally(isAsync, onfinally) {
+function runFinally(isAsync, onfinally, description) {
     if (!onfinally) {
         if (isAsync)
             return Promise.resolve();
@@ -125,14 +153,16 @@ function runFinally(isAsync, onfinally) {
     }
     catch (error) {
         if (isAsync)
-            return Promise.reject(error);
+            return Promise.reject(ensureError(error, description));
         else
-            throw error;
+            throw ensureError(error, description);
     }
     if (!isAsync && result instanceof Promise)
         throw new Error("onfinally callback returned Promise in non-async context");
     if (isAsync && !(result instanceof Promise))
         result = Promise.resolve(result);
+    if (isAsync && result instanceof Promise)
+        return result.catch((error) => { throw ensureError(error, description); });
     return result;
 }
 function runUnroll(isAsync, spool) {
@@ -213,21 +243,21 @@ export function run(...args) {
             }
             catch (arg) {
                 error = ensureError(arg, description);
-                runFinally(false, onfinally);
+                runFinally(false, onfinally, description);
                 runUnroll(false, spool);
                 throw error;
             }
-            runFinally(false, onfinally);
+            runFinally(false, onfinally, description);
             return result;
         }
-        runFinally(false, onfinally);
+        runFinally(false, onfinally, description);
         runUnroll(false, spool);
         throw error;
     }
     if (result instanceof Promise) {
         /*  asynchronous case (result or error branch)  */
         return result.then(async (result) => {
-            await runFinally(true, onfinally);
+            await runFinally(true, onfinally, description);
             if (spool && oncleanup)
                 spool.roll(result, oncleanup);
             return result;
@@ -236,25 +266,25 @@ export function run(...args) {
             let error = ensureError(arg, description);
             if (oncatch) {
                 try {
-                    const result = oncatch(error);
-                    await runFinally(true, onfinally);
+                    const result = await oncatch(error);
+                    await runFinally(true, onfinally, description);
                     return result;
                 }
                 catch (arg) {
                     error = ensureError(arg, description);
-                    await runFinally(true, onfinally);
+                    await runFinally(true, onfinally, description);
                     await runUnroll(true, spool);
                     throw error;
                 }
             }
-            await runFinally(true, onfinally);
+            await runFinally(true, onfinally, description);
             await runUnroll(true, spool);
             throw error;
         });
     }
     else {
         /*  synchronous case (result branch)  */
-        runFinally(false, onfinally);
+        runFinally(false, onfinally, description);
         if (spool && oncleanup)
             spool.roll(result, oncleanup);
         return result;

package/dst-stage1/mqtt-plus-error.js.map

@@ -1 +1 @@
-{"version":3,"file":"mqtt-plus-error.js","sourceRoot":"","sources":["../src/mqtt-plus-error.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mqtt-plus-error.js","sourceRoot":"","sources":["../src/mqtt-plus-error.ts"],"names":[],"mappings":"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"}

package/dst-stage1/mqtt-plus-event.d.ts

@@ -3,6 +3,8 @@ import type { APISchema, EventKeys, Registration } from "./mqtt-plus-api";
 import type { WithInfo, InfoEvent } from "./mqtt-plus-info";
 import { AuthTrait, type AuthOption } from "./mqtt-plus-auth";
 export declare class EventTrait<T extends APISchema = APISchema> extends AuthTrait<T> {
+    private eventControllers;
+    destroy(): Promise<void>;
     event<K extends EventKeys<T> & string>(name: K, callback: WithInfo<T[K], InfoEvent>): Promise<Registration>;
     event<K extends EventKeys<T> & string>(config: {
         name: K;
@@ -11,14 +13,14 @@ export declare class EventTrait<T extends APISchema = APISchema> extends AuthTra
         share?: string;
         auth?: AuthOption;
     }): Promise<Registration>;
-    emit<K extends EventKeys<T> & string>(name: K, ...params: Parameters<T[K]>): void;
+    emit<K extends EventKeys<T> & string>(name: K, ...params: Parameters<T[K]>): Promise<void>;
     emit<K extends EventKeys<T> & string>(config: {
         name: K;
         params: Parameters<T[K]>;
         receiver?: string;
         options?: IClientPublishOptions;
         meta?: Record<string, any>;
-    }): void;
+    }): Promise<void>;
     emit<K extends EventKeys<T> & string>(config: {
         name: K;
         params: Parameters<T[K]>;

package/dst-stage1/mqtt-plus-event.js

@@ -23,10 +23,25 @@
 */
 import { nanoid } from "nanoid";
 import { AuthTrait } from "./mqtt-plus-auth";
-import { Spool, ensureError } from "./mqtt-plus-error";
+import { Spool, ensureError, run } from "./mqtt-plus-error";
 /*  Event Emission Trait  */
 export class EventTrait extends AuthTrait {
+    constructor() {
+        super(...arguments);
+        /*  event state  */
+        this.eventControllers = new Map();
+    }
+    /*  destroy trait  */
+    async destroy() {
+        for (const controller of this.eventControllers.values())
+            controller.abort(new Error("event destroyed"));
+        this.eventControllers.clear();
+        await super.destroy();
+    }
     async event(nameOrConfig, ...args) {
+        /*  sanity check lifecycle  */
+        if (this.destroyed)
+            throw new Error("event: instance already destroyed");
         /*  determine actual parameters  */
         let name;
         let callback;
@@ -54,6 +69,15 @@ export class EventTrait extends AuthTrait {
         /*  sanity check situation  */
         if (this.onRequest.has(`event-emission:${name}`))
             throw new Error(`event: event "${name}" already registered`);
+        /*  create per-event controller tracking  */
+        const requestIds = new Set();
+        spool.roll(() => {
+            for (const requestId of requestIds) {
+                this.eventControllers.get(requestId)?.abort(new Error(`event "${name}" destroyed`));
+                this.eventControllers.delete(requestId);
+            }
+            requestIds.clear();
+        });
         /*  generate the corresponding MQTT topics for broadcast and direct use  */
         const topicS = share !== "" ? `$share/${share}/${name}` : name;
         const topicB = this.options.topicMake(topicS, "event-emission");
@@ -64,39 +88,65 @@ export class EventTrait extends AuthTrait {
             if (request.receiver && request.receiver !== this.options.id)
                 return;
             /*  determine event information  */
+            const requestId = request.id;
             const senderId = request.sender;
-            if (senderId === undefined || senderId === "")
-                throw new Error("invalid request: missing sender");
+            if (senderId === undefined || senderId === "") {
+                this.error(new Error("invalid request: missing sender"));
+                return;
+            }
+            /*  sanity check topic/payload name  */
+            if (topicName !== request.name) {
+                this.log("warning", `event name mismatch -- dropped request for "${name}"` +
+                    ` (topic: "${topicName}", payload: "${request.name}")`, { requestId });
+                return;
+            }
             const params = request.params ?? [];
+            /*  sanity check request id  */
+            if (this.eventControllers.has(requestId)) {
+                this.log("warning", `duplicate event request id -- dropped request for event "${name}"`, { requestId });
+                return;
+            }
+            /*  define abort controller and signal  */
+            const abortController = new AbortController();
+            const abortSignal = abortController.signal;
+            requestIds.add(requestId);
+            this.eventControllers.set(requestId, abortController);
             /*  create information object  */
-            const info = { sender: senderId };
+            const info = {
+                sender: senderId,
+                signal: abortSignal
+            };
             if (request.receiver)
                 info.receiver = request.receiver;
             if (request.meta)
                 info.meta = request.meta;
             /*  asynchronously execute handler  */
             try {
-                if (topicName !== request.name)
-                    throw new Error(`event name mismatch (topic: "${topicName}", payload: "${request.name}")`);
                 if (auth)
-                    info.authenticated = await this.authenticated(senderId, request.auth, auth);
-                if (info.authenticated !== undefined && !info.authenticated)
-                    throw new Error(`event "${name}" failed authentication`);
+                    info.authenticated = await this.authenticated(senderId, request.auth, auth, `event "${name}"`);
                 await callback(...params, info);
             }
             catch (result) {
                 const error = ensureError(result);
                 this.error(error, `handler for event "${name}" failed`);
             }
+            finally {
+                abortController.abort();
+                requestIds.delete(requestId);
+                this.eventControllers.delete(requestId);
+            }
         });
         spool.roll(() => { this.onRequest.delete(`event-emission:${name}`); });
         /*  subscribe to MQTT topics  */
         await this.subscribeTopicAndSpool(spool, topicB, options);
         await this.subscribeTopicAndSpool(spool, topicD, options);
         /*  provide a registration for subsequent destruction  */
-        return this.makeRegistration(spool, "event", name, `event-emission:${name}`);
+        return this.makeRegistration(spool, "event", name);
     }
     emit(nameOrConfig, ...args) {
+        /*  sanity check lifecycle  */
+        if (this.destroyed)
+            throw new Error("emit: instance already destroyed");
         /*  determine actual parameters  */
         let name;
         let params;
@@ -133,9 +183,7 @@ export class EventTrait extends AuthTrait {
             return { topic, payload: message, options: { qos: 2, ...options } };
         else
             /*  publish message to MQTT topic  */
-            this.publishToTopic(topic, message, { qos: 2, ...options }).catch((err) => {
-                this.error(err, `emitting event "${name}" failed`);
-            });
+            return run(`publish event as MQTT message to topic "${topic}"`, () => this.publishToTopic(topic, message, { qos: 2, ...options }));
     }
 }
 //# sourceMappingURL=mqtt-plus-event.js.map

package/dst-stage1/mqtt-plus-event.js.map

@@ -1 +1 @@
-{"version":3,"file":"mqtt-plus-event.js","sourceRoot":"","sources":["../src/mqtt-plus-event.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mqtt-plus-event.js","sourceRoot":"","sources":["../src/mqtt-plus-event.ts"],"names":[],"mappings":"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"}

package/dst-stage1/mqtt-plus-info.d.ts

@@ -6,8 +6,10 @@ export interface InfoBase {
     meta?: Record<string, any>;
 }
 export interface InfoEvent extends InfoBase {
+    signal: AbortSignal;
 }
 export interface InfoService extends InfoBase {
+    signal: AbortSignal;
 }
 export interface InfoSource extends InfoBase {
     signal: AbortSignal;

package/dst-stage1/mqtt-plus-msg.d.ts

@@ -21,19 +21,22 @@ export declare class ServiceCallRequest extends Base {
     params?: any[] | undefined;
     auth?: string[] | undefined;
     meta?: Record<string, any> | undefined;
-    constructor(id: string, name: string, params?: any[] | undefined, sender?: string, receiver?: string, auth?: string[] | undefined, meta?: Record<string, any> | undefined);
+    qos?: 0 | 1 | 2 | undefined;
+    constructor(id: string, name: string, params?: any[] | undefined, sender?: string, receiver?: string, auth?: string[] | undefined, meta?: Record<string, any> | undefined, qos?: 0 | 1 | 2 | undefined);
 }
 export declare class ServiceCallResponse extends Base {
+    name: string;
     result?: any | undefined;
     error?: string | undefined;
-    constructor(id: string, result?: any | undefined, error?: string | undefined, sender?: string, receiver?: string);
+    constructor(id: string, name: string, result?: any | undefined, error?: string | undefined, sender?: string, receiver?: string);
 }
 export declare class SinkPushRequest extends Base {
     name: string;
     params?: any[] | undefined;
     auth?: string[] | undefined;
     meta?: Record<string, any> | undefined;
-    constructor(id: string, name: string, params?: any[] | undefined, sender?: string, receiver?: string, auth?: string[] | undefined, meta?: Record<string, any> | undefined);
+    qos?: 0 | 1 | 2 | undefined;
+    constructor(id: string, name: string, params?: any[] | undefined, sender?: string, receiver?: string, auth?: string[] | undefined, meta?: Record<string, any> | undefined, qos?: 0 | 1 | 2 | undefined);
 }
 export declare class SinkPushResponse extends Base {
     name: string;
@@ -59,7 +62,8 @@ export declare class SourceFetchRequest extends Base {
     auth?: string[] | undefined;
     meta?: Record<string, any> | undefined;
     credit?: number | undefined;
-    constructor(id: string, name: string, params?: any[] | undefined, sender?: string, receiver?: string, auth?: string[] | undefined, meta?: Record<string, any> | undefined, credit?: number | undefined);
+    qos?: 0 | 1 | 2 | undefined;
+    constructor(id: string, name: string, params?: any[] | undefined, sender?: string, receiver?: string, auth?: string[] | undefined, meta?: Record<string, any> | undefined, credit?: number | undefined, qos?: 0 | 1 | 2 | undefined);
 }
 export declare class SourceFetchResponse extends Base {
     name: string;
@@ -82,13 +86,13 @@ export declare class SourceFetchCredit extends Base {
 export type Message = EventEmission | ServiceCallRequest | ServiceCallResponse | SinkPushRequest | SinkPushResponse | SinkPushChunk | SinkPushCredit | SourceFetchRequest | SourceFetchResponse | SourceFetchChunk | SourceFetchCredit;
 declare class Msg {
     makeEventEmission(id: string, name: string, params?: any[], sender?: string, receiver?: string, auth?: string[], meta?: Record<string, any>): EventEmission;
-    makeServiceCallRequest(id: string, name: string, params?: any[], sender?: string, receiver?: string, auth?: string[], meta?: Record<string, any>): ServiceCallRequest;
-    makeServiceCallResponse(id: string, result?: any, error?: string, sender?: string, receiver?: string): ServiceCallResponse;
-    makeSinkPushRequest(id: string, name: string, params?: any[], sender?: string, receiver?: string, auth?: string[], meta?: Record<string, any>): SinkPushRequest;
+    makeServiceCallRequest(id: string, name: string, params?: any[], sender?: string, receiver?: string, auth?: string[], meta?: Record<string, any>, qos?: 0 | 1 | 2): ServiceCallRequest;
+    makeServiceCallResponse(id: string, name: string, result?: any, error?: string, sender?: string, receiver?: string): ServiceCallResponse;
+    makeSinkPushRequest(id: string, name: string, params?: any[], sender?: string, receiver?: string, auth?: string[], meta?: Record<string, any>, qos?: 0 | 1 | 2): SinkPushRequest;
     makeSinkPushResponse(id: string, name: string, error?: string, sender?: string, receiver?: string, credit?: number): SinkPushResponse;
     makeSinkPushChunk(id: string, name: string, chunk?: Uint8Array, error?: string, final?: boolean, sender?: string, receiver?: string): SinkPushChunk;
     makeSinkPushCredit(id: string, name: string, credit: number, sender?: string, receiver?: string): SinkPushCredit;
-    makeSourceFetchRequest(id: string, name: string, params?: any[], sender?: string, receiver?: string, auth?: string[], meta?: Record<string, any>, credit?: number): SourceFetchRequest;
+    makeSourceFetchRequest(id: string, name: string, params?: any[], sender?: string, receiver?: string, auth?: string[], meta?: Record<string, any>, credit?: number, qos?: 0 | 1 | 2): SourceFetchRequest;
     makeSourceFetchResponse(id: string, name: string, error?: string, sender?: string, receiver?: string, meta?: Record<string, any>): SourceFetchResponse;
     makeSourceFetchChunk(id: string, name: string, chunk?: Uint8Array, error?: string, final?: boolean, sender?: string, receiver?: string): SourceFetchChunk;
     makeSourceFetchCredit(id: string, name: string, credit: number, sender?: string, receiver?: string): SourceFetchCredit;