Skip to content

Commit 8557941

Browse files
committed
Merge branch 'main' into feature/follow-up-prompts
# Conflicts: # dist/components/Bot.d.ts.map # dist/web.js # src/components/Bot.tsx
2 parents c2c95ab + 2521184 commit 8557941

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,8 +33,8 @@ 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';
3736
import { FollowUpPromptBubble } from '@/components/bubbles/FollowUpPromptBubble';
37+
import { fetchEventSource, EventStreamContentType } from '@microsoft/fetch-event-source';
3838

3939
export type FileEvent<T = EventTarget> = {
4040
target: T;
@@ -536,6 +536,17 @@ export const Bot = (botProps: BotProps & { class?: string }) => {
536536
headers: {
537537
'Content-Type': 'application/json',
538538
},
539+
async onopen(response) {
540+
if (response.ok && response.headers.get('content-type') === EventStreamContentType) {
541+
return; // everything's good
542+
} else if (response.status === 429) {
543+
const errMessage = await response.text() ?? 'Too many requests. Please try again later.';
544+
handleError(errMessage);
545+
throw new Error(errMessage);
546+
} else {
547+
throw new Error();
548+
}
549+
},
539550
async onmessage(ev) {
540551
const payload = JSON.parse(ev.data);
541552
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)