Only register push when needed

Author: f-r00t

src/lib/rpc.js

@@ -1,9 +1,11 @@
 import {
   saveRoomMessageAndUpdate,
   setRoomMessages,
+  syncRoomMessages,
   setLatestRoomMessages,
 } from '@/services/bare';
-import { getCurrentRoom, useGlobalStore } from '@/services/zustand';
+import { getCurrentRoom, useGlobalStore, usePreferencesStore } from '@/services/zustand';
+import { getDeviceId } from '../services/pushnotifications';
 import { sleep } from '@/utils';
 import Toast from 'react-native-toast-message';
 import { Peers } from 'lib/connections';
@@ -55,6 +57,7 @@ export class Bridge {
     this.pushRegistrationTimer = null;
     this.pushRegistrationDebouncePromise = null;
     this.pushRegistrationDebounceMs = 750;
+    this.pushRegistrationDone = false;
     this.rpc = new RPC(IPC, (req, error) => {
       const data = this.parse(b4a.toString(req.data));
       if (!data) {
@@ -114,11 +117,13 @@ export class Bridge {
 
   get_pending_push_registrations(room_keys = []) {
     const all_room_keys = [...new Set([...this.get_room_keys_from_store(), ...room_keys])];
-    const pending_room_keys = all_room_keys.filter((room_key) => !this.registeredRoomKeys.has(room_key));
+    const prefs = usePreferencesStore.getState().preferences;
+    const prefs_registered = prefs?.registeredRoomKeys || [];
+    const pending_room_keys = all_room_keys.filter((room_key) => !this.registeredRoomKeys.has(room_key) && !prefs_registered.includes(room_key));
 
     return {
-      include_device_push: !this.basePushRegistered,
-      include_call_push: !this.callPushRegistered,
+      include_device_push: !this.basePushRegistered && !prefs?.basePushVerified,
+      include_call_push: !this.callPushRegistered && !prefs?.basePushVerified,
       pending_room_keys,
     };
   }
@@ -161,8 +166,13 @@ export class Bridge {
     }
 
     const sent = await this.send_push_registration(push_registration_batch);
+    console.log('[rpc.js] Push registration sent:', sent);
     if (sent && sent.success === true) {
       this.mark_push_registrations_sent(state);
+      const currentFirebaseToken = getDeviceId();
+      if (currentFirebaseToken) {
+        usePreferencesStore.getState().setLastRegisteredDeviceToken(currentFirebaseToken);
+      }
     }
     return sent;
   }
@@ -176,6 +186,24 @@ export class Bridge {
   async sync_push_registrations(room_keys = []) {
     this.collect_pending_push_room_keys(room_keys);
 
+    const prefs = usePreferencesStore.getState().preferences;
+    const currentFirebaseToken = getDeviceId();
+    const tokenIsSame = currentFirebaseToken && currentFirebaseToken === prefs?.lastRegisteredDeviceToken;
+
+    if (!tokenIsSame && currentFirebaseToken) {
+      usePreferencesStore.getState().clearRegisteredRoomKeys();
+    }
+
+    const state = this.get_pending_push_registrations([...this.pendingPushRoomKeys]);
+
+    console.log('[rpc.js] Push registration rooms number:' + state.pending_room_keys?.length);
+    console.log('[rpc.js] Push registration token is same:' + tokenIsSame);
+
+    if (state.pending_room_keys.length === 0 && tokenIsSame && !state.include_device_push && !state.include_call_push) {
+      this.pendingPushRoomKeys.clear();
+      return { success: true, skipped: true };
+    }
+
     if (!useGlobalStore.getState().huginNode.connected) {
       return null;
     }
@@ -231,12 +259,33 @@ export class Bridge {
         case 'hugin-node-connected':
           useGlobalStore.getState().setHuginNode({connected: true});
 
+          if (useGlobalStore.getState().appState !== 'active') {
+             console.log('[rpc.js] App not active, skipping push registration sync');
+             break;
+          }
+
+          if (this.pushRegistrationDone) {
+             console.log('[rpc.js] Push registration already done this run, skipping');
+             break;
+          }
+
           if (useGlobalStore.getState().contacts.length === 0
           && useGlobalStore.getState().rooms.length === 0) {
             console.log('[rpc.js] No contacts or rooms, skipping push registration sync')
             break;
           }
+
+          const prefs = usePreferencesStore.getState().preferences;
+          const currentFirebaseToken = getDeviceId();
+          if (currentFirebaseToken && currentFirebaseToken === prefs?.lastRegisteredDeviceToken) {
+            console.log('[rpc.js] Push token has not changed since last registration, skipping');
+            this.pushRegistrationDone = true;
+            break;
+          }
+
           await this.sync_push_registrations();
+          console.log('[rpc.js] Push registration sync completed');
+          this.pushRegistrationDone = true;
           break;
         case 'hugin-node-disconnected':
           console.log('Hugin node disconnected!')
@@ -248,6 +297,7 @@ export class Bridge {
           break;
         case 'new-swarm':
           if (!json.beam && typeof json.key === 'string' && json.key.length > 0) {
+            console.log('[rpc.js] New swarm started, syncing push registrations')
             await this.sync_push_registrations([json.key]);
           }
           break;
@@ -315,11 +365,7 @@ export class Bridge {
         case 'history-update':
           await sleep(500);
           if (getCurrentRoom() === json.key) {
-            const currentState = useGlobalStore.getState();
-            // This might need to be checked, may cause history sync not to show messages immediately
-            if (!currentState.roomMessages || currentState.roomMessages.length === 0) {
-              setRoomMessages(json.key, 0);
-            }
+            syncRoomMessages(json.key);
             if (json.history && !json.background) {
               Toast.show({
                 type: 'success',
@@ -376,7 +422,7 @@ export class Bridge {
           WebRTC.signal(key, topic, address, data);
           break;
         case 'error-message':
-          console.log('Error:', json.data);
+          console.log('Error:', json);
           Toast.show({ text1: json.data?.message || 'Error', type: 'error' });
           break;
         case 'file-saved-to-downloads':

src/services/pushnotifications.ts

@@ -28,7 +28,7 @@ import { saveMessageToQueue, resetMessageQueue, getMessageQueue } from '../utils
 import VoipPushNotification from 'react-native-voip-push-notification';
 import { updateUser, useGlobalStore, usePreferencesStore, useUserStore } from './zustand';
 import { getRooms, initDB, messageExists, roomMessageExists, saveRoomMessage, addContact, saveMessage } from './bare/sqlite';
-import { Beam, decrypt_sealed_box, Nodes, Rooms } from 'lib/native';
+import { Beam, decrypt_sealed_box, Nodes, Rooms, sync_push_registrations } from 'lib/native';
 import { Connection } from './bare/globals';
 import { ConnectionStatus, User } from '../types/user';
 import { setLatestMessages, updateMessage } from './bare/contacts';
@@ -344,6 +344,13 @@ async function getEncryptionKey(): Promise<string | null> {
     const firebaseToken = await getToken(messaging);
     console.log('✅ Firebase Token:', firebaseToken);
     deviceId = firebaseToken;
+
+    const prefToken = usePreferencesStore.getState().preferences?.lastRegisteredDeviceToken;
+    if (firebaseToken && firebaseToken !== prefToken) {
+      console.log('🔄 Device token changed or not registered yet, triggering sync...');
+      sync_push_registrations();
+    }
+
     return firebaseToken;
   } catch (err) {
     console.error('❌ Failed to get FCM token:', err);
@@ -390,6 +397,9 @@ let channelId;
       if (box?.type && box?.type == 'room') {
         console.log('🔔 Room message received!!');
         message = await decryptRoomMessage(box.box, box.timestamp);
+        if (message && message.roomKey) {
+          usePreferencesStore.getState().addRegisteredRoomKeys([message.roomKey]);
+        }
 
         if (await roomMessageExists(message.hash)) {
           console.log('🔕 Room message already exists, skipping synchronization.');
@@ -418,6 +428,9 @@ let channelId;
         const key = await getEncryptionKey();
         if (!key) return; // Cannot decrypt without key
         message = decryptMessage(box.box, box.t, key as string);
+        if (message) {
+          usePreferencesStore.getState().setBasePushVerified(true);
+        }
 
         console.log('🔔 Direct message received!!', message.from);
 
@@ -497,6 +510,9 @@ let channelId;
         console.log('🔔 Room message received!!');
 
         message = await decryptRoomMessage(box.box, box.timestamp);
+        if (message && message.roomKey) {
+          usePreferencesStore.getState().addRegisteredRoomKeys([message.roomKey]);
+        }
 
         if (await roomMessageExists(message.hash)) {
           console.log('🔕 Room message already exists, skipping notification.');
@@ -528,6 +544,9 @@ let channelId;
         const key = await getEncryptionKey();
 
         message = decryptMessage(box.box, box.t, key);
+        if (message) {
+          usePreferencesStore.getState().setBasePushVerified(true);
+        }
 
         console.log('Displaying notification for message:', message);
 

src/services/zustand/async-storage-stores.ts

@@ -209,6 +209,10 @@ interface PreferencesStore {
   setAuthMethod: (authMethod: AuthMethods | null) => void;
   setSkipBgRefreshWarning: (skip: boolean) => void;
   skipBgRefreshWarning: boolean;
+  setLastRegisteredDeviceToken: (token: string) => void;
+  addRegisteredRoomKeys: (keys: string[]) => void;
+  clearRegisteredRoomKeys: () => void;
+  setBasePushVerified: (verified: boolean) => void;
 }
 
 export const usePreferencesStore = create<PreferencesStore>()(
@@ -226,6 +230,25 @@ export const usePreferencesStore = create<PreferencesStore>()(
         })),
       skipBgRefreshWarning: false,
       setSkipBgRefreshWarning: (skip) => set({ skipBgRefreshWarning: skip }),
+      setLastRegisteredDeviceToken: (token: string) =>
+        set((state) => ({
+          preferences: { ...state.preferences, lastRegisteredDeviceToken: token },
+        })),
+      addRegisteredRoomKeys: (keys: string[]) =>
+        set((state) => ({
+          preferences: {
+            ...state.preferences,
+            registeredRoomKeys: [...new Set([...(state.preferences.registeredRoomKeys || []), ...keys])],
+          },
+        })),
+      clearRegisteredRoomKeys: () =>
+        set((state) => ({
+          preferences: { ...state.preferences, registeredRoomKeys: [], basePushVerified: false },
+        })),
+      setBasePushVerified: (verified: boolean) =>
+        set((state) => ({
+          preferences: { ...state.preferences, basePushVerified: verified },
+        })),
     }),
     {
       merge: (persistedState: unknown, currentState: PreferencesStore) => {
@@ -236,6 +259,11 @@ export const usePreferencesStore = create<PreferencesStore>()(
           typedPersistedState?.preferences ?? defaultPreferences;
         const skipBgRefreshWarning =
           typedPersistedState?.skipBgRefreshWarning ?? false;
+        const lastRegisteredDeviceToken =
+          typedPersistedState?.preferences?.lastRegisteredDeviceToken;
+        // Merge preferences with whatever was persisted plus any top-level things
+        // Wait, preferences is already extracted above
+        
         return { ...currentState, preferences, skipBgRefreshWarning }
       },
       name: ASYNC_STORAGE_KEYS.PREFERENCES,

src/services/zustand/global-store.ts

@@ -3,7 +3,7 @@ import { create } from 'zustand';
 import { subscribeWithSelector } from 'zustand/middleware';
 
 import type { Balance, Message, RemoteFile, Room, User, Contact, Call, HuginNode } from '@/types';
-import { AppStateStatus } from 'react-native';
+import { AppState, AppStateStatus } from 'react-native';
 
 type GlobalStore = {
   balance: Balance;
@@ -166,7 +166,7 @@ export const useGlobalStore = create<
       set((state) => ({
         fileDownloads: state.fileDownloads.filter((f) => f.hash !== hash),
       })),
-    appState: 'inactive',
+    appState: AppState.currentState || 'active',
     talkingUsers: {},
     setAppState: (appState) => set({appState}),
     setVoipPayload: (voipPayload) => set({ voipPayload }),

src/types/user.ts

@@ -19,7 +19,9 @@ export interface Preferences {
   node: string;
   huginNodeMode?: 'automatic' | 'manual';
   huginNode?: string;
-
+  lastRegisteredDeviceToken?: string;
+  registeredRoomKeys?: string[];
+  basePushVerified?: boolean;
 }
 
 export interface Payee {