cordova-plugin-reteno 2.0.4 → 2.2.0

package/src/ios/RetenoPlugin.swift

@@ -117,7 +117,7 @@ class RetenoPlugin: CDVPlugin {
       isAutomaticScreenReportingEnabled: screenReportingEnabled,
       isAutomaticAppLifecycleReportingEnabled: lifecycleAppEnabled,
       isApplicationForegroundLifecycleReportingEnabled: lifecycleForegroundEnabled,
-      isAutomaticPushSubsriptionReportingEnabled: lifecyclePushEnabled,
+      isAutomaticPushSubscriptionReportingEnabled: lifecyclePushEnabled,
       sessionConfiguration: RetenoSessionConfiguration(
         sessionDuration: sessionDurationSeconds,
         isSessionStartReportingEnabled: lifecycleSessionStartEnabled,
@@ -125,14 +125,13 @@ class RetenoPlugin: CDVPlugin {
       ),
       isPausedInAppMessages: pauseInAppMessages,
       inAppMessagesPauseBehaviour: inAppMessagesPauseBehaviour,
-      isDebugMode: isDebugMode,
-      deviceTokenHandlingMode: deviceTokenMode
+      isDebugMode: isDebugMode
     )
 
     self.isManualTokenMode = (deviceTokenMode == .manual)
 
     DispatchQueue.main.async {
-      Reteno.start(apiKey: apiKey, configuration: configuration)
+      Reteno.start(apiKey: apiKey, deviceTokenHandlingMode: deviceTokenMode, configuration: configuration)
 
       // When IOS_DEVICE_TOKEN_HANDLING_MODE is manual and FirebaseMessaging is available,
       // configure Firebase if the developer hasn't done it yet, then hook FCM
@@ -1364,6 +1363,13 @@ class RetenoPlugin: CDVPlugin {
     return trimmed.isEmpty ? nil : trimmed
   }
 
+  // For marketId, empty string explicitly means "clear value" and must be preserved.
+  private func marketIdValue(_ value: Any?) -> String? {
+    guard let raw = value as? String else { return nil }
+    let trimmed = raw.trimmingCharacters(in: .whitespacesAndNewlines)
+    return trimmed.isEmpty ? "" : trimmed
+  }
+
   private func stringArrayValue(_ value: Any?) -> [String] {
     if let array = value as? [String] {
       return array.compactMap { stringValue($0) }
@@ -1453,6 +1459,7 @@ class RetenoPlugin: CDVPlugin {
     let timeZone = stringValue(payload["timeZone"])
     let address = buildAddress(from: payload["address"])
     let fields = buildCustomFields(from: payload["fields"])
+    let marketId = marketIdValue(payload["marketId"])
 
     return UserAttributes(
       phone: phone,
@@ -1461,6 +1468,7 @@ class RetenoPlugin: CDVPlugin {
       lastName: lastName,
       languageCode: languageCode,
       timeZone: timeZone,
+      marketId: marketId,
       address: address,
       fields: fields
     )
@@ -1473,12 +1481,14 @@ class RetenoPlugin: CDVPlugin {
     let timeZone = stringValue(payload["timeZone"])
     let address = buildAddress(from: payload["address"])
     let fields = buildCustomFields(from: payload["fields"])
+    let marketId = marketIdValue(payload["marketId"])
 
     return AnonymousUserAttributes(
       firstName: firstName,
       lastName: lastName,
       languageCode: languageCode,
       timeZone: timeZone,
+      marketId: marketId,
       address: address,
       fields: fields
     )

package/types/index.ts

@@ -19,6 +19,13 @@ export type UserAttributesAnonymous = {
   timeZone?: string | null;
   address?: Address | null;
   fields?: Fields | null;
+  /**
+   * Market ID. Max 64 chars; latin letters, digits, '-' and '_' are allowed.
+   * Pass `""` (empty string) to clear the value on the server.
+   * Passing `null` or omitting the field has no effect (the existing value is kept).
+   * Available with the bundled Android 2.9.6+ and iOS 2.7.2+ SDKs.
+   */
+  marketId?: string;
 };
 
 export type UserAttributes = {
@@ -97,7 +104,7 @@ export type RetenoInitializeOptions = {
   inAppMessagesPauseBehaviour?: InAppPauseBehaviour;
   isAutomaticScreenReportingEnabled?: boolean;
   lifecycleTrackingOptions?: LifecycleTrackingOptions;
-  /** Session reset duration in seconds (Android 2.9.4+, iOS 2.7.0+). */
+  /** Session reset duration in seconds (supported by the bundled Android 2.9.6+ and iOS 2.7.2+ SDKs). */
   sessionDurationSeconds?: number;
   /** Enables Reteno debug mode for near real-time event monitoring. Use only with test devices. */
   isDebugMode?: boolean;
@@ -105,7 +112,12 @@ export type RetenoInitializeOptions = {
 
 export type InAppPauseBehaviour = 'SKIP_IN_APPS' | 'POSTPONE_IN_APPS';
 
-export type InAppLifecycleEvent = 'beforeDisplay' | 'onDisplay' | 'beforeClose' | 'afterClose' | 'onError';
+export type InAppLifecycleEvent =
+  | 'beforeDisplay'
+  | 'onDisplay'
+  | 'beforeClose'
+  | 'afterClose'
+  | 'onError';
 
 export type InAppData = {
   id?: string;
@@ -118,7 +130,7 @@ export type InAppActionData = {
 };
 
 export type InAppCloseData = {
-  id?: string;//android only
+  id?: string; //android only
   closeAction: string;
   action?: InAppActionData;
 };
@@ -142,6 +154,14 @@ export type NotificationChannelConfig = {
   description: string;
 };
 
+/**
+ * Android notification grouping rule. The rule is persisted natively so it
+ * remains available when a push is handled before the WebView starts.
+ */
+export type NotificationGroupingRule =
+  | { payloadKey: string; groupId?: never; showSummary?: boolean }
+  | { groupId: string; payloadKey?: never; showSummary?: boolean };
+
 export type AppInboxStatus = 'OPENED' | 'UNOPENED';
 
 export type AppInboxMessage = {