lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Reverting changes regarding single quotes

Browse source
This commit is contained in:
David Négrier 2021-07-23 14:59:56 +02:00
parent a146065cc6
commit 3d5c222957
6 changed files with 401 additions and 401 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
front/src/Api/Events/IframeEvent.ts
View file

@ -1,29 +1,29 @@
import type { GameStateEvent } from './GameStateEvent';
import type { ButtonClickedEvent } from './ButtonClickedEvent';
import type { ChatEvent } from './ChatEvent';
import type { ClosePopupEvent } from './ClosePopupEvent';
import type { EnterLeaveEvent } from './EnterLeaveEvent';
import type { GoToPageEvent } from './GoToPageEvent';
import type { LoadPageEvent } from './LoadPageEvent';
import type { OpenCoWebSiteEvent } from './OpenCoWebSiteEvent';
import type { OpenPopupEvent } from './OpenPopupEvent';
import type { OpenTabEvent } from './OpenTabEvent';
import type { UserInputChatEvent } from './UserInputChatEvent';
import type { DataLayerEvent } from './DataLayerEvent';
import type { LayerEvent } from './LayerEvent';
import type { SetPropertyEvent } from './setPropertyEvent';
import type { LoadSoundEvent } from './LoadSoundEvent';
import type { PlaySoundEvent } from './PlaySoundEvent';
import type { MenuItemClickedEvent } from './ui/MenuItemClickedEvent';
import type { MenuItemRegisterEvent } from './ui/MenuItemRegisterEvent';
import type { HasPlayerMovedEvent } from './HasPlayerMovedEvent';
import type { SetTilesEvent } from './SetTilesEvent';
import type { GameStateEvent } from "./GameStateEvent";
import type { ButtonClickedEvent } from "./ButtonClickedEvent";
import type { ChatEvent } from "./ChatEvent";
import type { ClosePopupEvent } from "./ClosePopupEvent";
import type { EnterLeaveEvent } from "./EnterLeaveEvent";
import type { GoToPageEvent } from "./GoToPageEvent";
import type { LoadPageEvent } from "./LoadPageEvent";
import type { OpenCoWebSiteEvent } from "./OpenCoWebSiteEvent";
import type { OpenPopupEvent } from "./OpenPopupEvent";
import type { OpenTabEvent } from "./OpenTabEvent";
import type { UserInputChatEvent } from "./UserInputChatEvent";
import type { DataLayerEvent } from "./DataLayerEvent";
import type { LayerEvent } from "./LayerEvent";
import type { SetPropertyEvent } from "./setPropertyEvent";
import type { LoadSoundEvent } from "./LoadSoundEvent";
import type { PlaySoundEvent } from "./PlaySoundEvent";
import type { MenuItemClickedEvent } from "./ui/MenuItemClickedEvent";
import type { MenuItemRegisterEvent } from "./ui/MenuItemRegisterEvent";
import type { HasPlayerMovedEvent } from "./HasPlayerMovedEvent";
import type { SetTilesEvent } from "./SetTilesEvent";
import type {
MessageReferenceEvent,
removeTriggerMessage,
triggerMessage,
TriggerMessageEvent,
} from './ui/TriggerMessageEvent';
} from "./ui/TriggerMessageEvent";
export interface TypedMessageEvent<T> extends MessageEvent {
data: T;
@ -67,7 +67,7 @@ export interface IframeEvent<T extends keyof IframeEventMap> {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export const isIframeEventWrapper = (event: any): event is IframeEvent<keyof IframeEventMap> =>
typeof event.type === 'string';
typeof event.type === "string";
export interface IframeResponseEventMap {
userInputChat: UserInputChatEvent;
@ -87,7 +87,7 @@ export interface IframeResponseEvent<T extends keyof IframeResponseEventMap> {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export const isIframeResponseEventWrapper = (event: {
type?: string;
}): event is IframeResponseEvent<keyof IframeResponseEventMap> => typeof event.type === 'string';
}): event is IframeResponseEvent<keyof IframeResponseEventMap> => typeof event.type === "string";
/**
* List event types sent from an iFrame to WorkAdventure that expect a unique answer from WorkAdventure along the type for the answer from WorkAdventure to the iFrame
@ -111,7 +111,7 @@ export type IframeQueryMap = {
export interface IframeQuery<T extends keyof IframeQueryMap> {
type: T;
data: IframeQueryMap[T]['query'];
data: IframeQueryMap[T]["query"];
}
export interface IframeQueryWrapper<T extends keyof IframeQueryMap> {
@ -120,22 +120,22 @@ export interface IframeQueryWrapper<T extends keyof IframeQueryMap> {
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export const isIframeQuery = (event: any): event is IframeQuery<keyof IframeQueryMap> => typeof event.type === 'string';
export const isIframeQuery = (event: any): event is IframeQuery<keyof IframeQueryMap> => typeof event.type === "string";
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export const isIframeQueryWrapper = (event: any): event is IframeQueryWrapper<keyof IframeQueryMap> =>
typeof event.id === 'number' && isIframeQuery(event.query);
typeof event.id === "number" && isIframeQuery(event.query);
export interface IframeAnswerEvent<T extends keyof IframeQueryMap> {
id: number;
type: T;
data: IframeQueryMap[T]['answer'];
data: IframeQueryMap[T]["answer"];
}
export const isIframeAnswerEvent = (event: {
type?: string;
id?: number;
}): event is IframeAnswerEvent<keyof IframeQueryMap> => typeof event.type === 'string' && typeof event.id === 'number';
}): event is IframeAnswerEvent<keyof IframeQueryMap> => typeof event.type === "string" && typeof event.id === "number";
export interface IframeErrorAnswerEvent {
id: number;
@ -148,4 +148,4 @@ export const isIframeErrorAnswerEvent = (event: {
id?: number;
error?: string;
}): event is IframeErrorAnswerEvent =>
typeof event.type === 'string' && typeof event.id === 'number' && typeof event.error === 'string';
typeof event.type === "string" && typeof event.id === "number" && typeof event.error === "string";

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

@ -1,15 +1,15 @@
import { Subject } from 'rxjs';
import type * as tg from 'generic-type-guard';
import { ChatEvent, isChatEvent } from './Events/ChatEvent';
import { HtmlUtils } from '../WebRtc/HtmlUtils';
import type { EnterLeaveEvent } from './Events/EnterLeaveEvent';
import { isOpenPopupEvent, OpenPopupEvent } from './Events/OpenPopupEvent';
import { isOpenTabEvent, OpenTabEvent } from './Events/OpenTabEvent';
import type { ButtonClickedEvent } from './Events/ButtonClickedEvent';
import { ClosePopupEvent, isClosePopupEvent } from './Events/ClosePopupEvent';
import { scriptUtils } from './ScriptUtils';
import { GoToPageEvent, isGoToPageEvent } from './Events/GoToPageEvent';
import { isOpenCoWebsite, OpenCoWebSiteEvent } from './Events/OpenCoWebSiteEvent';
import { Subject } from "rxjs";
import type * as tg from "generic-type-guard";
import { ChatEvent, isChatEvent } from "./Events/ChatEvent";
import { HtmlUtils } from "../WebRtc/HtmlUtils";
import type { EnterLeaveEvent } from "./Events/EnterLeaveEvent";
import { isOpenPopupEvent, OpenPopupEvent } from "./Events/OpenPopupEvent";
import { isOpenTabEvent, OpenTabEvent } from "./Events/OpenTabEvent";
import type { ButtonClickedEvent } from "./Events/ButtonClickedEvent";
import { ClosePopupEvent, isClosePopupEvent } from "./Events/ClosePopupEvent";
import { scriptUtils } from "./ScriptUtils";
import { GoToPageEvent, isGoToPageEvent } from "./Events/GoToPageEvent";
import { isOpenCoWebsite, OpenCoWebSiteEvent } from "./Events/OpenCoWebSiteEvent";
import {
IframeErrorAnswerEvent,
IframeEvent,
@ -21,24 +21,24 @@ import {
isIframeEventWrapper,
isIframeQueryWrapper,
TypedMessageEvent,
} from './Events/IframeEvent';
import type { UserInputChatEvent } from './Events/UserInputChatEvent';
import { isPlaySoundEvent, PlaySoundEvent } from './Events/PlaySoundEvent';
import { isStopSoundEvent, StopSoundEvent } from './Events/StopSoundEvent';
import { isLoadSoundEvent, LoadSoundEvent } from './Events/LoadSoundEvent';
import { isSetPropertyEvent, SetPropertyEvent } from './Events/setPropertyEvent';
import { isLayerEvent, LayerEvent } from './Events/LayerEvent';
import { isMenuItemRegisterEvent } from './Events/ui/MenuItemRegisterEvent';
import type { DataLayerEvent } from './Events/DataLayerEvent';
import type { GameStateEvent } from './Events/GameStateEvent';
import type { HasPlayerMovedEvent } from './Events/HasPlayerMovedEvent';
import { isLoadPageEvent } from './Events/LoadPageEvent';
import { handleMenuItemRegistrationEvent, isMenuItemRegisterIframeEvent } from './Events/ui/MenuItemRegisterEvent';
import { SetTilesEvent, isSetTilesEvent } from './Events/SetTilesEvent';
} from "./Events/IframeEvent";
import type { UserInputChatEvent } from "./Events/UserInputChatEvent";
import { isPlaySoundEvent, PlaySoundEvent } from "./Events/PlaySoundEvent";
import { isStopSoundEvent, StopSoundEvent } from "./Events/StopSoundEvent";
import { isLoadSoundEvent, LoadSoundEvent } from "./Events/LoadSoundEvent";
import { isSetPropertyEvent, SetPropertyEvent } from "./Events/setPropertyEvent";
import { isLayerEvent, LayerEvent } from "./Events/LayerEvent";
import { isMenuItemRegisterEvent } from "./Events/ui/MenuItemRegisterEvent";
import type { DataLayerEvent } from "./Events/DataLayerEvent";
import type { GameStateEvent } from "./Events/GameStateEvent";
import type { HasPlayerMovedEvent } from "./Events/HasPlayerMovedEvent";
import { isLoadPageEvent } from "./Events/LoadPageEvent";
import { handleMenuItemRegistrationEvent, isMenuItemRegisterIframeEvent } from "./Events/ui/MenuItemRegisterEvent";
import { SetTilesEvent, isSetTilesEvent } from "./Events/SetTilesEvent";
type AnswererCallback<T extends keyof IframeQueryMap> = (
query: IframeQueryMap[T]['query']
) => IframeQueryMap[T]['answer'] | Promise<IframeQueryMap[T]['answer']>;
query: IframeQueryMap[T]["query"]
) => IframeQueryMap[T]["answer"] | Promise<IframeQueryMap[T]["answer"]>;
/**
* Listens to messages from iframes and turn those messages into easy to use observables.
@ -122,7 +122,7 @@ class IframeListener {
init() {
window.addEventListener(
'message',
"message",
<T extends keyof IframeEventMap, U extends keyof IframeQueryMap>(
message: TypedMessageEvent<IframeEvent<T | U>>
) => {
@ -144,10 +144,10 @@ class IframeListener {
if (foundSrc === undefined || iframe === undefined) {
if (isIframeEventWrapper(payload)) {
console.warn(
'It seems an iFrame is trying to communicate with WorkAdventure but was not explicitly granted the permission to do so. ' +
'If you are looking to use the WorkAdventure Scripting API inside an iFrame, you should allow the ' +
"It seems an iFrame is trying to communicate with WorkAdventure but was not explicitly granted the permission to do so. " +
"If you are looking to use the WorkAdventure Scripting API inside an iFrame, you should allow the " +
'iFrame to communicate with WorkAdventure by using the "openWebsiteAllowApi" property in your map (or passing "true" as a second' +
'parameter to WA.nav.openCoWebSite())'
"parameter to WA.nav.openCoWebSite())"
);
}
return;
@ -172,7 +172,7 @@ class IframeListener {
type: query.type,
error: errorMsg,
} as IframeErrorAnswerEvent,
'*'
"*"
);
return;
}
@ -185,11 +185,11 @@ class IframeListener {
type: query.type,
data: value,
},
'*'
"*"
);
})
.catch((reason) => {
console.error('An error occurred while responding to an iFrame query.', reason);
console.error("An error occurred while responding to an iFrame query.", reason);
let reasonMsg: string;
if (reason instanceof Error) {
reasonMsg = reason.message;
@ -203,54 +203,54 @@ class IframeListener {
type: query.type,
error: reasonMsg,
} as IframeErrorAnswerEvent,
'*'
"*"
);
});
} else if (isIframeEventWrapper(payload)) {
if (payload.type === 'showLayer' && isLayerEvent(payload.data)) {
if (payload.type === "showLayer" && isLayerEvent(payload.data)) {
this._showLayerStream.next(payload.data);
} else if (payload.type === 'hideLayer' && isLayerEvent(payload.data)) {
} else if (payload.type === "hideLayer" && isLayerEvent(payload.data)) {
this._hideLayerStream.next(payload.data);
} else if (payload.type === 'setProperty' && isSetPropertyEvent(payload.data)) {
} else if (payload.type === "setProperty" && isSetPropertyEvent(payload.data)) {
this._setPropertyStream.next(payload.data);
} else if (payload.type === 'chat' && isChatEvent(payload.data)) {
} else if (payload.type === "chat" && isChatEvent(payload.data)) {
this._chatStream.next(payload.data);
} else if (payload.type === 'openPopup' && isOpenPopupEvent(payload.data)) {
} else if (payload.type === "openPopup" && isOpenPopupEvent(payload.data)) {
this._openPopupStream.next(payload.data);
} else if (payload.type === 'closePopup' && isClosePopupEvent(payload.data)) {
} else if (payload.type === "closePopup" && isClosePopupEvent(payload.data)) {
this._closePopupStream.next(payload.data);
} else if (payload.type === 'openTab' && isOpenTabEvent(payload.data)) {
} else if (payload.type === "openTab" && isOpenTabEvent(payload.data)) {
scriptUtils.openTab(payload.data.url);
} else if (payload.type === 'goToPage' && isGoToPageEvent(payload.data)) {
} else if (payload.type === "goToPage" && isGoToPageEvent(payload.data)) {
scriptUtils.goToPage(payload.data.url);
} else if (payload.type === 'loadPage' && isLoadPageEvent(payload.data)) {
} else if (payload.type === "loadPage" && isLoadPageEvent(payload.data)) {
this._loadPageStream.next(payload.data.url);
} else if (payload.type === 'playSound' && isPlaySoundEvent(payload.data)) {
} else if (payload.type === "playSound" && isPlaySoundEvent(payload.data)) {
this._playSoundStream.next(payload.data);
} else if (payload.type === 'stopSound' && isStopSoundEvent(payload.data)) {
} else if (payload.type === "stopSound" && isStopSoundEvent(payload.data)) {
this._stopSoundStream.next(payload.data);
} else if (payload.type === 'loadSound' && isLoadSoundEvent(payload.data)) {
} else if (payload.type === "loadSound" && isLoadSoundEvent(payload.data)) {
this._loadSoundStream.next(payload.data);
} else if (payload.type === 'openCoWebSite' && isOpenCoWebsite(payload.data)) {
} else if (payload.type === "openCoWebSite" && isOpenCoWebsite(payload.data)) {
scriptUtils.openCoWebsite(
payload.data.url,
foundSrc,
payload.data.allowApi,
payload.data.allowPolicy
);
} else if (payload.type === 'closeCoWebSite') {
} else if (payload.type === "closeCoWebSite") {
scriptUtils.closeCoWebSite();
} else if (payload.type === 'disablePlayerControls') {
} else if (payload.type === "disablePlayerControls") {
this._disablePlayerControlStream.next();
} else if (payload.type === 'restorePlayerControls') {
} else if (payload.type === "restorePlayerControls") {
this._enablePlayerControlStream.next();
} else if (payload.type === 'displayBubble') {
} else if (payload.type === "displayBubble") {
this._displayBubbleStream.next();
} else if (payload.type === 'removeBubble') {
} else if (payload.type === "removeBubble") {
this._removeBubbleStream.next();
} else if (payload.type == 'onPlayerMove') {
} else if (payload.type == "onPlayerMove") {
this.sendPlayerMove = true;
} else if (payload.type == 'getDataLayer') {
} else if (payload.type == "getDataLayer") {
this._dataLayerChangeStream.next();
} else if (isMenuItemRegisterIframeEvent(payload)) {
const data = payload.data.menutItem;
@ -259,7 +259,7 @@ class IframeListener {
this._unregisterMenuCommandStream.next(data);
});
handleMenuItemRegistrationEvent(payload.data);
} else if (payload.type == 'setTiles' && isSetTilesEvent(payload.data)) {
} else if (payload.type == "setTiles" && isSetTilesEvent(payload.data)) {
this._setTilesStream.next(payload.data);
}
}
@ -270,7 +270,7 @@ class IframeListener {
sendDataLayerEvent(dataLayerEvent: DataLayerEvent) {
this.postMessage({
type: 'dataLayer',
type: "dataLayer",
data: dataLayerEvent,
});
}
@ -291,18 +291,18 @@ class IframeListener {
}
registerScript(scriptUrl: string): void {
console.log('Loading map related script at ', scriptUrl);
console.log("Loading map related script at ", scriptUrl);
if (!process.env.NODE_ENV || process.env.NODE_ENV === 'development') {
if (!process.env.NODE_ENV || process.env.NODE_ENV === "development") {
// Using external iframe mode (
const iframe = document.createElement('iframe');
const iframe = document.createElement("iframe");
iframe.id = IframeListener.getIFrameId(scriptUrl);
iframe.style.display = 'none';
iframe.src = '/iframe.html?script=' + encodeURIComponent(scriptUrl);
iframe.style.display = "none";
iframe.src = "/iframe.html?script=" + encodeURIComponent(scriptUrl);
// 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');
iframe.sandbox.add('allow-top-navigation-by-user-activation');
iframe.sandbox.add("allow-scripts");
iframe.sandbox.add("allow-top-navigation-by-user-activation");
document.body.prepend(iframe);
@ -310,31 +310,31 @@ class IframeListener {
this.registerIframe(iframe);
} else {
// production code
const iframe = document.createElement('iframe');
const iframe = document.createElement("iframe");
iframe.id = IframeListener.getIFrameId(scriptUrl);
iframe.style.display = 'none';
iframe.style.display = "none";
// 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');
iframe.sandbox.add('allow-top-navigation-by-user-activation');
iframe.sandbox.add("allow-scripts");
iframe.sandbox.add("allow-top-navigation-by-user-activation");
//iframe.src = "data:text/html;charset=utf-8," + escape(html);
iframe.srcdoc =
'<!doctype html>\n' +
'\n' +
"<!doctype html>\n" +
"\n" +
'<html lang="en">\n' +
'<head>\n' +
"<head>\n" +
'<script src="' +
window.location.protocol +
'//' +
"//" +
window.location.host +
'/iframe_api.js" ></script>\n' +
'<script src="' +
scriptUrl +
'" ></script>\n' +
'<title></title>\n' +
'</head>\n' +
'</html>\n';
"<title></title>\n" +
"</head>\n" +
"</html>\n";
document.body.prepend(iframe);
@ -353,7 +353,7 @@ class IframeListener {
}
private static getIFrameId(scriptUrl: string): string {
return 'script' + btoa(scriptUrl);
return "script" + btoa(scriptUrl);
}
unregisterScript(scriptUrl: string): void {
@ -370,7 +370,7 @@ class IframeListener {
sendUserInputChat(message: string) {
this.postMessage({
type: 'userInputChat',
type: "userInputChat",
data: {
message: message,
} as UserInputChatEvent,
@ -379,7 +379,7 @@ class IframeListener {
sendEnterEvent(name: string) {
this.postMessage({
type: 'enterEvent',
type: "enterEvent",
data: {
name: name,
} as EnterLeaveEvent,
@ -388,7 +388,7 @@ class IframeListener {
sendLeaveEvent(name: string) {
this.postMessage({
type: 'leaveEvent',
type: "leaveEvent",
data: {
name: name,
} as EnterLeaveEvent,
@ -398,7 +398,7 @@ class IframeListener {
hasPlayerMoved(event: HasPlayerMovedEvent) {
if (this.sendPlayerMove) {
this.postMessage({
type: 'hasPlayerMoved',
type: "hasPlayerMoved",
data: event,
});
}
@ -406,7 +406,7 @@ class IframeListener {
sendButtonClickedEvent(popupId: number, buttonId: number): void {
this.postMessage({
type: 'buttonClickedEvent',
type: "buttonClickedEvent",
data: {
popupId,
buttonId,
@ -419,7 +419,7 @@ class IframeListener {
*/
public postMessage(message: IframeResponseEvent<keyof IframeResponseEventMap>) {
for (const iframe of this.iframes) {
iframe.contentWindow?.postMessage(message, '*');
iframe.contentWindow?.postMessage(message, "*");
}
}
@ -431,7 +431,7 @@ class IframeListener {
* @param key The "type" of the query we are answering
* @param callback
*/
public registerAnswerer<T extends keyof IframeQueryMap, Guard extends tg.TypeGuard<IframeQueryMap[T]['query']>>(
public registerAnswerer<T extends keyof IframeQueryMap, Guard extends tg.TypeGuard<IframeQueryMap[T]["query"]>>(
key: T,
callback: AnswererCallback<T>,
typeChecker?: Guard

36
front/src/Connexion/Room.ts
View file

@ -1,6 +1,6 @@
import Axios from 'axios';
import { PUSHER_URL } from '../Enum/EnvironmentVariable';
import type { CharacterTexture } from './LocalUser';
import Axios from "axios";
import { PUSHER_URL } from "../Enum/EnvironmentVariable";
import type { CharacterTexture } from "./LocalUser";
export class MapDetail {
constructor(public readonly mapUrl: string, public readonly textures: CharacterTexture[] | undefined) {}
@ -15,19 +15,19 @@ export class Room {
private _search: URLSearchParams;
constructor(id: string) {
const url = new URL(id, 'https://example.com');
const url = new URL(id, "https://example.com");
this.id = url.pathname;
if (this.id.startsWith('/')) {
if (this.id.startsWith("/")) {
this.id = this.id.substr(1);
}
if (this.id.startsWith('_/')) {
if (this.id.startsWith("_/")) {
this.isPublic = true;
} else if (this.id.startsWith('@/')) {
} else if (this.id.startsWith("@/")) {
this.isPublic = false;
} else {
throw new Error('Invalid room ID');
throw new Error("Invalid room ID");
}
this._search = new URLSearchParams(url.search);
@ -38,16 +38,16 @@ export class Room {
baseUrl: string,
currentInstance: string
): { roomId: string; hash: string | null } {
let roomId = '';
let roomId = "";
let hash = null;
if (!identifier.startsWith('/_/') && !identifier.startsWith('/@/')) {
if (!identifier.startsWith("/_/") && !identifier.startsWith("/@/")) {
//relative file link
//Relative identifier can be deep enough to rewrite the base domain, so we cannot use the variable 'baseUrl' as the actual base url for the URL objects.
//We instead use 'workadventure' as a dummy base value.
const baseUrlObject = new URL(baseUrl);
const absoluteExitSceneUrl = new URL(
identifier,
'http://workadventure/_/' + currentInstance + '/' + baseUrlObject.hostname + baseUrlObject.pathname
"http://workadventure/_/" + currentInstance + "/" + baseUrlObject.hostname + baseUrlObject.pathname
);
roomId = absoluteExitSceneUrl.pathname; //in case of a relative url, we need to create a public roomId
roomId = roomId.substring(1); //remove the leading slash
@ -58,7 +58,7 @@ export class Room {
}
} else {
//absolute room Id
const parts = identifier.split('#');
const parts = identifier.split("#");
roomId = parts[0];
roomId = roomId.substring(1); //remove the leading slash
if (parts.length > 1) {
@ -78,7 +78,7 @@ export class Room {
if (this.isPublic) {
const match = /_\/[^/]+\/(.+)/.exec(this.id);
if (!match) throw new Error('Could not extract url from "' + this.id + '"');
this.mapUrl = window.location.protocol + '//' + match[1];
this.mapUrl = window.location.protocol + "//" + match[1];
resolve(new MapDetail(this.mapUrl, this.textures));
return;
} else {
@ -89,7 +89,7 @@ export class Room {
params: urlParts,
})
.then(({ data }) => {
console.log('Map ', this.id, ' resolves to URL ', data.mapUrl);
console.log("Map ", this.id, " resolves to URL ", data.mapUrl);
resolve(data);
return;
})
@ -118,7 +118,7 @@ export class Room {
} else {
const match = /@\/([^/]+)\/([^/]+)\/.+/.exec(this.id);
if (!match) throw new Error('Could not extract instance from "' + this.id + '"');
this.instance = match[1] + '/' + match[2];
this.instance = match[1] + "/" + match[2];
return this.instance;
}
}
@ -127,7 +127,7 @@ export class Room {
const regex = /@\/([^/]+)\/([^/]+)(?:\/([^/]*))?/gm;
const match = regex.exec(url);
if (!match) {
throw new Error('Invalid URL ' + url);
throw new Error("Invalid URL " + url);
}
const results: { organizationSlug: string; worldSlug: string; roomSlug?: string } = {
organizationSlug: match[1],
@ -140,8 +140,8 @@ export class Room {
}
public isDisconnected(): boolean {
const alone = this._search.get('alone');
if (alone && alone !== '0' && alone.toLowerCase() !== 'false') {
const alone = this._search.get("alone");
if (alone && alone !== "0" && alone.toLowerCase() !== "false") {
return true;
}
return false;

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

@ -1,8 +1,8 @@
import type { Subscription } from 'rxjs';
import { GlobalMessageManager } from '../../Administration/GlobalMessageManager';
import { userMessageManager } from '../../Administration/UserMessageManager';
import { iframeListener } from '../../Api/IframeListener';
import { connectionManager } from '../../Connexion/ConnectionManager';
import type { Subscription } from "rxjs";
import { GlobalMessageManager } from "../../Administration/GlobalMessageManager";
import { userMessageManager } from "../../Administration/UserMessageManager";
import { iframeListener } from "../../Api/IframeListener";
import { connectionManager } from "../../Connexion/ConnectionManager";
import type {
GroupCreatedUpdatedMessageInterface,
MessageUserJoined,
@ -12,10 +12,10 @@ import type {
PointInterface,
PositionInterface,
RoomJoinedMessageInterface,
} from '../../Connexion/ConnexionModels';
import { DEBUG_MODE, JITSI_PRIVATE_MODE, MAX_PER_GROUP, POSITION_DELAY } from '../../Enum/EnvironmentVariable';
} from "../../Connexion/ConnexionModels";
import { DEBUG_MODE, JITSI_PRIVATE_MODE, MAX_PER_GROUP, POSITION_DELAY } from "../../Enum/EnvironmentVariable";
import { Queue } from 'queue-typescript';
import { Queue } from "queue-typescript";
import {
AUDIO_LOOP_PROPERTY,
AUDIO_VOLUME_PROPERTY,
@ -26,72 +26,72 @@ import {
TRIGGER_JITSI_PROPERTIES,
TRIGGER_WEBSITE_PROPERTIES,
WEBSITE_MESSAGE_PROPERTIES,
} from '../../WebRtc/LayoutManager';
import { coWebsiteManager } from '../../WebRtc/CoWebsiteManager';
import type { UserMovedMessage } from '../../Messages/generated/messages_pb';
import { ProtobufClientUtils } from '../../Network/ProtobufClientUtils';
import type { RoomConnection } from '../../Connexion/RoomConnection';
import { Room } from '../../Connexion/Room';
import { jitsiFactory } from '../../WebRtc/JitsiFactory';
import { urlManager } from '../../Url/UrlManager';
import { audioManager } from '../../WebRtc/AudioManager';
import { TextureError } from '../../Exception/TextureError';
import { localUserStore } from '../../Connexion/LocalUserStore';
import { HtmlUtils } from '../../WebRtc/HtmlUtils';
import { mediaManager } from '../../WebRtc/MediaManager';
import { SimplePeer } from '../../WebRtc/SimplePeer';
import { addLoader } from '../Components/Loader';
import { OpenChatIcon, openChatIconName } from '../Components/OpenChatIcon';
import { lazyLoadPlayerCharacterTextures, loadCustomTexture } from '../Entity/PlayerTexturesLoadingManager';
import { RemotePlayer } from '../Entity/RemotePlayer';
import type { ActionableItem } from '../Items/ActionableItem';
import type { ItemFactoryInterface } from '../Items/ItemFactoryInterface';
import { SelectCharacterScene, SelectCharacterSceneName } from '../Login/SelectCharacterScene';
} from "../../WebRtc/LayoutManager";
import { coWebsiteManager } from "../../WebRtc/CoWebsiteManager";
import type { UserMovedMessage } from "../../Messages/generated/messages_pb";
import { ProtobufClientUtils } from "../../Network/ProtobufClientUtils";
import type { RoomConnection } from "../../Connexion/RoomConnection";
import { Room } from "../../Connexion/Room";
import { jitsiFactory } from "../../WebRtc/JitsiFactory";
import { urlManager } from "../../Url/UrlManager";
import { audioManager } from "../../WebRtc/AudioManager";
import { TextureError } from "../../Exception/TextureError";
import { localUserStore } from "../../Connexion/LocalUserStore";
import { HtmlUtils } from "../../WebRtc/HtmlUtils";
import { mediaManager } from "../../WebRtc/MediaManager";
import { SimplePeer } from "../../WebRtc/SimplePeer";
import { addLoader } from "../Components/Loader";
import { OpenChatIcon, openChatIconName } from "../Components/OpenChatIcon";
import { lazyLoadPlayerCharacterTextures, loadCustomTexture } from "../Entity/PlayerTexturesLoadingManager";
import { RemotePlayer } from "../Entity/RemotePlayer";
import type { ActionableItem } from "../Items/ActionableItem";
import type { ItemFactoryInterface } from "../Items/ItemFactoryInterface";
import { SelectCharacterScene, SelectCharacterSceneName } from "../Login/SelectCharacterScene";
import type {
ITiledMap,
ITiledMapLayer,
ITiledMapLayerProperty,
ITiledMapObject,
ITiledTileSet,
} from '../Map/ITiledMap';
import { MenuScene, MenuSceneName } from '../Menu/MenuScene';
import { PlayerAnimationDirections } from '../Player/Animation';
import { hasMovedEventName, Player, requestEmoteEventName } from '../Player/Player';
import { ErrorSceneName } from '../Reconnecting/ErrorScene';
import { ReconnectingSceneName } from '../Reconnecting/ReconnectingScene';
import { UserInputManager } from '../UserInput/UserInputManager';
import type { AddPlayerInterface } from './AddPlayerInterface';
import { gameManager } from './GameManager';
import { GameMap } from './GameMap';
import { PlayerMovement } from './PlayerMovement';
import { PlayersPositionInterpolator } from './PlayersPositionInterpolator';
} from "../Map/ITiledMap";
import { MenuScene, MenuSceneName } from "../Menu/MenuScene";
import { PlayerAnimationDirections } from "../Player/Animation";
import { hasMovedEventName, Player, requestEmoteEventName } from "../Player/Player";
import { ErrorSceneName } from "../Reconnecting/ErrorScene";
import { ReconnectingSceneName } from "../Reconnecting/ReconnectingScene";
import { UserInputManager } from "../UserInput/UserInputManager";
import type { AddPlayerInterface } from "./AddPlayerInterface";
import { gameManager } from "./GameManager";
import { GameMap } from "./GameMap";
import { PlayerMovement } from "./PlayerMovement";
import { PlayersPositionInterpolator } from "./PlayersPositionInterpolator";
import Texture = Phaser.Textures.Texture;
import Sprite = Phaser.GameObjects.Sprite;
import CanvasTexture = Phaser.Textures.CanvasTexture;
import GameObject = Phaser.GameObjects.GameObject;
import FILE_LOAD_ERROR = Phaser.Loader.Events.FILE_LOAD_ERROR;
import DOMElement = Phaser.GameObjects.DOMElement;
import { worldFullMessageStream } from '../../Connexion/WorldFullMessageStream';
import { lazyLoadCompanionResource } from '../Companion/CompanionTexturesLoadingManager';
import { DirtyScene } from './DirtyScene';
import { TextUtils } from '../Components/TextUtils';
import { touchScreenManager } from '../../Touch/TouchScreenManager';
import { PinchManager } from '../UserInput/PinchManager';
import { joystickBaseImg, joystickBaseKey, joystickThumbImg, joystickThumbKey } from '../Components/MobileJoystick';
import { waScaleManager } from '../Services/WaScaleManager';
import { EmoteManager } from './EmoteManager';
import { worldFullMessageStream } from "../../Connexion/WorldFullMessageStream";
import { lazyLoadCompanionResource } from "../Companion/CompanionTexturesLoadingManager";
import { DirtyScene } from "./DirtyScene";
import { TextUtils } from "../Components/TextUtils";
import { touchScreenManager } from "../../Touch/TouchScreenManager";
import { PinchManager } from "../UserInput/PinchManager";
import { joystickBaseImg, joystickBaseKey, joystickThumbImg, joystickThumbKey } from "../Components/MobileJoystick";
import { waScaleManager } from "../Services/WaScaleManager";
import { EmoteManager } from "./EmoteManager";
import EVENT_TYPE = Phaser.Scenes.Events;
import RenderTexture = Phaser.GameObjects.RenderTexture;
import Tilemap = Phaser.Tilemaps.Tilemap;
import type { HasPlayerMovedEvent } from '../../Api/Events/HasPlayerMovedEvent';
import type { HasPlayerMovedEvent } from "../../Api/Events/HasPlayerMovedEvent";
import AnimatedTiles from 'phaser-animated-tiles';
import { StartPositionCalculator } from './StartPositionCalculator';
import { soundManager } from './SoundManager';
import { peerStore, screenSharingPeerStore } from '../../Stores/PeerStore';
import { videoFocusStore } from '../../Stores/VideoFocusStore';
import { biggestAvailableAreaStore } from '../../Stores/BiggestAvailableAreaStore';
import { isMessageReferenceEvent, isTriggerMessageEvent } from '../../Api/Events/ui/TriggerMessageEvent';
import AnimatedTiles from "phaser-animated-tiles";
import { StartPositionCalculator } from "./StartPositionCalculator";
import { soundManager } from "./SoundManager";
import { peerStore, screenSharingPeerStore } from "../../Stores/PeerStore";
import { videoFocusStore } from "../../Stores/VideoFocusStore";
import { biggestAvailableAreaStore } from "../../Stores/BiggestAvailableAreaStore";
import { isMessageReferenceEvent, isTriggerMessageEvent } from "../../Api/Events/ui/TriggerMessageEvent";
export interface GameSceneInitInterface {
initPosition: PointInterface | null;
@ -99,32 +99,32 @@ export interface GameSceneInitInterface {
}
interface InitUserPositionEventInterface {
type: 'InitUserPositionEvent';
type: "InitUserPositionEvent";
event: MessageUserPositionInterface[];
}
interface AddPlayerEventInterface {
type: 'AddPlayerEvent';
type: "AddPlayerEvent";
event: AddPlayerInterface;
}
interface RemovePlayerEventInterface {
type: 'RemovePlayerEvent';
type: "RemovePlayerEvent";
userId: number;
}
interface UserMovedEventInterface {
type: 'UserMovedEvent';
type: "UserMovedEvent";
event: MessageUserMovedInterface;
}
interface GroupCreatedUpdatedEventInterface {
type: 'GroupCreatedUpdatedEvent';
type: "GroupCreatedUpdatedEvent";
event: GroupCreatedUpdatedMessageInterface;
}
interface DeleteGroupEventInterface {
type: 'DeleteGroupEvent';
type: "DeleteGroupEvent";
groupId: number;
}
@ -177,7 +177,7 @@ export class GameScene extends DirtyScene {
currentTick!: number;
lastSentTick!: number; // The last tick at which a position was sent.
lastMoveEventSent: HasPlayerMovedEvent = {
direction: '',
direction: "",
moving: false,
x: -1000,
y: -1000,
@ -231,29 +231,29 @@ export class GameScene extends DirtyScene {
}
}
this.load.image(openChatIconName, 'resources/objects/talk.png');
this.load.image(openChatIconName, "resources/objects/talk.png");
if (touchScreenManager.supportTouchScreen) {
this.load.image(joystickBaseKey, joystickBaseImg);
this.load.image(joystickThumbKey, joystickThumbImg);
}
this.load.audio('audio-webrtc-in', '/resources/objects/webrtc-in.mp3');
this.load.audio('audio-webrtc-out', '/resources/objects/webrtc-out.mp3');
this.load.audio("audio-webrtc-in", "/resources/objects/webrtc-in.mp3");
this.load.audio("audio-webrtc-out", "/resources/objects/webrtc-out.mp3");
//this.load.audio('audio-report-message', '/resources/objects/report-message.mp3');
this.sound.pauseOnBlur = false;
this.load.on(FILE_LOAD_ERROR, (file: { src: string }) => {
// If we happen to be in HTTP and we are trying to load a URL in HTTPS only... (this happens only in dev environments)
if (
window.location.protocol === 'http:' &&
window.location.protocol === "http:" &&
file.src === this.MapUrlFile &&
file.src.startsWith('http:') &&
file.src.startsWith("http:") &&
this.originalMapUrl === undefined
) {
this.originalMapUrl = this.MapUrlFile;
this.MapUrlFile = this.MapUrlFile.replace('http://', 'https://');
this.MapUrlFile = this.MapUrlFile.replace("http://", "https://");
this.load.tilemapTiledJSON(this.MapUrlFile, this.MapUrlFile);
this.load.on(
'filecomplete-tilemapJSON-' + this.MapUrlFile,
"filecomplete-tilemapJSON-" + this.MapUrlFile,
(key: string, type: string, data: unknown) => {
this.onMapLoad(data);
}
@ -264,18 +264,18 @@ export class GameScene extends DirtyScene {
// So if we are in https, we can still try to load a HTTP local resource (can be useful for testing purposes)
// See https://developer.mozilla.org/en-US/docs/Web/Security/Secure_Contexts#when_is_a_context_considered_secure
const url = new URL(file.src);
const host = url.host.split(':')[0];
const host = url.host.split(":")[0];
if (
window.location.protocol === 'https:' &&
window.location.protocol === "https:" &&
file.src === this.MapUrlFile &&
(host === '127.0.0.1' || host === 'localhost' || host.endsWith('.localhost')) &&
(host === "127.0.0.1" || host === "localhost" || host.endsWith(".localhost")) &&
this.originalMapUrl === undefined
) {
this.originalMapUrl = this.MapUrlFile;
this.MapUrlFile = this.MapUrlFile.replace('https://', 'http://');
this.MapUrlFile = this.MapUrlFile.replace("https://", "http://");
this.load.tilemapTiledJSON(this.MapUrlFile, this.MapUrlFile);
this.load.on(
'filecomplete-tilemapJSON-' + this.MapUrlFile,
"filecomplete-tilemapJSON-" + this.MapUrlFile,
(key: string, type: string, data: unknown) => {
this.onMapLoad(data);
}
@ -284,17 +284,17 @@ export class GameScene extends DirtyScene {
}
//once preloading is over, we don't want loading errors to crash the game, so we need to disable this behavior after preloading.
console.error('Error when loading: ', file);
console.error("Error when loading: ", file);
if (this.preloading) {
this.scene.start(ErrorSceneName, {
title: 'Network error',
subTitle: 'An error occurred while loading resource:',
title: "Network error",
subTitle: "An error occurred while loading resource:",
message: this.originalMapUrl ?? file.src,
});
}
});
this.load.scenePlugin('AnimatedTiles', AnimatedTiles, 'animatedTiles', 'animatedTiles');
this.load.on('filecomplete-tilemapJSON-' + this.MapUrlFile, (key: string, type: string, data: unknown) => {
this.load.scenePlugin("AnimatedTiles", AnimatedTiles, "animatedTiles", "animatedTiles");
this.load.on("filecomplete-tilemapJSON-" + this.MapUrlFile, (key: string, type: string, data: unknown) => {
this.onMapLoad(data);
});
//TODO strategy to add access token
@ -306,13 +306,13 @@ export class GameScene extends DirtyScene {
this.onMapLoad(data);
}
this.load.bitmapFont('main_font', 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml');
this.load.bitmapFont("main_font", "resources/fonts/arcade.png", "resources/fonts/arcade.xml");
//eslint-disable-next-line @typescript-eslint/no-explicit-any
(this.load as any).rexWebFont({
custom: {
families: ['Press Start 2P'],
urls: ['/resources/fonts/fonts.css'],
testString: 'abcdefg',
families: ["Press Start 2P"],
urls: ["/resources/fonts/fonts.css"],
testString: "abcdefg",
},
});
@ -326,9 +326,9 @@ export class GameScene extends DirtyScene {
// Triggered when the map is loaded
// Load tiles attached to the map recursively
this.mapFile = data.data;
const url = this.MapUrlFile.substr(0, this.MapUrlFile.lastIndexOf('/'));
const url = this.MapUrlFile.substr(0, this.MapUrlFile.lastIndexOf("/"));
this.mapFile.tilesets.forEach((tileset) => {
if (typeof tileset.name === 'undefined' || typeof tileset.image === 'undefined') {
if (typeof tileset.name === "undefined" || typeof tileset.image === "undefined") {
console.warn("Don't know how to handle tileset ", tileset);
return;
}
@ -340,7 +340,7 @@ export class GameScene extends DirtyScene {
const objects = new Map<string, ITiledMapObject[]>();
for (const layer of this.mapFile.layers) {
if (layer.type === 'objectgroup') {
if (layer.type === "objectgroup") {
for (const object of layer.objects) {
let objectsOfType: ITiledMapObject[] | undefined;
if (!objects.has(object.type)) {
@ -348,7 +348,7 @@ export class GameScene extends DirtyScene {
} else {
objectsOfType = objects.get(object.type);
if (objectsOfType === undefined) {
throw new Error('Unexpected object type not found');
throw new Error("Unexpected object type not found");
}
}
objectsOfType.push(object);
@ -363,8 +363,8 @@ export class GameScene extends DirtyScene {
let itemFactory: ItemFactoryInterface;
switch (itemType) {
case 'computer': {
const module = await import('../Items/Computer/computer');
case "computer": {
const module = await import("../Items/Computer/computer");
itemFactory = module.default;
break;
}
@ -376,7 +376,7 @@ export class GameScene extends DirtyScene {
itemFactory.preload(this.load);
this.load.start(); // Let's manually start the loader because the import might be over AFTER the loading ends.
this.load.on('complete', () => {
this.load.on("complete", () => {
// FIXME: the factory might fail because the resources might not be loaded yet...
// We would need to add a loader ended event in addition to the createPromise
this.createPromise.then(async () => {
@ -432,7 +432,7 @@ export class GameScene extends DirtyScene {
const playerName = gameManager.getPlayerName();
if (!playerName) {
throw 'playerName is not set';
throw "playerName is not set";
}
this.playerName = playerName;
this.characterLayers = gameManager.getCharacterLayers();
@ -440,7 +440,7 @@ export class GameScene extends DirtyScene {
//initalise map
this.Map = this.add.tilemap(this.MapUrlFile);
const mapDirUrl = this.MapUrlFile.substr(0, this.MapUrlFile.lastIndexOf('/'));
const mapDirUrl = this.MapUrlFile.substr(0, this.MapUrlFile.lastIndexOf("/"));
this.mapFile.tilesets.forEach((tileset: ITiledTileSet) => {
this.Terrains.push(
this.Map.addTilesetImage(
@ -460,7 +460,7 @@ export class GameScene extends DirtyScene {
//add layer on map
this.gameMap = new GameMap(this.mapFile, this.Map, this.Terrains);
for (const layer of this.gameMap.flatLayers) {
if (layer.type === 'tilelayer') {
if (layer.type === "tilelayer") {
const exitSceneUrl = this.getExitSceneUrl(layer);
if (exitSceneUrl !== undefined) {
this.loadNextGame(exitSceneUrl);
@ -470,7 +470,7 @@ export class GameScene extends DirtyScene {
this.loadNextGame(exitUrl);
}
}
if (layer.type === 'objectgroup') {
if (layer.type === "objectgroup") {
for (const object of layer.objects) {
if (object.text) {
TextUtils.createTextFromITiledMapObject(this, object);
@ -501,7 +501,7 @@ export class GameScene extends DirtyScene {
mediaManager.setUserInputManager(this.userInputManager);
if (localUserStore.getFullscreen()) {
document.querySelector('body')?.requestFullscreen();
document.querySelector("body")?.requestFullscreen();
}
//notify game manager can to create currentUser in map
@ -511,7 +511,7 @@ export class GameScene extends DirtyScene {
this.initCamera();
this.animatedTiles.init(this.Map);
this.events.on('tileanimationupdate', () => (this.dirty = true));
this.events.on("tileanimationupdate", () => (this.dirty = true));
this.initCirclesCanvas();
@ -561,11 +561,11 @@ export class GameScene extends DirtyScene {
this.peerStoreUnsubscribe = peerStore.subscribe((peers) => {
const newPeerNumber = peers.size;
if (newPeerNumber > oldPeerNumber) {
this.sound.play('audio-webrtc-in', {
this.sound.play("audio-webrtc-in", {
volume: 0.2,
});
} else if (newPeerNumber < oldPeerNumber) {
this.sound.play('audio-webrtc-out', {
this.sound.play("audio-webrtc-out", {
volume: 0.2,
});
}
@ -613,7 +613,7 @@ export class GameScene extends DirtyScene {
this.connection.onUserMoved((message: UserMovedMessage) => {
const position = message.getPosition();
if (position === undefined) {
throw new Error('Position missing from UserMovedMessage');
throw new Error("Position missing from UserMovedMessage");
}
const messageUserMoved: MessageUserMovedInterface = {
@ -641,10 +641,10 @@ export class GameScene extends DirtyScene {
});
this.connection.onServerDisconnected(() => {
console.log('Player disconnected from server. Reloading scene.');
console.log("Player disconnected from server. Reloading scene.");
this.cleanupClosingScene();
const gameSceneKey = 'somekey' + Math.round(Math.random() * 10000);
const gameSceneKey = "somekey" + Math.round(Math.random() * 10000);
const game: Phaser.Scene = new GameScene(this.room, this.MapUrlFile, gameSceneKey);
this.scene.add(gameSceneKey, game, true, {
initPosition: {
@ -723,34 +723,34 @@ export class GameScene extends DirtyScene {
private initCirclesCanvas(): void {
// Let's generate the circle for the group delimiter
let circleElement = Object.values(this.textures.list).find(
(object: Texture) => object.key === 'circleSprite-white'
(object: Texture) => object.key === "circleSprite-white"
);
if (circleElement) {
this.textures.remove('circleSprite-white');
this.textures.remove("circleSprite-white");
}
circleElement = Object.values(this.textures.list).find((object: Texture) => object.key === 'circleSprite-red');
circleElement = Object.values(this.textures.list).find((object: Texture) => object.key === "circleSprite-red");
if (circleElement) {
this.textures.remove('circleSprite-red');
this.textures.remove("circleSprite-red");
}
//create white circle canvas use to create sprite
this.circleTexture = this.textures.createCanvas('circleSprite-white', 96, 96);
this.circleTexture = this.textures.createCanvas("circleSprite-white", 96, 96);
const context = this.circleTexture.context;
context.beginPath();
context.arc(48, 48, 48, 0, 2 * Math.PI, false);
// context.lineWidth = 5;
context.strokeStyle = '#ffffff';
context.strokeStyle = "#ffffff";
context.stroke();
this.circleTexture.refresh();
//create red circle canvas use to create sprite
this.circleRedTexture = this.textures.createCanvas('circleSprite-red', 96, 96);
this.circleRedTexture = this.textures.createCanvas("circleSprite-red", 96, 96);
const contextRed = this.circleRedTexture.context;
contextRed.beginPath();
contextRed.arc(48, 48, 48, 0, 2 * Math.PI, false);
//context.lineWidth = 5;
contextRed.strokeStyle = '#ff0000';
contextRed.strokeStyle = "#ff0000";
contextRed.stroke();
this.circleRedTexture.refresh();
}
@ -765,35 +765,35 @@ export class GameScene extends DirtyScene {
}
private triggerOnMapLayerPropertyChange() {
this.gameMap.onPropertyChange('exitSceneUrl', (newValue, oldValue) => {
this.gameMap.onPropertyChange("exitSceneUrl", (newValue, oldValue) => {
if (newValue) this.onMapExit(newValue as string);
});
this.gameMap.onPropertyChange('exitUrl', (newValue, oldValue) => {
this.gameMap.onPropertyChange("exitUrl", (newValue, oldValue) => {
if (newValue) this.onMapExit(newValue as string);
});
this.gameMap.onPropertyChange('openWebsite', (newValue, oldValue, allProps) => {
this.gameMap.onPropertyChange("openWebsite", (newValue, oldValue, allProps) => {
if (newValue === undefined) {
layoutManager.removeActionButton('openWebsite', this.userInputManager);
layoutManager.removeActionButton("openWebsite", this.userInputManager);
coWebsiteManager.closeCoWebsite();
} else {
const openWebsiteFunction = () => {
coWebsiteManager.loadCoWebsite(
newValue as string,
this.MapUrlFile,
allProps.get('openWebsiteAllowApi') as boolean | undefined,
allProps.get('openWebsitePolicy') as string | undefined
allProps.get("openWebsiteAllowApi") as boolean | undefined,
allProps.get("openWebsitePolicy") as string | undefined
);
layoutManager.removeActionButton('openWebsite', this.userInputManager);
layoutManager.removeActionButton("openWebsite", this.userInputManager);
};
const openWebsiteTriggerValue = allProps.get(TRIGGER_WEBSITE_PROPERTIES);
if (openWebsiteTriggerValue && openWebsiteTriggerValue === ON_ACTION_TRIGGER_BUTTON) {
let message = allProps.get(WEBSITE_MESSAGE_PROPERTIES);
if (message === undefined) {
message = 'Press SPACE or touch here to open web site';
message = "Press SPACE or touch here to open web site";
}
layoutManager.addActionButton(
'openWebsite',
"openWebsite",
message.toString(),
() => {
openWebsiteFunction();
@ -805,32 +805,32 @@ export class GameScene extends DirtyScene {
}
}
});
this.gameMap.onPropertyChange('jitsiRoom', (newValue, oldValue, allProps) => {
this.gameMap.onPropertyChange("jitsiRoom", (newValue, oldValue, allProps) => {
if (newValue === undefined) {
layoutManager.removeActionButton('jitsiRoom', this.userInputManager);
layoutManager.removeActionButton("jitsiRoom", this.userInputManager);
this.stopJitsi();
} else {
const openJitsiRoomFunction = () => {
const roomName = jitsiFactory.getRoomName(newValue.toString(), this.instance);
const jitsiUrl = allProps.get('jitsiUrl') as string | undefined;
const jitsiUrl = allProps.get("jitsiUrl") as string | undefined;
if (JITSI_PRIVATE_MODE && !jitsiUrl) {
const adminTag = allProps.get('jitsiRoomAdminTag') as string | undefined;
const adminTag = allProps.get("jitsiRoomAdminTag") as string | undefined;
this.connection?.emitQueryJitsiJwtMessage(roomName, adminTag);
} else {
this.startJitsi(roomName, undefined);
}
layoutManager.removeActionButton('jitsiRoom', this.userInputManager);
layoutManager.removeActionButton("jitsiRoom", this.userInputManager);
};
const jitsiTriggerValue = allProps.get(TRIGGER_JITSI_PROPERTIES);
if (jitsiTriggerValue && jitsiTriggerValue === ON_ACTION_TRIGGER_BUTTON) {
let message = allProps.get(JITSI_MESSAGE_PROPERTIES);
if (message === undefined) {
message = 'Press SPACE or touch here to enter Jitsi Meet room';
message = "Press SPACE or touch here to enter Jitsi Meet room";
}
layoutManager.addActionButton(
'jitsiRoom',
"jitsiRoom",
message.toString(),
() => {
openJitsiRoomFunction();
@ -842,14 +842,14 @@ export class GameScene extends DirtyScene {
}
}
});
this.gameMap.onPropertyChange('silent', (newValue, oldValue) => {
if (newValue === undefined || newValue === false || newValue === '') {
this.gameMap.onPropertyChange("silent", (newValue, oldValue) => {
if (newValue === undefined || newValue === false || newValue === "") {
this.connection?.setSilent(false);
} else {
this.connection?.setSilent(true);
}
});
this.gameMap.onPropertyChange('playAudio', (newValue, oldValue, allProps) => {
this.gameMap.onPropertyChange("playAudio", (newValue, oldValue, allProps) => {
const volume = allProps.get(AUDIO_VOLUME_PROPERTY) as number | undefined;
const loop = allProps.get(AUDIO_LOOP_PROPERTY) as boolean | undefined;
newValue === undefined
@ -857,14 +857,14 @@ export class GameScene extends DirtyScene {
: audioManager.playAudio(newValue, this.getMapDirUrl(), volume, loop);
});
// TODO: This legacy property should be removed at some point
this.gameMap.onPropertyChange('playAudioLoop', (newValue, oldValue) => {
this.gameMap.onPropertyChange("playAudioLoop", (newValue, oldValue) => {
newValue === undefined
? audioManager.unloadAudio()
: audioManager.playAudio(newValue, this.getMapDirUrl(), undefined, true);
});
this.gameMap.onPropertyChange('zone', (newValue, oldValue) => {
if (newValue === undefined || newValue === false || newValue === '') {
this.gameMap.onPropertyChange("zone", (newValue, oldValue) => {
if (newValue === undefined || newValue === false || newValue === "") {
iframeListener.sendLeaveEvent(oldValue as string);
} else {
iframeListener.sendEnterEvent(newValue as string);
@ -897,17 +897,17 @@ ${escapedMessage}
let id = 0;
for (const button of openPopupEvent.buttons) {
html += `<button type="button" class="nes-btn is-${HtmlUtils.escapeHtml(
button.className ?? ''
button.className ?? ""
)}" id="popup-${openPopupEvent.popupId}-${id}">${HtmlUtils.escapeHtml(button.label)}</button>`;
id++;
}
html += '</div>';
html += "</div>";
const domElement = this.add.dom(objectLayerSquare.x, objectLayerSquare.y).createFromHTML(html);
const container: HTMLDivElement = domElement.getChildByID('container') as HTMLDivElement;
container.style.width = objectLayerSquare.width + 'px';
const container: HTMLDivElement = domElement.getChildByID("container") as HTMLDivElement;
container.style.width = objectLayerSquare.width + "px";
domElement.scale = 0;
domElement.setClassName('popUpElement');
domElement.setClassName("popUpElement");
setTimeout(() => {
container.hidden = false;
@ -928,7 +928,7 @@ ${escapedMessage}
this.tweens.add({
targets: domElement,
scale: 1,
ease: 'EaseOut',
ease: "EaseOut",
duration: 400,
});
@ -941,16 +941,16 @@ ${escapedMessage}
const popUpElement = this.popUpElements.get(closePopupEvent.popupId);
if (popUpElement === undefined) {
console.error(
'Could not close popup with ID ',
"Could not close popup with ID ",
closePopupEvent.popupId,
'. Maybe it has already been closed?'
". Maybe it has already been closed?"
);
}
this.tweens.add({
targets: popUpElement,
scale: 0,
ease: 'EaseOut',
ease: "EaseOut",
duration: 400,
onComplete: () => {
popUpElement?.destroy();
@ -1008,7 +1008,7 @@ ${escapedMessage}
this,
this.CurrentPlayer.x + 25,
this.CurrentPlayer.y,
'circleSprite-white'
"circleSprite-white"
);
scriptedBubbleSprite.setDisplayOrigin(48, 48);
this.add.existing(scriptedBubbleSprite);
@ -1045,7 +1045,7 @@ ${escapedMessage}
})
);
iframeListener.registerAnswerer('getState', () => {
iframeListener.registerAnswerer("getState", () => {
return {
mapUrl: this.MapUrlFile,
startLayerName: this.startPositionCalculator.startLayerName,
@ -1064,7 +1064,7 @@ ${escapedMessage}
);
iframeListener.registerAnswerer(
'triggerMessage',
"triggerMessage",
(message) =>
new Promise((resolver) => {
layoutManager.addActionButton(
@ -1081,7 +1081,7 @@ ${escapedMessage}
);
iframeListener.registerAnswerer(
'removeTriggerMessage',
"removeTriggerMessage",
(message) => {
layoutManager.removeActionButton(message.uuid, this.userInputManager);
},
@ -1121,14 +1121,14 @@ ${escapedMessage}
}
private getMapDirUrl(): string {
return this.MapUrlFile.substr(0, this.MapUrlFile.lastIndexOf('/'));
return this.MapUrlFile.substr(0, this.MapUrlFile.lastIndexOf("/"));
}
private onMapExit(exitKey: string) {
if (this.mapTransitioning) return;
this.mapTransitioning = true;
const { roomId, hash } = Room.getIdFromIdentifier(exitKey, this.MapUrlFile, this.instance);
if (!roomId) throw new Error('Could not find the room from its exit key: ' + exitKey);
if (!roomId) throw new Error("Could not find the room from its exit key: " + exitKey);
if (hash) {
urlManager.pushStartLayerNameToUrl(hash);
}
@ -1136,7 +1136,7 @@ ${escapedMessage}
menuScene.reset();
if (roomId !== this.scene.key) {
if (this.scene.get(roomId) === null) {
console.error('next room not loaded', exitKey);
console.error("next room not loaded", exitKey);
return;
}
this.cleanupClosingScene();
@ -1173,7 +1173,7 @@ ${escapedMessage}
this.emoteManager.destroy();
this.peerStoreUnsubscribe();
this.biggestAvailableAreaStoreUnsubscribe();
iframeListener.unregisterAnswerer('getState');
iframeListener.unregisterAnswerer("getState");
mediaManager.hideGameOverlay();
@ -1196,18 +1196,18 @@ ${escapedMessage}
}
private getExitUrl(layer: ITiledMapLayer): string | undefined {
return this.getProperty(layer, 'exitUrl') as string | undefined;
return this.getProperty(layer, "exitUrl") as string | undefined;
}
/**
* @deprecated the map property exitSceneUrl is deprecated
*/
private getExitSceneUrl(layer: ITiledMapLayer): string | undefined {
return this.getProperty(layer, 'exitSceneUrl') as string | undefined;
return this.getProperty(layer, "exitSceneUrl") as string | undefined;
}
private getScriptUrls(map: ITiledMap): string[] {
return (this.getProperties(map, 'script') as string[]).map((script) =>
return (this.getProperties(map, "script") as string[]).map((script) =>
new URL(script, this.MapUrlFile).toString()
);
}
@ -1285,7 +1285,7 @@ ${escapedMessage}
this.companion,
this.companion !== null ? lazyLoadCompanionResource(this.load, this.companion) : undefined
);
this.CurrentPlayer.on('pointerdown', (pointer: Phaser.Input.Pointer) => {
this.CurrentPlayer.on("pointerdown", (pointer: Phaser.Input.Pointer) => {
if (pointer.wasTouch && (pointer.event as TouchEvent).touches.length > 1) {
return; //we don't want the menu to open when pinching on a touch screen.
}
@ -1403,22 +1403,22 @@ ${escapedMessage}
this.dirty = true;
const event = this.pendingEvents.dequeue();
switch (event.type) {
case 'InitUserPositionEvent':
case "InitUserPositionEvent":
this.doInitUsersPosition(event.event);
break;
case 'AddPlayerEvent':
case "AddPlayerEvent":
this.doAddPlayer(event.event);
break;
case 'RemovePlayerEvent':
case "RemovePlayerEvent":
this.doRemovePlayer(event.userId);
break;
case 'UserMovedEvent':
case "UserMovedEvent":
this.doUpdatePlayerPosition(event.event);
break;
case 'GroupCreatedUpdatedEvent':
case "GroupCreatedUpdatedEvent":
this.doShareGroupPosition(event.event);
break;
case 'DeleteGroupEvent':
case "DeleteGroupEvent":
this.doDeleteGroup(event.groupId);
break;
}
@ -1440,7 +1440,7 @@ ${escapedMessage}
*/
private initUsersPosition(usersPosition: MessageUserPositionInterface[]): void {
this.pendingEvents.enqueue({
type: 'InitUserPositionEvent',
type: "InitUserPositionEvent",
event: usersPosition,
});
}
@ -1465,7 +1465,7 @@ ${escapedMessage}
*/
public addPlayer(addPlayerData: AddPlayerInterface): void {
this.pendingEvents.enqueue({
type: 'AddPlayerEvent',
type: "AddPlayerEvent",
event: addPlayerData,
});
}
@ -1504,7 +1504,7 @@ ${escapedMessage}
*/
public removePlayer(userId: number) {
this.pendingEvents.enqueue({
type: 'RemovePlayerEvent',
type: "RemovePlayerEvent",
userId,
});
}
@ -1512,7 +1512,7 @@ ${escapedMessage}
private doRemovePlayer(userId: number) {
const player = this.MapPlayersByKey.get(userId);
if (player === undefined) {
console.error('Cannot find user with id ', userId);
console.error("Cannot find user with id ", userId);
} else {
player.destroy();
@ -1528,7 +1528,7 @@ ${escapedMessage}
public updatePlayerPosition(message: MessageUserMovedInterface): void {
this.pendingEvents.enqueue({
type: 'UserMovedEvent',
type: "UserMovedEvent",
event: message,
});
}
@ -1554,7 +1554,7 @@ ${escapedMessage}
public shareGroupPosition(groupPositionMessage: GroupCreatedUpdatedMessageInterface) {
this.pendingEvents.enqueue({
type: 'GroupCreatedUpdatedEvent',
type: "GroupCreatedUpdatedEvent",
event: groupPositionMessage,
});
}
@ -1569,7 +1569,7 @@ ${escapedMessage}
this,
Math.round(groupPositionMessage.position.x),
Math.round(groupPositionMessage.position.y),
groupPositionMessage.groupSize === MAX_PER_GROUP ? 'circleSprite-red' : 'circleSprite-white'
groupPositionMessage.groupSize === MAX_PER_GROUP ? "circleSprite-red" : "circleSprite-white"
);
sprite.setDisplayOrigin(48, 48);
this.add.existing(sprite);
@ -1579,7 +1579,7 @@ ${escapedMessage}
deleteGroup(groupId: number): void {
this.pendingEvents.enqueue({
type: 'DeleteGroupEvent',
type: "DeleteGroupEvent",
groupId,
});
}
@ -1615,7 +1615,7 @@ ${escapedMessage}
}
private getObjectLayerData(objectName: string): ITiledMapObject | undefined {
for (const layer of this.mapFile.layers) {
if (layer.type === 'objectgroup' && layer.name === 'floorLayer') {
if (layer.type === "objectgroup" && layer.name === "floorLayer") {
for (const object of layer.objects) {
if (object.name === objectName) {
return object;
@ -1640,7 +1640,7 @@ ${escapedMessage}
const xCenter = (array.xEnd - array.xStart) / 2 + array.xStart;
const yCenter = (array.yEnd - array.yStart) / 2 + array.yStart;
const game = HtmlUtils.querySelectorOrFail<HTMLCanvasElement>('#game canvas');
const game = HtmlUtils.querySelectorOrFail<HTMLCanvasElement>("#game canvas");
// Let's put this in Game coordinates by applying the zoom level:
this.cameras.main.setFollowOffset(
@ -1651,19 +1651,19 @@ ${escapedMessage}
public startJitsi(roomName: string, jwt?: string): void {
const allProps = this.gameMap.getCurrentProperties();
const jitsiConfig = this.safeParseJSONstring(allProps.get('jitsiConfig') as string | undefined, 'jitsiConfig');
const jitsiConfig = this.safeParseJSONstring(allProps.get("jitsiConfig") as string | undefined, "jitsiConfig");
const jitsiInterfaceConfig = this.safeParseJSONstring(
allProps.get('jitsiInterfaceConfig') as string | undefined,
'jitsiInterfaceConfig'
allProps.get("jitsiInterfaceConfig") as string | undefined,
"jitsiInterfaceConfig"
);
const jitsiUrl = allProps.get('jitsiUrl') as string | undefined;
const jitsiUrl = allProps.get("jitsiUrl") as string | undefined;
jitsiFactory.start(roomName, this.playerName, jwt, jitsiConfig, jitsiInterfaceConfig, jitsiUrl);
this.connection?.setSilent(true);
mediaManager.hideGameOverlay();
//permit to stop jitsi when user close iframe
mediaManager.addTriggerCloseJitsiFrameButton('close-jisi', () => {
mediaManager.addTriggerCloseJitsiFrameButton("close-jisi", () => {
this.stopJitsi();
});
}
@ -1673,7 +1673,7 @@ ${escapedMessage}
jitsiFactory.stop();
mediaManager.showGameOverlay();
mediaManager.removeTriggerCloseJitsiFrameButton('close-jisi');
mediaManager.removeTriggerCloseJitsiFrameButton("close-jisi");
}
//todo: put this into an 'orchestrator' scene (EntryScene?)
@ -1681,9 +1681,9 @@ ${escapedMessage}
this.cleanupClosingScene();
this.userInputManager.disableControls();
this.scene.start(ErrorSceneName, {
title: 'Banned',
subTitle: 'You were banned from WorkAdventure',
message: 'If you want more information, you may contact us at: workadventure@thecodingmachine.com',
title: "Banned",
subTitle: "You were banned from WorkAdventure",
message: "If you want more information, you may contact us at: workadventure@thecodingmachine.com",
});
}
@ -1696,16 +1696,16 @@ ${escapedMessage}
//FIX ME to use status code
if (message == undefined) {
this.scene.start(ErrorSceneName, {
title: 'Connection rejected',
subTitle: 'The world you are trying to join is full. Try again later.',
message: 'If you want more information, you may contact us at: workadventure@thecodingmachine.com',
title: "Connection rejected",
subTitle: "The world you are trying to join is full. Try again later.",
message: "If you want more information, you may contact us at: workadventure@thecodingmachine.com",
});
} else {
this.scene.start(ErrorSceneName, {
title: 'Connection rejected',
subTitle: 'You cannot join the World. Try again later. \n\r \n\r Error: ' + message + '.',
title: "Connection rejected",
subTitle: "You cannot join the World. Try again later. \n\r \n\r Error: " + message + ".",
message:
'If you want more information, you may contact administrator or contact us at: workadventure@thecodingmachine.com',
"If you want more information, you may contact administrator or contact us at: workadventure@thecodingmachine.com",
});
}
}

66
front/src/iframe_api.ts
View file

@ -1,4 +1,4 @@
import { registeredCallbacks } from './Api/iframe/registeredCallbacks';
import { registeredCallbacks } from "./Api/iframe/registeredCallbacks";
import {
IframeResponseEvent,
IframeResponseEventMap,
@ -6,19 +6,19 @@ import {
isIframeErrorAnswerEvent,
isIframeResponseEventWrapper,
TypedMessageEvent,
} from './Api/Events/IframeEvent';
import chat from './Api/iframe/chat';
import type { IframeCallback } from './Api/iframe/IframeApiContribution';
import nav from './Api/iframe/nav';
import controls from './Api/iframe/controls';
import ui from './Api/iframe/ui';
import sound from './Api/iframe/sound';
import room from './Api/iframe/room';
import player from './Api/iframe/player';
import type { ButtonDescriptor } from './Api/iframe/Ui/ButtonDescriptor';
import type { Popup } from './Api/iframe/Ui/Popup';
import type { Sound } from './Api/iframe/Sound/Sound';
import { answerPromises, sendToWorkadventure } from './Api/iframe/IframeApiContribution';
} from "./Api/Events/IframeEvent";
import chat from "./Api/iframe/chat";
import type { IframeCallback } from "./Api/iframe/IframeApiContribution";
import nav from "./Api/iframe/nav";
import controls from "./Api/iframe/controls";
import ui from "./Api/iframe/ui";
import sound from "./Api/iframe/sound";
import room from "./Api/iframe/room";
import player from "./Api/iframe/player";
import type { ButtonDescriptor } from "./Api/iframe/Ui/ButtonDescriptor";
import type { Popup } from "./Api/iframe/Ui/Popup";
import type { Sound } from "./Api/iframe/Sound/Sound";
import { answerPromises, sendToWorkadventure } from "./Api/iframe/IframeApiContribution";
const wa = {
ui,
@ -36,7 +36,7 @@ const wa = {
* @deprecated Use WA.chat.sendChatMessage instead
*/
sendChatMessage(message: string, author: string): void {
console.warn('Method WA.sendChatMessage is deprecated. Please use WA.chat.sendChatMessage instead');
console.warn("Method WA.sendChatMessage is deprecated. Please use WA.chat.sendChatMessage instead");
chat.sendChatMessage(message, author);
},
@ -45,7 +45,7 @@ const wa = {
*/
disablePlayerControls(): void {
console.warn(
'Method WA.disablePlayerControls is deprecated. Please use WA.controls.disablePlayerControls instead'
"Method WA.disablePlayerControls is deprecated. Please use WA.controls.disablePlayerControls instead"
);
controls.disablePlayerControls();
},
@ -55,7 +55,7 @@ const wa = {
*/
restorePlayerControls(): void {
console.warn(
'Method WA.restorePlayerControls is deprecated. Please use WA.controls.restorePlayerControls instead'
"Method WA.restorePlayerControls is deprecated. Please use WA.controls.restorePlayerControls instead"
);
controls.restorePlayerControls();
},
@ -64,7 +64,7 @@ const wa = {
* @deprecated Use WA.ui.displayBubble instead
*/
displayBubble(): void {
console.warn('Method WA.displayBubble is deprecated. Please use WA.ui.displayBubble instead');
console.warn("Method WA.displayBubble is deprecated. Please use WA.ui.displayBubble instead");
ui.displayBubble();
},
@ -72,7 +72,7 @@ const wa = {
* @deprecated Use WA.ui.removeBubble instead
*/
removeBubble(): void {
console.warn('Method WA.removeBubble is deprecated. Please use WA.ui.removeBubble instead');
console.warn("Method WA.removeBubble is deprecated. Please use WA.ui.removeBubble instead");
ui.removeBubble();
},
@ -80,7 +80,7 @@ const wa = {
* @deprecated Use WA.nav.openTab instead
*/
openTab(url: string): void {
console.warn('Method WA.openTab is deprecated. Please use WA.nav.openTab instead');
console.warn("Method WA.openTab is deprecated. Please use WA.nav.openTab instead");
nav.openTab(url);
},
@ -88,7 +88,7 @@ const wa = {
* @deprecated Use WA.sound.loadSound instead
*/
loadSound(url: string): Sound {
console.warn('Method WA.loadSound is deprecated. Please use WA.sound.loadSound instead');
console.warn("Method WA.loadSound is deprecated. Please use WA.sound.loadSound instead");
return sound.loadSound(url);
},
@ -96,7 +96,7 @@ const wa = {
* @deprecated Use WA.nav.goToPage instead
*/
goToPage(url: string): void {
console.warn('Method WA.goToPage is deprecated. Please use WA.nav.goToPage instead');
console.warn("Method WA.goToPage is deprecated. Please use WA.nav.goToPage instead");
nav.goToPage(url);
},
@ -104,15 +104,15 @@ const wa = {
* @deprecated Use WA.nav.goToRoom instead
*/
goToRoom(url: string): void {
console.warn('Method WA.goToRoom is deprecated. Please use WA.nav.goToRoom instead');
console.warn("Method WA.goToRoom is deprecated. Please use WA.nav.goToRoom instead");
nav.goToRoom(url);
},
/**
* @deprecated Use WA.nav.openCoWebSite instead
*/
openCoWebSite(url: string, allowApi: boolean = false, allowPolicy: string = ''): void {
console.warn('Method WA.openCoWebSite is deprecated. Please use WA.nav.openCoWebSite instead');
openCoWebSite(url: string, allowApi: boolean = false, allowPolicy: string = ""): void {
console.warn("Method WA.openCoWebSite is deprecated. Please use WA.nav.openCoWebSite instead");
nav.openCoWebSite(url, allowApi, allowPolicy);
},
@ -120,7 +120,7 @@ const wa = {
* @deprecated Use WA.nav.closeCoWebSite instead
*/
closeCoWebSite(): void {
console.warn('Method WA.closeCoWebSite is deprecated. Please use WA.nav.closeCoWebSite instead');
console.warn("Method WA.closeCoWebSite is deprecated. Please use WA.nav.closeCoWebSite instead");
nav.closeCoWebSite();
},
@ -128,28 +128,28 @@ const wa = {
* @deprecated Use WA.controls.restorePlayerControls instead
*/
openPopup(targetObject: string, message: string, buttons: ButtonDescriptor[]): Popup {
console.warn('Method WA.openPopup is deprecated. Please use WA.ui.openPopup instead');
console.warn("Method WA.openPopup is deprecated. Please use WA.ui.openPopup instead");
return ui.openPopup(targetObject, message, buttons);
},
/**
* @deprecated Use WA.chat.onChatMessage instead
*/
onChatMessage(callback: (message: string) => void): void {
console.warn('Method WA.onChatMessage is deprecated. Please use WA.chat.onChatMessage instead');
console.warn("Method WA.onChatMessage is deprecated. Please use WA.chat.onChatMessage instead");
chat.onChatMessage(callback);
},
/**
* @deprecated Use WA.room.onEnterZone instead
*/
onEnterZone(name: string, callback: () => void): void {
console.warn('Method WA.onEnterZone is deprecated. Please use WA.room.onEnterZone instead');
console.warn("Method WA.onEnterZone is deprecated. Please use WA.room.onEnterZone instead");
room.onEnterZone(name, callback);
},
/**
* @deprecated Use WA.room.onLeaveZone instead
*/
onLeaveZone(name: string, callback: () => void): void {
console.warn('Method WA.onLeaveZone is deprecated. Please use WA.room.onLeaveZone instead');
console.warn("Method WA.onLeaveZone is deprecated. Please use WA.room.onLeaveZone instead");
room.onLeaveZone(name, callback);
},
};
@ -166,7 +166,7 @@ declare global {
window.WA = wa;
window.addEventListener(
'message',
"message",
<T extends keyof IframeResponseEventMap>(message: TypedMessageEvent<IframeResponseEvent<T>>) => {
if (message.source !== window.parent) {
return; // Skip message in this event listener
@ -181,7 +181,7 @@ window.addEventListener(
const resolver = answerPromises.get(queryId);
if (resolver === undefined) {
throw new Error('In Iframe API, got an answer for a question that we have no track of.');
throw new Error("In Iframe API, got an answer for a question that we have no track of.");
}
resolver.resolve(payloadData);
@ -192,7 +192,7 @@ window.addEventListener(
const resolver = answerPromises.get(queryId);
if (resolver === undefined) {
throw new Error('In Iframe API, got an error answer for a question that we have no track of.');
throw new Error("In Iframe API, got an error answer for a question that we have no track of.");
}
resolver.reject(payloadError);

102
front/tests/Phaser/Game/RoomTest.ts
View file

@ -1,89 +1,89 @@
import 'jasmine';
import { Room } from '../../../src/Connexion/Room';
import "jasmine";
import { Room } from "../../../src/Connexion/Room";
describe('Room getIdFromIdentifier()', () => {
it('should work with an absolute room id and no hash as parameter', () => {
const { roomId, hash } = Room.getIdFromIdentifier('/_/global/maps.workadventu.re/test2.json', '', '');
expect(roomId).toEqual('_/global/maps.workadventu.re/test2.json');
describe("Room getIdFromIdentifier()", () => {
it("should work with an absolute room id and no hash as parameter", () => {
const { roomId, hash } = Room.getIdFromIdentifier("/_/global/maps.workadventu.re/test2.json", "", "");
expect(roomId).toEqual("_/global/maps.workadventu.re/test2.json");
expect(hash).toEqual(null);
});
it('should work with an absolute room id and a hash as parameters', () => {
const { roomId, hash } = Room.getIdFromIdentifier('/_/global/maps.workadventu.re/test2.json#start', '', '');
expect(roomId).toEqual('_/global/maps.workadventu.re/test2.json');
expect(hash).toEqual('start');
it("should work with an absolute room id and a hash as parameters", () => {
const { roomId, hash } = Room.getIdFromIdentifier("/_/global/maps.workadventu.re/test2.json#start", "", "");
expect(roomId).toEqual("_/global/maps.workadventu.re/test2.json");
expect(hash).toEqual("start");
});
it('should work with an absolute room id, regardless of baseUrl or instance', () => {
it("should work with an absolute room id, regardless of baseUrl or instance", () => {
const { roomId, hash } = Room.getIdFromIdentifier(
'/_/global/maps.workadventu.re/test2.json',
'https://another.domain/_/global/test.json',
'lol'
"/_/global/maps.workadventu.re/test2.json",
"https://another.domain/_/global/test.json",
"lol"
);
expect(roomId).toEqual('_/global/maps.workadventu.re/test2.json');
expect(roomId).toEqual("_/global/maps.workadventu.re/test2.json");
expect(hash).toEqual(null);
});
it('should work with a relative file link and no hash as parameters', () => {
it("should work with a relative file link and no hash as parameters", () => {
const { roomId, hash } = Room.getIdFromIdentifier(
'./test2.json',
'https://maps.workadventu.re/test.json',
'global'
"./test2.json",
"https://maps.workadventu.re/test.json",
"global"
);
expect(roomId).toEqual('_/global/maps.workadventu.re/test2.json');
expect(roomId).toEqual("_/global/maps.workadventu.re/test2.json");
expect(hash).toEqual(null);
});
it('should work with a relative file link with no dot', () => {
it("should work with a relative file link with no dot", () => {
const { roomId, hash } = Room.getIdFromIdentifier(
'test2.json',
'https://maps.workadventu.re/test.json',
'global'
"test2.json",
"https://maps.workadventu.re/test.json",
"global"
);
expect(roomId).toEqual('_/global/maps.workadventu.re/test2.json');
expect(roomId).toEqual("_/global/maps.workadventu.re/test2.json");
expect(hash).toEqual(null);
});
it('should work with a relative file link two levels deep', () => {
it("should work with a relative file link two levels deep", () => {
const { roomId, hash } = Room.getIdFromIdentifier(
'../floor1/Floor1.json',
'https://maps.workadventu.re/floor0/Floor0.json',
'global'
"../floor1/Floor1.json",
"https://maps.workadventu.re/floor0/Floor0.json",
"global"
);
expect(roomId).toEqual('_/global/maps.workadventu.re/floor1/Floor1.json');
expect(roomId).toEqual("_/global/maps.workadventu.re/floor1/Floor1.json");
expect(hash).toEqual(null);
});
it('should work with a relative file link that rewrite the map domain', () => {
it("should work with a relative file link that rewrite the map domain", () => {
const { roomId, hash } = Room.getIdFromIdentifier(
'../../maps.workadventure.localhost/Floor1/floor1.json',
'https://maps.workadventu.re/floor0/Floor0.json',
'global'
"../../maps.workadventure.localhost/Floor1/floor1.json",
"https://maps.workadventu.re/floor0/Floor0.json",
"global"
);
expect(roomId).toEqual('_/global/maps.workadventure.localhost/Floor1/floor1.json');
expect(roomId).toEqual("_/global/maps.workadventure.localhost/Floor1/floor1.json");
expect(hash).toEqual(null);
});
it('should work with a relative file link that rewrite the map instance', () => {
it("should work with a relative file link that rewrite the map instance", () => {
const { roomId, hash } = Room.getIdFromIdentifier(
'../../../notglobal/maps.workadventu.re/Floor1/floor1.json',
'https://maps.workadventu.re/floor0/Floor0.json',
'global'
"../../../notglobal/maps.workadventu.re/Floor1/floor1.json",
"https://maps.workadventu.re/floor0/Floor0.json",
"global"
);
expect(roomId).toEqual('_/notglobal/maps.workadventu.re/Floor1/floor1.json');
expect(roomId).toEqual("_/notglobal/maps.workadventu.re/Floor1/floor1.json");
expect(hash).toEqual(null);
});
it('should work with a relative file link that change the map type', () => {
it("should work with a relative file link that change the map type", () => {
const { roomId, hash } = Room.getIdFromIdentifier(
'../../../../@/tcm/is/great',
'https://maps.workadventu.re/floor0/Floor0.json',
'global'
"../../../../@/tcm/is/great",
"https://maps.workadventu.re/floor0/Floor0.json",
"global"
);
expect(roomId).toEqual('@/tcm/is/great');
expect(roomId).toEqual("@/tcm/is/great");
expect(hash).toEqual(null);
});
it('should work with a relative file link and a hash as parameters', () => {
it("should work with a relative file link and a hash as parameters", () => {
const { roomId, hash } = Room.getIdFromIdentifier(
'./test2.json#start',
'https://maps.workadventu.re/test.json',
'global'
"./test2.json#start",
"https://maps.workadventu.re/test.json",
"global"
);
expect(roomId).toEqual('_/global/maps.workadventu.re/test2.json');
expect(hash).toEqual('start');
expect(roomId).toEqual("_/global/maps.workadventu.re/test2.json");
expect(hash).toEqual("start");
});
});