@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
package/dist/classes/index.js
CHANGED
|
@@ -1,21 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
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("./ConduitActiveSchema"), exports);
|
|
18
|
-
__exportStar(require("./GrpcServer"), exports);
|
|
19
|
-
__exportStar(require("./ConduitServiceModule"), exports);
|
|
20
|
-
__exportStar(require("./ConfigController"), exports);
|
|
1
|
+
export * from './ConduitActiveSchema.js';
|
|
2
|
+
export * from './GrpcServer.js';
|
|
3
|
+
export * from './ConduitServiceModule.js';
|
|
4
|
+
export * from './ConfigController.js';
|
|
21
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
const
|
|
5
|
-
const protoLoader = require('@grpc/proto-loader');
|
|
6
|
-
function createServer(port) {
|
|
7
|
-
const grpcServer = new grpc_js_1.Server({
|
|
1
|
+
import { loadPackageDefinition, Server, ServerCredentials, } from '@grpc/grpc-js';
|
|
2
|
+
import protoLoader from '@grpc/proto-loader';
|
|
3
|
+
export function createServer(port) {
|
|
4
|
+
const grpcServer = new Server({
|
|
8
5
|
'grpc.max_receive_message_length': 1024 * 1024 * 100,
|
|
9
6
|
'grpc.max_send_message_length': 1024 * 1024 * 100,
|
|
10
7
|
});
|
|
11
8
|
return new Promise((resolve, reject) => {
|
|
12
|
-
grpcServer.bindAsync(port,
|
|
9
|
+
grpcServer.bindAsync(port, ServerCredentials.createInsecure(), (err, port) => {
|
|
13
10
|
if (err) {
|
|
14
11
|
reject(err);
|
|
15
12
|
}
|
|
@@ -22,8 +19,7 @@ function createServer(port) {
|
|
|
22
19
|
});
|
|
23
20
|
});
|
|
24
21
|
}
|
|
25
|
-
|
|
26
|
-
function addServiceToServer(server, protoPath, descriptorObject, functions) {
|
|
22
|
+
export function addServiceToServer(server, protoPath, descriptorObject, functions) {
|
|
27
23
|
const packageDefinition = protoLoader.loadSync(protoPath, {
|
|
28
24
|
keepCase: true,
|
|
29
25
|
longs: String,
|
|
@@ -31,7 +27,7 @@ function addServiceToServer(server, protoPath, descriptorObject, functions) {
|
|
|
31
27
|
defaults: true,
|
|
32
28
|
oneofs: true,
|
|
33
29
|
});
|
|
34
|
-
const protoDescriptor =
|
|
30
|
+
const protoDescriptor = loadPackageDefinition(packageDefinition);
|
|
35
31
|
const objs = descriptorObject.split('.');
|
|
36
32
|
let descObj = protoDescriptor;
|
|
37
33
|
objs.forEach((r) => {
|
|
@@ -39,5 +35,4 @@ function addServiceToServer(server, protoPath, descriptorObject, functions) {
|
|
|
39
35
|
});
|
|
40
36
|
server.addService(descObj.service, functions);
|
|
41
37
|
}
|
|
42
|
-
exports.addServiceToServer = addServiceToServer;
|
|
43
38
|
//# sourceMappingURL=GrpcHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GrpcHelper.js","sourceRoot":"","sources":["../../src/helpers/GrpcHelper.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GrpcHelper.js","sourceRoot":"","sources":["../../src/helpers/GrpcHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,MAAM,EACN,iBAAiB,GAElB,MAAM,eAAe,CAAC;AAEvB,OAAO,WAAW,MAAM,oBAAoB,CAAC;AAE7C,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,MAAM,UAAU,GAAW,IAAI,MAAM,CAAC;QACpC,iCAAiC,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;QACpD,8BAA8B,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;KAClD,CAAC,CAAC;IACH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,iBAAiB,CAAC,cAAc,EAAE,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC3E,IAAI,GAAG,EAAE,CAAC;gBACR,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC;oBACN,MAAM,EAAE,UAAU;oBAClB,IAAI;iBACL,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,MAAc,EACd,SAAiB,EACjB,gBAAwB,EACxB,SAAuC;IAEvC,MAAM,iBAAiB,GAAG,WAAW,CAAC,QAAQ,CAAC,SAAS,EAAE;QACxD,QAAQ,EAAE,IAAI;QACd,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,OAAO,GAAQ,eAAe,CAAC;IACnC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;QACzB,OAAO,GAAG,OAAO,CAAC,CAAC,CAAQ,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,EAAE,SAAyC,CAAC,CAAC;AAChF,CAAC"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.createParsedRouterRequest = void 0;
|
|
4
|
-
function createParsedRouterRequest(params, urlParams, queryParams, bodyParams, path, headers, context, cookies) {
|
|
1
|
+
export function createParsedRouterRequest(params, urlParams, queryParams, bodyParams, path, headers, context, cookies) {
|
|
5
2
|
return {
|
|
6
3
|
request: {
|
|
7
4
|
params,
|
|
@@ -15,5 +12,4 @@ function createParsedRouterRequest(params, urlParams, queryParams, bodyParams, p
|
|
|
15
12
|
},
|
|
16
13
|
};
|
|
17
14
|
}
|
|
18
|
-
exports.createParsedRouterRequest = createParsedRouterRequest;
|
|
19
15
|
//# sourceMappingURL=GrpcToParsedRouterRequest.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GrpcToParsedRouterRequest.js","sourceRoot":"","sources":["../../src/helpers/GrpcToParsedRouterRequest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"GrpcToParsedRouterRequest.js","sourceRoot":"","sources":["../../src/helpers/GrpcToParsedRouterRequest.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,yBAAyB,CACvC,MAAc,EACd,SAAkB,EAClB,WAAoB,EACpB,UAAmB,EACnB,IAAa,EACb,OAAiB,EACjB,OAAiB,EACjB,OAAiB;IAEjB,OAA4B;QAC1B,OAAO,EAAE;YACP,MAAM;YACN,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,EAAE;YAC1B,WAAW,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE;YAC9B,UAAU,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,EAAE;YAC5B,IAAI,EAAE,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,EAAE;YAChB,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE;YACtB,OAAO,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE;SACvB;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1,82 +1,79 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ConduitRelation = exports.ConduitJson = exports.ConduitObjectId = exports.ConduitDate = exports.ConduitBoolean = exports.ConduitNumber = exports.ConduitString = void 0;
|
|
4
|
-
const grpc_sdk_1 = require("@conduitplatform/grpc-sdk");
|
|
1
|
+
import { TYPE } from '@conduitplatform/grpc-sdk';
|
|
5
2
|
class ConduitStringConstructor {
|
|
6
3
|
// private to disallow creating other instances of this type
|
|
7
4
|
constructor() { }
|
|
8
5
|
static get Optional() {
|
|
9
|
-
return
|
|
6
|
+
return TYPE.String;
|
|
10
7
|
}
|
|
11
8
|
static get Required() {
|
|
12
|
-
return { type:
|
|
9
|
+
return { type: TYPE.String, required: true };
|
|
13
10
|
}
|
|
14
11
|
}
|
|
15
|
-
|
|
12
|
+
export const ConduitString = ConduitStringConstructor;
|
|
16
13
|
class ConduitNumberConstructor {
|
|
17
14
|
// private to disallow creating other instances of this type
|
|
18
15
|
constructor() { }
|
|
19
16
|
static get Optional() {
|
|
20
|
-
return
|
|
17
|
+
return TYPE.Number;
|
|
21
18
|
}
|
|
22
19
|
static get Required() {
|
|
23
|
-
return { type:
|
|
20
|
+
return { type: TYPE.Number, required: true };
|
|
24
21
|
}
|
|
25
22
|
}
|
|
26
|
-
|
|
23
|
+
export const ConduitNumber = ConduitNumberConstructor;
|
|
27
24
|
class ConduitBooleanConstructor {
|
|
28
25
|
// private to disallow creating other instances of this type
|
|
29
26
|
constructor() { }
|
|
30
27
|
static get Optional() {
|
|
31
|
-
return
|
|
28
|
+
return TYPE.Boolean;
|
|
32
29
|
}
|
|
33
30
|
static get Required() {
|
|
34
|
-
return { type:
|
|
31
|
+
return { type: TYPE.Boolean, required: true };
|
|
35
32
|
}
|
|
36
33
|
}
|
|
37
|
-
|
|
34
|
+
export const ConduitBoolean = ConduitBooleanConstructor;
|
|
38
35
|
class ConduitDateConstructor {
|
|
39
36
|
// private to disallow creating other instances of this type
|
|
40
37
|
constructor() { }
|
|
41
38
|
static get Optional() {
|
|
42
|
-
return
|
|
39
|
+
return TYPE.Date;
|
|
43
40
|
}
|
|
44
41
|
static get Required() {
|
|
45
|
-
return { type:
|
|
42
|
+
return { type: TYPE.Date, required: true };
|
|
46
43
|
}
|
|
47
44
|
}
|
|
48
|
-
|
|
45
|
+
export const ConduitDate = ConduitDateConstructor;
|
|
49
46
|
class ConduitObjectIdConstructor {
|
|
50
47
|
// private to disallow creating other instances of this type
|
|
51
48
|
constructor() { }
|
|
52
49
|
static get Optional() {
|
|
53
|
-
return
|
|
50
|
+
return TYPE.ObjectId;
|
|
54
51
|
}
|
|
55
52
|
static get Required() {
|
|
56
|
-
return { type:
|
|
53
|
+
return { type: TYPE.ObjectId, required: true };
|
|
57
54
|
}
|
|
58
55
|
}
|
|
59
|
-
|
|
56
|
+
export const ConduitObjectId = ConduitObjectIdConstructor;
|
|
60
57
|
class ConduitJSONConstructor {
|
|
61
58
|
// private to disallow creating other instances of this type
|
|
62
59
|
constructor() { }
|
|
63
60
|
static get Optional() {
|
|
64
|
-
return
|
|
61
|
+
return TYPE.JSON;
|
|
65
62
|
}
|
|
66
63
|
static get Required() {
|
|
67
|
-
return { type:
|
|
64
|
+
return { type: TYPE.JSON, required: true };
|
|
68
65
|
}
|
|
69
66
|
}
|
|
70
|
-
|
|
67
|
+
export const ConduitJson = ConduitJSONConstructor;
|
|
71
68
|
class ConduitRelationConstructor {
|
|
72
69
|
// private to disallow creating other instances of this type
|
|
73
70
|
constructor() { }
|
|
74
71
|
static Optional(model) {
|
|
75
|
-
return { type:
|
|
72
|
+
return { type: TYPE.Relation, model, required: false };
|
|
76
73
|
}
|
|
77
74
|
static Required(model) {
|
|
78
|
-
return { type:
|
|
75
|
+
return { type: TYPE.Relation, model, required: true };
|
|
79
76
|
}
|
|
80
77
|
}
|
|
81
|
-
|
|
78
|
+
export const ConduitRelation = ConduitRelationConstructor;
|
|
82
79
|
//# sourceMappingURL=TypeHelpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeHelpers.js","sourceRoot":"","sources":["../../src/helpers/TypeHelpers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TypeHelpers.js","sourceRoot":"","sources":["../../src/helpers/TypeHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,MAAM,wBAAwB;IAC5B,4DAA4D;IAC5D,gBAAuB,CAAC;IAExB,MAAM,KAAK,QAAQ;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,wBAAwB,CAAC;AAEtD,MAAM,wBAAwB;IAC5B,4DAA4D;IAC5D,gBAAuB,CAAC;IAExB,MAAM,KAAK,QAAQ;QACjB,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;CACF;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,wBAAwB,CAAC;AAEtD,MAAM,yBAAyB;IAC7B,4DAA4D;IAC5D,gBAAuB,CAAC;IAExB,MAAM,KAAK,QAAQ;QACjB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAChD,CAAC;CACF;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,yBAAyB,CAAC;AAExD,MAAM,sBAAsB;IAC1B,4DAA4D;IAC5D,gBAAuB,CAAC;IAExB,MAAM,KAAK,QAAQ;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7C,CAAC;CACF;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,sBAAsB,CAAC;AAElD,MAAM,0BAA0B;IAC9B,4DAA4D;IAC5D,gBAAuB,CAAC;IAExB,MAAM,KAAK,QAAQ;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjD,CAAC;CACF;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,0BAA0B,CAAC;AAE1D,MAAM,sBAAsB;IAC1B,4DAA4D;IAC5D,gBAAuB,CAAC;IAExB,MAAM,KAAK,QAAQ;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC7C,CAAC;CACF;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,sBAAsB,CAAC;AAElD,MAAM,0BAA0B;IAC9B,4DAA4D;IAC5D,gBAAuB,CAAC;IAExB,MAAM,CAAC,QAAQ,CAAC,KAAa;QAK3B,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;IACzD,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,KAAa;QAC3B,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACxD,CAAC;CACF;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,0BAA0B,CAAC"}
|
package/dist/helpers/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export * from './TypeHelpers';
|
|
2
|
-
export * from './GrpcHelper';
|
|
3
|
-
export * from './wrapGrpcFunctions';
|
|
4
|
-
export * from './GrpcToParsedRouterRequest';
|
|
1
|
+
export * from './TypeHelpers.js';
|
|
2
|
+
export * from './GrpcHelper.js';
|
|
3
|
+
export * from './wrapGrpcFunctions.js';
|
|
4
|
+
export * from './GrpcToParsedRouterRequest.js';
|
package/dist/helpers/index.js
CHANGED
|
@@ -1,21 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
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("./TypeHelpers"), exports);
|
|
18
|
-
__exportStar(require("./GrpcHelper"), exports);
|
|
19
|
-
__exportStar(require("./wrapGrpcFunctions"), exports);
|
|
20
|
-
__exportStar(require("./GrpcToParsedRouterRequest"), exports);
|
|
1
|
+
export * from './TypeHelpers.js';
|
|
2
|
+
export * from './GrpcHelper.js';
|
|
3
|
+
export * from './wrapGrpcFunctions.js';
|
|
4
|
+
export * from './GrpcToParsedRouterRequest.js';
|
|
21
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/helpers/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gCAAgC,CAAC"}
|
|
@@ -1,32 +1,26 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.wrapGrpcFunctions = void 0;
|
|
7
|
-
const fast_jwt_1 = require("fast-jwt");
|
|
8
|
-
const grpc_js_1 = require("@grpc/grpc-js");
|
|
9
|
-
const grpc_sdk_1 = __importDefault(require("@conduitplatform/grpc-sdk"));
|
|
10
|
-
function wrapGrpcFunctions(functions, postponeRestart) {
|
|
1
|
+
import { createVerifier } from 'fast-jwt';
|
|
2
|
+
import { status } from '@grpc/grpc-js';
|
|
3
|
+
import ConduitGrpcSdk from '@conduitplatform/grpc-sdk';
|
|
4
|
+
export function wrapGrpcFunctions(functions, postponeRestart) {
|
|
11
5
|
const grpcKey = process.env.GRPC_KEY;
|
|
12
6
|
const wrappedFunctions = {};
|
|
13
7
|
Object.keys(functions).forEach(name => {
|
|
14
8
|
wrappedFunctions[name] = (call, callback) => {
|
|
15
9
|
var _a;
|
|
16
|
-
(_a =
|
|
10
|
+
(_a = ConduitGrpcSdk.Metrics) === null || _a === void 0 ? void 0 : _a.increment('internal_grpc_requests_total');
|
|
17
11
|
postponeRestart();
|
|
18
12
|
if (grpcKey) {
|
|
19
|
-
const verify =
|
|
13
|
+
const verify = createVerifier({ key: grpcKey });
|
|
20
14
|
const grpcToken = call.metadata.get('grpc-token')[0];
|
|
21
15
|
if (!grpcToken) {
|
|
22
|
-
return throwError(callback, 'No gRPC protection token provided',
|
|
16
|
+
return throwError(callback, 'No gRPC protection token provided', status.PERMISSION_DENIED);
|
|
23
17
|
}
|
|
24
18
|
try {
|
|
25
19
|
const jwt = verify(grpcToken);
|
|
26
20
|
call.metadata.set('module-name', jwt.moduleName);
|
|
27
21
|
}
|
|
28
22
|
catch (_b) {
|
|
29
|
-
return throwError(callback, 'Failed to verify gRPC protection token. GRPC_KEY value differs',
|
|
23
|
+
return throwError(callback, 'Failed to verify gRPC protection token. GRPC_KEY value differs', status.PERMISSION_DENIED);
|
|
30
24
|
}
|
|
31
25
|
}
|
|
32
26
|
let invoked;
|
|
@@ -45,8 +39,7 @@ function wrapGrpcFunctions(functions, postponeRestart) {
|
|
|
45
39
|
});
|
|
46
40
|
return wrappedFunctions;
|
|
47
41
|
}
|
|
48
|
-
|
|
49
|
-
function throwError(callback, message, code = grpc_js_1.status.INTERNAL) {
|
|
42
|
+
function throwError(callback, message, code = status.INTERNAL) {
|
|
50
43
|
// Aborting server streams is not yet implemented!
|
|
51
44
|
if (callback) {
|
|
52
45
|
callback({ code, message });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wrapGrpcFunctions.js","sourceRoot":"","sources":["../../src/helpers/wrapGrpcFunctions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wrapGrpcFunctions.js","sourceRoot":"","sources":["../../src/helpers/wrapGrpcFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,cAAgC,MAAM,2BAA2B,CAAC;AAOzE,MAAM,UAAU,iBAAiB,CAC/B,SAAuC,EACvC,eAA2B;IAE3B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACrC,MAAM,gBAAgB,GAAiC,EAAE,CAAC;IAC1D,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACpC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAS,EAAE,QAAa,EAAE,EAAE;;YACpD,MAAA,cAAc,CAAC,OAAO,0CAAE,SAAS,CAAC,8BAA8B,CAAC,CAAC;YAClE,eAAe,EAAE,CAAC;YAClB,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;gBAChD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;gBACrD,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,OAAO,UAAU,CACf,QAAQ,EACR,mCAAmC,EACnC,MAAM,CAAC,iBAAiB,CACzB,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,GAAG,GAAQ,MAAM,CAAC,SAAS,CAAC,CAAC;oBACnC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC;gBACnD,CAAC;gBAAC,WAAM,CAAC;oBACP,OAAO,UAAU,CACf,QAAQ,EACR,gEAAgE,EAChE,MAAM,CAAC,iBAAiB,CACzB,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,IAAI,OAA2B,CAAC;YAChC,IAAI,CAAC;gBACH,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YAC5C,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,UAAU,CAAC,QAAQ,EAAG,KAAe,CAAC,OAAO,CAAC,CAAC;YACxD,CAAC;YACD,IAAI,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAA,KAAK,UAAU,EAAE,CAAC;gBACxC,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;oBACpC,OAAO,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,UAAU,CACjB,QAAuC,EACvC,OAAe,EACf,OAAe,MAAM,CAAC,QAAQ;IAE9B,kDAAkD;IAClD,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9B,CAAC;AACH,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export * from './ManagedModule';
|
|
2
|
-
export * from './interfaces';
|
|
3
|
-
export * from './classes';
|
|
4
|
-
export * from './helpers';
|
|
5
|
-
export * from './routing';
|
|
6
|
-
export * from './utilities';
|
|
1
|
+
export * from './ManagedModule.js';
|
|
2
|
+
export * from './interfaces/index.js';
|
|
3
|
+
export * from './classes/index.js';
|
|
4
|
+
export * from './helpers/index.js';
|
|
5
|
+
export * from './routing/index.js';
|
|
6
|
+
export * from './utilities/index.js';
|
package/dist/index.js
CHANGED
|
@@ -1,23 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
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("./ManagedModule"), exports);
|
|
18
|
-
__exportStar(require("./interfaces"), exports);
|
|
19
|
-
__exportStar(require("./classes"), exports);
|
|
20
|
-
__exportStar(require("./helpers"), exports);
|
|
21
|
-
__exportStar(require("./routing"), exports);
|
|
22
|
-
__exportStar(require("./utilities"), exports);
|
|
1
|
+
export * from './ManagedModule.js';
|
|
2
|
+
export * from './interfaces/index.js';
|
|
3
|
+
export * from './classes/index.js';
|
|
4
|
+
export * from './helpers/index.js';
|
|
5
|
+
export * from './routing/index.js';
|
|
6
|
+
export * from './utilities/index.js';
|
|
23
7
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC"}
|
|
@@ -1,12 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ModuleLifecycleStage = void 0;
|
|
4
|
-
var ModuleLifecycleStage;
|
|
1
|
+
export var ModuleLifecycleStage;
|
|
5
2
|
(function (ModuleLifecycleStage) {
|
|
6
3
|
ModuleLifecycleStage["CREATE_GRPC"] = "creat-grpc-server";
|
|
7
4
|
ModuleLifecycleStage["PRE_SERVER_START"] = "pre-grpc-start";
|
|
8
5
|
ModuleLifecycleStage["SERVER_STARTED"] = "grpc-server-started";
|
|
9
6
|
ModuleLifecycleStage["PRE_REGISTER"] = "pre-register";
|
|
10
7
|
ModuleLifecycleStage["POST_REGISTER"] = "post-register";
|
|
11
|
-
})(ModuleLifecycleStage
|
|
8
|
+
})(ModuleLifecycleStage || (ModuleLifecycleStage = {}));
|
|
12
9
|
//# sourceMappingURL=ModuleLifecycleStage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModuleLifecycleStage.js","sourceRoot":"","sources":["../../src/interfaces/ModuleLifecycleStage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ModuleLifecycleStage.js","sourceRoot":"","sources":["../../src/interfaces/ModuleLifecycleStage.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,oBAMX;AAND,WAAY,oBAAoB;IAC9B,yDAAiC,CAAA;IACjC,2DAAmC,CAAA;IACnC,8DAAsC,CAAA;IACtC,qDAA6B,CAAA;IAC7B,uDAA+B,CAAA;AACjC,CAAC,EANW,oBAAoB,KAApB,oBAAoB,QAM/B"}
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export * from './ConduitService';
|
|
1
|
+
export * from './ConduitService.js';
|
|
2
|
+
export * from './ModuleLifecycleStage.js';
|
package/dist/interfaces/index.js
CHANGED
|
@@ -1,18 +1,3 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
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("./ConduitService"), exports);
|
|
1
|
+
export * from './ConduitService.js';
|
|
2
|
+
export * from './ModuleLifecycleStage.js';
|
|
18
3
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,2BAA2B,CAAC"}
|
package/dist/logging/index.js
CHANGED
|
@@ -1,38 +1,9 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
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 __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.setupLoki = exports.ConduitLogger = void 0;
|
|
30
|
-
const grpc_sdk_1 = __importDefault(require("@conduitplatform/grpc-sdk"));
|
|
31
|
-
const winston_1 = __importStar(require("winston"));
|
|
32
|
-
const lodash_1 = require("lodash");
|
|
33
|
-
const http_1 = require("http");
|
|
34
|
-
const winston_loki_1 = __importDefault(require("winston-loki"));
|
|
35
|
-
const utilities_1 = require("../utilities");
|
|
1
|
+
import ConduitGrpcSdk from '@conduitplatform/grpc-sdk';
|
|
2
|
+
import winston, { format } from 'winston';
|
|
3
|
+
import { isEmpty } from 'lodash-es';
|
|
4
|
+
import { get } from 'http';
|
|
5
|
+
import LokiTransport from 'winston-loki';
|
|
6
|
+
import { linearBackoffTimeoutAsync } from '../utilities/index.js';
|
|
36
7
|
const processMeta = (meta) => {
|
|
37
8
|
if (Array.isArray(meta)) {
|
|
38
9
|
return meta.reduce((message, meta) => `${message} \n ${JSON.stringify(meta, null, 2)}`, '');
|
|
@@ -42,31 +13,31 @@ const processMeta = (meta) => {
|
|
|
42
13
|
}
|
|
43
14
|
};
|
|
44
15
|
const createFormat = (logMeta = true) => {
|
|
45
|
-
return
|
|
16
|
+
return format.combine(format.printf(info => {
|
|
46
17
|
// This will customize the Error Message
|
|
47
18
|
if (info.stack) {
|
|
48
19
|
return `[${info.timestamp}] [${info.level.toUpperCase()}]: ${info.message} ${info.stack}`;
|
|
49
20
|
}
|
|
50
21
|
if (logMeta) {
|
|
51
|
-
return `[${info.timestamp}] [${info.level.toUpperCase()}]: ${info.message} ${!
|
|
22
|
+
return `[${info.timestamp}] [${info.level.toUpperCase()}]: ${info.message} ${!isEmpty(info.meta) ? processMeta(info.meta) : ''}`;
|
|
52
23
|
}
|
|
53
24
|
else {
|
|
54
25
|
return `[${info.timestamp}] [${info.level.toUpperCase()}]: ${info.message}`;
|
|
55
26
|
}
|
|
56
27
|
}));
|
|
57
28
|
};
|
|
58
|
-
const defaultTransport = new
|
|
29
|
+
const defaultTransport = new winston.transports.Console({
|
|
59
30
|
level: 'debug',
|
|
60
|
-
format:
|
|
31
|
+
format: format.combine(format.prettyPrint(), format.errors({ stack: true }), format.timestamp({
|
|
61
32
|
format: 'YYYY-MM-DD HH:mm:ss',
|
|
62
|
-
}), createFormat(false),
|
|
33
|
+
}), createFormat(false), format.colorize({
|
|
63
34
|
all: true,
|
|
64
35
|
})),
|
|
65
36
|
});
|
|
66
|
-
class ConduitLogger {
|
|
37
|
+
export class ConduitLogger {
|
|
67
38
|
constructor(transports) {
|
|
68
|
-
this._winston =
|
|
69
|
-
format:
|
|
39
|
+
this._winston = winston.createLogger({
|
|
40
|
+
format: format.combine(format.prettyPrint(), format.errors({ stack: true }), format.timestamp({
|
|
70
41
|
format: 'YYYY-MM-DD HH:mm:ss',
|
|
71
42
|
}), createFormat()),
|
|
72
43
|
transports: transports ? [...transports, defaultTransport] : [defaultTransport],
|
|
@@ -103,11 +74,10 @@ class ConduitLogger {
|
|
|
103
74
|
return this._winston.verbose(message, cb);
|
|
104
75
|
}
|
|
105
76
|
}
|
|
106
|
-
exports.ConduitLogger = ConduitLogger;
|
|
107
77
|
async function lokiReadyCheck(lokiUrl) {
|
|
108
78
|
return new Promise((resolve, reject) => {
|
|
109
79
|
const data = [];
|
|
110
|
-
|
|
80
|
+
get(`${lokiUrl}/ready`, r => {
|
|
111
81
|
r.on('data', chunk => data.push(chunk));
|
|
112
82
|
r.on('end', () => {
|
|
113
83
|
if (Buffer.concat(data).toString() === 'ready\n')
|
|
@@ -120,7 +90,7 @@ async function lokiReadyCheck(lokiUrl) {
|
|
|
120
90
|
});
|
|
121
91
|
});
|
|
122
92
|
}
|
|
123
|
-
async function setupLoki(module, instance) {
|
|
93
|
+
export async function setupLoki(module, instance) {
|
|
124
94
|
let lokiUrl = process.env.LOKI_URL;
|
|
125
95
|
if (lokiUrl && lokiUrl !== '') {
|
|
126
96
|
if (lokiUrl.endsWith('/'))
|
|
@@ -128,7 +98,7 @@ async function setupLoki(module, instance) {
|
|
|
128
98
|
const onTry = async () => {
|
|
129
99
|
return await lokiReadyCheck(lokiUrl)
|
|
130
100
|
.then(() => {
|
|
131
|
-
|
|
101
|
+
ConduitGrpcSdk.Logger.addTransport(new LokiTransport({
|
|
132
102
|
level: 'debug',
|
|
133
103
|
host: lokiUrl,
|
|
134
104
|
batching: false,
|
|
@@ -146,10 +116,9 @@ async function setupLoki(module, instance) {
|
|
|
146
116
|
.catch(() => true); // retry
|
|
147
117
|
};
|
|
148
118
|
const onFailure = () => {
|
|
149
|
-
|
|
119
|
+
ConduitGrpcSdk.Logger.error(`Failed to connect to Loki on '${lokiUrl}'`);
|
|
150
120
|
};
|
|
151
|
-
await
|
|
121
|
+
await linearBackoffTimeoutAsync(onTry, 250, 15, onFailure, true);
|
|
152
122
|
}
|
|
153
123
|
}
|
|
154
|
-
exports.setupLoki = setupLoki;
|
|
155
124
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logging/index.ts"],"names":[],"mappings":"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"}
|