From b43087a4b4940896ac07d7857bf54d84c5deb23e Mon Sep 17 00:00:00 2001 From: wasrusgen Date: Mon, 18 May 2026 12:08:20 +0300 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83?= =?UTF-8?q?=D1=82=20#/master=20=E2=80=94=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=20=D0=B2=D1=85=D0=BE=D0=B4=D1=8F=D1=89=D0=B8=D1=85=20=D0=B7?= =?UTF-8?q?=D0=B0=D0=B4=D0=B0=D1=87=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=80=D1=89?= =?UTF-8?q?=D0=B8=D0=BA=D0=B0/=D1=81=D0=B1=D0=BE=D1=80=D1=89=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - routeByHash: #/master → renderStaff(window.__zovMe) - таймаут 15с на fetch в renderStaff и renderStaffAssemblies - app.js v=20260518g Co-Authored-By: Claude Sonnet 4.6 --- miniapp/assets/app.js | 23 +++++++++++++---------- miniapp/index.html | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/miniapp/assets/app.js b/miniapp/assets/app.js index 254fc25..54de0ce 100644 --- a/miniapp/assets/app.js +++ b/miniapp/assets/app.js @@ -862,13 +862,13 @@ async function renderStaff(me) { if (caps.measurer) { try { + const ctrl1 = new AbortController(); + const t1 = setTimeout(() => ctrl1.abort(), 15000); const res = await fetch(`${BACKEND_URL}/api/measurement_inbox`, { - method: "POST", - body: JSON.stringify({ - initData: tg?.initData || "", - initDataUnsafe: tg?.initDataUnsafe || null, - }), + method: "POST", signal: ctrl1.signal, + body: JSON.stringify({ initData: tg?.initData || "", initDataUnsafe: tg?.initDataUnsafe || null }), }); + clearTimeout(t1); const data = await res.json(); const list = document.getElementById("inboxList"); if (!list) return; @@ -922,13 +922,13 @@ async function renderStaff(me) { async function renderStaffAssemblies(container) { try { + const ctrl2 = new AbortController(); + const t2 = setTimeout(() => ctrl2.abort(), 15000); const res = await fetch(`${BACKEND_URL}/api/assembly_list`, { - method: "POST", - body: JSON.stringify({ - initData: tg?.initData || "", - initDataUnsafe: tg?.initDataUnsafe || null, - }), + method: "POST", signal: ctrl2.signal, + body: JSON.stringify({ initData: tg?.initData || "", initDataUnsafe: tg?.initDataUnsafe || null }), }); + clearTimeout(t2); const data = await res.json(); if (data.error) { container.innerHTML = `
Ошибка: ${escHtml(data.error)}
`; @@ -1743,6 +1743,9 @@ function routeByHash() { renderInboxDetail(location.hash.replace("#/inbox/", "")); } else if (location.hash.startsWith("#/assembly")) { Assembly.mount(app); + } else if (location.hash.startsWith("#/master")) { + const me = window.__zovMe; + if (me) renderStaff(me); else init(); } else if (location.hash.startsWith("#/c/proposal")) { app.innerHTML = ""; document.body.classList.remove("has-bottom-nav"); diff --git a/miniapp/index.html b/miniapp/index.html index 4573615..aaadc24 100644 --- a/miniapp/index.html +++ b/miniapp/index.html @@ -45,6 +45,6 @@ - +