@rsdk/kafka.producer.direct 3.0.1-next.0 → 3.1.0-next.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.1.0-next.0](https://github.com/R-Vision/rsdk/compare/v3.0.2...v3.1.0-next.0) (2023-08-08)
+
+### Features
+
+* **kafka:** added option to consume by topic name ([#93](https://github.com/R-Vision/rsdk/issues/93)) ([09b4c1b](https://github.com/R-Vision/rsdk/commit/09b4c1bd515c1c2c3ccda17851fbe79e64ea8ac5))
+
+## [3.0.2](https://github.com/R-Vision/rsdk/compare/v3.0.1...v3.0.2) (2023-08-07)
+
+**Note:** Version bump only for package @rsdk/kafka.producer.direct
+
+## [3.0.1](https://github.com/R-Vision/rsdk/compare/v3.0.0...v3.0.1) (2023-08-07)
+
+### Bug Fixes
+
+* **deps:** correctly peerDependencies ([349628f](https://github.com/R-Vision/rsdk/commit/349628f10da46a30d6c8b9f9387e010869318212))
+
 ## [3.0.1-next.0](https://github.com/R-Vision/rsdk/compare/v3.0.0...v3.0.1-next.0) (2023-08-07)
 
 ### Bug Fixes

package/dist/direct.producer.d.ts

@@ -2,13 +2,13 @@ import type { EventType } from '@rsdk/kafka.common';
 import type { KafkaProducer, PublishOptions } from '@rsdk/kafka.producer';
 import { BaseProducer } from '@rsdk/kafka.producer';
 import type { Producer } from 'kafkajs';
-export declare class DirectProducer<T extends EventType> extends BaseProducer<T> implements KafkaProducer<T> {
+export declare class DirectProducer<T extends EventType, P = T extends EventType<infer P> ? P : never> extends BaseProducer<T, P> implements KafkaProducer<P> {
     readonly eventType: T;
     private readonly client;
     static logger: import("@rsdk/logging").ILogger;
     constructor(eventType: T, client: Producer);
     static getTopicName(eventType: EventType): string;
-    publish(payload: T, options?: PublishOptions): Promise<void>;
+    publish(payload: P, options?: PublishOptions): Promise<void>;
     private getMessage;
     private getPayload;
 }

package/dist/direct.producer.js.map

@@ -1 +1 @@
-{"version":3,"file":"direct.producer.js","sourceRoot":"","sources":["../src/direct.producer.ts"],"names":[],"mappings":";;;AACA,qDAAiE;AAEjE,yDAAoD;AACpD,2CAA8C;AAE9C,6CAAyC;AAEzC,MAAa,cACX,SAAQ,6BAAe;IAMH;IACD;IAJnB,MAAM,CAAC,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAErD,YACoB,SAAY,EACb,MAAgB;QAEjC,KAAK,CAAC,SAAS,CAAC,CAAC;QAHC,cAAS,GAAT,SAAS,CAAG;QACb,WAAM,GAAN,MAAM,CAAU;IAGnC,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,SAAoB;QACtC,OAAO,UAAU,SAAS,CAAC,MAAM,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAU,EAAE,OAAwB;QAChD,MAAM,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE9D,IAAI;YACF,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBACrB,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;aAC9C,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,0CAA2B,CAC7B,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,EAC3C;gBACE,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,OAAO;aACjB,CACF,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SACvB;IACH,CAAC;IAEO,UAAU,CAAC,OAAU,EAAE,OAAwB;QACrD,OAAO;YACL,OAAO,EAAE;gBACP,EAAE,EAAE,IAAA,wBAAU,GAAE;gBAChB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK;gBAC1B,GAAG,CAAC,OAAO,EAAE,QAAQ,IAAI;oBACvB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;iBAC3C,CAAC;aACH;YACD,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;gBAClB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE;gBAC3C,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC;aAC3C,CAAC;YACF,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;SAC5D,CAAC;IACJ,CAAC;IAEO,UAAU,CAAC,OAAU,EAAE,OAAwB;QACrD,OAAO,OAAO,EAAE,YAAY;YAC1B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;YAC9B,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACvE,CAAC;;AAzDH,wCA0DC"}
+{"version":3,"file":"direct.producer.js","sourceRoot":"","sources":["../src/direct.producer.ts"],"names":[],"mappings":";;;AACA,qDAAiE;AAEjE,yDAAoD;AACpD,2CAA8C;AAE9C,6CAAyC;AAEzC,MAAa,cAIX,SAAQ,6BAAkB;IAMN;IACD;IAJnB,MAAM,CAAC,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAErD,YACoB,SAAY,EACb,MAAgB;QAEjC,KAAK,CAAC,SAAS,CAAC,CAAC;QAHC,cAAS,GAAT,SAAS,CAAG;QACb,WAAM,GAAN,MAAM,CAAU;IAGnC,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,SAAoB;QACtC,OAAO,UAAU,SAAS,CAAC,MAAM,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,OAAU,EAAE,OAAwB;QAChD,MAAM,SAAS,GAAG,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAE9D,IAAI;YACF,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;gBACrB,KAAK,EAAE,SAAS;gBAChB,QAAQ,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;aAC9C,CAAC,CAAC;SACJ;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,0CAA2B,CAC7B,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,EAC3C;gBACE,KAAK,EAAE,KAAK;gBACZ,OAAO,EAAE,OAAO;aACjB,CACF,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SACvB;IACH,CAAC;IAEO,UAAU,CAAC,OAAU,EAAE,OAAwB;QACrD,OAAO;YACL,OAAO,EAAE;gBACP,EAAE,EAAE,IAAA,wBAAU,GAAE;gBAChB,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK;gBAC1B,GAAG,CAAC,OAAO,EAAE,QAAQ,IAAI;oBACvB,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC;iBAC3C,CAAC;aACH;YACD,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;gBAClB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE;gBAC3C,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC;aAC3C,CAAC;YACF,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;SAC5D,CAAC;IACJ,CAAC;IAEO,UAAU,CAAC,OAAU,EAAE,OAAwB;QACrD,OAAO,OAAO,EAAE,YAAY;YAC1B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC;YAC9B,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IACvE,CAAC;;AA5DH,wCA6DC"}

package/dist/metadata/autodoc.resolver.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.kafkaProducerDirectAutodocResolver = exports.KafkaProducerDirectAutodocResolver = void 0;
 const autodoc_protocol_1 = require("@rsdk/autodoc.protocol");
+const kafka_common_1 = require("@rsdk/kafka.common");
 const constants_1 = require("../constants");
 class KafkaProducerDirectAutodocResolver {
     getNode(rsdkMetadataProvider) {
@@ -9,11 +10,13 @@ class KafkaProducerDirectAutodocResolver {
         if (!resources) {
             return null;
         }
-        return new autodoc_protocol_1.Composite(new autodoc_protocol_1.Table(resources.map((resource) => {
+        return new autodoc_protocol_1.Composite(new autodoc_protocol_1.Table(resources
+            .filter((resource) => resource.value.type === kafka_common_1.KafkaTopicType.Produce)
+            .map((resource) => {
             const { topicName, group: group, partitionKeyField, eventType, } = resource.value;
             return {
                 TopicName: topicName,
-                Group: group,
+                Group: group ?? '-',
                 PartitionKeyField: partitionKeyField ?? '-',
                 EventType: eventType?.$type ?? '-',
             };

package/dist/metadata/autodoc.resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"autodoc.resolver.js","sourceRoot":"","sources":["../../src/metadata/autodoc.resolver.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAI1D,4CAAkE;AAElE,MAAa,kCAAkC;IAC7C,OAAO,CAAC,oBAA0C;QAChD,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CACxC,8CAAkC,CACnC,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,IAAI,CAAC;SACb;QAED,OAAO,IAAI,4BAAS,CAClB,IAAI,wBAAK,CACP,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YACzB,MAAM,EACJ,SAAS,EACT,KAAK,EAAE,KAAK,EACZ,iBAAiB,EACjB,SAAS,GACV,GAAG,QAAQ,CAAC,KAAK,CAAC;YAEnB,OAAO;gBACL,SAAS,EAAE,SAAS;gBACpB,KAAK,EAAE,KAAK;gBACZ,iBAAiB,EAAE,iBAAiB,IAAI,GAAG;gBAC3C,SAAS,EAAE,SAAS,EAAE,KAAK,IAAI,GAAG;aACnC,CAAC;QACJ,CAAC,CAAC,CACH,EACD,uBAAuB,CACxB,CAAC;IACJ,CAAC;CACF;AA/BD,gFA+BC;AAEY,QAAA,kCAAkC,GAC7C,IAAI,kCAAkC,EAAE,CAAC"}
+{"version":3,"file":"autodoc.resolver.js","sourceRoot":"","sources":["../../src/metadata/autodoc.resolver.ts"],"names":[],"mappings":";;;AACA,6DAA0D;AAE1D,qDAAoD;AAIpD,4CAAkE;AAElE,MAAa,kCAAkC;IAC7C,OAAO,CAAC,oBAA0C;QAChD,MAAM,SAAS,GAAG,oBAAoB,CAAC,GAAG,CACxC,8CAAkC,CACnC,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE;YACd,OAAO,IAAI,CAAC;SACb;QAED,OAAO,IAAI,4BAAS,CAClB,IAAI,wBAAK,CACP,SAAS;aACN,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,6BAAc,CAAC,OAAO,CAAC;aACpE,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChB,MAAM,EACJ,SAAS,EACT,KAAK,EAAE,KAAK,EACZ,iBAAiB,EACjB,SAAS,GACV,GAAkC,QAAQ,CAAC,KAAK,CAAC;YAElD,OAAO;gBACL,SAAS,EAAE,SAAS;gBACpB,KAAK,EAAE,KAAK,IAAI,GAAG;gBACnB,iBAAiB,EAAE,iBAAiB,IAAI,GAAG;gBAC3C,SAAS,EAAE,SAAS,EAAE,KAAK,IAAI,GAAG;aACnC,CAAC;QACJ,CAAC,CAAC,CACL,EACD,uBAAuB,CACxB,CAAC;IACJ,CAAC;CACF;AAjCD,gFAiCC;AAEY,QAAA,kCAAkC,GAC7C,IAAI,kCAAkC,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/kafka.producer.direct",
-  "version": "3.0.1-next.0",
+  "version": "3.1.0-next.0",
   "description": "Publishing messages directly to kafka",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -13,17 +13,17 @@
   "peerDependencies": {
     "@nestjs/common": "^10.1.3",
     "@nestjs/microservices": "^10.1.3",
-    "@rsdk/autodoc.protocol": "^3.0.0",
-    "@rsdk/common": "^3.0.0",
-    "@rsdk/core": "^3.0.1-next.0",
-    "@rsdk/kafka.common": "^3.0.1-next.0",
-    "@rsdk/kafka.producer": "^3.0.1-next.0",
-    "@rsdk/logging": "^3.0.0",
-    "@rsdk/metadata": "^3.0.0",
+    "@rsdk/autodoc.protocol": "^3.1.0-next.0",
+    "@rsdk/common": "^3.1.0-next.0",
+    "@rsdk/core": "^3.1.0-next.0",
+    "@rsdk/kafka.common": "^3.1.0-next.0",
+    "@rsdk/kafka.producer": "^3.1.0-next.0",
+    "@rsdk/logging": "^3.1.0-next.0",
+    "@rsdk/metadata": "^3.1.0-next.0",
     "kafkajs": "^2.2.4"
   },
   "dependencies": {
     "lodash": "^4.17.21"
   },
-  "gitHead": "fc4e33568c2e79d62977fc6e17175e08893cb196"
+  "gitHead": "55598931db264fb6d5b5c4787c48298ed86bbc0d"
 }

package/src/direct.producer.ts

@@ -6,9 +6,12 @@ import { LoggerFactory } from '@rsdk/logging';
 import type { Message, Producer } from 'kafkajs';
 import { randomUUID } from 'node:crypto';
 
-export class DirectProducer<T extends EventType>
-  extends BaseProducer<T>
-  implements KafkaProducer<T>
+export class DirectProducer<
+    T extends EventType,
+    P = T extends EventType<infer P> ? P : never,
+  >
+  extends BaseProducer<T, P>
+  implements KafkaProducer<P>
 {
   static logger = LoggerFactory.create(DirectProducer);
 
@@ -23,7 +26,7 @@ export class DirectProducer<T extends EventType>
     return `events.${eventType.$group}`;
   }
 
-  async publish(payload: T, options?: PublishOptions): Promise<void> {
+  async publish(payload: P, options?: PublishOptions): Promise<void> {
     const topicName = DirectProducer.getTopicName(this.eventType);
 
     try {
@@ -42,7 +45,7 @@ export class DirectProducer<T extends EventType>
     }
   }
 
-  private getMessage(payload: T, options?: PublishOptions): Message {
+  private getMessage(payload: P, options?: PublishOptions): Message {
     return {
       headers: {
         id: randomUUID(),
@@ -59,7 +62,7 @@ export class DirectProducer<T extends EventType>
     };
   }
 
-  private getPayload(payload: T, options?: PublishOptions): string {
+  private getPayload(payload: P, options?: PublishOptions): string {
     return options?.partitionKey
       ? String(options.partitionKey)
       : this.getPartitionKey(payload, this.eventType.$partitionKeyField);

package/src/metadata/autodoc.resolver.ts

@@ -1,6 +1,8 @@
 import type { DocumentResolver } from '@rsdk/autodoc.protocol';
 import { Composite, Table } from '@rsdk/autodoc.protocol';
 import type { KafkaTopicMetadata } from '@rsdk/kafka.common';
+import { KafkaTopicType } from '@rsdk/kafka.common';
+import type { KafkaTopicMetadataByEventType } from '@rsdk/kafka.common/dist/metadata/kafka.metadata';
 import type { RsdkMetadataProvider } from '@rsdk/metadata';
 
 import { KAFKA_PRODUCED_RSDK_METADATA_SCOPE } from '../constants';
@@ -17,21 +19,23 @@ export class KafkaProducerDirectAutodocResolver implements DocumentResolver {
 
     return new Composite(
       new Table(
-        resources.map((resource) => {
-          const {
-            topicName,
-            group: group,
-            partitionKeyField,
-            eventType,
-          } = resource.value;
+        resources
+          .filter((resource) => resource.value.type === KafkaTopicType.Produce)
+          .map((resource) => {
+            const {
+              topicName,
+              group: group,
+              partitionKeyField,
+              eventType,
+            } = <KafkaTopicMetadataByEventType>resource.value;
 
-          return {
-            TopicName: topicName,
-            Group: group,
-            PartitionKeyField: partitionKeyField ?? '-',
-            EventType: eventType?.$type ?? '-',
-          };
-        }),
+            return {
+              TopicName: topicName,
+              Group: group ?? '-',
+              PartitionKeyField: partitionKeyField ?? '-',
+              EventType: eventType?.$type ?? '-',
+            };
+          }),
       ),
       'Kafka producer direct',
     );