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: unsubscribe from emitter after pickup completion #1806

Merged
merged 2 commits into from
Mar 28, 2024
Merged

fix: unsubscribe from emitter after pickup completion #1806

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
15720ff
fix: unsubscribe from emitter after pickup completion
genaris Mar 20, 2024
dcd94dc
Merge branch 'main' into fix/unsubscribe-from-emitter
TimoGlastra Mar 28, 2024
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
4 changes: 3 additions & 1 deletion packages/core/src/modules/discover-features/DiscoverFeaturesApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type { DiscoverFeaturesService } from './services'
import type { Feature } from '../../agent/models'

import { firstValueFrom, of, ReplaySubject, Subject } from 'rxjs'
import { catchError, filter, map, takeUntil, timeout } from 'rxjs/operators'
import { catchError, filter, first, map, takeUntil, timeout } from 'rxjs/operators'

import { AgentContext } from '../../agent'
import { EventEmitter } from '../../agent/EventEmitter'
Expand Down Expand Up @@ -120,6 +120,8 @@ export class DiscoverFeaturesApi<
filter((e) => e.payload.connection?.id === connection.id),
// Return disclosures
map((e) => e.payload.disclosures),
// Only wait for first event that matches the criteria
first(),
// If we don't have an answer in timeoutMs miliseconds (no response, not supported, etc...) error
timeout({
first: options.awaitDisclosuresTimeoutMs ?? 7000,
Expand Down
5 changes: 3 additions & 2 deletions packages/core/src/modules/message-pickup/MessagePickupApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import type { V1MessagePickupProtocol, V2MessagePickupProtocol } from './protoco
import type { MessagePickupProtocol } from './protocol/MessagePickupProtocol'
import type { MessagePickupRepository } from './storage/MessagePickupRepository'

import { ReplaySubject, Subject, filter, firstValueFrom, takeUntil, timeout } from 'rxjs'
import { ReplaySubject, Subject, filter, first, firstValueFrom, takeUntil, timeout } from 'rxjs'

import { AgentContext } from '../../agent'
import { EventEmitter } from '../../agent/EventEmitter'
Expand Down Expand Up @@ -222,14 +222,15 @@ export class MessagePickupApi<MPPs extends MessagePickupProtocol[] = [V1MessageP
const replaySubject = new ReplaySubject(1)

if (options.awaitCompletion) {
// Listen for response to our feature query
this.eventEmitter
.observable<MessagePickupCompletedEvent>(MessagePickupEventTypes.MessagePickupCompleted)
.pipe(
// Stop when the agent shuts down
takeUntil(this.stop$),
// filter by connection id
filter((e) => e.payload.connection.id === connectionRecord.id),
// Only wait for first event that matches the criteria
first(),
// If we don't receive all messages within timeoutMs miliseconds (no response, not supported, etc...) error
timeout({
first: options.awaitCompletionTimeoutMs ?? 10000,
Expand Down
Loading