node-consul-service 1.0.69 → 1.0.71

package/dist/consul/types.d.ts

@@ -3,4 +3,5 @@ export interface ServiceInstance {
     ServiceName: string;
     ServiceAddress: string;
     ServicePort: number;
+    Address: any;
 }

package/dist/index.cjs.js

@@ -88,47 +88,91 @@ async function deregisterService(id) {
     console.log(`🛑 Service "${id}" deregistered successfully.`);
 }
 
-const LOG_DIR$1 = '/home/log';
-const LOG_FILE$1 = path.join(LOG_DIR$1, 'detect.log');
-// تأكد من وجود المجلد
-async function ensureLogDir$1() {
-    await require$$6.promises.mkdir(LOG_DIR$1, { recursive: true });
+const BASE_LOG_DIR$1 = '/home/log';
+// اسم السيرفس الحالي اللي بيعمل الـ discovery
+const CURRENT_SERVICE$1 = process.env.SERVICE_NAME || 'unknown-service';
+async function ensureLogDir$1(dir) {
+    await require$$6.promises.mkdir(dir, { recursive: true });
 }
-// صيغة السطر
-function formatLogLine(serviceName, instance, elapsedMs) {
+function formatLogLine(targetService, instance, elapsedMs) {
     var _a, _b, _c, _d, _e;
     const ts = new Date().toISOString();
-    const addr = (_b = (_a = instance.ServiceAddress) !== null && _a !== void 0 ? _a : instance.ServiceAddress) !== null && _b !== void 0 ? _b : 'unknown';
+    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 elapsed = elapsedMs !== undefined ? ` | Elapsed=${elapsedMs}ms` : '';
-    return `${ts} | ${serviceName} | ${addr}:${port} | Node=${node} | ID=${id}${elapsed}\n`;
+    return `${ts} | Target=${targetService} | ${addr}:${port} | Node=${node} | ID=${id}${elapsed}\n`;
 }
-// دالة تسجيل
-async function appendDiscoveryLog(serviceName, instance, elapsedMs) {
+async function appendDiscoveryLog(targetService, instance, elapsedMs) {
     try {
-        await ensureLogDir$1();
-        const line = formatLogLine(serviceName, instance, elapsedMs);
-        await require$$6.promises.appendFile(LOG_FILE$1, line, { encoding: 'utf8' });
+        // فولدر خاص بالسيرفس الحالي
+        const serviceDir = path.join(BASE_LOG_DIR$1, CURRENT_SERVICE$1);
+        await ensureLogDir$1(serviceDir);
+        // اللوج يروح في ملف ثابت detect.log
+        const file = path.join(serviceDir, 'detect.log');
+        const line = formatLogLine(targetService, instance, elapsedMs);
+        await require$$6.promises.appendFile(file, line, { encoding: 'utf8' });
     }
     catch (err) {
         console.error('❌ Failed to write discovery log:', err);
     }
 }
 
+const store = new Map();
+/**
+ * Set a value in memory with optional TTL (ms).
+ */
+function set(key, value, ttl) {
+    const record = { value };
+    {
+        record.expiresAt = Date.now() + ttl;
+    }
+    store.set(key, record);
+}
+/**
+ * Get a value from memory.
+ * Returns undefined if key does not exist or expired.
+ */
+function get$1(key) {
+    const record = store.get(key);
+    if (!record)
+        return undefined;
+    if (record.expiresAt && record.expiresAt < Date.now()) {
+        store.delete(key);
+        return undefined;
+    }
+    return record.value;
+}
+
+const CACHE_TTL = 10000; // 10 ثواني – عدلها حسب احتياجك
 async function listServices() {
+    const cacheKey = 'services:list';
+    const cached = get$1(cacheKey);
+    if (cached)
+        return cached;
     const services = await getClient().agent.service.list();
-    return Object.values(services);
+    const values = Object.values(services);
+    set(cacheKey, values, CACHE_TTL);
+    return values;
 }
 async function getServiceInstances(serviceName) {
+    const cacheKey = `services:${serviceName}`;
+    const cached = get$1(cacheKey);
+    if (cached)
+        return cached;
     const start = Date.now();
     const services = await getClient().catalog.service.nodes(serviceName);
     const elapsed = Date.now() - start;
     console.log(`⏱️ Discovery for ${serviceName} took ${elapsed}ms`);
+    set(cacheKey, services, CACHE_TTL);
     return services;
 }
 async function getRandomServiceInstance(serviceName) {
+    const cacheKey = `random:${serviceName}`;
+    const cached = get$1(cacheKey);
+    if (cached)
+        return cached;
     const start = Date.now();
     const instances = await getServiceInstances(serviceName);
     if (!instances.length)
@@ -137,11 +181,20 @@ 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;
 }
 async function getServiceUrl(serviceName) {
+    const cacheKey = `url:${serviceName}`;
+    const cached = get$1(cacheKey);
+    if (cached)
+        return cached;
     const instance = await getRandomServiceInstance(serviceName);
-    return `http://${instance.ServiceAddress}:${instance.ServicePort}`;
+    const url = `http://${instance.ServiceAddress}:${instance.ServicePort}`;
+    // cache url
+    set(cacheKey, url, CACHE_TTL);
+    return url;
 }
 
 function bind(fn, thisArg) {
@@ -20259,20 +20312,34 @@ const {
   mergeConfig
 } = axios;
 
-const LOG_DIR = '/home/log';
-const LOG_FILE = path.join(LOG_DIR, 'calls.log');
-async function ensureLogDir() {
-    await require$$6.promises.mkdir(LOG_DIR, { recursive: true });
+const BASE_LOG_DIR = '/home/log';
+const CURRENT_SERVICE = process.env.SERVICE_NAME || 'unknown-service';
+async function ensureLogDir(dir) {
+    await require$$6.promises.mkdir(dir, { recursive: true });
 }
-function formatCallLogLine(serviceName, url, method, status, elapsedMs) {
+function getLogFileForStatus(status) {
+    const date = new Date().toISOString().split('T')[0]; // YYYY-MM-DD
+    const serviceDir = path.join(BASE_LOG_DIR, CURRENT_SERVICE);
+    if (status >= 200 && status < 300)
+        return path.join(serviceDir, `calls-2xx-${date}.log`);
+    if (status >= 400 && status < 500)
+        return path.join(serviceDir, `calls-4xx-${date}.log`);
+    if (status >= 500 && status < 600)
+        return path.join(serviceDir, `calls-5xx-${date}.log`);
+    return path.join(serviceDir, `calls-other-${date}.log`);
+}
+function formatCallLogLine(targetService, url, method, status, elapsedMs, errorMessage) {
     const ts = new Date().toISOString();
-    return `${ts} | ${serviceName} | ${method.toUpperCase()} ${url} | Status=${status} | Elapsed=${elapsedMs}ms\n`;
+    const errPart = errorMessage ? ` | Error="${errorMessage}"` : '';
+    return `${ts} | Caller=${CURRENT_SERVICE} | Target=${targetService} | ${method.toUpperCase()} ${url} | Status=${status} | Elapsed=${elapsedMs}ms${errPart}\n`;
 }
-async function appendCallLog(serviceName, url, method, status, elapsedMs) {
+async function appendCallLog(targetService, url, method, status, elapsedMs, errorMessage) {
     try {
-        await ensureLogDir();
-        const line = formatCallLogLine(serviceName, url, method, status, elapsedMs);
-        await require$$6.promises.appendFile(LOG_FILE, line, { encoding: 'utf8' });
+        const file = getLogFileForStatus(status);
+        const dir = path.dirname(file);
+        await ensureLogDir(dir);
+        const line = formatCallLogLine(targetService, url, method, status, elapsedMs, errorMessage);
+        await require$$6.promises.appendFile(file, line, { encoding: 'utf8' });
     }
     catch (err) {
         console.error('❌ Failed to write call log:', err);
@@ -20280,35 +20347,33 @@ async function appendCallLog(serviceName, url, method, status, elapsedMs) {
 }
 
 async function callService(serviceName, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const { method = 'GET', path = '/', data, headers, params, } = options;
     const start = Date.now();
     try {
+        // ...
         const instance = await getRandomServiceInstance(serviceName);
         const url = `http://${instance.ServiceAddress}:${instance.ServicePort}${path}`;
-        const response = await axios.request({
-            url,
-            method,
-            data,
-            headers,
-            params,
-        });
+        const response = await axios.request({ url, method, data, headers, params });
         const elapsed = Date.now() - start;
-        // 📌 سجل نجاح الكول
+        // سجل في فولدر السيرفس الحالي (مش target)
         await appendCallLog(serviceName, url, method, response.status, elapsed);
         return response.data;
     }
     catch (error) {
         const elapsed = Date.now() - start;
-        // 📌 سجل الفشل كمان
         const status = (_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : 0;
-        await appendCallLog(serviceName, (_d = (_c = error.config) === null || _c === void 0 ? void 0 : _c.url) !== null && _d !== void 0 ? _d : '', (_f = (_e = error.config) === null || _e === void 0 ? void 0 : _e.method) !== null && _f !== void 0 ? _f : method, status, elapsed);
+        const url = (_d = (_c = error.config) === null || _c === void 0 ? void 0 : _c.url) !== null && _d !== void 0 ? _d : '';
+        const methodUsed = (_f = (_e = error.config) === null || _e === void 0 ? void 0 : _e.method) !== null && _f !== void 0 ? _f : method;
+        const message = (_g = error.message) !== null && _g !== void 0 ? _g : 'Unknown error';
+        // 📌 سجل الفشل مع رسالة الخطأ
+        await appendCallLog(serviceName, url, methodUsed, status, elapsed, message);
         return {
             success: false,
-            message: error.message,
+            message,
             status,
-            code: (_j = (_h = (_g = error.response) === null || _g === void 0 ? void 0 : _g.data) === null || _h === void 0 ? void 0 : _h.code) !== null && _j !== void 0 ? _j : "",
-            data: (_k = error.response) === null || _k === void 0 ? void 0 : _k.data,
+            code: (_k = (_j = (_h = error.response) === null || _h === void 0 ? void 0 : _h.data) === null || _j === void 0 ? void 0 : _j.code) !== null && _k !== void 0 ? _k : "",
+            data: (_l = error.response) === null || _l === void 0 ? void 0 : _l.data,
         };
     }
 }

package/dist/index.esm.js

@@ -86,47 +86,91 @@ async function deregisterService(id) {
     console.log(`🛑 Service "${id}" deregistered successfully.`);
 }
 
-const LOG_DIR$1 = '/home/log';
-const LOG_FILE$1 = path.join(LOG_DIR$1, 'detect.log');
-// تأكد من وجود المجلد
-async function ensureLogDir$1() {
-    await promises.mkdir(LOG_DIR$1, { recursive: true });
+const BASE_LOG_DIR$1 = '/home/log';
+// اسم السيرفس الحالي اللي بيعمل الـ discovery
+const CURRENT_SERVICE$1 = process.env.SERVICE_NAME || 'unknown-service';
+async function ensureLogDir$1(dir) {
+    await promises.mkdir(dir, { recursive: true });
 }
-// صيغة السطر
-function formatLogLine(serviceName, instance, elapsedMs) {
+function formatLogLine(targetService, instance, elapsedMs) {
     var _a, _b, _c, _d, _e;
     const ts = new Date().toISOString();
-    const addr = (_b = (_a = instance.ServiceAddress) !== null && _a !== void 0 ? _a : instance.ServiceAddress) !== null && _b !== void 0 ? _b : 'unknown';
+    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 elapsed = elapsedMs !== undefined ? ` | Elapsed=${elapsedMs}ms` : '';
-    return `${ts} | ${serviceName} | ${addr}:${port} | Node=${node} | ID=${id}${elapsed}\n`;
+    return `${ts} | Target=${targetService} | ${addr}:${port} | Node=${node} | ID=${id}${elapsed}\n`;
 }
-// دالة تسجيل
-async function appendDiscoveryLog(serviceName, instance, elapsedMs) {
+async function appendDiscoveryLog(targetService, instance, elapsedMs) {
     try {
-        await ensureLogDir$1();
-        const line = formatLogLine(serviceName, instance, elapsedMs);
-        await promises.appendFile(LOG_FILE$1, line, { encoding: 'utf8' });
+        // فولدر خاص بالسيرفس الحالي
+        const serviceDir = path.join(BASE_LOG_DIR$1, CURRENT_SERVICE$1);
+        await ensureLogDir$1(serviceDir);
+        // اللوج يروح في ملف ثابت detect.log
+        const file = path.join(serviceDir, 'detect.log');
+        const line = formatLogLine(targetService, instance, elapsedMs);
+        await promises.appendFile(file, line, { encoding: 'utf8' });
     }
     catch (err) {
         console.error('❌ Failed to write discovery log:', err);
     }
 }
 
+const store = new Map();
+/**
+ * Set a value in memory with optional TTL (ms).
+ */
+function set(key, value, ttl) {
+    const record = { value };
+    {
+        record.expiresAt = Date.now() + ttl;
+    }
+    store.set(key, record);
+}
+/**
+ * Get a value from memory.
+ * Returns undefined if key does not exist or expired.
+ */
+function get$1(key) {
+    const record = store.get(key);
+    if (!record)
+        return undefined;
+    if (record.expiresAt && record.expiresAt < Date.now()) {
+        store.delete(key);
+        return undefined;
+    }
+    return record.value;
+}
+
+const CACHE_TTL = 10000; // 10 ثواني – عدلها حسب احتياجك
 async function listServices() {
+    const cacheKey = 'services:list';
+    const cached = get$1(cacheKey);
+    if (cached)
+        return cached;
     const services = await getClient().agent.service.list();
-    return Object.values(services);
+    const values = Object.values(services);
+    set(cacheKey, values, CACHE_TTL);
+    return values;
 }
 async function getServiceInstances(serviceName) {
+    const cacheKey = `services:${serviceName}`;
+    const cached = get$1(cacheKey);
+    if (cached)
+        return cached;
     const start = Date.now();
     const services = await getClient().catalog.service.nodes(serviceName);
     const elapsed = Date.now() - start;
     console.log(`⏱️ Discovery for ${serviceName} took ${elapsed}ms`);
+    set(cacheKey, services, CACHE_TTL);
     return services;
 }
 async function getRandomServiceInstance(serviceName) {
+    const cacheKey = `random:${serviceName}`;
+    const cached = get$1(cacheKey);
+    if (cached)
+        return cached;
     const start = Date.now();
     const instances = await getServiceInstances(serviceName);
     if (!instances.length)
@@ -135,11 +179,20 @@ 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;
 }
 async function getServiceUrl(serviceName) {
+    const cacheKey = `url:${serviceName}`;
+    const cached = get$1(cacheKey);
+    if (cached)
+        return cached;
     const instance = await getRandomServiceInstance(serviceName);
-    return `http://${instance.ServiceAddress}:${instance.ServicePort}`;
+    const url = `http://${instance.ServiceAddress}:${instance.ServicePort}`;
+    // cache url
+    set(cacheKey, url, CACHE_TTL);
+    return url;
 }
 
 function bind(fn, thisArg) {
@@ -20257,20 +20310,34 @@ const {
   mergeConfig
 } = axios;
 
-const LOG_DIR = '/home/log';
-const LOG_FILE = path.join(LOG_DIR, 'calls.log');
-async function ensureLogDir() {
-    await promises.mkdir(LOG_DIR, { recursive: true });
+const BASE_LOG_DIR = '/home/log';
+const CURRENT_SERVICE = process.env.SERVICE_NAME || 'unknown-service';
+async function ensureLogDir(dir) {
+    await promises.mkdir(dir, { recursive: true });
 }
-function formatCallLogLine(serviceName, url, method, status, elapsedMs) {
+function getLogFileForStatus(status) {
+    const date = new Date().toISOString().split('T')[0]; // YYYY-MM-DD
+    const serviceDir = path.join(BASE_LOG_DIR, CURRENT_SERVICE);
+    if (status >= 200 && status < 300)
+        return path.join(serviceDir, `calls-2xx-${date}.log`);
+    if (status >= 400 && status < 500)
+        return path.join(serviceDir, `calls-4xx-${date}.log`);
+    if (status >= 500 && status < 600)
+        return path.join(serviceDir, `calls-5xx-${date}.log`);
+    return path.join(serviceDir, `calls-other-${date}.log`);
+}
+function formatCallLogLine(targetService, url, method, status, elapsedMs, errorMessage) {
     const ts = new Date().toISOString();
-    return `${ts} | ${serviceName} | ${method.toUpperCase()} ${url} | Status=${status} | Elapsed=${elapsedMs}ms\n`;
+    const errPart = errorMessage ? ` | Error="${errorMessage}"` : '';
+    return `${ts} | Caller=${CURRENT_SERVICE} | Target=${targetService} | ${method.toUpperCase()} ${url} | Status=${status} | Elapsed=${elapsedMs}ms${errPart}\n`;
 }
-async function appendCallLog(serviceName, url, method, status, elapsedMs) {
+async function appendCallLog(targetService, url, method, status, elapsedMs, errorMessage) {
     try {
-        await ensureLogDir();
-        const line = formatCallLogLine(serviceName, url, method, status, elapsedMs);
-        await promises.appendFile(LOG_FILE, line, { encoding: 'utf8' });
+        const file = getLogFileForStatus(status);
+        const dir = path.dirname(file);
+        await ensureLogDir(dir);
+        const line = formatCallLogLine(targetService, url, method, status, elapsedMs, errorMessage);
+        await promises.appendFile(file, line, { encoding: 'utf8' });
     }
     catch (err) {
         console.error('❌ Failed to write call log:', err);
@@ -20278,35 +20345,33 @@ async function appendCallLog(serviceName, url, method, status, elapsedMs) {
 }
 
 async function callService(serviceName, options = {}) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     const { method = 'GET', path = '/', data, headers, params, } = options;
     const start = Date.now();
     try {
+        // ...
         const instance = await getRandomServiceInstance(serviceName);
         const url = `http://${instance.ServiceAddress}:${instance.ServicePort}${path}`;
-        const response = await axios.request({
-            url,
-            method,
-            data,
-            headers,
-            params,
-        });
+        const response = await axios.request({ url, method, data, headers, params });
         const elapsed = Date.now() - start;
-        // 📌 سجل نجاح الكول
+        // سجل في فولدر السيرفس الحالي (مش target)
         await appendCallLog(serviceName, url, method, response.status, elapsed);
         return response.data;
     }
     catch (error) {
         const elapsed = Date.now() - start;
-        // 📌 سجل الفشل كمان
         const status = (_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : 0;
-        await appendCallLog(serviceName, (_d = (_c = error.config) === null || _c === void 0 ? void 0 : _c.url) !== null && _d !== void 0 ? _d : '', (_f = (_e = error.config) === null || _e === void 0 ? void 0 : _e.method) !== null && _f !== void 0 ? _f : method, status, elapsed);
+        const url = (_d = (_c = error.config) === null || _c === void 0 ? void 0 : _c.url) !== null && _d !== void 0 ? _d : '';
+        const methodUsed = (_f = (_e = error.config) === null || _e === void 0 ? void 0 : _e.method) !== null && _f !== void 0 ? _f : method;
+        const message = (_g = error.message) !== null && _g !== void 0 ? _g : 'Unknown error';
+        // 📌 سجل الفشل مع رسالة الخطأ
+        await appendCallLog(serviceName, url, methodUsed, status, elapsed, message);
         return {
             success: false,
-            message: error.message,
+            message,
             status,
-            code: (_j = (_h = (_g = error.response) === null || _g === void 0 ? void 0 : _g.data) === null || _h === void 0 ? void 0 : _h.code) !== null && _j !== void 0 ? _j : "",
-            data: (_k = error.response) === null || _k === void 0 ? void 0 : _k.data,
+            code: (_k = (_j = (_h = error.response) === null || _h === void 0 ? void 0 : _h.data) === null || _j === void 0 ? void 0 : _j.code) !== null && _k !== void 0 ? _k : "",
+            data: (_l = error.response) === null || _l === void 0 ? void 0 : _l.data,
         };
     }
 }

package/dist/utils/callLogger.d.ts

@@ -1 +1 @@
-export declare function appendCallLog(serviceName: string, url: string, method: string, status: number, elapsedMs: number): Promise<void>;
+export declare function appendCallLog(targetService: string, url: string, method: string, status: number, elapsedMs: number, errorMessage?: string): Promise<void>;

package/dist/utils/logger.d.ts

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

package/dist/utils/memoryStore.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Set a value in memory with optional TTL (ms).
+ */
+export declare function set(key: string, value: any, ttl?: number): void;
+/**
+ * Get a value from memory.
+ * Returns undefined if key does not exist or expired.
+ */
+export declare function get<T = any>(key: string): T | undefined;
+/**
+ * Delete a value.
+ */
+export declare function del(key: string): void;
+/**
+ * Clear all keys.
+ */
+export declare function clear(): void;

package/package.json

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