mirror of
https://github.com/paricafe/misskey.git
synced 2024-11-28 07:16:44 -06:00
try: fix sw cache
This commit is contained in:
fly_mc
parent
0c18136af3
commit
b7abc5ee54
1 changed files with 174 additions and 180 deletions
|
|
@ -12,209 +12,203 @@ import { createEmptyNotification, createNotification } from '@/scripts/create-no
|
||||||
import { swLang } from '@/scripts/lang.js';
|
import { swLang } from '@/scripts/lang.js';
|
||||||
import * as swos from '@/scripts/operations.js';
|
import * as swos from '@/scripts/operations.js';
|
||||||
|
|
||||||
globalThis.addEventListener('install', () => {
|
const CACHE_NAME = 'pari-cache-0';
|
||||||
// ev.waitUntil(globalThis.skipWaiting());
|
const urlsToCache = [
|
||||||
|
'/',
|
||||||
|
'/emoji',
|
||||||
|
'/twemoji',
|
||||||
|
'/fluent-emoji',
|
||||||
|
'/vite',
|
||||||
|
];
|
||||||
|
|
||||||
|
globalThis.addEventListener('install', (event) => {
|
||||||
|
event.waitUntil(
|
||||||
|
caches.open(CACHE_NAME)
|
||||||
|
.then((cache) => cache.addAll(urlsToCache))
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
globalThis.addEventListener('activate', ev => {
|
globalThis.addEventListener('activate', (event) => {
|
||||||
ev.waitUntil(
|
const cacheWhitelist = [CACHE_NAME, swLang.cacheName];
|
||||||
caches.keys()
|
event.waitUntil(
|
||||||
.then(cacheNames => Promise.all(
|
caches.keys().then((cacheNames) => {
|
||||||
cacheNames
|
return Promise.all(
|
||||||
.filter((v) => v !== swLang.cacheName)
|
cacheNames.map((cacheName) => {
|
||||||
.map(name => caches.delete(name)),
|
if (cacheWhitelist.indexOf(cacheName) === -1) {
|
||||||
))
|
return caches.delete(cacheName);
|
||||||
.then(() => globalThis.clients.claim()),
|
}
|
||||||
);
|
})
|
||||||
|
);
|
||||||
|
}).then(() => globalThis.clients.claim())
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
globalThis.addEventListener('fetch', (event) => {
|
||||||
|
event.respondWith(
|
||||||
|
caches.match(event.request)
|
||||||
|
.then((response) => {
|
||||||
|
if (response) {
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
return fetch(event.request).then(
|
||||||
|
(response) => {
|
||||||
|
if(!response || response.status !== 200 || response.type !== 'basic') {
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
const responseToCache = response.clone();
|
||||||
|
|
||||||
|
caches.open(CACHE_NAME)
|
||||||
|
.then((cache) => {
|
||||||
|
cache.put(event.request, responseToCache);
|
||||||
|
});
|
||||||
|
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
async function offlineContentHTML() {
|
async function offlineContentHTML() {
|
||||||
const i18n = await (swLang.i18n ?? swLang.fetchLocale()) as Partial<I18n<Locale>>;
|
const i18n = await (swLang.i18n ?? swLang.fetchLocale()) as Partial<I18n<Locale>>;
|
||||||
const messages = {
|
const messages = {
|
||||||
title: i18n.ts?._offlineScreen.title ?? 'Offline - Could not connect to server',
|
title: i18n.ts?._offlineScreen.title ?? 'Offline - Could not connect to server',
|
||||||
header: i18n.ts?._offlineScreen.header ?? 'Could not connect to server',
|
header: i18n.ts?._offlineScreen.header ?? 'Could not connect to server',
|
||||||
reload: i18n.ts?.reload ?? 'Reload',
|
reload: i18n.ts?.reload ?? 'Reload',
|
||||||
};
|
};
|
||||||
|
|
||||||
return `<!DOCTYPE html><html lang="ja"><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="ja"><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>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
globalThis.addEventListener('fetch', ev => {
|
|
||||||
let isHTMLRequest = false;
|
|
||||||
if (ev.request.headers.get('sec-fetch-dest') === 'document') {
|
|
||||||
isHTMLRequest = true;
|
|
||||||
} else if (ev.request.headers.get('accept')?.includes('/html')) {
|
|
||||||
isHTMLRequest = true;
|
|
||||||
} else if (ev.request.url.endsWith('/')) {
|
|
||||||
isHTMLRequest = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isHTMLRequest) return;
|
|
||||||
ev.respondWith(
|
|
||||||
fetch(ev.request)
|
|
||||||
.catch(async () => {
|
|
||||||
const html = await offlineContentHTML();
|
|
||||||
return new Response(html, {
|
|
||||||
status: 200,
|
|
||||||
headers: {
|
|
||||||
'content-type': 'text/html',
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
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',
|
}).then(async () => {
|
||||||
}).then(async () => {
|
const data: PushNotificationDataMap[keyof PushNotificationDataMap] = ev.data?.json();
|
||||||
const data: PushNotificationDataMap[keyof PushNotificationDataMap] = ev.data?.json();
|
|
||||||
|
|
||||||
switch (data.type) {
|
switch (data.type) {
|
||||||
// case 'driveFileCreated':
|
case 'notification':
|
||||||
case 'notification':
|
case 'unreadAntennaNote':
|
||||||
case 'unreadAntennaNote':
|
if (Date.now() - data.dateTime > 1000 * 60 * 60 * 24) break;
|
||||||
// 1日以上経過している場合は無視
|
return createNotification(data);
|
||||||
if (Date.now() - data.dateTime > 1000 * 60 * 60 * 24) break;
|
case 'readAllNotifications':
|
||||||
|
await globalThis.registration.getNotifications()
|
||||||
|
.then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close()));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
return createNotification(data);
|
await createEmptyNotification();
|
||||||
case 'readAllNotifications':
|
return;
|
||||||
await globalThis.registration.getNotifications()
|
}));
|
||||||
.then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close()));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
await createEmptyNotification();
|
|
||||||
return;
|
|
||||||
}));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
globalThis.addEventListener('notificationclick', (ev: ServiceWorkerGlobalScopeEventMap['notificationclick']) => {
|
globalThis.addEventListener('notificationclick', (ev: ServiceWorkerGlobalScopeEventMap['notificationclick']) => {
|
||||||
ev.waitUntil((async (): Promise<void> => {
|
ev.waitUntil((async (): Promise<void> => {
|
||||||
if (_DEV_) {
|
const { action, notification } = ev;
|
||||||
console.log('notificationclick', ev.action, ev.notification.data);
|
const data: PushNotificationDataMap[keyof PushNotificationDataMap] = notification.data ?? {};
|
||||||
}
|
const { userId: loginId } = data;
|
||||||
|
let client: WindowClient | null = null;
|
||||||
|
|
||||||
const { action, notification } = ev;
|
switch (data.type) {
|
||||||
const data: PushNotificationDataMap[keyof PushNotificationDataMap] = notification.data ?? {};
|
case 'notification':
|
||||||
const { userId: loginId } = data;
|
switch (action) {
|
||||||
let client: WindowClient | null = null;
|
case 'follow':
|
||||||
|
if ('userId' in data.body) await swos.api('following/create', loginId, { userId: data.body.userId });
|
||||||
|
break;
|
||||||
|
case 'showUser':
|
||||||
|
if ('user' in data.body) client = await swos.openUser(Misskey.acct.toString(data.body.user), loginId);
|
||||||
|
break;
|
||||||
|
case 'reply':
|
||||||
|
if ('note' in data.body) client = await swos.openPost({ reply: data.body.note }, loginId);
|
||||||
|
break;
|
||||||
|
case 'renote':
|
||||||
|
if ('note' in data.body) await swos.api('notes/create', loginId, { renoteId: data.body.note.id });
|
||||||
|
break;
|
||||||
|
case 'accept':
|
||||||
|
if (data.body.type === 'receiveFollowRequest') {
|
||||||
|
await swos.api('following/requests/accept', loginId, { userId: data.body.userId });
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'reject':
|
||||||
|
if (data.body.type === 'receiveFollowRequest') {
|
||||||
|
await swos.api('following/requests/reject', loginId, { userId: data.body.userId });
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'showFollowRequests':
|
||||||
|
client = await swos.openClient('push', '/my/follow-requests', loginId);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if (data.body.type === 'receiveFollowRequest') {
|
||||||
|
client = await swos.openClient('push', '/my/follow-requests', loginId);
|
||||||
|
} else if (data.body.type === 'reaction') {
|
||||||
|
client = await swos.openNote(data.body.note.id, loginId);
|
||||||
|
} else if ('note' in data.body) {
|
||||||
|
client = await swos.openNote(data.body.note.id, loginId);
|
||||||
|
} else if ('user' in data.body) {
|
||||||
|
client = await swos.openUser(Misskey.acct.toString(data.body.user), loginId);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case 'unreadAntennaNote':
|
||||||
|
client = await swos.openAntenna(data.body.antenna.id, loginId);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if (action === 'markAllAsRead') {
|
||||||
|
await globalThis.registration.getNotifications()
|
||||||
|
.then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close()));
|
||||||
|
await get<Pick<Misskey.entities.SignupResponse, 'id' | 'token'>[]>('accounts').then(accounts => {
|
||||||
|
return Promise.all((accounts ?? []).map(async account => {
|
||||||
|
await swos.sendMarkAllAsRead(account.id);
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
} else if (action === 'settings') {
|
||||||
|
client = await swos.openClient('push', '/settings/notifications', loginId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (data.type) {
|
if (client) {
|
||||||
case 'notification':
|
client.focus();
|
||||||
switch (action) {
|
}
|
||||||
case 'follow':
|
if (data.type === 'notification') {
|
||||||
if ('userId' in data.body) await swos.api('following/create', loginId, { userId: data.body.userId });
|
await swos.sendMarkAllAsRead(loginId);
|
||||||
break;
|
}
|
||||||
case 'showUser':
|
|
||||||
if ('user' in data.body) client = await swos.openUser(Misskey.acct.toString(data.body.user), loginId);
|
|
||||||
break;
|
|
||||||
case 'reply':
|
|
||||||
if ('note' in data.body) client = await swos.openPost({ reply: data.body.note }, loginId);
|
|
||||||
break;
|
|
||||||
case 'renote':
|
|
||||||
if ('note' in data.body) await swos.api('notes/create', loginId, { renoteId: data.body.note.id });
|
|
||||||
break;
|
|
||||||
case 'accept':
|
|
||||||
switch (data.body.type) {
|
|
||||||
case 'receiveFollowRequest':
|
|
||||||
await swos.api('following/requests/accept', loginId, { userId: data.body.userId });
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'reject':
|
|
||||||
switch (data.body.type) {
|
|
||||||
case 'receiveFollowRequest':
|
|
||||||
await swos.api('following/requests/reject', loginId, { userId: data.body.userId });
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'showFollowRequests':
|
|
||||||
client = await swos.openClient('push', '/my/follow-requests', loginId);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
switch (data.body.type) {
|
|
||||||
case 'receiveFollowRequest':
|
|
||||||
client = await swos.openClient('push', '/my/follow-requests', loginId);
|
|
||||||
break;
|
|
||||||
case 'reaction':
|
|
||||||
client = await swos.openNote(data.body.note.id, loginId);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
if ('note' in data.body) {
|
|
||||||
client = await swos.openNote(data.body.note.id, loginId);
|
|
||||||
} else if ('user' in data.body) {
|
|
||||||
client = await swos.openUser(Misskey.acct.toString(data.body.user), loginId);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case 'unreadAntennaNote':
|
|
||||||
client = await swos.openAntenna(data.body.antenna.id, loginId);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
switch (action) {
|
|
||||||
case 'markAllAsRead':
|
|
||||||
await globalThis.registration.getNotifications()
|
|
||||||
.then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close()));
|
|
||||||
await get<Pick<Misskey.entities.SignupResponse, 'id' | 'token'>[]>('accounts').then(accounts => {
|
|
||||||
return Promise.all((accounts ?? []).map(async account => {
|
|
||||||
await swos.sendMarkAllAsRead(account.id);
|
|
||||||
}));
|
|
||||||
});
|
|
||||||
break;
|
|
||||||
case 'settings':
|
|
||||||
client = await swos.openClient('push', '/settings/notifications', loginId);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client) {
|
notification.close();
|
||||||
client.focus();
|
})());
|
||||||
}
|
|
||||||
if (data.type === 'notification') {
|
|
||||||
await swos.sendMarkAllAsRead(loginId);
|
|
||||||
}
|
|
||||||
|
|
||||||
notification.close();
|
|
||||||
})());
|
|
||||||
});
|
});
|
||||||
|
|
||||||
globalThis.addEventListener('notificationclose', (ev: ServiceWorkerGlobalScopeEventMap['notificationclose']) => {
|
globalThis.addEventListener('notificationclose', (ev: ServiceWorkerGlobalScopeEventMap['notificationclose']) => {
|
||||||
const data: PushNotificationDataMap[keyof PushNotificationDataMap] = ev.notification.data;
|
const data: PushNotificationDataMap[keyof PushNotificationDataMap] = ev.notification.data;
|
||||||
|
|
||||||
ev.waitUntil((async (): Promise<void> => {
|
ev.waitUntil((async (): Promise<void> => {
|
||||||
if (data.type === 'notification') {
|
if (data.type === 'notification') {
|
||||||
await swos.sendMarkAllAsRead(data.userId);
|
await swos.sendMarkAllAsRead(data.userId);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
})());
|
})());
|
||||||
});
|
});
|
||||||
|
|
||||||
globalThis.addEventListener('message', (ev: ServiceWorkerGlobalScopeEventMap['message']) => {
|
globalThis.addEventListener('message', (ev: ServiceWorkerGlobalScopeEventMap['message']) => {
|
||||||
ev.waitUntil((async (): Promise<void> => {
|
ev.waitUntil((async (): Promise<void> => {
|
||||||
switch (ev.data) {
|
if (ev.data === 'clear') {
|
||||||
case 'clear':
|
await caches.keys()
|
||||||
// Cache Storage全削除
|
.then(cacheNames => Promise.all(
|
||||||
await caches.keys()
|
cacheNames.map(name => caches.delete(name)),
|
||||||
.then(cacheNames => Promise.all(
|
));
|
||||||
cacheNames.map(name => caches.delete(name)),
|
return;
|
||||||
));
|
}
|
||||||
return; // TODO
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof ev.data === 'object') {
|
if (typeof ev.data === 'object') {
|
||||||
// E.g. '[object Array]' → 'array'
|
const otype = Object.prototype.toString.call(ev.data).slice(8, -1).toLowerCase();
|
||||||
const otype = Object.prototype.toString.call(ev.data).slice(8, -1).toLowerCase();
|
|
||||||
|
|
||||||
if (otype === 'object') {
|
if (otype === 'object') {
|
||||||
if (ev.data.msg === 'initialize') {
|
if (ev.data.msg === 'initialize') {
|
||||||
swLang.setLang(ev.data.lang);
|
swLang.setLang(ev.data.lang);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})());
|
})());
|
||||||
});
|
});
|
||||||
Loading…
Reference in a new issue