@axinom/mosaic-service-common 0.18.0 → 0.19.0-rc.10
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/dist/common/config/basic-config-definitions.d.ts +107 -2
- package/dist/common/config/basic-config-definitions.d.ts.map +1 -1
- package/dist/common/config/basic-config-definitions.js +61 -1
- package/dist/common/config/basic-config-definitions.js.map +1 -1
- package/dist/common/config/env-var-extensions.d.ts.map +1 -1
- package/dist/common/config/env-var-extensions.js +1 -0
- package/dist/common/config/env-var-extensions.js.map +1 -1
- package/dist/common/logging/generate-log.d.ts +2 -0
- package/dist/common/logging/generate-log.d.ts.map +1 -1
- package/dist/common/logging/generate-log.js +1 -0
- package/dist/common/logging/generate-log.js.map +1 -1
- package/dist/common/logging/index.d.ts +1 -0
- package/dist/common/logging/index.d.ts.map +1 -1
- package/dist/common/logging/index.js +1 -0
- package/dist/common/logging/index.js.map +1 -1
- package/dist/common/logging/log-message.d.ts +2 -0
- package/dist/common/logging/log-message.d.ts.map +1 -1
- package/dist/common/logging/log-retention.d.ts +18 -0
- package/dist/common/logging/log-retention.d.ts.map +1 -0
- package/dist/common/logging/log-retention.js +22 -0
- package/dist/common/logging/log-retention.js.map +1 -0
- package/dist/common/logging/logger.d.ts +2 -0
- package/dist/common/logging/logger.d.ts.map +1 -1
- package/dist/common/logging/logger.js +21 -0
- package/dist/common/logging/logger.js.map +1 -1
- package/dist/middleware/index.d.ts +1 -0
- package/dist/middleware/index.d.ts.map +1 -1
- package/dist/middleware/index.js +1 -0
- package/dist/middleware/index.js.map +1 -1
- package/dist/middleware/liveness-readiness-middleware.d.ts +2 -8
- package/dist/middleware/liveness-readiness-middleware.d.ts.map +1 -1
- package/dist/middleware/liveness-readiness-middleware.js +3 -2
- package/dist/middleware/liveness-readiness-middleware.js.map +1 -1
- package/dist/middleware/maintenance-middleware.d.ts +30 -0
- package/dist/middleware/maintenance-middleware.d.ts.map +1 -0
- package/dist/middleware/maintenance-middleware.js +110 -0
- package/dist/middleware/maintenance-middleware.js.map +1 -0
- package/dist/middleware/monitoring-middleware.d.ts +2 -7
- package/dist/middleware/monitoring-middleware.d.ts.map +1 -1
- package/dist/middleware/monitoring-middleware.js +13 -2
- package/dist/middleware/monitoring-middleware.js.map +1 -1
- package/package.json +3 -2
|
@@ -9,11 +9,28 @@ export declare const getBasicConfigDefinitions: (variables?: Dict<string | undef
|
|
|
9
9
|
environment: () => "test" | "development" | "production";
|
|
10
10
|
serviceId: () => string;
|
|
11
11
|
logLevel: () => "" | "FATAL" | "ERROR" | "WARN" | "INFO" | "DEBUG" | "TRACE";
|
|
12
|
+
healthEndpointPort: () => number | undefined;
|
|
12
13
|
secureLoggingMode: () => MaskMode;
|
|
13
14
|
logMaskKeywords: () => string[];
|
|
14
15
|
isDev: () => boolean;
|
|
15
16
|
isProd: () => boolean;
|
|
16
17
|
};
|
|
18
|
+
/**
|
|
19
|
+
* Get the basic configuration definitions for the Maintenance Endpoint
|
|
20
|
+
* @param variables process.env variables or custom provided values
|
|
21
|
+
*/
|
|
22
|
+
export declare const getBasicMaintenanceEndpointDefinitions: (variables?: Dict<string | undefined>, logger?: LoggerFn | undefined) => {
|
|
23
|
+
maintenanceEndpointPort: () => number | undefined;
|
|
24
|
+
maintenanceEndpointUserName: () => string;
|
|
25
|
+
maintenanceEndpointPassword: () => string;
|
|
26
|
+
};
|
|
27
|
+
/**
|
|
28
|
+
* Get the basic configuration definitions for the Metrics Endpoint
|
|
29
|
+
* @param variables process.env variables or custom provided values
|
|
30
|
+
*/
|
|
31
|
+
export declare const getBasicMetricsEndpointDefinitions: (variables?: Dict<string | undefined>, logger?: LoggerFn | undefined) => {
|
|
32
|
+
metricsEndpointPort: () => number | undefined;
|
|
33
|
+
};
|
|
17
34
|
/**
|
|
18
35
|
* Get the basic configuration definitions for GraphQL specific settings
|
|
19
36
|
* @param variables process.env variables or custom provided values
|
|
@@ -89,19 +106,107 @@ export declare const getBasicManagedConfigDefinitions: (variables?: Dict<string
|
|
|
89
106
|
* Get the basic, validated configuration object.
|
|
90
107
|
*/
|
|
91
108
|
export declare const getValidatedBasicConfig: (variables?: Dict<string | undefined>) => BasicConfig;
|
|
109
|
+
/**
|
|
110
|
+
* The basic Configuration type
|
|
111
|
+
*/
|
|
92
112
|
declare const config: import("./config-validation").ValueObject<{
|
|
93
113
|
environment: () => "test" | "development" | "production";
|
|
94
114
|
serviceId: () => string;
|
|
95
115
|
logLevel: () => "" | "FATAL" | "ERROR" | "WARN" | "INFO" | "DEBUG" | "TRACE";
|
|
116
|
+
healthEndpointPort: () => number | undefined;
|
|
96
117
|
secureLoggingMode: () => MaskMode;
|
|
97
118
|
logMaskKeywords: () => string[];
|
|
98
119
|
isDev: () => boolean;
|
|
99
120
|
isProd: () => boolean;
|
|
100
121
|
}>;
|
|
122
|
+
export declare type BasicConfig = typeof config;
|
|
101
123
|
/**
|
|
102
|
-
* The basic Configuration type
|
|
124
|
+
* The basic maintenance Configuration type
|
|
103
125
|
*/
|
|
104
|
-
|
|
126
|
+
declare const maintenanceConfig: import("./config-validation").ValueObject<{
|
|
127
|
+
maintenanceEndpointPort: () => number | undefined;
|
|
128
|
+
maintenanceEndpointUserName: () => string;
|
|
129
|
+
maintenanceEndpointPassword: () => string;
|
|
130
|
+
}>;
|
|
131
|
+
export declare type BasicMaintenanceConfig = typeof maintenanceConfig;
|
|
132
|
+
/**
|
|
133
|
+
* The basic metrics Configuration type
|
|
134
|
+
*/
|
|
135
|
+
declare const metricsConfig: import("./config-validation").ValueObject<{
|
|
136
|
+
metricsEndpointPort: () => number | undefined;
|
|
137
|
+
}>;
|
|
138
|
+
export declare type BasicMetricsConfig = typeof metricsConfig;
|
|
139
|
+
/**
|
|
140
|
+
* The basic GraphQL Configuration type
|
|
141
|
+
*/
|
|
142
|
+
declare const gqlConfig: import("./config-validation").ValueObject<{
|
|
143
|
+
port: () => number;
|
|
144
|
+
graphqlGuiEnabled: () => boolean;
|
|
145
|
+
}>;
|
|
146
|
+
export declare type BasicGQLConfig = typeof gqlConfig;
|
|
147
|
+
/**
|
|
148
|
+
* The basic DB Configuration type
|
|
149
|
+
*/
|
|
150
|
+
declare const dbConfig: import("./config-validation").ValueObject<{
|
|
151
|
+
pgHost: () => string;
|
|
152
|
+
pgPort: () => number;
|
|
153
|
+
pgUserSuffix: () => string;
|
|
154
|
+
pgSSLMode: () => "require" | "allow" | "disable" | "prefer" | "verify-ca" | "verify-full";
|
|
155
|
+
pgRoot: () => string | undefined;
|
|
156
|
+
pgRootPassword: () => string | undefined;
|
|
157
|
+
dbName: () => string;
|
|
158
|
+
dbOwner: () => string;
|
|
159
|
+
dbOwnerPassword: () => string;
|
|
160
|
+
dbLogin: () => string;
|
|
161
|
+
dbLoginPassword: () => string;
|
|
162
|
+
dbGqlRole: () => string;
|
|
163
|
+
pgRootConnectionString: () => string;
|
|
164
|
+
dbOwnerConnectionString: () => string;
|
|
165
|
+
dbShadowConnectionString: () => string;
|
|
166
|
+
dbLoginConnectionString: () => string;
|
|
167
|
+
}>;
|
|
168
|
+
export declare type BasicDBConfig = typeof dbConfig;
|
|
169
|
+
/**
|
|
170
|
+
* The basic RMQ Configuration type
|
|
171
|
+
*/
|
|
172
|
+
declare const rmqConfig: import("./config-validation").ValueObject<{
|
|
173
|
+
rmqProtocol: () => string;
|
|
174
|
+
rmqVHost: () => string;
|
|
175
|
+
rmqHost: () => string;
|
|
176
|
+
rmqPort: () => number;
|
|
177
|
+
rmqUser: () => string;
|
|
178
|
+
rmqPassword: () => string;
|
|
179
|
+
rmqDevMiddleware: () => boolean;
|
|
180
|
+
rmqVHostAssert: () => boolean;
|
|
181
|
+
rmqChannelMax: () => number;
|
|
182
|
+
rmqMgmtProtocol: () => string | undefined;
|
|
183
|
+
rmqMgmtHost: () => string | undefined;
|
|
184
|
+
rmqMgmtPort: () => number | undefined;
|
|
185
|
+
}>;
|
|
186
|
+
export declare type BasicRMQConfig = typeof rmqConfig;
|
|
187
|
+
/**
|
|
188
|
+
* The basic managed-service Configuration type
|
|
189
|
+
*/
|
|
190
|
+
declare const managedServiceConfig: import("./config-validation").ValueObject<{
|
|
191
|
+
idServiceAuthBaseUrl: () => string;
|
|
192
|
+
managedServiceAccountClientId: () => string;
|
|
193
|
+
managedServiceAccountClientSecret: () => string;
|
|
194
|
+
dbEnvOwner: () => string;
|
|
195
|
+
dbEnvOwnerPassword: () => string;
|
|
196
|
+
dbEnvOwnerConnectionString: () => string;
|
|
197
|
+
}>;
|
|
198
|
+
export declare type BasicManagedServiceConfig = typeof managedServiceConfig;
|
|
199
|
+
/**
|
|
200
|
+
* The basic customizable-service Configuration type
|
|
201
|
+
*/
|
|
202
|
+
declare const customizableServiceConfig: import("./config-validation").ValueObject<{
|
|
203
|
+
tenantId: () => string;
|
|
204
|
+
environmentId: () => string;
|
|
205
|
+
idServiceAuthBaseUrl: () => string;
|
|
206
|
+
serviceAccountClientId: () => string;
|
|
207
|
+
serviceAccountClientSecret: () => string;
|
|
208
|
+
}>;
|
|
209
|
+
export declare type BasicCustomizableServiceConfig = typeof customizableServiceConfig;
|
|
105
210
|
/**
|
|
106
211
|
* Get a string that contains help which default process env are supported
|
|
107
212
|
* within the different `getBasic***ConfigDefinitions` that can be printed to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic-config-definitions.d.ts","sourceRoot":"","sources":["../../../src/common/config/basic-config-definitions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,EAAuB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAQhC;;;GAGG;AACH,eAAO,MAAM,yBAAyB,eACzB,KAAK,MAAM,GAAG,SAAS,CAAC
|
|
1
|
+
{"version":3,"file":"basic-config-definitions.d.ts","sourceRoot":"","sources":["../../../src/common/config/basic-config-definitions.ts"],"names":[],"mappings":"AAEA,OAAO,EAAQ,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,EAAuB,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAQhC;;;GAGG;AACH,eAAO,MAAM,yBAAyB,eACzB,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;;;;CAgCpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,sCAAsC,eACtC,KAAK,MAAM,GAAG,SAAS,CAAC;;;;CAYpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kCAAkC,eAClC,KAAK,MAAM,GAAG,SAAS,CAAC;;CAOpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gCAAgC,gBAC9B,MAAM,cACR,KAAK,MAAM,GAAG,SAAS,CAAC;;;CASpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,eAC3B,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;CAsDpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iCAAiC,eACjC,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;;;;;;;;CAwBpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,qCAAqC,eACrC,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;CAcpC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,gCAAgC,eAChC,KAAK,MAAM,GAAG,SAAS,CAAC;;;;;;;CAgCpC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,uBAAuB,eACvB,KAAK,MAAM,GAAG,SAAS,CAAC,KAClC,WAEF,CAAC;AAEF;;GAEG;AACH,QAAA,MAAM,MAAM;;;;;;;;;EAA6C,CAAC;AAC1D,oBAAY,WAAW,GAAG,OAAO,MAAM,CAAC;AAExC;;GAEG;AACH,QAAA,MAAM,iBAAiB;;;;EAEtB,CAAC;AACF,oBAAY,sBAAsB,GAAG,OAAO,iBAAiB,CAAC;AAE9D;;GAEG;AACH,QAAA,MAAM,aAAa;;EAAsD,CAAC;AAC1E,oBAAY,kBAAkB,GAAG,OAAO,aAAa,CAAC;AAEtD;;GAEG;AACH,QAAA,MAAM,SAAS;;;EAAwD,CAAC;AACxE,oBAAY,cAAc,GAAG,OAAO,SAAS,CAAC;AAE9C;;GAEG;AACH,QAAA,MAAM,QAAQ;;;;;;;;;;;;;;;;;EAA+C,CAAC;AAC9D,oBAAY,aAAa,GAAG,OAAO,QAAQ,CAAC;AAE5C;;GAEG;AACH,QAAA,MAAM,SAAS;;;;;;;;;;;;;EAAqD,CAAC;AACrE,oBAAY,cAAc,GAAG,OAAO,SAAS,CAAC;AAE9C;;GAEG;AACH,QAAA,MAAM,oBAAoB;;;;;;;EAAoD,CAAC;AAC/E,oBAAY,yBAAyB,GAAG,OAAO,oBAAoB,CAAC;AAEpE;;GAEG;AACH,QAAA,MAAM,yBAAyB;;;;;;EAE9B,CAAC;AACF,oBAAY,8BAA8B,GAAG,OAAO,yBAAyB,CAAC;AAE9E;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,kBAAkB,QAAO,MAuCrC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getEnvSettingsHelp = exports.getValidatedBasicConfig = exports.getBasicManagedConfigDefinitions = exports.getBasicCustomizableConfigDefinitions = exports.getBasicRabbitMqConfigDefinitions = exports.getBasicDbConfigDefinitions = exports.getBasicGraphQlConfigDefinitions = exports.getBasicConfigDefinitions = void 0;
|
|
3
|
+
exports.getEnvSettingsHelp = exports.getValidatedBasicConfig = exports.getBasicManagedConfigDefinitions = exports.getBasicCustomizableConfigDefinitions = exports.getBasicRabbitMqConfigDefinitions = exports.getBasicDbConfigDefinitions = exports.getBasicGraphQlConfigDefinitions = exports.getBasicMetricsEndpointDefinitions = exports.getBasicMaintenanceEndpointDefinitions = exports.getBasicConfigDefinitions = void 0;
|
|
4
4
|
/* eslint-disable @typescript-eslint/explicit-function-return-type */
|
|
5
5
|
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
6
6
|
const env_var_1 = require("env-var");
|
|
@@ -22,6 +22,7 @@ const getBasicConfigDefinitions = (variables = process.env, logger) => {
|
|
|
22
22
|
.asEnum(['development', 'production', 'test']),
|
|
23
23
|
serviceId: () => env.get('SERVICE_ID').required().asString(),
|
|
24
24
|
logLevel: () => env.get('LOG_LEVEL').default('INFO').asLogLevel(),
|
|
25
|
+
healthEndpointPort: () => env.get('HEALTH_ENDPOINT_PORT').asPortNumber(),
|
|
25
26
|
secureLoggingMode: () => env
|
|
26
27
|
.get('SECURE_LOGGING_MODE')
|
|
27
28
|
.default(logging_1.MaskMode.SECRETS_HIDDEN)
|
|
@@ -40,6 +41,30 @@ const getBasicConfigDefinitions = (variables = process.env, logger) => {
|
|
|
40
41
|
};
|
|
41
42
|
};
|
|
42
43
|
exports.getBasicConfigDefinitions = getBasicConfigDefinitions;
|
|
44
|
+
/**
|
|
45
|
+
* Get the basic configuration definitions for the Maintenance Endpoint
|
|
46
|
+
* @param variables process.env variables or custom provided values
|
|
47
|
+
*/
|
|
48
|
+
const getBasicMaintenanceEndpointDefinitions = (variables = process.env, logger) => {
|
|
49
|
+
const env = (0, env_var_1.from)(variables, undefined, logger);
|
|
50
|
+
return {
|
|
51
|
+
maintenanceEndpointPort: () => env.get('MAINTENANCE_ENDPOINT_PORT').asPortNumber(),
|
|
52
|
+
maintenanceEndpointUserName: () => env.get('MAINTENANCE_ENDPOINT_USER_NAME').required().asString(),
|
|
53
|
+
maintenanceEndpointPassword: () => env.get('MAINTENANCE_ENDPOINT_PASSWORD').required().asString(),
|
|
54
|
+
};
|
|
55
|
+
};
|
|
56
|
+
exports.getBasicMaintenanceEndpointDefinitions = getBasicMaintenanceEndpointDefinitions;
|
|
57
|
+
/**
|
|
58
|
+
* Get the basic configuration definitions for the Metrics Endpoint
|
|
59
|
+
* @param variables process.env variables or custom provided values
|
|
60
|
+
*/
|
|
61
|
+
const getBasicMetricsEndpointDefinitions = (variables = process.env, logger) => {
|
|
62
|
+
const env = (0, env_var_1.from)(variables, undefined, logger);
|
|
63
|
+
return {
|
|
64
|
+
metricsEndpointPort: () => env.get('METRICS_ENDPOINT_PORT').asPortNumber(),
|
|
65
|
+
};
|
|
66
|
+
};
|
|
67
|
+
exports.getBasicMetricsEndpointDefinitions = getBasicMetricsEndpointDefinitions;
|
|
43
68
|
/**
|
|
44
69
|
* Get the basic configuration definitions for GraphQL specific settings
|
|
45
70
|
* @param variables process.env variables or custom provided values
|
|
@@ -177,7 +202,38 @@ const getValidatedBasicConfig = (variables = process.env) => {
|
|
|
177
202
|
return (0, config_validation_1.getValidatedConfig)((0, exports.getBasicConfigDefinitions)(variables));
|
|
178
203
|
};
|
|
179
204
|
exports.getValidatedBasicConfig = getValidatedBasicConfig;
|
|
205
|
+
/**
|
|
206
|
+
* The basic Configuration type
|
|
207
|
+
*/
|
|
180
208
|
const config = (0, config_validation_1.getConfigType)((0, exports.getBasicConfigDefinitions)());
|
|
209
|
+
/**
|
|
210
|
+
* The basic maintenance Configuration type
|
|
211
|
+
*/
|
|
212
|
+
const maintenanceConfig = (0, config_validation_1.getConfigType)((0, exports.getBasicMaintenanceEndpointDefinitions)());
|
|
213
|
+
/**
|
|
214
|
+
* The basic metrics Configuration type
|
|
215
|
+
*/
|
|
216
|
+
const metricsConfig = (0, config_validation_1.getConfigType)((0, exports.getBasicMetricsEndpointDefinitions)());
|
|
217
|
+
/**
|
|
218
|
+
* The basic GraphQL Configuration type
|
|
219
|
+
*/
|
|
220
|
+
const gqlConfig = (0, config_validation_1.getConfigType)((0, exports.getBasicGraphQlConfigDefinitions)(9999));
|
|
221
|
+
/**
|
|
222
|
+
* The basic DB Configuration type
|
|
223
|
+
*/
|
|
224
|
+
const dbConfig = (0, config_validation_1.getConfigType)((0, exports.getBasicDbConfigDefinitions)());
|
|
225
|
+
/**
|
|
226
|
+
* The basic RMQ Configuration type
|
|
227
|
+
*/
|
|
228
|
+
const rmqConfig = (0, config_validation_1.getConfigType)((0, exports.getBasicRabbitMqConfigDefinitions)());
|
|
229
|
+
/**
|
|
230
|
+
* The basic managed-service Configuration type
|
|
231
|
+
*/
|
|
232
|
+
const managedServiceConfig = (0, config_validation_1.getConfigType)((0, exports.getBasicManagedConfigDefinitions)());
|
|
233
|
+
/**
|
|
234
|
+
* The basic customizable-service Configuration type
|
|
235
|
+
*/
|
|
236
|
+
const customizableServiceConfig = (0, config_validation_1.getConfigType)((0, exports.getBasicCustomizableConfigDefinitions)());
|
|
181
237
|
/**
|
|
182
238
|
* Get a string that contains help which default process env are supported
|
|
183
239
|
* within the different `getBasic***ConfigDefinitions` that can be printed to
|
|
@@ -212,6 +268,10 @@ const getEnvSettingsHelp = () => {
|
|
|
212
268
|
};
|
|
213
269
|
output += `# getBasicConfigDefinitions usage:${os_1.EOL}`;
|
|
214
270
|
(0, config_validation_1.getConfig)((0, exports.getBasicConfigDefinitions)(undefined, logger));
|
|
271
|
+
output += `# getBasicMaintenanceEndpointDefinitions usage:${os_1.EOL}`;
|
|
272
|
+
(0, config_validation_1.getConfig)((0, exports.getBasicMaintenanceEndpointDefinitions)(undefined, logger));
|
|
273
|
+
output += `# getBasicMetricsEndpointDefinitions usage:${os_1.EOL}`;
|
|
274
|
+
(0, config_validation_1.getConfig)((0, exports.getBasicMetricsEndpointDefinitions)(undefined, logger));
|
|
215
275
|
output += `# getBasicGraphQlConfigDefinitions usage:${os_1.EOL}`;
|
|
216
276
|
(0, config_validation_1.getConfig)((0, exports.getBasicGraphQlConfigDefinitions)(9999, undefined, logger));
|
|
217
277
|
output += `# getBasicDbConfigDefinitions usage:${os_1.EOL}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic-config-definitions.js","sourceRoot":"","sources":["../../../src/common/config/basic-config-definitions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"basic-config-definitions.js","sourceRoot":"","sources":["../../../src/common/config/basic-config-definitions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-var-extensions.d.ts","sourceRoot":"","sources":["../../../src/common/config/env-var-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EAAe,QAAQ,
|
|
1
|
+
{"version":3,"file":"env-var-extensions.d.ts","sourceRoot":"","sources":["../../../src/common/config/env-var-extensions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,OAAO,EAAe,QAAQ,EAAgB,MAAM,YAAY,CAAC;AAOjE;;;;;GAKG;AACH,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,MAAM,OAAO,QAAQ,GAAG,EAAE,CA0B9D,CAAC;AAEF,eAAO,MAAM,+BAA+B;uCACT,IAAI;CAGtC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAiBvD,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,EAAE,WAAW,CAAC,MAAM,CAM9C,CAAC"}
|
|
@@ -27,6 +27,7 @@ const asLogLevel = (logLevel) => {
|
|
|
27
27
|
details: { code: errors_1.ErrorCode.StartupError },
|
|
28
28
|
},
|
|
29
29
|
level: logging_1.LogLevel.WARN,
|
|
30
|
+
retention: logging_1.LogRetention.Medium,
|
|
30
31
|
loggerContext: 'asLogLevel',
|
|
31
32
|
});
|
|
32
33
|
// Unlike with our default logger - this will log string with both dev and prod env, since we cannot rely on config object here.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-var-extensions.js","sourceRoot":"","sources":["../../../src/common/config/env-var-extensions.ts"],"names":[],"mappings":";;;AACA,sCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"env-var-extensions.js","sourceRoot":"","sources":["../../../src/common/config/env-var-extensions.ts"],"names":[],"mappings":";;;AACA,sCAAsC;AACtC,wCAAiE;AAEjE;;GAEG;AACH,IAAI,sBAAsB,GAAG,IAAI,CAAC;AAElC;;;;;GAKG;AACI,MAAM,UAAU,GAA4C,CACjE,QAAgB,EACY,EAAE;;IAC9B,MAAM,WAAW,GAAG,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,KAAK,GAAG,kBAAQ,CAAC,WAAoC,CAAC,CAAC;IAC7D,IAAI,KAAK,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACpD,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAQ,CAAC;aACzC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aAC/B,IAAI,CAAC,IAAI,CAAC,CAAC;QACd,MAAM,GAAG,GAAG,IAAA,qBAAW,EAAC;YACtB,OAAO,EAAE;gBACP,OAAO,EAAE,cAAc,QAAQ,2DAA2D,cAAc,EAAE;gBAC1G,OAAO,EAAE,EAAE,IAAI,EAAE,kBAAS,CAAC,YAAY,EAAE;aAC1C;YACD,KAAK,EAAE,kBAAQ,CAAC,IAAI;YACpB,SAAS,EAAE,sBAAY,CAAC,MAAM;YAC9B,aAAa,EAAE,YAAY;SAC5B,CAAC,CAAC;QAEH,gIAAgI;QAChI,IAAI,GAAG,IAAI,sBAAsB,EAAE;YACjC,CAAC,MAAA,MAAM,CAAC,aAAa,mCAAI,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5D,sBAAsB,GAAG,KAAK,CAAC;SAChC;KACF;IACD,OAAO,MAAC,QAAkC,mCAAI,EAAE,CAAC;AACnD,CAAC,CAAC;AA1BW,QAAA,UAAU,cA0BrB;AAEW,QAAA,+BAA+B,GAAG;IAC7C,2BAA2B,EAAE,GAAS,EAAE;QACtC,sBAAsB,GAAG,IAAI,CAAC;IAChC,CAAC;CACF,CAAC;AAEF;;;;GAIG;AACI,MAAM,uBAAuB,GAAwB,CAC1D,KAAa,EACb,MAAe,EACf,aAAsB,EACd,EAAE;IACV,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,KAAK,CAAC;KACd;IACD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;KACH;IACD,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,+BAA+B,MAAM,EAAE,CAAC,CAAC;KAC3E;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAjBW,QAAA,uBAAuB,2BAiBlC;AAEF;;;;;;;GAOG;AACI,MAAM,cAAc,GAAwB,CAAC,KAAa,EAAU,EAAE;IAC3E,OAAO,IAAA,+BAAuB,EAC5B,KAAK,EACL,4BAA4B,EAC5B,0IAA0I,CAC3I,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,cAAc,kBAMzB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { LogLevel } from './log-level';
|
|
2
2
|
import { LogMessage } from './log-message';
|
|
3
|
+
import { LogRetention } from './log-retention';
|
|
3
4
|
import { Log } from './logger';
|
|
4
5
|
import { MaskMiddleware, MaskOptions } from './mask-middleware';
|
|
5
6
|
import { SkipMaskMiddleware } from './skip-mask-middleware';
|
|
@@ -9,6 +10,7 @@ import { SkipMaskMiddleware } from './skip-mask-middleware';
|
|
|
9
10
|
interface GenerateLogValues {
|
|
10
11
|
message: string | LogMessage;
|
|
11
12
|
level: LogLevel;
|
|
13
|
+
retention: LogRetention;
|
|
12
14
|
loggerContext: string;
|
|
13
15
|
error?: Error;
|
|
14
16
|
component?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-log.d.ts","sourceRoot":"","sources":["../../../src/common/logging/generate-log.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAW5D;;GAEG;AACH,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,KAAK,EAAE,QAAQ,CAAC;IAChB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,UAAU,kBAAkB;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS,CAAC;CAC7B;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,WACd,iBAAiB,4FAGxB,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"generate-log.d.ts","sourceRoot":"","sources":["../../../src/common/logging/generate-log.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,cAAc,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAW5D;;GAEG;AACH,UAAU,iBAAiB;IACzB,OAAO,EAAE,MAAM,GAAG,UAAU,CAAC;IAC7B,KAAK,EAAE,QAAQ,CAAC;IAChB,SAAS,EAAE,YAAY,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,UAAU,kBAAkB;IAC1B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,GAAG,SAAS,CAAC;CAC7B;AAED;;GAEG;AACH,eAAO,MAAM,WAAW,WACd,iBAAiB,4FAGxB,GAAG,GAAG,SAqER,CAAC"}
|
|
@@ -27,6 +27,7 @@ const generateLog = (values, masking, logMiddleware) => {
|
|
|
27
27
|
let logMessage = {
|
|
28
28
|
logtime: parseTimestamp(logtime),
|
|
29
29
|
loglevel: log_level_1.LogLevel[values.level],
|
|
30
|
+
retention: values.retention,
|
|
30
31
|
context: context || values.loggerContext,
|
|
31
32
|
component: values.component,
|
|
32
33
|
// sensitive properties
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-log.js","sourceRoot":"","sources":["../../../src/common/logging/generate-log.ts"],"names":[],"mappings":";;;AAAA,iCAAiC;AACjC,qDAAiD;AACjD,wCAA+D;AAC/D,2CAAuC;
|
|
1
|
+
{"version":3,"file":"generate-log.js","sourceRoot":"","sources":["../../../src/common/logging/generate-log.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/logging/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,yCAAyC,CAAC;AACxD,cAAc,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/logging/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC;AAChD,cAAc,wBAAwB,CAAC;AACvC,cAAc,yCAAyC,CAAC;AACxD,cAAc,mBAAmB,CAAC"}
|
|
@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
13
13
|
__exportStar(require("./generate-log"), exports);
|
|
14
14
|
__exportStar(require("./log-level"), exports);
|
|
15
15
|
__exportStar(require("./log-message"), exports);
|
|
16
|
+
__exportStar(require("./log-retention"), exports);
|
|
16
17
|
__exportStar(require("./logger"), exports);
|
|
17
18
|
__exportStar(require("./mask-middleware"), exports);
|
|
18
19
|
__exportStar(require("./setup-global-console-override"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA+B;AAC/B,8CAA4B;AAC5B,gDAA8B;AAC9B,2CAAyB;AACzB,oDAAkC;AAClC,kEAAgD;AAChD,yDAAuC;AACvC,0EAAwD;AACxD,oDAAkC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/logging/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA+B;AAC/B,8CAA4B;AAC5B,gDAA8B;AAC9B,kDAAgC;AAChC,2CAAyB;AACzB,oDAAkC;AAClC,kEAAgD;AAChD,yDAAuC;AACvC,0EAAwD;AACxD,oDAAkC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Dict } from '../types';
|
|
2
|
+
import { LogRetention } from './log-retention';
|
|
2
3
|
/**
|
|
3
4
|
* An interface that represents a message object to be logged by Logger. An example of Mosaic implementation:
|
|
4
5
|
* ```ts
|
|
@@ -11,6 +12,7 @@ import { Dict } from '../types';
|
|
|
11
12
|
export interface LogMessage {
|
|
12
13
|
message?: string;
|
|
13
14
|
logtime?: string | Date;
|
|
15
|
+
retention?: LogRetention;
|
|
14
16
|
context?: string;
|
|
15
17
|
details?: Dict<unknown>;
|
|
16
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log-message.d.ts","sourceRoot":"","sources":["../../../src/common/logging/log-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"log-message.d.ts","sourceRoot":"","sources":["../../../src/common/logging/log-message.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,SAAS,CAAC,EAAE,YAAY,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;CACzB"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* An enum containing retention time frames for log messages.
|
|
3
|
+
*/
|
|
4
|
+
export declare enum LogRetention {
|
|
5
|
+
/**
|
|
6
|
+
* Logs are saved for 7 days.
|
|
7
|
+
*/
|
|
8
|
+
Short = "short",
|
|
9
|
+
/**
|
|
10
|
+
* Logs are saved for 90 days.
|
|
11
|
+
*/
|
|
12
|
+
Medium = "medium",
|
|
13
|
+
/**
|
|
14
|
+
* Logs are saved for 365 days.
|
|
15
|
+
*/
|
|
16
|
+
Long = "long"
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=log-retention.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-retention.d.ts","sourceRoot":"","sources":["../../../src/common/logging/log-retention.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,YAAY;IACtB;;OAEG;IACH,KAAK,UAAU;IACf;;OAEG;IACH,MAAM,WAAW;IACjB;;OAEG;IACH,IAAI,SAAS;CACd"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.LogRetention = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* An enum containing retention time frames for log messages.
|
|
6
|
+
*/
|
|
7
|
+
var LogRetention;
|
|
8
|
+
(function (LogRetention) {
|
|
9
|
+
/**
|
|
10
|
+
* Logs are saved for 7 days.
|
|
11
|
+
*/
|
|
12
|
+
LogRetention["Short"] = "short";
|
|
13
|
+
/**
|
|
14
|
+
* Logs are saved for 90 days.
|
|
15
|
+
*/
|
|
16
|
+
LogRetention["Medium"] = "medium";
|
|
17
|
+
/**
|
|
18
|
+
* Logs are saved for 365 days.
|
|
19
|
+
*/
|
|
20
|
+
LogRetention["Long"] = "long";
|
|
21
|
+
})(LogRetention = exports.LogRetention || (exports.LogRetention = {}));
|
|
22
|
+
//# sourceMappingURL=log-retention.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log-retention.js","sourceRoot":"","sources":["../../../src/common/logging/log-retention.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,IAAY,YAaX;AAbD,WAAY,YAAY;IACtB;;OAEG;IACH,+BAAe,CAAA;IACf;;OAEG;IACH,iCAAiB,CAAA;IACjB;;OAEG;IACH,6BAAa,CAAA;AACf,CAAC,EAbW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAavB"}
|
|
@@ -12,6 +12,7 @@ import { SkipMaskMiddleware } from './skip-mask-middleware';
|
|
|
12
12
|
export interface Log {
|
|
13
13
|
logtime: string;
|
|
14
14
|
loglevel: string;
|
|
15
|
+
retention: string;
|
|
15
16
|
message: string;
|
|
16
17
|
context: string;
|
|
17
18
|
component?: string;
|
|
@@ -135,6 +136,7 @@ export declare class Logger {
|
|
|
135
136
|
*/
|
|
136
137
|
private getLogMiddleware;
|
|
137
138
|
private format;
|
|
139
|
+
private getLogRetention;
|
|
138
140
|
private processArgsAndWriteLog;
|
|
139
141
|
}
|
|
140
142
|
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/common/logging/logger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../src/common/logging/logger.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,WAAW,EAAwC,MAAM,WAAW,CAAC;AAE9E,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAe,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAEL,cAAc,EAEf,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxB,KAAK,CAAC,EAAE,WAAW,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;;;;OASG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAE9B;;OAEG;IACH,cAAc,CAAC,EAAE,cAAc,CAAC;IAEhC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IAExC;;OAEG;IACH,aAAa,CAAC,EAAE,aAAa,EAAE,CAAC;CACjC;AAID;;;;GAIG;AACH,eAAO,MAAM,yBAAyB,+CAEnC,IAEF,CAAC;AAGF;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,mDAEvC,IAEF,CAAC;AAIF;;;;;;GAMG;AACH,eAAO,MAAM,wBAAwB,gDAElC,IAEF,CAAC;AAEF;;GAEG;AACH,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuB;IAC9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAiB;IACjD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAqB;IACzD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAkB;IAEhD;;;OAGG;gBACS,OAAO,CAAC,EAAE,aAAa;IAUnC,OAAO,CAAC,cAAc;IAWf,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IACzC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IACzB,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAKvD,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IACzC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IACzB,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAKvD,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IACxC,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IACxB,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAKtD,GAAG,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IACvC,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IACvB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAKrD,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IACzC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IACzB,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAKvD,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IACzC,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IACzB,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAK9D;;;;OAIG;IACI,KAAK,CACV,OAAO,EAAE,MAAM,GAAG,UAAU,EAC5B,EACE,KAAqB,EACrB,KAAK,GACN,GAAE;QACD;;WAEG;QACH,KAAK,CAAC,EAAE,QAAQ,CAAC;QACjB;;WAEG;QACH,KAAK,CAAC,EAAE,KAAK,CAAC;KACV,GACL,IAAI;IA2BP,OAAO,CAAC,OAAO;IAIf;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAIxB,OAAO,CAAC,MAAM;IAyCd,OAAO,CAAC,eAAe;IAuBvB,OAAO,CAAC,sBAAsB;CAY/B"}
|
|
@@ -2,10 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Logger = exports.setupGlobalLogMiddleware = exports.setupGlobalSkipMaskMiddleware = exports.setupGlobalMaskMiddleware = void 0;
|
|
4
4
|
const util_1 = require("util");
|
|
5
|
+
const __1 = require("..");
|
|
5
6
|
const config_1 = require("../config");
|
|
6
7
|
const helpers_1 = require("../helpers");
|
|
7
8
|
const generate_log_1 = require("./generate-log");
|
|
8
9
|
const log_level_1 = require("./log-level");
|
|
10
|
+
const log_retention_1 = require("./log-retention");
|
|
9
11
|
const mask_middleware_1 = require("./mask-middleware");
|
|
10
12
|
const skip_mask_middleware_1 = require("./skip-mask-middleware");
|
|
11
13
|
let globalMaskMiddleware;
|
|
@@ -144,6 +146,7 @@ class Logger {
|
|
|
144
146
|
message,
|
|
145
147
|
level,
|
|
146
148
|
error,
|
|
149
|
+
retention: this.getLogRetention(level, message),
|
|
147
150
|
loggerContext: this.loggerContext,
|
|
148
151
|
component: this.config.isDev
|
|
149
152
|
? undefined
|
|
@@ -167,6 +170,24 @@ class Logger {
|
|
|
167
170
|
}
|
|
168
171
|
return JSON.stringify(log);
|
|
169
172
|
}
|
|
173
|
+
getLogRetention(level, message) {
|
|
174
|
+
//return retention from message, if exists
|
|
175
|
+
if (typeof message !== 'string' && message.retention) {
|
|
176
|
+
return message.retention;
|
|
177
|
+
}
|
|
178
|
+
switch (level) {
|
|
179
|
+
case log_level_1.LogLevel.FATAL:
|
|
180
|
+
case log_level_1.LogLevel.ERROR:
|
|
181
|
+
case log_level_1.LogLevel.WARN:
|
|
182
|
+
case log_level_1.LogLevel.INFO:
|
|
183
|
+
return log_retention_1.LogRetention.Medium;
|
|
184
|
+
case log_level_1.LogLevel.DEBUG:
|
|
185
|
+
case log_level_1.LogLevel.TRACE:
|
|
186
|
+
return log_retention_1.LogRetention.Short;
|
|
187
|
+
default:
|
|
188
|
+
throw new __1.UnreachableCaseError(level);
|
|
189
|
+
}
|
|
190
|
+
}
|
|
170
191
|
processArgsAndWriteLog(level, args) {
|
|
171
192
|
var _a, _b;
|
|
172
193
|
let error;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logging/logger.ts"],"names":[],"mappings":";;;AAGA,+BAA+B;AAC/B,sCAA8E;AAC9E,wCAAmD;AAEnD,iDAA4D;AAC5D,2CAAuC;AAEvC,uDAI2B;AAC3B,iEAGgC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../src/common/logging/logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from './http-server-with-websockets-middleware';
|
|
2
2
|
export * from './liveness-readiness-middleware';
|
|
3
|
+
export * from './maintenance-middleware';
|
|
3
4
|
export * from './monitoring-middleware';
|
|
4
5
|
export * from './shutdown-actions-middleware';
|
|
5
6
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,iCAAiC,CAAC;AAChD,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":"AAAA,cAAc,0CAA0C,CAAC;AACzD,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC"}
|
package/dist/middleware/index.js
CHANGED
|
@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
__exportStar(require("./http-server-with-websockets-middleware"), exports);
|
|
14
14
|
__exportStar(require("./liveness-readiness-middleware"), exports);
|
|
15
|
+
__exportStar(require("./maintenance-middleware"), exports);
|
|
15
16
|
__exportStar(require("./monitoring-middleware"), exports);
|
|
16
17
|
__exportStar(require("./shutdown-actions-middleware"), exports);
|
|
17
18
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAAyD;AACzD,kEAAgD;AAChD,0DAAwC;AACxC,gEAA8C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/middleware/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2EAAyD;AACzD,kEAAgD;AAChD,2DAAyC;AACzC,0DAAwC;AACxC,gEAA8C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Logger } from '../common';
|
|
1
|
+
import { BasicConfig, Logger } from '../common';
|
|
2
2
|
declare class State<T> {
|
|
3
3
|
private state;
|
|
4
4
|
constructor(state: T);
|
|
@@ -9,10 +9,6 @@ declare class State<T> {
|
|
|
9
9
|
* Options used to set up liveliness and readiness endpoints.
|
|
10
10
|
*/
|
|
11
11
|
export interface ILivenessReadinessOptions {
|
|
12
|
-
/**
|
|
13
|
-
* `healthEndpointPort`: the server port which will serve liveness & readiness
|
|
14
|
-
*/
|
|
15
|
-
healthEndpointPort?: number;
|
|
16
12
|
/**
|
|
17
13
|
* `enableLivenessEndpoint`: expose a liveness probe endpoint or not
|
|
18
14
|
*/
|
|
@@ -66,9 +62,7 @@ export interface ILivenessReadinessOptions {
|
|
|
66
62
|
* @param livenessReadinessOptions The configuration object for liveness & readiness endpoints
|
|
67
63
|
* @param logger A logger object to use for output generated inside the middleware.
|
|
68
64
|
*/
|
|
69
|
-
export declare const setupLivenessAndReadiness: (config: {
|
|
70
|
-
isDev: boolean;
|
|
71
|
-
}, livenessReadinessOptions?: ILivenessReadinessOptions, logger?: Logger | undefined) => {
|
|
65
|
+
export declare const setupLivenessAndReadiness: (config: BasicConfig, livenessReadinessOptions?: ILivenessReadinessOptions, logger?: Logger | undefined) => {
|
|
72
66
|
liveness: State<boolean>;
|
|
73
67
|
readiness: State<boolean>;
|
|
74
68
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liveness-readiness-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/liveness-readiness-middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"liveness-readiness-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/liveness-readiness-middleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAe,WAAW,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAE7D,cAAM,KAAK,CAAC,CAAC;IACC,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,CAAC;IAErB,QAAQ,IAAI,CAAC;IAIb,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI;CAGhC;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;OAEG;IACH,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,yBAAyB,WAC5B,WAAW,6BACO,yBAAyB,kCAElD;IACD,QAAQ,EAAE,MAAM,OAAO,CAAC,CAAC;IACzB,SAAS,EAAE,MAAM,OAAO,CAAC,CAAC;CA0F3B,CAAC"}
|
|
@@ -43,8 +43,9 @@ class State {
|
|
|
43
43
|
* @param logger A logger object to use for output generated inside the middleware.
|
|
44
44
|
*/
|
|
45
45
|
const setupLivenessAndReadiness = (config, livenessReadinessOptions = {}, logger) => {
|
|
46
|
+
var _a;
|
|
46
47
|
const localLogger = logger !== null && logger !== void 0 ? logger : new common_1.Logger({ context: exports.setupLivenessAndReadiness.name });
|
|
47
|
-
const options = Object.assign({
|
|
48
|
+
const options = Object.assign({ enableLivenessEndpoint: true, livenessPath: '/live', defaultLiveness: true, enableReadinessEndpoint: true, readinessPath: '/ready', defaultReadiness: false }, livenessReadinessOptions);
|
|
48
49
|
const app = express();
|
|
49
50
|
// Configure liveness probe endpoint
|
|
50
51
|
const livenessData = new State(options.defaultLiveness);
|
|
@@ -99,7 +100,7 @@ const setupLivenessAndReadiness = (config, livenessReadinessOptions = {}, logger
|
|
|
99
100
|
});
|
|
100
101
|
}
|
|
101
102
|
// If running on dev environment, we will assign a free ephemeral port
|
|
102
|
-
const server = app.listen(config.isDev ? 0 :
|
|
103
|
+
const server = app.listen(config.isDev ? 0 : (_a = config.healthEndpointPort) !== null && _a !== void 0 ? _a : 9000, () => {
|
|
103
104
|
const port = server.address().port;
|
|
104
105
|
localLogger.debug({
|
|
105
106
|
message: `liveness & readiness app started`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"liveness-readiness-middleware.js","sourceRoot":"","sources":["../../src/middleware/liveness-readiness-middleware.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"liveness-readiness-middleware.js","sourceRoot":"","sources":["../../src/middleware/liveness-readiness-middleware.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,sCAA6D;AAE7D,MAAM,KAAK;IACT,YAAoB,KAAQ;QAAR,UAAK,GAAL,KAAK,CAAG;IAAG,CAAC;IAEzB,QAAQ;QACb,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,QAAQ,CAAC,KAAQ;QACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAgCD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACI,MAAM,yBAAyB,GAAG,CACvC,MAAmB,EACnB,2BAAsD,EAAE,EACxD,MAAe,EAIf,EAAE;;IACF,MAAM,WAAW,GACf,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,eAAM,CAAC,EAAE,OAAO,EAAE,iCAAyB,CAAC,IAAI,EAAE,CAAC,CAAC;IACpE,MAAM,OAAO,mBACX,sBAAsB,EAAE,IAAI,EAC5B,YAAY,EAAE,OAAO,EACrB,eAAe,EAAE,IAAI,EACrB,uBAAuB,EAAE,IAAI,EAC7B,aAAa,EAAE,QAAQ,EACvB,gBAAgB,EAAE,KAAK,IACpB,wBAAwB,CAC5B,CAAC;IAEF,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IAEtB,oCAAoC;IACpC,MAAM,YAAY,GAAG,IAAI,KAAK,CAAU,OAAO,CAAC,eAAe,CAAC,CAAC;IACjE,IAAI,OAAO,CAAC,sBAAsB,EAAE;QAClC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC1C,IAAI;gBACF,IAAI,YAAY,CAAC,QAAQ,EAAE,EAAE;oBAC3B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACnB,IAAI,EAAE,oBAAoB;qBAC3B,CAAC,CAAC;iBACJ;qBAAM;oBACL,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACnB,IAAI,EAAE,wBAAwB;qBAC/B,CAAC,CAAC;iBACJ;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,IAAI,EAAE,uBAAuB;oBAC7B,OAAO,EAAE,0DAA0D;iBACpE,CAAC,CAAC;gBACH,IAAA,oBAAW,EAAC,KAAK,CAAC,CAAC;gBACnB,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;KACJ;IAED,qCAAqC;IACrC,MAAM,aAAa,GAAG,IAAI,KAAK,CAAU,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACnE,IAAI,OAAO,CAAC,uBAAuB,EAAE;QACnC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YAC3C,IAAI;gBACF,IAAI,aAAa,CAAC,QAAQ,EAAE,EAAE;oBAC5B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACnB,IAAI,EAAE,kBAAkB;qBACzB,CAAC,CAAC;iBACJ;qBAAM;oBACL,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;wBACnB,IAAI,EAAE,sBAAsB;qBAC7B,CAAC,CAAC;iBACJ;aACF;YAAC,OAAO,KAAK,EAAE;gBACd,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACnB,IAAI,EAAE,uBAAuB;oBAC7B,OAAO,EAAE,0DAA0D;iBACpE,CAAC,CAAC;gBACH,IAAA,oBAAW,EAAC,KAAK,CAAC,CAAC;gBACnB,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;aAC1B;QACH,CAAC,CAAC,CAAC;KACJ;IAED,sEAAsE;IACtE,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CACvB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,kBAAkB,mCAAI,IAAI,EACpD,GAAG,EAAE;QACH,MAAM,IAAI,GAAI,MAAM,CAAC,OAAO,EAAkB,CAAC,IAAI,CAAC;QAEpD,WAAW,CAAC,KAAK,CAAC;YAChB,OAAO,EAAE,kCAAkC;YAC3C,OAAO,EAAE;gBACP,QAAQ,EAAE,OAAO,CAAC,sBAAsB;oBACtC,CAAC,CAAC,oBAAoB,IAAI,GAAG,OAAO,CAAC,YAAY,EAAE;oBACnD,CAAC,CAAC,aAAa;gBACjB,SAAS,EAAE,OAAO,CAAC,uBAAuB;oBACxC,CAAC,CAAC,oBAAoB,IAAI,GAAG,OAAO,CAAC,aAAa,EAAE;oBACpD,CAAC,CAAC,aAAa;aAClB;SACF,CAAC,CAAC;IACL,CAAC,CACF,CAAC;IAEF,OAAO;QACL,QAAQ,EAAE,YAAY;QACtB,SAAS,EAAE,aAAa;KACzB,CAAC;AACJ,CAAC,CAAC;AAhGW,QAAA,yBAAyB,6BAgGpC"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { RequestHandler } from 'express';
|
|
2
|
+
import { BasicConfig, BasicMaintenanceConfig } from '../common';
|
|
3
|
+
/**
|
|
4
|
+
* Setup a maintenance endpoint for the service. The endpoint will be setup with a default middleware which offers basic commands
|
|
5
|
+
* for troubleshooting the service (see {@link basicMaintenanceRequestHandlerFactory}). The endpoint can be extended with more middleware as required by the service.
|
|
6
|
+
*
|
|
7
|
+
* The endpoint will be guarded by an HTTP Basic Auth credential as defined in the config object (`maintenanceEndpointUserName` : `maintenanceEndpointPassword`).
|
|
8
|
+
*
|
|
9
|
+
* The listening port will be as defined in `maintenanceEndpointPort` of the config object (Defaults to `9911` if unspecified).
|
|
10
|
+
*
|
|
11
|
+
* `DANGEROUS:` It is highly recommended to keep this endpoint behind a Firewall as it may allow destructive operations on the service.
|
|
12
|
+
*
|
|
13
|
+
* @param config The config object of the service.
|
|
14
|
+
* @param maintenanceRequestHandlers A variadic list of middleware to be used to on the maintenance endpoint. When unspecified, the `basicMaintenanceRequestHandlerFactory` will be used to generate a RequestHandler.
|
|
15
|
+
*/
|
|
16
|
+
export declare const setupMaintenanceEndpoint: (config: BasicConfig & BasicMaintenanceConfig, ...maintenanceRequestHandlers: RequestHandler[]) => void;
|
|
17
|
+
/**
|
|
18
|
+
* This factory will generate a RequestHandler middleware with support for the following commands:
|
|
19
|
+
*
|
|
20
|
+
* - `env`: output the current process.env variables of the service.
|
|
21
|
+
* - `config`: output the current Config structure of the service.
|
|
22
|
+
* - `getHeapStatistics`: output an object with heap statistics for the service.
|
|
23
|
+
* - `getHeapSnapshot`: generate a heap-snapshot for the service and download the file. the service will hang for some seconds when the snapshot is being generated.
|
|
24
|
+
* - `killService`: abruptly kill the service process, potentially followed-up with a restart of the process if service health is being monitored (i.e. production services).
|
|
25
|
+
*
|
|
26
|
+
* @param config The config object of the service
|
|
27
|
+
* @returns A RequestHandler middleware
|
|
28
|
+
*/
|
|
29
|
+
export declare const basicMaintenanceRequestHandlerFactory: (config: BasicConfig) => RequestHandler;
|
|
30
|
+
//# sourceMappingURL=maintenance-middleware.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"maintenance-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/maintenance-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAIzC,OAAO,EAEL,WAAW,EACX,sBAAsB,EAEvB,MAAM,WAAW,CAAC;AAEnB;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,wBAAwB,WAC3B,WAAW,GAAG,sBAAsB,iCACb,cAAc,EAAE,KAC9C,IA8BF,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qCAAqC,WACvC,WAAW,KAAG,cA4EtB,CAAC"}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.basicMaintenanceRequestHandlerFactory = exports.setupMaintenanceEndpoint = void 0;
|
|
4
|
+
const express = require("express");
|
|
5
|
+
const basicAuth = require("express-basic-auth");
|
|
6
|
+
const v8 = require("v8");
|
|
7
|
+
const common_1 = require("../common");
|
|
8
|
+
/**
|
|
9
|
+
* Setup a maintenance endpoint for the service. The endpoint will be setup with a default middleware which offers basic commands
|
|
10
|
+
* for troubleshooting the service (see {@link basicMaintenanceRequestHandlerFactory}). The endpoint can be extended with more middleware as required by the service.
|
|
11
|
+
*
|
|
12
|
+
* The endpoint will be guarded by an HTTP Basic Auth credential as defined in the config object (`maintenanceEndpointUserName` : `maintenanceEndpointPassword`).
|
|
13
|
+
*
|
|
14
|
+
* The listening port will be as defined in `maintenanceEndpointPort` of the config object (Defaults to `9911` if unspecified).
|
|
15
|
+
*
|
|
16
|
+
* `DANGEROUS:` It is highly recommended to keep this endpoint behind a Firewall as it may allow destructive operations on the service.
|
|
17
|
+
*
|
|
18
|
+
* @param config The config object of the service.
|
|
19
|
+
* @param maintenanceRequestHandlers A variadic list of middleware to be used to on the maintenance endpoint. When unspecified, the `basicMaintenanceRequestHandlerFactory` will be used to generate a RequestHandler.
|
|
20
|
+
*/
|
|
21
|
+
const setupMaintenanceEndpoint = (config, ...maintenanceRequestHandlers) => {
|
|
22
|
+
var _a;
|
|
23
|
+
const logger = new common_1.Logger({ context: exports.setupMaintenanceEndpoint.name });
|
|
24
|
+
const maintenanceApp = express();
|
|
25
|
+
maintenanceApp.set('json spaces', 2);
|
|
26
|
+
maintenanceApp.use(basicAuth({
|
|
27
|
+
users: {
|
|
28
|
+
[config.maintenanceEndpointUserName]: config.maintenanceEndpointPassword,
|
|
29
|
+
},
|
|
30
|
+
challenge: true,
|
|
31
|
+
}), maintenanceRequestHandlers.length === 0
|
|
32
|
+
? (0, exports.basicMaintenanceRequestHandlerFactory)(config)
|
|
33
|
+
: maintenanceRequestHandlers);
|
|
34
|
+
const server = maintenanceApp.listen(config.isDev ? 0 : (_a = config.maintenanceEndpointPort) !== null && _a !== void 0 ? _a : 9911, () => {
|
|
35
|
+
const port = server.address().port;
|
|
36
|
+
logger.debug({
|
|
37
|
+
message: `maintenance app started`,
|
|
38
|
+
details: { URL: `http://localhost:${port}` },
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
};
|
|
42
|
+
exports.setupMaintenanceEndpoint = setupMaintenanceEndpoint;
|
|
43
|
+
/**
|
|
44
|
+
* This factory will generate a RequestHandler middleware with support for the following commands:
|
|
45
|
+
*
|
|
46
|
+
* - `env`: output the current process.env variables of the service.
|
|
47
|
+
* - `config`: output the current Config structure of the service.
|
|
48
|
+
* - `getHeapStatistics`: output an object with heap statistics for the service.
|
|
49
|
+
* - `getHeapSnapshot`: generate a heap-snapshot for the service and download the file. the service will hang for some seconds when the snapshot is being generated.
|
|
50
|
+
* - `killService`: abruptly kill the service process, potentially followed-up with a restart of the process if service health is being monitored (i.e. production services).
|
|
51
|
+
*
|
|
52
|
+
* @param config The config object of the service
|
|
53
|
+
* @returns A RequestHandler middleware
|
|
54
|
+
*/
|
|
55
|
+
const basicMaintenanceRequestHandlerFactory = (config) => async (req, res, next) => {
|
|
56
|
+
const logger = new common_1.Logger({
|
|
57
|
+
context: exports.basicMaintenanceRequestHandlerFactory.name,
|
|
58
|
+
});
|
|
59
|
+
try {
|
|
60
|
+
switch (req.path) {
|
|
61
|
+
case '/': {
|
|
62
|
+
res.send(/*html*/ `
|
|
63
|
+
<h3>Commands</h3>
|
|
64
|
+
<ul>
|
|
65
|
+
<li><a href='/env' title='output the current process.env variables of the service.'>env</a></li>
|
|
66
|
+
<li><a href='/config' title='output the current Config structure of the service.'>config</a></li>
|
|
67
|
+
<li><a href='/getHeapStatistics' title='output an object with heap statistics for the service.'>getHeapStatistics</a></li>
|
|
68
|
+
<li><a href='/getHeapSnapshot' title='generate a heap-snapshot for the service and download the file. the service will hang for some seconds when the snapshot is being generated.'>getHeapSnapshot</a></li>
|
|
69
|
+
<li><a href='/killService' title='abruptly kill the service process, potentially followed-up with a restart of the process if service health is being monitored (i.e. production services).'>killService</a></li>
|
|
70
|
+
</ul>
|
|
71
|
+
`);
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
case '/env': {
|
|
75
|
+
res.json(Object.assign({}, process.env));
|
|
76
|
+
break;
|
|
77
|
+
}
|
|
78
|
+
case '/config': {
|
|
79
|
+
res.json(Object.assign({}, config));
|
|
80
|
+
break;
|
|
81
|
+
}
|
|
82
|
+
case '/getHeapStatistics': {
|
|
83
|
+
res.json(Object.assign({}, v8.getHeapStatistics()));
|
|
84
|
+
break;
|
|
85
|
+
}
|
|
86
|
+
case '/getHeapSnapshot': {
|
|
87
|
+
const heapSnapshotFilePath = `${process.cwd()}/${config.serviceId}_${Date.now()}.heapsnapshot`;
|
|
88
|
+
res.attachment(heapSnapshotFilePath);
|
|
89
|
+
v8.getHeapSnapshot().pipe(res);
|
|
90
|
+
break;
|
|
91
|
+
}
|
|
92
|
+
case '/killService': {
|
|
93
|
+
process.exit(-9911);
|
|
94
|
+
break;
|
|
95
|
+
}
|
|
96
|
+
default: {
|
|
97
|
+
next();
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
catch (error) {
|
|
102
|
+
if (!res.headersSent) {
|
|
103
|
+
res.status(500).send(error);
|
|
104
|
+
}
|
|
105
|
+
(0, common_1.assertError)(error);
|
|
106
|
+
logger.error(error);
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
exports.basicMaintenanceRequestHandlerFactory = basicMaintenanceRequestHandlerFactory;
|
|
110
|
+
//# sourceMappingURL=maintenance-middleware.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"maintenance-middleware.js","sourceRoot":"","sources":["../../src/middleware/maintenance-middleware.ts"],"names":[],"mappings":";;;AAAA,mCAAmC;AAEnC,gDAAgD;AAEhD,yBAAyB;AACzB,sCAKmB;AAEnB;;;;;;;;;;;;GAYG;AACI,MAAM,wBAAwB,GAAG,CACtC,MAA4C,EAC5C,GAAG,0BAA4C,EACzC,EAAE;;IACR,MAAM,MAAM,GAAW,IAAI,eAAM,CAAC,EAAE,OAAO,EAAE,gCAAwB,CAAC,IAAI,EAAE,CAAC,CAAC;IAE9E,MAAM,cAAc,GAAG,OAAO,EAAE,CAAC;IACjC,cAAc,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;IAErC,cAAc,CAAC,GAAG,CAChB,SAAS,CAAC;QACR,KAAK,EAAE;YACL,CAAC,MAAM,CAAC,2BAA2B,CAAC,EAClC,MAAM,CAAC,2BAA2B;SACrC;QACD,SAAS,EAAE,IAAI;KAChB,CAAC,EACF,0BAA0B,CAAC,MAAM,KAAK,CAAC;QACrC,CAAC,CAAC,IAAA,6CAAqC,EAAC,MAAM,CAAC;QAC/C,CAAC,CAAC,0BAA0B,CAC/B,CAAC;IAEF,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAClC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,uBAAuB,mCAAI,IAAI,EACzD,GAAG,EAAE;QACH,MAAM,IAAI,GAAI,MAAM,CAAC,OAAO,EAAkB,CAAC,IAAI,CAAC;QAEpD,MAAM,CAAC,KAAK,CAAC;YACX,OAAO,EAAE,yBAAyB;YAClC,OAAO,EAAE,EAAE,GAAG,EAAE,oBAAoB,IAAI,EAAE,EAAE;SAC7C,CAAC,CAAC;IACL,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AAjCW,QAAA,wBAAwB,4BAiCnC;AAEF;;;;;;;;;;;GAWG;AACI,MAAM,qCAAqC,GAChD,CAAC,MAAmB,EAAkB,EAAE,CACxC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;IACvB,MAAM,MAAM,GAAW,IAAI,eAAM,CAAC;QAChC,OAAO,EAAE,6CAAqC,CAAC,IAAI;KACpD,CAAC,CAAC;IAEH,IAAI;QACF,QAAQ,GAAG,CAAC,IAAI,EAAE;YAChB,KAAK,GAAG,CAAC,CAAC;gBACR,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;;;;;;;;;WASjB,CAAC,CAAC;gBAEH,MAAM;aACP;YAED,KAAK,MAAM,CAAC,CAAC;gBACX,GAAG,CAAC,IAAI,mBACH,OAAO,CAAC,GAAG,EACd,CAAC;gBAEH,MAAM;aACP;YAED,KAAK,SAAS,CAAC,CAAC;gBACd,GAAG,CAAC,IAAI,mBACH,MAAM,EACT,CAAC;gBAEH,MAAM;aACP;YAED,KAAK,oBAAoB,CAAC,CAAC;gBACzB,GAAG,CAAC,IAAI,mBACH,EAAE,CAAC,iBAAiB,EAAE,EACzB,CAAC;gBAEH,MAAM;aACP;YAED,KAAK,kBAAkB,CAAC,CAAC;gBACvB,MAAM,oBAAoB,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,IAC3C,MAAM,CAAC,SACT,IAAI,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC;gBAE9B,GAAG,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAC;gBACrC,EAAE,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAE/B,MAAM;aACP;YAED,KAAK,cAAc,CAAC,CAAC;gBACnB,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;gBAEpB,MAAM;aACP;YAED,OAAO,CAAC,CAAC;gBACP,IAAI,EAAE,CAAC;aACR;SACF;KACF;IAAC,OAAO,KAAK,EAAE;QACd,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE;YACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC7B;QAED,IAAA,oBAAW,EAAC,KAAK,CAAC,CAAC;QACnB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KACrB;AACH,CAAC,CAAC;AA7ES,QAAA,qCAAqC,yCA6E9C"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { Application } from 'express';
|
|
2
1
|
import { Metric, Registry } from 'prom-client';
|
|
3
|
-
import { Logger } from '../common';
|
|
2
|
+
import { BasicConfig, BasicMetricsConfig, Logger } from '../common';
|
|
4
3
|
/**
|
|
5
4
|
* Options used to set up monitoring middleware.
|
|
6
5
|
*/
|
|
@@ -27,14 +26,10 @@ export interface IMonitoringOptions {
|
|
|
27
26
|
* By default, standard nodejs process metrics are collected. All gathered metrics are exported via a '/metrics' path.
|
|
28
27
|
* If custom metrics are required, they can be defined on a separate metric-registry and passed in as arguments.
|
|
29
28
|
*
|
|
30
|
-
* @param app The express application to setup the metric monitoring endpoint on.
|
|
31
29
|
* @param config A service config object containing `service-id` & `environment` values to be used as metric labels.
|
|
32
30
|
* @param monitoringOptions An object containing monitoring options.
|
|
33
31
|
* @param logger A logger object to use for output generated inside the middleware.
|
|
34
32
|
* @returns A instance of `Registry`. This can be used to further configure necessary metrics.
|
|
35
33
|
*/
|
|
36
|
-
export declare const setupMonitoring: (
|
|
37
|
-
serviceId: string;
|
|
38
|
-
environment: string;
|
|
39
|
-
}, monitoringOptions?: IMonitoringOptions, logger?: Logger | undefined) => Registry;
|
|
34
|
+
export declare const setupMonitoring: (config: BasicConfig & BasicMetricsConfig, monitoringOptions?: IMonitoringOptions, logger?: Logger | undefined) => Registry;
|
|
40
35
|
//# sourceMappingURL=monitoring-middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitoring-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/monitoring-middleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"monitoring-middleware.d.ts","sourceRoot":"","sources":["../../src/middleware/monitoring-middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAyB,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAEL,WAAW,EACX,kBAAkB,EAClB,MAAM,EACP,MAAM,WAAW,CAAC;AAGnB;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,cAAc,CAAC,EAAE,QAAQ,CAAC;IAC1B;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;CAC5B;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,eAAe,WAClB,WAAW,GAAG,kBAAkB,sBACrB,kBAAkB,kCAEpC,QAsDF,CAAC"}
|
|
@@ -3,20 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.setupMonitoring = void 0;
|
|
4
4
|
const prom_client_1 = require("prom-client");
|
|
5
5
|
const common_1 = require("../common");
|
|
6
|
+
const express = require("express");
|
|
6
7
|
/**
|
|
7
8
|
* Setup a prometheus metric monitoring endpoint using an express application.
|
|
8
9
|
* By default, standard nodejs process metrics are collected. All gathered metrics are exported via a '/metrics' path.
|
|
9
10
|
* If custom metrics are required, they can be defined on a separate metric-registry and passed in as arguments.
|
|
10
11
|
*
|
|
11
|
-
* @param app The express application to setup the metric monitoring endpoint on.
|
|
12
12
|
* @param config A service config object containing `service-id` & `environment` values to be used as metric labels.
|
|
13
13
|
* @param monitoringOptions An object containing monitoring options.
|
|
14
14
|
* @param logger A logger object to use for output generated inside the middleware.
|
|
15
15
|
* @returns A instance of `Registry`. This can be used to further configure necessary metrics.
|
|
16
16
|
*/
|
|
17
|
-
const setupMonitoring = (
|
|
17
|
+
const setupMonitoring = (config, monitoringOptions = {}, logger) => {
|
|
18
|
+
var _a;
|
|
18
19
|
const localLogger = logger !== null && logger !== void 0 ? logger : new common_1.Logger({ context: exports.setupMonitoring.name });
|
|
19
20
|
const options = Object.assign({ metricsPath: '/metrics', metricRegistry: new prom_client_1.Registry(), collectDefaultMetrics: true, metrics: [] }, monitoringOptions);
|
|
21
|
+
const app = express();
|
|
20
22
|
options.metricRegistry.setDefaultLabels({
|
|
21
23
|
serviceId: config.serviceId,
|
|
22
24
|
environment: config.environment,
|
|
@@ -27,6 +29,15 @@ const setupMonitoring = (app, config, monitoringOptions = {}, logger) => {
|
|
|
27
29
|
if (options.collectDefaultMetrics) {
|
|
28
30
|
(0, prom_client_1.collectDefaultMetrics)({ register: options.metricRegistry });
|
|
29
31
|
}
|
|
32
|
+
const server = app.listen(config.isDev ? 0 : (_a = config.metricsEndpointPort) !== null && _a !== void 0 ? _a : 9090, () => {
|
|
33
|
+
const port = server.address().port;
|
|
34
|
+
localLogger.debug({
|
|
35
|
+
message: `Metrics app started`,
|
|
36
|
+
details: {
|
|
37
|
+
metrics: `http://localhost:${port}${options.metricsPath}`,
|
|
38
|
+
},
|
|
39
|
+
});
|
|
40
|
+
});
|
|
30
41
|
app.use(options.metricsPath, async (_req, res) => {
|
|
31
42
|
try {
|
|
32
43
|
res.setHeader('content-type', options.metricRegistry.contentType);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitoring-middleware.js","sourceRoot":"","sources":["../../src/middleware/monitoring-middleware.ts"],"names":[],"mappings":";;;AACA,6CAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"monitoring-middleware.js","sourceRoot":"","sources":["../../src/middleware/monitoring-middleware.ts"],"names":[],"mappings":";;;AACA,6CAAsE;AACtE,sCAKmB;AACnB,mCAAoC;AAwBpC;;;;;;;;;GASG;AACI,MAAM,eAAe,GAAG,CAC7B,MAAwC,EACxC,oBAAwC,EAAE,EAC1C,MAAe,EACL,EAAE;;IACZ,MAAM,WAAW,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,eAAM,CAAC,EAAE,OAAO,EAAE,uBAAe,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5E,MAAM,OAAO,mBACX,WAAW,EAAE,UAAU,EACvB,cAAc,EAAE,IAAI,sBAAQ,EAAE,EAC9B,qBAAqB,EAAE,IAAI,EAC3B,OAAO,EAAE,EAAE,IACR,iBAAiB,CACrB,CAAC;IAEF,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;IAEtB,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC;QACtC,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;KAChC,CAAC,CAAC;IAEH,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;QACpC,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;KAC/C;IAED,IAAI,OAAO,CAAC,qBAAqB,EAAE;QACjC,IAAA,mCAAqB,EAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;KAC7D;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CACvB,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,mBAAmB,mCAAI,IAAI,EACrD,GAAG,EAAE;QACH,MAAM,IAAI,GAAI,MAAM,CAAC,OAAO,EAAkB,CAAC,IAAI,CAAC;QAEpD,WAAW,CAAC,KAAK,CAAC;YAChB,OAAO,EAAE,qBAAqB;YAC9B,OAAO,EAAE;gBACP,OAAO,EAAE,oBAAoB,IAAI,GAAG,OAAO,CAAC,WAAW,EAAE;aAC1D;SACF,CAAC,CAAC;IACL,CAAC,CACF,CAAC;IAEF,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;QAC/C,IAAI;YACF,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YAClE,GAAG,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC;SAClD;QAAC,OAAO,KAAK,EAAE;YACd,GAAG,CAAC,IAAI,CACN,0EAA0E,MAAM,CAAC,SAAS,qBAAqB,CAChH,CAAC;YAEF,IAAA,oBAAW,EAAC,KAAK,CAAC,CAAC;YACnB,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SAC1B;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,cAAc,CAAC;AAChC,CAAC,CAAC;AA1DW,QAAA,eAAe,mBA0D1B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-service-common",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.19.0-rc.10",
|
|
4
4
|
"description": "Common helpers and PostgreSQL-related functionality",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -32,6 +32,7 @@
|
|
|
32
32
|
"endent": "^2.0.1",
|
|
33
33
|
"env-var": "^6.3.0",
|
|
34
34
|
"express": "^4.17.1",
|
|
35
|
+
"express-basic-auth": "^1.2.1",
|
|
35
36
|
"graphile-build": "^4.12.0",
|
|
36
37
|
"graphile-build-pg": "^4.12.1",
|
|
37
38
|
"graphile-utils": "^4.12.1",
|
|
@@ -62,5 +63,5 @@
|
|
|
62
63
|
"publishConfig": {
|
|
63
64
|
"access": "public"
|
|
64
65
|
},
|
|
65
|
-
"gitHead": "
|
|
66
|
+
"gitHead": "5a247dfd8e95fa184022dd58409bbc08dfe0acd7"
|
|
66
67
|
}
|