@cardsjd/portal 0.1.13 → 0.1.14

package/lib/AdMobPortal.js

@@ -77,8 +77,8 @@ export class AdMobPortal extends BasePortal {
 		AdMob.addListener(InterstitialAdPluginEvents.Loaded, () => {
 			this.isInterstitialAdReady = true;
 		});
-		AdMob.addListener(InterstitialAdPluginEvents.Showed, () => {
-			this.isInterstitialAdReady = false;
+		AdMob.addListener(InterstitialAdPluginEvents.Showed, () => {
+			this.isInterstitialAdReady = false;
 			if (this.onAdOpened) {
 				this.onAdOpened({
 					adType: 'interstitial',
@@ -155,13 +155,19 @@ export class AdMobPortal extends BasePortal {
 	}
 
 	async showInterstitialAd() {
-		if (!this.isAdLoaded()) {
-			await this.loadInterstitialAd();
-			return; // no auto show
+		if (!this.isAdLoaded()) {
+			await this.loadInterstitialAd();
+			return false; // no auto show
 		}
 
 		this.isInterstitialAdReady = false;
-		return AdMob.showInterstitial();
+		try {
+			await AdMob.showInterstitial();
+		} catch (error) {
+			console.error('Interstitial ad failed to show', error);
+		}
+
+		return true;
 	}
 
 	async loadRewardedAd() {

package/lib/BasePortal.js

@@ -26,11 +26,12 @@ export class BasePortal {
 
 	async getFriends() { }
 
-	async setupAds() { }
+	async setupAds() { }
 
 	async loadInterstitialAd(_force) { }
 
-	async showInterstitialAd() { }
+	// Returns true if a display was attempted, false if only loading or unavailable.
+	async showInterstitialAd() { return true; }
 
 	loadRewardedAd(_onLoaded) { }
 
@@ -42,15 +43,15 @@ export class BasePortal {
 
 	isAdLoaded() { }
 
-	isRewardedAdLoaded() { }
-
-	isPrivacyOptionsRequired() {
-		return false;
-	}
-
-	async showPrivacyOptions() { }
-
-	logError(_errorCode) { }
+	isRewardedAdLoaded() { }
+
+	isPrivacyOptionsRequired() {
+		return false;
+	}
+
+	async showPrivacyOptions() { }
+
+	logError(_errorCode) { }
 
 	isErrorState() { }
 
@@ -97,7 +98,9 @@ export class BasePortal {
 
 		// show ad or just load ad (not load and show)
 		if (readyToShowAd) {
-			await this.showInterstitialAd();
+			if (await this.showInterstitialAd()) {
+				this.lastShownInterstitial = Date.now();
+			}
 		} else {
 			await this.loadInterstitialAd();
 		}

package/lib/CrazyGamesPortal.js

@@ -299,7 +299,13 @@ export class CrazyGamesPortal extends BasePortal {
 			},
 		};
 
-		globalThis.CrazyGames.SDK.ad.requestAd('midgame', callbacks);
+		try {
+			await globalThis.CrazyGames.SDK.ad.requestAd('midgame', callbacks);
+		} catch (error) {
+			console.error('Interstitial ad failed to show', error);
+		}
+
+		return true;
 	}
 
 	isAdLoaded() {

package/lib/FacebookPortal.js

@@ -1,4 +1,4 @@
-import { BasePortal } from './BasePortal';
+import { BasePortal } from './BasePortal';
 import { FBInstantGame } from '@cardsjd/fbinstantgame';
 
 export class FacebookPortal extends BasePortal {
@@ -32,20 +32,20 @@ export class FacebookPortal extends BasePortal {
 
 	async load() {
 		const fbUserdata = await this.fBInstantGame.loadData();
-		const fbProfile = await this.fBInstantGame.getProfile();
-		const data = {};
-		data.userdata = fbUserdata;
-		data.user = fbProfile ? {
-			facebookId: fbProfile.facebookId ?? fbProfile.id,
-			name: fbProfile.name,
-			avatar: fbProfile.avatar ?? fbProfile.pic,
-			locale: fbProfile.locale,
-		} : null;
+		const fbProfile = await this.fBInstantGame.getProfile();
+		const data = {};
+		data.userdata = fbUserdata;
+		data.user = fbProfile ? {
+			facebookId: fbProfile.facebookId ?? fbProfile.id,
+			name: fbProfile.name,
+			avatar: fbProfile.avatar ?? fbProfile.pic,
+			locale: fbProfile.locale,
+		} : null;
 		return data;
 	}
 
-	async save(data, forceSave) {
-		this.fBInstantGame.saveData(data, forceSave).catch(function () { });
+	async save(data, forceSave) {
+		this.fBInstantGame.saveData(data, forceSave).catch(function () { });
 	}
 
 	gameStart() {
@@ -65,10 +65,10 @@ export class FacebookPortal extends BasePortal {
 	
 		this.subscribeBot();
 	}
-	createShortCut() {
-		this.portal?.createShortCut?.();
-	}
-	async subscribeBot() {
+	createShortCut() {
+		this.portal?.createShortCut?.();
+	}
+	async subscribeBot() {
 		await this.fBInstantGame.subscribeBot();
 	}
 
@@ -111,7 +111,7 @@ export class FacebookPortal extends BasePortal {
 
 	// ----- Ad methods -----
 
-	async setupAds() {
+	async setupAds() {
 		console.log('FB_Ads.setup');
 
 		if (typeof FBInstant === 'undefined' || !globalThis.FBInstant) {
@@ -188,7 +188,7 @@ export class FacebookPortal extends BasePortal {
 
 		this._isAdLoading = true;
 
-		const interstitialAdId = this.appConfig?.interstitialAdId;
+		const interstitialAdId = this.appConfig?.interstitialAdId;
 
 		console.log('FB_Ads.getInterstitialAdAsync start: ' + interstitialAdId);
 		if (!this.isApiSupported('getInterstitialAdAsync')) {
@@ -249,6 +249,7 @@ export class FacebookPortal extends BasePortal {
 
 		if (!isAdLoaded) {
 			this.loadInterstitialAd();
+			return false;
 		}
 
 		if (isAdLoaded) {
@@ -257,7 +258,7 @@ export class FacebookPortal extends BasePortal {
 				return false;
 			}
 
-			this.preloadedInterstitial.showAsync()
+			return Promise.resolve().then(() => this.preloadedInterstitial.showAsync())
 				.then(() => {
 					// Perform post-ad success operation
 					console.log('Interstitial ad finished successfully');
@@ -273,7 +274,7 @@ export class FacebookPortal extends BasePortal {
 					this.logError(err.code);
 					console.error('interstitialAd  Error: ' + err.message + ' ' + err.code);
 
-				});
+				}).then(() => true);
 		}
 
 	}
@@ -290,7 +291,7 @@ export class FacebookPortal extends BasePortal {
 			console.log('FBInstant plugin not ready'); return false;
 		}
 
-		const interstitialAdId = this.appConfig?.interstitialAdId;
+		const interstitialAdId = this.appConfig?.interstitialAdId;
 		if (!this.isApiSupported('getInterstitialAdAsync')) {
 			this.logError('CLIENT_UNSUPPORTED_OPERATION');
 			console.warn('FBInstant.getInterstitialAdAsync is not supported on this client');

package/lib/GameDistributionPortal.js

@@ -69,7 +69,13 @@ export class GameDistribution extends BasePortal {
 			return false;
 		}
 
-		return globalThis.gdsdk.showAd(AdType.Interstitial);
+		try {
+			await globalThis.gdsdk.showAd(AdType.Interstitial);
+		} catch (error) {
+			console.error('Interstitial ad failed to show', error);
+		}
+
+		return true;
 	}
 
 	isAdLoaded() {

package/lib/NextGenAdMobPortal.js

@@ -351,7 +351,7 @@ export class NextGenAdMobPortal extends BasePortal {
 	async showInterstitialAd() {
 		const setup = await this.ensureAdsReady();
 		if (!setup.canRequestAds || setup.promptShown) {
-			return;
+			return false;
 		}
 
 		if (!this.isAdLoaded()) {
@@ -361,12 +361,18 @@ export class NextGenAdMobPortal extends BasePortal {
 			})]);
 			clearTimeout(timeoutId);
 			if (!this.isAdLoaded()) {
-				return;
+				return false;
 			}
 		}
 
 		this.isInterstitialAdReady = false;
-		return this._interstitialAd.show();
+		try {
+			await this._interstitialAd.show();
+		} catch (error) {
+			console.error('Interstitial ad failed to show', error);
+		}
+
+		return true;
 	}
 
 	async loadRewardedAd() {

package/lib/PokiPortal.js

@@ -221,18 +221,18 @@ export class PokiPortal extends BasePortal {
 				});
 			}
 
-			if (typeof this.onAdClosed === 'function') {
-				this.onAdClosed({
-					adType,
-					adProvider,
-				});
-			}
-
-			return false;
-		}
-	}
-
-	isAdLoaded() {
+			if (typeof this.onAdClosed === 'function') {
+				this.onAdClosed({
+					adType,
+					adProvider,
+				});
+			}
+
+			return true;
+		}
+	}
+
+	isAdLoaded() {
 		return this.isReady();
 	}
 

package/lib/WebPortal.js

@@ -125,22 +125,22 @@ export class WebPortal extends BasePortal {
 	}
 
 	showInterstitialAd() {
-		console.log('GoogleH5.showAd');
-
-		if (typeof adBreak === 'undefined' || !globalThis.adBreak) {
-			console.log('GoogleH5 adBreak plugin not ready'); return;
-		}
-
-		if (!this.isSetup) {
-			console.log('GoogleH5.showAd - isSetup is false');
-			return;
+		console.log('GoogleH5.showAd');
+
+		if (typeof adBreak === 'undefined' || !globalThis.adBreak) {
+			console.log('GoogleH5 adBreak plugin not ready'); return false;
 		}
 
-		globalThis.adBreak({
+		if (!this.isSetup) {
+			console.log('GoogleH5.showAd - isSetup is false');
+			return false;
+		}
+
+		return Promise.resolve().then(() => globalThis.adBreak({
 			type: 'next', // The type of this placement (required)
-			name: 'post_game', // A descriptive name for this placement
-			beforeAd: () => {
-				if (this.onAdOpened) {
+			name: 'post_game', // A descriptive name for this placement
+			beforeAd: () => {
+				if (this.onAdOpened) {
 					this.onAdOpened({
 						adType: 'interstitial',
 						adProvider: this.adProviderName,
@@ -155,10 +155,12 @@ export class WebPortal extends BasePortal {
 					});
 				}
 			},
-			adBreakDone: (placementInfo) => {
-				console.log('placementInfo', placementInfo);
-			},
-		});
+			adBreakDone: (placementInfo) => {
+				console.log('placementInfo', placementInfo);
+			},
+		})).catch(error => {
+			console.error('Interstitial ad failed to show', error);
+		}).then(() => true);
 	}
 
 	isAdLoaded() {

package/package.json

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