@hazeljs/discovery 0.2.0-beta.39 → 0.2.0-beta.42

package/README.md

@@ -3,6 +3,7 @@
 Service Discovery and Registry for HazelJS microservices - inspired by Netflix Eureka and Consul.
 
 [![npm version](https://img.shields.io/npm/v/@hazeljs/discovery.svg)](https://www.npmjs.com/package/@hazeljs/discovery)
+[![npm downloads](https://img.shields.io/npm/dm/@hazeljs/discovery)](https://www.npmjs.com/package/@hazeljs/discovery)
 [![License: Apache-2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 
 ## Features

package/dist/__tests__/service-client.test.js

@@ -139,7 +139,8 @@ describe('ServiceClient', () => {
             const mockRequest = jest.fn().mockRejectedValue(new Error('Network error'));
             serviceClient.axiosInstance = { request: mockRequest };
             await expect(serviceClient.get('/api/users')).rejects.toThrow();
-            expect(mockRequest).toHaveBeenCalledTimes(3); // Default retries
+            // retries: 3 → RetryPolicy maxAttempts: 3 → 1 initial + 3 retries = 4 total
+            expect(mockRequest).toHaveBeenCalledTimes(4);
         });
         it('should respect retry delay', async () => {
             const client = new service_client_1.ServiceClient(discoveryClient, {

package/dist/client/service-client.d.ts

@@ -1,6 +1,7 @@
 /**
  * Service Client
- * HTTP client with automatic service discovery and load balancing
+ * HTTP client with automatic service discovery and load balancing.
+ * Uses @hazeljs/resilience RetryPolicy for retry logic.
  */
 import { DiscoveryClient } from './discovery-client';
 import { ServiceFilter } from '../types';
@@ -17,8 +18,7 @@ export declare class ServiceClient {
     private discoveryClient;
     private config;
     private axiosInstance;
-    private retries;
-    private retryDelay;
+    private retryPolicy;
     constructor(discoveryClient: DiscoveryClient, config: ServiceClientConfig);
     /**
      * GET request
@@ -41,12 +41,8 @@ export declare class ServiceClient {
      */
     patch<T = unknown>(path: string, data?: unknown, config?: AxiosRequestConfig): Promise<AxiosResponse<T>>;
     /**
-     * Generic request with service discovery
+     * Generic request with service discovery and resilience-backed retry
      */
     private request;
-    /**
-     * Sleep utility
-     */
-    private sleep;
 }
 //# sourceMappingURL=service-client.d.ts.map

package/dist/client/service-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service-client.d.ts","sourceRoot":"","sources":["../../src/client/service-client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAIzC,OAAc,EAAiB,kBAAkB,EAAE,aAAa,EAAc,MAAM,OAAO,CAAC;AAE5F,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAqBD,qBAAa,aAAa;IAMtB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,MAAM;IANhB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,UAAU,CAAS;gBAGjB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,mBAAmB;IAYrC;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI5F;;OAEG;IACG,IAAI,CAAC,CAAC,GAAG,OAAO,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI5B;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI5B;;OAEG;IACG,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI/F;;OAEG;IACG,KAAK,CAAC,CAAC,GAAG,OAAO,EACrB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI5B;;OAEG;YACW,OAAO;IAgErB;;OAEG;IACH,OAAO,CAAC,KAAK;CAGd"}
+{"version":3,"file":"service-client.d.ts","sourceRoot":"","sources":["../../src/client/service-client.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAKzC,OAAc,EAAiB,kBAAkB,EAAE,aAAa,EAAc,MAAM,OAAO,CAAC;AAE5F,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAyBD,qBAAa,aAAa;IAKtB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,MAAM;IALhB,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,WAAW,CAAc;gBAGvB,eAAe,EAAE,eAAe,EAChC,MAAM,EAAE,mBAAmB;IAyBrC;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI5F;;OAEG;IACG,IAAI,CAAC,CAAC,GAAG,OAAO,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI5B;;OAEG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EACnB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI5B;;OAEG;IACG,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI/F;;OAEG;IACG,KAAK,CAAC,CAAC,GAAG,OAAO,EACrB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,OAAO,EACd,MAAM,CAAC,EAAE,kBAAkB,GAC1B,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAI5B;;OAEG;YACW,OAAO;CAyCtB"}

package/dist/client/service-client.js

@@ -1,7 +1,8 @@
 "use strict";
 /**
  * Service Client
- * HTTP client with automatic service discovery and load balancing
+ * HTTP client with automatic service discovery and load balancing.
+ * Uses @hazeljs/resilience RetryPolicy for retry logic.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -41,6 +42,7 @@ exports.ServiceClient = void 0;
 const strategies_1 = require("../load-balancer/strategies");
 const logger_1 = require("../utils/logger");
 const validation_1 = require("../utils/validation");
+const resilience_1 = require("@hazeljs/resilience");
 const axios_1 = __importStar(require("axios"));
 /** HTTP status codes that are safe to retry */
 const RETRYABLE_STATUS_CODES = new Set([502, 503, 504, 408, 429]);
@@ -55,7 +57,11 @@ function isRetryableError(error) {
             return true;
         return RETRYABLE_STATUS_CODES.has(error.response.status);
     }
-    // Non-Axios errors (e.g. "no instances available") are retryable
+    // "No instances available" is not transient - do not retry
+    const msg = error instanceof Error ? error.message : String(error);
+    if (msg.includes('No instances available'))
+        return false;
+    // Other non-Axios errors (e.g. network) are retryable
     return true;
 }
 class ServiceClient {
@@ -63,11 +69,21 @@ class ServiceClient {
         this.discoveryClient = discoveryClient;
         this.config = config;
         (0, validation_1.validateServiceClientConfig)(config);
-        this.retries = config.retries ?? 3;
-        this.retryDelay = config.retryDelay ?? 1000;
         this.axiosInstance = axios_1.default.create({
             timeout: config.timeout || 5000,
         });
+        // Delegate retry logic to @hazeljs/resilience RetryPolicy
+        const logger = logger_1.DiscoveryLogger.getLogger();
+        this.retryPolicy = new resilience_1.RetryPolicy({
+            maxAttempts: config.retries ?? 3,
+            backoff: 'fixed',
+            baseDelay: config.retryDelay ?? 1000,
+            jitter: false,
+            retryPredicate: isRetryableError,
+            onRetry: (error, attempt) => {
+                logger.warn(`Request to ${config.serviceName} failed (attempt ${attempt}/${config.retries ?? 3})`, error);
+            },
+        });
     }
     /**
      * GET request
@@ -100,13 +116,11 @@ class ServiceClient {
         return this.request({ ...config, method: 'PATCH', url: path, data });
     }
     /**
-     * Generic request with service discovery
+     * Generic request with service discovery and resilience-backed retry
      */
     async request(config) {
-        const logger = logger_1.DiscoveryLogger.getLogger();
-        let lastError = null;
-        for (let attempt = 0; attempt < this.retries; attempt++) {
-            // Discover service instance
+        return this.retryPolicy.execute(async () => {
+            // Discover service instance on each attempt (may pick a different one)
             const instance = await this.discoveryClient.getInstance(this.config.serviceName, this.config.loadBalancingStrategy, this.config.filter);
             if (!instance) {
                 throw new Error(`No instances available for service: ${this.config.serviceName}`);
@@ -130,31 +144,12 @@ class ServiceClient {
                 const response = await this.axiosInstance.request(fullConfig);
                 return response;
             }
-            catch (error) {
-                lastError = error;
-                logger.warn(`Request to ${this.config.serviceName} failed (attempt ${attempt + 1}/${this.retries})`, error);
-                // Only retry on transient / network errors
-                if (!isRetryableError(error)) {
-                    throw error;
-                }
-                // Wait before retry (skip delay on last attempt since we'll throw)
-                if (attempt < this.retries - 1) {
-                    await this.sleep(this.retryDelay);
-                }
-            }
             finally {
                 if (isLeastConn) {
                     lbStrategy.decrementConnections(instance.id);
                 }
             }
-        }
-        throw lastError || new Error('Request failed after all retries');
-    }
-    /**
-     * Sleep utility
-     */
-    sleep(ms) {
-        return new Promise((resolve) => setTimeout(resolve, ms));
+        });
     }
 }
 exports.ServiceClient = ServiceClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hazeljs/discovery",
-  "version": "0.2.0-beta.39",
+  "version": "0.2.0-beta.42",
   "description": "Service discovery and registry for HazelJS microservices - Eureka-inspired with multiple backend support",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,6 +18,8 @@
     "clean": "rm -rf dist"
   },
   "dependencies": {
+    "@hazeljs/core": "^0.2.0-beta.42",
+    "@hazeljs/resilience": "^0.2.0-beta.42",
     "axios": "^1.6.0",
     "reflect-metadata": "^0.2.2"
   },
@@ -75,5 +77,5 @@
     "url": "https://github.com/hazeljs/hazel-js/issues"
   },
   "homepage": "https://hazeljs.com",
-  "gitHead": "1ef15653fe25b11327020085fdfdd6d426b45763"
+  "gitHead": "00db05d3763e93f2caa5bc5a3540b5c81d8b3faf"
 }