fix(change-events): Trigger a 'disconnected' event when an account is deleted and the connection is closed

Author: andris9

lib/email-client/gmail-client.js

@@ -314,12 +314,26 @@ class GmailClient extends BaseClient {
     async close() {
         clearTimeout(this.renewWatchTimer);
         this.closed = true;
+
+        if (this.state !== 'disconnected') {
+            this.state = 'disconnected';
+            await this.setStateVal();
+            await emitChangeEvent(this.logger, this.account, 'state', this.state);
+        }
+
         return null;
     }
 
     async delete() {
         clearTimeout(this.renewWatchTimer);
         this.closed = true;
+
+        if (this.state !== 'disconnected') {
+            this.state = 'disconnected';
+            await this.setStateVal();
+            await emitChangeEvent(this.logger, this.account, 'state', this.state);
+        }
+
         return null;
     }
 

lib/email-client/imap-client.js

@@ -1086,6 +1086,12 @@ class IMAPClient extends BaseClient {
                 await this.redis.hSetExists(this.getAccountKey(), 'connections', this.connections.size.toString());
                 imapClient?.log.info({ msg: 'Connection closed', type: 'imapClient', account: this.account, disabled: imapClient.disabled });
 
+                if (this.state !== 'disconnected') {
+                    this.state = 'disconnected';
+                    await this.setStateVal();
+                    await emitChangeEvent(this.logger, this.account, 'state', this.state);
+                }
+
                 try {
                     for (let [, mailbox] of this.mailboxes) {
                         if (mailbox.syncing) {
@@ -1254,7 +1260,6 @@ class IMAPClient extends BaseClient {
     }
 
     close() {
-        this.state = 'disconnected';
         if (this.isClosed || this.isClosing) {
             return;
         }

lib/email-client/outlook-client.js

@@ -215,12 +215,26 @@ class OutlookClient extends BaseClient {
     async close() {
         clearTimeout(this.renewWatchTimer);
         this.closed = true;
+
+        if (this.state !== 'disconnected') {
+            this.state = 'disconnected';
+            await this.setStateVal();
+            await emitChangeEvent(this.logger, this.account, 'state', this.state);
+        }
+
         return null;
     }
 
     async delete() {
         clearTimeout(this.renewWatchTimer);
         this.closed = true;
+
+        if (this.state !== 'disconnected') {
+            this.state = 'disconnected';
+            await this.setStateVal();
+            await emitChangeEvent(this.logger, this.account, 'state', this.state);
+        }
+
         return null;
     }