@autofleet/outbreak 1.0.0-beta.0 → 1.0.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/src/example.js +2 -2
- package/dist/src/example.js.map +1 -1
- package/dist/src/{http-wrapper.d.ts → http_wrapper.d.ts} +0 -0
- package/dist/src/{http-wrapper.js → http_wrapper.js} +7 -23
- package/dist/src/http_wrapper.js.map +1 -0
- package/dist/src/index.js +9 -30
- package/dist/src/index.js.map +1 -1
- package/dist/src/tracer.d.ts +1 -0
- package/dist/src/tracer.js +3 -7
- package/dist/src/tracer.js.map +1 -1
- package/dist/tests/http-wrapper.test.js +14 -30
- package/dist/tests/http-wrapper.test.js.map +1 -1
- package/package.json +7 -8
- package/src/{http-wrapper.ts → http_wrapper.ts} +0 -0
- package/src/index.ts +2 -5
- package/dist/src/http-wrapper.js.map +0 -1
- package/dist/src/rabbit-wrapper.d.ts +0 -2
- package/dist/src/rabbit-wrapper.js +0 -98
- package/dist/src/rabbit-wrapper.js.map +0 -1
- package/src/rabbit-wrapper.ts +0 -84
package/dist/src/example.js
CHANGED
@@ -22,7 +22,7 @@ const logger = winston_1.default.createLogger({
|
|
22
22
|
new winston_1.default.transports.Console(),
|
23
23
|
],
|
24
24
|
});
|
25
|
-
|
25
|
+
index_1.default({
|
26
26
|
setAndPropagateCorrelationId: true,
|
27
27
|
headersToPropagate: [
|
28
28
|
'x-text',
|
@@ -30,7 +30,7 @@ const logger = winston_1.default.createLogger({
|
|
30
30
|
headersPrefix: 'x-af-',
|
31
31
|
winstonLogger: logger,
|
32
32
|
});
|
33
|
-
const app =
|
33
|
+
const app = express_1.default();
|
34
34
|
app.all('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
35
35
|
const network = axios_1.default.create({ baseURL: 'http://localhost:8080/' });
|
36
36
|
const { data } = yield network.get('/header-parrot');
|
package/dist/src/example.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"example.js","sourceRoot":"","sources":["../../src/example.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAA8B;AAC9B,kDAA0B;AAC1B,sDAA8B;AAE9B,oDAAoC;AAEpC,eAAK,CAAC,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAE5D,MAAM,MAAM,GAAG,iBAAO,CAAC,YAAY,CAAC;IAClC,UAAU,EAAE;QACV,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,EAAE;KACjC;CACF,CAAC,CAAC;AAEH,
|
1
|
+
{"version":3,"file":"example.js","sourceRoot":"","sources":["../../src/example.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,sDAA8B;AAC9B,kDAA0B;AAC1B,sDAA8B;AAE9B,oDAAoC;AAEpC,eAAK,CAAC,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAC;AAE5D,MAAM,MAAM,GAAG,iBAAO,CAAC,YAAY,CAAC;IAClC,UAAU,EAAE;QACV,IAAI,iBAAO,CAAC,UAAU,CAAC,OAAO,EAAE;KACjC;CACF,CAAC,CAAC;AAEH,eAAa,CAAC;IACZ,4BAA4B,EAAE,IAAI;IAClC,kBAAkB,EAAE;QAClB,QAAQ;KACT;IACD,aAAa,EAAE,OAAO;IACtB,aAAa,EAAE,MAAM;CACtB,CAAC,CAAC;AAEH,MAAM,GAAG,GAAG,iBAAO,EAAE,CAAC;AAEtB,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;IAC9B,MAAM,OAAO,GAAG,eAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC,CAAC;IACpE,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;IACrD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjB,CAAC,CAAA,CAAC,CAAC;AAEH,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACrC,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACtC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACxB,CAAC,CAAC,CAAC;AAEH,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;IACpB,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;AAC5B,CAAC,CAAC,CAAC"}
|
File without changes
|
@@ -1,30 +1,14 @@
|
|
1
1
|
"use strict";
|
2
|
-
var
|
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 __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
|
-
});
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
18
5
|
var __importStar = (this && this.__importStar) || function (mod) {
|
19
6
|
if (mod && mod.__esModule) return mod;
|
20
7
|
var result = {};
|
21
|
-
if (mod != null) for (var k in mod) if (
|
22
|
-
|
8
|
+
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
9
|
+
result["default"] = mod;
|
23
10
|
return result;
|
24
11
|
};
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
27
|
-
};
|
28
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
29
13
|
/* eslint-disable max-len */
|
30
14
|
const http_1 = __importDefault(require("http"));
|
@@ -60,7 +44,7 @@ function injectInResponse(response, headers) {
|
|
60
44
|
}
|
61
45
|
function wrappedListener(config, listener) {
|
62
46
|
return (req, res, next, error) => {
|
63
|
-
|
47
|
+
tracer_1.newTrace('httpRequest');
|
64
48
|
if (config.setAndPropagateCorrelationId === true) {
|
65
49
|
setAndCollectCorrelationId(config, req, res);
|
66
50
|
}
|
@@ -118,4 +102,4 @@ function wrapHttp(config) {
|
|
118
102
|
http_1.default.get = wrapHttpRequest(originalGet);
|
119
103
|
}
|
120
104
|
exports.default = wrapHttp;
|
121
|
-
//# sourceMappingURL=
|
105
|
+
//# sourceMappingURL=http_wrapper.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"http_wrapper.js","sourceRoot":"","sources":["../../src/http_wrapper.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.js
CHANGED
@@ -1,38 +1,20 @@
|
|
1
1
|
"use strict";
|
2
|
-
var
|
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 __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
|
-
});
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
18
5
|
var __importStar = (this && this.__importStar) || function (mod) {
|
19
6
|
if (mod && mod.__esModule) return mod;
|
20
7
|
var result = {};
|
21
|
-
if (mod != null) for (var k in mod) if (
|
22
|
-
|
8
|
+
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
9
|
+
result["default"] = mod;
|
23
10
|
return result;
|
24
11
|
};
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
27
|
-
};
|
28
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
29
|
-
exports.traceTypes = exports.newTrace = exports.getCurrentContext = void 0;
|
30
13
|
const winston_1 = require("winston");
|
31
|
-
const http_wrapper_1 = __importDefault(require("./
|
32
|
-
const rabbit_wrapper_1 = __importDefault(require("./rabbit-wrapper"));
|
14
|
+
const http_wrapper_1 = __importDefault(require("./http_wrapper"));
|
33
15
|
const config_1 = __importDefault(require("./config"));
|
34
16
|
const tracer = __importStar(require("./tracer"));
|
35
|
-
const addMetadataToLog = (loggerTraceKey) =>
|
17
|
+
const addMetadataToLog = (loggerTraceKey) => winston_1.format((info) => {
|
36
18
|
const currentTrace = tracer.getCurrentTrace();
|
37
19
|
if (currentTrace && currentTrace.context && currentTrace.context.get) {
|
38
20
|
// eslint-disable-next-line no-param-reassign
|
@@ -41,9 +23,7 @@ const addMetadataToLog = (loggerTraceKey) => (0, winston_1.format)((info) => {
|
|
41
23
|
return info;
|
42
24
|
});
|
43
25
|
function default_1(options) {
|
44
|
-
|
45
|
-
(0, http_wrapper_1.default)(conf);
|
46
|
-
(0, rabbit_wrapper_1.default)(conf);
|
26
|
+
http_wrapper_1.default(config_1.default.load(options));
|
47
27
|
tracer.enable();
|
48
28
|
if (options.winstonLogger) {
|
49
29
|
const traceKey = options.loggerTraceKey || 'traceId';
|
@@ -62,8 +42,7 @@ function default_1(options) {
|
|
62
42
|
}
|
63
43
|
}
|
64
44
|
exports.default = default_1;
|
65
|
-
|
66
|
-
exports.getCurrentContext = getCurrentContext;
|
45
|
+
exports.getCurrentContext = () => tracer.getCurrentTrace();
|
67
46
|
exports.newTrace = tracer.newTrace;
|
68
47
|
exports.traceTypes = {
|
69
48
|
HTTP_REQUEST: 'httpRequest',
|
package/dist/src/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,qCAA0C;AAE1C,kEAAyC;AACzC,sDAA8B;AAC9B,iDAAmC;AAUnC,MAAM,gBAAgB,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,gBAAM,CAAC,CAAC,IAAI,EAAE,EAAE;IAC3D,MAAM,YAAY,GAAG,MAAM,CAAC,eAAe,EAAE,CAAC;IAC9C,IAAI,YAAY,IAAI,YAAY,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE;QACpE,6CAA6C;QAC7C,IAAI,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAM,CAAC,mBAAmB,CAAC,CAAC;KAC7E;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC,CAAC;AAEH,mBAAyB,OAAgB;IACvC,sBAAW,CAAC,gBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;IAClC,MAAM,CAAC,MAAM,EAAE,CAAC;IAEhB,IAAI,OAAO,CAAC,aAAa,EAAE;QACzB,MAAM,QAAQ,GAAG,OAAO,CAAC,cAAc,IAAI,SAAS,CAAC;QACrD,6CAA6C;QAC7C,OAAO,CAAC,aAAa,CAAC,MAAM,GAAG,gBAAM,CAAC,OAAO,CAC3C,gBAAgB,CAAC,QAAQ,CAAC,EAAE,EAC5B,OAAO,CAAC,aAAa,CAAC,MAAM,CAC7B,CAAC;KACH;IAED,IAAI;QACF,8EAA8E;QAC9E,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QACrC,QAAQ,CAAC,MAAM,CAAC;YACd,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;KACJ;YAAS;QACR,aAAa;KACd;AACH,CAAC;AAtBD,4BAsBC;AAEY,QAAA,iBAAiB,GAAG,GAAQ,EAAE,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC;AAErE,mCAAmC;AAEtB,QAAA,UAAU,GAAG;IACxB,YAAY,EAAE,aAAa;IAC3B,UAAU,EAAE,WAAW;IACvB,MAAM,EAAE,QAAQ;CACjB,CAAC"}
|
package/dist/src/tracer.d.ts
CHANGED
package/dist/src/tracer.js
CHANGED
@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
4
|
};
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
6
|
-
exports.getCurrentTrace = exports.enable = exports.newTrace = void 0;
|
7
6
|
const async_hooks_1 = __importDefault(require("async_hooks"));
|
8
7
|
const uuid_1 = __importDefault(require("uuid"));
|
9
8
|
const prevStates = {};
|
@@ -45,15 +44,12 @@ class Trace {
|
|
45
44
|
this.context = new Map();
|
46
45
|
}
|
47
46
|
}
|
48
|
-
|
47
|
+
exports.newTrace = (type) => {
|
49
48
|
tracer.currentTrace = new Trace(type);
|
50
49
|
tracer.traces[async_hooks_1.default.executionAsyncId()] = tracer.currentTrace;
|
51
50
|
return tracer.currentTrace;
|
52
51
|
};
|
53
|
-
exports.
|
54
|
-
|
55
|
-
exports.enable = enable;
|
56
|
-
const getCurrentTrace = () => tracer.currentTrace || {};
|
57
|
-
exports.getCurrentTrace = getCurrentTrace;
|
52
|
+
exports.enable = () => hook.enable();
|
53
|
+
exports.getCurrentTrace = () => tracer.currentTrace || {};
|
58
54
|
exports.default = tracer;
|
59
55
|
//# sourceMappingURL=tracer.js.map
|
package/dist/src/tracer.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../src/tracer.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../src/tracer.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AACrC,gDAAwB;AAExB,MAAM,UAAU,GAAG,EAAE,CAAC;AAEtB,MAAM,MAAM,GAAG;IACb,YAAY,EAAE,IAAI;IAClB,MAAM,EAAE,EAAE;CACX,CAAC;AAEF,SAAS,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,cAAc;IACzC,IAAI,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE;QACjC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;KACxD;AACH,CAAC;AAED,SAAS,MAAM,CAAC,OAAO;IACrB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAO;KACR;IACD,UAAU,CAAC,OAAO,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC;IAC1C,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,KAAK,CAAC,OAAO;IACpB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QAC3B,OAAO;KACR;IACD,MAAM,CAAC,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,SAAS,OAAO,CAAC,OAAO;IACtB,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;QAC1B,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9B,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC;KAC5B;AACH,CAAC;AAED,MAAM,IAAI,GAAG,qBAAU,CAAC,UAAU,CAAC;IACjC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;CAC7B,CAAC,CAAC;AAEH,MAAM,KAAK;IAOT,YAAY,IAAI;QACd,IAAI,CAAC,EAAE,GAAG,cAAI,CAAC,EAAE,EAAE,CAAC;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAE,CAAC;IAC3B,CAAC;CACF;AAEY,QAAA,QAAQ,GAAG,CAAC,IAAI,EAAQ,EAAE;IACrC,MAAM,CAAC,YAAY,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC;IACtC,MAAM,CAAC,MAAM,CAAC,qBAAU,CAAC,gBAAgB,EAAE,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC;IACnE,OAAO,MAAM,CAAC,YAAY,CAAC;AAC7B,CAAC,CAAC;AAEW,QAAA,MAAM,GAAG,GAAyB,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;AAEnD,QAAA,eAAe,GAAG,GAAQ,EAAE,CAAC,MAAM,CAAC,YAAY,IAAI,EAAE,CAAC;AAEpE,kBAAe,MAAM,CAAC"}
|
@@ -1,27 +1,4 @@
|
|
1
1
|
"use strict";
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
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 __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
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
26
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
27
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
@@ -34,6 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
34
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
35
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
36
13
|
};
|
14
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
15
|
+
if (mod && mod.__esModule) return mod;
|
16
|
+
var result = {};
|
17
|
+
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
|
18
|
+
result["default"] = mod;
|
19
|
+
return result;
|
20
|
+
};
|
37
21
|
Object.defineProperty(exports, "__esModule", { value: true });
|
38
22
|
const express_1 = __importDefault(require("express"));
|
39
23
|
const axios_1 = __importDefault(require("axios"));
|
@@ -47,7 +31,7 @@ const logger = winston_1.default.createLogger({
|
|
47
31
|
],
|
48
32
|
});
|
49
33
|
const generateApp = (addEndpoints, port) => __awaiter(void 0, void 0, void 0, function* () {
|
50
|
-
const app =
|
34
|
+
const app = express_1.default();
|
51
35
|
addEndpoints(app);
|
52
36
|
const server = yield new Promise((resolve) => {
|
53
37
|
const s = app.listen(port, () => {
|
@@ -61,7 +45,7 @@ const generateApp = (addEndpoints, port) => __awaiter(void 0, void 0, void 0, fu
|
|
61
45
|
describe('E2E', () => {
|
62
46
|
it('Basic functionality', () => __awaiter(void 0, void 0, void 0, function* () {
|
63
47
|
let server2TraceId = null;
|
64
|
-
|
48
|
+
index_1.default({
|
65
49
|
setAndPropagateCorrelationId: true,
|
66
50
|
headersToPropagate: [
|
67
51
|
'x-test-header',
|
@@ -105,7 +89,7 @@ describe('E2E', () => {
|
|
105
89
|
const instance = axios_1.default.create({
|
106
90
|
httpAgent,
|
107
91
|
});
|
108
|
-
|
92
|
+
index_1.default({
|
109
93
|
setAndPropagateCorrelationId: true,
|
110
94
|
headersToPropagate: [
|
111
95
|
'x-test-header',
|
@@ -119,11 +103,11 @@ describe('E2E', () => {
|
|
119
103
|
httpAgent: serverHttpAgent,
|
120
104
|
});
|
121
105
|
app.post('/', (req, res) => __awaiter(void 0, void 0, void 0, function* () {
|
122
|
-
const { id } =
|
106
|
+
const { id } = index_1.getCurrentContext();
|
123
107
|
setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
|
124
108
|
setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
|
125
109
|
const { data: res1 } = yield serverInstance.post('http://localhost:8082');
|
126
|
-
if (
|
110
|
+
if (index_1.getCurrentContext().id !== id) {
|
127
111
|
throw new Error('Should be the same trace');
|
128
112
|
}
|
129
113
|
res.json(res1);
|
@@ -133,12 +117,12 @@ describe('E2E', () => {
|
|
133
117
|
}, 8081);
|
134
118
|
const closeServer2 = yield generateApp((app) => {
|
135
119
|
app.post('/', (req, res) => {
|
136
|
-
const { id } =
|
120
|
+
const { id } = index_1.getCurrentContext();
|
137
121
|
setTimeout(() => __awaiter(void 0, void 0, void 0, function* () {
|
138
122
|
yield bluebird_1.default.map([1, 2, 3], (value) => __awaiter(void 0, void 0, void 0, function* () {
|
139
123
|
if (value === 2) {
|
140
124
|
server2TraceIds.push(req.headers['x-trace-id']);
|
141
|
-
if (
|
125
|
+
if (index_1.getCurrentContext().id !== id) {
|
142
126
|
throw new Error('Should be the same trace');
|
143
127
|
}
|
144
128
|
res.json({
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"http-wrapper.test.js","sourceRoot":"","sources":["../../tests/http-wrapper.test.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"http-wrapper.test.js","sourceRoot":"","sources":["../../tests/http-wrapper.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@autofleet/outbreak",
|
3
|
-
"version": "1.0.0
|
3
|
+
"version": "1.0.0",
|
4
4
|
"description": "",
|
5
5
|
"main": "dist/src/index.js",
|
6
6
|
"types": "dist/src/index.d.ts",
|
@@ -16,9 +16,10 @@
|
|
16
16
|
"author": "Dor Shay",
|
17
17
|
"license": "ISC",
|
18
18
|
"dependencies": {
|
19
|
-
"@autofleet/
|
19
|
+
"@autofleet/network": "^1.2.1",
|
20
20
|
"axios": "^0.19.2",
|
21
21
|
"express": "^4.17.1",
|
22
|
+
"jsonwebtoken": "^8.5.1",
|
22
23
|
"shortid": "^2.2.15",
|
23
24
|
"uuid": "^3.4.0",
|
24
25
|
"winston": "^3.2.1"
|
@@ -27,9 +28,7 @@
|
|
27
28
|
"bluebird": "*"
|
28
29
|
},
|
29
30
|
"devDependencies": {
|
30
|
-
"@types/
|
31
|
-
"@types/bluebird": "^3.5.35",
|
32
|
-
"@types/jest": "^26.0.23",
|
31
|
+
"@types/jest": "^24.9.1",
|
33
32
|
"@types/node": "^13.5.0",
|
34
33
|
"@typescript-eslint/eslint-plugin": "^2.17.0",
|
35
34
|
"@typescript-eslint/parser": "^2.17.0",
|
@@ -38,11 +37,11 @@
|
|
38
37
|
"eslint": "^6.8.0",
|
39
38
|
"eslint-config-airbnb": "^18.0.1",
|
40
39
|
"eslint-plugin-import": "^2.20.0",
|
41
|
-
"jest": "^
|
40
|
+
"jest": "^25.1.0",
|
42
41
|
"nodemon": "^2.0.2",
|
43
|
-
"ts-jest": "^
|
42
|
+
"ts-jest": "^25.0.0",
|
44
43
|
"ts-node": "^8.6.2",
|
45
|
-
"typescript": "^
|
44
|
+
"typescript": "^3.7.5",
|
46
45
|
"typescript-eslint": "0.0.1-alpha.0"
|
47
46
|
}
|
48
47
|
}
|
File without changes
|
package/src/index.ts
CHANGED
@@ -1,7 +1,6 @@
|
|
1
1
|
import winston, { format } from 'winston';
|
2
2
|
|
3
|
-
import httpWrapper from './
|
4
|
-
import rabbitWrapper from './rabbit-wrapper';
|
3
|
+
import httpWrapper from './http_wrapper';
|
5
4
|
import config from './config';
|
6
5
|
import * as tracer from './tracer';
|
7
6
|
|
@@ -24,9 +23,7 @@ const addMetadataToLog = (loggerTraceKey) => format((info) => {
|
|
24
23
|
});
|
25
24
|
|
26
25
|
export default function (options: Options): void {
|
27
|
-
|
28
|
-
httpWrapper(conf);
|
29
|
-
rabbitWrapper(conf);
|
26
|
+
httpWrapper(config.load(options));
|
30
27
|
tracer.enable();
|
31
28
|
|
32
29
|
if (options.winstonLogger) {
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"http-wrapper.js","sourceRoot":"","sources":["../../src/http-wrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4BAA4B;AAC5B,gDAAwB;AACxB,sDAA8B;AAG9B,mDAA4C;AAE5C,MAAM,wBAAwB,GAAG,cAAI,CAAC,YAAY,CAAC;AACnD,MAAM,eAAe,GAAG,cAAI,CAAC,OAAO,CAAC;AACrC,MAAM,WAAW,GAAG,cAAI,CAAC,GAAG,CAAC;AAE7B,SAAS,0BAA0B,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG;IAClD,IAAI,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC5D,IAAI,OAAO,aAAa,KAAK,WAAW,EAAE;QACxC,aAAa,GAAG,iBAAO,CAAC,QAAQ,EAAE,CAAC;KACpC;IACD,gBAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;IAC3E,GAAG,CAAC,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,aAAa;IAC1C,MAAM,aAAa,GAAG,aAAa;QACjC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;QACrE,CAAC,CAAC,EAAE,CAAC;IAEP,CAAC,GAAG,OAAO,EAAE,GAAG,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAChD,IAAI,OAAO,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,WAAW,EAAE;YAC9C,gBAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;SAC9D;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,QAAQ,EAAE,OAAO;IACzC,IAAI,gBAAM,CAAC,YAAY,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACzB,QAAQ,CAAC,SAAS,CAAC,MAAM,EAAE,gBAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,eAAe,CAAC,MAAW,EAAE,QAAiC;IACrE,OAAO,CAAC,GAAyB,EAAE,GAAwB,EAAE,IAAS,EAAE,KAAU,EAAQ,EAAE;QAC1F,IAAA,iBAAQ,EAAC,aAAa,CAAC,CAAC;QAExB,IAAI,MAAM,CAAC,4BAA4B,KAAK,IAAI,EAAE;YAChD,0BAA0B,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;SAC9C;QAED,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;QAE5D,IAAI,MAAM,CAAC,oBAAoB,EAAE;YAC/B,gBAAgB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC;SACrD;QAED,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,MAAM;IAClC,gGAAgG;IAChG,OAAO,SAAS,wBAAwB,CAAC,QAAQ;QAC/C,OAAO,wBAAwB,CAAC,eAAe,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IACrE,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,CAAC,OAAO;IACrB,IAAI,gBAAM,CAAC,YAAY,EAAE;QACvB,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,6CAA6C;YAC7C,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;SACtB;QACD,CAAC,GAAG,CAAC,gBAAM,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3D,6CAA6C;YAC7C,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,gBAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,SAAS,eAAe,CAAC,cAAc;IACrC,cAAc;IACd,SAAS,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;QAChC,MAAM,CAAC,OAAO,CAAC,CAAC;QAEhB,OAAO,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;IAED,SAAS,YAAY,CAAC,OAAO,EAAE,EAAE;QAC/B,MAAM,CAAC,OAAO,CAAC,CAAC;QAEhB,OAAO,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACrC,CAAC;IAID,SAAS,kBAAkB,CAAC,GAAG,IAAI;QACjC,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI,GAAG,CAAC;QACR,IAAI,QAAQ,CAAC;QAEb,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,CAAC,OAAO,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;YAChC,OAAO,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;SACzC;QACD,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC;QAC3B,OAAO,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,SAAwB,QAAQ,CAAC,MAAM;IACrC,cAAI,CAAC,YAAY,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACjD,cAAI,CAAC,OAAO,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;IAChD,cAAI,CAAC,GAAG,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;AAC1C,CAAC;AAJD,2BAIC"}
|
@@ -1,98 +0,0 @@
|
|
1
|
-
"use strict";
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
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 __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
|
-
/* eslint-disable func-names */
|
30
|
-
const rabbit_1 = __importDefault(require("@autofleet/rabbit"));
|
31
|
-
const tracer_1 = __importStar(require("./tracer"));
|
32
|
-
const originalConsume = rabbit_1.default.prototype.consume;
|
33
|
-
const originalConsumeFromExchange = rabbit_1.default.prototype.consumeFromExchange;
|
34
|
-
const originalSendToQueue = rabbit_1.default.prototype.sendToQueue;
|
35
|
-
const originalPublish = rabbit_1.default.prototype.publish;
|
36
|
-
function collectHeadersFromMessage(msg, headers, headersPrefix) {
|
37
|
-
var _a;
|
38
|
-
const prefixHeaders = headersPrefix
|
39
|
-
? Object.keys((_a = msg.properties) === null || _a === void 0 ? void 0 : _a.headers).filter((h) => h.includes(headersPrefix))
|
40
|
-
: [];
|
41
|
-
[...headers, ...prefixHeaders].forEach((header) => {
|
42
|
-
if (typeof msg.properties.headers[header] !== 'undefined') {
|
43
|
-
tracer_1.default.currentTrace.context.set(header, msg.properties.headers[header]);
|
44
|
-
}
|
45
|
-
});
|
46
|
-
}
|
47
|
-
function mergeHeaders(tracingHeaders, customHeaders) {
|
48
|
-
let mergedHeaders = {};
|
49
|
-
if (customHeaders) {
|
50
|
-
mergedHeaders = Object.assign(mergedHeaders, customHeaders);
|
51
|
-
}
|
52
|
-
if (tracer_1.default.currentTrace) {
|
53
|
-
tracingHeaders.forEach((header) => {
|
54
|
-
mergedHeaders[header] = tracer_1.default.currentTrace.context.get(header);
|
55
|
-
});
|
56
|
-
}
|
57
|
-
return mergedHeaders;
|
58
|
-
}
|
59
|
-
function wrapConsume(config, originalMethod) {
|
60
|
-
return function (queue, callback, options) {
|
61
|
-
const wrappedCallback = (msg, ack, nack) => {
|
62
|
-
(0, tracer_1.newTrace)('rabbitMessage');
|
63
|
-
collectHeadersFromMessage(msg, config.headersToCollect, config.headersPrefix);
|
64
|
-
return callback(msg, ack, nack);
|
65
|
-
};
|
66
|
-
return originalMethod(queue, wrappedCallback, options);
|
67
|
-
};
|
68
|
-
}
|
69
|
-
function wrapConsumeFromExchange(config, originalMethod) {
|
70
|
-
return function (queue, callback, options) {
|
71
|
-
const wrappedCallback = (msg, ack, nack) => {
|
72
|
-
(0, tracer_1.newTrace)('rabbitMessage');
|
73
|
-
collectHeadersFromMessage(msg, config.headersToCollect, config.headersPrefix);
|
74
|
-
return callback(msg, ack, nack);
|
75
|
-
};
|
76
|
-
return originalMethod(queue, wrappedCallback, options);
|
77
|
-
};
|
78
|
-
}
|
79
|
-
function wrapSendToQueue(config, originalMethod) {
|
80
|
-
return function (queue, content, options, customHeaders) {
|
81
|
-
const finalHeaders = mergeHeaders(config.headersToCollect, customHeaders);
|
82
|
-
return originalMethod(queue, content, options, finalHeaders);
|
83
|
-
};
|
84
|
-
}
|
85
|
-
function wrapPublish(config, originalMethod) {
|
86
|
-
return function (queue, content, customHeaders) {
|
87
|
-
const finalHeaders = mergeHeaders(config.headersToCollect, customHeaders);
|
88
|
-
return originalMethod(queue, content, finalHeaders);
|
89
|
-
};
|
90
|
-
}
|
91
|
-
const wrapRabbit = (conf) => {
|
92
|
-
rabbit_1.default.prototype.consume = wrapConsume(conf, originalConsume);
|
93
|
-
rabbit_1.default.prototype.consumeFromExchange = wrapConsumeFromExchange(conf, originalConsumeFromExchange);
|
94
|
-
rabbit_1.default.prototype.sendToQueue = wrapSendToQueue(conf, originalSendToQueue);
|
95
|
-
rabbit_1.default.prototype.publish = wrapPublish(conf, originalPublish);
|
96
|
-
};
|
97
|
-
exports.default = wrapRabbit;
|
98
|
-
//# sourceMappingURL=rabbit-wrapper.js.map
|
@@ -1 +0,0 @@
|
|
1
|
-
{"version":3,"file":"rabbit-wrapper.js","sourceRoot":"","sources":["../../src/rabbit-wrapper.ts"],"names":[],"mappings":"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"}
|
package/src/rabbit-wrapper.ts
DELETED
@@ -1,84 +0,0 @@
|
|
1
|
-
/* eslint-disable func-names */
|
2
|
-
import Rabbit, { AfRabbitOptions } from '@autofleet/rabbit';
|
3
|
-
import shortid from 'shortid';
|
4
|
-
import tracer, { newTrace } from './tracer';
|
5
|
-
|
6
|
-
const originalConsume = Rabbit.prototype.consume;
|
7
|
-
const originalConsumeFromExchange = Rabbit.prototype.consumeFromExchange;
|
8
|
-
const originalSendToQueue = Rabbit.prototype.sendToQueue;
|
9
|
-
const originalPublish = Rabbit.prototype.publish;
|
10
|
-
|
11
|
-
function collectHeadersFromMessage(msg, headers, headersPrefix): void {
|
12
|
-
const prefixHeaders = headersPrefix
|
13
|
-
? Object.keys(msg.properties?.headers).filter((h) => h.includes(headersPrefix))
|
14
|
-
: [];
|
15
|
-
|
16
|
-
[...headers, ...prefixHeaders].forEach((header) => {
|
17
|
-
if (typeof msg.properties.headers[header] !== 'undefined') {
|
18
|
-
tracer.currentTrace.context.set(header, msg.properties.headers[header]);
|
19
|
-
}
|
20
|
-
});
|
21
|
-
}
|
22
|
-
|
23
|
-
function mergeHeaders(tracingHeaders, customHeaders): Record<string, string> {
|
24
|
-
let mergedHeaders = {};
|
25
|
-
|
26
|
-
if (customHeaders) {
|
27
|
-
mergedHeaders = Object.assign(mergedHeaders, customHeaders);
|
28
|
-
}
|
29
|
-
|
30
|
-
if (tracer.currentTrace) {
|
31
|
-
tracingHeaders.forEach((header) => {
|
32
|
-
mergedHeaders[header] = tracer.currentTrace.context.get(header);
|
33
|
-
});
|
34
|
-
}
|
35
|
-
|
36
|
-
return mergedHeaders;
|
37
|
-
}
|
38
|
-
|
39
|
-
function wrapConsume(config, originalMethod): any {
|
40
|
-
return function (queue: string, callback, options: AfRabbitOptions): Promise<any> {
|
41
|
-
const wrappedCallback = (msg, ack, nack): Promise<any> => {
|
42
|
-
newTrace('rabbitMessage');
|
43
|
-
collectHeadersFromMessage(msg, config.headersToCollect, config.headersPrefix);
|
44
|
-
return callback(msg, ack, nack);
|
45
|
-
};
|
46
|
-
return originalMethod(queue, wrappedCallback, options);
|
47
|
-
};
|
48
|
-
}
|
49
|
-
|
50
|
-
function wrapConsumeFromExchange(config, originalMethod): any {
|
51
|
-
return function (queue: string, callback, options: AfRabbitOptions): Promise<any> {
|
52
|
-
const wrappedCallback = (msg, ack, nack): Promise<any> => {
|
53
|
-
newTrace('rabbitMessage');
|
54
|
-
collectHeadersFromMessage(msg, config.headersToCollect, config.headersPrefix);
|
55
|
-
return callback(msg, ack, nack);
|
56
|
-
};
|
57
|
-
return originalMethod(queue, wrappedCallback, options);
|
58
|
-
};
|
59
|
-
}
|
60
|
-
|
61
|
-
function wrapSendToQueue(config, originalMethod): any {
|
62
|
-
return function (queue: string, content: any, options?: any, customHeaders?: any):
|
63
|
-
Promise<boolean> {
|
64
|
-
const finalHeaders = mergeHeaders(config.headersToCollect, customHeaders);
|
65
|
-
return originalMethod(queue, content, options, finalHeaders);
|
66
|
-
};
|
67
|
-
}
|
68
|
-
|
69
|
-
function wrapPublish(config, originalMethod): any {
|
70
|
-
return function (queue: string, content: any, customHeaders?: any):
|
71
|
-
Promise<boolean> {
|
72
|
-
const finalHeaders = mergeHeaders(config.headersToCollect, customHeaders);
|
73
|
-
return originalMethod(queue, content, finalHeaders);
|
74
|
-
};
|
75
|
-
}
|
76
|
-
|
77
|
-
const wrapRabbit = (conf): void => {
|
78
|
-
Rabbit.prototype.consume = wrapConsume(conf, originalConsume);
|
79
|
-
Rabbit.prototype.consumeFromExchange = wrapConsumeFromExchange(conf, originalConsumeFromExchange);
|
80
|
-
Rabbit.prototype.sendToQueue = wrapSendToQueue(conf, originalSendToQueue);
|
81
|
-
Rabbit.prototype.publish = wrapPublish(conf, originalPublish);
|
82
|
-
};
|
83
|
-
|
84
|
-
export default wrapRabbit;
|