wx2tg-puppet 2.0.0 → 2.0.2

package/dist/entities/config.entity.d.ts

@@ -4,4 +4,5 @@ export declare class Config {
     wxid: string;
     deviceId: string;
     DeviceName: string;
+    DeviceType: string;
 }

package/dist/entities/config.entity.js

@@ -34,6 +34,10 @@ __decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     __metadata("design:type", String)
 ], Config.prototype, "DeviceName", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    __metadata("design:type", String)
+], Config.prototype, "DeviceType", void 0);
 exports.Config = Config = __decorate([
     (0, typeorm_1.Entity)()
 ], Config);

package/dist/index.d.ts

@@ -32,8 +32,12 @@ export declare class WxBot extends EventEmitter {
     private checkLoginStatus;
     info(): Promise<Contact | null>;
     private clearAllIntervals;
-    loginSuccess(userName: string): Promise<void>;
+    private loginSuccess;
     private logOut;
+    /**
+     * 清空登录信息
+     */
+    clearCache(): Promise<void>;
     login(): Promise<void>;
     start(): Promise<void>;
     static get Contact(): typeof Contact;

package/dist/index.js

@@ -41,6 +41,8 @@ const MessageType_1 = require("./type/MessageType");
 const Friendship_1 = require("./core/Friendship");
 const UserApi_1 = require("./api/UserApi");
 const ContactEntity_1 = require("./entities/ContactEntity");
+const room_service_1 = require("./services/room.service");
+const message_service_1 = require("./services/message.service");
 class WxBot extends events_1.EventEmitter {
     constructor({ baseUrl, databasePath, deviceType = 'ipad' }) {
         super();
@@ -70,6 +72,11 @@ class WxBot extends events_1.EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const config = yield config_service_1.configService.get();
+                if (config && config.DeviceType !== this.deviceType) {
+                    yield this.clearCache();
+                    config.deviceId = "";
+                    config.DeviceName = "";
+                }
                 let response;
                 // 根据 deviceType 调用不同接口
                 switch (this.deviceType) {
@@ -253,6 +260,7 @@ class WxBot extends events_1.EventEmitter {
                 yield config_service_1.configService.save({
                     deviceId: cacheInfo.data.Data.Deviceid_str,
                     DeviceName: cacheInfo.data.Data.DeviceName,
+                    DeviceType: this.deviceType,
                 });
             }
             // 获取详情
@@ -325,7 +333,7 @@ class WxBot extends events_1.EventEmitter {
                             if (!contactE) {
                                 contactE = new ContactEntity_1.ContactEntity();
                             }
-                            contactE.nickName = message._pushContent.split(':')[0].slice(0, -1);
+                            contactE.nickName = msg.PushContent.split(':')[0].slice(0, -1);
                             contactE.userName = message.fromId;
                             contactE.smallHeadImgUrl = 'https://raw.githubusercontent.com/finalpi/wechat2tg/wx2tg-pad/qywx.jpg';
                             contactE.bigHeadImgUrl = 'https://raw.githubusercontent.com/finalpi/wechat2tg/wx2tg-pad/qywx.jpg';
@@ -365,6 +373,22 @@ class WxBot extends events_1.EventEmitter {
             this.emit('logout');
         });
     }
+    /**
+     * 清空登录信息
+     */
+    clearCache() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logOut();
+            const config = yield config_service_1.configService.get();
+            if (config) {
+                const res = yield LoginApi_1.loginApi.LogOut(config.wxid);
+            }
+            config_service_1.configService.delete();
+            room_service_1.roomService.clear();
+            contact_service_1.contactService.clear();
+            message_service_1.messageService.clear();
+        });
+    }
     login() {
         return __awaiter(this, void 0, void 0, function* () {
             this.clearAllIntervals(); // 确保清理所有定时器

package/dist/services/config.service.d.ts

@@ -3,6 +3,7 @@ declare class ConfigService {
     private get repo();
     get(): Promise<Config | null>;
     save(config: Partial<Config>): Promise<Config>;
+    delete(): Promise<void>;
 }
 export declare const configService: ConfigService;
 export {};

package/dist/services/config.service.js

@@ -34,5 +34,13 @@ class ConfigService {
             }
         });
     }
+    delete() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const config = yield this.get();
+            if (config) {
+                yield this.repo.delete(config);
+            }
+        });
+    }
 }
 exports.configService = new ConfigService();

package/dist/services/contact.service.d.ts

@@ -6,6 +6,7 @@ declare class ContactService {
     save(contact: Partial<ContactEntity>): Promise<ContactEntity>;
     update(userName: string, update: Partial<ContactEntity>): Promise<ContactEntity | null>;
     clearRoom(): Promise<void>;
+    clear(): Promise<void>;
     upsertByUsername(userName: string, data: Partial<ContactEntity>): Promise<ContactEntity>;
     delete(userName: string): Promise<boolean>;
     searchByNickNameOrRemark(keyword: string): Promise<ContactEntity[]>;

package/dist/services/contact.service.js

@@ -49,6 +49,11 @@ class ContactService {
             });
         });
     }
+    clear() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.repo.clear();
+        });
+    }
     upsertByUsername(userName, data) {
         return __awaiter(this, void 0, void 0, function* () {
             let contact = yield this.getByUserName(userName);

package/dist/services/message.service.d.ts

@@ -7,6 +7,7 @@ declare class MessageService {
     update(MsgId: number, update: Partial<MessageEntity>): Promise<MessageEntity | null>;
     upsertByMsgId(MsgId: number, data: Partial<MessageEntity>): Promise<MessageEntity>;
     delete(MsgId: number): Promise<boolean>;
+    clear(): Promise<void>;
 }
 export declare const messageService: MessageService;
 export {};

package/dist/services/message.service.js

@@ -59,5 +59,10 @@ class MessageService {
             return result.affected !== 0;
         });
     }
+    clear() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.repo.clear();
+        });
+    }
 }
 exports.messageService = new MessageService();

package/dist/services/room.service.d.ts

@@ -7,6 +7,7 @@ declare class RoomService {
     update(chatroomId: string, update: Partial<RoomEntity>): Promise<RoomEntity | null>;
     upsertByChatroomId(chatroomId: string, data: Partial<RoomEntity>): Promise<RoomEntity>;
     delete(chatroomId: string): Promise<boolean>;
+    clear(): Promise<void>;
 }
 export declare const roomService: RoomService;
 export {};

package/dist/services/room.service.js

@@ -59,5 +59,10 @@ class RoomService {
             return result.affected !== 0;
         });
     }
+    clear() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.repo.clear();
+        });
+    }
 }
 exports.roomService = new RoomService();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wx2tg-puppet",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [