184 build - поправлен mapping для других аккаунтов, 2 идентификатора удалений, и пустые ворота должны работать
This commit is contained in:
@@ -182,7 +182,10 @@
|
||||
});
|
||||
const data = await response.json().catch(() => ({}));
|
||||
if (!response.ok) {
|
||||
throw new Error(data.detail || `Ошибка запроса: ${response.status}`);
|
||||
const detail = data.detail;
|
||||
const message = typeof detail === "string" ? detail
|
||||
: detail?.message || detail?.code || (detail ? JSON.stringify(detail) : `Ошибка запроса: ${response.status}`);
|
||||
throw new Error(message);
|
||||
}
|
||||
return data;
|
||||
}
|
||||
@@ -250,10 +253,10 @@
|
||||
|| ""
|
||||
),
|
||||
token: String(
|
||||
operatorSession?.channel_key
|
||||
|| operatorSession?.token
|
||||
|| state.vmixChannel?.channel_key
|
||||
operatorSession?.token
|
||||
|| operatorSession?.channel_key
|
||||
|| state.vmixChannel?.token
|
||||
|| state.vmixChannel?.channel_key
|
||||
|| runtimeStorage.getItem("hockey.operatorSessionToken")
|
||||
|| ""
|
||||
),
|
||||
@@ -1560,6 +1563,26 @@
|
||||
return context;
|
||||
}
|
||||
|
||||
function mappingProfileUseTarget() {
|
||||
const runtime = window.UIBuilderRuntime?.getData?.()?.hockey || {};
|
||||
const gameId = String(runtime.selected_game?.external_id || runtime.selected_game?.id || "").trim();
|
||||
const operatorSession = runtime.operator_session || runtime.session || {};
|
||||
const sessionGameId = String(operatorSession.game_external_id || operatorSession.game_id || "").trim();
|
||||
let sessionToken = gameId && (!sessionGameId || sessionGameId === gameId)
|
||||
? String(operatorSession.token || operatorSession.channel_key || "").trim()
|
||||
: "";
|
||||
// A settings channel may belong to a different tab, account or match.
|
||||
// Use only this workspace's session, or its matching tab-scoped fallback.
|
||||
if (!sessionToken && gameId && String(runtimeStorage.getItem("hockey.selectedGameId") || "").trim() === gameId) {
|
||||
sessionToken = String(runtimeStorage.getItem("hockey.operatorSessionToken") || "").trim();
|
||||
}
|
||||
return {
|
||||
game_id: gameId,
|
||||
device_id: String(window.HockeyAgentRuntime?.currentDeviceId?.() || runtimeStorage.getItem("hockey.vmix.selected_device") || "").trim(),
|
||||
session_token: sessionToken,
|
||||
};
|
||||
}
|
||||
|
||||
let mappingCatalogRequestRevision = 0;
|
||||
async function loadMappingCatalog() {
|
||||
const revision = ++mappingCatalogRequestRevision;
|
||||
@@ -3330,14 +3353,13 @@
|
||||
const profileId = Number(button.dataset.mapUseProfile || 0);
|
||||
if (!profileId) return;
|
||||
const selected = (state.mappingProfiles?.profiles || []).find((item) => Number(item.id) === profileId);
|
||||
const deviceId = String(runtimeStorage.getItem("hockey.vmix.selected_device") || "").trim();
|
||||
const sessionToken = String(selectedContext().token || "").trim();
|
||||
const target = mappingProfileUseTarget();
|
||||
button.disabled = true;
|
||||
button.textContent = "Применяю…";
|
||||
try {
|
||||
const result = await request(`/api/hockey/admin/vmix-mapping/profiles/${profileId}/use`, {
|
||||
method: "POST",
|
||||
body: JSON.stringify({ device_id: deviceId, session_token: sessionToken }),
|
||||
body: JSON.stringify(target),
|
||||
});
|
||||
await loadMapping(profileId);
|
||||
const applied = result.applied || {};
|
||||
|
||||
Reference in New Issue
Block a user