From 1361bdfbf2f8ac7301b89b4eba45aa92b929a80f Mon Sep 17 00:00:00 2001 From: Nya Candy Date: Mon, 13 Nov 2023 15:39:54 +0800 Subject: [PATCH] fix: test break caused by #12273 (#12322) * fix * fix: websocket stream origin --- packages/frontend/src/config.ts | 4 ++-- packages/frontend/src/stream.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/config.ts b/packages/frontend/src/config.ts index 9de29e80d..2968ab12e 100644 --- a/packages/frontend/src/config.ts +++ b/packages/frontend/src/config.ts @@ -11,8 +11,8 @@ const siteName = document.querySelector('meta[property="og:site export const host = address.host; export const hostname = address.hostname; export const url = address.origin; -export const apiUrl = url + '/api'; -export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming'; +export const apiUrl = location.origin + '/api'; +export const wsOrigin = location.origin; export const lang = miLocalStorage.getItem('lang') ?? 'en-US'; export const langs = _LANGS_; const preParseLocale = miLocalStorage.getItem('locale'); diff --git a/packages/frontend/src/stream.ts b/packages/frontend/src/stream.ts index 27fce4d4b..5f0826b4e 100644 --- a/packages/frontend/src/stream.ts +++ b/packages/frontend/src/stream.ts @@ -6,14 +6,14 @@ import * as Misskey from 'misskey-js'; import { markRaw } from 'vue'; import { $i } from '@/account.js'; -import { url } from '@/config.js'; +import { wsOrigin } from '@/config.js'; let stream: Misskey.Stream | null = null; export function useStream(): Misskey.Stream { if (stream) return stream; - stream = markRaw(new Misskey.Stream(url, $i ? { + stream = markRaw(new Misskey.Stream(wsOrigin, $i ? { token: $i.token, } : null));