node-consul-service 1.0.74 → 1.0.75

package/dist/consul/atlasDiscovery.d.ts

@@ -0,0 +1,5 @@
+import { AtlasServiceInstance } from './types';
+export declare function listServices(): Promise<any[]>;
+export declare function getServiceInstances(serviceName: string): Promise<AtlasServiceInstance[]>;
+export declare function getRandomServiceInstance(serviceName: string): Promise<AtlasServiceInstance>;
+export declare function getServiceUrl(serviceName: string): Promise<string>;

package/dist/consul/client.d.ts

@@ -1,4 +1,3 @@
-import Consul from 'consul';
 import { AtlasClient } from '../atlas/atlas.client';
 export interface ConsulClientOptions {
     host?: string;
@@ -8,4 +7,3 @@ export interface ConsulClientOptions {
 export declare function toBoolean(value?: string | boolean | null): boolean;
 export declare function initClient({ host, port, secure }: ConsulClientOptions): void;
 export declare function getAtlasClient(): AtlasClient;
-export declare function getClient(): Consul;

package/dist/consul/registry.d.ts

@@ -1,18 +1,9 @@
 type RegisterOptions = {
     name: string;
-    id: string;
     port: number;
     address?: string;
-    check?: {
-        name?: string;
-        http?: string;
-        interval?: string;
-        timeout?: string;
-        deregistercriticalserviceafter?: string;
-    } | false;
     tags?: string[];
     meta?: Record<string, string>;
 };
 export declare function registerService(options: RegisterOptions): Promise<void>;
-export declare function deregisterService(id: string): Promise<void>;
 export {};

package/dist/consul/types.d.ts

@@ -5,3 +5,9 @@ export interface ServiceInstance {
     ServicePort: number;
     Address: any;
 }
+export interface AtlasServiceInstance {
+    _id: string;
+    name: string;
+    address: string;
+    port: number;
+}

package/dist/index.cjs.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var Consul = require('consul');
 var require$$1 = require('util');
 var stream = require('stream');
 var path = require('path');
@@ -20164,8 +20163,6 @@ class AtlasClient {
     }
 }
 
-// src/lib/client.ts
-let consulClient = null;
 let atlasClient = null;
 function toBoolean(value) {
     if (typeof value === 'boolean')
@@ -20180,19 +20177,6 @@ function initClient({ host = '127.0.0.1', port = 8500, secure = false }) {
         port: 371,
         version: '1',
     });
-    consulClient = new Consul({
-        host: host !== null && host !== void 0 ? host : '127.0.0.1',
-        port: port !== null && port !== void 0 ? port : 8500,
-        secure: toBoolean(secure),
-    });
-    consulClient.agent.self(err => {
-        if (err) {
-            console.error('❌ Failed to connect to Consul:', err.message);
-        }
-        else {
-            console.log('✅ Connected to Consul successfully');
-        }
-    });
 }
 function getAtlasClient() {
     if (!atlasClient) {
@@ -20200,61 +20184,19 @@ function getAtlasClient() {
     }
     return atlasClient;
 }
-function getClient() {
-    if (!consulClient) {
-        throw new Error('Consul client not initialized. Call initClient() first.');
-    }
-    return consulClient;
-}
 
-const registeredServices = new Set();
 async function registerService(options) {
-    var _a, _b, _c, _d;
-    const { name, id, port, address = 'localhost', check, tags, meta } = options;
+    const { name, port, address = 'localhost', tags, meta } = options;
     const atlasClient = getAtlasClient();
-    await atlasClient.registerService({
+    await atlasClient
+        .registerService({
         address,
         port,
         name,
-    }).then((res) => {
-        console.log("🚀 ~ registerService ~ res:", res);
+    })
+        .then(res => {
+        console.log("Service Registered");
     });
-    if (registeredServices.has(id)) {
-        console.log(`⚠️ Service "${id}" is already registered.`);
-        return;
-    }
-    const serviceDefinition = {
-        name,
-        id,
-        address,
-        port,
-        tags,
-        meta,
-    };
-    if (check !== false) {
-        const checkDefinition = {
-            name: (_a = check === null || check === void 0 ? void 0 : check.name) !== null && _a !== void 0 ? _a : `${name}-check`,
-            http: (_b = check === null || check === void 0 ? void 0 : check.http) !== null && _b !== void 0 ? _b : `http://${address}:${port}/health`,
-            interval: (_c = check === null || check === void 0 ? void 0 : check.interval) !== null && _c !== void 0 ? _c : '10s',
-            timeout: (_d = check === null || check === void 0 ? void 0 : check.timeout) !== null && _d !== void 0 ? _d : '5s',
-        };
-        if (check === null || check === void 0 ? void 0 : check.deregistercriticalserviceafter) {
-            checkDefinition.deregistercriticalserviceafter = check.deregistercriticalserviceafter;
-        }
-        serviceDefinition.check = checkDefinition;
-    }
-    await getClient().agent.service.register(serviceDefinition);
-    registeredServices.add(id);
-    console.log(`✅ Service "${id}" registered successfully.`);
-}
-async function deregisterService(id) {
-    if (!registeredServices.has(id)) {
-        console.log(`⚠️ Service "${id}" is not registered.`);
-        return;
-    }
-    await getClient().agent.service.deregister(id);
-    registeredServices.delete(id);
-    console.log(`🛑 Service "${id}" deregistered successfully.`);
 }
 
 const BASE_LOG_DIR$2 = '/home/log';
@@ -20264,12 +20206,12 @@ async function ensureLogDir$2(dir) {
     await require$$6.promises.mkdir(dir, { recursive: true });
 }
 function formatLogLine(targetService, instance, elapsedMs) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const ts = new Date().toISOString();
-    const addr = (_b = (_a = instance.ServiceAddress) !== null && _a !== void 0 ? _a : instance.Address) !== null && _b !== void 0 ? _b : 'unknown';
-    const port = (_c = instance.ServicePort) !== null && _c !== void 0 ? _c : 'unknown';
-    const node = (_d = instance.Node) !== null && _d !== void 0 ? _d : 'N/A';
-    const id = (_e = instance.ServiceID) !== null && _e !== void 0 ? _e : 'N/A';
+    const addr = (_a = instance.address) !== null && _a !== void 0 ? _a : 'unknown';
+    const port = (_b = instance.port) !== null && _b !== void 0 ? _b : 'unknown';
+    const node = (_c = instance.Node) !== null && _c !== void 0 ? _c : 'N/A';
+    const id = (_d = instance.ServiceID) !== null && _d !== void 0 ? _d : 'N/A';
     const elapsed = elapsedMs !== undefined ? ` | Elapsed=${elapsedMs}ms` : '';
     return `${ts} | Target=${targetService} | ${addr}:${port} | Node=${node} | ID=${id}${elapsed}\n`;
 }
@@ -20314,29 +20256,33 @@ function get(key) {
     return record.value;
 }
 
-const CACHE_TTL = 60000;
+const CACHE_TTL = 60000; // 1 دقيقة
+// جلب كل الخدمات
 async function listServices() {
     const cacheKey = 'services:list';
     const cached = get(cacheKey);
     if (cached)
         return cached;
-    const services = await getClient().agent.service.list();
-    const values = Object.values(services);
-    set(cacheKey, values, CACHE_TTL);
-    return values;
+    const services = await getAtlasClient().listServices();
+    set(cacheKey, services, CACHE_TTL);
+    return services;
 }
+// جلب كل الـ instances لسيرفس معين
 async function getServiceInstances(serviceName) {
     const cacheKey = `services:${serviceName}`;
     const cached = get(cacheKey);
     if (cached)
         return cached;
     const start = Date.now();
-    const services = await getClient().catalog.service.nodes(serviceName);
+    const services = await getAtlasClient().listServices(); // هنجيب كل السيرفسات
     const elapsed = Date.now() - start;
     console.log(`⏱️ Discovery for ${serviceName} took ${elapsed}ms`);
-    set(cacheKey, services, CACHE_TTL);
-    return services;
+    // فلترة السيرفس المطلوب
+    const instances = services.filter(s => s.name === serviceName);
+    set(cacheKey, instances, CACHE_TTL);
+    return instances;
 }
+// جلب instance عشوائي لسيرفس معين
 async function getRandomServiceInstance(serviceName) {
     const cacheKey = `random:${serviceName}`;
     const cached = get(cacheKey);
@@ -20350,18 +20296,17 @@ async function getRandomServiceInstance(serviceName) {
     const instance = instances[randomIndex];
     const elapsed = Date.now() - start;
     await appendDiscoveryLog(serviceName, instance, elapsed);
-    // cache random instance
     set(cacheKey, instance, CACHE_TTL);
     return instance;
 }
+// جلب URL جاهز للاتصال
 async function getServiceUrl(serviceName) {
     const cacheKey = `url:${serviceName}`;
     const cached = get(cacheKey);
     if (cached)
         return cached;
     const instance = await getRandomServiceInstance(serviceName);
-    const url = `http://${instance.ServiceAddress}:${instance.ServicePort}`;
-    // cache url
+    const url = `http://${instance.address}:${instance.port}`;
     set(cacheKey, url, CACHE_TTL);
     return url;
 }
@@ -20435,7 +20380,7 @@ async function callService(serviceName, options = {}) {
     const start = Date.now();
     try {
         const instance = await getRandomServiceInstance(serviceName);
-        const url = `http://${instance.ServiceAddress}:${instance.ServicePort}${path}`;
+        const url = `http://${instance.address}:${instance.port}${path}`;
         const response = await axios.request({ url, method, data, headers, params });
         const elapsed = Date.now() - start;
         // 📌 سجل الكول
@@ -20624,9 +20569,7 @@ async function dataLink(data, schema) {
 
 exports.callService = callService;
 exports.dataLink = dataLink;
-exports.deregisterService = deregisterService;
 exports.getAtlasClient = getAtlasClient;
-exports.getClient = getClient;
 exports.getRandomServiceInstance = getRandomServiceInstance;
 exports.getServiceInstances = getServiceInstances;
 exports.getServiceUrl = getServiceUrl;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from './consul/client';
 export * from './consul/registry';
-export * from './consul/discovery';
+export * from './consul/atlasDiscovery';
 export * from './consul/httpCaller';
 export * from './consul/dataLink';

package/dist/index.esm.js

@@ -1,4 +1,3 @@
-import Consul from 'consul';
 import require$$1 from 'util';
 import stream, { Readable } from 'stream';
 import path from 'path';
@@ -20162,8 +20161,6 @@ class AtlasClient {
     }
 }
 
-// src/lib/client.ts
-let consulClient = null;
 let atlasClient = null;
 function toBoolean(value) {
     if (typeof value === 'boolean')
@@ -20178,19 +20175,6 @@ function initClient({ host = '127.0.0.1', port = 8500, secure = false }) {
         port: 371,
         version: '1',
     });
-    consulClient = new Consul({
-        host: host !== null && host !== void 0 ? host : '127.0.0.1',
-        port: port !== null && port !== void 0 ? port : 8500,
-        secure: toBoolean(secure),
-    });
-    consulClient.agent.self(err => {
-        if (err) {
-            console.error('❌ Failed to connect to Consul:', err.message);
-        }
-        else {
-            console.log('✅ Connected to Consul successfully');
-        }
-    });
 }
 function getAtlasClient() {
     if (!atlasClient) {
@@ -20198,61 +20182,19 @@ function getAtlasClient() {
     }
     return atlasClient;
 }
-function getClient() {
-    if (!consulClient) {
-        throw new Error('Consul client not initialized. Call initClient() first.');
-    }
-    return consulClient;
-}
 
-const registeredServices = new Set();
 async function registerService(options) {
-    var _a, _b, _c, _d;
-    const { name, id, port, address = 'localhost', check, tags, meta } = options;
+    const { name, port, address = 'localhost', tags, meta } = options;
     const atlasClient = getAtlasClient();
-    await atlasClient.registerService({
+    await atlasClient
+        .registerService({
         address,
         port,
         name,
-    }).then((res) => {
-        console.log("🚀 ~ registerService ~ res:", res);
+    })
+        .then(res => {
+        console.log("Service Registered");
     });
-    if (registeredServices.has(id)) {
-        console.log(`⚠️ Service "${id}" is already registered.`);
-        return;
-    }
-    const serviceDefinition = {
-        name,
-        id,
-        address,
-        port,
-        tags,
-        meta,
-    };
-    if (check !== false) {
-        const checkDefinition = {
-            name: (_a = check === null || check === void 0 ? void 0 : check.name) !== null && _a !== void 0 ? _a : `${name}-check`,
-            http: (_b = check === null || check === void 0 ? void 0 : check.http) !== null && _b !== void 0 ? _b : `http://${address}:${port}/health`,
-            interval: (_c = check === null || check === void 0 ? void 0 : check.interval) !== null && _c !== void 0 ? _c : '10s',
-            timeout: (_d = check === null || check === void 0 ? void 0 : check.timeout) !== null && _d !== void 0 ? _d : '5s',
-        };
-        if (check === null || check === void 0 ? void 0 : check.deregistercriticalserviceafter) {
-            checkDefinition.deregistercriticalserviceafter = check.deregistercriticalserviceafter;
-        }
-        serviceDefinition.check = checkDefinition;
-    }
-    await getClient().agent.service.register(serviceDefinition);
-    registeredServices.add(id);
-    console.log(`✅ Service "${id}" registered successfully.`);
-}
-async function deregisterService(id) {
-    if (!registeredServices.has(id)) {
-        console.log(`⚠️ Service "${id}" is not registered.`);
-        return;
-    }
-    await getClient().agent.service.deregister(id);
-    registeredServices.delete(id);
-    console.log(`🛑 Service "${id}" deregistered successfully.`);
 }
 
 const BASE_LOG_DIR$2 = '/home/log';
@@ -20262,12 +20204,12 @@ async function ensureLogDir$2(dir) {
     await promises.mkdir(dir, { recursive: true });
 }
 function formatLogLine(targetService, instance, elapsedMs) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     const ts = new Date().toISOString();
-    const addr = (_b = (_a = instance.ServiceAddress) !== null && _a !== void 0 ? _a : instance.Address) !== null && _b !== void 0 ? _b : 'unknown';
-    const port = (_c = instance.ServicePort) !== null && _c !== void 0 ? _c : 'unknown';
-    const node = (_d = instance.Node) !== null && _d !== void 0 ? _d : 'N/A';
-    const id = (_e = instance.ServiceID) !== null && _e !== void 0 ? _e : 'N/A';
+    const addr = (_a = instance.address) !== null && _a !== void 0 ? _a : 'unknown';
+    const port = (_b = instance.port) !== null && _b !== void 0 ? _b : 'unknown';
+    const node = (_c = instance.Node) !== null && _c !== void 0 ? _c : 'N/A';
+    const id = (_d = instance.ServiceID) !== null && _d !== void 0 ? _d : 'N/A';
     const elapsed = elapsedMs !== undefined ? ` | Elapsed=${elapsedMs}ms` : '';
     return `${ts} | Target=${targetService} | ${addr}:${port} | Node=${node} | ID=${id}${elapsed}\n`;
 }
@@ -20312,29 +20254,33 @@ function get(key) {
     return record.value;
 }
 
-const CACHE_TTL = 60000;
+const CACHE_TTL = 60000; // 1 دقيقة
+// جلب كل الخدمات
 async function listServices() {
     const cacheKey = 'services:list';
     const cached = get(cacheKey);
     if (cached)
         return cached;
-    const services = await getClient().agent.service.list();
-    const values = Object.values(services);
-    set(cacheKey, values, CACHE_TTL);
-    return values;
+    const services = await getAtlasClient().listServices();
+    set(cacheKey, services, CACHE_TTL);
+    return services;
 }
+// جلب كل الـ instances لسيرفس معين
 async function getServiceInstances(serviceName) {
     const cacheKey = `services:${serviceName}`;
     const cached = get(cacheKey);
     if (cached)
         return cached;
     const start = Date.now();
-    const services = await getClient().catalog.service.nodes(serviceName);
+    const services = await getAtlasClient().listServices(); // هنجيب كل السيرفسات
     const elapsed = Date.now() - start;
     console.log(`⏱️ Discovery for ${serviceName} took ${elapsed}ms`);
-    set(cacheKey, services, CACHE_TTL);
-    return services;
+    // فلترة السيرفس المطلوب
+    const instances = services.filter(s => s.name === serviceName);
+    set(cacheKey, instances, CACHE_TTL);
+    return instances;
 }
+// جلب instance عشوائي لسيرفس معين
 async function getRandomServiceInstance(serviceName) {
     const cacheKey = `random:${serviceName}`;
     const cached = get(cacheKey);
@@ -20348,18 +20294,17 @@ async function getRandomServiceInstance(serviceName) {
     const instance = instances[randomIndex];
     const elapsed = Date.now() - start;
     await appendDiscoveryLog(serviceName, instance, elapsed);
-    // cache random instance
     set(cacheKey, instance, CACHE_TTL);
     return instance;
 }
+// جلب URL جاهز للاتصال
 async function getServiceUrl(serviceName) {
     const cacheKey = `url:${serviceName}`;
     const cached = get(cacheKey);
     if (cached)
         return cached;
     const instance = await getRandomServiceInstance(serviceName);
-    const url = `http://${instance.ServiceAddress}:${instance.ServicePort}`;
-    // cache url
+    const url = `http://${instance.address}:${instance.port}`;
     set(cacheKey, url, CACHE_TTL);
     return url;
 }
@@ -20433,7 +20378,7 @@ async function callService(serviceName, options = {}) {
     const start = Date.now();
     try {
         const instance = await getRandomServiceInstance(serviceName);
-        const url = `http://${instance.ServiceAddress}:${instance.ServicePort}${path}`;
+        const url = `http://${instance.address}:${instance.port}${path}`;
         const response = await axios.request({ url, method, data, headers, params });
         const elapsed = Date.now() - start;
         // 📌 سجل الكول
@@ -20620,5 +20565,5 @@ async function dataLink(data, schema) {
     return isArray ? result : result[0];
 }
 
-export { callService, dataLink, deregisterService, getAtlasClient, getClient, getRandomServiceInstance, getServiceInstances, getServiceUrl, initClient, listServices, registerService, toBoolean };
+export { callService, dataLink, getAtlasClient, getRandomServiceInstance, getServiceInstances, getServiceUrl, initClient, listServices, registerService, toBoolean };
 //# sourceMappingURL=index.esm.js.map

package/dist/utils/logger.d.ts

@@ -1,2 +1,2 @@
-import { ServiceInstance } from '../consul/types';
-export declare function appendDiscoveryLog(targetService: string, instance: ServiceInstance, elapsedMs?: number): Promise<void>;
+import { AtlasServiceInstance } from '../consul/types';
+export declare function appendDiscoveryLog(targetService: string, instance: AtlasServiceInstance, elapsedMs?: number): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-consul-service",
-  "version": "1.0.74",
+  "version": "1.0.75",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "types": "dist/index.d.ts",