Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2026-03-02 03:39:21 +00:00
Code Issues Projects Releases Wiki Activity

Prepare for the release on gamedistribution

Browse Source
This commit is contained in:
tobspr
2020-05-22 13:12:07 +02:00
parent b3a2e869d1
commit ab5462e140
32 changed files with 375 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/js/platform/browser/embed_provider.js
View File

@@ -1,47 +0,0 @@
import { AdProviderInterface } from "../ad_provider";
/**
* Stores information about where we are iframed
*/
export class EmbedProvider {
/**
* @returns {string}
*/
getId() {
abstract;
return "";
}
/**
* Whether this provider supports ads
* @returns {boolean}
*/
getSupportsAds() {
return false;
}
/**
* Returns the ad provider
* @returns {typeof AdProviderInterface}
*/
getAdProvider() {
abstract;
return null;
}
/**
* Whetherexternal links are supported
* @returns {boolean}
*/
getSupportsExternalLinks() {
return true;
}
/**
* Returns whether this provider is iframed
* @returns {boolean}
*/
getIsIframed() {
return true;
}
}

16
src/js/platform/browser/embed_providers/armorgames.js
View File

@@ -1,16 +0,0 @@
import { AdinplayAdProvider } from "../../ad_providers/adinplay";
import { ShapezioWebsiteEmbedProvider } from "./shapezio_website";
export class ArmorgamesEmbedProvider extends ShapezioWebsiteEmbedProvider {
getId() {
return "armorgames";
}
getAdProvider() {
return AdinplayAdProvider;
}
getIsIframed() {
return true;
}
}

11
src/js/platform/browser/embed_providers/crazygames.js
View File

@@ -1,11 +0,0 @@
import { ShapezioWebsiteEmbedProvider } from "./shapezio_website";
export class CrazygamesEmbedProvider extends ShapezioWebsiteEmbedProvider {
getId() {
return "crazygames";
}
getIsIframed() {
return true;
}
}

20
src/js/platform/browser/embed_providers/gamedistribution.js
View File

@@ -1,20 +0,0 @@
import { AdinplayAdProvider } from "../../ad_providers/adinplay";
import { ShapezioWebsiteEmbedProvider } from "./shapezio_website";
export class GamedistributionEmbedProvider extends ShapezioWebsiteEmbedProvider {
getId() {
return "gamedistribution";
}
getAdProvider() {
return AdinplayAdProvider;
}
getSupportsExternalLinks() {
return false;
}
getIsIframed() {
return true;
}
}

15
src/js/platform/browser/embed_providers/iogames_space.js
View File

@@ -1,15 +0,0 @@
import { ShapezioWebsiteEmbedProvider } from "./shapezio_website";
export class IogamesSpaceEmbedProvider extends ShapezioWebsiteEmbedProvider {
getId() {
return "iogames.space";
}
getShowUpvoteHints() {
return true;
}
getIsIframed() {
return true;
}
}

24
src/js/platform/browser/embed_providers/kongregate.js
View File

@@ -1,24 +0,0 @@
import { NoAdProvider } from "../../ad_providers/no_ad_provider";
import { EmbedProvider } from "../embed_provider";
export class KongregateEmbedProvider extends EmbedProvider {
getId() {
return "kongregate";
}
getSupportsAds() {
return false;
}
getAdProvider() {
return NoAdProvider;
}
getSupportsExternalLinks() {
return true;
}
getIsIframed() {
return true;
}
}

11
src/js/platform/browser/embed_providers/miniclip.js
View File

@@ -1,11 +0,0 @@
import { ShapezioWebsiteEmbedProvider } from "./shapezio_website";
export class MiniclipEmbedProvider extends ShapezioWebsiteEmbedProvider {
getId() {
return "miniclip";
}
getIsIframed() {
return true;
}
}

24
src/js/platform/browser/embed_providers/shapezio_website.js
View File

@@ -1,24 +0,0 @@
import { EmbedProvider } from "../embed_provider";
import { AdinplayAdProvider } from "../../ad_providers/adinplay";
export class ShapezioWebsiteEmbedProvider extends EmbedProvider {
getId() {
return "shapezio";
}
getSupportsAds() {
return true;
}
getAdProvider() {
return AdinplayAdProvider;
}
getIsIframed() {
return false;
}
getSupportsExternalLinks() {
return true;
}
}

83
src/js/platform/browser/wrapper.js
View File

