wx2tg-puppet 2.0.8 → 2.1.0

package/dist/core/Contact.js

@@ -75,11 +75,9 @@ class Contact {
      */
     sync() {
         return __awaiter(this, void 0, void 0, function* () {
-            config_service_1.configService.get().then(config => {
-                Contact.fetchAndUpsertContactDetail((config === null || config === void 0 ? void 0 : config.wxid) || '', this.id).then(contact => {
-                    this.contact = contact;
-                });
-            });
+            const config = yield config_service_1.configService.get();
+            const contact = yield Contact.fetchAndUpsertContactDetail((config === null || config === void 0 ? void 0 : config.wxid) || '', this.id);
+            this.contact = contact;
         });
     }
     /**

package/dist/index.js

@@ -196,6 +196,10 @@ class WxBot extends events_1.EventEmitter {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             try {
+                if (!this.uuid) {
+                    yield this.fetchAndShowQRCode();
+                    return;
+                }
                 const statusResp = yield LoginApi_1.loginApi.LoginCheckQR(this.uuid);
                 console.log('CheckQR response:', statusResp.data);
                 const statusData = statusResp.data;
@@ -302,9 +306,14 @@ class WxBot extends events_1.EventEmitter {
                 if (data.Code !== 0) {
                     // Code不为0，增加失败计数
                     this.syncFailureCount++;
-                    if (this.syncFailureCount >= 3) {
-                        // 连续失败3次，退出登录
+                    if (this.syncFailureCount >= 10) {
+                        // 连续失败10次，退出登录
                         this.syncFailureCount = 0; // 重置计数器
+                        // 先尝试二次登录
+                        const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
+                        if (loginTwice.data.Message === '登录成功') {
+                            return;
+                        }
                         yield this.logOut();
                         yield this.login();
                         return;
@@ -313,6 +322,11 @@ class WxBot extends events_1.EventEmitter {
                     return;
                 }
                 if (data.Message === '用户可能退出') {
+                    // 先尝试二次登录
+                    const loginTwice = yield LoginApi_1.loginApi.LoginTwiceAutoAuth(userName);
+                    if (loginTwice.data.Message === '登录成功') {
+                        return;
+                    }
                     // 用户可能退出，立即退出登录
                     yield this.logOut();
                     yield this.login();

package/package.json

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

package/dist/test.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/test.js

@@ -1,48 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const _1 = require(".");
-(() => __awaiter(void 0, void 0, void 0, function* () {
-    const wxBot = new _1.WxBot({
-        baseUrl: 'http://127.0.0.1:8059/api',
-        databasePath: './database.sqlite',
-        deviceType: 'ipadX'
-    });
-    yield wxBot.start();
-    wxBot.on('message', (message) => __awaiter(void 0, void 0, void 0, function* () {
-        console.log('收到消息', message.text());
-        console.log('消息类型', message.type());
-        if (message.type() === 'image') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        else if (message.type() === 'video') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        else if (message.type() === 'voice') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        else if (message.type() === 'file') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        else if (message.type() === 'emoji') {
-            const fileBox = yield message.toFileBox();
-            yield (fileBox === null || fileBox === void 0 ? void 0 : fileBox.toFile(fileBox.name));
-        }
-        // const room = await message.room()
-        // if(room){
-        //   await room.say('你好','@all')
-        // }
-    }));
-}))();