Upgrade module

RNAmazonPublisherServices.podspec

@@ -21,7 +21,8 @@ Pod::Spec.new do |s|
 
     # folly_version must match the version used in React Native
     # See folly_version in react-native/React/FBReactNativeSpec/FBReactNativeSpec.podspec
-    folly_version = '2021.06.28.00-v2'
+    folly_config = get_folly_config()
+    folly_version = folly_config[:version]
     folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
     s.compiler_flags  = folly_compiler_flags

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-aps",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "author": "AdversportTeam <rm@adversport.com> (https://github.com/AdversportTeam)",
   "contributors": [
     "Jay Kim <me@wjay.kim> (https://github.com/wjaykim)"
@@ -257,12 +257,8 @@
     ]
   },
   "codegenConfig": {
-    "libraries": [
-      {
-        "name": "rnaps",
-        "type": "modules",
-        "jsSrcsDir": "./src/turbomodules"
-      }
-    ]
+    "name": "rnaps",
+    "type": "modules",
+    "jsSrcsDir": "./src/turbomodules"
   }
 }

src/APSAds.ts

@@ -20,17 +20,11 @@ import AdsModule from './internal/AdsModule';
 import { AdNetworkInfo, validateAdNetworkInfo } from './types/AdNetworkInfo';
 import { isMRAIDPolicy, MRAIDPolicy } from './types/MRAIDPolicy';
 
