Cleanup

back/src/Controller/AdminController.ts

@@ -1,24 +1,26 @@
-import {Application, Request, Response} from "express";
 import {OK} from "http-status-codes";
 import {ADMIN_API_TOKEN, ADMIN_API_URL} from "../Enum/EnvironmentVariable";
 import Axios from "axios";
+import {HttpRequest, HttpResponse} from "uWebSockets.js";
+import {parse} from "query-string";
+import {App} from "../Server/sifrr.server";
 
 export class AdminController {
-    App : Application;
-
-    constructor(App : Application) {
-        this.App = App;
+    constructor(private App : App) {
         this.getLoginUrlByToken();
     }
 
-    
+
     getLoginUrlByToken(){
-        this.App.get("/register/:token", async (req: Request, res: Response) => {
+        this.App.get("/register/:token", async (res: HttpResponse, req: HttpRequest) => {
             if (!ADMIN_API_URL) {
-                return res.status(500).send('No admin backoffice set!');
+                return res.writeStatus("500 Internal Server Error").end('No admin backoffice set!');
             }
-            const token:string = req.params.token;
-            
+
+            const query = parse(req.getQuery());
+
+            const token:string = query.token as string;
+
             let response = null
             try {
                 response = await Axios.get(ADMIN_API_URL+'/api/login-url/'+token, { headers: {"Authorization" : `${ADMIN_API_TOKEN}`} })
@@ -30,7 +32,7 @@ export class AdminController {
             const organizationSlug = response.data.organizationSlug;
             const worldSlug = response.data.worldSlug;
             const roomSlug = response.data.roomSlug;
-            return res.status(OK).send({organizationSlug, worldSlug, roomSlug});
+            return res.writeStatus("200 OK").end(JSON.stringify({organizationSlug, worldSlug, roomSlug}));
         });
     }
 }

back/src/Controller/AuthenticateController.ts

@@ -1,6 +1,4 @@
-import {Application, Request, Response} from "express";
 import Jwt from "jsonwebtoken";
-import {BAD_REQUEST, OK} from "http-status-codes";
 import {SECRET_KEY, URL_ROOM_STARTED} from "../Enum/EnvironmentVariable"; //TODO fix import by "_Enum/..."
 import { uuid } from 'uuidv4';
 import {HttpRequest, HttpResponse, TemplatedApp} from "uWebSockets.js";

back/src/Controller/DebugController.ts

@@ -1,22 +1,25 @@
-import {Application, Request, Response} from "express";
-import {OK} from "http-status-codes";
 import {ADMIN_API_TOKEN} from "../Enum/EnvironmentVariable";
 import {IoSocketController} from "_Controller/IoSocketController";
 import {stringify} from "circular-json";
+import {HttpRequest, HttpResponse} from "uWebSockets.js";
+import { parse } from 'query-string';
+import {App} from "../Server/sifrr.server";
 
 export class DebugController {
-    constructor(private App : Application, private ioSocketController: IoSocketController) {
+    constructor(private App : App, private ioSocketController: IoSocketController) {
         this.getDump();
     }
 
 
     getDump(){
-        this.App.get("/dump", (req: Request, res: Response) => {
-            if (req.query.token !== ADMIN_API_TOKEN) {
+        this.App.get("/dump", (res: HttpResponse, req: HttpRequest) => {
+            const query = parse(req.getQuery());
+
+            if (query.token !== ADMIN_API_TOKEN) {
                 return res.status(401).send('Invalid token sent!');
             }
 
-            return res.status(OK).contentType('application/json').send(stringify(
+            return res.writeStatus('200 OK').writeHeader('Content-Type', 'application/json').end(stringify(
                 this.ioSocketController.getWorlds(),
                 (key: unknown, value: unknown) => {
                     if(value instanceof Map) {

back/src/Controller/IoSocketController.ts

@@ -121,7 +121,7 @@ export class IoSocketController {
      *
      * @param token
      */
-    searchClientByToken(token: string): ExSocketInterface | null {
+/*    searchClientByToken(token: string): ExSocketInterface | null {
         const clients: ExSocketInterface[] = Object.values(this.Io.sockets.sockets) as ExSocketInterface[];
         for (let i = 0; i < clients.length; i++) {
             const client = clients[i];
@@ -131,7 +131,7 @@ export class IoSocketController {
             return client;
         }
         return null;
-    }
+    }*/
 
     private authenticate(ws: WebSocket) {
         //console.log(socket.handshake.query.token);
@@ -657,25 +657,23 @@ export class IoSocketController {
         //socket.emit(SocketIoEvent.GROUP_CREATE_UPDATE, groupUpdateMessage.serializeBinary().buffer);
     }
 
-    private emitDeleteGroupEvent(socket: Socket, groupId: number): void {
+    private emitDeleteGroupEvent(client: ExSocketInterface, groupId: number): void {
         const groupDeleteMessage = new GroupDeleteMessage();
         groupDeleteMessage.setGroupid(groupId);
 
         const subMessage = new SubMessage();
         subMessage.setGroupdeletemessage(groupDeleteMessage);
 
-        const client : ExSocketInterface = socket as ExSocketInterface;
         emitInBatch(client, subMessage);
     }
 
-    private emitUserLeftEvent(socket: Socket, userId: number): void {
+    private emitUserLeftEvent(client: ExSocketInterface, userId: number): void {
         const userLeftMessage = new UserLeftMessage();
         userLeftMessage.setUserid(userId);
 
         const subMessage = new SubMessage();
         subMessage.setUserleftmessage(userLeftMessage);
 
-        const client : ExSocketInterface = socket as ExSocketInterface;
         emitInBatch(client, subMessage);
     }