fa-consul 1.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +112 -0
- package/dist/__tests__/lib/logger.d.ts +3 -0
- package/dist/__tests__/lib/logger.d.ts.map +1 -0
- package/dist/__tests__/lib/logger.js +25 -0
- package/dist/__tests__/lib/logger.js.map +1 -0
- package/dist/access-points/access-points-updater.d.ts +19 -0
- package/dist/access-points/access-points-updater.d.ts.map +1 -0
- package/dist/access-points/access-points-updater.js +141 -0
- package/dist/access-points/access-points-updater.js.map +1 -0
- package/dist/access-points/access-points-utils.d.ts +4 -0
- package/dist/access-points/access-points-utils.d.ts.map +1 -0
- package/dist/access-points/access-points-utils.js +27 -0
- package/dist/access-points/access-points-utils.js.map +1 -0
- package/dist/access-points/access-points.d.ts +20 -0
- package/dist/access-points/access-points.d.ts.map +1 -0
- package/dist/access-points/access-points.js +166 -0
- package/dist/access-points/access-points.js.map +1 -0
- package/dist/constants.d.ts +7 -0
- package/dist/constants.d.ts.map +1 -0
- package/dist/constants.js +7 -0
- package/dist/constants.js.map +1 -0
- package/dist/consul-client/endpoints/agent.d.ts +31 -0
- package/dist/consul-client/endpoints/agent.d.ts.map +1 -0
- package/dist/consul-client/endpoints/agent.js +87 -0
- package/dist/consul-client/endpoints/agent.js.map +1 -0
- package/dist/consul-client/endpoints/catalog.d.ts +11 -0
- package/dist/consul-client/endpoints/catalog.d.ts.map +1 -0
- package/dist/consul-client/endpoints/catalog.js +14 -0
- package/dist/consul-client/endpoints/catalog.js.map +1 -0
- package/dist/consul-client/endpoints/health.d.ts +18 -0
- package/dist/consul-client/endpoints/health.d.ts.map +1 -0
- package/dist/consul-client/endpoints/health.js +28 -0
- package/dist/consul-client/endpoints/health.js.map +1 -0
- package/dist/consul-client/http-client.d.ts +26 -0
- package/dist/consul-client/http-client.d.ts.map +1 -0
- package/dist/consul-client/http-client.js +139 -0
- package/dist/consul-client/http-client.js.map +1 -0
- package/dist/consul-client/index.d.ts +16 -0
- package/dist/consul-client/index.d.ts.map +1 -0
- package/dist/consul-client/index.js +25 -0
- package/dist/consul-client/index.js.map +1 -0
- package/dist/consul-client/types.d.ts +126 -0
- package/dist/consul-client/types.d.ts.map +1 -0
- package/dist/consul-client/types.js +2 -0
- package/dist/consul-client/types.js.map +1 -0
- package/dist/cyclic-register.d.ts +3 -0
- package/dist/cyclic-register.d.ts.map +1 -0
- package/dist/cyclic-register.js +75 -0
- package/dist/cyclic-register.js.map +1 -0
- package/dist/get-api.d.ts +5 -0
- package/dist/get-api.d.ts.map +1 -0
- package/dist/get-api.js +51 -0
- package/dist/get-api.js.map +1 -0
- package/dist/get-register-config.d.ts +4 -0
- package/dist/get-register-config.d.ts.map +1 -0
- package/dist/get-register-config.js +94 -0
- package/dist/get-register-config.js.map +1 -0
- package/dist/index.d.ts +12 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +11 -0
- package/dist/index.js.map +1 -0
- package/dist/interfaces.d.ts +251 -0
- package/dist/interfaces.d.ts.map +1 -0
- package/dist/interfaces.js +2 -0
- package/dist/interfaces.js.map +1 -0
- package/dist/lib/color.d.ts +40 -0
- package/dist/lib/color.d.ts.map +1 -0
- package/dist/lib/color.js +41 -0
- package/dist/lib/color.js.map +1 -0
- package/dist/lib/curl-text.d.ts +3 -0
- package/dist/lib/curl-text.d.ts.map +1 -0
- package/dist/lib/curl-text.js +73 -0
- package/dist/lib/curl-text.js.map +1 -0
- package/dist/lib/fqdn.d.ts +3 -0
- package/dist/lib/fqdn.d.ts.map +1 -0
- package/dist/lib/fqdn.js +40 -0
- package/dist/lib/fqdn.js.map +1 -0
- package/dist/lib/hash.d.ts +3 -0
- package/dist/lib/hash.d.ts.map +1 -0
- package/dist/lib/hash.js +64 -0
- package/dist/lib/hash.js.map +1 -0
- package/dist/lib/http-request-text.d.ts +4 -0
- package/dist/lib/http-request-text.d.ts.map +1 -0
- package/dist/lib/http-request-text.js +21 -0
- package/dist/lib/http-request-text.js.map +1 -0
- package/dist/lib/logger-stub.d.ts +9 -0
- package/dist/lib/logger-stub.d.ts.map +1 -0
- package/dist/lib/logger-stub.js +10 -0
- package/dist/lib/logger-stub.js.map +1 -0
- package/dist/lib/utils.d.ts +17 -0
- package/dist/lib/utils.d.ts.map +1 -0
- package/dist/lib/utils.js +164 -0
- package/dist/lib/utils.js.map +1 -0
- package/dist/prepare-consul-api.d.ts +4 -0
- package/dist/prepare-consul-api.d.ts.map +1 -0
- package/dist/prepare-consul-api.js +380 -0
- package/dist/prepare-consul-api.js.map +1 -0
- package/dist/src/get-register-config.d.ts +4 -0
- package/dist/src/get-register-config.d.ts.map +1 -0
- package/dist/src/get-register-config.js +94 -0
- package/dist/src/get-register-config.js.map +1 -0
- package/package.json +65 -0
- package/src/access-points/access-points-updater.ts +154 -0
- package/src/access-points/access-points-utils.ts +31 -0
- package/src/access-points/access-points.ts +185 -0
- package/src/constants.ts +7 -0
- package/src/consul-client/endpoints/agent.ts +91 -0
- package/src/consul-client/endpoints/catalog.ts +13 -0
- package/src/consul-client/endpoints/health.ts +31 -0
- package/src/consul-client/http-client.ts +166 -0
- package/src/consul-client/index.ts +31 -0
- package/src/consul-client/types.ts +134 -0
- package/src/cyclic-register.ts +94 -0
- package/src/get-api.ts +62 -0
- package/src/get-register-config.ts +102 -0
- package/src/index.ts +58 -0
- package/src/interfaces.ts +276 -0
- package/src/lib/color.ts +43 -0
- package/src/lib/curl-text.ts +91 -0
- package/src/lib/fqdn.ts +45 -0
- package/src/lib/hash.ts +56 -0
- package/src/lib/http-request-text.ts +24 -0
- package/src/lib/logger-stub.ts +11 -0
- package/src/lib/utils.ts +174 -0
- package/src/prepare-consul-api.ts +426 -0
|
@@ -0,0 +1,380 @@
|
|
|
1
|
+
/* eslint-disable no-console */
|
|
2
|
+
// noinspection UnnecessaryLocalVariableJS,JSUnusedGlobalSymbols
|
|
3
|
+
import { Mutex } from 'async-mutex';
|
|
4
|
+
import { CONSUL_DEBUG_ON, DEBUG, MAX_API_CACHED, PREFIX } from './constants';
|
|
5
|
+
import { ConsulClient } from './consul-client';
|
|
6
|
+
import { blue, cyan, magenta, reset, yellow } from './lib/color';
|
|
7
|
+
import { getCurlText } from './lib/curl-text';
|
|
8
|
+
import { getFQDNCached } from './lib/fqdn';
|
|
9
|
+
import { getConfigHash } from './lib/hash';
|
|
10
|
+
import getHttpRequestText from './lib/http-request-text';
|
|
11
|
+
import loggerStub from './lib/logger-stub';
|
|
12
|
+
import { minimizeCache, parseBoolean, serviceConfigDiff } from './lib/utils';
|
|
13
|
+
const mutex = new Mutex();
|
|
14
|
+
const dbg = {
|
|
15
|
+
on: CONSUL_DEBUG_ON,
|
|
16
|
+
curl: /af-consul:curl/i.test(DEBUG),
|
|
17
|
+
};
|
|
18
|
+
const debug = (msg) => {
|
|
19
|
+
if (dbg.on) {
|
|
20
|
+
console.log(`${magenta}${PREFIX}${reset}: ${msg}`);
|
|
21
|
+
}
|
|
22
|
+
};
|
|
23
|
+
const agentTypeS = Symbol.for('agentType');
|
|
24
|
+
const consulConfigTypes = ['reg', 'dev', 'prd'];
|
|
25
|
+
const getConsulAgentOptions = async (clOptions) => {
|
|
26
|
+
const { agent, service, } = clOptions.config.consul;
|
|
27
|
+
const secure_ = parseBoolean(agent.reg.secure);
|
|
28
|
+
const result = {};
|
|
29
|
+
const reg = {
|
|
30
|
+
host: agent.reg.host || (await getFQDNCached()) || process.env.HOST_HOSTNAME || service?.host || '127.0.0.1',
|
|
31
|
+
port: String(agent.reg.port || (secure_ ? 433 : 8500)),
|
|
32
|
+
secure: secure_,
|
|
33
|
+
...(agent.reg.token ? { defaults: { token: agent.reg.token } } : {}),
|
|
34
|
+
};
|
|
35
|
+
result.reg = reg;
|
|
36
|
+
['dev', 'prd'].forEach((id) => {
|
|
37
|
+
if (agent[id]) {
|
|
38
|
+
const { host, port, secure, token, dc, } = agent[id];
|
|
39
|
+
const agentOpts = {
|
|
40
|
+
host: String(host || reg.host),
|
|
41
|
+
port: String(port || reg.port),
|
|
42
|
+
secure: parseBoolean(secure == null ? reg.secure : secure),
|
|
43
|
+
...(token ? { defaults: { token } } : (reg.defaults ? { defaults: reg.defaults } : {})),
|
|
44
|
+
...(dc ? { dc } : {}),
|
|
45
|
+
};
|
|
46
|
+
result[id] = agentOpts;
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
result[id] = { ...reg };
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
consulConfigTypes.forEach((id) => {
|
|
53
|
+
if (!Number(result[id].port)) {
|
|
54
|
+
throw new Error(`The port for consul agent[${id}] is invalid: [${result[id].port}]`);
|
|
55
|
+
}
|
|
56
|
+
// @ts-ignore
|
|
57
|
+
result[id][agentTypeS] = id;
|
|
58
|
+
});
|
|
59
|
+
return result;
|
|
60
|
+
};
|
|
61
|
+
export const prepareConsulAPI = async (clOptions) => {
|
|
62
|
+
let logger = (clOptions.logger || loggerStub);
|
|
63
|
+
if (!logger?.info) {
|
|
64
|
+
logger = loggerStub;
|
|
65
|
+
}
|
|
66
|
+
const fullConsulAgentOptions = await getConsulAgentOptions(clOptions);
|
|
67
|
+
if (dbg.on) {
|
|
68
|
+
debug(`CONSUL AGENT OPTIONS:\n${JSON.stringify(fullConsulAgentOptions, undefined, 2)}`);
|
|
69
|
+
}
|
|
70
|
+
const consulInstances = {};
|
|
71
|
+
consulConfigTypes.forEach((id) => {
|
|
72
|
+
const consulAgentOptions = fullConsulAgentOptions[id];
|
|
73
|
+
const consulInstance = new ConsulClient(consulAgentOptions);
|
|
74
|
+
// @ts-ignore
|
|
75
|
+
consulInstance[agentTypeS] = id;
|
|
76
|
+
consulInstances[id] = consulInstance;
|
|
77
|
+
consulInstance.onRequest((request) => {
|
|
78
|
+
if (dbg.on) {
|
|
79
|
+
const msg = dbg.curl ? getCurlText(request) : getHttpRequestText(request);
|
|
80
|
+
debug(`[${request.id}] ${yellow}${msg}${reset}`);
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
consulInstance.onResponse((request, response) => {
|
|
84
|
+
const rqId = `[${request.id}] `;
|
|
85
|
+
try {
|
|
86
|
+
const { statusCode = 0, body = null } = response || {};
|
|
87
|
+
debug(`${rqId}HTTP Status: ${statusCode}`);
|
|
88
|
+
if (statusCode > 299) {
|
|
89
|
+
if (body) {
|
|
90
|
+
logger.error(`${rqId}[CONSUL] ERROR: ${JSON.stringify(body)}`);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
debug(`${rqId}response.body not found!`);
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
catch (err) {
|
|
98
|
+
logger.error(`ERROR (onResponse ${rqId}): \n err.message: ${err.message}\n err.stack:\n${err.stack}\n`);
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
const getAgentTypeByServiceID = (serviceId) => {
|
|
103
|
+
const agentType = serviceId.substring(0, 3);
|
|
104
|
+
return (/(dev|prd)/.test(agentType) ? agentType : 'reg');
|
|
105
|
+
};
|
|
106
|
+
const getAgentOptionsByServiceID = (serviceId) => fullConsulAgentOptions[getAgentTypeByServiceID(serviceId)];
|
|
107
|
+
const getConsulInstanceByServiceID = (serviceId) => consulInstances[getAgentTypeByServiceID(serviceId)];
|
|
108
|
+
const createConsulClientFromOptions = (agentOptions) => new ConsulClient(agentOptions);
|
|
109
|
+
const api = {
|
|
110
|
+
// Returns the services the agent is managing. - список сервисов на этом агенте
|
|
111
|
+
async agentServiceList(apiArgs = {}) {
|
|
112
|
+
// ### GET http://<*.host>:<*.port>/v1/agent/services
|
|
113
|
+
let client;
|
|
114
|
+
if (apiArgs.agentOptions) {
|
|
115
|
+
client = createConsulClientFromOptions(apiArgs.agentOptions);
|
|
116
|
+
}
|
|
117
|
+
else if (apiArgs.agentType) {
|
|
118
|
+
client = consulInstances[apiArgs.agentType];
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
client = consulInstances.reg;
|
|
122
|
+
}
|
|
123
|
+
try {
|
|
124
|
+
const result = await client.agent.serviceList();
|
|
125
|
+
return result;
|
|
126
|
+
}
|
|
127
|
+
catch (err) {
|
|
128
|
+
logger.error(`[consul.agent.serviceList] ERROR:\n err.message: ${err.message}\n err.stack:\n${err.stack}\n`);
|
|
129
|
+
return apiArgs.withError ? err : false;
|
|
130
|
+
}
|
|
131
|
+
},
|
|
132
|
+
// Lists services in a given datacenter
|
|
133
|
+
async catalogServiceList(dc, apiArgs = {}) {
|
|
134
|
+
// ### GET https://<context.host>:<context.port>/v1/catalog/services?dc=<dc>
|
|
135
|
+
let client;
|
|
136
|
+
if (apiArgs.agentOptions) {
|
|
137
|
+
client = createConsulClientFromOptions(apiArgs.agentOptions);
|
|
138
|
+
}
|
|
139
|
+
else if (apiArgs.agentType) {
|
|
140
|
+
client = consulInstances[apiArgs.agentType];
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
const agentType = (Object.entries(fullConsulAgentOptions)
|
|
144
|
+
.find(([, v]) => v.dc === dc) || ['dev'])[0];
|
|
145
|
+
client = consulInstances[agentType];
|
|
146
|
+
}
|
|
147
|
+
try {
|
|
148
|
+
const result = await client.catalog.serviceList(dc);
|
|
149
|
+
return result;
|
|
150
|
+
}
|
|
151
|
+
catch (err) {
|
|
152
|
+
logger.error(`[consul.catalog.serviceList] ERROR:\n err.message: ${err.message}\n err.stack:\n${err.stack}\n`);
|
|
153
|
+
return apiArgs.withError ? err : {};
|
|
154
|
+
}
|
|
155
|
+
},
|
|
156
|
+
// Returns the nodes and health info of a service
|
|
157
|
+
async consulHealthService(apiArgs) {
|
|
158
|
+
// ### GET https://<context.host>:<context.port>/v1/health/service/<apiArgs.options.serviceId>?passing=true&dc=<apiArgs.options.dc || context.dc>
|
|
159
|
+
const { service: serviceId, dc, passing, } = apiArgs.options;
|
|
160
|
+
let dcToUse = dc;
|
|
161
|
+
if (!dcToUse) {
|
|
162
|
+
const agentOptions = getAgentOptionsByServiceID(serviceId);
|
|
163
|
+
dcToUse = agentOptions.dc || undefined;
|
|
164
|
+
}
|
|
165
|
+
let client;
|
|
166
|
+
if (apiArgs.agentOptions) {
|
|
167
|
+
client = createConsulClientFromOptions(apiArgs.agentOptions);
|
|
168
|
+
}
|
|
169
|
+
else if (apiArgs.agentType) {
|
|
170
|
+
client = consulInstances[apiArgs.agentType];
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
client = getConsulInstanceByServiceID(serviceId);
|
|
174
|
+
}
|
|
175
|
+
try {
|
|
176
|
+
const result = await client.health.service({
|
|
177
|
+
service: serviceId,
|
|
178
|
+
dc: dcToUse,
|
|
179
|
+
passing,
|
|
180
|
+
});
|
|
181
|
+
return result;
|
|
182
|
+
}
|
|
183
|
+
catch (err) {
|
|
184
|
+
logger.error(`[consul.health.service] ERROR:\n err.message: ${err.message}\n err.stack:\n${err.stack}\n`);
|
|
185
|
+
return apiArgs.withError ? err : [];
|
|
186
|
+
}
|
|
187
|
+
},
|
|
188
|
+
async getServiceInfo(serviceName) {
|
|
189
|
+
// ### GET https://<context.host>:<context.port>/v1/health/service/<apiArgs.options.serviceId>?passing=true&dc=<apiArgs.options.dc || context.dc>
|
|
190
|
+
const result = await this.consulHealthService({
|
|
191
|
+
options: {
|
|
192
|
+
service: serviceName,
|
|
193
|
+
passing: true,
|
|
194
|
+
},
|
|
195
|
+
});
|
|
196
|
+
const res = result?.[0]?.Service;
|
|
197
|
+
if (!res) {
|
|
198
|
+
logger.debug(`No info about service ID ${cyan}${serviceName}`);
|
|
199
|
+
}
|
|
200
|
+
return res;
|
|
201
|
+
},
|
|
202
|
+
async getServiceSocket(serviceName, defaults) {
|
|
203
|
+
if (process.env.USE_DEFAULT_SERVICE_SOCKET) {
|
|
204
|
+
return defaults;
|
|
205
|
+
}
|
|
206
|
+
// В функции consulHealthService используется агент dev/prd в зависимости от префикса
|
|
207
|
+
const result = await this.consulHealthService({
|
|
208
|
+
options: {
|
|
209
|
+
service: serviceName,
|
|
210
|
+
passing: true,
|
|
211
|
+
},
|
|
212
|
+
});
|
|
213
|
+
if (!result || !result.length) {
|
|
214
|
+
logger.warn(`CONSUL: No working service found: ${cyan}${serviceName}${reset}. Return defaults ${defaults.host}:${defaults.port}`);
|
|
215
|
+
return defaults;
|
|
216
|
+
}
|
|
217
|
+
const service = result[0]?.Service;
|
|
218
|
+
const nodeAddress = result[0]?.Node?.Node;
|
|
219
|
+
const Address = service?.Address || nodeAddress;
|
|
220
|
+
const Port = service?.Port;
|
|
221
|
+
const host = await getFQDNCached(Address);
|
|
222
|
+
return {
|
|
223
|
+
host: host || Address || '',
|
|
224
|
+
port: Port || 0,
|
|
225
|
+
};
|
|
226
|
+
},
|
|
227
|
+
// Registers a new service.
|
|
228
|
+
async agentServiceRegister(options, withError = false) {
|
|
229
|
+
// ### PUT http://<reg.host>:<reg.port>/v1/agent/service/register
|
|
230
|
+
try {
|
|
231
|
+
await consulInstances.reg.agent.serviceRegister(options);
|
|
232
|
+
return true;
|
|
233
|
+
}
|
|
234
|
+
catch (err) {
|
|
235
|
+
logger.error(`[consul.agent.service.register] ERROR:\n err.message: ${err.message}\n err.stack:\n${err.stack}\n`);
|
|
236
|
+
return withError ? err : false;
|
|
237
|
+
}
|
|
238
|
+
},
|
|
239
|
+
// Deregister a service.
|
|
240
|
+
async agentServiceDeregister(serviceId, apiArgs = {}) {
|
|
241
|
+
// ### PUT http://<reg.host>:<reg.port>/v1/agent/service/deregister/<serviceId>
|
|
242
|
+
let client;
|
|
243
|
+
if (apiArgs.agentOptions) {
|
|
244
|
+
client = createConsulClientFromOptions(apiArgs.agentOptions);
|
|
245
|
+
}
|
|
246
|
+
else if (apiArgs.agentType) {
|
|
247
|
+
client = consulInstances[apiArgs.agentType];
|
|
248
|
+
}
|
|
249
|
+
else {
|
|
250
|
+
client = consulInstances.reg;
|
|
251
|
+
}
|
|
252
|
+
try {
|
|
253
|
+
await client.agent.serviceDeregister(serviceId);
|
|
254
|
+
return true;
|
|
255
|
+
}
|
|
256
|
+
catch (err) {
|
|
257
|
+
logger.error(`[consul.agent.service.deregister] ERROR:\n err.message: ${err.message}\n err.stack:\n${err.stack}\n`);
|
|
258
|
+
return apiArgs.withError ? err : false;
|
|
259
|
+
}
|
|
260
|
+
},
|
|
261
|
+
async deregisterIfNeed(serviceId, agentOptions) {
|
|
262
|
+
const apiArgs = agentOptions ? { agentOptions } : {};
|
|
263
|
+
const healthServiceInfo = await this.checkIfServiceRegistered(serviceId, apiArgs);
|
|
264
|
+
if (healthServiceInfo) {
|
|
265
|
+
const nodeHost = (healthServiceInfo.Node?.Node || '').toLowerCase()
|
|
266
|
+
.split('.')[0] || '';
|
|
267
|
+
const [agentType = 'reg'] = Object.entries(fullConsulAgentOptions)
|
|
268
|
+
.find(([, aOpt]) => aOpt.host.toLowerCase()
|
|
269
|
+
.startsWith(nodeHost)) || [];
|
|
270
|
+
apiArgs.agentType = agentType;
|
|
271
|
+
const isDeregister = await this.agentServiceDeregister(serviceId, apiArgs);
|
|
272
|
+
const agentHost = fullConsulAgentOptions[agentType].host;
|
|
273
|
+
const m = (wasnt = '') => `Previous registration of service '${cyan}${serviceId}${reset}'${wasnt} removed from consul agent ${blue}${agentHost}${reset}`;
|
|
274
|
+
if (isDeregister) {
|
|
275
|
+
logger.info(m());
|
|
276
|
+
}
|
|
277
|
+
else {
|
|
278
|
+
logger.error(m(' was NOT'));
|
|
279
|
+
return false;
|
|
280
|
+
}
|
|
281
|
+
}
|
|
282
|
+
else {
|
|
283
|
+
logger.info(`Service '${cyan}${serviceId}${reset}' is not registered in Consul`);
|
|
284
|
+
}
|
|
285
|
+
return true;
|
|
286
|
+
},
|
|
287
|
+
// Returns the members as seen by the consul agent. - список агентов (нод)
|
|
288
|
+
agentMembers: async (apiArgs = {}) => {
|
|
289
|
+
// ### GET http://<reg.host>:<reg.port>/v1/agent/members
|
|
290
|
+
let client;
|
|
291
|
+
if (apiArgs.agentOptions) {
|
|
292
|
+
client = createConsulClientFromOptions(apiArgs.agentOptions);
|
|
293
|
+
}
|
|
294
|
+
else if (apiArgs.agentType) {
|
|
295
|
+
client = consulInstances[apiArgs.agentType];
|
|
296
|
+
}
|
|
297
|
+
else {
|
|
298
|
+
client = consulInstances.reg;
|
|
299
|
+
}
|
|
300
|
+
try {
|
|
301
|
+
const result = await client.agent.members();
|
|
302
|
+
return result;
|
|
303
|
+
}
|
|
304
|
+
catch (err) {
|
|
305
|
+
logger.error(`[consul.agent.members] ERROR:\n err.message: ${err.message}\n err.stack:\n${err.stack}\n`);
|
|
306
|
+
return apiArgs.withError ? err : false;
|
|
307
|
+
}
|
|
308
|
+
},
|
|
309
|
+
async checkIfServiceRegistered(serviceIdOrName, apiArgs = {}) {
|
|
310
|
+
if (!apiArgs.agentOptions && !apiArgs.agentType) {
|
|
311
|
+
apiArgs.agentType = getAgentTypeByServiceID(serviceIdOrName);
|
|
312
|
+
}
|
|
313
|
+
const result = await this.consulHealthService({ ...apiArgs, options: { service: serviceIdOrName } });
|
|
314
|
+
return result?.[0];
|
|
315
|
+
},
|
|
316
|
+
async registerService(registerConfig, registerOptions) {
|
|
317
|
+
const serviceId = registerConfig.id || registerConfig.name;
|
|
318
|
+
const srv = `Service '${cyan}${serviceId}${reset}'`;
|
|
319
|
+
const serviceInfo = await this.getServiceInfo(serviceId);
|
|
320
|
+
const diff = serviceConfigDiff(registerConfig, serviceInfo);
|
|
321
|
+
const isAlreadyRegistered = !!serviceInfo;
|
|
322
|
+
const already = () => {
|
|
323
|
+
if (!registerOptions.noAlreadyRegisteredMessage) {
|
|
324
|
+
if (dbg.on) {
|
|
325
|
+
console.log(`${srv} already registered in Consul`);
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
return 'already';
|
|
329
|
+
};
|
|
330
|
+
switch (registerOptions.registerType) {
|
|
331
|
+
case 'if-config-differ': {
|
|
332
|
+
if (!diff.length) {
|
|
333
|
+
return already();
|
|
334
|
+
}
|
|
335
|
+
logger.info(`${srv}. Configuration difference detected. New: config.${diff[0]}=${diff[1]} / Current: config.${diff[2]}=${diff[3]}`);
|
|
336
|
+
break;
|
|
337
|
+
}
|
|
338
|
+
case 'if-not-registered': {
|
|
339
|
+
if (isAlreadyRegistered) {
|
|
340
|
+
return already();
|
|
341
|
+
}
|
|
342
|
+
break;
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
if (isAlreadyRegistered && registerOptions.deleteOtherInstance) {
|
|
346
|
+
if (await this.agentServiceDeregister(serviceId)) {
|
|
347
|
+
logger.info(`Previous registration of ${srv} removed from Consul`);
|
|
348
|
+
}
|
|
349
|
+
}
|
|
350
|
+
const isJustRegistered = await this.agentServiceRegister(registerConfig);
|
|
351
|
+
if (isJustRegistered) {
|
|
352
|
+
if (dbg.on) {
|
|
353
|
+
logger.info(`${srv} is registered in Consul`);
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
else {
|
|
357
|
+
logger.error(`${srv} is NOT registered in Consul`);
|
|
358
|
+
}
|
|
359
|
+
return isJustRegistered ? 'just' : false;
|
|
360
|
+
},
|
|
361
|
+
agentOptions: fullConsulAgentOptions,
|
|
362
|
+
getConsulAgentOptions,
|
|
363
|
+
};
|
|
364
|
+
return api;
|
|
365
|
+
};
|
|
366
|
+
const consulApiCache = {};
|
|
367
|
+
export const getConsulApiCached = async (clOptions) => mutex
|
|
368
|
+
.runExclusive(async () => {
|
|
369
|
+
const hash = getConfigHash(clOptions);
|
|
370
|
+
if (!consulApiCache[hash]) {
|
|
371
|
+
minimizeCache(consulApiCache, MAX_API_CACHED);
|
|
372
|
+
const value = await prepareConsulAPI(clOptions);
|
|
373
|
+
consulApiCache[hash] = {
|
|
374
|
+
created: Date.now(),
|
|
375
|
+
value,
|
|
376
|
+
};
|
|
377
|
+
}
|
|
378
|
+
return consulApiCache[hash].value;
|
|
379
|
+
});
|
|
380
|
+
//# sourceMappingURL=prepare-consul-api.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"prepare-consul-api.js","sourceRoot":"","sources":["../src/prepare-consul-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { ICLOptions, IRegisterConfig } from './interfaces';
|
|
2
|
+
export declare const getServiceID: (name: string, instance: string, envCode?: string) => string;
|
|
3
|
+
export declare const getRegisterConfig: (options: ICLOptions) => Promise<IRegisterConfig>;
|
|
4
|
+
//# sourceMappingURL=get-register-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"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"}
|
|
@@ -0,0 +1,94 @@
|
|
|
1
|
+
import { PREFIX } from './constants';
|
|
2
|
+
import { getFQDNCached } from './lib/fqdn';
|
|
3
|
+
import { getPackageJson, parseMeta, parseTags, removeAroundQuotas } from './lib/utils';
|
|
4
|
+
export const getServiceID = (name, instance, envCode = '') => {
|
|
5
|
+
const p = (process.env.NODE_CONSUL_ENV || process.env.NODE_ENV) === 'production';
|
|
6
|
+
return `${p ? 'prd' : 'dev'}-${envCode}-${name}-${instance}`.toLowerCase();
|
|
7
|
+
};
|
|
8
|
+
export const getRegisterConfig = async (options) => {
|
|
9
|
+
const { config, envCode = '' } = options;
|
|
10
|
+
const { webServer } = config;
|
|
11
|
+
const consulServiceConfig = config?.consul?.service ?? {};
|
|
12
|
+
const { id, host } = consulServiceConfig;
|
|
13
|
+
let { name, instance, version, description, tags, meta, port } = consulServiceConfig;
|
|
14
|
+
name = removeAroundQuotas(name);
|
|
15
|
+
instance = removeAroundQuotas(instance);
|
|
16
|
+
version = removeAroundQuotas(version);
|
|
17
|
+
description = removeAroundQuotas(description);
|
|
18
|
+
tags = parseTags(tags);
|
|
19
|
+
tags = [name, version, ...(tags)];
|
|
20
|
+
if (envCode) {
|
|
21
|
+
tags.push(envCode);
|
|
22
|
+
}
|
|
23
|
+
port = Number(port) || Number(webServer.port);
|
|
24
|
+
if (!port) {
|
|
25
|
+
throw new Error(`${PREFIX}: Port is empty!`);
|
|
26
|
+
}
|
|
27
|
+
const serviceId = id || process.env.CONSUL_SERVICE_ID || getServiceID(name, instance, envCode);
|
|
28
|
+
const address = host || (await getFQDNCached());
|
|
29
|
+
if (!address) {
|
|
30
|
+
throw new Error(`${PREFIX}: Address is empty!`);
|
|
31
|
+
}
|
|
32
|
+
meta = parseMeta(meta, { serviceId, name, instance, address, port });
|
|
33
|
+
const metaObj = {
|
|
34
|
+
host: address,
|
|
35
|
+
port: String(port),
|
|
36
|
+
NODE_ENV: process.env.NODE_ENV || '',
|
|
37
|
+
};
|
|
38
|
+
if (name) {
|
|
39
|
+
metaObj.name = name;
|
|
40
|
+
}
|
|
41
|
+
if (version) {
|
|
42
|
+
metaObj.version = version;
|
|
43
|
+
}
|
|
44
|
+
if (description) {
|
|
45
|
+
metaObj.description = description;
|
|
46
|
+
}
|
|
47
|
+
if (instance) {
|
|
48
|
+
metaObj.instance = instance;
|
|
49
|
+
}
|
|
50
|
+
let packageJson = getPackageJson();
|
|
51
|
+
if (packageJson) {
|
|
52
|
+
metaObj.pj_name = packageJson.name;
|
|
53
|
+
metaObj.pj_version = packageJson.version;
|
|
54
|
+
}
|
|
55
|
+
if (metaObj.pj_name !== 'fa-consul') {
|
|
56
|
+
packageJson = getPackageJson('/node_modules/fa-consul');
|
|
57
|
+
if (packageJson) {
|
|
58
|
+
metaObj.af_consul_version = packageJson.version;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
const registerConfig = {
|
|
62
|
+
id: serviceId,
|
|
63
|
+
name: serviceId,
|
|
64
|
+
port,
|
|
65
|
+
address,
|
|
66
|
+
tags,
|
|
67
|
+
// @ts-ignore
|
|
68
|
+
meta: { ...metaObj, ...meta },
|
|
69
|
+
};
|
|
70
|
+
const check = { ...(config.consul?.check || {}) };
|
|
71
|
+
[['name', `Service '${name}-${instance}'`], ['timeout', '5s'], ['deregistercriticalserviceafter', '3m']]
|
|
72
|
+
.forEach(([n, v]) => {
|
|
73
|
+
// @ts-ignore
|
|
74
|
+
if (!check[n]) {
|
|
75
|
+
// @ts-ignore
|
|
76
|
+
check[n] = v;
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
if (!(check.http || check.tcp || check.script || check.shell)) {
|
|
80
|
+
check.http = `http://${address}:${port}/health`;
|
|
81
|
+
}
|
|
82
|
+
if ((check.http || check.script) && !check.interval) {
|
|
83
|
+
check.interval = '10s';
|
|
84
|
+
}
|
|
85
|
+
registerConfig.check = check;
|
|
86
|
+
if (!config.service) {
|
|
87
|
+
config.service = {};
|
|
88
|
+
}
|
|
89
|
+
config.service.id = serviceId;
|
|
90
|
+
config.service.address = address;
|
|
91
|
+
config.service.fromService = `${serviceId} / ${address}`;
|
|
92
|
+
return registerConfig;
|
|
93
|
+
};
|
|
94
|
+
//# sourceMappingURL=get-register-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-register-config.js","sourceRoot":"","sources":["../../src/get-register-config.ts"],"names":[],"mappings":"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"}
|
package/package.json
ADDED
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "fa-consul",
|
|
3
|
+
"version": "1.0.1",
|
|
4
|
+
"description": "A highly specialized function library",
|
|
5
|
+
"type": "module",
|
|
6
|
+
"main": "dist/index.js",
|
|
7
|
+
"types": "dist/index.d.ts",
|
|
8
|
+
"author": "Viacheslav Makarov <vvmakarov@bazilio.ru>",
|
|
9
|
+
"license": "ISC",
|
|
10
|
+
"engines": {
|
|
11
|
+
"node": ">=18.0.0"
|
|
12
|
+
},
|
|
13
|
+
"scripts": {
|
|
14
|
+
"test:register": "node --loader ts-node/esm ./__tests__/lib/register.ts",
|
|
15
|
+
"test:deregister": "node --loader ts-node/esm ./__tests__/lib/deregister.ts",
|
|
16
|
+
"test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
|
|
17
|
+
"test:unit": "node --experimental-vm-modules node_modules/jest/bin/jest.js __tests__/unit/",
|
|
18
|
+
"test:coverage": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage",
|
|
19
|
+
"lint": "eslint .",
|
|
20
|
+
"lint:fix": "eslint . --fix",
|
|
21
|
+
"clean": "shx rm -rf dist/*",
|
|
22
|
+
"build": "tsc -p tsconfig.build.json",
|
|
23
|
+
"cb": "shx rm -rf dist/* && tsc -p tsconfig.build.json",
|
|
24
|
+
"cbd": "shx rm -rf dist/* && tsc -p tsconfig.json"
|
|
25
|
+
},
|
|
26
|
+
"dependencies": {
|
|
27
|
+
"af-tools-ts": "^1.1.5",
|
|
28
|
+
"async-mutex": "^0.5.0",
|
|
29
|
+
"xxhashjs": "^0.2.2"
|
|
30
|
+
},
|
|
31
|
+
"devDependencies": {
|
|
32
|
+
"@eslint/js": "^9.39.2",
|
|
33
|
+
"@jest/test-sequencer": "^30.2.0",
|
|
34
|
+
"@types/config": "^3.3.5",
|
|
35
|
+
"@types/jest": "^29.5.6",
|
|
36
|
+
"@types/node": "^24.10.1",
|
|
37
|
+
"@types/xxhashjs": "^0.2.4",
|
|
38
|
+
"af-logger": "^2.0.29",
|
|
39
|
+
"config": "^4.1.1",
|
|
40
|
+
"dotenv": "^17.2.3",
|
|
41
|
+
"eslint": "^9.39.2",
|
|
42
|
+
"globals": "^16.5.0",
|
|
43
|
+
"jest": "^30.2.0",
|
|
44
|
+
"shx": "^0.4.0",
|
|
45
|
+
"ts-jest": "^29.4.6",
|
|
46
|
+
"ts-node": "^10.9.2",
|
|
47
|
+
"typescript": "^5.9.3",
|
|
48
|
+
"typescript-eslint": "^8.49.0"
|
|
49
|
+
},
|
|
50
|
+
"np": {
|
|
51
|
+
"yarn": false,
|
|
52
|
+
"contents": "."
|
|
53
|
+
},
|
|
54
|
+
"publishConfig": {
|
|
55
|
+
"access": "public"
|
|
56
|
+
},
|
|
57
|
+
"files": [
|
|
58
|
+
"dist/**/*",
|
|
59
|
+
"src/**/*"
|
|
60
|
+
],
|
|
61
|
+
"repository": {
|
|
62
|
+
"type": "git",
|
|
63
|
+
"url": "git+https://github.com/Bazilio-san/fa-consul.git"
|
|
64
|
+
}
|
|
65
|
+
}
|