Merge branch 'develop' of github.com:thecodingmachine/workadventure

back/.eslintrc.json

@@ -25,6 +25,7 @@
     ],
     "rules": {
         "no-unused-vars": "off",
-        "@typescript-eslint/no-explicit-any": "error"
+        "@typescript-eslint/no-explicit-any": "error",
+        "no-throw-literal": "error"
     }
 }

front/.eslintrc.js

@@ -34,6 +34,7 @@ module.exports = {
     "rules": {
         "no-unused-vars": "off",
         "@typescript-eslint/no-explicit-any": "error",
+        "no-throw-literal": "error",
         // TODO: remove those ignored rules and write a stronger code!
         "@typescript-eslint/no-unsafe-call": "off",
         "@typescript-eslint/restrict-plus-operands": "off",

front/dist/.htaccess

@@ -20,7 +20,7 @@ RewriteBase /
 # We only want to let Apache serve files and not directories.
 # Rewrite all other queries starting with _ to index.ts.
 RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule "^[_@]/" "/index.html" [L]
+RewriteRule "^[_@*]/" "/index.html" [L]
 RewriteRule "^register/" "/index.html" [L]
 RewriteRule "^login" "/index.html" [L]
 RewriteRule "^jwt" "/index.html" [L]

front/src/Components/Menu/AudioGlobalMessage.svelte

@@ -26,7 +26,7 @@
             const selectedFile = inputAudio.files ? inputAudio.files[0] : null;
             if (!selectedFile) {
                 errorFile = true;
-                throw "no file selected";
+                throw new Error("no file selected");
             }
 
             const fd = new FormData();

front/src/Components/Menu/Menu.svelte

@@ -80,7 +80,7 @@
                     break;
                 }
             }
