From b53dd11f1c8f1a2400bd7a1a5856d9c6b9c42c12 Mon Sep 17 00:00:00 2001 From: Thomas Date: Wed, 11 Nov 2026 08:38:08 +0100 Subject: [PATCH] FCM: Debug-Popup und doppelte Diagnoseausgaben entfernen --- CMBNet/cmbnet/api/push.py | 12 ------ CMBNet/cmbnet/services/fcm_service.py | 45 ------------------- CMBNet/docs/FCM_PROTOKOLL.md | 24 ++++++----- CMBNet/static/css/mobile.css | 11 ----- CMBNet/static/js/sw.js | 2 +- CMBNet/static/js/views/mobile.js | 62 --------------------------- 6 files changed, 15 insertions(+), 141 deletions(-) diff --git a/CMBNet/cmbnet/api/push.py b/CMBNet/cmbnet/api/push.py index f1dfa21..afc3e91 100644 --- a/CMBNet/cmbnet/api/push.py +++ b/CMBNet/cmbnet/api/push.py @@ -77,13 +77,6 @@ def register_push_token(**kwargs): 'FCM-Token registriert: tenant=%s client=%s type=%s', g.tenant_id, client_id, client_type ) - write_fcm_debug_log({ - 'event': 'token-registered', - 'client_id': client_id, - 'account_id': account_id, - 'client_type': client_type, - 'platform': _platform_name(data.get('platform')), - }, tenant_id=g.tenant_id) return jsonify({'ok': True}) @@ -197,11 +190,6 @@ def wake_mobile_clients(**kwargs): int(result.get('failed') or 0) ) error_details = list(result.get('errors') or [])[:5] - for item in error_details: - current_app.logger.warning( - 'FCM-Wake-Fehler: tenant=%s token=%s error=%s', - g.tenant_id, item.get('fingerprint'), item.get('error') - ) write_fcm_debug_log({ 'event': 'wake-manual', 'group_id': group_id, diff --git a/CMBNet/cmbnet/services/fcm_service.py b/CMBNet/cmbnet/services/fcm_service.py index 3f6368f..08eef3d 100644 --- a/CMBNet/cmbnet/services/fcm_service.py +++ b/CMBNet/cmbnet/services/fcm_service.py @@ -154,7 +154,6 @@ class FcmService: 'Bitte requirements.txt installieren.' ) logger.warning(self._error) - self._log_debug({'event': 'init-error', 'error': self._error}) return None, self._error try: @@ -174,7 +173,6 @@ class FcmService: except Exception as exc: self._error = f'FCM-Initialisierung fehlgeschlagen: {exc}' logger.exception(self._error) - self._log_debug({'event': 'init-error', 'error': self._error}) return None, self._error return self._app, None @@ -211,22 +209,6 @@ class FcmService: return f'{name}: {text}' return name - @staticmethod - def _log_debug(payload): - """Schreibt eine FCM-Diagnosezeile in das separate FCM-Log.""" - tenant_id = None - try: - from flask import g - tenant_id = getattr(g, 'tenant_id', None) - except Exception: - pass - try: - from cmbnet.core.logging import write_fcm_debug_log - write_fcm_debug_log(payload, tenant_id=tenant_id) - except Exception: - # Diagnose darf den Versand nie beeinflussen. - pass - def send_wake(self, tokens, reason='wake'): """Sendet ein reines Daten-Signal an die angegebenen FCM-Tokens. @@ -250,14 +232,6 @@ class FcmService: app, error = self._ensure_app() if error or app is None: result['error'] = error - self._log_debug({ - 'event': 'wake', - 'reason': reason, - 'requested': len(tokens), - 'sent': 0, - 'failed': 0, - 'error': error, - }) return result result['configured'] = True @@ -296,15 +270,6 @@ class FcmService: if batch_result.get('error'): result['error'] = batch_result['error'] - self._log_debug({ - 'event': 'wake', - 'reason': reason, - 'requested': len(tokens), - 'sent': result['sent'], - 'failed': result['failed'], - 'errors': result['errors'][:5], - 'error': result.get('error'), - }) return result def _send_batch(self, messaging, tokens, data, android, webpush, app=None): @@ -335,11 +300,6 @@ class FcmService: 'FCM-Batchversand fehlgeschlagen (%s Empfänger): %s', len(tokens), details ) - self._log_debug({ - 'event': 'batch-error', - 'recipients': len(tokens), - 'error': details, - }) batch_result['failed'] += len(tokens) batch_result['error'] = details batch_result['errors'].append({ @@ -361,11 +321,6 @@ class FcmService: 'FCM-Signal abgelehnt: token=%s error=%s', fingerprint, details ) - self._log_debug({ - 'event': 'rejected', - 'token': fingerprint, - 'error': details, - }) batch_result['errors'].append({ 'fingerprint': fingerprint, 'error': details, diff --git a/CMBNet/docs/FCM_PROTOKOLL.md b/CMBNet/docs/FCM_PROTOKOLL.md index d4f0d08..47025bd 100644 --- a/CMBNet/docs/FCM_PROTOKOLL.md +++ b/CMBNet/docs/FCM_PROTOKOLL.md @@ -96,7 +96,7 @@ PWA-Seite (mobile.js) Service Worker (sw.js) Flask/API/Broker `firebase-messaging-compat.js` im Seitenkontext. - `firebase.initializeApp(config.firebase)` - `messaging = firebase.messaging()` - - `messaging.onMessage(payload => { showFirebaseDebugPopup(...); handlePushWake(reason); })` + - `messaging.onMessage(payload => handlePushWake(reason))` für den Vordergrund. - `messaging.getToken({vapidKey: config.vapidKey, serviceWorkerRegistration: swRegistration})` 4. Der Token wird in `state.fcmToken` gespeichert. @@ -269,22 +269,26 @@ keine Tokens. Typische Ursachen: | `FirebaseError: … credential …` | Service-Account ungültig, abgelaufen oder falsche Datei. | | `ValueError: The default Firebase app does not exist` | Die benannte App `cmbnet` wurde initialisiert, aber `send_each_for_multicast()` ohne `app=...` aufgerufen. Beim Versand muss die benannte App explizit übergeben werden. | -Seit der erweiterten Diagnose stehen die konkreten Fehler in der Antwort -(`errors[].error`) und im Serverlog (`FCM-Signal abgelehnt: token=… -error=…`). Die Oberfläche zeigt den ersten Fehler direkt an. +Die konkreten Fehler stehen in der Antwort (`errors[].error`) und im +Serverlog (`FCM-Signal abgelehnt: token=… error=…`). Die Oberfläche zeigt den +ersten Fehler direkt an. -Zusätzlich schreibt die Anwendung eine eigene Datei +Zusätzlich schreibt die Anwendung **eine Zeile pro Wake** in `logs/cmbnet-fcm-YYYY-MM-DD.log`. Dort stehen auch dann Einträge, wenn der Flask-Logger nur nach stdout/journald schreibt: ```json -{"event":"token-registered","client_id":"…","client_type":"group_view","platform":"ios"} -{"event":"wake-manual","group_id":1,"valid_tokens":2,"connected":2, - "candidates":2,"sent":0,"failed":2, - "errors":[{"fingerprint":"…","error":"SenderIdMismatchError: …"}]} -{"event":"rejected","token":"…","error":"…"} +{"event":"wake-manual","group_id":1,"valid_tokens":2,"connected":0, + "candidates":2,"sent":2,"failed":0,"errors":[],"error":null} +{"event":"wake-auto","client_id":"…","reason":"queue","tokens":1, + "sent":1,"failed":0,"errors":[],"error":null} +{"event":"wake-unavailable","valid_tokens":2,"connected":0, + "error":"FCM ist deaktiviert."} ``` +Einzelne abgelehnte Tokens erscheinen nicht als eigene Zeilen; sie sind im +Feld `errors` der Wake-Zeile enthalten (Token nur als Fingerabdruck). + Die Datei lässt sich mit `CMBNET_FCM_DEBUG_LOG=0` abschalten. Das WS-Debug-Log `logs/cmbnet-ws-*.log` enthält dagegen nur eingehende WebSocket-Nachrichten und Empfängerlisten, keine FCM-Versandereignisse. diff --git a/CMBNet/static/css/mobile.css b/CMBNet/static/css/mobile.css index 5553104..0ab736e 100644 --- a/CMBNet/static/css/mobile.css +++ b/CMBNet/static/css/mobile.css @@ -274,17 +274,6 @@ html[data-theme="dark"] .mobile-ws-status.is-error { background: rgba(153, 27, 27, 0.96); } -.firebase-debug-payload { - max-height: 16rem; - overflow: auto; - padding: 0.6rem; - border-radius: 0.45rem; - background: rgba(15, 23, 42, 0.06); - font-size: 0.75rem; - white-space: pre-wrap; - overflow-wrap: anywhere; -} - .mobile-work-btn { position: absolute; left: 50%; diff --git a/CMBNet/static/js/sw.js b/CMBNet/static/js/sw.js index 129a22d..b150a47 100644 --- a/CMBNet/static/js/sw.js +++ b/CMBNet/static/js/sw.js @@ -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-v26'; +const VERSION = 'cmbnet-pwa-v27'; const BASE = new URL('./', self.location).href; const SHELL_CACHE = `${VERSION}-shell`; const TILE_CACHE = `${VERSION}-tiles`; diff --git a/CMBNet/static/js/views/mobile.js b/CMBNet/static/js/views/mobile.js index 898bc26..9fb4f66 100644 --- a/CMBNet/static/js/views/mobile.js +++ b/CMBNet/static/js/views/mobile.js @@ -420,9 +420,6 @@ async function initFirebasePush(registration = null, force = false) { && payload.data.reason ? payload.data.reason : 'wake'; - // Debugging: Jede im Vordergrund empfangene Firebase-Nachricht - // wird sichtbar angezeigt, bevor die Synchronisierung läuft. - showFirebaseDebugPopup(reason, payload); handlePushWake(reason); }); } @@ -476,69 +473,10 @@ function initPushWakeListener() { if (!event.data || event.data.type !== 'cmbnet-wake') return; const port = event.ports && event.ports[0]; const reason = event.data.reason || 'wake'; - // Ein Klick auf eine Benachrichtigung ist kein neuer Firebase-Empfang. - if (reason !== 'notification') { - showFirebaseDebugPopup(reason, event.data); - } handlePushWake(reason, port); }); } -function showFirebaseDebugPopup(reason, payload) { - let dialog = document.getElementById('firebaseDebugDialog'); - if (!dialog) { - dialog = document.createElement('dialog'); - dialog.id = 'firebaseDebugDialog'; - dialog.setAttribute('aria-labelledby', 'firebaseDebugTitle'); - - const article = document.createElement('article'); - const header = document.createElement('header'); - const title = document.createElement('h3'); - title.id = 'firebaseDebugTitle'; - title.textContent = 'Firebase-Nachricht'; - header.appendChild(title); - - const body = document.createElement('div'); - body.className = 'dialog-body'; - const reasonEl = document.createElement('p'); - reasonEl.id = 'firebaseDebugReason'; - const payloadEl = document.createElement('pre'); - payloadEl.id = 'firebaseDebugPayload'; - payloadEl.className = 'firebase-debug-payload'; - body.append(reasonEl, payloadEl); - - const footer = document.createElement('footer'); - const closeButton = document.createElement('button'); - closeButton.type = 'button'; - closeButton.className = 'secondary'; - closeButton.textContent = 'Schließen'; - closeButton.addEventListener('click', () => dialog.close()); - footer.appendChild(closeButton); - - article.append(header, body, footer); - dialog.appendChild(article); - document.body.appendChild(dialog); - } - - const reasonEl = dialog.querySelector('#firebaseDebugReason'); - const payloadEl = dialog.querySelector('#firebaseDebugPayload'); - if (reasonEl) reasonEl.textContent = `Grund: ${reason || 'wake'}`; - if (payloadEl) { - let text = ''; - try { - text = payload ? JSON.stringify(payload, null, 2) : ''; - } catch (error) { - text = String(payload || ''); - } - payloadEl.textContent = text; - } - - if (!dialog.open) { - if (typeof dialog.showModal === 'function') dialog.showModal(); - else if (typeof dialog.show === 'function') dialog.show(); - } -} - function waitForWsAuthentication(timeoutMs = PUSH_WAKE_AUTH_TIMEOUT_MS) { if (state.authenticated) return Promise.resolve(true); return new Promise(resolve => {