fix bug

takayama-lily · Sep 1, 2021 · b1b61a9 · b1b61a9
1 parent 3417723
commit b1b61a9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -178,6 +178,8 @@ export type MessageElem = TextElem | AtElem | FaceElem | BfaceElem | MfaceElem |
     ImgPttElem | LocationElem | MusicElem | ShareElem | JsonElem | XmlElem |
     AnonymousElem | ReplyElem | NodeElem | ShakeElem | PokeElem | FileElem | VideoElem | MiraiElem;
 
+export type Sendable = string | MessageElem | Iterable<MessageElem | string>
+
 /** 一般文本 */
 export interface TextElem {
     type: "text",
@@ -450,7 +452,7 @@ interface CommonMessageEventData extends CommonEventData {
     message_id: string,
     user_id: number,
     font: string,
-    reply: (message: MessageElem | Iterable<MessageElem> | string, auto_escape?: boolean) => Promise<Ret<{ message_id: string }>>,
+    reply(message: Sendable, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>,
 }
 export interface PrivateMessageEventData extends CommonMessageEventData {
     message_type: "private", //私聊消息
@@ -915,13 +917,13 @@ export class Client extends EventEmitter {
     getGroupMemberInfo(group_id: number, user_id: number, no_cache?: boolean): Promise<Ret<MemberInfo>>;
 
     /** 私聊 */
-    sendPrivateMsg(user_id: number, message: MessageElem | Iterable<MessageElem> | string, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>;
+    sendPrivateMsg(user_id: number, message: Sendable, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>;
     /** 群聊 */
-    sendGroupMsg(group_id: number, message: MessageElem | Iterable<MessageElem> | string, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>;
+    sendGroupMsg(group_id: number, message: Sendable, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>;
     /** 群临时会话，大多数时候可以使用私聊达到同样效果 */
-    sendTempMsg(group_id: number, user_id: number, message: MessageElem | Iterable<MessageElem> | string, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>;
+    sendTempMsg(group_id: number, user_id: number, message: Sendable, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>;
     /** 讨论组 */
-    sendDiscussMsg(discuss_id: number, message: MessageElem | Iterable<MessageElem> | string, auto_escape?: boolean): Promise<Ret>;
+    sendDiscussMsg(discuss_id: number, message: Sendable, auto_escape?: boolean): Promise<Ret>;
     /** 撤回 */
     deleteMsg(message_id: string): Promise<Ret>;
     /** 置消息已读(message_id及之前的消息将全部变为已读) */
@@ -1083,7 +1085,7 @@ export function createClient(uin: number, config?: ConfBot): Client;
  * 生成消息元素的快捷函数
  */
 export namespace segment {
-    /** 普通文本 */
+    /** @deprecated 普通文本 */
     function text(text: string): TextElem;
     /** at */
     function at(qq: number, text?: string, dummy?: boolean): AtElem;
@@ -1137,6 +1139,7 @@ export namespace segment {
  * 生成CQ码字符串的快捷函数
  */
 export namespace cqcode {
+    /** @deprecated */
     function text(text: string): string;
     function at(qq: number, text?: string, dummy?: boolean): string;
     function face(id: number, text?: string): string;

diff --git a/lib/wtlogin/wt.js b/lib/wtlogin/wt.js
@@ -10,6 +10,7 @@ const Ecdh = require("./ecdh");
 const Writer = require("./writer");
 const tlv = require("./tlv");
 const { timestamp, md5, BUF16, BUF0, NOOP } = require("../common");
+const { TimeoutError } = require("../exception");
 
 const BUF_UNKNOWN = Buffer.from([0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00]);
 
@@ -60,7 +61,7 @@ class WtLogin {
             this._decodeLoginResponse(payload);
         } catch (e) {
             this.logger.debug(e.message);
-            if (this.token_flag)
+            if (this.token_flag && (e instanceof TimeoutError === false))
                 await this.deleteToken();
             this.c.emit("internal.network", "服务器繁忙");
         }

diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "oicq",
   "app_name": "oicq",
-  "version": "1.19.6",
-  "app_version": "1.19.6",
+  "version": "1.19.7",
+  "app_version": "1.19.7",
   "upday": "2021/9/1",
   "protocol_version": "v11",
   "description": "QQ protocol!",