doopush-react-native-sdk 0.1.2 → 0.5.1

package/README.md

@@ -1,48 +1,35 @@
 # DooPush React Native SDK
 
-> **v0.1.1 alpha** —— 最小 API surface，端到端真实可用。
-> 仅支持 FCM (Android) + APNs (iOS)。OEM 通道、React Hooks 在 v0.5.0 beta。
+> React Native / Expo SDK，支持 APNs、FCM、Android 6 类 OEM 通道、Hooks、通知事件、WebSocket Gateway、角标、统计和第三方共存控制。
 
 [DooPush](https://doopush.com) 推送通知服务的 React Native SDK。基于 Expo Modules API 实现，可在 Expo（managed / prebuild）和 bare React Native 项目里使用。
 
-## v0.1.x alpha 提供什么
+## 功能
 
 - ✅ `DooPush.configure(config)`
-- ✅ `DooPush.register()` —— iOS APNs / Android FCM 自动流程
-- ✅ `DooPush.registerWithToken(token, vendor)` —— 调用方已经有 token 时（如配合 expo-notifications 共存）
-- 🟡 `DooPush.getDeviceToken()` / `getDeviceId()` —— 当前都返回 `null`，原生 getter 还没暴露，v0.5.0 上线
-- ✅ 事件监听：`addRegisterListener`、`addRegisterErrorListener`、`addMessageListener`
-- ✅ Config 插件：FCM 厂商（google-services.json）、iOS entitlement
-- ✅ Android Active 模式：DooPush 接管通知 UI；与 `expo-notifications` 通过广播 relay 共存（opt-in，JS bridge 在 v0.5.0）
-
-### v0.1 已知限制
-
-- `register()` 返回 `{token, deviceId, vendor}`，但 Android 端 `deviceId` 当前是空字符串（服务端 deviceId 还没在 bridge 层捕获，v0.5.0 修）。`token` 和 `vendor` 字段是对的。
-- `getDeviceToken()` / `getDeviceId()` 在 Android 上一直返回 `null`（底层 SDK 还没公开 getter）。
-
-## v0.1 不包含（v0.5.0+ 才有）
-
-- React Hooks（`useDooPush`、`useDooPushToken`）
-- OEM 通道（HMS / Honor / Xiaomi / OPPO / VIVO / Meizu）
-- WebSocket gateway 的 JS API
-- 统计 / 角标 / 通道相关的 JS API
-- npm 发布（当前用 git tag）
+- ✅ `DooPush.register()` —— iOS APNs / Android FCM 或 OEM 自动流程
+- ✅ `DooPush.registerWithToken(token, vendor)` —— 调用方已有 token 时的 passive 模式
+- ✅ `DooPush.getDeviceToken()` / `getDeviceId()` / `getDeviceInfo()` —— iOS 与 Android 均返回原生 SDK 缓存值
+- ✅ `DooPush.updateDeviceInfo()` / `reportStatistics()` / `checkPermissionStatus()`
+- ✅ 角标 API：`setBadge()` / `clearBadge()` / `getBadge()`
+- ✅ React Hooks：`useDooPush()` / `useDooPushMessage()`
+- ✅ 事件监听：注册、注册错误、消息、通知点击、通知打开、Gateway 状态
+- ✅ 第三方共存控制：`setNotificationManagementMode`、`setExpoNotificationRelayEnabled`、`setNotificationDisplayEnabled`
+- ✅ Config Plugin：iOS entitlement / background mode、Android FCM/HMS/Honor 配置文件、OEM 配置文件生成、Gradle plugin/dependency 注入和 manifest placeholders 合并
+- ✅ Android OEM 通道：HMS / Honor / Xiaomi / OPPO / VIVO / Meizu
 
 ## 前置条件
 
-- iOS 原生 SDK ≥ **1.1.1**（SPM tag `v1.1.1` of `doopush-ios-sdk`，或路径方式本地引用）
-- Android 原生 SDK ≥ **1.1.0**（JitPack `com.github.doopush:doopush-android-sdk:v1.1.0`，或本地 mavenLocal）
+- iOS 原生 SDK ≥ **1.2.0**（monorepo 本地开发可路径引用未发布版本）
+- Android 原生 SDK ≥ **1.2.0**（monorepo 本地开发可走 mavenLocal 用未发布版本）
 - Expo SDK 50+（或 RN 0.73+ bare）。**新项目推荐 Expo SDK 54+**
 
-## 快速安装（公开发布后）
+## 快速安装
 
 ```bash
 npx expo install doopush-react-native-sdk
 ```
 
-> v0.1.x alpha **暂未发到 npm**，公开仓走 git tag：
-> `npm install github:doopush/doopush-react-native-sdk#v0.1.1`
-
 `app.json` 配 plugin：
 
 ```json
@@ -58,7 +45,15 @@ npx expo install doopush-react-native-sdk
           "ios": { "mode": "production" },
           "android": {
             "vendors": {
-              "fcm": { "googleServicesFile": "./google-services.json" }
+              "fcm": { "googleServicesFile": "./google-services.json" },
+              "hms": { "agconnectServicesFile": "./agconnect-services.json" },
+              "honor": {
+                "mcsServicesFile": "./mcs-services.json"
+              },
+              "xiaomi": { "appId": "mi_app_id", "appKey": "mi_app_key" },
+              "oppo": { "appKey": "oppo_app_key", "appSecret": "oppo_app_secret" },
+              "vivo": { "appId": "vivo_app_id", "apiKey": "vivo_api_key" },
+              "meizu": { "appId": "meizu_app_id", "appKey": "meizu_app_key" }
             }
           }
         }
@@ -68,6 +63,8 @@ npx expo install doopush-react-native-sdk
 }
 ```
 
+> OEM 配置支持两种方式：传 `servicesFile`/`mcsServicesFile`/`agconnectServicesFile` 复制厂商 JSON；或对 Xiaomi / OPPO / VIVO / Meizu / Honor 传内联凭证，prebuild 时会生成对应 `android/app/src/main/assets/*-services.json`。HMS 仍需 `agconnect-services.json` 文件。
+
 ```bash
 npx expo prebuild --clean
 npx expo run:android   # 或 run:ios
@@ -76,10 +73,12 @@ npx expo run:android   # 或 run:ios
 ## 用法
 
 ```tsx
-import { useEffect, useState } from 'react';
-import { DooPush, type DooPushMessage } from 'doopush-react-native-sdk';
+import { useEffect } from 'react';
+import { DooPush, useDooPush, type DooPushMessage } from 'doopush-react-native-sdk';
 
 export default function App() {
+  const { token, deviceId, register, lastMessage, error } = useDooPush();
+
   useEffect(() => {
     DooPush.configure({
       appId: 'your_app_id',
@@ -88,19 +87,32 @@ export default function App() {
     const sub = DooPush.addMessageListener((m: DooPushMessage) => {
       console.log('收到推送', m);
     });
-    return () => sub.remove();
+    const clickSub = DooPush.addNotificationClickListener((m) => {
+      console.log('点击推送', m);
+    });
+    return () => { sub.remove(); clickSub.remove(); };
   }, []);
 
   const handleRegister = async () => {
     try {
-      const { token, deviceId } = await DooPush.register();
+      const { token, deviceId } = await register();
       console.log('注册成功', token, deviceId);
     } catch (e) {
       console.error('注册失败', e);
     }
   };
 
-  // ...
+  // 也可以直接使用 hook 暴露的状态：token / deviceId / lastMessage / error
+  console.log({ token, deviceId, lastMessage, error });
+}
+
+// 常用补充 API：
+async function maintenance() {
+  await DooPush.setBadge(3);
+  await DooPush.clearBadge();
+  await DooPush.reportStatistics();
+  const permission = await DooPush.checkPermissionStatus();
+  console.log(permission);
 }
 ```
 
@@ -144,9 +156,13 @@ sdk/react-native/
 默认兼容。iOS 上 DooPush 接管 `UNUserNotificationCenterDelegate` 但走 delegate-forwarding，`expo-notifications` 的监听依然能收到。Android 上 DooPush 接管 `FirebaseMessagingService`，如果你也想让 `expo-notifications` 收到 FCM 消息，调（v0.5.0+）：
 
 ```ts
+DooPush.setNotificationManagementMode('active');
+// relay 是独立开关；setNotificationManagementMode 不会覆盖该值。
 DooPush.setExpoNotificationRelayEnabled(true);
 ```
 
+> `setNotificationDisplayEnabled` 仅控制 Android FCM 由 DooPush 自管展示通知的开关；iOS 端是 no-op。`setExpoNotificationRelayEnabled` 是独立开关，不会被 active/passive 模式切换重置。若 iOS 需要让位给其它通知库，请使用 `setNotificationManagementMode('passive')`。
+
 ### 与 `@react-native-firebase/messaging`
 
 **二选一** —— 两个库都声明 `FirebaseMessagingService`，manifest merger 只能留一个。如果你已经在用 `react-native-firebase`，就在 DooPush plugin 里**省略 fcm 厂商**，用 `react-native-firebase` 拿 token 后再交给 DooPush：
@@ -165,6 +181,22 @@ MIT
 
 ## CHANGELOG
 
+### v0.5.1
+- **Fix (Android)**：`expo prebuild` 流程缺失 `google-services` Gradle 插件 classpath 注入，原生工程 sync 失败；config plugin 现在补齐 `withRootBuildGradle` / `withSettingsGradle` / `withGradleProperties`，prebuild 全流程跑通。
+- **Fix (config plugin)**：`zod` 等 plugin 运行时依赖错误地放在 `devDependencies` 里，用户 `npx expo prebuild` 时 plugin 解析失败；改为生产依赖。
+- **Fix (iOS)**：`normalizePermissionStatus` 在 `AsyncFunction` 闭包里少了 `self.` 前缀，调用 permission 相关 API 时崩溃；同步修复。
+- **Dev**：example app 的 Podfile 在 monorepo 中可自动指向同仓库 `sdk/ios/DooPushSDK`，便于联动调试本地原生 SDK。
+- **Install**：默认 npm dist-tag 改为 `latest`（不再要求 `@beta`），`npm install doopush-react-native-sdk` 直接安装最新版。
+
+### v0.5.0
+- **能力补齐**：Android `register()` / `registerWithToken()` 返回真实 `deviceId`，`getDeviceToken()` / `getDeviceId()` / `getDeviceInfo()` 接入原生缓存。
+- **新增 Hooks**：`useDooPush()`、`useDooPushMessage()`。
+- **新增 API**：角标、权限状态、设备信息更新、统计上报。
+- **新增事件**：通知点击、通知打开、Gateway open/closed/error；`connectGateway()` 在缺少 token 时会拒绝。
+- **共存控制**：新增 active/passive 管理模式、Expo relay、通知展示开关。
+- **Config Plugin**：扩展 Android OEM vendor 配置入口；支持内联凭证生成 services JSON，HMS/Honor Gradle plugin 注入，HMS/Honor services 文件同时复制到 app 根目录和 assets。
+- **依赖底座**：iOS / Android 原生 SDK 对齐到 v1.2.0。
+
 ### v0.1.2
 - **chore**：发版流水线连通性测试（无功能变更）。验证 monorepo `sync-rn-sdk.yml` → `doopush-react-native-sdk` 公仓 → `auto-publish-release.yml` → GitHub Release + npm publish 全链路。dist-tag 应解析为 `alpha`（0.1.x ≤ 0.4.x）。
 

package/android/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 group = 'com.doopush.reactnative'
-version = '0.1.0'
+version = '0.5.0'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -18,15 +18,15 @@ android {
         minSdkVersion safeExtGet("minSdkVersion", 26)
         targetSdkVersion safeExtGet("targetSdkVersion", 34)
         versionCode 1
-        versionName "0.1.0"
+        versionName "0.5.0"
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
@@ -39,10 +39,12 @@ repositories {
 }
 
 dependencies {
-    // DooPush native Android SDK v1.1.0+
+    // RN bridge directly uses NotificationManagerCompat / ContextCompat for permission checks.
+    implementation 'androidx.core:core-ktx:1.12.0'
+    // DooPush native Android SDK v1.2.0+
     // During v0.1 alpha dev: rely on mavenLocal (./gradlew :lib:publishToMavenLocal in sdk/android/DooPushSDK).
     // Once published, this resolves from JitPack via the maven{} block above.
-    implementation 'com.github.doopush:doopush-android-sdk:1.1.+'
+    implementation 'com.doopush:android-sdk:1.2.0'
 
     // FCM (transitive via DooPush AAR's runtime deps for FCM, but explicit here for clarity).
     implementation platform('com.google.firebase:firebase-bom:32.7.0')

package/android/src/main/java/com/doopush/reactnative/DooPushReactNativeSDKModule.kt

@@ -1,9 +1,15 @@
 package com.doopush.reactnative
 
+import android.Manifest
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.core.app.NotificationManagerCompat
+import androidx.core.content.ContextCompat
 import com.doopush.sdk.DooPushCallback
 import com.doopush.sdk.DooPushManager
 import com.doopush.sdk.DooPushNotificationHandler
 import com.doopush.sdk.DooPushRegisterCallback
+import com.doopush.sdk.DooPushRegisterResult
 import com.doopush.sdk.models.DooPushError
 import com.doopush.sdk.models.PushMessage
 import expo.modules.kotlin.Promise
@@ -12,18 +18,27 @@ import expo.modules.kotlin.modules.ModuleDefinition
 
 /**
  * DooPush React Native SDK — Android bridge
- * v0.1.0 alpha
+ * v0.5.0
  *
  * Mode: ACTIVE (default) — DooPush owns FCM display via DooPushFirebaseMessagingService.
- * Coexistence with expo-notifications/react-native-firebase is via the relay broadcast
- * (opt-in by host app calling setExpoNotificationRelayEnabled(true) from JS — not exposed in v0.1).
+ * Coexistence with expo-notifications/react-native-firebase is exposed through
+ * notification-management / relay APIs.
  */
 class DooPushReactNativeSDKModule : Module(), DooPushCallback {
 
     override fun definition() = ModuleDefinition {
         Name("DooPushReactNativeSDK")
 
-        Events("onRegister", "onRegisterError", "onMessage")
+        Events(
+            "onRegister",
+            "onRegisterError",
+            "onMessage",
+            "onNotificationClick",
+            "onNotificationOpen",
+            "onGatewayOpen",
+            "onGatewayClosed",
+            "onGatewayError"
+        )
 
         OnCreate {
             DooPushManager.getInstance().setCallback(this@DooPushReactNativeSDKModule)
@@ -50,17 +65,20 @@ class DooPushReactNativeSDKModule : Module(), DooPushCallback {
             DooPushManager.getInstance().registerForPushNotifications(
                 object : DooPushRegisterCallback {
                     override fun onSuccess(token: String) {
+                        // Compatibility fallback for older native SDK callback dispatch.
                         promise.resolve(mapOf(
                             "token" to token,
-                            "deviceId" to (DooPushManager.getInstance().run {
-                                // Try to read deviceId via reflection / public getter; v1.1.0 doesn't expose
-                                // a public getDeviceId(), so we fall back to empty string for v0.1.0.
-                                // TODO P3: expose getDeviceId() on Android Manager parity with iOS.
-                                ""
-                            }),
+                            "deviceId" to (DooPushManager.getInstance().getDeviceId() ?: ""),
                             "vendor" to currentVendor()
                         ))
                     }
+                    override fun onSuccess(result: DooPushRegisterResult) {
+                        promise.resolve(mapOf(
+                            "token" to result.token,
+                            "deviceId" to result.deviceId,
+                            "vendor" to normalizeVendor(result.vendor)
+                        ))
+                    }
                     override fun onError(error: DooPushError) {
                         promise.reject("E_REGISTER", error.message ?: "register failed", null)
                     }
@@ -75,7 +93,10 @@ class DooPushReactNativeSDKModule : Module(), DooPushCallback {
                 vendor = vendor,
                 callback = object : DooPushRegisterCallback {
                     override fun onSuccess(t: String) {
-                        promise.resolve(mapOf("deviceId" to ""))  // TODO P3: real deviceId
+                        promise.resolve(mapOf("deviceId" to (DooPushManager.getInstance().getDeviceId() ?: "")))
+                    }
+                    override fun onSuccess(result: DooPushRegisterResult) {
+                        promise.resolve(mapOf("deviceId" to result.deviceId))
                     }
                     override fun onError(error: DooPushError) {
                         promise.reject("E_REGISTER", error.message ?: "register failed", null)
@@ -86,13 +107,97 @@ class DooPushReactNativeSDKModule : Module(), DooPushCallback {
 
         // ── token getters ───────────────────────────────────────────────
         AsyncFunction("getDeviceToken") { ->
-            // Android SDK v1.1.0 doesn't expose a public getDeviceToken() — return null in v0.1.
-            // TODO P3: add public getter on Android Manager and wire here.
-            null as String?
+            DooPushManager.getInstance().getDeviceToken()
         }
 
         AsyncFunction("getDeviceId") { ->
-            null as String?  // same TODO
+            DooPushManager.getInstance().getDeviceId()
+        }
+
+        AsyncFunction("getDeviceInfo") { ->
+            DooPushManager.getInstance().getDeviceInfo()?.let { deviceInfo ->
+                mapOf(
+                    "platform" to deviceInfo.platform,
+                    "channel" to normalizeVendor(deviceInfo.channel),
+                    "bundleId" to deviceInfo.bundleId,
+                    "brand" to deviceInfo.brand,
+                    "model" to deviceInfo.model,
+                    "systemVersion" to deviceInfo.systemVersion,
+                    "appVersion" to deviceInfo.appVersion,
+                    "userAgent" to deviceInfo.userAgent
+                )
+            }
+        }
+
+        AsyncFunction("updateDeviceInfo") { promise: Promise ->
+            DooPushManager.getInstance().updateDeviceInfo { success, error ->
+                if (success) {
+                    promise.resolve(null)
+                } else {
+                    promise.reject("E_UPDATE_DEVICE_INFO", error?.message ?: "updateDeviceInfo failed", null)
+                }
+            }
+        }
+
+        AsyncFunction("reportStatistics") { ->
+            DooPushManager.getInstance().reportStatistics()
+        }
+
+        AsyncFunction("checkPermissionStatus") { ->
+            checkPermissionStatus()
+        }
+
+        AsyncFunction("setBadge") { count: Int, promise: Promise ->
+            if (count < 0) {
+                promise.reject("E_BADGE", "badge count must be >= 0", null)
+            } else {
+                promise.resolve(DooPushManager.getInstance().setBadgeCount(count))
+            }
+        }
+
+        AsyncFunction("clearBadge") { ->
+            DooPushManager.getInstance().clearBadge()
+        }
+
+        AsyncFunction("getBadge") { ->
+            DooPushManager.getInstance().getBadgeCount()
+        }
+
+        // ── notification management / coexistence ───────────────────────
+        Function("setNotificationManagementMode") { mode: String ->
+            val manager = DooPushManager.getInstance()
+            val resolved = when (mode.lowercase()) {
+                "active" -> DooPushManager.NotificationManagementMode.ACTIVE
+                "passive" -> DooPushManager.NotificationManagementMode.PASSIVE
+                else -> throw IllegalArgumentException("mode must be 'active' or 'passive'")
+            }
+            manager.setNotificationManagementMode(resolved)
+            // Keep relay independent: callers may opt into Expo relay in either mode.
+            manager.setFCMNotificationDisplayEnabled(
+                resolved == DooPushManager.NotificationManagementMode.ACTIVE
+            )
+        }
+
+        Function("setExpoNotificationRelayEnabled") { enabled: Boolean ->
+            DooPushManager.getInstance().setExpoNotificationRelayEnabled(enabled)
+        }
+
+        Function("setNotificationDisplayEnabled") { enabled: Boolean ->
+            DooPushManager.getInstance().setFCMNotificationDisplayEnabled(enabled)
+        }
+
+        AsyncFunction("connectGateway") { promise: Promise ->
+            if (DooPushManager.getInstance().getDeviceToken().isNullOrBlank()) {
+                promise.reject("E_GATEWAY", "device token is required before connecting gateway", null)
+            } else {
+                DooPushManager.getInstance().connectWebSocket()
+                promise.resolve(null)
+            }
+        }
+
+        AsyncFunction("disconnectGateway") { promise: Promise ->
+            DooPushManager.getInstance().disconnectWebSocket()
+            promise.resolve(null)
         }
     }
 
@@ -101,11 +206,19 @@ class DooPushReactNativeSDKModule : Module(), DooPushCallback {
     override fun onRegisterSuccess(token: String) {
         sendEvent("onRegister", mapOf(
             "token" to token,
-            "deviceId" to "",  // TODO P3
+            "deviceId" to (DooPushManager.getInstance().getDeviceId() ?: ""),
             "vendor" to currentVendor()
         ))
     }
 
+    override fun onRegisterSuccess(result: DooPushRegisterResult) {
+        sendEvent("onRegister", mapOf(
+            "token" to result.token,
+            "deviceId" to result.deviceId,
+            "vendor" to normalizeVendor(result.vendor)
+        ))
+    }
+
     override fun onRegisterError(error: DooPushError) {
         sendEvent("onRegisterError", mapOf(
             "code" to "E_REGISTER",
@@ -125,22 +238,69 @@ class DooPushReactNativeSDKModule : Module(), DooPushCallback {
         ))
     }
 
-    // The DooPushCallback interface (v1.1.0) has additional non-default abstract methods
-    // that the plan code didn't list. Implement them as no-ops for v0.1.0 — surfacing
-    // direct token-fetch results to JS isn't part of the v0.1 surface (the JS layer only
-    // consumes onRegister/onRegisterError/onMessage). v0.5.0 may surface these.
+    // Direct token-fetch callbacks are not part of the RN v0.5.0 surface; apps consume
+    // register/registerWithToken plus onRegister/onRegisterError/onMessage events.
     override fun onTokenReceived(token: String) {
-        // No-op: not surfaced in v0.1.0.
+        // No-op.
     }
 
     override fun onTokenError(error: DooPushError) {
-        // No-op: not surfaced in v0.1.0.
+        // No-op.
     }
 
     override fun onNotificationClick(notificationData: DooPushNotificationHandler.NotificationData) {
-        // v0.5.0 will surface this as onNotificationClick. For v0.1, ignored.
+        sendEvent("onNotificationClick", normalizeNotification(notificationData))
+    }
+
+    override fun onNotificationOpen(notificationData: DooPushNotificationHandler.NotificationData) {
+        sendEvent("onNotificationOpen", normalizeNotification(notificationData))
+    }
+
+    override fun onWebSocketOpen() {
+        sendEvent("onGatewayOpen", mapOf("connected" to true))
+    }
+
+    override fun onWebSocketClosed(code: Int, reason: String) {
+        sendEvent("onGatewayClosed", mapOf("code" to code, "reason" to reason))
+    }
+
+    override fun onWebSocketFailure(t: Throwable) {
+        sendEvent("onGatewayError", mapOf(
+            "code" to "E_GATEWAY",
+            "message" to (t.message ?: "WebSocket failure")
+        ))
+    }
+
+    private fun normalizeNotification(
+        notificationData: DooPushNotificationHandler.NotificationData
+    ): Map<String, Any?> = mapOf(
+        "vendor" to currentVendor(),
+        "title" to notificationData.title,
+        "body" to notificationData.body,
+        "pushLogId" to notificationData.pushLogId,
+        "dedupKey" to notificationData.dedupKey,
+        "data" to notificationData.payload.mapValues { it.value.toString() }
+    )
+
+    private fun currentVendor(): String =
+        normalizeVendor(DooPushManager.getInstance().getCurrentVendor() ?: "fcm")
+
+    private fun checkPermissionStatus(): String {
+        val context = appContext.reactContext ?: return "unknown"
+        val notificationsEnabled = NotificationManagerCompat.from(context).areNotificationsEnabled()
+        if (!notificationsEnabled) return "denied"
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            val granted = ContextCompat.checkSelfPermission(
+                context,
+                Manifest.permission.POST_NOTIFICATIONS
+            ) == PackageManager.PERMISSION_GRANTED
+            return if (granted) "authorized" else "denied"
+        }
+
+        return "authorized"
     }
 
-    /** Best-effort vendor inference for v0.1 (default fcm). v0.5.0 will read from active vendor state. */
-    private fun currentVendor(): String = "fcm"
+    private fun normalizeVendor(vendor: String): String =
+        if (vendor == "huawei") "hms" else vendor
 }

package/build/DooPush.d.ts

@@ -1,10 +1,11 @@
 import { Subscription } from 'expo-modules-core';
-import type { DooPushConfig, DooPushVendor, DooPushMessage } from './types';
+import type { DooPushConfig, DooPushVendor, DooPushMessage, DooPushNotificationManagementMode, DooPushGatewayOpenEvent, DooPushGatewayClosedEvent, DooPushGatewayErrorEvent, DooPushRegisterResult, DooPushDeviceInfo, DooPushPermissionStatus } from './types';
 import type { OnRegisterEvent, OnRegisterErrorEvent } from './events';
 /**
  * DooPush React Native SDK — imperative API
  *
- * v0.1.0 alpha — minimal surface: configure / register / token getters / event listeners
+ * v0.5.0 — registration, OEM channels, token/device getters, hooks,
+ * notification events, WebSocket gateway, badge, statistics, and coexistence controls.
  */
 /**
  * Configure the SDK. Call once per app launch, ideally in App entry point.
@@ -18,11 +19,7 @@ export declare function configure(config: DooPushConfig): void;
  * Returns the device token + DooPush deviceId on success.
  * Rejects if user denies permission or network fails.
  */
-export declare function register(): Promise<{
-    token: string;
-    deviceId: string;
-    vendor: DooPushVendor;
-}>;
+export declare function register(): Promise<DooPushRegisterResult>;
 /**
  * Register with a token already obtained externally (e.g. via expo-notifications
  * `getDevicePushTokenAsync()`). Skips SDK's internal permission/token flow.
@@ -34,7 +31,47 @@ export declare function registerWithToken(token: string, vendor?: DooPushVendor)
 export declare function getDeviceToken(): Promise<string | null>;
 /** Returns DooPush server-assigned deviceId (after register success), or null. */
 export declare function getDeviceId(): Promise<string | null>;
+/** Returns the current native SDK device information snapshot, or null before configure. */
+export declare function getDeviceInfo(): Promise<DooPushDeviceInfo | null>;
+/** Refresh device information on the DooPush server using the current token. */
+export declare function updateDeviceInfo(): Promise<void>;
+/** Immediately flush locally collected push statistics. */
+export declare function reportStatistics(): Promise<void>;
+/** Check OS-level push notification permission status. */
+export declare function checkPermissionStatus(): Promise<DooPushPermissionStatus>;
+/** Set the application badge count. */
+export declare function setBadge(count: number): Promise<boolean>;
+/** Clear the application badge count. */
+export declare function clearBadge(): Promise<boolean>;
+/** Return the last known application badge count. */
+export declare function getBadge(): Promise<number>;
+/**
+ * Set notification management mode.
+ *
+ * - active: DooPush requests permission / owns notification handling where possible.
+ * - passive: host app obtains token and calls registerWithToken().
+ */
+export declare function setNotificationManagementMode(mode: DooPushNotificationManagementMode): void;
+/**
+ * Android: relay FCM messages to Expo Notifications coexistence broadcast.
+ * iOS: no-op because delegate forwarding is used.
+ */
+export declare function setExpoNotificationRelayEnabled(enabled: boolean): void;
+/**
+ * Android: toggle SDK-owned FCM notification display.
+ * iOS: no-op; use setNotificationManagementMode('passive') to disable DooPush delegate tracking.
+ */
+export declare function setNotificationDisplayEnabled(enabled: boolean): void;
+/** Manually connect the WebSocket gateway using the registered device token. */
+export declare function connectGateway(): Promise<void>;
+/** Manually disconnect the WebSocket gateway. */
+export declare function disconnectGateway(): Promise<void>;
 export declare function addRegisterListener(listener: (e: OnRegisterEvent) => void): Subscription;
 export declare function addRegisterErrorListener(listener: (e: OnRegisterErrorEvent) => void): Subscription;
 export declare function addMessageListener(listener: (msg: DooPushMessage) => void): Subscription;
+export declare function addNotificationClickListener(listener: (msg: DooPushMessage) => void): Subscription;
+export declare function addNotificationOpenListener(listener: (msg: DooPushMessage) => void): Subscription;
+export declare function addGatewayOpenListener(listener: (e: DooPushGatewayOpenEvent) => void): Subscription;
+export declare function addGatewayClosedListener(listener: (e: DooPushGatewayClosedEvent) => void): Subscription;
+export declare function addGatewayErrorListener(listener: (e: DooPushGatewayErrorEvent) => void): Subscription;
 //# sourceMappingURL=DooPush.d.ts.map

package/build/DooPush.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DooPush.d.ts","sourceRoot":"","sources":["../src/DooPush.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACb,cAAc,EACf,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EACV,eAAe,EACf,oBAAoB,EACrB,MAAM,UAAU,CAAC;AAElB;;;;GAIG;AAEH;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAErD;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,IAAI,OAAO,CAAC;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,aAAa,CAAC;CACvB,CAAC,CAED;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,aAAqB,GAC5B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAE/B;AAED,sEAAsE;AACtE,wBAAgB,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEvD;AAED,kFAAkF;AAClF,wBAAgB,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEpD;AAID,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,CAAC,CAAC,EAAE,eAAe,KAAK,IAAI,GACrC,YAAY,CAEd;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,CAAC,CAAC,EAAE,oBAAoB,KAAK,IAAI,GAC1C,YAAY,CAEd;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,GACtC,YAAY,CAEd"}
+{"version":3,"file":"DooPush.d.ts","sourceRoot":"","sources":["../src/DooPush.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACb,cAAc,EACd,iCAAiC,EACjC,uBAAuB,EACvB,yBAAyB,EACzB,wBAAwB,EACxB,qBAAqB,EACrB,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EACV,eAAe,EACf,oBAAoB,EACrB,MAAM,UAAU,CAAC;AAElB;;;;;GAKG;AAEH;;;GAGG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,aAAa,GAAG,IAAI,CAErD;AAED;;;;;;GAMG;AACH,wBAAgB,QAAQ,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAEzD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,aAAqB,GAC5B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,CAE/B;AAED,sEAAsE;AACtE,wBAAgB,cAAc,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEvD;AAED,kFAAkF;AAClF,wBAAgB,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEpD;AAED,4FAA4F;AAC5F,wBAAgB,aAAa,IAAI,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAEjE;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAEhD;AAED,2DAA2D;AAC3D,wBAAgB,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC,CAEhD;AAED,0DAA0D;AAC1D,wBAAgB,qBAAqB,IAAI,OAAO,CAAC,uBAAuB,CAAC,CAExE;AAED,uCAAuC;AACvC,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAExD;AAED,yCAAyC;AACzC,wBAAgB,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC,CAE7C;AAED,qDAAqD;AACrD,wBAAgB,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAE1C;AAED;;;;;GAKG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,iCAAiC,GACtC,IAAI,CAEN;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAEtE;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAEpE;AAED,gFAAgF;AAChF,wBAAgB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC,CAE9C;AAED,iDAAiD;AACjD,wBAAgB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CAEjD;AAID,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,CAAC,CAAC,EAAE,eAAe,KAAK,IAAI,GACrC,YAAY,CAEd;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,CAAC,CAAC,EAAE,oBAAoB,KAAK,IAAI,GAC1C,YAAY,CAEd;AAED,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,GACtC,YAAY,CAEd;AAED,wBAAgB,4BAA4B,CAC1C,QAAQ,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,GACtC,YAAY,CAEd;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,CAAC,GAAG,EAAE,cAAc,KAAK,IAAI,GACtC,YAAY,CAEd;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,CAAC,CAAC,EAAE,uBAAuB,KAAK,IAAI,GAC7C,YAAY,CAEd;AAED,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,CAAC,CAAC,EAAE,yBAAyB,KAAK,IAAI,GAC/C,YAAY,CAEd;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,CAAC,CAAC,EAAE,wBAAwB,KAAK,IAAI,GAC9C,YAAY,CAEd"}