@orion-js/echoes 3.5.0 → 3.6.0

package/lib/request/index.js

@@ -19,6 +19,8 @@ async function request(options) {
         const requestMaker = config_1.default?.requests?.makeRequest || makeRequest_1.makeRequest;
         const requestOptions = {
             url: (0, getURL_1.default)(service),
+            retries: options.retries,
+            timeout: options.timeout,
             data: {
                 body,
                 signature

package/lib/request/makeRequest.js

@@ -5,15 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeRequest = void 0;
 const axios_1 = __importDefault(require("axios"));
+const helpers_1 = require("@orion-js/helpers");
 const makeRequest = async (options) => {
-    const result = await (0, axios_1.default)({
-        method: 'post',
-        url: options.url,
-        headers: {
-            'User-Agent': 'Orionjs-Echoes/1.1'
-        },
-        data: options.data
-    });
+    const result = await (0, helpers_1.executeWithRetries)(async () => {
+        return await (0, axios_1.default)({
+            method: 'post',
+            url: options.url,
+            timeout: options.timeout,
+            headers: {
+                'User-Agent': 'Orionjs-Echoes/1.1'
+            },
+            data: options.data
+        });
+    }, options.retries, 200);
     return {
         data: result.data,
         statusCode: result.status

package/lib/startService/index.d.ts

@@ -1,2 +1,2 @@
 import { EchoesOptions } from '../types';
-export default function (options: EchoesOptions): void;
+export default function startService(options: EchoesOptions): Promise<void>;

package/lib/startService/index.js

@@ -8,7 +8,7 @@ const config_1 = __importDefault(require("../config"));
 const requestsHandler_1 = __importDefault(require("../requestsHandler"));
 const types_1 = __importDefault(require("../echo/types"));
 const http_1 = require("@orion-js/http");
-function default_1(options) {
+async function startService(options) {
     config_1.default.echoes = options.echoes;
     if (options.requests) {
         config_1.default.requests = options.requests;
@@ -18,13 +18,16 @@ function default_1(options) {
         const kafka = new kafkajs_1.Kafka(options.client);
         config_1.default.producer = kafka.producer(options.producer);
         config_1.default.consumer = kafka.consumer(options.consumer);
-        config_1.default.producer.connect();
-        config_1.default.consumer.connect();
+        await config_1.default.producer.connect();
+        await config_1.default.consumer.connect();
         for (const topic in options.echoes) {
             const echo = options.echoes[topic];
             if (echo.type !== types_1.default.event)
                 continue;
-            config_1.default.consumer.subscribe({ topic });
+            await config_1.default.consumer.subscribe({
+                topic,
+                fromBeginning: options.readTopicsFromBeginning === false ? false : true
+            });
         }
         config_1.default.consumer.run({
             eachMessage: async (payload) => {
@@ -38,4 +41,4 @@ function default_1(options) {
         });
     }
 }
-exports.default = default_1;
+exports.default = startService;

package/lib/types.d.ts

@@ -17,6 +17,8 @@ export interface RequestOptions<TParams> {
     method: string;
     service: string;
     params: TParams;
+    retries?: number;
+    timeout?: number;
 }
 export interface RequestHandlerResponse {
     result?: any;
@@ -24,6 +26,8 @@ export interface RequestHandlerResponse {
 }
 export interface MakeRequestParams {
     url: string;
+    retries?: number;
+    timeout?: number;
     data: {
         body: object;
         signature: string;
@@ -64,6 +68,10 @@ export interface EchoesOptions {
     consumer?: ConsumerConfig;
     requests?: RequestsConfig;
     echoes: EchoesMap;
+    /**
+     * Defaults to true. When true, allows a reconnecting service to read missed messages.
+     */
+    readTopicsFromBeginning?: boolean;
 }
 export interface EchoesConfigHandler {
     producer?: Producer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/echoes",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -18,9 +18,9 @@
   },
   "dependencies": {
     "@orion-js/env": "^3.5.0",
-    "@orion-js/helpers": "^3.5.0",
-    "@orion-js/http": "^3.5.0",
-    "@orion-js/services": "^3.5.0",
+    "@orion-js/helpers": "^3.5.3",
+    "@orion-js/http": "^3.6.0",
+    "@orion-js/services": "^3.5.3",
     "axios": "^0.24.0",
     "jssha": "^3.2.0",
     "kafkajs": "^1.15.0",
@@ -40,5 +40,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6fc8b0e40fad04d7ff84cf0849cbf260a66b6641"
+  "gitHead": "420961a09399dd52f21c3e5ec756fb3e5bda0dc3"
 }