@elastic/synthetics 1.0.0-beta.30 → 1.0.0-beta.33
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/cli.js +51 -26
- package/dist/cli.js.map +1 -1
- package/dist/common_types.d.ts +4 -1
- package/dist/common_types.d.ts.map +1 -1
- package/dist/core/expect.d.ts +25 -25
- package/dist/core/expect.d.ts.map +1 -1
- package/dist/core/expect.js.map +1 -1
- package/dist/core/gatherer.d.ts.map +1 -1
- package/dist/core/gatherer.js +3 -1
- package/dist/core/gatherer.js.map +1 -1
- package/dist/core/runner.d.ts.map +1 -1
- package/dist/core/runner.js +4 -3
- package/dist/core/runner.js.map +1 -1
- package/dist/dsl/index.js +5 -1
- package/dist/dsl/index.js.map +1 -1
- package/dist/dsl/journey.d.ts +2 -1
- package/dist/dsl/journey.d.ts.map +1 -1
- package/dist/dsl/journey.js +5 -1
- package/dist/dsl/journey.js.map +1 -1
- package/dist/dsl/monitor.d.ts +2 -1
- package/dist/dsl/monitor.d.ts.map +1 -1
- package/dist/dsl/monitor.js +2 -2
- package/dist/dsl/monitor.js.map +1 -1
- package/dist/generator/index.d.ts +11 -3
- package/dist/generator/index.d.ts.map +1 -1
- package/dist/generator/index.js +98 -27
- package/dist/generator/index.js.map +1 -1
- package/dist/generator/utils.d.ts +2 -1
- package/dist/generator/utils.d.ts.map +1 -1
- package/dist/generator/utils.js +27 -4
- package/dist/generator/utils.js.map +1 -1
- package/dist/helpers.d.ts +10 -5
- package/dist/helpers.d.ts.map +1 -1
- package/dist/helpers.js +41 -10
- package/dist/helpers.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/loader.js +11 -3
- package/dist/loader.js.map +1 -1
- package/dist/locations/index.d.ts +45 -0
- package/dist/locations/index.d.ts.map +1 -0
- package/dist/locations/index.js +90 -0
- package/dist/locations/index.js.map +1 -0
- package/dist/{dsl/locations.d.ts → locations/public-locations.d.ts} +1 -1
- package/dist/locations/public-locations.d.ts.map +1 -0
- package/dist/{dsl/locations.js → locations/public-locations.js} +1 -1
- package/dist/locations/public-locations.js.map +1 -0
- package/dist/options.d.ts +7 -0
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +21 -1
- package/dist/options.js.map +1 -1
- package/dist/plugins/index.js +5 -1
- package/dist/plugins/index.js.map +1 -1
- package/dist/push/bundler.d.ts.map +1 -1
- package/dist/push/bundler.js +12 -3
- package/dist/push/bundler.js.map +1 -1
- package/dist/push/index.d.ts +12 -1
- package/dist/push/index.d.ts.map +1 -1
- package/dist/push/index.js +137 -8
- package/dist/push/index.js.map +1 -1
- package/dist/push/monitor.d.ts +7 -0
- package/dist/push/monitor.d.ts.map +1 -1
- package/dist/push/monitor.js +23 -7
- package/dist/push/monitor.js.map +1 -1
- package/dist/push/plugin.d.ts.map +1 -1
- package/dist/push/plugin.js +11 -2
- package/dist/push/plugin.js.map +1 -1
- package/dist/push/request.d.ts +8 -7
- package/dist/push/request.d.ts.map +1 -1
- package/dist/push/request.js +22 -22
- package/dist/push/request.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +9 -9
- package/src/cli.ts +79 -59
- package/src/common_types.ts +4 -0
- package/src/core/expect.ts +58 -24
- package/src/core/gatherer.ts +9 -2
- package/src/core/runner.ts +5 -6
- package/src/dsl/journey.ts +8 -1
- package/src/dsl/monitor.ts +2 -1
- package/src/generator/index.ts +138 -34
- package/src/generator/utils.ts +29 -3
- package/src/helpers.ts +40 -12
- package/src/index.ts +1 -0
- package/src/loader.ts +11 -2
- package/src/locations/index.ts +108 -0
- package/src/{dsl/locations.ts → locations/public-locations.ts} +0 -0
- package/src/options.ts +38 -0
- package/src/push/bundler.ts +7 -2
- package/src/push/index.ts +177 -10
- package/src/push/monitor.ts +38 -9
- package/src/push/plugin.ts +6 -1
- package/src/push/request.ts +27 -34
- package/templates/journeys/advanced-example-helpers.ts +9 -9
- package/templates/journeys/advanced-example.journey.ts +6 -6
- package/templates/journeys/example.journey.ts +1 -1
- package/templates/synthetics.config.ts +2 -1
- package/dist/dsl/locations.d.ts.map +0 -1
- package/dist/dsl/locations.js.map +0 -1
package/dist/dsl/journey.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/dsl/journey.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG
|
|
1
|
+
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/dsl/journey.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;;;;;;;;;;;;;;;;;;;;;AASH,yDAAiD;AACjD,iCAA8B;AAE9B,uCAAmD;AAmBnD,MAAa,OAAO;IAUlB,YACE,OAAuB,EACvB,QAAyB,EACzB,QAAmB;QAPrB,UAAK,GAAW,EAAE,CAAC;QACnB,UAAK,GAAU,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAQvC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC;QACrC,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACzB,CAAC;IAED,OAAO,CAAC,IAAY,EAAE,QAAsB,EAAE,QAAmB;QAC/D,MAAM,IAAI,GAAG,IAAI,WAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACvE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CAAC,IAAc,EAAE,QAAuB;QAC7C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAED,aAAa,CAAC,MAAqB;QACjC;;WAEG;QACH,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAO,CAAC;YACzB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,EAAE;YACrB,GAAG,MAAM;SACV,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,YAAoB,EAAE,WAA0B;QACtD,IAAI,WAAW,EAAE;YACf,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;SACpC;QACD,IAAI,YAAY,EAAE;YAChB,OAAO,IAAA,oBAAO,EAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;SACzE;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,CAAC,OAAO;QACf,MAAM,QAAQ,GAAG,IAAA,oBAAU,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;QACzD,OAAO,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC;IAC7B,CAAC;CACF;AAlED,0BAkEC"}
|
package/dist/dsl/monitor.d.ts
CHANGED
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
import { ThrottlingOptions, Location, ScreenshotOptions, Params, PlaywrightOptions } from '../common_types';
|
|
26
|
-
import { LocationsMap } from '
|
|
26
|
+
import { LocationsMap } from '../locations/public-locations';
|
|
27
27
|
export declare type SyntheticsLocationsType = keyof typeof LocationsMap;
|
|
28
28
|
export declare const SyntheticsLocations: ("japan" | "india" | "singapore" | "australia_east" | "united_kingdom" | "germany" | "canada_east" | "brazil" | "us_east" | "us_west")[];
|
|
29
29
|
export declare type MonitorConfig = {
|
|
@@ -33,6 +33,7 @@ export declare type MonitorConfig = {
|
|
|
33
33
|
schedule?: number;
|
|
34
34
|
enabled?: boolean;
|
|
35
35
|
locations?: SyntheticsLocationsType[];
|
|
36
|
+
privateLocations?: string[];
|
|
36
37
|
throttling?: ThrottlingOptions;
|
|
37
38
|
screenshot?: ScreenshotOptions;
|
|
38
39
|
params?: Params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/dsl/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EACL,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,MAAM,EACN,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/dsl/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EACL,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EACjB,MAAM,EACN,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAE7D,oBAAY,uBAAuB,GAAG,MAAM,OAAO,YAAY,CAAC;AAChE,eAAO,MAAM,mBAAmB,0IAEF,CAAC;AAE/B,oBAAY,aAAa,GAAG;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,uBAAuB,EAAE,CAAC;IACtC,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;CACvC,CAAC;AAEF,aAAK,aAAa,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,CAAC;AAEF,qBAAa,OAAO;IAGC,MAAM,EAAE,aAAa;IAFxC,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,aAAa,CAAC;gBACH,MAAM,GAAE,aAAkB;IAC7C;;;OAGG;IACH,MAAM,CAAC,UAAU,GAAE,aAAkB;IAQrC,SAAS,CAAC,MAAM,EAAE,QAAQ;IAG1B;;;;;OAKG;IACH,SAAS,CAAC,MAAM,EAAE,aAAa;CAGhC"}
|
package/dist/dsl/monitor.js
CHANGED
|
@@ -29,8 +29,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
29
29
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
30
|
exports.Monitor = exports.SyntheticsLocations = void 0;
|
|
31
31
|
const deepmerge_1 = __importDefault(require("deepmerge"));
|
|
32
|
-
const
|
|
33
|
-
exports.SyntheticsLocations = Object.keys(
|
|
32
|
+
const public_locations_1 = require("../locations/public-locations");
|
|
33
|
+
exports.SyntheticsLocations = Object.keys(public_locations_1.LocationsMap);
|
|
34
34
|
class Monitor {
|
|
35
35
|
constructor(config = {}) {
|
|
36
36
|
this.config = config;
|
package/dist/dsl/monitor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/dsl/monitor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,0DAA8B;AAQ9B,
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/dsl/monitor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,0DAA8B;AAQ9B,oEAA6D;AAGhD,QAAA,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAC5C,+BAAY,CACgB,CAAC;AAqB/B,MAAa,OAAO;IAGlB,YAAmB,SAAwB,EAAE;QAA1B,WAAM,GAAN,MAAM,CAAoB;IAAG,CAAC;IACjD;;;OAGG;IACH,MAAM,CAAC,aAA4B,EAAE;QACnC,IAAI,CAAC,MAAM,GAAG,IAAA,mBAAK,EAAC,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE;YAC3C,UAAU,CAAC,MAAM,EAAE,MAAM;gBACvB,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9B,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,MAAgB;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IACD;;;;;OAKG;IACH,SAAS,CAAC,MAAqB;QAC7B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;CACF;AA5BD,0BA4BC"}
|
|
@@ -1,8 +1,16 @@
|
|
|
1
|
-
declare type
|
|
2
|
-
|
|
1
|
+
export declare type ProjectSettings = {
|
|
2
|
+
url: string;
|
|
3
|
+
space: string;
|
|
4
|
+
project: string;
|
|
5
|
+
};
|
|
6
|
+
declare type PromptOptions = ProjectSettings & {
|
|
7
|
+
locations: Array<string>;
|
|
8
|
+
privateLocations: Array<string>;
|
|
3
9
|
schedule: number;
|
|
4
10
|
};
|
|
5
|
-
export declare const
|
|
11
|
+
export declare const REGULAR_FILES_PATH: string[];
|
|
12
|
+
export declare const SETTINGS_PATH = ".synthetics/project.json";
|
|
13
|
+
export declare const CONFIG_PATH = "synthetics.config.ts";
|
|
6
14
|
export declare class Generator {
|
|
7
15
|
projectDir: string;
|
|
8
16
|
pkgManager: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"AA2CA,oBAAY,eAAe,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,aAAK,aAAa,GAAG,eAAe,GAAG;IACrC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACzB,gBAAgB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAGF,eAAO,MAAM,kBAAkB,UAM9B,CAAC;AACF,eAAO,MAAM,aAAa,6BAA6B,CAAC;AACxD,eAAO,MAAM,WAAW,yBAAyB,CAAC;AAKlD,qBAAa,SAAS;IAED,UAAU,EAAE,MAAM;IADrC,UAAU,SAAS;gBACA,UAAU,EAAE,MAAM;IAE/B,SAAS;IAWT,SAAS;IAmFT,KAAK,CAAC,OAAO,EAAE,aAAa;IAmC5B,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,UAAQ;IAsBlE,OAAO;IA0BP,YAAY;IAsBZ,cAAc;IAcpB,MAAM;IAoBA,KAAK;CASZ"}
|
package/dist/generator/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Generator = exports.
|
|
3
|
+
exports.Generator = exports.CONFIG_PATH = exports.SETTINGS_PATH = exports.REGULAR_FILES_PATH = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* MIT License
|
|
6
6
|
*
|
|
@@ -30,27 +30,32 @@ const fs_1 = require("fs");
|
|
|
30
30
|
const promises_1 = require("fs/promises");
|
|
31
31
|
const colors_1 = require("kleur/colors");
|
|
32
32
|
const path_1 = require("path");
|
|
33
|
+
// @ts-ignore-next-line: has no exported member 'Input'
|
|
33
34
|
const enquirer_1 = require("enquirer");
|
|
34
|
-
const monitor_1 = require("../dsl/monitor");
|
|
35
35
|
const helpers_1 = require("../helpers");
|
|
36
36
|
const utils_1 = require("./utils");
|
|
37
|
-
|
|
38
|
-
// synthetics project
|
|
37
|
+
const locations_1 = require("../locations");
|
|
38
|
+
// Templates that are required for setting up new synthetics project
|
|
39
39
|
const templateDir = (0, path_1.join)(__dirname, '..', '..', 'templates');
|
|
40
40
|
// exported for testing
|
|
41
|
-
exports.
|
|
42
|
-
'.github/workflows/run-synthetics.yml',
|
|
43
|
-
'README.md',
|
|
41
|
+
exports.REGULAR_FILES_PATH = [
|
|
44
42
|
'journeys/example.journey.ts',
|
|
45
|
-
'journeys/advanced-example.journey.ts',
|
|
46
43
|
'journeys/advanced-example-helpers.ts',
|
|
44
|
+
'journeys/advanced-example.journey.ts',
|
|
45
|
+
'.github/workflows/run-synthetics.yml',
|
|
46
|
+
'README.md',
|
|
47
47
|
];
|
|
48
|
+
exports.SETTINGS_PATH = '.synthetics/project.json';
|
|
49
|
+
exports.CONFIG_PATH = 'synthetics.config.ts';
|
|
50
|
+
// Files to be overriden by default if the project is initialized multiple times
|
|
51
|
+
const DEFAULT_OVERRIDES = [exports.SETTINGS_PATH, exports.CONFIG_PATH];
|
|
48
52
|
class Generator {
|
|
49
53
|
constructor(projectDir) {
|
|
50
54
|
this.projectDir = projectDir;
|
|
51
55
|
this.pkgManager = 'npm';
|
|
52
56
|
}
|
|
53
57
|
async directory() {
|
|
58
|
+
(0, helpers_1.progress)(`Initializing Synthetics project in '${(0, path_1.relative)(process.cwd(), this.projectDir) || '.'}'`);
|
|
54
59
|
if (!(0, fs_1.existsSync)(this.projectDir)) {
|
|
55
60
|
await (0, promises_1.mkdir)(this.projectDir);
|
|
56
61
|
}
|
|
@@ -59,12 +64,48 @@ class Generator {
|
|
|
59
64
|
if (process.env.TEST_QUESTIONS) {
|
|
60
65
|
return JSON.parse(process.env.TEST_QUESTIONS);
|
|
61
66
|
}
|
|
62
|
-
const
|
|
67
|
+
const { onCloud } = await (0, enquirer_1.prompt)({
|
|
68
|
+
type: 'confirm',
|
|
69
|
+
name: 'onCloud',
|
|
70
|
+
initial: 'y',
|
|
71
|
+
message: 'Do you use Elastic Cloud',
|
|
72
|
+
});
|
|
73
|
+
const url = await new enquirer_1.Input({
|
|
74
|
+
header: onCloud
|
|
75
|
+
? (0, colors_1.yellow)('Get cloud.id from your deployment https://www.elastic.co/guide/en/cloud/current/ec-cloud-id.html')
|
|
76
|
+
: '',
|
|
77
|
+
message: onCloud
|
|
78
|
+
? 'What is your cloud.id'
|
|
79
|
+
: 'What is the url of your Kibana instance',
|
|
80
|
+
name: 'url',
|
|
81
|
+
required: true,
|
|
82
|
+
result(value) {
|
|
83
|
+
return onCloud ? (0, utils_1.cloudIDToKibanaURL)(value) : value;
|
|
84
|
+
},
|
|
85
|
+
}).run();
|
|
86
|
+
const auth = await new enquirer_1.Input({
|
|
87
|
+
name: 'auth',
|
|
88
|
+
header: (0, colors_1.yellow)(`Generate API key from Kibana ${(0, helpers_1.removeTrailingSlash)(url)}/app/uptime/manage-monitors/all`),
|
|
89
|
+
required: true,
|
|
90
|
+
message: 'What is your API key',
|
|
91
|
+
}).run();
|
|
92
|
+
const allLocations = await (0, locations_1.getLocations)({ url, auth });
|
|
93
|
+
const locChoices = (0, locations_1.formatLocations)(allLocations);
|
|
94
|
+
if (locChoices.length === 0) {
|
|
95
|
+
// TODO - Add link to docs
|
|
96
|
+
throw 'Follow the docs to set up your first private locations - <link>';
|
|
97
|
+
}
|
|
98
|
+
const monitorQues = [
|
|
63
99
|
{
|
|
64
100
|
type: 'select',
|
|
65
101
|
name: 'locations',
|
|
66
|
-
|
|
67
|
-
|
|
102
|
+
hint: '(Use <space> to select, <return> to submit)',
|
|
103
|
+
message: 'Select the locations where you want to run monitors',
|
|
104
|
+
choices: locChoices,
|
|
105
|
+
multiple: true,
|
|
106
|
+
validate(value) {
|
|
107
|
+
return value.length === 0 ? `Select at least one option.` : true;
|
|
108
|
+
},
|
|
68
109
|
},
|
|
69
110
|
{
|
|
70
111
|
type: 'numeral',
|
|
@@ -72,17 +113,38 @@ class Generator {
|
|
|
72
113
|
message: 'Set default schedule in minutes for all monitors',
|
|
73
114
|
initial: 10,
|
|
74
115
|
},
|
|
116
|
+
{
|
|
117
|
+
type: 'input',
|
|
118
|
+
name: 'project',
|
|
119
|
+
message: 'Choose project id to logically group monitors',
|
|
120
|
+
initial: (0, path_1.basename)(this.projectDir),
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
type: 'input',
|
|
124
|
+
name: 'space',
|
|
125
|
+
message: 'Choose the target Kibana space',
|
|
126
|
+
initial: 'default',
|
|
127
|
+
},
|
|
75
128
|
];
|
|
76
|
-
|
|
129
|
+
// Split and group private and public locations from the answered list.
|
|
130
|
+
const answers = await (0, enquirer_1.prompt)(monitorQues);
|
|
131
|
+
const { locations, privateLocations } = (0, locations_1.groupLocations)(answers.locations);
|
|
132
|
+
return { ...answers, url, locations, privateLocations };
|
|
77
133
|
}
|
|
78
134
|
async files(answers) {
|
|
79
135
|
const fileMap = new Map();
|
|
136
|
+
// Setup project.json
|
|
137
|
+
const projectJSON = {
|
|
138
|
+
url: answers.url,
|
|
139
|
+
space: answers.space,
|
|
140
|
+
project: answers.project,
|
|
141
|
+
};
|
|
142
|
+
fileMap.set(exports.SETTINGS_PATH, JSON.stringify(projectJSON, null, 2) + '\n');
|
|
80
143
|
// Setup Synthetics config file
|
|
81
|
-
|
|
82
|
-
fileMap.set(configFile, (0, utils_1.replaceTemplates)(await (0, promises_1.readFile)((0, path_1.join)(templateDir, configFile), 'utf-8'), answers));
|
|
144
|
+
fileMap.set(exports.CONFIG_PATH, (0, utils_1.replaceTemplates)(await (0, promises_1.readFile)((0, path_1.join)(templateDir, exports.CONFIG_PATH), 'utf-8'), answers));
|
|
83
145
|
// Setup non-templated files
|
|
84
|
-
Promise.all(exports.
|
|
85
|
-
fileMap.set(
|
|
146
|
+
Promise.all(exports.REGULAR_FILES_PATH.map(async (file) => {
|
|
147
|
+
fileMap.set(file, await (0, promises_1.readFile)((0, path_1.join)(templateDir, file), 'utf-8'));
|
|
86
148
|
})).catch(e => {
|
|
87
149
|
throw e;
|
|
88
150
|
});
|
|
@@ -93,20 +155,30 @@ class Generator {
|
|
|
93
155
|
}
|
|
94
156
|
async createFile(relativePath, content, override = false) {
|
|
95
157
|
const absolutePath = (0, path_1.join)(this.projectDir, relativePath);
|
|
96
|
-
if (override
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
await (0,
|
|
158
|
+
if (!override &&
|
|
159
|
+
!DEFAULT_OVERRIDES.includes(relativePath) &&
|
|
160
|
+
(0, fs_1.existsSync)(absolutePath)) {
|
|
161
|
+
const { override } = await (0, enquirer_1.prompt)({
|
|
162
|
+
type: 'confirm',
|
|
163
|
+
name: 'override',
|
|
164
|
+
message: `File ${relativePath} already exists. Override it?`,
|
|
165
|
+
initial: false,
|
|
166
|
+
});
|
|
167
|
+
if (!override)
|
|
168
|
+
return;
|
|
100
169
|
}
|
|
170
|
+
(0, helpers_1.progress)(`Writing ${(0, path_1.relative)(process.cwd(), absolutePath)}.`);
|
|
171
|
+
await (0, promises_1.mkdir)((0, path_1.dirname)(absolutePath), { recursive: true });
|
|
172
|
+
await (0, promises_1.writeFile)(absolutePath, content, 'utf-8');
|
|
101
173
|
}
|
|
102
174
|
async package() {
|
|
103
175
|
this.pkgManager = await (0, utils_1.getPackageManager)(this.projectDir);
|
|
104
176
|
const commands = new Map();
|
|
105
|
-
commands.set(`
|
|
177
|
+
commands.set(`Setting up project using ${this.pkgManager == 'yarn' ? 'Yarn' : 'NPM'}`, this.pkgManager == 'yarn' ? 'yarn init -y' : 'npm init -y');
|
|
106
178
|
const pkgName = '@elastic/synthetics';
|
|
107
179
|
commands.set(`Installing @elastic/synthetics library`, this.pkgManager == 'yarn'
|
|
108
|
-
? `yarn add -dev ${pkgName}`
|
|
109
|
-
: `npm i -d ${pkgName}`);
|
|
180
|
+
? `yarn add -dev ${pkgName} --silent`
|
|
181
|
+
: `npm i -d ${pkgName} --quiet`);
|
|
110
182
|
// Execute commands
|
|
111
183
|
for (const [name, command] of commands) {
|
|
112
184
|
(0, helpers_1.progress)(`${name}...`);
|
|
@@ -125,8 +197,7 @@ class Generator {
|
|
|
125
197
|
// Add test command
|
|
126
198
|
pkgJSON.scripts.test = 'npx @elastic/synthetics journeys';
|
|
127
199
|
// Add push command
|
|
128
|
-
|
|
129
|
-
pkgJSON.scripts.push = `npx @elastic/synthetics push journeys --project ${project} --url http://localhost:5601 --auth apiKey`;
|
|
200
|
+
pkgJSON.scripts.push = `npx @elastic/synthetics push --auth $SYNTHETICS_API_KEY`;
|
|
130
201
|
await this.createFile(filename, JSON.stringify(pkgJSON, null, 2) + '\n', true);
|
|
131
202
|
}
|
|
132
203
|
async patchGitIgnore() {
|
|
@@ -148,9 +219,9 @@ All set, you can run below commands inside: ${this.projectDir}:
|
|
|
148
219
|
|
|
149
220
|
Run synthetic tests: ${(0, colors_1.cyan)((0, utils_1.runCommand)(this.pkgManager, 'test'))}
|
|
150
221
|
|
|
151
|
-
Push monitors to Kibana: ${(0, colors_1.cyan)((0, utils_1.runCommand)(this.pkgManager, 'push'))}
|
|
222
|
+
Push monitors to Kibana: ${(0, colors_1.cyan)('SYNTHETICS_API_KEY=<value> ' + (0, utils_1.runCommand)(this.pkgManager, 'push'))}
|
|
152
223
|
|
|
153
|
-
${(0, colors_1.yellow)('Make sure to
|
|
224
|
+
${(0, colors_1.yellow)('Make sure to configure the SYNTHETICS_API_KEY before pushing monitors to Kibana.')}
|
|
154
225
|
|
|
155
226
|
Visit https://www.elastic.co/guide/en/observability/current/synthetic-run-tests.html to learn more.
|
|
156
227
|
`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,iDAAyC;AACzC,2BAAgC;AAChC,0CAAyD;AACzD,yCAAkD;AAClD,+BAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,5 +24,6 @@
|
|
|
24
24
|
*/
|
|
25
25
|
export declare function getPackageManager(dir: string): Promise<"yarn" | "npm">;
|
|
26
26
|
export declare function runCommand(pkgManager: string, command: string): string;
|
|
27
|
-
export declare function replaceTemplates(input: string,
|
|
27
|
+
export declare function replaceTemplates(input: string, values: Record<string, any>): string;
|
|
28
|
+
export declare function cloudIDToKibanaURL(id: string): string;
|
|
28
29
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/generator/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,2BAKlD;AAED,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAK7D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/generator/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,2BAKlD;AAED,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAK7D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UAgB1E;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,UAmB5C"}
|
package/dist/generator/utils.js
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
*
|
|
25
25
|
*/
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.replaceTemplates = exports.runCommand = exports.getPackageManager = void 0;
|
|
27
|
+
exports.cloudIDToKibanaURL = exports.replaceTemplates = exports.runCommand = exports.getPackageManager = void 0;
|
|
28
28
|
const fs_1 = require("fs");
|
|
29
29
|
const path_1 = require("path");
|
|
30
30
|
async function getPackageManager(dir) {
|
|
@@ -41,10 +41,15 @@ function runCommand(pkgManager, command) {
|
|
|
41
41
|
return `npm run ${command}`;
|
|
42
42
|
}
|
|
43
43
|
exports.runCommand = runCommand;
|
|
44
|
-
function replaceTemplates(input,
|
|
45
|
-
for (const key in
|
|
46
|
-
const finalValue =
|
|
44
|
+
function replaceTemplates(input, values) {
|
|
45
|
+
for (const key in values) {
|
|
46
|
+
const finalValue = values[key];
|
|
47
47
|
input = input.replace(new RegExp(`'{{` + key + `}}'`, 'g'), () => {
|
|
48
|
+
if (Array.isArray(finalValue)) {
|
|
49
|
+
return String(finalValue)
|
|
50
|
+
.split(',')
|
|
51
|
+
.map(f => `'${f}'`);
|
|
52
|
+
}
|
|
48
53
|
if (typeof finalValue == 'number') {
|
|
49
54
|
return Number(finalValue);
|
|
50
55
|
}
|
|
@@ -54,4 +59,22 @@ function replaceTemplates(input, literals) {
|
|
|
54
59
|
return input;
|
|
55
60
|
}
|
|
56
61
|
exports.replaceTemplates = replaceTemplates;
|
|
62
|
+
function cloudIDToKibanaURL(id) {
|
|
63
|
+
const ID_SEPARATOR = ':';
|
|
64
|
+
const VALUE_SEPARATOR = '$';
|
|
65
|
+
// Ignore values before the separator
|
|
66
|
+
const index = id.lastIndexOf(ID_SEPARATOR);
|
|
67
|
+
if (index >= 0) {
|
|
68
|
+
id = id.substring(index + 1);
|
|
69
|
+
}
|
|
70
|
+
// Decode the base64 string
|
|
71
|
+
const decoded = Buffer.from(id, 'base64').toString();
|
|
72
|
+
const words = decoded.split(VALUE_SEPARATOR);
|
|
73
|
+
// construct the kibana and ES urls from decoded value
|
|
74
|
+
const [host, port = '443'] = words[0].split(ID_SEPARATOR);
|
|
75
|
+
const [kibanaId, kibanaPort = port] = words[2].split(ID_SEPARATOR);
|
|
76
|
+
const kibanaURL = `https://${kibanaId}.${host}:${kibanaPort}`;
|
|
77
|
+
return kibanaURL;
|
|
78
|
+
}
|
|
79
|
+
exports.cloudIDToKibanaURL = cloudIDToKibanaURL;
|
|
57
80
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/generator/utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,2BAAgC;AAChC,+BAA4B;AAErB,KAAK,UAAU,iBAAiB,CAAC,GAAW;IACjD,IAAI,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC,EAAE;QACtC,OAAO,MAAM,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AALD,8CAKC;AAED,SAAgB,UAAU,CAAC,UAAkB,EAAE,OAAe;IAC5D,IAAI,UAAU,KAAK,MAAM,EAAE;QACzB,OAAO,QAAQ,OAAO,EAAE,CAAC;KAC1B;IACD,OAAO,WAAW,OAAO,EAAE,CAAC;AAC9B,CAAC;AALD,gCAKC;AAED,SAAgB,gBAAgB,CAAC,KAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/generator/utils.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,2BAAgC;AAChC,+BAA4B;AAErB,KAAK,UAAU,iBAAiB,CAAC,GAAW;IACjD,IAAI,IAAA,eAAU,EAAC,IAAA,WAAI,EAAC,GAAG,EAAE,WAAW,CAAC,CAAC,EAAE;QACtC,OAAO,MAAM,CAAC;KACf;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AALD,8CAKC;AAED,SAAgB,UAAU,CAAC,UAAkB,EAAE,OAAe;IAC5D,IAAI,UAAU,KAAK,MAAM,EAAE;QACzB,OAAO,QAAQ,OAAO,EAAE,CAAC;KAC1B;IACD,OAAO,WAAW,OAAO,EAAE,CAAC;AAC9B,CAAC;AALD,gCAKC;AAED,SAAgB,gBAAgB,CAAC,KAAa,EAAE,MAA2B;IACzE,KAAK,MAAM,GAAG,IAAI,MAAM,EAAE;QACxB,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/B,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,GAAG,GAAG,GAAG,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE;YAC/D,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBAC7B,OAAO,MAAM,CAAC,UAAU,CAAC;qBACtB,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACvB;YACD,IAAI,OAAO,UAAU,IAAI,QAAQ,EAAE;gBACjC,OAAO,MAAM,CAAC,UAAU,CAAC,CAAC;aAC3B;YACD,OAAO,UAAU,CAAC;QACpB,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAhBD,4CAgBC;AAED,SAAgB,kBAAkB,CAAC,EAAU;IAC3C,MAAM,YAAY,GAAG,GAAG,CAAC;IACzB,MAAM,eAAe,GAAG,GAAG,CAAC;IAC5B,qCAAqC;IACrC,MAAM,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;IAC3C,IAAI,KAAK,IAAI,CAAC,EAAE;QACd,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;KAC9B;IAED,2BAA2B;IAC3B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAE7C,sDAAsD;IACtD,MAAM,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC1D,MAAM,CAAC,QAAQ,EAAE,UAAU,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IACnE,MAAM,SAAS,GAAG,WAAW,QAAQ,IAAI,IAAI,IAAI,UAAU,EAAE,CAAC;IAE9D,OAAO,SAAS,CAAC;AACnB,CAAC;AAnBD,gDAmBC"}
|
package/dist/helpers.d.ts
CHANGED
|
@@ -22,12 +22,7 @@
|
|
|
22
22
|
* THE SOFTWARE.
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
|
-
/// <reference types="node" />
|
|
26
|
-
import fs from 'fs';
|
|
27
25
|
import { HooksArgs, HooksCallback, NetworkConditions, Location, ThrottlingOptions } from './common_types';
|
|
28
|
-
export declare const readFileAsync: typeof fs.readFile.__promisify__;
|
|
29
|
-
export declare const writeFileAsync: typeof fs.writeFile.__promisify__;
|
|
30
|
-
export declare const mkdirAsync: typeof fs.mkdir.__promisify__;
|
|
31
26
|
export declare function noop(): void;
|
|
32
27
|
export declare function indent(lines: string, tab?: string): string;
|
|
33
28
|
export declare const symbols: {
|
|
@@ -94,6 +89,12 @@ export declare function formatError(error: Error): {
|
|
|
94
89
|
message: string;
|
|
95
90
|
stack: string;
|
|
96
91
|
};
|
|
92
|
+
/**
|
|
93
|
+
* All the settings that are related to the Synthetics is stored
|
|
94
|
+
* under this directory
|
|
95
|
+
* Examples: Screenshots, Project setup
|
|
96
|
+
*/
|
|
97
|
+
export declare const SYNTHETICS_PATH: string;
|
|
97
98
|
/**
|
|
98
99
|
* Synthetics cache path that is based on the process id to make sure
|
|
99
100
|
* each process does not modify the caching layer used by other process
|
|
@@ -109,8 +110,12 @@ export declare const DEFAULT_THROTTLING_OPTIONS: ThrottlingOptions;
|
|
|
109
110
|
*/
|
|
110
111
|
export declare function getNetworkConditions(throttlingOpts: ThrottlingOptions): NetworkConditions;
|
|
111
112
|
export declare function wrapFnWithLocation<A extends unknown[], R>(func: (location: Location, ...args: A) => R): (...args: A) => R;
|
|
113
|
+
export declare function safeNDJSONParse(chunks: string[]): any[];
|
|
112
114
|
export declare function write(message: string): void;
|
|
113
115
|
export declare function progress(message: string): void;
|
|
116
|
+
export declare function apiProgress(message: string): void;
|
|
114
117
|
export declare function error(message: string): void;
|
|
115
118
|
export declare function done(message: string): void;
|
|
119
|
+
export declare function aborted(message: string): void;
|
|
120
|
+
export declare function removeTrailingSlash(url: string): string;
|
|
116
121
|
//# sourceMappingURL=helpers.d.ts.map
|
package/dist/helpers.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EACL,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,QAAQ,EACR,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AAIxB,wBAAgB,IAAI,SAAK;AAEzB,wBAAgB,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,SAAQ,UAEhD;AAOD,eAAO,MAAM,OAAO;;;;;;CAMnB,CAAC;AAEF,wBAAgB,gBAAgB,WAE/B;AAED,wBAAgB,gBAAgB,WAE/B;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,WAGrC;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,UAE5C;AAMD,wBAAgB,YAAY,WAE3B;AAED;;GAEG;AACH,wBAAgB,GAAG,WAElB;AAED;;GAEG;AACH,wBAAsB,WAAW,CAC/B,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAC/B,IAAI,EAAE,SAAS,mBAIhB;AAED,wBAAgB,cAAc,CAAC,GAAG,KAAA,kBAMjC;AAED,wBAAgB,WAAW,CAAC,IAAI,KAAA,WAE/B;AAED,wBAAgB,MAAM,CAAC,QAAQ,KAAA,WAE9B;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,KAAA,EAAE,GAAG,KAAA,OAiBvD;AAED;;;;;;GAMG;AACH,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,GAAG,EACnD,GAAG,SAAK,iBAeT;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBtE;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,UAKjE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,UAiBzE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK;;;;EAWvC;AAGD;;;;GAIG;AACH,eAAO,MAAM,eAAe,QAA2B,CAAC;AACxD;;;;GAIG;AACH,eAAO,MAAM,UAAU,QAAgD,CAAC;AAExE,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,UAE/C;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,UAEhD;AAED,eAAO,MAAM,0BAA0B,EAAE,iBAIxC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,iBAAiB,GAChC,iBAAiB,CAOnB;AAMD,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EACvD,IAAI,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,GAC1C,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC,CAwBnB;AAGD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,SAc/C;AAGD,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,QAEpC;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,QAEvC;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,QAE1C;AAED,wBAAgB,KAAK,CAAC,OAAO,EAAE,MAAM,QAEpC;AAED,wBAAgB,IAAI,CAAC,OAAO,EAAE,MAAM,QAEnC;AAED,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,QAEtC;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,UAE9C"}
|
package/dist/helpers.js
CHANGED
|
@@ -27,19 +27,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
27
27
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
28
28
|
};
|
|
29
29
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
30
|
-
exports.done = exports.error = exports.progress = exports.write = exports.wrapFnWithLocation = exports.getNetworkConditions = exports.DEFAULT_THROTTLING_OPTIONS = exports.megabitsToBytes = exports.getDurationInUs = exports.CACHE_PATH = exports.formatError = exports.rewriteErrorStack = exports.rewriteErrorMessage = exports.findPWLogsIndexes = exports.totalist = exports.findPkgJsonByTraversing = exports.isFile = exports.isDirectory = exports.isDepInstalled = exports.runParallel = exports.now = exports.getTimestamp = exports.microSecsToSeconds = exports.monotonicTimeInSeconds = exports.generateTempPath = exports.generateUniqueId = exports.symbols = exports.indent = exports.noop =
|
|
30
|
+
exports.removeTrailingSlash = exports.aborted = exports.done = exports.error = exports.apiProgress = exports.progress = exports.write = exports.safeNDJSONParse = exports.wrapFnWithLocation = exports.getNetworkConditions = exports.DEFAULT_THROTTLING_OPTIONS = exports.megabitsToBytes = exports.getDurationInUs = exports.CACHE_PATH = exports.SYNTHETICS_PATH = exports.formatError = exports.rewriteErrorStack = exports.rewriteErrorMessage = exports.findPWLogsIndexes = exports.totalist = exports.findPkgJsonByTraversing = exports.isFile = exports.isDirectory = exports.isDepInstalled = exports.runParallel = exports.now = exports.getTimestamp = exports.microSecsToSeconds = exports.monotonicTimeInSeconds = exports.generateTempPath = exports.generateUniqueId = exports.symbols = exports.indent = exports.noop = void 0;
|
|
31
31
|
const colors_1 = require("kleur/colors");
|
|
32
32
|
const os_1 = __importDefault(require("os"));
|
|
33
33
|
const path_1 = require("path");
|
|
34
34
|
const fs_1 = __importDefault(require("fs"));
|
|
35
|
-
const
|
|
35
|
+
const promises_1 = require("fs/promises");
|
|
36
36
|
const perf_hooks_1 = require("perf_hooks");
|
|
37
37
|
const source_map_support_1 = __importDefault(require("@cspotcode/source-map-support"));
|
|
38
|
-
const lstatAsync = (0, util_1.promisify)(fs_1.default.lstat);
|
|
39
|
-
const readdirAsync = (0, util_1.promisify)(fs_1.default.readdir);
|
|
40
|
-
exports.readFileAsync = (0, util_1.promisify)(fs_1.default.readFile);
|
|
41
|
-
exports.writeFileAsync = (0, util_1.promisify)(fs_1.default.writeFile);
|
|
42
|
-
exports.mkdirAsync = (0, util_1.promisify)(fs_1.default.mkdir);
|
|
43
38
|
const SEPARATOR = '\n';
|
|
44
39
|
function noop() { }
|
|
45
40
|
exports.noop = noop;
|
|
@@ -162,10 +157,10 @@ exports.findPkgJsonByTraversing = findPkgJsonByTraversing;
|
|
|
162
157
|
*/
|
|
163
158
|
async function totalist(dir, callback, pre = '') {
|
|
164
159
|
dir = (0, path_1.resolve)('.', dir);
|
|
165
|
-
await
|
|
160
|
+
await (0, promises_1.readdir)(dir).then(arr => {
|
|
166
161
|
return Promise.all(arr.map(str => {
|
|
167
162
|
const abs = (0, path_1.join)(dir, str);
|
|
168
|
-
return
|
|
163
|
+
return (0, promises_1.lstat)(abs).then(stats => stats.isDirectory()
|
|
169
164
|
? totalist(abs, callback, (0, path_1.join)(pre, str))
|
|
170
165
|
: callback((0, path_1.join)(pre, str), abs));
|
|
171
166
|
}));
|
|
@@ -236,12 +231,18 @@ function formatError(error) {
|
|
|
236
231
|
}
|
|
237
232
|
exports.formatError = formatError;
|
|
238
233
|
const cwd = process.cwd();
|
|
234
|
+
/**
|
|
235
|
+
* All the settings that are related to the Synthetics is stored
|
|
236
|
+
* under this directory
|
|
237
|
+
* Examples: Screenshots, Project setup
|
|
238
|
+
*/
|
|
239
|
+
exports.SYNTHETICS_PATH = (0, path_1.join)(cwd, '.synthetics');
|
|
239
240
|
/**
|
|
240
241
|
* Synthetics cache path that is based on the process id to make sure
|
|
241
242
|
* each process does not modify the caching layer used by other process
|
|
242
243
|
* once we move to executing journeys in parallel
|
|
243
244
|
*/
|
|
244
|
-
exports.CACHE_PATH = (0, path_1.join)(
|
|
245
|
+
exports.CACHE_PATH = (0, path_1.join)(exports.SYNTHETICS_PATH, process.pid.toString());
|
|
245
246
|
function getDurationInUs(duration) {
|
|
246
247
|
return Math.trunc(duration * 1e6);
|
|
247
248
|
}
|
|
@@ -295,6 +296,24 @@ function wrapFnWithLocation(func) {
|
|
|
295
296
|
};
|
|
296
297
|
}
|
|
297
298
|
exports.wrapFnWithLocation = wrapFnWithLocation;
|
|
299
|
+
// Safely parse ND JSON (Newline delimitted JSON) chunks
|
|
300
|
+
function safeNDJSONParse(chunks) {
|
|
301
|
+
// chunks may not be at proper newline boundaries, so we make sure everything is split
|
|
302
|
+
// on proper newlines
|
|
303
|
+
chunks = Array.isArray(chunks) ? chunks : [chunks];
|
|
304
|
+
const lines = chunks.join('\n').split(/\r?\n/);
|
|
305
|
+
return lines
|
|
306
|
+
.filter(l => l.match(/\S/)) // remove blank lines
|
|
307
|
+
.map(line => {
|
|
308
|
+
try {
|
|
309
|
+
return JSON.parse(line);
|
|
310
|
+
}
|
|
311
|
+
catch (e) {
|
|
312
|
+
throw `Error ${e} could not parse data '${line}'`;
|
|
313
|
+
}
|
|
314
|
+
});
|
|
315
|
+
}
|
|
316
|
+
exports.safeNDJSONParse = safeNDJSONParse;
|
|
298
317
|
// Console helpers
|
|
299
318
|
function write(message) {
|
|
300
319
|
process.stderr.write(message + '\n');
|
|
@@ -304,6 +323,10 @@ function progress(message) {
|
|
|
304
323
|
write((0, colors_1.cyan)((0, colors_1.bold)(`${exports.symbols.progress} ${message}`)));
|
|
305
324
|
}
|
|
306
325
|
exports.progress = progress;
|
|
326
|
+
function apiProgress(message) {
|
|
327
|
+
write((0, colors_1.grey)(`> ${message}`));
|
|
328
|
+
}
|
|
329
|
+
exports.apiProgress = apiProgress;
|
|
307
330
|
function error(message) {
|
|
308
331
|
write((0, colors_1.red)(message));
|
|
309
332
|
}
|
|
@@ -312,4 +335,12 @@ function done(message) {
|
|
|
312
335
|
write((0, colors_1.bold)((0, colors_1.green)(`${exports.symbols['succeeded']} ${message}`)));
|
|
313
336
|
}
|
|
314
337
|
exports.done = done;
|
|
338
|
+
function aborted(message) {
|
|
339
|
+
write((0, colors_1.bold)((0, colors_1.yellow)(`${exports.symbols['warning']} ${message}`)));
|
|
340
|
+
}
|
|
341
|
+
exports.aborted = aborted;
|
|
342
|
+
function removeTrailingSlash(url) {
|
|
343
|
+
return url.replace(/\/+$/, '');
|
|
344
|
+
}
|
|
345
|
+
exports.removeTrailingSlash = removeTrailingSlash;
|
|
315
346
|
//# sourceMappingURL=helpers.js.map
|
package/dist/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -35,7 +35,7 @@ export { expect } from './core/expect';
|
|
|
35
35
|
* Export all the driver related types to be consumed
|
|
36
36
|
* and used by suites
|
|
37
37
|
*/
|
|
38
|
-
export type { Page, ChromiumBrowser, ChromiumBrowserContext, CDPSession, } from 'playwright-chromium';
|
|
38
|
+
export type { Page, ChromiumBrowser, ChromiumBrowserContext, CDPSession, APIRequestContext, } from 'playwright-chromium';
|
|
39
39
|
/**
|
|
40
40
|
* Export the types necessary to write custom reporters
|
|
41
41
|
*/
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU;;GAE5C;AAED;;GAEG;AACH,OAAO,EACL,OAAO,EACP,IAAI,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,MAAM,EACN,KAAK,GACN,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC;;;GAGG;AACH,YAAY,EACV,IAAI,EACJ,eAAe,EACf,sBAAsB,EACtB,UAAU,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU;;GAE5C;AAED;;GAEG;AACH,OAAO,EACL,OAAO,EACP,IAAI,EACJ,OAAO,EACP,SAAS,EACT,QAAQ,EACR,MAAM,EACN,KAAK,GACN,MAAM,QAAQ,CAAC;AAChB,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC;;;GAGG;AACH,YAAY,EACV,IAAI,EACJ,eAAe,EACf,sBAAsB,EACtB,UAAU,EACV,iBAAiB,GAClB,MAAM,qBAAqB,CAAC;AAE7B;;GAEG;AACH,YAAY,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE7D,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,YAAY,EACV,MAAM,EACN,eAAe,EACf,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,GACZ,MAAM,wBAAwB,CAAC"}
|