yume/yumechi-no-kuni
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix sw.js initialization order
Some checks are pending
Publish Docker image / Build (push) Waiting to run
Details
Lint / pnpm_install (push) Waiting to run
Details
Lint / lint (backend) (push) Blocked by required conditions
Details
Lint / lint (frontend) (push) Blocked by required conditions
Details
Lint / lint (frontend-embed) (push) Blocked by required conditions
Details
Lint / lint (frontend-shared) (push) Blocked by required conditions
Details
Lint / lint (misskey-bubble-game) (push) Blocked by required conditions
Details
Lint / lint (misskey-js) (push) Blocked by required conditions
Details
Lint / lint (misskey-reversi) (push) Blocked by required conditions
Details
Lint / lint (sw) (push) Blocked by required conditions
Details
Lint / typecheck (backend) (push) Blocked by required conditions
Details
Lint / typecheck (misskey-js) (push) Blocked by required conditions
Details
Lint / typecheck (sw) (push) Blocked by required conditions
Details
Test (production install and build) / production (22.11.0) (push) Waiting to run
Details

Browse source 
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
This commit is contained in:
ゆめ 2024-11-21 06:05:51 -06:00
parent 9bb310e0d1
commit 5587de26c7
No known key found for this signature in database
1 changed files with 230 additions and 227 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
packages/sw/src/sw.ts
View file

