v0.12.4 windsurf changes

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rosterchirp-backend",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "description": "RosterChirp backend server",
   "main": "src/index.js",
   "scripts": {

build.sh

@@ -13,7 +13,7 @@
 # ─────────────────────────────────────────────────────────────
 set -euo pipefail
 
-VERSION="${1:-0.12.3}"
+VERSION="${1:-0.12.4}"
 ACTION="${2:-}"
 REGISTRY="${REGISTRY:-}"
 IMAGE_NAME="rosterchirp"

frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rosterchirp-frontend",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "private": true,
   "scripts": {
     "dev": "vite",

frontend/public/sw copy.js

@@ -0,0 +1,126 @@
+// ── Firebase Messaging (background push for Android PWA) ──────────────────────
+// Fill in the values below from Firebase Console → Project Settings → General → Your apps
+// Leave apiKey as '__FIREBASE_API_KEY__' if not using FCM (push will be disabled).
+importScripts('https://www.gstatic.com/firebasejs/10.14.1/firebase-app-compat.js');
+importScripts('https://www.gstatic.com/firebasejs/10.14.1/firebase-messaging-compat.js');
+
+const FIREBASE_CONFIG = {
+  apiKey: "AIzaSyDx191unzXFT4WA1OvkdbrIY_c57kgruAU",
+  authDomain: "rosterchirp-push.firebaseapp.com",
+  projectId: "rosterchirp-push",
+  storageBucket: "rosterchirp-push.firebasestorage.app",
+  messagingSenderId: "126479377334",
+  appId: "1:126479377334:web:280abdd135cf7e0c50d717"
+};
+
+// Only initialise Firebase if the config has been filled in
+let messaging = null;
+if (FIREBASE_CONFIG.apiKey !== '__FIREBASE_API_KEY__') {
+  firebase.initializeApp(FIREBASE_CONFIG);
+  messaging = firebase.messaging();
+}
+
+// ── Cache ─────────────────────────────────────────────────────────────────────
+const CACHE_NAME = 'rosterchirp-v1';
+const STATIC_ASSETS = ['/'];
+
+self.addEventListener('install', (event) => {
+  event.waitUntil(
+    caches.open(CACHE_NAME).then((cache) => cache.addAll(STATIC_ASSETS))
+  );
+  self.skipWaiting();
+});
+
+self.addEventListener('activate', (event) => {
+  event.waitUntil(
+    caches.keys().then((keys) =>
+      Promise.all(keys.filter(k => k !== CACHE_NAME).map(k => caches.delete(k)))
+    )
+  );
+  self.clients.claim();
+});
+
+self.addEventListener('fetch', (event) => {
+  const url = event.request.url;
+  if (url.includes('/api/') || url.includes('/socket.io/') || url.includes('/manifest.json')) {
+    return;
+  }
+  event.respondWith(
+    fetch(event.request).catch(() => caches.match(event.request))
+  );
+});
+
+// ── Badge counter ─────────────────────────────────────────────────────────────
+let badgeCount = 0;
+
+function showRosterChirpNotification(data) {
+  console.log('[SW] showRosterChirpNotification:', JSON.stringify(data));
+  badgeCount++;
+  if (self.navigator?.setAppBadge) self.navigator.setAppBadge(badgeCount).catch(() => {});
+
+  return self.registration.showNotification(data.title || 'New Message', {
+    body:    data.body || '',
+    icon:    '/icons/icon-192.png',
+    badge:   '/icons/icon-192-maskable.png',
+    data:    { url: data.url || '/' },
+    tag:     data.groupId ? `rosterchirp-group-${data.groupId}` : 'rosterchirp-message',
+    renotify: true,
+    vibrate:  [200, 100, 200],
+  });
+}
+
+// ── FCM background messages ───────────────────────────────────────────────────
+if (messaging) {
+  messaging.onBackgroundMessage((payload) => {
+    console.log('[SW] onBackgroundMessage received, data:', JSON.stringify(payload.data));
+    return showRosterChirpNotification(payload.data || {});
+  });
+} else {
+  console.warn('[SW] Firebase messaging not initialised — push notifications disabled');
+}
+
+// ── Raw push event (fallback diagnostic) ─────────────────────────────────────
+// Fires for every push event BEFORE the Firebase SDK handles it.
+// Log it so chrome://inspect shows whether the SW is even waking up.
+self.addEventListener('push', (event) => {
+  console.log('[SW] push event received, hasData:', !!event.data, 'text:', event.data?.text?.()?.slice(0, 120));
+  // Note: Firebase compat SDK registers its own push listener and handles display.
+  // This listener is diagnostic only — do not call showNotification() here.
+});
+
+// ── Notification click ────────────────────────────────────────────────────────
+self.addEventListener('notificationclick', (event) => {
+  event.notification.close();
+  badgeCount = 0;
+  if (self.navigator?.clearAppBadge) self.navigator.clearAppBadge().catch(() => {});
+  event.waitUntil(
+    clients.matchAll({ type: 'window', includeUncontrolled: true }).then((clientList) => {
+      const url = event.notification.data?.url || '/';
+      for (const client of clientList) {
+        if (client.url.includes(self.location.origin) && 'focus' in client) {
+          client.focus();
+          return;
+        }
+      }
+      return clients.openWindow(url);
+    })
+  );
+});
+
+// ── Badge control messages from main thread ───────────────────────────────────
+self.addEventListener('message', (event) => {
+  if (event.data?.type === 'CLEAR_BADGE') {
+    badgeCount = 0;
+    if (self.navigator?.clearAppBadge) self.navigator.clearAppBadge().catch(() => {});
+  }
+  if (event.data?.type === 'SET_BADGE') {
+    badgeCount = event.data.count || 0;
+    if (self.navigator?.setAppBadge) {
+      if (badgeCount > 0) {
+        self.navigator.setAppBadge(badgeCount).catch(() => {});
+      } else {
+        self.navigator.clearAppBadge().catch(() => {});
+      }
+    }
+  }
+});

frontend/public/sw.js

@@ -1,24 +1,35 @@
 // ── Firebase Messaging (background push for Android PWA) ──────────────────────
-// Fill in the values below from Firebase Console → Project Settings → General → Your apps
-// Leave apiKey as '__FIREBASE_API_KEY__' if not using FCM (push will be disabled).
+// Dynamically fetch Firebase config from backend to ensure consistency
 importScripts('https://www.gstatic.com/firebasejs/10.14.1/firebase-app-compat.js');
 importScripts('https://www.gstatic.com/firebasejs/10.14.1/firebase-messaging-compat.js');
 
-const FIREBASE_CONFIG = {
-  apiKey: "AIzaSyDx191unzXFT4WA1OvkdbrIY_c57kgruAU",
-  authDomain: "rosterchirp-push.firebaseapp.com",
-  projectId: "rosterchirp-push",
-  storageBucket: "rosterchirp-push.firebasestorage.app",
-  messagingSenderId: "126479377334",
-  appId: "1:126479377334:web:280abdd135cf7e0c50d717"
-};
+let FIREBASE_CONFIG = null;
+let VAPID_KEY = null;
 
-// Only initialise Firebase if the config has been filled in
+// Fetch Firebase config and initialise messaging
 let messaging = null;
-if (FIREBASE_CONFIG.apiKey !== '__FIREBASE_API_KEY__') {
+let firebaseConfigPromise = fetch('/api/push/firebase-config')
+  .then(res => res.json())
+  .then(config => {
+    FIREBASE_CONFIG = {
+      apiKey: config.apiKey,
+      authDomain: config.authDomain || `${config.projectId}.firebaseapp.com`,
+      projectId: config.projectId,
+      storageBucket: config.storageBucket || `${config.projectId}.firebasestorage.app`,
+      messagingSenderId: config.messagingSenderId,
+      appId: config.appId
+    };
+    VAPID_KEY = config.vapidKey;
+    
+    if (FIREBASE_CONFIG.apiKey) {
       firebase.initializeApp(FIREBASE_CONFIG);
       messaging = firebase.messaging();
+      console.log('[SW] Firebase initialized with dynamic config');
     }
+  })
+  .catch(err => {
+    console.warn('[SW] Failed to fetch Firebase config:', err);
+  });
 
 // ── Cache ─────────────────────────────────────────────────────────────────────
 const CACHE_NAME = 'rosterchirp-v1';
@@ -70,6 +81,8 @@ function showRosterChirpNotification(data) {
 }
 
 // ── FCM background messages ───────────────────────────────────────────────────
+// Wait for Firebase config to be loaded before setting up message handler
+firebaseConfigPromise.then(() => {
   if (messaging) {
     messaging.onBackgroundMessage((payload) => {
       console.log('[SW] onBackgroundMessage received, data:', JSON.stringify(payload.data));
@@ -78,6 +91,7 @@ if (messaging) {
   } else {
     console.warn('[SW] Firebase messaging not initialised — push notifications disabled');
   }
+});
 
 // ── Raw push event (fallback diagnostic) ─────────────────────────────────────
 // Fires for every push event BEFORE the Firebase SDK handles it.