@midwayjs/mqtt 3.15.8 → 3.16.2

package/dist/framework.d.ts

@@ -1,5 +1,5 @@
 import { BaseFramework } from '@midwayjs/core';
-import { IMidwayMQTTApplication, IMidwayMQTTConfigurationOptions, IMidwayMQTTContext } from './interface';
+import { IMidwayMQTTApplication, IMidwayMQTTConfigurationOptions, IMidwayMQTTContext, IMqttSubscriber, MqttSubscriberOptions } from './interface';
 import { IClientOptions, MqttClient } from 'mqtt';
 export declare class MidwayMQTTFramework extends BaseFramework<IMidwayMQTTApplication, IMidwayMQTTContext, IMidwayMQTTConfigurationOptions> {
     app: IMidwayMQTTApplication;
@@ -9,7 +9,26 @@ export declare class MidwayMQTTFramework extends BaseFramework<IMidwayMQTTApplic
     applicationInitialize(options: any): Promise<void>;
     run(): Promise<void>;
     protected beforeStop(): Promise<void>;
-    createSubscriber(connectionOptions: IClientOptions, clientName?: string): Promise<MqttClient>;
+    /**
+     * dynamic create subscriber
+     */
+    createSubscriber(
+    /**
+     * mqtt connection options
+     */
+    connectionOptions: IClientOptions, 
+    /**
+     * mqtt subscribe options
+     */
+    subscribeOptions: MqttSubscriberOptions, 
+    /**
+     * midway mqtt subscriber class
+     */
+    ClzProvider: new () => IMqttSubscriber, 
+    /**
+     * midway mqtt component instance name, if not set, will be manager by your self
+     */
+    clientName?: string): Promise<MqttClient>;
     getSubscriber(name: string): MqttClient;
     getSubscribers(): MqttClient[];
     getFrameworkName(): string;

package/dist/framework.js

@@ -37,20 +37,7 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
             mqttSubscriberMap[subscriberName] = subscriberModule;
         }
         for (const customKey in sub) {
-            const consumer = await this.createSubscriber(sub[customKey].connectOptions, customKey);
-            await consumer.subscribeAsync(sub[customKey].subscribeOptions.topicObject, sub[customKey].subscribeOptions.opts);
-            consumer.on('message', async (topic, message, packet) => {
-                const ctx = this.app.createAnonymousContext();
-                ctx.topic = topic;
-                ctx.packet = packet;
-                ctx.message = message;
-                const fn = await this.applyMiddleware(async (ctx) => {
-                    const instance = await ctx.requestContext.getAsync(mqttSubscriberMap[customKey]);
-                    // eslint-disable-next-line prefer-spread
-                    return await instance['subscribe'].call(instance, ctx);
-                });
-                return await fn(ctx);
-            });
+            await this.createSubscriber(sub[customKey].connectOptions, sub[customKey].subscribeOptions, mqttSubscriberMap[customKey], customKey);
         }
     }
     async beforeStop() {
@@ -59,8 +46,27 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
             this.mqttLogger.info(`[midway-mqtt] subscriber: ${name} is closed`);
         }
     }
-    async createSubscriber(connectionOptions, clientName) {
-        return new Promise(resolve => {
+    /**
+     * dynamic create subscriber
+     */
+    async createSubscriber(
+    /**
+     * mqtt connection options
+     */
+    connectionOptions, 
+    /**
+     * mqtt subscribe options
+     */
+    subscribeOptions, 
+    /**
+     * midway mqtt subscriber class
+     */
+    ClzProvider, 
+    /**
+     * midway mqtt component instance name, if not set, will be manager by your self
+     */
+    clientName) {
+        const consumer = await new Promise(resolve => {
             const client = (0, mqtt_1.connect)(connectionOptions);
             client.on('connect', () => {
                 if (clientName) {
@@ -73,6 +79,20 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
                 this.mqttLogger.error(err);
             });
         });
+        consumer.on('message', async (topic, message, packet) => {
+            const ctx = this.app.createAnonymousContext();
+            ctx.topic = topic;
+            ctx.packet = packet;
+            ctx.message = message;
+            const fn = await this.applyMiddleware(async (ctx) => {
+                const instance = await ctx.requestContext.getAsync(ClzProvider);
+                // eslint-disable-next-line prefer-spread
+                return await instance['subscribe'].call(instance, ctx);
+            });
+            return await fn(ctx);
+        });
+        await consumer.subscribeAsync(subscribeOptions.topicObject, subscribeOptions.opts);
+        return consumer;
     }
     getSubscriber(name) {
         return this.subscriberMap.get(name);

package/dist/index.d.ts

@@ -3,4 +3,5 @@ export { MidwayMQTTFramework as Framework } from './framework';
 export { MQTTConfiguration as Configuration } from './configuration';
 export * from './decorator';
 export * from './service';
+export * as Mqtt from 'mqtt';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Configuration = exports.Framework = void 0;
+exports.Mqtt = exports.Configuration = exports.Framework = void 0;
 __exportStar(require("./interface"), exports);
 var framework_1 = require("./framework");
 Object.defineProperty(exports, "Framework", { enumerable: true, get: function () { return framework_1.MidwayMQTTFramework; } });
@@ -22,4 +22,5 @@ var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.MQTTConfiguration; } });
 __exportStar(require("./decorator"), exports);
 __exportStar(require("./service"), exports);
+exports.Mqtt = require("mqtt");
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -25,6 +25,6 @@ export interface Context extends IMidwayMQTTContext {
 }
 export type NextFunction = BaseNextFunction;
 export interface IMqttSubscriber {
-    subscribe(ctx: IMidwayMQTTContext): Promise<void>;
+    subscribe(ctx: IMidwayMQTTContext): Promise<any>;
 }
 //# sourceMappingURL=interface.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/mqtt",
-  "version": "3.15.8",
+  "version": "3.16.2",
   "description": "Midway Framework for mqtt",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -23,11 +23,11 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.15.8",
-    "@midwayjs/mock": "^3.15.8"
+    "@midwayjs/core": "^3.16.2",
+    "@midwayjs/mock": "^3.16.2"
   },
   "dependencies": {
-    "mqtt": "5.5.1"
+    "mqtt": "5.5.5"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -37,5 +37,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "b9790dce4fac050c747893bc86dda0f044d827a9"
+  "gitHead": "45af90c8055ed62b4a0e811d3b5ce42a796b6d65"
 }