From fe53323d987345fa7af5812aefd926e5700f4281 Mon Sep 17 00:00:00 2001 From: panda Date: Mon, 16 Oct 2023 22:49:33 -0500 Subject: [PATCH] ui: fix websocket cookie (#670) --- .../ui-default/components/message/index.page.ts | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/ui-default/components/message/index.page.ts b/packages/ui-default/components/message/index.page.ts index 8694b8b0..d1a83805 100644 --- a/packages/ui-default/components/message/index.page.ts +++ b/packages/ui-default/components/message/index.page.ts @@ -46,12 +46,7 @@ const onmessage = (msg) => { return true; }; -const url = new URL(`${UiContext.ws_prefix}home/messages-conn`, window.location.href); -// TODO handle a better way for cookie -if (url.host !== window.location.host) url.searchParams.append('sid', document.cookie.split('sid=')[1].split(';')[0]); -const endpoint = url.toString().replace('http', 'ws'); - -const initWorkerMode = () => { +const initWorkerMode = (endpoint) => { console.log('Messages: using SharedWorker'); const worker = new SharedWorker('/messages-shared-worker.js', { name: 'HydroMessagesWorker' }); worker.port.start(); @@ -81,9 +76,13 @@ const messagePage = new AutoloadPage('messagePage', (pagename) => { action: () => window.open('/home/messages', '_blank'), }).show(); } + const url = new URL(`${UiContext.ws_prefix}home/messages-conn`, window.location.href); + // TODO handle a better way for cookie + if (url.host !== window.location.host) url.searchParams.append('sid', document.cookie.split('sid=')[1].split(';')[0]); + const endpoint = url.toString().replace('http', 'ws'); if (window.SharedWorker) { try { - initWorkerMode(); + initWorkerMode(endpoint); return; } catch (e) { console.error('SharedWorker init fail: ', e.message);