callman-core 1.11.7 → 1.12.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/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/request/executeRequest.d.ts.map +1 -1
- package/dist/request/executeRequest.js +15 -1
- package/dist/request/executeRequest.js.map +1 -1
- package/dist/runner/requestRunner.d.ts.map +1 -1
- package/dist/runner/requestRunner.js +88 -4
- package/dist/runner/requestRunner.js.map +1 -1
- package/dist/runner/runRequestWithDataset.d.ts +3 -0
- package/dist/runner/runRequestWithDataset.d.ts.map +1 -0
- package/dist/runner/runRequestWithDataset.js +109 -0
- package/dist/runner/runRequestWithDataset.js.map +1 -0
- package/dist/scenario-runner/adapters/helpers/expected-status.d.ts +10 -0
- package/dist/scenario-runner/adapters/helpers/expected-status.d.ts.map +1 -0
- package/dist/scenario-runner/adapters/helpers/expected-status.js +57 -0
- package/dist/scenario-runner/adapters/helpers/expected-status.js.map +1 -0
- package/dist/scenario-runner/adapters/helpers/failure-messages.d.ts +9 -1
- package/dist/scenario-runner/adapters/helpers/failure-messages.d.ts.map +1 -1
- package/dist/scenario-runner/adapters/helpers/failure-messages.js +23 -9
- package/dist/scenario-runner/adapters/helpers/failure-messages.js.map +1 -1
- package/dist/scenario-runner/adapters/index.d.ts +2 -0
- package/dist/scenario-runner/adapters/index.d.ts.map +1 -1
- package/dist/scenario-runner/adapters/index.js +5 -0
- package/dist/scenario-runner/adapters/index.js.map +1 -1
- package/dist/scenario-runner/adapters/request-executor.d.ts.map +1 -1
- package/dist/scenario-runner/adapters/request-executor.js +7 -0
- package/dist/scenario-runner/adapters/request-executor.js.map +1 -1
- package/dist/scenario-runner/condition.d.ts.map +1 -1
- package/dist/scenario-runner/condition.js +28 -0
- package/dist/scenario-runner/condition.js.map +1 -1
- package/dist/scenario-runner/executionPolicyRunner.d.ts.map +1 -1
- package/dist/scenario-runner/executionPolicyRunner.js +2 -0
- package/dist/scenario-runner/executionPolicyRunner.js.map +1 -1
- package/dist/scenario-runner/nodePolicy.d.ts.map +1 -1
- package/dist/scenario-runner/nodePolicy.js +17 -0
- package/dist/scenario-runner/nodePolicy.js.map +1 -1
- package/dist/scenario-runner/retryExecutor.d.ts +9 -1
- package/dist/scenario-runner/retryExecutor.d.ts.map +1 -1
- package/dist/scenario-runner/retryExecutor.js +13 -4
- package/dist/scenario-runner/retryExecutor.js.map +1 -1
- package/dist/scenario-runner/runScenario.d.ts.map +1 -1
- package/dist/scenario-runner/runScenario.js +170 -5
- package/dist/scenario-runner/runScenario.js.map +1 -1
- package/dist/scenario-runner/types.d.ts +42 -3
- package/dist/scenario-runner/types.d.ts.map +1 -1
- package/dist/types/index.d.ts +35 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist-cjs/index.js +3 -1
- package/dist-cjs/index.js.map +1 -1
- package/dist-cjs/request/executeRequest.js +15 -1
- package/dist-cjs/request/executeRequest.js.map +1 -1
- package/dist-cjs/runner/requestRunner.js +88 -4
- package/dist-cjs/runner/requestRunner.js.map +1 -1
- package/dist-cjs/runner/runRequestWithDataset.js +113 -0
- package/dist-cjs/runner/runRequestWithDataset.js.map +1 -0
- package/dist-cjs/scenario-runner/adapters/helpers/expected-status.js +61 -0
- package/dist-cjs/scenario-runner/adapters/helpers/expected-status.js.map +1 -0
- package/dist-cjs/scenario-runner/adapters/helpers/failure-messages.js +23 -9
- package/dist-cjs/scenario-runner/adapters/helpers/failure-messages.js.map +1 -1
- package/dist-cjs/scenario-runner/adapters/index.js +9 -1
- package/dist-cjs/scenario-runner/adapters/index.js.map +1 -1
- package/dist-cjs/scenario-runner/adapters/request-executor.js +7 -0
- package/dist-cjs/scenario-runner/adapters/request-executor.js.map +1 -1
- package/dist-cjs/scenario-runner/condition.js +28 -0
- package/dist-cjs/scenario-runner/condition.js.map +1 -1
- package/dist-cjs/scenario-runner/executionPolicyRunner.js +2 -0
- package/dist-cjs/scenario-runner/executionPolicyRunner.js.map +1 -1
- package/dist-cjs/scenario-runner/nodePolicy.js +17 -0
- package/dist-cjs/scenario-runner/nodePolicy.js.map +1 -1
- package/dist-cjs/scenario-runner/retryExecutor.js +13 -4
- package/dist-cjs/scenario-runner/retryExecutor.js.map +1 -1
- package/dist-cjs/scenario-runner/runScenario.js +169 -4
- package/dist-cjs/scenario-runner/runScenario.js.map +1 -1
- package/package.json +1 -1
package/dist/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { runCollection } from "./runner/runCollection.js";
|
|
2
2
|
export { runRequest } from "./runner/requestRunner.js";
|
|
3
|
+
export { runRequestWithDataset } from "./runner/runRequestWithDataset.js";
|
|
3
4
|
export { executeRequest } from "./request/executeRequest.js";
|
|
4
5
|
export { isXmlContentType, parseXml, looksLikeXml, XML_PARSER_OPTIONS, type ParseXmlResult, } from "./utils/xml.js";
|
|
5
6
|
export { sanitizeJsonBody } from "./utils/jsonc.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,KAAK,cAAc,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,YAAY,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,YAAY,EACV,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,uBAAuB,EACvB,WAAW,EACX,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,yBAAyB,EACzB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,mBAAmB,EACnB,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,eAAe,EACf,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,UAAU,GAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,oBAAoB,EACpB,KAAK,kBAAkB,GACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EACL,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,GACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,qBAAqB,EACrB,KAAK,wBAAwB,GAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,EACxB,KAAK,iBAAiB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EACjB,gBAAgB,EAChB,KAAK,cAAc,GACpB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,kBAAkB,EAClB,KAAK,cAAc,GACpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,YAAY,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAC5E,YAAY,EACV,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,uBAAuB,EACvB,WAAW,EACX,mBAAmB,EACnB,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,qBAAqB,EACrB,yBAAyB,EACzB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,mBAAmB,EACnB,WAAW,EACX,gBAAgB,EAChB,sBAAsB,EACtB,mBAAmB,GACpB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,eAAe,EACf,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,UAAU,GAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,oBAAoB,EACpB,KAAK,kBAAkB,GACxB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EACL,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,GACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,qBAAqB,EACrB,KAAK,wBAAwB,GAC9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,EACxB,KAAK,iBAAiB,GACvB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EACjB,gBAAgB,EAChB,KAAK,cAAc,GACpB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { runCollection } from "./runner/runCollection.js";
|
|
2
2
|
export { runRequest } from "./runner/requestRunner.js";
|
|
3
|
+
export { runRequestWithDataset } from "./runner/runRequestWithDataset.js";
|
|
3
4
|
export { executeRequest } from "./request/executeRequest.js";
|
|
4
5
|
export { isXmlContentType, parseXml, looksLikeXml, XML_PARSER_OPTIONS, } from "./utils/xml.js";
|
|
5
6
|
export { sanitizeJsonBody } from "./utils/jsonc.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,kBAAkB,GAEnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AA2BhE,OAAO,EACL,eAAe,GAIhB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,oBAAoB,GAErB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EACL,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,GACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,qBAAqB,GAEtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,GAEzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EACjB,gBAAgB,GAEjB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,kBAAkB,GAEnB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,cAAc,uBAAuB,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AA2BhE,OAAO,EACL,eAAe,GAIhB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,oBAAoB,GAErB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAC/E,OAAO,EACL,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,8BAA8B,EAC9B,sBAAsB,GACvB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,qBAAqB,GAEtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,GAEzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EACjB,gBAAgB,GAEjB,MAAM,uBAAuB,CAAC;AAC/B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iBAAiB,CAAC;AAChC,cAAc,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeRequest.d.ts","sourceRoot":"","sources":["../../src/request/executeRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AA4BnF,eAAO,MAAM,kBAAkB,0HAC0F,CAAC;
|
|
1
|
+
{"version":3,"file":"executeRequest.d.ts","sourceRoot":"","sources":["../../src/request/executeRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AA4BnF,eAAO,MAAM,kBAAkB,0HAC0F,CAAC;AA2B1H,eAAO,MAAM,cAAc,GAAU,mDAOlC,mBAAmB,KAAG,OAAO,CAAC,oBAAoB,CA+DpD,CAAC"}
|
|
@@ -23,6 +23,20 @@ const withDefaultUserAgent = (headers) => {
|
|
|
23
23
|
}
|
|
24
24
|
return next;
|
|
25
25
|
};
|
|
26
|
+
// Add a default `http://` scheme when the URL has none (e.g. `localhost:9090`
|
|
27
|
+
// or `api.example.com/x`). Browsers/Electron do this implicitly, so a scheme-
|
|
28
|
+
// less URL that works in the desktop app must also work here (CLI/backend) —
|
|
29
|
+
// otherwise axios throws "Unsupported protocol localhost:". Already-schemed and
|
|
30
|
+
// protocol-relative (`//host`) URLs are left untouched.
|
|
31
|
+
const ensureUrlScheme = (url) => {
|
|
32
|
+
const trimmed = url.trim();
|
|
33
|
+
if (!trimmed)
|
|
34
|
+
return trimmed;
|
|
35
|
+
if (/^[a-zA-Z][a-zA-Z\d+.-]*:\/\//.test(trimmed) || trimmed.startsWith("//")) {
|
|
36
|
+
return trimmed;
|
|
37
|
+
}
|
|
38
|
+
return `http://${trimmed}`;
|
|
39
|
+
};
|
|
26
40
|
export const executeRequest = async ({ method, url, headers, query, body, timeoutMs = 30_000, }) => {
|
|
27
41
|
const startedAt = typeof performance !== "undefined" ? performance.now() : Date.now();
|
|
28
42
|
// Strip JSON comments / trailing commas from a JSON string body so a body
|
|
@@ -33,7 +47,7 @@ export const executeRequest = async ({ method, url, headers, query, body, timeou
|
|
|
33
47
|
: body;
|
|
34
48
|
const config = {
|
|
35
49
|
method,
|
|
36
|
-
url,
|
|
50
|
+
url: ensureUrlScheme(url),
|
|
37
51
|
headers: outgoingHeaders,
|
|
38
52
|
params: query,
|
|
39
53
|
data: requestData,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeRequest.js","sourceRoot":"","sources":["../../src/request/executeRequest.ts"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAGlD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAErD,MAAM,iBAAiB,GAAG,CAAC,WAAmB,EAAW,EAAE,CACzD,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;AAEhC,MAAM,gBAAgB,GAAG,CACvB,OAAgC,EACR,EAAE,CAC1B,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;IAC5C,GAAG;IACH,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC;CAC9D,CAAC,CACH,CAAC;AAEJ,MAAM,eAAe,GAAG,CAAC,OAA+B,EAAU,EAAE;IAClE,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CACxC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,cAAc,CAChD,CAAC;IACF,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC1B,CAAC,CAAC;AAEF,mEAAmE;AACnE,oEAAoE;AACpE,uEAAuE;AACvE,uEAAuE;AACvE,MAAM,CAAC,MAAM,kBAAkB,GAC7B,uHAAuH,CAAC;AAE1H,MAAM,oBAAoB,GAAG,CAC3B,OAA2C,EACnB,EAAE;IAC1B,MAAM,IAAI,GAAG,EAAE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;IACpC,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,YAAY,CAAC,CAAC;IACzF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,IAAI,CAAC,YAAY,CAAC,GAAG,kBAAkB,CAAC;IAC1C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EAAE,EACnC,MAAM,EACN,GAAG,EACH,OAAO,EACP,KAAK,EACL,IAAI,EACJ,SAAS,GAAG,MAAM,GACE,EAAiC,EAAE;IACvD,MAAM,SAAS,GACb,OAAO,WAAW,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;IACtE,0EAA0E;IAC1E,gEAAgE;IAChE,MAAM,eAAe,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,WAAW,GACf,OAAO,IAAI,KAAK,QAAQ,IAAI,iBAAiB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;QAC7E,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC;QACxB,CAAC,CAAC,IAAI,CAAC;IAEX,MAAM,MAAM,GAAuB;QACjC,MAAM;QACN,GAAG;
|
|
1
|
+
{"version":3,"file":"executeRequest.js","sourceRoot":"","sources":["../../src/request/executeRequest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestRunner.d.ts","sourceRoot":"","sources":["../../src/runner/requestRunner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"requestRunner.d.ts","sourceRoot":"","sources":["../../src/runner/requestRunner.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAGV,eAAe,EACf,gBAAgB,EAEjB,MAAM,mBAAmB,CAAC;AAyN3B,eAAO,MAAM,UAAU,GACrB,OAAO,eAAe,KACrB,OAAO,CAAC,gBAAgB,CAiJ1B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { validateContracts } from "../contract/contractValidator.js";
|
|
2
2
|
import { buildDbExecuteCapability, buildRedisCapability, runConfiguredDbQuery, runRedisCommandsForPhase, } from "../host/connections.js";
|
|
3
3
|
import { executeRequest } from "../request/executeRequest.js";
|
|
4
|
+
import { executeScript } from "../script/executor.js";
|
|
4
5
|
import { runScript } from "../script/scriptEngine.js";
|
|
5
6
|
import { resolveTemplateValue } from "../variables/resolver.js";
|
|
6
7
|
const stringifyEnv = (env) => {
|
|
@@ -10,6 +11,44 @@ const stringifyEnv = (env) => {
|
|
|
10
11
|
}
|
|
11
12
|
return out;
|
|
12
13
|
};
|
|
14
|
+
// ── Pre-request script plumbing ────────────────────────────────────────────
|
|
15
|
+
// The sandbox represents headers/query as key/value arrays; the runner uses
|
|
16
|
+
// flat records. These bridge the two so a pre-request script can mutate the
|
|
17
|
+
// request (pm.request.setHeader) and the mutation reaches the HTTP call.
|
|
18
|
+
const headersToScriptPairs = (record) => Object.entries(record ?? {}).map(([key, value]) => ({ key, value, enabled: true }));
|
|
19
|
+
const scriptPairsToRecord = (pairs) => {
|
|
20
|
+
const out = {};
|
|
21
|
+
for (const pair of pairs) {
|
|
22
|
+
if (pair.enabled === false || !pair.key)
|
|
23
|
+
continue;
|
|
24
|
+
out[pair.key] = pair.value;
|
|
25
|
+
}
|
|
26
|
+
return out;
|
|
27
|
+
};
|
|
28
|
+
const toScriptRequestState = (request) => ({
|
|
29
|
+
method: request.method,
|
|
30
|
+
url: request.url,
|
|
31
|
+
headers: headersToScriptPairs(request.headers),
|
|
32
|
+
query: headersToScriptPairs(request.query),
|
|
33
|
+
body: {
|
|
34
|
+
mode: "raw",
|
|
35
|
+
raw: typeof request.body === "string"
|
|
36
|
+
? request.body
|
|
37
|
+
: request.body != null
|
|
38
|
+
? JSON.stringify(request.body)
|
|
39
|
+
: "",
|
|
40
|
+
formEntries: [],
|
|
41
|
+
},
|
|
42
|
+
});
|
|
43
|
+
// Apply a script's environment writes back onto the shared EnvStore so later
|
|
44
|
+
// template resolution (and later requests) see the new values.
|
|
45
|
+
const applyScriptEnvMutations = (env, mutations) => {
|
|
46
|
+
for (const mutation of mutations) {
|
|
47
|
+
if (mutation.scope !== "environment")
|
|
48
|
+
continue;
|
|
49
|
+
env.set(mutation.key, mutation.type === "unset" ? "" : (mutation.value ?? ""));
|
|
50
|
+
}
|
|
51
|
+
};
|
|
13
52
|
// Build a `{{response.*}}` template root from an HTTP result so pre/post DB +
|
|
14
53
|
// Redis nodes can reference the response body. Mirrors the desktop host's
|
|
15
54
|
// `buildResponseTemplateRoot`.
|
|
@@ -124,14 +163,59 @@ const buildScriptExtensions = (input) => {
|
|
|
124
163
|
return { db, redis };
|
|
125
164
|
};
|
|
126
165
|
export const runRequest = async (input) => {
|
|
127
|
-
|
|
166
|
+
// `let` so the pre-request script can re-resolve after mutating env/request;
|
|
167
|
+
// the initial value also covers the catch block if something throws early.
|
|
168
|
+
let runtimeRequest = normalizeRequestForExecution(input);
|
|
128
169
|
const connections = input.connections ?? {};
|
|
129
170
|
const featurePolicy = input.featurePolicy;
|
|
130
171
|
const databaseEnabled = featurePolicy ? featurePolicy.database : true;
|
|
131
172
|
const redisConfig = input.request.redis;
|
|
132
173
|
try {
|
|
133
|
-
// ── Pre-request phase: DB node + Redis commands run before the HTTP call.
|
|
134
174
|
const envBefore = stringifyEnv(input.env.all());
|
|
175
|
+
// ── Pre-request script: runs BEFORE the HTTP call (and before template
|
|
176
|
+
// resolution) so `pm.environment.set` tokens and `pm.request.setHeader`
|
|
177
|
+
// mutations reach the outgoing request. Its console output is dropped
|
|
178
|
+
// here; test assertions surface in scriptResults.
|
|
179
|
+
let preRequestTestResults = [];
|
|
180
|
+
if (input.request.preRequestScript?.trim()) {
|
|
181
|
+
const preResult = await executeScript({
|
|
182
|
+
script: input.request.preRequestScript,
|
|
183
|
+
stage: "pre-request",
|
|
184
|
+
filename: "callman-request.script.js",
|
|
185
|
+
capabilities: {
|
|
186
|
+
environment: { values: envBefore, emitMutations: true },
|
|
187
|
+
request: toScriptRequestState(input.request),
|
|
188
|
+
extensions: {
|
|
189
|
+
log: true,
|
|
190
|
+
node: true,
|
|
191
|
+
random: true,
|
|
192
|
+
counter: { snapshot: [] },
|
|
193
|
+
cryptojs: true,
|
|
194
|
+
variables: true,
|
|
195
|
+
},
|
|
196
|
+
},
|
|
197
|
+
});
|
|
198
|
+
applyScriptEnvMutations(input.env, preResult.variableMutations);
|
|
199
|
+
preRequestTestResults = preResult.testResults;
|
|
200
|
+
const mutatedRequest = preResult.request
|
|
201
|
+
? {
|
|
202
|
+
...input.request,
|
|
203
|
+
method: preResult.request.method,
|
|
204
|
+
url: preResult.request.url,
|
|
205
|
+
headers: scriptPairsToRecord(preResult.request.headers),
|
|
206
|
+
query: scriptPairsToRecord(preResult.request.query),
|
|
207
|
+
body: preResult.request.body.mode === "raw"
|
|
208
|
+
? preResult.request.body.raw
|
|
209
|
+
: input.request.body,
|
|
210
|
+
}
|
|
211
|
+
: input.request;
|
|
212
|
+
// Re-resolve templates against the updated env + mutated request.
|
|
213
|
+
runtimeRequest = normalizeRequestForExecution({
|
|
214
|
+
...input,
|
|
215
|
+
request: mutatedRequest,
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
// ── Pre-request phase: DB node + Redis commands run before the HTTP call.
|
|
135
219
|
const preDbResult = databaseEnabled
|
|
136
220
|
? await runConfiguredDbQuery({
|
|
137
221
|
connections,
|
|
@@ -176,7 +260,7 @@ export const runRequest = async (input) => {
|
|
|
176
260
|
redisPre,
|
|
177
261
|
redisPost,
|
|
178
262
|
});
|
|
179
|
-
const
|
|
263
|
+
const testsScriptResults = await runScript(input.request.tests, {
|
|
180
264
|
env: input.env,
|
|
181
265
|
response,
|
|
182
266
|
request: runtimeRequest,
|
|
@@ -193,7 +277,7 @@ export const runRequest = async (input) => {
|
|
|
193
277
|
duration: response.duration,
|
|
194
278
|
response,
|
|
195
279
|
request: runtimeRequest,
|
|
196
|
-
scriptResults,
|
|
280
|
+
scriptResults: [...preRequestTestResults, ...testsScriptResults],
|
|
197
281
|
contractResults,
|
|
198
282
|
},
|
|
199
283
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestRunner.js","sourceRoot":"","sources":["../../src/runner/requestRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EACL,wBAAwB,EACxB,oBAAoB,EACpB,oBAAoB,EACpB,wBAAwB,GAEzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"requestRunner.js","sourceRoot":"","sources":["../../src/runner/requestRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import type { DataContractSet, DataDrivenRunResult, RunRequestInput } from "../types/index.js";
|
|
2
|
+
export declare const runRequestWithDataset: (input: RunRequestInput, dataset: DataContractSet | null | undefined) => Promise<DataDrivenRunResult>;
|
|
3
|
+
//# sourceMappingURL=runRequestWithDataset.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runRequestWithDataset.d.ts","sourceRoot":"","sources":["../../src/runner/runRequestWithDataset.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAGV,eAAe,EAEf,mBAAmB,EACnB,eAAe,EAEhB,MAAM,mBAAmB,CAAC;AAoD3B,eAAO,MAAM,qBAAqB,GAChC,OAAO,eAAe,EACtB,SAAS,eAAe,GAAG,IAAI,GAAG,SAAS,KAC1C,OAAO,CAAC,mBAAmB,CAoE7B,CAAC"}
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
// Data-driven contract run for a single request. Runs the request ONCE PER
|
|
2
|
+
// dataset row, injecting the row's values as `{{data.<column>}}` and validating
|
|
3
|
+
// that row's expected result (optional HTTP status + response-field assertions)
|
|
4
|
+
// against the response. Mirrors the scenario `runScenarioWithDataset` idiom but
|
|
5
|
+
// for the request runner, so the CLI, backend and desktop share one primitive.
|
|
6
|
+
//
|
|
7
|
+
// With no rows it falls back to a single plain `runRequest`.
|
|
8
|
+
import { runRequest } from "./requestRunner.js";
|
|
9
|
+
// Build the contract rule array for one row: each assertion becomes a
|
|
10
|
+
// path-scoped contract, and an `expectedStatus` becomes a `response.status`
|
|
11
|
+
// contract (the validator routes `response.*` paths against the HTTP envelope,
|
|
12
|
+
// so this asserts the status code with no dedicated primitive).
|
|
13
|
+
const buildRowContracts = (row) => {
|
|
14
|
+
const contracts = [];
|
|
15
|
+
if (typeof row.expectedStatus === "number") {
|
|
16
|
+
contracts.push({
|
|
17
|
+
name: `Expected status ${row.expectedStatus}`,
|
|
18
|
+
path: "response.status",
|
|
19
|
+
enabled: true,
|
|
20
|
+
rules: { equals: row.expectedStatus },
|
|
21
|
+
});
|
|
22
|
+
}
|
|
23
|
+
for (const assertion of row.assertions ?? []) {
|
|
24
|
+
if (assertion.enabled === false)
|
|
25
|
+
continue;
|
|
26
|
+
contracts.push({
|
|
27
|
+
path: assertion.path,
|
|
28
|
+
enabled: true,
|
|
29
|
+
rules: assertion.rules,
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
return contracts;
|
|
33
|
+
};
|
|
34
|
+
// CRITICAL: the request runner's resolver splits `data.column` into nested
|
|
35
|
+
// tokens (`env["data"]["column"]`), so a flat `"data.column"` key would NOT
|
|
36
|
+
// resolve `{{data.column}}`. We must inject a NESTED `data` object.
|
|
37
|
+
const injectRow = (input, row, rowIndex, total) => {
|
|
38
|
+
const scope = {};
|
|
39
|
+
for (const [key, value] of Object.entries(row.data)) {
|
|
40
|
+
scope[key] = value == null ? "" : String(value);
|
|
41
|
+
}
|
|
42
|
+
scope.$index = String(rowIndex + 1);
|
|
43
|
+
scope.$row = String(rowIndex + 1);
|
|
44
|
+
scope.$total = String(total);
|
|
45
|
+
input.env.set("data", scope);
|
|
46
|
+
};
|
|
47
|
+
const hasFailure = (results) => results.some((result) => result.status === "FAIL");
|
|
48
|
+
export const runRequestWithDataset = async (input, dataset) => {
|
|
49
|
+
const rows = dataset?.rows ?? [];
|
|
50
|
+
// No rows → single plain run reported as one iteration (keeps callers simple).
|
|
51
|
+
if (rows.length === 0) {
|
|
52
|
+
const { result } = await runRequest(input);
|
|
53
|
+
const passed = !hasFailure(result.contractResults) && !hasFailure(result.scriptResults);
|
|
54
|
+
return {
|
|
55
|
+
iterations: [
|
|
56
|
+
{
|
|
57
|
+
rowIndex: 0,
|
|
58
|
+
row: {},
|
|
59
|
+
status: result.status,
|
|
60
|
+
durationMs: result.duration,
|
|
61
|
+
scriptResults: result.scriptResults,
|
|
62
|
+
contractResults: result.contractResults,
|
|
63
|
+
passed: passed && result.status >= 200 && result.status < 400,
|
|
64
|
+
},
|
|
65
|
+
],
|
|
66
|
+
summary: { total: 1, passed: passed ? 1 : 0, failed: passed ? 0 : 1 },
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
const iterations = [];
|
|
70
|
+
for (let rowIndex = 0; rowIndex < rows.length; rowIndex += 1) {
|
|
71
|
+
const row = rows[rowIndex] ?? { data: {} };
|
|
72
|
+
injectRow(input, row, rowIndex, rows.length);
|
|
73
|
+
const rowContracts = buildRowContracts(row);
|
|
74
|
+
const { result, response } = await runRequest({
|
|
75
|
+
...input,
|
|
76
|
+
request: { ...input.request, contracts: rowContracts },
|
|
77
|
+
});
|
|
78
|
+
const failingContract = hasFailure(result.contractResults);
|
|
79
|
+
const failingScript = hasFailure(result.scriptResults);
|
|
80
|
+
const statusOk = result.status >= 200 && result.status < 400;
|
|
81
|
+
// When an expected status is declared, the contract check governs the
|
|
82
|
+
// verdict (a mismatch shows up as a failing contract); otherwise fall back
|
|
83
|
+
// to the coarse 2xx/3xx check.
|
|
84
|
+
const passed = !failingContract &&
|
|
85
|
+
!failingScript &&
|
|
86
|
+
(typeof row.expectedStatus === "number" || statusOk);
|
|
87
|
+
iterations.push({
|
|
88
|
+
rowIndex,
|
|
89
|
+
row: row.data,
|
|
90
|
+
status: result.status,
|
|
91
|
+
durationMs: result.duration,
|
|
92
|
+
scriptResults: result.scriptResults,
|
|
93
|
+
contractResults: result.contractResults,
|
|
94
|
+
passed,
|
|
95
|
+
request: result.request,
|
|
96
|
+
response,
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
const passed = iterations.filter((iteration) => iteration.passed).length;
|
|
100
|
+
return {
|
|
101
|
+
iterations,
|
|
102
|
+
summary: {
|
|
103
|
+
total: iterations.length,
|
|
104
|
+
passed,
|
|
105
|
+
failed: iterations.length - passed,
|
|
106
|
+
},
|
|
107
|
+
};
|
|
108
|
+
};
|
|
109
|
+
//# sourceMappingURL=runRequestWithDataset.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runRequestWithDataset.js","sourceRoot":"","sources":["../../src/runner/runRequestWithDataset.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export interface ExpectedStatusEvaluation {
|
|
2
|
+
/** The resolved expression as evaluated (trimmed). */
|
|
3
|
+
raw: string;
|
|
4
|
+
/** Whether every term parsed under the grammar above. */
|
|
5
|
+
valid: boolean;
|
|
6
|
+
/** Whether the status satisfied at least one term (false when invalid). */
|
|
7
|
+
matched: boolean;
|
|
8
|
+
}
|
|
9
|
+
export declare const evaluateScenarioExpectedStatus: (resolvedExpression: string | null | undefined, status: number) => ExpectedStatusEvaluation | null;
|
|
10
|
+
//# sourceMappingURL=expected-status.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expected-status.d.ts","sourceRoot":"","sources":["../../../../src/scenario-runner/adapters/helpers/expected-status.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,wBAAwB;IACvC,sDAAsD;IACtD,GAAG,EAAE,MAAM,CAAC;IACZ,yDAAyD;IACzD,KAAK,EAAE,OAAO,CAAC;IACf,2EAA2E;IAC3E,OAAO,EAAE,OAAO,CAAC;CAClB;AAMD,eAAO,MAAM,8BAA8B,GACzC,oBAAoB,MAAM,GAAG,IAAI,GAAG,SAAS,EAC7C,QAAQ,MAAM,KACb,wBAAwB,GAAG,IA4C7B,CAAC"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
// Expected-status expression evaluation — the request node's no-code
|
|
2
|
+
// negative-testing knob (`config.expectedStatus`).
|
|
3
|
+
//
|
|
4
|
+
// Grammar (after template resolution): comma-separated terms, each one of
|
|
5
|
+
// exact status "429"
|
|
6
|
+
// range "200-299"
|
|
7
|
+
// status class "2xx" (case-insensitive)
|
|
8
|
+
// The whole expression matches when ANY term matches. An empty/absent
|
|
9
|
+
// expression means "no expectation" (legacy 2xx/3xx semantics) and callers
|
|
10
|
+
// receive `null`. A malformed expression (including an unresolved
|
|
11
|
+
// `{{template}}`) yields `valid: false` so the node fails LOUDLY instead of
|
|
12
|
+
// silently passing/failing.
|
|
13
|
+
const EXACT_TERM = /^(\d{3})$/;
|
|
14
|
+
const RANGE_TERM = /^(\d{3})\s*-\s*(\d{3})$/;
|
|
15
|
+
const CLASS_TERM = /^([1-5])xx$/i;
|
|
16
|
+
export const evaluateScenarioExpectedStatus = (resolvedExpression, status) => {
|
|
17
|
+
const raw = (resolvedExpression ?? "").trim();
|
|
18
|
+
if (!raw) {
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
21
|
+
const terms = raw
|
|
22
|
+
.split(",")
|
|
23
|
+
.map((term) => term.trim())
|
|
24
|
+
.filter((term) => term.length > 0);
|
|
25
|
+
if (terms.length === 0) {
|
|
26
|
+
return { raw, valid: false, matched: false };
|
|
27
|
+
}
|
|
28
|
+
let matched = false;
|
|
29
|
+
for (const term of terms) {
|
|
30
|
+
const exact = EXACT_TERM.exec(term);
|
|
31
|
+
if (exact) {
|
|
32
|
+
if (status === Number(exact[1]))
|
|
33
|
+
matched = true;
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
const range = RANGE_TERM.exec(term);
|
|
37
|
+
if (range) {
|
|
38
|
+
const low = Number(range[1]);
|
|
39
|
+
const high = Number(range[2]);
|
|
40
|
+
if (low > high) {
|
|
41
|
+
return { raw, valid: false, matched: false };
|
|
42
|
+
}
|
|
43
|
+
if (status >= low && status <= high)
|
|
44
|
+
matched = true;
|
|
45
|
+
continue;
|
|
46
|
+
}
|
|
47
|
+
const statusClass = CLASS_TERM.exec(term);
|
|
48
|
+
if (statusClass) {
|
|
49
|
+
if (Math.floor(status / 100) === Number(statusClass[1]))
|
|
50
|
+
matched = true;
|
|
51
|
+
continue;
|
|
52
|
+
}
|
|
53
|
+
return { raw, valid: false, matched: false };
|
|
54
|
+
}
|
|
55
|
+
return { raw, valid: true, matched };
|
|
56
|
+
};
|
|
57
|
+
//# sourceMappingURL=expected-status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"expected-status.js","sourceRoot":"","sources":["../../../../src/scenario-runner/adapters/helpers/expected-status.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,mDAAmD;AACnD,EAAE;AACF,0EAA0E;AAC1E,yBAAyB;AACzB,6BAA6B;AAC7B,4CAA4C;AAC5C,sEAAsE;AACtE,2EAA2E;AAC3E,kEAAkE;AAClE,4EAA4E;AAC5E,4BAA4B;AAW5B,MAAM,UAAU,GAAG,WAAW,CAAC;AAC/B,MAAM,UAAU,GAAG,yBAAyB,CAAC;AAC7C,MAAM,UAAU,GAAG,cAAc,CAAC;AAElC,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,kBAA6C,EAC7C,MAAc,EACmB,EAAE;IACnC,MAAM,GAAG,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9C,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,GAAG;SACd,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;SAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAErC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC/C,CAAC;IAED,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,KAAK,EAAE,CAAC;YACV,IAAI,MAAM,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAAE,OAAO,GAAG,IAAI,CAAC;YAChD,SAAS;QACX,CAAC;QAED,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,IAAI,GAAG,GAAG,IAAI,EAAE,CAAC;gBACf,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;YAC/C,CAAC;YACD,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,IAAI,IAAI;gBAAE,OAAO,GAAG,IAAI,CAAC;YACpD,SAAS;QACX,CAAC;QAED,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,WAAW,EAAE,CAAC;YAChB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,KAAK,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;gBAAE,OAAO,GAAG,IAAI,CAAC;YACxE,SAAS;QACX,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC/C,CAAC;IAED,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;AACvC,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { ScenarioRequestResponse } from "../../types.js";
|
|
2
|
+
import type { ExpectedStatusEvaluation } from "./expected-status.js";
|
|
2
3
|
export interface FailureMessageInput {
|
|
3
4
|
response: ScenarioRequestResponse;
|
|
4
5
|
postResponseError?: {
|
|
@@ -16,8 +17,15 @@ export interface FailureMessageInput {
|
|
|
16
17
|
status?: "PASS" | "FAIL" | "SKIP";
|
|
17
18
|
message?: string;
|
|
18
19
|
}>;
|
|
20
|
+
/**
|
|
21
|
+
* Result of evaluating `config.expectedStatus` (null/absent = no
|
|
22
|
+
* expectation → legacy 2xx/3xx semantics). When present and matched, the
|
|
23
|
+
* built-in "non-2xx fails" rule is skipped so e.g. an expected 429 counts
|
|
24
|
+
* as a PASS — contract assertions and test results still apply.
|
|
25
|
+
*/
|
|
26
|
+
statusExpectation?: ExpectedStatusEvaluation | null;
|
|
19
27
|
}
|
|
20
|
-
export declare const buildRequestFailureMessage: ({ response, postResponseError, testsError, testResults, contractResults, }: FailureMessageInput) => string | null;
|
|
28
|
+
export declare const buildRequestFailureMessage: ({ response, postResponseError, testsError, testResults, contractResults, statusExpectation, }: FailureMessageInput) => string | null;
|
|
21
29
|
export declare const summarizeContractResults: (contractResults: Array<{
|
|
22
30
|
status?: "PASS" | "FAIL" | "SKIP";
|
|
23
31
|
}>) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failure-messages.d.ts","sourceRoot":"","sources":["../../../../src/scenario-runner/adapters/helpers/failure-messages.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"failure-messages.d.ts","sourceRoot":"","sources":["../../../../src/scenario-runner/adapters/helpers/failure-messages.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAE9D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAErE,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,uBAAuB,CAAC;IAClC,iBAAiB,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/C,UAAU,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IACxC,WAAW,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvF,eAAe,EAAE,KAAK,CAAC;QAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAChF;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,wBAAwB,GAAG,IAAI,CAAC;CACrD;AAED,eAAO,MAAM,0BAA0B,GAAI,+FAOxC,mBAAmB,KAAG,MAAM,GAAG,IAgDjC,CAAC;AAGF,eAAO,MAAM,wBAAwB,GACnC,iBAAiB,KAAK,CAAC;IAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC,KAC5D;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAmBlE,CAAC"}
|
|
@@ -4,9 +4,10 @@
|
|
|
4
4
|
// the backend's current behavior; renderer-side variant collapses into the
|
|
5
5
|
// same logic post-unification.
|
|
6
6
|
//
|
|
7
|
-
// Priority:
|
|
8
|
-
//
|
|
9
|
-
|
|
7
|
+
// Priority: script errors → transport error (always fails) → expected-status
|
|
8
|
+
// mismatch/invalid (when configured) → response.ok=false (legacy, only when
|
|
9
|
+
// no expectation) → first FAIL test → first FAIL contract → null (success).
|
|
10
|
+
export const buildRequestFailureMessage = ({ response, postResponseError, testsError, testResults, contractResults, statusExpectation, }) => {
|
|
10
11
|
// Backend's current behavior elevates explicit script errors above
|
|
11
12
|
// response/contract failures so the operator sees the root cause first.
|
|
12
13
|
if (postResponseError?.message) {
|
|
@@ -15,14 +16,27 @@ export const buildRequestFailureMessage = ({ response, postResponseError, testsE
|
|
|
15
16
|
if (testsError?.message) {
|
|
16
17
|
return `Tests script failed: ${testsError.message}`;
|
|
17
18
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
// Transport-level failures (executor error / no HTTP status) always fail —
|
|
20
|
+
// an expectation can only match a real HTTP response.
|
|
21
|
+
if (response.errorMessage?.trim()) {
|
|
22
|
+
return response.errorMessage;
|
|
23
|
+
}
|
|
24
|
+
if (response.status <= 0) {
|
|
25
|
+
return "Request execution failed.";
|
|
26
|
+
}
|
|
27
|
+
const expectation = statusExpectation ?? null;
|
|
28
|
+
if (expectation) {
|
|
29
|
+
if (!expectation.valid) {
|
|
30
|
+
return `Expected status expression "${expectation.raw}" is invalid. Use forms like "201", "429", "200-299" or "2xx".`;
|
|
21
31
|
}
|
|
22
|
-
if (
|
|
23
|
-
return `
|
|
32
|
+
if (!expectation.matched) {
|
|
33
|
+
return `Expected status ${expectation.raw} but got ${response.status}.`;
|
|
24
34
|
}
|
|
25
|
-
|
|
35
|
+
// Expectation matched — skip the legacy non-2xx failure below and let
|
|
36
|
+
// tests/contracts decide.
|
|
37
|
+
}
|
|
38
|
+
else if (!response.ok) {
|
|
39
|
+
return `Request failed with status ${response.status}`;
|
|
26
40
|
}
|
|
27
41
|
const failedTest = testResults.find((entry) => entry.status === "FAIL");
|
|
28
42
|
if (failedTest) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"failure-messages.js","sourceRoot":"","sources":["../../../../src/scenario-runner/adapters/helpers/failure-messages.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,qFAAqF;AACrF,2EAA2E;AAC3E,2EAA2E;AAC3E,+BAA+B;AAC/B,EAAE;AACF,
|
|
1
|
+
{"version":3,"file":"failure-messages.js","sourceRoot":"","sources":["../../../../src/scenario-runner/adapters/helpers/failure-messages.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,8 @@ export { buildNotificationExecutor } from "./notification-executor.js";
|
|
|
7
7
|
export { buildRedisExecutor } from "./redis-executor.js";
|
|
8
8
|
export { buildRequestExecutor } from "./request-executor.js";
|
|
9
9
|
export { buildScriptExecutor } from "./script-executor.js";
|
|
10
|
+
export { evaluateScenarioExpectedStatus, type ExpectedStatusEvaluation, } from "./helpers/expected-status.js";
|
|
11
|
+
export { buildRequestFailureMessage, summarizeContractResults, type FailureMessageInput, } from "./helpers/failure-messages.js";
|
|
10
12
|
export type { DatabaseExecuteInput, DatabaseExecuteResult, HttpExecuteInput, HttpExecuteResult, KafkaCaptureInput, KafkaCaptureOutcome, RedisCommandOutcome, RedisExecuteInput, RedisExecuteResult, ScenarioConnectionProvider, ScenarioConnectionRuntime, ScenarioConnectionType, ScenarioRuntimeAdapterDrivers, ScenarioRuntimeAdapterFactoryOptions, } from "./types.js";
|
|
11
13
|
export type { ConnectionRuntimeConfig, DatabaseConnectionConfig, DatabaseConnectionMode, KafkaConnectionConfig, NotificationConnectionConfig, RedisConnectionConfig, } from "./connection-config.js";
|
|
12
14
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/scenario-runner/adapters/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAS3D,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,YAAY,CAAC;AAEvE,eAAO,MAAM,4BAA4B,GACvC,SAAS,oCAAoC,KAC5C,uBAQD,CAAC;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/scenario-runner/adapters/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAS3D,OAAO,KAAK,EAAE,oCAAoC,EAAE,MAAM,YAAY,CAAC;AAEvE,eAAO,MAAM,4BAA4B,GACvC,SAAS,oCAAoC,KAC5C,uBAQD,CAAC;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAI3D,OAAO,EACL,8BAA8B,EAC9B,KAAK,wBAAwB,GAC9B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,EACxB,KAAK,mBAAmB,GACzB,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EACV,oBAAoB,EACpB,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,0BAA0B,EAC1B,yBAAyB,EACzB,sBAAsB,EACtB,6BAA6B,EAC7B,oCAAoC,GACrC,MAAM,YAAY,CAAC;AAEpB,YAAY,EACV,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,qBAAqB,EACrB,4BAA4B,EAC5B,qBAAqB,GACtB,MAAM,wBAAwB,CAAC"}
|
|
@@ -27,4 +27,9 @@ export { buildNotificationExecutor } from "./notification-executor.js";
|
|
|
27
27
|
export { buildRedisExecutor } from "./redis-executor.js";
|
|
28
28
|
export { buildRequestExecutor } from "./request-executor.js";
|
|
29
29
|
export { buildScriptExecutor } from "./script-executor.js";
|
|
30
|
+
// Expected-status (no-code negative testing) + failure-message helpers —
|
|
31
|
+
// exported so hosts with their own request pipelines (desktop interactive
|
|
32
|
+
// run) evaluate the exact same semantics instead of duplicating them.
|
|
33
|
+
export { evaluateScenarioExpectedStatus, } from "./helpers/expected-status.js";
|
|
34
|
+
export { buildRequestFailureMessage, summarizeContractResults, } from "./helpers/failure-messages.js";
|
|
30
35
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/scenario-runner/adapters/index.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,EAAE;AACF,gEAAgE;AAChE,6DAA6D;AAC7D,qEAAqE;AACrE,qEAAqE;AACrE,uEAAuE;AACvE,wDAAwD;AAIxD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAI3D,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,OAA6C,EACpB,EAAE,CAAC,CAAC;IAC7B,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC;IAC9C,UAAU,EAAE,eAAe,CAAC,OAAO,CAAC;IACpC,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC;IAC1C,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC;IAC1C,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,mBAAmB,CAAC,OAAO,CAAC;IACtE,oBAAoB,EAClB,OAAO,CAAC,oBAAoB,IAAI,yBAAyB,CAAC,OAAO,CAAC;CACrE,CAAC,CAAC;AAEH,iEAAiE;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/scenario-runner/adapters/index.ts"],"names":[],"mappings":"AAAA,6DAA6D;AAC7D,EAAE;AACF,gEAAgE;AAChE,6DAA6D;AAC7D,qEAAqE;AACrE,qEAAqE;AACrE,uEAAuE;AACvE,wDAAwD;AAIxD,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAI3D,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAC1C,OAA6C,EACpB,EAAE,CAAC,CAAC;IAC7B,eAAe,EAAE,oBAAoB,CAAC,OAAO,CAAC;IAC9C,UAAU,EAAE,eAAe,CAAC,OAAO,CAAC;IACpC,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC;IAC1C,aAAa,EAAE,kBAAkB,CAAC,OAAO,CAAC;IAC1C,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,mBAAmB,CAAC,OAAO,CAAC;IACtE,oBAAoB,EAClB,OAAO,CAAC,oBAAoB,IAAI,yBAAyB,CAAC,OAAO,CAAC;CACrE,CAAC,CAAC;AAEH,iEAAiE;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,yEAAyE;AACzE,0EAA0E;AAC1E,sEAAsE;AACtE,OAAO,EACL,8BAA8B,GAE/B,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,0BAA0B,EAC1B,wBAAwB,GAEzB,MAAM,+BAA+B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-executor.d.ts","sourceRoot":"","sources":["../../../src/scenario-runner/adapters/request-executor.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACV,6BAA6B,EAC7B,8BAA8B,EAE/B,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"request-executor.d.ts","sourceRoot":"","sources":["../../../src/scenario-runner/adapters/request-executor.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EACV,6BAA6B,EAC7B,8BAA8B,EAE/B,MAAM,aAAa,CAAC;AAyBrB,OAAO,KAAK,EAEV,oCAAoC,EACrC,MAAM,YAAY,CAAC;AAmBpB,eAAO,MAAM,oBAAoB,GAC/B,SAAS,oCAAoC,MAEtC,OAAO,6BAA6B,KAAG,OAAO,CAAC,8BAA8B,CA6PnF,CAAC"}
|