@@ -1,18 +1,11 @@
import { Math_min } from "../../core/builtins";
import { globalConfig, IS_MOBILE } from "../../core/config";
import { createLogger } from "../../core/logging";
import { queryParamOptions } from "../../core/query_parameters";
import { clamp } from "../../core/utils";
import { globalConfig, IS_MOBILE } from "../../core/config";
import { NoAdProvider } from "../ad_providers/no_ad_provider";
import { PlatformWrapperInterface } from "../wrapper";
import { ShapezioWebsiteEmbedProvider } from "./embed_providers/shapezio_website";
import { ArmorgamesEmbedProvider } from "./embed_providers/armorgames";
import { IogamesSpaceEmbedProvider } from "./embed_providers/iogames_space";
import { MiniclipEmbedProvider } from "./embed_providers/miniclip";
import { GamedistributionEmbedProvider } from "./embed_providers/gamedistribution";
import { KongregateEmbedProvider } from "./embed_providers/kongregate";
import { CrazygamesEmbedProvider } from "./embed_providers/crazygames";
import { EmbedProvider } from "./embed_provider";
import { GamedistributionAdProvider } from "../ad_providers/gamedistribution";
const logger = createLogger("platform/browser");
@@ -20,39 +13,50 @@ export class PlatformWrapperImplBrowser extends PlatformWrapperInterface {
initialize() {
this.recaptchaTokenCallback = null;
this.embedProvider = new ShapezioWebsiteEmbedProvider();
this.embedProvider = {
id: "shapezio-website",
adProvider: NoAdProvider,
iframed: false,
externalLinks: true,
iogLink: true,
};
if (!G_IS_STANDALONE && queryParamOptions.embedProvider) {
const providerId = queryParamOptions.embedProvider;
this.embedProvider.iframed = true;
this.embedProvider.iogLink = false;
switch (providerId) {
case "armorgames": {
this.embedProvider = new ArmorgamesEmbedProvider();
this.embedProvider.id = "armorgames";
break;
}
case "iogames.space": {
this.embedProvider = new IogamesSpaceEmbedProvider();
this.embedProvider.id = "iogames.space";
this.embedProvider.iogLink = true;
break;
}
case "miniclip": {
this.embedProvider = new MiniclipEmbedProvider();
this.embedProvider.id = "miniclip";
break;
}
case "gamedistribution": {
this.embedProvider = new GamedistributionEmbedProvider();
this.embedProvider.id = "gamedistribution";
this.embedProvider.externalLinks = false;
this.embedProvider.adProvider = GamedistributionAdProvider;
break;
}
case "kongregate": {
this.embedProvider = new KongregateEmbedProvider();
this.embedProvider.id = "kongregate";
break;
}
case "crazygames": {
this.embedProvider = new CrazygamesEmbedProvider();
this.embedProvider.id = "crazygames";
break;
}
@@ -62,27 +66,9 @@ export class PlatformWrapperImplBrowser extends PlatformWrapperInterface {
}
}
logger.log("Embed provider:", this.embedProvider.getId());
logger.log("Embed provider:", this.embedProvider.id);
return super.initialize().then(() => {
// SENTRY
if (!G_IS_DEV && false) {
logger.log(this, "Loading sentry");
const sentryTag = document.createElement("script");
sentryTag.src = "https://browser.sentry-cdn.com/5.7.1/bundle.min.js";
sentryTag.setAttribute("integrity", "TODO_SENTRY");
sentryTag.setAttribute("crossorigin", "anonymous");
sentryTag.addEventListener("load", this.onSentryLoaded.bind(this));
document.head.appendChild(sentryTag);
}
});
}
/**
* @returns {EmbedProvider}
*/
getEmbedProvider() {
return this.embedProvider;
return super.initialize().then(() => this.initializeAdProvider());
}
onSentryLoaded() {
@@ -151,7 +137,7 @@ export class PlatformWrapperImplBrowser extends PlatformWrapperInterface {
}
getId() {
return "browser@" + this.embedProvider.getId();
return "browser@" + this.embedProvider.id;
}
getUiScale() {
@@ -173,16 +159,15 @@ export class PlatformWrapperImplBrowser extends PlatformWrapperInterface {
openExternalLink(url, force = false) {
logger.log("Opening external:", url);
// if (force || this.embedProvider.getSupportsExternalLinks()) {
window.open(url);
// } else {
// // Do nothing
// alert("This platform does not allow opening external links. You can play on the website directly to open them.");
// }
}
getSupportsAds() {
return this.embedProvider.getSupportsAds();
if (force || this.embedProvider.externalLinks) {
window.open(url);
} else {
// Do nothing
alert(
"This platform does not allow opening external links. You can play on https://shapez.io directly to open them.\n\nClicked Link: " +
url
);
}
}
performRestart() {
@@ -218,16 +203,18 @@ export class PlatformWrapperImplBrowser extends PlatformWrapperInterface {
initializeAdProvider() {
if (G_IS_DEV && !globalConfig.debug.testAds) {
logger.log("Ads disabled in local environment");
return Promise.resolve();
}
// First, detect adblocker
return this.detectAdblock().then(hasAdblocker => {
if (hasAdblocker) {
logger.log("Adblock detected");
return;
}
const adProvider = this.embedProvider.getAdProvider();
const adProvider = this.embedProvider.adProvider;
this.app.adProvider = new adProvider(this.app);
return this.app.adProvider.initialize().catch(err => {
logger.error("Failed to initialize ad provider, disabling ads:", err);