af-consul - npm Package Compare versions

Comparing version 3.0.14 to 3.0.15

package.json

 {
   "name": "af-consul",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "description": "A highly specialized function library",
@@ -5,0 +5,0 @@ "main": "./dist/cjs/src/index.js",

README.md

@@ -43,53 +43,49 @@ ## Not of interest to third party users
 
+const e = process.env;
 const config = {
-    consul: {
-        check: {
-            interval: process.env.CONSUL_HEALTH_CHECK_INTERVAL || '10s',
-            timeout: process.env.CONSUL_HEALTH_CHECK_TMEOUT || '5s',
-            deregistercriticalserviceafter: process.env.CONSUL_DEREGISTER_CRITICAL_SERVICE_AFTER || '3m',
-        },
-        agent: {
-            host: process.env.CONSUL_AGENT_HOST || os.hostname(),
-            port: process.env.CONSUL_AGENT_PORT || '8500',
-            secure: !!process.env.CONSUL_AGENT_SECURE,
-            token: process.env.CONSUL_AGENT_TOKEN,
-        },
-        service: {
-            name: process.env.CONSUL_SERVICE_NAME || 'af-consul',
-            instance: process.env.CONSUL_SERVICE_INSTANCE || 'test',
-            version: process.env.CONSUL_SERVICE_VERSION || '0.0.1',
-            description: process.env.CONSUL_SERVICE_DESCRIPTION || 'AF-CONSUL TEST',
-            tags: process.env.CONSUL_SERVICE_TAGS || [
-                'af',
-                'consul',
-                'test',
-            ],
-            meta: process.env.CONSUL_SERVICE_META || { CONSUL_TEST: 12345, line_yellow: 'straight' },
-            host: process.env.CONSUL_SERVICE_HOST || null,
-            port: process.env.CONSUL_SERVICE_PORT || null,
-        },
+  consul: {
+    check: {
+      interval: e.CONSUL_HEALTH_CHECK_INTERVAL || '1s',
+      timeout: e.CONSUL_HEALTH_CHECK_TMEOUT || '1s',
+      deregistercriticalserviceafter: e.CONSUL_DEREGISTER_CRITICAL_SERVICE_AFTER || '1m',
     },
-    webServer: {
-        host: process.env.WS_HOST || '0.0.0.0',
-        port: process.env.WS_PORT || '10000',
+    agent: {
+      reg: {
+        host: e.CONSUL_AGENT_HOST || thisHostName,
+        port: e.CONSUL_AGENT_PORT || '8500',
+        secure: e.CONSUL_AGENT_SECURE,
+        token: e.CONSUL_AGENT_TOKEN,
+      },
+      dev: {
+        dc: e.CONSUL_AGENT_DEV_DC || 'dc-dev',
+        host: e.CONSUL_AGENT_DEV_HOST || thisHostName,
+        port: e.CONSUL_AGENT_DEV_PORT || '8500',
+        secure: e.CONSUL_AGENT_DEV_SECURE,
+        token: e.CONSUL_AGENT_DEV_TOKEN,
+      },
+      prd: {
+        dc: e.CONSUL_AGENT_PRD_DC || 'dc-prd',
+        host: e.CONSUL_AGENT_PRD_HOST || thisHostName,
+        port: e.CONSUL_AGENT_PRD_PORT || '8500',
+        secure: e.CONSUL_AGENT_PRD_SECURE,
+        token: e.CONSUL_AGENT_PRD_TOKEN,
+      },
     },
-};
-
-const getConsulAPI = async () => getAPI(
-    {
-        config,
-        logger,
-        projectId: process.env.PROJECT_ID || 'proj',
+    // Details of the service being registered with consul
+    service: {
+      name: e.CONSUL_SERVICE_NAME || 'af-consul',
+      instance: e.CONSUL_SERVICE_INSTANCE || 'test',
+      version: e.CONSUL_SERVICE_VERSION || '0.0.1',
+      description: e.CONSUL_SERVICE_DESCRIPTION || 'AF-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,
+      port: e.CONSUL_SERVICE_PORT || null,
     },
-);
-
-
-getConsulAPI().then(({ register }) => {
-    register.once().then(() => null);
-});
-
-getConsulAPI().then(({ deregister }) => {
-    deregister().then(() => null);
-});
-
+  },
+  webServer: {
+    host: e.WS_HOST || '0.0.0.0',
+    port: e.WS_PORT || '10000',
+  },
+}
 ```
@@ -96,0 +92,0 @@

src/access-points/access-points-updater.ts

@@ -96,3 +96,3 @@ /* eslint-disable no-console */
 export async function updateAccessPoints (clOptions: ICLOptions): Promise<boolean> {
-  const accessPoints = Object.values(<IAccessPoints>clOptions.config.accessPoints).filter((ap: any) => ap?.isAP);
+  const accessPoints = Object.values(<IAccessPoints>clOptions.config.accessPoints).filter((ap: any) => ap?.isAP && !ap.noConsul);
   const result = [];
@@ -99,0 +99,0 @@ for (let i = 0; i < accessPoints.length; i++) {

src/interfaces.ts

@@ -89,2 +89,3 @@ import Consul from 'consul';
   updateIntervalIfSuccessMillis?: number,
+  noConsul?: boolean,
 
@@ -91,0 +92,0 @@ [propName: string]: any

No alert changes

Improved metrics

Lines of code

4552

increased by0.02%

Worsened metrics

Total package byte prevSize

313463

Number of lines in readme file

113

decreased by-3.42%

No dependency changes