@nebulae/event-store-tpi-rx6 1.1.5 → 1.2.0

package/lib/broker/PubSubBroker.js

@@ -21,30 +21,50 @@ class PubSubBroker {
         )
         this.senderId = uuidv4();
         this.pubsubClient = new PubSub({});
+        this.subscriptionLock = false;
+        this.startLock = false;
     }
 
     /**
      * Starts Broker connections
      * Returns an Obserable that resolves to each connection result
+     * Uses a semaphore to prevent concurrent access - returns of(null) if busy
      */
-    start$() {        
-        return new Rx.Observable(async (observer) => {            
+    start$() {
+        return new Rx.Observable(async (observer) => {
+            // Check semaphore - return null if already busy
+            if (this.startLock) {
+                observer.next(null);
+                observer.complete();
+                return;
+            }
+            
+            // Acquire lock
+            this.startLock = true;
+            
             try {
-                const [topic] = await this.pubsubClient.createTopic(this.eventsTopic);
-                console.log(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker created topic: Topic=${this.eventsTopic}`);
-                this.topic = topic;
-            } catch (error) {
-                if(error.code === 6) {
-                    this.topic = this.pubsubClient.topic(this.eventsTopic);
-                    console.log(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker topic already exists, getting existing topic: Topic=${this.eventsTopic}`);
-                } else {
-                    observer.error(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker failed to create or get topic: Topic=${this.eventsTopic}, Error=${error.message}`);
-                    return;
-                }                
+                try {
+                    const [topic] = await this.pubsubClient.createTopic(this.eventsTopic);
+                    console.log(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker created topic: Topic=${this.eventsTopic}`);
+                    this.topic = topic;
+                } catch (error) {
+                    if (error.code === 6) {
+                        this.topic = this.pubsubClient.topic(this.eventsTopic);
+                        console.log(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker topic already exists, getting existing topic: Topic=${this.eventsTopic}`);
+                    } else {
+                        observer.error(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker failed to create or get topic: Topic=${this.eventsTopic}, Error=${error.message}`);
+                        return;
+                    }
+                }
+                if (this.topic) {
+                    this.startMessageListener(this.topic);
+                    observer.next(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker listening: Topic=${this.eventsTopic}, subscriptionName=${this.eventsTopicSubscription}`);
+                }
+                observer.complete();
+            } finally {
+                // Release lock
+                this.startLock = false;
             }
-            this.startMessageListener(this.topic);
-            observer.next(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker listening: Topic=${this.eventsTopic}, subscriptionName=${this.eventsTopicSubscription}`);
-            observer.complete();
         });
     }
 
@@ -53,7 +73,9 @@ class PubSubBroker {
      */
     stop$() {
         return Rx.Observable.create(observer => {
-            Rx.defer(() => this.getSubscription$()).subscribe(
+            Rx.defer(() => this.getSubscription$()).pipe(
+                filter(sub => sub != null)
+            ).subscribe(
                 (subscription) => {
                     subscription.removeListener(`message`, this.onMessage);
                     observer.next(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker removed listener: Topic=${this.eventsTopic}, subscriptionName=${subscription}`);
@@ -93,28 +115,41 @@ class PubSubBroker {
     getEventListener$(aggregateType, ignoreSelfEvents = true) {
         return this.orderedIncomingEvents$.pipe(
             filter(msg => msg)
-            ,filter(msg => !ignoreSelfEvents || msg.attributes.senderId !== this.senderId)
-            ,map(msg => msg.data)
-            ,filter(evt => evt.at === aggregateType || aggregateType == "*")
-            )
+            , filter(msg => !ignoreSelfEvents || msg.attributes.senderId !== this.senderId)
+            , map(msg => msg.data)
+            , filter(evt => evt.at === aggregateType || aggregateType == "*")
+        )
     }
 
 
     /**
      * Returns an Observable that resolves to the subscription
+     * Uses a semaphore to prevent concurrent access - returns null if busy
      */
     async getSubscription$(topic) {
+        // Check semaphore - return null if already busy
+        if (this.subscriptionLock) {
+            //console.log(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker getSubscription$ is busy, returning null`);
+            return null;
+        }
+
+        // Acquire lock
+        this.subscriptionLock = true;
+
         try {
             const [subscription] = await (topic || this.topic).createSubscription(this.eventsTopicSubscription);
             console.log(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker created subscription: Topic=${this.eventsTopic}, subscriptionName=${this.eventsTopicSubscription}`);
-            return subscription;                        
+            return subscription;
         } catch (error) {
-            if(error.code === 6) {
+            if (error.code === 6) {
                 console.log(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker subscription already exists, getting existing subscription: Topic=${this.eventsTopic}, subscriptionName=${this.eventsTopicSubscription}`);
                 return (topic || this.topic).subscription(this.eventsTopicSubscription);
             } else {
                 throw new Error(`@nebulae/event-store-tpi-rx6: Event Store PubSub Broker failed to create or get subscription: Topic=${this.eventsTopic}, subscriptionName=${this.eventsTopicSubscription}, Error=${error.message}`);
             }
+        } finally {
+            // Release lock
+            this.subscriptionLock = false;
         }
     }
 
@@ -122,30 +157,31 @@ class PubSubBroker {
      * Starts to listen messages
      */
     startMessageListener(topic) {
-        this.messageListenerSubscription = Rx.defer(() => this.getSubscription$(topic))
-            .subscribe(
-                (pubSubSubscription) => {
-                    this.onMessage = message => {
-                        message.ack();
-                        this.incomingEvents$.next({
-                            data: JSON.parse(message.data),
-                            id: message.id,
-                            attributes: message.attributes,
-                            correlationId: message.attributes.correlationId
-                        });
-                    };
-                    pubSubSubscription.on(`message`, this.onMessage);
-                    pubSubSubscription.on('error', error => {
-                        console.error('@nebulae/event-store-tpi-rx6.PubSubBroker: Received error:', error);
+        this.messageListenerSubscription = Rx.defer(() => this.getSubscription$(topic)).pipe(
+            filter(sub => sub != null)
+        ).subscribe(
+            (pubSubSubscription) => {
+                this.onMessage = message => {
+                    message.ack();
+                    this.incomingEvents$.next({
+                        data: JSON.parse(message.data),
+                        id: message.id,
+                        attributes: message.attributes,
+                        correlationId: message.attributes.correlationId
                     });
-                },
-                (err) => {
-                    console.error('Failed to obtain EventStore subscription', err);
-                },
-                () => {
-                    console.log('GatewayEvents listener has completed!');
-                }
-            );
+                };
+                pubSubSubscription.on(`message`, this.onMessage);
+                pubSubSubscription.on('error', error => {
+                    console.error('@nebulae/event-store-tpi-rx6.PubSubBroker: Received error:', error);
+                });
+            },
+            (err) => {
+                console.error('Failed to obtain EventStore subscription', err);
+            },
+            () => {
+                console.log('GatewayEvents listener has completed!');
+            }
+        );
     }
 
 }

package/package.json

@@ -64,5 +64,5 @@
   "scripts": {
     "test": "mocha --recursive --reporter spec"
   },
-  "version": "1.1.5"
+  "version": "1.2.0"
 }