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,35 +15,33 @@ 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) {
await navigator.storage.estimate();
if (navigator.storage && navigator.storage.persisted) { if (navigator.storage && navigator.storage.persisted) {
if (!await navigator.storage.persisted()) { await navigator.storage.persisted();
return null;
} }
if (navigator.storage && navigator.storage.estimate) {
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();
@ -73,16 +71,7 @@ async function offlineContentHTML() {
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 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)); const shouldCache = PATHS_TO_CACHE.some(path => ev.request.url.includes(path));
if (shouldCache) { if (shouldCache) {
@ -91,6 +80,7 @@ async function registerFetchHandler(root: FileSystemDirectoryHandle | null) {
.then(async response => { .then(async response => {
if (response) return response; if (response) return response;
try {
const fetchResponse = await fetch(ev.request); const fetchResponse = await fetch(ev.request);
if (!fetchResponse || fetchResponse.status !== 200 || fetchResponse.type !== 'basic') { if (!fetchResponse || fetchResponse.status !== 200 || fetchResponse.type !== 'basic') {
return fetchResponse; return fetchResponse;
@ -113,6 +103,9 @@ async function registerFetchHandler(root: FileSystemDirectoryHandle | null) {
} }
return fetchResponse; return fetchResponse;
} catch {
return response;
}
}) })
); );
return; return;
@ -140,9 +133,7 @@ async function registerFetchHandler(root: FileSystemDirectoryHandle | null) {
}); });
}), }),
); );
}); });
}
globalThis.addEventListener('push', ev => { globalThis.addEventListener('push', ev => {
ev.waitUntil(globalThis.clients.matchAll({ ev.waitUntil(globalThis.clients.matchAll({