Skip to content

Commit 72be027

Browse files
committed
Merge branch 'master' into feat/replace-benchmarks
2 parents 3de4d8a + 72283cc commit 72be027

File tree

61 files changed

+349
-237
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+349
-237
lines changed

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"packages": ["packages/*"],
3-
"version": "11.1.12",
3+
"version": "11.1.13",
44
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
55
}

package-lock.json

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
"eslint-plugin-prettier": "5.5.5",
129129
"eventsource": "4.1.0",
130130
"fancy-log": "2.0.0",
131-
"fastify": "5.7.2",
131+
"fastify": "5.7.4",
132132
"fastify-plugin": "5.1.0",
133133
"find-my-way": "9.4.0",
134134
"globals": "17.3.0",
@@ -151,7 +151,7 @@
151151
"markdown-table": "2.0.0",
152152
"mocha": "11.7.5",
153153
"mongoose": "9.1.5",
154-
"mqtt": "5.14.1",
154+
"mqtt": "5.15.0",
155155
"multer": "2.0.2",
156156
"mysql2": "3.16.2",
157157
"nats": "2.29.3",

packages/common/Readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
6363
<td><a href="https://microsoft.com/" target="_blank"><img src="https://nestjs.com/img/logos/microsoft-logo.png" width="180" valign="middle" /></a></td>
6464
<td><a href="https://mojam.co" target="_blank"><img src="https://nestjs.com/img/logos/mojam-logo.png" width="80" valign="middle" /></a></td>
6565
<td><a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="170" valign="middle" /></a></td>
66+
<td><a href="https://serpapi.com/" target="_blank"><img src="https://nestjs.com/img/logos/serpapi-logo.png" width="150" valign="middle" /></a></td>
6667
</tr>
6768
</table>
6869

packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nestjs/common",
3-
"version": "11.1.12",
3+
"version": "11.1.13",
44
"description": "Nest - modern, fast, powerful node.js web framework (@common)",
55
"author": "Kamil Mysliwiec",
66
"homepage": "https://nestjs.com",

packages/core/Readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
6363
<td><a href="https://microsoft.com/" target="_blank"><img src="https://nestjs.com/img/logos/microsoft-logo.png" width="180" valign="middle" /></a></td>
6464
<td><a href="https://mojam.co" target="_blank"><img src="https://nestjs.com/img/logos/mojam-logo.png" width="80" valign="middle" /></a></td>
6565
<td><a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="170" valign="middle" /></a></td>
66+
<td><a href="https://serpapi.com/" target="_blank"><img src="https://nestjs.com/img/logos/serpapi-logo.png" width="150" valign="middle" /></a></td>
6667
</tr>
6768
</table>
6869

packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nestjs/core",
3-
"version": "11.1.12",
3+
"version": "11.1.13",
44
"description": "Nest - modern, fast, powerful node.js web framework (@core)",
55
"author": "Kamil Mysliwiec",
66
"license": "MIT",
@@ -39,7 +39,7 @@
3939
"uid": "2.0.2"
4040
},
4141
"devDependencies": {
42-
"@nestjs/common": "11.1.12"
42+
"@nestjs/common": "11.1.13"
4343
},
4444
"peerDependencies": {
4545
"@nestjs/common": "^11.0.0",

packages/microservices/Readme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
6363
<td><a href="https://microsoft.com/" target="_blank"><img src="https://nestjs.com/img/logos/microsoft-logo.png" width="180" valign="middle" /></a></td>
6464
<td><a href="https://mojam.co" target="_blank"><img src="https://nestjs.com/img/logos/mojam-logo.png" width="80" valign="middle" /></a></td>
6565
<td><a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="170" valign="middle" /></a></td>
66+
<td><a href="https://serpapi.com/" target="_blank"><img src="https://nestjs.com/img/logos/serpapi-logo.png" width="150" valign="middle" /></a></td>
6667
</tr>
6768
</table>
6869

packages/microservices/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nestjs/microservices",
3-
"version": "11.1.12",
3+
"version": "11.1.13",
44
"description": "Nest - modern, fast, powerful node.js web framework (@microservices)",
55
"author": "Kamil Mysliwiec",
66
"license": "MIT",
@@ -22,8 +22,8 @@
2222
"tslib": "2.8.1"
2323
},
2424
"devDependencies": {
25-
"@nestjs/common": "11.1.12",
26-
"@nestjs/core": "11.1.12"
25+
"@nestjs/common": "11.1.13",
26+
"@nestjs/core": "11.1.13"
2727
},
2828
"peerDependencies": {
2929
"@grpc/grpc-js": "*",

packages/microservices/server/server-mqtt.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,21 @@ export class ServerMqtt extends Server<MqttEvents, MqttStatus> {
9090

9191
const registeredPatterns = [...this.messageHandlers.keys()];
9292
registeredPatterns.forEach(pattern => {
93-
const { isEventHandler } = this.messageHandlers.get(pattern)!;
93+
const handler = this.messageHandlers.get(pattern)!;
94+
const { isEventHandler, extras } = handler;
95+
96+
const globalSubscribeOptions = this.getOptionsProp(
97+
this.options,
98+
'subscribeOptions',
99+
);
100+
const subscribeOptions =
101+
extras?.qos !== undefined
102+
? { ...globalSubscribeOptions, qos: extras.qos }
103+
: globalSubscribeOptions;
104+
94105
mqttClient.subscribe(
95106
isEventHandler ? pattern : this.getRequestPattern(pattern),
96-
this.getOptionsProp(this.options, 'subscribeOptions'),
107+
subscribeOptions,
97108
);
98109
});
99110
}

0 commit comments

Comments
 (0)