-/**
- * @public
- */
 export class APSAds {
   private static _nativeModule = AdsModule;
 
   /**
    * Initializes the APSAds SDK.
-   * @param appKey - Generated APS app key from the APS portal
-   *
-   * @public
    */
   static initialize(appKey: string): Promise<void> {
     if (typeof appKey !== 'string') {
@@ -41,9 +35,6 @@ export class APSAds {
 
   /**
    * Sets the primary ad server or mediator.
-   * @param adNetworkInfo - `AdNetworkInfo` object containing the primary ad network and its properties
-   *
-   * @public
    */
   static setAdNetworkInfo(adNetworkInfo: AdNetworkInfo): void {
     try {
@@ -58,9 +49,6 @@ export class APSAds {
 
   /**
    * Sets the MRAID versions supported by user ad server.
-   * @param versions - Array of supported versions
-   *
-   * @public
    */
   static setMRAIDSupportedVersions(versions: string[]): void {
     if (
@@ -76,9 +64,6 @@ export class APSAds {
 
   /**
    * Sets the MRAID policy.
-   * @param policy - MRAIDPolicy value. `MRAIDPolicy.DFP` for Google Ad Manager and `MRAIDPolicy.CUSTOM` for other ad server / mediation.
-   *
-   * @public
    */
   static setMRAIDPolicy(policy: MRAIDPolicy): void {
     if (!isMRAIDPolicy(policy)) {
@@ -91,9 +76,6 @@ export class APSAds {
 
   /**
    * Enable / disable the test mode for APSAds.
-   * @param enabled - Whether to enable or disable the test mode.
-   *
-   * @public
    */
   static setTestMode(enabled: boolean): void {
     if (typeof enabled !== 'boolean') {
@@ -106,9 +88,6 @@ export class APSAds {
 
   /**
    * Enable / disable the geo location tracking for APSAds.
-   * @param enabled - Whether to enable or disable the geo location tracking.
-   *
-   * @public
    */
   static setUseGeoLocation(enabled: boolean): void {
     if (typeof enabled !== 'boolean') {
@@ -121,10 +100,6 @@ export class APSAds {
 
   /**
    * Adds a custom attribute to the APSAds SDK.
-   * @param key - The key of the custom attribute
-   * @param value - The value of the custom attribute
-   *
-   * @public
    */
   static addCustomAttribute(key: string, value: string): void {
     if (typeof key !== 'string') {
@@ -142,9 +117,6 @@ export class APSAds {
 
   /**
    * Removes a custom attribute from the APSAds SDK.
-   * @param key - The key of the custom attribute
-   *
-   * @public
    */
   static removeCustomAttribute(key: string): void {
     if (typeof key !== 'string') {

src/AdError.ts

@@ -19,20 +19,13 @@
 /**
  * AdError class
  *
- * @public
  */
 export class AdError extends Error {
-  /**
-   * @internal
-   */
   constructor(readonly code: string, message: string) {
     super(message);
     this.name = 'AdError';
   }
 
-  /**
-   * @internal
-   */
   static fromNativeError(error: any): AdError {
     const { code, message } = error.userInfo;
     return new AdError(code, message);
@@ -41,10 +34,6 @@ export class AdError extends Error {
 
 /**
  * Type guard for AdError.
- * @param error - Uknown error object
- * @returns Whether the error is an AdError
- *
- * @public
  */
 export function isAdError(error: unknown): error is AdError {
   return error instanceof AdError;

src/AdLoader.ts

@@ -27,11 +27,8 @@ import {
   validateAdLoaderOptions,
   validateBannerAdLoaderOptions,
 } from './types/AdLoaderOptions';
-import { AdType } from './types/AdType';
+import { AdType } from './types';
 
-/**
- * @public
- */
 export class AdLoader {
   private static readonly _nativeModule = AdLoaderModule;
   private static readonly _eventEmitter = new NativeEventEmitter(
@@ -49,8 +46,6 @@ export class AdLoader {
 
   /**
    * Create a banner AdLoader instance.
-   * @param adLoaderOptions - `BannerAdLoaderOptions` object used to configure the bid request.
-   * @returns AdLoader instance.
    */
   static createBannerAdLoader(adLoaderOptions: BannerAdLoaderOptions) {
     try {
@@ -66,8 +61,6 @@ export class AdLoader {
 
   /**
    * Create a interstitial AdLoader instance.
-   * @param adLoaderOptions - `AdLoaderOptions` object used to configure the bid request.
-   * @returns AdLoader instance.
    */
   static createInterstitialAdLoader(adLoaderOptions: AdLoaderOptions) {
     try {
@@ -85,12 +78,6 @@ export class AdLoader {
    * Add a listener for the bid response. Supported events are:
    * - `AdLoaderEvent.SUCCESS`
    * - `AdLoaderEvent.FAILURE`
-   * @param eventName - The name of the event to listen.
-   * @param listener - The listener to be called when the event is fired.
-   *
-   * @returns Unsubscribe function.
-   *
-   * @public
    */
   addListener<E extends AdLoaderEvent>(
     eventName: E,
@@ -126,9 +113,6 @@ export class AdLoader {
    * Request APS for a bid. Only a single ad size and slotUUID is supported per bid request.
    * This method will return a promise that resolves a bid response requested by this call.
    * In order to receive further bid responses returned by auto refresh, you must register listeners via `addListener()`.
-   * @returns Promise of key value pairs from returned bid response.
-   *
-   * @public
    */
   async loadAd() {
     try {
@@ -149,18 +133,13 @@ export class AdLoader {
   /**
    * Stop the auto refresh of the ad.
    *
-   * @public
    */
   stopAutoRefresh() {
     AdLoader._nativeModule.stopAutoRefresh(this.loaderId);
   }
 
   /**
    * In order for SKAdNetwork to work, pass the app event.
-   * @param name - The name of the event.
-   * @param info - The data/info with the event.
-   *
-   * @public
    */
   static skadnHelper(name: string, info?: string) {
     if (typeof name !== 'string') {

src/TestIds.ts

@@ -18,9 +18,6 @@
 
 import { Platform } from 'react-native';
 
-/**
- * @public
- */
 export const TestIds = {
   APS_APP_KEY: '',
   APS_SLOT_BANNER_320x50: '',

src/turbomodules/NativeRNAPSAdLoaderModule.ts

@@ -16,20 +16,47 @@
  * along with Foobar. If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { TurboModule, TurboModuleRegistry } from 'react-native';
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
 
-import type { AdLoaderOptions, AdType, BannerAdLoaderOptions } from '../types';
+interface AdLoaderOptions {
+  /**
+   * The slotUUID of the ad slot.
+   */
+  slotUUID: string;
+  /**
+   * The optional custom targeting key value pairs for the bid request.
+   */
+  customTargeting?: { [key: string]: string };
+}
+
+interface BannerAdLoaderOptions extends AdLoaderOptions {
+  /**
+   * The size of the banner ad slot. Required for banner ad slots.
+   */
+  size?: string;
+
+  /**
+   * Whether the banner ad to be automatically refreshed. Defaults to `false`.
+   */
+  autoRefresh?: boolean;
+
+  /**
+   * The time interval in seconds between refreshes. Defaults to `60` seconds if autoRefresh enabled. The minimum auto-refresh time supported is `20` seconds.
+   */
+  refreshInterval?: number;
+}
 
 export interface Spec extends TurboModule {
   loadAd: (
     loaderId: number,
-    adType: AdType,
-    options: AdLoaderOptions | BannerAdLoaderOptions
+    adType: string,
+    options: BannerAdLoaderOptions
   ) => Promise<{ [key: string]: string }>;
 
   stopAutoRefresh: (loaderId: number) => void;
 
   skadnHelper: (name: string, info?: string) => void;
 }
 
-export default TurboModuleRegistry.get<Spec>('RNAPSAdLoaderModule');
+export default TurboModuleRegistry.getEnforcing<Spec>('RNAPSAdLoaderModule');

src/turbomodules/NativeRNAPSAdsModule.ts

@@ -15,10 +15,16 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with Foobar. If not, see <https://www.gnu.org/licenses/>.
  */
-
-import { TurboModule, TurboModuleRegistry } from 'react-native';
-
-import type { AdNetworkInfo, MRAIDPolicy } from '../types';
+import type { TurboModule } from 'react-native';
+import { TurboModuleRegistry } from 'react-native';
+
+interface AdNetworkInfo {
+  /**
+   * The name of the primary ad server or mediator
+   */
+  adNetwork: string;
+  adNetworkProperties?: { [key: string]: string };
+}
 
 /**
  * @internal
@@ -30,7 +36,7 @@ export interface Spec extends TurboModule {
 
   setMRAIDSupportedVersions: (supportedVersions: string[]) => void;
 
-  setMRAIDPolicy: (policy: MRAIDPolicy) => void;
+  setMRAIDPolicy: (policy: string) => void;
 
   setTestMode: (enabled: boolean) => void;
 
@@ -41,4 +47,4 @@ export interface Spec extends TurboModule {
   removeCustomAttribute: (key: string) => void;
 }
 
-export default TurboModuleRegistry.get<Spec>('RNAPSAdsModule');
+export default TurboModuleRegistry.getEnforcing<Spec>('RNAPSAdsModule');

src/types/AdLoaderEvent.ts

@@ -16,22 +16,13 @@
  * along with Foobar. If not, see <https://www.gnu.org/licenses/>.
  */
 
-/**
- * @public
- */
 export const AdLoaderEvent = {
   SUCCESS: 'onSuccess',
   FAILURE: 'onFailure',
 } as const;
 
-/**
- * @public
- */
 export type AdLoaderEvent = typeof AdLoaderEvent[keyof typeof AdLoaderEvent];
 
-/**
- * @internal
- */
 export function isAdLoaderEvent(value: any): value is AdLoaderEvent {
   return Object.values(AdLoaderEvent).includes(value);
 }

src/types/AdLoaderOptions.ts

@@ -16,9 +16,6 @@
  * along with Foobar. If not, see <https://www.gnu.org/licenses/>.
  */
 
-/**
- * @public
- */
 export interface AdLoaderOptions {
   /**
    * The slotUUID of the ad slot.
@@ -30,14 +27,11 @@ export interface AdLoaderOptions {
   customTargeting?: { [key: string]: string };
 }
 
-/**
- * @public
- */
 export interface BannerAdLoaderOptions extends AdLoaderOptions {
   /**
    * The size of the banner ad slot. Required for banner ad slots.
    */
-  size: string;
+  size?: string;
 
   /**
    * Whether the banner ad to be automatically refreshed. Defaults to `false`.
@@ -52,9 +46,6 @@ export interface BannerAdLoaderOptions extends AdLoaderOptions {
 
 const sizeRegex = /([0-9]+)x([0-9]+)/;
 
-/**
- * @internal
- */
 export function validateAdLoaderOptions(adLoaderOptions: AdLoaderOptions) {
   if (typeof adLoaderOptions !== 'object') {
     throw new Error("'adLoaderOptions' expected an object value");
@@ -64,9 +55,6 @@ export function validateAdLoaderOptions(adLoaderOptions: AdLoaderOptions) {
   }
 }
 
-/**
- * @internal
- */
 export function validateBannerAdLoaderOptions(
   adLoaderOptions: BannerAdLoaderOptions
 ) {