Upgrading eslint

back/package.json

@@ -68,9 +68,9 @@
     "@types/mkdirp": "^1.0.1",
     "@types/redis": "^2.8.31",
     "@types/uuidv4": "^5.0.0",
-    "@typescript-eslint/eslint-plugin": "^2.26.0",
+    "@typescript-eslint/eslint-plugin": "^5.8.0",
-    "@typescript-eslint/parser": "^2.26.0",
+    "@typescript-eslint/parser": "^5.8.0",
-    "eslint": "^6.8.0",
+    "eslint": "^8.5.0",
     "jasmine": "^3.5.0",
     "lint-staged": "^11.0.0",
     "prettier": "^2.3.1",

back/server.ts

@@ -10,6 +10,6 @@ App.listen(HTTP_PORT, () => console.log(`WorkAdventure HTTP API starting on port
 const server = new grpc.Server();
 server.addService<IRoomManagerServer>(RoomManagerService, roomManager);
 
-server.bind('0.0.0.0:'+GRPC_PORT, grpc.ServerCredentials.createInsecure());
+server.bind(`0.0.0.0:${GRPC_PORT}`, grpc.ServerCredentials.createInsecure());
 server.start();
 console.log('WorkAdventure HTTP/2 API starting on port %d!', GRPC_PORT);

back/src/Controller/DebugController.ts

@@ -36,9 +36,11 @@ export class DebugController {
                                     return "BatchedMessages";
                                 }
                                 if (value instanceof Map) {
-                                    const obj: any = {}; // eslint-disable-line @typescript-eslint/no-explicit-any
+                                    const obj: { [key: string | number]: unknown } = {};
                                     for (const [mapKey, mapValue] of value.entries()) {
-                                        obj[mapKey] = mapValue;
+                                        if (typeof mapKey === "number" || typeof mapKey === "string") {
+                                            obj[mapKey] = mapValue;
+                                        }
                                     }
                                     return obj;
                                 } else if (value instanceof Set) {

back/src/Controller/PrometheusController.ts

@@ -1,12 +1,10 @@
 import { App } from "../Server/sifrr.server";
 import { HttpRequest, HttpResponse } from "uWebSockets.js";
-const register = require("prom-client").register;
+import { register, collectDefaultMetrics } from "prom-client";
-const collectDefaultMetrics = require("prom-client").collectDefaultMetrics;
 
 export class PrometheusController {
     constructor(private App: App) {
         collectDefaultMetrics({
-            timeout: 10000,
             gcDurationBuckets: [0.001, 0.01, 0.1, 1, 2, 5], // These are the default buckets.
         });
 

back/src/Model/GameRoom.ts

@@ -34,6 +34,7 @@ import { ADMIN_API_URL } from "../Enum/EnvironmentVariable";
 import { LocalUrlError } from "../Services/LocalUrlError";
 import { emitErrorOnRoomSocket } from "../Services/MessageHelpers";
 import { VariableError } from "../Services/VariableError";
+import { isRoomRedirect } from "../Services/AdminApi/RoomRedirect";
 
 export type ConnectCallback = (user: User, group: Group) => void;
 export type DisconnectCallback = (user: User, group: Group) => void;
@@ -282,9 +283,7 @@ export class GameRoom {
             this.positionNotifier.leave(group);
             group.destroy();
             if (!this.groups.has(group)) {
-                throw new Error(
+                throw new Error(`Could not find group ${group.getId()} referenced by user ${user.id} in World.`);
-                    "Could not find group " + group.getId() + " referenced by user " + user.id + " in World."
-                );
             }
             this.groups.delete(group);
             //todo: is the group garbage collected?
@@ -485,9 +484,9 @@ export class GameRoom {
         }
 
         const result = await adminApi.fetchMapDetails(roomUrl);
-        if (!isMapDetailsData(result)) {
+        if (isRoomRedirect(result)) {
-            console.error("Unexpected room details received from server", result);
+            console.error("Unexpected room redirect received while querying map details", result);
-            throw new Error("Unexpected room details received from server");
+            throw new Error("Unexpected room redirect received while querying map details");
         }
         return result;
     }

back/src/Model/Group.ts

@@ -116,7 +116,7 @@ export class Group implements Movable {
     leave(user: User): void {
         const success = this.users.delete(user);
         if (success === false) {
-            throw new Error("Could not find user " + user.id + " in the group " + this.id);
+            throw new Error(`Could not find user ${user.id} in the group ${this.id}`);
         }
         user.group = undefined;
 

back/src/Model/Zone.ts

@@ -39,21 +39,13 @@ export class Zone {
         const result = this.things.delete(thing);
         if (!result) {
             if (thing instanceof User) {
-                throw new Error("Could not find user in zone " + thing.id);
+                throw new Error(`Could not find user in zone ${thing.id}`);
             }
             if (thing instanceof Group) {
                 throw new Error(
-                    "Could not find group " +
+                    `Could not find group ${thing.getId()} in zone (${this.x},${this.y}). Position of group: (${
-                        thing.getId() +
+                        thing.getPosition().x
-                        " in zone (" +
+                    },${thing.getPosition().y})`
-                        this.x +
-                        "," +
-                        this.y +
-                        "). Position of group: (" +
-                        thing.getPosition().x +
-                        "," +
-                        thing.getPosition().y +
-                        ")"
                 );
             }
         }

back/src/RoomManager.ts

@@ -166,7 +166,7 @@ const roomManager: IRoomManagerServer = {
         socketManager
             .addZoneListener(call, zoneMessage.getRoomid(), zoneMessage.getX(), zoneMessage.getY())
             .catch((e) => {
-                emitErrorOnZoneSocket(call, e.toString());
+                emitErrorOnZoneSocket(call, e);
             });
 
         call.on("cancelled", () => {
@@ -196,7 +196,7 @@ const roomManager: IRoomManagerServer = {
         const roomMessage = call.request;
 
         socketManager.addRoomListener(call, roomMessage.getRoomid()).catch((e) => {
-            emitErrorOnRoomSocket(call, e.toString());
+            emitErrorOnRoomSocket(call, e);
         });
 
         call.on("cancelled", () => {

back/src/Server/server/baseapp.ts

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 import { Readable } from "stream";
 import { us_listen_socket_close, TemplatedApp, HttpResponse, HttpRequest } from "uWebSockets.js";
 

back/src/Server/server/formdata.ts

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 import { createWriteStream } from "fs";
 import { join, dirname } from "path";
 import Busboy from "busboy";

back/src/Server/server/utils.ts

@@ -1,3 +1,5 @@
+/* eslint-disable */
+
 import { ReadStream } from "fs";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

back/src/Services/AdminApi.ts

@@ -1,7 +1,7 @@
 import { ADMIN_API_TOKEN, ADMIN_API_URL } from "../Enum/EnvironmentVariable";
 import Axios from "axios";
-import { MapDetailsData } from "./AdminApi/MapDetailsData";
+import { isMapDetailsData, MapDetailsData } from "./AdminApi/MapDetailsData";
-import { RoomRedirect } from "./AdminApi/RoomRedirect";
+import { isRoomRedirect, RoomRedirect } from "./AdminApi/RoomRedirect";
 
 class AdminApi {
     async fetchMapDetails(playUri: string): Promise<MapDetailsData | RoomRedirect> {
@@ -17,6 +17,12 @@ class AdminApi {
             headers: { Authorization: `${ADMIN_API_TOKEN}` },
             params,
         });
+
+        if (!isMapDetailsData(res.data) && !isRoomRedirect(res.data)) {
+            console.error("Unexpected answer from the /api/map admin endpoint.", res.data);
+            throw new Error("Unexpected answer from the /api/map admin endpoint.");
+        }
+
         return res.data;
     }
 }

back/src/Services/ClientEventsEmitter.ts

@@ -1,4 +1,4 @@
-const EventEmitter = require("events");
+import { EventEmitter } from "events";
 
 const clientJoinEvent = "clientJoin";
 const clientLeaveEvent = "clientLeave";

back/src/Services/MapFetcher.ts

@@ -32,7 +32,7 @@ class MapFetcher {
             //throw new Error("Invalid map format for map " + mapUrl);
             console.error("Invalid map format for map " + mapUrl);
         }
-
+        /* eslint-disable-next-line @typescript-eslint/no-unsafe-return */
         return res.data;
     }
 

back/src/Services/MessageHelpers.ts

@@ -10,15 +10,18 @@ import {
 import { UserSocket } from "_Model/User";
 import { RoomSocket, ZoneSocket } from "../RoomManager";
 
-export function emitError(Client: UserSocket, error: unknown): void {
+function getMessageFromError(error: unknown): string {
-    let message = "";
     if (error instanceof Error) {
-        message = error.message;
+        return error.message;
     } else if (typeof error === "string") {
-        message = error;
+        return error;
     } else {
-        message = "Unknown error";
+        return "Unknown error";
     }
+}
+
+export function emitError(Client: UserSocket, error: unknown): void {
+    const message = getMessageFromError(error);
 
     const errorMessage = new ErrorMessage();
     errorMessage.setMessage(message);
@@ -32,8 +35,9 @@ export function emitError(Client: UserSocket, error: unknown): void {
     console.warn(message);
 }
 
-export function emitErrorOnRoomSocket(Client: RoomSocket, message: string): void {
+export function emitErrorOnRoomSocket(Client: RoomSocket, error: unknown): void {
-    console.error(message);
+    console.error(error);
+    const message = getMessageFromError(error);
 
     const errorMessage = new ErrorMessage();
     errorMessage.setMessage(message);
@@ -50,8 +54,9 @@ export function emitErrorOnRoomSocket(Client: RoomSocket, message: string): void
     console.warn(message);
 }
 
-export function emitErrorOnZoneSocket(Client: ZoneSocket, message: string): void {
+export function emitErrorOnZoneSocket(Client: ZoneSocket, error: unknown): void {
-    console.error(message);
+    console.error(error);
+    const message = getMessageFromError(error);
 
     const errorMessage = new ErrorMessage();
     errorMessage.setMessage(message);

back/src/Services/SocketManager.ts

@@ -197,7 +197,7 @@ export class SocketManager {
         webrtcSignalToClient.setSignal(data.getSignal());
         // TODO: only compute credentials if data.signal.type === "offer"
         if (TURN_STATIC_AUTH_SECRET !== "") {
-            const { username, password } = this.getTURNCredentials("" + user.id, TURN_STATIC_AUTH_SECRET);
+            const { username, password } = this.getTURNCredentials(user.id.toString(), TURN_STATIC_AUTH_SECRET);
             webrtcSignalToClient.setWebrtcusername(username);
             webrtcSignalToClient.setWebrtcpassword(password);
         }
@@ -227,7 +227,7 @@ export class SocketManager {
         webrtcSignalToClient.setSignal(data.getSignal());
         // TODO: only compute credentials if data.signal.type === "offer"
         if (TURN_STATIC_AUTH_SECRET !== "") {
-            const { username, password } = this.getTURNCredentials("" + user.id, TURN_STATIC_AUTH_SECRET);
+            const { username, password } = this.getTURNCredentials(user.id.toString(), TURN_STATIC_AUTH_SECRET);
             webrtcSignalToClient.setWebrtcusername(username);
             webrtcSignalToClient.setWebrtcpassword(password);
         }
@@ -310,7 +310,7 @@ export class SocketManager {
         if (thing instanceof User) {
             const userJoinedZoneMessage = new UserJoinedZoneMessage();
             if (!Number.isInteger(thing.id)) {
-                throw new Error("clientUser.userId is not an integer " + thing.id);
+                throw new Error(`clientUser.userId is not an integer ${thing.id}`);
             }
             userJoinedZoneMessage.setUserid(thing.id);
             userJoinedZoneMessage.setUseruuid(thing.uuid);
@@ -446,7 +446,10 @@ export class SocketManager {
             webrtcStartMessage1.setUserid(otherUser.id);
             webrtcStartMessage1.setInitiator(true);
             if (TURN_STATIC_AUTH_SECRET !== "") {
-                const { username, password } = this.getTURNCredentials("" + otherUser.id, TURN_STATIC_AUTH_SECRET);
+                const { username, password } = this.getTURNCredentials(
+                    otherUser.id.toString(),
+                    TURN_STATIC_AUTH_SECRET
+                );
                 webrtcStartMessage1.setWebrtcusername(username);
                 webrtcStartMessage1.setWebrtcpassword(password);
             }
@@ -460,7 +463,7 @@ export class SocketManager {
             webrtcStartMessage2.setUserid(user.id);
             webrtcStartMessage2.setInitiator(false);
             if (TURN_STATIC_AUTH_SECRET !== "") {
-                const { username, password } = this.getTURNCredentials("" + user.id, TURN_STATIC_AUTH_SECRET);
+                const { username, password } = this.getTURNCredentials(user.id.toString(), TURN_STATIC_AUTH_SECRET);
                 webrtcStartMessage2.setWebrtcusername(username);
                 webrtcStartMessage2.setWebrtcpassword(password);
             }
@@ -484,7 +487,7 @@ export class SocketManager {
         hmac.setEncoding("base64");
         hmac.write(username);
         hmac.end();
-        const password = hmac.read();
+        const password = hmac.read() as string;
         return {
             username: username,
             password: password,

back/src/Services/VariablesManager.ts

@@ -101,11 +101,11 @@ export class VariablesManager {
                     }
 
                     // We store a copy of the object (to make it immutable)
-                    objects.set(object.name, this.iTiledObjectToVariable(object));
+                    objects.set(object.name as string, this.iTiledObjectToVariable(object));
                 }
             }
         } else if (layer.type === "group") {
-            for (const innerLayer of layer.layers) {
+            for (const innerLayer of layer.layers as ITiledMapLayer[]) {
                 this.recursiveFindVariablesInLayer(innerLayer, objects);
             }
         }
@@ -116,7 +116,7 @@ export class VariablesManager {
 
         if (object.properties) {
             for (const property of object.properties) {
-                const value = property.value;
+                const value = property.value as unknown;
                 switch (property.name) {
                     case "default":
                         variable.defaultValue = JSON.stringify(value);

pusher/src/Controller/PrometheusController.ts

@@ -1,12 +1,10 @@
 import { App } from "../Server/sifrr.server";
 import { HttpRequest, HttpResponse } from "uWebSockets.js";
-const register = require("prom-client").register;
+import { register, collectDefaultMetrics } from "prom-client";
-const collectDefaultMetrics = require("prom-client").collectDefaultMetrics;
 
 export class PrometheusController {
     constructor(private App: App) {
         collectDefaultMetrics({
-            timeout: 10000,
             gcDurationBuckets: [0.001, 0.01, 0.1, 1, 2, 5], // These are the default buckets.
         });
 

pusher/src/Services/ClientEventsEmitter.ts

@@ -1,4 +1,4 @@
-const EventEmitter = require("events");
+import { EventEmitter } from "events";
 
 const clientJoinEvent = "clientJoin";
 const clientLeaveEvent = "clientLeave";