@cardsjd/portal 0.1.3 → 0.1.4

package/lib/BasePortal.js

@@ -1,11 +1,10 @@
-import { Advertisement } from './Advertisement.js';
 export class BasePortal {
 
 	async init() { }
 
 	async load() { }
 
-	async save(data, forceSave) { }
+	async save(_data, _forceSave) { }
 
 	async delete() { }
 
@@ -21,26 +20,17 @@ export class BasePortal {
 
 	async getInvite() { }
 
-	async inviteSend(user, room) { }
+	async inviteSend(_user, _room) { }
 
-	async findAndInvite(userFrom, room) { }
+	async findAndInvite(_userFrom, _room) { }
 
 	async getFriends() { }
 
-	tryShowInterstitialAd(options) {
-		const readyToShowAd = Advertisement.isInterstitialAdReady(options);
-		if (readyToShowAd) {
-			this.showInterstitialAd();
-		} else {
-			this.loadInterstitialAd();
-		}
-	}
-	
 	setupAds() { }
 
-	loadInterstitialAd(_force) { }
+	async loadInterstitialAd(_force) { }
 
-	showInterstitialAd() { }
+	async showInterstitialAd() { }
 
 	loadRewardedAd(_onLoaded) { }
 
@@ -48,7 +38,7 @@ export class BasePortal {
 
 	loadAppOpenAd() { }
 
-	showAppOpenAd(maxDelay) { }
+	async showAppOpenAd(_maxDelay) { }
 
 	isAdLoaded() { }
 
@@ -59,4 +49,79 @@ export class BasePortal {
 	isErrorState() { }
 
 	createShortCut() { }
+
+	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 === 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 (not load and show)
+		if (readyToShowAd) {
+			await this.showInterstitialAd();
+		} else {
+			await this.loadInterstitialAd();
+		}
+	}
+
+	async showAppOpenAdWithMaxDelay(maxDelay) {
+		if (this.isSetUp === false) { return; }
+		if (this.adProvider == null) { 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/package.json

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

package/lib/Advertisement.js

@@ -1,99 +0,0 @@
-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();
-		}
-	}
-}