react-native-radar 4.33.0 → 4.34.0

package/android/src/newarch/java/com/radar/RadarModule.kt

@@ -40,9 +40,12 @@ import org.json.JSONObject
 @ReactModule(name = RadarModule.NAME)
 class RadarModule(reactContext: ReactApplicationContext) :
     NativeRadarSpec(reactContext), PermissionListener {
+        @Volatile
+        private var isInvalidated = false
 
     private val radarReceiver = object : RadarReceiver() {
         override fun onEventsReceived(context: Context, events: Array<RadarEvent>, user: RadarUser?) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 var eventsArray = Arguments.createArray()
                 for (event in events) {
@@ -57,6 +60,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onLocationUpdated(context: Context, location: Location, user: RadarUser) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("location", Radar.jsonForLocation(location).toString())
                 putString("user", user.toJson().toString())
@@ -65,6 +69,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onClientLocationUpdated(context: Context, location: Location, stopped: Boolean, source: Radar.RadarLocationSource) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("location", Radar.jsonForLocation(location).toString())
                 putBoolean("stopped", stopped)
@@ -74,6 +79,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onError(context: Context, status: Radar.RadarStatus) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("status", status.toString())
             }
@@ -81,6 +87,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onLog(context: Context, message: String) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("message", message)
             }
@@ -90,6 +97,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
 
     private val radarInAppMessageReceiver = object : RadarInAppMessageReceiver {
         override fun onNewInAppMessage(message: RadarInAppMessage) {
+            if (isInvalidated) return
             try {
             val eventBlob = Arguments.createMap().apply {
                 putMap("inAppMessage", RadarUtils.mapForJson(JSONObject(message.toJson())))
@@ -101,6 +109,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onInAppMessageDismissed(message: RadarInAppMessage) {
+            if (isInvalidated) return
             try {
                 val eventBlob = Arguments.createMap().apply {
                     putMap("inAppMessage", RadarUtils.mapForJson(JSONObject(message.toJson())))
@@ -112,6 +121,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
         }
 
         override fun onInAppMessageButtonClicked(message: RadarInAppMessage) {
+            if (isInvalidated) return
             try {
                 val eventBlob = Arguments.createMap().apply {
                     putMap("inAppMessage", RadarUtils.mapForJson(JSONObject(message.toJson())))
@@ -125,6 +135,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
 
     private val radarVerifiedReceiver = object : RadarVerifiedReceiver() {
         override fun onTokenUpdated(context: Context, token: RadarVerifiedLocationToken) {
+            if (isInvalidated) return
             val eventBlob = Arguments.createMap().apply {
                 putString("token", token.toJson().toString())
             }
@@ -140,10 +151,26 @@ class RadarModule(reactContext: ReactApplicationContext) :
         return NAME
     }
 
+    override fun invalidate() {
+        isInvalidated = true
+
+        // Detach from the process-level Radar singleton so this stale module
+        // instance stops receiving callbacks after its JS runtime is gone.
+        Radar.setReceiver(null)
+
+        try {
+            Radar.setVerifiedReceiver(null)
+        } catch (e: Exception) {
+            Log.e(TAG, "Error detaching verified receiver", e)
+        }
+
+        super.invalidate()
+    }
+
     override fun initialize(publishableKey: String, fraud: Boolean, options: ReadableMap?): Unit {
         val editor = reactApplicationContext.getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit()
         editor.putString("x_platform_sdk_type", "ReactNative")
-        editor.putString("x_platform_sdk_version", "4.33.0")
+        editor.putString("x_platform_sdk_version", "4.34.0")
         editor.apply()
 
         Radar.initialize(reactApplicationContext, publishableKey, radarReceiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, radarInAppMessageReceiver, currentActivity)
@@ -155,7 +182,7 @@ class RadarModule(reactContext: ReactApplicationContext) :
     override fun initializeWithAuthToken(authToken: String, fraud: Boolean, options: ReadableMap?): Unit {
         val editor = reactApplicationContext.getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit()
         editor.putString("x_platform_sdk_type", "ReactNative")
-        editor.putString("x_platform_sdk_version", "4.33.0")
+        editor.putString("x_platform_sdk_version", "4.34.0")
         editor.apply()
         
         val initOptions = io.radar.sdk.RadarInitializeOptions.builder()
@@ -456,6 +483,10 @@ class RadarModule(reactContext: ReactApplicationContext) :
         radarModuleImpl.getPublishableKey(promise)
     }
 
+    override fun getMobileOrigin(promise: Promise): Unit {
+        promise.resolve(reactApplicationContext.packageName)
+    }
+
     override fun showInAppMessage(inAppMessage: ReadableMap): Unit {
         radarModuleImpl.showInAppMessage(inAppMessage)
     }

package/android/src/oldarch/java/com/radar/RadarModule.java

@@ -102,7 +102,7 @@ public class RadarModule extends ReactContextBaseJavaModule implements Permissio
         this.fraud = fraud;
         SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "ReactNative");
-        editor.putString("x_platform_sdk_version", "4.33.0");
+        editor.putString("x_platform_sdk_version", "4.34.0");
         editor.apply();
         Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud, null, inAppMessageReceiver, getCurrentActivity());
         if (fraud) { 
@@ -115,7 +115,7 @@ public class RadarModule extends ReactContextBaseJavaModule implements Permissio
         this.fraud = fraud;
         SharedPreferences.Editor editor = getReactApplicationContext().getSharedPreferences("RadarSDK", Context.MODE_PRIVATE).edit();
         editor.putString("x_platform_sdk_type", "ReactNative");
-        editor.putString("x_platform_sdk_version", "4.33.0");
+        editor.putString("x_platform_sdk_version", "4.34.0");
         editor.apply();
         
         io.radar.sdk.RadarInitializeOptions.Builder builder = io.radar.sdk.RadarInitializeOptions.builder()
@@ -474,6 +474,14 @@ public class RadarModule extends ReactContextBaseJavaModule implements Permissio
         radarModuleImpl.getPublishableKey(promise);
     }
 
+    @ReactMethod
+    public void getMobileOrigin(final Promise promise) {
+        if (promise == null) {
+            return;
+        }
+        promise.resolve(getReactApplicationContext().getPackageName());
+    }
+
     @ReactMethod
     public void showInAppMessage(ReadableMap inAppMessageMap) {
         radarModuleImpl.showInAppMessage(inAppMessageMap);

package/dist/@types/RadarNativeInterface.d.ts

@@ -75,4 +75,5 @@ export interface RadarNativeInterface {
     onInAppMessageClicked: (callback: RadarInAppMessageClickedCallback | null) => void;
     getHost: () => Promise<string>;
     getPublishableKey: () => Promise<string>;
+    getMobileOrigin: () => Promise<string>;
 }

package/dist/NativeRadar.d.ts

@@ -92,6 +92,7 @@ export interface Spec extends TurboModule {
     nativeSdkVersion(): Promise<string>;
     getHost(): Promise<string>;
     getPublishableKey(): Promise<string>;
+    getMobileOrigin(): Promise<string>;
     showInAppMessage(inAppMessage: Object): void;
     setPushNotificationToken(token: string): void;
     isInitialized(): Promise<boolean>;

package/dist/helpers.d.ts

@@ -1,2 +1,3 @@
 export function getHost(): Promise<string>;
 export function getPublishableKey(): Promise<string>;
+export function getMobileOrigin(): Promise<string>;

package/dist/helpers.js

@@ -3,9 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPublishableKey = exports.getHost = void 0;
+exports.getMobileOrigin = exports.getPublishableKey = exports.getHost = void 0;
 const index_native_1 = __importDefault(require("./index.native"));
 const getHost = () => (index_native_1.default.getHost());
 exports.getHost = getHost;
 const getPublishableKey = () => (index_native_1.default.getPublishableKey());
 exports.getPublishableKey = getPublishableKey;
+const getMobileOrigin = () => (index_native_1.default.getMobileOrigin());
+exports.getMobileOrigin = getMobileOrigin;

package/dist/index.native.js

@@ -388,6 +388,9 @@ const Radar = {
     getPublishableKey: function () {
         return NativeRadar.getPublishableKey();
     },
+    getMobileOrigin: function () {
+        return NativeRadar.getMobileOrigin();
+    },
     isInitialized: function () {
         return NativeRadar.isInitialized();
     },

package/dist/ui/map.jsx

@@ -1,23 +1,26 @@
 import React, { useState, useEffect } from 'react';
 import { View, Image } from 'react-native';
 import Radar from '../index.native';
-import { getHost, getPublishableKey } from '../helpers';
+import { getHost, getPublishableKey, getMobileOrigin } from '../helpers';
 import styles from './styles';
 
 let MapLibreGL;
 let MapLibreMap;
 let GeoJSONSource;
 let Layer;
+let TransformRequestManager;
 try {
   MapLibreGL = require('@maplibre/maplibre-react-native');
   MapLibreMap = MapLibreGL.Map;
   GeoJSONSource = MapLibreGL.GeoJSONSource;
   Layer = MapLibreGL.Layer;
+  TransformRequestManager = MapLibreGL.TransformRequestManager;
 } catch (e) {
   MapLibreGL = null;
   MapLibreMap = null;
   GeoJSONSource = null;
   Layer = null;
+  TransformRequestManager = null;
 }
 
 const DEFAULT_STYLE = 'radar-default-v1';
@@ -49,10 +52,35 @@ const RadarMap = ({ mapOptions, children }) => {
   const [userLocation, setUserLocation] = useState(null);
 
   useEffect(() => {
-    createStyleURL(mapOptions?.mapStyle || DEFAULT_STYLE).then((result) => {
+    const setup = async () => {
+      const host = await getHost();
+
+      if (TransformRequestManager) {
+        try {
+          const mobileOrigin = await getMobileOrigin();
+          if (mobileOrigin) {
+            const mapHostPattern = `${host
+              .replace(/^https?:\/\//, '')
+              .replace(/\./g, '\\.')}/maps/`;
+            TransformRequestManager.addHeader({
+              id: 'radar-mobile-origin',
+              name: 'X-Radar-Mobile-Origin',
+              value: mobileOrigin,
+              match: mapHostPattern,
+            });
+          }
+        } catch (err) {
+          // eslint-disable-next-line no-console
+          console.warn(`Radar SDK: Failed to set mobile origin header: ${err}`);
+        }
+      }
+
+      const result = await createStyleURL(mapOptions?.mapStyle || DEFAULT_STYLE);
       setStyleURL(result);
-    });
-  }, [mapOptions]);
+    };
+
+    setup();
+  }, [mapOptions?.mapStyle]);
 
   useEffect(() => {
     Radar.getLocation().then((result) => {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "4.33.0";
+export declare const VERSION = "4.34.0";

package/dist/version.js

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
 // This file contains the version of the react-native-radar package
 // It should be updated to match the version in package.json
-exports.VERSION = '4.33.0';
+exports.VERSION = '4.34.0';

package/ios/RNRadar.h

@@ -6,11 +6,12 @@
 
 #import <RadarSDK/RadarSDK.h>
 #import <React/RCTBridgeModule.h>
+#import <React/RCTInvalidating.h>
 
 #ifdef RCT_NEW_ARCH_ENABLED
-@interface RNRadar : NativeRadarSpecBase <NativeRadarSpec, RadarDelegate, CLLocationManagerDelegate, RadarVerifiedDelegate, RadarInAppMessageProtocol>
+@interface RNRadar : NativeRadarSpecBase <NativeRadarSpec, RadarDelegate, CLLocationManagerDelegate, RadarVerifiedDelegate, RadarInAppMessageProtocol, RCTInvalidating>
 #else
-@interface RNRadar : RCTEventEmitter <RCTBridgeModule, RadarDelegate, CLLocationManagerDelegate, RadarVerifiedDelegate, RadarInAppMessageProtocol>
+@interface RNRadar : RCTEventEmitter <RCTBridgeModule, RadarDelegate, CLLocationManagerDelegate, RadarVerifiedDelegate, RadarInAppMessageProtocol, RCTInvalidating>
 #endif
 
 @end

package/ios/RNRadar.mm

@@ -55,6 +55,22 @@ RCT_EXPORT_MODULE()
     hasListeners = NO;
 }
 
+- (void)invalidate {
+#ifdef RCT_NEW_ARCH_ENABLED
+    jsEventEmitterReady = NO;
+#endif
+    hasListeners = NO;
+
+    // Detach from the process-level Radar singleton so a stale module
+    // instance doesn't continue to receive events.
+    [Radar setDelegate:nil];
+    [Radar setVerifiedDelegate:nil];
+    [Radar setInAppMessageDelegate:nil];
+
+    locationManager.delegate = nil;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 #ifdef RCT_NEW_ARCH_ENABLED
 - (void)setEventEmitterCallback:(EventEmitterCallbackWrapper *)eventEmitterCallbackWrapper {
     [super setEventEmitterCallback:eventEmitterCallbackWrapper];
@@ -217,7 +233,7 @@ RCT_EXPORT_MODULE()
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud options:(NSDictionary *)options) {
     _publishableKey = publishableKey; 
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"4.33.0" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"4.34.0" forKey:@"radar-xPlatformSDKVersion"];
     
     RadarInitializeOptions *radarOptions = [[RadarInitializeOptions alloc] init];
     if (options != nil) {
@@ -240,7 +256,7 @@ RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud option
 RCT_EXPORT_METHOD(initializeWithAuthToken:(NSString *)authToken fraud:(BOOL)fraud options:(NSDictionary *)options) {
     _publishableKey = nil;
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"4.33.0" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"4.34.0" forKey:@"radar-xPlatformSDKVersion"];
     RadarInitializeOptions *radarOptions = [[RadarInitializeOptions alloc] init];
     if (options != nil) {
         id silentPushValue = options[@"silentPush"];
@@ -335,6 +351,10 @@ RCT_EXPORT_METHOD(getPublishableKey:(RCTPromiseResolveBlock)resolve reject:(RCTP
     resolve(_publishableKey);
 }
 
+RCT_EXPORT_METHOD(getMobileOrigin:(RCTPromiseResolveBlock) resolve reject:(RCTPromiseRejectBlock)reject) {
+    resolve([[NSBundle mainBundle] bundleIdentifier]);
+}
+
 RCT_EXPORT_METHOD(getPermissionsStatus:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
     CLAuthorizationStatus status = [CLLocationManager authorizationStatus];
     NSString *statusStr;

package/package.json

@@ -3,7 +3,7 @@
   "description": "React Native module for Radar, the leading geofencing and location tracking platform",
   "homepage": "https://radar.com",
   "license": "Apache-2.0",
-  "version": "4.33.0",
+  "version": "4.34.0",
   "main": "dist/index.js",
   "files": [
     "dist",

package/src/@types/RadarNativeInterface.ts

@@ -147,4 +147,5 @@ export interface RadarNativeInterface {
   onInAppMessageClicked: (callback: RadarInAppMessageClickedCallback | null) => void;
   getHost: () => Promise<string>;
   getPublishableKey: () => Promise<string>;
+  getMobileOrigin: () => Promise<string>;
 }

package/src/NativeRadar.ts

@@ -103,6 +103,7 @@ export interface Spec extends TurboModule {
   nativeSdkVersion(): Promise<string>;
   getHost(): Promise<string>;
   getPublishableKey(): Promise<string>;
+  getMobileOrigin(): Promise<string>;
   showInAppMessage(inAppMessage: Object): void;
   setPushNotificationToken(token: string): void;
   isInitialized(): Promise<boolean>;

package/src/helpers.js

@@ -8,4 +8,8 @@ const getPublishableKey = () => (
   Radar.getPublishableKey()
 );
 
-export { getHost, getPublishableKey };
+const getMobileOrigin = () => (
+  Radar.getMobileOrigin()
+);
+
+export { getHost, getPublishableKey, getMobileOrigin };

package/src/index.native.ts

@@ -570,6 +570,9 @@ const Radar: RadarNativeInterface = {
   getPublishableKey: function (): Promise<string> {
     return NativeRadar.getPublishableKey();
   },
+  getMobileOrigin: function (): Promise<string> {
+    return NativeRadar.getMobileOrigin();
+  },
   isInitialized: function (): Promise<boolean> {
     return NativeRadar.isInitialized();
   },

package/src/ui/map.jsx

@@ -1,23 +1,26 @@
 import React, { useState, useEffect } from 'react';
 import { View, Image } from 'react-native';
 import Radar from '../index.native';
-import { getHost, getPublishableKey } from '../helpers';
+import { getHost, getPublishableKey, getMobileOrigin } from '../helpers';
 import styles from './styles';
 
 let MapLibreGL;
 let MapLibreMap;
 let GeoJSONSource;
 let Layer;
+let TransformRequestManager;
 try {
   MapLibreGL = require('@maplibre/maplibre-react-native');
   MapLibreMap = MapLibreGL.Map;
   GeoJSONSource = MapLibreGL.GeoJSONSource;
   Layer = MapLibreGL.Layer;
+  TransformRequestManager = MapLibreGL.TransformRequestManager;
 } catch (e) {
   MapLibreGL = null;
   MapLibreMap = null;
   GeoJSONSource = null;
   Layer = null;
+  TransformRequestManager = null;
 }
 
 const DEFAULT_STYLE = 'radar-default-v1';
@@ -49,10 +52,35 @@ const RadarMap = ({ mapOptions, children }) => {
   const [userLocation, setUserLocation] = useState(null);
 
   useEffect(() => {
-    createStyleURL(mapOptions?.mapStyle || DEFAULT_STYLE).then((result) => {
+    const setup = async () => {
+      const host = await getHost();
+
+      if (TransformRequestManager) {
+        try {
+          const mobileOrigin = await getMobileOrigin();
+          if (mobileOrigin) {
+            const mapHostPattern = `${host
+              .replace(/^https?:\/\//, '')
+              .replace(/\./g, '\\.')}/maps/`;
+            TransformRequestManager.addHeader({
+              id: 'radar-mobile-origin',
+              name: 'X-Radar-Mobile-Origin',
+              value: mobileOrigin,
+              match: mapHostPattern,
+            });
+          }
+        } catch (err) {
+          // eslint-disable-next-line no-console
+          console.warn(`Radar SDK: Failed to set mobile origin header: ${err}`);
+        }
+      }
+
+      const result = await createStyleURL(mapOptions?.mapStyle || DEFAULT_STYLE);
       setStyleURL(result);
-    });
-  }, [mapOptions]);
+    };
+
+    setup();
+  }, [mapOptions?.mapStyle]);
 
   useEffect(() => {
     Radar.getLocation().then((result) => {

package/src/version.ts

@@ -1,3 +1,3 @@
 // This file contains the version of the react-native-radar package
 // It should be updated to match the version in package.json
-export const VERSION = '4.33.0';
+export const VERSION = '4.34.0';