squally-reporter 0.17.0 → 0.19.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/README.md +128 -11
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +2 -1
- package/dist/cli.js.map +1 -1
- package/dist/http-config.d.ts +19 -0
- package/dist/http-config.d.ts.map +1 -1
- package/dist/http-config.js +37 -0
- package/dist/http-config.js.map +1 -1
- package/dist/index.d.ts +285 -19
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +823 -187
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -114,6 +114,15 @@ passed) - never for an attempt that passed on its first try, regardless of how
|
|
|
114
114
|
that just passed, and uploading one anyway would only eat into your
|
|
115
115
|
organization's storage for no benefit.
|
|
116
116
|
|
|
117
|
+
**Uploaded while the suite runs (0.18.0).** An attempt's artifacts go up as
|
|
118
|
+
soon as Squally has accepted the batch that carries its result - not only
|
|
119
|
+
after the last test, as until 0.17.0. A job that is cancelled or killed
|
|
120
|
+
partway keeps the artifacts of every result that already arrived. When the
|
|
121
|
+
suite ends, the reporter waits **up to 3 minutes** for the uploads still
|
|
122
|
+
running; the last 15 seconds of that only finish the confirmation, no new
|
|
123
|
+
upload starts in them. A file is sent as a stream, not read into memory
|
|
124
|
+
first.
|
|
125
|
+
|
|
117
126
|
**You need to actually enable capture in `playwright.config.ts`** - without
|
|
118
127
|
it, Playwright doesn't produce any attachments, so there's nothing for the
|
|
119
128
|
reporter to find or upload (no error either way, it's a silent no-op):
|
|
@@ -140,8 +149,10 @@ release of it:
|
|
|
140
149
|
The test result itself is reported as usual, and the run's outcome and exit
|
|
141
150
|
code are untouched. In the dashboard that artifact is shown as skipped, with
|
|
142
151
|
the reason, rather than silently missing.
|
|
143
|
-
- **At most 250 artifacts per
|
|
144
|
-
|
|
152
|
+
- **At most 250 artifacts per request.** Since 0.18.0 the reporter sends them
|
|
153
|
+
in rounds of at most 250, so a shard with more no longer loses the rest.
|
|
154
|
+
Until 0.17.0 a shard's artifacts went in one request, and Squally kept the
|
|
155
|
+
first 250.
|
|
145
156
|
- **A total storage cap per organization, depending on your Squally plan.**
|
|
146
157
|
Once it is reached, further uploads are rejected the same way until you free
|
|
147
158
|
up space or upgrade. Note that a fully instrumented suite now produces up to
|
|
@@ -151,9 +162,14 @@ release of it:
|
|
|
151
162
|
- **Your test's own `stdout`/`stderr` is cut at 16 KB** before it is sent. That
|
|
152
163
|
is this reporter's own limit, not Squally's, and it applies whether or not
|
|
153
164
|
you capture artifacts at all.
|
|
154
|
-
- Two minutes per upload, and 30 seconds for the calls that surround it.
|
|
155
|
-
|
|
156
|
-
|
|
165
|
+
- Two minutes per upload, and 30 seconds for the calls that surround it. Since
|
|
166
|
+
0.18.0 a network error, an HTTP 5xx or a 429 is retried like the results
|
|
167
|
+
(see *When Squally cannot be reached for a while*), and the 3 minutes at the
|
|
168
|
+
end bound the whole wait. What did not arrive is said once, at the end:
|
|
169
|
+
|
|
170
|
+
```
|
|
171
|
+
[squally-reporter] 2 of 9 artifacts did not reach Squally - the storage answered HTTP 503, and the retries ran out. Your test run and its exit code are not affected.
|
|
172
|
+
```
|
|
157
173
|
|
|
158
174
|
Upload is best-effort and fully non-blocking, same principle as the rest of
|
|
159
175
|
this reporter - a failed or skipped upload never fails your test run or
|
|
@@ -202,6 +218,51 @@ If Squally is unreachable partway through, results already sent stay in the
|
|
|
202
218
|
dashboard; only what could not be delivered is lost, and your test run's exit
|
|
203
219
|
code is never affected either way.
|
|
204
220
|
|
|
221
|
+
## The end of a run (0.18.0)
|
|
222
|
+
|
|
223
|
+
When every result arrived and the run is marked complete, the last line says
|
|
224
|
+
where it is and what got there:
|
|
225
|
+
|
|
226
|
+
```
|
|
227
|
+
[squally-reporter] Reported to Squally: run #128 · 412 results, 9 artifacts · https://app.squally.dev/o/…/runs/…
|
|
228
|
+
```
|
|
229
|
+
|
|
230
|
+
If something did not arrive, that line is replaced by the one that says what
|
|
231
|
+
is missing (see below).
|
|
232
|
+
|
|
233
|
+
**`SQUALLY_OUTPUT_FILE`** writes the run's link and counts as JSON, for a
|
|
234
|
+
later CI step that posts the link somewhere:
|
|
235
|
+
|
|
236
|
+
```bash
|
|
237
|
+
SQUALLY_OUTPUT_FILE=test-results/squally.json
|
|
238
|
+
```
|
|
239
|
+
|
|
240
|
+
```json
|
|
241
|
+
{
|
|
242
|
+
"version": 1,
|
|
243
|
+
"runUrl": "https://app.squally.dev/o/…/runs/…",
|
|
244
|
+
"runNumber": 128,
|
|
245
|
+
"runId": "…",
|
|
246
|
+
"shard": null,
|
|
247
|
+
"complete": true,
|
|
248
|
+
"tests": { "passed": 40, "failed": 1, "flaky": 1, "skipped": 0 },
|
|
249
|
+
"results": { "produced": 44, "delivered": 44 },
|
|
250
|
+
"artifacts": { "uploaded": 3, "notUploaded": 0 }
|
|
251
|
+
}
|
|
252
|
+
```
|
|
253
|
+
|
|
254
|
+
- Written at the very end of every run the reporter took part in - also one
|
|
255
|
+
Squally refused or could not be reached for, then with `runUrl: null` and
|
|
256
|
+
`complete: false`, so the file is always there for the next step. Missing
|
|
257
|
+
directories are created.
|
|
258
|
+
- `tests` counts this process's tests the way Playwright does at the end
|
|
259
|
+
(`expected` as passed, `unexpected` as failed, `flaky`, `skipped`).
|
|
260
|
+
`results` counts attempts: produced, and accepted by Squally.
|
|
261
|
+
- One file per process: under `--shard`, give each shard its own path (or
|
|
262
|
+
read them one after another), and `shard` says which one it was.
|
|
263
|
+
- A path that cannot be written is one warning; the exit code stays yours.
|
|
264
|
+
- New fields may be added; `version` changes only if one changes meaning.
|
|
265
|
+
|
|
205
266
|
## When Squally cannot be reached for a while (0.17.0)
|
|
206
267
|
|
|
207
268
|
Some failures pass on their own, and the reporter waits them out instead of
|
|
@@ -226,6 +287,11 @@ answers (a refused key, an exhausted quota, an unknown or finished run), an
|
|
|
226
287
|
HTTP 403 *without* the firewall's header, and a redirect. Those keep their own
|
|
227
288
|
line, as before.
|
|
228
289
|
|
|
290
|
+
The artifact uploads follow the same rules since 0.18.0 (until then each was
|
|
291
|
+
tried once): the request for the upload URL, the upload to storage (a network
|
|
292
|
+
error, HTTP 5xx or 429) and the confirmation. They have their own line at the
|
|
293
|
+
end and never delay the results.
|
|
294
|
+
|
|
229
295
|
When your suite ends, the reporter normally waits up to 5 seconds for the last
|
|
230
296
|
results. After one of the failures above it waits up to 60 seconds, for the
|
|
231
297
|
last results and for marking the run complete.
|
|
@@ -275,6 +341,29 @@ that Playwright cuts off because the whole run is stopping (`maxFailures`
|
|
|
275
341
|
reached, Ctrl+C) is reported as skipped: it did not fail, and it does not
|
|
276
342
|
count against the test.
|
|
277
343
|
|
|
344
|
+
## Annotations, the test's line, worker and start (0.19.0)
|
|
345
|
+
|
|
346
|
+
Every attempt also sends:
|
|
347
|
+
|
|
348
|
+
- **Its annotations** - `test.info().annotations`, the `{ annotation }`
|
|
349
|
+
option, and the ones `test.skip()`, `test.fixme()`, `test.slow()` and
|
|
350
|
+
`test.fail()` add: type, description, and where it was added (`file:line`).
|
|
351
|
+
Squally shows them on the run's Tests tab, the attempt page and the test
|
|
352
|
+
page; an `issue` whose description is a link becomes a link there.
|
|
353
|
+
- **Descriptions go through the same secret masking as error texts**, and
|
|
354
|
+
are cut at 1,000 characters.
|
|
355
|
+
- **At most 20 per attempt**, types cut at 64 characters; Squally is told
|
|
356
|
+
how many were left out.
|
|
357
|
+
- On Playwright versions without per-attempt annotations, the test's own
|
|
358
|
+
list is sent with every attempt.
|
|
359
|
+
- **The test's line and column** in its file, for the attempt page's
|
|
360
|
+
*Open in repository* link.
|
|
361
|
+
- **The worker that ran it, its slot and when it started** (`workerIndex`,
|
|
362
|
+
`parallelIndex`, `startTime`). Squally stores them for a later timeline of
|
|
363
|
+
the run; nothing shows them yet.
|
|
364
|
+
|
|
365
|
+
Nothing to configure. An older Squally ignores these fields.
|
|
366
|
+
|
|
278
367
|
## Cancelled runs
|
|
279
368
|
|
|
280
369
|
**Cancelled in Squally.** An admin can cancel a running run from its page in
|
|
@@ -555,6 +644,11 @@ Playwright's config - never the config itself:
|
|
|
555
644
|
`CIRCLE_REPOSITORY_URL`, `CODEBUILD_SOURCE_REPO_URL`, `DRONE_GIT_HTTP_URL`,
|
|
556
645
|
`TRAVIS_REPO_SLUG`, `GIT_URL`), else `git remote get-url origin`.
|
|
557
646
|
Credentials, a query and `.git` are removed before it is sent.
|
|
647
|
+
- **Where in the repository the run started** (0.19.0): the directory
|
|
648
|
+
Playwright runs in, relative to the repository's root, as
|
|
649
|
+
`git rev-parse --show-prefix` prints it - `e2e/` in a monorepo, empty at
|
|
650
|
+
the root. Test file paths are relative to that directory, so Squally needs
|
|
651
|
+
it to link a test to its file. Not sent when git cannot say.
|
|
558
652
|
|
|
559
653
|
Two switches:
|
|
560
654
|
|
|
@@ -563,13 +657,13 @@ Two switches:
|
|
|
563
657
|
# Only scheme, host and path are sent, never a login, query or fragment.
|
|
564
658
|
SQUALLY_SEND_BASE_URL=true
|
|
565
659
|
|
|
566
|
-
# The repository - on unless you turn it off.
|
|
660
|
+
# The repository and where in it the run started - on unless you turn it off.
|
|
567
661
|
SQUALLY_SEND_REPOSITORY=false
|
|
568
662
|
```
|
|
569
663
|
|
|
570
664
|
**Never sent:** the rest of `use` (extra HTTP headers, HTTP credentials,
|
|
571
665
|
`storageState`, proxy, launch and context options), `config.metadata`, the
|
|
572
|
-
command line, the config file and every directory path, `webServer`, `grep`,
|
|
666
|
+
command line, the config file and every absolute directory path, `webServer`, `grep`,
|
|
573
667
|
global setup and teardown, and each project's own `metadata`.
|
|
574
668
|
|
|
575
669
|
## Tested revision (optional)
|
|
@@ -612,14 +706,37 @@ written two ways still compares equal: it is lowercased, and a leading `v` or a
|
|
|
612
706
|
`v1.2.0` is stored as `1.2.0`. The reporter says so once per run when it
|
|
613
707
|
happens, so a value that looks different in the dashboard is not a mystery.
|
|
614
708
|
|
|
709
|
+
## Behind a proxy (0.18.0)
|
|
710
|
+
|
|
711
|
+
Every request - to Squally, the artifact uploads to storage, and
|
|
712
|
+
`npx squally-reporter cancel` - goes through the proxy in `HTTPS_PROXY` (for
|
|
713
|
+
`https://` addresses) or `HTTP_PROXY` (for `http://`), lower-case names
|
|
714
|
+
first, the way curl reads them. Hosts in `NO_PROXY` are reached directly:
|
|
715
|
+
comma-separated, each name with all its subdomains (`internal` and
|
|
716
|
+
`.internal` both cover `squally.internal`), `host:port` for one port only, `*`
|
|
717
|
+
for everything - no IP ranges:
|
|
718
|
+
|
|
719
|
+
```bash
|
|
720
|
+
HTTPS_PROXY=http://proxy.internal:3128
|
|
721
|
+
NO_PROXY=localhost,127.0.0.1,.internal
|
|
722
|
+
```
|
|
723
|
+
|
|
724
|
+
The proxy is asked to open a tunnel (`CONNECT`), so TLS still goes end to end
|
|
725
|
+
to Squally. A login in the proxy URL (`http://user:pass@host:port`) is sent as
|
|
726
|
+
`Proxy-Authorization`. A value that is not a URL is one warning, naming the
|
|
727
|
+
variable but not its value, and the reporter connects directly. Without any of
|
|
728
|
+
these variables nothing changes. Until 0.17.0 the variables were ignored.
|
|
729
|
+
|
|
615
730
|
## Troubleshooting
|
|
616
731
|
|
|
617
732
|
Set `SQUALLY_DEBUG=1` to print detail that is otherwise kept quiet - the
|
|
618
733
|
browser-console extraction (how many messages were found, or that an attempt's
|
|
619
|
-
trace held none)
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
734
|
+
trace held none), since 0.11.0 a CI run link that was not sent because it was
|
|
735
|
+
not an `https://` URL, and since 0.18.0 which proxy variable is in use and a
|
|
736
|
+
quarantine rules request that failed (nothing uses the rules yet, so that is
|
|
737
|
+
no longer a warning). Everything that is *not* ordinary (a trace that cannot
|
|
738
|
+
be read, an unsupported schema version, a rejected upload) is printed without
|
|
739
|
+
it.
|
|
623
740
|
|
|
624
741
|
## Support
|
|
625
742
|
|
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAuCA,eAAO,MAAM,KAAK,QAUN,CAAC;AAEb,MAAM,MAAM,YAAY,GACpB;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACtD;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,CAAA;CAAE,CAAC;AAE1E,iDAAiD;AACjD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAQlF;AAcD,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7C,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,CAqB7D;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5B,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,2FAA2F;IAC3F,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAcD,0FAA0F;AAC1F,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAuCA,eAAO,MAAM,KAAK,QAUN,CAAC;AAEb,MAAM,MAAM,YAAY,GACpB;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GACtD;IAAE,SAAS,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,kBAAkB,GAAG,kBAAkB,CAAA;CAAE,CAAC;AAE1E,iDAAiD;AACjD,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAQlF;AAcD,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;CAAE,GAC9C;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAE7C,wBAAgB,SAAS,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,UAAU,CAqB7D;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5B,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,2FAA2F;IAC3F,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAcD,0FAA0F;AAC1F,wBAAsB,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA+H9F;AAED,yFAAyF;AACzF,wBAAsB,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBzG"}
|
package/dist/cli.js
CHANGED
|
@@ -137,7 +137,8 @@ async function runCancel(jobKeyArg, deps) {
|
|
|
137
137
|
if (!connection.apiUrl || !connection.apiKey)
|
|
138
138
|
return;
|
|
139
139
|
const url = `${connection.apiUrl.replace(/\/+$/, "")}/api/ingest/v2/runs/cancel`;
|
|
140
|
-
|
|
140
|
+
// Through HTTP(S)_PROXY when one is set (0.18.0), like the reporter.
|
|
141
|
+
const dispatcher = (0, http_config_1.createDispatcher)({ headersTimeout: timeoutMs, bodyTimeout: timeoutMs, keepAliveTimeout: 1000 });
|
|
141
142
|
try {
|
|
142
143
|
for (let attempt = 1;; attempt++) {
|
|
143
144
|
const last = attempt >= 2; // one retry
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AACA,4EAA4E;AAC5E,gBAAgB;AAChB,EAAE;AACF,yEAAyE;AACzE,+EAA+E;AAC/E,gFAAgF;AAChF,8EAA8E;AAC9E,yCAAyC;AACzC,EAAE;AACF,+EAA+E;AAC/E,2EAA2E;AAC3E,+EAA+E;AAC/E,yEAAyE;AACzE,qCAAqC;AACrC,EAAE;AACF,+EAA+E;AAC/E,+EAA+E;AAC/E,4EAA4E;AAC5E,qCAAqC;AACrC,EAAE;AACF,gFAAgF;;;AAmChF,oDAQC;AAmBD,8BAqBC;AAwBD,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/http-config.d.ts
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
|
+
import { Agent, type Dispatcher } from "undici";
|
|
1
2
|
export declare const REPORTER_VERSION: string;
|
|
2
3
|
export declare const USER_AGENT: string;
|
|
3
4
|
export declare const API_REQUEST_TIMEOUT_MS = 30000;
|
|
4
5
|
export declare const SERVER_ERROR_RETRY_DELAY_MS = 1000;
|
|
6
|
+
/** The proxy variable this process would use, by name - never its value (it can carry a login). */
|
|
7
|
+
export declare function proxyVariableInUse(env: NodeJS.ProcessEnv): string | null;
|
|
8
|
+
/**
|
|
9
|
+
* The dispatcher every request of this package goes through (0.18.0): to
|
|
10
|
+
* Squally, to the storage's presigned URLs, and the CLI's cancel.
|
|
11
|
+
*
|
|
12
|
+
* HTTP(S)_PROXY and NO_PROXY, as curl and most CI images read them - undici's
|
|
13
|
+
* EnvHttpProxyAgent: HTTPS_PROXY for https targets, HTTP_PROXY for http ones,
|
|
14
|
+
* lower case before upper case, NO_PROXY's hosts and domain suffixes go
|
|
15
|
+
* direct. Node's own fetch ignores these variables, which is why a self-hosted
|
|
16
|
+
* runner behind a company proxy reached nothing until this release.
|
|
17
|
+
*
|
|
18
|
+
* A plain Agent when no proxy is set, so a run without one is exactly what it
|
|
19
|
+
* was. A proxy URL undici cannot parse throws in the constructor - here that
|
|
20
|
+
* would be onBegin throwing into the customer's run - so it is one warning and
|
|
21
|
+
* a direct connection instead.
|
|
22
|
+
*/
|
|
23
|
+
export declare function createDispatcher(options: Agent.Options): Dispatcher;
|
|
5
24
|
//# sourceMappingURL=http-config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-config.d.ts","sourceRoot":"","sources":["../src/http-config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"http-config.d.ts","sourceRoot":"","sources":["../src/http-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,KAAK,UAAU,EAAE,MAAM,QAAQ,CAAC;AAgBnE,eAAO,MAAM,gBAAgB,QAA8D,CAAC;AAC5F,eAAO,MAAM,UAAU,QAAyC,CAAC;AAYjE,eAAO,MAAM,sBAAsB,QAAS,CAAC;AAK7C,eAAO,MAAM,2BAA2B,OAAQ,CAAC;AAIjD,mGAAmG;AACnG,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,GAAG,IAAI,CAExE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,GAAG,UAAU,CAWnE"}
|
package/dist/http-config.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.SERVER_ERROR_RETRY_DELAY_MS = exports.API_REQUEST_TIMEOUT_MS = exports.USER_AGENT = exports.REPORTER_VERSION = void 0;
|
|
4
|
+
exports.proxyVariableInUse = proxyVariableInUse;
|
|
5
|
+
exports.createDispatcher = createDispatcher;
|
|
6
|
+
const undici_1 = require("undici");
|
|
4
7
|
// Sent on every request to squally-app (not on the artifact PUT to R2's
|
|
5
8
|
// presigned URL - that goes straight to Cloudflare storage, not through the
|
|
6
9
|
// app, and R2 has no use for it). Server-side, a customer's reporter version
|
|
@@ -32,4 +35,38 @@ exports.API_REQUEST_TIMEOUT_MS = 30000;
|
|
|
32
35
|
// cancel. The reporter's own calls retry within a time budget since 0.17.0
|
|
33
36
|
// (the retry policy in index.ts).
|
|
34
37
|
exports.SERVER_ERROR_RETRY_DELAY_MS = 1000;
|
|
38
|
+
const PROXY_VARIABLES = ["HTTPS_PROXY", "https_proxy", "HTTP_PROXY", "http_proxy"];
|
|
39
|
+
/** The proxy variable this process would use, by name - never its value (it can carry a login). */
|
|
40
|
+
function proxyVariableInUse(env) {
|
|
41
|
+
return PROXY_VARIABLES.find((name) => (env[name] ?? "").trim() !== "") ?? null;
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* The dispatcher every request of this package goes through (0.18.0): to
|
|
45
|
+
* Squally, to the storage's presigned URLs, and the CLI's cancel.
|
|
46
|
+
*
|
|
47
|
+
* HTTP(S)_PROXY and NO_PROXY, as curl and most CI images read them - undici's
|
|
48
|
+
* EnvHttpProxyAgent: HTTPS_PROXY for https targets, HTTP_PROXY for http ones,
|
|
49
|
+
* lower case before upper case, NO_PROXY's hosts and domain suffixes go
|
|
50
|
+
* direct. Node's own fetch ignores these variables, which is why a self-hosted
|
|
51
|
+
* runner behind a company proxy reached nothing until this release.
|
|
52
|
+
*
|
|
53
|
+
* A plain Agent when no proxy is set, so a run without one is exactly what it
|
|
54
|
+
* was. A proxy URL undici cannot parse throws in the constructor - here that
|
|
55
|
+
* would be onBegin throwing into the customer's run - so it is one warning and
|
|
56
|
+
* a direct connection instead.
|
|
57
|
+
*/
|
|
58
|
+
function createDispatcher(options) {
|
|
59
|
+
const variable = proxyVariableInUse(process.env);
|
|
60
|
+
if (variable === null)
|
|
61
|
+
return new undici_1.Agent(options);
|
|
62
|
+
try {
|
|
63
|
+
return new undici_1.EnvHttpProxyAgent(options);
|
|
64
|
+
}
|
|
65
|
+
catch {
|
|
66
|
+
// Without the error's message: undici's can quote the URL, and a proxy
|
|
67
|
+
// URL can carry a login.
|
|
68
|
+
console.warn(`[squally-reporter] ${variable} is not a proxy URL this reporter can use - connecting directly instead.`);
|
|
69
|
+
return new undici_1.Agent(options);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
35
72
|
//# sourceMappingURL=http-config.js.map
|
package/dist/http-config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-config.js","sourceRoot":"","sources":["../src/http-config.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"http-config.js","sourceRoot":"","sources":["../src/http-config.ts"],"names":[],"mappings":";;;AAuCA,gDAEC;AAiBD,4CAWC;AArED,mCAAmE;AAEnE,wEAAwE;AACxE,4EAA4E;AAC5E,6EAA6E;AAC7E,0EAA0E;AAC1E,sEAAsE;AACtE,gEAAgE;AAChE,wBAAwB;AACxB,EAAE;AACF,6EAA6E;AAC7E,0EAA0E;AAC1E,uEAAuE;AACvE,0EAA0E;AAC1E,4EAA4E;AAC5E,qCAAqC;AACxB,QAAA,gBAAgB,GAAI,OAAO,CAAC,iBAAiB,CAAyB,CAAC,OAAO,CAAC;AAC/E,QAAA,UAAU,GAAG,oBAAoB,wBAAgB,EAAE,CAAC;AAEjE,4EAA4E;AAC5E,0EAA0E;AAC1E,4EAA4E;AAC5E,wDAAwD;AACxD,EAAE;AACF,6EAA6E;AAC7E,oGAAoG;AACpG,6EAA6E;AAC7E,6EAA6E;AAC7E,sDAAsD;AACzC,QAAA,sBAAsB,GAAG,KAAM,CAAC;AAE7C,2EAA2E;AAC3E,2EAA2E;AAC3E,kCAAkC;AACrB,QAAA,2BAA2B,GAAG,IAAK,CAAC;AAEjD,MAAM,eAAe,GAAG,CAAC,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,CAAU,CAAC;AAE5F,mGAAmG;AACnG,SAAgB,kBAAkB,CAAC,GAAsB;IACvD,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,IAAI,IAAI,CAAC;AACjF,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,SAAgB,gBAAgB,CAAC,OAAsB;IACrD,MAAM,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACjD,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,IAAI,cAAK,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,CAAC;QACH,OAAO,IAAI,0BAAiB,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,uEAAuE;QACvE,yBAAyB;QACzB,OAAO,CAAC,IAAI,CAAC,sBAAsB,QAAQ,0EAA0E,CAAC,CAAC;QACvH,OAAO,IAAI,cAAK,CAAC,OAAO,CAAC,CAAC;IAC5B,CAAC;AACH,CAAC"}
|