cordova-admob-tomitank 1.1.7 → 1.2.0

package/src/ios/AMBRewarded.swift

@@ -17,18 +17,15 @@ class AMBRewarded: AMBAdBase, FullScreenContentDelegate {
         RewardedAd.load(with: adUnitId, request: adRequest, completionHandler: { ad, error in
             if error != nil {
                 self.emit(AMBEvents.adLoadFail, error!)
-                self.emit(AMBEvents.rewardedLoadFail, error!)
-
                 ctx.reject(error!)
                 return
             }
 
-            self.mAd = ad
+            self.mAd = ads
             ad?.fullScreenContentDelegate = self
             ad?.serverSideVerificationOptions = ctx.optServerSideVerificationOptions()
 
             self.emit(AMBEvents.adLoad)
-            self.emit(AMBEvents.rewardedLoad)
 
             ctx.resolve()
         })
@@ -38,31 +35,26 @@ class AMBRewarded: AMBAdBase, FullScreenContentDelegate {
         mAd?.present(from: plugin.viewController, userDidEarnRewardHandler: {
             let reward = self.mAd!.adReward
             self.emit(AMBEvents.adReward, reward)
-            self.emit(AMBEvents.rewardedReward, reward)
         })
         ctx.resolve()
     }
 
     func adDidRecordImpression(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adImpression)
-        self.emit(AMBEvents.rewardedImpression)
     }
 
     func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         clear()
         self.emit(AMBEvents.adShowFail, error)
-        self.emit(AMBEvents.rewardedShowFail, error)
     }
 
     func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adShow)
-        self.emit(AMBEvents.rewardedShow)
     }
 
     func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
         clear()
         self.emit(AMBEvents.adDismiss)
