@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,11 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
const grpc_sdk_1 = require("@conduitplatform/grpc-sdk");
|
|
7
|
-
const ProxyRouteBuilder_1 = require("./ProxyRouteBuilder");
|
|
8
|
-
class RoutingManager {
|
|
1
|
+
import { RouteBuilder } from './RouteBuilder.js';
|
|
2
|
+
import { wrapFunctionsAsync } from './RoutingUtilities.js';
|
|
3
|
+
import { Admin, ConduitRouteActions, } from '@conduitplatform/grpc-sdk';
|
|
4
|
+
import { ProxyRouteBuilder } from './ProxyRouteBuilder.js';
|
|
5
|
+
export class RoutingManager {
|
|
9
6
|
constructor(_router, _server) {
|
|
10
7
|
this._router = _router;
|
|
11
8
|
this._server = _server;
|
|
@@ -13,27 +10,27 @@ class RoutingManager {
|
|
|
13
10
|
this._moduleProxyRoutes = {};
|
|
14
11
|
this._routeHandlers = {};
|
|
15
12
|
this.isAdmin = false;
|
|
16
|
-
if (_router instanceof
|
|
13
|
+
if (_router instanceof Admin) {
|
|
17
14
|
this.isAdmin = true;
|
|
18
15
|
}
|
|
19
16
|
}
|
|
20
17
|
get(path) {
|
|
21
|
-
return new
|
|
18
|
+
return new RouteBuilder(this).method(ConduitRouteActions.GET).path(path);
|
|
22
19
|
}
|
|
23
20
|
post(path) {
|
|
24
|
-
return new
|
|
21
|
+
return new RouteBuilder(this).method(ConduitRouteActions.POST).path(path);
|
|
25
22
|
}
|
|
26
23
|
delete(path) {
|
|
27
|
-
return new
|
|
24
|
+
return new RouteBuilder(this).method(ConduitRouteActions.DELETE).path(path);
|
|
28
25
|
}
|
|
29
26
|
update(path) {
|
|
30
|
-
return new
|
|
27
|
+
return new RouteBuilder(this).method(ConduitRouteActions.UPDATE).path(path);
|
|
31
28
|
}
|
|
32
29
|
patch(path) {
|
|
33
|
-
return new
|
|
30
|
+
return new RouteBuilder(this).method(ConduitRouteActions.PATCH).path(path);
|
|
34
31
|
}
|
|
35
32
|
proxy() {
|
|
36
|
-
return new
|
|
33
|
+
return new ProxyRouteBuilder(this);
|
|
37
34
|
}
|
|
38
35
|
clear() {
|
|
39
36
|
this._moduleRoutes = {};
|
|
@@ -95,7 +92,7 @@ class RoutingManager {
|
|
|
95
92
|
async registerRoutes() {
|
|
96
93
|
if (Object.keys(this._routeHandlers).length === 0)
|
|
97
94
|
return;
|
|
98
|
-
const modifiedFunctions =
|
|
95
|
+
const modifiedFunctions = wrapFunctionsAsync(this._routeHandlers, this.isAdmin ? 'admin' : 'client');
|
|
99
96
|
if (this.isAdmin) {
|
|
100
97
|
RoutingManager.AdminController.setRoutes(modifiedFunctions);
|
|
101
98
|
}
|
|
@@ -140,5 +137,4 @@ class RoutingManager {
|
|
|
140
137
|
return routeObject;
|
|
141
138
|
}
|
|
142
139
|
}
|
|
143
|
-
exports.RoutingManager = RoutingManager;
|
|
144
140
|
//# sourceMappingURL=RoutingManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutingManager.js","sourceRoot":"","sources":["../../src/routing/RoutingManager.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RoutingManager.js","sourceRoot":"","sources":["../../src/routing/RoutingManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Indexable } from '@conduitplatform/grpc-sdk';
|
|
2
|
-
import { RequestHandlers } from './wrapRouterFunctions';
|
|
2
|
+
import { RequestHandlers } from './wrapRouterFunctions.js';
|
|
3
3
|
export declare function wrapFunctionsAsync(functions: {
|
|
4
4
|
[name: string]: RequestHandlers;
|
|
5
5
|
}, routerType: 'admin' | 'client'): {
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.wrapFunctionsAsync = void 0;
|
|
4
|
-
const wrapRouterFunctions_1 = require("./wrapRouterFunctions");
|
|
5
|
-
function wrapFunctionsAsync(functions, routerType) {
|
|
1
|
+
import { wrapRouterGrpcFunction } from './wrapRouterFunctions.js';
|
|
2
|
+
export function wrapFunctionsAsync(functions, routerType) {
|
|
6
3
|
const modifiedFunctions = {};
|
|
7
4
|
Object.keys(functions).forEach(key => {
|
|
8
|
-
modifiedFunctions[key] =
|
|
5
|
+
modifiedFunctions[key] = wrapRouterGrpcFunction(functions[key], routerType);
|
|
9
6
|
});
|
|
10
7
|
return modifiedFunctions;
|
|
11
8
|
}
|
|
12
|
-
exports.wrapFunctionsAsync = wrapFunctionsAsync;
|
|
13
9
|
//# sourceMappingURL=RoutingUtilities.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutingUtilities.js","sourceRoot":"","sources":["../../src/routing/RoutingUtilities.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"RoutingUtilities.js","sourceRoot":"","sources":["../../src/routing/RoutingUtilities.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAEnF,MAAM,UAAU,kBAAkB,CAChC,SAA8C,EAC9C,UAA8B;IAI9B,MAAM,iBAAiB,GAEnB,EAAE,CAAC;IACP,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACnC,iBAAiB,CAAC,GAAG,CAAC,GAAG,sBAAsB,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IACH,OAAO,iBAAiB,CAAC;AAC3B,CAAC"}
|
package/dist/routing/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export * from './RouteBuilder';
|
|
2
|
-
export * from './RoutingManager';
|
|
3
|
-
export * from './RoutingUtilities';
|
|
4
|
-
export * from './wrapRouterFunctions';
|
|
5
|
-
export * from './ProxyRouteBuilder';
|
|
1
|
+
export * from './RouteBuilder.js';
|
|
2
|
+
export * from './RoutingManager.js';
|
|
3
|
+
export * from './RoutingUtilities.js';
|
|
4
|
+
export * from './wrapRouterFunctions.js';
|
|
5
|
+
export * from './ProxyRouteBuilder.js';
|
package/dist/routing/index.js
CHANGED
|
@@ -1,22 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./RouteBuilder"), exports);
|
|
18
|
-
__exportStar(require("./RoutingManager"), exports);
|
|
19
|
-
__exportStar(require("./RoutingUtilities"), exports);
|
|
20
|
-
__exportStar(require("./wrapRouterFunctions"), exports);
|
|
21
|
-
__exportStar(require("./ProxyRouteBuilder"), exports);
|
|
1
|
+
export * from './RouteBuilder.js';
|
|
2
|
+
export * from './RoutingManager.js';
|
|
3
|
+
export * from './RoutingUtilities.js';
|
|
4
|
+
export * from './wrapRouterFunctions.js';
|
|
5
|
+
export * from './ProxyRouteBuilder.js';
|
|
22
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routing/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/routing/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC"}
|
|
@@ -1,11 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.wrapRouterGrpcFunction = void 0;
|
|
7
|
-
const grpc_sdk_1 = __importDefault(require("@conduitplatform/grpc-sdk"));
|
|
8
|
-
const grpc_js_1 = require("@grpc/grpc-js");
|
|
1
|
+
import ConduitGrpcSdk from '@conduitplatform/grpc-sdk';
|
|
2
|
+
import { status } from '@grpc/grpc-js';
|
|
9
3
|
function generateLog(routerType, routerRequest, requestReceive, call, status) {
|
|
10
4
|
var _a, _b, _c;
|
|
11
5
|
let log = '';
|
|
@@ -17,11 +11,11 @@ function generateLog(routerType, routerRequest, requestReceive, call, status) {
|
|
|
17
11
|
log += `(${routerType}) Socket: ${call.request.event} socket: ${call.request.socket}`;
|
|
18
12
|
}
|
|
19
13
|
log += ` ${status !== null && status !== void 0 ? status : '200'} ${latency}`;
|
|
20
|
-
|
|
21
|
-
(_a =
|
|
22
|
-
(_b =
|
|
14
|
+
ConduitGrpcSdk.Logger.log(log);
|
|
15
|
+
(_a = ConduitGrpcSdk.Metrics) === null || _a === void 0 ? void 0 : _a.set('grpc_request_latency_seconds', latency / 1000);
|
|
16
|
+
(_b = ConduitGrpcSdk.Metrics) === null || _b === void 0 ? void 0 : _b.set(`${routerType}_grpc_request_latency_seconds`, latency / 1000);
|
|
23
17
|
const successStatus = !status || status.toString().charAt(0) === '2';
|
|
24
|
-
(_c =
|
|
18
|
+
(_c = ConduitGrpcSdk.Metrics) === null || _c === void 0 ? void 0 : _c.increment(`${routerType}_grpc_response_statuses_total`, 1, {
|
|
25
19
|
success: successStatus ? 'true' : 'false',
|
|
26
20
|
});
|
|
27
21
|
}
|
|
@@ -40,7 +34,7 @@ function parseResponseData(r, routerRequest, requestReceive, call, callback, res
|
|
|
40
34
|
responded.did = true;
|
|
41
35
|
if (!r) {
|
|
42
36
|
callback({
|
|
43
|
-
code:
|
|
37
|
+
code: status.INTERNAL,
|
|
44
38
|
message: 'Handler did not return a response',
|
|
45
39
|
});
|
|
46
40
|
}
|
|
@@ -79,12 +73,12 @@ function parseResponseData(r, routerRequest, requestReceive, call, callback, res
|
|
|
79
73
|
}
|
|
80
74
|
generateLog(routerType, routerRequest, requestReceive, call, undefined);
|
|
81
75
|
}
|
|
82
|
-
function wrapRouterGrpcFunction(fun, routerType) {
|
|
76
|
+
export function wrapRouterGrpcFunction(fun, routerType) {
|
|
83
77
|
return (call, callback) => {
|
|
84
78
|
var _a, _b, _c, _d;
|
|
85
79
|
const requestReceive = Date.now();
|
|
86
80
|
let routerRequest = true;
|
|
87
|
-
(_a =
|
|
81
|
+
(_a = ConduitGrpcSdk.Metrics) === null || _a === void 0 ? void 0 : _a.increment(`${routerType}_grpc_requests_total`);
|
|
88
82
|
try {
|
|
89
83
|
call.request.context = parseRequestData(call.request.context);
|
|
90
84
|
call.request.params = parseRequestData(call.request.params);
|
|
@@ -98,11 +92,11 @@ function wrapRouterGrpcFunction(fun, routerType) {
|
|
|
98
92
|
}
|
|
99
93
|
}
|
|
100
94
|
catch (e) {
|
|
101
|
-
(_b =
|
|
102
|
-
generateLog(routerType, routerRequest, requestReceive, call,
|
|
103
|
-
|
|
95
|
+
(_b = ConduitGrpcSdk.Metrics) === null || _b === void 0 ? void 0 : _b.increment(`${routerType}_grpc_errors_total`);
|
|
96
|
+
generateLog(routerType, routerRequest, requestReceive, call, status.INTERNAL);
|
|
97
|
+
ConduitGrpcSdk.Logger.error((_c = e.message) !== null && _c !== void 0 ? _c : 'Something went wrong');
|
|
104
98
|
return callback({
|
|
105
|
-
code:
|
|
99
|
+
code: status.INTERNAL,
|
|
106
100
|
message: (_d = e.message) !== null && _d !== void 0 ? _d : 'Something went wrong',
|
|
107
101
|
});
|
|
108
102
|
}
|
|
@@ -113,15 +107,14 @@ function wrapRouterGrpcFunction(fun, routerType) {
|
|
|
113
107
|
.then(r => parseResponseData(r, routerRequest, requestReceive, call, callback, responded, routerType))
|
|
114
108
|
.catch(error => {
|
|
115
109
|
var _a, _b, _c, _d, _e, _f;
|
|
116
|
-
(_a =
|
|
117
|
-
generateLog(routerType, routerRequest, requestReceive, call, (_b = error.code) !== null && _b !== void 0 ? _b :
|
|
118
|
-
|
|
110
|
+
(_a = ConduitGrpcSdk.Metrics) === null || _a === void 0 ? void 0 : _a.increment(`${routerType}_grpc_errors_total`);
|
|
111
|
+
generateLog(routerType, routerRequest, requestReceive, call, (_b = error.code) !== null && _b !== void 0 ? _b : status.INTERNAL);
|
|
112
|
+
ConduitGrpcSdk.Logger.error((_c = error.message) !== null && _c !== void 0 ? _c : 'Something went wrong');
|
|
119
113
|
callback({
|
|
120
|
-
code: (_d = error.code) !== null && _d !== void 0 ? _d :
|
|
114
|
+
code: (_d = error.code) !== null && _d !== void 0 ? _d : status.INTERNAL,
|
|
121
115
|
message: (_f = (_e = error.details) !== null && _e !== void 0 ? _e : error.message) !== null && _f !== void 0 ? _f : 'Something went wrong',
|
|
122
116
|
});
|
|
123
117
|
});
|
|
124
118
|
};
|
|
125
119
|
}
|
|
126
|
-
exports.wrapRouterGrpcFunction = wrapRouterGrpcFunction;
|
|
127
120
|
//# sourceMappingURL=wrapRouterFunctions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapRouterFunctions.js","sourceRoot":"","sources":["../../src/routing/wrapRouterFunctions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wrapRouterFunctions.js","sourceRoot":"","sources":["../../src/routing/wrapRouterFunctions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.convictConfigParser = void 0;
|
|
4
|
-
const convictConfigParser = (config) => {
|
|
1
|
+
export const convictConfigParser = (config) => {
|
|
5
2
|
if (typeof config === 'object') {
|
|
6
3
|
Object.keys(config).forEach(key => {
|
|
7
4
|
if (key === '_cvtProperties') {
|
|
8
|
-
config =
|
|
5
|
+
config = convictConfigParser(config._cvtProperties);
|
|
9
6
|
}
|
|
10
7
|
else {
|
|
11
|
-
config[key] =
|
|
8
|
+
config[key] = convictConfigParser(config[key]);
|
|
12
9
|
}
|
|
13
10
|
});
|
|
14
11
|
}
|
|
15
12
|
return config;
|
|
16
13
|
};
|
|
17
|
-
exports.convictConfigParser = convictConfigParser;
|
|
18
14
|
//# sourceMappingURL=convictConfigParser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convictConfigParser.js","sourceRoot":"","sources":["../../src/utilities/convictConfigParser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"convictConfigParser.js","sourceRoot":"","sources":["../../src/utilities/convictConfigParser.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAiB,EAAE,EAAE;IACvD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAChC,IAAI,GAAG,KAAK,gBAAgB,EAAE,CAAC;gBAC7B,MAAM,GAAG,mBAAmB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YACtD,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACjD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from './initializeSdk';
|
|
2
|
-
export * from './linearBackoffTimeout';
|
|
3
|
-
export * from './merge';
|
|
1
|
+
export * from './initializeSdk.js';
|
|
2
|
+
export * from './linearBackoffTimeout.js';
|
|
3
|
+
export * from './merge.js';
|
package/dist/utilities/index.js
CHANGED
|
@@ -1,20 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
14
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
|
-
};
|
|
16
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
__exportStar(require("./initializeSdk"), exports);
|
|
18
|
-
__exportStar(require("./linearBackoffTimeout"), exports);
|
|
19
|
-
__exportStar(require("./merge"), exports);
|
|
1
|
+
export * from './initializeSdk.js';
|
|
2
|
+
export * from './linearBackoffTimeout.js';
|
|
3
|
+
export * from './merge.js';
|
|
20
4
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utilities/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utilities/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,YAAY,CAAC"}
|
|
@@ -1,62 +1,35 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.initializeSdk = void 0;
|
|
30
|
-
const grpc_sdk_1 = __importStar(require("@conduitplatform/grpc-sdk"));
|
|
31
|
-
const logging_1 = require("../logging");
|
|
32
|
-
const winston_1 = __importDefault(require("winston"));
|
|
33
|
-
const path_1 = __importDefault(require("path"));
|
|
34
|
-
const metrics_1 = require("../metrics");
|
|
35
|
-
const clientMiddleware_1 = require("../metrics/clientMiddleware");
|
|
36
|
-
const initializeSdk = (coreUrl, moduleName, watchModules = true, serviceHealthStatusGetter = () => grpc_sdk_1.HealthCheckStatus.SERVING) => {
|
|
1
|
+
import ConduitGrpcSdk, { HealthCheckStatus, } from '@conduitplatform/grpc-sdk';
|
|
2
|
+
import { ConduitLogger, setupLoki } from '../logging/index.js';
|
|
3
|
+
import winston from 'winston';
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import { ConduitMetrics } from '../metrics/index.js';
|
|
6
|
+
import { clientMiddleware } from '../metrics/clientMiddleware.js';
|
|
7
|
+
import { fileURLToPath } from 'node:url';
|
|
8
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
9
|
+
const __dirname = path.dirname(__filename);
|
|
10
|
+
export const initializeSdk = (coreUrl, moduleName, watchModules = true, serviceHealthStatusGetter = () => HealthCheckStatus.SERVING) => {
|
|
37
11
|
let logger;
|
|
38
12
|
try {
|
|
39
|
-
logger = new
|
|
40
|
-
new
|
|
41
|
-
filename:
|
|
13
|
+
logger = new ConduitLogger([
|
|
14
|
+
new winston.transports.File({
|
|
15
|
+
filename: path.join(__dirname, '.logs/combined.log'),
|
|
42
16
|
level: 'info',
|
|
43
17
|
}),
|
|
44
|
-
new
|
|
45
|
-
filename:
|
|
18
|
+
new winston.transports.File({
|
|
19
|
+
filename: path.join(__dirname, '.logs/errors.log'),
|
|
46
20
|
level: 'error',
|
|
47
21
|
}),
|
|
48
22
|
]);
|
|
49
23
|
}
|
|
50
24
|
catch (e) {
|
|
51
|
-
logger = new
|
|
25
|
+
logger = new ConduitLogger();
|
|
52
26
|
}
|
|
53
|
-
const grpcSdk = new
|
|
54
|
-
|
|
27
|
+
const grpcSdk = new ConduitGrpcSdk(coreUrl, moduleName, watchModules, logger, serviceHealthStatusGetter);
|
|
28
|
+
setupLoki(grpcSdk.name, grpcSdk.instance).then();
|
|
55
29
|
if (process.env.METRICS_PORT) {
|
|
56
|
-
|
|
57
|
-
grpcSdk.addMiddleware(
|
|
30
|
+
ConduitGrpcSdk.Metrics = new ConduitMetrics(grpcSdk.name, grpcSdk.instance);
|
|
31
|
+
grpcSdk.addMiddleware(clientMiddleware());
|
|
58
32
|
}
|
|
59
33
|
return grpcSdk;
|
|
60
34
|
};
|
|
61
|
-
exports.initializeSdk = initializeSdk;
|
|
62
35
|
//# sourceMappingURL=initializeSdk.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initializeSdk.js","sourceRoot":"","sources":["../../src/utilities/initializeSdk.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"initializeSdk.js","sourceRoot":"","sources":["../../src/utilities/initializeSdk.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,EAAE,EACrB,iBAAiB,GAElB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,UAAU,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AAC3C,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,OAAe,EACf,UAAkB,EAClB,eAAwB,IAAI,EAC5B,4BAAqD,GAAG,EAAE,CAAC,iBAAiB,CAAC,OAAO,EACpF,EAAE;IACF,IAAI,MAAsB,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,aAAa,CAAC;YACzB,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC;gBACpD,KAAK,EAAE,MAAM;aACd,CAAC;YACF,IAAI,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC;gBAClD,KAAK,EAAE,OAAO;aACf,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;IAC/B,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,cAAc,CAChC,OAAO,EACP,UAAU,EACV,YAAY,EACZ,MAAM,EACN,yBAAyB,CAC1B,CAAC;IACF,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IACjD,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;QAC7B,cAAc,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5E,OAAO,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.linearBackoffTimeoutAsync = exports.linearBackoffTimeout = void 0;
|
|
4
1
|
/**
|
|
5
2
|
* Registers a timeout with linear backoff.
|
|
6
3
|
* onFailure() only runs on rep exhaustion.
|
|
7
4
|
* Timeout can be cleared through returned clear() or inside onTry().
|
|
8
5
|
*/
|
|
9
|
-
|
|
10
|
-
function linearBackoffTimeout(onTry, delay, reps, onFailure) {
|
|
6
|
+
import { clearTimeout } from 'timers';
|
|
7
|
+
export function linearBackoffTimeout(onTry, delay, reps, onFailure) {
|
|
11
8
|
const nextRep = () => reps === undefined || --reps > 0;
|
|
12
9
|
let stopSignal = false;
|
|
13
10
|
const stop = () => {
|
|
@@ -16,7 +13,7 @@ function linearBackoffTimeout(onTry, delay, reps, onFailure) {
|
|
|
16
13
|
let timeout;
|
|
17
14
|
const invoker = async () => {
|
|
18
15
|
if (stopSignal) {
|
|
19
|
-
return timeout ?
|
|
16
|
+
return timeout ? clearTimeout(timeout) : null;
|
|
20
17
|
}
|
|
21
18
|
delay = Math.floor(delay * 2);
|
|
22
19
|
if (delay > 0 && nextRep()) {
|
|
@@ -32,19 +29,18 @@ function linearBackoffTimeout(onTry, delay, reps, onFailure) {
|
|
|
32
29
|
return {
|
|
33
30
|
clear: () => {
|
|
34
31
|
if (timeout) {
|
|
35
|
-
|
|
32
|
+
clearTimeout(timeout);
|
|
36
33
|
timeout = null;
|
|
37
34
|
}
|
|
38
35
|
},
|
|
39
36
|
};
|
|
40
37
|
}
|
|
41
|
-
exports.linearBackoffTimeout = linearBackoffTimeout;
|
|
42
38
|
/**
|
|
43
39
|
* Registers a timeout with linear backoff.
|
|
44
40
|
* onFailure() only runs on rep exhaustion.
|
|
45
41
|
* @param {() => Promise<boolean>} onTry - Async handler, returns 'continue' boolean flag
|
|
46
42
|
*/
|
|
47
|
-
async function linearBackoffTimeoutAsync(onTry, delay, reps, onFailure, startNow = false) {
|
|
43
|
+
export async function linearBackoffTimeoutAsync(onTry, delay, reps, onFailure, startNow = false) {
|
|
48
44
|
const nextRep = () => reps === undefined || --reps > 0;
|
|
49
45
|
const invoker = async () => {
|
|
50
46
|
delay = Math.floor(delay * 2);
|
|
@@ -58,5 +54,4 @@ async function linearBackoffTimeoutAsync(onTry, delay, reps, onFailure, startNow
|
|
|
58
54
|
};
|
|
59
55
|
setTimeout(invoker, startNow ? 0 : delay);
|
|
60
56
|
}
|
|
61
|
-
exports.linearBackoffTimeoutAsync = linearBackoffTimeoutAsync;
|
|
62
57
|
//# sourceMappingURL=linearBackoffTimeout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linearBackoffTimeout.js","sourceRoot":"","sources":["../../src/utilities/linearBackoffTimeout.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"linearBackoffTimeout.js","sourceRoot":"","sources":["../../src/utilities/linearBackoffTimeout.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,UAAU,oBAAoB,CAClC,KAAiC,EACjC,KAAa,EACb,IAAa,EACb,SAAsB;IAEtB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC;IACvD,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,UAAU,GAAG,IAAI,CAAC;IACpB,CAAC,CAAC;IACF,IAAI,OAA8B,CAAC;IACnC,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;QACzB,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,CAAC;QACD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAC9B,IAAI,KAAK,GAAG,CAAC,IAAI,OAAO,EAAE,EAAE,CAAC;YAC3B,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,CAAC;QACd,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,IAAI,CAAC;YACf,SAAS,IAAI,SAAS,EAAE,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC;IACF,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACrC,OAAO;QACL,KAAK,EAAE,GAAG,EAAE;YACV,IAAI,OAAO,EAAE,CAAC;gBACZ,YAAY,CAAC,OAAO,CAAC,CAAC;gBACtB,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,KAA6B,EAC7B,KAAa,EACb,IAAa,EACb,SAAsC,EACtC,QAAQ,GAAG,KAAK;IAEhB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,EAAE,IAAI,GAAG,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;QACzB,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAC9B,IAAI,KAAK,GAAG,CAAC,IAAI,OAAO,EAAE,EAAE,CAAC;YAC3B,IAAI,MAAM,KAAK,EAAE;gBAAE,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACN,SAAS,IAAI,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC;QACnC,CAAC;IACH,CAAC,CAAC;IACF,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC"}
|
package/dist/utilities/merge.js
CHANGED
|
@@ -1,15 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.merge = void 0;
|
|
4
|
-
const lodash_1 = require("lodash");
|
|
5
|
-
function merge(objA, objB) {
|
|
1
|
+
import { mergeWith as _mergeWith } from 'lodash-es';
|
|
2
|
+
export function merge(objA, objB) {
|
|
6
3
|
const customizer = (objValue, srcValue) => {
|
|
7
4
|
if (Array.isArray(objValue)) {
|
|
8
5
|
// don't merge arrays
|
|
9
6
|
return srcValue;
|
|
10
7
|
}
|
|
11
8
|
};
|
|
12
|
-
return (
|
|
9
|
+
return _mergeWith({}, objA, objB, customizer);
|
|
13
10
|
}
|
|
14
|
-
exports.merge = merge;
|
|
15
11
|
//# sourceMappingURL=merge.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/utilities/merge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/utilities/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AAEpD,MAAM,UAAU,KAAK,CAAmB,IAAO,EAAE,IAAO;IACtD,MAAM,UAAU,GAAG,CAAC,QAAiB,EAAE,QAAiB,EAAE,EAAE;QAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,qBAAqB;YACrB,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC,CAAC;IACF,OAAO,UAAU,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;AAChD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@conduitplatform/module-tools",
|
|
3
|
-
"version": "0.16.0-rc.
|
|
3
|
+
"version": "0.16.0-rc.4",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"engines": {
|
|
7
7
|
"node": ">=14"
|
|
8
8
|
},
|
|
9
|
+
"type": "module",
|
|
9
10
|
"scripts": {
|
|
10
11
|
"prepublish": "npm run build",
|
|
11
12
|
"build": "rimraf dist && tsc",
|
|
@@ -19,7 +20,7 @@
|
|
|
19
20
|
"convict": "^6.2.4",
|
|
20
21
|
"express": "^4.18.2",
|
|
21
22
|
"fast-jwt": "^3.3.2",
|
|
22
|
-
"lodash": "^4.17.21",
|
|
23
|
+
"lodash-es": "^4.17.21",
|
|
23
24
|
"prom-client": "^15.0.0",
|
|
24
25
|
"protobufjs": "^7.2.3",
|
|
25
26
|
"winston": "^3.8.2",
|
|
@@ -40,18 +41,18 @@
|
|
|
40
41
|
"devDependencies": {
|
|
41
42
|
"@conduitplatform/grpc-sdk": "*",
|
|
42
43
|
"@types/convict": "^6.1.6",
|
|
43
|
-
"@types/express": "^4.17.
|
|
44
|
+
"@types/express": "^4.17.21",
|
|
44
45
|
"@types/fs-extra": "^11.0.4",
|
|
45
46
|
"@types/google-protobuf": "^3.15.6",
|
|
46
|
-
"@types/lodash": "^4.
|
|
47
|
-
"@types/node": "20.
|
|
47
|
+
"@types/lodash-es": "^4.17.12",
|
|
48
|
+
"@types/node": "20.11.13",
|
|
48
49
|
"copyfiles": "^2.4.1",
|
|
49
50
|
"rimraf": "^5.0.5",
|
|
50
|
-
"ts-proto": "^1.
|
|
51
|
-
"typescript": "~5.
|
|
51
|
+
"ts-proto": "^1.167.1",
|
|
52
|
+
"typescript": "~5.3.3"
|
|
52
53
|
},
|
|
53
54
|
"peerDependencies": {
|
|
54
55
|
"@conduitplatform/grpc-sdk": "*",
|
|
55
|
-
"@grpc/grpc-js": "^1.
|
|
56
|
+
"@grpc/grpc-js": "^1.9.7"
|
|
56
57
|
}
|
|
57
58
|
}
|