@midwayjs/mqtt 4.0.0-alpha.1 → 4.0.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/configuration.js +0 -1
- package/dist/framework.d.ts +1 -1
- package/dist/framework.js +4 -10
- package/dist/service.js +3 -1
- package/package.json +6 -6
package/README.md
CHANGED
package/dist/configuration.js
CHANGED
package/dist/framework.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { IClientOptions, MqttClient } from 'mqtt';
|
|
|
4
4
|
export declare class MidwayMQTTFramework extends BaseFramework<IMidwayMQTTApplication, IMidwayMQTTContext, IMidwayMQTTConfigurationOptions> {
|
|
5
5
|
app: IMidwayMQTTApplication;
|
|
6
6
|
protected subscriberMap: Map<string, MqttClient>;
|
|
7
|
-
|
|
7
|
+
protected frameworkLoggerName: string;
|
|
8
8
|
configure(): any;
|
|
9
9
|
applicationInitialize(options: any): Promise<void>;
|
|
10
10
|
run(): Promise<void>;
|
package/dist/framework.js
CHANGED
|
@@ -5,9 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
5
5
|
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;
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
9
|
exports.MidwayMQTTFramework = void 0;
|
|
13
10
|
const core_1 = require("@midwayjs/core");
|
|
@@ -17,6 +14,7 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
|
|
|
17
14
|
constructor() {
|
|
18
15
|
super(...arguments);
|
|
19
16
|
this.subscriberMap = new Map();
|
|
17
|
+
this.frameworkLoggerName = 'mqttLogger';
|
|
20
18
|
}
|
|
21
19
|
configure() {
|
|
22
20
|
return this.configService.getConfiguration('mqtt');
|
|
@@ -27,7 +25,7 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
|
|
|
27
25
|
async run() {
|
|
28
26
|
const { sub } = this.configurationOptions;
|
|
29
27
|
if (Object.keys(sub || {}).length === 0) {
|
|
30
|
-
this.
|
|
28
|
+
this.logger.info('[midway-mqtt] Not found consumer config, skip init consumer');
|
|
31
29
|
}
|
|
32
30
|
// find subscriber
|
|
33
31
|
const mqttSubscriberModules = core_1.DecoratorManager.listModule(decorator_1.MQTT_DECORATOR_KEY);
|
|
@@ -43,7 +41,7 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
|
|
|
43
41
|
async beforeStop() {
|
|
44
42
|
for (const [name, consumer] of this.subscriberMap) {
|
|
45
43
|
await consumer.endAsync();
|
|
46
|
-
this.
|
|
44
|
+
this.logger.info(`[midway-mqtt] subscriber: ${name} is closed`);
|
|
47
45
|
}
|
|
48
46
|
}
|
|
49
47
|
/**
|
|
@@ -76,7 +74,7 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
|
|
|
76
74
|
resolve(client);
|
|
77
75
|
});
|
|
78
76
|
client.on('error', err => {
|
|
79
|
-
this.
|
|
77
|
+
this.logger.error(err);
|
|
80
78
|
});
|
|
81
79
|
});
|
|
82
80
|
consumer.on('message', async (topic, message, packet) => {
|
|
@@ -105,10 +103,6 @@ let MidwayMQTTFramework = class MidwayMQTTFramework extends core_1.BaseFramework
|
|
|
105
103
|
}
|
|
106
104
|
};
|
|
107
105
|
exports.MidwayMQTTFramework = MidwayMQTTFramework;
|
|
108
|
-
__decorate([
|
|
109
|
-
(0, core_1.Logger)('mqttLogger'),
|
|
110
|
-
__metadata("design:type", Object)
|
|
111
|
-
], MidwayMQTTFramework.prototype, "mqttLogger", void 0);
|
|
112
106
|
exports.MidwayMQTTFramework = MidwayMQTTFramework = __decorate([
|
|
113
107
|
(0, core_1.Framework)()
|
|
114
108
|
], MidwayMQTTFramework);
|
package/dist/service.js
CHANGED
|
@@ -17,7 +17,9 @@ let MqttProducerFactory = class MqttProducerFactory extends core_1.ServiceFactor
|
|
|
17
17
|
return 'mqtt';
|
|
18
18
|
}
|
|
19
19
|
async init() {
|
|
20
|
-
await this.initClients(this.pubConfig
|
|
20
|
+
await this.initClients(this.pubConfig, {
|
|
21
|
+
concurrent: true,
|
|
22
|
+
});
|
|
21
23
|
}
|
|
22
24
|
async createClient(config, clientName) {
|
|
23
25
|
return new Promise(resolve => {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@midwayjs/mqtt",
|
|
3
|
-
"version": "4.0.0-
|
|
3
|
+
"version": "4.0.0-beta.2",
|
|
4
4
|
"description": "Midway Framework for mqtt",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "index.d.ts",
|
|
@@ -23,11 +23,11 @@
|
|
|
23
23
|
],
|
|
24
24
|
"license": "MIT",
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@midwayjs/core": "^4.0.0-
|
|
27
|
-
"@midwayjs/mock": "^4.0.0-
|
|
26
|
+
"@midwayjs/core": "^4.0.0-beta.2",
|
|
27
|
+
"@midwayjs/mock": "^4.0.0-beta.2"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"mqtt": "5.10.
|
|
30
|
+
"mqtt": "5.10.4"
|
|
31
31
|
},
|
|
32
32
|
"author": "Harry Chen <czy88840616@gmail.com>",
|
|
33
33
|
"repository": {
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"url": "https://github.com/midwayjs/midway.git"
|
|
36
36
|
},
|
|
37
37
|
"engines": {
|
|
38
|
-
"node": ">=
|
|
38
|
+
"node": ">=20"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "53bfef4c5279da5f09025e4610bdbf64f94f60bd"
|
|
41
41
|
}
|