Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1724 from thecodingmachine/master

Browse source 
Backport fix 2022-01-13
This commit is contained in:
David Négrier 2022-01-13 15:59:54 +01:00 • committed by GitHub
commit 57d2dec756
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 353 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
front/dist/iframe.html vendored
View file

@ -11,7 +11,10 @@
const scriptUrl = urlParams.get('script');
const script = document.createElement('script');
script.src = scriptUrl;
script.type = "module";
if (urlParams.get('moduleMode') === 'true') {
script.type = "module";
}
document.head.append(script);
</script>
</head>

12
front/src/Api/IframeListener.ts
View file

@ -274,7 +274,7 @@ class IframeListener {
this.iframes.delete(iframe);
}
registerScript(scriptUrl: string): Promise<void> {
registerScript(scriptUrl: string, enableModuleMode: boolean = true): Promise<void> {
return new Promise<void>((resolve, reject) => {
console.info("Loading map related script at ", scriptUrl);
@ -283,7 +283,11 @@ class IframeListener {
const iframe = document.createElement("iframe");
iframe.id = IframeListener.getIFrameId(scriptUrl);
iframe.style.display = "none";
iframe.src = "/iframe.html?script=" + encodeURIComponent(scriptUrl);
iframe.src =
"/iframe.html?script=" +
encodeURIComponent(scriptUrl) +
"&moduleMode=" +
(enableModuleMode ? "true" : "false");
// We are putting a sandbox on this script because it will run in the same domain as the main website.
iframe.sandbox.add("allow-scripts");
@ -318,7 +322,9 @@ class IframeListener {
"//" +
window.location.host +
'/iframe_api.js" ></script>\n' +
'<script type="module" src="' +
"<script " +
(enableModuleMode ? 'type="module" ' : "") +
'src="' +
scriptUrl +
'" ></script>\n' +
"<title></title>\n" +

1
front/src/Phaser/Game/GameMapProperties.ts
View file

@ -28,6 +28,7 @@ export enum GameMapProperties {
PLAY_AUDIO_LOOP = "playAudioLoop",
READABLE_BY = "readableBy",
SCRIPT = "script",
SCRIPT_DISABLE_MODULE_SUPPORT = "scriptDisableModuleSupport",
SILENT = "silent",
START = "start",
START_LAYER = "startLayer",

5
front/src/Phaser/Game/GameScene.ts
View file

@ -597,9 +597,12 @@ export class GameScene extends DirtyScene {
this.createPromiseResolve();
// Now, let's load the script, if any
const scripts = this.getScriptUrls(this.mapFile);
const disableModuleMode = this.getProperty(this.mapFile, GameMapProperties.SCRIPT_DISABLE_MODULE_SUPPORT) as
| boolean
| undefined;
const scriptPromises = [];
for (const script of scripts) {
scriptPromises.push(iframeListener.registerScript(script));
scriptPromises.push(iframeListener.registerScript(script, !disableModuleMode));
}
this.userInputManager.spaceEvent(() => {