Merge pull request #356 from thecodingmachine/develop

Release 2020-10-21

back/package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "tsc": "tsc",
     "dev": "ts-node-dev --respawn ./server.ts",
-    "prod": "tsc && node ./dist/server.js",
+    "prod": "tsc && node --max-old-space-size=4096 ./dist/server.js",
     "profile": "tsc && node --prof ./dist/server.js",
     "test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json",
     "lint": "node_modules/.bin/eslint src/ . --ext .ts",

back/src/Model/Group.ts

@@ -117,4 +117,8 @@ export class Group implements Movable {
             this.leave(user);
         }
     }
+
+    get getSize(){
+        return this.users.size;
+    }
 }

back/src/Services/SocketManager.ts

@@ -130,6 +130,7 @@ export class SocketManager {
                     userJoinedMessage.setPosition(ProtobufUtils.toPositionMessage(player.position));
 
                     roomJoinedMessage.addUser(userJoinedMessage);
+                    roomJoinedMessage.setTagList(client.tags);
                 } else if (thing instanceof Group) {
                     const groupUpdateMessage = new GroupUpdateMessage();
                     groupUpdateMessage.setGroupid(thing.getId());
@@ -493,6 +494,7 @@ export class SocketManager {
         const groupUpdateMessage = new GroupUpdateMessage();
         groupUpdateMessage.setGroupid(group.getId());
         groupUpdateMessage.setPosition(pointMessage);
+        groupUpdateMessage.setGroupsize(group.getSize);
 
         const subMessage = new SubMessage();
         subMessage.setGroupupdatemessage(groupUpdateMessage);

benchmark/index.ts

@@ -2,6 +2,7 @@ import {RoomConnection} from "../front/src/Connexion/RoomConnection";
 import {connectionManager} from "../front/src/Connexion/ConnectionManager";
 import * as WebSocket from "ws"
 
+
 function sleep(ms) {
     return new Promise(resolve => setTimeout(resolve, ms));
 }
@@ -11,15 +12,18 @@ RoomConnection.setWebsocketFactory((url: string) => {
 });
 
 async function startOneUser(): Promise<void> {
-    const connection = await connectionManager.connectToRoomSocket();
+    await connectionManager.anonymousLogin(true);
-    connection.emitPlayerDetailsMessage('foo', ['male3']);
+    const connection = await connectionManager.connectToRoomSocket(process.env.ROOM_ID ? process.env.ROOM_ID : '_/global/maps.workadventure.localhost/Floor0/floor0.json', 'TEST', ['male3'],
+        {
+            x: 783,
+            y: 170
+        }, {
+            top: 0,
+            bottom: 200,
+            left: 500,
+            right: 800
+        });
 
-    await connection.joinARoom('global__maps.workadventure.localhost/Floor0/floor0', 783, 170, 'down', true, {
-        top: 0,
-        bottom: 200,
-        left: 500,
-        right: 800
-    });
     console.log(connection.getUserId());
 
     let angle = Math.random() * Math.PI * 2;

front/src/Connexion/ConnectionManager.ts

@@ -76,10 +76,12 @@ class ConnectionManager {
         await Axios.get(`${API_URL}/verify`, {params: {token}});
     }
 
-    private async anonymousLogin(): Promise<void> {
+    public async anonymousLogin(isBenchmark: boolean = false): Promise<void> {
         const data = await Axios.post(`${API_URL}/anonymLogin`).then(res => res.data);
         this.localUser = new LocalUser(data.userUuid, data.authToken, []);
-        localUserStore.saveUser(this.localUser);
+        if (!isBenchmark) { // In benchmark, we don't have a local storage.
+            localUserStore.saveUser(this.localUser);
+        }
     }
 
     public initBenchmark(): void {

front/src/Connexion/ConnexionModels.ts

@@ -73,7 +73,8 @@ export interface PositionInterface {
 
 export interface GroupCreatedUpdatedMessageInterface {
     position: PositionInterface,
-    groupId: number
+    groupId: number,
+    groupSize: number
 }
 
 export interface WebRtcStartMessageInterface {

front/src/Connexion/RoomConnection.ts

@@ -335,7 +335,8 @@ export class RoomConnection implements RoomConnection {
 
         return {
             groupId: message.getGroupid(),
-            position: position.toObject()
+            position: position.toObject(),
+            groupSize: message.getGroupsize()
         }
     }
 

front/src/Enum/EnvironmentVariable.ts

@@ -1,5 +1,5 @@
 const DEBUG_MODE: boolean = process.env.DEBUG_MODE == "true";
-const API_URL = (typeof(window) !== 'undefined' ? window.location.protocol : 'http:') + '//' + (process.env.API_URL || "api.workadventure.localhost");
+const API_URL = (process.env.API_PROTOCOL || (typeof(window) !== 'undefined' ? window.location.protocol : 'http:')) + '//' + (process.env.API_URL || "api.workadventure.localhost");
 const TURN_SERVER: string = process.env.TURN_SERVER || "turn:numb.viagenie.ca";
 const TURN_USER: string = process.env.TURN_USER || 'g.parant@thecodingmachine.com';
 const TURN_PASSWORD: string = process.env.TURN_PASSWORD || 'itcugcOHxle9Acqi$';

front/src/Phaser/Game/GameScene.ts

@@ -109,6 +109,7 @@ export class GameScene extends ResizableScene implements CenterListener {
     startX!: number;
     startY!: number;
     circleTexture!: CanvasTexture;
+    circleRedTexture!: CanvasTexture;
     pendingEvents: Queue<InitUserPositionEventInterface|AddPlayerEventInterface|RemovePlayerEventInterface|UserMovedEventInterface|GroupCreatedUpdatedEventInterface|DeleteGroupEventInterface> = new Queue<InitUserPositionEventInterface|AddPlayerEventInterface|RemovePlayerEventInterface|UserMovedEventInterface|GroupCreatedUpdatedEventInterface|DeleteGroupEventInterface>();
     private initPosition: PositionInterface|null = null;
     private playersPositionInterpolator = new PlayersPositionInterpolator();
@@ -409,11 +410,18 @@ export class GameScene extends ResizableScene implements CenterListener {
         this.initCamera();
 
         // Let's generate the circle for the group delimiter
-        const circleElement = Object.values(this.textures.list).find((object: Texture) => object.key === 'circleSprite');
+        let circleElement = Object.values(this.textures.list).find((object: Texture) => object.key === 'circleSprite-white');
         if (circleElement) {
-            this.textures.remove('circleSprite');
+            this.textures.remove('circleSprite-white');
         }
-        this.circleTexture = this.textures.createCanvas('circleSprite', 96, 96);
+
+        circleElement = Object.values(this.textures.list).find((object: Texture) => object.key === 'circleSprite-red');
+        if (circleElement) {
+            this.textures.remove('circleSprite-red');
+        }
+
+        //create white circle canvas use to create sprite
+        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);
@@ -422,6 +430,16 @@ export class GameScene extends ResizableScene implements CenterListener {
         context.stroke();
         this.circleTexture.refresh();
 
+        //create red circle canvas use to create sprite
+        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.stroke();
+        this.circleRedTexture.refresh();
+
         // Let's pause the scene if the connection is not established yet
         if (this.connection === undefined) {
             // Let's wait 0.5 seconds before printing the "connecting" screen to avoid blinking
@@ -1123,18 +1141,27 @@ export class GameScene extends ResizableScene implements CenterListener {
 
     private doShareGroupPosition(groupPositionMessage: GroupCreatedUpdatedMessageInterface) {
         const groupId = groupPositionMessage.groupId;
+        const groupSize = groupPositionMessage.groupSize;
 
         const group = this.groups.get(groupId);
         if (group !== undefined) {
             group.setPosition(Math.round(groupPositionMessage.position.x), Math.round(groupPositionMessage.position.y));
         } else {
             // TODO: circle radius should not be hard stored
+            const positionX = 48;
+            const positionY = 48;
+
+            let texture = 'circleSprite-red';
+            if(groupSize < 4){
+                texture = 'circleSprite-white';
+            }
             const sprite = new Sprite(
                 this,
                 Math.round(groupPositionMessage.position.x),
                 Math.round(groupPositionMessage.position.y),
-                'circleSprite');
+                texture
-            sprite.setDisplayOrigin(48, 48);
+            );
+            sprite.setDisplayOrigin(positionX, positionY);
             this.add.existing(sprite);
             this.groups.set(groupId, sprite);
         }
@@ -1266,6 +1293,10 @@ export class GameScene extends ResizableScene implements CenterListener {
 
     private loadSpritesheet(name: string, url: string): Promise<void> {
         return new Promise<void>(((resolve, reject) => {
+            if (this.textures.exists(name)) {
+                resolve();
+                return;
+            }
             this.load.spritesheet(
                 name,
                 url,

front/src/WebRtc/ScreenSharingPeer.ts

@@ -13,6 +13,8 @@ export class ScreenSharingPeer extends Peer {
      * Whether this connection is currently receiving a video stream from a remote user.
      */
     private isReceivingStream:boolean = false;
+    public toClose: boolean = false;
+    public _connected: boolean = false;
 
     constructor(private userId: number, initiator: boolean, private connection: RoomConnection) {
         super({
@@ -42,6 +44,8 @@ export class ScreenSharingPeer extends Peer {
         });
 
         this.on('close', () => {
+            this._connected = false;
+            this.toClose = true;
             this.destroy();
         });
 
@@ -62,11 +66,16 @@ export class ScreenSharingPeer extends Peer {
         });
 
         this.on('connect', () => {
+            this._connected = true;
             // FIXME: we need to put the loader on the screen sharing connection
             mediaManager.isConnected("" + this.userId);
             console.info(`connect => ${this.userId}`);
         });
 
+        this.once('finish', () => {
+            this._onFinish();
+        });
+
         this.pushScreenSharingToRemoteUser();
     }
 
@@ -100,6 +109,10 @@ export class ScreenSharingPeer extends Peer {
 
     public destroy(error?: Error): void {
         try {
+            this._connected = false
+            if(!this.toClose){
+                return;
+            }
             mediaManager.removeActiveScreenSharingVideo("" + 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.
@@ -111,6 +124,18 @@ export class ScreenSharingPeer extends Peer {
         }
     }
 
+    _onFinish () {
+        if (this.destroyed) return
+        const destroySoon = () => {
+            this.destroy();
+        }
+        if (this._connected) {
+            destroySoon();
+        } else {
+            this.once('connect', destroySoon);
+        }
+    }
+
     private pushScreenSharingToRemoteUser() {
         const localScreenCapture: MediaStream | null = mediaManager.localScreenCapture;
         if(!localScreenCapture){

front/src/WebRtc/SimplePeer.ts

@@ -108,44 +108,30 @@ export class SimplePeer {
         this.createPeerConnection(user);
     }
 
-    /**
-     * server has two people connected, start the meet
-     */
-    private startWebRtc() {
-        console.warn('startWebRtc startWebRtc');
-        this.Users.forEach((user: UserSimplePeerInterface) => {
-            //if it's not an initiator, peer connection will be created when gamer will receive offer signal
-            if(!user.initiator){
-                return;
-            }
-            this.createPeerConnection(user);
-        });
-    }
-
     /**
      * create peer connection to bind users
      */
-    private createPeerConnection(user : UserSimplePeerInterface) : VideoPeer | null{
+    private createPeerConnection(user : UserSimplePeerInterface) : VideoPeer | null {
         const peerConnection = this.PeerConnectionArray.get(user.userId)
-        if(peerConnection){
+        if (peerConnection) {
-            if(peerConnection.destroyed){
+            if (peerConnection.destroyed) {
                 peerConnection.toClose = true;
                 peerConnection.destroy();
                 const peerConnexionDeleted = this.PeerConnectionArray.delete(user.userId);
-                if(!peerConnexionDeleted){
+                if (!peerConnexionDeleted) {
                     throw 'Error to delete peer connection';
                 }
                 this.createPeerConnection(user);
-            }else {
+            } else {
                 peerConnection.toClose = false;
             }
             return null;
         }
 
         let name = user.name;
-        if(!name){
+        if (!name) {
             const userSearch = this.Users.find((userSearch: UserSimplePeerInterface) => userSearch.userId === user.userId);
-            if(userSearch) {
+            if (userSearch) {
                 name = userSearch.name;
             }
         }
@@ -153,8 +139,8 @@ export class SimplePeer {
         mediaManager.removeActiveVideo("" + user.userId);
 
         const reportCallback = this.enableReporting ? (comment: string) => {
-                this.reportUser(user.userId, comment);
+            this.reportUser(user.userId, comment);
-            }: undefined;
+        } : undefined;
 
         mediaManager.addActiveVideo("" + user.userId, reportCallback, name);
 
@@ -179,9 +165,19 @@ export class SimplePeer {
      * create peer connection to bind users
      */
     private createPeerScreenSharingConnection(user : UserSimplePeerInterface) : ScreenSharingPeer | null{
-        if(
+        const peerConnection = this.PeerScreenSharingConnectionArray.get(user.userId);
-            this.PeerScreenSharingConnectionArray.has(user.userId)
+        if(peerConnection){
-        ){
+            if(peerConnection.destroyed){
+                peerConnection.toClose = true;
+                peerConnection.destroy();
+                const peerConnexionDeleted = this.PeerScreenSharingConnectionArray.delete(user.userId);
+                if(!peerConnexionDeleted){
+                    throw 'Error to delete peer connection';
+                }
+                this.createPeerConnection(user);
+            }else {
+                peerConnection.toClose = false;
+            }
             return null;
         }
 

front/src/WebRtc/VideoPeer.ts

@@ -39,13 +39,13 @@ export class VideoPeer extends Peer {
                         urls: 'stun:stun.l.google.com:19302'
                     },
                     {
-                        urls: TURN_SERVER,
+                        urls: TURN_SERVER.split(','),
                         username: TURN_USER,
                         credential: TURN_PASSWORD
                     },
                 ]
             }
-        })
+        });
 
         //start listen signal for the peer connection
         this.on('signal', (data: unknown) => {

messages/messages.proto

@@ -125,6 +125,7 @@ message BatchMessage {
 message GroupUpdateMessage {
   int32 groupId = 1;
   PointMessage position = 2;
+  int32 groupSize = 3;
 }
 
 message GroupDeleteMessage {