Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix race condition in stream opening #6760

Merged
merged 2 commits into from
Dec 12, 2023
Merged

Fix race condition in stream opening #6760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30dc2f1
dev: Fix race condition in event stream opening logic
kschiffer Dec 12, 2023
c4164c6
dev: Fix verbose stream closure
kschiffer Dec 12, 2023
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
1 change: 1 addition & 0 deletions pkg/webui/console/store/middleware/logics/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,7 @@ const createEventsConnectLogics = (reducerName, entityName, onEventsStart) => {
}),
createLogic({
type: SET_EVENT_FILTER,
debounce: 250,
process: async ({ action }, dispatch, done) => {
if (channel) {
try {
Expand Down
16 changes: 9 additions & 7 deletions sdk/js/src/api/stream/subscribeToWebSocketStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { notify, EVENTS, MESSAGE_TYPES } from './shared'
const wsInstances = {}
let subscriptions = {}
const initialListeners = Object.values(EVENTS).reduce((acc, curr) => ({ ...acc, [curr]: {} }), {})
let closeRequested = false

/**
* Opens a new stream.
Expand Down Expand Up @@ -68,7 +69,6 @@ export default async (
type: MESSAGE_TYPES.UNSUBSCRIBE,
id: subscriptionId,
})
let closeRequested = false
const url = baseUrl + endpoint

await Promise.race([
Expand All @@ -93,11 +93,6 @@ export default async (
`ttn.lorawan.v3.header.authorization.bearer.${tokenParsed}`,
])

// Event listener for 'open'
wsInstances[url].addEventListener('open', () => {
wsInstances[url].send(subscriptionPayload)
})

// Broadcast connection errors to all listeners.
wsInstances[url].addEventListener('error', error => {
Object.values(subscriptions)
Expand Down Expand Up @@ -163,9 +158,16 @@ export default async (
}
}
})
} else if (wsInstances[url] && wsInstances[url].readyState === WebSocket.OPEN) {
}

if (wsInstances[url] && wsInstances[url].readyState === WebSocket.OPEN) {
// If the WebSocket connection is already open, only add the subscription.
wsInstances[url].send(subscriptionPayload)
} else if (wsInstances[url] && wsInstances[url].readyState === WebSocket.CONNECTING) {
// Otherwise wait for the connection to open and then add the subscription.
wsInstances[url].addEventListener('open', () => {
wsInstances[url].send(subscriptionPayload)
})
}
} catch (error) {
const err = error instanceof Error ? error : new Error(error)
Expand Down
Loading