Skip to content

Commit 2521184

Browse files
authored
Merge pull request #263 from FlowiseAI/bugfix/Rate-Limit-Err-Message
Bugfix/Showing rate limit error message when streaming
2 parents b74a970 + 2555e68 commit 2521184

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

dist/components/Bot.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/features/full/components/Full.d.ts.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/web.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/Bot.tsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { cancelAudioRecording, startAudioRecording, stopAudioRecording } from '@
3333
import { LeadCaptureBubble } from '@/components/bubbles/LeadCaptureBubble';
3434
import { removeLocalStorageChatHistory, getLocalStorageChatflow, setLocalStorageChatflow, setCookie, getCookie } from '@/utils';
3535
import { cloneDeep } from 'lodash';
36-
import { fetchEventSource } from '@microsoft/fetch-event-source';
36+
import { fetchEventSource, EventStreamContentType } from '@microsoft/fetch-event-source';
3737

3838
export type FileEvent<T = EventTarget> = {
3939
target: T;
@@ -514,6 +514,17 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
514514
headers: {
515515
'Content-Type': 'application/json',
516516
},
517+
async onopen(response) {
518+
if (response.ok && response.headers.get('content-type') === EventStreamContentType) {
519+
return; // everything's good
520+
} else if (response.status === 429) {
521+
const errMessage = await response.text() ?? 'Too many requests. Please try again later.';
522+
handleError(errMessage);
523+
throw new Error(errMessage);
524+
} else {
525+
throw new Error();
526+
}
527+
},
517528
async onmessage(ev) {
518529
const payload = JSON.parse(ev.data);
519530
switch (payload.event) {

src/features/full/components/Full.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ export const Full = (props: FullProps, { element }: { element: HTMLElement }) =>
8383
starterPromptFontSize={props.theme?.chatWindow?.starterPromptFontSize}
8484
clearChatOnReload={props.theme?.chatWindow?.clearChatOnReload}
8585
disclaimer={props.theme?.disclaimer}
86+
dateTimeToggle={props.theme?.chatWindow?.dateTimeToggle}
8687
/>
8788
</div>
8889
</Show>

0 commit comments

Comments
 (0)