fix: 🐛 修复登出状态会上报多次logout事件

Author: danni-cool

package.json

@@ -72,7 +72,8 @@
   "pnpm": {
     "patchedDependencies": {
       "[email protected]": "patches/[email protected]",
-      "[email protected]": "patches/[email protected]"
+      "[email protected]": "patches/[email protected]",
+      "[email protected]": "patches/[email protected]"
     }
   }
 }

patches/[email protected]

@@ -0,0 +1,13 @@
+diff --git a/dist/cjs/src/mixins/login-mixin.js b/dist/cjs/src/mixins/login-mixin.js
+index 01c9a9caea23816ebdd36398bb2cd1f4f0e85559..d273c203e0d41262559cc3c85543485b4affb4ea 100644
+--- a/dist/cjs/src/mixins/login-mixin.js
++++ b/dist/cjs/src/mixins/login-mixin.js
+@@ -110,6 +110,8 @@ const loginMixin = (mixinBase) => {
+                 this.__currentUserId = undefined;
+                 resolve();
+             }));
++             // bugfix: 修复wechat4u并未真正登出的问题
++             this.wechat4u?.emit('logout');
+         }
+         /**
+          * @deprecated use `currentUserId` instead. (will be removed in v2.0)

pnpm-lock.yaml

@@ -1,8 +1,6 @@
-const fs = require('fs')
 const { FileBox } = require('file-box')
 const MIME = require('mime')
 const { logger } = require('./log')
-const { memoryCardPath } = require('../config/const')
 /**
  * 下载媒体文件转化为Buffer
  * @param {string} fileUrl
@@ -176,13 +174,13 @@ const sleep = async (ms) => {
 /**
  * 删除登录缓存文件
  */
-const deleteMemoryCard = () => {
-  //@ts-expect-errors 必定是 pathlike
-  if (fs.existsSync(memoryCardPath)) {
-    //@ts-expect-errors 必定是 pathlike
-    fs.unlinkSync(memoryCardPath)
-  }
-}
+// const deleteMemoryCard = () => {
+//   //@ts-expect-errors 必定是 pathlike
+//   if (fs.existsSync(memoryCardPath)) {
+//     //@ts-expect-errors 必定是 pathlike
+//     fs.unlinkSync(memoryCardPath)
+//   }
+// }
 
 module.exports = {
   ...require('./msg.js'),
@@ -196,6 +194,5 @@ module.exports = {
   parseJsonLikeStr,
   tryConvertCnCharToUtf8Char,
   sleep,
-  Defer,
-  deleteMemoryCard
+  Defer
 }

src/utils/index.js

@@ -60,26 +60,17 @@ module.exports = function init() {
           Utils.logger.error('上报login事件给 RECVD_MSG_API 出错', e)
         }
       )
-
-      //TODO: test code
-      // setTimeout(function () {
-      //   bot.logout()
-      // }, 5000)
     })
 
     // 登出事件
     .on('logout', async (user) => {
-      Utils.deleteMemoryCard()
-
       /** bugfix: 重置登录会触发多次logout，但是上报只需要登录成功后登出那一次 */
       if (!botLoginSuccessLastTime) return
 
       botLoginSuccessLastTime = false
 
       Utils.logger.info(chalk.red(`User ${user.toString()} logout`))
 
-      bot.reset()
-
       // 登出时给接收消息api发送特殊文本
       Service.sendMsg2RecvdApi(
         new SystemEvent({ event: 'logout', user })