From d54111ce948b381b810ce1860c88b424b9759133 Mon Sep 17 00:00:00 2001
From: linyuchen <lin.yu.chen@hotmail.com>
Date: Fri, 16 Feb 2024 22:48:43 +0800
Subject: [PATCH] fix: ws url token parse

---
 manifest.json          | 2 +-
 src/common/data.ts     | 2 +-
 src/common/utils.ts    | 2 +-
 src/onebot11/server.ts | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index 31d8846..bd5ee7f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -4,7 +4,7 @@
     "name": "LLOneBot",
     "slug": "LLOneBot",
     "description": "LiteLoaderQQNT的OneBotApi",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "thumbnail": "./icon.png",
     "authors": [{
         "name": "linyuchen",
diff --git a/src/common/data.ts b/src/common/data.ts
index 2af3461..91163d6 100644
--- a/src/common/data.ts
+++ b/src/common/data.ts
@@ -88,5 +88,5 @@ export function getStrangerByUin(uin: string) {
     }
 }
 
-export const version = "v3.2.0"
+export const version = "v3.2.1"
 export const heartInterval = 15000 // 毫秒
\ No newline at end of file
diff --git a/src/common/utils.ts b/src/common/utils.ts
index 78a52c2..f4e3955 100644
--- a/src/common/utils.ts
+++ b/src/common/utils.ts
@@ -33,7 +33,7 @@ export function log(...msg: any[]) {
         }
         logMsg += msgItem + " ";
     }
-    logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n`
+    logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
     // sendLog(...msg);
     // console.log(msg)
     fs.appendFile(path.join(CONFIG_DIR , `llonebot-${currentDate}.log`), logMsg, (err: any) => {
diff --git a/src/onebot11/server.ts b/src/onebot11/server.ts
index b69aab7..c479501 100644
--- a/src/onebot11/server.ts
+++ b/src/onebot11/server.ts
@@ -103,7 +103,7 @@ export function startWSServer(port: number) {
     }
     wsServer = new websocket.Server({port})
     wsServer.on("connection", (ws, req) => {
-        const url = req.url;
+        const url = req.url.split("?").shift();
         log("received ws connect", url)
         let token: string = ""
         const authHeader = req.headers['authorization'];
@@ -111,7 +111,7 @@ export function startWSServer(port: number) {
             token = authHeader.split("Bearer ").pop()
             log("receive ws header token", token);
         } else {
-            const parsedUrl = urlParse.parse(url, true);
+            const parsedUrl = urlParse.parse(req.url, true);
             const urlToken = parsedUrl.query.access_token;
             if (urlToken) {
                 if (Array.isArray(urlToken)) {