@rsdk/kafka.common 3.5.0-next.2 → 3.5.0-next.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/client/kafka.client.js +3 -1
  3. package/dist/client/kafka.client.js.map +1 -1
  4. package/dist/client/kafka.healthcheck.js +3 -1
  5. package/dist/client/kafka.healthcheck.js.map +1 -1
  6. package/dist/index.d.ts +1 -0
  7. package/dist/index.js +3 -1
  8. package/dist/index.js.map +1 -1
  9. package/dist/retry-policy.d.ts +6 -0
  10. package/dist/retry-policy.js +10 -0
  11. package/dist/retry-policy.js.map +1 -0
  12. package/package.json +6 -6
  13. package/src/client/kafka.client.ts +3 -1
  14. package/src/client/kafka.healthcheck.ts +3 -1
  15. package/src/index.ts +2 -0
  16. package/src/retry-policy.ts +6 -0
package/CHANGELOG.md CHANGED
@@ -3,6 +3,14 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [3.5.0-next.7](https://github.com/R-Vision/rsdk/compare/v3.5.0-next.6...v3.5.0-next.7) (2023-10-02)
7
+
8
+ **Note:** Version bump only for package @rsdk/kafka.common
9
+
10
+ ## [3.5.0-next.5](https://github.com/R-Vision/rsdk/compare/v3.5.0-next.4...v3.5.0-next.5) (2023-10-02)
11
+
12
+ **Note:** Version bump only for package @rsdk/kafka.common
13
+
6
14
  ## [3.5.0-next.2](https://github.com/R-Vision/rsdk/compare/v3.5.0-next.1...v3.5.0-next.2) (2023-09-26)
7
15
 
8
16
  **Note:** Version bump only for package @rsdk/kafka.common
package/dist/client/kafka.client.js CHANGED
@@ -6,6 +6,7 @@ const core_1 = require("@rsdk/core");
6
6
  const logging_1 = require("@rsdk/logging");
7
7
  const kafkajs_1 = require("kafkajs");
8
8
  const create_logger_adapter_fn_1 = require("../create-logger-adapter.fn");
9
+ const retry_policy_1 = require("../retry-policy");
9
10
  const kafka_config_1 = require("./kafka.config");
10
11
  exports.KAFKA_CLIENT_INJECTION_TOKEN = Symbol('KafkaClient');
11
12
  exports.KAFKA_PRODUCER_INJECTION_TOKEN = Symbol('KafkaProducer');
@@ -22,6 +23,7 @@ exports.KafkaClient = {
22
23
  clientId: `${name}-${process.pid}`,
23
24
  brokers: config.brokers,
24
25
  logCreator: (0, create_logger_adapter_fn_1.createLoggerAdapter)(logger),
26
+ retry: retry_policy_1.retryPolicy,
25
27
  });
26
28
  },
27
29
  };
