@n1k1t/mock-server 0.1.86 → 0.2.1
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/lib/package.json +1 -1
- package/lib/src/client/remote.d.ts +3 -1
- package/lib/src/client/remote.d.ts.map +1 -1
- package/lib/src/config/index.d.ts +1 -1
- package/lib/src/config/index.js +3 -3
- package/lib/src/expectations/models/expectation.d.ts +7 -2
- package/lib/src/expectations/models/expectation.d.ts.map +1 -1
- package/lib/src/expectations/models/expectation.js +28 -7
- package/lib/src/expectations/models/expectation.js.map +1 -1
- package/lib/src/expectations/models/operator.d.ts +2 -2
- package/lib/src/expectations/models/operator.d.ts.map +1 -1
- package/lib/src/expectations/models/operator.js +2 -2
- package/lib/src/expectations/models/operator.js.map +1 -1
- package/lib/src/expectations/operators/and.operator.d.ts +2 -2
- package/lib/src/expectations/operators/and.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/and.operator.js +2 -1
- package/lib/src/expectations/operators/and.operator.js.map +1 -1
- package/lib/src/expectations/operators/exec.operator.d.ts +2 -2
- package/lib/src/expectations/operators/exec.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/exec.operator.js +1 -1
- package/lib/src/expectations/operators/has.operator.d.ts +2 -2
- package/lib/src/expectations/operators/has.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/has.operator.js +12 -20
- package/lib/src/expectations/operators/has.operator.js.map +1 -1
- package/lib/src/expectations/operators/if.operator.d.ts +2 -2
- package/lib/src/expectations/operators/if.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/if.operator.js +6 -5
- package/lib/src/expectations/operators/if.operator.js.map +1 -1
- package/lib/src/expectations/operators/merge.operator.d.ts +2 -2
- package/lib/src/expectations/operators/merge.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/merge.operator.js +1 -1
- package/lib/src/expectations/operators/not.operator.d.ts +2 -2
- package/lib/src/expectations/operators/not.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/not.operator.js +1 -1
- package/lib/src/expectations/operators/or.operator.d.ts +2 -2
- package/lib/src/expectations/operators/or.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/or.operator.js +2 -1
- package/lib/src/expectations/operators/or.operator.js.map +1 -1
- package/lib/src/expectations/operators/remove.operator.d.ts +2 -2
- package/lib/src/expectations/operators/remove.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/remove.operator.js +1 -1
- package/lib/src/expectations/operators/root.operator.d.ts +2 -2
- package/lib/src/expectations/operators/root.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/root.operator.js +1 -1
- package/lib/src/expectations/operators/set.operator.d.ts +2 -2
- package/lib/src/expectations/operators/set.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/set.operator.js +6 -10
- package/lib/src/expectations/operators/set.operator.js.map +1 -1
- package/lib/src/expectations/operators/switch.operator.d.ts +2 -2
- package/lib/src/expectations/operators/switch.operator.d.ts.map +1 -1
- package/lib/src/expectations/operators/switch.operator.js +7 -9
- package/lib/src/expectations/operators/switch.operator.js.map +1 -1
- package/lib/src/expectations/types.d.ts +11 -12
- package/lib/src/expectations/types.d.ts.map +1 -1
- package/lib/src/expectations/types.js +4 -2
- package/lib/src/expectations/types.js.map +1 -1
- package/lib/src/expectations/utils/index.d.ts +1 -0
- package/lib/src/expectations/utils/index.d.ts.map +1 -1
- package/lib/src/expectations/utils/index.js +1 -0
- package/lib/src/expectations/utils/index.js.map +1 -1
- package/lib/src/expectations/utils/location.d.ts.map +1 -1
- package/lib/src/expectations/utils/location.js +7 -3
- package/lib/src/expectations/utils/location.js.map +1 -1
- package/lib/src/expectations/utils/tags.d.ts +5 -0
- package/lib/src/expectations/utils/tags.d.ts.map +1 -0
- package/lib/src/expectations/utils/tags.js +49 -0
- package/lib/src/expectations/utils/tags.js.map +1 -0
- package/lib/src/server/endpoints/config.get.endpoint.d.ts +2 -2
- package/lib/src/server/endpoints/expectations-group.update.endpoint.d.ts +5 -1
- package/lib/src/server/endpoints/expectations-group.update.endpoint.d.ts.map +1 -1
- package/lib/src/server/endpoints/expectations.compact.get-list.endpoint.d.ts +33 -0
- package/lib/src/server/endpoints/expectations.compact.get-list.endpoint.d.ts.map +1 -0
- package/lib/src/server/endpoints/{expectations.get-list.endpoint.js → expectations.compact.get-list.endpoint.js} +4 -4
- package/lib/src/server/endpoints/expectations.compact.get-list.endpoint.js.map +1 -0
- package/lib/src/server/endpoints/expectations.create.endpoint.d.ts +5 -1
- package/lib/src/server/endpoints/expectations.create.endpoint.d.ts.map +1 -1
- package/lib/src/server/endpoints/expectations.get-by-id.endpoint.d.ts +49 -0
- package/lib/src/server/endpoints/expectations.get-by-id.endpoint.d.ts.map +1 -0
- package/lib/src/server/endpoints/expectations.get-by-id.endpoint.js +21 -0
- package/lib/src/server/endpoints/expectations.get-by-id.endpoint.js.map +1 -0
- package/lib/src/server/endpoints/expectations.update.endpoint.d.ts +5 -1
- package/lib/src/server/endpoints/expectations.update.endpoint.d.ts.map +1 -1
- package/lib/src/server/endpoints/history.compact.get-list.endpoint.d.ts +38 -0
- package/lib/src/server/endpoints/history.compact.get-list.endpoint.d.ts.map +1 -0
- package/lib/src/server/endpoints/{history.get-list.endpoint.js → history.compact.get-list.endpoint.js} +4 -4
- package/lib/src/server/endpoints/history.compact.get-list.endpoint.js.map +1 -0
- package/lib/src/server/endpoints/history.get-by-id.endpoint.d.ts +52 -0
- package/lib/src/server/endpoints/history.get-by-id.endpoint.d.ts.map +1 -0
- package/lib/src/server/endpoints/history.get-by-id.endpoint.js +21 -0
- package/lib/src/server/endpoints/history.get-by-id.endpoint.js.map +1 -0
- package/lib/src/server/endpoints/index.d.ts +4 -2
- package/lib/src/server/endpoints/index.d.ts.map +1 -1
- package/lib/src/server/endpoints/index.js +9 -5
- package/lib/src/server/endpoints/index.js.map +1 -1
- package/lib/src/server/index.d.ts.map +1 -1
- package/lib/src/server/index.js +3 -1
- package/lib/src/server/index.js.map +1 -1
- package/lib/src/server/models/context/index.d.ts +4 -2
- package/lib/src/server/models/context/index.d.ts.map +1 -1
- package/lib/src/server/models/context/index.js +16 -15
- package/lib/src/server/models/context/index.js.map +1 -1
- package/lib/src/server/models/context/utils.d.ts +1 -1
- package/lib/src/server/models/context/utils.d.ts.map +1 -1
- package/lib/src/server/models/context/utils.js +13 -15
- package/lib/src/server/models/context/utils.js.map +1 -1
- package/lib/src/server/models/executor/index.d.ts.map +1 -1
- package/lib/src/server/models/executor/index.js +22 -30
- package/lib/src/server/models/executor/index.js.map +1 -1
- package/lib/src/server/models/history/model.d.ts +19 -13
- package/lib/src/server/models/history/model.d.ts.map +1 -1
- package/lib/src/server/models/history/model.js +69 -17
- package/lib/src/server/models/history/model.js.map +1 -1
- package/lib/src/server/models/history/storage.js +2 -2
- package/lib/src/server/models/history/storage.js.map +1 -1
- package/lib/src/server/models/history/types.d.ts +12 -0
- package/lib/src/server/models/history/types.d.ts.map +1 -1
- package/lib/src/server/transports/http.transport/executor.d.ts.map +1 -1
- package/lib/src/server/transports/http.transport/executor.js +7 -3
- package/lib/src/server/transports/http.transport/executor.js.map +1 -1
- package/lib/src/server/transports/http.transport/index.js +2 -2
- package/lib/src/server/transports/http.transport/index.js.map +1 -1
- package/lib/src/server/transports/internal/http.transport/executor.js +1 -1
- package/lib/src/server/transports/internal/http.transport/executor.js.map +1 -1
- package/lib/src/server/transports/ws.transport/index.js +2 -2
- package/lib/src/server/transports/ws.transport/index.js.map +1 -1
- package/package.json +1 -1
- package/public/assets/{index-WDELzuxC.js → index-gA9kYtxd.js} +186 -189
- package/public/assets/{index-D-g7Ghci.css → index-tl7gtkKo.css} +1 -1
- package/public/index.html +2 -2
- package/lib/src/server/endpoints/expectations.get-list.endpoint.d.ts +0 -25
- package/lib/src/server/endpoints/expectations.get-list.endpoint.d.ts.map +0 -1
- package/lib/src/server/endpoints/expectations.get-list.endpoint.js.map +0 -1
- package/lib/src/server/endpoints/history.get-list.endpoint.d.ts +0 -30
- package/lib/src/server/endpoints/history.get-list.endpoint.d.ts.map +0 -1
- package/lib/src/server/endpoints/history.get-list.endpoint.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/server/models/context/utils.ts"],"names":[],"mappings":";;;;;;AAAA,+BAAuD;AACvD,6CAAwD;AACxD,qDAAwD;AACxD,6BAAwC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/server/models/context/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/server/models/executor/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/server/models/executor/index.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAKpF,OAAO,EAEL,cAAc,EAId,uBAAuB,EACvB,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAEpB,cAAc,UAAU,CAAC;AAKzB,MAAM,WAAW,oBAAoB;IACnC,WAAW,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC;CAChC;AAED,8BAAsB,QAAQ,CAAC,eAAe,SAAS,cAAc,GAAG,cAAc;IAC7E,eAAe,EAAG,eAAe,CAAC;IAClC,QAAQ,EAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IAE9C,wCAAwC;aACxB,OAAO,CACrB,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,uBAAuB,EACjC,aAAa,EAAE,yBAAyB,GACvC,OAAO,CAAC,wBAAwB,GAAG,IAAI,CAAC;IAE3C,gDAAgD;aAChC,KAAK,CACnB,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,uBAAuB,GAChC,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC;IAE1C,0BAA0B;IACb,KAAK,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAI9E,+DAA+D;IAClD,OAAO,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAIhE,mCAAmC;IACtB,IAAI,CAAC,OAAO,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,eAAe,CAAC;YAuGvF,gBAAgB;YAsEhB,cAAc;CA6D7B"}
|
|
@@ -18,10 +18,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
18
18
|
};
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
20
|
exports.Executor = void 0;
|
|
21
|
-
const node_gzip_1 = require("node-gzip");
|
|
22
|
-
const rxjs_1 = require("rxjs");
|
|
23
21
|
const rfdc_1 = __importDefault(require("rfdc"));
|
|
24
22
|
const lodash_1 = __importDefault(require("lodash"));
|
|
23
|
+
const node_gzip_1 = require("node-gzip");
|
|
24
|
+
const rxjs_1 = require("rxjs");
|
|
25
25
|
const errors_1 = require("./errors");
|
|
26
26
|
const utils_1 = require("../../../utils");
|
|
27
27
|
const logger_1 = require("../../../logger");
|
|
@@ -49,8 +49,8 @@ class Executor {
|
|
|
49
49
|
context.provider.storages.history.unregister(context.history);
|
|
50
50
|
return context;
|
|
51
51
|
}
|
|
52
|
-
if (context.history?.
|
|
53
|
-
context.history.
|
|
52
|
+
if (context.history?.is('registered')) {
|
|
53
|
+
context.history.switch('pending');
|
|
54
54
|
}
|
|
55
55
|
return context;
|
|
56
56
|
}
|
|
@@ -63,15 +63,15 @@ class Executor {
|
|
|
63
63
|
.catch((error) => logger.error('Got error while execution [prepare] method', error?.stack ?? error));
|
|
64
64
|
context.provider.server.exchanges.io.publish('expectation:updated', expectation.toPlain());
|
|
65
65
|
logger.info('Expectation has matched as', `"${expectation.name}" [${expectation.id}]`);
|
|
66
|
-
if (context.history?.
|
|
66
|
+
if (context.history?.is('registered')) {
|
|
67
67
|
context.history
|
|
68
|
-
.
|
|
69
|
-
.
|
|
68
|
+
.switch('pending')
|
|
69
|
+
.actualize(context.snapshot)
|
|
70
70
|
.assign({ expectation: context.expectation });
|
|
71
71
|
context.provider.server.exchanges.io.publish('history:added', context.history.toPlain());
|
|
72
72
|
context.provider.server.services.metrics.register('rate', { count: 1 });
|
|
73
73
|
}
|
|
74
|
-
if (!context.
|
|
74
|
+
if (!context.is(['handling'])) {
|
|
75
75
|
return context;
|
|
76
76
|
}
|
|
77
77
|
if (context.snapshot.incoming.delay) {
|
|
@@ -83,7 +83,7 @@ class Executor {
|
|
|
83
83
|
context.snapshot.assign({ error: { code: context.snapshot.incoming.error, isManual: true } });
|
|
84
84
|
throw errors_1.ExecutorManualError.build(context.snapshot.incoming.error);
|
|
85
85
|
}
|
|
86
|
-
if (expectation.forward) {
|
|
86
|
+
if (expectation.schema.forward) {
|
|
87
87
|
const forwarded = await this.handleForwarding(context).catch((error) => {
|
|
88
88
|
logger.error('Got error while execution [handleForwarding] method', error?.stack ?? error);
|
|
89
89
|
return null;
|
|
@@ -100,20 +100,12 @@ class Executor {
|
|
|
100
100
|
}
|
|
101
101
|
});
|
|
102
102
|
}
|
|
103
|
-
if (context.snapshot.forwarded && context.history?.
|
|
104
|
-
context.history.snapshot
|
|
105
|
-
cache: context.snapshot.cache,
|
|
106
|
-
forwarded: {
|
|
107
|
-
incoming: lodash_1.default.omit(context.snapshot.forwarded.incoming, ['stream']),
|
|
108
|
-
...(context.snapshot.forwarded.outgoing && {
|
|
109
|
-
outgoing: lodash_1.default.omit(context.snapshot.forwarded.outgoing, ['stream'])
|
|
110
|
-
}),
|
|
111
|
-
},
|
|
112
|
-
});
|
|
103
|
+
if (context.snapshot.forwarded && context.history?.is('pending')) {
|
|
104
|
+
context.history.actualize(context.snapshot);
|
|
113
105
|
context.provider.server.exchanges.io.publish('history:updated', context.history.toPlain());
|
|
114
106
|
}
|
|
115
107
|
}
|
|
116
|
-
if (!context.
|
|
108
|
+
if (!context.is(['handling'])) {
|
|
117
109
|
return context;
|
|
118
110
|
}
|
|
119
111
|
const outgoing = await this.handleReplying(context).catch((error) => {
|
|
@@ -123,7 +115,7 @@ class Executor {
|
|
|
123
115
|
return outgoing ? context.assign({ outgoing }) : context;
|
|
124
116
|
}
|
|
125
117
|
async handleForwarding(context) {
|
|
126
|
-
if (!context.expectation?.forward) {
|
|
118
|
+
if (!context.expectation?.schema.forward) {
|
|
127
119
|
return context.snapshot;
|
|
128
120
|
}
|
|
129
121
|
const snapshot = context.snapshot.assign({ cache: context.compileCacheConfiguration() });
|
|
@@ -155,14 +147,14 @@ class Executor {
|
|
|
155
147
|
});
|
|
156
148
|
}
|
|
157
149
|
}
|
|
158
|
-
const type = (0, context_1.extractPayloadType)(snapshot.incoming.headers) ?? 'plain'
|
|
150
|
+
const type = (0, context_1.extractPayloadType)(snapshot.incoming.headers) ?? (snapshot.incoming.type === 'plain'
|
|
151
|
+
? typeof snapshot.incoming.data === 'object' ? 'json' : 'plain'
|
|
152
|
+
: snapshot.incoming.type);
|
|
159
153
|
const dataRaw = snapshot.incoming.data === undefined
|
|
160
154
|
? snapshot.incoming.dataRaw
|
|
161
|
-
:
|
|
162
|
-
? (0, context_1.serializePayload)(type, snapshot.incoming.data)
|
|
163
|
-
: Buffer.from(String(snapshot.incoming.data));
|
|
155
|
+
: (0, context_1.serializePayload)(type, snapshot.incoming.data);
|
|
164
156
|
const forwarded = await this
|
|
165
|
-
.forward(context, Object.assign(snapshot.incoming, { type, dataRaw }), context.expectation.forward)
|
|
157
|
+
.forward(context, Object.assign(snapshot.incoming, { type, dataRaw }), context.expectation.schema.forward)
|
|
166
158
|
.catch((error) => {
|
|
167
159
|
logger.error('Got error while execution [forward] method', error?.stack ?? error);
|
|
168
160
|
return null;
|
|
@@ -180,12 +172,12 @@ class Executor {
|
|
|
180
172
|
const snapshot = context.expectation?.response
|
|
181
173
|
? context.expectation.response.manipulate(context.snapshot)
|
|
182
174
|
: context.snapshot;
|
|
183
|
-
const type = (0, context_1.extractPayloadType)(snapshot.outgoing.headers) ?? snapshot.outgoing.type
|
|
175
|
+
const type = (0, context_1.extractPayloadType)(snapshot.outgoing.headers) ?? (snapshot.outgoing.type === 'plain'
|
|
176
|
+
? typeof snapshot.outgoing.data === 'object' ? 'json' : 'plain'
|
|
177
|
+
: snapshot.outgoing.type);
|
|
184
178
|
const dataRaw = snapshot.outgoing.data === undefined
|
|
185
179
|
? snapshot.outgoing.dataRaw
|
|
186
|
-
:
|
|
187
|
-
? (0, context_1.serializePayload)(type, snapshot.outgoing.data)
|
|
188
|
-
: Buffer.from(String(snapshot.outgoing.data));
|
|
180
|
+
: (0, context_1.serializePayload)(type, snapshot.outgoing.data);
|
|
189
181
|
const outgoing = await this
|
|
190
182
|
.reply(context, Object.assign(snapshot.outgoing, { type, dataRaw }))
|
|
191
183
|
.catch((error) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/models/executor/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,yCAAyC;AACzC,+BAA4B;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/models/executor/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,32 +1,38 @@
|
|
|
1
1
|
import type { IRequestContextMessage, RequestContextSnapshot } from '../../models';
|
|
2
|
-
import type { THistoryStatus } from './types';
|
|
2
|
+
import type { IHistoryMeta, THistoryStatus } from './types';
|
|
3
3
|
import type { Expectation } from '../../../expectations';
|
|
4
4
|
export declare class History {
|
|
5
|
-
protected configuration: Pick<History, 'group' | 'snapshot'> & Partial<Pick<History, 'timestamp' | 'id' | 'status' | 'expectation' | '
|
|
6
|
-
TPlain: Pick<History, 'id' | 'status' | 'group' | 'timestamp' | '
|
|
5
|
+
protected configuration: Pick<History, 'group' | 'snapshot'> & Partial<Pick<History, 'timestamp' | 'id' | 'status' | 'expectation' | 'meta'>>;
|
|
6
|
+
TPlain: Pick<History, 'id' | 'status' | 'group' | 'timestamp' | 'meta'> & {
|
|
7
|
+
format: 'plain';
|
|
7
8
|
snapshot: RequestContextSnapshot['TPlain'];
|
|
8
9
|
expectation?: Expectation<any>['TPlain'];
|
|
9
10
|
};
|
|
11
|
+
TCompact: Omit<History['TPlain'], 'snapshot' | 'expectation' | 'format'> & {
|
|
12
|
+
format: 'compact';
|
|
13
|
+
expectation?: Expectation<any>['TCompact'];
|
|
14
|
+
};
|
|
10
15
|
id: string;
|
|
11
|
-
|
|
16
|
+
timestamp: number;
|
|
12
17
|
group: string;
|
|
13
18
|
snapshot: RequestContextSnapshot;
|
|
14
19
|
status: THistoryStatus;
|
|
20
|
+
meta: IHistoryMeta;
|
|
21
|
+
messagesCounter: (value?: number) => number;
|
|
15
22
|
expectation?: Expectation<any>;
|
|
16
|
-
|
|
17
|
-
duration: number;
|
|
18
|
-
private cached;
|
|
19
|
-
constructor(configuration: Pick<History, 'group' | 'snapshot'> & Partial<Pick<History, 'timestamp' | 'id' | 'status' | 'expectation' | 'duration'>>);
|
|
20
|
-
get plain(): History['TPlain'];
|
|
23
|
+
constructor(configuration: Pick<History, 'group' | 'snapshot'> & Partial<Pick<History, 'timestamp' | 'id' | 'status' | 'expectation' | 'meta'>>);
|
|
21
24
|
pushMessage(location: IRequestContextMessage['location'], data: unknown): this;
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
+
/** Actualizes internal snapshot with provided */
|
|
26
|
+
actualize(snapshot: RequestContextSnapshot): this;
|
|
27
|
+
/** Switched status and updates duration */
|
|
28
|
+
switch(status: History['status']): this;
|
|
29
|
+
is(status: History['status']): boolean;
|
|
25
30
|
complete(): this;
|
|
26
31
|
assign<T extends Partial<Pick<History, 'expectation'>>>(payload: T): this & T;
|
|
27
|
-
/** Updates duration
|
|
32
|
+
/** Updates duration based on timestamp */
|
|
28
33
|
mark(): this;
|
|
29
34
|
toPlain(): History['TPlain'];
|
|
35
|
+
toCompact(): History['TCompact'];
|
|
30
36
|
static build(configuration: History['configuration']): History;
|
|
31
37
|
}
|
|
32
38
|
//# sourceMappingURL=model.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../src/server/models/history/model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../../../../src/server/models/history/model.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIzD,qBAAa,OAAO;IA2ChB,SAAS,CAAC,aAAa,EACnB,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAAC,GACnC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,GAAG,QAAQ,GAAG,aAAa,GAAG,MAAM,CAAC,CAAC;IA5C7E,MAAM,EAAG,IAAI,CAAC,OAAO,EAAE,IAAI,GAAG,QAAQ,GAAG,OAAO,GAAG,WAAW,GAAG,MAAM,CAAC,GAAG;QAChF,MAAM,EAAE,OAAO,CAAC;QAEhB,QAAQ,EAAE,sBAAsB,CAAC,QAAQ,CAAC,CAAC;QAC3C,WAAW,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;KAC1C,CAAC;IAEK,QAAQ,EAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,GAAG,aAAa,GAAG,QAAQ,CAAC,GAAG;QACjF,MAAM,EAAE,SAAS,CAAC;QAClB,WAAW,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;KAC5C,CAAC;IAEK,EAAE,EAAE,MAAM,CAAqC;IAC/C,SAAS,EAAE,MAAM,CAA8C;IAE/D,KAAK,EAAE,MAAM,CAA4B;IACzC,QAAQ,EAAE,sBAAsB,CAA+B;IAE/D,MAAM,EAAE,cAAc,CAA+C;IACrE,IAAI,EAAE,YAAY,CAiBvB;IAEK,eAAe,6BAAkB;IACjC,WAAW,CAAC,EAAE,WAAW,CAAC,GAAG,CAAC,CAAkC;gBAG3D,aAAa,EACnB,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAAC,GACnC,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,GAAG,QAAQ,GAAG,aAAa,GAAG,MAAM,CAAC,CAAC;IAG7E,WAAW,CAAC,QAAQ,EAAE,sBAAsB,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,OAAO,GAAG,IAAI;IAKrF,iDAAiD;IAC1C,SAAS,CAAC,QAAQ,EAAE,sBAAsB,GAAG,IAAI;IAsBxD,2CAA2C;IACpC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,IAAI;IAIvC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,GAAG,OAAO;IAItC,QAAQ,IAAI,IAAI;IAoBhB,MAAM,CAAC,CAAC,SAAS,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC;IAIzE,0CAA0C;IACnC,IAAI;IASJ,OAAO,IAAI,OAAO,CAAC,QAAQ,CAAC;IAgB5B,SAAS,IAAI,OAAO,CAAC,UAAU,CAAC;IAevC,MAAM,CAAC,KAAK,CAAC,aAAa,EAAE,OAAO,CAAC,eAAe,CAAC;CAGrD"}
|
|
@@ -1,65 +1,117 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.History = void 0;
|
|
4
7
|
const uuid_1 = require("uuid");
|
|
8
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
5
9
|
const utils_1 = require("../../../utils");
|
|
6
10
|
class History {
|
|
7
11
|
constructor(configuration) {
|
|
8
12
|
this.configuration = configuration;
|
|
9
13
|
this.id = this.configuration.id ?? (0, uuid_1.v4)();
|
|
10
|
-
this.
|
|
14
|
+
this.timestamp = this.configuration.timestamp ?? Date.now();
|
|
11
15
|
this.group = this.configuration.group;
|
|
12
16
|
this.snapshot = this.configuration.snapshot;
|
|
13
17
|
this.status = this.configuration.status ?? 'unregistered';
|
|
18
|
+
this.meta = this.configuration.meta ?? {
|
|
19
|
+
tags: {
|
|
20
|
+
transport: this.snapshot.transport,
|
|
21
|
+
incoming: {
|
|
22
|
+
path: this.snapshot.incoming.path,
|
|
23
|
+
method: this.snapshot.incoming.method,
|
|
24
|
+
},
|
|
25
|
+
outgoing: {
|
|
26
|
+
status: this.snapshot.outgoing.status,
|
|
27
|
+
},
|
|
28
|
+
},
|
|
29
|
+
metrics: {
|
|
30
|
+
duration: 0,
|
|
31
|
+
},
|
|
32
|
+
};
|
|
33
|
+
this.messagesCounter = (0, utils_1.buildCounter)();
|
|
14
34
|
this.expectation = this.configuration.expectation;
|
|
15
|
-
this.timestamp = this.configuration.timestamp ?? Date.now();
|
|
16
|
-
this.duration = this.configuration.duration ?? 0;
|
|
17
|
-
this.cached = null;
|
|
18
|
-
}
|
|
19
|
-
get plain() {
|
|
20
|
-
return this.cached ?? this.toPlain();
|
|
21
35
|
}
|
|
22
36
|
pushMessage(location, data) {
|
|
23
37
|
this.snapshot.messages.push({ location, data, id: this.messagesCounter(), timestamp: Date.now() });
|
|
24
38
|
return this.mark();
|
|
25
39
|
}
|
|
26
|
-
|
|
40
|
+
/** Actualizes internal snapshot with provided */
|
|
41
|
+
actualize(snapshot) {
|
|
27
42
|
this.snapshot.assign(snapshot.omit(['incoming', 'forwarded', 'messages']));
|
|
43
|
+
if (snapshot.forwarded) {
|
|
44
|
+
this.snapshot.assign({
|
|
45
|
+
forwarded: {
|
|
46
|
+
incoming: lodash_1.default.omit(snapshot.forwarded.incoming, ['stream']),
|
|
47
|
+
...(snapshot.forwarded.outgoing && {
|
|
48
|
+
outgoing: lodash_1.default.omit(snapshot.forwarded.outgoing, ['stream']),
|
|
49
|
+
}),
|
|
50
|
+
},
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
if (snapshot.seed !== undefined) {
|
|
54
|
+
this.meta.tags.seed = snapshot.seed;
|
|
55
|
+
}
|
|
28
56
|
return this.mark();
|
|
29
57
|
}
|
|
30
|
-
|
|
58
|
+
/** Switched status and updates duration */
|
|
59
|
+
switch(status) {
|
|
31
60
|
return Object.assign(this.mark(), { status });
|
|
32
61
|
}
|
|
33
|
-
|
|
62
|
+
is(status) {
|
|
34
63
|
return this.status === status;
|
|
35
64
|
}
|
|
36
65
|
complete() {
|
|
37
66
|
if (this.snapshot.container) {
|
|
38
67
|
this.snapshot.container = this.snapshot.container.clone();
|
|
39
68
|
}
|
|
40
|
-
this.
|
|
41
|
-
|
|
69
|
+
if (this.snapshot.cache.hasRead || this.snapshot.cache.hasWritten) {
|
|
70
|
+
this.meta.tags.cache = {
|
|
71
|
+
hasWritten: this.snapshot.cache.hasWritten,
|
|
72
|
+
hasRead: this.snapshot.cache.hasRead,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
this.meta.tags.error = this.snapshot.error;
|
|
76
|
+
this.meta.tags.outgoing = {
|
|
77
|
+
status: this.snapshot.outgoing.status,
|
|
78
|
+
};
|
|
79
|
+
return this.switch('completed');
|
|
42
80
|
}
|
|
43
81
|
assign(payload) {
|
|
44
82
|
return Object.assign(this.mark(), payload);
|
|
45
83
|
}
|
|
46
|
-
/** Updates duration
|
|
84
|
+
/** Updates duration based on timestamp */
|
|
47
85
|
mark() {
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
86
|
+
if (this.is('completed')) {
|
|
87
|
+
return this;
|
|
88
|
+
}
|
|
89
|
+
this.meta.metrics.duration = Date.now() - this.timestamp;
|
|
90
|
+
return this;
|
|
51
91
|
}
|
|
52
92
|
toPlain() {
|
|
53
93
|
return {
|
|
94
|
+
format: 'plain',
|
|
54
95
|
id: this.id,
|
|
55
96
|
timestamp: this.timestamp,
|
|
56
|
-
duration: this.duration,
|
|
57
97
|
group: this.group,
|
|
58
98
|
status: this.status,
|
|
99
|
+
meta: this.meta,
|
|
59
100
|
snapshot: this.snapshot.toPlain(),
|
|
60
101
|
expectation: this.expectation?.toPlain(),
|
|
61
102
|
};
|
|
62
103
|
}
|
|
104
|
+
toCompact() {
|
|
105
|
+
return {
|
|
106
|
+
format: 'compact',
|
|
107
|
+
id: this.id,
|
|
108
|
+
timestamp: this.timestamp,
|
|
109
|
+
group: this.group,
|
|
110
|
+
status: this.status,
|
|
111
|
+
meta: this.meta,
|
|
112
|
+
expectation: this.expectation?.toCompact(),
|
|
113
|
+
};
|
|
114
|
+
}
|
|
63
115
|
static build(configuration) {
|
|
64
116
|
return new History(configuration);
|
|
65
117
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../src/server/models/history/model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../../src/server/models/history/model.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ class HistoryStorage extends Map {
|
|
|
30
30
|
/** Removes history item from storage and marks it as `unregistred` */
|
|
31
31
|
unregister(history) {
|
|
32
32
|
if (history) {
|
|
33
|
-
this.delete(history.
|
|
33
|
+
this.delete(history.switch('unregistered').id);
|
|
34
34
|
this.stack.splice(this.stack.indexOf(history.id), 1);
|
|
35
35
|
}
|
|
36
36
|
return this;
|
|
@@ -43,7 +43,7 @@ class HistoryStorage extends Map {
|
|
|
43
43
|
group: history.group,
|
|
44
44
|
status: history.status,
|
|
45
45
|
timestamp: history.timestamp,
|
|
46
|
-
|
|
46
|
+
meta: history.meta,
|
|
47
47
|
...(history.expectation && { expectation: expectations_1.Expectation.build(history.expectation) }),
|
|
48
48
|
snapshot: models_1.RequestContextSnapshot.build({
|
|
49
49
|
transport: history.snapshot.transport,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../../src/server/models/history/storage.ts"],"names":[],"mappings":";;;;;;AAAA,yCAAgE;AAChE,wDAAoD;AACpD,mCAAkC;AAElC,6DAAqC;AAErC,MAAa,cAAe,SAAQ,GAAoB;IAGtD,YAAsB,aAA0D;QAC9E,KAAK,EAAE,CAAC;QADY,kBAAa,GAAb,aAAa,CAA6C;QAFxE,UAAK,GAAa,EAAE,CAAC;IAI7B,CAAC;IAED,6BAA6B;IACtB,QAAQ,CAAC,SAA4D;QAC1E,MAAM,OAAO,GAAG,SAAS,YAAY,eAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAO,CAAC,KAAK,CAAC;YACvE,MAAM,EAAE,YAAY;YAEpB,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,KAAK;YAC/B,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAC7B,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAE9B,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,IAAI,gBAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAG,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,sEAAsE;IAC/D,UAAU,CAAC,OAAiB;QACjC,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"storage.js","sourceRoot":"","sources":["../../../../../src/server/models/history/storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,14 @@
|
|
|
1
|
+
import type { IRequestContextCacheConfiguration, IRequestContextIncoming, IRequestContextOutgoing, RequestContextSnapshot } from '../context';
|
|
1
2
|
export type THistoryStatus = 'unregistered' | 'registered' | 'pending' | 'completed';
|
|
3
|
+
export interface IHistoryMeta {
|
|
4
|
+
tags: Partial<Pick<RequestContextSnapshot, 'seed' | 'error'>> & {
|
|
5
|
+
transport: RequestContextSnapshot['transport'];
|
|
6
|
+
incoming: Partial<Pick<IRequestContextIncoming, 'path' | 'method'>>;
|
|
7
|
+
outgoing?: Partial<Pick<IRequestContextOutgoing, 'status'>>;
|
|
8
|
+
cache?: Partial<Pick<IRequestContextCacheConfiguration, 'hasRead' | 'hasWritten'>>;
|
|
9
|
+
};
|
|
10
|
+
metrics: {
|
|
11
|
+
duration: number;
|
|
12
|
+
};
|
|
13
|
+
}
|
|
2
14
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/models/history/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/server/models/history/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iCAAiC,EACjC,uBAAuB,EACvB,uBAAuB,EACvB,sBAAsB,EACvB,MAAM,YAAY,CAAC;AAEpB,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,YAAY,GAAG,SAAS,GAAG,WAAW,CAAC;AAErF,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,GAAG;QAC9D,SAAS,EAAE,sBAAsB,CAAC,WAAW,CAAC,CAAC;QAC/C,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,uBAAuB,EAAE,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC;QAEpE,QAAQ,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5D,KAAK,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,SAAS,GAAG,YAAY,CAAC,CAAC,CAAC;KACpF,CAAC;IAEF,OAAO,EAAE;QACP,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;CACH"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../src/server/transports/http.transport/executor.ts"],"names":[],"mappings":"AAAA,OAAc,EAAc,kBAAkB,EAAiB,MAAM,OAAO,CAAC;AAM7E,OAAO,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAGpD,OAAO,EAGL,QAAQ,EAER,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAItB,qBAAa,YAAa,SAAQ,QAAQ,CAAC,kBAAkB,CAAC;IAC/C,IAAI,CAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,oBAAoB;IAYhE,KAAK,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAoBpE,OAAO,CAClB,OAAO,EAAE,kBAAkB,EAC3B,QAAQ,EAAE,uBAAuB,EACjC,aAAa,EAAE,yBAAyB;;;;;;;;;;IAoD7B,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../../../../src/server/transports/http.transport/executor.ts"],"names":[],"mappings":"AAAA,OAAc,EAAc,kBAAkB,EAAiB,MAAM,OAAO,CAAC;AAM7E,OAAO,KAAK,EAAE,WAAW,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAGpD,OAAO,EAGL,QAAQ,EAER,uBAAuB,EACvB,uBAAuB,EACvB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAItB,qBAAa,YAAa,SAAQ,QAAQ,CAAC,kBAAkB,CAAC;IAC/C,IAAI,CAAC,OAAO,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,oBAAoB;IAYhE,KAAK,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAoBpE,OAAO,CAClB,OAAO,EAAE,kBAAkB,EAC3B,QAAQ,EAAE,uBAAuB,EACjC,aAAa,EAAE,yBAAyB;;;;;;;;;;IAoD7B,KAAK,CAAC,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,uBAAuB;IAuBjF,sDAAsD;cACtC,8BAA8B,CAC5C,OAAO,EAAE,kBAAkB,EAC3B,QAAQ,EAAE,uBAAuB,EACjC,aAAa,EAAE,yBAAyB,GACvC,OAAO,CAAC,kBAAkB,CAAC;CA4B/B"}
|
|
@@ -5,9 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.HttpExecutor = void 0;
|
|
7
7
|
const axios_1 = __importDefault(require("axios"));
|
|
8
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
8
9
|
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
9
10
|
const http_encoding_1 = require("http-encoding");
|
|
10
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
11
11
|
const logger_1 = require("../../../logger");
|
|
12
12
|
const models_1 = require("../../models");
|
|
13
13
|
const logger = logger_1.Logger.build('Server.Transports.Http.Executor');
|
|
@@ -23,7 +23,7 @@ class HttpExecutor extends models_1.Executor {
|
|
|
23
23
|
}
|
|
24
24
|
async match(context) {
|
|
25
25
|
const expectation = context.provider.storages.expectations.match(context.snapshot);
|
|
26
|
-
if (!expectation && context.
|
|
26
|
+
if (!expectation && context.is(['handling'])) {
|
|
27
27
|
context.assign({
|
|
28
28
|
outgoing: await this.reply(context, {
|
|
29
29
|
type: 'plain',
|
|
@@ -79,7 +79,11 @@ class HttpExecutor extends models_1.Executor {
|
|
|
79
79
|
}
|
|
80
80
|
async reply(context, outgoing) {
|
|
81
81
|
outgoing.headers = lodash_1.default.omitBy(Object.assign(lodash_1.default.omit(outgoing.headers, ['transfer-encoding']), {
|
|
82
|
-
'content-type': outgoing.headers['content-type'] ?? (outgoing.type === 'json'
|
|
82
|
+
'content-type': outgoing.headers['content-type'] ?? (outgoing.type === 'json'
|
|
83
|
+
? 'application/json'
|
|
84
|
+
: outgoing.type === 'xml'
|
|
85
|
+
? 'application/xml'
|
|
86
|
+
: undefined),
|
|
83
87
|
...(outgoing.dataRaw && { 'content-length': String(outgoing.dataRaw.length) }),
|
|
84
88
|
}), lodash_1.default.isNil);
|
|
85
89
|
context.response.writeHead(outgoing.status, outgoing.headers);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../src/server/transports/http.transport/executor.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA6E;AAC7E,yDAAoD;AACpD,iDAA6C;
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../src/server/transports/http.transport/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,13 +31,13 @@ const buildHttpListener = (router) => async (request, response) => {
|
|
|
31
31
|
if (!context) {
|
|
32
32
|
return response.destroy();
|
|
33
33
|
}
|
|
34
|
-
if (!context.
|
|
34
|
+
if (!context.is(['registered', 'handling'])) {
|
|
35
35
|
return null;
|
|
36
36
|
}
|
|
37
37
|
const expectation = await meta_1.metaStorage
|
|
38
38
|
.wrap(context.meta, () => transport.executor.match(context))
|
|
39
39
|
.catch((error) => logger.error('Got error while expectation matching', error?.stack ?? error));
|
|
40
|
-
if (!context.
|
|
40
|
+
if (!context.is(['registered', 'handling'])) {
|
|
41
41
|
return null;
|
|
42
42
|
}
|
|
43
43
|
if (!expectation) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/transports/http.transport/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,yCAA2D;AAC3D,uCAA+C;AAC/C,yCAA0C;AAC1C,wCAA4C;AAC5C,4CAAyC;AAEzC,6CAA2B;AAC3B,4CAA0B;AAE1B,MAAM,MAAM,GAAG,eAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;AAE/C,MAAM,iBAAiB,GAAG,CAA2C,MAAiB,EAAE,EAAE,CAC/F,KAAK,EAAE,OAAwB,EAAE,QAAwB,EAAE,EAAE;IAC3D,KAAK,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,MAAM,CAAC,KAAK,CAAgB,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC;QAC7F,MAAM,OAAO,GAAG,MAAM,SAAS;aAC5B,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC;aAC3C,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;QAEhG,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/server/transports/http.transport/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,yCAA2D;AAC3D,uCAA+C;AAC/C,yCAA0C;AAC1C,wCAA4C;AAC5C,4CAAyC;AAEzC,6CAA2B;AAC3B,4CAA0B;AAE1B,MAAM,MAAM,GAAG,eAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;AAE/C,MAAM,iBAAiB,GAAG,CAA2C,MAAiB,EAAE,EAAE,CAC/F,KAAK,EAAE,OAAwB,EAAE,QAAwB,EAAE,EAAE;IAC3D,KAAK,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,MAAM,CAAC,KAAK,CAAgB,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC;QAC7F,MAAM,OAAO,GAAG,MAAM,SAAS;aAC5B,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC;aAC3C,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,EAAE,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;QAEhG,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC5B,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,WAAW,GAAG,MAAM,kBAAW;aAClC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;aAC3D,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;QAEjG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,SAAS;QACX,CAAC;QAED,MAAM,kBAAW;aACd,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;aACpF,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;QAEtF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,OAAO,CAAgB,MAAM,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE5E,MAAM,kBAAW;SACd,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;SACnE,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC;AACxF,CAAC,CAAA;AAxCU,QAAA,iBAAiB,qBAwC3B;AAEH,MAAa,aAAc,SAAQ,kBAAuB;IAA1D;;QACS,aAAQ,GAAG,IAAI,uBAAY,EAAE,CAAC;IASvC,CAAC;IAPQ,cAAc,CACnB,QAA6C,EAC7C,OAAwB,EACxB,QAAwB;QAExB,OAAO,4BAAkB,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;CACF;AAVD,sCAUC"}
|
|
@@ -51,7 +51,7 @@ class InternalHttpExecutor extends models_1.Executor {
|
|
|
51
51
|
const path = `${context.incoming.method}:${context.incoming.path.replace(routes.internal.root, '')}`;
|
|
52
52
|
const endpoint = this.router[path] ?? (path.includes(routes.internal.gui) ? endpoints.gui : null);
|
|
53
53
|
await endpoint?.handler?.(context);
|
|
54
|
-
if (context.
|
|
54
|
+
if (context.is(['completed'])) {
|
|
55
55
|
return context;
|
|
56
56
|
}
|
|
57
57
|
const outgoing = await this.reply(context, context.outgoing);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../src/server/transports/internal/http.transport/executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AAEvB,4CAA8E;AAI9E,8DAAgD;AAChD,gEAAwC;AAExC,MAAa,oBAAqB,SAAQ,iBAAoC;IAA9E;;QACS,WAAM,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC7C,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,EAC9G,EAAE,CACH,CAAC;IA0CJ,CAAC;IAxCQ,KAAK,CAAC,IAAI,CAAC,OAAmC;QACnD,MAAM,MAAM,GAAG,gBAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEpC,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;QACrG,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAElG,MAAM,QAAQ,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC;QAEnC,IAAI,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../../../src/server/transports/internal/http.transport/executor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AAEvB,4CAA8E;AAI9E,8DAAgD;AAChD,gEAAwC;AAExC,MAAa,oBAAqB,SAAQ,iBAAoC;IAA9E;;QACS,WAAM,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC7C,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,EAC9G,EAAE,CACH,CAAC;IA0CJ,CAAC;IAxCQ,KAAK,CAAC,IAAI,CAAC,OAAmC;QACnD,MAAM,MAAM,GAAG,gBAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEpC,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;QACrG,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAElG,MAAM,QAAQ,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC;QAEnC,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC;YAC9B,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC7D,OAAO,OAAO,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IACjD,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,OAA4C;QAC7D,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,OAAmC,EAAE,QAAkC;QACvF,MAAM,MAAM,GAAG,QAAQ,IAAI;YAC1B,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,GAAG;YAEX,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,8BAA8B;SACrC,CAAC;QAEF,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC1D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;QAC7C,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;QAEvB,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AA9CD,oDA8CC"}
|