diff --git a/cmd/creator-web/static/assets/console.js b/cmd/creator-web/static/assets/console.js index 9ccec82..c4e32f5 100644 --- a/cmd/creator-web/static/assets/console.js +++ b/cmd/creator-web/static/assets/console.js @@ -39,6 +39,18 @@ function notify(message) { toastTimer = setTimeout(() => { toast.hidden = true; }, 4200); } +function safeClientError(error) { + const message = error && typeof error.message === "string" ? error.message : ""; + switch (message) { + case "creator authentication denied": + return "Логин или пароль не принят."; + case "Сессия отклонена": + return "Сессия истекла. Войдите снова."; + default: + return "Операция недоступна. Попробуйте ещё раз."; + } +} + async function request(path, options = {}) { const headers = new Headers(options.headers || {}); if (sessionToken) headers.set("Authorization", `Bearer ${sessionToken}`); @@ -128,7 +140,7 @@ loginForm.addEventListener("submit", async (event) => { byId("creator-password").value = ""; await showConsole(); } catch (error) { - loginError.textContent = error.message === "creator authentication denied" ? "Логин или пароль не принят." : error.message; + loginError.textContent = safeClientError(error); } finally { button.disabled = false; button.firstElementChild.textContent = "Открыть консоль"; @@ -185,7 +197,7 @@ advisoryForm.addEventListener("submit", async (event) => { byId("advisory-result").hidden = false; } catch (error) { setText("advisory-state", "ОШИБКА"); - setText("advisory-text", error.message); + setText("advisory-text", safeClientError(error)); byId("advisory-result").hidden = false; } finally { byId("advisory-egress-ack").checked = false; @@ -272,7 +284,7 @@ async function loadLearning() { list.replaceChildren(); const failed = document.createElement("p"); failed.className = "register-empty activity-error"; - failed.textContent = error.message; + failed.textContent = safeClientError(error); list.append(failed); }); setText("learning-count", "ОШИБКА"); @@ -371,7 +383,7 @@ async function loadActionHistory() { list.replaceChildren(); const failed = document.createElement("p"); failed.className = "register-empty activity-error"; - failed.textContent = error.message; + failed.textContent = safeClientError(error); list.append(failed); setText("action-count", "ОШИБКА"); } finally { @@ -430,7 +442,7 @@ async function reconcileHistoryAction(actionID, button) { await loadActionHistory(); if (currentProspective) await loadProspectiveRegister(currentProspective.ID); } catch (error) { - notify(error.message); + notify(safeClientError(error)); button.disabled = false; button.textContent = "Сверить"; } @@ -450,7 +462,7 @@ async function loadFocus(query) { } catch (error) { setSignal("focus", "ошибка", "error"); setBadge("focus", "НЕДОСТУПЕН", "bad"); - setText("focus-message", error.message); + setText("focus-message", safeClientError(error)); byId("connection-state").classList.add("offline"); } } @@ -472,7 +484,7 @@ async function loadTask(taskID, query) { currentTask = null; setSignal("task", "отклонена", "error"); setBadge("task", "ВНЕ ФОКУСА", "bad"); - setText("task-message", error.message); + setText("task-message", safeClientError(error)); updateActionReadiness(); } } @@ -511,12 +523,12 @@ async function loadProspectiveRegister(selectedID) { list.replaceChildren(); const failed = document.createElement("p"); failed.className = "register-empty"; - failed.textContent = error.message; + failed.textContent = safeClientError(error); list.append(failed); setText("prospective-count", "ОШИБКА"); setSignal("prospective", "ошибка", "error"); setBadge("prospective", "НЕДОСТУПНА", "bad"); - setText("prospective-message", error.message); + setText("prospective-message", safeClientError(error)); } } @@ -572,7 +584,7 @@ async function loadProspective(prospectiveID) { setSignal("prospective", "ошибка", "error"); setBadge("prospective", "НЕДОСТУПНА", "bad"); setText("prospective-state", "UNKNOWN"); - setText("prospective-message", error.message); + setText("prospective-message", safeClientError(error)); updateActionReadiness(); } } @@ -594,7 +606,7 @@ async function loadCapability(capabilityID) { setSignal("capability", "ошибка", "error"); setBadge("capability", "НЕДОСТУПНА", "bad"); setText("capability-state", "UNKNOWN"); - setText("capability-reason", error.message); + setText("capability-reason", safeClientError(error)); } } @@ -700,7 +712,7 @@ byId("confirm-notification").addEventListener("click", async () => { await loadActionHistory(); notify(result.State === "SUCCEEDED" ? "Receiver принял уведомление." : "Исход отправки требует сверки."); } catch (error) { - setText("notification-confirmation-error", error.message); + setText("notification-confirmation-error", safeClientError(error)); } finally { button.disabled = false; button.textContent = "Подтверждаю отправку"; @@ -730,7 +742,7 @@ byId("confirm-satisfaction").addEventListener("click", async () => { notify(result.State === "SUCCEEDED" ? "Исполнение зафиксировано через Commit." : "Исход требует проверки."); await loadProspectiveRegister(command.ProspectiveItemID); } catch (error) { - setText("confirmation-error", error.message); + setText("confirmation-error", safeClientError(error)); } finally { button.disabled = false; button.textContent = "Подтверждаю переход"; @@ -764,7 +776,7 @@ byId("reconcile-action").addEventListener("click", async () => { notify(result.State === "SUCCEEDED" ? "Исход подтверждён." : "Исход пока неизвестен."); if (currentProspective) await loadProspectiveRegister(currentProspective.ID); } catch (error) { - notify(error.message); + notify(safeClientError(error)); } finally { button.disabled = false; button.textContent = "Проверить исход";