-        self.emit(AMBEvents.rewardedDismiss)
     }
 
     private func clear() {

package/src/ios/AMBRewardedInterstitial.swift

@@ -17,8 +17,6 @@ class AMBRewardedInterstitial: AMBAdBase, FullScreenContentDelegate {
         RewardedInterstitialAd.load(with: adUnitId, request: adRequest, completionHandler: { ad, error in
             if error != nil {
                 self.emit(AMBEvents.adLoadFail, error!)
-                self.emit(AMBEvents.rewardedInterstitialLoadFail, error!)
-
                 ctx.reject(error!)
                 return
             }
@@ -28,7 +26,6 @@ class AMBRewardedInterstitial: AMBAdBase, FullScreenContentDelegate {
             ad?.serverSideVerificationOptions = ctx.optServerSideVerificationOptions()
 
             self.emit(AMBEvents.adLoad)
-            self.emit(AMBEvents.rewardedInterstitialLoad)
 
             ctx.resolve()
         })
@@ -38,31 +35,26 @@ class AMBRewardedInterstitial: AMBAdBase, FullScreenContentDelegate {
         mAd?.present(from: plugin.viewController, userDidEarnRewardHandler: {
             let reward = self.mAd!.adReward
             self.emit(AMBEvents.adReward, reward)
-            self.emit(AMBEvents.rewardedInterstitialReward, reward)
         })
         ctx.resolve()
     }
 
     func adDidRecordImpression(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adImpression)
-        self.emit(AMBEvents.rewardedInterstitialImpression)
     }
 
     func ad(_ ad: FullScreenPresentingAd, didFailToPresentFullScreenContentWithError error: Error) {
         clear()
         self.emit(AMBEvents.adShowFail, error)
-        self.emit(AMBEvents.rewardedInterstitialShowFail, error)
     }
 
     func adWillPresentFullScreenContent(_ ad: FullScreenPresentingAd) {
         self.emit(AMBEvents.adShow)
-        self.emit(AMBEvents.rewardedInterstitialShow)
     }
 
     func adDidDismissFullScreenContent(_ ad: FullScreenPresentingAd) {
         clear()
         self.emit(AMBEvents.adDismiss)
-        self.emit(AMBEvents.rewardedInterstitialDismiss)
     }
 
     private func clear() {

package/src/www/admob.ts

@@ -1,26 +1,26 @@
-import * as cordova from 'cordova'
-import channel from 'cordova/channel'
-import exec from 'cordova/exec'
-import { AdMob } from '.'
-import { MobileAd, NativeActions } from './shared'
+import { AdMob } from '.';
+import exec from 'cordova/exec';
+import * as cordova from 'cordova';
+import channel from 'cordova/channel';
+import { MobileAd, NativeActions } from './shared';
 
-const admob = new AdMob()
+const admob = new AdMob();
 
 function onMessageFromNative(event: any) {
-  const { data } = event
+  const { data } = event;
   if (data && data.adId) {
-    data.ad = MobileAd.getAdById(data.adId)
+    data.ad = MobileAd.getAdById(data.adId);
   }
-  cordova.fireDocumentEvent(event.type, data)
+  cordova.fireDocumentEvent(event.type, data);
 }
 
-const feature = 'onAdMobPlusReady'
-channel.createSticky(feature)
-channel.waitForInitialization(feature)
+const feature = 'onAdMobPlusReady';
+channel.createSticky(feature);
+channel.waitForInitialization(feature);
 
 channel.onCordovaReady.subscribe(() => {
-  exec(onMessageFromNative, console.error, 'AdMob', NativeActions.ready, [])
-  channel.initializationComplete(feature)
-})
+  exec(onMessageFromNative, console.error, 'AdMob', NativeActions.ready, []);
+  channel.initializationComplete(feature);
+});
 
-export default admob
+export default admob;

package/src/www/api.ts

@@ -1,6 +1,6 @@
-import { execAsync, NativeActions } from './generated'
-
-export { execAsync, AdSizeType, Events, NativeActions } from './generated'
+import BannerAd from './banner';
+import { execAsync, Events, NativeActions } from './generated';
+export { execAsync, AdSizeType, Events, NativeActions } from './generated';
 
 /** @internal */
 export type MobileAdOptions = {
@@ -9,104 +9,108 @@ export type MobileAdOptions = {
   contentUrl?: string
   keywords?: string[]
   npa?: '1'
-}
+};
+
+let started = false;
+let startPromise: Promise<{ version: string }> | null = null;
+type AdEventNames = Exclude<keyof typeof Events, 'ready'> extends infer K
+  ? K extends keyof typeof Events
+    ? typeof Events[K] extends `admob.${string}.${infer EventName}`
+      ? EventName
+      : never
+    : never
+  : never;
 
-let started = false
-let startPromise: Promise<{ version: string }> | null = null
+// Size and dimension currently only apply to the banner
+type AdEventNamesByType<T extends MobileAd<any>> = T extends BannerAd ? Omit<AdEventNames, 'size'|'sizechange'> : AdEventNames;
 
 /** @internal */
 export async function start() {
-  startPromise = execAsync(NativeActions.start) as Promise<{ version: string }>
-  const result = await startPromise
-  started = true
-  return result
+  startPromise = execAsync(NativeActions.start) as Promise<{ version: string }>;
+  const result = await startPromise;
+  started = true;
+  return result;
 }
 
 /** @internal */
 export class MobileAd<T extends MobileAdOptions = MobileAdOptions> {
-  public static readonly type: string = ''
-
-  private static allAds: { [s: string]: MobileAd } = {}
-  private static idCounter = 0
-
-  public readonly id: string
-
-  protected readonly opts: T
-  private _created = false
-  private _init: Promise<any> | null = null
+  public static readonly type: string = '';
+  private static allAds: { [s: string]: MobileAd } = {};
+  public readonly id: string;
+  protected readonly opts: T;
+  private _created = false;
+  private _init: Promise<any> | null = null;
 
   constructor(opts: T) {
-    this.opts = opts
-
+    this.opts = opts;
     this.id = opts.id ?? opts.adUnitId;
-    MobileAd.allAds[this.id] = this
+    MobileAd.allAds[this.id] = this;
   }
 
   public static getAdById(id: string) {
-    return this.allAds[id]
+    return this.allAds[id];
   }
 
   public get adUnitId() {
-    return this.opts.adUnitId
+    return this.opts.adUnitId;
   }
 
-  public on(...args: Parameters<typeof document.addEventListener>): () => void {
-    const [eventName, cb, ...rest] = args
-    const type = `admob.ad.${eventName.toLowerCase()}`
-    const listener = (evt: any) => {
+  public on<EventNames extends AdEventNamesByType<this>>(eventName: EventNames, callback: (ev: Event) => any, useCapture?: boolean): () => void {
+    const type = `admob.ad.${eventName.toLowerCase()}`;
+    const listener = (evt: Event & { ad?: MobileAd }) => {
       if (evt.ad === this) {
-        cb(evt)
+        callback(evt);
       }
-    }
-    document.addEventListener(type, listener, ...rest)
+    };
+    document.addEventListener(type, listener, useCapture);
 
     return () => {
-      document.removeEventListener(type, listener, ...rest)
-    }
+      document.removeEventListener(type, listener, useCapture);
+    };
   }
 
   protected async isLoaded() {
-    await this.init()
+    await this.init();
     return execAsync(NativeActions.adIsLoaded, [
       { id: this.id },
-    ]) as Promise<boolean>
+    ]) as Promise<boolean>;
   }
 
   protected async load() {
     await this.init()
     // TODO read `opts` in native code?
-    await execAsync(NativeActions.adLoad, [{ ...this.opts, id: this.id }])
+    await execAsync(NativeActions.adLoad, [{ ...this.opts, id: this.id }]);
   }
 
   protected async show(opts?: Record<string, any>) {
     await this.init()
-    return execAsync(NativeActions.adShow, [{ ...opts, id: this.id }])
+    return execAsync(NativeActions.adShow, [{ ...opts, id: this.id }]);
   }
 
   protected async hide() {
-    return execAsync(NativeActions.adHide, [{ id: this.id }])
+    return execAsync(NativeActions.adHide, [{ id: this.id }]);
   }
 
   protected async init() {
-    if (this._created) return
+    if (this._created) return;
 
     if (!started) {
-      if (startPromise === null) start()
-      await startPromise
+      if (startPromise === null) start();
+      await startPromise;
     }
 
     if (this._init === null) {
       const cls =
         (this.constructor as unknown as { cls?: string }).cls ??
-        this.constructor.name
+        this.constructor.name;
 
       this._init = execAsync(NativeActions.adCreate, [
         { ...this.opts, id: this.id, cls },
-      ])
+      ]);
     }
 
