diff --git a/src/App.js b/src/App.js index a117bef..2274dc8 100644 --- a/src/App.js +++ b/src/App.js @@ -5,6 +5,7 @@ import { Sidebar } from './Sidebar'; import { PressureHelper } from './PressureHelper'; import { TokenCtx } from './UserAction'; import { load_config, bgimg_style } from './Config'; +import { check_service_work_update } from './Common'; import { load_attentions } from './Attention.js'; import { listen_darkmode } from './infrastructure/functions'; import { LoginPopup, TitleLine } from './infrastructure/widgets'; @@ -40,6 +41,7 @@ class App extends Component { window.BACKEND = localStorage['BACKEND'] || process.env.REACT_APP_BACKEND || '/'; + check_service_work_update(false); if (process.env.NODE_ENV === 'production') { setTimeout(() => { fetch('https://api.github.com/users/hole-thu') diff --git a/src/Common.js b/src/Common.js index 8304e7b..07cb9a3 100644 --- a/src/Common.js +++ b/src/Common.js @@ -11,6 +11,7 @@ import { split_text, } from './text_splitter'; import renderMd from './Markdown'; +import { cache } from './cache'; export { format_time, Time, TitleLine }; @@ -488,3 +489,25 @@ export class ClickHandler extends PureComponent { ); } } + +export function check_service_work_update(update_now = false) { + if ('serviceWorker' in navigator) { + navigator.serviceWorker.ready.then((serviceWorker) => { + const waitingServiceWorker = serviceWorker.waiting; + if ( + waitingServiceWorker && + (update_now || window.confirm('发现新版本,是否立即使用并刷新?')) + ) { + cache().clear(); + waitingServiceWorker.addEventListener('statechange', (event) => { + if (event.target.state === 'activated') { + window.location.reload(); + } + }); + waitingServiceWorker.postMessage({ type: 'SKIP_WAITING' }); + } else { + if (update_now) alert('没有已下载的更新'); + } + }); + } +} diff --git a/src/Config.js b/src/Config.js index 48945f7..93d06a4 100644 --- a/src/Config.js +++ b/src/Config.js @@ -32,7 +32,7 @@ const DEFAULT_CONFIG = { block_cw: ['xxg', 'zzxg'], block_words_v4: ['🕷️', '[系统自动代发]'], whitelist_cw: [], - room_id: process.env.REACT_APP_ROOM_ID, + room: process.env.REACT_APP_ROOM_ID, }; export function load_config() { @@ -222,13 +222,13 @@ class ConfigRoomId extends PureComponent { constructor(props) { super(props); this.state = { - room_id: window.config.room_id, + room: window.config.room, }; } save_changes() { this.props.callback({ - room_id: this.state.room_id, + room: this.state.room, }); } @@ -236,7 +236,7 @@ class ConfigRoomId extends PureComponent { let value = e.target.value; this.setState( { - room_id: value, + room: value, }, this.save_changes.bind(this), ); @@ -249,7 +249,7 @@ class ConfigRoomId extends PureComponent { 分区编号: - #room_id + #room
选择分区编号,会作为发言时的分区和影响查看到的内容 @@ -416,7 +416,7 @@ export class ConfigUI extends PureComponent { callback={this.save_changes_bound} />