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.

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

enhancements to downstream iterator use to determine if the iterator failed #665

Merged
merged 2 commits into from
Mar 15, 2024
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 Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: build test bundle lint

DENO_JOBS=4
export DENO_JOBS=4

build: test

Expand Down
16 changes: 12 additions & 4 deletions jetstream/consumer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,8 @@ export interface Consumer extends ExportedConsumer {
}

export interface Close {
close(): Promise<void>;
close(): Promise<void | Error>;
closed(): Promise<void | Error>;
}

export interface ConsumerMessages extends QueuedIterator<JsMsg>, Close {
Expand Down Expand Up @@ -620,12 +621,12 @@ export class PullConsumerMessagesImpl extends QueuedIteratorImpl<JsMsg>
this.timeout = t;
}

close(): Promise<void> {
close(): Promise<void | Error> {
this.stop();
return this.iterClosed;
}

closed(): Promise<void> {
closed(): Promise<void | Error> {
return this.iterClosed;
}

Expand All @@ -641,6 +642,9 @@ export class PullConsumerMessagesImpl extends QueuedIteratorImpl<JsMsg>
}

stop(err?: Error) {
if (this.done) {
return;
}
this.sub?.unsubscribe();
this.clearTimers();
this.statusIterator?.stop();
Expand Down Expand Up @@ -757,11 +761,15 @@ export class OrderedConsumerMessages extends QueuedIteratorImpl<JsMsg>
});
}

close(): Promise<void> {
close(): Promise<void | Error> {
this.stop();
return this.iterClosed;
}

closed(): Promise<void | Error> {
return this.iterClosed;
}

status(): Promise<AsyncIterable<ConsumerStatus>> {
const iter = new QueuedIteratorImpl<ConsumerStatus>();
this.listeners.push(iter);
Expand Down
1 change: 0 additions & 1 deletion jetstream/tests/consumers_consume_test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ Deno.test("consumers - consume deleted consumer", async () => {
(async () => {
const status = await iter.status();
for await (const s of status) {
console.log(s);
if (s.type === ConsumerEvents.ConsumerDeleted) {
deleted.resolve();
}
Expand Down
6 changes: 3 additions & 3 deletions nats-base-client/queued_iterator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class QueuedIteratorImpl<T> implements QueuedIterator<T> {
// FIXME: this is updated by the protocol
received: number;
noIterator: boolean;
iterClosed: Deferred<void>;
iterClosed: Deferred<void | Error>;
done: boolean;
signal: Deferred<void>;
yields: T[];
Expand All @@ -78,7 +78,7 @@ export class QueuedIteratorImpl<T> implements QueuedIterator<T> {
this.done = false;
this.signal = deferred<void>();
this.yields = [];
this.iterClosed = deferred<void>();
this.iterClosed = deferred<void | Error>();
this.time = 0;
this.yielding = false;
}
Expand Down Expand Up @@ -185,7 +185,7 @@ export class QueuedIteratorImpl<T> implements QueuedIterator<T> {
this.err = err;
this.done = true;
this.signal.resolve();
this.iterClosed.resolve();
this.iterClosed.resolve(err);
}

getProcessed(): number {
Expand Down
Loading