@conduitplatform/module-tools 0.16.0-rc.3 → 0.16.0-rc.4
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/ManagedModule.d.ts +2 -2
- package/dist/ManagedModule.js +41 -48
- package/dist/ManagedModule.js.map +1 -1
- package/dist/classes/ConduitActiveSchema.js +2 -6
- package/dist/classes/ConduitActiveSchema.js.map +1 -1
- package/dist/classes/ConduitServiceModule.d.ts +2 -2
- package/dist/classes/ConduitServiceModule.js +27 -54
- package/dist/classes/ConduitServiceModule.js.map +1 -1
- package/dist/classes/ConfigController.js +1 -5
- package/dist/classes/ConfigController.js.map +1 -1
- package/dist/classes/GrpcServer.js +16 -23
- package/dist/classes/GrpcServer.js.map +1 -1
- package/dist/classes/index.d.ts +4 -4
- package/dist/classes/index.js +4 -20
- package/dist/classes/index.js.map +1 -1
- package/dist/helpers/GrpcHelper.js +7 -12
- package/dist/helpers/GrpcHelper.js.map +1 -1
- package/dist/helpers/GrpcToParsedRouterRequest.js +1 -5
- package/dist/helpers/GrpcToParsedRouterRequest.js.map +1 -1
- package/dist/helpers/TypeHelpers.js +22 -25
- package/dist/helpers/TypeHelpers.js.map +1 -1
- package/dist/helpers/index.d.ts +4 -4
- package/dist/helpers/index.js +4 -20
- package/dist/helpers/index.js.map +1 -1
- package/dist/helpers/wrapGrpcFunctions.js +9 -16
- package/dist/helpers/wrapGrpcFunctions.js.map +1 -1
- package/dist/index.d.ts +6 -6
- package/dist/index.js +6 -22
- package/dist/index.js.map +1 -1
- package/dist/interfaces/ConduitService.js +1 -2
- package/dist/interfaces/ModuleLifecycleStage.js +2 -5
- package/dist/interfaces/ModuleLifecycleStage.js.map +1 -1
- package/dist/interfaces/index.d.ts +2 -1
- package/dist/interfaces/index.js +2 -17
- package/dist/interfaces/index.js.map +1 -1
- package/dist/logging/index.js +19 -50
- package/dist/logging/index.js.map +1 -1
- package/dist/metrics/MetricsServer.js +9 -16
- package/dist/metrics/MetricsServer.js.map +1 -1
- package/dist/metrics/clientMiddleware.js +19 -23
- package/dist/metrics/clientMiddleware.js.map +1 -1
- package/dist/metrics/config/defaults.js +14 -16
- package/dist/metrics/config/defaults.js.map +1 -1
- package/dist/metrics/index.js +21 -28
- package/dist/metrics/index.js.map +1 -1
- package/dist/routing/ProxyRouteBuilder.d.ts +1 -1
- package/dist/routing/ProxyRouteBuilder.js +1 -5
- package/dist/routing/ProxyRouteBuilder.js.map +1 -1
- package/dist/routing/RouteBuilder.d.ts +2 -2
- package/dist/routing/RouteBuilder.js +3 -7
- package/dist/routing/RouteBuilder.js.map +1 -1
- package/dist/routing/RoutingController.js +3 -7
- package/dist/routing/RoutingController.js.map +1 -1
- package/dist/routing/RoutingManager.d.ts +5 -5
- package/dist/routing/RoutingManager.js +13 -17
- package/dist/routing/RoutingManager.js.map +1 -1
- package/dist/routing/RoutingUtilities.d.ts +1 -1
- package/dist/routing/RoutingUtilities.js +3 -7
- package/dist/routing/RoutingUtilities.js.map +1 -1
- package/dist/routing/index.d.ts +5 -5
- package/dist/routing/index.js +5 -21
- package/dist/routing/index.js.map +1 -1
- package/dist/routing/wrapRouterFunctions.js +17 -24
- package/dist/routing/wrapRouterFunctions.js.map +1 -1
- package/dist/utilities/convictConfigParser.js +3 -7
- package/dist/utilities/convictConfigParser.js.map +1 -1
- package/dist/utilities/index.d.ts +3 -3
- package/dist/utilities/index.js +3 -19
- package/dist/utilities/index.js.map +1 -1
- package/dist/utilities/initializeSdk.js +20 -47
- package/dist/utilities/initializeSdk.js.map +1 -1
- package/dist/utilities/linearBackoffTimeout.js +5 -10
- package/dist/utilities/linearBackoffTimeout.js.map +1 -1
- package/dist/utilities/merge.js +3 -7
- package/dist/utilities/merge.js.map +1 -1
- package/package.json +9 -8
|
@@ -1,24 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.MetricsServer = void 0;
|
|
7
|
-
const express_1 = __importDefault(require("express"));
|
|
8
|
-
const lodash_1 = require("lodash");
|
|
9
|
-
const grpc_sdk_1 = __importDefault(require("@conduitplatform/grpc-sdk"));
|
|
10
|
-
class MetricsServer {
|
|
1
|
+
import express from 'express';
|
|
2
|
+
import { isNaN } from 'lodash-es';
|
|
3
|
+
import ConduitGrpcSdk from '@conduitplatform/grpc-sdk';
|
|
4
|
+
export class MetricsServer {
|
|
11
5
|
constructor(moduleName, instance, registry) {
|
|
12
6
|
this.moduleName = moduleName;
|
|
13
7
|
this.instance = instance;
|
|
14
8
|
this.Registry = registry;
|
|
15
9
|
}
|
|
16
10
|
initialize() {
|
|
17
|
-
const server = (
|
|
11
|
+
const server = express();
|
|
18
12
|
const port = this.getHttpPort();
|
|
19
13
|
const url = '0.0.0.0:' + port.toString();
|
|
20
14
|
server.listen(port, () => {
|
|
21
|
-
|
|
15
|
+
ConduitGrpcSdk.Logger.info(`Metrics server listening on: ${url}`);
|
|
22
16
|
});
|
|
23
17
|
server.get('/', (req, res) => {
|
|
24
18
|
return res
|
|
@@ -34,16 +28,15 @@ class MetricsServer {
|
|
|
34
28
|
getHttpPort() {
|
|
35
29
|
const value = process.env['METRICS_PORT'];
|
|
36
30
|
if (!value) {
|
|
37
|
-
|
|
31
|
+
ConduitGrpcSdk.Logger.error(`Metrics HTTP port not set`);
|
|
38
32
|
process.exit(-1);
|
|
39
33
|
}
|
|
40
34
|
const port = parseInt(value, 10);
|
|
41
|
-
if (
|
|
42
|
-
|
|
35
|
+
if (isNaN(port) || port < 1 || port > 65535) {
|
|
36
|
+
ConduitGrpcSdk.Logger.error(`Invalid HTTP port value: ${port}`);
|
|
43
37
|
process.exit(-1);
|
|
44
38
|
}
|
|
45
39
|
return port;
|
|
46
40
|
}
|
|
47
41
|
}
|
|
48
|
-
exports.MetricsServer = MetricsServer;
|
|
49
42
|
//# sourceMappingURL=MetricsServer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetricsServer.js","sourceRoot":"","sources":["../../src/metrics/MetricsServer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"MetricsServer.js","sourceRoot":"","sources":["../../src/metrics/MetricsServer.ts"],"names":[],"mappings":"AAAA,OAAO,OAAoB,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAEvD,MAAM,OAAO,aAAa;IAKxB,YAAY,UAAkB,EAAE,QAAgB,EAAE,QAAkB;QAClE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,UAAU;QACR,MAAM,MAAM,GAAG,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;YACvB,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAoB,EAAE,GAAqB,EAAE,EAAE;YAC9D,OAAO,GAAG;iBACP,MAAM,CAAC,GAAG,CAAC;iBACX,IAAI,CACH,+BAA+B,IAAI,CAAC,UAAU,eAAe,IAAI,CAAC,QAAQ,EAAE,CAC7E,CAAC;QACN,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;YAC3E,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YAC9C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,WAAW;QACT,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACzD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QACD,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACjC,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,KAAK,EAAE,CAAC;YAC5C,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,IAAI,EAAE,CAAC,CAAC;YAChE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.clientMiddleware = void 0;
|
|
4
1
|
// Forked from nice-grpc-prometheus
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
const registry = new
|
|
2
|
+
import { isAbortError } from 'abort-controller-x';
|
|
3
|
+
import { ClientError, Status, } from 'nice-grpc-common';
|
|
4
|
+
import { Counter, exponentialBuckets, Histogram, Registry } from 'prom-client';
|
|
5
|
+
const registry = new Registry();
|
|
9
6
|
const typeLabel = 'grpc_type';
|
|
10
7
|
const serviceLabel = 'grpc_service';
|
|
11
8
|
const methodLabel = 'grpc_method';
|
|
@@ -14,7 +11,7 @@ const codeLabel = 'grpc_code';
|
|
|
14
11
|
/**
|
|
15
12
|
* 1ms, 4ms, 16ms, ..., ~1 hour in seconds
|
|
16
13
|
*/
|
|
17
|
-
const latencySecondsBuckets =
|
|
14
|
+
const latencySecondsBuckets = exponentialBuckets(0.001, 4, 12);
|
|
18
15
|
function getLabels(method) {
|
|
19
16
|
const callType = method.requestStream
|
|
20
17
|
? method.responseStream
|
|
@@ -38,44 +35,44 @@ async function* incrementStreamMessagesCounter(iterable, counter) {
|
|
|
38
35
|
yield item;
|
|
39
36
|
}
|
|
40
37
|
}
|
|
41
|
-
const clientStartedMetric = new
|
|
38
|
+
const clientStartedMetric = new Counter({
|
|
42
39
|
registers: [registry],
|
|
43
40
|
name: 'conduit_grpc_client_started_total',
|
|
44
41
|
help: 'Total number of RPCs started on the client.',
|
|
45
42
|
labelNames: [typeLabel, serviceLabel, methodLabel, pathLabel],
|
|
46
43
|
});
|
|
47
|
-
const clientHandledMetric = new
|
|
44
|
+
const clientHandledMetric = new Counter({
|
|
48
45
|
registers: [registry],
|
|
49
46
|
name: 'conduit_grpc_client_handled_total',
|
|
50
47
|
help: 'Total number of RPCs completed on the client, regardless of success or failure.',
|
|
51
48
|
labelNames: [typeLabel, serviceLabel, methodLabel, pathLabel, codeLabel],
|
|
52
49
|
});
|
|
53
|
-
const clientStreamMsgReceivedMetric = new
|
|
50
|
+
const clientStreamMsgReceivedMetric = new Counter({
|
|
54
51
|
registers: [registry],
|
|
55
52
|
name: 'conduit_grpc_client_msg_received_total',
|
|
56
53
|
help: 'Total number of RPC stream messages received by the client.',
|
|
57
54
|
labelNames: [typeLabel, serviceLabel, methodLabel, pathLabel],
|
|
58
55
|
});
|
|
59
|
-
const clientStreamMsgSentMetric = new
|
|
56
|
+
const clientStreamMsgSentMetric = new Counter({
|
|
60
57
|
registers: [registry],
|
|
61
58
|
name: 'conduit_grpc_client_msg_sent_total',
|
|
62
59
|
help: 'Total number of gRPC stream messages sent by the client.',
|
|
63
60
|
labelNames: [typeLabel, serviceLabel, methodLabel, pathLabel],
|
|
64
61
|
});
|
|
65
|
-
const clientHandlingSecondsMetric = new
|
|
62
|
+
const clientHandlingSecondsMetric = new Histogram({
|
|
66
63
|
registers: [registry],
|
|
67
64
|
name: 'grpc_client_handling_seconds',
|
|
68
65
|
help: 'Histogram of response latency (seconds) of the gRPC until it is finished by the application.',
|
|
69
66
|
labelNames: [typeLabel, serviceLabel, methodLabel, pathLabel, codeLabel],
|
|
70
67
|
buckets: latencySecondsBuckets,
|
|
71
68
|
});
|
|
72
|
-
function clientMiddleware() {
|
|
69
|
+
export function clientMiddleware() {
|
|
73
70
|
return async function* prometheusClientMiddlewareGenerator(call, options) {
|
|
74
71
|
const labels = getLabels(call.method);
|
|
75
72
|
clientStartedMetric.inc(labels);
|
|
76
73
|
const stopTimer = clientHandlingSecondsMetric.startTimer(labels);
|
|
77
74
|
let settled = false;
|
|
78
|
-
let status =
|
|
75
|
+
let status = Status.OK;
|
|
79
76
|
try {
|
|
80
77
|
let request;
|
|
81
78
|
if (!call.requestStream) {
|
|
@@ -97,28 +94,27 @@ function clientMiddleware() {
|
|
|
97
94
|
}
|
|
98
95
|
catch (err) {
|
|
99
96
|
settled = true;
|
|
100
|
-
if (err instanceof
|
|
97
|
+
if (err instanceof ClientError) {
|
|
101
98
|
status = err.code;
|
|
102
99
|
}
|
|
103
|
-
else if (
|
|
104
|
-
status =
|
|
100
|
+
else if (isAbortError(err)) {
|
|
101
|
+
status = Status.ABORTED;
|
|
105
102
|
}
|
|
106
103
|
else {
|
|
107
|
-
status =
|
|
104
|
+
status = Status.UNKNOWN;
|
|
108
105
|
}
|
|
109
106
|
throw err;
|
|
110
107
|
}
|
|
111
108
|
finally {
|
|
112
109
|
if (!settled) {
|
|
113
|
-
status =
|
|
110
|
+
status = Status.CANCELLED;
|
|
114
111
|
}
|
|
115
|
-
stopTimer({ [codeLabel]:
|
|
112
|
+
stopTimer({ [codeLabel]: Status[status] });
|
|
116
113
|
clientHandledMetric.inc({
|
|
117
114
|
...labels,
|
|
118
|
-
[codeLabel]:
|
|
115
|
+
[codeLabel]: Status[status],
|
|
119
116
|
});
|
|
120
117
|
}
|
|
121
118
|
};
|
|
122
119
|
}
|
|
123
|
-
exports.clientMiddleware = clientMiddleware;
|
|
124
120
|
//# sourceMappingURL=clientMiddleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clientMiddleware.js","sourceRoot":"","sources":["../../src/metrics/clientMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"clientMiddleware.js","sourceRoot":"","sources":["../../src/metrics/clientMiddleware.ts"],"names":[],"mappings":"AAAA,mCAAmC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAEL,WAAW,EAIX,MAAM,GACP,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE/E,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;AAEhC,MAAM,SAAS,GAAG,WAAW,CAAC;AAC9B,MAAM,YAAY,GAAG,cAAc,CAAC;AACpC,MAAM,WAAW,GAAG,aAAa,CAAC;AAClC,MAAM,SAAS,GAAG,WAAW,CAAC;AAC9B,MAAM,SAAS,GAAG,WAAW,CAAC;AAC9B;;GAEG;AACH,MAAM,qBAAqB,GAAG,kBAAkB,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAE/D,SAAS,SAAS,CAAC,MAAwB;IACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa;QACnC,CAAC,CAAC,MAAM,CAAC,cAAc;YACrB,CAAC,CAAC,aAAa;YACf,CAAC,CAAC,eAAe;QACnB,CAAC,CAAC,MAAM,CAAC,cAAc;YACvB,CAAC,CAAC,eAAe;YACjB,CAAC,CAAC,OAAO,CAAC;IACZ,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IACxB,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3D,OAAO;QACL,CAAC,SAAS,CAAC,EAAE,QAAQ;QACrB,CAAC,YAAY,CAAC,EAAE,WAAW;QAC3B,CAAC,WAAW,CAAC,EAAE,UAAU;QACzB,CAAC,SAAS,CAAC,EAAE,IAAI;KAClB,CAAC;AACJ,CAAC;AAED,KAAK,SAAS,CAAC,CAAC,8BAA8B,CAC5C,QAA0B,EAC1B,OAAyB;IAEzB,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,MAAM,IAAI,CAAC;IACb,CAAC;AACH,CAAC;AAED,MAAM,mBAAmB,GAAG,IAAI,OAAO,CAAC;IACtC,SAAS,EAAE,CAAC,QAAQ,CAAC;IACrB,IAAI,EAAE,mCAAmC;IACzC,IAAI,EAAE,6CAA6C;IACnD,UAAU,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,CAAC;CAC9D,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,IAAI,OAAO,CAAC;IACtC,SAAS,EAAE,CAAC,QAAQ,CAAC;IACrB,IAAI,EAAE,mCAAmC;IACzC,IAAI,EAAE,iFAAiF;IACvF,UAAU,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC;CACzE,CAAC,CAAC;AAEH,MAAM,6BAA6B,GAAG,IAAI,OAAO,CAAC;IAChD,SAAS,EAAE,CAAC,QAAQ,CAAC;IACrB,IAAI,EAAE,wCAAwC;IAC9C,IAAI,EAAE,6DAA6D;IACnE,UAAU,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,CAAC;CAC9D,CAAC,CAAC;AAEH,MAAM,yBAAyB,GAAG,IAAI,OAAO,CAAC;IAC5C,SAAS,EAAE,CAAC,QAAQ,CAAC;IACrB,IAAI,EAAE,oCAAoC;IAC1C,IAAI,EAAE,0DAA0D;IAChE,UAAU,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,CAAC;CAC9D,CAAC,CAAC;AAEH,MAAM,2BAA2B,GAAG,IAAI,SAAS,CAAC;IAChD,SAAS,EAAE,CAAC,QAAQ,CAAC;IACrB,IAAI,EAAE,8BAA8B;IACpC,IAAI,EAAE,8FAA8F;IACpG,UAAU,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC;IACxE,OAAO,EAAE,qBAAqB;CAC/B,CAAC,CAAC;AAEH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,KAAK,SAAS,CAAC,CAAC,mCAAmC,CACxD,IAA6C,EAC7C,OAAoB;QAEpB,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtC,mBAAmB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,SAAS,GAAG,2BAA2B,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,MAAM,GAAW,MAAM,CAAC,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,IAAI,OAAO,CAAC;YACZ,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;gBACxB,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,8BAA8B,CACtC,IAAI,CAAC,OAAO,EACZ,yBAAyB,CAAC,MAAM,CAAC,MAAM,CAAC,CACzC,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;gBACzB,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACpD,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO,QAAQ,CAAC;YAClB,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,CAAC,8BAA8B,CACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,EAC3B,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,CAC7C,CAAC;gBACF,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO;YACT,CAAC;QACH,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,OAAO,GAAG,IAAI,CAAC;YACf,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;gBAC/B,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC;YACpB,CAAC;iBAAM,IAAI,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC7B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;YAC1B,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC;YAC5B,CAAC;YACD,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC3C,mBAAmB,CAAC,GAAG,CAAC;gBACtB,GAAG,MAAM;gBACT,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC;aAC5B,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,72 +1,70 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const grpc_sdk_1 = require("@conduitplatform/grpc-sdk");
|
|
4
|
-
exports.default = {
|
|
1
|
+
import { MetricType } from '@conduitplatform/grpc-sdk';
|
|
2
|
+
export default {
|
|
5
3
|
internalGrpcRequests: {
|
|
6
|
-
type:
|
|
4
|
+
type: MetricType.Counter,
|
|
7
5
|
config: {
|
|
8
6
|
name: 'internal_grpc_requests_total',
|
|
9
7
|
help: "Tracks the total number of Conduit's internal gRPC requests",
|
|
10
8
|
},
|
|
11
9
|
},
|
|
12
10
|
clientGrpcRequests: {
|
|
13
|
-
type:
|
|
11
|
+
type: MetricType.Counter,
|
|
14
12
|
config: {
|
|
15
13
|
name: 'client_grpc_requests_total',
|
|
16
14
|
help: 'Tracks the total number of the client gRPC requests',
|
|
17
15
|
},
|
|
18
16
|
},
|
|
19
17
|
adminGrpcRequests: {
|
|
20
|
-
type:
|
|
18
|
+
type: MetricType.Counter,
|
|
21
19
|
config: {
|
|
22
20
|
name: 'admin_grpc_requests_total',
|
|
23
21
|
help: 'Tracks the total number of the admin gRPC requests',
|
|
24
22
|
},
|
|
25
23
|
},
|
|
26
24
|
clientGrpcErrors: {
|
|
27
|
-
type:
|
|
25
|
+
type: MetricType.Counter,
|
|
28
26
|
config: {
|
|
29
27
|
name: 'client_grpc_errors_total',
|
|
30
28
|
help: 'Tracks the total number of client grpc errors',
|
|
31
29
|
},
|
|
32
30
|
},
|
|
33
31
|
adminGrpcErrors: {
|
|
34
|
-
type:
|
|
32
|
+
type: MetricType.Counter,
|
|
35
33
|
config: {
|
|
36
34
|
name: 'admin_grpc_errors_total',
|
|
37
35
|
help: 'Tracks the total number of admin grpc errors',
|
|
38
36
|
},
|
|
39
37
|
},
|
|
40
38
|
moduleHealthState: {
|
|
41
|
-
type:
|
|
39
|
+
type: MetricType.Gauge,
|
|
42
40
|
config: {
|
|
43
41
|
name: 'module_health_state',
|
|
44
42
|
help: 'Tracks the health state of the module',
|
|
45
43
|
},
|
|
46
44
|
},
|
|
47
45
|
grpcRequestLatency: {
|
|
48
|
-
type:
|
|
46
|
+
type: MetricType.Gauge,
|
|
49
47
|
config: {
|
|
50
48
|
name: 'grpc_request_latency_seconds',
|
|
51
49
|
help: 'Tracks the latency of grpc requests in seconds',
|
|
52
50
|
},
|
|
53
51
|
},
|
|
54
52
|
adminGrpcRequestLatency: {
|
|
55
|
-
type:
|
|
53
|
+
type: MetricType.Gauge,
|
|
56
54
|
config: {
|
|
57
55
|
name: 'admin_grpc_request_latency_seconds',
|
|
58
56
|
help: 'Tracks the latency of admin grpc requests in seconds',
|
|
59
57
|
},
|
|
60
58
|
},
|
|
61
59
|
clientGrpcRequestLatency: {
|
|
62
|
-
type:
|
|
60
|
+
type: MetricType.Gauge,
|
|
63
61
|
config: {
|
|
64
62
|
name: 'client_grpc_request_latency_seconds',
|
|
65
63
|
help: 'Tracks the latency of client grpc requests in seconds',
|
|
66
64
|
},
|
|
67
65
|
},
|
|
68
66
|
grpcResponseStatuses: {
|
|
69
|
-
type:
|
|
67
|
+
type: MetricType.Counter,
|
|
70
68
|
config: {
|
|
71
69
|
name: 'grpc_response_statuses_total',
|
|
72
70
|
help: 'Tracks the total number of grpc response codes',
|
|
@@ -74,7 +72,7 @@ exports.default = {
|
|
|
74
72
|
},
|
|
75
73
|
},
|
|
76
74
|
adminGrpcResponseStatuses: {
|
|
77
|
-
type:
|
|
75
|
+
type: MetricType.Counter,
|
|
78
76
|
config: {
|
|
79
77
|
name: 'admin_grpc_response_statuses_total',
|
|
80
78
|
help: 'Tracks the total number of admin grpc response codes',
|
|
@@ -82,7 +80,7 @@ exports.default = {
|
|
|
82
80
|
},
|
|
83
81
|
},
|
|
84
82
|
clientGrpcResponseStatuses: {
|
|
85
|
-
type:
|
|
83
|
+
type: MetricType.Counter,
|
|
86
84
|
config: {
|
|
87
85
|
name: 'client_grpc_response_statuses_total',
|
|
88
86
|
help: 'Tracks the total number of client grpc response codes',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../src/metrics/config/defaults.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../src/metrics/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,eAAe;IACb,oBAAoB,EAAE;QACpB,IAAI,EAAE,UAAU,CAAC,OAAO;QACxB,MAAM,EAAE;YACN,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,6DAA6D;SACpE;KACF;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,UAAU,CAAC,OAAO;QACxB,MAAM,EAAE;YACN,IAAI,EAAE,4BAA4B;YAClC,IAAI,EAAE,qDAAqD;SAC5D;KACF;IACD,iBAAiB,EAAE;QACjB,IAAI,EAAE,UAAU,CAAC,OAAO;QACxB,MAAM,EAAE;YACN,IAAI,EAAE,2BAA2B;YACjC,IAAI,EAAE,oDAAoD;SAC3D;KACF;IACD,gBAAgB,EAAE;QAChB,IAAI,EAAE,UAAU,CAAC,OAAO;QACxB,MAAM,EAAE;YACN,IAAI,EAAE,0BAA0B;YAChC,IAAI,EAAE,+CAA+C;SACtD;KACF;IACD,eAAe,EAAE;QACf,IAAI,EAAE,UAAU,CAAC,OAAO;QACxB,MAAM,EAAE;YACN,IAAI,EAAE,yBAAyB;YAC/B,IAAI,EAAE,8CAA8C;SACrD;KACF;IACD,iBAAiB,EAAE;QACjB,IAAI,EAAE,UAAU,CAAC,KAAK;QACtB,MAAM,EAAE;YACN,IAAI,EAAE,qBAAqB;YAC3B,IAAI,EAAE,uCAAuC;SAC9C;KACF;IACD,kBAAkB,EAAE;QAClB,IAAI,EAAE,UAAU,CAAC,KAAK;QACtB,MAAM,EAAE;YACN,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,gDAAgD;SACvD;KACF;IACD,uBAAuB,EAAE;QACvB,IAAI,EAAE,UAAU,CAAC,KAAK;QACtB,MAAM,EAAE;YACN,IAAI,EAAE,oCAAoC;YAC1C,IAAI,EAAE,sDAAsD;SAC7D;KACF;IACD,wBAAwB,EAAE;QACxB,IAAI,EAAE,UAAU,CAAC,KAAK;QACtB,MAAM,EAAE;YACN,IAAI,EAAE,qCAAqC;YAC3C,IAAI,EAAE,uDAAuD;SAC9D;KACF;IACD,oBAAoB,EAAE;QACpB,IAAI,EAAE,UAAU,CAAC,OAAO;QACxB,MAAM,EAAE;YACN,IAAI,EAAE,8BAA8B;YACpC,IAAI,EAAE,gDAAgD;YACtD,UAAU,EAAE,CAAC,SAAS,CAAC;SACxB;KACF;IACD,yBAAyB,EAAE;QACzB,IAAI,EAAE,UAAU,CAAC,OAAO;QACxB,MAAM,EAAE;YACN,IAAI,EAAE,oCAAoC;YAC1C,IAAI,EAAE,sDAAsD;YAC5D,UAAU,EAAE,CAAC,SAAS,CAAC;SACxB;KACF;IACD,0BAA0B,EAAE;QAC1B,IAAI,EAAE,UAAU,CAAC,OAAO;QACxB,MAAM,EAAE;YACN,IAAI,EAAE,qCAAqC;YAC3C,IAAI,EAAE,wDAAwD;YAC9D,UAAU,EAAE,CAAC,SAAS,CAAC;SACxB;KACF;CACF,CAAC"}
|
package/dist/metrics/index.js
CHANGED
|
@@ -1,28 +1,22 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
exports.ConduitMetrics = void 0;
|
|
7
|
-
const prom_client_1 = require("prom-client");
|
|
8
|
-
const MetricsServer_1 = require("./MetricsServer");
|
|
9
|
-
const defaults_1 = __importDefault(require("./config/defaults"));
|
|
10
|
-
const grpc_sdk_1 = require("@conduitplatform/grpc-sdk");
|
|
11
|
-
class ConduitMetrics {
|
|
1
|
+
import { collectDefaultMetrics, Counter, Gauge, Histogram, Registry, Summary, } from 'prom-client';
|
|
2
|
+
import { MetricsServer } from './MetricsServer.js';
|
|
3
|
+
import defaultMetrics from './config/defaults.js';
|
|
4
|
+
import { MetricType } from '@conduitplatform/grpc-sdk';
|
|
5
|
+
export class ConduitMetrics {
|
|
12
6
|
constructor(moduleName, instance) {
|
|
13
7
|
this.moduleName = moduleName;
|
|
14
8
|
this.instance = instance;
|
|
15
|
-
this._registry = new
|
|
9
|
+
this._registry = new Registry();
|
|
16
10
|
this._registry.setDefaultLabels({
|
|
17
11
|
module_name: this.moduleName,
|
|
18
12
|
module_instance: this.instance,
|
|
19
13
|
});
|
|
20
14
|
this.collectDefaultMetrics();
|
|
21
|
-
this._httpServer = new
|
|
15
|
+
this._httpServer = new MetricsServer(moduleName, instance, this._registry);
|
|
22
16
|
this._httpServer.initialize();
|
|
23
17
|
}
|
|
24
18
|
initializeDefaultMetrics() {
|
|
25
|
-
for (const metric of Object.values(
|
|
19
|
+
for (const metric of Object.values(defaultMetrics)) {
|
|
26
20
|
this.registerMetric(metric.type, metric.config);
|
|
27
21
|
}
|
|
28
22
|
}
|
|
@@ -32,22 +26,22 @@ class ConduitMetrics {
|
|
|
32
26
|
const metricConfig = JSON.parse(JSON.stringify(config));
|
|
33
27
|
metricConfig.name = this.addPrefix(config.name);
|
|
34
28
|
switch (type) {
|
|
35
|
-
case
|
|
29
|
+
case MetricType.Counter:
|
|
36
30
|
this.createCounter(metricConfig);
|
|
37
31
|
break;
|
|
38
|
-
case
|
|
32
|
+
case MetricType.Gauge:
|
|
39
33
|
this.createGauge(metricConfig);
|
|
40
34
|
break;
|
|
41
|
-
case
|
|
35
|
+
case MetricType.Histogram:
|
|
42
36
|
this.createHistogram(metricConfig);
|
|
43
37
|
break;
|
|
44
|
-
case
|
|
38
|
+
case MetricType.Summary:
|
|
45
39
|
this.createSummary(metricConfig);
|
|
46
40
|
break;
|
|
47
41
|
}
|
|
48
42
|
}
|
|
49
43
|
collectDefaultMetrics() {
|
|
50
|
-
|
|
44
|
+
collectDefaultMetrics({
|
|
51
45
|
register: this._registry,
|
|
52
46
|
prefix: 'conduit_',
|
|
53
47
|
// probably not needed
|
|
@@ -58,23 +52,23 @@ class ConduitMetrics {
|
|
|
58
52
|
});
|
|
59
53
|
}
|
|
60
54
|
createCounter(config) {
|
|
61
|
-
return new
|
|
55
|
+
return new Counter({ ...config, registers: [this._registry] });
|
|
62
56
|
}
|
|
63
57
|
createSummary(config) {
|
|
64
|
-
return new
|
|
58
|
+
return new Summary({ ...config, registers: [this._registry] });
|
|
65
59
|
}
|
|
66
60
|
createHistogram(config) {
|
|
67
|
-
return new
|
|
61
|
+
return new Histogram({ ...config, registers: [this._registry] });
|
|
68
62
|
}
|
|
69
63
|
createGauge(config) {
|
|
70
|
-
return new
|
|
64
|
+
return new Gauge({ ...config, registers: [this._registry] });
|
|
71
65
|
}
|
|
72
66
|
getMetric(name) {
|
|
73
67
|
return this._registry.getSingleMetric(this.addPrefix(name));
|
|
74
68
|
}
|
|
75
69
|
increment(metric, increment = 1, labels) {
|
|
76
70
|
const metricInstance = this._registry.getSingleMetric(this.addPrefix(metric));
|
|
77
|
-
if (!(metricInstance instanceof
|
|
71
|
+
if (!(metricInstance instanceof Counter) && !(metricInstance instanceof Gauge)) {
|
|
78
72
|
throw new Error(`Metric ${metric} is not an incrementable metric`);
|
|
79
73
|
}
|
|
80
74
|
return labels
|
|
@@ -83,7 +77,7 @@ class ConduitMetrics {
|
|
|
83
77
|
}
|
|
84
78
|
decrement(metric, decrement = 1, labels) {
|
|
85
79
|
const metricInstance = this._registry.getSingleMetric(this.addPrefix(metric));
|
|
86
|
-
if (!(metricInstance instanceof
|
|
80
|
+
if (!(metricInstance instanceof Gauge)) {
|
|
87
81
|
throw new Error(`Metric ${metric} is not a decrementable metric`);
|
|
88
82
|
}
|
|
89
83
|
return labels
|
|
@@ -92,7 +86,7 @@ class ConduitMetrics {
|
|
|
92
86
|
}
|
|
93
87
|
set(metric, value, labels) {
|
|
94
88
|
const metricInstance = this._registry.getSingleMetric(this.addPrefix(metric));
|
|
95
|
-
if (!(metricInstance instanceof
|
|
89
|
+
if (!(metricInstance instanceof Gauge)) {
|
|
96
90
|
throw new Error(`Metric ${metric} is not a Gauge`);
|
|
97
91
|
}
|
|
98
92
|
return labels
|
|
@@ -101,7 +95,7 @@ class ConduitMetrics {
|
|
|
101
95
|
}
|
|
102
96
|
observe(metric, value, labels) {
|
|
103
97
|
const metricInstance = this._registry.getSingleMetric(this.addPrefix(metric));
|
|
104
|
-
if (!(metricInstance instanceof
|
|
98
|
+
if (!(metricInstance instanceof Histogram) && !(metricInstance instanceof Summary)) {
|
|
105
99
|
throw new Error(`Metric ${metric} is not a Histogram`);
|
|
106
100
|
}
|
|
107
101
|
return labels
|
|
@@ -112,5 +106,4 @@ class ConduitMetrics {
|
|
|
112
106
|
return `conduit_${metric}`;
|
|
113
107
|
}
|
|
114
108
|
}
|
|
115
|
-
exports.ConduitMetrics = ConduitMetrics;
|
|
116
109
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/metrics/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/metrics/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ProxyMiddlewareOptions, ProxyRouteActions, ProxyRouteOptions } from '@conduitplatform/grpc-sdk';
|
|
2
|
-
import { RoutingManager } from './RoutingManager';
|
|
2
|
+
import { RoutingManager } from './RoutingManager.js';
|
|
3
3
|
export declare class ProxyRouteBuilder {
|
|
4
4
|
private readonly manager?;
|
|
5
5
|
private _options;
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ProxyRouteBuilder = void 0;
|
|
4
|
-
class ProxyRouteBuilder {
|
|
1
|
+
export class ProxyRouteBuilder {
|
|
5
2
|
constructor(manager) {
|
|
6
3
|
this.manager = manager;
|
|
7
4
|
this._options = { path: '' };
|
|
@@ -74,5 +71,4 @@ class ProxyRouteBuilder {
|
|
|
74
71
|
};
|
|
75
72
|
}
|
|
76
73
|
}
|
|
77
|
-
exports.ProxyRouteBuilder = ProxyRouteBuilder;
|
|
78
74
|
//# sourceMappingURL=ProxyRouteBuilder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProxyRouteBuilder.js","sourceRoot":"","sources":["../../src/routing/ProxyRouteBuilder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ProxyRouteBuilder.js","sourceRoot":"","sources":["../../src/routing/ProxyRouteBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ConduitModel, ConduitQueryParams, ConduitReturn, ConduitRoute, ConduitRouteActions, ConduitUrlParams } from '@conduitplatform/grpc-sdk';
|
|
2
|
-
import { RoutingManager } from './RoutingManager';
|
|
3
|
-
import { RequestHandlers } from './wrapRouterFunctions';
|
|
2
|
+
import { RoutingManager } from './RoutingManager.js';
|
|
3
|
+
import { RequestHandlers } from './wrapRouterFunctions.js';
|
|
4
4
|
export declare class RouteBuilder {
|
|
5
5
|
private readonly manager?;
|
|
6
6
|
private readonly _options;
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.RouteBuilder = void 0;
|
|
4
|
-
const grpc_sdk_1 = require("@conduitplatform/grpc-sdk");
|
|
5
|
-
class RouteBuilder {
|
|
1
|
+
import { ConduitRouteReturnDefinition, } from '@conduitplatform/grpc-sdk';
|
|
2
|
+
export class RouteBuilder {
|
|
6
3
|
constructor(manager) {
|
|
7
4
|
this.manager = manager;
|
|
8
5
|
this._options = {};
|
|
@@ -60,7 +57,7 @@ class RouteBuilder {
|
|
|
60
57
|
return this;
|
|
61
58
|
}
|
|
62
59
|
return(name, fields) {
|
|
63
|
-
this._returns = new
|
|
60
|
+
this._returns = new ConduitRouteReturnDefinition(name, fields);
|
|
64
61
|
return this;
|
|
65
62
|
}
|
|
66
63
|
handler(fn) {
|
|
@@ -100,5 +97,4 @@ class RouteBuilder {
|
|
|
100
97
|
};
|
|
101
98
|
}
|
|
102
99
|
}
|
|
103
|
-
exports.RouteBuilder = RouteBuilder;
|
|
104
100
|
//# sourceMappingURL=RouteBuilder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteBuilder.js","sourceRoot":"","sources":["../../src/routing/RouteBuilder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RouteBuilder.js","sourceRoot":"","sources":["../../src/routing/RouteBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.RoutingController = void 0;
|
|
4
|
-
const grpc_js_1 = require("@grpc/grpc-js");
|
|
5
|
-
class RoutingController {
|
|
1
|
+
import { status } from '@grpc/grpc-js';
|
|
2
|
+
export class RoutingController {
|
|
6
3
|
constructor() {
|
|
7
4
|
this._routeHandlers = {};
|
|
8
5
|
}
|
|
@@ -12,7 +9,7 @@ class RoutingController {
|
|
|
12
9
|
}
|
|
13
10
|
else {
|
|
14
11
|
callback({
|
|
15
|
-
code:
|
|
12
|
+
code: status.NOT_FOUND,
|
|
16
13
|
message: 'Not found',
|
|
17
14
|
});
|
|
18
15
|
}
|
|
@@ -21,5 +18,4 @@ class RoutingController {
|
|
|
21
18
|
this._routeHandlers = routes;
|
|
22
19
|
}
|
|
23
20
|
}
|
|
24
|
-
exports.RoutingController = RoutingController;
|
|
25
21
|
//# sourceMappingURL=RoutingController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutingController.js","sourceRoot":"","sources":["../../src/routing/RoutingController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RoutingController.js","sourceRoot":"","sources":["../../src/routing/RoutingController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,OAAO,iBAAiB;IAA9B;QACU,mBAAc,GAElB,EAAE,CAAC;IAgBT,CAAC;IAdC,aAAa,CAAC,IAAsB,EAAE,QAA2B;QAC/D,IAAI,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACjE,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC;gBACP,IAAI,EAAE,MAAM,CAAC,SAAS;gBACtB,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,SAAS,CAAC,MAA6D;QACrE,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;IAC/B,CAAC;CACF"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { RouteBuilder } from './RouteBuilder';
|
|
2
|
-
import { RequestHandlers } from './wrapRouterFunctions';
|
|
1
|
+
import { RouteBuilder } from './RouteBuilder.js';
|
|
2
|
+
import { RequestHandlers } from './wrapRouterFunctions.js';
|
|
3
3
|
import { Admin, ConduitMiddlewareOptions, ConduitRouteOptions, ConduitRouteReturnDefinition, ConduitSocketEventHandler, ConduitSocketOptions, ProxyMiddlewareOptions, ProxyRouteOptions, Router } from '@conduitplatform/grpc-sdk';
|
|
4
|
-
import { GrpcServer } from '../classes';
|
|
5
|
-
import { ProxyRouteBuilder } from './ProxyRouteBuilder';
|
|
6
|
-
import { RoutingController } from './RoutingController';
|
|
4
|
+
import { GrpcServer } from '../classes/index.js';
|
|
5
|
+
import { ProxyRouteBuilder } from './ProxyRouteBuilder.js';
|
|
6
|
+
import { RoutingController } from './RoutingController.js';
|
|
7
7
|
export declare class RoutingManager {
|
|
8
8
|
private readonly _router;
|
|
9
9
|
private readonly _server;
|