diff --git a/front/src/Phaser/Game/GameMap.ts b/front/src/Phaser/Game/GameMap.ts index 9f3157a0..12da0514 100644 --- a/front/src/Phaser/Game/GameMap.ts +++ b/front/src/Phaser/Game/GameMap.ts @@ -49,6 +49,10 @@ export class GameMap { this.lastProperties = newProps; } + public getCurrentProperties(): Map { + return this.lastProperties; + } + private getProperties(key: number): Map { const properties = new Map(); diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts index cb1f3dc4..7138330a 100644 --- a/front/src/Phaser/Game/GameScene.ts +++ b/front/src/Phaser/Game/GameScene.ts @@ -631,6 +631,15 @@ export class GameScene extends ResizableScene implements CenterListener { } } + private safeParseJSONstring(jsonString: string|undefined, propertyName: string) { + try { + return jsonString ? JSON.parse(jsonString) : {}; + } catch(e) { + console.warn('Invalid JSON found in property "' + propertyName + '" of the map:' + jsonString, e); + return {} + } + } + private triggerOnMapLayerPropertyChange(){ this.gameMap.onPropertyChange('exitSceneUrl', (newValue, oldValue) => { if (newValue) this.onMapExit(newValue as string); @@ -664,12 +673,13 @@ export class GameScene extends ResizableScene implements CenterListener { this.stopJitsi(); }else{ const openJitsiRoomFunction = () => { + const roomName = jitsiFactory.getRoomName(newValue.toString(), this.instance); if (JITSI_PRIVATE_MODE) { const adminTag = allProps.get("jitsiRoomAdminTag") as string|undefined; - this.connection.emitQueryJitsiJwtMessage(this.instance.replace('/', '-') + "-" + newValue, adminTag); + this.connection.emitQueryJitsiJwtMessage(roomName, adminTag); } else { - this.startJitsi(newValue as string); + this.startJitsi(roomName, undefined); } layoutManager.removeActionButton('jitsiRoom', this.userInputManager); } @@ -1229,7 +1239,11 @@ export class GameScene extends ResizableScene implements CenterListener { } public startJitsi(roomName: string, jwt?: string): void { - jitsiFactory.start(roomName, this.playerName, jwt); + const allProps = this.gameMap.getCurrentProperties(); + const jitsiConfig = this.safeParseJSONstring(allProps.get("jitsiConfig") as string|undefined, 'jitsiConfig'); + const jitsiInterfaceConfig = this.safeParseJSONstring(allProps.get("jitsiInterfaceConfig") as string|undefined, 'jitsiInterfaceConfig'); + + jitsiFactory.start(roomName, this.playerName, jwt, jitsiConfig, jitsiInterfaceConfig); this.connection.setSilent(true); mediaManager.hideGameOverlay(); diff --git a/front/src/WebRtc/JitsiFactory.ts b/front/src/WebRtc/JitsiFactory.ts index 736b5244..7d470754 100644 --- a/front/src/WebRtc/JitsiFactory.ts +++ b/front/src/WebRtc/JitsiFactory.ts @@ -3,11 +3,19 @@ import {mediaManager} from "./MediaManager"; import {coWebsiteManager} from "./CoWebsiteManager"; declare const window:any; // eslint-disable-line @typescript-eslint/no-explicit-any -const interfaceConfig = { +const defaultConfig = { + startWithAudioMuted: !mediaManager.constraintsMedia.audio, + startWithVideoMuted: mediaManager.constraintsMedia.video === false, + prejoinPageEnabled: false +} + +const defaultInterfaceConfig = { SHOW_CHROME_EXTENSION_BANNER: false, MOBILE_APP_PROMO: false, HIDE_INVITE_MORE_HEADER: true, + DISABLE_JOIN_LEAVE_NOTIFICATIONS: true, + DISABLE_VIDEO_BACKGROUND: true, // Note: hiding brand does not seem to work, we probably need to put this on the server side. SHOW_BRAND_WATERMARK: false, @@ -25,12 +33,31 @@ const interfaceConfig = { ], }; +const slugify = (...args: (string | number)[]): string => { + const value = args.join(' ') + + return value + .normalize('NFD') // split an accented letter in the base letter and the accent + .replace(/[\u0300-\u036f]/g, '') // remove all previously split accents + .toLowerCase() + .trim() + .replace(/[^a-z0-9 ]/g, '') // remove all chars not letters, numbers and spaces (to be replaced) + .replace(/\s+/g, '-') // separator +} + class JitsiFactory { private jitsiApi: any; // eslint-disable-line @typescript-eslint/no-explicit-any private audioCallback = this.onAudioChange.bind(this); private videoCallback = this.onVideoChange.bind(this); - - public start(roomName: string, playerName:string, jwt?: string): void { + + /** + * Slugifies the room name and prepends the room name with the instance + */ + public getRoomName(roomName: string, instance: string): string { + return slugify(instance.replace('/', '-') + "-" + roomName); + } + + public start(roomName: string, playerName:string, jwt?: string, config?: object, interfaceConfig?: object): void { coWebsiteManager.insertCoWebsite((cowebsiteDiv => { const domain = JITSI_URL; const options: any = { // eslint-disable-line @typescript-eslint/no-explicit-any @@ -39,17 +66,13 @@ class JitsiFactory { width: "100%", height: "100%", parentNode: cowebsiteDiv, - configOverwrite: { - startWithAudioMuted: !mediaManager.constraintsMedia.audio, - startWithVideoMuted: mediaManager.constraintsMedia.video === false, - prejoinPageEnabled: false - }, - interfaceConfigOverwrite: interfaceConfig, + configOverwrite: {...defaultConfig, ...config}, + interfaceConfigOverwrite: {...defaultInterfaceConfig, ...interfaceConfig} }; if (!options.jwt) { delete options.jwt; } - + return new Promise((resolve, reject) => { options.onload = () => resolve(); //we want for the iframe to be loaded before triggering animations. setTimeout(() => resolve(), 2000); //failsafe in case the iframe is deleted before loading or too long to load @@ -87,7 +110,6 @@ class JitsiFactory { mediaManager.enableCamera(); } } - } -export const jitsiFactory = new JitsiFactory(); \ No newline at end of file +export const jitsiFactory = new JitsiFactory(); diff --git a/maps/tests/Attribution-tilesets.txt b/maps/tests/Attribution-tilesets.txt new file mode 100644 index 00000000..a0e4224a --- /dev/null +++ b/maps/tests/Attribution-tilesets.txt @@ -0,0 +1,25 @@ +License +------- + +CC-BY-SA 3.0: + - http://creativecommons.org/licenses/by-sa/3.0/ + - See the file: cc-by-sa-3.0.txt +GNU GPL 3.0: + - http://www.gnu.org/licenses/gpl-3.0.html + - See the file: gpl-3.0.txt + +Assets from: workadventure@thecodingmachine.com + +BASE assets: +------------ + + - le-coq.png + - logotcm.png + - pin.png + - tileset1-repositioning.png + - tileset1.png + - tileset2.2.png + - tileset2.png + - tileset3.2.png + - tileset3.png + - walls2.png \ No newline at end of file diff --git a/maps/tests/jitsi_config.json b/maps/tests/jitsi_config.json new file mode 100644 index 00000000..1a831d97 --- /dev/null +++ b/maps/tests/jitsi_config.json @@ -0,0 +1,99 @@ +{ "compressionlevel":-1, + "editorsettings": + { + "export": + { + "target":"." + } + }, + "height":10, + "infinite":false, + "layers":[ + { + "data":[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1], + "height":10, + "id":1, + "name":"floor", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":10, + "x":0, + "y":0 + }, + { + "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + "height":10, + "id":2, + "name":"start", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":10, + "x":0, + "y":0 + }, + { + "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + "height":10, + "id":4, + "name":"jitsi", + "opacity":1, + "properties":[ + { + "name":"jitsiConfig", + "type":"string", + "value":"{ \"startWithAudioMuted\": true }" + }, + { + "name":"jitsiInterfaceConfig", + "type":"string", + "value":"{ \"DEFAULT_BACKGROUND\": \"#77ee77\" }" + }, + { + "name":"jitsiRoom", + "type":"string", + "value":"myRoom avec espace \u00e9\u00e0$&'\"_ \ud83d\ude00" + }], + "type":"tilelayer", + "visible":true, + "width":10, + "x":0, + "y":0 + }, + { + "draworder":"topdown", + "id":3, + "name":"floorLayer", + "objects":[], + "opacity":1, + "type":"objectgroup", + "visible":true, + "x":0, + "y":0 + }], + "nextlayerid":5, + "nextobjectid":1, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.3.3", + "tileheight":32, + "tilesets":[ + { + "columns":11, + "firstgid":1, + "image":"tileset1.png", + "imageheight":352, + "imagewidth":352, + "margin":0, + "name":"tileset1", + "spacing":0, + "tilecount":121, + "tileheight":32, + "tilewidth":32 + }], + "tilewidth":32, + "type":"map", + "version":1.2, + "width":10 +} \ No newline at end of file diff --git a/maps/tests/tileset1.png b/maps/tests/tileset1.png new file mode 100644 index 00000000..6e7dafb4 Binary files /dev/null and b/maps/tests/tileset1.png differ