@conduitplatform/module-tools 0.16.0-alpha.9 → 0.16.0-rc.0
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 +1 -0
- package/dist/ManagedModule.js +153 -358
- package/dist/ManagedModule.js.map +1 -1
- package/dist/classes/ConduitActiveSchema.d.ts +12 -9
- package/dist/classes/ConduitActiveSchema.js +43 -52
- package/dist/classes/ConduitActiveSchema.js.map +1 -1
- package/dist/classes/ConduitServiceModule.d.ts +2 -0
- package/dist/classes/ConduitServiceModule.js +65 -112
- package/dist/classes/ConduitServiceModule.js.map +1 -1
- package/dist/classes/ConfigController.js +10 -17
- package/dist/classes/ConfigController.js.map +1 -1
- package/dist/classes/GrpcServer.d.ts +1 -0
- package/dist/classes/GrpcServer.js +93 -172
- package/dist/classes/GrpcServer.js.map +1 -1
- package/dist/helpers/GrpcHelper.js +11 -11
- package/dist/helpers/GrpcHelper.js.map +1 -1
- package/dist/helpers/GrpcToParsedRouterRequest.d.ts +2 -0
- package/dist/helpers/GrpcToParsedRouterRequest.js +19 -0
- package/dist/helpers/GrpcToParsedRouterRequest.js.map +1 -0
- package/dist/helpers/TypeHelpers.js +57 -119
- package/dist/helpers/TypeHelpers.js.map +1 -1
- package/dist/helpers/index.d.ts +1 -0
- package/dist/helpers/index.js +1 -0
- package/dist/helpers/index.js.map +1 -1
- package/dist/helpers/wrapGrpcFunctions.js +14 -15
- package/dist/helpers/wrapGrpcFunctions.js.map +1 -1
- package/dist/interfaces/ModuleLifecycleStage.d.ts +7 -0
- package/dist/interfaces/ModuleLifecycleStage.js +12 -0
- package/dist/interfaces/ModuleLifecycleStage.js.map +1 -0
- package/dist/logging/index.js +80 -180
- package/dist/logging/index.js.map +1 -1
- package/dist/metrics/MetricsServer.d.ts +2 -1
- package/dist/metrics/MetricsServer.js +25 -70
- package/dist/metrics/MetricsServer.js.map +1 -1
- package/dist/metrics/clientMiddleware.js +76 -217
- package/dist/metrics/clientMiddleware.js.map +1 -1
- package/dist/metrics/config/defaults.js +1 -1
- package/dist/metrics/config/defaults.js.map +1 -1
- package/dist/metrics/index.js +53 -89
- package/dist/metrics/index.js.map +1 -1
- package/dist/module.proto +58 -0
- package/dist/routing/ProxyRouteBuilder.js +21 -24
- package/dist/routing/ProxyRouteBuilder.js.map +1 -1
- package/dist/routing/RouteBuilder.js +31 -34
- package/dist/routing/RouteBuilder.js.map +1 -1
- package/dist/routing/RoutingController.d.ts +8 -0
- package/dist/routing/RoutingController.js +25 -0
- package/dist/routing/RoutingController.js.map +1 -0
- package/dist/routing/RoutingManager.d.ts +5 -2
- package/dist/routing/RoutingManager.js +61 -115
- package/dist/routing/RoutingManager.js.map +1 -1
- package/dist/routing/RoutingUtilities.js +3 -3
- package/dist/routing/RoutingUtilities.js.map +1 -1
- package/dist/routing/wrapRouterFunctions.d.ts +5 -5
- package/dist/routing/wrapRouterFunctions.js +30 -39
- package/dist/routing/wrapRouterFunctions.js.map +1 -1
- package/dist/utilities/convictConfigParser.js +2 -2
- package/dist/utilities/convictConfigParser.js.map +1 -1
- package/dist/utilities/initializeSdk.js +9 -11
- package/dist/utilities/initializeSdk.js.map +1 -1
- package/dist/utilities/linearBackoffTimeout.d.ts +1 -1
- package/dist/utilities/linearBackoffTimeout.js +35 -92
- package/dist/utilities/linearBackoffTimeout.js.map +1 -1
- package/dist/utilities/merge.js +2 -2
- package/dist/utilities/merge.js.map +1 -1
- package/package.json +19 -20
|
@@ -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,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.wrapFunctionsAsync = void 0;
|
|
4
|
-
|
|
4
|
+
const wrapRouterFunctions_1 = require("./wrapRouterFunctions");
|
|
5
5
|
function wrapFunctionsAsync(functions, routerType) {
|
|
6
|
-
|
|
7
|
-
Object.keys(functions).forEach(
|
|
6
|
+
const modifiedFunctions = {};
|
|
7
|
+
Object.keys(functions).forEach(key => {
|
|
8
8
|
modifiedFunctions[key] = (0, wrapRouterFunctions_1.wrapRouterGrpcFunction)(functions[key], routerType);
|
|
9
9
|
});
|
|
10
10
|
return modifiedFunctions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutingUtilities.js","sourceRoot":"","sources":["../../src/routing/RoutingUtilities.ts"],"names":[],"mappings":";;;AACA
|
|
1
|
+
{"version":3,"file":"RoutingUtilities.js","sourceRoot":"","sources":["../../src/routing/RoutingUtilities.ts"],"names":[],"mappings":";;;AACA,+DAAgF;AAEhF,SAAgB,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,IAAA,4CAAsB,EAAC,SAAS,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;IAC9E,CAAC,CAAC,CAAC;IACH,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAbD,gDAaC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Indexable, ParsedRouterRequest, ParsedSocketRequest, UnparsedRouterResponse, UnparsedSocketResponse } from '@conduitplatform/grpc-sdk';
|
|
2
|
-
export
|
|
3
|
-
export
|
|
4
|
-
export
|
|
5
|
-
export
|
|
6
|
-
export
|
|
2
|
+
export type RouterRequestHandler = (call: ParsedRouterRequest) => Promise<UnparsedRouterResponse>;
|
|
3
|
+
export type RouterRequestHandlerCallback = (call: ParsedRouterRequest, callback: (response: UnparsedRouterResponse) => void) => Promise<UnparsedRouterResponse | undefined | void>;
|
|
4
|
+
export type SocketRequestHandler = (call: ParsedSocketRequest) => Promise<UnparsedSocketResponse>;
|
|
5
|
+
export type SocketRequestHandlerCallback = (call: ParsedSocketRequest, callback: (response: UnparsedRouterResponse) => void) => Promise<UnparsedSocketResponse | undefined | void>;
|
|
6
|
+
export type RequestHandlers = RouterRequestHandler | RouterRequestHandlerCallback | SocketRequestHandler | SocketRequestHandlerCallback;
|
|
7
7
|
export declare function wrapRouterGrpcFunction(fun: RequestHandlers, routerType: string): (call: Indexable, callback: any) => void;
|
|
@@ -1,38 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __assign = (this && this.__assign) || function () {
|
|
3
|
-
__assign = Object.assign || function(t) {
|
|
4
|
-
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
-
s = arguments[i];
|
|
6
|
-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
-
t[p] = s[p];
|
|
8
|
-
}
|
|
9
|
-
return t;
|
|
10
|
-
};
|
|
11
|
-
return __assign.apply(this, arguments);
|
|
12
|
-
};
|
|
13
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
4
|
};
|
|
16
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
6
|
exports.wrapRouterGrpcFunction = void 0;
|
|
18
|
-
|
|
19
|
-
|
|
7
|
+
const grpc_sdk_1 = __importDefault(require("@conduitplatform/grpc-sdk"));
|
|
8
|
+
const grpc_js_1 = require("@grpc/grpc-js");
|
|
20
9
|
function generateLog(routerType, routerRequest, requestReceive, call, status) {
|
|
21
10
|
var _a, _b, _c;
|
|
22
|
-
|
|
23
|
-
|
|
11
|
+
let log = '';
|
|
12
|
+
const latency = Date.now() - requestReceive;
|
|
24
13
|
if (routerRequest) {
|
|
25
|
-
log +=
|
|
14
|
+
log += `(${routerType}) Request: ${call.request.path}`;
|
|
26
15
|
}
|
|
27
16
|
else {
|
|
28
|
-
log +=
|
|
17
|
+
log += `(${routerType}) Socket: ${call.request.event} socket: ${call.request.socket}`;
|
|
29
18
|
}
|
|
30
|
-
log +=
|
|
19
|
+
log += ` ${status !== null && status !== void 0 ? status : '200'} ${latency}`;
|
|
31
20
|
grpc_sdk_1.default.Logger.log(log);
|
|
32
21
|
(_a = grpc_sdk_1.default.Metrics) === null || _a === void 0 ? void 0 : _a.set('grpc_request_latency_seconds', latency / 1000);
|
|
33
|
-
(_b = grpc_sdk_1.default.Metrics) === null || _b === void 0 ? void 0 : _b.set(
|
|
34
|
-
|
|
35
|
-
(_c = grpc_sdk_1.default.Metrics) === null || _c === void 0 ? void 0 : _c.increment(
|
|
22
|
+
(_b = grpc_sdk_1.default.Metrics) === null || _b === void 0 ? void 0 : _b.set(`${routerType}_grpc_request_latency_seconds`, latency / 1000);
|
|
23
|
+
const successStatus = !status || status.toString().charAt(0) === '2';
|
|
24
|
+
(_c = grpc_sdk_1.default.Metrics) === null || _c === void 0 ? void 0 : _c.increment(`${routerType}_grpc_response_statuses_total`, 1, {
|
|
36
25
|
success: successStatus ? 'true' : 'false',
|
|
37
26
|
});
|
|
38
27
|
}
|
|
@@ -60,7 +49,7 @@ function parseResponseData(r, routerRequest, requestReceive, call, callback, res
|
|
|
60
49
|
callback(null, { result: r });
|
|
61
50
|
}
|
|
62
51
|
else {
|
|
63
|
-
|
|
52
|
+
let respObject;
|
|
64
53
|
if (r.removeCookies || r.setCookies) {
|
|
65
54
|
respObject = {
|
|
66
55
|
removeCookies: r.removeCookies,
|
|
@@ -68,14 +57,18 @@ function parseResponseData(r, routerRequest, requestReceive, call, callback, res
|
|
|
68
57
|
};
|
|
69
58
|
}
|
|
70
59
|
if (r.result || r.redirect) {
|
|
71
|
-
callback(null,
|
|
60
|
+
callback(null, {
|
|
61
|
+
...respObject,
|
|
62
|
+
redirect: (_a = r.redirect) !== null && _a !== void 0 ? _a : undefined,
|
|
63
|
+
result: r.result
|
|
72
64
|
? typeof r.result === 'string'
|
|
73
65
|
? r.result
|
|
74
66
|
: JSON.stringify(r.result)
|
|
75
|
-
: undefined
|
|
67
|
+
: undefined,
|
|
68
|
+
});
|
|
76
69
|
}
|
|
77
70
|
else {
|
|
78
|
-
callback(null,
|
|
71
|
+
callback(null, { ...respObject, result: JSON.stringify(r) });
|
|
79
72
|
}
|
|
80
73
|
}
|
|
81
74
|
}
|
|
@@ -87,11 +80,11 @@ function parseResponseData(r, routerRequest, requestReceive, call, callback, res
|
|
|
87
80
|
generateLog(routerType, routerRequest, requestReceive, call, undefined);
|
|
88
81
|
}
|
|
89
82
|
function wrapRouterGrpcFunction(fun, routerType) {
|
|
90
|
-
return
|
|
83
|
+
return (call, callback) => {
|
|
91
84
|
var _a, _b, _c, _d;
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
(_a = grpc_sdk_1.default.Metrics) === null || _a === void 0 ? void 0 : _a.increment(
|
|
85
|
+
const requestReceive = Date.now();
|
|
86
|
+
let routerRequest = true;
|
|
87
|
+
(_a = grpc_sdk_1.default.Metrics) === null || _a === void 0 ? void 0 : _a.increment(`${routerType}_grpc_requests_total`);
|
|
95
88
|
try {
|
|
96
89
|
call.request.context = parseRequestData(call.request.context);
|
|
97
90
|
call.request.params = parseRequestData(call.request.params);
|
|
@@ -105,7 +98,7 @@ function wrapRouterGrpcFunction(fun, routerType) {
|
|
|
105
98
|
}
|
|
106
99
|
}
|
|
107
100
|
catch (e) {
|
|
108
|
-
(_b = grpc_sdk_1.default.Metrics) === null || _b === void 0 ? void 0 : _b.increment(
|
|
101
|
+
(_b = grpc_sdk_1.default.Metrics) === null || _b === void 0 ? void 0 : _b.increment(`${routerType}_grpc_errors_total`);
|
|
109
102
|
generateLog(routerType, routerRequest, requestReceive, call, grpc_js_1.status.INTERNAL);
|
|
110
103
|
grpc_sdk_1.default.Logger.error((_c = e.message) !== null && _c !== void 0 ? _c : 'Something went wrong');
|
|
111
104
|
return callback({
|
|
@@ -113,21 +106,19 @@ function wrapRouterGrpcFunction(fun, routerType) {
|
|
|
113
106
|
message: (_d = e.message) !== null && _d !== void 0 ? _d : 'Something went wrong',
|
|
114
107
|
});
|
|
115
108
|
}
|
|
116
|
-
|
|
117
|
-
fun(call,
|
|
109
|
+
const responded = { did: false };
|
|
110
|
+
fun(call, r => {
|
|
118
111
|
parseResponseData(r, routerRequest, requestReceive, call, callback, responded, routerType);
|
|
119
112
|
})
|
|
120
|
-
.then(
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
var _a, _b, _c, _d, _e;
|
|
125
|
-
(_a = grpc_sdk_1.default.Metrics) === null || _a === void 0 ? void 0 : _a.increment("".concat(routerType, "_grpc_errors_total"));
|
|
113
|
+
.then(r => parseResponseData(r, routerRequest, requestReceive, call, callback, responded, routerType))
|
|
114
|
+
.catch(error => {
|
|
115
|
+
var _a, _b, _c, _d, _e, _f;
|
|
116
|
+
(_a = grpc_sdk_1.default.Metrics) === null || _a === void 0 ? void 0 : _a.increment(`${routerType}_grpc_errors_total`);
|
|
126
117
|
generateLog(routerType, routerRequest, requestReceive, call, (_b = error.code) !== null && _b !== void 0 ? _b : grpc_js_1.status.INTERNAL);
|
|
127
118
|
grpc_sdk_1.default.Logger.error((_c = error.message) !== null && _c !== void 0 ? _c : 'Something went wrong');
|
|
128
119
|
callback({
|
|
129
120
|
code: (_d = error.code) !== null && _d !== void 0 ? _d : grpc_js_1.status.INTERNAL,
|
|
130
|
-
message: (_e = error.
|
|
121
|
+
message: (_f = (_e = error.details) !== null && _e !== void 0 ? _e : error.message) !== null && _f !== void 0 ? _f : 'Something went wrong',
|
|
131
122
|
});
|
|
132
123
|
});
|
|
133
124
|
};
|
|
@@ -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,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.convictConfigParser = void 0;
|
|
4
|
-
|
|
4
|
+
const convictConfigParser = (config) => {
|
|
5
5
|
if (typeof config === 'object') {
|
|
6
|
-
Object.keys(config).forEach(
|
|
6
|
+
Object.keys(config).forEach(key => {
|
|
7
7
|
if (key === '_cvtProperties') {
|
|
8
8
|
config = (0, exports.convictConfigParser)(config._cvtProperties);
|
|
9
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convictConfigParser.js","sourceRoot":"","sources":["../../src/utilities/convictConfigParser.ts"],"names":[],"mappings":";;;AAEO,
|
|
1
|
+
{"version":3,"file":"convictConfigParser.js","sourceRoot":"","sources":["../../src/utilities/convictConfigParser.ts"],"names":[],"mappings":";;;AAEO,MAAM,mBAAmB,GAAG,CAAC,MAAiB,EAAE,EAAE;IACvD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAChC,IAAI,GAAG,KAAK,gBAAgB,EAAE;gBAC5B,MAAM,GAAG,IAAA,2BAAmB,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC;aACrD;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,GAAG,IAAA,2BAAmB,EAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;aAChD;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAXW,QAAA,mBAAmB,uBAW9B"}
|
|
@@ -27,16 +27,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports.initializeSdk = void 0;
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
if (serviceHealthStatusGetter === void 0) { serviceHealthStatusGetter = function () { return grpc_sdk_1.HealthCheckStatus.SERVING; }; }
|
|
39
|
-
var logger;
|
|
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) => {
|
|
37
|
+
let logger;
|
|
40
38
|
try {
|
|
41
39
|
logger = new logging_1.ConduitLogger([
|
|
42
40
|
new winston_1.default.transports.File({
|
|
@@ -52,7 +50,7 @@ var initializeSdk = function (coreUrl, moduleName, watchModules, serviceHealthSt
|
|
|
52
50
|
catch (e) {
|
|
53
51
|
logger = new logging_1.ConduitLogger();
|
|
54
52
|
}
|
|
55
|
-
|
|
53
|
+
const grpcSdk = new grpc_sdk_1.default(coreUrl, moduleName, watchModules, logger, serviceHealthStatusGetter);
|
|
56
54
|
(0, logging_1.setupLoki)(grpcSdk.name, grpcSdk.instance).then();
|
|
57
55
|
if (process.env.METRICS_PORT) {
|
|
58
56
|
grpc_sdk_1.default.Metrics = new metrics_1.ConduitMetrics(grpcSdk.name, grpcSdk.instance);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initializeSdk.js","sourceRoot":"","sources":["../../src/utilities/initializeSdk.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"initializeSdk.js","sourceRoot":"","sources":["../../src/utilities/initializeSdk.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAGmC;AACnC,wCAAsD;AACtD,sDAA8B;AAC9B,gDAAwB;AACxB,wCAA4C;AAC5C,kEAA+D;AAExD,MAAM,aAAa,GAAG,CAC3B,OAAe,EACf,UAAkB,EAClB,eAAwB,IAAI,EAC5B,4BAAqD,GAAG,EAAE,CAAC,4BAAiB,CAAC,OAAO,EACpF,EAAE;IACF,IAAI,MAAsB,CAAC;IAC3B,IAAI;QACF,MAAM,GAAG,IAAI,uBAAa,CAAC;YACzB,IAAI,iBAAO,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1B,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC;gBACpD,KAAK,EAAE,MAAM;aACd,CAAC;YACF,IAAI,iBAAO,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1B,QAAQ,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC;gBAClD,KAAK,EAAE,OAAO;aACf,CAAC;SACH,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,GAAG,IAAI,uBAAa,EAAE,CAAC;KAC9B;IACD,MAAM,OAAO,GAAG,IAAI,kBAAc,CAChC,OAAO,EACP,UAAU,EACV,YAAY,EACZ,MAAM,EACN,yBAAyB,CAC1B,CAAC;IACF,IAAA,mBAAS,EAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;IACjD,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;QAC5B,kBAAc,CAAC,OAAO,GAAG,IAAI,wBAAc,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5E,OAAO,CAAC,aAAa,CAAC,IAAA,mCAAgB,GAAE,CAAC,CAAC;KAC3C;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAlCW,QAAA,aAAa,iBAkCxB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export declare function linearBackoffTimeout(onTry: (
|
|
1
|
+
export declare function linearBackoffTimeout(onTry: (stop: () => void) => void, delay: number, reps?: number, onFailure?: () => void): {
|
|
2
2
|
clear: () => void;
|
|
3
3
|
};
|
|
4
4
|
/**
|
|
@@ -1,40 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (_) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
3
|
exports.linearBackoffTimeoutAsync = exports.linearBackoffTimeout = void 0;
|
|
40
4
|
/**
|
|
@@ -42,28 +6,31 @@ exports.linearBackoffTimeoutAsync = exports.linearBackoffTimeout = void 0;
|
|
|
42
6
|
* onFailure() only runs on rep exhaustion.
|
|
43
7
|
* Timeout can be cleared through returned clear() or inside onTry().
|
|
44
8
|
*/
|
|
45
|
-
|
|
9
|
+
const timers_1 = require("timers");
|
|
46
10
|
function linearBackoffTimeout(onTry, delay, reps, onFailure) {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
11
|
+
const nextRep = () => reps === undefined || --reps > 0;
|
|
12
|
+
let stopSignal = false;
|
|
13
|
+
const stop = () => {
|
|
14
|
+
stopSignal = true;
|
|
15
|
+
};
|
|
16
|
+
let timeout;
|
|
17
|
+
const invoker = async () => {
|
|
18
|
+
if (stopSignal) {
|
|
19
|
+
return timeout ? (0, timers_1.clearTimeout)(timeout) : null;
|
|
20
|
+
}
|
|
21
|
+
delay = Math.floor(delay * 2);
|
|
22
|
+
if (delay > 0 && nextRep()) {
|
|
23
|
+
timeout = setTimeout(invoker, delay);
|
|
24
|
+
onTry(stop);
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
timeout = null;
|
|
28
|
+
onFailure && onFailure();
|
|
29
|
+
}
|
|
30
|
+
};
|
|
64
31
|
timeout = setTimeout(invoker, delay);
|
|
65
32
|
return {
|
|
66
|
-
clear:
|
|
33
|
+
clear: () => {
|
|
67
34
|
if (timeout) {
|
|
68
35
|
(0, timers_1.clearTimeout)(timeout);
|
|
69
36
|
timeout = null;
|
|
@@ -77,43 +44,19 @@ exports.linearBackoffTimeout = linearBackoffTimeout;
|
|
|
77
44
|
* onFailure() only runs on rep exhaustion.
|
|
78
45
|
* @param {() => Promise<boolean>} onTry - Async handler, returns 'continue' boolean flag
|
|
79
46
|
*/
|
|
80
|
-
function linearBackoffTimeoutAsync(onTry, delay, reps, onFailure, startNow) {
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
if (!(delay > 0 && nextRep())) return [3 /*break*/, 2];
|
|
94
|
-
return [4 /*yield*/, onTry()];
|
|
95
|
-
case 1:
|
|
96
|
-
if (_b.sent())
|
|
97
|
-
setTimeout(invoker, delay);
|
|
98
|
-
return [3 /*break*/, 5];
|
|
99
|
-
case 2:
|
|
100
|
-
_a = onFailure;
|
|
101
|
-
if (!_a) return [3 /*break*/, 4];
|
|
102
|
-
return [4 /*yield*/, onFailure()];
|
|
103
|
-
case 3:
|
|
104
|
-
_a = (_b.sent());
|
|
105
|
-
_b.label = 4;
|
|
106
|
-
case 4:
|
|
107
|
-
_a;
|
|
108
|
-
_b.label = 5;
|
|
109
|
-
case 5: return [2 /*return*/];
|
|
110
|
-
}
|
|
111
|
-
});
|
|
112
|
-
}); };
|
|
113
|
-
setTimeout(invoker, startNow ? 0 : delay);
|
|
114
|
-
return [2 /*return*/];
|
|
115
|
-
});
|
|
116
|
-
});
|
|
47
|
+
async function linearBackoffTimeoutAsync(onTry, delay, reps, onFailure, startNow = false) {
|
|
48
|
+
const nextRep = () => reps === undefined || --reps > 0;
|
|
49
|
+
const invoker = async () => {
|
|
50
|
+
delay = Math.floor(delay * 2);
|
|
51
|
+
if (delay > 0 && nextRep()) {
|
|
52
|
+
if (await onTry())
|
|
53
|
+
setTimeout(invoker, delay);
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
onFailure && (await onFailure());
|
|
57
|
+
}
|
|
58
|
+
};
|
|
59
|
+
setTimeout(invoker, startNow ? 0 : delay);
|
|
117
60
|
}
|
|
118
61
|
exports.linearBackoffTimeoutAsync = linearBackoffTimeoutAsync;
|
|
119
62
|
//# 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,mCAAsC;AAEtC,SAAgB,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;YACd,OAAO,OAAO,CAAC,CAAC,CAAC,IAAA,qBAAY,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;SAC/C;QACD,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;QAC9B,IAAI,KAAK,GAAG,CAAC,IAAI,OAAO,EAAE,EAAE;YAC1B,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YACrC,KAAK,CAAC,IAAI,CAAC,CAAC;SACb;aAAM;YACL,OAAO,GAAG,IAAI,CAAC;YACf,SAAS,IAAI,SAAS,EAAE,CAAC;SAC1B;IACH,CAAC,CAAC;IACF,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IACrC,OAAO;QACL,KAAK,EAAE,GAAG,EAAE;YACV,IAAI,OAAO,EAAE;gBACX,IAAA,qBAAY,EAAC,OAAO,CAAC,CAAC;gBACtB,OAAO,GAAG,IAAI,CAAC;aAChB;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAlCD,oDAkCC;AAED;;;;GAIG;AACI,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;YAC1B,IAAI,MAAM,KAAK,EAAE;gBAAE,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;SAC/C;aAAM;YACL,SAAS,IAAI,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC;SAClC;IACH,CAAC,CAAC;IACF,UAAU,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC;AAjBD,8DAiBC"}
|
package/dist/utilities/merge.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.merge = void 0;
|
|
4
|
-
|
|
4
|
+
const lodash_1 = require("lodash");
|
|
5
5
|
function merge(objA, objB) {
|
|
6
|
-
|
|
6
|
+
const customizer = (objValue, srcValue) => {
|
|
7
7
|
if (Array.isArray(objValue)) {
|
|
8
8
|
// don't merge arrays
|
|
9
9
|
return srcValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/utilities/merge.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/utilities/merge.ts"],"names":[],"mappings":";;;AAAA,mCAAiD;AAEjD,SAAgB,KAAK,CAAmB,IAAO,EAAE,IAAO;IACtD,MAAM,UAAU,GAAG,CAAC,QAAiB,EAAE,QAAiB,EAAE,EAAE;QAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC3B,qBAAqB;YACrB,OAAO,QAAQ,CAAC;SACjB;IACH,CAAC,CAAC;IACF,OAAO,IAAA,kBAAU,EAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;AAChD,CAAC;AARD,sBAQC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@conduitplatform/module-tools",
|
|
3
|
-
"version": "0.16.0-
|
|
3
|
+
"version": "0.16.0-rc.0",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"engines": {
|
|
@@ -13,17 +13,17 @@
|
|
|
13
13
|
},
|
|
14
14
|
"license": "MIT",
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@grpc/grpc-js": "^1.
|
|
17
|
-
"@grpc/proto-loader": "^0.6
|
|
18
|
-
"abort-controller-x": "^0.4.
|
|
19
|
-
"convict": "^6.2.
|
|
20
|
-
"express": "^4.18.
|
|
21
|
-
"fast-jwt": "^
|
|
16
|
+
"@grpc/grpc-js": "^1.9.7",
|
|
17
|
+
"@grpc/proto-loader": "^0.7.6",
|
|
18
|
+
"abort-controller-x": "^0.4.1",
|
|
19
|
+
"convict": "^6.2.4",
|
|
20
|
+
"express": "^4.18.2",
|
|
21
|
+
"fast-jwt": "^3.3.2",
|
|
22
22
|
"lodash": "^4.17.21",
|
|
23
|
-
"prom-client": "^
|
|
24
|
-
"protobufjs": "^
|
|
25
|
-
"winston": "^3.8.
|
|
26
|
-
"winston-loki": "^6.0.
|
|
23
|
+
"prom-client": "^15.0.0",
|
|
24
|
+
"protobufjs": "^7.2.3",
|
|
25
|
+
"winston": "^3.8.2",
|
|
26
|
+
"winston-loki": "^6.0.7"
|
|
27
27
|
},
|
|
28
28
|
"directories": {
|
|
29
29
|
"lib": "dist",
|
|
@@ -39,17 +39,16 @@
|
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
41
|
"@conduitplatform/grpc-sdk": "*",
|
|
42
|
-
"@types/convict": "^6.1.
|
|
43
|
-
"@types/express": "^4.17.
|
|
44
|
-
"@types/fs-extra": "^
|
|
42
|
+
"@types/convict": "^6.1.6",
|
|
43
|
+
"@types/express": "^4.17.17",
|
|
44
|
+
"@types/fs-extra": "^11.0.2",
|
|
45
45
|
"@types/google-protobuf": "^3.15.6",
|
|
46
|
-
"@types/
|
|
47
|
-
"@types/
|
|
48
|
-
"@types/node": "14.14.31",
|
|
46
|
+
"@types/lodash": "^4.14.200",
|
|
47
|
+
"@types/node": "20.8.10",
|
|
49
48
|
"copyfiles": "^2.4.1",
|
|
50
|
-
"rimraf": "^
|
|
51
|
-
"ts-proto": "^1.
|
|
52
|
-
"typescript": "~
|
|
49
|
+
"rimraf": "^5.0.5",
|
|
50
|
+
"ts-proto": "^1.160.0",
|
|
51
|
+
"typescript": "~5.0.4"
|
|
53
52
|
},
|
|
54
53
|
"peerDependencies": {
|
|
55
54
|
"@conduitplatform/grpc-sdk": "*",
|