3. Versuch bug fix FCM mit mehr Info im UI
This commit is contained in:
1 parent
df97539f27
commit
84aa7f9631
10 files changed
+178
-36
No files matched your search
@@ -5,7 +5,7 @@
|
||||
* damit er sowohl die mobilen Views als auch die statischen Assets
|
||||
* kontrolliert. Der Cache-Name wird pro App-Wurzel gebildet.
|
||||
*/
|
||||
const VERSION = 'cmbnet-pwa-v25';
|
||||
const VERSION = 'cmbnet-pwa-v26';
|
||||
const BASE = new URL('./', self.location).href;
|
||||
const SHELL_CACHE = `${VERSION}-shell`;
|
||||
const TILE_CACHE = `${VERSION}-tiles`;
|
||||
|
||||
@@ -3653,14 +3653,26 @@ async function wakeMobileClients() {
|
||||
throw new Error(result.error || `HTTP ${response.status}`);
|
||||
}
|
||||
const sent = Number(result.sent) || 0;
|
||||
const tokens = Number(result.valid_tokens) || 0;
|
||||
const connected = Number(result.connected) || 0;
|
||||
const candidates = Number(result.candidates) || 0;
|
||||
if (sent > 0) {
|
||||
setStreetSearchStatus(`${sent} mobile Clients geweckt.`);
|
||||
} else {
|
||||
const tokens = Number(result.valid_tokens) || 0;
|
||||
const connected = Number(result.connected) || 0;
|
||||
} else if (tokens === 0) {
|
||||
setStreetSearchStatus(
|
||||
'Keine mobilen Clients mit Push-Token gefunden '
|
||||
+ `(registriert: ${tokens}, verbunden: ${connected}).`
|
||||
'Keine mobilen Clients mit Push-Token registriert.', true
|
||||
);
|
||||
} else if (candidates === 0) {
|
||||
setStreetSearchStatus(
|
||||
'Kein passender Client für dieses Aufwachsignal '
|
||||
+ `(registriert: ${tokens}, verbunden: ${connected}).`,
|
||||
true
|
||||
);
|
||||
} else {
|
||||
setStreetSearchStatus(
|
||||
`Wecken fehlgeschlagen: ${Number(result.failed) || 0} Fehler `
|
||||
+ `bei ${candidates} Empfängern.`,
|
||||
true
|
||||
);
|
||||
}
|
||||
setTimeout(() => setStreetSearchStatus(''), 5000);
|
||||
|
||||
@@ -652,21 +652,39 @@ async function wakeMobileClientsFromUi() {
|
||||
const body = viewMode === 'mobile_dispatcher' && state.currentGroupId
|
||||
? {group_id: state.currentGroupId}
|
||||
: {};
|
||||
const result = await fetchJson(`${apiBase}/push/wake`, {
|
||||
// ``fetchJson`` verwirft den Fehlertext des Servers. Für den Wake-
|
||||
// Button ist er aber entscheidend (z. B. fehlendes firebase-admin).
|
||||
const response = await fetch(`${apiBase}/push/wake`, {
|
||||
method: 'POST',
|
||||
credentials: 'same-origin',
|
||||
headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify(body)
|
||||
});
|
||||
const result = await response.json().catch(() => ({}));
|
||||
const sent = Number(result.sent) || 0;
|
||||
const tokens = Number(result.valid_tokens) || 0;
|
||||
const connected = Number(result.connected) || 0;
|
||||
const candidates = Number(result.candidates) || 0;
|
||||
if (sent > 0) {
|
||||
showMobileToast(`${sent} mobile Clients geweckt.`);
|
||||
} else {
|
||||
const tokens = Number(result.valid_tokens) || 0;
|
||||
const connected = Number(result.connected) || 0;
|
||||
} else if (!response.ok) {
|
||||
showMobileToast(
|
||||
'Keine mobilen Clients mit Push-Token gefunden '
|
||||
`Wecken fehlgeschlagen: ${result.error || `HTTP ${response.status}`}`,
|
||||
true
|
||||
);
|
||||
} else if (tokens === 0) {
|
||||
showMobileToast('Keine mobilen Clients mit Push-Token registriert.');
|
||||
} else if (candidates === 0) {
|
||||
showMobileToast(
|
||||
'Kein passender Client für dieses Aufwachsignal '
|
||||
+ `(registriert: ${tokens}, verbunden: ${connected}).`
|
||||
);
|
||||
} else {
|
||||
showMobileToast(
|
||||
`Wecken fehlgeschlagen: ${Number(result.failed) || 0} Fehler `
|
||||
+ `bei ${candidates} Empfängern.`,
|
||||
true
|
||||
);
|
||||
}
|
||||
} catch (error) {
|
||||
showMobileToast(`Wecken fehlgeschlagen: ${error.message}`, true);
|
||||
|
||||
Reference in new issue
Block a user