From e885beaab9994cf8e7ec63cb429aa8daebac181d Mon Sep 17 00:00:00 2001 From: eternal-flame-AD Date: Thu, 21 Nov 2024 12:29:42 -0600 Subject: [PATCH] Revert "Pick pari sw.ts" This reverts commit 8e508b921ca21fd0e8722b73e037009cbb692c90. Revert "add media proxy to worker-src" This reverts commit b29f49fefc1b6353b2b9b870b216aeda9a7fe870. --- packages/backend/src/server/csp.ts | 1 - packages/sw/src/sw.ts | 383 +++++++++++++---------------- 2 files changed, 175 insertions(+), 209 deletions(-) diff --git a/packages/backend/src/server/csp.ts b/packages/backend/src/server/csp.ts index adbebd0059..3e1e7962b8 100644 --- a/packages/backend/src/server/csp.ts +++ b/packages/backend/src/server/csp.ts @@ -50,7 +50,6 @@ export function generateCSP(hashedMap: Map, options: { '\'wasm-unsafe-eval\'', ...scripts ]], - ['worker-src', ['\'self\'', options.mediaProxy].filter(Boolean)], ['object-src', ['\'none\'']], ['base-uri', ['\'self\'']], ['form-action', ['\'self\'']], diff --git a/packages/sw/src/sw.ts b/packages/sw/src/sw.ts index 042ce570da..bf980b83a4 100644 --- a/packages/sw/src/sw.ts +++ b/packages/sw/src/sw.ts @@ -12,242 +12,209 @@ import { createEmptyNotification, createNotification } from '@/scripts/create-no import { swLang } from '@/scripts/lang.js'; import * as swos from '@/scripts/operations.js'; -const STATIC_CACHE_NAME = `misskey-static-${_VERSION_}`; -const PATHS_TO_CACHE = ['/assets/', '/static-assets/', '/emoji/', '/twemoji/', '/fluent-emoji/', '/vite/']; - -async function cacheWithFallback(cache, paths) { - for (const path of paths) { - try { - await cache.add(new Request(path, { credentials: 'same-origin' })); - } catch (error) { - // eslint-disable-next-line no-empty - } - } -} - -globalThis.addEventListener('install', (ev) => { - ev.waitUntil((async () => { - const cache = await caches.open(STATIC_CACHE_NAME); - await cacheWithFallback(cache, PATHS_TO_CACHE); - await globalThis.skipWaiting(); - })()); +globalThis.addEventListener('install', () => { + // ev.waitUntil(globalThis.skipWaiting()); }); -globalThis.addEventListener('activate', (ev) => { - ev.waitUntil( - caches.keys() - .then((cacheNames) => Promise.all( - cacheNames - .filter((v) => v !== STATIC_CACHE_NAME && v !== swLang.cacheName) - .map((name) => caches.delete(name)), - )) - .then(() => globalThis.clients.claim()), - ); +globalThis.addEventListener('activate', ev => { + ev.waitUntil( + caches.keys() + .then(cacheNames => Promise.all( + cacheNames + .filter((v) => v !== swLang.cacheName) + .map(name => caches.delete(name)), + )) + .then(() => globalThis.clients.claim()), + ); }); async function offlineContentHTML() { - const i18n = await (swLang.i18n ?? swLang.fetchLocale()) as Partial>; - const messages = { - title: i18n.ts?._offlineScreen.title ?? 'Offline - Could not connect to server', - header: i18n.ts?._offlineScreen.header ?? 'Could not connect to server', - reload: i18n.ts?.reload ?? 'Reload', - }; + const i18n = await (swLang.i18n ?? swLang.fetchLocale()) as Partial>; + const messages = { + title: i18n.ts?._offlineScreen.title ?? 'Offline - Could not connect to server', + header: i18n.ts?._offlineScreen.header ?? 'Could not connect to server', + reload: i18n.ts?.reload ?? 'Reload', + }; - return `${messages.title}
${messages.header}
v${_VERSION_}
`; + return `${messages.title}
${messages.header}
v${_VERSION_}
`; } -globalThis.addEventListener('fetch', (ev) => { - const shouldCache = PATHS_TO_CACHE.some((path) => ev.request.url.includes(path)); +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 (shouldCache) { - ev.respondWith( - caches.match(ev.request) - .then((response) => { - if (response) return response; - - return fetch(ev.request).then((response) => { - if (!response || response.status !== 200 || response.type !== 'basic') return response; - const responseToCache = response.clone(); - caches.open(STATIC_CACHE_NAME) - .then((cache) => { - cache.put(ev.request, responseToCache); - }); - return response; - }); - }), - ); - return; - } - - 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', - }, - }); - }), - ); + 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) => { - ev.waitUntil(globalThis.clients.matchAll({ - includeUncontrolled: true, - type: 'window', - }).then(async () => { - const data: PushNotificationDataMap[keyof PushNotificationDataMap] = ev.data?.json(); +globalThis.addEventListener('push', ev => { + // クライアント取得 + ev.waitUntil(globalThis.clients.matchAll({ + includeUncontrolled: true, + type: 'window', + }).then(async () => { + const data: PushNotificationDataMap[keyof PushNotificationDataMap] = ev.data?.json(); - switch (data.type) { - case 'notification': - case 'unreadAntennaNote': - if (Date.now() - data.dateTime > 1000 * 60 * 60 * 24) break; + switch (data.type) { + // case 'driveFileCreated': + case 'notification': + case 'unreadAntennaNote': + // 1日以上経過している場合は無視 + if (Date.now() - data.dateTime > 1000 * 60 * 60 * 24) break; - return createNotification(data); - case 'readAllNotifications': - await globalThis.registration.getNotifications() - .then((notifications) => notifications.forEach((n) => n.tag !== 'read_notification' && n.close())); - break; - } + return createNotification(data); + case 'readAllNotifications': + await globalThis.registration.getNotifications() + .then(notifications => notifications.forEach(n => n.tag !== 'read_notification' && n.close())); + break; + } - await createEmptyNotification(); - return; - })); + await createEmptyNotification(); + return; + })); }); globalThis.addEventListener('notificationclick', (ev: ServiceWorkerGlobalScopeEventMap['notificationclick']) => { - ev.waitUntil((async (): Promise => { - if (_DEV_) { - console.log('notificationclick', ev.action, ev.notification.data); - } + ev.waitUntil((async (): Promise => { + if (_DEV_) { + console.log('notificationclick', ev.action, ev.notification.data); + } - const { action, notification } = ev; - const data: PushNotificationDataMap[keyof PushNotificationDataMap] = notification.data ?? {}; - const { userId: loginId } = data; - let client: WindowClient | null = null; + const { action, notification } = ev; + const data: PushNotificationDataMap[keyof PushNotificationDataMap] = notification.data ?? {}; + const { userId: loginId } = data; + let client: WindowClient | null = null; - switch (data.type) { - case 'notification': - switch (action) { - 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': - 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[]>('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; - } - } + switch (data.type) { + case 'notification': + switch (action) { + 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': + 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[]>('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) { - client.focus(); - } - if (data.type === 'notification') { - await swos.sendMarkAllAsRead(loginId); - } + if (client) { + client.focus(); + } + if (data.type === 'notification') { + await swos.sendMarkAllAsRead(loginId); + } - notification.close(); - })()); + notification.close(); + })()); }); 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 => { - if (data.type === 'notification') { - await swos.sendMarkAllAsRead(data.userId); - } - return; - })()); + ev.waitUntil((async (): Promise => { + if (data.type === 'notification') { + await swos.sendMarkAllAsRead(data.userId); + } + return; + })()); }); globalThis.addEventListener('message', (ev: ServiceWorkerGlobalScopeEventMap['message']) => { - ev.waitUntil((async (): Promise => { - if (ev.data === 'clear') { - await caches.keys() - .then((cacheNames) => Promise.all( - cacheNames.map((name) => caches.delete(name)), - )); - return; - } + ev.waitUntil((async (): Promise => { + switch (ev.data) { + case 'clear': + // Cache Storage全削除 + await caches.keys() + .then(cacheNames => Promise.all( + cacheNames.map(name => caches.delete(name)), + )); + return; // TODO + } - if (typeof ev.data === 'object') { - const otype = Object.prototype.toString.call(ev.data).slice(8, -1).toLowerCase(); + if (typeof ev.data === 'object') { + // E.g. '[object Array]' → 'array' + const otype = Object.prototype.toString.call(ev.data).slice(8, -1).toLowerCase(); - if (otype === 'object') { - if (ev.data.msg === 'initialize') { - swLang.setLang(ev.data.lang); - } - } - } - })()); + if (otype === 'object') { + if (ev.data.msg === 'initialize') { + swLang.setLang(ev.data.lang); + } + } + } + })()); });