Compare commits

...

2 commits

Author SHA1 Message Date
3f70c7bcb2
2024.11.0-yumechinokuni.6
Some checks failed
Publish Docker image / Build (push) Waiting to run
Lint / pnpm_install (push) Waiting to run
Lint / lint (backend) (push) Blocked by required conditions
Lint / lint (frontend) (push) Blocked by required conditions
Lint / lint (frontend-embed) (push) Blocked by required conditions
Lint / lint (frontend-shared) (push) Blocked by required conditions
Lint / lint (misskey-bubble-game) (push) Blocked by required conditions
Lint / lint (misskey-js) (push) Blocked by required conditions
Lint / lint (misskey-reversi) (push) Blocked by required conditions
Lint / lint (sw) (push) Blocked by required conditions
Lint / typecheck (backend) (push) Blocked by required conditions
Lint / typecheck (misskey-js) (push) Blocked by required conditions
Lint / typecheck (sw) (push) Blocked by required conditions
Test (production install and build) / production (22.11.0) (push) Waiting to run
Lint / pnpm_install (pull_request) Successful in 1m34s
Test (production install and build) / production (22.11.0) (pull_request) Successful in 59s
Publish Docker image / Build (pull_request) Successful in 4m2s
Test (backend) / unit (22.11.0) (pull_request) Failing after 8m37s
Lint / lint (backend) (pull_request) Successful in 2m10s
Lint / lint (frontend) (pull_request) Successful in 1m56s
Lint / lint (frontend-embed) (pull_request) Successful in 1m54s
Lint / lint (frontend-shared) (pull_request) Successful in 2m7s
Lint / lint (misskey-bubble-game) (pull_request) Successful in 2m6s
Lint / lint (misskey-js) (pull_request) Successful in 2m9s
Lint / lint (misskey-reversi) (pull_request) Successful in 2m4s
Lint / typecheck (misskey-js) (pull_request) Successful in 1m13s
Lint / lint (sw) (pull_request) Successful in 2m24s
Lint / typecheck (backend) (pull_request) Successful in 2m3s
Lint / typecheck (sw) (pull_request) Failing after 1m30s
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-21 10:49:28 -06:00
fc88be1829
Revert "piack pari sw.ts"
This reverts commit 9bb310e0d1.

This reverts commit 5587de26c7.

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
2024-11-21 10:48:46 -06:00
4 changed files with 237 additions and 238 deletions

View file

@ -1,3 +1,11 @@
## 2024.11.0-yumechinokuni.6
- Upstream: 2024.11.0-alpha.4 タッグをマージする
- Performance: EmojiのリクエストをProxyでキャッシュするように
- Performance: Service Workerのキャッシュを最適化
- Security: AP Payloadの検証を強化
- Security: Image/Video Processorはドライブ機能だけを使うように
## 2024.11.0-yumechinokuni.5 ## 2024.11.0-yumechinokuni.5
- Upstream: 2024.11.0-alpha.2 タッグをマージする - Upstream: 2024.11.0-alpha.2 タッグをマージする

View file

@ -1,6 +1,6 @@
{ {
"name": "misskey", "name": "misskey",
"version": "2024.11.0-yumechinokuni.5", "version": "2024.11.0-yumechinokuni.6",
"codename": "nasubi", "codename": "nasubi",
"repository": { "repository": {
"type": "git", "type": "git",

View file

@ -1,7 +1,7 @@
{ {
"type": "module", "type": "module",
"name": "misskey-js", "name": "misskey-js",
"version": "2024.11.0-yumechinokuni.5", "version": "2024.11.0-yumechinokuni.6",
"description": "Misskey SDK for JavaScript", "description": "Misskey SDK for JavaScript",
"license": "MIT", "license": "MIT",
"main": "./built/index.js", "main": "./built/index.js",

View file

@ -15,283 +15,274 @@ 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> { async function requestStorage() {
try { try {
if (navigator.storage && navigator.storage.estimate) { if (navigator.storage && navigator.storage.persisted) {
await navigator.storage.estimate(); await navigator.storage.persisted();
if (navigator.storage && navigator.storage.persisted) { }
if (!await navigator.storage.persisted()) { if (navigator.storage && navigator.storage.estimate) {
return null; const quota = await navigator.storage.estimate();
} if (quota.quota && quota.quota < 2 * 1024 * 1024 * 1024) {
} await navigator.storage.estimate;
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) {
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) {}
} }
} }
globalThis.addEventListener('install', (ev) => { globalThis.addEventListener('install', (ev) => {
ev.waitUntil((async () => { ev.waitUntil((async () => {
const storage = await requestStorage(); 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()),
); );
}); });
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(!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) { 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();
});
if (shouldCache) {
ev.respondWith(
caches.match(ev.request)
.then(async response => {
if (response) return response;
globalThis.addEventListener('fetch', ev => { try {
const shouldCache = PATHS_TO_CACHE.some(path => ev.request.url.includes(path)); const fetchResponse = await fetch(ev.request);
if (!fetchResponse || fetchResponse.status !== 200 || fetchResponse.type !== 'basic') {
return fetchResponse;
}
if (shouldCache) { const responseToCache = fetchResponse.clone();
ev.respondWith( const cache = await caches.open(STATIC_CACHE_NAME);
caches.match(ev.request)
.then(async response => {
if (response) return response;
const fetchResponse = await fetch(ev.request); try {
if (!fetchResponse || fetchResponse.status !== 200 || fetchResponse.type !== 'basic') { await cache.put(ev.request, responseToCache);
return fetchResponse; } 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());
}
}
const responseToCache = fetchResponse.clone(); return fetchResponse;
const cache = await caches.open(STATIC_CACHE_NAME); } catch {
return response;
}
})
);
return;
}
try { let isHTMLRequest = false;
await cache.put(ev.request, responseToCache); if (ev.request.headers.get('sec-fetch-dest') === 'document') {
} catch (err) { isHTMLRequest = true;
const keys = await cache.keys(); } else if (ev.request.headers.get('accept')?.includes('/html')) {
if (keys.length > 0) { isHTMLRequest = true;
const deleteCount = Math.ceil(keys.length * 0.2); } else if (ev.request.url.endsWith('/')) {
for (let i = 0; i < deleteCount; i++) { isHTMLRequest = true;
await cache.delete(keys[i]); }
}
await cache.put(ev.request, responseToCache.clone());
}
}
return fetchResponse;
})
);
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 => { 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 'notification': case 'notification':
case 'unreadAntennaNote': case 'unreadAntennaNote':
if (Date.now() - data.dateTime > 1000 * 60 * 60 * 24) break; 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;
case 'edited': case 'edited':
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;
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') { 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;
} }
if (typeof ev.data === 'object') { if (typeof ev.data === 'object') {
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);
} }
} }
} }
})()); })());
}); });