Merge pull request #4 from eric2788/develop

新增自動重連機制

Author: eric2788

.github/workflows/node.js.yml

@@ -1,6 +1,6 @@
 name: Build Executable And Publish
 env:
-  version: 0.1.4
+  version: 0.1.5
   artifact_name: vup_monitors
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

Dockerfile

@@ -1,23 +1,12 @@
-FROM node:16 AS builder
+FROM node:16-alpine
 
 WORKDIR /app
 
 COPY ./src ./src
 COPY *.json .
 
 RUN npm install
-RUN npm install pkg -g
-RUN pkg .
 
-FROM ubuntu:latest
+VOLUME [ "/app/data" ]
 
-WORKDIR /
-
-ENV NODE_ENV=production
-
-COPY --from=builder /app/dist/vup_monitors-linux /vup_monitors
-RUN chmod +x /vup_monitors
-
-VOLUME [ "/data" ]
-
-ENTRYPOINT [ "/vup_monitors" ]
+CMD [ "npm", "run", "start" ]

changelog.md

@@ -3,7 +3,7 @@
 
 ### 更新
 
-- 把所有js檔案放入 src folder
-- 更新 readme.md
-- 修复无法读取外部 data/settings.json
-- reduce docker image size
+- 新增 go-cqhttp 自動重連機制。(之前因為沒有重連機制，在 go-cqhttp 重啟之後整個 vup_monitors 程序會失效直到重新啟動。)
+
+- 縮小 Docker Image 佔用空間 (500MB -> 154MB)
+

data/settings.json

@@ -0,0 +1,17 @@
+{
+    "bot": {
+        "http": "http://127.0.0.1:5700",
+        "ws": "ws://127.0.0.1:6700"
+    },
+    "redis": {
+        "host": "127.0.0.1",
+        "port": 6379,
+        "database": 0
+    },
+    "websocket": {
+        "host": "localhost:8080",
+        "use-tls": false
+    },
+    "source": "websocket",
+    "owners": []
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vup_monitors",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "bin": "src/index.js",
   "main": "src/index.js",
   "scripts": {

src/bot/ws.js

@@ -21,11 +21,26 @@ async function connect(){
 }
 
 let ws = undefined
+let callback = (data) => {}
 
 async function startWS(){
   try {
-    const websocket = await connect()
-    ws = websocket
+    ws = await connect()
+    ws.on('close', err => {
+      console.warn(`go-cqhttp WebSocket 意外关闭，重连中...`)
+      startWS()
+    })
+    ws.on('error', err => {
+      console.warn(`连接 go-cqhttp 时出现错误: ${err?.message ?? err}，重连中`)
+      startWS()
+    })
+    ws.on('message', data => {
+      try {
+        callback(JSON.parse(data))
+      } catch (e) {
+        console.error(e)
+      }
+    })
     return ws
   }catch(err){
     console.warn('五秒后重连...')
@@ -34,6 +49,10 @@ async function startWS(){
   }
 }
 
+function setListener(listener){
+  callback = listener
+}
+
 module.exports = {
   startWS,
   send(action, params) {
@@ -43,19 +62,5 @@ module.exports = {
     }
     ws.send(JSON.stringify({ action, params }))
   },
-  async listen(callback) {
-    if (!ws) {
-      //console.warn(`WS 尚未连接，五秒后重试。`)
-      await sleep(5000)
-      await this.listen(callback)
-      return
-    }
-    ws.on('message', data => {
-      try {
-        callback(JSON.parse(data))
-      } catch (e) {
-        console.error(e)
-      }
-    })
-  }
+  setListener
 }

src/index.js

@@ -18,7 +18,7 @@ console.log(`已设置管理员QQ号: ${owners}, 群管和管理员都可使用
 console.log('正在启动 vup monitors...')
 Promise.all([ws.startWS(), messager.connect()])
   .then(() => {
-    ws.listen(data => {
+    ws.setListener(data => {
       if (process.env.NODE_ENV === 'development') {
         console.log(data)
       }