-        } else throw "There is no menu called " + menu;
+        } else throw new Error("There is no menu called " + menu);
     }
 
     function closeMenu() {

front/src/Connexion/ConnectionManager.ts

@@ -107,10 +107,10 @@ class ConnectionManager {
                 const code = urlParams.get("code");
                 const state = urlParams.get("state");
                 if (!state || !localUserStore.verifyState(state)) {
-                    throw "Could not validate state!";
+                    throw new Error("Could not validate state!");
                 }
                 if (!code) {
-                    throw "No Auth code provided";
+                    throw new Error("No Auth code provided");
                 }
                 localUserStore.setCode(code);
             }
@@ -337,10 +337,10 @@ class ConnectionManager {
 
         if (!token) {
             if (!state || !localUserStore.verifyState(state)) {
-                throw "Could not validate state!";
+                throw new Error("Could not validate state!");
             }
             if (!code) {
-                throw "No Auth code provided";
+                throw new Error("No Auth code provided");
             }
         }
         const { authToken, userUuid, textures, email, username } = await Axios.get(`${PUSHER_URL}/login-callback`, {

front/src/Connexion/RoomConnection.ts

@@ -691,7 +691,7 @@ export class RoomConnection implements RoomConnection {
     }
 
     public getUserId(): number {
-        if (this.userId === null) throw "UserId cannot be null!";
+        if (this.userId === null) throw new Error("UserId cannot be null!");
         return this.userId;
     }
 

front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts

@@ -90,7 +90,7 @@ export const getRessourceDescriptor = (
         const playerResource = LAYERS[i][textureName];
         if (playerResource !== undefined) return playerResource;
     }
-    throw "Could not find a data for texture " + textureName;
+    throw new Error("Could not find a data for texture " + textureName);
 };
 
 export const createLoadingPromise = (

front/src/Phaser/Game/GameManager.ts

@@ -66,7 +66,7 @@ export class GameManager {
 
     getCharacterLayers(): string[] {
         if (!this.characterLayers) {
-            throw "characterLayers are not set";
+            throw new Error("characterLayers are not set");
         }
         return this.characterLayers;
     }
@@ -119,7 +119,7 @@ export class GameManager {
      * This will close the socket connections and stop the gameScene, but won't remove it.
      */
     leaveGame(targetSceneName: string, sceneClass: Phaser.Scene): void {
-        if (this.currentGameSceneName === null) throw "No current scene id set!";
+        if (this.currentGameSceneName === null) throw new Error("No current scene id set!");
         const gameScene: GameScene = this.scenePlugin.get(this.currentGameSceneName) as GameScene;
         gameScene.cleanupClosingScene();
         gameScene.createSuccessorGameScene(false, false);
@@ -143,7 +143,7 @@ export class GameManager {
     }
 
     public getCurrentGameScene(): GameScene {
-        if (this.currentGameSceneName === null) throw "No current scene id set!";
+        if (this.currentGameSceneName === null) throw new Error("No current scene id set!");
         return this.scenePlugin.get(this.currentGameSceneName) as GameScene;
     }
 

front/src/Phaser/Game/GameScene.ts

@@ -459,7 +459,7 @@ export class GameScene extends DirtyScene {
 
         const playerName = gameManager.getPlayerName();
         if (!playerName) {
-            throw "playerName is not set";
+            throw new Error("playerName is not set");
         }
         this.playerName = playerName;
         this.characterLayers = gameManager.getCharacterLayers();

front/src/Phaser/Login/CustomizeScene.ts

@@ -48,7 +48,7 @@ export class CustomizeScene extends AbstractCharacterScene {
                         bodyResourceDescription.level < 0 ||
                         bodyResourceDescription.level > 5
                     ) {
-                        throw "Texture level is null";
+                        throw new Error("Texture level is null");
                     }
                     this.layers[bodyResourceDescription.level].unshift(bodyResourceDescription);
                 });

front/src/Stores/ChatStore.ts

@@ -26,7 +26,7 @@ export interface ChatMessage {
 function getAuthor(authorId: number): PlayerInterface {
     const author = playersStore.getPlayerById(authorId);
     if (!author) {
-        throw "Could not find data for author " + authorId;
+        throw new Error("Could not find data for author " + authorId);
     }
     return author;
 }

front/src/WebRtc/CoWebsiteManager.ts

@@ -610,17 +610,16 @@ class CoWebsiteManager {
         }
     }
 
-    public closeCoWebsites(): Promise<void> {
-        this.currentOperationPromise = this.currentOperationPromise.then(() => {
-            const promises: Promise<void>[] = [];
-            this.coWebsites.forEach((coWebsite: CoWebsite) => {
-                promises.push(this.closeCoWebsite(coWebsite));
-            });
-            return Promise.all(promises).then(() => {
-                return;
-            });
+    public async closeCoWebsites(): Promise<void> {
+        await this.currentOperationPromise;
+
+        const promises: Promise<void>[] = [];
+        this.coWebsites.forEach((coWebsite: CoWebsite) => {
+            promises.push(this.closeCoWebsite(coWebsite));
         });
-        return this.currentOperationPromise;
+        await Promise.all(promises);
+        // TODO: this.currentOperationPromise does not point any more on the last promise
+        return;
     }
 
     public getGameSize(): { width: number; height: number } {

front/src/WebRtc/ColorGenerator.ts

@@ -62,7 +62,7 @@ function hsv_to_rgb(hue: number, saturation: number, brightness: number): { r: n
             b = q;
             break;
         default:
-            throw "h_i cannot be " + h_i;
+            throw new Error("h_i cannot be " + h_i);
     }
     return {
         r,

front/src/WebRtc/DeviceUtils.ts

@@ -22,7 +22,7 @@ export function getNavigatorType(): NavigatorType {
     } else if (window.navigator.userAgent.includes("Safari")) {
         return NavigatorType.safari;
     }
-    throw "Couldn't detect navigator type";
+    throw new Error("Couldn't detect navigator type");
 }
 export function isAndroid(): boolean {
     return window.navigator.userAgent.includes("Android");

front/src/WebRtc/SimplePeer.ts

@@ -123,7 +123,7 @@ export class SimplePeer {
                 peerConnection.destroy();
                 const peerConnexionDeleted = this.PeerConnectionArray.delete(user.userId);
                 if (!peerConnexionDeleted) {
-                    throw "Error to delete peer connection";
+                    throw new Error("Error to delete peer connection");
                 }
                 //return this.createPeerConnection(user, localStream);
             } else {
@@ -177,7 +177,7 @@ export class SimplePeer {
                 peerConnection.destroy();
                 const peerConnexionDeleted = this.PeerScreenSharingConnectionArray.delete(user.userId);
                 if (!peerConnexionDeleted) {
-                    throw "Error to delete peer connection";
+                    throw new Error("Error to delete peer connection");
                 }
                 this.createPeerConnection(user);
             } else {
@@ -229,7 +229,7 @@ export class SimplePeer {
 
             const userIndex = this.Users.findIndex((user) => user.userId === userId);
             if (userIndex < 0) {
-                throw "Couldn't delete user";
+                throw new Error("Couldn't delete user");
             } else {
                 this.Users.splice(userIndex, 1);
             }

pusher/.eslintrc.json

@@ -25,6 +25,7 @@
     ],
     "rules": {
         "no-unused-vars": "off",
-        "@typescript-eslint/no-explicit-any": "error"
+        "@typescript-eslint/no-explicit-any": "error",
+        "no-throw-literal": "error"
     }
 }

pusher/src/Controller/AdminController.ts

@@ -39,7 +39,7 @@ export class AdminController extends BaseController {
 
             try {
                 if (typeof body.roomId !== "string") {
-                    throw "Incorrect roomId parameter";
+                    throw new Error("Incorrect roomId parameter");
                 }
                 const roomId: string = body.roomId;
 
@@ -86,13 +86,13 @@ export class AdminController extends BaseController {
 
             try {
                 if (typeof body.text !== "string") {
-                    throw "Incorrect text parameter";
+                    throw new Error("Incorrect text parameter");
                 }
                 if (body.type !== "capacity" && body.type !== "message") {
-                    throw "Incorrect type parameter";
+                    throw new Error("Incorrect type parameter");
                 }
                 if (!body.targets || typeof body.targets !== "object") {
-                    throw "Incorrect targets parameter";
+                    throw new Error("Incorrect targets parameter");
                 }
                 const text: string = body.text;
                 const type: string = body.type;

pusher/src/Controller/AuthenticateController.ts

@@ -32,7 +32,7 @@ export class AuthenticateController extends BaseController {
             try {
                 const { nonce, state, playUri, redirect } = parse(req.getQuery());
                 if (!state || !nonce) {
-                    throw "missing state and nonce URL parameters";
+                    throw new Error("missing state and nonce URL parameters");
                 }
 
                 const loginUri = await openIDClient.authorizationUrl(

pusher/src/Controller/OpenIdProfileController.ts

@@ -27,7 +27,7 @@ export class OpenIdProfileController extends BaseController {
             try {
                 const resCheckTokenAuth = await openIDClient.checkTokenAuth(accessToken as string);
                 if (!resCheckTokenAuth.email) {
-                    throw "Email was not found";
+                    throw new Error("Email was not found");
                 }
                 res.end(
                     this.buildHtml(

pusher/src/Services/SocketManager.ts

@@ -680,7 +680,7 @@ export class SocketManager implements ZoneEventListener {
         playGlobalMessageEvent: PlayGlobalMessage
     ): Promise<void> {
         if (!client.tags.includes("admin")) {
-            throw "Client is not an admin!";
+            throw new Error("Client is not an admin!");
         }
 
         const clientRoomUrl = client.roomId;