Merge pull request #22 from eric2788/develop

eric2788 · Apr 14, 2022 · 9b4bfe6 · 9b4bfe6
2 parents 44cc6d3 + 624d75e
commit 9b4bfe6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/commands/blive.js b/src/commands/blive.js
@@ -48,16 +48,27 @@ class BLiveTerminate extends CommandExecutor {
     }
 }
 
+
+const roomMap = new Map()
+
 class BLiveListening extends CommandExecutor {
 
     async execute({ send, data }, args) {
         const set = messager.listening()
 
         const displays = []
 
+        await send(`正在刷取监听房间资讯，可能需要几分钟...`)
+
         for (const room of set) {
             try {
-                const res = await messager.getRoomUserName(room)
+                let res;
+                if (roomMap.has(room)) {
+                    res = roomMap.get(room)
+                }else{
+                    res = await messager.getRoomUserName(room)
+                    roomMap.set(room, res)
+                }
                 displays.push(`${room}(${res?.name})`)
             }catch(err){
                 console.error(`獲取房間資訊錯誤: ${err}`)

diff --git a/src/el/api/websocket_api.js b/src/el/api/websocket_api.js
@@ -15,7 +15,7 @@ class WebSocketSouce extends MessageSource {
     constructor(){
         super()
         this.websocketURL = `ws${websocket['use-tls'] ? 's' : ''}://${websocket.host}/ws?id=${IDENTIFIER}`
-        const baseURL = `http${websocket['use-tls'] ? 's' : ''}://${websocket.host}/subscribe`
+        const baseURL = `http${websocket['use-tls'] ? 's' : ''}://${websocket.host}`
         this.api = axios.create({
             baseURL,
             timeout: 5000,
@@ -50,7 +50,7 @@ class WebSocketSouce extends MessageSource {
         const form = new FormData()
         form.append('subscribes', room)
         try {
-            await this.api.put('/add', form, { headers: form.getHeaders() })
+            await this.api.put('/subscribe/add', form, { headers: form.getHeaders() })
         }catch(err){
             throw new Error(err?.response?.data?.error ?? err?.response?.data ?? err)
         }
@@ -61,7 +61,7 @@ class WebSocketSouce extends MessageSource {
         const form = new FormData()
         form.append('subscribes', room)
         try {
-            await this.api.put('/remove', form, { headers: form.getHeaders() })
+            await this.api.put('/subscribe/remove', form, { headers: form.getHeaders() })
         }catch(err){
             throw new Error(err?.response?.data?.error ?? err?.response?.data ?? err)
         }
@@ -75,7 +75,7 @@ class WebSocketSouce extends MessageSource {
         }
         try {
             // 透過調用 ?validate=false 來略過房間訊息檢查以防止412請求頻繁
-            await this.api.post('?validate=false', form, { headers: form.getHeaders() })
+            await this.api.post('/subscribe?validate=false', form, { headers: form.getHeaders() })
         }catch(err){
             throw new Error(err?.response?.data?.error ?? err?.response?.data ?? err)
         }