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

Jump to bottom

Always teardown subscriptions on completion #846

Merged
merged 2 commits into from
Aug 24, 2022
Merged

Always teardown subscriptions on completion #846

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6916073
Always teardown GQL subscriptions on completion
fathyb Aug 23, 2022
216e9bf
format + unit test
fathyb Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 16 additions & 10 deletions lib/subscription-connection.js
View file
Open in desktop
Expand Up @@ -271,6 +271,7 @@ module.exports = class SubscriptionConnection {
}

this.sendMessage(this.protocolMessageTypes.GQL_COMPLETE, id, null)
this.handleGQLComplete(id)
}

async _executeQueryOrMutation ({ query, context, variables, operationName, id }) {
Expand All @@ -283,6 +284,19 @@ module.exports = class SubscriptionConnection {
this.sendMessage(this.protocolMessageTypes.GQL_DATA, id, response)
this.sendMessage(this.protocolMessageTypes.GQL_COMPLETE, id, null)
}

handleGQLComplete (id) {
const sc = this.subscriptionContexts.get(id)
if (sc) {
sc.close && sc.close()
this.subscriptionContexts.delete(id)
}
const subIter = this.subscriptionIters.get(id)
if (subIter) {
subIter.return && subIter.return()
this.subscriptionIters.delete(id)
}
}

async handleGQLStop (data) {
if (this.context.onSubscriptionEnd) {
Expand All @@ -293,16 +307,8 @@ module.exports = class SubscriptionConnection {
return this.handleConnectionClose()
}
}
const sc = this.subscriptionContexts.get(data.id)
if (sc) {
sc.close && sc.close()
this.subscriptionContexts.delete(data.id)
}
const subIter = this.subscriptionIters.get(data.id)
if (subIter) {
subIter.return && subIter.return()
this.subscriptionIters.delete(data.id)
}

this.handleGQLComplete(data.id)
}

handleConnectionClose () {
Expand Down