@@ -517,7 +526,11 @@ export class MediaManager {
this.remoteVideo.set(userId, HtmlUtils.getElementByIdOrFail
(userId));
}
-
+
+ private getScreenSharingId(userId: string): string {
+ return `screen-sharing-${userId}`;
+ }
+
disabledMicrophoneByUserId(userId: number){
const element = document.getElementById(`microphone-${userId}`);
if(!element){
@@ -556,6 +569,10 @@ export class MediaManager {
}
}
+ toggleBlockLogo(userId: number, show: boolean): void {
+ const blockLogoElement = HtmlUtils.getElementByIdOrFail('blocking-'+userId);
+ show ? blockLogoElement.classList.add('active') : blockLogoElement.classList.remove('active');
+ }
addStreamRemoteVideo(userId: string, stream : MediaStream): void {
const remoteVideo = this.remoteVideo.get(userId);
if (remoteVideo === undefined) {
@@ -565,12 +582,12 @@ export class MediaManager {
}
addStreamRemoteScreenSharing(userId: string, stream : MediaStream){
// In the case of screen sharing (going both ways), we may need to create the HTML element if it does not exist yet
- const remoteVideo = this.remoteVideo.get(`screen-sharing-${userId}`);
+ const remoteVideo = this.remoteVideo.get(this.getScreenSharingId(userId));
if (remoteVideo === undefined) {
this.addScreenSharingActiveVideo(userId);
}
- this.addStreamRemoteVideo(`screen-sharing-${userId}`, stream);
+ this.addStreamRemoteVideo(this.getScreenSharingId(userId), stream);
}
removeActiveVideo(userId: string){
@@ -581,7 +598,7 @@ export class MediaManager {
this.removeParticipant(userId);
}
removeActiveScreenSharingVideo(userId: string) {
- this.removeActiveVideo(`screen-sharing-${userId}`)
+ this.removeActiveVideo(this.getScreenSharingId(userId))
}
playWebrtcOutSound(): void {
@@ -617,7 +634,7 @@ export class MediaManager {
errorDiv.style.display = 'block';
}
isErrorScreenSharing(userId: string): void {
- this.isError(`screen-sharing-${userId}`);
+ this.isError(this.getScreenSharingId(userId));
}
@@ -645,65 +662,8 @@ export class MediaManager {
return color;
}
- public showReportModal(userId: string, userName: string, reportCallBack: ReportCallback){
- //create report text area
- const mainContainer = HtmlUtils.getElementByIdOrFail('main-container');
-
- const divReport = document.createElement('div');
- divReport.classList.add('modal-report-user');
-
- const inputHidden = document.createElement('input');
- inputHidden.id = 'input-report-user';
- inputHidden.type = 'hidden';
- inputHidden.value = userId;
- divReport.appendChild(inputHidden);
-
- const titleMessage = document.createElement('p');
- titleMessage.id = 'title-report-user';
- titleMessage.innerText = 'Open a report';
- divReport.appendChild(titleMessage);
-
- const bodyMessage = document.createElement('p');
- bodyMessage.id = 'body-report-user';
- bodyMessage.innerText = `You are about to open a report regarding an offensive conduct from user ${userName.toUpperCase()}. Please explain to us how you think ${userName.toUpperCase()} breached the code of conduct.`;
- divReport.appendChild(bodyMessage);
-
- const imgReportUser = document.createElement('img');
- imgReportUser.id = 'img-report-user';
- imgReportUser.src = 'resources/logos/report.svg';
- divReport.appendChild(imgReportUser);
-
- const textareaUser = document.createElement('textarea');
- textareaUser.id = 'textarea-report-user';
- textareaUser.placeholder = 'Write ...';
- divReport.appendChild(textareaUser);
-
- const buttonReport = document.createElement('button');
- buttonReport.id = 'button-save-report-user';
- buttonReport.innerText = 'Report';
- buttonReport.addEventListener('click', () => {
- if(!textareaUser.value){
- textareaUser.style.border = '1px solid red'
- return;
- }
- reportCallBack(textareaUser.value);
- divReport.remove();
- });
- divReport.appendChild(buttonReport);
-
- const buttonCancel = document.createElement('img');
- buttonCancel.id = 'cancel-report-user';
- buttonCancel.src = 'resources/logos/close.svg';
- buttonCancel.addEventListener('click', () => {
- divReport.remove();
- });
- divReport.appendChild(buttonCancel);
-
- mainContainer.appendChild(divReport);
- }
-
- public addNewParticipant(userId: number|string, name: string|undefined, img?: string, reportCallBack?: ReportCallback){
- discussionManager.addParticipant(userId, name, img, false, reportCallBack);
+ public addNewParticipant(userId: number|string, name: string|undefined, img?: string, showReportUserCallBack?: ShowReportCallBack){
+ discussionManager.addParticipant(userId, name, img, false, showReportUserCallBack);
}
public removeParticipant(userId: number|string){
@@ -769,6 +729,10 @@ export class MediaManager {
this.checkActiveUser();
}, this.focused ? 10000 : 1000);
}
+
+ public setShowReportModalCallBacks(callback: ShowReportCallBack){
+ this.showReportModalCallBacks.add(callback);
+ }
}
export const mediaManager = new MediaManager();
diff --git a/front/src/WebRtc/ScreenSharingPeer.ts b/front/src/WebRtc/ScreenSharingPeer.ts
index a6cf679b..62f3079c 100644
--- a/front/src/WebRtc/ScreenSharingPeer.ts
+++ b/front/src/WebRtc/ScreenSharingPeer.ts
@@ -1,8 +1,9 @@
import * as SimplePeerNamespace from "simple-peer";
import {mediaManager} from "./MediaManager";
-import {TURN_SERVER, TURN_USER, TURN_PASSWORD} from "../Enum/EnvironmentVariable";
+import {STUN_SERVER, TURN_SERVER, TURN_USER, TURN_PASSWORD} from "../Enum/EnvironmentVariable";
import {RoomConnection} from "../Connexion/RoomConnection";
import {MESSAGE_TYPE_CONSTRAINT} from "./VideoPeer";
+import {UserSimplePeerInterface} from "./SimplePeer";
const Peer: SimplePeerNamespace.SimplePeer = require('simple-peer');
@@ -16,25 +17,28 @@ export class ScreenSharingPeer extends Peer {
private isReceivingStream:boolean = false;
public toClose: boolean = false;
public _connected: boolean = false;
+ private userId: number;
- constructor(private userId: number, initiator: boolean, private connection: RoomConnection) {
+ constructor(user: UserSimplePeerInterface, initiator: boolean, private connection: RoomConnection) {
super({
initiator: initiator ? initiator : false,
reconnectTimer: 10000,
config: {
iceServers: [
{
- urls: 'stun:stun.l.google.com:19302'
+ urls: STUN_SERVER.split(',')
},
- {
+ TURN_SERVER !== '' ? {
urls: TURN_SERVER.split(','),
- username: TURN_USER,
- credential: TURN_PASSWORD
- },
- ]
+ username: user.webRtcUser || TURN_USER,
+ credential: user.webRtcPassword || TURN_PASSWORD
+ } : undefined,
+ ].filter((value) => value !== undefined)
}
});
+ this.userId = user.userId;
+
//start listen signal for the peer connection
this.on('signal', (data: unknown) => {
this.sendWebrtcScreenSharingSignal(data);
diff --git a/front/src/WebRtc/SimplePeer.ts b/front/src/WebRtc/SimplePeer.ts
index 90d260ee..34e4b3f8 100644
--- a/front/src/WebRtc/SimplePeer.ts
+++ b/front/src/WebRtc/SimplePeer.ts
@@ -9,13 +9,18 @@ import {
UpdatedLocalStreamCallback
} from "./MediaManager";
import {ScreenSharingPeer} from "./ScreenSharingPeer";
-import {MESSAGE_TYPE_CONSTRAINT, MESSAGE_TYPE_MESSAGE, VideoPeer} from "./VideoPeer";
+import {MESSAGE_TYPE_BLOCKED, MESSAGE_TYPE_CONSTRAINT, MESSAGE_TYPE_MESSAGE, VideoPeer} from "./VideoPeer";
import {RoomConnection} from "../Connexion/RoomConnection";
+import {connectionManager} from "../Connexion/ConnectionManager";
+import {GameConnexionTypes} from "../Url/UrlManager";
+import {blackListManager} from "./BlackListManager";
export interface UserSimplePeerInterface{
userId: number;
name?: string;
initiator?: boolean;
+ webRtcUser?: string|undefined;
+ webRtcPassword?: string|undefined;
}
export interface PeerConnectionListener {
@@ -36,6 +41,7 @@ export class SimplePeer {
private readonly sendLocalScreenSharingStreamCallback: StartScreenSharingCallback;
private readonly stopLocalScreenSharingStreamCallback: StopScreenSharingCallback;
private readonly peerConnectionListeners: Array = new Array();
+ private readonly userId: number;
constructor(private Connection: RoomConnection, private enableReporting: boolean, private myName: string) {
// We need to go through this weird bound function pointer in order to be able to "free" this reference later.
@@ -46,6 +52,7 @@ export class SimplePeer {
mediaManager.onUpdateLocalStream(this.sendLocalVideoStreamCallback);
mediaManager.onStartScreenSharing(this.sendLocalScreenSharingStreamCallback);
mediaManager.onStopScreenSharing(this.stopLocalScreenSharingStreamCallback);
+ this.userId = Connection.getUserId();
this.initialise();
}
@@ -89,15 +96,14 @@ export class SimplePeer {
});
}
- private receiveWebrtcStart(user: UserSimplePeerInterface) {
- //this.WebRtcRoomId = data.roomId;
+ private receiveWebrtcStart(user: UserSimplePeerInterface): void {
this.Users.push(user);
// Note: the clients array contain the list of all clients (even the ones we are already connected to in case a user joints a group)
// So we can receive a request we already had before. (which will abort at the first line of createPeerConnection)
// This would be symmetrical to the way we handle disconnection.
-
+
//start connection
- console.log('receiveWebrtcStart. Initiator: ', user.initiator)
+ //console.log('receiveWebrtcStart. Initiator: ', user.initiator)
if(!user.initiator){
return;
}
@@ -134,17 +140,13 @@ export class SimplePeer {
mediaManager.removeActiveVideo("" + user.userId);
- const reportCallback = this.enableReporting ? (comment: string) => {
- this.reportUser(user.userId, comment);
- } : undefined;
+ mediaManager.addActiveVideo(user, name);
- mediaManager.addActiveVideo("" + user.userId, reportCallback, name);
-
- const peer = new VideoPeer(user.userId, user.initiator ? user.initiator : false, this.Connection);
+ const peer = new VideoPeer(user, user.initiator ? user.initiator : false, this.Connection);
//permit to send message
mediaManager.addSendMessageCallback(user.userId,(message: string) => {
- peer.write(new Buffer(JSON.stringify({type: MESSAGE_TYPE_MESSAGE, name: this.myName.toUpperCase(), message: message})));
+ peer.write(new Buffer(JSON.stringify({type: MESSAGE_TYPE_MESSAGE, name: this.myName.toUpperCase(), userId: this.userId, message: message})));
});
peer.toClose = false;
@@ -189,7 +191,7 @@ export class SimplePeer {
mediaManager.addScreenSharingActiveVideo("" + user.userId);
}
- const peer = new ScreenSharingPeer(user.userId, user.initiator ? user.initiator : false, this.Connection);
+ const peer = new ScreenSharingPeer(user, user.initiator ? user.initiator : false, this.Connection);
this.PeerScreenSharingConnectionArray.set(user.userId, peer);
for (const peerConnectionListener of this.peerConnectionListeners) {
@@ -300,6 +302,7 @@ export class SimplePeer {
}
private receiveWebrtcScreenSharingSignal(data: WebRtcSignalReceivedMessageInterface) {
+ if (blackListManager.isBlackListed(data.userId)) return;
console.log("receiveWebrtcScreenSharingSignal", data);
try {
//if offer type, create peer connection
@@ -391,14 +394,8 @@ export class SimplePeer {
}
}
- /**
- * Triggered locally when clicking on the report button
- */
- public reportUser(userId: number, message: string) {
- this.Connection.emitReportPlayerMessage(userId, message)
- }
-
private sendLocalScreenSharingStreamToUser(userId: number): void {
+ if (blackListManager.isBlackListed(userId)) return;
// If a connection already exists with user (because it is already sharing a screen with us... let's use this connection)
if (this.PeerScreenSharingConnectionArray.has(userId)) {
this.pushScreenSharingToRemoteUser(userId);
diff --git a/front/src/WebRtc/VideoPeer.ts b/front/src/WebRtc/VideoPeer.ts
index 877f4e64..416a17c9 100644
--- a/front/src/WebRtc/VideoPeer.ts
+++ b/front/src/WebRtc/VideoPeer.ts
@@ -1,65 +1,57 @@
import * as SimplePeerNamespace from "simple-peer";
import {mediaManager} from "./MediaManager";
-import {TURN_PASSWORD, TURN_SERVER, TURN_USER} from "../Enum/EnvironmentVariable";
+import {STUN_SERVER, TURN_PASSWORD, TURN_SERVER, TURN_USER} from "../Enum/EnvironmentVariable";
import {RoomConnection} from "../Connexion/RoomConnection";
+import {blackListManager} from "./BlackListManager";
+import {Subscription} from "rxjs";
+import {UserSimplePeerInterface} from "./SimplePeer";
const Peer: SimplePeerNamespace.SimplePeer = require('simple-peer');
export const MESSAGE_TYPE_CONSTRAINT = 'constraint';
export const MESSAGE_TYPE_MESSAGE = 'message';
+export const MESSAGE_TYPE_BLOCKED = 'blocked';
+export const MESSAGE_TYPE_UNBLOCKED = 'unblocked';
/**
* A peer connection used to transmit video / audio signals between 2 peers.
*/
export class VideoPeer extends Peer {
public toClose: boolean = false;
public _connected: boolean = false;
+ private remoteStream!: MediaStream;
+ private blocked: boolean = false;
+ private userId: number;
+ private userName: string;
+ private onBlockSubscribe: Subscription;
+ private onUnBlockSubscribe: Subscription;
- constructor(public userId: number, initiator: boolean, private connection: RoomConnection) {
+ constructor(public user: UserSimplePeerInterface, initiator: boolean, private connection: RoomConnection) {
super({
initiator: initiator ? initiator : false,
reconnectTimer: 10000,
config: {
iceServers: [
{
- urls: 'stun:stun.l.google.com:19302'
+ urls: STUN_SERVER.split(',')
},
- {
+ TURN_SERVER !== '' ? {
urls: TURN_SERVER.split(','),
- username: TURN_USER,
- credential: TURN_PASSWORD
- },
- ]
+ username: user.webRtcUser || TURN_USER,
+ credential: user.webRtcPassword || TURN_PASSWORD
+ } : undefined,
+ ].filter((value) => value !== undefined)
}
});
- console.log('PEER SETUP ', {
- initiator: initiator ? initiator : false,
- reconnectTimer: 10000,
- config: {
- iceServers: [
- {
- urls: 'stun:stun.l.google.com:19302'
- },
- {
- urls: TURN_SERVER.split(','),
- username: TURN_USER,
- credential: TURN_PASSWORD
- },
- ]
- }
- });
+ this.userId = user.userId;
+ this.userName = user.name || '';
//start listen signal for the peer connection
this.on('signal', (data: unknown) => {
this.sendWebrtcSignal(data);
});
- this.on('stream', (stream: MediaStream) => {
- this.stream(stream);
- });
-
- /*peer.on('track', (track: MediaStreamTrack, stream: MediaStream) => {
- });*/
+ this.on('stream', (stream: MediaStream) => this.stream(stream));
this.on('close', () => {
this._connected = false;
@@ -70,7 +62,7 @@ export class VideoPeer extends Peer {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
this.on('error', (err: any) => {
console.error(`error => ${this.userId} => ${err.code}`, err);
- mediaManager.isError("" + userId);
+ mediaManager.isError("" + this.userId);
});
this.on('connect', () => {
@@ -81,8 +73,6 @@ export class VideoPeer extends Peer {
this.on('data', (chunk: Buffer) => {
const message = JSON.parse(chunk.toString('utf8'));
- console.log("data", message);
-
if(message.type === MESSAGE_TYPE_CONSTRAINT) {
if (message.audio) {
mediaManager.enabledMicrophoneByUserId(this.userId);
@@ -95,8 +85,19 @@ export class VideoPeer extends Peer {
} else {
mediaManager.disabledVideoByUserId(this.userId);
}
- } else if(message.type === 'message') {
- mediaManager.addNewMessage(message.name, message.message);
+ } else if(message.type === MESSAGE_TYPE_MESSAGE) {
+ if (!blackListManager.isBlackListed(message.userId)) {
+ mediaManager.addNewMessage(message.name, message.message);
+ }
+ } else if(message.type === MESSAGE_TYPE_BLOCKED) {
+ //FIXME when A blacklists B, the output stream from A is muted in B's js client. This is insecure since B can manipulate the code to unmute A stream.
+ // Find a way to block A's output stream in A's js client
+ //However, the output stream stream B is correctly blocked in A client
+ this.blocked = true;
+ this.toggleRemoteStream(false);
+ } else if(message.type === MESSAGE_TYPE_UNBLOCKED) {
+ this.blocked = false;
+ this.toggleRemoteStream(true);
}
});
@@ -105,6 +106,31 @@ export class VideoPeer extends Peer {
});
this.pushVideoToRemoteUser();
+ this.onBlockSubscribe = blackListManager.onBlockStream.subscribe((userId) => {
+ if (userId === this.userId) {
+ this.toggleRemoteStream(false);
+ this.sendBlockMessage(true);
+ }
+ });
+ this.onUnBlockSubscribe = blackListManager.onUnBlockStream.subscribe((userId) => {
+ if (userId === this.userId) {
+ this.toggleRemoteStream(true);
+ this.sendBlockMessage(false);
+ }
+ });
+
+ if (blackListManager.isBlackListed(this.userId)) {
+ this.sendBlockMessage(true)
+ }
+ }
+
+ private sendBlockMessage(blocking: boolean) {
+ this.write(new Buffer(JSON.stringify({type: blocking ? MESSAGE_TYPE_BLOCKED : MESSAGE_TYPE_UNBLOCKED, name: this.userName.toUpperCase(), userId: this.userId, message: ''})));
+ }
+
+ private toggleRemoteStream(enable: boolean) {
+ this.remoteStream.getTracks().forEach(track => track.enabled = enable);
+ mediaManager.toggleBlockLogo(this.userId, !enable);
}
private sendWebrtcSignal(data: unknown) {
@@ -120,13 +146,13 @@ export class VideoPeer extends Peer {
*/
private stream(stream: MediaStream) {
try {
+ this.remoteStream = stream;
+ if (blackListManager.isBlackListed(this.userId) || this.blocked) {
+ this.toggleRemoteStream(false);
+ }
mediaManager.addStreamRemoteVideo("" + this.userId, stream);
}catch (err){
console.error(err);
- //Force add streem video
- /*setTimeout(() => {
- this.stream(stream);
- }, 500);*/ //todo: find a way to prevent infinite regression.
}
}
@@ -139,6 +165,8 @@ export class VideoPeer extends Peer {
if(!this.toClose){
return;
}
+ this.onBlockSubscribe.unsubscribe();
+ this.onUnBlockSubscribe.unsubscribe();
mediaManager.removeActiveVideo("" + this.userId);
// FIXME: I don't understand why "Closing connection with" message is displayed TWICE before "Nb users in peerConnectionArray"
// I do understand the method closeConnection is called twice, but I don't understand how they manage to run in parallel.
diff --git a/front/src/index.ts b/front/src/index.ts
index acf66cf8..94b1df43 100644
--- a/front/src/index.ts
+++ b/front/src/index.ts
@@ -1,7 +1,6 @@
import 'phaser';
import GameConfig = Phaser.Types.Core.GameConfig;
import {DEBUG_MODE, JITSI_URL, RESOLUTION} from "./Enum/EnvironmentVariable";
-import {cypressAsserter} from "./Cypress/CypressAsserter";
import {LoginScene} from "./Phaser/Login/LoginScene";
import {ReconnectingScene} from "./Phaser/Reconnecting/ReconnectingScene";
import {SelectCharacterScene} from "./Phaser/Login/SelectCharacterScene";
@@ -53,8 +52,28 @@ const fps : Phaser.Types.Core.FPSConfig = {
smoothStep: false
}
+// the ?phaserMode=canvas parameter can be used to force Canvas usage
+const params = new URLSearchParams(document.location.search.substring(1));
+const phaserMode = params.get("phaserMode");
+let mode: number;
+switch (phaserMode) {
+ case 'auto':
+ case null:
+ mode = Phaser.AUTO;
+ break;
+ case 'canvas':
+ mode = Phaser.CANVAS;
+ break;
+ case 'webgl':
+ mode = Phaser.WEBGL;
+ break;
+ default:
+ throw new Error('phaserMode parameter must be one of "auto", "canvas" or "webgl"');
+}
+
+
const config: GameConfig = {
- type: Phaser.AUTO,
+ type: mode,
title: "WorkAdventure",
width: width / RESOLUTION,
height: height / RESOLUTION,
@@ -65,6 +84,11 @@ const config: GameConfig = {
dom: {
createContainer: true
},
+ render: {
+ pixelArt: true,
+ roundPixels: true,
+ antialias: false
+ },
physics: {
default: "arcade",
arcade: {
@@ -73,16 +97,15 @@ const config: GameConfig = {
},
callbacks: {
postBoot: game => {
- const renderer = game.renderer;
+ // Commented out to try to fix MacOS bug
+ /*const renderer = game.renderer;
if (renderer instanceof WebGLRenderer) {
renderer.pipelines.add(OutlinePipeline.KEY, new OutlinePipeline(game));
- }
+ }*/
}
}
};
-cypressAsserter.gameStarted();
-
const game = new Phaser.Game(config);
window.addEventListener('resize', function (event) {
diff --git a/front/templater.sh b/front/templater.sh
index e63617c5..1851cdc5 100755
--- a/front/templater.sh
+++ b/front/templater.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -x
set -o nounset errexit
-template_file_index=dist/index.html.tmpl
+template_file_index=dist/index.tmpl.html
generated_file_index=dist/index.html
tmp_trackcodefile=/tmp/trackcode
diff --git a/front/tests/Phaser/Game/HtmlUtilsTest.ts b/front/tests/Phaser/Game/HtmlUtilsTest.ts
index 8ef1d476..a878fdc0 100644
--- a/front/tests/Phaser/Game/HtmlUtilsTest.ts
+++ b/front/tests/Phaser/Game/HtmlUtilsTest.ts
@@ -2,13 +2,19 @@ import "jasmine";
import {HtmlUtils} from "../../../src/WebRtc/HtmlUtils";
describe("urlify()", () => {
- it("should transform an url into a link", () => {
- const text = HtmlUtils.urlify('https://google.com');
- expect(text).toEqual('https://google.com');
+ // FIXME: we need to add PhantomJS to have a good mock for "document".
+ /*it("should transform an url into a link", () => {
+ const text = HtmlUtils.urlify('foo https://google.com bar');
+ expect(text).toEqual('foo https://google.com bar');
});
it("should not transform a normal text into a link", () => {
const text = HtmlUtils.urlify('hello');
expect(text).toEqual('hello');
});
-});
\ No newline at end of file
+
+ it("should escape HTML", () => {
+ const text = HtmlUtils.urlify('boo
');
+ expect(text).toEqual('<h1>boo</h1>');
+ });*/
+});
diff --git a/front/webpack.config.js b/front/webpack.config.js
index 3b97081c..170466ef 100644
--- a/front/webpack.config.js
+++ b/front/webpack.config.js
@@ -39,13 +39,34 @@ module.exports = {
plugins: [
new HtmlWebpackPlugin(
{
- template: './dist/index.html'
+ template: './dist/index.tmpl.html',
+ minify: {
+ collapseWhitespace: true,
+ keepClosingSlash: true,
+ removeComments: false,
+ removeRedundantAttributes: true,
+ removeScriptTypeAttributes: true,
+ removeStyleLinkTypeAttributes: true,
+ useShortDoctype: true
+ }
}
),
new webpack.ProvidePlugin({
Phaser: 'phaser'
}),
- new webpack.EnvironmentPlugin(['API_URL', 'UPLOADER_URL', 'ADMIN_URL', 'DEBUG_MODE', 'TURN_SERVER', 'TURN_USER', 'TURN_PASSWORD', 'JITSI_URL', 'JITSI_PRIVATE_MODE', 'START_ROOM_URL'])
+ new webpack.EnvironmentPlugin([
+ 'API_URL',
+ 'UPLOADER_URL',
+ 'ADMIN_URL',
+ 'DEBUG_MODE',
+ 'STUN_SERVER',
+ 'TURN_SERVER',
+ 'TURN_USER',
+ 'TURN_PASSWORD',
+ 'JITSI_URL',
+ 'JITSI_PRIVATE_MODE',
+ 'START_ROOM_URL'
+ ])
],
};
diff --git a/front/yarn.lock b/front/yarn.lock
index 105a4310..0b85ad88 100644
--- a/front/yarn.lock
+++ b/front/yarn.lock
@@ -1771,7 +1771,7 @@ eventemitter3@^2.0.3:
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-2.0.3.tgz#b5e1079b59fb5e1ba2771c0a993be060a58c99ba"
integrity sha1-teEHm1n7XhuidxwKmTvgYKWMmbo=
-eventemitter3@^4.0.0, eventemitter3@^4.0.7:
+eventemitter3@^4.0.0, eventemitter3@^4.0.4:
version "4.0.7"
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
@@ -1829,7 +1829,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
dependencies:
homedir-polyfill "^1.0.1"
-exports-loader@^1.1.1:
+exports-loader@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-1.1.1.tgz#88c9a6877ee6a5519d7c41a016bdd99148421e69"
integrity sha512-CmyhIR2sJ3KOfVsHjsR0Yvo+0lhRhRMAevCbB8dhTVLHsZPs0lCQTvRmR9YNvBXDBxUuhmCE2f54KqEjZUaFrg==
@@ -2528,7 +2528,7 @@ import-local@^2.0.0:
pkg-dir "^3.0.0"
resolve-cwd "^2.0.0"
-imports-loader@^1.2.0:
+imports-loader@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz#b06823d0bb42e6f5ff89bc893829000eda46693f"
integrity sha512-zPvangKEgrrPeqeUqH0Uhc59YqK07JqZBi9a9cQ3v/EKUIqrbJHY4CvUrDus2lgQa5AmPyXuGrWP8JJTqzE5RQ==
@@ -3663,14 +3663,14 @@ pbkdf2@^3.0.3:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
-phaser@^3.52.0:
- version "3.52.0"
- resolved "https://registry.yarnpkg.com/phaser/-/phaser-3.52.0.tgz#834dd7a7717308c2576d2450d0806317cf3d1ea8"
- integrity sha512-oH39AUXR+cletB3GIvLnVO2J7/M6xs0D0LamVdCrbCDO3jckQOVBcqR6SJ2wam+4D5iJTCXv8K+FmxFzcTUWuA==
+phaser@3.24.1:
+ version "3.24.1"
+ resolved "https://registry.yarnpkg.com/phaser/-/phaser-3.24.1.tgz#376e0c965d2a35af37c06ee78627dafbde5be017"
+ integrity sha512-WbrRMkbpEzarkfrq83akeauc6b8xNxsOTpDygyW7wrU2G2ne6kOYu3hji4UAaGnZaOLrVuj8ycYPjX9P1LxcDw==
dependencies:
- eventemitter3 "^4.0.7"
- exports-loader "^1.1.1"
- imports-loader "^1.2.0"
+ eventemitter3 "^4.0.4"
+ exports-loader "^1.1.0"
+ imports-loader "^1.1.0"
path "^0.12.7"
picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
@@ -4094,7 +4094,7 @@ run-queue@^1.0.0, run-queue@^1.0.3:
dependencies:
aproba "^1.1.1"
-rxjs@^6.6.0:
+rxjs@^6.6.0, rxjs@^6.6.3:
version "6.6.3"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
diff --git a/maps/.dockerignore b/maps/.dockerignore
new file mode 100644
index 00000000..64d1025d
--- /dev/null
+++ b/maps/.dockerignore
@@ -0,0 +1,4 @@
+/node_modules/
+/dist/bundle.js
+/yarn-error.log
+/Dockerfile
diff --git a/maps/Floor0/floor0.json b/maps/Floor0/floor0.json
index f5239941..24b28d6c 100644
--- a/maps/Floor0/floor0.json
+++ b/maps/Floor0/floor0.json
@@ -298,7 +298,7 @@
{
"name":"exitUrl",
"type":"string",
- "value":"\/@\/tcm\/workadventure\/floor1"
+ "value":"..\/Floor1\/floor1.json"
}],
"type":"tilelayer",
"visible":true,
diff --git a/maps/Floor1/floor1.json b/maps/Floor1/floor1.json
index 6deb3bf5..1894ed42 100644
--- a/maps/Floor1/floor1.json
+++ b/maps/Floor1/floor1.json
@@ -83,9 +83,9 @@
"opacity":1,
"properties":[
{
- "name":"exitSceneUrl",
+ "name":"exitUrl",
"type":"string",
- "value":"\/@\/tcm\/workadventure\/floor0#down-the-stairs"
+ "value":"..\/Floor0\/floor0.json"
}],
"type":"tilelayer",
"visible":true,
@@ -264,7 +264,7 @@
"nextobjectid":1,
"orientation":"orthogonal",
"renderorder":"right-down",
- "tiledversion":"1.4.2",
+ "tiledversion":"1.3.3",
"tileheight":32,
"tilesets":[
{
@@ -1959,6 +1959,6 @@
}],
"tilewidth":32,
"type":"map",
- "version":1.4,
+ "version":1.2,
"width":46
}
\ No newline at end of file
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
diff --git a/messages/.dockerignore b/messages/.dockerignore
new file mode 100644
index 00000000..64d1025d
--- /dev/null
+++ b/messages/.dockerignore
@@ -0,0 +1,4 @@
+/node_modules/
+/dist/bundle.js
+/yarn-error.log
+/Dockerfile
diff --git a/messages/protos/messages.proto b/messages/protos/messages.proto
index 39f575be..54b425f9 100644
--- a/messages/protos/messages.proto
+++ b/messages/protos/messages.proto
@@ -168,6 +168,8 @@ message WebRtcStartMessage {
int32 userId = 1;
string name = 2;
bool initiator = 3;
+ string webrtcUserName = 4;
+ string webrtcPassword = 5;
}
message WebRtcDisconnectMessage {
@@ -177,6 +179,8 @@ message WebRtcDisconnectMessage {
message WebRtcSignalToClientMessage {
int32 userId = 1;
string signal = 2;
+ string webrtcUserName = 4;
+ string webrtcPassword = 5;
}
message TeleportMessageMessage{
diff --git a/pusher/Dockerfile b/pusher/Dockerfile
index 42de3883..4aec9748 100644
--- a/pusher/Dockerfile
+++ b/pusher/Dockerfile
@@ -1,15 +1,26 @@
-FROM thecodingmachine/workadventure-back-base:latest as builder
-WORKDIR /var/www/messages
-COPY --chown=docker:docker messages .
+# protobuf build
+FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 as builder
+WORKDIR /usr/src
+COPY messages .
RUN yarn install && yarn proto
-FROM thecodingmachine/nodejs:12
-
-COPY --chown=docker:docker pusher .
-COPY --from=builder --chown=docker:docker /var/www/messages/generated /usr/src/app/src/Messages/generated
+# typescript build
+FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 as builder2
+WORKDIR /usr/src
+COPY pusher/yarn.lock pusher/package.json ./
RUN yarn install
-
+COPY pusher .
+COPY --from=builder /usr/src/generated src/Messages/generated
ENV NODE_ENV=production
RUN yarn run tsc
+# final production image
+FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76
+WORKDIR /usr/src
+COPY pusher/yarn.lock pusher/package.json ./
+COPY --from=builder2 /usr/src/dist /usr/src/dist
+ENV NODE_ENV=production
+RUN yarn install --production
+
+USER node
CMD ["yarn", "run", "runprod"]
diff --git a/pusher/Dockerfile.prod b/pusher/Dockerfile.prod
new file mode 100644
index 00000000..772532f0
--- /dev/null
+++ b/pusher/Dockerfile.prod
@@ -0,0 +1,17 @@
+FROM node:12.19.0-slim
+
+RUN mkdir -p /home/node/app && chown -R node:node /home/node/app
+WORKDIR /home/node/app
+
+USER node
+ENV NODE_ENV=production
+ENV DEBUG=*
+
+COPY --chown=node:node package.json yarn.lock ./
+
+RUN yarn install --prod --frozen-lockfile
+
+COPY --chown=node:node ./dist/ ./dist/
+
+EXPOSE 8080
+CMD ["yarn", "run", "runprod"]
diff --git a/pusher/src/Services/AdminApi.ts b/pusher/src/Services/AdminApi.ts
index 48e8a1a4..e9bccef8 100644
--- a/pusher/src/Services/AdminApi.ts
+++ b/pusher/src/Services/AdminApi.ts
@@ -105,11 +105,12 @@ class AdminApi {
return res.data;
}
- reportPlayer(reportedUserUuid: string, reportedUserComment: string, reporterUserUuid: string) {
+ reportPlayer(reportedUserUuid: string, reportedUserComment: string, reporterUserUuid: string, reportWorldSlug: string) {
return Axios.post(`${ADMIN_API_URL}/api/report`, {
reportedUserUuid,
reportedUserComment,
reporterUserUuid,
+ reportWorldSlug
},
{
headers: {"Authorization": `${ADMIN_API_TOKEN}`}
diff --git a/pusher/src/Services/SocketManager.ts b/pusher/src/Services/SocketManager.ts
index 2f86ae19..713b8c7d 100644
--- a/pusher/src/Services/SocketManager.ts
+++ b/pusher/src/Services/SocketManager.ts
@@ -172,6 +172,7 @@ export class SocketManager implements ZoneEventListener {
console.log('Calling joinRoom')
const apiClient = await apiClientRepository.getClient(client.roomId);
const streamToPusher = apiClient.joinRoom();
+ clientEventsEmitter.emitClientJoin(client.userUuid, client.roomId);
client.backConnection = streamToPusher;
@@ -304,7 +305,7 @@ export class SocketManager implements ZoneEventListener {
throw 'reported socket user not found';
}
//TODO report user on admin application
- await adminApi.reportPlayer(reportedSocket.userUuid, reportPlayerMessage.getReportcomment(), client.userUuid)
+ await adminApi.reportPlayer(reportedSocket.userUuid, reportPlayerMessage.getReportcomment(), client.userUuid, client.roomId.split('/')[2])
} catch (e) {
console.error('An error occurred on "handleReportMessage"');
console.error(e);
diff --git a/uploader/Dockerfile b/uploader/Dockerfile
index 3c471f6c..e4366308 100644
--- a/uploader/Dockerfile
+++ b/uploader/Dockerfile
@@ -1,9 +1,19 @@
-FROM thecodingmachine/nodejs:12
-
-COPY --chown=docker:docker uploader .
+# typescript build
+FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76 as builder2
+WORKDIR /usr/src
+COPY uploader/yarn.lock uploader/package.json ./
RUN yarn install
-
+COPY uploader .
ENV NODE_ENV=production
RUN yarn run tsc
+# final production image
+FROM node:14.15.4-buster-slim@sha256:cbae886186467bbfd274b82a234a1cdfbbd31201c2a6ee63a6893eefcf3c6e76
+WORKDIR /usr/src
+COPY uploader/yarn.lock uploader/package.json ./
+COPY --from=builder2 /usr/src/dist /usr/src/dist
+ENV NODE_ENV=production
+RUN yarn install --production
+
+USER node
CMD ["yarn", "run", "runprod"]
diff --git a/website/.dockerignore b/website/.dockerignore
new file mode 100644
index 00000000..576c21a2
--- /dev/null
+++ b/website/.dockerignore
@@ -0,0 +1,5 @@
+/dist/
+/node_modules/
+/dist/bundle.js
+/yarn-error.log
+/Dockerfile
+ 
+