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

Fix:Errors thrown when iterating over subscription source event streams (AsyncIterables) should be caught. #4004

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
44 changes: 37 additions & 7 deletions src/execution/execute.ts
Expand Up @@ -1781,18 +1781,48 @@ export function createSourceEventStream(
function createSourceEventStreamImpl(
exeContext: ExecutionContext,
): PromiseOrValue<AsyncIterable<unknown> | ExecutionResult> {
try {
const eventStream = executeSubscription(exeContext);
if (isPromise(eventStream)) {
return eventStream.then(undefined, (error) => ({ errors: [error] }));
try {

const eventStream = executeSubscription(exeContext);

if (isPromise(eventStream)) {
// Handle promise errors
return eventStream.then(
data => ({ data }),
error => ({ errors: [error] })
);
}

const wrappedStream = {
async *[Symbol.asyncIterator]() {
try {
yield* eventStream;
} catch (error) {
yield { errors: [error] };
}
}
};

return eventStream;
} catch (error) {
return { errors: [error] };
return wrappedStream;

} catch (error) {
// Handle sync errors
return { errors: [error] };
}

function resolve(payload) {
if (payload.errors) {
throw payload.errors[0];
} else {
return payload.data;
}
}

const stream = executeSubscription();
mapAsyncIterable(stream, resolve);

}

function executeSubscription(
exeContext: ExecutionContext,
): PromiseOrValue<AsyncIterable<unknown>> {
Expand Down