@@ -32,7 +34,7 @@ exports.KafkaProducer = {
32
34
  const producer = kafka.producer({
33
35
  allowAutoTopicCreation: false,
34
36
  createPartitioner: kafkajs_1.Partitioners.DefaultPartitioner,
35
- retry: { retries: 0 },
37
+ retry: { retries: 1 },
36
38
  });
37
39
  await producer.connect();
38
40
  return { ...producer, onModuleDestroy: () => producer.disconnect() };
package/dist/client/kafka.client.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"kafka.client.js","sourceRoot":"","sources":["../../src/client/kafka.client.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,qCAAsC;AACtC,2CAA8C;AAE9C,qCAA8C;AAE9C,0EAAkE;AAElE,iDAA6C;AAEhC,QAAA,4BAA4B,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AACrD,QAAA,8BAA8B,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAE/D,MAAM,WAAW,GAAG,GAAuB,EAAE,CAClD,IAAA,eAAM,EAAC,oCAA4B,CAAC,CAAC;AAD1B,QAAA,WAAW,eACe;AAChC,MAAM,mBAAmB,GAAG,GAAuB,EAAE,CAC1D,IAAA,eAAM,EAAC,sCAA8B,CAAC,CAAC;AAD5B,QAAA,mBAAmB,uBACS;AAE5B,QAAA,WAAW,GAAoB;IAC1C,MAAM,EAAE,CAAC,0BAAW,EAAE,eAAQ,CAAC;IAC/B,OAAO,EAAE,oCAA4B;IACrC,UAAU,CAAC,MAAmB,EAAE,IAAY;QAC1C,MAAM,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAE3D,OAAO,IAAI,eAAK,CAAC;YACf,QAAQ,EAAE,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE;YAClC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,UAAU,EAAE,IAAA,8CAAmB,EAAC,MAAM,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEW,QAAA,aAAa,GAAoB;IAC5C,MAAM,EAAE,CAAC,oCAA4B,CAAC;IACtC,OAAO,EAAE,sCAA8B;IACvC,KAAK,CAAC,UAAU,CAAC,KAAY;QAC3B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC9B,sBAAsB,EAAE,KAAK;YAC7B,iBAAiB,EAAE,sBAAY,CAAC,kBAAkB;YAClD,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzB,OAAO,EAAE,GAAG,QAAQ,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC;IACvE,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"kafka.client.js","sourceRoot":"","sources":["../../src/client/kafka.client.ts"],"names":[],"mappings":";;;AACA,2CAAwC;AACxC,qCAAsC;AACtC,2CAA8C;AAE9C,qCAA8C;AAE9C,0EAAkE;AAClE,kDAA8C;AAE9C,iDAA6C;AAEhC,QAAA,4BAA4B,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;AACrD,QAAA,8BAA8B,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAE/D,MAAM,WAAW,GAAG,GAAuB,EAAE,CAClD,IAAA,eAAM,EAAC,oCAA4B,CAAC,CAAC;AAD1B,QAAA,WAAW,eACe;AAChC,MAAM,mBAAmB,GAAG,GAAuB,EAAE,CAC1D,IAAA,eAAM,EAAC,sCAA8B,CAAC,CAAC;AAD5B,QAAA,mBAAmB,uBACS;AAE5B,QAAA,WAAW,GAAoB;IAC1C,MAAM,EAAE,CAAC,0BAAW,EAAE,eAAQ,CAAC;IAC/B,OAAO,EAAE,oCAA4B;IACrC,UAAU,CAAC,MAAmB,EAAE,IAAY;QAC1C,MAAM,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAE3D,OAAO,IAAI,eAAK,CAAC;YACf,QAAQ,EAAE,GAAG,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE;YAClC,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,UAAU,EAAE,IAAA,8CAAmB,EAAC,MAAM,CAAC;YACvC,KAAK,EAAE,0BAAW;SACnB,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEW,QAAA,aAAa,GAAoB;IAC5C,MAAM,EAAE,CAAC,oCAA4B,CAAC;IACtC,OAAO,EAAE,sCAA8B;IACvC,KAAK,CAAC,UAAU,CAAC,KAAY;QAC3B,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;YAC9B,sBAAsB,EAAE,KAAK;YAC7B,iBAAiB,EAAE,sBAAY,CAAC,kBAAkB;YAClD,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzB,OAAO,EAAE,GAAG,QAAQ,EAAE,eAAe,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC;IACvE,CAAC;CACF,CAAC"}
package/dist/client/kafka.healthcheck.js CHANGED
@@ -10,7 +10,9 @@ class KafkaHealthcheck {
10
10
  this.neededTopics = neededTopics;
11
11
  }
12
12
  async getMissingTopics() {
13
- const admin = this.kafkaClient.admin();
13
+ const admin = this.kafkaClient.admin({
14
+ retry: { retries: 1 },
15
+ });
14
16
  await admin.connect();
15
17
  const topics = await admin.listTopics();
16
18
  await admin.disconnect();
package/dist/client/kafka.healthcheck.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"kafka.healthcheck.js","sourceRoot":"","sources":["../../src/client/kafka.healthcheck.ts"],"names":[],"mappings":";;;AAAA,qCAAyC;AAGzC,MAAa,gBAAgB;IAEhB;IACA;IAFX,YACW,WAAkB,EAClB,YAAsB;QADtB,gBAAW,GAAX,WAAW,CAAO;QAClB,iBAAY,GAAZ,YAAY,CAAU;IAC9B,CAAC;IAEJ,KAAK,CAAC,gBAAgB;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;QAEvC,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QAEtB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;QAExC,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAC7B,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAC/C,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,OAAO,kBAAW,CAAC,IAAI,CAAC;oBACtB,aAAa;iBACd,CAAC,CAAC;aACJ;YACD,OAAO,kBAAW,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SAC3B;QAAC,OAAO,KAAc,EAAE;YACvB,OAAO,kBAAW,CAAC,IAAI,CAAC;gBACtB,KAAK,EAAG,KAAe,CAAC,OAAO;aAChC,CAAC,CAAC;SACJ;IACH,CAAC;CACF;AAlCD,4CAkCC"}
1
+ {"version":3,"file":"kafka.healthcheck.js","sourceRoot":"","sources":["../../src/client/kafka.healthcheck.ts"],"names":[],"mappings":";;;AAAA,qCAAyC;AAGzC,MAAa,gBAAgB;IAEhB;IACA;IAFX,YACW,WAAkB,EAClB,YAAsB;QADtB,gBAAW,GAAX,WAAW,CAAO;QAClB,iBAAY,GAAZ,YAAY,CAAU;IAC9B,CAAC;IAEJ,KAAK,CAAC,gBAAgB;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;YACnC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE;SACtB,CAAC,CAAC;QAEH,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QAEtB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;QAExC,MAAM,KAAK,CAAC,UAAU,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAC7B,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAC/C,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACpD,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC5B,OAAO,kBAAW,CAAC,IAAI,CAAC;oBACtB,aAAa;iBACd,CAAC,CAAC;aACJ;YACD,OAAO,kBAAW,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SAC3B;QAAC,OAAO,KAAc,EAAE;YACvB,OAAO,kBAAW,CAAC,IAAI,CAAC;gBACtB,KAAK,EAAG,KAAe,CAAC,OAAO;aAChC,CAAC,CAAC;SACJ;IACH,CAAC;CACF;AApCD,4CAoCC"}
package/dist/index.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ export { retryPolicy } from './retry-policy';
1
2
  export { KAFKA_PRODUCER_INJECTION_TOKEN, KAFKA_CLIENT_INJECTION_TOKEN, } from './client/kafka.client';
2
3
  export { KafkaClientModule } from './client/kafka-client.module';
3
4
  export { KafkaConfig } from './client/kafka.config';
package/dist/index.js CHANGED
@@ -1,6 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.KafkaHealthcheck = exports.isEventType = exports.getTopicName = exports.createLoggerAdapter = exports.ServerKafkaExceptionFactory = exports.KafkaTopicType = exports.KAFKA_TOPIC_RSDK_METADATA_SCOPE = exports.KafkaMetadataProvider = exports.KafkaMetadataModule = exports.KafkaConfig = exports.KafkaClientModule = exports.KAFKA_CLIENT_INJECTION_TOKEN = exports.KAFKA_PRODUCER_INJECTION_TOKEN = void 0;
3
+ exports.KafkaHealthcheck = exports.isEventType = exports.getTopicName = exports.createLoggerAdapter = exports.ServerKafkaExceptionFactory = exports.KafkaTopicType = exports.KAFKA_TOPIC_RSDK_METADATA_SCOPE = exports.KafkaMetadataProvider = exports.KafkaMetadataModule = exports.KafkaConfig = exports.KafkaClientModule = exports.KAFKA_CLIENT_INJECTION_TOKEN = exports.KAFKA_PRODUCER_INJECTION_TOKEN = exports.retryPolicy = void 0;
4
+ var retry_policy_1 = require("./retry-policy");
5
+ Object.defineProperty(exports, "retryPolicy", { enumerable: true, get: function () { return retry_policy_1.retryPolicy; } });
4
6
  var kafka_client_1 = require("./client/kafka.client");
5
7
  Object.defineProperty(exports, "KAFKA_PRODUCER_INJECTION_TOKEN", { enumerable: true, get: function () { return kafka_client_1.KAFKA_PRODUCER_INJECTION_TOKEN; } });
6
8
  Object.defineProperty(exports, "KAFKA_CLIENT_INJECTION_TOKEN", { enumerable: true, get: function () { return kafka_client_1.KAFKA_CLIENT_INJECTION_TOKEN; } });
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,sDAG+B;AAF7B,8HAAA,8BAA8B,OAAA;AAC9B,4HAAA,4BAA4B,OAAA;AAG9B,oEAAiE;AAAxD,wHAAA,iBAAiB,OAAA;AAE1B,sDAAoD;AAA3C,2GAAA,WAAW,OAAA;AAEpB,0EAAuE;AAA9D,4HAAA,mBAAmB,OAAA;AAE5B,8EAA2E;AAAlE,gIAAA,qBAAqB,OAAA;AAC9B,4DAImC;AAHjC,iIAAA,+BAA+B,OAAA;AAE/B,gHAAA,cAAc,OAAA;AAGhB,yCAA0D;AAAjD,wHAAA,2BAA2B,OAAA;AAEpC,uEAAiE;AAAxD,+HAAA,mBAAmB,OAAA;AAE5B,2CAAoE;AAA3D,0GAAA,YAAY,OAAA;AAAE,yGAAA,WAAW,OAAA;AAElC,gEAA8D;AAArD,qHAAA,gBAAgB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AAEpB,sDAG+B;AAF7B,8HAAA,8BAA8B,OAAA;AAC9B,4HAAA,4BAA4B,OAAA;AAG9B,oEAAiE;AAAxD,wHAAA,iBAAiB,OAAA;AAE1B,sDAAoD;AAA3C,2GAAA,WAAW,OAAA;AAEpB,0EAAuE;AAA9D,4HAAA,mBAAmB,OAAA;AAE5B,8EAA2E;AAAlE,gIAAA,qBAAqB,OAAA;AAC9B,4DAImC;AAHjC,iIAAA,+BAA+B,OAAA;AAE/B,gHAAA,cAAc,OAAA;AAGhB,yCAA0D;AAAjD,wHAAA,2BAA2B,OAAA;AAEpC,uEAAiE;AAAxD,+HAAA,mBAAmB,OAAA;AAE5B,2CAAoE;AAA3D,0GAAA,YAAY,OAAA;AAAE,yGAAA,WAAW,OAAA;AAElC,gEAA8D;AAArD,qHAAA,gBAAgB,OAAA"}
package/dist/retry-policy.d.ts ADDED
@@ -0,0 +1,6 @@
1
+ export declare const retryPolicy: {
2
+ maxRetryTime: number;
3
+ retries: number;
4
+ factor: number;
5
+ multiplier: number;
6
+ };
package/dist/retry-policy.js ADDED
@@ -0,0 +1,10 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.retryPolicy = void 0;
4
+ exports.retryPolicy = {
5
+ maxRetryTime: 1e3,
6
+ retries: Number.POSITIVE_INFINITY,
7
+ factor: 0,
8
+ multiplier: 10,
9
+ };
10
+ //# sourceMappingURL=retry-policy.js.map
package/dist/retry-policy.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"retry-policy.js","sourceRoot":"","sources":["../src/retry-policy.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG;IACzB,YAAY,EAAE,GAAG;IACjB,OAAO,EAAE,MAAM,CAAC,iBAAiB;IACjC,MAAM,EAAE,CAAC;IACT,UAAU,EAAE,EAAE;CACf,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/kafka.common",
3
- "version": "3.5.0-next.2",
3
+ "version": "3.5.0-next.7",
4
4
  "description": "Common functionality for kafka consumers and producers",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -13,10 +13,10 @@
13
13
  "peerDependencies": {
14
14
  "@nestjs/common": "^10.1.3",
15
15
  "@nestjs/microservices": "^10.1.3",
16
- "@rsdk/common": "^3.5.0-next.2",
17
- "@rsdk/core": "^3.5.0-next.2",
18
- "@rsdk/logging": "^3.5.0-next.2",
19
- "@rsdk/metadata": "^3.5.0-next.2",
16
+ "@rsdk/common": "^3.5.0-next.7",
17
+ "@rsdk/core": "^3.5.0-next.7",
18
+ "@rsdk/logging": "^3.5.0-next.7",
19
+ "@rsdk/metadata": "^3.5.0-next.7",
20
20
  "kafkajs": "^2.2.4",
21
21
  "lodash": "^4.17.21",
22
22
  "rxjs": "^7.0.0"
@@ -24,5 +24,5 @@
24
24
  "dependencies": {
25
25
  "protobufjs": "^7.2.3"
26
26
  },
27
- "gitHead": "679a45fa51732a95140255b41dabe7b34f95f055"
27
+ "gitHead": "d45507843068602defe1eabcd11a918aaa837d39"
28
28
  }
package/src/client/kafka.client.ts CHANGED
@@ -6,6 +6,7 @@ import type { Producer } from 'kafkajs';
6
6
  import { Kafka, Partitioners } from 'kafkajs';
7
7
 
8
8
  import { createLoggerAdapter } from '../create-logger-adapter.fn';
9
+ import { retryPolicy } from '../retry-policy';
9
10
 
10
11
  import { KafkaConfig } from './kafka.config';
11
12
 
@@ -27,6 +28,7 @@ export const KafkaClient: FactoryProvider = {
27
28
  clientId: `${name}-${process.pid}`,
28
29
  brokers: config.brokers,
29
30
  logCreator: createLoggerAdapter(logger),
31
+ retry: retryPolicy,
30
32
  });
31
33
  },
32
34
  };
