@fishonfire/bubbles-expo 0.1.1 → 0.1.3

package/README.md

@@ -70,6 +70,8 @@ Plugin options:
 
 For Android remote display, backend payloads must use the same `android.notification.channel_id` as `defaultChannelId`. The plugin writes Firebase's default-channel manifest metadata, and the package creates the actual Android notification channel when `BubblesNotificationsProvider`, `getNotificationPermissions()`, or `ensureDefaultNotificationChannel()` runs. On a fresh install, the app must be opened at least once before remote notifications can reliably use this configured channel; otherwise Android/Firebase may fall back to its own default behavior before JavaScript has created the channel.
 
+Device registration uses the Firebase Installation ID (FID) as the push registration identifier. The package does not call Firebase Messaging's deprecated `getToken()` path for Bubbles device sync; the same FID value is sent as both `push_token` and `fid`. On Android, the config plugin also opts into FID-based Firebase Messaging registration and installs native startup code that calls `FirebaseMessaging.getInstance().register()` automatically.
+
 ## Background registration
 
 Register the package-owned background notification handlers once from your app entrypoint:
@@ -162,7 +164,7 @@ export function EnableNotificationsButton() {
 }
 ```
 
-`useBubblesNotifications()` also exposes `addDeviceAttribute`, `deviceId`, `pushToken`, `permissionStatus`, `notificationsEnabled`, `tokenType`, and `error`.
+`useBubblesNotifications()` also exposes `addDeviceAttribute`, `deviceId`, `pushToken`, `permissionStatus`, `notificationsEnabled`, `tokenType`, and `error`. When notifications are enabled, `pushToken` is the Firebase Installation ID and `tokenType` is `"fid"`.
 
 If your app already requested notification permissions, call `registerDevice({ requestPermissions: false })`.
 

package/dist/index.d.mts

@@ -212,7 +212,7 @@ declare function ensureNotificationPermissions(options?: GetNotificationPermissi
 
 type SupportedPlatform = 'android' | 'ios';
 
-type NativeTokenType = 'fcm';
+type NativeTokenType = 'fid';
 type GetDeviceTokenOptions = GetNotificationPermissionsOptions;
 interface DeviceTokenResult {
     platform: SupportedPlatform;

package/dist/index.d.ts

@@ -212,7 +212,7 @@ declare function ensureNotificationPermissions(options?: GetNotificationPermissi
 
 type SupportedPlatform = 'android' | 'ios';
 
-type NativeTokenType = 'fcm';
+type NativeTokenType = 'fid';
 type GetDeviceTokenOptions = GetNotificationPermissionsOptions;
 interface DeviceTokenResult {
     platform: SupportedPlatform;

package/dist/index.js

@@ -1418,27 +1418,28 @@ function registerBubblesBackgroundHandlers() {
 }
 
 // src/runtime/tokens.ts
-var import_messaging2 = require("@react-native-firebase/messaging");
 var import_react_native4 = require("react-native");
-async function getFirebaseMessagingToken(platform) {
+
+// src/runtime/installations.ts
+var import_installations = require("@react-native-firebase/installations");
+async function getFirebaseInstallationId(platform) {
   try {
-    const messagingInstance = (0, import_messaging2.getMessaging)();
-    if (!(0, import_messaging2.isDeviceRegisteredForRemoteMessages)(messagingInstance)) {
-      await (0, import_messaging2.registerDeviceForRemoteMessages)(messagingInstance);
-    }
-    const token = await (0, import_messaging2.getToken)(messagingInstance);
+    const installationsInstance = (0, import_installations.getInstallations)();
+    const installationId = await (0, import_installations.getId)(installationsInstance);
     return getRequiredNonEmptyStringFromSource(
-      token,
-      `${platform} FCM token from Firebase Messaging`
+      installationId,
+      `${platform} Firebase installation id from Firebase Installations`
     );
   } catch (error) {
     const reason = getErrorMessage(error);
-    const platformSpecificSetupHint = platform === "ios" ? " On iOS, also ensure Firebase APNs setup is complete and `expo.ios.googleServicesFile` is configured." : " On Android, ensure `google-services.json` is configured and the native app has been rebuilt.";
+    const platformSpecificSetupHint = platform === "ios" ? " On iOS, ensure `expo.ios.googleServicesFile` is configured and the native app has been rebuilt." : " On Android, ensure `expo.android.googleServicesFile` is configured and the native app has been rebuilt.";
     failWithBubblesError(
-      `Failed to get a ${platform} FCM token from Firebase Messaging. Ensure "@react-native-firebase/app" and "@react-native-firebase/messaging" are installed, the Expo app includes the "@react-native-firebase/messaging" config plugin, and Firebase is configured for this platform.${platformSpecificSetupHint} Original error: ${reason}`
+      `Failed to get a ${platform} Firebase installation id from Firebase Installations. Ensure "@react-native-firebase/app" and "@react-native-firebase/installations" are installed and Firebase is configured for this platform.${platformSpecificSetupHint} Original error: ${reason}`
     );
   }
 }
+
+// src/runtime/tokens.ts
 async function getDeviceRegistrationState(options) {
   const platform = getSupportedPlatform(import_react_native4.Platform.OS);
   const permissions = await getNotificationPermissions(options);
@@ -1453,10 +1454,10 @@ async function getDeviceRegistrationState(options) {
       notificationsEnabled: false
     };
   }
-  const token = await getFirebaseMessagingToken(platform);
+  const token = await getFirebaseInstallationId(platform);
   return {
     platform,
-    tokenType: "fcm",
+    tokenType: "fid",
     token,
     permissionStatus,
     notificationsEnabled: true
@@ -1469,7 +1470,7 @@ async function getDeviceToken(options) {
   }
   return {
     platform: registrationState.platform,
-    tokenType: "fcm",
+    tokenType: "fid",
     token: registrationState.token
   };
 }
@@ -1683,7 +1684,7 @@ async function prepareBubblesNotificationPresentation(options) {
 }
 
 // src/runtime/foreground-message-observer.ts
-var import_messaging3 = require("@react-native-firebase/messaging");
+var import_messaging2 = require("@react-native-firebase/messaging");
 var import_react_native5 = require("react-native");
 function supportsFirebaseForegroundMessages() {
   return import_react_native5.Platform.OS === "android" || import_react_native5.Platform.OS === "ios";
@@ -1703,8 +1704,8 @@ function observeBubblesForegroundMessages() {
     return () => {
     };
   }
-  const unsubscribe = (0, import_messaging3.onMessage)(
-    (0, import_messaging3.getMessaging)(),
+  const unsubscribe = (0, import_messaging2.onMessage)(
+    (0, import_messaging2.getMessaging)(),
     (remoteMessage) => {
       void handleFirebaseForegroundMessage(remoteMessage).catch(
         (error) => {
@@ -1721,25 +1722,6 @@ function observeBubblesForegroundMessages() {
   };
 }
 
-// src/runtime/installations.ts
-var import_installations = require("@react-native-firebase/installations");
-async function getFirebaseInstallationId(platform) {
-  try {
-    const installationsInstance = (0, import_installations.getInstallations)();
-    const installationId = await (0, import_installations.getId)(installationsInstance);
-    return getRequiredNonEmptyStringFromSource(
-      installationId,
-      `${platform} Firebase installation id from Firebase Installations`
-    );
-  } catch (error) {
-    const reason = getErrorMessage(error);
-    const platformSpecificSetupHint = platform === "ios" ? " On iOS, ensure `expo.ios.googleServicesFile` is configured and the native app has been rebuilt." : " On Android, ensure `expo.android.googleServicesFile` is configured and the native app has been rebuilt.";
-    failWithBubblesError(
-      `Failed to get a ${platform} Firebase installation id from Firebase Installations. Ensure "@react-native-firebase/app" and "@react-native-firebase/installations" are installed and Firebase is configured for this platform.${platformSpecificSetupHint} Original error: ${reason}`
-    );
-  }
-}
-
 // src/runtime/transport.ts
 function observeBubblesForegroundRemoteMessages() {
   return observeBubblesForegroundMessages();
@@ -1747,9 +1729,6 @@ function observeBubblesForegroundRemoteMessages() {
 async function getBubblesDeviceRegistrationState(options) {
   return getDeviceRegistrationState(options);
 }
-async function getBubblesInstallationId(platform) {
-  return getFirebaseInstallationId(platform);
-}
 
 // src/runtime/sync-device.ts
 var BubblesNotificationsSyncError = class extends Error {
@@ -1812,7 +1791,7 @@ async function syncDeviceRegistrationState(options) {
     options.registrationState
   );
   try {
-    const installationId = options.registrationState.notificationsEnabled ? await getBubblesInstallationId(options.registrationState.platform) : null;
+    const installationId = options.registrationState.notificationsEnabled ? options.registrationState.token : null;
     const syncResult = await syncBubblesDevice({
       apiBaseUrl,
       appId: options.appId,

package/dist/index.mjs

@@ -52,32 +52,28 @@ import {
 } from "./chunk-3BAGWXHY.mjs";
 
 // src/runtime/tokens.ts
-import {
-  getMessaging,
-  getToken,
-  isDeviceRegisteredForRemoteMessages,
-  registerDeviceForRemoteMessages
-} from "@react-native-firebase/messaging";
 import { Platform } from "react-native";
-async function getFirebaseMessagingToken(platform) {
+
+// src/runtime/installations.ts
+import { getId, getInstallations } from "@react-native-firebase/installations";
+async function getFirebaseInstallationId(platform) {
   try {
-    const messagingInstance = getMessaging();
-    if (!isDeviceRegisteredForRemoteMessages(messagingInstance)) {
-      await registerDeviceForRemoteMessages(messagingInstance);
-    }
-    const token = await getToken(messagingInstance);
+    const installationsInstance = getInstallations();
+    const installationId = await getId(installationsInstance);
     return getRequiredNonEmptyStringFromSource(
-      token,
-      `${platform} FCM token from Firebase Messaging`
+      installationId,
+      `${platform} Firebase installation id from Firebase Installations`
     );
   } catch (error) {
     const reason = getErrorMessage(error);
-    const platformSpecificSetupHint = platform === "ios" ? " On iOS, also ensure Firebase APNs setup is complete and `expo.ios.googleServicesFile` is configured." : " On Android, ensure `google-services.json` is configured and the native app has been rebuilt.";
+    const platformSpecificSetupHint = platform === "ios" ? " On iOS, ensure `expo.ios.googleServicesFile` is configured and the native app has been rebuilt." : " On Android, ensure `expo.android.googleServicesFile` is configured and the native app has been rebuilt.";
     failWithBubblesError(
-      `Failed to get a ${platform} FCM token from Firebase Messaging. Ensure "@react-native-firebase/app" and "@react-native-firebase/messaging" are installed, the Expo app includes the "@react-native-firebase/messaging" config plugin, and Firebase is configured for this platform.${platformSpecificSetupHint} Original error: ${reason}`
+      `Failed to get a ${platform} Firebase installation id from Firebase Installations. Ensure "@react-native-firebase/app" and "@react-native-firebase/installations" are installed and Firebase is configured for this platform.${platformSpecificSetupHint} Original error: ${reason}`
     );
   }
 }
+
+// src/runtime/tokens.ts
 async function getDeviceRegistrationState(options) {
   const platform = getSupportedPlatform(Platform.OS);
   const permissions = await getNotificationPermissions(options);
@@ -92,10 +88,10 @@ async function getDeviceRegistrationState(options) {
       notificationsEnabled: false
     };
   }
-  const token = await getFirebaseMessagingToken(platform);
+  const token = await getFirebaseInstallationId(platform);
   return {
     platform,
-    tokenType: "fcm",
+    tokenType: "fid",
     token,
     permissionStatus,
     notificationsEnabled: true
@@ -108,7 +104,7 @@ async function getDeviceToken(options) {
   }
   return {
     platform: registrationState.platform,
-    tokenType: "fcm",
+    tokenType: "fid",
     token: registrationState.token
   };
 }
@@ -323,7 +319,7 @@ async function prepareBubblesNotificationPresentation(options) {
 
 // src/runtime/foreground-message-observer.ts
 import {
-  getMessaging as getMessaging2,
+  getMessaging,
   onMessage
 } from "@react-native-firebase/messaging";
 import { Platform as Platform2 } from "react-native";
@@ -346,7 +342,7 @@ function observeBubblesForegroundMessages() {
     };
   }
   const unsubscribe = onMessage(
-    getMessaging2(),
+    getMessaging(),
     (remoteMessage) => {
       void handleFirebaseForegroundMessage(remoteMessage).catch(
         (error) => {
@@ -363,25 +359,6 @@ function observeBubblesForegroundMessages() {
   };
 }
 
-// src/runtime/installations.ts
-import { getId, getInstallations } from "@react-native-firebase/installations";
-async function getFirebaseInstallationId(platform) {
-  try {
-    const installationsInstance = getInstallations();
-    const installationId = await getId(installationsInstance);
-    return getRequiredNonEmptyStringFromSource(
-      installationId,
-      `${platform} Firebase installation id from Firebase Installations`
-    );
-  } catch (error) {
-    const reason = getErrorMessage(error);
-    const platformSpecificSetupHint = platform === "ios" ? " On iOS, ensure `expo.ios.googleServicesFile` is configured and the native app has been rebuilt." : " On Android, ensure `expo.android.googleServicesFile` is configured and the native app has been rebuilt.";
-    failWithBubblesError(
-      `Failed to get a ${platform} Firebase installation id from Firebase Installations. Ensure "@react-native-firebase/app" and "@react-native-firebase/installations" are installed and Firebase is configured for this platform.${platformSpecificSetupHint} Original error: ${reason}`
-    );
-  }
-}
-
 // src/runtime/transport.ts
 function observeBubblesForegroundRemoteMessages() {
   return observeBubblesForegroundMessages();
@@ -389,9 +366,6 @@ function observeBubblesForegroundRemoteMessages() {
 async function getBubblesDeviceRegistrationState(options) {
   return getDeviceRegistrationState(options);
 }
-async function getBubblesInstallationId(platform) {
-  return getFirebaseInstallationId(platform);
-}
 
 // src/runtime/sync-device.ts
 var BubblesNotificationsSyncError = class extends Error {
@@ -454,7 +428,7 @@ async function syncDeviceRegistrationState(options) {
     options.registrationState
   );
   try {
-    const installationId = options.registrationState.notificationsEnabled ? await getBubblesInstallationId(options.registrationState.platform) : null;
+    const installationId = options.registrationState.notificationsEnabled ? options.registrationState.token : null;
     const syncResult = await syncBubblesDevice({
       apiBaseUrl,
       appId: options.appId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishonfire/bubbles-expo",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Expo config plugin, explicit background registration API, and React provider for Bubbles notifications.",
   "license": "MIT",
   "main": "./dist/index.js",

package/plugin/build/index.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("./config");
 const with_firebase_messaging_manifest_1 = __importDefault(require("./with-firebase-messaging-manifest"));
+const with_firebase_messaging_registration_1 = __importDefault(require("./with-firebase-messaging-registration"));
 const with_expo_notifications_1 = __importDefault(require("./with-expo-notifications"));
 const with_runtime_defaults_1 = __importDefault(require("./with-runtime-defaults"));
 const with_rnfirebase_disable_spm_1 = __importDefault(require("./with-rnfirebase-disable-spm"));
@@ -13,6 +14,7 @@ const withBubblesNotificationsExpo = (config, input) => {
     config = (0, with_runtime_defaults_1.default)(config, options);
     config = (0, with_expo_notifications_1.default)(config, options);
     config = (0, with_firebase_messaging_manifest_1.default)(config, options);
+    config = (0, with_firebase_messaging_registration_1.default)(config, options);
     config = (0, with_rnfirebase_disable_spm_1.default)(config);
     return config;
 };

package/plugin/build/with-firebase-messaging-manifest.js

@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("expo/config-plugins");
 const FCM_DEFAULT_CHANNEL = 'com.google.firebase.messaging.default_notification_channel_id';
 const FCM_DEFAULT_COLOR = 'com.google.firebase.messaging.default_notification_color';
+const FCM_INSTALLATION_ID_ENABLED = 'firebase_messaging_installation_id_enabled';
+const RN_FIREBASE_MESSAGING_SERVICE = 'io.invertase.firebase.messaging.ReactNativeFirebaseMessagingService';
+const BUBBLES_FIREBASE_MESSAGING_SERVICE = '.BubblesFirebaseMessagingService';
+const BUBBLES_FIREBASE_MESSAGING_REGISTRAR = '.BubblesFirebaseMessagingRegistrar';
 const withFirebaseMessagingManifest = (config, options) => {
     return (0, config_plugins_1.withAndroidManifest)(config, config => {
         const manifest = config.modResults;
@@ -17,6 +21,8 @@ const withFirebaseMessagingManifest = (config, options) => {
         if (channel) {
             setToolsReplace(channel.$, 'android:value');
         }
+        config_plugins_1.AndroidConfig.Manifest.addMetaDataItemToMainApplication(application, FCM_INSTALLATION_ID_ENABLED, 'true', 'value');
+        addBubblesFirebaseMessagingRegistrationEntries(application, getAndroidPackageName(config));
         // Expo only creates the FCM color metadata when a notification
         // color has actually been configured.
         if (options.androidNotificationColor) {
@@ -29,6 +35,36 @@ const withFirebaseMessagingManifest = (config, options) => {
         return config;
     });
 };
+function getAndroidPackageName(config) {
+    const packageName = config.android?.package?.trim();
+    if (!packageName) {
+        throw new Error('[@fishonfire/bubbles-expo] "expo.android.package" is required to configure Android Firebase Messaging registration.');
+    }
+    return packageName;
+}
+function addBubblesFirebaseMessagingRegistrationEntries(application, packageName) {
+    application.service = application.service ?? [];
+    application.provider = application.provider ?? [];
+    removeManifestService(application, RN_FIREBASE_MESSAGING_SERVICE);
+    removeManifestService(application, BUBBLES_FIREBASE_MESSAGING_SERVICE);
+    upsertManifestProvider(application, {
+        $: {
+            'android:name': BUBBLES_FIREBASE_MESSAGING_REGISTRAR,
+            'android:authorities': `${packageName}.bubblesnotifications.fcmregistrar`,
+            'android:exported': 'false',
+            'android:initOrder': '100',
+        },
+    });
+}
+function removeManifestService(application, serviceName) {
+    application.service = (application.service ?? []).filter(item => item.$['android:name'] !== serviceName);
+}
+function upsertManifestProvider(application, provider) {
+    application.provider = [
+        ...(application.provider ?? []).filter(item => item.$['android:name'] !== provider.$['android:name']),
+        provider,
+    ];
+}
 function setToolsReplace(attributes, value) {
     attributes['tools:replace'] = value;
 }

package/plugin/build/with-firebase-messaging-registration.d.ts

@@ -0,0 +1,4 @@
+import { ConfigPlugin } from 'expo/config-plugins';
+import type { NormalizedBubblesNotificationsExpoPluginConfig } from './config';
+declare const withFirebaseMessagingRegistration: ConfigPlugin<NormalizedBubblesNotificationsExpoPluginConfig>;
+export default withFirebaseMessagingRegistration;

package/plugin/build/with-firebase-messaging-registration.js

@@ -0,0 +1,118 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const config_plugins_1 = require("expo/config-plugins");
+const REGISTRAR_CLASS = 'BubblesFirebaseMessagingRegistrar';
+const withFirebaseMessagingRegistration = config => {
+    return (0, config_plugins_1.withDangerousMod)(config, [
+        'android',
+        async (config) => {
+            const packageName = getAndroidPackageName(config);
+            const sourceDirectory = node_path_1.default.join(config.modRequest.projectRoot, 'android', 'app', 'src', 'main', 'java', ...packageName.split('.'));
+            await promises_1.default.mkdir(sourceDirectory, { recursive: true });
+            await promises_1.default.writeFile(node_path_1.default.join(sourceDirectory, `${REGISTRAR_CLASS}.java`), buildFirebaseMessagingRegistrarSource(packageName));
+            return config;
+        },
+    ]);
+};
+function getAndroidPackageName(config) {
+    const packageName = config.android?.package?.trim();
+    if (!packageName) {
+        throw new Error('[@fishonfire/bubbles-expo] "expo.android.package" is required to configure Android Firebase Messaging registration.');
+    }
+    return packageName;
+}
+function buildFirebaseMessagingRegistrarSource(packageName) {
+    return `package ${packageName};
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public final class ${REGISTRAR_CLASS} extends ContentProvider {
+  private static final String TAG = "BubblesFCMRegistrar";
+
+  @Override
+  public boolean onCreate() {
+    try {
+      Class<?> firebaseAppClass = Class.forName("com.google.firebase.FirebaseApp");
+      Class<?> firebaseMessagingClass = Class.forName("com.google.firebase.messaging.FirebaseMessaging");
+
+      if (getContext() != null) {
+        Object apps = firebaseAppClass
+            .getMethod("getApps", android.content.Context.class)
+            .invoke(null, getContext());
+
+        if (apps instanceof java.util.List && ((java.util.List<?>) apps).isEmpty()) {
+          firebaseAppClass
+              .getMethod("initializeApp", android.content.Context.class)
+              .invoke(null, getContext());
+        }
+      }
+
+      Object messaging = firebaseMessagingClass
+          .getMethod("getInstance")
+          .invoke(null);
+
+      firebaseMessagingClass
+          .getMethod("register")
+          .invoke(messaging);
+    } catch (ReflectiveOperationException | RuntimeException error) {
+      Log.w(TAG, "Failed to start Firebase Messaging registration.", error);
+    }
+
+    return false;
+  }
+
+  @Nullable
+  @Override
+  public Cursor query(
+      @NonNull Uri uri,
+      @Nullable String[] projection,
+      @Nullable String selection,
+      @Nullable String[] selectionArgs,
+      @Nullable String sortOrder) {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public String getType(@NonNull Uri uri) {
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+    return null;
+  }
+
+  @Override
+  public int delete(
+      @NonNull Uri uri,
+      @Nullable String selection,
+      @Nullable String[] selectionArgs) {
+    return 0;
+  }
+
+  @Override
+  public int update(
+      @NonNull Uri uri,
+      @Nullable ContentValues values,
+      @Nullable String selection,
+      @Nullable String[] selectionArgs) {
+    return 0;
+  }
+}
+`;
+}
+exports.default = withFirebaseMessagingRegistration;