wechaty-puppet-matrix 0.0.23 → 0.0.24

package/dist/esm/src/matrix/service/request.js

@@ -10,6 +10,7 @@ import imageSize from 'image-size';
 import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
+import mqtt from 'mqtt';
 const PRE = '[PuppetMatrix]';
 export var NotifyTypeEnum;
 (function (NotifyTypeEnum) {
@@ -360,7 +361,66 @@ class Client extends EventEmitter {
             log.error('socket had already been opened!');
             return;
         }
-        await this.createWebSocket();
+        await this.createMqttConnection();
+    }
+    async createMqttConnection() {
+        if (!this.tokenInfo) {
+            log.error('Token info not available');
+            return;
+        }
+        function randomRange(min, max) {
+            return Math.floor(Math.random() * (max - min)) + min;
+        }
+        const client = mqtt.connect(this.tokenInfo.mqServer, {
+            username: this.tokenInfo.mqUser,
+            password: this.tokenInfo.mqPsd,
+            keepalive: 60,
+            reconnectPeriod: 1000,
+            connectTimeout: 30 * 1000,
+            clientId: this.tokenInfo.guid + randomRange(1, 10000),
+        });
+        client.on('connect', () => {
+            this.connectionStatus.status = 'connected';
+            this.reconnectAttempts = 0;
+            log.info('MQTT connection opened');
+            this.socket = client;
+            client.subscribe(`aibotk/msg/${this.tokenInfo.guid}`, (err) => {
+                if (err) {
+                    log.error('Failed to subscribe to topic', err);
+                }
+                else {
+                    log.info('Subscribed to topic');
+                }
+            });
+        });
+        client.on('error', (error) => {
+            log.warn('MQTT connection error', error);
+        });
+        client.on('close', () => {
+            this.connectionStatus.status = 'disconnected';
+            log.warn('MQTT connection closed');
+            this.socket = null;
+            void this.reconnect();
+        });
+        client.on('message', (topic, message) => {
+            this.resetHeartbeatTimeout();
+            log.verbose(PRE, 'Received message on topic %s: %s', topic, message.toString());
+            if (message.toString() === 'ping' || message.toString() === 'pong') {
+                log.verbose('Received heartbeat');
+                return;
+            }
+            try {
+                const payload = JSON.parse(message.toString());
+                log.info('Received payload', JSON.stringify(payload));
+                void this.eventParse(payload);
+            }
+            catch (error) {
+                log.warn(PRE, 'Error parsing message: %s', error);
+                this.emit('error', error.message);
+            }
+        });
+        this.socket = client;
+        this.startHeartbeat();
     }
     async createWebSocket() {
         if (!this.tokenInfo) {
@@ -424,16 +484,15 @@ class Client extends EventEmitter {
     }
     startHeartbeat() {
         this.stopHeartbeat();
-        this.socket?.send('ping');
         this.heartbeatTimer = setInterval(() => {
-            if (this.socket?.readyState === WebSocket.OPEN) {
+            if (this.socket?.connected) {
                 try {
-                    this.socket.send('ping');
+                    this.socket.publish(`aibotk/msg/${this.tokenInfo.guid}`, 'pong');
                     this.setHeartbeatTimeout();
                 }
                 catch (error) {
                     log.error('Failed to send heartbeat:', error);
-                    void this.handleWebSocketClose(1006, 'Heartbeat failed');
+                    void this.handleMqttClose();
                 }
             }
         }, this.HEARTBEAT_INTERVAL);
@@ -454,7 +513,7 @@ class Client extends EventEmitter {
         }
         this.heartbeatTimeoutTimer = setTimeout(() => {
             log.warn('Heartbeat timeout, reconnecting...');
-            void this.handleWebSocketClose(1006, 'Heartbeat timeout');
+            void this.handleMqttClose();
         }, this.HEARTBEAT_TIMEOUT);
     }
     resetHeartbeatTimeout() {
@@ -463,6 +522,32 @@ class Client extends EventEmitter {
             this.heartbeatTimeoutTimer = undefined;
         }
     }
+    async handleMqttClose() {
+        this.connectionStatus.status = 'disconnected';
+        log.warn('MQTT connection closed');
+        if (this.socket) {
+            this.socket.end();
+            this.socket = null;
+        }
+        await this.reconnectMqtt();
+    }
+    async reconnectMqtt() {
+        if (this.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {
+            log.error('Max reconnect attempts reached. Stopping reconnection.');
+            return;
+        }
+        const delay = Math.min(this.INITIAL_RECONNECT_DELAY * Math.pow(2, this.reconnectAttempts), this.MAX_RECONNECT_DELAY);
+        this.reconnectAttempts++;
+        log.info(`Reconnecting in ${delay}ms (Attempt ${this.reconnectAttempts})`);
+        setTimeout(() => {
+            try {
+                void this.createMqttConnection();
+            }
+            catch (error) {
+                log.warn('Reconnection failed', error);
+            }
+        }, delay);
+    }
     async handleWebSocketClose(code, reason) {
         this.connectionStatus.status = 'disconnected';
         log.warn(`WebSocket closed: Code ${code}, Reason ${reason}`);

package/dist/esm/src/matrix/utils/string.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/utils/string.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,MAAO,MAAM,WAExC,CAAA"}
+{"version":3,"file":"string.d.ts","sourceRoot":"","sources":["../../../../../src/matrix/utils/string.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe,GAAI,GAAG,MAAM,WAExC,CAAA"}

package/dist/esm/src/puppet-matrix.d.ts

@@ -21,6 +21,7 @@ declare class PuppetMatrix extends PUPPET.Puppet {
     private _verifyInterval?;
     private _qrcodeStatuasInterval?;
     private _getQrcodeTimes;
+    private _roomJoinTemp;
     static readonly VERSION: string;
     constructor(options?: PuppetEngineOptions);
     get client(): Client | undefined;
@@ -109,6 +110,7 @@ declare class PuppetMatrix extends PUPPET.Puppet {
     tap(postId: string, type: PUPPET.types.Tap, tap?: boolean): Promise<boolean | void>;
     syncRoom(): Promise<void>;
     private _getRoomMemberList;
+    private _updateRoomMemberMap;
     private _updateContactCache;
     private _updateRoomMember;
     _updateRoom(roomId: string): Promise<void>;

package/dist/esm/src/puppet-matrix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"puppet-matrix.d.ts","sourceRoot":"","sources":["../../../src/puppet-matrix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAe,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAKhD,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAExE,OAAO,MAAM,MAAM,6BAA6B,CAAA;AA4BhD,QAAA,MAAM,OAAO,QAAiC,CAAA;AAK9C,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,aAAa,GAAG;IACvD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,GAAG,CAAA;IACZ,kBAAkB,EAAE,MAAM,CAAA;CAC3B,CAAA;AAED,cAAM,YAAa,SAAQ,MAAM,CAAC,MAAM;IAmBT,OAAO,EAAE,mBAAmB;IAjBzD,OAAO,CAAC,SAAS,CAAC,CAAc;IAChC,OAAO,CAAC,OAAO,CAAC,CAAQ;IACxB,OAAO,CAAC,KAAK,CAAC,CAA4B;IAC1C,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,eAAe,CAAC,CAA+B;IACvD,OAAO,CAAC,eAAe,CAAC,CAAuC;IAC/D,OAAO,CAAC,eAAe,CAAC,CAAuC;IAC/D,OAAO,CAAC,sBAAsB,CAAC,CAAuC;IACtE,OAAO,CAAC,eAAe,CAAQ;IAC/B,gBAAiC,OAAO,SAAU;gBAOrB,OAAO,GAAE,mBAA+C;IAsBrF,IAAW,MAAM,uBAEhB;IAEc,OAAO,IAAK,OAAO,CAAC,IAAI,CAAC;YAS1B,YAAY;YA0GZ,YAAY;IAuB1B,OAAO,CAAC,eAAe;YAOT,UAAU;IAiET,eAAe,CAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAS1D,aAAa;YA4Cb,OAAO;IAiCR,KAAK,IAAK,OAAO,CAAC,IAAI,CAAC;IAoBvB,MAAM,IAAK,OAAO,CAAC,IAAI,CAAC;YAIvB,WAAW;IAaV,MAAM,CAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7C,IAAI,CAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAOpB,aAAa,IAAK,OAAO,CAAC,IAAI,CAAC;IAKjC,iBAAiB,IAAK,OAAO,CAAC,IAAI,CAAC;IAuBjC,eAAe,CAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C,iBAAiB,IAAK,OAAO,CAAC,MAAM,CAAC;IAKrC,oBAAoB,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKvD,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1E,YAAY,CAAE,SAAS,EAAE,MAAM,GAAyB,OAAO,CAAC,MAAM,CAAC;IACvE,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/D,aAAa,CAAE,SAAS,EAAE,MAAM,GAA6B,OAAO,CAAC,gBAAgB,CAAC;IACtF,aAAa,CAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAK,OAAO,CAAC,IAAI,CAAC;IAa1E,WAAW,IAAK,OAAO,CAAC,MAAM,EAAE,CAAC;IAKjC,wBAAwB,CAAE,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,IAAI;IAK7E,kBAAkB,CAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAKjE,aAAa,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAWhD,gBAAgB,CAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxE,mBAAmB,CAAE,MAAM,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3E,YAAY,CAAE,SAAS,EAAE,MAAM,EAAE,GAAI,OAAO,CAAC,IAAI,CAAC;IAKlD,iBAAiB,CAAE,SAAS,CAAC,EAAE,MAAM,GAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAW1D,gBAAgB,CAAE,YAAY,EAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBvD,aAAa,CAAE,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoD5F,qBAAqB,CAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IAQ7D,sBAAsB,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;YAU5D,iBAAiB;YAmBjB,kBAAkB;IAuBjB,cAAc,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAKnD,cAAc,CAC3B,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IA6BpB,WAAW,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAsC1D,YAAY,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAS3D,kBAAkB,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC;IAe5E,UAAU,CAAE,SAAS,EAAE,MAAM,GAAK,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAsBlE,eAAe,CAAE,SAAS,EAAE,MAAM,GAAK,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAiBxE,kBAAkB,CAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IA8BhF,eAAe,CAAE,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA0C3F,sBAAsB,CAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,WAAW,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IAwB3G,eAAe,CAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA4BxG,cAAc,CAAE,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAsBxG,eAAe,CAAE,cAAc,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAW1F,aAAa,CAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASnD,cAAc,CAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkCrE,OAAO,CAAE,MAAM,EAAM,MAAM,EAAE,SAAS,EAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/D,UAAU,CAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAWtD,UAAU,CACvB,aAAa,EAAG,MAAM,EAAE,EACxB,KAAK,EAAW,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC;IAKH,OAAO,CACpB,MAAM,EAAM,MAAM,EAClB,SAAS,EAAG,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAKD,QAAQ,IAAK,OAAO,CAAC,MAAM,EAAE,CAAC;IAK9B,UAAU,CAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAK5C,QAAQ,CAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,SAAS,CAAE,MAAM,EAAE,MAAM,GAAmB,OAAO,CAAC,MAAM,CAAC;IAC3D,SAAS,CAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAI,OAAO,CAAC,IAAI,CAAC;IAUzD,YAAY,CAAE,MAAM,EAAE,MAAM,GAAmB,OAAO,CAAC,MAAM,CAAC;IAC9D,YAAY,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAK,OAAO,CAAC,IAAI,CAAC;IAW5D,cAAc,CAAE,MAAM,EAAE,MAAM,GAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAMnD,oBAAoB,CAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D,uBAAuB,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAKnF,iBAAiB,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAsBnE,uBAAuB,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAQnF,iBAAiB,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAavD,oBAAoB,CAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;IAQ7E,cAAc,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAC,SAAS,CAAC;IAc9D,oBAAoB,CAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAcjF,0BAA0B,CAAE,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;IAQ5F,wBAAwB,CAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAQjE,8BAA8B,CAAE,UAAU,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC;IAQzF,0BAA0B,CAAE,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;IAQxG,oBAAoB,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;IAiBtE,WAAW,CAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;IAiEnE,aAAa,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzC,cAAc,CAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,CAAC;IAKnE,kBAAkB,CAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;IAKxF,oBAAoB,CAAE,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;IAMnF,GAAG,CAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,UAAO,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAY1F,QAAQ;YAWA,kBAAkB;YAkClB,mBAAmB;YAgCnB,iBAAiB;IAYlB,WAAW,CAAE,MAAM,EAAC,MAAM;YAgBzB,cAAc;YAcd,cAAc;YAgEd,eAAe;YAcf,iBAAiB;IAa/B,OAAO,CAAC,gBAAgB;YAeV,uBAAuB;YASvB,uBAAuB;YASvB,uBAAuB;YAgBvB,sBAAsB;IAuBvB,WAAW;CAQzB;AAED,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,CAAA;AAEhC,eAAe,YAAY,CAAA"}
+{"version":3,"file":"puppet-matrix.d.ts","sourceRoot":"","sources":["../../../src/puppet-matrix.ts"],"names":[],"mappings":"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"}

package/dist/esm/src/puppet-matrix.js

@@ -38,11 +38,13 @@ class PuppetMatrix extends PUPPET.Puppet {
     _verifyInterval;
     _qrcodeStatuasInterval;
     _getQrcodeTimes;
+    _roomJoinTemp = {};
     static VERSION = VERSION;
     constructor(options = {}) {
         super(options);
         this.options = options;
         this.options.engine = Client;
+        this._roomJoinTemp = {};
         this._getQrcodeTimes = 0;
         this.options.maxGetQrcoderTimes = 20;
         if (!this.options.token) {
@@ -114,6 +116,18 @@ class PuppetMatrix extends PUPPET.Puppet {
                 this.emit('room-leave', payload);
             }));
             this._client.on('room-join', this.wrapAsync(async ({ roomId, inviterId, joinIds, joinUsers }) => {
+                for (const joinId of joinIds) {
+                    if (this._roomJoinTemp[`${roomId}-${joinId}`]) {
+                        joinIds = joinIds.filter(id => id !== joinId);
+                    }
+                    else {
+                        this._roomJoinTemp[`${roomId}-${joinId}`] = joinId;
+                        const temTimer = setTimeout(() => {
+                            delete this._roomJoinTemp[`${roomId}-${joinId}`];
+                            clearTimeout(temTimer);
+                        }, 50000);
+                    }
+                }
                 const payload = {
                     inviteeIdList: joinIds,
                     inviterId,
@@ -128,7 +142,9 @@ class PuppetMatrix extends PUPPET.Puppet {
                         await this._cacheMgr?.setRoom(roomId, roomInfo);
                     }
                 }
-                this.emit('room-join', payload);
+                if (joinIds.length) {
+                    this.emit('room-join', payload);
+                }
             }));
             this._client.on('logout', this.wrapAsync(async (message) => {
                 log.info(PRE, 'Logout event: %s', message);
@@ -894,8 +910,15 @@ class PuppetMatrix extends PUPPET.Puppet {
         if (roomMemberMap[contactId]) {
             return roomMemberMap[contactId];
         }
-        const newMap = await this._getRoomMemberList(roomId, true);
-        return newMap[contactId];
+        const memberInfo = await this._updateRoomMemberMap(roomId, contactId);
+        const ret = await this._cacheMgr.getRoomMember(roomId);
+        if (ret) {
+            const newMap = await this._getRoomMemberList(roomId, true);
+            return newMap[contactId] || memberInfo;
+        }
+        else {
+            return memberInfo;
+        }
     }
     async roomMemberRawPayloadParser(rawPayload) {
         return engineRoomMemberToWechaty(rawPayload);
@@ -1032,6 +1055,60 @@ class PuppetMatrix extends PUPPET.Puppet {
         }
         return ret;
     }
+    async _updateRoomMemberMap(roomId, contactId) {
+        if (!this._cacheMgr) {
+            return {
+                avatar: '',
+                city: '',
+                country: '',
+                name: '',
+                alias: '',
+                province: '',
+                wxid: contactId,
+                sex: 0,
+                wxNum: '',
+            };
+        }
+        const ret = await this._cacheMgr.getRoomMember(roomId);
+        if (ret) {
+            const existContact = await this._cacheMgr.getContact(contactId);
+            if (existContact) {
+                ret[contactId] = existContact;
+                await this._updateRoomMember(roomId, ret);
+                return existContact;
+            }
+            else {
+                const contact = await this._client?.searchContact([contactId]);
+                if (!Array.isArray(contact)) {
+                    ret[contactId] = contact;
+                    await this._updateRoomMember(roomId, ret);
+                    return contact;
+                }
+                return {
+                    avatar: '',
+                    city: '',
+                    country: '',
+                    name: '',
+                    alias: '',
+                    province: '',
+                    wxid: contactId,
+                    sex: 0,
+                    wxNum: '',
+                };
+            }
+        }
+        return {
+            avatar: '',
+            city: '',
+            country: '',
+            name: '',
+            alias: '',
+            province: '',
+            wxid: contactId,
+            sex: 0,
+            wxNum: '',
+        };
+    }
     async _updateContactCache(contact) {
         if (!contact.wxid) {
             log.warn(PRE, `wxid is required for contact: ${JSON.stringify(contact)}`);
@@ -1042,7 +1119,7 @@ class PuppetMatrix extends PUPPET.Puppet {
             const roomId = contact.wxid;
             let finalPayload = contact;
             if (oldRoomPayload) {
-                finalPayload = Object.assign(oldRoomPayload, contact);
+                finalPayload = { ...oldRoomPayload, ...contact };
             }
             await this._cacheMgr.setRoom(roomId, finalPayload);
             if (!finalPayload.chatroommemberList || finalPayload.chatroommemberList.length === 0) {
@@ -1053,7 +1130,7 @@ class PuppetMatrix extends PUPPET.Puppet {
         else {
             const oldContactPaylod = await this._cacheMgr.getContact(contact.wxid);
             if (oldContactPaylod) {
-                await this._cacheMgr.setContact(contact.wxid, Object.assign(oldContactPaylod, contact));
+                await this._cacheMgr.setContact(contact.wxid, { ...oldContactPaylod, ...contact });
             }
             else {
                 await this._cacheMgr.setContact(contact.wxid, contact);
@@ -1133,12 +1210,29 @@ class PuppetMatrix extends PUPPET.Puppet {
                 break;
             }
             case EventType.RoomJoin: {
+                const roomJoin = event.payload;
+                await this._updateRoomMember(roomJoin.roomId);
+                for (const joinId of roomJoin.inviteeIdList) {
+                    if (this._roomJoinTemp[`${roomJoin.roomId}-${joinId}`]) {
+                        roomJoin.inviteeIdList = roomJoin.inviteeIdList.filter(id => id !== joinId);
+                    }
+                    else {
+                        this._roomJoinTemp[`${roomJoin.roomId}-${joinId}`] = joinId;
+                        const temTimer = setTimeout(() => {
+                            delete this._roomJoinTemp[`${roomJoin.roomId}-${joinId}`];
+                            clearTimeout(temTimer);
+                        }, 50000);
+                    }
+                }
+                this.emit('room-join', roomJoin);
                 break;
             }
             case EventType.RoomLeave: {
                 break;
             }
             case EventType.RoomTopic: {
+                const roomTopic = event.payload;
+                this.emit('room-topic', roomTopic);
                 break;
             }
         }

package/dist/esm/src/utils/normalize-filebox.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-filebox.d.ts","sourceRoot":"","sources":["../../../../src/utils/normalize-filebox.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACR,MAA0B,UAAU,CAAA;AACrC,OAAO,EAEL,gBAAgB,EACjB,MAA0B,UAAU,CAAA;AA4BrC,QAAA,MAAM,cAAc,YAAa,gBAAgB,YA8BhD,CAAA;AAED,QAAA,MAAM,oBAAoB,gBAAiB,OAAO,OAAO,eAAqB,gBAAgB,wCAkB7F,CAAA;AAED,OAAO,EACL,cAAc,EACd,oBAAoB,GACrB,CAAA"}
+{"version":3,"file":"normalize-filebox.d.ts","sourceRoot":"","sources":["../../../../src/utils/normalize-filebox.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACR,MAA0B,UAAU,CAAA;AACrC,OAAO,EAEL,gBAAgB,EACjB,MAA0B,UAAU,CAAA;AA4BrC,QAAA,MAAM,cAAc,GAAI,SAAS,gBAAgB,YA8BhD,CAAA;AAED,QAAA,MAAM,oBAAoB,GAAI,aAAa,OAAO,OAAO,MAAY,SAAS,gBAAgB,wCAkB7F,CAAA;AAED,OAAO,EACL,cAAc,EACd,oBAAoB,GACrB,CAAA"}

package/dist/esm/src/utils/sns-xml-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sns-xml-generator.d.ts","sourceRoot":"","sources":["../../../../src/utils/sns-xml-generator.ts"],"names":[],"mappings":"AAAA,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,aAAa,SAAU,MAAM,WAAW,MAAM,KAAG,MAkD7D,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,WAAW,MAAM,SAAS,KAAK,KAAG,MAgD5E,CAAA;AAED,eAAO,MAAM,cAAc,SAAU,MAAM,eAAe,MAAM,aAAa,KAAK,EAAE,KAAG,MAkEtF,CAAA"}
+{"version":3,"file":"sns-xml-generator.d.ts","sourceRoot":"","sources":["../../../../src/utils/sns-xml-generator.ts"],"names":[],"mappings":"AAAA,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,aAAa,EAAE,MAAM,CAAA;IACrB,GAAG,EAAE,MAAM,CAAA;IACX,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,WAAW,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,MAAM,MAAM,EAAE,SAAS,MAAM,KAAG,MAkD7D,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,SAAS,MAAM,EAAE,OAAO,KAAK,KAAG,MAgD5E,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,aAAa,MAAM,EAAE,WAAW,KAAK,EAAE,KAAG,MAkEtF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wechaty-puppet-matrix",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "Puppet matrix for Wechaty",
   "type": "module",
   "typings": "./dist/esm/src/mod.d.ts",
@@ -77,6 +77,7 @@
     "fs-extra": "^10.1.0",
     "image-size": "^1.1.1",
     "lru-cache": "^6.0.0",
+    "mqtt": "^5.10.4",
     "node-cleanup": "^2.1.2",
     "wechaty-web-panel": "^1.6.76",
     "ws": "^8.18.0",

package/src/matrix/service/request.ts

@@ -11,6 +11,7 @@ import imageSize from 'image-size'
 import fs from 'fs-extra'
 import os from 'os'
 import path from 'path'
+import mqtt from 'mqtt'
 const PRE = '[PuppetMatrix]'
 
 /**
@@ -708,7 +709,78 @@ class Client extends EventEmitter {
       return
     }
 
-    await this.createWebSocket()
+    await this.createMqttConnection()
+  }
+
+  async createMqttConnection (): Promise<void> {
+    if (!this.tokenInfo) {
+      log.error('Token info not available')
+      return
+    }
+
+    function randomRange (min: number, max: number) {
+      // min最小值，max最大值
+      return Math.floor(Math.random() * (max - min)) + min
+    }
+
+    const client = mqtt.connect(this.tokenInfo.mqServer, {
+      username: this.tokenInfo.mqUser,
+      password: this.tokenInfo.mqPsd,
+      keepalive: 60,
+      reconnectPeriod: 1000,
+      connectTimeout: 30 * 1000,
+      clientId: this.tokenInfo.guid + randomRange(1, 10000),
+    })
+
+    client.on('connect', () => {
+      this.connectionStatus.status = 'connected'
+      this.reconnectAttempts = 0
+      log.info('MQTT connection opened')
+      this.socket = client
+
+      // 订阅主题
+      client.subscribe(`aibotk/msg/${this.tokenInfo.guid}`, (err) => {
+        if (err) {
+          log.error('Failed to subscribe to topic', err)
+        } else {
+          log.info('Subscribed to topic')
+        }
+      })
+    })
+
+    client.on('error', (error: any) => {
+      log.warn('MQTT connection error', error)
+    })
+
+    client.on('close', () => {
+      this.connectionStatus.status = 'disconnected'
+      log.warn('MQTT connection closed')
+      this.socket = null
+      void this.reconnect()
+    })
+
+    client.on('message', (topic, message) => {
+      this.resetHeartbeatTimeout() // 收到任何消息都重置心跳超时
+
+      log.verbose(PRE, 'Received message on topic %s: %s', topic, message.toString())
+      if (message.toString() === 'ping' || message.toString() === 'pong') {
+        log.verbose('Received heartbeat')
+        return
+      }
+
+      try {
+        const payload = JSON.parse(message.toString())
+        log.info('Received payload', JSON.stringify(payload))
+        void this.eventParse(payload)
+      } catch (error) {
+        log.warn(PRE, 'Error parsing message: %s', error)
+        // @ts-ignore
+        this.emit('error', (error as Error).message)
+      }
+    })
+
+    this.socket = client
+    this.startHeartbeat()
   }
 
   async createWebSocket (): Promise<void> {
@@ -792,15 +864,14 @@ class Client extends EventEmitter {
 
   private startHeartbeat (): void {
     this.stopHeartbeat() // 确保清理现有定时器
-    this.socket?.send('ping')
     this.heartbeatTimer = setInterval(() => {
-      if (this.socket?.readyState === WebSocket.OPEN) {
+      if (this.socket?.connected) {
         try {
-          this.socket.send('ping')
+          this.socket.publish(`aibotk/msg/${this.tokenInfo.guid}`, 'pong')
           this.setHeartbeatTimeout()
         } catch (error) {
           log.error('Failed to send heartbeat:', error)
-          void this.handleWebSocketClose(1006, 'Heartbeat failed')
+          void this.handleMqttClose()
         }
       }
     }, this.HEARTBEAT_INTERVAL)
@@ -826,7 +897,7 @@ class Client extends EventEmitter {
     }
     this.heartbeatTimeoutTimer = setTimeout(() => {
       log.warn('Heartbeat timeout, reconnecting...')
-      void this.handleWebSocketClose(1006, 'Heartbeat timeout')
+      void this.handleMqttClose()
     }, this.HEARTBEAT_TIMEOUT)
   }
 
@@ -838,6 +909,41 @@ class Client extends EventEmitter {
     }
   }
 
+  private async handleMqttClose () {
+    this.connectionStatus.status = 'disconnected'
+    log.warn('MQTT connection closed')
+    if (this.socket) {
+      this.socket.end()
+      this.socket = null
+    }
+
+    // 触发重连
+    await this.reconnectMqtt()
+  }
+
+  private async reconnectMqtt (): Promise<void> {
+    if (this.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {
+      log.error('Max reconnect attempts reached. Stopping reconnection.')
+      return
+    }
+
+    // 指数退避重连策略
+    const delay = Math.min(
+      this.INITIAL_RECONNECT_DELAY * Math.pow(2, this.reconnectAttempts),
+      this.MAX_RECONNECT_DELAY,
+    )
+
+    this.reconnectAttempts++
+    log.info(`Reconnecting in ${delay}ms (Attempt ${this.reconnectAttempts})`)
+    setTimeout(() => {
+      try {
+        void this.createMqttConnection()
+      } catch (error) {
+        log.warn('Reconnection failed', error)
+      }
+    }, delay)
+  }
+
   private async handleWebSocketClose (code?: number, reason?: Buffer | String) {
     this.connectionStatus.status = 'disconnected'
     log.warn(`WebSocket closed: Code ${code}, Reason ${reason}`)