common-tg-service 1.3.122 → 1.3.124

package/dist/components/Telegram/TelegramManager.js

@@ -312,28 +312,49 @@ class TelegramManager {
         this.apiHash = tgCreds.apiHash;
         this.apiId = tgCreds.apiId;
         const tgConfiguration = await (0, generateTGConfig_1.generateTGConfig)(this.phoneNumber);
-        await (0, withTimeout_1.withTimeout)(async () => {
-            this.client = new telegram_1.TelegramClient(this.session, this.apiId, this.apiHash, tgConfiguration);
-            this.client.setLogLevel(Logger_1.LogLevel.ERROR);
-            this.client._errorHandler = this.errorHandler.bind(this);
-            await this.client.connect();
-            this.logger.info(this.phoneNumber, "Connected Client Succesfully");
-            this.clearTimeoutErr();
-        }, {
-            timeout: 180000,
-            errorMessage: `[Tg Manager]\n${this.phoneNumber}: Client Creation TimeOut\n`
-        });
-        if (handler && this.client) {
-            if (handlerFn) {
-                this.logger.info(this.phoneNumber, "Adding Custom Event Handler");
-                this.client.addEventHandler(async (event) => { await handlerFn(event); }, new events_1.NewMessage());
+        try {
+            await (0, withTimeout_1.withTimeout)(async () => {
+                this.client = new telegram_1.TelegramClient(this.session, this.apiId, this.apiHash, tgConfiguration);
+                this.client.setLogLevel(Logger_1.LogLevel.ERROR);
+                this.client._errorHandler = this.errorHandler.bind(this);
+                await this.client.connect();
+                this.logger.info(this.phoneNumber, "Connected Client Succesfully");
+                this.clearTimeoutErr();
+            }, {
+                timeout: 180000,
+                errorMessage: `[Tg Manager]\n${this.phoneNumber}: Client Creation TimeOut\n`
+            });
+            if (!this.client) {
+                throw new Error(`Client is null after connection attempt for ${this.phoneNumber}`);
             }
-            else {
-                this.logger.info(this.phoneNumber, "Adding Default Event Handler");
-                this.client.addEventHandler(async (event) => { await this.handleEvents(event); }, new events_1.NewMessage());
+            if (handler && this.client) {
+                if (handlerFn) {
+                    this.logger.info(this.phoneNumber, "Adding Custom Event Handler");
+                    this.client.addEventHandler(async (event) => { await handlerFn(event); }, new events_1.NewMessage());
+                }
+                else {
+                    this.logger.info(this.phoneNumber, "Adding Default Event Handler");
+                    this.client.addEventHandler(async (event) => { await this.handleEvents(event); }, new events_1.NewMessage());
+                }
+                if (!this.client.connected) {
+                    throw new Error(`Client not connected after connection attempt for ${this.phoneNumber}`);
+                }
             }
+            return this.client;
+        }
+        catch (error) {
+            this.logger.error(this.phoneNumber, "Client creation failed", error);
+            if (this.client) {
+                try {
+                    await this.client.destroy();
+                }
+                catch (destroyError) {
+                    this.logger.error(this.phoneNumber, "Error destroying failed client", destroyError);
+                }
+                this.client = null;
+            }
+            throw error;
         }
-        return this.client;
     }
     async getGrpMembers(entity) {
         try {