@nebulae/event-store-tpi-rx6 1.1.3 → 1.1.4

package/lib/broker/PubSubBroker.js

@@ -1,10 +1,10 @@
 'use strict'
 
 const Rx = require('rxjs');
-const { filter, map} = require('rxjs/operators');
+const { filter, map } = require('rxjs/operators');
 // Imports the Google Cloud client library
 const uuidv4 = require('uuid/v4');
-const PubSub = require('@google-cloud/pubsub');
+const { PubSub } = require('@google-cloud/pubsub');
 
 class PubSubBroker {
 
@@ -12,7 +12,6 @@ class PubSubBroker {
         //this.projectId = projectId;
         this.eventsTopic = eventsTopic;
         this.eventsTopicSubscription = eventsTopicSubscription;
-
         /**
          * Rx Subject for every incoming event
          */
@@ -20,29 +19,19 @@ class PubSubBroker {
         this.orderedIncomingEvents$ = this.incomingEvents$.pipe(
             filter(msg => msg)
         )
-            // .groupBy(msg => msg.data.at)
-            // .mergeMap(groupStream =>
-            //     groupStream.bufferWhen(() => groupStream.debounceTime(250))
-            //         .filter(bufferedArray => bufferedArray && bufferedArray.length > 0)
-            //         .map(bufferedArray => bufferedArray.sort((o1, o2) => { return o1.data.av - o2.data.av }))
-            //         .mergeMap(bufferedArray => Rx.Observable.from(bufferedArray))
-            // );
         this.senderId = uuidv4();
-
-        this.pubsubClient = new PubSub({
-            //projectId: projectId,
-        });
-
-        this.topic = this.pubsubClient.topic(eventsTopic);
+        this.pubsubClient = new PubSub({});
     }
 
     /**
      * Starts Broker connections
      * Returns an Obserable that resolves to each connection result
      */
-    start$() {
-        return Rx.Observable.create(observer => {
-            this.startMessageListener();
+    start$() {        
+        return new Rx.Observable(async (observer) => {
+            const [topic] = await this.pubsubClient.createTopic(this.eventsTopic);
+            this.topic = topic;
+            this.startMessageListener(topic);
             observer.next(`Event Store PubSub Broker listening: Topic=${this.eventsTopic}, subscriptionName=${this.eventsTopicSubscription}`);
             observer.complete();
         });
@@ -78,11 +67,12 @@ class PubSubBroker {
     publish$(data) {
         const dataBuffer = Buffer.from(JSON.stringify(data));
         return Rx.defer(() =>
-            this.topic.publisher().publish(
-                dataBuffer,
-                { senderId: this.senderId }))
-            //.do(messageId => console.log(`PubSub Message published through ${this.topic.name}, Message=${JSON.stringify(data)}`))
-            ;
+            this.topic.publishMessage(
+                {
+                    data: dataBuffer,
+                    attributes: { senderId: this.senderId }
+                }
+            ));
     }
 
     /**
@@ -102,33 +92,32 @@ class PubSubBroker {
     /**
      * Returns an Observable that resolves to the subscription
      */
-    getSubscription$() {
-        return Rx.defer(() =>
-            this.topic.subscription(this.eventsTopicSubscription)
-                .get({ autoCreate: true })).pipe(
-                    map(results => results[0])
-                );
+    getSubscription$(topic) {
+        return Rx.defer(() => (topic || this.topic).createSubscription(this.eventsTopicSubscription)).pipe(
+            map(([subscription]) => subscription),
+        );
     }
 
     /**
      * Starts to listen messages
      */
-    startMessageListener() {
-        this.messageListenerSubscription = this.getSubscription$()
+    startMessageListener(topic) {
+        this.messageListenerSubscription = this.getSubscription$(topic)
             .subscribe(
                 (pubSubSubscription) => {
                     this.onMessage = message => {
                         message.ack();
-                        //console.log(`Received message ${message.id}:`);                                                
                         this.incomingEvents$.next({
                             data: JSON.parse(message.data),
                             id: message.id,
                             attributes: message.attributes,
                             correlationId: message.attributes.correlationId
                         });
-                        //console.log(`Execute ack message ${message.id}:`);                                                                                  
                     };
                     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);

package/package.json

@@ -35,7 +35,7 @@
     "url": "https://github.com/NebulaEngineering/event-store-tpi-rx6/issues"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^0.18.0",
+    "@google-cloud/pubsub": "^2.19.4",
     "async-mqtt": "^1.0.1",
     "dotenv": "^5.0.1",
     "mongodb": "^3.0.5",
@@ -64,5 +64,5 @@
   "scripts": {
     "test": "mocha --recursive --reporter spec"
   },
-  "version": "1.1.3"
+  "version": "1.1.4"
 }