Merge pull request #16 from p-fedyukovich/feature/bump-deps

feat: bumped nestjs and pubsub
p-fedyukovich · Sep 28, 2022 · 47b1833 · 47b1833
2 parents cc01e4c + 5b331f5
commit 47b1833
Show file tree

Hide file tree

Showing 6 changed files with 636 additions and 405 deletions.
diff --git a/lib/gc-pubsub.client.spec.ts b/lib/gc-pubsub.client.spec.ts
@@ -24,7 +24,7 @@ describe('GCPubSubClient', () => {
     topicMock = {
       create: sandbox.stub().resolves(),
       flush: sandbox.stub().callsFake((callback) => callback()),
-      publishJSON: sandbox.stub().resolves(),
+      publishMessage: sandbox.stub().resolves(),
       subscription: sandbox.stub().returns(subscriptionMock),
     };
 
@@ -103,8 +103,8 @@ describe('GCPubSubClient', () => {
     });
     it('should send message to a proper topic', () => {
       client['publish'](msg, () => {
-        expect(topicMock.publishJSON.called).to.be.true;
-        expect(topicMock.publishJSON.getCall(0).args[0]).to.be.eql(msg);
+        expect(topicMock.publishMessage.called).to.be.true;
+        expect(topicMock.publishMessage.getCall(0).args[0].json).to.be.eql(msg);
       });
     });
     describe('on dispose', () => {
@@ -202,10 +202,10 @@ describe('GCPubSubClient', () => {
     });
     it('should publish packet', async () => {
       await client['dispatchEvent'](msg);
-      expect(topicMock.publishJSON.called).to.be.true;
+      expect(topicMock.publishMessage.called).to.be.true;
     });
     it('should throw error', async () => {
-      topicMock.publishJSON.callsFake((a: any, b: any, c: any, d: any) =>
+      topicMock.publishMessage.callsFake((a: any, b: any, c: any, d: any) =>
         d(new Error()),
       );
       client['dispatchEvent'](msg).catch((err) =>

diff --git a/lib/gc-pubsub.client.ts b/lib/gc-pubsub.client.ts
@@ -125,7 +125,7 @@ export class GCPubSubClient extends ClientProxy {
     });
 
     if (this.topic) {
-      await this.topic.publishJSON(serializedPacket);
+      await this.topic.publishMessage({ json: serializedPacket });
     }
   }
 
@@ -141,8 +141,9 @@ export class GCPubSubClient extends ClientProxy {
 
       if (this.topic) {
         this.topic
-          .publishJSON(serializedPacket, {
-            replyTo: this.replyTopicName,
+          .publishMessage({
+            json: serializedPacket,
+            attributes: { replyTo: this.replyTopicName },
           })
           .catch((err) => callback({ err }));
       } else {

diff --git a/lib/gc-pubsub.server.spec.ts b/lib/gc-pubsub.server.spec.ts
@@ -29,7 +29,7 @@ describe('GCPubSubServer', () => {
     topicMock = {
       create: sandbox.stub().resolves(),
       flush: sandbox.stub().callsFake((callback) => callback()),
-      publishJSON: sandbox.stub().resolves(),
+      publishMessage: sandbox.stub().resolves(),
       subscription: sandbox.stub().returns(subscriptionMock),
     };
 
@@ -106,10 +106,12 @@ describe('GCPubSubServer', () => {
         data: Buffer.from(JSON.stringify(msg)),
       });
       expect(
-        topicMock.publishJSON.calledWith({
-          id: msg.id,
-          status: 'error',
-          err: NO_MESSAGE_HANDLER,
+        topicMock.publishMessage.calledWith({
+          json: {
+            id: msg.id,
+            status: 'error',
+            err: NO_MESSAGE_HANDLER,
+          },
         }),
       ).to.be.true;
     });
@@ -146,7 +148,9 @@ describe('GCPubSubServer', () => {
 
       await server.sendMessage(message, replyTo, correlationId);
       expect(
-        topicMock.publishJSON.calledWith({ ...message, id: correlationId }),
+        topicMock.publishMessage.calledWith({
+          json: { ...message, id: correlationId },
+        }),
       ).to.be.true;
     });
   });

diff --git a/lib/gc-pubsub.server.ts b/lib/gc-pubsub.server.ts
@@ -173,7 +173,7 @@ export class GCPubSubServer extends Server implements CustomTransportStrategy {
 
     await this.client
       .topic(replyTo, this.publisherConfig)
-      .publishJSON(outgoingResponse);
+      .publishMessage({ json: outgoingResponse });
   }
 
   public async createIfNotExists(create: () => Promise<any>) {

diff --git a/package.json b/package.json
@@ -32,12 +32,12 @@
   "devDependencies": {
     "@commitlint/cli": "11.0.0",
     "@commitlint/config-angular": "11.0.0",
-    "@google-cloud/pubsub": "2.19.0",
-    "@nestjs/common": "8.0.6",
-    "@nestjs/core": "8.0.6",
-    "@nestjs/microservices": "8.0.6",
-    "@nestjs/platform-express": "8.0.6",
-    "@nestjs/testing": "8.0.6",
+    "@google-cloud/pubsub": "3.2.0",
+    "@nestjs/common": "^9.0.0",
+    "@nestjs/core": "^9.0.0",
+    "@nestjs/microservices": "^9.0.0",
+    "@nestjs/platform-express": "^9.0.0",
+    "@nestjs/testing": "^9.0.0",
     "@types/chai": "^4.2.21",
     "@types/jest": "27.0.1",
     "@types/node": "12.12.6",
@@ -64,10 +64,10 @@
     "typescript": "4.4.3"
   },
   "peerDependencies": {
-    "@google-cloud/pubsub": "^2.0.0",
-    "@nestjs/common": "^8.0.0",
-    "@nestjs/core": "^8.0.0",
-    "@nestjs/microservices": "^8.0.0",
+    "@google-cloud/pubsub": "^3.0.0",
+    "@nestjs/common": "^9.0.0",
+    "@nestjs/core": "^9.0.0",
+    "@nestjs/microservices": "^9.0.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.0.0"
   },