@cardsjd/portal 0.1.2 → 0.1.3

package/lib/AdMobPortal.js

@@ -140,7 +140,7 @@ export class AdMobPortal extends BasePortal {
 		return this._isRewardedAdLoaded;
 	}
 
-	async loadAd() {
+	async loadInterstitialAd() {
 		if (this.isSetup === false) {
 			return;
 		}
@@ -154,9 +154,9 @@ export class AdMobPortal extends BasePortal {
 		});
 	}
 
-	async showAd() {
+	async showInterstitialAd() {
 		if (!this.isAdLoaded()) {
-			await this.loadAd();
+			await this.loadInterstitialAd();
 			return; // no auto show
 		}
 

package/lib/Advertisement.js

@@ -0,0 +1,99 @@
+export class Advertisement {
+    isInterstitialAdReady(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
+		const delayBetweenRewardedAds = options?.delayBetweenRewardedAds || config.delayBetweenRewardedAds || 300;  //check for  600 seconds passed
+
+
+		//0. if ads removed, dont even load the ad
+		//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
+		if (this.removeAds) { return false; }
+
+		let readyToShowAd = false;
+
+		//reset timer
+		if (this.lastShownInterstitial === null) {
+			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
+		if (readyToShowAd) {
+			true;
+		} else {
+			false;
+		}
+	}
+	async showAppOpenAdWithMaxDelay(maxDelay) {
+		if (this.isSetUp === false) { return; }
+		if (this.adProvider == null) { return; }
+
+
+
+		if (!maxDelay) {
+			maxDelay = 4000;
+		}
+
+		//todo: fix if long loader time than maxDelay, then skip ad
+		//something like this:
+		//return new Promise(async (resolve, reject) => {
+		// if (this.adProvider && this.adProvider.showAppOpenAd) {
+		//     timeoutPromise = setTimeout(() => {
+		//         //stop ad from showing
+		//         if (this.adProvider) this.adProvider.appOpenAdAutoShow = false;
+		//         reject(new Error('showAppOpenAd has not fired after 4 seconds. Skipping ad'));
+		//     }, maxDelay);
+		//     await this.adProvider.showAppOpenAd();
+		//     clearTimeout(timeoutPromise);
+		//     resolve();
+		// }
+		// else {
+		//     reject();
+		// }
+
+
+		//get start time
+		const startTime = Date.now();
+		if (this.adProvider.loadAppOpenAd) {
+			await this.adProvider.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.adProvider.showAppOpenAd) {
+			await this.adProvider.showAppOpenAd();
+		}
+	}
+}

package/lib/BasePortal.js

@@ -1,3 +1,4 @@
+import { Advertisement } from './Advertisement.js';
 export class BasePortal {
 
 	async init() { }
@@ -5,7 +6,7 @@ export class BasePortal {
 	async load() { }
 
 	async save(data, forceSave) { }
-	
+
 	async delete() { }
 
 	gameStart() { }
@@ -26,20 +27,29 @@ export class BasePortal {
 
 	async getFriends() { }
 
-	tryShowInterstitialAd() { }
-
+	tryShowInterstitialAd(options) {
+		const readyToShowAd = Advertisement.isInterstitialAdReady(options);
+		if (readyToShowAd) {
+			this.showInterstitialAd();
+		} else {
+			this.loadInterstitialAd();
+		}
+	}
+	
 	setupAds() { }
 
-	loadAd(_force) { }
+	loadInterstitialAd(_force) { }
 
-	showAd() { }
-
-	loadAndShowAd() { }
+	showInterstitialAd() { }
 
 	loadRewardedAd(_onLoaded) { }
 
 	showRewardedAd() { }
 
+	loadAppOpenAd() { }
+
+	showAppOpenAd(maxDelay) { }
+
 	isAdLoaded() { }
 
 	isRewardedAdLoaded() { }

package/lib/CrazyGamesPortal.js

@@ -245,7 +245,7 @@ export class CrazyGamesPortal extends BasePortal {
 		return this.isCrazyGames();
 	}
 
-	async loadAd() {
+	async loadInterstitialAd() {
 		console.log('CrazyGames.loadAd');
 
 		if (!this.isCrazyGames()) {
@@ -257,7 +257,7 @@ export class CrazyGamesPortal extends BasePortal {
 		}
 	}
 
-	async showAd() {
+	async showInterstitialAd() {
 		console.log('CrazyGames.showAd');
 
 		if (!this.isCrazyGames()) {

package/lib/FacebookPortal.js

@@ -159,25 +159,25 @@ export class FacebookPortal extends BasePortal {
 		this._errorCount = (this._errorCount || 0) + 1;
 	}
 
-	loadAd(force) {
-		console.log('FB_Ads.loadAd');
+	loadInterstitialAd(force) {
+		console.log('FB_Ads.loadInterstitialAd');
 
 		if (typeof FBInstant === 'undefined' || !globalThis.FBInstant) {
 			console.log('FBInstant plugin not ready'); return false;
 		}
 
 		if (!force && this._isAdLoading) {
-			console.log('FBInstant.loadAd() - _isAdLoading = true');
+			console.log('FBInstant.loadInterstitialAd() - _isAdLoading = true');
 			return true;
 		}
 
 		if (!force && this._isAdLoaded) {
-			console.log('FBInstant.loadAd() - _isAdLoaded = true');
+			console.log('FBInstant.loadInterstitialAd() - _isAdLoaded = true');
 			return true;
 		}
 
 		if (!force && this.isErrorState()) {
-			console.log('FBInstant.loadAd() - ErrorState = true');
+			console.log('FBInstant.loadInterstitialAd() - ErrorState = true');
 			return true;
 		}
 
@@ -228,27 +228,27 @@ export class FacebookPortal extends BasePortal {
 		}
 	}
 
-	showAd() {
-		console.log('FB_Ads.showAd');
+	showInterstitialAd() {
+		console.log('FB_Ads.showInterstitialAd');
 
 		if (typeof FBInstant === 'undefined' || !globalThis.FBInstant) {
 			console.log('FBInstant plugin not ready'); return false;
 		}
 
 		if (this.isErrorState()) {
-			console.log('FBInstant.showAd() - ErrorState = true');
+			console.log('FBInstant.showInterstitialAd() - ErrorState = true');
 			return true;
 		}
 
 		const isAdLoaded = this._isAdLoaded;
 
 		if (!isAdLoaded) {
-			this.loadAd();
+			this.loadInterstitialAd();
 		}
 
 		if (isAdLoaded) {
 			if (!this.preloadedInterstitial) {
-				console.log('FBInstant.showAd() - error: preloadedInterstitial = null');
+				console.log('FBInstant.showInterstitialAd() - error: preloadedInterstitial = null');
 				return false;
 			}
 
@@ -273,11 +273,11 @@ export class FacebookPortal extends BasePortal {
 
 	}
 
-	loadAndShowAd() {
+	loadAndShowInterstitialAd() {
 		console.log('FB_Ads.showAd');
 
 		if (this.isErrorState()) {
-			console.log('FBInstant.showAd() - isErrorState = true');
+			console.log('FBInstant.loadAndShowInterstitialAd() - isErrorState = true');
 			return true;
 		}
 

package/lib/GameDistributionPortal.js

@@ -51,7 +51,7 @@ export class GameDistribution extends BasePortal {
 		return true;
 	}
 
-	async loadAd() {
+	async loadInterstitialAd() {
 		if (!this.isReady()) {
 			return false;
 		}
@@ -64,7 +64,7 @@ export class GameDistribution extends BasePortal {
 		}
 	}
 
-	async showAd() {
+	async showInterstitialAd() {
 		if (!this.isReady()) {
 			return false;
 		}
@@ -80,7 +80,7 @@ export class GameDistribution extends BasePortal {
 		return this.isRewardedAdReady;
 	}
 
-	loadRewardedAd() {
+	async loadRewardedAd() {
 		if (!this.isReady()) {
 			return false;
 		}

package/lib/PokiPortal.js

@@ -182,11 +182,11 @@ export class PokiPortal extends BasePortal {
 		return true;
 	}
 
-	async loadAd() {
+	async loadInterstitialAd() {
 		// Poki commercial breaks do not require manual preloading
 	}
 
-	async showAd() {
+	async showInterstitialAd() {
 		if (!this.isReady()) {
 			return false;
 		}

package/lib/WebPortal.js

@@ -115,11 +115,11 @@ export class WebPortal extends BasePortal {
 		});
 	}
 
-	loadAd() {
+	loadInterstitialAd() {
 		console.log('GoogleH5.loadAd');
 	}
 
-	showAd() {
+	showInterstitialAd() {
 		console.log('GoogleH5.showAd');
 
 		if (typeof adBreak === 'undefined' || !globalThis.adBreak) {

package/package.json

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