test a new initialization
Some checks failed
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
Lint / pnpm_install (push) Successful in 1m48s
Test (production install and build) / production (22.11.0) (push) Successful in 1m3s
Publish Docker image / Build (push) Successful in 4m34s
Lint / lint (backend) (push) Failing after 2m20s
Lint / lint (frontend-embed) (push) Has been cancelled
Lint / lint (frontend) (push) Has been cancelled
Test (backend) / unit (22.11.0) (push) Has been cancelled
Some checks failed
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
Lint / pnpm_install (push) Successful in 1m48s
Test (production install and build) / production (22.11.0) (push) Successful in 1m3s
Publish Docker image / Build (push) Successful in 4m34s
Lint / lint (backend) (push) Failing after 2m20s
Lint / lint (frontend-embed) (push) Has been cancelled
Lint / lint (frontend) (push) Has been cancelled
Test (backend) / unit (22.11.0) (push) Has been cancelled
Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
This commit is contained in:
parent
80f788c38b
commit
9fb992faa3
5 changed files with 363 additions and 184 deletions
|
|
@ -5,6 +5,136 @@
|
|||
|
||||
'use strict';
|
||||
|
||||
class Systemd {
|
||||
constructor(version, cmdline) {
|
||||
this.tty_dom = document.querySelector('#tty');
|
||||
const welcome = document.createElement('div');
|
||||
welcome.className = 'tty-line';
|
||||
welcome.innerText = `YumechiNoKuni ${version} running in Web mode. (+mproxy, +metrics, +csp) cmdline: ${cmdline}`;
|
||||
this.tty_dom.appendChild(welcome);
|
||||
}
|
||||
async start(id, promise) {
|
||||
let state = { state: 'running' };
|
||||
let persistentDom = null;
|
||||
const started = Date.now();
|
||||
const formatRunning = () => {
|
||||
const shiftArray = (arr, n) => {
|
||||
return arr.slice(n).concat(arr.slice(0, n));
|
||||
};
|
||||
const elapsed_secs = Math.floor((Date.now() - started) / 1000);
|
||||
const stars = shiftArray([' ', '*', '*', '*', ' ', ' '], elapsed_secs % 6);
|
||||
const spanStatus = document.createElement('span');
|
||||
spanStatus.innerText = stars.join('');
|
||||
spanStatus.className = 'tty-status-running';
|
||||
const spanMessage = document.createElement('span');
|
||||
spanMessage.innerText = `A start job is running for ${id} (${elapsed_secs}s / no limit)`;
|
||||
const div = document.createElement('div');
|
||||
div.className = 'tty-line';
|
||||
div.innerHTML = '[';
|
||||
div.appendChild(spanStatus);
|
||||
div.innerHTML += '] ';
|
||||
div.appendChild(spanMessage);
|
||||
return div;
|
||||
};
|
||||
const formatDone = () => {
|
||||
const elapsed_secs = (Date.now() - started) / 1000;
|
||||
const spanStatus = document.createElement('span');
|
||||
spanStatus.innerText = ' OK ';
|
||||
spanStatus.className = 'tty-status-ok';
|
||||
const spanMessage = document.createElement('span');
|
||||
spanMessage.innerText = `Finished ${id} in ${elapsed_secs.toFixed(3)}s`;
|
||||
const div = document.createElement('div');
|
||||
div.className = 'tty-line';
|
||||
div.innerHTML = '[';
|
||||
div.appendChild(spanStatus);
|
||||
div.innerHTML += '] ';
|
||||
div.appendChild(spanMessage);
|
||||
return div;
|
||||
};
|
||||
const formatFailed = (message) => {
|
||||
const elapsed_secs = (Date.now() - started) / 1000;
|
||||
const spanStatus = document.createElement('span');
|
||||
spanStatus.innerText = 'FAILED';
|
||||
spanStatus.className = 'tty-status-failed';
|
||||
const spanMessage = document.createElement('span');
|
||||
spanMessage.innerText = `Failed ${id} in ${elapsed_secs.toFixed(3)}s: ${message}`;
|
||||
const div = document.createElement('div');
|
||||
div.className = 'tty-line';
|
||||
div.innerHTML = '[';
|
||||
div.appendChild(spanStatus);
|
||||
div.innerHTML += '] ';
|
||||
div.appendChild(spanMessage);
|
||||
return div;
|
||||
};
|
||||
const render = () => {
|
||||
switch (state.state) {
|
||||
case 'running':
|
||||
if (persistentDom === null) {
|
||||
persistentDom = formatRunning();
|
||||
this.tty_dom.appendChild(persistentDom);
|
||||
}
|
||||
else {
|
||||
persistentDom.innerHTML = formatRunning().innerHTML;
|
||||
}
|
||||
break;
|
||||
case 'done':
|
||||
if (persistentDom === null) {
|
||||
persistentDom = formatDone();
|
||||
this.tty_dom.appendChild(persistentDom);
|
||||
}
|
||||
else {
|
||||
persistentDom.innerHTML = formatDone().innerHTML;
|
||||
}
|
||||
break;
|
||||
case 'failed':
|
||||
if (persistentDom === null) {
|
||||
persistentDom = formatFailed(state.message);
|
||||
this.tty_dom.appendChild(persistentDom);
|
||||
}
|
||||
else {
|
||||
persistentDom.innerHTML = formatFailed(state.message).innerHTML;
|
||||
}
|
||||
break;
|
||||
}
|
||||
};
|
||||
render();
|
||||
const interval = setInterval(render, 500);
|
||||
try {
|
||||
let res = await promise;
|
||||
state = { state: 'done' };
|
||||
return res;
|
||||
}
|
||||
catch (e) {
|
||||
if (e instanceof Error) {
|
||||
state = { state: 'failed', message: e.message };
|
||||
}
|
||||
else {
|
||||
state = { state: 'failed', message: 'Unknown error' };
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
finally {
|
||||
clearInterval(interval);
|
||||
render();
|
||||
}
|
||||
}
|
||||
async startSync(id, func) {
|
||||
return this.start(id, (async () => {
|
||||
return func();
|
||||
})());
|
||||
}
|
||||
emergency_mode(code, details) {``
|
||||
const divPrev = document.createElement('div');
|
||||
divPrev.className = 'tty-line';
|
||||
divPrev.innerText = 'Critical error occurred [' + code + '] : ' + details.message ? details.message : details;
|
||||
this.tty_dom.appendChild(divPrev);
|
||||
const div = document.createElement('div');
|
||||
div.className = 'tty-line';
|
||||
div.innerText = 'You are in emergency mode. Type Ctrl-Shift-I to view system logs. Clearing local storage by going to /flush and browser settings may help.';
|
||||
this.tty_dom.appendChild(div);
|
||||
}
|
||||
}
|
||||
|
||||
// ブロックの中に入れないと、定義した変数がブラウザのグローバルスコープに登録されてしまい邪魔なので
|
||||
(async () => {
|
||||
window.onerror = (e) => {
|
||||
|
|
@ -16,10 +146,24 @@
|
|||
renderError('SOMETHING_HAPPENED_IN_PROMISE', e);
|
||||
};
|
||||
|
||||
const cmdline = new URLSearchParams(location.search).get('cmdline') || '';
|
||||
const cmdlineArray = cmdline.split(',').map(x => x.trim());
|
||||
if (cmdlineArray.includes('nosplash')) {
|
||||
document.querySelector('#splashIcon').classList.add('hidden');
|
||||
document.querySelector('#splashSpinner').classList.add('hidden');
|
||||
}
|
||||
|
||||
const systemd = new Systemd(VERSION, cmdline);
|
||||
|
||||
if (cmdlineArray.includes('leak')) {
|
||||
await systemd.start('Promise Leak Service', new Promise(() => { }));
|
||||
}
|
||||
|
||||
let forceError = localStorage.getItem('forceError');
|
||||
if (forceError != null) {
|
||||
renderError('FORCED_ERROR', 'This error is forced by having forceError in local storage.');
|
||||
return;
|
||||
await systemd.startSync('Force Error Service', () => {
|
||||
throw new Error('This error is forced by having forceError in local storage.');
|
||||
});
|
||||
}
|
||||
|
||||
//#region Detect language & fetch translations
|
||||
|
|
@ -37,7 +181,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
const metaRes = await window.fetch('/api/meta', {
|
||||
const metaRes = await systemd.start('Fetch /api/meta',window.fetch('/api/meta', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({}),
|
||||
credentials: 'omit',
|
||||
|
|
@ -45,12 +189,12 @@
|
|||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
});
|
||||
}));
|
||||
if (metaRes.status !== 200) {
|
||||
renderError('META_FETCH');
|
||||
return;
|
||||
}
|
||||
const meta = await metaRes.json();
|
||||
const meta = await systemd.start('Parse /api/meta', metaRes.json());
|
||||
const v = meta.version;
|
||||
if (v == null) {
|
||||
renderError('META_FETCH_V');
|
||||
|
|
@ -63,7 +207,7 @@
|
|||
lang = 'en-US';
|
||||
}
|
||||
|
||||
const localRes = await window.fetch(`/assets/locales/${lang}.${v}.json`);
|
||||
const localRes = await systemd.start('Fetch Locale files', window.fetch(`/assets/locales/${lang}.${v}.json`));
|
||||
if (localRes.status === 200) {
|
||||
localStorage.setItem('lang', lang);
|
||||
localStorage.setItem('locale', await localRes.text());
|
||||
|
|
@ -77,19 +221,25 @@
|
|||
|
||||
//#region Script
|
||||
async function importAppScript() {
|
||||
await import(`/vite/${CLIENT_ENTRY}`)
|
||||
await systemd.start('Load App Script', import(`/vite/${CLIENT_ENTRY}`))
|
||||
.catch(async e => {
|
||||
console.error(e);
|
||||
renderError('APP_IMPORT', e);
|
||||
});
|
||||
}
|
||||
|
||||
if (cmdlineArray.includes('fail')) {
|
||||
await systemd.startSync('Force Error Service', () => {
|
||||
throw new Error('This error is forced by having fail in command line.');
|
||||
});
|
||||
}
|
||||
|
||||
// タイミングによっては、この時点でDOMの構築が済んでいる場合とそうでない場合とがある
|
||||
if (document.readyState !== 'loading') {
|
||||
importAppScript();
|
||||
systemd.start('import App Script', importAppScript());
|
||||
} else {
|
||||
window.addEventListener('DOMContentLoaded', () => {
|
||||
importAppScript();
|
||||
systemd.start('import App Script', importAppScript());
|
||||
});
|
||||
}
|
||||
//#endregion
|
||||
|
|
@ -97,6 +247,7 @@
|
|||
//#region Theme
|
||||
const theme = localStorage.getItem('theme');
|
||||
if (theme) {
|
||||
await systemd.startSync('Apply theme', () => {
|
||||
for (const [k, v] of Object.entries(JSON.parse(theme))) {
|
||||
document.documentElement.style.setProperty(`--MI_THEME-${k}`, v.toString());
|
||||
|
||||
|
|
@ -110,6 +261,7 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
const colorScheme = localStorage.getItem('colorScheme');
|
||||
if (colorScheme) {
|
||||
|
|
@ -134,15 +286,19 @@
|
|||
|
||||
const customCss = localStorage.getItem('customCss');
|
||||
if (customCss && customCss.length > 0) {
|
||||
await systemd.startSync('Apply custom CSS', () => {
|
||||
const style = document.createElement('style');
|
||||
style.innerHTML = customCss;
|
||||
document.head.appendChild(style);
|
||||
});
|
||||
}
|
||||
|
||||
async function addStyle(styleText) {
|
||||
await systemd.startSync('Apply custom Style', () => {
|
||||
let css = document.createElement('style');
|
||||
css.appendChild(document.createTextNode(styleText));
|
||||
document.head.appendChild(css);
|
||||
});
|
||||
}
|
||||
|
||||
async function renderError(code, details) {
|
||||
|
|
@ -151,164 +307,6 @@
|
|||
await new Promise(resolve => window.addEventListener('DOMContentLoaded', resolve));
|
||||
}
|
||||
|
||||
let errorsElement = document.getElementById('errors');
|
||||
|
||||
if (!errorsElement) {
|
||||
document.body.innerHTML = `
|
||||
<svg class="icon-warning" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
|
||||
<path stroke="none" d="M0 0h24v24H0z" fill="none"></path>
|
||||
<path d="M12 9v2m0 4v.01"></path>
|
||||
<path d="M5 19h14a2 2 0 0 0 1.84 -2.75l-7.1 -12.25a2 2 0 0 0 -3.5 0l-7.1 12.25a2 2 0 0 0 1.75 2.75"></path>
|
||||
</svg>
|
||||
<h1>Failed to load<br>読み込みに失敗しました</h1>
|
||||
<button class="button-big" onclick="location.reload(true);">
|
||||
<span class="button-label-big">Reload / リロード</span>
|
||||
</button>
|
||||
<p><b>The following actions may solve the problem. / 以下を行うと解決する可能性があります。</b></p>
|
||||
<p>Update your os and browser / ブラウザおよびOSを最新バージョンに更新する</p>
|
||||
<p>Disable an adblocker / アドブロッカーを無効にする</p>
|
||||
<p>Clear the browser cache / ブラウザのキャッシュをクリアする</p>
|
||||
<p>(Tor Browser) Set dom.webaudio.enabled to true / dom.webaudio.enabledをtrueに設定する</p>
|
||||
<details style="color: #86b300;">
|
||||
<summary>Other options / その他のオプション</summary>
|
||||
<a href="/flush">
|
||||
<button class="button-small">
|
||||
<span class="button-label-small">Clear preferences and cache</span>
|
||||
</button>
|
||||
</a>
|
||||
<br>
|
||||
<a href="/cli">
|
||||
<button class="button-small">
|
||||
<span class="button-label-small">Start the simple client</span>
|
||||
</button>
|
||||
</a>
|
||||
<br>
|
||||
<a href="/bios">
|
||||
<button class="button-small">
|
||||
<span class="button-label-small">Start the repair tool</span>
|
||||
</button>
|
||||
</a>
|
||||
</details>
|
||||
<br>
|
||||
<div id="errors"></div>
|
||||
`;
|
||||
errorsElement = document.getElementById('errors');
|
||||
}
|
||||
const detailsElement = document.createElement('details');
|
||||
detailsElement.id = 'errorInfo';
|
||||
detailsElement.innerHTML = `
|
||||
<br>
|
||||
<summary>
|
||||
<code>ERROR CODE: ${code}</code>
|
||||
</summary>
|
||||
<code>${details.toString()} ${JSON.stringify(details)}</code>`;
|
||||
errorsElement.appendChild(detailsElement);
|
||||
addStyle(`
|
||||
* {
|
||||
font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif;
|
||||
}
|
||||
|
||||
#misskey_app,
|
||||
#splash {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
body,
|
||||
html {
|
||||
background-color: #222;
|
||||
color: #dfddcc;
|
||||
justify-content: center;
|
||||
margin: auto;
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
button {
|
||||
border-radius: 999px;
|
||||
padding: 0px 12px 0px 12px;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.button-big {
|
||||
background: linear-gradient(90deg, rgb(134, 179, 0), rgb(74, 179, 0));
|
||||
line-height: 50px;
|
||||
}
|
||||
|
||||
.button-big:hover {
|
||||
background: rgb(153, 204, 0);
|
||||
}
|
||||
|
||||
.button-small {
|
||||
background: #444;
|
||||
line-height: 40px;
|
||||
}
|
||||
|
||||
.button-small:hover {
|
||||
background: #555;
|
||||
}
|
||||
|
||||
.button-label-big {
|
||||
color: #222;
|
||||
font-weight: bold;
|
||||
font-size: 1.2em;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
.button-label-small {
|
||||
color: rgb(153, 204, 0);
|
||||
font-size: 16px;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
a {
|
||||
color: rgb(134, 179, 0);
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
p,
|
||||
li {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.icon-warning {
|
||||
color: #dec340;
|
||||
height: 4rem;
|
||||
padding-top: 2rem;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 1.5em;
|
||||
margin: 1em;
|
||||
}
|
||||
|
||||
code {
|
||||
font-family: Fira, FiraCode, monospace;
|
||||
}
|
||||
|
||||
#errorInfo {
|
||||
background: #333;
|
||||
margin-bottom: 2rem;
|
||||
padding: 0.5rem 1rem;
|
||||
width: 40rem;
|
||||
border-radius: 10px;
|
||||
justify-content: center;
|
||||
margin: auto;
|
||||
}
|
||||
|
||||
#errorInfo summary {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#errorInfo summary > * {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
@media screen and (max-width: 500px) {
|
||||
#errorInfo {
|
||||
width: 50%;
|
||||
}
|
||||
}`);
|
||||
systemd.emergency_mode(code, details);
|
||||
}
|
||||
})();
|
||||
|
|
|
|||
|
|
@ -9,6 +9,32 @@ html {
|
|||
color: var(--MI_THEME-fg);
|
||||
}
|
||||
|
||||
.hidden {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
#tty {
|
||||
z-index: 10001;
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
#tty > .tty-line {
|
||||
font-family: 'Courier New', Courier, monospace !important;
|
||||
display: block;
|
||||
}
|
||||
|
||||
#tty > .tty-line .tty-status-ok {
|
||||
color: green;
|
||||
}
|
||||
|
||||
#tty > .tty-line .tty-status-failed {
|
||||
color: darkred;
|
||||
}
|
||||
|
||||
#tty > .tty-line .tty-status-running {
|
||||
color: red;
|
||||
}
|
||||
|
||||
#splash {
|
||||
position: fixed;
|
||||
z-index: 10000;
|
||||
|
|
|
|||
151
packages/backend/src/server/web/systemd.ts
Normal file
151
packages/backend/src/server/web/systemd.ts
Normal file
|
|
@ -0,0 +1,151 @@
|
|||
export class Systemd {
|
||||
private tty_dom: HTMLDivElement;
|
||||
constructor() {
|
||||
this.tty_dom = document.querySelector('#tty') as HTMLDivElement;
|
||||
|
||||
console.log('Systemd started');
|
||||
}
|
||||
|
||||
async start<T>(id: string, promise: Promise<T>): Promise<T> {
|
||||
|
||||
let state: {
|
||||
state: 'running'
|
||||
} | {
|
||||
state: 'done'
|
||||
} | {
|
||||
state: 'failed'
|
||||
message: string
|
||||
} = { state: 'running' };
|
||||
|
||||
let persistentDom : HTMLDivElement | null = null;
|
||||
|
||||
const started = Date.now();
|
||||
|
||||
const formatRunning = () => {
|
||||
const shiftArray = <T>(arr: T[], n: number): T[] => {
|
||||
return arr.slice(n).concat(arr.slice(0, n));
|
||||
};
|
||||
|
||||
const elapsed_secs = Math.floor((Date.now() - started) / 1000);
|
||||
const stars = shiftArray(['*', '*', '*', ' ', ' ', ' '], elapsed_secs % 6);
|
||||
|
||||
const spanStatus = document.createElement('span');
|
||||
|
||||
spanStatus.innerText = stars.join('');
|
||||
spanStatus.className = 'tty-status-running';
|
||||
|
||||
const spanMessage = document.createElement('span');
|
||||
spanMessage.innerText = `A start job is running for ${id} (${elapsed_secs}s / no limit)`;
|
||||
|
||||
const div = document.createElement('div');
|
||||
div.className = 'tty-line';
|
||||
div.innerHTML = '[';
|
||||
div.appendChild(spanStatus);
|
||||
div.innerHTML += '] ';
|
||||
div.appendChild(spanMessage);
|
||||
|
||||
return div;
|
||||
}
|
||||
|
||||
const formatDone = () => {
|
||||
const elapsed_secs = Math.floor((Date.now() - started) / 1000);
|
||||
|
||||
const spanStatus = document.createElement('span');
|
||||
spanStatus.innerText = ' OK ';
|
||||
spanStatus.className = 'tty-status-ok';
|
||||
|
||||
const spanMessage = document.createElement('span');
|
||||
spanMessage.innerText = `Finished ${id} in ${elapsed_secs}s`;
|
||||
|
||||
const div = document.createElement('div');
|
||||
div.className = 'tty-line';
|
||||
div.innerHTML = '[';
|
||||
div.appendChild(spanStatus);
|
||||
div.innerHTML += '] ';
|
||||
div.appendChild(spanMessage);
|
||||
|
||||
return div;
|
||||
}
|
||||
|
||||
const formatFailed = (message: string) => {
|
||||
const elapsed_secs = Math.floor((Date.now() - started) / 1000);
|
||||
|
||||
const spanStatus = document.createElement('span');
|
||||
spanStatus.innerText = 'FAILED';
|
||||
spanStatus.className = 'tty-status-failed';
|
||||
|
||||
const spanMessage = document.createElement('span');
|
||||
spanMessage.innerText = `Failed ${id} in ${elapsed_secs}s: ${message}`;
|
||||
|
||||
const div = document.createElement('div');
|
||||
div.className = 'tty-line';
|
||||
div.innerHTML = '[';
|
||||
div.appendChild(spanStatus);
|
||||
div.innerHTML += '] ';
|
||||
div.appendChild(spanMessage);
|
||||
|
||||
return div;
|
||||
}
|
||||
|
||||
const render = () => {
|
||||
switch (state.state) {
|
||||
case 'running':
|
||||
if (persistentDom === null) {
|
||||
persistentDom = formatRunning();
|
||||
this.tty_dom.appendChild(persistentDom);
|
||||
} else {
|
||||
persistentDom.innerHTML = formatRunning().innerHTML;
|
||||
}
|
||||
break;
|
||||
case 'done':
|
||||
if (persistentDom === null) {
|
||||
persistentDom = formatDone();
|
||||
this.tty_dom.appendChild(persistentDom);
|
||||
} else {
|
||||
persistentDom.innerHTML = formatDone().innerHTML;
|
||||
}
|
||||
break;
|
||||
case 'failed':
|
||||
if (persistentDom === null) {
|
||||
persistentDom = formatFailed(state.message);
|
||||
this.tty_dom.appendChild(persistentDom);
|
||||
} else {
|
||||
persistentDom.innerHTML = formatFailed(state.message).innerHTML;
|
||||
}
|
||||
break;
|
||||
}
|
||||
};
|
||||
|
||||
render();
|
||||
const interval = setInterval(render, 500);
|
||||
|
||||
try {
|
||||
let res = await promise;
|
||||
state = { state: 'done' };
|
||||
return res;
|
||||
} catch (e) {
|
||||
if (e instanceof Error) {
|
||||
state = { state: 'failed', message: e.message };
|
||||
} else {
|
||||
state = { state: 'failed', message: 'Unknown error' };
|
||||
}
|
||||
throw e;
|
||||
} finally {
|
||||
clearInterval(interval);
|
||||
render();
|
||||
}
|
||||
}
|
||||
|
||||
async startSync<T>(id: string, func: () => T): Promise<T> {
|
||||
return this.start(id, (async () => {
|
||||
return func();
|
||||
})());
|
||||
}
|
||||
|
||||
public emergency_mode() {
|
||||
const div = document.createElement('div');
|
||||
div.className = 'tty-line';
|
||||
div.innerText = 'You are in emergency mode. Type Ctrl-Shift-I to view logs.';
|
||||
this.tty_dom.appendChild(div);
|
||||
}
|
||||
}
|
||||
|
|
@ -56,6 +56,7 @@ html(class='embed')
|
|||
br
|
||||
| Please turn on your JavaScript
|
||||
div#splash
|
||||
div#tty
|
||||
img#splashIcon(src= icon || '/static-assets/splash.png')
|
||||
div#splashSpinner
|
||||
<span>Loading...</span>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@ html
|
|||
script(type='application/json' id='misskey_clientCtx' data-generated-at=now)
|
||||
!= clientCtx
|
||||
|
||||
script(integrity=bootJS.integrity) !{bootJS.content}
|
||||
|
||||
body
|
||||
noscript: p
|
||||
|
|
@ -73,7 +72,11 @@ html
|
|||
br
|
||||
| Please turn on your JavaScript
|
||||
div#splash
|
||||
div#tty
|
||||
img#splashIcon(src= icon || '/static-assets/splash.png')
|
||||
div#splashSpinner
|
||||
<span>Loading...</span>
|
||||
|
||||
script(integrity=bootJS.integrity) !{bootJS.content}
|
||||
|
||||
block content
|
||||
|
|
|
|||
Loading…
Reference in a new issue