@cardsjd/portal 0.1.7 → 0.1.8

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();

package/lib/BasePortal.js

@@ -50,10 +50,77 @@ export class BasePortal {
 
 	createShortCut() { }
 
-	async tryShowInterstitialAd(_options) {
-
+	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 showAppOpenAdWithMaxDelay(_maxDelay) {
-
+	async showAppOpenAdWithMaxDelay(maxDelay) {
+		if (this.isSetUp === false) { return; }
+
+
+		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');
 

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');
 

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;

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;

package/lib/WebPortal.js

@@ -49,7 +49,7 @@ export class WebPortal extends BasePortal {
 
 	async setupAds() {
 		if (this.isSetup) {
-			console.log('CapacitorAdmob is already setup');
+			console.log('GoogleH5.isSetup is already done');
 			return;
 		}
 		if (this.isSetupLoading) {
@@ -58,11 +58,6 @@ export class WebPortal extends BasePortal {
 
 		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');
@@ -122,53 +117,6 @@ 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() {
 		console.log('GoogleH5.showAd');
 
@@ -304,4 +252,5 @@ export class WebPortal extends BasePortal {
 
 		return adStatus;
 	}
+
 }

package/package.json

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