@@ -191,17 +191,20 @@ interface SendEventData {
191191export const sendEventData = ( { data, event, wuid, apiKey, instanceName } : SendEventData ) => {
192192 const rabbitConfig = configService . get < Rabbitmq > ( 'RABBITMQ' ) ;
193193 let exchangeName = rabbitConfig . EXCHANGE_NAME ;
194- if ( rabbitConfig . MODE === 'isolated' ) exchangeName = instanceName ;
194+ if ( rabbitConfig . MODE === 'isolated' ) exchangeName = instanceName ?? 'evolution_exchange' ;
195195
196196 amqpChannel . assertExchange ( exchangeName , 'topic' , {
197197 durable : true ,
198198 autoDelete : false ,
199199 } ) ;
200+
200201 let queueName = event ;
202+
201203 if ( rabbitConfig . MODE === 'single' ) {
202204 queueName = 'evolution' ;
203205 } else if ( rabbitConfig . MODE === 'global' ) {
204206 let eventName = '' ;
207+
205208 Object . keys ( globalQueues ) . forEach ( ( key ) => {
206209 if ( globalQueues [ key ] . includes ( event as Events ) ) {
207210 eventName = key ;
@@ -211,18 +214,23 @@ export const sendEventData = ({ data, event, wuid, apiKey, instanceName }: SendE
211214 }
212215 } ) ;
213216 queueName = eventName ;
217+ } else if ( rabbitConfig . MODE === 'isolated' ) {
218+ queueName = `${ instanceName } .${ event } ` ;
214219 }
220+
215221 amqpChannel . assertQueue ( queueName , {
216222 durable : true ,
217223 autoDelete : false ,
218224 arguments : { 'x-queue-type' : 'quorum' } ,
219225 } ) ;
226+
220227 amqpChannel . bindQueue ( queueName , exchangeName , event ) ;
221228
222229 const serverUrl = configService . get < HttpServer > ( 'SERVER' ) . URL ;
223230 const tzoffset = new Date ( ) . getTimezoneOffset ( ) * 60000 ; //offset in milliseconds
224231 const localISOTime = new Date ( Date . now ( ) - tzoffset ) . toISOString ( ) ;
225232 const now = localISOTime ;
233+
226234 const message = {
227235 event,
228236 instance : instanceName ,
@@ -231,9 +239,11 @@ export const sendEventData = ({ data, event, wuid, apiKey, instanceName }: SendE
231239 date_time : now ,
232240 sender : wuid ,
233241 } ;
242+
234243 if ( apiKey ) {
235244 message [ 'apikey' ] = apiKey ;
236245 }
246+
237247 logger . log ( {
238248 queueName,
239249 exchangeName,
0 commit comments