-    await this._init
-    this._created = true
+    await this._init;
+    this._created = true;
   }
 }
 
@@ -119,12 +123,12 @@ export enum MaxAdContentRating {
 }
 
 export type RequestConfig = {
-  maxAdContentRating?: MaxAdContentRating
-  sameAppKey?: boolean,
-  tagForChildDirectedTreatment?: boolean | null
-  tagForUnderAgeOfConsent?: boolean | null
-  testDeviceIds?: string[]
-}
+  maxAdContentRating?: MaxAdContentRating;
+  publisherFirstPartyIDEnabled?: boolean;
+  tagForChildDirectedTreatment?: boolean | null;
+  tagForUnderAgeOfConsent?: boolean | null;
+  testDeviceIds?: string[];
+};
 
 export const enum Platforms {
   android = 'android',
@@ -141,4 +145,4 @@ export enum TrackingAuthorizationStatus {
 export type AdMobConfig = {
   appMuted?: boolean
   appVolume?: number
-} & RequestConfig
+} & RequestConfig;

package/src/www/generated.ts

@@ -1,70 +1,32 @@
 // THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 export enum NativeActions {
-  adCreate = 'adCreate',
-  adHide = 'adHide',
-  adIsLoaded = 'adIsLoaded',
+  ready = 'ready',
+  start = 'start',
   adLoad = 'adLoad',
   adShow = 'adShow',
-  bannerConfig = 'bannerConfig',
-  bannerHide = 'bannerHide',
-  bannerLoad = 'bannerLoad',
-  bannerShow = 'bannerShow',
-  configRequest = 'configRequest',
+  adHide = 'adHide',
+  adCreate = 'adCreate',
   configure = 'configure',
-  interstitialIsLoaded = 'interstitialIsLoaded',
-  interstitialLoad = 'interstitialLoad',
-  interstitialShow = 'interstitialShow',
-  ready = 'ready',
-  requestTrackingAuthorization = 'requestTrackingAuthorization',
-  rewardedInterstitialIsLoaded = 'rewardedInterstitialIsLoaded',
-  rewardedInterstitialLoad = 'rewardedInterstitialLoad',
-  rewardedInterstitialShow = 'rewardedInterstitialShow',
-  rewardedIsLoaded = 'rewardedIsLoaded',
-  rewardedLoad = 'rewardedLoad',
-  rewardedShow = 'rewardedShow',
+  adIsLoaded = 'adIsLoaded',
   setAppMuted = 'setAppMuted',
   setAppVolume = 'setAppVolume',
-  start = 'start',
+  bannerConfig = 'bannerConfig',
+  configRequest = 'configRequest',
+  requestTrackingAuthorization = 'requestTrackingAuthorization'
 }
 
 export enum Events {
-  adClick = 'admob.ad.click',
-  adDismiss = 'admob.ad.dismiss',
-  adImpression = 'admob.ad.impression',
-  adLoad = 'admob.ad.load',
-  adLoadFail = 'admob.ad.loadfail',
-  adReward = 'admob.ad.reward',
-  adShow = 'admob.ad.show',
-  adShowFail = 'admob.ad.showfail',
-  bannerClick = 'admob.banner.click',
-  bannerClose = 'admob.banner.close',
-  bannerImpression = 'admob.banner.impression',
-  bannerLoad = 'admob.banner.load',
-  bannerLoadFail = 'admob.banner.loadfail',
-  bannerOpen = 'admob.banner.open',
-  bannerSize = 'admob.banner.size',
-  bannerSizeChange = 'admob.banner.sizechange',
-  interstitialDismiss = 'admob.interstitial.dismiss',
-  interstitialImpression = 'admob.interstitial.impression',
-  interstitialLoad = 'admob.interstitial.load',
-  interstitialLoadFail = 'admob.interstitial.loadfail',
-  interstitialShow = 'admob.interstitial.show',
-  interstitialShowFail = 'admob.interstitial.showfail',
-  ready = 'admob.ready',
-  rewardedDismiss = 'admob.rewarded.dismiss',
-  rewardedImpression = 'admob.rewarded.impression',
-  rewardedInterstitialDismiss = 'admob.rewardedi.dismiss',
-  rewardedInterstitialImpression = 'admob.rewardedi.impression',
-  rewardedInterstitialLoad = 'admob.rewardedi.load',
-  rewardedInterstitialLoadFail = 'admob.rewardedi.loadfail',
-  rewardedInterstitialReward = 'admob.rewardedi.reward',
-  rewardedInterstitialShow = 'admob.rewardedi.show',
-  rewardedInterstitialShowFail = 'admob.rewardedi.showfail',
-  rewardedLoad = 'admob.rewarded.load',
-  rewardedLoadFail = 'admob.rewarded.loadfail',
-  rewardedReward = 'admob.rewarded.reward',
-  rewardedShow = 'admob.rewarded.show',
-  rewardedShowFail = 'admob.rewarded.showfail',
+  ready = "admob.ready",
+  adLoad = "admob.ad.load",
+  adShow = "admob.ad.show",
+  adClick = "admob.ad.click",
+  adReward = "admob.ad.reward",
+  adDismiss = "admob.ad.dismiss",
+  adLoadFail = "admob.ad.loadfail",
+  adShowFail = "admob.ad.showfail",
+  adImpression = "admob.ad.impression",
+  bannerSizeChange = "admob.ad.sizechange", // use same path
+  bannerSize = "admob.ad.size" // use same path
 }
 
 export enum AdSizeType {

package/src/www/index.ts

@@ -1,14 +1,14 @@
-import AppOpenAd from './app-open'
-import BannerAd, { BannerAdOptions } from './banner'
-import InterstitialAd from './interstitial'
-import NativeAd, { NativeAdOptions } from './native'
+import AppOpenAd from './app-open';
+import InterstitialAd from './interstitial';
+import BannerAd, { BannerAdOptions } from './banner';
+import NativeAd, { NativeAdOptions } from './native';
 import RewardedAd, {
   RewardedAdOptions,
   ServerSideVerificationOptions,
-} from './rewarded'
+} from './rewarded';
 import RewardedInterstitialAd, {
   RewardedInterstitialAdOptions,
-} from './rewarded-interstitial'
+} from './rewarded-interstitial';
 import {
   AdMobConfig,
   Events,
@@ -19,9 +19,9 @@ import {
   start,
   AdSizeType,
   TrackingAuthorizationStatus,
-} from './shared'
+} from './shared';
 
