@cardsjd/portal 0.1.8 → 0.1.9

package/lib/AdMobPortal.js

@@ -179,9 +179,7 @@ export class AdMobPortal extends BasePortal {
 	}
 
 	async showRewardedAd() {
-		if (this.isSetup === false) {
-			return;
-		}
+		await this.setupAds();
 
 		if (!this.isRewardedAdLoaded()) {
 			await this.loadRewardedAd();

package/lib/BasePortal.js

@@ -51,8 +51,7 @@ export class BasePortal {
 	createShortCut() { }
 
 	async tryShowInterstitialAd(options) {
-		//only load/show if ads enabled
-		if (this.isSetup === false) { return; }
+		await this.setupAds();
 
 		const config = this.config || {};
 		const offsetStartdelay = options?.offsetStartdelay || config.offsetStartdelay || 120;  //start with 1 min passed to get the first ad to show faster
@@ -98,8 +97,7 @@ export class BasePortal {
 		}
 	}
 	async showAppOpenAdWithMaxDelay(maxDelay) {
-		if (this.isSetUp === false) { return; }
-
+		await this.setupAds();
 
 		if (!maxDelay) {
 			maxDelay = 4000;

package/lib/CrazyGamesPortal.js

@@ -317,9 +317,7 @@ export class CrazyGamesPortal extends BasePortal {
 			return false;
 		}
 
-		if (!this.isSetup) {
-			await this.setupAds();
-		}
+		await this.setupAds();
 
 		const adType = 'rewarded';
 		const adProvider = this.adProviderName;

package/lib/FacebookPortal.js

@@ -407,9 +407,11 @@ export class FacebookPortal extends BasePortal {
 
 	}
 
-	showRewardedAd() {
+	async showRewardedAd() {
 		console.log('FB_Ads.ShowRewardedAd');
 
+		await this.setupAds();
+
 		if (this.isErrorState()) {
 			console.log('FBInstant.ShowRewardedAd() - isErrorState = true');
 			return true;

package/lib/GameDistributionPortal.js

@@ -97,11 +97,13 @@ export class GameDistribution extends BasePortal {
 		})();
 	}
 
-	showRewardedAd() {
+	async showRewardedAd() {
 		if (!this.isReady()) {
 			return false;
 		}
 
+		await this.setupAds();
+
 		return globalThis.gdsdk.showAd(AdType.Rewarded);
 	}
 }

package/lib/PokiPortal.js

@@ -245,6 +245,8 @@ export class PokiPortal extends BasePortal {
 			return false;
 		}
 
+		await this.setupAds();
+
 		const adType = 'rewarded';
 		const adProvider = this.adProviderName;
 

package/lib/WebPortal.js

@@ -1,4 +1,4 @@
-import { BasePortal } from './BasePortal';
+import { BasePortal } from './BasePortal.js';
 
 export class WebPortal extends BasePortal {
 	name = 'WebPortal';
@@ -16,9 +16,10 @@ export class WebPortal extends BasePortal {
 		this.onAdRewarded = null;
 
 		this.page_url = 'cardsjd.com';
-		this.adProviderName = 'GoogleH5';
-		this.isSetup = false;
-		this.isSetupLoading = false;
+		this.adProviderName = 'GoogleH5';
+		this.isSetup = false;
+		this.isSetupLoading = false;
+		this.setupPromise = null;
 	}
 
 	async init() {
@@ -47,28 +48,34 @@ export class WebPortal extends BasePortal {
 
 	// ----- Ad methods -----
 
-	async setupAds() {
-		if (this.isSetup) {
-			console.log('GoogleH5.isSetup is already done');
-			return;
-		}
-		if (this.isSetupLoading) {
-			throw Error('GoogleH5 setup is in progress already');
-		}
-
-		this.isSetupLoading = true; //prevent async loading
-
-		try {
-			await this.loadScript();
-			console.log('adsbygoogle loaded');
-		} catch (error) {
-			console.log(error);
-			return;
-		}
-
-		if (typeof adConfig === 'undefined') {
-			console.log('GoogleH5 adBreak plugin not ready');
-			throw Error('GoogleH5 adBreak plugin not ready');
+	async setupAds() {
+		if (this.isSetup) {
+			console.log('GoogleH5.isSetup is already done');
+			return;
+		}
+
+		if (this.setupPromise) {
+			return this.setupPromise;
+		}
+
+		this.isSetupLoading = true;
+		this.setupPromise = this.setupAdsOnce();
+
+		try {
+			return await this.setupPromise;
+		} finally {
+			this.isSetupLoading = false;
+			this.setupPromise = null;
+		}
+	}
+
+	async setupAdsOnce() {
+		await this.loadScript();
+		console.log('adsbygoogle loaded');
+
+		if (typeof globalThis.adConfig === 'undefined') {
+			console.log('GoogleH5 adBreak plugin not ready');
+			throw Error('GoogleH5 adBreak plugin not ready');
 		}
 
 		globalThis.adConfig({
@@ -77,10 +84,9 @@ export class WebPortal extends BasePortal {
 			onReady: () => {
 				console.log('GoogleH5.isSetup is ready');
 			},
-		});
-		this.isSetup = true;
-		this.isSetupLoading = false;
-	}
+		});
+		this.isSetup = true;
+	}
 
 	async loadScript() {
 		return new Promise((resolve, reject) => {
@@ -114,10 +120,11 @@ export class WebPortal extends BasePortal {
 		});
 	}
 
-	loadInterstitialAd() {
-		console.log('GoogleH5.loadAd');
-	}
-	showInterstitialAd() {
+	loadInterstitialAd() {
+		console.log('GoogleH5.loadAd');
+	}
+
+	showInterstitialAd() {
 		console.log('GoogleH5.showAd');
 
 		if (typeof adBreak === 'undefined' || !globalThis.adBreak) {
@@ -162,9 +169,11 @@ export class WebPortal extends BasePortal {
 		return true;
 	}
 
-	showRewardedAd() {
+	async showRewardedAd() {
 		console.log('GoogleH5.ShowRewardedAd');
 
+		await this.setupAds();
+
 		if (typeof globalThis.adBreak === 'undefined' || !globalThis.adBreak) {
 			console.log('GoogleH5 adBreak plugin not ready'); return;
 		}
@@ -253,4 +262,4 @@ export class WebPortal extends BasePortal {
 		return adStatus;
 	}
 
-}
+}

package/package.json

@@ -1,23 +1,24 @@
 {
 	"name": "@cardsjd/portal",
-  "private": false,
-  "version": "0.1.8",
-  "type": "module",
-  "main": "lib/index.js",
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "lint": "eslint lib --report-unused-disable-directives --max-warnings 0",
-    "lint:fix": "npm run lint -- --fix"
-  },
-  "devDependencies": {},
-  "dependencies": {
-    "@capacitor-community/admob": "^7.0.3",
-    "@discord/embedded-app-sdk": "^2.4.0"
-  },
-  "peerDependencies": {}
+	"private": false,
+	"version": "0.1.9",
+	"type": "module",
+	"main": "lib/index.js",
+	"publishConfig": {
+		"access": "public"
+	},
+	"files": [
+		"lib"
+	],
+	"scripts": {
+		"test": "node --test",
+		"lint": "eslint lib --report-unused-disable-directives --max-warnings 0",
+		"lint:fix": "npm run lint -- --fix"
+	},
+	"devDependencies": {},
+	"dependencies": {
+		"@capacitor-community/admob": "^7.0.3",
+		"@discord/embedded-app-sdk": "^2.4.0"
+	},
+	"peerDependencies": {}
 }