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

Revert "Pick pari sw.ts"
Some checks failed
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
Lint / pnpm_install (push) Successful in 1m44s
Details
Test (production install and build) / production (22.11.0) (push) Successful in 56s
Details
Publish Docker image / Build (push) Successful in 4m38s
Details
Lint / lint (backend) (push) Successful in 2m5s
Details
Lint / lint (frontend-embed) (push) Has been cancelled
Details
Lint / lint (frontend) (push) Has been cancelled
Details
Test (backend) / unit (22.11.0) (push) Has been cancelled
Details

Browse source 
This reverts commit 8e508b921c.

Revert "add media proxy to worker-src"

This reverts commit b29f49fefc.
This commit is contained in:
ゆめ 2024-11-21 12:29:42 -06:00
parent d25fa27c24
commit e885beaab9
No known key found for this signature in database
2 changed files with 175 additions and 209 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/backend/src/server/csp.ts
View file

@ -50,7 +50,6 @@ export function generateCSP(hashedMap: Map<string, CSPHashed>, options: {
'\'wasm-unsafe-eval\'', '\'wasm-unsafe-eval\'',
...scripts ...scripts
]], ]],
['worker-src', ['\'self\'', options.mediaProxy].filter(Boolean)],
['object-src', ['\'none\'']], ['object-src', ['\'none\'']],
['base-uri', ['\'self\'']], ['base-uri', ['\'self\'']],
['form-action', ['\'self\'']], ['form-action', ['\'self\'']],

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

