@cardsjd/portal 0.1.14 → 0.1.16

package/lib/BasePortal.js

@@ -97,8 +97,10 @@ export class BasePortal {
 		console.log('readyToShowInterstitialAd: ' + readyToShowAd + ' : ' + secondsSinceLastAd + ' of ' + delayBetweenAds);
 
 		// show ad or just load ad (not load and show)
-		if (readyToShowAd) {
-			if (await this.showInterstitialAd()) {
+		if (readyToShowAd) {
+			// showInterstitialAd returns true if the ad was shown or the show attempt failed;
+			// false means it only loaded or skipped the ad without attempting to show it.
+			if (await this.showInterstitialAd()) {
 				this.lastShownInterstitial = Date.now();
 			}
 		} else {

package/lib/NextGenAdMobPortal.js

@@ -33,6 +33,7 @@ export class NextGenAdMobPortal extends BasePortal {
 		this._consentInfoUpdated = false;
 		this._consentGathered = false;
 		this._canRequestAds = false;
+		this._limitedAdsFallback = false;
 		this._privacyOptionsRequired = false;
 		this.isTesting = false;
 	}
@@ -85,21 +86,55 @@ export class NextGenAdMobPortal extends BasePortal {
 	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() {
-		await this.loadUmp();
-		const consentInfo = await this._umpModule.updateConsentInfo();
+		const consentInfo = await this.requestConsent('updateConsentInfo');
 		this._consentInfoUpdated = true;
 		this.setConsentInfo(consentInfo);
 		return consentInfo;
 	}
 
 	async gatherConsent() {
-		await this.loadUmp();
-		const consentInfo = await this._umpModule.gatherConsent();
+		const consentInfo = await this.requestConsent('gatherConsent');
 		this._consentInfoUpdated = true;
 		this._consentGathered = true;
 		this.setConsentInfo(consentInfo);
@@ -169,7 +204,7 @@ export class NextGenAdMobPortal extends BasePortal {
 			};
 		}
 
-		const trackingPromptShown = await this.requestTrackingAuthorization(consentInfo);
+		const trackingPromptShown = !this._limitedAdsFallback && await this.requestTrackingAuthorization(consentInfo);
 		const promptShown = consentInfo?.formShown === true || trackingPromptShown;
 
 		if (consentInfo.canRequestAds !== true) {
@@ -195,7 +230,7 @@ export class NextGenAdMobPortal extends BasePortal {
 			await this.setupAds();
 		}
 
-		if (!this._canRequestAds || !await this.canStartAdsWithoutPrompt()) {
+		if (!this._canRequestAds || (!this._limitedAdsFallback && !await this.canStartAdsWithoutPrompt())) {
 			return false;
 		}
 
@@ -219,7 +254,7 @@ export class NextGenAdMobPortal extends BasePortal {
 			await AdMob.start();
 
 			await AdMob.addListener('interstitial.show', (info) => {
-				if (info.id === this._interstitialAd?.id) {
+				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
 					this.isInterstitialAdReady = false;
 					if (this.onAdOpened) {
 						this.onAdOpened({
@@ -230,7 +265,7 @@ export class NextGenAdMobPortal extends BasePortal {
 				}
 			});
 			await AdMob.addListener('interstitial.dismiss', (info) => {
-				if (info.id === this._interstitialAd?.id) {
+				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
 					this.isInterstitialAdReady = false;
 					this._interstitialAd = null;
 					if (this.onAdClosed) {
@@ -242,7 +277,7 @@ export class NextGenAdMobPortal extends BasePortal {
 				}
 			});
 			await AdMob.addListener('interstitial.loadfail', (info) => {
-				if (info.id === this._interstitialAd?.id) {
+				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
 					this.isInterstitialAdReady = false;
 					this._interstitialAd = null;
 					if (this.onAdError) {
@@ -251,7 +286,7 @@ export class NextGenAdMobPortal extends BasePortal {
 				}
 			});
 			await AdMob.addListener('interstitial.showfail', (info) => {
-				if (info.id === this._interstitialAd?.id) {
+				if ((info.id ?? info.adId) === this._interstitialAd?.id) {
 					this.isInterstitialAdReady = false;
 					this._interstitialAd = null;
 					if (this.onAdError) {
@@ -260,7 +295,7 @@ export class NextGenAdMobPortal extends BasePortal {
 				}
 			});
 			await AdMob.addListener('rewarded.dismiss', (info) => {
-				if (info.id === this._rewardedAd?.id) {
+				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
 					this._isRewardedAdLoaded = false;
 					this._rewardedAd = null;
 					if (this.onAdClosed) {
@@ -276,7 +311,7 @@ export class NextGenAdMobPortal extends BasePortal {
 				}
 			});
 			await AdMob.addListener('rewarded.loadfail', (info) => {
-				if (info.id === this._rewardedAd?.id) {
+				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
 					this._isRewardedAdLoaded = false;
 					this._rewardedAd = null;
 					if (this.onAdError) {
@@ -285,7 +320,7 @@ export class NextGenAdMobPortal extends BasePortal {
 				}
 			});
 			await AdMob.addListener('rewarded.showfail', (info) => {
-				if (info.id === this._rewardedAd?.id) {
+				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
 					this._isRewardedAdLoaded = false;
 					this._rewardedAd = null;
 					if (this.onAdError) {
@@ -294,7 +329,7 @@ export class NextGenAdMobPortal extends BasePortal {
 				}
 			});
 			await AdMob.addListener('rewarded.reward', (info) => {
-				if (info.id === this._rewardedAd?.id) {
+				if ((info.id ?? info.adId) === this._rewardedAd?.id) {
 					this._receivedReward = true;
 					this._rewardInfo = info.reward;
 				}

package/package.json

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