fa-consul 1.0.1 → 1.0.3

package/README.md

@@ -75,7 +75,7 @@ const config = {
       name: e.CONSUL_SERVICE_NAME || 'fa-consul',
       instance: e.CONSUL_SERVICE_INSTANCE || 'test',
       version: e.CONSUL_SERVICE_VERSION || '0.0.1',
-      description: e.CONSUL_SERVICE_DESCRIPTION || 'AF-CONSUL TEST',
+      description: e.CONSUL_SERVICE_DESCRIPTION || 'FA-CONSUL TEST',
       tags: e.CONSUL_SERVICE_TAGS || ['af', 'consul', 'test'],
       meta: e.CONSUL_SERVICE_META || { CONSUL_TEST: 12345, line_yellow: 'straight' },
       host: e.CONSUL_SERVICE_HOST || null,
@@ -95,7 +95,7 @@ const config = {
           - Polling ${CONSUL_ID}   
           - The data is up-to-date ${CONSUL_ID}
     
-    af-consul 		 
+    fa-consul 		 
         `${yellow} REGISTER CONFIG:\n${JSON.stringify(registerConfig, undefined, 2)}\n${reset}`
         `CONSUL AGENT OPTIONS:\n${JSON.stringify(fullConsulAgentOptions, undefined, 2)}`
         `${rqId}HTTP Status: ${statusCode}`
@@ -103,10 +103,10 @@ const config = {
         `No info about service ID ${cyan}${serviceName}`
         `${prefixG} Skip registration check after health check`    
     
-    af-consul:curl
+    fa-consul:curl
         const msg = dbg.curl ? getCurl(request, true) : getHttpRequestText(request);
         `[${request._id_}] ${yellow}${msg}${reset}`
     
-    af-consul:reg
+    fa-consul:reg
         `${PREFIX}: updated ${updatedCount.length} access point(s)`
         `${prefixG} Service ${cyan}${registerConfig.id}${reset} registration check...`

package/dist/constants.d.ts

@@ -1,4 +1,4 @@
-export declare const PREFIX = "AF-CONSUL";
+export declare const PREFIX = "FA-CONSUL";
 export declare const MAX_API_CACHED = 3;
 export declare const CONSUL_AP_UPDATE_TIMEOUT_MILLIS: number;
 export declare const DEBUG: string;

package/dist/constants.js

@@ -1,7 +1,7 @@
-export const PREFIX = 'AF-CONSUL';
+export const PREFIX = 'FA-CONSUL';
 export const MAX_API_CACHED = 3;
 export const CONSUL_AP_UPDATE_TIMEOUT_MILLIS = Number(process.env.CONSUL_AP_UPDATE_TIMEOUT_MILLIS) || 10_000;
 export const DEBUG = (String(process.env.DEBUG || '')).trim();
-export const CONSUL_DEBUG_ON = DEBUG.split(/[ ,]/).some((v) => /af-consul/i.test(v) || v === '*');
+export const CONSUL_DEBUG_ON = DEBUG.split(/[ ,]/).some((v) => /fa-consul/i.test(v) || v === '*');
 export const FORCE_EVERY_REGISTER_ATTEMPT = !!process.env.FORCE_EVERY_REGISTER_ATTEMPT;
 //# sourceMappingURL=constants.js.map

package/dist/cyclic-register.js

@@ -7,7 +7,7 @@ import { toMills } from './lib/utils';
 const prefix = 'CONSUL-REG:';
 const prefixG = `${green}${prefix}${reset}`;
 const DEFAULT_INTERVAL = 60_000;
-const isDebugReg = /\baf-consul:(reg|\*)/i.test(DEBUG) || /\baf-consul:\*/i.test(DEBUG);
+const isDebugReg = /\bfa-consul:(reg|\*)/i.test(DEBUG) || /\bfa-consul:\*/i.test(DEBUG);
 const debug = (msg) => {
     if (isDebugReg) {
         console.log(`${magenta}${PREFIX}${reset}: ${msg}`);

package/dist/get-register-config.js

@@ -52,8 +52,8 @@ export const getRegisterConfig = async (options) => {
         metaObj.pj_name = packageJson.name;
         metaObj.pj_version = packageJson.version;
     }
-    if (metaObj.pj_name !== 'fa-consyl') {
-        packageJson = getPackageJson('/node_modules/fa-consyl');
+    if (metaObj.pj_name !== 'fa-consul') {
+        packageJson = getPackageJson('/node_modules/fa-consul');
         if (packageJson) {
             metaObj.af_consul_version = packageJson.version;
         }

package/dist/prepare-consul-api.js

@@ -13,7 +13,7 @@ import { minimizeCache, parseBoolean, serviceConfigDiff } from './lib/utils';
 const mutex = new Mutex();
 const dbg = {
     on: CONSUL_DEBUG_ON,
-    curl: /af-consul:curl/i.test(DEBUG),
+    curl: /fa-consul:curl/i.test(DEBUG),
 };
 const debug = (msg) => {
     if (dbg.on) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fa-consul",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "A highly specialized function library",
   "type": "module",
   "main": "dist/index.js",

package/src/constants.ts

@@ -1,7 +1,7 @@
-export const PREFIX = 'AF-CONSUL';
+export const PREFIX = 'FA-CONSUL';
 export const MAX_API_CACHED = 3;
 
 export const CONSUL_AP_UPDATE_TIMEOUT_MILLIS = Number(process.env.CONSUL_AP_UPDATE_TIMEOUT_MILLIS) || 10_000;
 export const DEBUG = (String(process.env.DEBUG || '')).trim();
-export const CONSUL_DEBUG_ON = DEBUG.split(/[ ,]/).some((v) => /af-consul/i.test(v) || v === '*');
+export const CONSUL_DEBUG_ON = DEBUG.split(/[ ,]/).some((v) => /fa-consul/i.test(v) || v === '*');
 export const FORCE_EVERY_REGISTER_ATTEMPT = !!process.env.FORCE_EVERY_REGISTER_ATTEMPT;

package/src/cyclic-register.ts

@@ -12,7 +12,7 @@ const prefixG = `${green}${prefix}${reset}`;
 
 const DEFAULT_INTERVAL = 60_000;
 
-const isDebugReg = /\baf-consul:(reg|\*)/i.test(DEBUG) || /\baf-consul:\*/i.test(DEBUG);
+const isDebugReg = /\bfa-consul:(reg|\*)/i.test(DEBUG) || /\bfa-consul:\*/i.test(DEBUG);
 const debug = (msg: string) => {
   if (isDebugReg) {
     console.log(`${magenta}${PREFIX}${reset}: ${msg}`);

package/src/prepare-consul-api.ts

@@ -34,7 +34,7 @@ const mutex = new Mutex();
 
 const dbg = {
   on: CONSUL_DEBUG_ON,
-  curl: /af-consul:curl/i.test(DEBUG),
+  curl: /fa-consul:curl/i.test(DEBUG),
 };
 const debug = (msg: string) => {
   if (dbg.on) {

package/dist/__tests__/lib/logger.d.ts

@@ -1,3 +0,0 @@
-declare const logger: import("af-logger").LoggerEx;
-export { logger };
-//# sourceMappingURL=logger.d.ts.map

package/dist/__tests__/lib/logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../__tests__/lib/logger.ts"],"names":[],"mappings":"AA0BA,QAAA,MAAQ,MAAM,8BAAgC,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/dist/__tests__/lib/logger.js

@@ -1,25 +0,0 @@
-import { getAFLogger } from 'af-logger';
-const minLevel = 'silly';
-const prefix = 'fa-consul';
-const logDir = './_log';
-const loggerSettings = {
-    minLevel,
-    name: prefix,
-    filePrefix: prefix,
-    logDir,
-    minLogSize: 0,
-    minErrorLogSize: 0,
-    // displayLoggerName: true,
-    // displayFunctionName: true,
-    // displayFilePath: 'displayAll',
-    // emitter: em,
-    fileLoggerMap: {
-        silly: 'info',
-        info: 'info',
-        error: 'error',
-        fatal: 'error',
-    },
-};
-const { logger } = getAFLogger(loggerSettings);
-export { logger };
-//# sourceMappingURL=logger.js.map

package/dist/__tests__/lib/logger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../__tests__/lib/logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,MAAM,QAAQ,GAAG,OAAO,CAAC;AACzB,MAAM,MAAM,GAAG,WAAW,CAAC;AAC3B,MAAM,MAAM,GAAG,QAAQ,CAAC;AAExB,MAAM,cAAc,GAAoB;IACtC,QAAQ;IACR,IAAI,EAAE,MAAM;IACZ,UAAU,EAAE,MAAM;IAClB,MAAM;IACN,UAAU,EAAE,CAAC;IACb,eAAe,EAAE,CAAC;IAClB,2BAA2B;IAC3B,6BAA6B;IAC7B,iCAAiC;IACjC,eAAe;IACf,aAAa,EAAE;QACb,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,MAAM;QACZ,KAAK,EAAE,OAAO;QACd,KAAK,EAAE,OAAO;KACf;CACF,CAAC;AAEF,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,CAAC"}

package/dist/src/get-register-config.d.ts

@@ -1,4 +0,0 @@
-import { ICLOptions, IRegisterConfig } from './interfaces';
-export declare const getServiceID: (name: string, instance: string, envCode?: string) => string;
-export declare const getRegisterConfig: (options: ICLOptions) => Promise<IRegisterConfig>;
-//# sourceMappingURL=get-register-config.d.ts.map

package/dist/src/get-register-config.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-register-config.d.ts","sourceRoot":"","sources":["../../src/get-register-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAI3D,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,EAAE,UAAU,MAAM,EAAE,UAAS,MAAW,WAGhF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAU,SAAS,UAAU,KAAG,OAAO,CAAC,eAAe,CA2FpF,CAAC"}

package/dist/src/get-register-config.js

@@ -1,94 +0,0 @@
-import { PREFIX } from './constants';
-import { getFQDNCached } from './lib/fqdn';
-import { getPackageJson, parseMeta, parseTags, removeAroundQuotas } from './lib/utils';
-export const getServiceID = (name, instance, envCode = '') => {
-    const p = (process.env.NODE_CONSUL_ENV || process.env.NODE_ENV) === 'production';
-    return `${p ? 'prd' : 'dev'}-${envCode}-${name}-${instance}`.toLowerCase();
-};
-export const getRegisterConfig = async (options) => {
-    const { config, envCode = '' } = options;
-    const { webServer } = config;
-    const consulServiceConfig = config?.consul?.service ?? {};
-    const { id, host } = consulServiceConfig;
-    let { name, instance, version, description, tags, meta, port } = consulServiceConfig;
-    name = removeAroundQuotas(name);
-    instance = removeAroundQuotas(instance);
-    version = removeAroundQuotas(version);
-    description = removeAroundQuotas(description);
-    tags = parseTags(tags);
-    tags = [name, version, ...(tags)];
-    if (envCode) {
-        tags.push(envCode);
-    }
-    port = Number(port) || Number(webServer.port);
-    if (!port) {
-        throw new Error(`${PREFIX}: Port is empty!`);
-    }
-    const serviceId = id || process.env.CONSUL_SERVICE_ID || getServiceID(name, instance, envCode);
-    const address = host || (await getFQDNCached());
-    if (!address) {
-        throw new Error(`${PREFIX}: Address is empty!`);
-    }
-    meta = parseMeta(meta, { serviceId, name, instance, address, port });
-    const metaObj = {
-        host: address,
-        port: String(port),
-        NODE_ENV: process.env.NODE_ENV || '',
-    };
-    if (name) {
-        metaObj.name = name;
-    }
-    if (version) {
-        metaObj.version = version;
-    }
-    if (description) {
-        metaObj.description = description;
-    }
-    if (instance) {
-        metaObj.instance = instance;
-    }
-    let packageJson = getPackageJson();
-    if (packageJson) {
-        metaObj.pj_name = packageJson.name;
-        metaObj.pj_version = packageJson.version;
-    }
-    if (metaObj.pj_name !== 'fa-consul') {
-        packageJson = getPackageJson('/node_modules/fa-consul');
-        if (packageJson) {
-            metaObj.af_consul_version = packageJson.version;
-        }
-    }
-    const registerConfig = {
-        id: serviceId,
-        name: serviceId,
-        port,
-        address,
-        tags,
-        // @ts-ignore
-        meta: { ...metaObj, ...meta },
-    };
-    const check = { ...(config.consul?.check || {}) };
-    [['name', `Service '${name}-${instance}'`], ['timeout', '5s'], ['deregistercriticalserviceafter', '3m']]
-        .forEach(([n, v]) => {
-        // @ts-ignore
-        if (!check[n]) {
-            // @ts-ignore
-            check[n] = v;
-        }
-    });
-    if (!(check.http || check.tcp || check.script || check.shell)) {
-        check.http = `http://${address}:${port}/health`;
-    }
-    if ((check.http || check.script) && !check.interval) {
-        check.interval = '10s';
-    }
-    registerConfig.check = check;
-    if (!config.service) {
-        config.service = {};
-    }
-    config.service.id = serviceId;
-    config.service.address = address;
-    config.service.fromService = `${serviceId} / ${address}`;
-    return registerConfig;
-};
-//# sourceMappingURL=get-register-config.js.map

package/dist/src/get-register-config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"get-register-config.js","sourceRoot":"","sources":["../../src/get-register-config.ts"],"names":[],"mappings":"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"}