Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
nodejs 20.15.0
python 3.8.12
python 3.13.5
7 changes: 3 additions & 4 deletions cluster/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "2"
services:
rabbit_node0:
environment:
Expand All @@ -16,8 +15,8 @@ services:
- "5562:5552"
tty: true
volumes:
- ./conf/:/etc/rabbitmq/
- "./tls-gen/basic/result/:/certs"
- ./conf/:/etc/rabbitmq/
- "./tls-gen/basic/result/:/certs"
rabbit_node1:
environment:
- RABBITMQ_ERLANG_COOKIE='secret_cookie'
Expand Down Expand Up @@ -65,4 +64,4 @@ services:
networks:
- back
networks:
back:
back:
2 changes: 0 additions & 2 deletions example/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "2"

services:
rabbitmq-stream:
image: rabbitmq:4.0.5-management
Expand Down
6 changes: 3 additions & 3 deletions example/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "node index.js",
"cluster-example": "node cluster_example.js",
"cluster-example": "node src/cluster_example.js",
"rebuild-source": "cd .. && npm run build && cd - && npm install --force"
},
"author": "",
Expand Down
4 changes: 2 additions & 2 deletions src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import { RouteResponse } from "./responses/route_response"
import { StreamStatsResponse } from "./responses/stream_stats_response"
import { SubscribeResponse } from "./responses/subscribe_response"
import { UnsubscribeResponse } from "./responses/unsubscribe_response"
import { SuperStreamConsumer } from "./super_stream_consumer"
import { SuperStreamConsumer, SuperStreamConsumerFunc } from "./super_stream_consumer"
import { MessageKeyExtractorFunction, SuperStreamPublisher } from "./super_stream_publisher"
import { DEFAULT_FRAME_MAX, REQUIRED_MANAGEMENT_VERSION, ResponseCode, sample, wait } from "./util"
import { ConsumerCreditPolicy, CreditRequestWrapper, defaultCreditPolicy } from "./consumer_credit_policy"
Expand Down Expand Up @@ -249,7 +249,7 @@ export class Client {

public async declareSuperStreamConsumer(
{ superStream, offset, consumerRef, creditPolicy }: DeclareSuperStreamConsumerParams,
handle: ConsumerFunc
handle: SuperStreamConsumerFunc
): Promise<SuperStreamConsumer> {
const partitions = await this.queryPartitions({ superStream })
return SuperStreamConsumer.create(handle, {
Expand Down
17 changes: 10 additions & 7 deletions src/connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -431,13 +431,16 @@ export class Connection {
body.byteLength
}`
)
this.socket.write(body, (err) => {
this.logger.debug(`Write COMPLETED for cmd key: ${cmd.key.toString(16)} - no correlationId - err: ${err}`)
if (err) {
return rej(err)
}
return res()
})
if (this.socket.readyState === "open") {
/* Check because there is still a delivery after the consumer is closed */
this.socket.write(body, (err) => {
this.logger.debug(`Write COMPLETED for cmd key: ${cmd.key.toString(16)} - no correlationId - err: ${err}`)
if (err) {
return rej(err)
}
return res()
})
}
})
}

Expand Down
16 changes: 12 additions & 4 deletions src/super_stream_consumer.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import { Client } from "./client"
import { Consumer, ConsumerFunc } from "./consumer"
import { Consumer } from "./consumer"
import { ConsumerCreditPolicy, defaultCreditPolicy } from "./consumer_credit_policy"
import { Message } from "./publisher"
import { Offset } from "./requests/subscribe_request"

export type SuperStreamConsumerFunc = (msg: Message, consumer: Consumer) => Promise<void> | void

export class SuperStreamConsumer {
private consumers: Map<string, Consumer> = new Map<string, Consumer>()
public consumerRef: string
Expand All @@ -13,7 +16,7 @@ export class SuperStreamConsumer {
private creditPolicy: ConsumerCreditPolicy

private constructor(
readonly handle: ConsumerFunc,
readonly handle: SuperStreamConsumerFunc,
params: {
superStream: string
locator: Client
Expand Down Expand Up @@ -42,7 +45,12 @@ export class SuperStreamConsumer {
singleActive: true,
creditPolicy: this.creditPolicy,
},
this.handle,
(msg) => {
const consumer = this.consumers.get(p)
if (consumer) {
return this.handle(msg, consumer)
}
},
this
)
this.consumers.set(p, partitionConsumer)
Expand All @@ -52,7 +60,7 @@ export class SuperStreamConsumer {
}

static async create(
handle: ConsumerFunc,
handle: SuperStreamConsumerFunc,
params: {
superStream: string
locator: Client
Expand Down