@elastic/synthetics 1.3.0 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/lib/index.js +432 -0
- package/dist/cli.js +23 -14
- package/dist/cli.js.map +1 -1
- package/dist/common_types.d.ts +51 -40
- package/dist/common_types.d.ts.map +1 -1
- package/dist/config.d.ts +2 -2
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +7 -1
- package/dist/config.js.map +1 -1
- package/dist/core/browser-service.js +2 -2
- package/dist/core/browser-service.js.map +1 -1
- package/dist/core/expect.d.ts +1 -152
- package/dist/core/expect.d.ts.map +1 -1
- package/dist/core/expect.js +14 -5
- package/dist/core/expect.js.map +1 -1
- package/dist/core/gatherer.d.ts +1 -1
- package/dist/core/gatherer.d.ts.map +1 -1
- package/dist/core/gatherer.js +5 -5
- package/dist/core/gatherer.js.map +1 -1
- package/dist/core/runner.d.ts +4 -4
- package/dist/core/runner.d.ts.map +1 -1
- package/dist/core/runner.js +8 -7
- package/dist/core/runner.js.map +1 -1
- package/dist/core/transform.d.ts +62 -2
- package/dist/core/transform.d.ts.map +1 -1
- package/dist/dsl/journey.d.ts +5 -5
- package/dist/dsl/journey.d.ts.map +1 -1
- package/dist/dsl/journey.js +0 -1
- package/dist/dsl/journey.js.map +1 -1
- package/dist/dsl/monitor.d.ts +8 -3
- package/dist/dsl/monitor.d.ts.map +1 -1
- package/dist/dsl/monitor.js +1 -0
- package/dist/dsl/monitor.js.map +1 -1
- package/dist/formatter/javascript.d.ts +6 -6
- package/dist/formatter/javascript.d.ts.map +1 -1
- package/dist/generator/index.d.ts +1 -1
- package/dist/generator/index.d.ts.map +1 -1
- package/dist/generator/index.js +1 -1
- package/dist/generator/index.js.map +1 -1
- package/dist/helpers.d.ts +1 -6
- package/dist/helpers.d.ts.map +1 -1
- package/dist/helpers.js +1 -24
- package/dist/helpers.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/locations/index.d.ts +13 -5
- package/dist/locations/index.d.ts.map +1 -1
- package/dist/locations/index.js +30 -14
- package/dist/locations/index.js.map +1 -1
- package/dist/options.d.ts +5 -2
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +20 -3
- package/dist/options.js.map +1 -1
- package/dist/plugins/browser-console.d.ts +3 -2
- package/dist/plugins/browser-console.d.ts.map +1 -1
- package/dist/plugins/browser-console.js +33 -7
- package/dist/plugins/browser-console.js.map +1 -1
- package/dist/plugins/network.d.ts +1 -0
- package/dist/plugins/network.d.ts.map +1 -1
- package/dist/plugins/network.js +15 -2
- package/dist/plugins/network.js.map +1 -1
- package/dist/plugins/plugin-manager.d.ts +3 -3
- package/dist/plugins/plugin-manager.d.ts.map +1 -1
- package/dist/plugins/tracing.d.ts +1 -1
- package/dist/plugins/tracing.d.ts.map +1 -1
- package/dist/push/index.d.ts +1 -1
- package/dist/push/index.d.ts.map +1 -1
- package/dist/push/index.js +7 -6
- package/dist/push/index.js.map +1 -1
- package/dist/push/kibana_api.d.ts +5 -5
- package/dist/push/kibana_api.d.ts.map +1 -1
- package/dist/push/kibana_api.js +1 -1
- package/dist/push/kibana_api.js.map +1 -1
- package/dist/push/monitor.d.ts +3 -3
- package/dist/push/monitor.d.ts.map +1 -1
- package/dist/push/monitor.js +22 -9
- package/dist/push/monitor.js.map +1 -1
- package/dist/push/request.d.ts +2 -2
- package/dist/push/request.d.ts.map +1 -1
- package/dist/push/utils.d.ts +3 -3
- package/dist/push/utils.d.ts.map +1 -1
- package/dist/push/utils.js +1 -1
- package/dist/push/utils.js.map +1 -1
- package/dist/reporters/base.d.ts +3 -0
- package/dist/reporters/base.d.ts.map +1 -1
- package/dist/reporters/base.js +20 -22
- package/dist/reporters/base.js.map +1 -1
- package/dist/reporters/index.d.ts +4 -3
- package/dist/reporters/index.d.ts.map +1 -1
- package/dist/reporters/index.js.map +1 -1
- package/dist/reporters/json.d.ts +5 -5
- package/dist/reporters/json.d.ts.map +1 -1
- package/dist/reporters/json.js +29 -1
- package/dist/reporters/json.js.map +1 -1
- package/dist/reporters/junit.d.ts.map +1 -1
- package/dist/reporters/junit.js +4 -4
- package/dist/reporters/junit.js.map +1 -1
- package/dist/reporters/reporter-util.d.ts +35 -0
- package/dist/reporters/reporter-util.d.ts.map +1 -0
- package/dist/reporters/reporter-util.js +192 -0
- package/dist/reporters/reporter-util.js.map +1 -0
- package/dist/sdk/trace-processor.d.ts +4 -4
- package/dist/sdk/trace-processor.d.ts.map +1 -1
- package/package.json +20 -11
- package/src/cli.ts +23 -22
- package/src/common_types.ts +17 -3
- package/src/config.ts +12 -1
- package/src/core/browser-service.ts +1 -1
- package/src/core/expect.ts +13 -191
- package/src/core/gatherer.ts +1 -1
- package/src/core/runner.ts +15 -9
- package/src/dsl/journey.ts +1 -2
- package/src/dsl/monitor.ts +5 -0
- package/src/generator/index.ts +2 -1
- package/src/helpers.ts +0 -24
- package/src/index.ts +3 -1
- package/src/locations/index.ts +37 -12
- package/src/options.ts +28 -3
- package/src/plugins/browser-console.ts +39 -8
- package/src/plugins/network.ts +16 -3
- package/src/push/index.ts +9 -6
- package/src/push/kibana_api.ts +4 -3
- package/src/push/monitor.ts +26 -9
- package/src/push/utils.ts +3 -3
- package/src/reporters/base.ts +26 -33
- package/src/reporters/index.ts +5 -1
- package/src/reporters/json.ts +33 -3
- package/src/reporters/junit.ts +5 -5
- package/src/reporters/reporter-util.ts +217 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/plugins/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAKvD,
|
|
1
|
+
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/plugins/tracing.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAKvD,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF;;;GAGG;AACH,qBAAa,OAAO;IACN,OAAO,CAAC,MAAM;IAAU,OAAO,CAAC,OAAO;gBAA/B,MAAM,EAAE,MAAM,EAAU,OAAO,EAAE,YAAY;IAE3D,KAAK;IAmCL,IAAI;CA2BX"}
|
package/dist/push/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { Monitor } from '../dsl/monitor';
|
|
|
2
2
|
import type { PushOptions, ProjectSettings } from '../common_types';
|
|
3
3
|
export declare function push(monitors: Monitor[], options: PushOptions): Promise<void>;
|
|
4
4
|
export declare function formatDuplicateError(monitors: Set<Monitor>): string;
|
|
5
|
-
export declare function loadSettings(): Promise<ProjectSettings>;
|
|
5
|
+
export declare function loadSettings(ignoreMissing?: boolean): Promise<ProjectSettings>;
|
|
6
6
|
export declare function validatePush(opts: PushOptions, settings: ProjectSettings): Promise<void>;
|
|
7
7
|
export declare function validateSettings(opts: PushOptions): void;
|
|
8
8
|
export declare function catchIncorrectSettings(settings: ProjectSettings, options: PushOptions): Promise<void>;
|
package/dist/push/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAqB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAY5D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAgBpE,wBAAsB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAqB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAY5D,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAgBpE,wBAAsB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,iBAmDnE;AAoCD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,UAU1D;AAID,wBAAsB,YAAY,CAAC,aAAa,UAAQ,4BAevD;AAED,wBAAsB,YAAY,CAChC,IAAI,EAAE,WAAW,EACjB,QAAQ,EAAE,eAAe,iBAI1B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,QA6BjD;AAgBD,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,WAAW,iBA0BrB;AAED,wBAAsB,UAAU,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,iBA2BzE;AAGD,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,QAKlD"}
|
package/dist/push/index.js
CHANGED
|
@@ -46,15 +46,14 @@ async function push(monitors, options) {
|
|
|
46
46
|
if (!(0, utils_1.isBulkAPISupported)(options.kibanaVersion)) {
|
|
47
47
|
return await pushLegacy(monitors, options);
|
|
48
48
|
}
|
|
49
|
-
const local = (0, monitor_1.getLocalMonitors)(monitors);
|
|
50
49
|
const { monitors: remote } = await (0, kibana_api_1.bulkGetMonitors)(options);
|
|
50
|
+
(0, helpers_1.progress)(`bundling ${monitors.length} monitors`);
|
|
51
|
+
const schemas = await (0, monitor_1.buildMonitorSchema)(monitors, true);
|
|
52
|
+
const local = (0, monitor_1.getLocalMonitors)(schemas);
|
|
51
53
|
const { newIDs, changedIDs, removedIDs, unchangedIDs } = (0, monitor_1.diffMonitors)(local, remote);
|
|
52
54
|
(0, utils_1.logDiff)(newIDs, changedIDs, removedIDs, unchangedIDs);
|
|
53
55
|
const updatedMonitors = new Set([...changedIDs, ...newIDs]);
|
|
54
56
|
if (updatedMonitors.size > 0) {
|
|
55
|
-
const toBundle = monitors.filter(m => updatedMonitors.has(m.config.id));
|
|
56
|
-
(0, helpers_1.progress)(`bundling ${toBundle.length} monitors`);
|
|
57
|
-
const schemas = await (0, monitor_1.buildMonitorSchema)(toBundle, true);
|
|
58
57
|
const chunks = (0, utils_1.getChunks)(schemas, kibana_api_1.CHUNK_SIZE);
|
|
59
58
|
for (const chunk of chunks) {
|
|
60
59
|
await (0, helpers_1.liveProgress)((0, kibana_api_1.bulkPutMonitors)(options, chunk), `creating or updating ${chunk.length} monitors`);
|
|
@@ -116,7 +115,7 @@ function formatDuplicateError(monitors) {
|
|
|
116
115
|
}
|
|
117
116
|
exports.formatDuplicateError = formatDuplicateError;
|
|
118
117
|
const INSTALLATION_HELP = `Run 'npx @elastic/synthetics init' to create project with default settings.`;
|
|
119
|
-
async function loadSettings() {
|
|
118
|
+
async function loadSettings(ignoreMissing = false) {
|
|
120
119
|
try {
|
|
121
120
|
const config = await (0, config_1.readConfig)(process.env['NODE_ENV'] || 'development');
|
|
122
121
|
// Missing config file, fake throw to capture as missing file
|
|
@@ -126,9 +125,11 @@ async function loadSettings() {
|
|
|
126
125
|
return config.project || {};
|
|
127
126
|
}
|
|
128
127
|
catch (e) {
|
|
129
|
-
|
|
128
|
+
if (!ignoreMissing) {
|
|
129
|
+
throw (0, helpers_1.error)(`Aborted (missing synthetics config file), Project not set up correctly.
|
|
130
130
|
|
|
131
131
|
${INSTALLATION_HELP}`);
|
|
132
|
+
}
|
|
132
133
|
}
|
|
133
134
|
}
|
|
134
135
|
exports.loadSettings = loadSettings;
|
package/dist/push/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,0CAAkD;AAClD,uCAAkC;AAClC,yCAA0C;AAC1C,uCAKmB;AACnB,4CAA4D;AAC5D,wCAUoB;AAEpB,sCAA6D;AAC7D,6CAMsB;AACtB,mCAKiB;AAEV,KAAK,UAAU,IAAI,CAAC,QAAmB,EAAE,OAAoB;IAClE,MAAM,UAAU,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,UAAU,CAAC,IAAI,GAAG,CAAC,EAAE;QACvB,MAAM,IAAA,eAAK,EAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;KAC/C;IACD,IAAA,kBAAQ,EAAC,iCAAiC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;IAExD;;OAEG;IACH,IAAI,CAAC,IAAA,0BAAkB,EAAC,OAAO,CAAC,aAAa,CAAC,EAAE;QAC9C,OAAO,MAAM,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;KAC5C;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,24 +26,24 @@ import { PushOptions } from '../common_types';
|
|
|
26
26
|
import { MonitorHashID, MonitorSchema } from './monitor';
|
|
27
27
|
import { APIMonitorError } from './request';
|
|
28
28
|
export declare const CHUNK_SIZE = 100;
|
|
29
|
-
export
|
|
29
|
+
export type PutResponse = {
|
|
30
30
|
createdMonitors: string[];
|
|
31
31
|
updatedMonitors: string[];
|
|
32
32
|
failedMonitors: APIMonitorError[];
|
|
33
33
|
};
|
|
34
34
|
export declare function bulkPutMonitors(options: PushOptions, schemas: MonitorSchema[]): Promise<PutResponse>;
|
|
35
|
-
export
|
|
35
|
+
export type GetResponse = {
|
|
36
36
|
total: number;
|
|
37
37
|
monitors: MonitorHashID[];
|
|
38
38
|
after_key?: string;
|
|
39
39
|
};
|
|
40
40
|
export declare function bulkGetMonitors(options: PushOptions): Promise<GetResponse>;
|
|
41
|
-
export
|
|
41
|
+
export type DeleteResponse = {
|
|
42
42
|
deleted_monitors: string[];
|
|
43
43
|
};
|
|
44
44
|
export declare function bulkDeleteMonitors(options: PushOptions, monitorIDs: string[]): Promise<DeleteResponse>;
|
|
45
|
-
export declare function getVersion(options: PushOptions): Promise<
|
|
46
|
-
export
|
|
45
|
+
export declare function getVersion(options: PushOptions): Promise<string>;
|
|
46
|
+
export type LegacyAPISchema = {
|
|
47
47
|
project: string;
|
|
48
48
|
keep_stale: boolean;
|
|
49
49
|
monitors: MonitorSchema[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kibana_api.d.ts","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAML,eAAe,EAChB,MAAM,WAAW,CAAC;AAInB,eAAO,MAAM,UAAU,MAAM,CAAC;AAE9B,
|
|
1
|
+
{"version":3,"file":"kibana_api.d.ts","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACzD,OAAO,EAML,eAAe,EAChB,MAAM,WAAW,CAAC;AAInB,eAAO,MAAM,UAAU,MAAM,CAAC;AAE9B,MAAM,MAAM,WAAW,GAAG;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,EAAE,eAAe,EAAE,CAAC;CACnC,CAAC;AAEF,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,aAAa,EAAE,wBAazB;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAsB,eAAe,CACnC,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,WAAW,CAAC,CAkBtB;AAmBD,MAAM,MAAM,cAAc,GAAG;IAC3B,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B,CAAC;AAEF,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,WAAW,EACpB,UAAU,EAAE,MAAM,EAAE,2BAQrB;AAQD,wBAAsB,UAAU,CAAC,OAAO,EAAE,WAAW,mBAQpD;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,SAAS,EACT,OAAO,GACR,EAAE;IACD,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,WAAW,CAAC;CACtB,iBAoCA"}
|
package/dist/push/kibana_api.js
CHANGED
|
@@ -92,7 +92,7 @@ async function getVersion(options) {
|
|
|
92
92
|
method: 'GET',
|
|
93
93
|
auth: options.auth,
|
|
94
94
|
});
|
|
95
|
-
return data.version
|
|
95
|
+
return data.kibana.version;
|
|
96
96
|
}
|
|
97
97
|
exports.getVersion = getVersion;
|
|
98
98
|
async function createMonitorsLegacy({ schemas, keepStale, options, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kibana_api.js","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"kibana_api.js","sourceRoot":"","sources":["../../src/push/kibana_api.ts"],"names":[],"mappings":"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"}
|
package/dist/push/monitor.d.ts
CHANGED
|
@@ -24,13 +24,13 @@
|
|
|
24
24
|
*/
|
|
25
25
|
import { AlertConfig, Monitor, MonitorConfig } from '../dsl/monitor';
|
|
26
26
|
import { PushOptions } from '../common_types';
|
|
27
|
-
export
|
|
27
|
+
export type MonitorSchema = Omit<MonitorConfig, 'locations'> & {
|
|
28
28
|
locations: string[];
|
|
29
29
|
content?: string;
|
|
30
30
|
filter?: Monitor['filter'];
|
|
31
31
|
hash?: string;
|
|
32
32
|
};
|
|
33
|
-
export
|
|
33
|
+
export type MonitorHashID = {
|
|
34
34
|
journey_id?: string;
|
|
35
35
|
hash?: string;
|
|
36
36
|
};
|
|
@@ -41,7 +41,7 @@ declare class RemoteDiffResult {
|
|
|
41
41
|
unchangedIDs: Set<string>;
|
|
42
42
|
}
|
|
43
43
|
export declare function diffMonitors(local: MonitorHashID[], remote: MonitorHashID[]): RemoteDiffResult;
|
|
44
|
-
export declare function getLocalMonitors(
|
|
44
|
+
export declare function getLocalMonitors(schemas: MonitorSchema[]): MonitorHashID[];
|
|
45
45
|
export declare function buildMonitorSchema(monitors: Monitor[], isV2: boolean): Promise<MonitorSchema[]>;
|
|
46
46
|
export declare function createLightweightMonitors(workDir: string, options: PushOptions): Promise<Monitor[]>;
|
|
47
47
|
export declare function buildMonitorFromYaml(config: MonitorConfig, options: PushOptions): Monitor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EACL,WAAW,EAEX,OAAO,EACP,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM9C,
|
|
1
|
+
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EACL,WAAW,EAEX,OAAO,EACP,aAAa,EACd,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM9C,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG;IAC7D,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAIF,MAAM,MAAM,aAAa,GAAG;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAOF,cAAM,gBAAgB;IAEpB,MAAM,cAAqB;IAE3B,UAAU,cAAqB;IAE/B,UAAU,cAAqB;IAE/B,YAAY,cAAqB;CAClC;AAED,wBAAgB,YAAY,CAC1B,KAAK,EAAE,aAAa,EAAE,EACtB,MAAM,EAAE,aAAa,EAAE,GACtB,gBAAgB,CAiClB;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,mBASxD;AAED,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,4BAmC1E;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,WAAW,sBAgErB;AAGD,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,WAAW,WAmCrB;AAUD,eAAO,MAAM,gBAAgB,WACnB,aAAa,YACX,WAAW,OAatB,CAAC;AAEF,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,QAAQ,GAAG,KAAK,EACrB,MAAM,EAAE,aAAa,EACrB,WAAW,CAAC,EAAE,WAAW,GACxB;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CA4BtB;AAED,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,kDA+B7C"}
|
package/dist/push/monitor.js
CHANGED
|
@@ -86,12 +86,12 @@ function diffMonitors(local, remote) {
|
|
|
86
86
|
return result;
|
|
87
87
|
}
|
|
88
88
|
exports.diffMonitors = diffMonitors;
|
|
89
|
-
function getLocalMonitors(
|
|
89
|
+
function getLocalMonitors(schemas) {
|
|
90
90
|
const data = [];
|
|
91
|
-
for (const
|
|
91
|
+
for (const schema of schemas) {
|
|
92
92
|
data.push({
|
|
93
|
-
journey_id:
|
|
94
|
-
hash:
|
|
93
|
+
journey_id: schema.id,
|
|
94
|
+
hash: schema.hash,
|
|
95
95
|
});
|
|
96
96
|
}
|
|
97
97
|
return data;
|
|
@@ -112,14 +112,19 @@ async function buildMonitorSchema(monitors, isV2) {
|
|
|
112
112
|
...config,
|
|
113
113
|
locations: translateLocation(config.locations),
|
|
114
114
|
};
|
|
115
|
-
if (isV2) {
|
|
116
|
-
schema.hash = monitor.hash();
|
|
117
|
-
}
|
|
118
115
|
if (type === 'browser') {
|
|
119
116
|
const outPath = (0, path_1.join)(bundlePath, config.name + '.zip');
|
|
120
117
|
const content = await bundler.build(source.file, outPath);
|
|
118
|
+
monitor.setContent(content);
|
|
121
119
|
Object.assign(schema, { content, filter });
|
|
122
120
|
}
|
|
121
|
+
/**
|
|
122
|
+
* Generate hash only after the bundled content is created
|
|
123
|
+
* to capture code changes in imported files
|
|
124
|
+
*/
|
|
125
|
+
if (isV2) {
|
|
126
|
+
schema.hash = monitor.hash();
|
|
127
|
+
}
|
|
123
128
|
schemas.push(schema);
|
|
124
129
|
}
|
|
125
130
|
await (0, promises_1.rm)(bundlePath, { recursive: true });
|
|
@@ -194,12 +199,13 @@ function buildMonitorFromYaml(config, options) {
|
|
|
194
199
|
const privateLocations = config['private_locations'] ||
|
|
195
200
|
config.privateLocations ||
|
|
196
201
|
options.privateLocations;
|
|
197
|
-
|
|
202
|
+
const retestOnFailure = config['retest_on_failure'] ?? options.retestOnFailure;
|
|
198
203
|
const alertConfig = (0, exports.parseAlertConfig)(config, options.alert);
|
|
199
204
|
const mon = new monitor_1.Monitor({
|
|
200
205
|
locations: options.locations,
|
|
201
206
|
tags: options.tags,
|
|
202
|
-
...config,
|
|
207
|
+
...normalizeConfig(config),
|
|
208
|
+
retestOnFailure,
|
|
203
209
|
privateLocations,
|
|
204
210
|
schedule: schedule || options.schedule,
|
|
205
211
|
alert: alertConfig,
|
|
@@ -214,6 +220,13 @@ function buildMonitorFromYaml(config, options) {
|
|
|
214
220
|
return mon;
|
|
215
221
|
}
|
|
216
222
|
exports.buildMonitorFromYaml = buildMonitorFromYaml;
|
|
223
|
+
// Deletes unncessary fields from the lightweight monitor config
|
|
224
|
+
// that is not supported by the Kibana API
|
|
225
|
+
function normalizeConfig(config) {
|
|
226
|
+
delete config['private_locations'];
|
|
227
|
+
delete config['retest_on_failure'];
|
|
228
|
+
return config;
|
|
229
|
+
}
|
|
217
230
|
const parseAlertConfig = (config, gConfig) => {
|
|
218
231
|
// If the user has provided a global alert config, merge it with the monitor alert config
|
|
219
232
|
const status = getAlertKeyValue('status', config, gConfig);
|
package/dist/push/monitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,0CAAkD;AAClD,+BAAqC;AACrC,+BAAoE;AACpE,yCAAyC;AACzC,uCAAoC;AACpC,wCAAqE;AACrE,oEAA6D;AAC7D,4CAKwB;AAExB,mCAAiD;AAEjD,mDAAmD;AACnD,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAgBhD,SAAS,iBAAiB,CAAC,SAAsC;IAC/D,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1B,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,+BAAY,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,gBAAgB;IACpB,8CAA8C;IAC9C,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IAC3B,uDAAuD;IACvD,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,iDAAiD;IACjD,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,sDAAsD;IACtD,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;CAClC;AAED,SAAgB,YAAY,CAC1B,KAAsB,EACtB,MAAuB;IAEvB,MAAM,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACtC,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACxD,KAAK,MAAM,MAAM,IAAI,KAAK,EAAE;QAC1B,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;KAC3D;IACD,MAAM,sBAAsB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzD,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE;QAC3B,sBAAsB,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;KAC5D;IAED,0BAA0B;IAC1B,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,qBAAqB,EAAE;QACxD,yDAAyD;QACzD,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;YACxC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAC5B;aAAM;YACL,MAAM,UAAU,GAAG,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACvD,IAAI,UAAU,IAAI,SAAS,EAAE;gBAC3B,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAChC;iBAAM,IAAI,UAAU,KAAK,SAAS,EAAE;gBACnC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAClC;SACF;QACD,yDAAyD;QACzD,mDAAmD;QACnD,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KACxC;IAED,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,sBAAsB,EAAE;QACzC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;KAC3B;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AApCD,oCAoCC;AAED,SAAgB,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"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"}
|
package/dist/push/request.d.ts
CHANGED
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
import type { Dispatcher } from 'undici';
|
|
26
|
-
export
|
|
26
|
+
export type APIRequestOptions = {
|
|
27
27
|
url: string;
|
|
28
28
|
method: Dispatcher.HttpMethod;
|
|
29
29
|
auth: string;
|
|
@@ -33,7 +33,7 @@ export declare function sendRequest(options: APIRequestOptions): Promise<Dispatc
|
|
|
33
33
|
export declare function sendReqAndHandleError<T>(options: APIRequestOptions): Promise<T>;
|
|
34
34
|
export declare function handleError(statusCode: number, url: string, body: Dispatcher.ResponseData['body']): Promise<Dispatcher.ResponseData['body']>;
|
|
35
35
|
export declare function ok(statusCode: number): boolean;
|
|
36
|
-
export
|
|
36
|
+
export type APIMonitorError = {
|
|
37
37
|
id?: string;
|
|
38
38
|
reason: string;
|
|
39
39
|
details: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAOzC,
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAOzC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,UAAU,CAAC,UAAU,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,wBAAsB,WAAW,CAAC,OAAO,EAAE,iBAAiB,oCAY3D;AAED,wBAAsB,qBAAqB,CAAC,CAAC,EAC3C,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,CAAC,CAAC,CAGZ;AAKD,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,GACpC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAkB1C;AAED,wBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,WAEpC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAM/D;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,UAShB;AAcD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,UAG7D;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,eAAe,EAAE,UAG5D"}
|
package/dist/push/utils.d.ts
CHANGED
|
@@ -26,12 +26,12 @@ import { PushOptions } from '../common_types';
|
|
|
26
26
|
import { Monitor } from '../dsl/monitor';
|
|
27
27
|
export declare function logDiff<T extends Set<string>>(newIDs: T, changedIDs: T, removedIDs: T, unchangedIDs: T): void;
|
|
28
28
|
export declare function getChunks(arr: any[], size: number): any[];
|
|
29
|
-
|
|
29
|
+
type Operation = 'status' | 'bulk_get' | 'bulk_update' | 'bulk_delete' | 'legacy' | 'location';
|
|
30
30
|
export declare function generateURL(options: PushOptions, operation: Operation): string;
|
|
31
31
|
/**
|
|
32
32
|
* Bulk API is supported for push monitors only from 8.6.0 and above
|
|
33
33
|
*/
|
|
34
|
-
export declare function isBulkAPISupported(version:
|
|
34
|
+
export declare function isBulkAPISupported(version: string): boolean;
|
|
35
35
|
/**
|
|
36
36
|
* Lightweight monitors are supported only from 8.5.0 and above
|
|
37
37
|
*/
|
|
@@ -40,6 +40,6 @@ export declare function isLightweightMonitorSupported(monitors: Monitor[], optio
|
|
|
40
40
|
* Lighweight monitor param options are supported only from
|
|
41
41
|
* 8.7.2 and above
|
|
42
42
|
*/
|
|
43
|
-
export declare function isParamOptionSupported(version:
|
|
43
|
+
export declare function isParamOptionSupported(version: string): boolean;
|
|
44
44
|
export {};
|
|
45
45
|
//# sourceMappingURL=utils.d.ts.map
|
package/dist/push/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/push/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,wBAAgB,OAAO,CAAC,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,EAC3C,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,CAAC,EACb,YAAY,EAAE,CAAC,QAShB;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,SAMjD;AAED,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/push/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,wBAAgB,OAAO,CAAC,CAAC,SAAS,GAAG,CAAC,MAAM,CAAC,EAC3C,MAAM,EAAE,CAAC,EACT,UAAU,EAAE,CAAC,EACb,UAAU,EAAE,CAAC,EACb,YAAY,EAAE,CAAC,QAShB;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,SAMjD;AAED,KAAK,SAAS,GACV,QAAQ,GACR,UAAU,GACV,aAAa,GACb,aAAa,GACb,QAAQ,GACR,UAAU,CAAC;AAEf,wBAAgB,WAAW,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,UAgBrE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,WAEjD;AAED;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,WAAW,WAOrB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,WAErD"}
|
package/dist/push/utils.js
CHANGED
|
@@ -51,7 +51,7 @@ function generateURL(options, operation) {
|
|
|
51
51
|
const url = (0, helpers_1.removeTrailingSlash)(options.url);
|
|
52
52
|
switch (operation) {
|
|
53
53
|
case 'status':
|
|
54
|
-
return `${url}/s/${options.space}/api/
|
|
54
|
+
return `${url}/s/${options.space}/api/stats`;
|
|
55
55
|
case 'bulk_get':
|
|
56
56
|
case 'bulk_update':
|
|
57
57
|
case 'bulk_delete':
|
package/dist/push/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/push/utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,oDAA4B;AAC5B,wCAA2D;AAC3D,yCAAwD;AAIxD,SAAgB,OAAO,CACrB,MAAS,EACT,UAAa,EACb,UAAa,EACb,YAAe;IAEf,IAAA,kBAAQ,EACN,gBAAgB;QACd,IAAA,cAAK,EAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC;QAC/B,IAAA,eAAM,EAAC,WAAW,UAAU,CAAC,IAAI,IAAI,CAAC;QACtC,IAAA,YAAG,EAAC,WAAW,UAAU,CAAC,IAAI,IAAI,CAAC;QACnC,IAAA,aAAI,EAAC,aAAa,YAAY,CAAC,IAAI,GAAG,CAAC,CAC1C,CAAC;AACJ,CAAC;AAbD,0BAaC;AAED,SAAgB,SAAS,CAAC,GAAU,EAAE,IAAY;IAChD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,EAAE;QACzC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;KACrC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAND,8BAMC;AAUD,SAAgB,WAAW,CAAC,OAAoB,EAAE,SAAoB;IACpE,MAAM,GAAG,GAAG,IAAA,6BAAmB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7C,QAAQ,SAAS,EAAE;QACjB,KAAK,QAAQ;YACX,OAAO,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/push/utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,oDAA4B;AAC5B,wCAA2D;AAC3D,yCAAwD;AAIxD,SAAgB,OAAO,CACrB,MAAS,EACT,UAAa,EACb,UAAa,EACb,YAAe;IAEf,IAAA,kBAAQ,EACN,gBAAgB;QACd,IAAA,cAAK,EAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC;QAC/B,IAAA,eAAM,EAAC,WAAW,UAAU,CAAC,IAAI,IAAI,CAAC;QACtC,IAAA,YAAG,EAAC,WAAW,UAAU,CAAC,IAAI,IAAI,CAAC;QACnC,IAAA,aAAI,EAAC,aAAa,YAAY,CAAC,IAAI,GAAG,CAAC,CAC1C,CAAC;AACJ,CAAC;AAbD,0BAaC;AAED,SAAgB,SAAS,CAAC,GAAU,EAAE,IAAY;IAChD,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,IAAI,IAAI,EAAE;QACzC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;KACrC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAND,8BAMC;AAUD,SAAgB,WAAW,CAAC,OAAoB,EAAE,SAAoB;IACpE,MAAM,GAAG,GAAG,IAAA,6BAAmB,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC7C,QAAQ,SAAS,EAAE;QACjB,KAAK,QAAQ;YACX,OAAO,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,YAAY,CAAC;QAC/C,KAAK,UAAU,CAAC;QAChB,KAAK,aAAa,CAAC;QACnB,KAAK,aAAa;YAChB,OAAO,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,2BAA2B,OAAO,CAAC,EAAE,WAAW,CAAC;QACnF,KAAK,QAAQ;YACX,OAAO,GAAG,GAAG,MAAM,OAAO,CAAC,KAAK,0CAA0C,CAAC;QAC7E,KAAK,UAAU;YACb,OAAO,GAAG,GAAG,oCAAoC,CAAC;QACpD;YACE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACxC;AACH,CAAC;AAhBD,kCAgBC;AAED;;GAEG;AACH,SAAgB,kBAAkB,CAAC,OAAe;IAChD,OAAO,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC9C,CAAC;AAFD,gDAEC;AAED;;GAEG;AACH,SAAgB,6BAA6B,CAC3C,QAAmB,EACnB,OAAoB;IAEpB,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC;IACtC,OAAO,CACL,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC;QACnC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CACrD,CAAC;AACJ,CAAC;AATD,sEASC;AAED;;;GAGG;AACH,SAAgB,sBAAsB,CAAC,OAAe;IACpD,OAAO,gBAAM,CAAC,SAAS,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;AAC9C,CAAC;AAFD,wDAEC"}
|
package/dist/reporters/base.d.ts
CHANGED
|
@@ -29,12 +29,15 @@ import { Journey, Step } from '../dsl';
|
|
|
29
29
|
export default class BaseReporter implements Reporter {
|
|
30
30
|
stream: SonicBoom;
|
|
31
31
|
fd: number;
|
|
32
|
+
dryRun: boolean;
|
|
32
33
|
metrics: {
|
|
33
34
|
succeeded: number;
|
|
34
35
|
failed: number;
|
|
35
36
|
skipped: number;
|
|
37
|
+
registered: number;
|
|
36
38
|
};
|
|
37
39
|
constructor(options?: ReporterOptions);
|
|
40
|
+
onJourneyRegister(journey: Journey): void;
|
|
38
41
|
onJourneyStart(journey: Journey, {}: JourneyStartResult): void;
|
|
39
42
|
onStepEnd(_: Journey, step: Step, result: StepEndResult): void;
|
|
40
43
|
onJourneyEnd(_: Journey, { error }: JourneyEndResult): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/reporters/base.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,SAAS,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/reporters/base.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAEH,OAAO,SAAS,MAAM,YAAY,CAAC;AAInC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,GAAG,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAMvC,MAAM,CAAC,OAAO,OAAO,YAAa,YAAW,QAAQ;IACnD,MAAM,EAAE,SAAS,CAAC;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO;;;;;MAKL;gBAEU,OAAO,GAAE,eAAoB;IAWzC,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAKzC,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,kBAAkB;IAIvD,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa;IAcvD,YAAY,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,gBAAgB;IAapD,KAAK;IA6BL,KAAK,CAAC,OAAO,KAAA;CAMd"}
|
package/dist/reporters/base.js
CHANGED
|
@@ -29,38 +29,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
29
29
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
30
|
const sonic_boom_1 = __importDefault(require("sonic-boom"));
|
|
31
31
|
const colors_1 = require("kleur/colors");
|
|
32
|
+
const reporter_util_1 = require("./reporter-util");
|
|
32
33
|
const helpers_1 = require("../helpers");
|
|
33
|
-
function renderError(error) {
|
|
34
|
-
let output = '';
|
|
35
|
-
const outer = (0, helpers_1.indent)('');
|
|
36
|
-
const inner = (0, helpers_1.indent)(outer);
|
|
37
|
-
const container = outer + '---\n';
|
|
38
|
-
output += container;
|
|
39
|
-
let stack = error.stack;
|
|
40
|
-
if (stack) {
|
|
41
|
-
output += inner + 'stack: |-\n';
|
|
42
|
-
stack = (0, helpers_1.rewriteErrorStack)(stack, (0, helpers_1.findPWLogsIndexes)(stack));
|
|
43
|
-
const lines = String(stack).split('\n');
|
|
44
|
-
for (const line of lines) {
|
|
45
|
-
output += inner + ' ' + line + '\n';
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
output += container;
|
|
49
|
-
return (0, colors_1.red)(output);
|
|
50
|
-
}
|
|
51
34
|
function renderDuration(durationMs) {
|
|
52
35
|
return parseInt(durationMs);
|
|
53
36
|
}
|
|
54
37
|
class BaseReporter {
|
|
55
38
|
stream;
|
|
56
39
|
fd;
|
|
40
|
+
dryRun;
|
|
57
41
|
metrics = {
|
|
58
42
|
succeeded: 0,
|
|
59
43
|
failed: 0,
|
|
60
44
|
skipped: 0,
|
|
45
|
+
registered: 0,
|
|
61
46
|
};
|
|
62
47
|
constructor(options = {}) {
|
|
63
48
|
this.fd = options.fd || process.stdout.fd;
|
|
49
|
+
this.dryRun = options.dryRun ?? false;
|
|
64
50
|
/**
|
|
65
51
|
* minLength is set to 1 byte to make sure we flush the
|
|
66
52
|
* content even if its the last byte on the stream buffer
|
|
@@ -68,14 +54,21 @@ class BaseReporter {
|
|
|
68
54
|
*/
|
|
69
55
|
this.stream = new sonic_boom_1.default({ fd: this.fd, sync: true, minLength: 1 });
|
|
70
56
|
}
|
|
57
|
+
onJourneyRegister(journey) {
|
|
58
|
+
this.write(`\nJourney: ${journey.name}`);
|
|
59
|
+
this.metrics.registered++;
|
|
60
|
+
}
|
|
71
61
|
onJourneyStart(journey, {}) {
|
|
72
62
|
this.write(`\nJourney: ${journey.name}`);
|
|
73
63
|
}
|
|
74
64
|
onStepEnd(_, step, result) {
|
|
75
65
|
const { status, end, start, error } = result;
|
|
76
|
-
const message = `${helpers_1.symbols[status]} Step: '${step.name}' ${status}
|
|
66
|
+
const message = `${helpers_1.symbols[status]} Step: '${step.name}' ${status} ${(0, colors_1.gray)('(' + renderDuration((end - start) * 1000) + ' ms)')}`;
|
|
77
67
|
this.write((0, helpers_1.indent)(message));
|
|
78
|
-
|
|
68
|
+
if (error) {
|
|
69
|
+
const message = (0, reporter_util_1.renderError)((0, reporter_util_1.serializeError)(error));
|
|
70
|
+
this.write((0, helpers_1.indent)(message) + '\n');
|
|
71
|
+
}
|
|
79
72
|
this.metrics[status]++;
|
|
80
73
|
}
|
|
81
74
|
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
@@ -87,12 +80,17 @@ class BaseReporter {
|
|
|
87
80
|
* be executed which means the error happened in one of the hooks
|
|
88
81
|
*/
|
|
89
82
|
if (total === 0 && error) {
|
|
90
|
-
|
|
83
|
+
const message = (0, reporter_util_1.renderError)((0, reporter_util_1.serializeError)(error));
|
|
84
|
+
this.write((0, helpers_1.indent)(message) + '\n');
|
|
91
85
|
}
|
|
92
86
|
}
|
|
93
87
|
onEnd() {
|
|
94
|
-
const { failed, succeeded, skipped } = this.metrics;
|
|
88
|
+
const { failed, succeeded, skipped, registered } = this.metrics;
|
|
95
89
|
const total = failed + succeeded + skipped;
|
|
90
|
+
if (this.dryRun) {
|
|
91
|
+
this.write(`\n${registered} journey(s) registered`);
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
96
94
|
let message = '\n';
|
|
97
95
|
if (total === 0) {
|
|
98
96
|
message = 'No tests found!';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/reporters/base.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;AAEH,4DAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/reporters/base.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;AAEH,4DAAmC;AACnC,yCAAsD;AACtD,mDAA8D;AAC9D,wCAAkD;AASlD,SAAS,cAAc,CAAC,UAAU;IAChC,OAAO,QAAQ,CAAC,UAAU,CAAC,CAAC;AAC9B,CAAC;AAED,MAAqB,YAAY;IAC/B,MAAM,CAAY;IAClB,EAAE,CAAS;IACX,MAAM,CAAU;IAChB,OAAO,GAAG;QACR,SAAS,EAAE,CAAC;QACZ,MAAM,EAAE,CAAC;QACT,OAAO,EAAE,CAAC;QACV,UAAU,EAAE,CAAC;KACd,CAAC;IAEF,YAAY,UAA2B,EAAE;QACvC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,KAAK,CAAC;QACtC;;;;WAIG;QACH,IAAI,CAAC,MAAM,GAAG,IAAI,oBAAS,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,CAAC;IACzE,CAAC;IAED,iBAAiB,CAAC,OAAgB;QAChC,IAAI,CAAC,KAAK,CAAC,cAAc,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QACzC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;IAC5B,CAAC;IAED,cAAc,CAAC,OAAgB,EAAE,EAAsB;QACrD,IAAI,CAAC,KAAK,CAAC,cAAc,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,SAAS,CAAC,CAAU,EAAE,IAAU,EAAE,MAAqB;QACrD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;QAC7C,MAAM,OAAO,GAAG,GAAG,iBAAO,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,IAAA,aAAI,EACxE,GAAG,GAAG,cAAc,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,GAAG,MAAM,CACpD,EAAE,CAAC;QACJ,IAAI,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,OAAO,CAAC,CAAC,CAAC;QAC5B,IAAI,KAAK,EAAE;YACT,MAAM,OAAO,GAAG,IAAA,2BAAW,EAAC,IAAA,8BAAc,EAAC,KAAK,CAAC,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;SACpC;QACD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,sDAAsD;IACtD,YAAY,CAAC,CAAU,EAAE,EAAE,KAAK,EAAoB;QAClD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACpD,MAAM,KAAK,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;QAC3C;;;WAGG;QACH,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,EAAE;YACxB,MAAM,OAAO,GAAG,IAAA,2BAAW,EAAC,IAAA,8BAAc,EAAC,KAAK,CAAC,CAAC,CAAC;YACnD,IAAI,CAAC,KAAK,CAAC,IAAA,gBAAM,EAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;SACpC;IACH,CAAC;IAED,KAAK;QACH,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QAChE,MAAM,KAAK,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;QAE3C,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,KAAK,CAAC,KAAK,UAAU,wBAAwB,CAAC,CAAC;YACpD,OAAO;SACR;QAED,IAAI,OAAO,GAAG,IAAI,CAAC;QACnB,IAAI,KAAK,KAAK,CAAC,EAAE;YACf,OAAO,GAAG,iBAAiB,CAAC;YAC5B,OAAO,IAAI,KAAK,cAAc,CAAC,IAAA,aAAG,GAAE,CAAC,SAAS,CAAC;YAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACpB,OAAO;SACR;QAED,OAAO,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,cAAK,EAAC,IAAI,SAAS,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9D,OAAO,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,YAAG,EAAC,IAAI,MAAM,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtD,OAAO,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,aAAI,EAAC,IAAI,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,OAAO,IAAI,KAAK,cAAc,CAAC,IAAA,aAAG,GAAE,CAAC,SAAS,CAAC;QAC/C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEpB,uEAAuE;QACvE,yEAAyE;QACzE,cAAc;QACd,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,OAAO,OAAO,IAAI,QAAQ,EAAE;YAC9B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;SACnC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IACpC,CAAC;CACF;AA7FD,+BA6FC"}
|
|
@@ -24,12 +24,13 @@
|
|
|
24
24
|
*/
|
|
25
25
|
import { Journey, Step } from '../dsl';
|
|
26
26
|
import { StartEvent, JourneyEndResult, JourneyStartResult, StepEndResult } from '../common_types';
|
|
27
|
-
export
|
|
27
|
+
export type ReporterOptions = {
|
|
28
28
|
fd?: number;
|
|
29
29
|
colors?: boolean;
|
|
30
|
+
dryRun?: boolean;
|
|
30
31
|
};
|
|
31
|
-
export
|
|
32
|
-
export
|
|
32
|
+
export type BuiltInReporterName = 'default' | 'json' | 'junit';
|
|
33
|
+
export type ReporterInstance = new (opts: ReporterOptions) => Reporter;
|
|
33
34
|
export declare const reporters: {
|
|
34
35
|
[key in BuiltInReporterName]: ReporterInstance;
|
|
35
36
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/reporters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACd,MAAM,iBAAiB,CAAC;AAEzB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/reporters/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,kBAAkB,EAClB,aAAa,EACd,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAC/D,MAAM,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE,eAAe,KAAK,QAAQ,CAAC;AACvE,eAAO,MAAM,SAAS,EAAE;KACrB,GAAG,IAAI,mBAAmB,GAAG,gBAAgB;CAK/C,CAAC;AAEF,MAAM,WAAW,QAAQ;IACvB,OAAO,CAAC,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI,CAAC;IACnC,iBAAiB,CAAC,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAC3C,cAAc,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpE,WAAW,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IACjD,SAAS,CAAC,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI,CAAC;IACtE,YAAY,CAAC,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,gBAAgB,GACvB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxB,KAAK,CAAC,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/reporters/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,kDAAkC;AAClC,kDAAkC;AAClC,oDAAoC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/reporters/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,kDAAkC;AAClC,kDAAkC;AAClC,oDAAoC;AAgBvB,QAAA,SAAS,GAElB;IACF,OAAO,EAAE,cAAY;IACrB,IAAI,EAAE,cAAY;IAClB,KAAK,EAAE,eAAa;CACrB,CAAC"}
|
package/dist/reporters/json.d.ts
CHANGED
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
import BaseReporter from './base';
|
|
27
27
|
import { Journey, Step } from '../dsl';
|
|
28
28
|
import { NetworkInfo, NetworkConditions, TraceOutput, StatusValue, PerfMetrics, Screenshot, StartEvent, JourneyStartResult, StepEndResult, JourneyEndResult, PageMetrics } from '../common_types';
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
type OutputType = 'synthetics/metadata' | 'journey/register' | 'journey/start' | 'screenshot/block' | 'step/screenshot_ref' | 'step/screenshot' | 'step/metrics' | 'step/filmstrips' | 'step/end' | 'journey/network_info' | 'journey/browserconsole' | 'journey/end';
|
|
30
|
+
type Payload = {
|
|
31
31
|
source?: string;
|
|
32
32
|
start?: number;
|
|
33
33
|
end?: number;
|
|
@@ -39,7 +39,7 @@ declare type Payload = {
|
|
|
39
39
|
index?: number;
|
|
40
40
|
network_conditions?: NetworkConditions;
|
|
41
41
|
};
|
|
42
|
-
|
|
42
|
+
type OutputFields = {
|
|
43
43
|
type: OutputType;
|
|
44
44
|
_id?: string;
|
|
45
45
|
journey?: Journey;
|
|
@@ -56,11 +56,11 @@ declare type OutputFields = {
|
|
|
56
56
|
blob?: string;
|
|
57
57
|
blob_mime?: string;
|
|
58
58
|
};
|
|
59
|
-
|
|
59
|
+
type ScreenshotBlob = {
|
|
60
60
|
blob: string;
|
|
61
61
|
id: string;
|
|
62
62
|
};
|
|
63
|
-
|
|
63
|
+
type ScreenshotReference = {
|
|
64
64
|
width: number;
|
|
65
65
|
height: number;
|
|
66
66
|
blocks: Array<{
|