From 0e07c64cad91666c4ce16195dae82e6181316e1e Mon Sep 17 00:00:00 2001 From: undefined Date: Sat, 3 Sep 2022 13:25:46 +0800 Subject: [PATCH] ui: use inline worker --- packages/ui-default/build/config/webpack.ts | 4 ++++ packages/ui-default/components/message/index.page.ts | 4 ++-- packages/ui-default/package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/ui-default/build/config/webpack.ts b/packages/ui-default/build/config/webpack.ts index dd4bdc67..2edef9b8 100644 --- a/packages/ui-default/build/config/webpack.ts +++ b/packages/ui-default/build/config/webpack.ts @@ -113,6 +113,10 @@ export default function (env: { production?: boolean, measure?: boolean } = {}) }, ], }, + { + resourceQuery: /inline/, + type: 'asset/inline', + }, { test: /\.(ttf|eot|woff|woff2|png|jpg|jpeg|gif)$/, type: 'asset/resource', diff --git a/packages/ui-default/components/message/index.page.ts b/packages/ui-default/components/message/index.page.ts index 7fc837b1..2216baf5 100644 --- a/packages/ui-default/components/message/index.page.ts +++ b/packages/ui-default/components/message/index.page.ts @@ -44,7 +44,7 @@ const endpoint = url.toString().replace('http', 'ws'); const initWorkerMode = () => { console.log('Messages: using SharedWorker'); - const worker = new SharedWorker(new URL('./worker', import.meta.url), { name: 'Hydro Messages Worker' }); + const worker = new SharedWorker(new URL('./worker?inline', import.meta.url), { name: 'HydroMessagesWorker' }); worker.port.start(); window.addEventListener('beforeunload', () => { worker.port.postMessage({ type: 'unload' }); @@ -107,7 +107,7 @@ const messagePage = new AutoloadPage('messagePage', (pagename) => { isMaster = true; localStorage.setItem('page.master', selfId); const masterChannel = new BroadcastChannel('hydro-messages'); - const sock = new ReconnectingWebsocket(url.toString()); + const sock = new ReconnectingWebsocket(endpoint); sock.onopen = () => console.log('Connected'); sock.onerror = console.error; sock.onclose = (...args) => console.log('Closed', ...args); diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 8b20400c..b7c4d76b 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.39.22", + "version": "4.39.23", "author": "undefined ", "license": "AGPL-3.0", "main": "hydro.js",