@fishonfire/bubbles-expo 0.1.0 → 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,10 +164,25 @@ export function EnableNotificationsButton() {
 }
 ```
 
-`useBubblesNotifications()` also exposes `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 })`.
 
+## Add custom device attributes
+
+After the provider has a backend `deviceId`, apps can add their own device attributes:
+
+```tsx
+const { addDeviceAttribute, deviceId } = useBubblesNotifications();
+
+if (deviceId) {
+  void addDeviceAttribute('plan', {
+    tier: 'pro',
+    seats: 4,
+  });
+}
+```
+
 ## Example application
 A example application can be found at: https://github.com/fishonfire/bubbles-notifications-expo-example
 
@@ -177,4 +194,4 @@ A example application can be found at: https://github.com/fishonfire/bubbles-not
 ## Copyright and Licence
 Copyright (c) 2026, Fish on Fire.
 
-Source code is licensed under the [`GPL License`](https://github.com/fishonfire/bubbles-notifications-expo/blob/develop/LICENSE).
+Source code is licensed under the [`GPL License`](https://github.com/fishonfire/bubbles-notifications-expo/blob/develop/LICENSE).

package/dist/{chunk-6NPXFGQX.mjs → chunk-3BAGWXHY.mjs}

@@ -458,6 +458,78 @@ function throwAppAuthenticationError(error) {
   }
   throw error;
 }
+function normalizeDeviceAttributes(value) {
+  return normalizeDeviceAttributeObject(value, "attributes", /* @__PURE__ */ new WeakSet());
+}
+function normalizeDeviceAttributeValue(value, sourceDescription, seenValues) {
+  if (value === null) {
+    return null;
+  }
+  if (typeof value === "string" || typeof value === "boolean") {
+    return value;
+  }
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) {
+      failWithBubblesError(`${sourceDescription} must be a finite number.`);
+    }
+    return value;
+  }
+  if (Array.isArray(value)) {
+    if (seenValues.has(value)) {
+      failWithBubblesError(`${sourceDescription} must not contain cycles.`);
+    }
+    seenValues.add(value);
+    const normalizedValue = value.map(
+      (entry, index) => normalizeDeviceAttributeValue(
+        entry,
+        `${sourceDescription}[${index}]`,
+        seenValues
+      )
+    );
+    seenValues.delete(value);
+    return normalizedValue;
+  }
+  if (isPlainObject(value)) {
+    return normalizeDeviceAttributeObject(
+      value,
+      sourceDescription,
+      seenValues
+    );
+  }
+  failWithBubblesError(
+    `${sourceDescription} must be a JSON-compatible value.`
+  );
+}
+function normalizeDeviceAttributeObject(value, sourceDescription, seenValues) {
+  if (!isPlainObject(value)) {
+    failWithBubblesError('"attributes" must be an object.');
+  }
+  const valuePrototype = Object.getPrototypeOf(value);
+  if (valuePrototype !== Object.prototype && valuePrototype !== null) {
+    failWithBubblesError(
+      `${sourceDescription} must be a JSON-compatible object.`
+    );
+  }
+  if (Object.getOwnPropertySymbols(value).length > 0) {
+    failWithBubblesError(
+      `${sourceDescription} must not contain symbol keys.`
+    );
+  }
+  if (seenValues.has(value)) {
+    failWithBubblesError(`${sourceDescription} must not contain cycles.`);
+  }
+  seenValues.add(value);
+  const normalizedValue = {};
+  for (const [attributeName, attributeValue] of Object.entries(value)) {
+    normalizedValue[attributeName] = normalizeDeviceAttributeValue(
+      attributeValue,
+      `${sourceDescription}.${attributeName}`,
+      seenValues
+    );
+  }
+  seenValues.delete(value);
+  return normalizedValue;
+}
 function extractDeviceIdFromDeviceResponse(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     return null;
@@ -497,6 +569,18 @@ async function updateBubblesDevice(options) {
     throwAppAuthenticationError(error);
   }
 }
+async function updateBubblesDeviceAttributes(options) {
+  const client = resolveDeviceClient(options);
+  try {
+    return await client.updateDeviceAttributes(
+      normalizeIdentifier(options.deviceId, "deviceId"),
+      normalizeDeviceAttributes(options.attributes),
+      withAppKeyHeader(options.appKey, options.requestOptions)
+    );
+  } catch (error) {
+    throwAppAuthenticationError(error);
+  }
+}
 async function syncBubblesDevice(options) {
   const client = resolveDeviceClient(options);
   if (options.deviceId !== null) {
@@ -1279,6 +1363,7 @@ export {
   extractDeviceIdFromDeviceResponse,
   createBubblesDevice,
   updateBubblesDevice,
+  updateBubblesDeviceAttributes,
   syncBubblesDevice,
   BUBBLES_DELIVERY_STATUSES,
   buildBubblesDeliveryStatusPayload,

package/dist/index.d.mts

@@ -93,10 +93,20 @@ interface SyncBubblesDeviceResult<TResponse = unknown> {
     deviceId: string | null;
     response: TResponse;
 }
+type BubblesDeviceAttributeValue = string | number | boolean | null | BubblesDeviceAttributeValue[] | {
+    [key: string]: BubblesDeviceAttributeValue;
+};
+type BubblesDeviceAttributes = Record<string, BubblesDeviceAttributeValue>;
+interface UpdateBubblesDeviceAttributesOptions extends BubblesDeviceClientInput {
+    deviceId: string | number;
+    attributes: BubblesDeviceAttributes;
+    requestOptions?: RequestOptions;
+}
 declare function createBubblesDeviceClient(options: BubblesDeviceClientOptions): DeviceClient;
 declare function extractDeviceIdFromDeviceResponse(value: unknown): string | null;
 declare function createBubblesDevice<TResponse = unknown>(options: CreateBubblesDeviceOptions): Promise<TResponse>;
 declare function updateBubblesDevice<TResponse = unknown>(options: UpdateBubblesDeviceOptions): Promise<TResponse>;
+declare function updateBubblesDeviceAttributes<TResponse = unknown>(options: UpdateBubblesDeviceAttributesOptions): Promise<TResponse>;
 declare function syncBubblesDevice<TResponse = unknown>(options: SyncBubblesDeviceOptions): Promise<SyncBubblesDeviceResult<TResponse>>;
 
 type DeviceClientFactoryOptions = Omit<DeviceClientOptions, 'baseUrl'>;
@@ -202,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;
@@ -220,6 +230,8 @@ declare function getDeviceRegistrationState(options?: GetDeviceTokenOptions): Pr
 declare function getDeviceToken(options?: GetDeviceTokenOptions): Promise<DeviceTokenResult>;
 declare function getFCMToken(options?: GetDeviceTokenOptions): Promise<string>;
 
+declare function collectBubblesDeviceAttributes(): Promise<BubblesDeviceAttributes>;
+
 interface RegisterDeviceOptions {
     requestPermissions?: boolean;
     permissionRequestOptions?: PermissionRequestOptions;
@@ -256,6 +268,7 @@ interface BubblesNotificationsProviderProps {
 }
 interface BubblesNotificationsContextValue {
     registerDevice: (options?: RegisterDeviceOptions) => Promise<void>;
+    addDeviceAttribute: (name: string, value: BubblesDeviceAttributeValue) => Promise<void>;
     deviceId: string | null;
     pushToken: string | null;
     tokenType: NativeTokenType | null;
@@ -303,4 +316,4 @@ interface BubblesNotificationPayload {
     url: string | null;
 }
 
-export { ANDROID_CHANNEL_IMPORTANCE_VALUES, type AndroidChannelImportance, BUBBLES_DELIVERY_STATUSES, BUBBLES_NOTIFICATIONS_EXPO_EXTRA_KEY, BubblesAppAuthenticationError, type BubblesCreateDevicePayload, type BubblesDeliveryStatus, type BubblesDeliveryStatusPayload, type BubblesDevicePayload, type BubblesDevicePlatform, type BubblesForegroundNotificationPayloadContract, type BubblesNotificationDataContract, type BubblesNotificationPayload, type BubblesNotificationResponseEvent, type BubblesNotificationsContextValue, type BubblesNotificationsLogoutEvent, BubblesNotificationsProvider, type BubblesNotificationsProviderProps, type BubblesNotificationsRuntimeConfig, type BubblesSilentNotificationPayloadContract, type BubblesUpdateDevicePayload, type BubblesVisibleNotificationPayloadContract, type BuildBubblesCreateDevicePayloadOptions, type BuildBubblesDeliveryStatusPayloadOptions, type BuildBubblesDevicePayloadOptions, type CreateBubblesDeviceOptions, type CreateStoredDeliveryStatusEventOptions, type DefaultNotificationChannelConfig, type DeviceRegistrationState, type DeviceTokenResult, type EnsureDefaultNotificationChannelOptions, type ForegroundPresentationOptions, type GetDeviceTokenOptions, type GetNotificationPermissionsOptions, type NativeTokenType, type PermissionRequestOptions, type PostBubblesDeliveryStatusOptions, type PostStoredBubblesDeliveryStatusOptions, type RegisterDeviceOptions, type StoredDeliveryStatusEvent, type StoredDeliveryStatusLedger, type StoredDeviceState, type StoredDeviceStateUpdate, type SupportedPlatform, type SyncBubblesDeviceOptions, type SyncBubblesDeviceResult, type UpdateBubblesDeviceOptions, buildBubblesDeliveryStatusPayload, buildCreateDevicePayload, buildStoredDeliveryStatusEventKey, buildUpdateDevicePayload, createBubblesDevice, createBubblesDeviceClient, createStoredDeliveryStatusEvent, describeNotificationPermissionStatus, enqueueStoredDeliveryStatusEvent, ensureDefaultNotificationChannel, ensureNotificationPermissions, extractDeviceIdFromDeviceResponse, flushStoredBubblesDeliveryStatuses, getAndroidNotificationChannelImportance, getBubblesNotificationsRuntimeConfig, getDefaultNotificationChannelConfig, getDeviceRegistrationState, getDeviceToken, getFCMToken, getNotificationPermissions, isNotificationPermissionGranted, markStoredDeliveryStatusEventPosted, patchStoredDeviceState, postBubblesDeliveryStatus, postStoredBubblesDeliveryStatus, readStoredApiBaseUrl, readStoredAppKey, readStoredDeliveryStatusLedger, readStoredDeviceId, readStoredDeviceState, registerBubblesBackgroundHandlers, storeApiBaseUrl, storeAppKey, storeDeliveryStatusLedger, storeDeviceId, storeDeviceState, syncBubblesDevice, updateBubblesDevice, useBubblesNotifications };
+export { ANDROID_CHANNEL_IMPORTANCE_VALUES, type AndroidChannelImportance, BUBBLES_DELIVERY_STATUSES, BUBBLES_NOTIFICATIONS_EXPO_EXTRA_KEY, BubblesAppAuthenticationError, type BubblesCreateDevicePayload, type BubblesDeliveryStatus, type BubblesDeliveryStatusPayload, type BubblesDeviceAttributeValue, type BubblesDeviceAttributes, type BubblesDevicePayload, type BubblesDevicePlatform, type BubblesForegroundNotificationPayloadContract, type BubblesNotificationDataContract, type BubblesNotificationPayload, type BubblesNotificationResponseEvent, type BubblesNotificationsContextValue, type BubblesNotificationsLogoutEvent, BubblesNotificationsProvider, type BubblesNotificationsProviderProps, type BubblesNotificationsRuntimeConfig, type BubblesSilentNotificationPayloadContract, type BubblesUpdateDevicePayload, type BubblesVisibleNotificationPayloadContract, type BuildBubblesCreateDevicePayloadOptions, type BuildBubblesDeliveryStatusPayloadOptions, type BuildBubblesDevicePayloadOptions, type CreateBubblesDeviceOptions, type CreateStoredDeliveryStatusEventOptions, type DefaultNotificationChannelConfig, type DeviceRegistrationState, type DeviceTokenResult, type EnsureDefaultNotificationChannelOptions, type ForegroundPresentationOptions, type GetDeviceTokenOptions, type GetNotificationPermissionsOptions, type NativeTokenType, type PermissionRequestOptions, type PostBubblesDeliveryStatusOptions, type PostStoredBubblesDeliveryStatusOptions, type RegisterDeviceOptions, type StoredDeliveryStatusEvent, type StoredDeliveryStatusLedger, type StoredDeviceState, type StoredDeviceStateUpdate, type SupportedPlatform, type SyncBubblesDeviceOptions, type SyncBubblesDeviceResult, type UpdateBubblesDeviceAttributesOptions, type UpdateBubblesDeviceOptions, buildBubblesDeliveryStatusPayload, buildCreateDevicePayload, buildStoredDeliveryStatusEventKey, buildUpdateDevicePayload, collectBubblesDeviceAttributes, createBubblesDevice, createBubblesDeviceClient, createStoredDeliveryStatusEvent, describeNotificationPermissionStatus, enqueueStoredDeliveryStatusEvent, ensureDefaultNotificationChannel, ensureNotificationPermissions, extractDeviceIdFromDeviceResponse, flushStoredBubblesDeliveryStatuses, getAndroidNotificationChannelImportance, getBubblesNotificationsRuntimeConfig, getDefaultNotificationChannelConfig, getDeviceRegistrationState, getDeviceToken, getFCMToken, getNotificationPermissions, isNotificationPermissionGranted, markStoredDeliveryStatusEventPosted, patchStoredDeviceState, postBubblesDeliveryStatus, postStoredBubblesDeliveryStatus, readStoredApiBaseUrl, readStoredAppKey, readStoredDeliveryStatusLedger, readStoredDeviceId, readStoredDeviceState, registerBubblesBackgroundHandlers, storeApiBaseUrl, storeAppKey, storeDeliveryStatusLedger, storeDeviceId, storeDeviceState, syncBubblesDevice, updateBubblesDevice, updateBubblesDeviceAttributes, useBubblesNotifications };

package/dist/index.d.ts

@@ -93,10 +93,20 @@ interface SyncBubblesDeviceResult<TResponse = unknown> {
     deviceId: string | null;
     response: TResponse;
 }
+type BubblesDeviceAttributeValue = string | number | boolean | null | BubblesDeviceAttributeValue[] | {
+    [key: string]: BubblesDeviceAttributeValue;
+};
+type BubblesDeviceAttributes = Record<string, BubblesDeviceAttributeValue>;
+interface UpdateBubblesDeviceAttributesOptions extends BubblesDeviceClientInput {
+    deviceId: string | number;
+    attributes: BubblesDeviceAttributes;
+    requestOptions?: RequestOptions;
+}
 declare function createBubblesDeviceClient(options: BubblesDeviceClientOptions): DeviceClient;
 declare function extractDeviceIdFromDeviceResponse(value: unknown): string | null;
 declare function createBubblesDevice<TResponse = unknown>(options: CreateBubblesDeviceOptions): Promise<TResponse>;
 declare function updateBubblesDevice<TResponse = unknown>(options: UpdateBubblesDeviceOptions): Promise<TResponse>;
+declare function updateBubblesDeviceAttributes<TResponse = unknown>(options: UpdateBubblesDeviceAttributesOptions): Promise<TResponse>;
 declare function syncBubblesDevice<TResponse = unknown>(options: SyncBubblesDeviceOptions): Promise<SyncBubblesDeviceResult<TResponse>>;
 
 type DeviceClientFactoryOptions = Omit<DeviceClientOptions, 'baseUrl'>;
@@ -202,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;
@@ -220,6 +230,8 @@ declare function getDeviceRegistrationState(options?: GetDeviceTokenOptions): Pr
 declare function getDeviceToken(options?: GetDeviceTokenOptions): Promise<DeviceTokenResult>;
 declare function getFCMToken(options?: GetDeviceTokenOptions): Promise<string>;
 
+declare function collectBubblesDeviceAttributes(): Promise<BubblesDeviceAttributes>;
+
 interface RegisterDeviceOptions {
     requestPermissions?: boolean;
     permissionRequestOptions?: PermissionRequestOptions;
@@ -256,6 +268,7 @@ interface BubblesNotificationsProviderProps {
 }
 interface BubblesNotificationsContextValue {
     registerDevice: (options?: RegisterDeviceOptions) => Promise<void>;
+    addDeviceAttribute: (name: string, value: BubblesDeviceAttributeValue) => Promise<void>;
     deviceId: string | null;
     pushToken: string | null;
     tokenType: NativeTokenType | null;
@@ -303,4 +316,4 @@ interface BubblesNotificationPayload {
     url: string | null;
 }
 
-export { ANDROID_CHANNEL_IMPORTANCE_VALUES, type AndroidChannelImportance, BUBBLES_DELIVERY_STATUSES, BUBBLES_NOTIFICATIONS_EXPO_EXTRA_KEY, BubblesAppAuthenticationError, type BubblesCreateDevicePayload, type BubblesDeliveryStatus, type BubblesDeliveryStatusPayload, type BubblesDevicePayload, type BubblesDevicePlatform, type BubblesForegroundNotificationPayloadContract, type BubblesNotificationDataContract, type BubblesNotificationPayload, type BubblesNotificationResponseEvent, type BubblesNotificationsContextValue, type BubblesNotificationsLogoutEvent, BubblesNotificationsProvider, type BubblesNotificationsProviderProps, type BubblesNotificationsRuntimeConfig, type BubblesSilentNotificationPayloadContract, type BubblesUpdateDevicePayload, type BubblesVisibleNotificationPayloadContract, type BuildBubblesCreateDevicePayloadOptions, type BuildBubblesDeliveryStatusPayloadOptions, type BuildBubblesDevicePayloadOptions, type CreateBubblesDeviceOptions, type CreateStoredDeliveryStatusEventOptions, type DefaultNotificationChannelConfig, type DeviceRegistrationState, type DeviceTokenResult, type EnsureDefaultNotificationChannelOptions, type ForegroundPresentationOptions, type GetDeviceTokenOptions, type GetNotificationPermissionsOptions, type NativeTokenType, type PermissionRequestOptions, type PostBubblesDeliveryStatusOptions, type PostStoredBubblesDeliveryStatusOptions, type RegisterDeviceOptions, type StoredDeliveryStatusEvent, type StoredDeliveryStatusLedger, type StoredDeviceState, type StoredDeviceStateUpdate, type SupportedPlatform, type SyncBubblesDeviceOptions, type SyncBubblesDeviceResult, type UpdateBubblesDeviceOptions, buildBubblesDeliveryStatusPayload, buildCreateDevicePayload, buildStoredDeliveryStatusEventKey, buildUpdateDevicePayload, createBubblesDevice, createBubblesDeviceClient, createStoredDeliveryStatusEvent, describeNotificationPermissionStatus, enqueueStoredDeliveryStatusEvent, ensureDefaultNotificationChannel, ensureNotificationPermissions, extractDeviceIdFromDeviceResponse, flushStoredBubblesDeliveryStatuses, getAndroidNotificationChannelImportance, getBubblesNotificationsRuntimeConfig, getDefaultNotificationChannelConfig, getDeviceRegistrationState, getDeviceToken, getFCMToken, getNotificationPermissions, isNotificationPermissionGranted, markStoredDeliveryStatusEventPosted, patchStoredDeviceState, postBubblesDeliveryStatus, postStoredBubblesDeliveryStatus, readStoredApiBaseUrl, readStoredAppKey, readStoredDeliveryStatusLedger, readStoredDeviceId, readStoredDeviceState, registerBubblesBackgroundHandlers, storeApiBaseUrl, storeAppKey, storeDeliveryStatusLedger, storeDeviceId, storeDeviceState, syncBubblesDevice, updateBubblesDevice, useBubblesNotifications };
+export { ANDROID_CHANNEL_IMPORTANCE_VALUES, type AndroidChannelImportance, BUBBLES_DELIVERY_STATUSES, BUBBLES_NOTIFICATIONS_EXPO_EXTRA_KEY, BubblesAppAuthenticationError, type BubblesCreateDevicePayload, type BubblesDeliveryStatus, type BubblesDeliveryStatusPayload, type BubblesDeviceAttributeValue, type BubblesDeviceAttributes, type BubblesDevicePayload, type BubblesDevicePlatform, type BubblesForegroundNotificationPayloadContract, type BubblesNotificationDataContract, type BubblesNotificationPayload, type BubblesNotificationResponseEvent, type BubblesNotificationsContextValue, type BubblesNotificationsLogoutEvent, BubblesNotificationsProvider, type BubblesNotificationsProviderProps, type BubblesNotificationsRuntimeConfig, type BubblesSilentNotificationPayloadContract, type BubblesUpdateDevicePayload, type BubblesVisibleNotificationPayloadContract, type BuildBubblesCreateDevicePayloadOptions, type BuildBubblesDeliveryStatusPayloadOptions, type BuildBubblesDevicePayloadOptions, type CreateBubblesDeviceOptions, type CreateStoredDeliveryStatusEventOptions, type DefaultNotificationChannelConfig, type DeviceRegistrationState, type DeviceTokenResult, type EnsureDefaultNotificationChannelOptions, type ForegroundPresentationOptions, type GetDeviceTokenOptions, type GetNotificationPermissionsOptions, type NativeTokenType, type PermissionRequestOptions, type PostBubblesDeliveryStatusOptions, type PostStoredBubblesDeliveryStatusOptions, type RegisterDeviceOptions, type StoredDeliveryStatusEvent, type StoredDeliveryStatusLedger, type StoredDeviceState, type StoredDeviceStateUpdate, type SupportedPlatform, type SyncBubblesDeviceOptions, type SyncBubblesDeviceResult, type UpdateBubblesDeviceAttributesOptions, type UpdateBubblesDeviceOptions, buildBubblesDeliveryStatusPayload, buildCreateDevicePayload, buildStoredDeliveryStatusEventKey, buildUpdateDevicePayload, collectBubblesDeviceAttributes, createBubblesDevice, createBubblesDeviceClient, createStoredDeliveryStatusEvent, describeNotificationPermissionStatus, enqueueStoredDeliveryStatusEvent, ensureDefaultNotificationChannel, ensureNotificationPermissions, extractDeviceIdFromDeviceResponse, flushStoredBubblesDeliveryStatuses, getAndroidNotificationChannelImportance, getBubblesNotificationsRuntimeConfig, getDefaultNotificationChannelConfig, getDeviceRegistrationState, getDeviceToken, getFCMToken, getNotificationPermissions, isNotificationPermissionGranted, markStoredDeliveryStatusEventPosted, patchStoredDeviceState, postBubblesDeliveryStatus, postStoredBubblesDeliveryStatus, readStoredApiBaseUrl, readStoredAppKey, readStoredDeliveryStatusLedger, readStoredDeviceId, readStoredDeviceState, registerBubblesBackgroundHandlers, storeApiBaseUrl, storeAppKey, storeDeliveryStatusLedger, storeDeviceId, storeDeviceState, syncBubblesDevice, updateBubblesDevice, updateBubblesDeviceAttributes, useBubblesNotifications };

package/dist/index.js

@@ -39,6 +39,7 @@ __export(index_exports, {
   buildCreateDevicePayload: () => buildCreateDevicePayload,
   buildStoredDeliveryStatusEventKey: () => buildStoredDeliveryStatusEventKey,
   buildUpdateDevicePayload: () => buildUpdateDevicePayload,
+  collectBubblesDeviceAttributes: () => collectBubblesDeviceAttributes,
   createBubblesDevice: () => createBubblesDevice,
   createBubblesDeviceClient: () => createBubblesDeviceClient,
   createStoredDeliveryStatusEvent: () => createStoredDeliveryStatusEvent,
@@ -73,6 +74,7 @@ __export(index_exports, {
   storeDeviceState: () => storeDeviceState,
   syncBubblesDevice: () => syncBubblesDevice,
   updateBubblesDevice: () => updateBubblesDevice,
+  updateBubblesDeviceAttributes: () => updateBubblesDeviceAttributes,
   useBubblesNotifications: () => useBubblesNotifications
 });
 module.exports = __toCommonJS(index_exports);
@@ -535,6 +537,78 @@ function throwAppAuthenticationError(error) {
   }
   throw error;
 }
+function normalizeDeviceAttributes(value) {
+  return normalizeDeviceAttributeObject(value, "attributes", /* @__PURE__ */ new WeakSet());
+}
+function normalizeDeviceAttributeValue(value, sourceDescription, seenValues) {
+  if (value === null) {
+    return null;
+  }
+  if (typeof value === "string" || typeof value === "boolean") {
+    return value;
+  }
+  if (typeof value === "number") {
+    if (!Number.isFinite(value)) {
+      failWithBubblesError(`${sourceDescription} must be a finite number.`);
+    }
+    return value;
+  }
+  if (Array.isArray(value)) {
+    if (seenValues.has(value)) {
+      failWithBubblesError(`${sourceDescription} must not contain cycles.`);
+    }
+    seenValues.add(value);
+    const normalizedValue = value.map(
+      (entry, index) => normalizeDeviceAttributeValue(
+        entry,
+        `${sourceDescription}[${index}]`,
+        seenValues
+      )
+    );
+    seenValues.delete(value);
+    return normalizedValue;
+  }
+  if (isPlainObject(value)) {
+    return normalizeDeviceAttributeObject(
+      value,
+      sourceDescription,
+      seenValues
+    );
+  }
+  failWithBubblesError(
+    `${sourceDescription} must be a JSON-compatible value.`
+  );
+}
+function normalizeDeviceAttributeObject(value, sourceDescription, seenValues) {
+  if (!isPlainObject(value)) {
+    failWithBubblesError('"attributes" must be an object.');
+  }
+  const valuePrototype = Object.getPrototypeOf(value);
+  if (valuePrototype !== Object.prototype && valuePrototype !== null) {
+    failWithBubblesError(
+      `${sourceDescription} must be a JSON-compatible object.`
+    );
+  }
+  if (Object.getOwnPropertySymbols(value).length > 0) {
+    failWithBubblesError(
+      `${sourceDescription} must not contain symbol keys.`
+    );
+  }
+  if (seenValues.has(value)) {
+    failWithBubblesError(`${sourceDescription} must not contain cycles.`);
+  }
+  seenValues.add(value);
+  const normalizedValue = {};
+  for (const [attributeName, attributeValue] of Object.entries(value)) {
+    normalizedValue[attributeName] = normalizeDeviceAttributeValue(
+      attributeValue,
+      `${sourceDescription}.${attributeName}`,
+      seenValues
+    );
+  }
+  seenValues.delete(value);
+  return normalizedValue;
+}
 function extractDeviceIdFromDeviceResponse(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     return null;
@@ -574,6 +648,18 @@ async function updateBubblesDevice(options) {
     throwAppAuthenticationError(error);
   }
 }
+async function updateBubblesDeviceAttributes(options) {
+  const client = resolveDeviceClient(options);
+  try {
+    return await client.updateDeviceAttributes(
+      normalizeIdentifier(options.deviceId, "deviceId"),
+      normalizeDeviceAttributes(options.attributes),
+      withAppKeyHeader(options.appKey, options.requestOptions)
+    );
+  } catch (error) {
+    throwAppAuthenticationError(error);
+  }
+}
 async function syncBubblesDevice(options) {
   const client = resolveDeviceClient(options);
   if (options.deviceId !== null) {
@@ -1332,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);
@@ -1367,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
@@ -1383,7 +1470,7 @@ async function getDeviceToken(options) {
   }
   return {
     platform: registrationState.platform,
-    tokenType: "fcm",
+    tokenType: "fid",
     token: registrationState.token
   };
 }
@@ -1392,6 +1479,73 @@ async function getFCMToken(options) {
   return tokenResult.token;
 }
 
+// src/runtime/device-attributes.ts
+var Application = __toESM(require("expo-application"));
+var Device = __toESM(require("expo-device"));
+function compactAttributes(attributes) {
+  return Object.fromEntries(
+    Object.entries(attributes).filter((entry) => entry[1] !== null && entry[1] !== void 0)
+  );
+}
+function addSection(attributes, name, section) {
+  const compactedSection = compactAttributes(section);
+  if (Object.keys(compactedSection).length > 0) {
+    attributes[name] = compactedSection;
+  }
+}
+function getDeviceTypeName(deviceType2) {
+  switch (deviceType2) {
+    case Device.DeviceType.PHONE:
+      return "phone";
+    case Device.DeviceType.TABLET:
+      return "tablet";
+    case Device.DeviceType.DESKTOP:
+      return "desktop";
+    case Device.DeviceType.TV:
+      return "tv";
+    case Device.DeviceType.UNKNOWN:
+      return "unknown";
+    default:
+      return void 0;
+  }
+}
+async function getDeviceType() {
+  if (Device.deviceType !== null && Device.deviceType !== void 0) {
+    return Device.deviceType;
+  }
+  try {
+    return await Device.getDeviceTypeAsync();
+  } catch {
+    return null;
+  }
+}
+async function collectBubblesDeviceAttributes() {
+  const attributes = {};
+  const deviceType2 = await getDeviceType();
+  addSection(attributes, "device", {
+    manufacturer: Device.manufacturer,
+    brand: Device.brand,
+    modelName: Device.modelName,
+    modelId: typeof Device.modelId === "string" ? Device.modelId : void 0,
+    deviceName: Device.deviceName,
+    deviceType: getDeviceTypeName(deviceType2),
+    totalMemory: Device.totalMemory
+  });
+  addSection(attributes, "os", {
+    name: Device.osName,
+    version: Device.osVersion,
+    buildId: Device.osBuildId,
+    platformApiLevel: Device.platformApiLevel
+  });
+  addSection(attributes, "app", {
+    applicationId: Application.applicationId,
+    applicationName: Application.applicationName,
+    nativeApplicationVersion: Application.nativeApplicationVersion,
+    nativeBuildVersion: Application.nativeBuildVersion
+  });
+  return attributes;
+}
+
 // src/runtime/BubblesNotificationsProvider.tsx
 var import_react3 = require("react");
 
@@ -1530,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";
@@ -1550,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) => {
@@ -1568,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();
@@ -1594,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 {
@@ -1635,6 +1767,20 @@ function buildRuntimeSnapshot(deviceId, registrationState) {
     notificationsEnabled: registrationState.notificationsEnabled
   };
 }
+async function syncBubblesDeviceAttributesBestEffort(apiBaseUrl, appKey, deviceId) {
+  try {
+    const attributes = await collectBubblesDeviceAttributes();
+    if (Object.keys(attributes).length > 0) {
+      await updateBubblesDeviceAttributes({
+        apiBaseUrl,
+        appKey,
+        deviceId,
+        attributes
+      });
+    }
+  } catch {
+  }
+}
 async function syncDeviceRegistrationState(options) {
   const apiBaseUrl = getRequiredNonEmptyString3(options.apiBaseUrl, "apiBaseUrl");
   const appKey = getRequiredNonEmptyString3(options.appKey, "appKey");
@@ -1645,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,
@@ -1661,6 +1807,13 @@ async function syncDeviceRegistrationState(options) {
     });
     const nextDeviceId = syncResult.deviceId ?? options.deviceId;
     storeDeviceId(nextDeviceId);
+    if (nextDeviceId) {
+      await syncBubblesDeviceAttributesBestEffort(
+        apiBaseUrl,
+        appKey,
+        nextDeviceId
+      );
+    }
     return {
       ...snapshot,
       action: syncResult.action,
@@ -1848,6 +2001,7 @@ function BubblesNotificationsProvider(props) {
   const [state, setState] = (0, import_react3.useState)(getInitialRuntimeState);
   const { enqueueOperation, isMountedRef } = useBubblesRuntimeOperationQueue(setState);
   const lastAutomaticSyncSignatureRef = (0, import_react3.useRef)(null);
+  const currentDeviceIdRef = (0, import_react3.useRef)(state.deviceId);
   const previousUserIdRef = (0, import_react3.useRef)(normalizedUserId);
   const buildAutomaticSyncSignature = (0, import_react3.useCallback)((deviceId) => {
     return getAutomaticSyncSignature({
@@ -1873,6 +2027,9 @@ function BubblesNotificationsProvider(props) {
       clearBubblesForegroundPresentation();
     };
   }, [isMountedRef]);
+  (0, import_react3.useEffect)(() => {
+    currentDeviceIdRef.current = state.deviceId;
+  }, [state.deviceId]);
   (0, import_react3.useEffect)(() => {
     let isCancelled = false;
     void (async () => {
@@ -1940,6 +2097,7 @@ function BubblesNotificationsProvider(props) {
         appVersion,
         deviceId: storedDeviceId
       });
+      currentDeviceIdRef.current = result.deviceId;
       return getRuntimeStateUpdate(result);
     });
   }, [
@@ -1973,9 +2131,10 @@ function BubblesNotificationsProvider(props) {
         userId: normalizedUserId,
         aliasing,
         appVersion,
-        deviceId: state.deviceId,
+        deviceId: currentDeviceIdRef.current,
         registrationOptions: options
       });
+      currentDeviceIdRef.current = result.deviceId;
       if (result.deviceId !== null) {
         lastAutomaticSyncSignatureRef.current = buildAutomaticSyncSignature(
           result.deviceId
@@ -1984,8 +2143,33 @@ function BubblesNotificationsProvider(props) {
       return getRuntimeStateUpdate(result);
     });
   }
+  function addDeviceAttribute(name, value) {
+    return enqueueOperation(async () => {
+      const attributeName = getRequiredNonEmptyString(name, "attributeName");
+      if (value === void 0) {
+        failWithBubblesError(
+          '"addDeviceAttribute()" requires "value" to be a JSON-compatible value.'
+        );
+      }
+      const deviceId = currentDeviceIdRef.current;
+      if (deviceId === null) {
+        failWithBubblesError(
+          '"addDeviceAttribute()" requires a backend "deviceId" before attributes can be synced.'
+        );
+      }
+      await updateBubblesDeviceAttributes({
+        apiBaseUrl,
+        appKey,
+        deviceId,
+        attributes: {
+          [attributeName]: value
+        }
+      });
+    });
+  }
   const contextValue = {
     registerDevice,
+    addDeviceAttribute,
     deviceId: state.deviceId,
     pushToken: state.pushToken,
     tokenType: state.tokenType,
@@ -2022,6 +2206,7 @@ function useBubblesNotifications() {
   buildCreateDevicePayload,
   buildStoredDeliveryStatusEventKey,
   buildUpdateDevicePayload,
+  collectBubblesDeviceAttributes,
   createBubblesDevice,
   createBubblesDeviceClient,
   createStoredDeliveryStatusEvent,
@@ -2056,5 +2241,6 @@ function useBubblesNotifications() {
   storeDeviceState,
   syncBubblesDevice,
   updateBubblesDevice,
+  updateBubblesDeviceAttributes,
   useBubblesNotifications
 });

package/dist/index.mjs

@@ -47,36 +47,33 @@ import {
   storeDeviceId,
   storeDeviceState,
   syncBubblesDevice,
-  updateBubblesDevice
-} from "./chunk-6NPXFGQX.mjs";
+  updateBubblesDevice,
+  updateBubblesDeviceAttributes
+} 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);
@@ -91,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
@@ -107,7 +104,7 @@ async function getDeviceToken(options) {
   }
   return {
     platform: registrationState.platform,
-    tokenType: "fcm",
+    tokenType: "fid",
     token: registrationState.token
   };
 }
@@ -116,6 +113,73 @@ async function getFCMToken(options) {
   return tokenResult.token;
 }
 
+// src/runtime/device-attributes.ts
+import * as Application from "expo-application";
+import * as Device from "expo-device";
+function compactAttributes(attributes) {
+  return Object.fromEntries(
+    Object.entries(attributes).filter((entry) => entry[1] !== null && entry[1] !== void 0)
+  );
+}
+function addSection(attributes, name, section) {
+  const compactedSection = compactAttributes(section);
+  if (Object.keys(compactedSection).length > 0) {
+    attributes[name] = compactedSection;
+  }
+}
+function getDeviceTypeName(deviceType2) {
+  switch (deviceType2) {
+    case Device.DeviceType.PHONE:
+      return "phone";
+    case Device.DeviceType.TABLET:
+      return "tablet";
+    case Device.DeviceType.DESKTOP:
+      return "desktop";
+    case Device.DeviceType.TV:
+      return "tv";
+    case Device.DeviceType.UNKNOWN:
+      return "unknown";
+    default:
+      return void 0;
+  }
+}
+async function getDeviceType() {
+  if (Device.deviceType !== null && Device.deviceType !== void 0) {
+    return Device.deviceType;
+  }
+  try {
+    return await Device.getDeviceTypeAsync();
+  } catch {
+    return null;
+  }
+}
+async function collectBubblesDeviceAttributes() {
+  const attributes = {};
+  const deviceType2 = await getDeviceType();
+  addSection(attributes, "device", {
+    manufacturer: Device.manufacturer,
+    brand: Device.brand,
+    modelName: Device.modelName,
+    modelId: typeof Device.modelId === "string" ? Device.modelId : void 0,
+    deviceName: Device.deviceName,
+    deviceType: getDeviceTypeName(deviceType2),
+    totalMemory: Device.totalMemory
+  });
+  addSection(attributes, "os", {
+    name: Device.osName,
+    version: Device.osVersion,
+    buildId: Device.osBuildId,
+    platformApiLevel: Device.platformApiLevel
+  });
+  addSection(attributes, "app", {
+    applicationId: Application.applicationId,
+    applicationName: Application.applicationName,
+    nativeApplicationVersion: Application.nativeApplicationVersion,
+    nativeBuildVersion: Application.nativeBuildVersion
+  });
+  return attributes;
+}
+
 // src/runtime/BubblesNotificationsProvider.tsx
 import { useCallback as useCallback2, useEffect, useRef as useRef2, useState } from "react";
 
@@ -255,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";
@@ -278,7 +342,7 @@ function observeBubblesForegroundMessages() {
     };
   }
   const unsubscribe = onMessage(
-    getMessaging2(),
+    getMessaging(),
     (remoteMessage) => {
       void handleFirebaseForegroundMessage(remoteMessage).catch(
         (error) => {
@@ -295,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();
@@ -321,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 {
@@ -362,6 +404,20 @@ function buildRuntimeSnapshot(deviceId, registrationState) {
     notificationsEnabled: registrationState.notificationsEnabled
   };
 }
+async function syncBubblesDeviceAttributesBestEffort(apiBaseUrl, appKey, deviceId) {
+  try {
+    const attributes = await collectBubblesDeviceAttributes();
+    if (Object.keys(attributes).length > 0) {
+      await updateBubblesDeviceAttributes({
+        apiBaseUrl,
+        appKey,
+        deviceId,
+        attributes
+      });
+    }
+  } catch {
+  }
+}
 async function syncDeviceRegistrationState(options) {
   const apiBaseUrl = getRequiredNonEmptyString2(options.apiBaseUrl, "apiBaseUrl");
   const appKey = getRequiredNonEmptyString2(options.appKey, "appKey");
@@ -372,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,
@@ -388,6 +444,13 @@ async function syncDeviceRegistrationState(options) {
     });
     const nextDeviceId = syncResult.deviceId ?? options.deviceId;
     storeDeviceId(nextDeviceId);
+    if (nextDeviceId) {
+      await syncBubblesDeviceAttributesBestEffort(
+        apiBaseUrl,
+        appKey,
+        nextDeviceId
+      );
+    }
     return {
       ...snapshot,
       action: syncResult.action,
@@ -578,6 +641,7 @@ function BubblesNotificationsProvider(props) {
   const [state, setState] = useState(getInitialRuntimeState);
   const { enqueueOperation, isMountedRef } = useBubblesRuntimeOperationQueue(setState);
   const lastAutomaticSyncSignatureRef = useRef2(null);
+  const currentDeviceIdRef = useRef2(state.deviceId);
   const previousUserIdRef = useRef2(normalizedUserId);
   const buildAutomaticSyncSignature = useCallback2((deviceId) => {
     return getAutomaticSyncSignature({
@@ -603,6 +667,9 @@ function BubblesNotificationsProvider(props) {
       clearBubblesForegroundPresentation();
     };
   }, [isMountedRef]);
+  useEffect(() => {
+    currentDeviceIdRef.current = state.deviceId;
+  }, [state.deviceId]);
   useEffect(() => {
     let isCancelled = false;
     void (async () => {
@@ -670,6 +737,7 @@ function BubblesNotificationsProvider(props) {
         appVersion,
         deviceId: storedDeviceId
       });
+      currentDeviceIdRef.current = result.deviceId;
       return getRuntimeStateUpdate(result);
     });
   }, [
@@ -703,9 +771,10 @@ function BubblesNotificationsProvider(props) {
         userId: normalizedUserId,
         aliasing,
         appVersion,
-        deviceId: state.deviceId,
+        deviceId: currentDeviceIdRef.current,
         registrationOptions: options
       });
+      currentDeviceIdRef.current = result.deviceId;
       if (result.deviceId !== null) {
         lastAutomaticSyncSignatureRef.current = buildAutomaticSyncSignature(
           result.deviceId
@@ -714,8 +783,33 @@ function BubblesNotificationsProvider(props) {
       return getRuntimeStateUpdate(result);
     });
   }
+  function addDeviceAttribute(name, value) {
+    return enqueueOperation(async () => {
+      const attributeName = getRequiredNonEmptyString(name, "attributeName");
+      if (value === void 0) {
+        failWithBubblesError(
+          '"addDeviceAttribute()" requires "value" to be a JSON-compatible value.'
+        );
+      }
+      const deviceId = currentDeviceIdRef.current;
+      if (deviceId === null) {
+        failWithBubblesError(
+          '"addDeviceAttribute()" requires a backend "deviceId" before attributes can be synced.'
+        );
+      }
+      await updateBubblesDeviceAttributes({
+        apiBaseUrl,
+        appKey,
+        deviceId,
+        attributes: {
+          [attributeName]: value
+        }
+      });
+    });
+  }
   const contextValue = {
     registerDevice,
+    addDeviceAttribute,
     deviceId: state.deviceId,
     pushToken: state.pushToken,
     tokenType: state.tokenType,
@@ -751,6 +845,7 @@ export {
   buildCreateDevicePayload,
   buildStoredDeliveryStatusEventKey,
   buildUpdateDevicePayload,
+  collectBubblesDeviceAttributes,
   createBubblesDevice,
   createBubblesDeviceClient,
   createStoredDeliveryStatusEvent,
@@ -785,5 +880,6 @@ export {
   storeDeviceState,
   syncBubblesDevice,
   updateBubblesDevice,
+  updateBubblesDeviceAttributes,
   useBubblesNotifications
 };

package/dist/register-task.mjs

@@ -1,6 +1,6 @@
 import {
   registerBubblesBackgroundHandlers
-} from "./chunk-6NPXFGQX.mjs";
+} from "./chunk-3BAGWXHY.mjs";
 
 // src/register-task.ts
 registerBubblesBackgroundHandlers();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fishonfire/bubbles-expo",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "Expo config plugin, explicit background registration API, and React provider for Bubbles notifications.",
   "license": "MIT",
   "main": "./dist/index.js",
@@ -68,8 +68,10 @@
     }
   },
   "dependencies": {
+    "expo-application": "~57.0.2",
     "@fishonfire/bubbles-js": "0.1.0",
     "expo-constants": "~57.0.16",
+    "expo-device": "~57.0.1",
     "expo-file-system": "~57.0.6"
   },
   "devDependencies": {

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;