-
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix error (Not found function GetAnimeShikimori)
- Loading branch information
Showing
14 changed files
with
467 additions
and
226 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,29 +1,166 @@ | ||
| /** | ||
| * Когда была команда обновить файлы; | ||
| * В нашем примере это работает как обновление программы | ||
| */ | ||
| navigator.serviceWorker?.addEventListener('controllerchange', () => { | ||
| //Указываем что было обновление | ||
| localStorage.setItem('dialog-update', true); | ||
| //Чтобы изменения вступили в силу нужно перезагрузить страницу (программу) | ||
| window.location.reload(); | ||
| }); | ||
| const SW = navigator.serviceWorker; | ||
| let currentVersion = { ver: 'undef', hash: 'undef' }; | ||
|
|
||
| (async () => { | ||
| if (SW) { | ||
| //Статус о регистрации sw.js в приложении | ||
| const regInfo = await SW.getRegistration(); | ||
|
|
||
| if (regInfo === undefined) { | ||
| await SW.register('sw.js', { scope: '/' }).then(() => { | ||
| console.log('[SW]: Registered successfully.'); | ||
| }).catch(error => { | ||
| console.log('[SW]: Registration failed:', error); | ||
| }); | ||
| } | ||
|
|
||
| Main(); | ||
| } | ||
|
|
||
| async function Main() { | ||
| const pages = ['/', '/index.html']; | ||
| let newServiceWorker = undefined; | ||
|
|
||
|
|
||
| //Скрипт только для главной страницы | ||
| if (pages.includes(window.location.pathname) && SW) { | ||
| //Сообщения от SW | ||
| SW.addEventListener('message', (ev) => { | ||
| try { | ||
| /**@type {{id: number, val: string | object}} */ | ||
| const data = JSON.parse(ev.data); | ||
| if (data.id === 220) { | ||
| currentVersion = data.val; | ||
| SetVersion(); | ||
| } | ||
| } catch { | ||
| console.log('[SW] - Message', ev); | ||
| } | ||
| }) | ||
| //Статус о регистрации sw.js в приложении | ||
| const regInfo = await SW.getRegistration(); | ||
|
|
||
| if (regInfo.installing) { | ||
| newServiceWorker = regInfo.installing; | ||
| } else if (regInfo.waiting) { | ||
| newServiceWorker = regInfo.waiting; | ||
| ShowUpdate(); | ||
| } else if (regInfo.active) { | ||
| newServiceWorker = regInfo.active; | ||
| } | ||
|
|
||
| regInfo.onupdatefound = (ev) => { | ||
| SW.getRegistration().then((swr) => { | ||
| if (swr.installing) { | ||
| newServiceWorker = swr.installing; | ||
| } else if (swr.waiting) { | ||
| newServiceWorker = swr.waiting; | ||
| } else if (swr.active) { | ||
| newServiceWorker = swr.active; | ||
| } | ||
| newServiceWorker.addEventListener('statechange', (ev) => { | ||
| if (ev.currentTarget.state === 'activated') { | ||
| CompleteUpdate(); | ||
| } | ||
| }); | ||
| }) | ||
| //Во время пользоваением приложения было изменение sw.js | ||
| ShowUpdate(); | ||
| } | ||
|
|
||
| newServiceWorker.addEventListener('statechange', ev => { | ||
| //Установлена новая версия sw.js (обновляем страницу чтобы применить изменения) | ||
| if (ev.currentTarget.state === 'activated') { | ||
| CompleteUpdate(); | ||
| } | ||
| }); | ||
|
|
||
| SW.ready.then(registartion => { | ||
| if (registartion.active) { | ||
| registartion.active.postMessage(220); | ||
| } | ||
| }); | ||
|
|
||
| async function ShowUpdate() { | ||
| const newVersion = await ParseVersion(); | ||
| // console.log(`${currentVersion.ver} > ${newVersion.ver}`); | ||
| // console.log(`${currentVersion.hash} > ${newVersion.hash}`); | ||
| $('.app-update').css({ display: 'flex' }); | ||
| if (currentVersion.ver === newVersion.ver) { | ||
| $('.update-content-version > .to-version > .cur').text(currentVersion.hash); | ||
| $('.update-content-version > .to-version > .next').text(newVersion.hash); | ||
| } else { | ||
| $('.update-content-version > .to-version > .cur').text(currentVersion.ver); | ||
| $('.update-content-version > .to-version > .next').text(newVersion.ver); | ||
| //Указываем что было обновление | ||
| localStorage.setItem('dialog-update', JSON.stringify({ show: true, ver: newVersion.ver, update: new Date().toJSON() })); | ||
| } | ||
| setTimeout(() => { | ||
| $('.app-update').addClass('show'); | ||
| setTimeout(() => { | ||
| $('.update-progress > .progress').css({ width: '50%' }); | ||
| setTimeout(() => { | ||
| SW.getRegistration().then((reg) => { | ||
| if (reg.waiting) { | ||
| reg.waiting.postMessage(221); | ||
| } | ||
| }); | ||
| }, 500) | ||
| }, 500); | ||
| }, 300) | ||
| } | ||
|
|
||
| function CompleteUpdate() { | ||
| $('.update-progress > .progress').css({ width: '100%' }); | ||
| setTimeout(() => { | ||
| location.reload() | ||
| }, 800); | ||
| } | ||
|
|
||
| function SetVersion() { | ||
| $('.github > .version-hash > .version > span').text(currentVersion.ver); | ||
| $('.github > .version-hash > .hash').text(currentVersion.hash); | ||
| try { | ||
| const data = JSON.parse(localStorage.getItem('dialog-update')); | ||
| let date = new Date(data.update); | ||
| $('.github > .date').text(`${date.getFullYear()}.${date.getMonth() + 1}.${date.getDate()}`); | ||
| } catch (error) { | ||
| console.log('Ошибка отображения версии', error); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| })(); | ||
|
|
||
| /** | ||
| * Регистрируем ServiceWorker | ||
| * Получает версию с файла sw.js | ||
| * @returns {Promise<{ver: string, hash: string}>} | ||
| */ | ||
| function registerServiceWorker() { | ||
| if ('serviceWorker' in navigator) { | ||
| navigator.serviceWorker.register('sw.js', { scope: '/' }).then(() => { | ||
| console.log('[SW]: Registered successfully.'); | ||
| }).catch(error => { | ||
| console.log('[SW]: Registration failed:', error); | ||
| }); | ||
| } | ||
| } | ||
| function ParseVersion() { | ||
| return new Promise((resolve) => { | ||
| fetch('sw.js').then((val) => { | ||
| val.text().then(val => { | ||
| const versionRegex = /const\s+version\s+=\s+'([^']+)';/; | ||
| const hashRegex = /const\s+hash\s+=\s+'([^']+)';/; | ||
|
|
||
| const versionMatch = val.match(versionRegex); | ||
| const hashMatch = val.match(hashRegex); | ||
|
|
||
| //Начало программы server.js | ||
| (() => { | ||
| //Регистриуем приложение service worker | ||
| registerServiceWorker(); | ||
| })(); | ||
| if (versionMatch && hashMatch) { | ||
| // Извлекаем значения версии и хэша из найденных совпадений | ||
| const versionValue = versionMatch[1]; | ||
| const hashValue = hashMatch[1]; | ||
|
|
||
| // Возвращаем объект с извлеченными значениями | ||
| return resolve({ ver: versionValue, hash: hashValue }) | ||
| } else { | ||
| return resolve({ ver: '0.0.0', hash: '00000' }); | ||
| } | ||
| }).catch(reason => { | ||
| return resolve({ ver: '0.0.0', hash: '00000' }); | ||
| }) | ||
| }).catch(reason => { | ||
| return resolve({ ver: '0.0.0', hash: '00000' }); | ||
| }); | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.