@ -12,242 +12,209 @@ 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';
const STATIC_CACHE_NAME = `misskey-static-${_VERSION_}`; globalThis.addEventListener('install', () => {
const PATHS_TO_CACHE = ['/assets/', '/static-assets/', '/emoji/', '/twemoji/', '/fluent-emoji/', '/vite/']; // ev.waitUntil(globalThis.skipWaiting());
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('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 !== swLang.cacheName)
.map((name) => caches.delete(name)), .map(name => caches.delete(name)),
)) ))
.then(() => globalThis.clients.claim()), .then(() => globalThis.clients.claim()),
); );
}); });
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="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>`; 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:#b4e900;color:#192320;border:none;cursor:pointer;-webkit-tap-highlight-color:transparent}button:hover{background-color:#c6ff03}</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) => { globalThis.addEventListener('fetch', ev => {
const shouldCache = PATHS_TO_CACHE.some((path) => ev.request.url.includes(path)); 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) { if (!isHTMLRequest) return;
ev.respondWith( ev.respondWith(
caches.match(ev.request) fetch(ev.request)
.then((response) => { .catch(async () => {
if (response) return response; const html = await offlineContentHTML();
return new Response(html, {
return fetch(ev.request).then((response) => { status: 200,
if (!response || response.status !== 200 || response.type !== 'basic') return response; headers: {
const responseToCache = response.clone(); 'content-type': 'text/html',
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',
},
});
}),
);
}); });
globalThis.addEventListener('push', (ev) => { globalThis.addEventListener('push', ev => {
ev.waitUntil(globalThis.clients.matchAll({ // クライアント取得
includeUncontrolled: true, ev.waitUntil(globalThis.clients.matchAll({
type: 'window', includeUncontrolled: true,
}).then(async () => { type: 'window',
const data: PushNotificationDataMap[keyof PushNotificationDataMap] = ev.data?.json(); }).then(async () => {
const data: PushNotificationDataMap[keyof PushNotificationDataMap] = ev.data?.json();
switch (data.type) { switch (data.type) {
case 'notification': // case 'driveFileCreated':
case 'unreadAntennaNote': case 'notification':
if (Date.now() - data.dateTime > 1000 * 60 * 60 * 24) break; case 'unreadAntennaNote':
// 1日以上経過している場合は無視
if (Date.now() - data.dateTime > 1000 * 60 * 60 * 24) break;
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;
} }
await createEmptyNotification(); await createEmptyNotification();
return; 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_) { if (_DEV_) {
console.log('notificationclick', ev.action, ev.notification.data); console.log('notificationclick', ev.action, ev.notification.data);
} }
const { action, notification } = ev; const { action, notification } = ev;
const data: PushNotificationDataMap[keyof PushNotificationDataMap] = notification.data ?? {}; const data: PushNotificationDataMap[keyof PushNotificationDataMap] = notification.data ?? {};
const { userId: loginId } = data; const { userId: loginId } = data;
let client: WindowClient | null = null; let client: WindowClient | null = null;
switch (data.type) { switch (data.type) {
case 'notification': case 'notification':
switch (action) { switch (action) {
case 'follow': case 'follow':
if ('userId' in data.body) await swos.api('following/create', loginId, { userId: data.body.userId }); if ('userId' in data.body) await swos.api('following/create', loginId, { userId: data.body.userId });
break; break;
case 'showUser': case 'showUser':
if ('user' in data.body) client = await swos.openUser(Misskey.acct.toString(data.body.user), loginId); if ('user' in data.body) client = await swos.openUser(Misskey.acct.toString(data.body.user), loginId);
break; break;
case 'reply': case 'reply':
if ('note' in data.body) client = await swos.openPost({ reply: data.body.note }, loginId); if ('note' in data.body) client = await swos.openPost({ reply: data.body.note }, loginId);
break; break;
case 'renote': case 'renote':
if ('note' in data.body) await swos.api('notes/create', loginId, { renoteId: data.body.note.id }); if ('note' in data.body) await swos.api('notes/create', loginId, { renoteId: data.body.note.id });
break; break;
case 'accept': case 'accept':
switch (data.body.type) { switch (data.body.type) {
case 'receiveFollowRequest': case 'receiveFollowRequest':
await swos.api('following/requests/accept', loginId, { userId: data.body.userId }); await swos.api('following/requests/accept', loginId, { userId: data.body.userId });
break; break;
} }
break; break;
case 'reject': case 'reject':
switch (data.body.type) { switch (data.body.type) {
case 'receiveFollowRequest': case 'receiveFollowRequest':
await swos.api('following/requests/reject', loginId, { userId: data.body.userId }); await swos.api('following/requests/reject', loginId, { userId: data.body.userId });
break; break;
} }
break; break;
case 'showFollowRequests': case 'showFollowRequests':
client = await swos.openClient('push', '/my/follow-requests', loginId); client = await swos.openClient('push', '/my/follow-requests', loginId);
break; break;
default: default:
switch (data.body.type) { switch (data.body.type) {
case 'receiveFollowRequest': case 'receiveFollowRequest':
client = await swos.openClient('push', '/my/follow-requests', loginId); client = await swos.openClient('push', '/my/follow-requests', loginId);
break; break;
case 'reaction': case 'reaction':
client = await swos.openNote(data.body.note.id, loginId); client = await swos.openNote(data.body.note.id, loginId);
break; break;
default: default:
if ('note' in data.body) { if ('note' in data.body) {
client = await swos.openNote(data.body.note.id, loginId); client = await swos.openNote(data.body.note.id, loginId);
} else if ('user' in data.body) { } else if ('user' in data.body) {
client = await swos.openUser(Misskey.acct.toString(data.body.user), loginId); client = await swos.openUser(Misskey.acct.toString(data.body.user), loginId);
} }
break; break;
} }
} }
break; break;
case 'unreadAntennaNote': case 'unreadAntennaNote':
client = await swos.openAntenna(data.body.antenna.id, loginId); client = await swos.openAntenna(data.body.antenna.id, loginId);
break; break;
default: default:
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);
})); }));
}); });
break; break;
case 'settings': case 'settings':
client = await swos.openClient('push', '/settings/notifications', loginId); client = await swos.openClient('push', '/settings/notifications', loginId);
break; break;
} }
} }
if (client) { if (client) {
client.focus(); client.focus();
} }
if (data.type === 'notification') { if (data.type === 'notification') {
await swos.sendMarkAllAsRead(loginId); await swos.sendMarkAllAsRead(loginId);
} }
notification.close(); 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> => {
if (ev.data === 'clear') { switch (ev.data) {
await caches.keys() case 'clear':
.then((cacheNames) => Promise.all( // Cache Storage全削除
cacheNames.map((name) => caches.delete(name)), await caches.keys()
)); .then(cacheNames => Promise.all(
return; cacheNames.map(name => caches.delete(name)),
} ));
return; // TODO
}
if (typeof ev.data === 'object') { if (typeof ev.data === 'object') {
const otype = Object.prototype.toString.call(ev.data).slice(8, -1).toLowerCase(); // E.g. '[object Array]' → 'array'
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);
} }
} }
} }
})()); })());
}); });