@abyss-project/monitor 4.0.0 → 5.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/.eslintrc.js +67 -18
- package/dist/types/interface/api/requests/application.request.d.ts +0 -8
- package/dist/types/interface/api/responses/infrastructure.admin.response.d.ts +2 -4
- package/package.json +2 -2
- package/tsconfig.build.json +4 -0
- package/dist/__tests__/alert-log-url.test.d.ts +0 -1
- package/dist/__tests__/alert-log-url.test.js +0 -21
- package/dist/__tests__/alert-log-url.test.js.map +0 -1
- package/dist/__tests__/application-log-bulk-api.test.d.ts +0 -1
- package/dist/__tests__/application-log-bulk-api.test.js +0 -125
- package/dist/__tests__/application-log-bulk-api.test.js.map +0 -1
- package/dist/__tests__/body-redaction.test.d.ts +0 -1
- package/dist/__tests__/body-redaction.test.js +0 -104
- package/dist/__tests__/body-redaction.test.js.map +0 -1
- package/dist/__tests__/graceful-shutdown-flush.test.d.ts +0 -1
- package/dist/__tests__/graceful-shutdown-flush.test.js +0 -253
- package/dist/__tests__/graceful-shutdown-flush.test.js.map +0 -1
- package/dist/__tests__/graceful-shutdown-logger.test.d.ts +0 -1
- package/dist/__tests__/graceful-shutdown-logger.test.js +0 -124
- package/dist/__tests__/graceful-shutdown-logger.test.js.map +0 -1
- package/dist/__tests__/header-pattern.test.d.ts +0 -1
- package/dist/__tests__/header-pattern.test.js +0 -66
- package/dist/__tests__/header-pattern.test.js.map +0 -1
- package/dist/__tests__/identifier-resolver.test.d.ts +0 -1
- package/dist/__tests__/identifier-resolver.test.js +0 -50
- package/dist/__tests__/identifier-resolver.test.js.map +0 -1
- package/dist/__tests__/latency-bucket.test.d.ts +0 -1
- package/dist/__tests__/latency-bucket.test.js +0 -10
- package/dist/__tests__/latency-bucket.test.js.map +0 -1
- package/dist/__tests__/log-queue.test.d.ts +0 -1
- package/dist/__tests__/log-queue.test.js +0 -97
- package/dist/__tests__/log-queue.test.js.map +0 -1
- package/dist/__tests__/log-shipper-preconfig.test.d.ts +0 -1
- package/dist/__tests__/log-shipper-preconfig.test.js +0 -54
- package/dist/__tests__/log-shipper-preconfig.test.js.map +0 -1
- package/dist/__tests__/log-shipper.test.d.ts +0 -1
- package/dist/__tests__/log-shipper.test.js +0 -1040
- package/dist/__tests__/log-shipper.test.js.map +0 -1
- package/dist/__tests__/log-spool.test.d.ts +0 -1
- package/dist/__tests__/log-spool.test.js +0 -297
- package/dist/__tests__/log-spool.test.js.map +0 -1
- package/dist/__tests__/logger-body-size.test.d.ts +0 -1
- package/dist/__tests__/logger-body-size.test.js +0 -12
- package/dist/__tests__/logger-body-size.test.js.map +0 -1
- package/dist/__tests__/logger-console-min-level.test.d.ts +0 -1
- package/dist/__tests__/logger-console-min-level.test.js +0 -55
- package/dist/__tests__/logger-console-min-level.test.js.map +0 -1
- package/dist/__tests__/logger-debug-critical.test.d.ts +0 -1
- package/dist/__tests__/logger-debug-critical.test.js +0 -77
- package/dist/__tests__/logger-debug-critical.test.js.map +0 -1
- package/dist/__tests__/logger-endpoint-headers.test.d.ts +0 -1
- package/dist/__tests__/logger-endpoint-headers.test.js +0 -23
- package/dist/__tests__/logger-endpoint-headers.test.js.map +0 -1
- package/dist/__tests__/logger-enqueues.test.d.ts +0 -1
- package/dist/__tests__/logger-enqueues.test.js +0 -276
- package/dist/__tests__/logger-enqueues.test.js.map +0 -1
- package/dist/__tests__/logger-returns-promise.test.d.ts +0 -1
- package/dist/__tests__/logger-returns-promise.test.js +0 -27
- package/dist/__tests__/logger-returns-promise.test.js.map +0 -1
- package/dist/__tests__/parse-window.test.d.ts +0 -1
- package/dist/__tests__/parse-window.test.js +0 -19
- package/dist/__tests__/parse-window.test.js.map +0 -1
- package/dist/__tests__/rate-limit.decorator.test.d.ts +0 -1
- package/dist/__tests__/rate-limit.decorator.test.js +0 -47
- package/dist/__tests__/rate-limit.decorator.test.js.map +0 -1
- package/dist/__tests__/rate-limit.middleware.test.d.ts +0 -1
- package/dist/__tests__/rate-limit.middleware.test.js +0 -156
- package/dist/__tests__/rate-limit.middleware.test.js.map +0 -1
- package/dist/__tests__/route-decorator-body-flags.test.d.ts +0 -1
- package/dist/__tests__/route-decorator-body-flags.test.js +0 -117
- package/dist/__tests__/route-decorator-body-flags.test.js.map +0 -1
- package/dist/__tests__/route-flags-loader.test.d.ts +0 -1
- package/dist/__tests__/route-flags-loader.test.js +0 -153
- package/dist/__tests__/route-flags-loader.test.js.map +0 -1
- package/dist/__tests__/sentinel-header-mask.test.d.ts +0 -1
- package/dist/__tests__/sentinel-header-mask.test.js +0 -14
- package/dist/__tests__/sentinel-header-mask.test.js.map +0 -1
- package/dist/__tests__/setconfig-keeps-queued-logs.test.d.ts +0 -1
- package/dist/__tests__/setconfig-keeps-queued-logs.test.js +0 -59
- package/dist/__tests__/setconfig-keeps-queued-logs.test.js.map +0 -1
- package/dist/__tests__/shipper-replay-on-config.test.d.ts +0 -1
- package/dist/__tests__/shipper-replay-on-config.test.js +0 -59
- package/dist/__tests__/shipper-replay-on-config.test.js.map +0 -1
- package/dist/__tests__/token-bucket.store.test.d.ts +0 -1
- package/dist/__tests__/token-bucket.store.test.js +0 -99
- package/dist/__tests__/token-bucket.store.test.js.map +0 -1
- package/dist/__tests__/utils/setup-global.d.ts +0 -1
- package/dist/__tests__/utils/setup-global.js +0 -35
- package/dist/__tests__/utils/setup-global.js.map +0 -1
- package/dist/__tests__/utils/teardown-global.d.ts +0 -1
- package/dist/__tests__/utils/teardown-global.js +0 -36
- package/dist/__tests__/utils/teardown-global.js.map +0 -1
|
@@ -1,156 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
require("reflect-metadata");
|
|
7
|
-
const ioredis_mock_1 = __importDefault(require("ioredis-mock"));
|
|
8
|
-
const token_bucket_store_1 = require("../middlewares/rate-limit/token-bucket.store");
|
|
9
|
-
const rate_limit_middleware_1 = require("../middlewares/rate-limit/rate-limit.middleware");
|
|
10
|
-
const baseConfig = {
|
|
11
|
-
enabled: true,
|
|
12
|
-
redisPrefix: 'test',
|
|
13
|
-
user: { max: 5, window: '1m' },
|
|
14
|
-
org: { max: 20, window: '1m' },
|
|
15
|
-
apikey: { max: 5, window: '1m' },
|
|
16
|
-
ip: { max: 2, window: '1m' },
|
|
17
|
-
};
|
|
18
|
-
function buildReqRes(opts = {}) {
|
|
19
|
-
const headers = {};
|
|
20
|
-
if (opts.apiKey)
|
|
21
|
-
headers['abyss-api-key'] = opts.apiKey;
|
|
22
|
-
const req = {
|
|
23
|
-
ip: opts.ip ?? '1.1.1.1',
|
|
24
|
-
method: 'GET',
|
|
25
|
-
path: opts.path ?? '/x',
|
|
26
|
-
headers,
|
|
27
|
-
header(name) {
|
|
28
|
-
return headers[name.toLowerCase()];
|
|
29
|
-
},
|
|
30
|
-
};
|
|
31
|
-
const resHeaders = {};
|
|
32
|
-
let statusCode = 200;
|
|
33
|
-
let jsonBody;
|
|
34
|
-
const res = {
|
|
35
|
-
locals: opts.locals ?? {},
|
|
36
|
-
setHeader(name, value) {
|
|
37
|
-
resHeaders[name] = value;
|
|
38
|
-
},
|
|
39
|
-
status(code) {
|
|
40
|
-
statusCode = code;
|
|
41
|
-
return res;
|
|
42
|
-
},
|
|
43
|
-
json(body) {
|
|
44
|
-
jsonBody = body;
|
|
45
|
-
return res;
|
|
46
|
-
},
|
|
47
|
-
};
|
|
48
|
-
res.__captured = () => ({
|
|
49
|
-
headers: resHeaders,
|
|
50
|
-
status: statusCode,
|
|
51
|
-
body: jsonBody,
|
|
52
|
-
});
|
|
53
|
-
const next = jest.fn();
|
|
54
|
-
return { req, res, next };
|
|
55
|
-
}
|
|
56
|
-
const captured = (res) => res.__captured();
|
|
57
|
-
describe('createRouteRateLimiter (per-route, scope- and param-aware)', () => {
|
|
58
|
-
let redis;
|
|
59
|
-
let store;
|
|
60
|
-
beforeEach(async () => {
|
|
61
|
-
redis = new ioredis_mock_1.default();
|
|
62
|
-
store = new token_bucket_store_1.TokenBucketStore(redis);
|
|
63
|
-
await store.load();
|
|
64
|
-
});
|
|
65
|
-
afterEach(async () => {
|
|
66
|
-
await redis.quit();
|
|
67
|
-
});
|
|
68
|
-
it('bypasses when the caller is admin (Defect A: scope resolves post-auth)', async () => {
|
|
69
|
-
const mw = (0, rate_limit_middleware_1.createRouteRateLimiter)(undefined, { store, config: baseConfig });
|
|
70
|
-
const { req, res, next } = buildReqRes({ locals: { isAdmin: true } });
|
|
71
|
-
await mw(req, res, next);
|
|
72
|
-
expect(next).toHaveBeenCalled();
|
|
73
|
-
expect(captured(res).headers['RateLimit-Limit']).toBeUndefined();
|
|
74
|
-
});
|
|
75
|
-
it('resolves the user bucket for an authenticated request (Defect A fixed)', async () => {
|
|
76
|
-
const mw = (0, rate_limit_middleware_1.createRouteRateLimiter)(undefined, { store, config: baseConfig });
|
|
77
|
-
const { req, res, next } = buildReqRes({
|
|
78
|
-
locals: { currentUser: { id: 'u1' }, organization: { id: 'o1' } },
|
|
79
|
-
});
|
|
80
|
-
await mw(req, res, next);
|
|
81
|
-
expect(next).toHaveBeenCalled();
|
|
82
|
-
expect(captured(res).headers['RateLimit-Limit']).toBe(5);
|
|
83
|
-
expect(captured(res).headers['RateLimit-Remaining']).toBe(4);
|
|
84
|
-
expect(captured(res).headers['RateLimit-Policy']).toBe('5;w=60');
|
|
85
|
-
});
|
|
86
|
-
it('blocks with 429 when the user bucket is exhausted', async () => {
|
|
87
|
-
const mw = (0, rate_limit_middleware_1.createRouteRateLimiter)(undefined, { store, config: baseConfig });
|
|
88
|
-
for (let i = 0; i < 5; i++) {
|
|
89
|
-
const ctx = buildReqRes({
|
|
90
|
-
locals: { currentUser: { id: 'u1' }, organization: { id: 'o1' } },
|
|
91
|
-
});
|
|
92
|
-
await mw(ctx.req, ctx.res, ctx.next);
|
|
93
|
-
}
|
|
94
|
-
const blocked = buildReqRes({
|
|
95
|
-
locals: { currentUser: { id: 'u1' }, organization: { id: 'o1' } },
|
|
96
|
-
});
|
|
97
|
-
await mw(blocked.req, blocked.res, blocked.next);
|
|
98
|
-
expect(captured(blocked.res).status).toBe(429);
|
|
99
|
-
expect(blocked.next).not.toHaveBeenCalled();
|
|
100
|
-
expect(captured(blocked.res).body).toMatchObject({
|
|
101
|
-
error: { code: 'RATE_LIMIT_EXCEEDED', scope: 'user' },
|
|
102
|
-
});
|
|
103
|
-
expect(captured(blocked.res).headers['Retry-After']).toBeGreaterThan(0);
|
|
104
|
-
});
|
|
105
|
-
it('applies the bound @RateLimit override on a PARAMETERIZED path (Defect B fixed)', async () => {
|
|
106
|
-
const mw = (0, rate_limit_middleware_1.createRouteRateLimiter)({ scope: 'ip', max: 1, window: '1m' }, { store, config: baseConfig });
|
|
107
|
-
const ctx1 = buildReqRes({ ip: '5.5.5.5', path: '/b/abc123def' });
|
|
108
|
-
await mw(ctx1.req, ctx1.res, ctx1.next);
|
|
109
|
-
expect(ctx1.next).toHaveBeenCalled();
|
|
110
|
-
expect(captured(ctx1.res).headers['RateLimit-Limit']).toBe(1);
|
|
111
|
-
const ctx2 = buildReqRes({ ip: '5.5.5.5', path: '/b/abc123def' });
|
|
112
|
-
await mw(ctx2.req, ctx2.res, ctx2.next);
|
|
113
|
-
expect(captured(ctx2.res).status).toBe(429);
|
|
114
|
-
});
|
|
115
|
-
it('falls back to the scope default when the route has no override', async () => {
|
|
116
|
-
const mw = (0, rate_limit_middleware_1.createRouteRateLimiter)(undefined, { store, config: baseConfig });
|
|
117
|
-
const { req, res, next } = buildReqRes({ locals: { currentUser: { id: 'u-fallback' } } });
|
|
118
|
-
await mw(req, res, next);
|
|
119
|
-
expect(next).toHaveBeenCalled();
|
|
120
|
-
expect(captured(res).headers['RateLimit-Limit']).toBe(5);
|
|
121
|
-
});
|
|
122
|
-
it('@RateLimit scope:ip forces the ip bucket even for authenticated callers', async () => {
|
|
123
|
-
const mw = (0, rate_limit_middleware_1.createRouteRateLimiter)({ scope: 'ip', max: 1, window: '1m' }, { store, config: baseConfig });
|
|
124
|
-
const ctx1 = buildReqRes({
|
|
125
|
-
ip: '7.7.7.7',
|
|
126
|
-
locals: { currentUser: { id: 'u-jwt' }, organization: { id: 'o-jwt' } },
|
|
127
|
-
});
|
|
128
|
-
await mw(ctx1.req, ctx1.res, ctx1.next);
|
|
129
|
-
expect(ctx1.next).toHaveBeenCalled();
|
|
130
|
-
expect(captured(ctx1.res).headers['RateLimit-Limit']).toBe(1);
|
|
131
|
-
const ctx2 = buildReqRes({
|
|
132
|
-
ip: '7.7.7.7',
|
|
133
|
-
locals: { currentUser: { id: 'u-jwt' }, organization: { id: 'o-jwt' } },
|
|
134
|
-
});
|
|
135
|
-
await mw(ctx2.req, ctx2.res, ctx2.next);
|
|
136
|
-
expect(captured(ctx2.res).status).toBe(429);
|
|
137
|
-
});
|
|
138
|
-
it('anonymous request resolves the ip bucket', async () => {
|
|
139
|
-
const mw = (0, rate_limit_middleware_1.createRouteRateLimiter)(undefined, { store, config: baseConfig });
|
|
140
|
-
const { req, res, next } = buildReqRes({ ip: '9.9.9.9' });
|
|
141
|
-
await mw(req, res, next);
|
|
142
|
-
expect(next).toHaveBeenCalled();
|
|
143
|
-
expect(captured(res).headers['RateLimit-Limit']).toBe(2);
|
|
144
|
-
});
|
|
145
|
-
it('returns next without enforcement when config.enabled is false', async () => {
|
|
146
|
-
const mw = (0, rate_limit_middleware_1.createRouteRateLimiter)(undefined, {
|
|
147
|
-
store,
|
|
148
|
-
config: { ...baseConfig, enabled: false },
|
|
149
|
-
});
|
|
150
|
-
const { req, res, next } = buildReqRes({ locals: { currentUser: { id: 'u1' } } });
|
|
151
|
-
await mw(req, res, next);
|
|
152
|
-
expect(next).toHaveBeenCalled();
|
|
153
|
-
expect(captured(res).headers['RateLimit-Limit']).toBeUndefined();
|
|
154
|
-
});
|
|
155
|
-
});
|
|
156
|
-
//# sourceMappingURL=rate-limit.middleware.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.middleware.test.js","sourceRoot":"","sources":["../../src/__tests__/rate-limit.middleware.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
import 'reflect-metadata';
|
|
@@ -1,117 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
require("reflect-metadata");
|
|
13
|
-
const decorators_1 = require("../frameworks/express/decorators");
|
|
14
|
-
function RejectingInnerDecorator() {
|
|
15
|
-
return function (_target, _propertyKey, descriptor) {
|
|
16
|
-
descriptor.value = function (...args) {
|
|
17
|
-
const res = args[1];
|
|
18
|
-
res.status(403).json({ message: 'forbidden' });
|
|
19
|
-
return undefined;
|
|
20
|
-
};
|
|
21
|
-
};
|
|
22
|
-
}
|
|
23
|
-
function fakeRes() {
|
|
24
|
-
return {
|
|
25
|
-
locals: {},
|
|
26
|
-
status: jest.fn().mockReturnThis(),
|
|
27
|
-
json: jest.fn().mockReturnThis(),
|
|
28
|
-
};
|
|
29
|
-
}
|
|
30
|
-
describe('Route decorators — shouldNotSaveRequestBody / shouldNotSaveResponseBody', () => {
|
|
31
|
-
it('sets shouldNotSaveRequestBody on res.locals even when an inner decorator rejects before the handler runs', () => {
|
|
32
|
-
const handler = jest.fn();
|
|
33
|
-
class Ctrl {
|
|
34
|
-
create(_req, res, _next) {
|
|
35
|
-
handler();
|
|
36
|
-
res.status(200).json({ ok: true });
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
__decorate([
|
|
40
|
-
(0, decorators_1.Post)({ path: '/', shouldNotSaveRequestBody: true }),
|
|
41
|
-
RejectingInnerDecorator(),
|
|
42
|
-
__metadata("design:type", Function),
|
|
43
|
-
__metadata("design:paramtypes", [Object, Object, Object]),
|
|
44
|
-
__metadata("design:returntype", void 0)
|
|
45
|
-
], Ctrl.prototype, "create", null);
|
|
46
|
-
const ctrl = new Ctrl();
|
|
47
|
-
const res = fakeRes();
|
|
48
|
-
ctrl.create({}, res, jest.fn());
|
|
49
|
-
expect(res.locals.shouldNotSaveRequestBody).toBe(true);
|
|
50
|
-
expect(handler).not.toHaveBeenCalled();
|
|
51
|
-
});
|
|
52
|
-
it('sets shouldNotSaveResponseBody on res.locals for a normal (non-rejected) handler', () => {
|
|
53
|
-
const handler = jest.fn();
|
|
54
|
-
class Ctrl {
|
|
55
|
-
value(_req, res, _next) {
|
|
56
|
-
handler();
|
|
57
|
-
res.status(200).json({ ok: true });
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
__decorate([
|
|
61
|
-
(0, decorators_1.Get)({ path: '/:id/value', shouldNotSaveResponseBody: true }),
|
|
62
|
-
__metadata("design:type", Function),
|
|
63
|
-
__metadata("design:paramtypes", [Object, Object, Object]),
|
|
64
|
-
__metadata("design:returntype", void 0)
|
|
65
|
-
], Ctrl.prototype, "value", null);
|
|
66
|
-
const ctrl = new Ctrl();
|
|
67
|
-
const res = fakeRes();
|
|
68
|
-
ctrl.value({}, res, jest.fn());
|
|
69
|
-
expect(res.locals.shouldNotSaveResponseBody).toBe(true);
|
|
70
|
-
expect(handler).toHaveBeenCalled();
|
|
71
|
-
});
|
|
72
|
-
it('leaves both flags falsy when the route declares neither option', () => {
|
|
73
|
-
class Ctrl {
|
|
74
|
-
create(_req, res, _next) {
|
|
75
|
-
res.status(200).json({ ok: true });
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
__decorate([
|
|
79
|
-
(0, decorators_1.Post)({ path: '/' }),
|
|
80
|
-
__metadata("design:type", Function),
|
|
81
|
-
__metadata("design:paramtypes", [Object, Object, Object]),
|
|
82
|
-
__metadata("design:returntype", void 0)
|
|
83
|
-
], Ctrl.prototype, "create", null);
|
|
84
|
-
const ctrl = new Ctrl();
|
|
85
|
-
const res = fakeRes();
|
|
86
|
-
ctrl.create({}, res, jest.fn());
|
|
87
|
-
expect(res.locals.shouldNotSaveRequestBody).not.toBe(true);
|
|
88
|
-
expect(res.locals.shouldNotSaveResponseBody).not.toBe(true);
|
|
89
|
-
});
|
|
90
|
-
it('never clobbers a flag an earlier layer already set, even when the route has no option', () => {
|
|
91
|
-
const observed = [];
|
|
92
|
-
class Ctrl {
|
|
93
|
-
create(_req, res, _next) {
|
|
94
|
-
observed.push({
|
|
95
|
-
requestBody: res.locals.shouldNotSaveRequestBody,
|
|
96
|
-
responseBody: res.locals.shouldNotSaveResponseBody,
|
|
97
|
-
});
|
|
98
|
-
res.status(200).json({ ok: true });
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
__decorate([
|
|
102
|
-
(0, decorators_1.Post)({ path: '/' }),
|
|
103
|
-
__metadata("design:type", Function),
|
|
104
|
-
__metadata("design:paramtypes", [Object, Object, Object]),
|
|
105
|
-
__metadata("design:returntype", void 0)
|
|
106
|
-
], Ctrl.prototype, "create", null);
|
|
107
|
-
const ctrl = new Ctrl();
|
|
108
|
-
const res = fakeRes();
|
|
109
|
-
res.locals.shouldNotSaveRequestBody = true;
|
|
110
|
-
res.locals.shouldNotSaveResponseBody = true;
|
|
111
|
-
ctrl.create({}, res, jest.fn());
|
|
112
|
-
expect(observed).toEqual([{ requestBody: true, responseBody: true }]);
|
|
113
|
-
expect(res.locals.shouldNotSaveRequestBody).toBe(true);
|
|
114
|
-
expect(res.locals.shouldNotSaveResponseBody).toBe(true);
|
|
115
|
-
});
|
|
116
|
-
});
|
|
117
|
-
//# sourceMappingURL=route-decorator-body-flags.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"route-decorator-body-flags.test.js","sourceRoot":"","sources":["../../src/__tests__/route-decorator-body-flags.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
import 'reflect-metadata';
|
|
@@ -1,153 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
-
};
|
|
8
|
-
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
-
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
-
};
|
|
11
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
require("reflect-metadata");
|
|
13
|
-
const events_1 = require("events");
|
|
14
|
-
const index_1 = require("../frameworks/express/index");
|
|
15
|
-
const decorators_1 = require("../frameworks/express/decorators");
|
|
16
|
-
class RejectingMiddleware {
|
|
17
|
-
run(_req, res, _next) {
|
|
18
|
-
res.status(403).json({ message: 'forbidden' });
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
function fakeApp() {
|
|
22
|
-
return { set: jest.fn(), use: jest.fn() };
|
|
23
|
-
}
|
|
24
|
-
function fakeRouter() {
|
|
25
|
-
const registry = new Map();
|
|
26
|
-
const router = {
|
|
27
|
-
get(path, ...handlers) {
|
|
28
|
-
registry.set(`GET ${path}`, handlers);
|
|
29
|
-
},
|
|
30
|
-
post(path, ...handlers) {
|
|
31
|
-
registry.set(`POST ${path}`, handlers);
|
|
32
|
-
},
|
|
33
|
-
put(path, ...handlers) {
|
|
34
|
-
registry.set(`PUT ${path}`, handlers);
|
|
35
|
-
},
|
|
36
|
-
patch(path, ...handlers) {
|
|
37
|
-
registry.set(`PATCH ${path}`, handlers);
|
|
38
|
-
},
|
|
39
|
-
delete(path, ...handlers) {
|
|
40
|
-
registry.set(`DELETE ${path}`, handlers);
|
|
41
|
-
},
|
|
42
|
-
use(..._args) {
|
|
43
|
-
},
|
|
44
|
-
};
|
|
45
|
-
return { router, registry };
|
|
46
|
-
}
|
|
47
|
-
function fakeReq() {
|
|
48
|
-
return { headers: {}, params: {}, query: {} };
|
|
49
|
-
}
|
|
50
|
-
function fakeRes() {
|
|
51
|
-
const res = Object.assign(new events_1.EventEmitter(), {
|
|
52
|
-
locals: {},
|
|
53
|
-
statusCode: 200,
|
|
54
|
-
status(code) {
|
|
55
|
-
res.statusCode = code;
|
|
56
|
-
return res;
|
|
57
|
-
},
|
|
58
|
-
json(body) {
|
|
59
|
-
res.body = body;
|
|
60
|
-
res.emit('close');
|
|
61
|
-
return res;
|
|
62
|
-
},
|
|
63
|
-
});
|
|
64
|
-
return res;
|
|
65
|
-
}
|
|
66
|
-
function runChain(handlers, req, res) {
|
|
67
|
-
let index = 0;
|
|
68
|
-
const next = (err) => {
|
|
69
|
-
if (err)
|
|
70
|
-
throw err;
|
|
71
|
-
const handler = handlers[index++];
|
|
72
|
-
if (handler)
|
|
73
|
-
handler(req, res, next);
|
|
74
|
-
};
|
|
75
|
-
next();
|
|
76
|
-
}
|
|
77
|
-
describe('controllerLoader — route flags survive a rejecting controller middleware', () => {
|
|
78
|
-
it('sets shouldNotSaveRequestBody on res.locals when a controller middleware rejects before the handler runs', async () => {
|
|
79
|
-
let Ctrl = class Ctrl {
|
|
80
|
-
create(_req, res) {
|
|
81
|
-
res.status(200).json({ ok: true });
|
|
82
|
-
}
|
|
83
|
-
};
|
|
84
|
-
__decorate([
|
|
85
|
-
(0, decorators_1.Post)({ path: '/', shouldNotSaveRequestBody: true }),
|
|
86
|
-
__metadata("design:type", Function),
|
|
87
|
-
__metadata("design:paramtypes", [Object, Object]),
|
|
88
|
-
__metadata("design:returntype", void 0)
|
|
89
|
-
], Ctrl.prototype, "create", null);
|
|
90
|
-
Ctrl = __decorate([
|
|
91
|
-
(0, decorators_1.Controller)({ prefixPath: '/x', middlewares: [RejectingMiddleware] })
|
|
92
|
-
], Ctrl);
|
|
93
|
-
const { router, registry } = fakeRouter();
|
|
94
|
-
await (0, index_1.controllerLoader)(fakeApp(), {
|
|
95
|
-
prefix: '/api',
|
|
96
|
-
middlewares: [RejectingMiddleware],
|
|
97
|
-
controllers: [Ctrl],
|
|
98
|
-
router: () => router,
|
|
99
|
-
});
|
|
100
|
-
const chain = registry.get('POST /');
|
|
101
|
-
expect(chain).toBeDefined();
|
|
102
|
-
const req = fakeReq();
|
|
103
|
-
const res = fakeRes();
|
|
104
|
-
let observedAtClose;
|
|
105
|
-
res.on('close', () => {
|
|
106
|
-
observedAtClose = {
|
|
107
|
-
requestBody: res.locals.shouldNotSaveRequestBody,
|
|
108
|
-
responseBody: res.locals.shouldNotSaveResponseBody,
|
|
109
|
-
};
|
|
110
|
-
});
|
|
111
|
-
runChain(chain, req, res);
|
|
112
|
-
expect(res.statusCode).toBe(403);
|
|
113
|
-
expect(observedAtClose).toEqual({ requestBody: true, responseBody: undefined });
|
|
114
|
-
});
|
|
115
|
-
it('leaves the flag unset when the route declares no option, even under the same rejecting middleware', async () => {
|
|
116
|
-
let Ctrl = class Ctrl {
|
|
117
|
-
create(_req, res) {
|
|
118
|
-
res.status(200).json({ ok: true });
|
|
119
|
-
}
|
|
120
|
-
};
|
|
121
|
-
__decorate([
|
|
122
|
-
(0, decorators_1.Post)({ path: '/' }),
|
|
123
|
-
__metadata("design:type", Function),
|
|
124
|
-
__metadata("design:paramtypes", [Object, Object]),
|
|
125
|
-
__metadata("design:returntype", void 0)
|
|
126
|
-
], Ctrl.prototype, "create", null);
|
|
127
|
-
Ctrl = __decorate([
|
|
128
|
-
(0, decorators_1.Controller)({ prefixPath: '/x', middlewares: [RejectingMiddleware] })
|
|
129
|
-
], Ctrl);
|
|
130
|
-
const { router, registry } = fakeRouter();
|
|
131
|
-
await (0, index_1.controllerLoader)(fakeApp(), {
|
|
132
|
-
prefix: '/api',
|
|
133
|
-
middlewares: [RejectingMiddleware],
|
|
134
|
-
controllers: [Ctrl],
|
|
135
|
-
router: () => router,
|
|
136
|
-
});
|
|
137
|
-
const chain = registry.get('POST /');
|
|
138
|
-
expect(chain).toBeDefined();
|
|
139
|
-
const req = fakeReq();
|
|
140
|
-
const res = fakeRes();
|
|
141
|
-
let observedAtClose;
|
|
142
|
-
res.on('close', () => {
|
|
143
|
-
observedAtClose = {
|
|
144
|
-
requestBody: res.locals.shouldNotSaveRequestBody,
|
|
145
|
-
responseBody: res.locals.shouldNotSaveResponseBody,
|
|
146
|
-
};
|
|
147
|
-
});
|
|
148
|
-
runChain(chain, req, res);
|
|
149
|
-
expect(res.statusCode).toBe(403);
|
|
150
|
-
expect(observedAtClose).toEqual({ requestBody: undefined, responseBody: undefined });
|
|
151
|
-
});
|
|
152
|
-
});
|
|
153
|
-
//# sourceMappingURL=route-flags-loader.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"route-flags-loader.test.js","sourceRoot":"","sources":["../../src/__tests__/route-flags-loader.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const http_1 = require("http");
|
|
4
|
-
const index_1 = require("../index");
|
|
5
|
-
describe('APPLICATION_SENTINEL_HEADER_MASK', () => {
|
|
6
|
-
it('is exported from the package root barrel', () => {
|
|
7
|
-
expect(typeof index_1.APPLICATION_SENTINEL_HEADER_MASK).toBe('string');
|
|
8
|
-
expect(index_1.APPLICATION_SENTINEL_HEADER_MASK.length).toBeGreaterThan(0);
|
|
9
|
-
});
|
|
10
|
-
it('can never be a real HTTP header value', () => {
|
|
11
|
-
expect(() => (0, http_1.validateHeaderValue)('X-Probe', index_1.APPLICATION_SENTINEL_HEADER_MASK)).toThrow();
|
|
12
|
-
});
|
|
13
|
-
});
|
|
14
|
-
//# sourceMappingURL=sentinel-header-mask.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sentinel-header-mask.test.js","sourceRoot":"","sources":["../../src/__tests__/sentinel-header-mask.test.ts"],"names":[],"mappings":";;AAAA,+BAA2C;AAC3C,oCAA4D;AAE5D,QAAQ,CAAC,kCAAkC,EAAE,GAAG,EAAE;IAChD,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,CAAC,OAAO,wCAAgC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/D,MAAM,CAAC,wCAAgC,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC,CAAC,CAAC;IAIH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;QAC/C,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,0BAAmB,EAAC,SAAS,EAAE,wCAAgC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC3F,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,59 +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
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
-
const logger_model_1 = require("../models/logger.model");
|
|
27
|
-
const __1 = require("..");
|
|
28
|
-
const applicationLogApi = __importStar(require("../api/application-log.api"));
|
|
29
|
-
describe('setConfig({ shipper }) — lignes émises avant la configuration', () => {
|
|
30
|
-
afterEach(() => {
|
|
31
|
-
__1.AbyssMonitorCore.getShipper().stop();
|
|
32
|
-
jest.restoreAllMocks();
|
|
33
|
-
});
|
|
34
|
-
it('livre les lignes émises avant setConfig, en plus de celle émise après', async () => {
|
|
35
|
-
const sendBulk = jest
|
|
36
|
-
.spyOn(applicationLogApi, 'createBulkApplicationLog')
|
|
37
|
-
.mockResolvedValue({ data: { created: 3, deduped: 0 } });
|
|
38
|
-
const logger = new logger_model_1.Logger({ shouldDisableConsoleLogging: true });
|
|
39
|
-
await logger.info('avant 1');
|
|
40
|
-
await logger.info('avant 2');
|
|
41
|
-
const shipperBeforeConfig = __1.AbyssMonitorCore.getShipper();
|
|
42
|
-
__1.AbyssMonitorCore.setConfig({
|
|
43
|
-
applicationId: 'app-setconfig',
|
|
44
|
-
secretPublishToken: 'secret',
|
|
45
|
-
shipper: { spoolDirectory: null, flushIntervalMs: 60_000 },
|
|
46
|
-
});
|
|
47
|
-
await logger.info('après');
|
|
48
|
-
await __1.AbyssMonitorCore.getShipper().flush();
|
|
49
|
-
expect(__1.AbyssMonitorCore.getShipper()).toBe(shipperBeforeConfig);
|
|
50
|
-
const bodies = sendBulk.mock.calls.map((call) => call[2]);
|
|
51
|
-
expect(bodies.flatMap((body) => body.logs.map((log) => log.message))).toEqual([
|
|
52
|
-
'avant 1',
|
|
53
|
-
'avant 2',
|
|
54
|
-
'après',
|
|
55
|
-
]);
|
|
56
|
-
expect(bodies.map((body) => body.droppedCount)).toEqual([null]);
|
|
57
|
-
});
|
|
58
|
-
});
|
|
59
|
-
//# sourceMappingURL=setconfig-keeps-queued-logs.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"setconfig-keeps-queued-logs.test.js","sourceRoot":"","sources":["../../src/__tests__/setconfig-keeps-queued-logs.test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yDAAgD;AAEhD,0BAAsC;AACtC,8EAAgE;AAShE,QAAQ,CAAC,+DAA+D,EAAE,GAAG,EAAE;IAC7E,SAAS,CAAC,GAAG,EAAE;QACb,oBAAgB,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;QACrF,MAAM,QAAQ,GAAG,IAAI;aAClB,KAAK,CAAC,iBAAiB,EAAE,0BAA0B,CAAC;aACpD,iBAAiB,CAAC,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAW,CAAC,CAAC;QACpE,MAAM,MAAM,GAAG,IAAI,qBAAM,CAAC,EAAE,2BAA2B,EAAE,IAAI,EAAE,CAAC,CAAC;QAGjE,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,MAAM,mBAAmB,GAAG,oBAAgB,CAAC,UAAU,EAAE,CAAC;QAE1D,oBAAgB,CAAC,SAAS,CAAC;YACzB,aAAa,EAAE,eAAe;YAC9B,kBAAkB,EAAE,QAAQ;YAC5B,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE;SAC3D,CAAC,CAAC;QACH,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3B,MAAM,oBAAgB,CAAC,UAAU,EAAE,CAAC,KAAK,EAAE,CAAC;QAE5C,MAAM,CAAC,oBAAgB,CAAC,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAChE,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAa,CAAC,CAAC;QACtE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC5E,SAAS;YACT,SAAS;YACT,OAAO;SACR,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAClE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const log_shipper_model_1 = require("../models/log-shipper.model");
|
|
4
|
-
const __1 = require("..");
|
|
5
|
-
describe('setConfig -> rejeu du spool', () => {
|
|
6
|
-
afterEach(() => {
|
|
7
|
-
__1.AbyssMonitorCore.getShipper().stop();
|
|
8
|
-
jest.restoreAllMocks();
|
|
9
|
-
});
|
|
10
|
-
it('rejoue les batches restants une fois la configuration complète', async () => {
|
|
11
|
-
const replay = jest.spyOn(__1.AbyssMonitorCore.getShipper(), 'replaySpool').mockResolvedValue(2);
|
|
12
|
-
__1.AbyssMonitorCore.setConfig({ applicationId: 'app-1', secretPublishToken: 'secret' });
|
|
13
|
-
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
14
|
-
expect(replay).toHaveBeenCalledTimes(1);
|
|
15
|
-
});
|
|
16
|
-
it('ne rejoue pas tant que la configuration est incomplète', async () => {
|
|
17
|
-
const replay = jest.spyOn(__1.AbyssMonitorCore.getShipper(), 'replaySpool').mockResolvedValue(0);
|
|
18
|
-
__1.AbyssMonitorCore.setConfig({ applicationId: 'app-1', secretPublishToken: '' });
|
|
19
|
-
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
20
|
-
expect(replay).not.toHaveBeenCalled();
|
|
21
|
-
});
|
|
22
|
-
it('rejoue sur le shipper reconfiguré, une fois ses nouvelles options appliquées', async () => {
|
|
23
|
-
const shipper = __1.AbyssMonitorCore.getShipper();
|
|
24
|
-
const order = [];
|
|
25
|
-
jest.spyOn(shipper, 'reconfigure').mockImplementation(() => {
|
|
26
|
-
order.push('reconfigure');
|
|
27
|
-
});
|
|
28
|
-
const replay = jest.spyOn(log_shipper_model_1.LogShipper.prototype, 'replaySpool').mockImplementation(async () => {
|
|
29
|
-
order.push('replay');
|
|
30
|
-
return 1;
|
|
31
|
-
});
|
|
32
|
-
__1.AbyssMonitorCore.setConfig({
|
|
33
|
-
applicationId: 'app-1',
|
|
34
|
-
secretPublishToken: 'secret',
|
|
35
|
-
shipper: { flushIntervalMs: 60_000 },
|
|
36
|
-
});
|
|
37
|
-
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
38
|
-
expect(__1.AbyssMonitorCore.getShipper()).toBe(shipper);
|
|
39
|
-
expect(replay).toHaveBeenCalledTimes(1);
|
|
40
|
-
expect(replay.mock.instances[0]).toBe(shipper);
|
|
41
|
-
expect(order).toEqual(['reconfigure', 'replay']);
|
|
42
|
-
});
|
|
43
|
-
it('un second setConfig ne rejoue pas une fois le spool trouvé vide par le premier', async () => {
|
|
44
|
-
const shipper = __1.AbyssMonitorCore.getShipper();
|
|
45
|
-
const pending = jest
|
|
46
|
-
.spyOn(shipper, 'mayHavePendingSpool')
|
|
47
|
-
.mockReturnValueOnce(true)
|
|
48
|
-
.mockReturnValue(false);
|
|
49
|
-
const replay = jest.spyOn(shipper, 'replaySpool').mockResolvedValue(0);
|
|
50
|
-
__1.AbyssMonitorCore.setConfig({ applicationId: 'app-1', secretPublishToken: 'secret' });
|
|
51
|
-
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
52
|
-
expect(replay).toHaveBeenCalledTimes(1);
|
|
53
|
-
__1.AbyssMonitorCore.setConfig({ applicationId: 'app-1', secretPublishToken: 'secret' });
|
|
54
|
-
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
55
|
-
expect(replay).toHaveBeenCalledTimes(1);
|
|
56
|
-
expect(pending).toHaveBeenCalledTimes(2);
|
|
57
|
-
});
|
|
58
|
-
});
|
|
59
|
-
//# sourceMappingURL=shipper-replay-on-config.test.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"shipper-replay-on-config.test.js","sourceRoot":"","sources":["../../src/__tests__/shipper-replay-on-config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|