-export * from './api'
+export * from './api';
 export {
   AppOpenAd,
   BannerAd,
@@ -34,56 +34,56 @@ export {
   RewardedInterstitialAd,
   RewardedInterstitialAdOptions,
   ServerSideVerificationOptions,
-}
+};
 
 export class AdMob {
-  public readonly AppOpenAd = AppOpenAd
-  public readonly BannerAd = BannerAd
-  public readonly InterstitialAd = InterstitialAd
-  public readonly NativeAd = NativeAd
-  public readonly RewardedAd = RewardedAd
-  public readonly RewardedInterstitialAd = RewardedInterstitialAd
-  public readonly AdSizeType = AdSizeType
-  public readonly Events = Events
-  public readonly TrackingAuthorizationStatus = TrackingAuthorizationStatus
+  public readonly AppOpenAd = AppOpenAd;
+  public readonly BannerAd = BannerAd;
+  public readonly InterstitialAd = InterstitialAd;
+  public readonly NativeAd = NativeAd;
+  public readonly RewardedAd = RewardedAd;
+  public readonly RewardedInterstitialAd = RewardedInterstitialAd;
+  public readonly AdSizeType = AdSizeType;
+  public readonly Events = Events;
+  public readonly TrackingAuthorizationStatus = TrackingAuthorizationStatus;
 
-  configure(config: AdMobConfig) {
-    return execAsync(NativeActions.configure, [config])
+  public configure(config: AdMobConfig) {
+    return execAsync(NativeActions.configure, [config]);
   }
 
   public configRequest(requestConfig: RequestConfig) {
-    return execAsync(NativeActions.configRequest, [requestConfig])
+    return execAsync(NativeActions.configRequest, [requestConfig]);
   }
 
   public setAppMuted(value: boolean) {
-    return execAsync(NativeActions.setAppMuted, [value])
+    return execAsync(NativeActions.setAppMuted, [value]);
   }
 
   public setAppVolume(value: number) {
-    return execAsync(NativeActions.setAppVolume, [value])
+    return execAsync(NativeActions.setAppVolume, [value]);
   }
 
   public start() {
-    return start()
+    return start();
   }
 
   public async requestTrackingAuthorization(): Promise<
     TrackingAuthorizationStatus | false
   > {
     if (cordova.platformId === Platforms.ios) {
-      const n = await execAsync(NativeActions.requestTrackingAuthorization)
+      const n = await execAsync(NativeActions.requestTrackingAuthorization);
       if (n !== false) {
         return TrackingAuthorizationStatus[
           TrackingAuthorizationStatus[n as number]
-        ]
+        ];
       }
     }
-    return false
+    return false;
   }
 }
 
 declare global {
-  const admob: AdMob
+  const admob: AdMob;
 }
 
-export default AdMob
+export default AdMob;