@cardsjd/portal 0.1.16 → 0.1.17

package/lib/NextGenAdMobPortal.js

@@ -1,451 +1,513 @@
-import { BasePortal } from './BasePortal.js';
-
-export class NextGenAdMobPortal extends BasePortal {
-	name = 'NextGenAdMobPortal';
-	autoLogin = false;
-
-	constructor(appConfig) {
-		super();
-		this.appConfig = appConfig;
-
-		// Ad callback properties
-		this.onAdLoaded = null;
-		this.onAdOpened = null;
-		this.onAdClosed = null;
-		this.onAdError = null;
-		this.onAdRewarded = null;
-		this.onBeforeTrackingAuthorization = null;
-		this.onPrivacyOptionsRequirementChanged = null;
-
-		this.adProviderName = 'CapgoAdmob';
-		this.isSetup = false;
-		this.isSetupLoading = false;
-		this._setupPromise = null;
-		this.isInterstitialAdReady = false;
-		this._isRewardedAdLoaded = false;
-		this._receivedReward = false;
-		this._rewardInfo = null;
+import { BasePortal } from './BasePortal.js';
+
+export class NextGenAdMobPortal extends BasePortal {
+	name = 'NextGenAdMobPortal';
+	autoLogin = false;
+
+	constructor(appConfig) {
+		super();
+		this.appConfig = appConfig;
+
+		// Ad callback properties
+		this.onAdLoaded = null;
+		this.onAdOpened = null;
+		this.onAdClosed = null;
+		this.onAdError = null;
+		this.onAdRewarded = null;
+		this.onBeforeTrackingAuthorization = null;
+		this.onPrivacyOptionsRequirementChanged = null;
+
+		this.adProviderName = 'CapgoAdmob';
+		this.isSetup = false;
+		this.isSetupLoading = false;
+		this._setupPromise = null;
+		this.isInterstitialAdReady = false;
+		this._isRewardedAdLoaded = false;
+		this._receivedReward = false;
+		this._rewardInfo = null;
 		this._interstitialAd = null;
-		this._interstitialLoadPromise = null;
-		this._rewardedAd = null;
-		this._adMobModule = null;
-		this._umpModule = null;
-		this._consentInfoUpdated = false;
-		this._consentGathered = false;
-		this._canRequestAds = false;
-		this._limitedAdsFallback = false;
-		this._privacyOptionsRequired = false;
-		this.isTesting = false;
-	}
-
-	async getAdMob() {
-		if (!this._adMobModule) {
-			// eslint-disable-next-line import/no-unresolved
-			this._adMobModule = await import('@capgo/capacitor-admob');
-		}
-
-		return this._adMobModule;
-	}
-
-	async loadUmp() {
-		if (!this._umpModule) {
-			// eslint-disable-next-line import/no-unresolved
-			const { GoogleUmpConsent } = await import('@cardsjd/google-ump');
-			this._umpModule = GoogleUmpConsent;
-		}
-	}
-
-	async requestTrackingAuthorization(_consentInfo) {
-		return false;
-	}
-
-	async canStartAdsWithoutPrompt() {
-		return true;
-	}
-
-	setConsentInfo(consentInfo) {
-		const wasRequired = this._privacyOptionsRequired;
-		if (typeof consentInfo?.canRequestAds === 'boolean') {
-			this._canRequestAds = consentInfo.canRequestAds;
-		}
-
-		this._privacyOptionsRequired = consentInfo?.privacyOptionsRequired === true;
-
-		if (
-			wasRequired !== this._privacyOptionsRequired &&
-			this.onPrivacyOptionsRequirementChanged
-		) {
-			this.onPrivacyOptionsRequirementChanged(this._privacyOptionsRequired);
-		}
-	}
-
-	isPrivacyOptionsRequired() {
-		return this._privacyOptionsRequired;
-	}
-
-	async showPrivacyOptions() {
-		await this.loadUmp();
-		const consentInfo = await this._umpModule.showPrivacyOptions();
-		if (consentInfo.canRequestAds === true) {
-			this._limitedAdsFallback = false;
-		}
-
-		this.setConsentInfo(consentInfo);
-		return consentInfo;
-	}
-
-	async requestConsent(method) {
-		try {
-			await this.loadUmp();
-			return await this._umpModule[method]();
-		} catch (error) {
-			// UMP may still allow ads using consent from a previous session.
-			let consentInfo;
-			try {
-				consentInfo = await this._umpModule.getConsentInfo();
-			} catch (statusError) {
-				console.warn('Unable to read UMP consent status:', statusError);
-			}
-
-			if (consentInfo?.canRequestAds === true) {
-				console.warn('UMP consent request failed; using existing consent:', error);
-				return consentInfo;
-			}
-
-			// Set Google's native limited-ad signal before allowing any ad requests.
-			await this.loadUmp();
-			await this._umpModule.enableLimitedAds();
-			this._limitedAdsFallback = true;
-			this._consentGathered = true;
-			console.warn('UMP consent request failed; requesting limited ads:', error);
-			return {
-				canRequestAds: true,
-				formShown: false,
-				privacyOptionsRequired: consentInfo?.privacyOptionsRequired ?? this._privacyOptionsRequired,
-			};
-		}
-	}
-
-	async updateConsentInfo() {
-		const consentInfo = await this.requestConsent('updateConsentInfo');
-		this._consentInfoUpdated = true;
-		this.setConsentInfo(consentInfo);
-		return consentInfo;
-	}
-
-	async gatherConsent() {
-		const consentInfo = await this.requestConsent('gatherConsent');
-		this._consentInfoUpdated = true;
-		this._consentGathered = true;
-		this.setConsentInfo(consentInfo);
-		return consentInfo;
-	}
-
-	getAdError(info, fallbackMessage) {
-		return new Error(info?.error?.message || info?.message || fallbackMessage);
-	}
-
-	// ----- Ad methods -----
-
-	async setupAds() {
-		if (this.isSetup || this._consentInfoUpdated) {
-			return;
-		}
-
-		if (!this._setupPromise) {
-			this._setupPromise = (async () => {
-				this.isSetupLoading = true;
-
-				try {
-					await this.updateConsentInfo();
-				} catch (error) {
-					console.error('Failed to update UMP consent info:', error);
-				} finally {
-					this.isSetupLoading = false;
-				}
-			})();
-		}
-
-		const setupPromise = this._setupPromise;
-		try {
-			await setupPromise;
-		} finally {
-			if (this._setupPromise === setupPromise) {
-				this._setupPromise = null;
-			}
-		}
-	}
-
-	async ensureAdsReady() {
-		if (this.isSetup) {
-			return {
-				canRequestAds: true,
-				promptShown: false,
-			};
-		}
-
-		let consentInfo;
-		try {
-			if (!this._consentInfoUpdated) {
-				await this.updateConsentInfo();
-			}
-
-			consentInfo = this._consentGathered ? {
-				canRequestAds: this._canRequestAds,
-			} : await this.gatherConsent();
-		} catch (error) {
-			if (this.onAdError) {
-				this.onAdError(error);
-			}
-
-			return {
-				canRequestAds: false,
-				promptShown: false,
-			};
-		}
-
-		const trackingPromptShown = !this._limitedAdsFallback && await this.requestTrackingAuthorization(consentInfo);
-		const promptShown = consentInfo?.formShown === true || trackingPromptShown;
-
-		if (consentInfo.canRequestAds !== true) {
-			return {
-				canRequestAds: false,
-				promptShown,
-			};
-		}
-
-		await this.startAds();
-		return {
-			canRequestAds: true,
-			promptShown,
-		};
-	}
-
-	async prepareAdsWithoutPrompt() {
-		if (this.isSetup) {
-			return true;
-		}
-
-		if (!this._consentInfoUpdated) {
-			await this.setupAds();
-		}
-
-		if (!this._canRequestAds || (!this._limitedAdsFallback && !await this.canStartAdsWithoutPrompt())) {
-			return false;
-		}
-
-		await this.startAds();
-		return true;
-	}
-
-	async startAds() {
-		if (this.isSetup) {
-			return;
-		}
-
-		if (this.isSetupLoading) {
-			throw Error('Capgo AdMob setup is in progress already');
-		}
-
-		this.isSetupLoading = true;
-
-		try {
-			const { AdMob } = await this.getAdMob();
-			await AdMob.start();
-
-			await AdMob.addListener('interstitial.show', (info) => {
-				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
-					this.isInterstitialAdReady = false;
-					if (this.onAdOpened) {
-						this.onAdOpened({
-							adType: 'interstitial',
-							adProvider: this.adProviderName,
-						});
+		// Native show resolves on opening; keep this until dismissal or show failure.
+		this._showingAd = null;
+		this._interstitialLoadPromise = null;
+		this._rewardedAd = null;
+		this._adMobModule = null;
+		this._umpModule = null;
+		this._consentInfoUpdated = false;
+		this._consentGathered = false;
+		this._canRequestAds = false;
+		this._limitedAdsFallback = false;
+		this._privacyOptionsRequired = false;
+		this.isTesting = false;
+	}
+
+	async getAdMob() {
+		if (!this._adMobModule) {
+			// eslint-disable-next-line import/no-unresolved
+			this._adMobModule = await import('@capgo/capacitor-admob');
+		}
+
+		return this._adMobModule;
+	}
+
+	async loadUmp() {
+		if (!this._umpModule) {
+			// eslint-disable-next-line import/no-unresolved
+			const { GoogleUmpConsent } = await import('@cardsjd/google-ump');
+			this._umpModule = GoogleUmpConsent;
+		}
+	}
+
+	async requestTrackingAuthorization(_consentInfo) {
+		return false;
+	}
+
+	async canStartAdsWithoutPrompt() {
+		return true;
+	}
+
+	setConsentInfo(consentInfo) {
+		const wasRequired = this._privacyOptionsRequired;
+		if (typeof consentInfo?.canRequestAds === 'boolean') {
+			this._canRequestAds = consentInfo.canRequestAds;
+		}
+
+		this._privacyOptionsRequired = consentInfo?.privacyOptionsRequired === true;
+
+		if (
+			wasRequired !== this._privacyOptionsRequired &&
+			this.onPrivacyOptionsRequirementChanged
+		) {
+			this.onPrivacyOptionsRequirementChanged(this._privacyOptionsRequired);
+		}
+	}
+
+	isPrivacyOptionsRequired() {
+		return this._privacyOptionsRequired;
+	}
+
+	async showPrivacyOptions() {
+		await this.loadUmp();
+		const consentInfo = await this._umpModule.showPrivacyOptions();
+		if (consentInfo.canRequestAds === true) {
+			this._limitedAdsFallback = false;
+		}
+
+		this.setConsentInfo(consentInfo);
+		return consentInfo;
+	}
+
+	async requestConsent(method) {
+		try {
+			await this.loadUmp();
+			return await this._umpModule[method]();
+		} catch (error) {
+			// UMP may still allow ads using consent from a previous session.
+			let consentInfo;
+			try {
+				consentInfo = await this._umpModule.getConsentInfo();
+			} catch (statusError) {
+				console.warn('Unable to read UMP consent status:', statusError);
+			}
+
+			if (consentInfo?.canRequestAds === true) {
+				console.warn('UMP consent request failed; using existing consent:', error);
+				return consentInfo;
+			}
+
+			// Set Google's native limited-ad signal before allowing any ad requests.
+			await this.loadUmp();
+			await this._umpModule.enableLimitedAds();
+			this._limitedAdsFallback = true;
+			this._consentGathered = true;
+			console.warn('UMP consent request failed; requesting limited ads:', error);
+			return {
+				canRequestAds: true,
+				formShown: false,
+				privacyOptionsRequired: consentInfo?.privacyOptionsRequired ?? this._privacyOptionsRequired,
+			};
+		}
+	}
+
+	async updateConsentInfo() {
+		const consentInfo = await this.requestConsent('updateConsentInfo');
+		this._consentInfoUpdated = true;
+		this.setConsentInfo(consentInfo);
+		return consentInfo;
+	}
+
+	async gatherConsent() {
+		const consentInfo = await this.requestConsent('gatherConsent');
+		this._consentInfoUpdated = true;
+		this._consentGathered = true;
+		this.setConsentInfo(consentInfo);
+		return consentInfo;
+	}
+
+	getAdError(info, fallbackMessage) {
+		return new Error(info?.error?.message || info?.message || fallbackMessage);
+	}
+
+	// ----- Ad methods -----
+
+	async setupAds() {
+		if (this.isSetup || this._consentInfoUpdated) {
+			return;
+		}
+
+		if (!this._setupPromise) {
+			this._setupPromise = (async () => {
+				this.isSetupLoading = true;
+
+				try {
+					await this.updateConsentInfo();
+				} catch (error) {
+					console.error('Failed to update UMP consent info:', error);
+				} finally {
+					this.isSetupLoading = false;
+				}
+			})();
+		}
+
+		const setupPromise = this._setupPromise;
+		try {
+			await setupPromise;
+		} finally {
+			if (this._setupPromise === setupPromise) {
+				this._setupPromise = null;
+			}
+		}
+	}
+
+	async ensureAdsReady() {
+		if (this.isSetup) {
+			return {
+				canRequestAds: true,
+				promptShown: false,
+			};
+		}
+
+		let consentInfo;
+		try {
+			if (!this._consentInfoUpdated) {
+				await this.updateConsentInfo();
+			}
+
+			consentInfo = this._consentGathered ? {
+				canRequestAds: this._canRequestAds,
+			} : await this.gatherConsent();
+		} catch (error) {
+			if (this.onAdError) {
+				this.onAdError(error);
+			}
+
+			return {
+				canRequestAds: false,
+				promptShown: false,
+			};
+		}
+
+		const trackingPromptShown = !this._limitedAdsFallback && await this.requestTrackingAuthorization(consentInfo);
+		const promptShown = consentInfo?.formShown === true || trackingPromptShown;
+
+		if (consentInfo.canRequestAds !== true) {
+			return {
+				canRequestAds: false,
+				promptShown,
+			};
+		}
+
+		await this.startAds();
+		return {
+			canRequestAds: true,
+			promptShown,
+		};
+	}
+
+	async prepareAdsWithoutPrompt() {
+		if (this.isSetup) {
+			return true;
+		}
+
+		if (!this._consentInfoUpdated) {
+			await this.setupAds();
+		}
+
+		if (!this._canRequestAds || (!this._limitedAdsFallback && !await this.canStartAdsWithoutPrompt())) {
+			return false;
+		}
+
+		await this.startAds();
+		return true;
+	}
+
+	async startAds() {
+		if (this.isSetup) {
+			return;
+		}
+
+		if (this.isSetupLoading) {
+			throw Error('Capgo AdMob setup is in progress already');
+		}
+
+		this.isSetupLoading = true;
+
+		try {
+			const { AdMob } = await this.getAdMob();
+			await AdMob.start();
+
+			await AdMob.addListener('interstitial.show', (info) => {
+				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
+					this.isInterstitialAdReady = false;
+					if (this.onAdOpened) {
+						this.onAdOpened({
+							adType: 'interstitial',
+							adProvider: this.adProviderName,
+						});
+					}
+				}
+			});
+			await AdMob.addListener('interstitial.dismiss', (info) => {
+				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
+					if (this._showingAd === this._interstitialAd) {
+						this._showingAd = null;
 					}
-				}
-			});
-			await AdMob.addListener('interstitial.dismiss', (info) => {
-				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
-					this.isInterstitialAdReady = false;
-					this._interstitialAd = null;
-					if (this.onAdClosed) {
-						this.onAdClosed({
-							adType: 'interstitial',
-							adProvider: this.adProviderName,
-						});
-					}
-				}
-			});
-			await AdMob.addListener('interstitial.loadfail', (info) => {
-				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
-					this.isInterstitialAdReady = false;
-					this._interstitialAd = null;
-					if (this.onAdError) {
-						this.onAdError(this.getAdError(info, 'InterstitialAd failed to load'));
-					}
-				}
-			});
-			await AdMob.addListener('interstitial.showfail', (info) => {
-				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
-					this.isInterstitialAdReady = false;
-					this._interstitialAd = null;
-					if (this.onAdError) {
-						this.onAdError(this.getAdError(info, 'InterstitialAd failed to show'));
-					}
-				}
-			});
-			await AdMob.addListener('rewarded.dismiss', (info) => {
-				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
-					this._isRewardedAdLoaded = false;
-					this._rewardedAd = null;
-					if (this.onAdClosed) {
-						this.onAdClosed({
-							adType: 'rewarded',
-							adProvider: this.adProviderName,
-						});
-					}
-
-					if (this._receivedReward && this.onAdRewarded) {
-						this.onAdRewarded(this._rewardInfo);
+
+					this.isInterstitialAdReady = false;
+					this._interstitialAd = null;
+					if (this.onAdClosed) {
+						this.onAdClosed({
+							adType: 'interstitial',
+							adProvider: this.adProviderName,
+						});
+					}
+				}
+			});
+			await AdMob.addListener('interstitial.loadfail', (info) => {
+				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
+					this.isInterstitialAdReady = false;
+					this._interstitialAd = null;
+					if (this.onAdError) {
+						this.onAdError(this.getAdError(info, 'InterstitialAd failed to load'));
+					}
+				}
+			});
+			await AdMob.addListener('interstitial.showfail', (info) => {
+				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
+					if (this._showingAd === this._interstitialAd) {
+						this._showingAd = null;
 					}
-				}
-			});
-			await AdMob.addListener('rewarded.loadfail', (info) => {
-				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
-					this._isRewardedAdLoaded = false;
-					this._rewardedAd = null;
-					if (this.onAdError) {
-						this.onAdError(this.getAdError(info, 'RewardAd failed to load'));
+
+					this.isInterstitialAdReady = false;
+					this._interstitialAd = null;
+					if (this.onAdError) {
+						this.onAdError(this.getAdError(info, 'InterstitialAd failed to show'));
+					}
+				}
+			});
+			await AdMob.addListener('rewarded.dismiss', (info) => {
+				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
+					if (this._showingAd === this._rewardedAd) {
+						this._showingAd = null;
 					}
-				}
-			});
-			await AdMob.addListener('rewarded.showfail', (info) => {
-				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
-					this._isRewardedAdLoaded = false;
-					this._rewardedAd = null;
-					if (this.onAdError) {
-						this.onAdError(this.getAdError(info, 'RewardAd failed to show'));
+
+					this._isRewardedAdLoaded = false;
+					this._rewardedAd = null;
+					if (this.onAdClosed) {
+						this.onAdClosed({
+							adType: 'rewarded',
+							adProvider: this.adProviderName,
+						});
+					}
+
+					if (this._receivedReward && this.onAdRewarded) {
+						this.onAdRewarded(this._rewardInfo);
+					}
+				}
+			});
+			await AdMob.addListener('rewarded.loadfail', (info) => {
+				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
+					this._isRewardedAdLoaded = false;
+					this._rewardedAd = null;
+					if (this.onAdError) {
+						this.onAdError(this.getAdError(info, 'RewardAd failed to load'));
+					}
+				}
+			});
+			await AdMob.addListener('rewarded.showfail', (info) => {
+				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
+					if (this._showingAd === this._rewardedAd) {
+						this._showingAd = null;
 					}
+
+					this._isRewardedAdLoaded = false;
+					this._rewardedAd = null;
+					if (this.onAdError) {
+						this.onAdError(this.getAdError(info, 'RewardAd failed to show'));
+					}
+				}
+			});
+			await AdMob.addListener('rewarded.reward', (info) => {
+				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
+					this._receivedReward = true;
+					this._rewardInfo = info.reward;
+				}
+			});
+
+			this.isSetup = true;
+		} finally {
+			this.isSetupLoading = false;
+		}
+	}
+
+	isAdLoaded() {
+		return this.isInterstitialAdReady;
+	}
+
+	isRewardedAdLoaded() {
+		return this._isRewardedAdLoaded;
+	}
+
+	async loadInterstitialAd() {
+		if (this._showingAd || this.isAdLoaded()) {
+			return;
+		}
+
+		if (!this._interstitialLoadPromise) {
+			this._interstitialLoadPromise = (async () => {
+				if (!await this.prepareAdsWithoutPrompt()) {
+					return;
+				}
+
+				const { InterstitialAd } = await this.getAdMob();
+				if (this._showingAd) {
+					return;
 				}
-			});
-			await AdMob.addListener('rewarded.reward', (info) => {
-				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
-					this._receivedReward = true;
-					this._rewardInfo = info.reward;
-				}
-			});
-
-			this.isSetup = true;
-		} finally {
-			this.isSetupLoading = false;
-		}
-	}
-
-	isAdLoaded() {
-		return this.isInterstitialAdReady;
-	}
-
-	isRewardedAdLoaded() {
-		return this._isRewardedAdLoaded;
-	}
-
-	async loadInterstitialAd() {
-		if (this.isAdLoaded()) {
-			return;
-		}
-
-		if (!this._interstitialLoadPromise) {
-			this._interstitialLoadPromise = (async () => {
-				if (!await this.prepareAdsWithoutPrompt()) {
-					return;
-				}
-
-				const { InterstitialAd } = await this.getAdMob();
-				this._interstitialAd = new InterstitialAd({
-					adUnitId: this.appConfig?.interstitialAdId,
-				});
-
-				await this._interstitialAd.load();
-				this.isInterstitialAdReady = true;
-			})();
-		}
-
-		const loadPromise = this._interstitialLoadPromise;
-		try {
-			await loadPromise;
-		} catch (error) {
-			this._interstitialAd = null;
-			throw error;
-		} finally {
-			if (this._interstitialLoadPromise === loadPromise) {
-				this._interstitialLoadPromise = null;
+
+				this._interstitialAd = new InterstitialAd({
+					adUnitId: this.appConfig?.interstitialAdId,
+				});
+
+				await this._interstitialAd.load();
+				this.isInterstitialAdReady = true;
+			})();
+		}
+
+		const loadPromise = this._interstitialLoadPromise;
+		try {
+			await loadPromise;
+		} catch (error) {
+			this._interstitialAd = null;
+			throw error;
+		} finally {
+			if (this._interstitialLoadPromise === loadPromise) {
+				this._interstitialLoadPromise = null;
+			}
+		}
+	}
+
+	async showInterstitialAd() {
+		if (this._showingAd) {
+			return false;
+		}
+
+		const setup = await this.ensureAdsReady();
+		if (this._showingAd || !setup.canRequestAds || setup.promptShown) {
+			return false;
+		}
+
+		if (!this.isAdLoaded()) {
+			let timeoutId;
+			await Promise.race([this.loadInterstitialAd(), new Promise(resolve => {
+				timeoutId = setTimeout(resolve, 2000);
+			})]);
+			clearTimeout(timeoutId);
+			if (!this.isAdLoaded()) {
+				return false;
+			}
+		}
+
+		if (this._showingAd) {
+			return false;
+		}
+
+		const ad = this._interstitialAd;
+		this._showingAd = ad;
+		this.isInterstitialAdReady = false;
+		try {
+			await ad.show();
+		} catch (error) {
+			if (this._showingAd === ad) {
+				this._showingAd = null;
 			}
+
+			console.error('Interstitial ad failed to show', error);
+		}
+
+		return true;
+	}
+
+	async loadRewardedAd() {
+		if (this._showingAd) {
+			return;
+		}
+
+		if (!await this.prepareAdsWithoutPrompt()) {
+			return;
+		}
+
+		if (this.isRewardedAdLoaded()) {
+			return;
+		}
+
+		const { RewardedAd } = await this.getAdMob();
+		if (this._showingAd) {
+			return;
 		}
-	}
-
-	async showInterstitialAd() {
-		const setup = await this.ensureAdsReady();
-		if (!setup.canRequestAds || setup.promptShown) {
-			return false;
-		}
-
-		if (!this.isAdLoaded()) {
-			let timeoutId;
-			await Promise.race([this.loadInterstitialAd(), new Promise(resolve => {
-				timeoutId = setTimeout(resolve, 2000);
-			})]);
-			clearTimeout(timeoutId);
-			if (!this.isAdLoaded()) {
-				return false;
+
+		this._rewardedAd = new RewardedAd({
+			adUnitId: this.appConfig?.rewardedAdId,
+		});
+
+		try {
+			await this._rewardedAd.load();
+			this._isRewardedAdLoaded = true;
+			this._receivedReward = false;
+			this._rewardInfo = null;
+		} catch (error) {
+			this._rewardedAd = null;
+			throw error;
+		}
+	}
+
+	async showRewardedAd() {
+		if (this._showingAd) {
+			return;
+		}
+
+		const setup = await this.ensureAdsReady();
+		if (this._showingAd || !setup.canRequestAds || setup.promptShown) {
+			return;
+		}
+
+		if (!this.isRewardedAdLoaded()) {
+			await this.loadRewardedAd();
+		}
+
+		if (this._showingAd) {
+			return;
+		}
+
+		const ad = this._rewardedAd;
+		this._showingAd = ad;
+		this._isRewardedAdLoaded = false;
+		try {
+			return await ad.show();
+		} catch (error) {
+			if (this._showingAd === ad) {
+				this._showingAd = null;
 			}
-		}
-
-		this.isInterstitialAdReady = false;
-		try {
-			await this._interstitialAd.show();
-		} catch (error) {
-			console.error('Interstitial ad failed to show', error);
-		}
-
-		return true;
-	}
-
-	async loadRewardedAd() {
-		if (!await this.prepareAdsWithoutPrompt()) {
-			return;
-		}
-
-		if (this.isRewardedAdLoaded()) {
-			return;
-		}
-
-		const { RewardedAd } = await this.getAdMob();
-		this._rewardedAd = new RewardedAd({
-			adUnitId: this.appConfig?.rewardedAdId,
-		});
-
-		try {
-			await this._rewardedAd.load();
-			this._isRewardedAdLoaded = true;
-			this._receivedReward = false;
-			this._rewardInfo = null;
-		} catch (error) {
-			this._rewardedAd = null;
-			throw error;
-		}
-	}
-
-	async showRewardedAd() {
-		const setup = await this.ensureAdsReady();
-		if (!setup.canRequestAds || setup.promptShown) {
-			return;
-		}
-
-		if (!this.isRewardedAdLoaded()) {
-			await this.loadRewardedAd();
-		}
-
-		this._isRewardedAdLoaded = false;
-		return this._rewardedAd.show();
-	}
-}
+
+			throw error;
+		}
+	}
+}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@cardsjd/portal",
 	"private": false,
-	"version": "0.1.16",
+	"version": "0.1.17",
 	"type": "module",
 	"main": "lib/index.js",
 	"publishConfig": {