Merge pull request #253 from da7a90-backup/websocket-cors-fix

Fix: fixed websocket connection
CodeCrowCorp · Feb 7, 2023 · d9d2587 · d9d2587
2 parents ea5a02e + e3be791
commit d9d2587
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/lib/api.ts b/src/lib/api.ts
@@ -37,7 +37,7 @@ async function send({
 	const res = await fetch(`${base}/${path}`, opts)
 	if (res.ok || res.status === 422) {
 		const text = await res.text()
-		if (path === 'wsinit/wsid') return text
+		if (path === 'wsinit/wsid'|| path.includes('wsinit/channelid')) return text
 		return text ? JSON.parse(text) : {}
 	}
 

diff --git a/src/routes/channel/[channelId]/+page.svelte b/src/routes/channel/[channelId]/+page.svelte
@@ -13,7 +13,7 @@
 	let showDrawer = false
 
 	onMount(async () => {
-		const channelSocketId = get(`wsinit/wsid`)
+		const channelSocketId = await get(`wsinit/channelid?channelId=${data.post._id}`)		
 		const channelSocket = new WebSocket(
 			`${env.PUBLIC_WEBSOCKET_URL}/wsinit/channelid/${channelSocketId}/connect`
 		)