natty
/
calckey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
syuilo 2022-06-26 13:28:49 +09:00
parent 0cae0a49e2 2366f568b9
commit 3183a02824
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/backend/src/server/web/boot.js
View File

@ -14,10 +14,10 @@
// ブロックの中に入れないと、定義した変数がブラウザのグローバルスコープに登録されてしまい邪魔なので // ブロックの中に入れないと、定義した変数がブラウザのグローバルスコープに登録されてしまい邪魔なので
(async () => { (async () => {
window.onerror = (e) => { window.onerror = (e) => {
renderError('SOMETHING_HAPPENED', e.toString()); renderError('SOMETHING_HAPPENED', e);
}; };
window.onunhandledrejection = (e) => { window.onunhandledrejection = (e) => {
renderError('SOMETHING_HAPPENED_IN_PROMISE', e.toString()); renderError('SOMETHING_HAPPENED_IN_PROMISE', e);
}; };
const v = localStorage.getItem('v') || VERSION; const v = localStorage.getItem('v') || VERSION;
@ -57,7 +57,7 @@
import(`/assets/${CLIENT_ENTRY}`) import(`/assets/${CLIENT_ENTRY}`)
.catch(async e => { .catch(async e => {
await checkUpdate(); await checkUpdate();
renderError('APP_FETCH_FAILED', JSON.stringify(e)); renderError('APP_FETCH_FAILED', e);
}) })
//#endregion //#endregion
@ -104,20 +104,27 @@
// eslint-disable-next-line no-inner-declarations // eslint-disable-next-line no-inner-declarations
function renderError(code, details) { function renderError(code, details) {
let errorsElement = document.getElementById('errors');
if (!errorsElement) {
document.documentElement.innerHTML = ` document.documentElement.innerHTML = `
<h1>⚠エラーが発生しました</h1> <h1>⚠ An error has occurred. ⚠</h1>
<p>問題が解決しない場合は管理者までお問い合わせください。以下のオプションを試すこともできます:</p> <p>If the problem persists, please contact the administrator. You may also try the following options:</p>
<ul> <ul>
<li><a href="/cli">簡易クライアント</a>を起動</li> <li>Start <a href="/cli">the simple client</a></li>
<li><a href="/bios">BIOS</a>で修復を試みる</li> <li>Attempt to repair in <a href="/bios">BIOS</a></li>
<li><a href="/flush">キャッシュをクリア</a>する</li> <li><a href="/flush">Flush preferences and cache</a></li>
</ul> </ul>
<hr> <hr>
<code>ERROR CODE: ${code}</code> <div id="errors"></div>
<details>
${details}
</details>
`; `;
errorsElement = document.getElementById('errors');
}
const detailsElement = document.createElement('details');
detailsElement.innerHTML = `<summary><code>ERROR CODE: ${code}</code></summary>${JSON.stringify(details)}`;
errorsElement.appendChild(detailsElement);
} }
// eslint-disable-next-line no-inner-declarations // eslint-disable-next-line no-inner-declarations