@postmate/core 0.1.12 → 0.1.14
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/engine/apiEngine.d.ts.map +1 -1
- package/dist/engine/apiEngine.js +13 -12
- package/dist/engine/apiEngine.js.map +1 -1
- package/dist/engine/collectionRunner.d.ts.map +1 -1
- package/dist/engine/collectionRunner.js +6 -3
- package/dist/engine/collectionRunner.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiEngine.d.ts","sourceRoot":"","sources":["../../src/engine/apiEngine.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAc,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;CACtB;AAED,qBAAa,SAAS;IAEd,OAAO,CAAC,UAAU;IACX,YAAY,EAAE,YAAY;IACjC,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,MAAM,CAAC;gBAJP,UAAU,EAAE,UAAU,EACvB,YAAY,EAAE,YAAY,EACzB,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,aAAa,EAC5B,MAAM,CAAC,EAAE,UAAU,YAAA;IAWzB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAiDnE,6BAA6B,CAC/B,OAAO,EAAE,eAAe,EACxB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,GAAE,GAAG,CAAC,MAAM,CAAa,GACjC,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"apiEngine.d.ts","sourceRoot":"","sources":["../../src/engine/apiEngine.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,eAAe,EAAc,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAIhD,MAAM,WAAW,gBAAgB;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;CACtB;AAED,qBAAa,SAAS;IAEd,OAAO,CAAC,UAAU;IACX,YAAY,EAAE,YAAY;IACjC,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,MAAM,CAAC;gBAJP,UAAU,EAAE,UAAU,EACvB,YAAY,EAAE,YAAY,EACzB,iBAAiB,EAAE,iBAAiB,EACpC,aAAa,EAAE,aAAa,EAC5B,MAAM,CAAC,EAAE,UAAU,YAAA;IAWzB,cAAc,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAiDnE,6BAA6B,CAC/B,OAAO,EAAE,eAAe,EACxB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,GAAE,GAAG,CAAC,MAAM,CAAa,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAoE5B,iBAAiB;YAQH,kBAAkB;YA8ElB,uBAAuB;IAmBrC,OAAO,CAAC,WAAW;IAsCb,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAUjE,OAAO,CAAC,QAAQ;CAOnB"}
|
package/dist/engine/apiEngine.js
CHANGED
|
@@ -67,39 +67,40 @@ export class ApiEngine {
|
|
|
67
67
|
};
|
|
68
68
|
}
|
|
69
69
|
async executeRequestWithPrerequests(request, parentData, visited = new Set()) {
|
|
70
|
-
|
|
71
|
-
|
|
70
|
+
let workingReq = structuredClone(request);
|
|
71
|
+
if (workingReq.env) {
|
|
72
|
+
this.scriptEngine.setVariable('activeEnv', workingReq.env);
|
|
72
73
|
}
|
|
73
|
-
if (!
|
|
74
|
+
if (!workingReq) {
|
|
74
75
|
throw new Error('Request is undefined');
|
|
75
76
|
}
|
|
76
77
|
// 🔁 Circular prerequest protection
|
|
77
|
-
const key = `${
|
|
78
|
+
const key = `${workingReq.collectionName}:${workingReq.id || workingReq.name}`;
|
|
78
79
|
if (visited.has(key)) {
|
|
79
80
|
throw new Error(`Circular prerequest detected: ${key}`);
|
|
80
81
|
}
|
|
81
82
|
visited.add(key);
|
|
82
83
|
// 🧬 Inherit data (datatable / globals)
|
|
83
84
|
if (parentData) {
|
|
84
|
-
|
|
85
|
+
workingReq.data = parentData;
|
|
85
86
|
}
|
|
86
|
-
this.scriptEngine.addToGlobalVariables(
|
|
87
|
+
this.scriptEngine.addToGlobalVariables(workingReq.data);
|
|
87
88
|
/* -----------------------------------
|
|
88
89
|
* 1️⃣ Execute prerequests (recursive)
|
|
89
90
|
* ----------------------------------- */
|
|
90
|
-
const preRequests =
|
|
91
|
+
const preRequests = workingReq.preRequests || [];
|
|
91
92
|
for (const pre of preRequests) {
|
|
92
93
|
const preReq = await this.collectionManager.getRequest(pre.collectionName, pre.requestId);
|
|
93
94
|
if (!preReq)
|
|
94
95
|
continue;
|
|
95
|
-
await this.executeRequestWithPrerequests(preReq,
|
|
96
|
+
await this.executeRequestWithPrerequests(preReq, workingReq.data, visited);
|
|
96
97
|
}
|
|
97
98
|
/* -----------------------------------
|
|
98
99
|
* 2️⃣ Run pre-request script
|
|
99
100
|
* ----------------------------------- */
|
|
100
|
-
if (
|
|
101
|
+
if (workingReq.preRequestScript) {
|
|
101
102
|
await this.scriptEngine.run({
|
|
102
|
-
script:
|
|
103
|
+
script: workingReq.preRequestScript,
|
|
103
104
|
RESPONSE: {}, // no response yet
|
|
104
105
|
timeout: 20000
|
|
105
106
|
});
|
|
@@ -107,12 +108,12 @@ export class ApiEngine {
|
|
|
107
108
|
/* -----------------------------------
|
|
108
109
|
* 3️⃣ Resolve variables
|
|
109
110
|
* ----------------------------------- */
|
|
110
|
-
|
|
111
|
+
workingReq = await this.resolveRequestVariables(workingReq);
|
|
111
112
|
// request = await this.resolveEnvVariables(request);
|
|
112
113
|
/* -----------------------------------
|
|
113
114
|
* 4️⃣ Execute actual HTTP request
|
|
114
115
|
* ----------------------------------- */
|
|
115
|
-
const result = await this.executeRequest(
|
|
116
|
+
const result = await this.executeRequest(workingReq);
|
|
116
117
|
return result;
|
|
117
118
|
}
|
|
118
119
|
clearAllVariables() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apiEngine.js","sourceRoot":"","sources":["../../src/engine/apiEngine.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"apiEngine.js","sourceRoot":"","sources":["../../src/engine/apiEngine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collectionRunner.d.ts","sourceRoot":"","sources":["../../src/engine/collectionRunner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAC9F,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAM3C,qBAAa,gBAAgB;IAIrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,UAAU;IALtB,OAAO,CAAC,OAAO,CAAS;gBAGZ,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU;IAGlC,IAAI;IAIE,GAAG,CACL,OAAO,EAAE,oBAAoB,EAC7B,MAAM,GAAE,mBAAwB,GACjC,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"collectionRunner.d.ts","sourceRoot":"","sources":["../../src/engine/collectionRunner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAC9F,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAM3C,qBAAa,gBAAgB;IAIrB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,UAAU;IALtB,OAAO,CAAC,OAAO,CAAS;gBAGZ,SAAS,EAAE,SAAS,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,UAAU,EAAE,UAAU;IAGlC,IAAI;IAIE,GAAG,CACL,OAAO,EAAE,oBAAoB,EAC7B,MAAM,GAAE,mBAAwB,GACjC,OAAO,CAAC,IAAI,CAAC;IAqFhB,iBAAiB;CAGpB"}
|
|
@@ -13,7 +13,7 @@ export class CollectionRunner {
|
|
|
13
13
|
this.stopped = true;
|
|
14
14
|
}
|
|
15
15
|
async run(options, events = {}) {
|
|
16
|
-
|
|
16
|
+
this.stopped = false;
|
|
17
17
|
this.apiEngine.scriptEngine.setVariable('activeEnv', options.env);
|
|
18
18
|
const requests = await this.collectionManager.getRequestsByContainer(options.collectionName, options.containerId || '', options.requestIds);
|
|
19
19
|
if (!requests.length) {
|
|
@@ -44,10 +44,12 @@ export class CollectionRunner {
|
|
|
44
44
|
for (const req of requests) {
|
|
45
45
|
if (this.stopped)
|
|
46
46
|
break;
|
|
47
|
-
req.data = row ?? undefined;
|
|
47
|
+
// req.data = row ?? undefined;
|
|
48
48
|
events.onRequestStart?.({ iteration: iter, request: req, rowIndex });
|
|
49
49
|
try {
|
|
50
|
-
const
|
|
50
|
+
const executionReq = structuredClone(req);
|
|
51
|
+
executionReq.data = row ?? undefined;
|
|
52
|
+
const result = await this.apiEngine.executeRequestWithPrerequests(executionReq, row);
|
|
51
53
|
aggregator.addRequestResult(iter, req, result);
|
|
52
54
|
events.onRequestEnd?.({
|
|
53
55
|
iteration: iter,
|
|
@@ -69,6 +71,7 @@ export class CollectionRunner {
|
|
|
69
71
|
}
|
|
70
72
|
}
|
|
71
73
|
finally {
|
|
74
|
+
this.stopped = false;
|
|
72
75
|
events.onComplete?.({
|
|
73
76
|
totalRequests: executed,
|
|
74
77
|
durationMs: Date.now() - startTime,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collectionRunner.js","sourceRoot":"","sources":["../../src/engine/collectionRunner.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAI/D,MAAM,OAAO,gBAAgB;IAIb;IACA;IACA;IALJ,OAAO,GAAG,KAAK,CAAC;IAExB,YACY,SAAoB,EACpB,iBAAoC,EACpC,UAAsB;QAFtB,cAAS,GAAT,SAAS,CAAW;QACpB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,eAAU,GAAV,UAAU,CAAY;IAC9B,CAAC;IAEL,IAAI;QACA,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,GAAG,CACL,OAA6B,EAC7B,SAA8B,EAAE;QAEhC,
|
|
1
|
+
{"version":3,"file":"collectionRunner.js","sourceRoot":"","sources":["../../src/engine/collectionRunner.ts"],"names":[],"mappings":"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"}
|