@ -15,20 +15,21 @@ import * as swos from '@/scripts/operations.js';
const STATIC_CACHE_NAME = `misskey-static-${_VERSION_}`; const STATIC_CACHE_NAME = `misskey-static-${_VERSION_}`;
const PATHS_TO_CACHE = ['/assets/', '/static-assets/', '/emoji/', '/twemoji/', '/fluent-emoji/', '/vite/']; const PATHS_TO_CACHE = ['/assets/', '/static-assets/', '/emoji/', '/twemoji/', '/fluent-emoji/', '/vite/'];
async function requestStorage() { async function requestStorage(): Promise<FileSystemDirectoryHandle | null> {
try { try {
if (navigator.storage && navigator.storage.persisted) {
await navigator.storage.persisted();
}
if (navigator.storage && navigator.storage.estimate) { if (navigator.storage && navigator.storage.estimate) {
const quota = await navigator.storage.estimate(); await navigator.storage.estimate();
if (quota.quota && quota.quota < 2 * 1024 * 1024 * 1024) { if (navigator.storage && navigator.storage.persisted) {
await navigator.storage.estimate; if (!await navigator.storage.persisted()) {
return null;
} }
} }
return navigator.storage.getDirectory();
}
} catch { } catch {
console.error('Failed to request storage'); console.error('Failed to request storage');
} }
return null;
} }
async function cacheWithFallback(cache, paths) { async function cacheWithFallback(cache, paths) {
@ -41,7 +42,8 @@ async function cacheWithFallback(cache, paths) {
globalThis.addEventListener('install', (ev) => { globalThis.addEventListener('install', (ev) => {
ev.waitUntil((async () => { ev.waitUntil((async () => {
await requestStorage(); const storage = await requestStorage();
registerFetchHandler(storage);
const cache = await caches.open(STATIC_CACHE_NAME); const cache = await caches.open(STATIC_CACHE_NAME);
await cacheWithFallback(cache, PATHS_TO_CACHE); await cacheWithFallback(cache, PATHS_TO_CACHE);
await globalThis.skipWaiting(); await globalThis.skipWaiting();
@ -71,6 +73,9 @@ async function offlineContentHTML() {
return `<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta content="width=device-width,initial-scale=1"name="viewport"><title>${messages.title}</title><style>body{background-color:#0c1210;color:#dee7e4;font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;display:flex;flex-direction:column;align-items:center;justify-content:center;min-height:100vh;margin:0;padding:24px;box-sizing:border-box}.icon{max-width:120px;width:100%;height:auto;margin-bottom:20px;}.message{text-align:center;font-size:20px;font-weight:700;margin-bottom:20px}.version{text-align:center;font-size:90%;margin-bottom:20px}button{padding:7px 14px;min-width:100px;font-weight:700;font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;border-radius:99rem;background-color:#ff82ab;color:#192320;border:none;cursor:pointer;-webkit-tap-highlight-color:transparent}button:hover{background-color:#fac5eb}</style></head><body><svg class="icon"fill="none"height="24"stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"stroke-width="2"viewBox="0 0 24 24"width="24"xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z"fill="none"stroke="none"/><path d="M9.58 5.548c.24 -.11 .492 -.207 .752 -.286c1.88 -.572 3.956 -.193 5.444 1c1.488 1.19 2.162 3.007 1.77 4.769h.99c1.913 0 3.464 1.56 3.464 3.486c0 .957 -.383 1.824 -1.003 2.454m-2.997 1.033h-11.343c-2.572 -.004 -4.657 -2.011 -4.657 -4.487c0 -2.475 2.085 -4.482 4.657 -4.482c.13 -.582 .37 -1.128 .7 -1.62"/><path d="M3 3l18 18"/></svg><div class="message">${messages.header}</div><div class="version">v${_VERSION_}</div><button onclick="reloadPage()">${messages.reload}</button><script>function reloadPage(){location.reload(!0)}</script></body></html>`; return `<!DOCTYPE html><html lang="en"><head><meta charset="UTF-8"><meta content="width=device-width,initial-scale=1"name="viewport"><title>${messages.title}</title><style>body{background-color:#0c1210;color:#dee7e4;font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;display:flex;flex-direction:column;align-items:center;justify-content:center;min-height:100vh;margin:0;padding:24px;box-sizing:border-box}.icon{max-width:120px;width:100%;height:auto;margin-bottom:20px;}.message{text-align:center;font-size:20px;font-weight:700;margin-bottom:20px}.version{text-align:center;font-size:90%;margin-bottom:20px}button{padding:7px 14px;min-width:100px;font-weight:700;font-family:Hiragino Maru Gothic Pro,BIZ UDGothic,Roboto,HelveticaNeue,Arial,sans-serif;line-height:1.35;border-radius:99rem;background-color:#ff82ab;color:#192320;border:none;cursor:pointer;-webkit-tap-highlight-color:transparent}button:hover{background-color:#fac5eb}</style></head><body><svg class="icon"fill="none"height="24"stroke="currentColor"stroke-linecap="round"stroke-linejoin="round"stroke-width="2"viewBox="0 0 24 24"width="24"xmlns="http://www.w3.org/2000/svg"><path d="M0 0h24v24H0z"fill="none"stroke="none"/><path d="M9.58 5.548c.24 -.11 .492 -.207 .752 -.286c1.88 -.572 3.956 -.193 5.444 1c1.488 1.19 2.162 3.007 1.77 4.769h.99c1.913 0 3.464 1.56 3.464 3.486c0 .957 -.383 1.824 -1.003 2.454m-2.997 1.033h-11.343c-2.572 -.004 -4.657 -2.011 -4.657 -4.487c0 -2.475 2.085 -4.482 4.657 -4.482c.13 -.582 .37 -1.128 .7 -1.62"/><path d="M3 3l18 18"/></svg><div class="message">${messages.header}</div><div class="version">v${_VERSION_}</div><button onclick="reloadPage()">${messages.reload}</button><script>function reloadPage(){location.reload(!0)}</script></body></html>`;
} }
async function registerFetchHandler(root: FileSystemDirectoryHandle | null) {
console.debug('rootfs:', root);
globalThis.addEventListener('fetch', ev => { globalThis.addEventListener('fetch', ev => {
const shouldCache = PATHS_TO_CACHE.some(path => ev.request.url.includes(path)); const shouldCache = PATHS_TO_CACHE.some(path => ev.request.url.includes(path));
@ -80,7 +85,6 @@ globalThis.addEventListener('fetch', ev => {
.then(async response => { .then(async response => {
if (response) return response; if (response) return response;
try {
const fetchResponse = await fetch(ev.request); const fetchResponse = await fetch(ev.request);
if (!fetchResponse || fetchResponse.status !== 200 || fetchResponse.type !== 'basic') { if (!fetchResponse || fetchResponse.status !== 200 || fetchResponse.type !== 'basic') {
return fetchResponse; return fetchResponse;
@ -103,9 +107,6 @@ globalThis.addEventListener('fetch', ev => {
} }
return fetchResponse; return fetchResponse;
} catch {
return response;
}
}) })
); );
return; return;
@ -134,6 +135,8 @@ globalThis.addEventListener('fetch', ev => {
}), }),
); );
}); });
}
globalThis.addEventListener('push', ev => { globalThis.addEventListener('push', ev => {
ev.waitUntil(globalThis.clients.matchAll({ ev.waitUntil(globalThis.clients.matchAll({