@cardsjd/portal 0.1.7 → 0.1.9

package/lib/AdMobPortal.js

@@ -153,53 +153,7 @@ export class AdMobPortal extends BasePortal {
 			adId: this.appConfig?.interstitialAdId,
 		});
 	}
-	async tryShowInterstitialAd(options) {
-		//only load/show if ads enabled
-		if (this.isSetup === false) { return; }
-
-		const config = this.config;
-		const offsetStartdelay = options?.offsetStartdelay || config.offsetStartdelay || 120;  //start with 1 min passed to get the first ad to show faster
-		const delayBetweenAds = options?.delayBetweenAds || config.delayBetweenAds || 240;  //check for  240 (4 min) seconds passed was 180
-		const awayResetTime = options?.awayResetTime || config.awayResetTime || 1200;  //check if over 20 min, may have not been in the app and reopened it with out restarting
-
-		//1. only allow ad to be shown/loaded once every 150 second (Advertisement.delayBetweenAds)
-		//2. check if over 20 min, may have not been in the app and reopened it with out restarting 
-		//3. load ad ether way
-		//4. show ad if conditions met
-
-		let readyToShowAd = false;
-
-		//reset timer
-		if (!this.lastShownInterstitial) {
-			this.lastShownInterstitial = Date.now();//now
-			//add start offset delay
-			const newDate = new Date();
-			newDate.setSeconds(newDate.getSeconds() - offsetStartdelay);
-			this.lastShownInterstitial = newDate;
-		}
-
-		const secondsSinceLastAd = (Date.now() - this.lastShownInterstitial) / 1000;
-
-		//check for  delayBetweenAds seconds passed
-		if (secondsSinceLastAd > delayBetweenAds) {
-			readyToShowAd = true;
-		}
-
-		//check if over 20 min, may have not been in the app and reopened it with out restarting 
-		if (secondsSinceLastAd > awayResetTime) {
-			readyToShowAd = false;
-			this.lastShownInterstitial = Date.now();//now, reset
-		}
-
-		console.log('readyToShowInterstitialAd: ' + readyToShowAd + ' : ' + secondsSinceLastAd + ' of ' + delayBetweenAds);
 
-		// show ad or just load ad (not load and show)
-		if (readyToShowAd) {
-			await this.showInterstitialAd();
-		} else {
-			await this.loadInterstitialAd();
-		}
-	}
 	async showInterstitialAd() {
 		if (!this.isAdLoaded()) {
 			await this.loadInterstitialAd();
@@ -225,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

@@ -50,10 +50,75 @@ export class BasePortal {
 
 	createShortCut() { }
 
-	async tryShowInterstitialAd(_options) {
-
+	async tryShowInterstitialAd(options) {
+		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
+		const delayBetweenAds = options?.delayBetweenAds || config.delayBetweenAds || 240;  //check for  240 (4 min) seconds passed was 180
+		const awayResetTime = options?.awayResetTime || config.awayResetTime || 1200;  //check if over 20 min, may have not been in the app and reopened it with out restarting
+
+		//1. only allow ad to be shown/loaded once every 150 second (Advertisement.delayBetweenAds)
+		//2. check if over 20 min, may have not been in the app and reopened it with out restarting 
+		//3. load ad ether way
+		//4. show ad if conditions met
+
+		let readyToShowAd = false;
+
+		//reset timer
+		if (!this.lastShownInterstitial) {
+			this.lastShownInterstitial = Date.now();//now
+			//add start offset delay
+			const newDate = new Date();
+			newDate.setSeconds(newDate.getSeconds() - offsetStartdelay);
+			this.lastShownInterstitial = newDate;
+		}
+
+		const secondsSinceLastAd = (Date.now() - this.lastShownInterstitial) / 1000;
+
+		//check for  delayBetweenAds seconds passed
+		if (secondsSinceLastAd > delayBetweenAds) {
+			readyToShowAd = true;
+		}
+
+		//check if over 20 min, may have not been in the app and reopened it with out restarting 
+		if (secondsSinceLastAd > awayResetTime) {
+			readyToShowAd = false;
+			this.lastShownInterstitial = Date.now();//now, reset
+		}
+
+		console.log('readyToShowInterstitialAd: ' + readyToShowAd + ' : ' + secondsSinceLastAd + ' of ' + delayBetweenAds);
+
+		// show ad or just load ad (not load and show)
+		if (readyToShowAd) {
+			await this.showInterstitialAd();
+		} else {
+			await this.loadInterstitialAd();
+		}
 	}
-	async showAppOpenAdWithMaxDelay(_maxDelay) {
-
+	async showAppOpenAdWithMaxDelay(maxDelay) {
+		await this.setupAds();
+
+		if (!maxDelay) {
+			maxDelay = 4000;
+		}
+
+		//get start time
+		const startTime = Date.now();
+		if (this.loadAppOpenAd) {
+			await this.loadAppOpenAd();
+		}
+
+		//this wont work...
+		//is timer over maxDelay
+		const timePassed = Date.now() - startTime;
+		if (timePassed > maxDelay) {
+			console.log(`showAppOpenAdWithMaxDelay took too long to load [${timePassed}ms/${maxDelay}ms], skipping ad`);
+			return;
+		}
+
+		if (this.showAppOpenAd) {
+			await this.showAppOpenAd();
+		}
 	}
 }

package/lib/CrazyGamesPortal.js

@@ -256,53 +256,7 @@ export class CrazyGamesPortal extends BasePortal {
 			await this.setupAds();
 		}
 	}
-async tryShowInterstitialAd(options) {
-		//only load/show if ads enabled
-		if (this.isSetup === false) { return; }
 
-		const config = this.config;
-		const offsetStartdelay = options?.offsetStartdelay || config.offsetStartdelay || 120;  //start with 1 min passed to get the first ad to show faster
-		const delayBetweenAds = options?.delayBetweenAds || config.delayBetweenAds || 240;  //check for  240 (4 min) seconds passed was 180
-		const awayResetTime = options?.awayResetTime || config.awayResetTime || 1200;  //check if over 20 min, may have not been in the app and reopened it with out restarting
-
-		//1. only allow ad to be shown/loaded once every 150 second (Advertisement.delayBetweenAds)
-		//2. check if over 20 min, may have not been in the app and reopened it with out restarting 
-		//3. load ad ether way
-		//4. show ad if conditions met
-
-		let readyToShowAd = false;
-
-		//reset timer
-		if (!this.lastShownInterstitial) {
-			this.lastShownInterstitial = Date.now();//now
-			//add start offset delay
-			const newDate = new Date();
-			newDate.setSeconds(newDate.getSeconds() - offsetStartdelay);
-			this.lastShownInterstitial = newDate;
-		}
-
-		const secondsSinceLastAd = (Date.now() - this.lastShownInterstitial) / 1000;
-
-		//check for  delayBetweenAds seconds passed
-		if (secondsSinceLastAd > delayBetweenAds) {
-			readyToShowAd = true;
-		}
-
-		//check if over 20 min, may have not been in the app and reopened it with out restarting 
-		if (secondsSinceLastAd > awayResetTime) {
-			readyToShowAd = false;
-			this.lastShownInterstitial = Date.now();//now, reset
-		}
-
-		console.log('readyToShowInterstitialAd: ' + readyToShowAd + ' : ' + secondsSinceLastAd + ' of ' + delayBetweenAds);
-
-		// show ad or just load ad (not load and show)
-		if (readyToShowAd) {
-			await this.showInterstitialAd();
-		} else {
-			await this.loadInterstitialAd();
-		}
-	}
 	async showInterstitialAd() {
 		console.log('CrazyGames.showAd');
 
@@ -363,9 +317,7 @@ async tryShowInterstitialAd(options) {
 			return false;
 		}
 
-		if (!this.isSetup) {
-			await this.setupAds();
-		}
+		await this.setupAds();
 
 		const adType = 'rewarded';
 		const adProvider = this.adProviderName;

package/lib/FacebookPortal.js

@@ -227,53 +227,7 @@ export class FacebookPortal extends BasePortal {
 			console.error('FB_Ads.getInterstitialAdAsync error: ' + ex);
 		}
 	}
-async tryShowInterstitialAd(options) {
-		//only load/show if ads enabled
-		if (this.isSetup === false) { return; }
-
-		const config = this.config;
-		const offsetStartdelay = options?.offsetStartdelay || config.offsetStartdelay || 120;  //start with 1 min passed to get the first ad to show faster
-		const delayBetweenAds = options?.delayBetweenAds || config.delayBetweenAds || 240;  //check for  240 (4 min) seconds passed was 180
-		const awayResetTime = options?.awayResetTime || config.awayResetTime || 1200;  //check if over 20 min, may have not been in the app and reopened it with out restarting
-
-		//1. only allow ad to be shown/loaded once every 150 second (Advertisement.delayBetweenAds)
-		//2. check if over 20 min, may have not been in the app and reopened it with out restarting 
-		//3. load ad ether way
-		//4. show ad if conditions met
-
-		let readyToShowAd = false;
-
-		//reset timer
-		if (!this.lastShownInterstitial) {
-			this.lastShownInterstitial = Date.now();//now
-			//add start offset delay
-			const newDate = new Date();
-			newDate.setSeconds(newDate.getSeconds() - offsetStartdelay);
-			this.lastShownInterstitial = newDate;
-		}
-
-		const secondsSinceLastAd = (Date.now() - this.lastShownInterstitial) / 1000;
-
-		//check for  delayBetweenAds seconds passed
-		if (secondsSinceLastAd > delayBetweenAds) {
-			readyToShowAd = true;
-		}
-
-		//check if over 20 min, may have not been in the app and reopened it with out restarting 
-		if (secondsSinceLastAd > awayResetTime) {
-			readyToShowAd = false;
-			this.lastShownInterstitial = Date.now();//now, reset
-		}
-
-		console.log('readyToShowInterstitialAd: ' + readyToShowAd + ' : ' + secondsSinceLastAd + ' of ' + delayBetweenAds);
-
-		// show ad or just load ad (not load and show)
-		if (readyToShowAd) {
-			await this.showInterstitialAd();
-		} else {
-			await this.loadInterstitialAd();
-		}
-	}
+	
 	showInterstitialAd() {
 		console.log('FB_Ads.showInterstitialAd');
 
@@ -453,9 +407,11 @@ async tryShowInterstitialAd(options) {
 
 	}
 
-	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

@@ -63,53 +63,7 @@ export class GameDistribution extends BasePortal {
 			this.isInterstitialAdReady = false;
 		}
 	}
-async tryShowInterstitialAd(options) {
-		//only load/show if ads enabled
-		if (this.isSetup === false) { return; }
-
-		const config = this.config;
-		const offsetStartdelay = options?.offsetStartdelay || config.offsetStartdelay || 120;  //start with 1 min passed to get the first ad to show faster
-		const delayBetweenAds = options?.delayBetweenAds || config.delayBetweenAds || 240;  //check for  240 (4 min) seconds passed was 180
-		const awayResetTime = options?.awayResetTime || config.awayResetTime || 1200;  //check if over 20 min, may have not been in the app and reopened it with out restarting
-
-		//1. only allow ad to be shown/loaded once every 150 second (Advertisement.delayBetweenAds)
-		//2. check if over 20 min, may have not been in the app and reopened it with out restarting 
-		//3. load ad ether way
-		//4. show ad if conditions met
-
-		let readyToShowAd = false;
-
-		//reset timer
-		if (!this.lastShownInterstitial) {
-			this.lastShownInterstitial = Date.now();//now
-			//add start offset delay
-			const newDate = new Date();
-			newDate.setSeconds(newDate.getSeconds() - offsetStartdelay);
-			this.lastShownInterstitial = newDate;
-		}
-
-		const secondsSinceLastAd = (Date.now() - this.lastShownInterstitial) / 1000;
-
-		//check for  delayBetweenAds seconds passed
-		if (secondsSinceLastAd > delayBetweenAds) {
-			readyToShowAd = true;
-		}
-
-		//check if over 20 min, may have not been in the app and reopened it with out restarting 
-		if (secondsSinceLastAd > awayResetTime) {
-			readyToShowAd = false;
-			this.lastShownInterstitial = Date.now();//now, reset
-		}
-
-		console.log('readyToShowInterstitialAd: ' + readyToShowAd + ' : ' + secondsSinceLastAd + ' of ' + delayBetweenAds);
 
-		// show ad or just load ad (not load and show)
-		if (readyToShowAd) {
-			await this.showInterstitialAd();
-		} else {
-			await this.loadInterstitialAd();
-		}
-	}
 	async showInterstitialAd() {
 		if (!this.isReady()) {
 			return false;
@@ -143,11 +97,13 @@ async tryShowInterstitialAd(options) {
 		})();
 	}
 
-	showRewardedAd() {
+	async showRewardedAd() {
 		if (!this.isReady()) {
 			return false;
 		}
 
+		await this.setupAds();
+
 		return globalThis.gdsdk.showAd(AdType.Rewarded);
 	}
 }

package/lib/PokiPortal.js

@@ -185,53 +185,7 @@ export class PokiPortal extends BasePortal {
 	async loadInterstitialAd() {
 		// Poki commercial breaks do not require manual preloading
 	}
-async tryShowInterstitialAd(options) {
-		//only load/show if ads enabled
-		if (this.isSetup === false) { return; }
-
-		const config = this.config;
-		const offsetStartdelay = options?.offsetStartdelay || config.offsetStartdelay || 120;  //start with 1 min passed to get the first ad to show faster
-		const delayBetweenAds = options?.delayBetweenAds || config.delayBetweenAds || 240;  //check for  240 (4 min) seconds passed was 180
-		const awayResetTime = options?.awayResetTime || config.awayResetTime || 1200;  //check if over 20 min, may have not been in the app and reopened it with out restarting
-
-		//1. only allow ad to be shown/loaded once every 150 second (Advertisement.delayBetweenAds)
-		//2. check if over 20 min, may have not been in the app and reopened it with out restarting 
-		//3. load ad ether way
-		//4. show ad if conditions met
-
-		let readyToShowAd = false;
-
-		//reset timer
-		if (!this.lastShownInterstitial) {
-			this.lastShownInterstitial = Date.now();//now
-			//add start offset delay
-			const newDate = new Date();
-			newDate.setSeconds(newDate.getSeconds() - offsetStartdelay);
-			this.lastShownInterstitial = newDate;
-		}
-
-		const secondsSinceLastAd = (Date.now() - this.lastShownInterstitial) / 1000;
-
-		//check for  delayBetweenAds seconds passed
-		if (secondsSinceLastAd > delayBetweenAds) {
-			readyToShowAd = true;
-		}
-
-		//check if over 20 min, may have not been in the app and reopened it with out restarting 
-		if (secondsSinceLastAd > awayResetTime) {
-			readyToShowAd = false;
-			this.lastShownInterstitial = Date.now();//now, reset
-		}
-
-		console.log('readyToShowInterstitialAd: ' + readyToShowAd + ' : ' + secondsSinceLastAd + ' of ' + delayBetweenAds);
 
-		// show ad or just load ad (not load and show)
-		if (readyToShowAd) {
-			await this.showInterstitialAd();
-		} else {
-			await this.loadInterstitialAd();
-		}
-	}
 	async showInterstitialAd() {
 		if (!this.isReady()) {
 			return false;
@@ -291,6 +245,8 @@ async tryShowInterstitialAd(options) {
 			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,33 +48,34 @@ export class WebPortal extends BasePortal {
 
 	// ----- Ad methods -----
 
-	async setupAds() {
-		if (this.isSetup) {
-			console.log('CapacitorAdmob is already setup');
-			return;
-		}
-		if (this.isSetupLoading) {
-			throw Error('GoogleH5 setup is in progress already');
-		}
-
-		this.isSetupLoading = true; //prevent async loading
-
-		if (this.isSetup) {
-			console.log('GoogleH5.isSetup is already done');
-			return;
-		}
-
-		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({
@@ -82,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) => {
@@ -119,57 +120,11 @@ export class WebPortal extends BasePortal {
 		});
 	}
 
-	loadInterstitialAd() {
-		console.log('GoogleH5.loadAd');
-	}
-	async tryShowInterstitialAd(options) {
-		//only load/show if ads enabled
-		if (this.isSetup === false) { return; }
-
-		const config = this.config;
-		const offsetStartdelay = options?.offsetStartdelay || config.offsetStartdelay || 120;  //start with 1 min passed to get the first ad to show faster
-		const delayBetweenAds = options?.delayBetweenAds || config.delayBetweenAds || 240;  //check for  240 (4 min) seconds passed was 180
-		const awayResetTime = options?.awayResetTime || config.awayResetTime || 1200;  //check if over 20 min, may have not been in the app and reopened it with out restarting
-
-		//1. only allow ad to be shown/loaded once every 150 second (Advertisement.delayBetweenAds)
-		//2. check if over 20 min, may have not been in the app and reopened it with out restarting 
-		//3. load ad ether way
-		//4. show ad if conditions met
-
-		let readyToShowAd = false;
-
-		//reset timer
-		if (!this.lastShownInterstitial) {
-			this.lastShownInterstitial = Date.now();//now
-			//add start offset delay
-			const newDate = new Date();
-			newDate.setSeconds(newDate.getSeconds() - offsetStartdelay);
-			this.lastShownInterstitial = newDate;
-		}
-
-		const secondsSinceLastAd = (Date.now() - this.lastShownInterstitial) / 1000;
-
-		//check for  delayBetweenAds seconds passed
-		if (secondsSinceLastAd > delayBetweenAds) {
-			readyToShowAd = true;
-		}
-
-		//check if over 20 min, may have not been in the app and reopened it with out restarting 
-		if (secondsSinceLastAd > awayResetTime) {
-			readyToShowAd = false;
-			this.lastShownInterstitial = Date.now();//now, reset
-		}
-
-		console.log('readyToShowInterstitialAd: ' + readyToShowAd + ' : ' + secondsSinceLastAd + ' of ' + delayBetweenAds);
-
-		// show ad or just load ad (not load and show)
-		if (readyToShowAd) {
-			await this.showInterstitialAd();
-		} else {
-			await this.loadInterstitialAd();
-		}
-	}
-	showInterstitialAd() {
+	loadInterstitialAd() {
+		console.log('GoogleH5.loadAd');
+	}
+
+	showInterstitialAd() {
 		console.log('GoogleH5.showAd');
 
 		if (typeof adBreak === 'undefined' || !globalThis.adBreak) {
@@ -214,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;
 		}
@@ -304,4 +261,5 @@ export class WebPortal extends BasePortal {
 
 		return adStatus;
 	}
-}
+
+}

package/package.json

@@ -1,23 +1,24 @@
 {
 	"name": "@cardsjd/portal",
-  "private": false,
-  "version": "0.1.7",
-  "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": {}
 }