@elastic/synthetics 1.26.0 → 1.26.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/core/transform.d.ts
CHANGED
|
@@ -72,6 +72,7 @@ export declare function transform(code: string, filename: string, options?: Tran
|
|
|
72
72
|
logLevel?: import("esbuild").LogLevel;
|
|
73
73
|
logLimit?: number;
|
|
74
74
|
logOverride?: Record<string, import("esbuild").LogLevel>;
|
|
75
|
+
logStyle?: import("esbuild").LogStyle;
|
|
75
76
|
tsconfigRaw: string | import("esbuild").TsconfigRaw;
|
|
76
77
|
}>;
|
|
77
78
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/core/transform.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAEL,MAAM,EACN,aAAa,EACb,gBAAgB,EACjB,MAAM,SAAS,CAAC;AA6CjB,wBAAgB,aAAa,IAAI,aAAa,CAc7C;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,gBAAqB
|
|
1
|
+
{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/core/transform.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAEL,MAAM,EACN,aAAa,EACb,gBAAgB,EACjB,MAAM,SAAS,CAAC;AA6CjB,wBAAgB,aAAa,IAAI,aAAa,CAc7C;AAED;;;GAGG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,gBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuC/B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,eAY/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/plugins/network.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,WAAW,EAAe,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAa9B;;;GAGG;AACH,eAAO,MAAM,oBAAoB,eAA6B,CAAC;AAM/D,qBAAa,cAAc;IAMb,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,gBAAgB,CAA4B;IACpD,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,CAAM;IACjC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAQ;gBAEf,MAAM,EAAE,MAAM;IAElC;;;;;OAKG;IACH,OAAO,CAAC,WAAW;
|
|
1
|
+
{"version":3,"file":"network.d.ts","sourceRoot":"","sources":["../../src/plugins/network.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,WAAW,EAAe,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEnE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAa9B;;;GAGG;AACH,eAAO,MAAM,oBAAoB,eAA6B,CAAC;AAM/D,qBAAa,cAAc;IAMb,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,gBAAgB,CAA4B;IACpD,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,CAAM;IACjC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,CAAQ;gBAEf,MAAM,EAAE,MAAM;IAElC;;;;;OAKG;IACH,OAAO,CAAC,WAAW;IAmBnB,OAAO,CAAC,qBAAqB;IAWvB,KAAK;IAeX,OAAO,CAAC,iBAAiB;IAMzB,OAAO,CAAC,UAAU,CAuDhB;IAEF,OAAO,CAAC,WAAW,CAqDjB;IAEF,OAAO,CAAC,mBAAmB,CAiCzB;IAEI,IAAI;CAsBX"}
|
package/dist/plugins/network.js
CHANGED
|
@@ -57,17 +57,22 @@ class NetworkManager {
|
|
|
57
57
|
* to not result in exception
|
|
58
58
|
*/
|
|
59
59
|
_addBarrier(page, promise) {
|
|
60
|
-
if (!page)
|
|
60
|
+
if (!page) {
|
|
61
|
+
promise.catch(error => {
|
|
62
|
+
(0, logger_1.log)(`Plugins: failed to collect network metadata: ${error}`);
|
|
63
|
+
});
|
|
61
64
|
return;
|
|
65
|
+
}
|
|
62
66
|
const race = Promise.race([
|
|
63
|
-
new Promise(resolve => page.
|
|
64
|
-
this._barrierPromises.delete(race);
|
|
65
|
-
resolve();
|
|
66
|
-
})),
|
|
67
|
+
new Promise(resolve => page.once('close', () => resolve())),
|
|
67
68
|
promise,
|
|
68
69
|
]);
|
|
69
70
|
this._barrierPromises.add(race);
|
|
70
|
-
race
|
|
71
|
+
race
|
|
72
|
+
.catch(error => {
|
|
73
|
+
(0, logger_1.log)(`Plugins: failed to collect network metadata: ${error}`);
|
|
74
|
+
})
|
|
75
|
+
.finally(() => this._barrierPromises.delete(race));
|
|
71
76
|
}
|
|
72
77
|
_nullableFrameBarrier(req) {
|
|
73
78
|
try {
|
|
@@ -89,15 +94,15 @@ class NetworkManager {
|
|
|
89
94
|
/**
|
|
90
95
|
* Listen for all network events from PW context
|
|
91
96
|
*/
|
|
92
|
-
context.on('request', this._onRequest
|
|
93
|
-
context.on('response', this._onResponse
|
|
94
|
-
context.on('requestfinished', this._onRequestCompleted
|
|
95
|
-
context.on('requestfailed', this._onRequestCompleted
|
|
97
|
+
context.on('request', this._onRequest);
|
|
98
|
+
context.on('response', this._onResponse);
|
|
99
|
+
context.on('requestfinished', this._onRequestCompleted);
|
|
100
|
+
context.on('requestfailed', this._onRequestCompleted);
|
|
96
101
|
}
|
|
97
102
|
_findNetworkEntry(request) {
|
|
98
103
|
return request[exports.NETWORK_ENTRY_SUMBOL];
|
|
99
104
|
}
|
|
100
|
-
_onRequest(request) {
|
|
105
|
+
_onRequest = (request) => {
|
|
101
106
|
const url = request.url();
|
|
102
107
|
/**
|
|
103
108
|
* Data URI should not show up as network requests
|
|
@@ -150,8 +155,8 @@ class NetworkManager {
|
|
|
150
155
|
}
|
|
151
156
|
request[exports.NETWORK_ENTRY_SUMBOL] = networkEntry;
|
|
152
157
|
this.results.push(networkEntry);
|
|
153
|
-
}
|
|
154
|
-
async
|
|
158
|
+
};
|
|
159
|
+
_onResponse = async (response) => {
|
|
155
160
|
const request = response.request();
|
|
156
161
|
const networkEntry = this._findNetworkEntry(request);
|
|
157
162
|
if (!networkEntry)
|
|
@@ -190,8 +195,8 @@ class NetworkManager {
|
|
|
190
195
|
if (details)
|
|
191
196
|
networkEntry.response.securityDetails = details;
|
|
192
197
|
}));
|
|
193
|
-
}
|
|
194
|
-
async
|
|
198
|
+
};
|
|
199
|
+
_onRequestCompleted = async (request) => {
|
|
195
200
|
const networkEntry = this._findNetworkEntry(request);
|
|
196
201
|
if (!networkEntry)
|
|
197
202
|
return;
|
|
@@ -219,8 +224,16 @@ class NetworkManager {
|
|
|
219
224
|
bytes: sizes.responseBodySize,
|
|
220
225
|
};
|
|
221
226
|
}));
|
|
222
|
-
}
|
|
227
|
+
};
|
|
223
228
|
async stop() {
|
|
229
|
+
/**
|
|
230
|
+
* First detach the listeners so that no new network events are recorded
|
|
231
|
+
*/
|
|
232
|
+
const context = this.driver.context;
|
|
233
|
+
context.off('request', this._onRequest);
|
|
234
|
+
context.off('response', this._onResponse);
|
|
235
|
+
context.off('requestfinished', this._onRequestCompleted);
|
|
236
|
+
context.off('requestfailed', this._onRequestCompleted);
|
|
224
237
|
/**
|
|
225
238
|
* Waiting for all network events is error prone and might hang the tests
|
|
226
239
|
* from getting closed forever when there are upstream bugs in browsers or
|
|
@@ -229,11 +242,6 @@ class NetworkManager {
|
|
|
229
242
|
if (this._barrierPromises.size > 0) {
|
|
230
243
|
(0, logger_1.log)(`Plugins: dropping ${this._barrierPromises.size} network events`);
|
|
231
244
|
}
|
|
232
|
-
const context = this.driver.context;
|
|
233
|
-
context.off('request', this._onRequest.bind(this));
|
|
234
|
-
context.off('response', this._onResponse.bind(this));
|
|
235
|
-
context.off('requestfinished', this._onRequestCompleted.bind(this));
|
|
236
|
-
context.off('requestfailed', this._onRequestCompleted.bind(this));
|
|
237
245
|
this._barrierPromises.clear();
|
|
238
246
|
(0, logger_1.log)(`Plugins: stopped collecting network events`);
|
|
239
247
|
return this.results;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/plugins/network.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAIH,2CAAqC;AAErC,wCAA0C;AAC1C,wDAAuE;AAEvE;;;;GAIG;AACH,SAAS,kBAAkB;IACzB,OAAO,IAAA,sBAAY,GAAE,GAAG,GAAG,CAAC;AAC9B,CAAC;AAED;;;GAGG;AACU,QAAA,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;AAM/D,MAAa,cAAc;IAML;IALZ,QAAQ,CAAc;IACtB,gBAAgB,GAAG,IAAI,GAAG,EAAiB,CAAC;IACpD,OAAO,GAAuB,EAAE,CAAC;IACjC,YAAY,GAAkB,IAAI,CAAC;IAEnC,YAAoB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAEtC;;;;;OAKG;IACK,WAAW,CAAC,IAAU,EAAE,OAAsB;QACpD,IAAI,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"network.js","sourceRoot":"","sources":["../../src/plugins/network.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@elastic/synthetics",
|
|
3
|
-
"version": "1.26.
|
|
3
|
+
"version": "1.26.1",
|
|
4
4
|
"description": "Elastic synthetic monitoring agent",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"commander": "^10.0.1",
|
|
48
48
|
"deepmerge": "^4.3.1",
|
|
49
49
|
"enquirer": "^2.3.6",
|
|
50
|
-
"esbuild": "^0.28.
|
|
50
|
+
"esbuild": "^0.28.2",
|
|
51
51
|
"http-proxy": "^1.18.1",
|
|
52
52
|
"kleur": "^4.1.5",
|
|
53
53
|
"micromatch": "^4.0.8",
|
package/src/plugins/network.ts
CHANGED
|
@@ -64,18 +64,22 @@ export class NetworkManager {
|
|
|
64
64
|
* to not result in exception
|
|
65
65
|
*/
|
|
66
66
|
private _addBarrier(page: Page, promise: Promise<void>) {
|
|
67
|
-
if (!page)
|
|
67
|
+
if (!page) {
|
|
68
|
+
promise.catch(error => {
|
|
69
|
+
log(`Plugins: failed to collect network metadata: ${error}`);
|
|
70
|
+
});
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
68
73
|
const race = Promise.race([
|
|
69
|
-
new Promise<void>(resolve =>
|
|
70
|
-
page.on('close', () => {
|
|
71
|
-
this._barrierPromises.delete(race);
|
|
72
|
-
resolve();
|
|
73
|
-
})
|
|
74
|
-
),
|
|
74
|
+
new Promise<void>(resolve => page.once('close', () => resolve())),
|
|
75
75
|
promise,
|
|
76
76
|
]);
|
|
77
77
|
this._barrierPromises.add(race);
|
|
78
|
-
race
|
|
78
|
+
race
|
|
79
|
+
.catch(error => {
|
|
80
|
+
log(`Plugins: failed to collect network metadata: ${error}`);
|
|
81
|
+
})
|
|
82
|
+
.finally(() => this._barrierPromises.delete(race));
|
|
79
83
|
}
|
|
80
84
|
|
|
81
85
|
private _nullableFrameBarrier(req: Request): Frame | null {
|
|
@@ -98,10 +102,10 @@ export class NetworkManager {
|
|
|
98
102
|
/**
|
|
99
103
|
* Listen for all network events from PW context
|
|
100
104
|
*/
|
|
101
|
-
context.on('request', this._onRequest
|
|
102
|
-
context.on('response', this._onResponse
|
|
103
|
-
context.on('requestfinished', this._onRequestCompleted
|
|
104
|
-
context.on('requestfailed', this._onRequestCompleted
|
|
105
|
+
context.on('request', this._onRequest);
|
|
106
|
+
context.on('response', this._onResponse);
|
|
107
|
+
context.on('requestfinished', this._onRequestCompleted);
|
|
108
|
+
context.on('requestfailed', this._onRequestCompleted);
|
|
105
109
|
}
|
|
106
110
|
|
|
107
111
|
private _findNetworkEntry(
|
|
@@ -110,7 +114,7 @@ export class NetworkManager {
|
|
|
110
114
|
return request[NETWORK_ENTRY_SUMBOL];
|
|
111
115
|
}
|
|
112
116
|
|
|
113
|
-
private _onRequest(request: Request) {
|
|
117
|
+
private _onRequest = (request: Request) => {
|
|
114
118
|
const url = request.url();
|
|
115
119
|
/**
|
|
116
120
|
* Data URI should not show up as network requests
|
|
@@ -165,9 +169,9 @@ export class NetworkManager {
|
|
|
165
169
|
|
|
166
170
|
request[NETWORK_ENTRY_SUMBOL] = networkEntry;
|
|
167
171
|
this.results.push(networkEntry);
|
|
168
|
-
}
|
|
172
|
+
};
|
|
169
173
|
|
|
170
|
-
private async
|
|
174
|
+
private _onResponse = async (response: Response) => {
|
|
171
175
|
const request = response.request();
|
|
172
176
|
const networkEntry = this._findNetworkEntry(request);
|
|
173
177
|
if (!networkEntry) return;
|
|
@@ -220,9 +224,9 @@ export class NetworkManager {
|
|
|
220
224
|
if (details) networkEntry.response.securityDetails = details;
|
|
221
225
|
})
|
|
222
226
|
);
|
|
223
|
-
}
|
|
227
|
+
};
|
|
224
228
|
|
|
225
|
-
private async
|
|
229
|
+
private _onRequestCompleted = async (request: Request) => {
|
|
226
230
|
const networkEntry = this._findNetworkEntry(request);
|
|
227
231
|
if (!networkEntry) return;
|
|
228
232
|
|
|
@@ -255,9 +259,18 @@ export class NetworkManager {
|
|
|
255
259
|
};
|
|
256
260
|
})
|
|
257
261
|
);
|
|
258
|
-
}
|
|
262
|
+
};
|
|
259
263
|
|
|
260
264
|
async stop() {
|
|
265
|
+
/**
|
|
266
|
+
* First detach the listeners so that no new network events are recorded
|
|
267
|
+
*/
|
|
268
|
+
const context = this.driver.context;
|
|
269
|
+
context.off('request', this._onRequest);
|
|
270
|
+
context.off('response', this._onResponse);
|
|
271
|
+
context.off('requestfinished', this._onRequestCompleted);
|
|
272
|
+
context.off('requestfailed', this._onRequestCompleted);
|
|
273
|
+
|
|
261
274
|
/**
|
|
262
275
|
* Waiting for all network events is error prone and might hang the tests
|
|
263
276
|
* from getting closed forever when there are upstream bugs in browsers or
|
|
@@ -266,11 +279,6 @@ export class NetworkManager {
|
|
|
266
279
|
if (this._barrierPromises.size > 0) {
|
|
267
280
|
log(`Plugins: dropping ${this._barrierPromises.size} network events`);
|
|
268
281
|
}
|
|
269
|
-
const context = this.driver.context;
|
|
270
|
-
context.off('request', this._onRequest.bind(this));
|
|
271
|
-
context.off('response', this._onResponse.bind(this));
|
|
272
|
-
context.off('requestfinished', this._onRequestCompleted.bind(this));
|
|
273
|
-
context.off('requestfailed', this._onRequestCompleted.bind(this));
|
|
274
282
|
this._barrierPromises.clear();
|
|
275
283
|
log(`Plugins: stopped collecting network events`);
|
|
276
284
|
return this.results;
|