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
6 changes: 3 additions & 3 deletions examples/websocket_example.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const rabbit = require("rabbitmq-amqp-js-client")
const { randomUUID } = require("crypto")

const rabbitUser = process.env.RABBITMQ_USER ?? "rabbit"
const rabbitPassword = process.env.RABBITMQ_PASSWORD ?? "rabbit"
const rabbitUser = process.env.RABBITMQ_USER ?? "guest"
const rabbitPassword = process.env.RABBITMQ_PASSWORD ?? "guest"
const rabbitHost = process.env.RABBITMQ_HOSTNAME ?? "localhost"
const rabbitPort = process.env.RABBITMQ_PORT ?? 5672
const rabbitPort = process.env.RABBITMQ_PORT ?? 15678

async function main() {
const testExchange = `test-exchange-${randomUUID()}`
Expand Down
13 changes: 5 additions & 8 deletions src/connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,9 @@ function buildConnectParams(envParams: EnvironmentParams, connParams?: Connectio
const reconnectParams = buildReconnectParams(connParams)
if (envParams.webSocket) {
const ws = websocket_connect(envParams.webSocket)
const connectionDetails = ws(
`ws://${envParams.username}:${envParams.password}@${envParams.host}:${envParams.port}`,
"amqp",
{}
)
const wsUrl = envParams.webSocketUrl ?? `ws://${envParams.host}:${envParams.port}/ws`
const connectionDetails = ws(wsUrl, "amqp", {})

return {
connection_details: () => {
return {
Expand All @@ -120,9 +118,8 @@ function buildConnectParams(envParams: EnvironmentParams, connParams?: Connectio
port: envParams.port,
}
},
host: envParams.host,
port: envParams.port,
transport: "tcp",
...envParams,
...reconnectParams,
}
}

Expand Down
1 change: 1 addition & 0 deletions src/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export type EnvironmentParams = {
username: string
password: string
webSocket?: WebSocketImpl
webSocketUrl?: string
}

export class AmqpEnvironment implements Environment {
Expand Down