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

Merge upstream #40

Merged
yume merged 36 commits from develop into master 2024-11-21 11:40:02 -06:00
Conversation 0 Commits 36 Files changed 59 +199 -243
1 changed files with 199 additions and 243 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8e508b921c - Show all commits

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

@ -15,48 +15,31 @@ 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(): Promise<FileSystemDirectoryHandle | null> {
try {
if (navigator.storage && navigator.storage.estimate) {
await navigator.storage.estimate();
if (navigator.storage && navigator.storage.persisted) {
if (!await navigator.storage.persisted()) {
return null;
}
}
return navigator.storage.getDirectory();
}
} catch {
console.error('Failed to request storage');
}
return null;
}
async function cacheWithFallback(cache, paths) { async function cacheWithFallback(cache, paths) {
for (const path of paths) { for (const path of paths) {
try { try {
await cache.add(new Request(path, { credentials: 'same-origin' })); await cache.add(new Request(path, { credentials: 'same-origin' }));
} catch (error) { } } catch (error) {
// eslint-disable-next-line no-empty
}
} }
} }
globalThis.addEventListener('install', (ev) => { globalThis.addEventListener('install', (ev) => {
ev.waitUntil((async () => { ev.waitUntil((async () => {
const storage = await requestStorage();
await 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();
})()); })());
}); });
globalThis.addEventListener('activate', ev => { globalThis.addEventListener('activate', (ev) => {
ev.waitUntil( ev.waitUntil(
caches.keys() caches.keys()
.then(cacheNames => Promise.all( .then((cacheNames) => Promise.all(
cacheNames cacheNames
.filter((v) => v !== STATIC_CACHE_NAME && v !== swLang.cacheName) .filter((v) => v !== STATIC_CACHE_NAME && v !== swLang.cacheName)
.map(name => caches.delete(name)), .map((name) => caches.delete(name)),
)) ))
.then(() => globalThis.clients.claim()), .then(() => globalThis.clients.claim()),
); );
@ -70,50 +53,28 @@ async function offlineContentHTML() {
reload: i18n.ts?.reload ?? 'Reload', reload: i18n.ts?.reload ?? 'Reload',
}; };
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(true)}</script></body></html>`;
} }
async function registerFetchHandler(root: FileSystemDirectoryHandle | null) { globalThis.addEventListener('fetch', (ev) => {
console.debug('rootfs:', root); const shouldCache = PATHS_TO_CACHE.some((path) => ev.request.url.includes(path));
const state = await root?.getFileHandle('state.json', { create: true })
await state?.createWritable().then(async writable => {
await writable.write(JSON.stringify({ started: Date.now() }));
await writable.close();
});
globalThis.addEventListener('fetch', ev => {
const shouldCache = PATHS_TO_CACHE.some(path => ev.request.url.includes(path));
if (shouldCache) { if (shouldCache) {
ev.respondWith( ev.respondWith(
caches.match(ev.request) caches.match(ev.request)
.then(async response => { .then((response) => {
if (response) return response; if (response) return response;
const fetchResponse = await fetch(ev.request); return fetch(ev.request).then((response) => {
if (!fetchResponse || fetchResponse.status !== 200 || fetchResponse.type !== 'basic') { if (!response || response.status !== 200 || response.type !== 'basic') return response;
return fetchResponse; const responseToCache = response.clone();
} caches.open(STATIC_CACHE_NAME)
.then((cache) => {
const responseToCache = fetchResponse.clone(); cache.put(ev.request, responseToCache);
const cache = await caches.open(STATIC_CACHE_NAME); });
return response;
try { });
await cache.put(ev.request, responseToCache); }),
} catch (err) {
const keys = await cache.keys();
if (keys.length > 0) {
const deleteCount = Math.ceil(keys.length * 0.2);
for (let i = 0; i < deleteCount; i++) {
await cache.delete(keys[i]);
}
await cache.put(ev.request, responseToCache.clone());
}
}
return fetchResponse;
})
); );
return; return;
} }
@ -140,11 +101,9 @@ async function registerFetchHandler(root: FileSystemDirectoryHandle | null) {
}); });
}), }),
); );
}); });
}
globalThis.addEventListener('push', (ev) => {
globalThis.addEventListener('push', ev => {
ev.waitUntil(globalThis.clients.matchAll({ ev.waitUntil(globalThis.clients.matchAll({
includeUncontrolled: true, includeUncontrolled: true,
type: 'window', type: 'window',
@ -159,7 +118,7 @@ globalThis.addEventListener('push', ev => {
return createNotification(data); return createNotification(data);
case 'readAllNotifications': case 'readAllNotifications':
await globalThis.registration.getNotifications() await globalThis.registration.getNotifications()
.then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close())); .then((notifications) => notifications.forEach((n) => n.tag !== 'read_notification' && n.close()));
break; break;
} }
@ -211,9 +170,6 @@ globalThis.addEventListener('notificationclick', (ev: ServiceWorkerGlobalScopeEv
case 'showFollowRequests': case 'showFollowRequests':
client = await swos.openClient('push', '/my/follow-requests', loginId); client = await swos.openClient('push', '/my/follow-requests', loginId);
break; break;
case 'edited':
if ('note' in data.body) client = await swos.openPost({ reply: data.body.note }, loginId);
break;
default: default:
switch (data.body.type) { switch (data.body.type) {
case 'receiveFollowRequest': case 'receiveFollowRequest':
@ -239,9 +195,9 @@ globalThis.addEventListener('notificationclick', (ev: ServiceWorkerGlobalScopeEv
switch (action) { switch (action) {
case 'markAllAsRead': case 'markAllAsRead':
await globalThis.registration.getNotifications() await globalThis.registration.getNotifications()
.then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close())); .then((notifications) => notifications.forEach((n) => n.tag !== 'read_notification' && n.close()));
await get<Pick<Misskey.entities.SignupResponse, 'id' | 'token'>[]>('accounts').then(accounts => { await get<Pick<Misskey.entities.SignupResponse, 'id' | 'token'>[]>('accounts').then((accounts) => {
return Promise.all((accounts ?? []).map(async account => { return Promise.all((accounts ?? []).map(async (account) => {
await swos.sendMarkAllAsRead(account.id); await swos.sendMarkAllAsRead(account.id);
})); }));
}); });
@ -278,8 +234,8 @@ globalThis.addEventListener('message', (ev: ServiceWorkerGlobalScopeEventMap['me
ev.waitUntil((async (): Promise<void> => { ev.waitUntil((async (): Promise<void> => {
if (ev.data === 'clear') { if (ev.data === 'clear') {
await caches.keys() await caches.keys()
.then(cacheNames => Promise.all( .then((cacheNames) => Promise.all(
cacheNames.map(name => caches.delete(name)), cacheNames.map((name) => caches.delete(name)),
)); ));
return; return;
} }