Более удобный парсинг post data

Ftrless · Jun 14, 2021 · 65dc26f · 65dc26f
1 parent fec4ba0
commit 65dc26f
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 65 deletions.
diff --git a/src/api/webserver/requests/AbstractRequest.ts b/src/api/webserver/requests/AbstractRequest.ts
@@ -42,4 +42,19 @@ export abstract class AbstractRequest {
     protected isInvalidValue(param: any): boolean {
         return typeof param !== "string" || param.trim().length === 0
     }
+
+    protected getPostData(req: IncomingMessage): Promise<string> {
+        return new Promise((resolve, reject) => {
+            let data = ""
+            req.on("data", (chunk) => {
+                data += chunk
+            })
+            req.on("end", () => {
+                resolve(data)
+            })
+            req.on("error", (error) => {
+                reject(error)
+            })
+        })
+    }
 }
diff --git a/src/api/webserver/requests/authlib/accountsServer/ProfilesRequest.ts b/src/api/webserver/requests/authlib/accountsServer/ProfilesRequest.ts
@@ -28,35 +28,36 @@ export class ProfilesRequest extends AbstractRequest {
     url = /^\/authlib\/profiles\/minecraft$/
 
     async emit(req: IncomingMessage, res: ServerResponse): Promise<void> {
-        let data: any = ""
-        req.on("data", (chunk) => {
-            data += chunk
-        })
-        req.on("end", async () => {
-            data = JsonHelper.fromJSON(data)
-            res.statusCode = 400
-
-            if ("object" !== typeof data || !Array.isArray(data) || data.length === 0) {
-                return res.end()
-            }
-
-            if (data.length >= 10) {
-                res.write(
-                    this.returnError("IllegalArgumentException", "Not more that 10 profile name per call is allowed.")
-                )
-                return res.end()
-            }
-
-            let users
-            try {
-                users = await App.AuthManager.getAuthProvider().profiles(data)
-            } catch (error) {
-                return res.end()
-            }
-
-            res.statusCode = 200
-            res.write(JsonHelper.toJSON(users))
-            res.end()
-        })
+        let data: any = await this.getPostData(req)
+        res.statusCode = 400
+
+        if (data.length === 0) {
+            res.write(this.returnError("Bad Request"))
+            return res.end()
+        }
+
+        data = JsonHelper.fromJSON(data)
+
+        if ("object" !== typeof data || !Array.isArray(data) || data.length === 0) {
+            return res.end()
+        }
+
+        if (data.length >= 10) {
+            res.write(
+                this.returnError("IllegalArgumentException", "Not more that 10 profile name per call is allowed.")
+            )
+            return res.end()
+        }
+
+        let users
+        try {
+            users = await App.AuthManager.getAuthProvider().profiles(data)
+        } catch (error) {
+            return res.end()
+        }
+
+        res.statusCode = 200
+        res.write(JsonHelper.toJSON(users))
+        res.end()
     }
 }
diff --git a/src/api/webserver/requests/authlib/sessionServer/HasJoinedRequest.ts b/src/api/webserver/requests/authlib/sessionServer/HasJoinedRequest.ts
@@ -26,7 +26,7 @@ import { AbstractRequest } from "../../AbstractRequest"
 
 export class HasJoinedRequest extends AbstractRequest {
     method = "GET"
-    url = /^\/authlib\/session\/minecraft\/hasJoined/
+    url = /^\/authlib\/session\/minecraft\/hasJoined$/
 
     async emit(req: IncomingMessage, res: ServerResponse): Promise<void> {
         res.statusCode = 400

diff --git a/src/api/webserver/requests/authlib/sessionServer/JoinRequest.ts b/src/api/webserver/requests/authlib/sessionServer/JoinRequest.ts
@@ -28,42 +28,40 @@ export class JoinRequest extends AbstractRequest {
     method = "POST"
     url = /^\/authlib\/session\/minecraft\/join$/
 
-    emit(req: IncomingMessage, res: ServerResponse): void {
-        let data: any = ""
-        req.on("data", (chunk) => {
-            data += chunk
-        })
-        req.on("end", async () => {
-            data = JsonHelper.fromJSON(data)
-            res.statusCode = 400
+    async emit(req: IncomingMessage, res: ServerResponse): Promise<void> {
+        let data: any = await this.getPostData(req)
+        res.statusCode = 400
 
-            if (
-                this.isInvalidValue(data.accessToken) ||
-                this.isInvalidValue(data.selectedProfile) ||
-                this.isInvalidValue(data.serverId)
-            ) {
-                res.write(this.returnError("Bad Request"))
-                return res.end()
-            }
+        if (data.length === 0) {
+            res.write(this.returnError("Bad Request"))
+            return res.end()
+        }
 
-            try {
-                await App.AuthManager.getAuthProvider().join(
-                    data.accessToken,
-                    UUIDHelper.getWithDashes(data.selectedProfile),
-                    data.serverId
-                )
-            } catch (error) {
-                res.write(
-                    this.returnError(
-                        "ForbiddenOperationException",
-                        "Invalid credentials. Invalid username or password."
-                    )
-                )
-                return res.end()
-            }
+        data = JsonHelper.fromJSON(data)
 
-            res.statusCode = 204
-            res.end()
-        })
+        if (
+            this.isInvalidValue(data.accessToken) ||
+            this.isInvalidValue(data.selectedProfile) ||
+            this.isInvalidValue(data.serverId)
+        ) {
+            res.write(this.returnError("Bad Request"))
+            return res.end()
+        }
+
+        try {
+            await App.AuthManager.getAuthProvider().join(
+                data.accessToken,
+                UUIDHelper.getWithDashes(data.selectedProfile),
+                data.serverId
+            )
+        } catch (error) {
+            res.write(
+                this.returnError("ForbiddenOperationException", "Invalid credentials. Invalid username or password.")
+            )
+            return res.end()
+        }
+
+        res.statusCode = 204
+        res.end()
     }
 }