mqtt-plus 1.4.0 → 1.4.2

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

@@ -22,17 +22,10 @@
 **  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 import { nanoid } from "nanoid";
-/*  internal requirements  */
-import { EventEmission } from "./mqtt-plus-msg";
 import { AuthTrait } from "./mqtt-plus-auth";
 import { run, Spool, ensureError } from "./mqtt-plus-error";
 /*  Event Emission Trait  */
 export class EventTrait extends AuthTrait {
-    constructor() {
-        super(...arguments);
-        /*  internal state  */
-        this.events = new Map();
-    }
     async event(nameOrConfig, ...args) {
         /*  determine actual parameters  */
         let name;
@@ -56,14 +49,14 @@ export class EventTrait extends AuthTrait {
         /*  create resource spool  */
         const spool = new Spool();
         /*  sanity check situation  */
-        if (this.events.has(name))
+        if (this.onRequest.has(`event-emission:${name}`))
             throw new Error(`event: event "${name}" already registered`);
         /*  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");
         const topicD = this.options.topicMake(name, "event-emission", this.options.id);
         /*  remember the registration  */
-        this.events.set(name, (request, topicName) => {
+        this.onRequest.set(`event-emission:${name}`, (request, topicName) => {
             /*  determine event information  */
             const senderId = request.sender;
             const params = request.params ?? [];
@@ -87,7 +80,7 @@ export class EventTrait extends AuthTrait {
                 this.error(error, `handler for event "${name}" failed`);
             });
         });
-        spool.roll(() => { this.events.delete(name); });
+        spool.roll(() => { this.onRequest.delete(`event-emission:${name}`); });
         /*  subscribe to MQTT topics  */
         await run(`subscribe to MQTT topic "${topicB}"`, spool, () => this._subscribeTopic(topicB, { qos: 2, ...options }));
         spool.roll(() => this._unsubscribeTopic(topicB).catch(() => { }));
@@ -96,7 +89,7 @@ export class EventTrait extends AuthTrait {
         /*  provide a registration for subsequent destruction  */
         return {
             destroy: async () => {
-                if (!this.events.has(name))
+                if (!this.onRequest.has(`event-emission:${name}`))
                     throw new Error(`destroy: event "${name}" not registered`);
                 await spool.unroll(false)?.catch((err) => {
                     this.error(err, `destroy: failed to cleanup: ${err.message}`);
@@ -110,7 +103,7 @@ export class EventTrait extends AuthTrait {
         let params;
         let receiver;
         let options = {};
-        let meta = {};
+        let meta;
         let dry;
         if (typeof eventOrConfig === "object" && eventOrConfig !== null) {
             /*  object-based API  */
@@ -118,7 +111,7 @@ export class EventTrait extends AuthTrait {
             params = eventOrConfig.params;
             receiver = eventOrConfig.receiver;
             options = eventOrConfig.options ?? {};
-            meta = eventOrConfig.meta ?? {};
+            meta = eventOrConfig.meta;
             dry = eventOrConfig.dry;
         }
         else {
@@ -145,17 +138,4 @@ export class EventTrait extends AuthTrait {
                 this.error(err, `emitting event "${event}" failed`);
             });
     }
-    /*  dispatch message (Event pattern handling)  */
-    async _dispatchMessage(topic, message) {
-        await super._dispatchMessage(topic, message);
-        const topicMatch = this.options.topicMatch(topic);
-        /*  on server-side handle event emission request  */
-        if (topicMatch !== null
-            && topicMatch.operation === "event-emission"
-            && message instanceof EventEmission) {
-            const handler = this.events.get(message.name);
-            if (handler !== undefined)
-                handler(message, topicMatch.name);
-        }
-    }
 }

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

@@ -1,6 +1,6 @@
 import type { APISchema } from "./mqtt-plus-api";
-import { BaseTrait } from "./mqtt-plus-base";
-export declare class MetaTrait<T extends APISchema = APISchema> extends BaseTrait<T> {
+import { TimerTrait } from "./mqtt-plus-timer";
+export declare class MetaTrait<T extends APISchema = APISchema> extends TimerTrait<T> {
     private _meta;
     meta(): Record<string, any>;
     meta(key: string): any;

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

@@ -21,9 +21,9 @@
 **  TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 **  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-import { BaseTrait } from "./mqtt-plus-base";
+import { TimerTrait } from "./mqtt-plus-timer";
 /*  Meta trait with meta information management  */
-export class MetaTrait extends BaseTrait {
+export class MetaTrait extends TimerTrait {
     constructor() {
         super(...arguments);
         /*  internal state  */

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

@@ -95,6 +95,8 @@ declare class Msg {
     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;
     parse(obj: any): EventEmission | ServiceCallRequest | ServiceCallResponse | SinkPushRequest | SinkPushResponse | SinkPushChunk | SinkPushCredit | SourceFetchRequest | SourceFetchResponse | SourceFetchChunk | SourceFetchCredit;
+    isRequest(msg: any): msg is (EventEmission | ServiceCallRequest | SourceFetchRequest | SinkPushRequest);
+    isResponse(msg: any): msg is (ServiceCallResponse | SinkPushResponse | SinkPushChunk | SinkPushCredit | SourceFetchResponse | SourceFetchChunk | SourceFetchCredit);
 }
 export declare class MsgTrait<T extends APISchema = APISchema> extends EncodeTrait<T> {
     protected msg: Msg;

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

@@ -343,6 +343,23 @@ class Msg {
         else
             throw new Error("invalid object: not of any known type");
     }
+    /*  guard for request messages  */
+    isRequest(msg) {
+        return (msg instanceof EventEmission
+            || msg instanceof ServiceCallRequest
+            || msg instanceof SourceFetchRequest
+            || msg instanceof SinkPushRequest);
+    }
+    /*  guard for response messages  */
+    isResponse(msg) {
+        return (msg instanceof ServiceCallResponse
+            || msg instanceof SinkPushResponse
+            || msg instanceof SinkPushChunk
+            || msg instanceof SinkPushCredit
+            || msg instanceof SourceFetchResponse
+            || msg instanceof SourceFetchChunk
+            || msg instanceof SourceFetchCredit);
+    }
 }
 /*  message trait  */
 export class MsgTrait extends EncodeTrait {

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

@@ -4,10 +4,6 @@ import type { WithInfo, InfoService } from "./mqtt-plus-info";
 import { EventTrait } from "./mqtt-plus-event";
 import type { AuthOption } from "./mqtt-plus-auth";
 export declare class ServiceTrait<T extends APISchema = APISchema> extends EventTrait<T> {
-    private services;
-    private callCallbacks;
-    private callSubscriptions;
-    destroy(): void;
     service<K extends ServiceKeys<T> & string>(name: K, callback: WithInfo<T[K], InfoService>): Promise<Registration>;
     service<K extends ServiceKeys<T> & string>(config: {
         name: K;
@@ -24,5 +20,4 @@ export declare class ServiceTrait<T extends APISchema = APISchema> extends Event
         options?: IClientPublishOptions;
         meta?: Record<string, any>;
     }): Promise<ReturnType<T[K]>>;
-    protected _dispatchMessage(topic: string, message: any): Promise<void>;
 }

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

@@ -23,24 +23,10 @@
 */
 import { nanoid } from "nanoid";
 /*  internal requirements  */
-import { RefCountedSubscription } from "./mqtt-plus-util";
 import { run, Spool, ensureError } from "./mqtt-plus-error";
-import { ServiceCallRequest, ServiceCallResponse } from "./mqtt-plus-msg";
 import { EventTrait } from "./mqtt-plus-event";
 /*  Service Call Trait  */
 export class ServiceTrait extends EventTrait {
-    constructor() {
-        super(...arguments);
-        /*  internal state  */
-        this.services = new Map();
-        this.callCallbacks = new Map();
-        this.callSubscriptions = new RefCountedSubscription((topic, options) => this._subscribeTopic(topic, options), (topic) => this._unsubscribeTopic(topic));
-    }
-    /*  destroy service trait  */
-    destroy() {
-        super.destroy();
-        this.callSubscriptions.flush();
-    }
     async service(nameOrConfig, ...args) {
         /*  determine actual parameters  */
         let name;
@@ -64,14 +50,14 @@ export class ServiceTrait extends EventTrait {
         /*  create a resource spool  */
         const spool = new Spool();
         /*  sanity check situation  */
-        if (this.services.has(name))
-            throw new Error(`register: service "${name}" already registered`);
+        if (this.onRequest.has(`service-call-request:${name}`))
+            throw new Error(`service: service "${name}" already registered`);
         /*  generate the corresponding MQTT topics for broadcast and direct use  */
         const topicS = `$share/${share}/${name}`;
         const topicB = this.options.topicMake(topicS, "service-call-request");
         const topicD = this.options.topicMake(name, "service-call-request", this.options.id);
         /*  remember the registration  */
-        this.services.set(name, (request, topicName) => {
+        this.onRequest.set(`service-call-request:${name}`, (request, topicName) => {
             /*  determine request information  */
             const requestId = request.id;
             const senderId = request.sender;
@@ -110,7 +96,7 @@ export class ServiceTrait extends EventTrait {
                 this.error(err, `handler for service "${name}" failed`);
             });
         });
-        spool.roll(() => { this.services.delete(name); });
+        spool.roll(() => { this.onRequest.delete(`service-call-request:${name}`); });
         /*  subscribe to MQTT topics  */
         await run(`subscribe to MQTT topic "${topicB}"`, spool, () => this._subscribeTopic(topicB, { qos: 2, ...options }));
         spool.roll(() => this._unsubscribeTopic(topicB).catch(() => { }));
@@ -119,8 +105,8 @@ export class ServiceTrait extends EventTrait {
         /*  provide a registration for subsequent destruction  */
         return {
             destroy: async () => {
-                if (!this.services.has(name))
-                    throw new Error(`destroy: service "${name}" no longer registered`);
+                if (!this.onRequest.has(`service-call-request:${name}`))
+                    throw new Error(`destroy: service "${name}" not registered`);
                 await spool.unroll(false)?.catch((err) => {
                     this.error(err, `destroy: failed to cleanup: ${err.message}`);
                 });
@@ -133,14 +119,14 @@ export class ServiceTrait extends EventTrait {
         let params;
         let receiver;
         let options = {};
-        let meta = {};
+        let meta;
         if (typeof nameOrConfig === "object" && nameOrConfig !== null) {
             /*  object-based API  */
             name = nameOrConfig.name;
             params = nameOrConfig.params;
             receiver = nameOrConfig.receiver;
             options = nameOrConfig.options ?? {};
-            meta = nameOrConfig.meta ?? {};
+            meta = nameOrConfig.meta;
         }
         else {
             /*  positional API  */
@@ -153,8 +139,8 @@ export class ServiceTrait extends EventTrait {
         const requestId = nanoid();
         /*  subscribe to MQTT response topic  */
         const responseTopic = this.options.topicMake(name, "service-call-response", this.options.id);
-        await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.callSubscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
-        spool.roll(() => this.callSubscriptions.unsubscribe(responseTopic));
+        await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.subscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
+        spool.roll(() => this.subscriptions.unsubscribe(responseTopic));
         /*  create promise for MQTT response handling  */
         const promise = new Promise((resolve, reject) => {
             let timer = setTimeout(async () => {
@@ -168,14 +154,14 @@ export class ServiceTrait extends EventTrait {
                     timer = null;
                 }
             });
-            this.callCallbacks.set(requestId, async (response) => {
+            this.onResponse.set(`service-call-response:${requestId}`, async (response) => {
                 await spool.unroll();
                 if (response.error !== undefined)
                     reject(new Error(response.error));
                 else
                     resolve(response.result);
             });
-            spool.roll(() => { this.callCallbacks.delete(requestId); });
+            spool.roll(() => { this.onResponse.delete(`service-call-response:${requestId}`); });
         });
         /*  generate encoded message  */
         const auth = this.authenticate();
@@ -188,26 +174,4 @@ export class ServiceTrait extends EventTrait {
         await run(`publish service request as MQTT message to topic "${topic}"`, spool, () => this._publishToTopic(topic, message, { qos: 2, ...options }));
         return promise;
     }
-    /*  dispatch message (Service pattern handling)  */
-    async _dispatchMessage(topic, message) {
-        await super._dispatchMessage(topic, message);
-        const topicMatch = this.options.topicMatch(topic);
-        /*  on server-side handle service call request  */
-        if (topicMatch !== null
-            && topicMatch.operation === "service-call-request"
-            && message instanceof ServiceCallRequest) {
-            const handler = this.services.get(message.name);
-            if (handler !== undefined)
-                handler(message, topicMatch.name);
-        }
-        /*  on client-side handle service call response  */
-        else if (topicMatch !== null
-            && topicMatch.operation === "service-call-response"
-            && topicMatch.peerId === this.options.id
-            && message instanceof ServiceCallResponse) {
-            const handler = this.callCallbacks.get(message.id);
-            if (handler !== undefined)
-                handler(message);
-        }
-    }
 }

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

@@ -5,17 +5,8 @@ import type { WithInfo, InfoSink } from "./mqtt-plus-info";
 import { SourceTrait } from "./mqtt-plus-source";
 import type { AuthOption } from "./mqtt-plus-auth";
 export declare class SinkTrait<T extends APISchema = APISchema> extends SourceTrait<T> {
-    private sinks;
     private pushStreams;
     private pushSpools;
-    private pushTimers;
-    private pushChunkCallbacks;
-    private pushResponseCallbacks;
-    private pushCreditCallbacks;
-    private pushSubscriptions;
-    destroy(): void;
-    private _refreshPushTimer;
-    private _clearPushTimer;
     sink<K extends SinkKeys<T> & string>(name: K, callback: WithInfo<T[K], InfoSink>): Promise<Registration>;
     sink<K extends SinkKeys<T> & string>(config: {
         name: K;
@@ -33,5 +24,4 @@ export declare class SinkTrait<T extends APISchema = APISchema> extends SourceTr
         options?: IClientPublishOptions;
         meta?: Record<string, any>;
     }): Promise<void>;
-    protected _dispatchMessage(topic: string, message: any): Promise<void>;
 }

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

@@ -25,50 +25,16 @@
 import { Readable } from "node:stream";
 import { nanoid } from "nanoid";
 /*  internal requirements  */
-import { CreditGate, RefCountedSubscription, streamToBuffer, sendBufferAsChunks, sendStreamAsChunks, makeMutuallyExclusiveFields } from "./mqtt-plus-util";
+import { CreditGate, streamToBuffer, sendBufferAsChunks, sendStreamAsChunks, makeMutuallyExclusiveFields } from "./mqtt-plus-util";
 import { run, Spool } from "./mqtt-plus-error";
-import { SinkPushRequest, SinkPushResponse, SinkPushChunk, SinkPushCredit } from "./mqtt-plus-msg";
 import { SourceTrait } from "./mqtt-plus-source";
 /*  Sink Push Trait  */
 export class SinkTrait extends SourceTrait {
     constructor() {
         super(...arguments);
         /*  sink state  */
-        this.sinks = new Map();
         this.pushStreams = new Map();
         this.pushSpools = new Map();
-        this.pushTimers = new Map();
-        this.pushChunkCallbacks = new Map();
-        this.pushResponseCallbacks = new Map();
-        this.pushCreditCallbacks = new Map();
-        this.pushSubscriptions = new RefCountedSubscription((topic, options) => this._subscribeTopic(topic, options), (topic) => this._unsubscribeTopic(topic));
-    }
-    /*  destroy sink trait  */
-    destroy() {
-        super.destroy();
-        this.pushSubscriptions.flush();
-    }
-    /*  refresh push timer for a specific request  */
-    _refreshPushTimer(requestId) {
-        const timer = this.pushTimers.get(requestId);
-        if (timer !== undefined)
-            clearTimeout(timer);
-        this.pushTimers.set(requestId, setTimeout(() => {
-            this.pushTimers.delete(requestId);
-            const stream = this.pushStreams.get(requestId);
-            if (stream !== undefined)
-                stream.destroy(new Error("push stream timeout"));
-            const spool = this.pushSpools.get(requestId);
-            spool?.unroll();
-        }, this.options.timeout));
-    }
-    /*  clear push timer for a specific request  */
-    _clearPushTimer(requestId) {
-        const timer = this.pushTimers.get(requestId);
-        if (timer !== undefined) {
-            clearTimeout(timer);
-            this.pushTimers.delete(requestId);
-        }
     }
     async sink(nameOrConfig, ...args) {
         /*  determine actual parameters  */
@@ -93,7 +59,7 @@ export class SinkTrait extends SourceTrait {
         /*  create a resource spool  */
         const spool = new Spool();
         /*  sanity check situation  */
-        if (this.sinks.has(name))
+        if (this.onRequest.has(`sink-push-request:${name}`))
             throw new Error(`sink: sink "${name}" already established`);
         /*  generate the corresponding MQTT topics for broadcast and direct use  */
         const topicS = `$share/${share}/${name}`;
@@ -101,7 +67,7 @@ export class SinkTrait extends SourceTrait {
         const topicReqD = this.options.topicMake(name, "sink-push-request", this.options.id);
         const topicChunkD = this.options.topicMake(name, "sink-push-chunk", this.options.id);
         /*  remember the registration  */
-        this.sinks.set(name, (request, topicName) => {
+        this.onRequest.set(`sink-push-request:${name}`, (request, topicName) => {
             /*  determine information  */
             const requestId = request.id;
             const params = request.params ?? [];
@@ -144,8 +110,14 @@ export class SinkTrait extends SourceTrait {
                     creditGranted: chunkCredit
                 } : undefined;
                 /*  utility functions for timeout management  */
-                const refreshPushTimeout = () => this._refreshPushTimer(requestId);
-                const clearPushTimeout = () => this._clearPushTimer(requestId);
+                const refreshPushTimeout = () => this.timerRefresh(requestId, () => {
+                    const stream = this.pushStreams.get(requestId);
+                    if (stream !== undefined)
+                        stream.destroy(new Error("push stream timeout"));
+                    const spool = this.pushSpools.get(requestId);
+                    spool?.unroll();
+                });
+                const clearPushTimeout = () => this.timerClear(requestId);
                 /*  create a readable for buffering received chunks  */
                 const readable = new Readable({
                     highWaterMark: chunkCredit > 0 ? chunkCredit * this.options.chunkSize : 16 * 1024,
@@ -170,7 +142,7 @@ export class SinkTrait extends SourceTrait {
                 readable.once("close", () => reqSpool.unroll());
                 readable.once("error", () => reqSpool.unroll());
                 /*  register chunk dispatch callback  */
-                this.pushChunkCallbacks.set(requestId, (chunkParsed, chunkTopicName) => {
+                this.onResponse.set(`sink-push-chunk:${requestId}`, (chunkParsed, chunkTopicName) => {
                     if (chunkTopicName !== chunkParsed.name)
                         throw new Error(`sink name mismatch between topic "${chunkTopicName}" ` +
                             `and payload "${chunkParsed.name}"`);
@@ -191,7 +163,7 @@ export class SinkTrait extends SourceTrait {
                         }
                     }
                 });
-                reqSpool.roll(() => { this.pushChunkCallbacks.delete(requestId); });
+                reqSpool.roll(() => { this.onResponse.delete(`sink-push-chunk:${requestId}`); });
                 /*  start timeout for push stream cleanup  */
                 refreshPushTimeout();
                 reqSpool.roll(() => { clearPushTimeout(); });
@@ -215,7 +187,7 @@ export class SinkTrait extends SourceTrait {
                 await sendResponse(err.message).catch(() => { });
             });
         });
-        spool.roll(() => { this.sinks.delete(name); });
+        spool.roll(() => { this.onRequest.delete(`sink-push-request:${name}`); });
         /*  subscribe to MQTT topics  */
         await run(`subscribe to MQTT topic "${topicReqB}"`, spool, () => this._subscribeTopic(topicReqB, { qos: 2, ...options }));
         spool.roll(() => this._unsubscribeTopic(topicReqB).catch(() => { }));
@@ -226,7 +198,7 @@ export class SinkTrait extends SourceTrait {
         /*  provide a registration for subsequent destruction  */
         return {
             destroy: async () => {
-                if (!this.sinks.has(name))
+                if (!this.onRequest.has(`sink-push-request:${name}`))
                     throw new Error(`destroy: sink "${name}" not established`);
                 await spool.unroll(false)?.catch((err) => {
                     this.error(err, `destroy: failed to cleanup: ${err.message}`);
@@ -263,8 +235,8 @@ export class SinkTrait extends SourceTrait {
         const requestId = nanoid();
         /*  subscribe to response topic (for ack/nak)  */
         const responseTopic = this.options.topicMake(name, "sink-push-response", this.options.id);
-        await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.pushSubscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
-        spool.roll(() => this.pushSubscriptions.unsubscribe(responseTopic));
+        await run(`subscribe to MQTT topic "${responseTopic}"`, spool, () => this.subscriptions.subscribe(responseTopic, { qos: options.qos ?? 2 }));
+        spool.roll(() => this.subscriptions.unsubscribe(responseTopic));
         /*  define abort controller and signal  */
         const abortController = new AbortController();
         const abortSignal = abortController.signal;
@@ -297,7 +269,7 @@ export class SinkTrait extends SourceTrait {
                 abortSignal.addEventListener("abort", onAbort, { once: true });
                 spool.roll(() => { abortSignal.removeEventListener("abort", onAbort); });
                 /*  register handlers for initial response  */
-                this.pushResponseCallbacks.set(requestId, (response) => {
+                this.onResponse.set(`sink-push-response:${requestId}`, (response) => {
                     if (response.error)
                         reject(new Error(response.error));
                     else {
@@ -307,11 +279,11 @@ export class SinkTrait extends SourceTrait {
                         resolve();
                     }
                 });
-                spool.roll(() => { this.pushResponseCallbacks.delete(requestId); });
-                this.pushCreditCallbacks.set(requestId, (_response) => {
+                spool.roll(() => { this.onResponse.delete(`sink-push-response:${requestId}`); });
+                this.onResponse.set(`sink-push-credit:${requestId}`, (_response) => {
                     refreshTimeout();
                 });
-                spool.roll(() => { this.pushCreditCallbacks.delete(requestId); });
+                spool.roll(() => { this.onResponse.delete(`sink-push-credit:${requestId}`); });
                 /*  generate and send request message  */
                 const auth = this.authenticate();
                 const metaStore = this.metaStore(meta);
@@ -323,7 +295,7 @@ export class SinkTrait extends SourceTrait {
                 });
             });
             /*  override handler for mid-stream (error) responses  */
-            this.pushResponseCallbacks.set(requestId, (response) => {
+            this.onResponse.set(`sink-push-response:${requestId}`, (response) => {
                 if (response.error)
                     abortController.abort(new Error(response.error));
             });
@@ -333,12 +305,12 @@ export class SinkTrait extends SourceTrait {
             /*  subscribe to credit topic if flow control is active  */
             if (creditGate) {
                 const creditTopic = this.options.topicMake(name, "sink-push-credit", this.options.id);
-                await run(`subscribe to MQTT topic "${creditTopic}"`, spool, () => this.pushSubscriptions.subscribe(creditTopic, { qos: 2 }));
-                spool.roll(() => this.pushSubscriptions.unsubscribe(creditTopic));
+                await run(`subscribe to MQTT topic "${creditTopic}"`, spool, () => this.subscriptions.subscribe(creditTopic, { qos: 2 }));
+                spool.roll(() => this.subscriptions.unsubscribe(creditTopic));
                 const gate = creditGate;
                 spool.roll(() => { gate.abort(); });
                 /*  update credit callback to include gate replenish  */
-                this.pushCreditCallbacks.set(requestId, (response) => {
+                this.onResponse.set(`sink-push-credit:${requestId}`, (response) => {
                     gate.replenish(response.credit);
                     refreshTimeout();
                 });
@@ -372,43 +344,4 @@ export class SinkTrait extends SourceTrait {
             await spool.unroll();
         }
     }
-    /*  dispatch incoming MQTT message  */
-    async _dispatchMessage(topic, message) {
-        /*  forward dispatching to other traits  */
-        await super._dispatchMessage(topic, message);
-        /*  match the MQTT topic  */
-        const topicMatch = this.options.topicMatch(topic);
-        /*  handle sink push request (on server-side)  */
-        if (topicMatch !== null
-            && topicMatch.operation === "sink-push-request"
-            && message instanceof SinkPushRequest) {
-            const handler = this.sinks.get(message.name);
-            if (handler !== undefined)
-                handler(message, topicMatch.name);
-        }
-        /*  handle sink push response (on client-side)  */
-        else if (topicMatch !== null
-            && topicMatch.operation === "sink-push-response"
-            && message instanceof SinkPushResponse) {
-            const handler = this.pushResponseCallbacks.get(message.id);
-            if (handler !== undefined)
-                handler(message);
-        }
-        /*  handle sink push chunk (on server-side)  */
-        else if (topicMatch !== null
-            && topicMatch.operation === "sink-push-chunk"
-            && message instanceof SinkPushChunk) {
-            const handler = this.pushChunkCallbacks.get(message.id);
-            if (handler !== undefined)
-                handler(message, topicMatch.name);
-        }
-        /*  handle sink push credit (on client-side)  */
-        else if (topicMatch !== null
-            && topicMatch.operation === "sink-push-credit"
-            && message instanceof SinkPushCredit) {
-            const handler = this.pushCreditCallbacks.get(message.id);
-            if (handler !== undefined)
-                handler(message);
-        }
-    }
 }

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

@@ -5,16 +5,7 @@ import type { WithInfo, InfoSource } from "./mqtt-plus-info";
 import { ServiceTrait } from "./mqtt-plus-service";
 import type { AuthOption } from "./mqtt-plus-auth";
 export declare class SourceTrait<T extends APISchema = APISchema> extends ServiceTrait<T> {
-    private sources;
-    private fetchResponseCallbacks;
-    private fetchChunkCallbacks;
-    private sourceCreditCallbacks;
     private sourceCreditGates;
-    private sourceTimers;
-    private fetchSubscriptions;
-    private _refreshSourceTimer;
-    private _clearSourceTimer;
-    destroy(): void;
     source<K extends SourceKeys<T> & string>(name: K, callback: WithInfo<T[K], InfoSource>): Promise<Registration>;
     source<K extends SourceKeys<T> & string>(config: {
         name: K;
@@ -39,5 +30,4 @@ export declare class SourceTrait<T extends APISchema = APISchema> extends Servic
         buffer: Promise<Uint8Array>;
         meta: Promise<Record<string, any> | undefined>;
     }>;
-    protected _dispatchMessage(topic: string, message: any): Promise<void>;
 }