react-native-radar 3.18.4 → 3.18.5-beta.2

package/android/build.gradle

@@ -18,7 +18,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 31
         versionCode 1
-        versionName '3.18.4'
+        versionName '3.18.5-beta.2'
     }
     lintOptions {
         abortOnError false
@@ -45,6 +45,6 @@ repositories {
 
 dependencies {
     api 'com.facebook.react:react-native:+'
-    api 'io.radar:sdk:3.18.5'
+    api 'io.radar:sdk:3.18.7-beta.1'
 }
 

package/android/src/main/java/io/radar/react/RNRadarModule.java

@@ -96,7 +96,7 @@ public class RNRadarModule extends ReactContextBaseJavaModule implements Permiss
         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", "3.18.4");
+        editor.putString("x_platform_sdk_version", "3.18.5-beta.2");
         editor.apply();
         if (fraud) {
             Radar.initialize(getReactApplicationContext(), publishableKey, receiver, Radar.RadarLocationServicesProvider.GOOGLE, fraud);

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { RadarNativeInterface } from "./@types/RadarNativeInterface";
-declare let module: RadarNativeInterface;
-export default module;
+declare let nativeModule: RadarNativeInterface;
+export default nativeModule;
 declare let RadarRNWeb: any;
 export { RadarRNWeb };
 declare let Autocomplete: any;

package/dist/index.js

@@ -16,9 +16,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Map = exports.Autocomplete = exports.RadarRNWeb = void 0;
 const react_native_1 = require("react-native");
-let module;
-module = require("./index.native").default;
-exports.default = module;
+let nativeModule;
+nativeModule = react_native_1.Platform.OS === "web" ? require("./index.web").default : require("./index.native").default;
+exports.default = nativeModule;
 let RadarRNWeb = react_native_1.Platform.OS === "web" ? require("./index.web").default : {};
 exports.RadarRNWeb = RadarRNWeb;
 let Autocomplete = react_native_1.Platform.OS !== "web" ? require("./ui/autocomplete").default : {};

package/dist/index.native.js

@@ -48,9 +48,9 @@ const startTrackingVerified = (options) => react_native_1.NativeModules.RNRadar.
 const mockTracking = (options) => react_native_1.NativeModules.RNRadar.mockTracking(options);
 const stopTracking = () => react_native_1.NativeModules.RNRadar.stopTracking();
 const stopTrackingVerified = () => react_native_1.NativeModules.RNRadar.stopTrackingVerified();
+const isTracking = () => react_native_1.NativeModules.RNRadar.isTracking();
 const getTrackingOptions = () => react_native_1.NativeModules.RNRadar.getTrackingOptions();
 const isUsingRemoteTrackingOptions = () => react_native_1.NativeModules.RNRadar.isUsingRemoteTrackingOptions();
-const isTracking = () => react_native_1.NativeModules.RNRadar.isTracking();
 const setForegroundServiceOptions = (options) => react_native_1.NativeModules.RNRadar.setForegroundServiceOptions(options);
 const setNotificationOptions = (options) => react_native_1.NativeModules.RNRadar.setNotificationOptions(options);
 const getTripOptions = () => react_native_1.NativeModules.RNRadar.getTripOptions();
@@ -94,7 +94,6 @@ const Radar = {
     setMetadata,
     getMetadata,
     setAnonymousTrackingEnabled,
-    isUsingRemoteTrackingOptions,
     getPermissionsStatus,
     requestPermissions,
     getLocation,
@@ -111,15 +110,16 @@ const Radar = {
     stopTrackingVerified,
     isTracking,
     getTrackingOptions,
+    isUsingRemoteTrackingOptions,
     setForegroundServiceOptions,
     setNotificationOptions,
-    acceptEvent,
-    rejectEvent,
     getTripOptions,
     startTrip,
-    updateTrip,
     completeTrip,
     cancelTrip,
+    updateTrip,
+    acceptEvent,
+    rejectEvent,
     getContext,
     searchPlaces,
     searchGeofences,

package/dist/index.web.d.ts

@@ -3,27 +3,38 @@ declare namespace Radar {
     export { initialize };
     export { setLogLevel };
     export { setUserId };
+    export { getUserId };
     export { setDescription };
+    export { getDescription };
     export { setMetadata };
+    export { getMetadata };
+    export { setAnonymousTrackingEnabled };
     export { getPermissionsStatus };
     export { requestPermissions };
     export { getLocation };
     export { trackOnce };
     export { trackVerified };
-    export { trackVerifiedToken };
+    export { getVerifiedLocationToken };
     export { startTrackingEfficient };
     export { startTrackingResponsive };
     export { startTrackingContinuous };
     export { startTrackingCustom };
+    export { startTrackingVerified };
     export { mockTracking };
     export { stopTracking };
+    export { stopTrackingVerified };
+    export { isTracking };
+    export { getTrackingOptions };
+    export { isUsingRemoteTrackingOptions };
     export { setForegroundServiceOptions };
-    export { acceptEvent };
-    export { rejectEvent };
+    export { setNotificationOptions };
+    export { getTripOptions };
     export { startTrip };
-    export { updateTrip };
     export { completeTrip };
     export { cancelTrip };
+    export { updateTrip };
+    export { acceptEvent };
+    export { rejectEvent };
     export { getContext };
     export { searchPlaces };
     export { searchGeofences };
@@ -31,35 +42,55 @@ declare namespace Radar {
     export { geocode };
     export { reverseGeocode };
     export { ipGeocode };
+    export { validateAddress };
     export { getDistance };
     export { getMatrix };
+    export { logConversion };
+    export { sendEvent };
     export { on };
     export { off };
+    export { nativeSdkVersion };
+    export { rnSdkVersion };
+    export { throwOnUnimplemented };
+    export { setDeviceId };
+    export { setDeviceType };
+    export { setRequestHeaders };
 }
 declare function initialize(publishableKey: any): void;
 declare function setLogLevel(level: any): void;
 declare function setUserId(userId: any): void;
+declare function getUserId(): Promise<any>;
 declare function setDescription(description: any): void;
+declare function getDescription(): Promise<any>;
 declare function setMetadata(metadata: any): void;
+declare function getMetadata(): Promise<any>;
+declare function setAnonymousTrackingEnabled(): void;
 declare function getPermissionsStatus(): Promise<any>;
-declare function requestPermissions(background: any): void;
+declare function requestPermissions(background: any): Promise<any>;
 declare function getLocation(): Promise<any>;
 declare function trackOnce(options: any): Promise<any>;
-declare function trackVerified(): void;
-declare function trackVerifiedToken(): void;
+declare function trackVerified(): Promise<any>;
+declare function getVerifiedLocationToken(): Promise<any>;
 declare function startTrackingEfficient(): void;
 declare function startTrackingResponsive(): void;
 declare function startTrackingContinuous(): void;
 declare function startTrackingCustom(options: any): void;
+declare function startTrackingVerified(options: any): void;
 declare function mockTracking(options: any): void;
 declare function stopTracking(): void;
+declare function stopTrackingVerified(): void;
+declare function isTracking(): Promise<any>;
+declare function getTrackingOptions(): Promise<any>;
+declare function isUsingRemoteTrackingOptions(): Promise<any>;
 declare function setForegroundServiceOptions(options: any): void;
-declare function acceptEvent(eventId: any, verifiedPlaceId: any): void;
-declare function rejectEvent(eventId: any): void;
+declare function setNotificationOptions(options: any): void;
+declare function getTripOptions(): Promise<any>;
 declare function startTrip(options: any): Promise<any>;
-declare function updateTrip(tripOptions: any): Promise<any>;
 declare function completeTrip(): Promise<any>;
 declare function cancelTrip(): Promise<any>;
+declare function updateTrip(tripOptions: any): Promise<any>;
+declare function acceptEvent(eventId: any, verifiedPlaceId: any): void;
+declare function rejectEvent(eventId: any): void;
 declare function getContext(options: any): Promise<any>;
 declare function searchPlaces(options: any): Promise<any>;
 declare function searchGeofences(options: any): Promise<any>;
@@ -67,7 +98,16 @@ declare function autocomplete(options: any): Promise<any>;
 declare function geocode(options: any): Promise<any>;
 declare function reverseGeocode(options: any): Promise<any>;
 declare function ipGeocode(): Promise<any>;
+declare function validateAddress(options: any): Promise<any>;
 declare function getDistance(options: any): Promise<any>;
 declare function getMatrix(options: any): Promise<any>;
+declare function logConversion(options: any): Promise<any>;
+declare function sendEvent(name: any, metadata: any): void;
 declare function on(event: any, callback: any): void;
 declare function off(event: any, callback: any): void;
+declare function nativeSdkVersion(): Promise<any>;
+declare function rnSdkVersion(): string;
+declare function throwOnUnimplemented(value: any): void;
+declare function setDeviceId(deviceId: any, installId: any): void;
+declare function setDeviceType(deviceType: any): void;
+declare function setRequestHeaders(headers: any): void;

package/dist/index.web.js

@@ -4,15 +4,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const radar_sdk_js_1 = __importDefault(require("radar-sdk-js"));
+const package_json_1 = require("../package.json");
+let throws = false;
+const throwOnUnimplemented = (value) => {
+    throws = value;
+};
 const initialize = (publishableKey) => {
     radar_sdk_js_1.default.initialize(publishableKey);
 };
 const setLogLevel = (level) => {
-    // not implemented
+    if (throws)
+        throw new Error("setLogLevel() is not implemented on web");
 };
 const setUserId = (userId) => {
     radar_sdk_js_1.default.setUserId(userId);
 };
+const getUserId = () => {
+    if (throws)
+        throw new Error("getUserId() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("getUserId() is not implemented on web"); });
+};
 const setDeviceId = (deviceId, installId) => {
     radar_sdk_js_1.default.setDeviceId(deviceId, installId);
 };
@@ -25,9 +36,23 @@ const setRequestHeaders = (headers) => {
 const setDescription = (description) => {
     radar_sdk_js_1.default.setDescription(description);
 };
+const getDescription = () => {
+    if (throws)
+        throw new Error("getDescription() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("getDescription() is not implemented on web"); });
+};
 const setMetadata = (metadata) => {
     radar_sdk_js_1.default.setMetadata(metadata);
 };
+const getMetadata = () => {
+    if (throws)
+        throw new Error("getMetadata() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("getMetadata() is not implemented on web"); });
+};
+const setAnonymousTrackingEnabled = () => {
+    if (throws)
+        throw new Error("setAnonymousTrackingEnabled() is not implemented on web");
+};
 const getPermissionsStatus = () => {
     return new Promise(resolve => {
         const navigator = window.navigator;
@@ -45,8 +70,10 @@ const getPermissionsStatus = () => {
         }
     });
 };
-const requestPermissions = background => {
-    // not implemented
+const requestPermissions = (background) => {
+    if (throws)
+        throw new Error("requestPermissions() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("requestPermissions() is not implemented on web"); });
 };
 const getLocation = () => {
     return new Promise((resolve, reject) => {
@@ -58,7 +85,7 @@ const getLocation = () => {
         });
     });
 };
-const trackOnce = options => {
+const trackOnce = (options) => {
     return new Promise((resolve, reject) => {
         const callback = (err, { status, location, user, events }) => {
             if (err) {
@@ -82,33 +109,80 @@ const trackOnce = options => {
     });
 };
 const trackVerified = () => {
-    // not implemented
+    if (throws)
+        throw new Error("trackVerified() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("trackVerified() is not implemented on web"); });
 };
-const trackVerifiedToken = () => {
-    // not implemented
+const getVerifiedLocationToken = () => {
+    if (throws)
+        throw new Error("getVerifiedLocationToken() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("getVerifiedLocationToken() is not implemented on web"); });
 };
 const startTrackingEfficient = () => {
-    // not implemented
+    if (throws)
+        throw new Error("startTrackingEfficient() is not implemented on web");
 };
 const startTrackingResponsive = () => {
-    // not implemented
+    if (throws)
+        throw new Error("startTrackingResponsive() is not implemented on web");
 };
 const startTrackingContinuous = () => {
-    // not implemented
-};
-const startTrackingCustom = options => {
-    // not implemented
+    if (throws)
+        throw new Error("startTrackingContinuous() is not implemented on web");
 };
-const mockTracking = options => {
-    // not implemented
+const startTrackingCustom = (options) => {
+    if (throws)
+        throw new Error("startTrackingCustom() is not implemented on web");
 };
-const stopTracking = () => {
-    // not implemented
+const startTrackingVerified = (options) => {
+    if (throws)
+        throw new Error("startTrackingVerified() is not implemented on web");
 };
-const setForegroundServiceOptions = options => {
-    // not implemented
+const mockTracking = (options) => {
+    if (throws)
+        throw new Error("mockTracking() is not implemented on web");
 };
-const startTrip = options => {
+const stopTracking = () => {
+    if (throws)
+        throw new Error("stopTracking() is not implemented on web");
+};
+const stopTrackingVerified = () => {
+    if (throws)
+        throw new Error("stopTrackingVerified() is not implemented on web");
+};
+const isTracking = () => {
+    if (throws)
+        throw new Error("isTracking() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("isTracking() is not implemented on web"); });
+};
+const getTrackingOptions = () => {
+    if (throws)
+        throw new Error("getTrackingOptions() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("getTrackingOptions() is not implemented on web"); });
+};
+const isUsingRemoteTrackingOptions = () => {
+    if (throws)
+        throw new Error("isUsingRemoteTrackingOptions() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("isUsingRemoteTrackingOptions() is not implemented on web"); });
+};
+const setForegroundServiceOptions = (options) => {
+    if (throws)
+        throw new Error("setForegroundServiceOptions() is not implemented on web");
+};
+const setNotificationOptions = (options) => {
+    if (throws)
+        throw new Error("setNotificationOptions() is not implemented on web");
+};
+const getTripOptions = () => {
+    if (throws)
+        throw new Error("getTripOptions() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("getTripOptions() is not implemented on web"); });
+};
+const startTrip = (options) => {
+    if (options.tripOptions) {
+        options = options.tripOptions;
+    }
+    console.log(options);
     return new Promise((resolve, reject) => {
         const callback = (err, { trip, events, status }) => {
             if (err) {
@@ -177,12 +251,14 @@ const updateTrip = (tripOptions) => {
     });
 };
 const acceptEvent = (eventId, verifiedPlaceId) => {
-    // not implemented
+    if (throws)
+        throw new Error("acceptEvent() is not implemented on web");
 };
-const rejectEvent = eventId => {
-    // not implemented
+const rejectEvent = (eventId) => {
+    if (throws)
+        throw new Error("rejectEvent() is not implemented on web");
 };
-const getContext = options => {
+const getContext = (options) => {
     return new Promise((resolve, reject) => {
         const callback = (err, { status, location, context }) => {
             if (err) {
@@ -204,7 +280,7 @@ const getContext = options => {
         }
     });
 };
-const searchPlaces = options => {
+const searchPlaces = (options) => {
     return new Promise((resolve, reject) => {
         radar_sdk_js_1.default.searchPlaces(options, (err, { status, location, places }) => {
             if (err) {
@@ -220,7 +296,7 @@ const searchPlaces = options => {
         });
     });
 };
-const searchGeofences = options => {
+const searchGeofences = (options) => {
     return new Promise((resolve, reject) => {
         radar_sdk_js_1.default.searchGeofences(options, (err, { status, location, geofences }) => {
             if (err) {
@@ -236,7 +312,7 @@ const searchGeofences = options => {
         });
     });
 };
-const autocomplete = options => {
+const autocomplete = (options) => {
     return new Promise((resolve, reject) => {
         radar_sdk_js_1.default.autocomplete(options, (err, { status, addresses }) => {
             if (err) {
@@ -251,13 +327,17 @@ const autocomplete = options => {
         });
     });
 };
-const geocode = options => {
+const geocode = (options) => {
     return new Promise((resolve, reject) => {
         let newOptions = options;
-        if (typeof options === 'string')
+        if (typeof options === 'string') {
             newOptions = {
                 query: options
             };
+        }
+        else if (options.address) {
+            newOptions.query = options.address;
+        }
         radar_sdk_js_1.default.geocode(newOptions, (err, { status, addresses }) => {
             if (err) {
                 reject(err);
@@ -271,7 +351,7 @@ const geocode = options => {
         });
     });
 };
-const reverseGeocode = options => {
+const reverseGeocode = (options) => {
     return new Promise((resolve, reject) => {
         const callback = (err, { status, addresses }) => {
             if (err) {
@@ -307,7 +387,22 @@ const ipGeocode = () => {
         });
     });
 };
-const getDistance = options => {
+const validateAddress = (options) => {
+    return new Promise((resolve, reject) => {
+        radar_sdk_js_1.default.validateAddress(options, (err, { status, address }) => {
+            if (err) {
+                reject(err);
+            }
+            else {
+                resolve({
+                    status,
+                    address
+                });
+            }
+        });
+    });
+};
+const getDistance = (options) => {
     return new Promise((resolve, reject) => {
         radar_sdk_js_1.default.getDistance(options, (err, { status, routes }) => {
             if (err) {
@@ -322,7 +417,7 @@ const getDistance = options => {
         });
     });
 };
-const getMatrix = options => {
+const getMatrix = (options) => {
     return new Promise((resolve, reject) => {
         radar_sdk_js_1.default.getMatrix(options, (err, { origins, destinations, matrix, status }) => {
             if (err) {
@@ -339,37 +434,63 @@ const getMatrix = options => {
         });
     });
 };
+const logConversion = (options) => {
+    if (throws)
+        throw new Error("logConversion() is not implemented on web");
+    return new Promise((resolve, reject) => { reject("logConversion() is not implemented on web"); });
+};
+const sendEvent = (name, metadata) => {
+    if (throws)
+        throw new Error("sendEvent() is not implemented on web");
+};
 const on = (event, callback) => {
-    // not implemented
+    if (throws)
+        throw new Error("on() is not implemented on web");
 };
 const off = (event, callback) => {
-    // not implemented
+    if (throws)
+        throw new Error("off() is not implemented on web");
 };
+const nativeSdkVersion = () => {
+    return new Promise((resolve, reject) => { resolve(radar_sdk_js_1.default.VERSION); });
+};
+const rnSdkVersion = () => package_json_1.version;
 const Radar = {
     initialize,
     setLogLevel,
     setUserId,
+    getUserId,
     setDescription,
+    getDescription,
     setMetadata,
+    getMetadata,
+    setAnonymousTrackingEnabled,
     getPermissionsStatus,
     requestPermissions,
     getLocation,
     trackOnce,
     trackVerified,
-    trackVerifiedToken,
+    getVerifiedLocationToken,
     startTrackingEfficient,
     startTrackingResponsive,
     startTrackingContinuous,
     startTrackingCustom,
+    startTrackingVerified,
     mockTracking,
     stopTracking,
+    stopTrackingVerified,
+    isTracking,
+    getTrackingOptions,
+    isUsingRemoteTrackingOptions,
     setForegroundServiceOptions,
-    acceptEvent,
-    rejectEvent,
+    setNotificationOptions,
+    getTripOptions,
     startTrip,
-    updateTrip,
     completeTrip,
     cancelTrip,
+    updateTrip,
+    acceptEvent,
+    rejectEvent,
     getContext,
     searchPlaces,
     searchGeofences,
@@ -377,9 +498,19 @@ const Radar = {
     geocode,
     reverseGeocode,
     ipGeocode,
+    validateAddress,
     getDistance,
     getMatrix,
+    logConversion,
+    sendEvent,
     on,
     off,
+    nativeSdkVersion,
+    rnSdkVersion,
+    // only for web, these should be called via RadarRNWeb instead of Radar for typing
+    throwOnUnimplemented,
+    setDeviceId,
+    setDeviceType,
+    setRequestHeaders,
 };
 exports.default = Radar;

package/ios/Cartfile.resolved

@@ -1 +1 @@
-github "radarlabs/radar-sdk-ios" "3.18.4"
+github "radarlabs/radar-sdk-ios" "3.18.6-beta.1"

package/ios/RNRadar.m

@@ -102,7 +102,7 @@ RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(initialize:(NSString *)publishableKey fraud:(BOOL)fraud) {
     [[NSUserDefaults standardUserDefaults] setObject:@"ReactNative" forKey:@"radar-xPlatformSDKType"];
-    [[NSUserDefaults standardUserDefaults] setObject:@"3.18.4" forKey:@"radar-xPlatformSDKVersion"];
+    [[NSUserDefaults standardUserDefaults] setObject:@"3.18.5-beta.2" forKey:@"radar-xPlatformSDKVersion"];
     [Radar initializeWithPublishableKey:publishableKey];
 }
 

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": "3.18.4",
+  "version": "3.18.5-beta.2",
   "main": "dist/index.js",
   "files": [
     "/android",
@@ -89,6 +89,6 @@
   "dependencies": {
     "@babel/runtime": "^7.21.0",
     "@react-native-community/netinfo": "^7.1.3",
-    "radar-sdk-js": "^3.6.0"
+    "radar-sdk-js": "^3.7.1"
   }
 }

package/plugin/build/withRadarIOS.js

@@ -51,8 +51,7 @@ const withRadarIOS = (config, args) => {
                 const filePath = path_1.default.join(config.modRequest.platformProjectRoot, 'Podfile');
                 const contents = await promises_1.default.readFile(filePath, 'utf-8');
                 // Check if the pod declaration already exists
-                const RadarSDKMotionVersion = '3.18.3';
-                if (contents.indexOf(`pod 'RadarSDKMotion', ${RadarSDKMotionVersion}`) === -1) {
+                if (contents.indexOf("pod 'RadarSDKMotion', '3.18.6-beta.1'") === -1) {
                     // Find the target block
                     const targetRegex = /target '(\w+)' do/g;
                     const match = targetRegex.exec(contents);
@@ -61,7 +60,7 @@ const withRadarIOS = (config, args) => {
                         const targetEndIndex = contents.indexOf('end', targetStartIndex) + 3;
                         // Insert the pod declaration within the target block
                         const targetBlock = contents.substring(targetStartIndex, targetEndIndex);
-                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDKMotion', '3.18.3'`);
+                        const updatedTargetBlock = targetBlock.replace(/(target '(\w+)' do)/, `$1\n  pod 'RadarSDKMotion', '3.18.6-beta.1'`);
                         const newContents = contents.replace(targetBlock, updatedTargetBlock);
                         // Write the updated contents back to the Podfile
                         await promises_1.default.writeFile(filePath, newContents);

package/react-native-radar.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.platform = :ios, "10.0"
 
   s.dependency "React"
-  s.dependency "RadarSDK", "~> 3.18.4"
+  s.dependency "RadarSDK", "~> 3.18.6-beta.1"
 end