@@ -38,7 +40,7 @@ export const KafkaProducer: FactoryProvider = {
38
40
  const producer = kafka.producer({
39
41
  allowAutoTopicCreation: false,
40
42
  createPartitioner: Partitioners.DefaultPartitioner,
41
- retry: { retries: 0 },
43
+ retry: { retries: 1 },
42
44
  });
43
45
 
44
46
  await producer.connect();
package/src/client/kafka.healthcheck.ts CHANGED
@@ -8,7 +8,9 @@ export class KafkaHealthcheck {
8
8
  ) {}
9
9
 
10
10
  async getMissingTopics(): Promise<string[]> {
11
- const admin = this.kafkaClient.admin();
11
+ const admin = this.kafkaClient.admin({
12
+ retry: { retries: 1 },
13
+ });
12
14
 
13
15
  await admin.connect();
14
16
 
package/src/index.ts CHANGED
@@ -1,3 +1,5 @@
1
+ export { retryPolicy } from './retry-policy';
2
+
1
3
  export {
2
4
  KAFKA_PRODUCER_INJECTION_TOKEN,
3
5
  KAFKA_CLIENT_INJECTION_TOKEN,
package/src/retry-policy.ts ADDED
@@ -0,0 +1,6 @@
1
+ export const retryPolicy = {
2
+ maxRetryTime: 1e3,
3
+ retries: Number.POSITIVE_INFINITY,
4
+ factor: 0,
5
+ multiplier: 10,
6
+ };