@elastic/synthetics 1.0.0-beta.26 → 1.0.0-beta.27
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/README.md +1 -1
- package/dist/cli.js +19 -11
- package/dist/cli.js.map +1 -1
- package/dist/core/gatherer.js +2 -2
- package/dist/core/gatherer.js.map +1 -1
- package/dist/dsl/locations.d.ts +37 -0
- package/dist/dsl/locations.d.ts.map +1 -0
- package/dist/dsl/locations.js +41 -0
- package/dist/dsl/locations.js.map +1 -0
- package/dist/dsl/monitor.d.ts +3 -2
- package/dist/dsl/monitor.d.ts.map +1 -1
- package/dist/dsl/monitor.js +2 -1
- package/dist/dsl/monitor.js.map +1 -1
- package/dist/generator/index.d.ts +8 -1
- package/dist/generator/index.d.ts.map +1 -1
- package/dist/generator/index.js +42 -7
- package/dist/generator/index.js.map +1 -1
- package/dist/generator/utils.d.ts +1 -0
- package/dist/generator/utils.d.ts.map +1 -1
- package/dist/generator/utils.js +14 -1
- package/dist/generator/utils.js.map +1 -1
- package/dist/options.d.ts +0 -5
- package/dist/options.d.ts.map +1 -1
- package/dist/options.js +20 -28
- package/dist/options.js.map +1 -1
- package/dist/push/monitor.d.ts.map +1 -1
- package/dist/push/monitor.js +2 -7
- package/dist/push/monitor.js.map +1 -1
- package/dist/push/request.d.ts.map +1 -1
- package/dist/push/request.js +1 -7
- package/dist/push/request.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -1
- package/src/cli.ts +27 -13
- package/src/core/gatherer.ts +2 -2
- package/src/dsl/locations.ts +38 -0
- package/src/dsl/monitor.ts +6 -2
- package/src/generator/index.ts +53 -11
- package/src/generator/utils.ts +13 -0
- package/src/options.ts +23 -29
- package/src/push/monitor.ts +2 -11
- package/src/push/request.ts +1 -8
- package/templates/synthetics.config.ts +7 -0
package/README.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
# Experimental Synthetics Agent
|
|
4
4
|
|
|
5
5
|
Synthetic Monitoring with Real Browsers.
|
|
6
|
-
**Please note this is
|
|
6
|
+
**Please note this is project is in beta status. Expect things to break and change!**
|
|
7
7
|
|
|
8
8
|
## Usage
|
|
9
9
|
|
package/dist/cli.js
CHANGED
|
@@ -48,7 +48,7 @@ commander_1.program
|
|
|
48
48
|
.option('--inline', 'Run inline journeys from heartbeat')
|
|
49
49
|
.option('-r, --require <modules...>', 'module(s) to preload')
|
|
50
50
|
.option('--no-headless', 'run browser in headful mode')
|
|
51
|
-
.option('--sandbox', 'enable chromium sandboxing'
|
|
51
|
+
.option('--sandbox', 'enable chromium sandboxing')
|
|
52
52
|
.option('--rich-events', 'Mimics a heartbeat run')
|
|
53
53
|
.option('--capability <features...>', 'Enable capabilities through feature flags')
|
|
54
54
|
.addOption(new commander_1.Option('--screenshots [flag]', 'take screenshots at end of each step')
|
|
@@ -90,25 +90,33 @@ commander_1.program
|
|
|
90
90
|
});
|
|
91
91
|
// Push command
|
|
92
92
|
commander_1.program
|
|
93
|
-
.command('push
|
|
94
|
-
.
|
|
93
|
+
.command('push')
|
|
94
|
+
.addArgument(new commander_1.Argument('[journeys...]', 'file path to journey directory and individual files').argRequired())
|
|
95
|
+
.description('Push journeys to create montors within Kibana monitor management UI')
|
|
95
96
|
.option('--schedule <time-in-minutes>', "schedule in minutes for the pushed monitors. Setting `10`, for example, configures monitors which don't have an interval defined to run every 10 minutes.", parseInt)
|
|
96
|
-
.addOption(new commander_1.Option('--locations <locations...>', '
|
|
97
|
-
.requiredOption('--project <id
|
|
97
|
+
.addOption(new commander_1.Option('--locations <locations...>', 'default list of locations from which your monitors will run.').choices(monitor_1.SyntheticsLocations))
|
|
98
|
+
.requiredOption('--project <project-id>', 'id that will be used for logically grouping monitors')
|
|
98
99
|
.requiredOption('--url <url>', 'kibana URL to upload the monitors')
|
|
99
|
-
.requiredOption('--auth <auth>', '
|
|
100
|
+
.requiredOption('--auth <auth>', 'API key used for Kibana authentication(https://www.elastic.co/guide/en/kibana/master/api-keys.html).')
|
|
100
101
|
.option('--space <space>', 'the target Kibana spaces for the pushed monitors — spaces help you organise pushed monitors.', 'default')
|
|
101
102
|
.option('--delete', 'automatically delete the stale monitors.')
|
|
102
|
-
.action(async (
|
|
103
|
+
.action(async (journeys, cmdOpts) => {
|
|
103
104
|
try {
|
|
104
|
-
|
|
105
|
-
await (0, loader_1.loadTestFiles)(cliArgs, files);
|
|
105
|
+
await (0, loader_1.loadTestFiles)({ inline: false }, journeys);
|
|
106
106
|
const options = (0, options_1.normalizeOptions)({ ...commander_1.program.opts(), ...cmdOpts });
|
|
107
|
+
if (!options.schedule) {
|
|
108
|
+
throw (0, helpers_1.error)(`Set default schedule in minutes for all monitors via '--schedule <time-in-minutes>' OR
|
|
109
|
+
configure via Synthetics config file under 'monitors.schedule' field.`);
|
|
110
|
+
}
|
|
111
|
+
if (!options.locations) {
|
|
112
|
+
throw (0, helpers_1.error)(`Set default location for all monitors via CLI as '--locations <locations...>' OR
|
|
113
|
+
configure via Synthetics config file under 'monitors.locations' field.`);
|
|
114
|
+
}
|
|
107
115
|
const monitors = core_1.runner.buildMonitors(options);
|
|
108
116
|
await (0, push_1.push)(monitors, cmdOpts);
|
|
109
117
|
}
|
|
110
118
|
catch (e) {
|
|
111
|
-
console.error(e);
|
|
119
|
+
e && console.error(e);
|
|
112
120
|
process.exit(1);
|
|
113
121
|
}
|
|
114
122
|
});
|
|
@@ -122,7 +130,7 @@ commander_1.program
|
|
|
122
130
|
await generator.setup();
|
|
123
131
|
}
|
|
124
132
|
catch (e) {
|
|
125
|
-
(0, helpers_1.error)(e);
|
|
133
|
+
e && (0, helpers_1.error)(e);
|
|
126
134
|
process.exit(1);
|
|
127
135
|
}
|
|
128
136
|
});
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AAEA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;AAEH,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/core/gatherer.js
CHANGED
|
@@ -61,12 +61,12 @@ class Gatherer {
|
|
|
61
61
|
return { browser: Gatherer.browser, context, page, client };
|
|
62
62
|
}
|
|
63
63
|
static async getUserAgent(userAgent) {
|
|
64
|
-
const syntheticsIdentifier = ' Elastic/Synthetics';
|
|
65
64
|
if (!userAgent) {
|
|
66
65
|
const session = await Gatherer.browser.newBrowserCDPSession();
|
|
67
66
|
({ userAgent } = await session.send('Browser.getVersion'));
|
|
67
|
+
return userAgent + ' Elastic/Synthetics';
|
|
68
68
|
}
|
|
69
|
-
return userAgent
|
|
69
|
+
return userAgent;
|
|
70
70
|
}
|
|
71
71
|
static setNetworkConditions(context, networkConditions) {
|
|
72
72
|
if (networkConditions) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gatherer.js","sourceRoot":"","sources":["../../src/core/gatherer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,6DAAgF;AAChF,wCAA2C;AAC3C,qCAA+B;AAG/B;;;GAGG;AACH,MAAa,QAAQ;IAGnB,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,OAAmB;QAC1C,IAAA,YAAG,EAAC,wBAAwB,CAAC,CAAC;QAC9B,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;QAErE,IAAI,QAAQ,CAAC,OAAO,IAAI,IAAI,EAAE;YAC5B,IAAI,UAAU,EAAE;gBACd,IAAA,YAAG,EAAC,wCAAwC,UAAU,EAAE,CAAC,CAAC;gBAC1D,QAAQ,CAAC,OAAO,GAAG,MAAM,8BAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;aACvD;iBAAM;gBACL,QAAQ,CAAC,OAAO,GAAG,MAAM,8BAAQ,CAAC,MAAM,CAAC;oBACvC,GAAG,iBAAiB;oBACpB,IAAI,EAAE;wBACJ,GAAG,CAAC,iBAAiB,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;wBACzD,GAAG,CAAC,iBAAiB,EAAE,IAAI,IAAI,EAAE,CAAC;qBACnC;iBACF,CAAC,CAAC;aACJ;SACF;QACD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC;YAChD,GAAG,iBAAiB;YACpB,SAAS,EAAE,MAAM,QAAQ,CAAC,YAAY,CAAC,iBAAiB,EAAE,SAAS,CAAC;SACrE,CAAC,CAAC;QACH,QAAQ,CAAC,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAE1D,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACjD,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAC9D,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,SAAkB;QAC1C,
|
|
1
|
+
{"version":3,"file":"gatherer.js","sourceRoot":"","sources":["../../src/core/gatherer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* MIT License
|
|
3
|
+
*
|
|
4
|
+
* Copyright (c) 2020-present, Elastic NV
|
|
5
|
+
*
|
|
6
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
7
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
8
|
+
* in the Software without restriction, including without limitation the rights
|
|
9
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
10
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
11
|
+
* furnished to do so, subject to the following conditions:
|
|
12
|
+
*
|
|
13
|
+
* The above copyright notice and this permission notice shall be included in
|
|
14
|
+
* all copies or substantial portions of the Software.
|
|
15
|
+
*
|
|
16
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
17
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
18
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
19
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
20
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
21
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
22
|
+
* THE SOFTWARE.
|
|
23
|
+
*
|
|
24
|
+
*/
|
|
25
|
+
export declare const LocationsMap: {
|
|
26
|
+
japan: string;
|
|
27
|
+
india: string;
|
|
28
|
+
singapore: string;
|
|
29
|
+
australia_east: string;
|
|
30
|
+
united_kingdom: string;
|
|
31
|
+
germany: string;
|
|
32
|
+
canada_east: string;
|
|
33
|
+
brazil: string;
|
|
34
|
+
us_east: string;
|
|
35
|
+
us_west: string;
|
|
36
|
+
};
|
|
37
|
+
//# sourceMappingURL=locations.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"locations.d.ts","sourceRoot":"","sources":["../../src/dsl/locations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,eAAO,MAAM,YAAY;;;;;;;;;;;CAWxB,CAAC"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* MIT License
|
|
4
|
+
*
|
|
5
|
+
* Copyright (c) 2020-present, Elastic NV
|
|
6
|
+
*
|
|
7
|
+
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
8
|
+
* of this software and associated documentation files (the "Software"), to deal
|
|
9
|
+
* in the Software without restriction, including without limitation the rights
|
|
10
|
+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
11
|
+
* copies of the Software, and to permit persons to whom the Software is
|
|
12
|
+
* furnished to do so, subject to the following conditions:
|
|
13
|
+
*
|
|
14
|
+
* The above copyright notice and this permission notice shall be included in
|
|
15
|
+
* all copies or substantial portions of the Software.
|
|
16
|
+
*
|
|
17
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
18
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
19
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
20
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
21
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
22
|
+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
23
|
+
* THE SOFTWARE.
|
|
24
|
+
*
|
|
25
|
+
*/
|
|
26
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
+
exports.LocationsMap = void 0;
|
|
28
|
+
// DO NOT EDIT - UPDATE WITH `npm run build:locations`
|
|
29
|
+
exports.LocationsMap = {
|
|
30
|
+
japan: 'asia-northeast1-a',
|
|
31
|
+
india: 'asia-south1-a',
|
|
32
|
+
singapore: 'asia-southeast1-a',
|
|
33
|
+
australia_east: 'australia-southeast1-a',
|
|
34
|
+
united_kingdom: 'europe-west2-a',
|
|
35
|
+
germany: 'europe-west3-a',
|
|
36
|
+
canada_east: 'northamerica-northeast1-a',
|
|
37
|
+
brazil: 'southamerica-east1-a',
|
|
38
|
+
us_east: 'us-east4-a',
|
|
39
|
+
us_west: 'us-west1-a',
|
|
40
|
+
};
|
|
41
|
+
//# sourceMappingURL=locations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"locations.js","sourceRoot":"","sources":["../../src/dsl/locations.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,sDAAsD;AACzC,QAAA,YAAY,GAAG;IAC1B,KAAK,EAAE,mBAAmB;IAC1B,KAAK,EAAE,eAAe;IACtB,SAAS,EAAE,mBAAmB;IAC9B,cAAc,EAAE,wBAAwB;IACxC,cAAc,EAAE,gBAAgB;IAChC,OAAO,EAAE,gBAAgB;IACzB,WAAW,EAAE,2BAA2B;IACxC,MAAM,EAAE,sBAAsB;IAC9B,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;CACtB,CAAC"}
|
package/dist/dsl/monitor.d.ts
CHANGED
|
@@ -23,8 +23,9 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
import { ThrottlingOptions, Location, ScreenshotOptions, Params, PlaywrightOptions } from '../common_types';
|
|
26
|
-
|
|
27
|
-
export declare type SyntheticsLocationsType = typeof
|
|
26
|
+
import { LocationsMap } from './locations';
|
|
27
|
+
export declare type SyntheticsLocationsType = keyof typeof LocationsMap;
|
|
28
|
+
export declare const SyntheticsLocations: ("japan" | "india" | "singapore" | "australia_east" | "united_kingdom" | "germany" | "canada_east" | "brazil" | "us_east" | "us_west")[];
|
|
28
29
|
export declare type MonitorConfig = {
|
|
29
30
|
id?: string;
|
|
30
31
|
name?: string;
|
|
@@ -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;
|
|
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,aAAa,CAAC;AAE3C,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,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,7 +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
|
-
|
|
32
|
+
const locations_1 = require("./locations");
|
|
33
|
+
exports.SyntheticsLocations = Object.keys(locations_1.LocationsMap);
|
|
33
34
|
class Monitor {
|
|
34
35
|
constructor(config = {}) {
|
|
35
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;
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/dsl/monitor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,0DAA8B;AAQ9B,2CAA2C;AAG9B,QAAA,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAC5C,wBAAY,CACgB,CAAC;AAoB/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,13 +1,20 @@
|
|
|
1
|
+
declare type PromptOptions = {
|
|
2
|
+
locations: string;
|
|
3
|
+
schedule: number;
|
|
4
|
+
};
|
|
1
5
|
export declare class Generator {
|
|
2
6
|
projectDir: string;
|
|
3
7
|
pkgManager: string;
|
|
4
8
|
constructor(projectDir: string);
|
|
5
9
|
directory(): Promise<void>;
|
|
6
|
-
|
|
10
|
+
questions(): Promise<any>;
|
|
11
|
+
files(answers: PromptOptions): Promise<void>;
|
|
7
12
|
createFile(relativePath: string, content: string, override?: boolean): Promise<void>;
|
|
8
13
|
package(): Promise<void>;
|
|
9
14
|
patchPkgJSON(): Promise<void>;
|
|
15
|
+
patchGitIgnore(): Promise<void>;
|
|
10
16
|
banner(): void;
|
|
11
17
|
setup(): Promise<void>;
|
|
12
18
|
}
|
|
19
|
+
export {};
|
|
13
20
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -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":"AAsCA,aAAK,aAAa,GAAG;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,qBAAa,SAAS;IAED,UAAU,EAAE,MAAM;IADrC,UAAU,SAAS;gBACA,UAAU,EAAE,MAAM;IAE/B,SAAS;IAMT,SAAS;IAqBT,KAAK,CAAC,OAAO,EAAE,aAAa;IAyB5B,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,UAAQ;IASlE,OAAO;IA4BP,YAAY;IAuBZ,cAAc;IAcpB,MAAM;IAkBA,KAAK;CASZ"}
|
package/dist/generator/index.js
CHANGED
|
@@ -30,6 +30,8 @@ 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
|
+
const enquirer_1 = require("enquirer");
|
|
34
|
+
const monitor_1 = require("../dsl/monitor");
|
|
33
35
|
const helpers_1 = require("../helpers");
|
|
34
36
|
const utils_1 = require("./utils");
|
|
35
37
|
// Templates that are required for setting up new
|
|
@@ -45,16 +47,34 @@ class Generator {
|
|
|
45
47
|
await (0, promises_1.mkdir)(this.projectDir);
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
|
-
async
|
|
50
|
+
async questions() {
|
|
51
|
+
if (process.env.TEST_QUESTIONS) {
|
|
52
|
+
return JSON.parse(process.env.TEST_QUESTIONS);
|
|
53
|
+
}
|
|
54
|
+
const question = [
|
|
55
|
+
{
|
|
56
|
+
type: 'select',
|
|
57
|
+
name: 'locations',
|
|
58
|
+
message: 'Select the default location where you want to run monitors.',
|
|
59
|
+
choices: monitor_1.SyntheticsLocations,
|
|
60
|
+
},
|
|
61
|
+
{
|
|
62
|
+
type: 'numeral',
|
|
63
|
+
name: 'schedule',
|
|
64
|
+
message: 'Set default schedule in minutes for all monitors',
|
|
65
|
+
initial: 10,
|
|
66
|
+
},
|
|
67
|
+
];
|
|
68
|
+
return await (0, enquirer_1.prompt)(question);
|
|
69
|
+
}
|
|
70
|
+
async files(answers) {
|
|
49
71
|
const fileMap = new Map();
|
|
50
72
|
// Setup Synthetics config file
|
|
51
73
|
const configFile = 'synthetics.config.ts';
|
|
52
|
-
fileMap.set(configFile, await (0, promises_1.readFile)((0, path_1.join)(templateDir, configFile), 'utf-8'));
|
|
74
|
+
fileMap.set(configFile, (0, utils_1.replaceTemplates)(await (0, promises_1.readFile)((0, path_1.join)(templateDir, configFile), 'utf-8'), answers));
|
|
53
75
|
// Setup example journey file
|
|
54
76
|
const journeyFile = 'journeys/example.journey.ts';
|
|
55
77
|
fileMap.set(journeyFile, await (0, promises_1.readFile)((0, path_1.join)(templateDir, journeyFile), 'utf-8'));
|
|
56
|
-
// Setup gitignore
|
|
57
|
-
fileMap.set('.gitignore', await (0, promises_1.readFile)((0, path_1.join)(templateDir, '.gitignore'), 'utf-8'));
|
|
58
78
|
// Create files
|
|
59
79
|
for (const [relativePath, content] of fileMap) {
|
|
60
80
|
await this.createFile(relativePath, content);
|
|
@@ -95,9 +115,22 @@ class Generator {
|
|
|
95
115
|
pkgJSON.scripts.test = 'npx @elastic/synthetics journeys';
|
|
96
116
|
// Add push command
|
|
97
117
|
const project = (0, path_1.basename)(this.projectDir);
|
|
98
|
-
pkgJSON.scripts.push = `npx @elastic/synthetics push journeys --project ${project} --url http://localhost:5601 --auth
|
|
118
|
+
pkgJSON.scripts.push = `npx @elastic/synthetics push journeys --project ${project} --url http://localhost:5601 --auth apiKey`;
|
|
99
119
|
await this.createFile(filename, JSON.stringify(pkgJSON, null, 2) + '\n', true);
|
|
100
120
|
}
|
|
121
|
+
async patchGitIgnore() {
|
|
122
|
+
const gitIgnorePath = (0, path_1.join)(this.projectDir, '.gitignore');
|
|
123
|
+
let gitIgnore = '';
|
|
124
|
+
if ((0, fs_1.existsSync)(gitIgnorePath)) {
|
|
125
|
+
const contents = await (0, promises_1.readFile)(gitIgnorePath, 'utf-8');
|
|
126
|
+
gitIgnore += contents.trimEnd() + '\n';
|
|
127
|
+
}
|
|
128
|
+
if (!gitIgnore.includes('node_modules')) {
|
|
129
|
+
gitIgnore += 'node_modules/\n';
|
|
130
|
+
}
|
|
131
|
+
gitIgnore += '.synthetics/\n';
|
|
132
|
+
await (0, promises_1.writeFile)(gitIgnorePath, gitIgnore, 'utf-8');
|
|
133
|
+
}
|
|
101
134
|
banner() {
|
|
102
135
|
(0, helpers_1.write)((0, colors_1.bold)(`
|
|
103
136
|
All set, you can run below commands inside: ${this.projectDir}:
|
|
@@ -106,16 +139,18 @@ All set, you can run below commands inside: ${this.projectDir}:
|
|
|
106
139
|
|
|
107
140
|
Push monitors to Kibana: ${(0, colors_1.cyan)((0, utils_1.runCommand)(this.pkgManager, 'push'))}
|
|
108
141
|
|
|
109
|
-
${(0, colors_1.yellow)('Make sure to update the Kibana url and
|
|
142
|
+
${(0, colors_1.yellow)('Make sure to update the Kibana url and api keys before pushing monitors to Kibana.')}
|
|
110
143
|
|
|
111
144
|
Visit https://www.elastic.co/guide/en/observability/master/synthetics-journeys.html to learn more.
|
|
112
145
|
`));
|
|
113
146
|
}
|
|
114
147
|
async setup() {
|
|
115
148
|
await this.directory();
|
|
149
|
+
const answers = await this.questions();
|
|
116
150
|
await this.package();
|
|
117
|
-
await this.files();
|
|
151
|
+
await this.files(answers);
|
|
118
152
|
await this.patchPkgJSON();
|
|
153
|
+
await this.patchGitIgnore();
|
|
119
154
|
this.banner();
|
|
120
155
|
}
|
|
121
156
|
}
|
|
@@ -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,wCAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/generator/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,4 +24,5 @@
|
|
|
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, literals: Record<string, any>): string;
|
|
27
28
|
//# 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"}
|
|
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,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,UAW5E"}
|
package/dist/generator/utils.js
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
*
|
|
25
25
|
*/
|
|
26
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
27
|
-
exports.runCommand = exports.getPackageManager = void 0;
|
|
27
|
+
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,4 +41,17 @@ function runCommand(pkgManager, command) {
|
|
|
41
41
|
return `npm run ${command}`;
|
|
42
42
|
}
|
|
43
43
|
exports.runCommand = runCommand;
|
|
44
|
+
function replaceTemplates(input, literals) {
|
|
45
|
+
for (const key in literals) {
|
|
46
|
+
const finalValue = literals[key];
|
|
47
|
+
input = input.replace(new RegExp(`'{{` + key + `}}'`, 'g'), () => {
|
|
48
|
+
if (typeof finalValue == 'number') {
|
|
49
|
+
return Number(finalValue);
|
|
50
|
+
}
|
|
51
|
+
return finalValue;
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
return input;
|
|
55
|
+
}
|
|
56
|
+
exports.replaceTemplates = replaceTemplates;
|
|
44
57
|
//# 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"}
|
|
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,QAA6B;IAC3E,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;QAC1B,MAAM,UAAU,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QACjC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,GAAG,GAAG,GAAG,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,EAAE;YAC/D,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;AAXD,4CAWC"}
|
package/dist/options.d.ts
CHANGED
|
@@ -23,12 +23,7 @@
|
|
|
23
23
|
*
|
|
24
24
|
*/
|
|
25
25
|
import type { CliArgs, RunOptions } from './common_types';
|
|
26
|
-
import { MonitorConfig } from './dsl/monitor';
|
|
27
26
|
export declare function normalizeOptions(cliArgs: CliArgs): RunOptions;
|
|
28
|
-
/**
|
|
29
|
-
* Get the default monitor configuration for all journeys
|
|
30
|
-
*/
|
|
31
|
-
export declare function getDefaultMonitorConfig(): MonitorConfig;
|
|
32
27
|
/**
|
|
33
28
|
* Parses the throttling CLI settings and also
|
|
34
29
|
* adapts to the format to keep the backwards compatability
|
package/dist/options.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;AAW7E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAqG7D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,OAwB3D"}
|
package/dist/options.js
CHANGED
|
@@ -27,7 +27,7 @@ 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.parseThrottling = exports.
|
|
30
|
+
exports.parseThrottling = exports.normalizeOptions = void 0;
|
|
31
31
|
const deepmerge_1 = __importDefault(require("deepmerge"));
|
|
32
32
|
const config_1 = require("./config");
|
|
33
33
|
const helpers_1 = require("./helpers");
|
|
@@ -93,20 +93,25 @@ function normalizeOptions(cliArgs) {
|
|
|
93
93
|
* 3. Configuration file
|
|
94
94
|
*/
|
|
95
95
|
options.params = Object.freeze((0, deepmerge_1.default)(config.params, cliArgs.params || {}));
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
96
|
+
/**
|
|
97
|
+
* Merge playwright options from CLI and Synthetics config
|
|
98
|
+
* and prefer individual options over other option
|
|
99
|
+
*/
|
|
100
|
+
const playwrightOpts = (0, deepmerge_1.default)(config.playwrightOptions, cliArgs.playwrightOptions || {});
|
|
101
|
+
options.playwrightOptions = {
|
|
102
|
+
...playwrightOpts,
|
|
103
|
+
headless: cliArgs.headless,
|
|
104
|
+
chromiumSandbox: cliArgs.sandbox ?? playwrightOpts?.chromiumSandbox,
|
|
105
|
+
ignoreHTTPSErrors: cliArgs.ignoreHttpsErrors ?? playwrightOpts?.ignoreHTTPSErrors,
|
|
106
|
+
};
|
|
107
|
+
/**
|
|
108
|
+
* Get the default monitor config from synthetics.config.ts file
|
|
109
|
+
*/
|
|
110
|
+
const monitor = config.monitor;
|
|
106
111
|
if (cliArgs.throttling) {
|
|
107
112
|
const throttleConfig = deepmerge_1.default.all([
|
|
108
|
-
|
|
109
|
-
|
|
113
|
+
helpers_1.DEFAULT_THROTTLING_OPTIONS,
|
|
114
|
+
monitor?.throttling || {},
|
|
110
115
|
cliArgs.throttling,
|
|
111
116
|
]);
|
|
112
117
|
options.throttling = throttleConfig;
|
|
@@ -118,24 +123,11 @@ function normalizeOptions(cliArgs) {
|
|
|
118
123
|
*/
|
|
119
124
|
options.throttling = {};
|
|
120
125
|
}
|
|
121
|
-
options.
|
|
122
|
-
|
|
123
|
-
options.schedule =
|
|
124
|
-
cliArgs.schedule ?? config.monitor?.schedule ?? defaults.schedule;
|
|
126
|
+
options.schedule = cliArgs.schedule ?? monitor?.schedule;
|
|
127
|
+
options.locations = cliArgs.locations ?? monitor?.locations;
|
|
125
128
|
return options;
|
|
126
129
|
}
|
|
127
130
|
exports.normalizeOptions = normalizeOptions;
|
|
128
|
-
/**
|
|
129
|
-
* Get the default monitor configuration for all journeys
|
|
130
|
-
*/
|
|
131
|
-
function getDefaultMonitorConfig() {
|
|
132
|
-
return {
|
|
133
|
-
throttling: helpers_1.DEFAULT_THROTTLING_OPTIONS,
|
|
134
|
-
locations: ['US East'],
|
|
135
|
-
schedule: 10,
|
|
136
|
-
};
|
|
137
|
-
}
|
|
138
|
-
exports.getDefaultMonitorConfig = getDefaultMonitorConfig;
|
|
139
131
|
/**
|
|
140
132
|
* Parses the throttling CLI settings and also
|
|
141
133
|
* adapts to the format to keep the backwards compatability
|
package/dist/options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;AAEH,0DAA8B;AAC9B,qCAAsC;AACtC,uCAA6E;
|
|
1
|
+
{"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;
|
|
1
|
+
{"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAOH,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAExD,oBAAY,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3B,CAAC;AAMF,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,4BAyB3D"}
|
package/dist/push/monitor.js
CHANGED
|
@@ -29,14 +29,9 @@ const promises_1 = require("fs/promises");
|
|
|
29
29
|
const path_1 = require("path");
|
|
30
30
|
const bundler_1 = require("./bundler");
|
|
31
31
|
const helpers_1 = require("../helpers");
|
|
32
|
-
|
|
33
|
-
// talking to the Kibana API
|
|
34
|
-
const LocationsMap = {
|
|
35
|
-
'US East': 'us-east4-a',
|
|
36
|
-
'EU West': 'europe-west2-a',
|
|
37
|
-
};
|
|
32
|
+
const locations_1 = require("../dsl/locations");
|
|
38
33
|
function translateLocation(locations) {
|
|
39
|
-
return locations.map(loc => LocationsMap[loc]).filter(Boolean);
|
|
34
|
+
return locations.map(loc => locations_1.LocationsMap[loc]).filter(Boolean);
|
|
40
35
|
}
|
|
41
36
|
async function buildMonitorSchema(monitors) {
|
|
42
37
|
if (monitors.length == 0) {
|
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,0CAAoC;AACpC,+BAA4B;AAC5B,uCAAoC;AACpC,wCAAwC;
|
|
1
|
+
{"version":3,"file":"monitor.js","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,0CAAoC;AACpC,+BAA4B;AAC5B,uCAAoC;AACpC,wCAAwC;AACxC,gDAAgD;AAShD,SAAS,iBAAiB,CAAC,SAAqC;IAC9D,OAAO,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,wBAAY,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AACjE,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,QAAmB;IAC1D,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACtC;IACD;;;OAGG;IACH,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,oBAAU,EAAE,SAAS,CAAC,CAAC;IAC/C,MAAM,IAAA,gBAAK,EAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,iBAAO,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAoB,EAAE,CAAC;IAEpC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;QAC3C,MAAM,OAAO,GAAG,IAAA,WAAI,EAAC,UAAU,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,CAAC,IAAI,CAAC;YACX,GAAG,MAAM;YACT,OAAO;YACP,SAAS,EAAE,iBAAiB,CAAC,MAAM,CAAC,SAAS,CAAC;YAC9C,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;KACJ;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAzBD,gDAyBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAK1C,oBAAY,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B,CAAC;
|
|
1
|
+
{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/push/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAK1C,oBAAY,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B,CAAC;AAQF,wBAAgB,EAAE,CAAC,UAAU,EAAE,MAAM,WAEpC;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,WAAW,2DAkBrB;AAED,oBAAY,eAAe,GAAG;IAC5B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,UAIlD;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,UAShB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,UAU7D;AAED,wBAAgB,mBAAmB,WAKlC"}
|