Skip to content
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
26 changes: 26 additions & 0 deletions packages/core/src/core/turn.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,32 @@ describe('Turn', () => {
{ type: GeminiEventType.Finished, value: 'OTHER' },
]);
});

it('should not crash when cancelled request has malformed error', async () => {
const abortController = new AbortController();

const errorToThrow = {
response: {
data: undefined, // Malformed error data
},
};

mockSendMessageStream.mockImplementation(async () => {
abortController.abort();
throw errorToThrow;
});

const events = [];
const reqParts: Part[] = [{ text: 'Test malformed error handling' }];

for await (const event of turn.run(reqParts, abortController.signal)) {
events.push(event);
}

expect(events).toEqual([{ type: GeminiEventType.UserCancelled }]);

expect(reportError).not.toHaveBeenCalled();
});
});

describe('getDebugResponses', () => {
Expand Down
9 changes: 5 additions & 4 deletions packages/core/src/core/turn.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,16 +247,17 @@ export class Turn {
}
}
} catch (e) {
const error = toFriendlyError(e);
if (error instanceof UnauthorizedError) {
throw error;
}
if (signal.aborted) {
yield { type: GeminiEventType.UserCancelled };
// Regular cancellation error, fail gracefully.
return;
}

const error = toFriendlyError(e);
if (error instanceof UnauthorizedError) {
throw error;
}

const contextForReport = [...this.chat.getHistory(/*curated*/ true), req];
await reportError(
error,
Expand Down
Loading