@@ -42,20 +42,23 @@ export class WAMonitoringService {
4242 public delInstanceTime ( instance : string ) {
4343 const time = this . configService . get < DelInstance > ( 'DEL_INSTANCE' ) ;
4444 if ( typeof time === 'number' && time > 0 ) {
45- setTimeout ( async ( ) => {
46- if ( this . waInstances [ instance ] ?. connectionStatus ?. state !== 'open' ) {
47- if ( this . waInstances [ instance ] ?. connectionStatus ?. state === 'connecting' ) {
48- if ( ( await this . waInstances [ instance ] . integration ) === Integration . WHATSAPP_BAILEYS ) {
49- await this . waInstances [ instance ] ?. client ?. logout ( 'Log out instance: ' + instance ) ;
50- this . waInstances [ instance ] ?. client ?. ws ?. close ( ) ;
51- this . waInstances [ instance ] ?. client ?. end ( undefined ) ;
45+ setTimeout (
46+ async ( ) => {
47+ if ( this . waInstances [ instance ] ?. connectionStatus ?. state !== 'open' ) {
48+ if ( this . waInstances [ instance ] ?. connectionStatus ?. state === 'connecting' ) {
49+ if ( ( await this . waInstances [ instance ] . integration ) === Integration . WHATSAPP_BAILEYS ) {
50+ await this . waInstances [ instance ] ?. client ?. logout ( 'Log out instance: ' + instance ) ;
51+ this . waInstances [ instance ] ?. client ?. ws ?. close ( ) ;
52+ this . waInstances [ instance ] ?. client ?. end ( undefined ) ;
53+ }
54+ this . eventEmitter . emit ( 'remove.instance' , instance , 'inner' ) ;
55+ } else {
56+ this . eventEmitter . emit ( 'remove.instance' , instance , 'inner' ) ;
5257 }
53- this . eventEmitter . emit ( 'remove.instance' , instance , 'inner' ) ;
54- } else {
55- this . eventEmitter . emit ( 'remove.instance' , instance , 'inner' ) ;
5658 }
57- }
58- } , 1000 * 60 * time ) ;
59+ } ,
60+ 1000 * 60 * time ,
61+ ) ;
5962 }
6063 }
6164
@@ -219,7 +222,7 @@ export class WAMonitoringService {
219222 id : data . instanceId ,
220223 name : data . instanceName ,
221224 connectionStatus :
222- data . integration && data . integration === Integration . WHATSAPP_BAILEYS ? 'close' : data . status ?? 'open' ,
225+ data . integration && data . integration === Integration . WHATSAPP_BAILEYS ? 'close' : ( data . status ?? 'open' ) ,
223226 number : data . number ,
224227 integration : data . integration || Integration . WHATSAPP_BAILEYS ,
225228 token : data . hash ,
0 commit comments