Merge pull request #301 from Monadical-SAS/sara/fix-websockets

fixes websockets
This commit is contained in:
Sara
2023-11-03 11:53:55 +01:00
committed by GitHub
4 changed files with 9 additions and 3 deletions

View File

@@ -11,6 +11,7 @@ export const DomainContext = createContext<DomainContextType>({
browse: false, browse: false,
}, },
api_url: "", api_url: "",
websocket_url: "",
}); });
export const DomainContextProvider = ({ export const DomainContextProvider = ({

View File

@@ -92,7 +92,7 @@ export default function TranscriptDetails(details: TranscriptDetails) {
<section className="flex items-center"> <section className="flex items-center">
<div className="mr-4 hidden md:block h-auto"> <div className="mr-4 hidden md:block h-auto">
<QRCode <QRCode
value={`${process.env.NEXT_PUBLIC_SITE_URL}transcripts/${details.params.transcriptId}`} value={`${location.origin}/transcripts/${details.params.transcriptId}`}
level="L" level="L"
size={98} size={98}
/> />

View File

@@ -1,7 +1,8 @@
import { useEffect, useState } from "react"; import { useContext, useEffect, useState } from "react";
import { Topic, FinalSummary, Status } from "./webSocketTypes"; import { Topic, FinalSummary, Status } from "./webSocketTypes";
import { useError } from "../../(errors)/errorContext"; import { useError } from "../../(errors)/errorContext";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";
import { DomainContext } from "../domainContext";
type UseWebSockets = { type UseWebSockets = {
transcriptText: string; transcriptText: string;
@@ -25,6 +26,8 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
const { setError } = useError(); const { setError } = useError();
const router = useRouter(); const router = useRouter();
const { websocket_url } = useContext(DomainContext);
useEffect(() => { useEffect(() => {
if (isProcessing || textQueue.length === 0) { if (isProcessing || textQueue.length === 0) {
return; return;
@@ -290,7 +293,7 @@ export const useWebSockets = (transcriptId: string | null): UseWebSockets => {
if (!transcriptId) return; if (!transcriptId) return;
const url = `${process.env.NEXT_PUBLIC_WEBSOCKET_URL}/v1/transcripts/${transcriptId}/events`; const url = `${websocket_url}/v1/transcripts/${transcriptId}/events`;
const ws = new WebSocket(url); const ws = new WebSocket(url);
ws.onopen = () => { ws.onopen = () => {

View File

@@ -8,6 +8,7 @@ const localConfig = {
browse: true, browse: true,
}, },
api_url: "http://127.0.0.1:1250", api_url: "http://127.0.0.1:1250",
websocket_url: "ws://127.0.0.1:1250",
auth_callback_url: "http://localhost:3000/auth-callback", auth_callback_url: "http://localhost:3000/auth-callback",
}; };
@@ -17,6 +18,7 @@ type EdgeConfig = {
[featureName in "requireLogin" | "privacy" | "browse"]: boolean; [featureName in "requireLogin" | "privacy" | "browse"]: boolean;
}; };
auth_callback_url: string; auth_callback_url: string;
websocket_url: string;
api_url: string; api_url: string;
}; };
}; };