@midwayjs/mqtt 3.20.4 → 4.0.0-beta.1

package/dist/configuration.js

@@ -21,11 +21,12 @@ let MQTTConfiguration = class MQTTConfiguration {
         await this.factory.stop();
     }
 };
+exports.MQTTConfiguration = MQTTConfiguration;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", framework_1.MidwayMQTTFramework)
 ], MQTTConfiguration.prototype, "framework", void 0);
-MQTTConfiguration = __decorate([
+exports.MQTTConfiguration = MQTTConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'mqtt',
         importConfigs: [
@@ -34,7 +35,6 @@ MQTTConfiguration = __decorate([
                     mqtt: {
                         pub: {},
                         sub: {},
-                        contextLoggerApplyLogger: 'mqttLogger',
                     },
                     midwayLogger: {
                         clients: {
@@ -48,5 +48,4 @@ MQTTConfiguration = __decorate([
         ],
     })
 ], MQTTConfiguration);
-exports.MQTTConfiguration = MQTTConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/decorator.js

@@ -5,8 +5,8 @@ const core_1 = require("@midwayjs/core");
 exports.MQTT_DECORATOR_KEY = 'rpc:mqtt';
 function MqttSubscriber(subscriberName) {
     return target => {
-        (0, core_1.saveModule)(exports.MQTT_DECORATOR_KEY, target);
-        (0, core_1.saveClassMetadata)(exports.MQTT_DECORATOR_KEY, subscriberName, target);
+        core_1.DecoratorManager.saveModule(exports.MQTT_DECORATOR_KEY, target);
+        core_1.MetadataManager.defineMetadata(exports.MQTT_DECORATOR_KEY, subscriberName, target);
         (0, core_1.Scope)(core_1.ScopeEnum.Request)(target);
         (0, core_1.Provide)()(target);
     };

package/dist/framework.d.ts

@@ -4,7 +4,7 @@ import { IClientOptions, MqttClient } from 'mqtt';
 export declare class MidwayMQTTFramework extends BaseFramework<IMidwayMQTTApplication, IMidwayMQTTContext, IMidwayMQTTConfigurationOptions> {
     app: IMidwayMQTTApplication;
     protected subscriberMap: Map<string, MqttClient>;
-    mqttLogger: any;
+    protected frameworkLoggerName: string;
     configure(): any;
     applicationInitialize(options: any): Promise<void>;
     run(): Promise<void>;

package/dist/framework.js

@@ -5,9 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayMQTTFramework = void 0;
 const core_1 = require("@midwayjs/core");
@@ -17,6 +14,7 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
     constructor() {
         super(...arguments);
         this.subscriberMap = new Map();
+        this.frameworkLoggerName = 'mqttLogger';
     }
     configure() {
         return this.configService.getConfiguration('mqtt');
@@ -27,13 +25,13 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
     async run() {
         const { sub } = this.configurationOptions;
         if (Object.keys(sub || {}).length === 0) {
-            this.mqttLogger.info('[midway-mqtt] Not found consumer config, skip init consumer');
+            this.logger.info('[midway-mqtt] Not found consumer config, skip init consumer');
         }
         // find subscriber
-        const mqttSubscriberModules = (0, core_1.listModule)(decorator_1.MQTT_DECORATOR_KEY);
+        const mqttSubscriberModules = core_1.DecoratorManager.listModule(decorator_1.MQTT_DECORATOR_KEY);
         const mqttSubscriberMap = {};
         for (const subscriberModule of mqttSubscriberModules) {
-            const subscriberName = (0, core_1.getClassMetadata)(decorator_1.MQTT_DECORATOR_KEY, subscriberModule);
+            const subscriberName = core_1.MetadataManager.getOwnMetadata(decorator_1.MQTT_DECORATOR_KEY, subscriberModule);
             mqttSubscriberMap[subscriberName] = subscriberModule;
         }
         for (const customKey in sub) {
@@ -43,7 +41,7 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
     async beforeStop() {
         for (const [name, consumer] of this.subscriberMap) {
             await consumer.endAsync();
-            this.mqttLogger.info(`[midway-mqtt] subscriber: ${name} is closed`);
+            this.logger.info(`[midway-mqtt] subscriber: ${name} is closed`);
         }
     }
     /**
@@ -76,7 +74,7 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
                 resolve(client);
             });
             client.on('error', err => {
-                this.mqttLogger.error(err);
+                this.logger.error(err);
             });
         });
         consumer.on('message', async (topic, message, packet) => {
@@ -101,15 +99,11 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
         return Object.values(this.subscriberMap);
     }
     getFrameworkName() {
-        return 'midway:mqtt';
+        return 'mqtt';
     }
 };
-__decorate([
-    (0, core_1.Logger)('mqttLogger'),
-    __metadata("design:type", Object)
-], MidwayMQTTFramework.prototype, "mqttLogger", void 0);
-MidwayMQTTFramework = __decorate([
+exports.MidwayMQTTFramework = MidwayMQTTFramework;
+exports.MidwayMQTTFramework = MidwayMQTTFramework = __decorate([
     (0, core_1.Framework)()
 ], MidwayMQTTFramework);
-exports.MidwayMQTTFramework = MidwayMQTTFramework;
 //# sourceMappingURL=framework.js.map

package/dist/service.js

@@ -17,7 +17,9 @@ let MqttProducerFactory = class MqttProducerFactory extends core_1.ServiceFactor
         return 'mqtt';
     }
     async init() {
-        await this.initClients(this.pubConfig);
+        await this.initClients(this.pubConfig, {
+            concurrent: true,
+        });
     }
     async createClient(config, clientName) {
         return new Promise(resolve => {
@@ -36,6 +38,7 @@ let MqttProducerFactory = class MqttProducerFactory extends core_1.ServiceFactor
         this.logger.info('[midway-mqtt] producer: %s is close', name);
     }
 };
+exports.MqttProducerFactory = MqttProducerFactory;
 __decorate([
     (0, core_1.Logger)('mqttLogger'),
     __metadata("design:type", Object)
@@ -50,11 +53,10 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], MqttProducerFactory.prototype, "init", null);
-MqttProducerFactory = __decorate([
+exports.MqttProducerFactory = MqttProducerFactory = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], MqttProducerFactory);
-exports.MqttProducerFactory = MqttProducerFactory;
 let DefaultMqttProducer = class DefaultMqttProducer {
     async init() {
         this.instance = this.mqttProducerFactory.get(this.mqttProducerFactory.getDefaultClientName() || 'default');
@@ -63,6 +65,7 @@ let DefaultMqttProducer = class DefaultMqttProducer {
         }
     }
 };
+exports.DefaultMqttProducer = DefaultMqttProducer;
 __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", MqttProducerFactory)
@@ -73,10 +76,9 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], DefaultMqttProducer.prototype, "init", null);
-DefaultMqttProducer = __decorate([
+exports.DefaultMqttProducer = DefaultMqttProducer = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], DefaultMqttProducer);
-exports.DefaultMqttProducer = DefaultMqttProducer;
 (0, core_1.delegateTargetAllPrototypeMethod)(DefaultMqttProducer, mqtt_1.MqttClient);
 //# sourceMappingURL=service.js.map

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/mqtt",
-  "version": "3.20.4",
+  "version": "4.0.0-beta.1",
   "description": "Midway Framework for mqtt",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
+    "test": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit",
     "lint:fix": "../../node_modules/.bin/mwts fix"
   },
   "keywords": [
@@ -23,8 +23,8 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/mock": "^3.20.4"
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1"
   },
   "dependencies": {
     "mqtt": "5.10.4"
@@ -37,5 +37,5 @@
   "engines": {
     "node": ">=16"
   },
-  "gitHead": "c3fb65a7ada8829635f3c6af5ef83c65c3a43d79"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }