From 059bc6e299c930370282cb79d50c0b722219f875 Mon Sep 17 00:00:00 2001 From: qwerinope Date: Sat, 13 Sep 2025 23:37:12 +0200 Subject: [PATCH] fix bug with required https --- src/web/chatWidget/www/src/createMessage.ts | 4 ++-- src/web/chatWidget/www/src/main.ts | 4 +++- src/web/index.ts | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/web/chatWidget/www/src/createMessage.ts b/src/web/chatWidget/www/src/createMessage.ts index 5edf894..3c83932 100644 --- a/src/web/chatWidget/www/src/createMessage.ts +++ b/src/web/chatWidget/www/src/createMessage.ts @@ -14,8 +14,8 @@ popover.textContent = 'Loading...' document.body.appendChild(popover); const [badges, emotes] = await Promise.all([ - fetch(`http://${location.host}/chat/getBadges`).then(data => data.json()), - fetch(`http://${location.host}/chat/getEmotes`).then(data => data.json()) + fetch(`${location.href}/getBadges`).then(data => data.json()), + fetch(`${location.href}/getEmotes`).then(data => data.json()) ]); await prefetchImages(Object.values(emotes)); diff --git a/src/web/chatWidget/www/src/main.ts b/src/web/chatWidget/www/src/main.ts index 123cf1a..7b0c4ed 100644 --- a/src/web/chatWidget/www/src/main.ts +++ b/src/web/chatWidget/www/src/main.ts @@ -5,7 +5,9 @@ import { type twitchEventData } from "web/chatWidget/websockettypes"; import { parseMessage } from './createMessage'; import { serverInstruction } from 'web/serverTypes'; -const socket = new WebSocket(`ws://${location.host}`); +const wsAddress = `ws${location.protocol === "https:" ? 's' : ''}://${location.host}`; + +const socket = new WebSocket(wsAddress); socket.onopen = () => { const instruction: serverInstruction = { diff --git a/src/web/index.ts b/src/web/index.ts index 0d059aa..1fe56ad 100644 --- a/src/web/index.ts +++ b/src/web/index.ts @@ -51,7 +51,7 @@ export default Bun.serve({ ws.close(); } }, - development: true, + development: process.env.NODE_ENV === "development", error(error) { logger.err(`Error at chatwidget server: ${error}`); return new Response("Internal Server Error", { status: 500 })