@yadsh/dsh-qa-integrations 0.10.1 → 0.10.3
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/lib/broker.js +83 -0
- package/lib/broker.js.map +1 -1
- package/lib/client/operator-controls.js +4 -1
- package/lib/client/operator-controls.js.map +1 -1
- package/lib/client/provider-card.js +4 -7
- package/lib/client/provider-card.js.map +1 -1
- package/lib/client.js +2283 -2284
- package/lib/client.js.map +1 -1
- package/lib/errors.js +7 -0
- package/lib/errors.js.map +1 -1
- package/lib/providers/bitrix24/transport.js +10 -3
- package/lib/providers/bitrix24/transport.js.map +1 -1
- package/lib/providers/kernel/errors.js +4 -1
- package/lib/providers/kernel/errors.js.map +1 -1
- package/lib/providers/kernel/read-policy.js +112 -13
- package/lib/providers/kernel/read-policy.js.map +1 -1
- package/lib/providers/teamcity/transport.js +6 -1
- package/lib/providers/teamcity/transport.js.map +1 -1
- package/lib/providers/testit/transport.js +6 -1
- package/lib/providers/testit/transport.js.map +1 -1
- package/lib/providers/weblate/transport.js +6 -1
- package/lib/providers/weblate/transport.js.map +1 -1
- package/lib/types/broker.d.ts +40 -0
- package/lib/types/client/operator-controls.d.ts +12 -0
- package/lib/types/errors.d.ts +21 -0
- package/lib/types/providers/kernel/errors.d.ts +5 -3
- package/lib/types/providers/kernel/read-policy.d.ts +62 -6
- package/locale/en.json +6 -0
- package/package.json +4 -2
package/lib/errors.js
CHANGED
|
@@ -6,6 +6,13 @@ export class IntegrationError extends Error {
|
|
|
6
6
|
* error that never reached one.
|
|
7
7
|
*/
|
|
8
8
|
budget;
|
|
9
|
+
/**
|
|
10
|
+
* Set by the transport that met the answer, on the failure it handed back.
|
|
11
|
+
* The broker logs it, because the call that failed is the one an operator is
|
|
12
|
+
* looking for and the party that decided the refusal no longer holds the
|
|
13
|
+
* response.
|
|
14
|
+
*/
|
|
15
|
+
diagnostics;
|
|
9
16
|
constructor(code, message, options) {
|
|
10
17
|
super(message, options);
|
|
11
18
|
this.code = code;
|
package/lib/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAiFA,oFAAoF;AACpF,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IAgB9B,IAAI;IAff;;;OAGG;IACH,MAAM,CAAmB;IAEzB;;;;;OAKG;IACH,WAAW,CAAwB;IAEnC,YACW,IAA0B,EACnC,OAAe,EACf,OAAsB;QAEtB,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;oBAJf,IAAI;QAKb,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF;AAED,MAAM,UAAU,sBAAsB,CAAC,KAAc;IACnD,MAAM,IAAI,GACR,KAAK,YAAY,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;IACzE,OAAO,IAAI,KAAK,CAAC,uCAAuC,IAAI,GAAG,CAAC,CAAC;AACnE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,OAAO,CACL,KAAK,YAAY,gBAAgB;QACjC,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB;YAChC,KAAK,CAAC,IAAI,KAAK,0BAA0B,CAAC,CAC7C,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAa;IAC7C,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,GAAG,KAAK,KAAK,OAAO,EAAE,CAAC,CAAC;AACxD,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IntegrationError } from "../../errors.js";
|
|
2
2
|
import { hostMatchesSuffix } from "../shared/host.js";
|
|
3
|
-
import { readBoundedJson, withTransportBudget } from "../kernel/read-policy.js";
|
|
3
|
+
import { answerDiagnostics, credentialRedirectFailure, isRedirectStatus, readBoundedJson, withTransportBudget, withTransportDiagnostics, } from "../kernel/read-policy.js";
|
|
4
4
|
export function credentialFromPlaintext(plaintext) {
|
|
5
5
|
let parsed;
|
|
6
6
|
try {
|
|
@@ -86,7 +86,10 @@ export class BitrixTransport {
|
|
|
86
86
|
try {
|
|
87
87
|
const response = await this.fetcher(`${credential.webhookBaseUrl}/${method}.json`, {
|
|
88
88
|
method: "POST",
|
|
89
|
-
|
|
89
|
+
// Never followed: the webhook's own secret must not travel to another
|
|
90
|
+
// origin. `manual` so that the redirect itself reaches the fold — the
|
|
91
|
+
// portal answers a dead webhook with one.
|
|
92
|
+
redirect: "manual",
|
|
90
93
|
headers: {
|
|
91
94
|
"content-type": "application/json",
|
|
92
95
|
accept: "application/json",
|
|
@@ -98,7 +101,11 @@ export class BitrixTransport {
|
|
|
98
101
|
// never read at all, exactly as in the shared transport loop.
|
|
99
102
|
if (!response.ok) {
|
|
100
103
|
const denied = response.status === 401 || response.status === 403;
|
|
101
|
-
throw
|
|
104
|
+
throw withTransportDiagnostics(isRedirectStatus(response.status)
|
|
105
|
+
? credentialRedirectFailure("Bitrix24")
|
|
106
|
+
: new IntegrationError(denied ? "ProviderPermissionDenied" : "ProviderUnavailable", denied
|
|
107
|
+
? "Provider denied this operation"
|
|
108
|
+
: "Provider request failed"), answerDiagnostics(response));
|
|
102
109
|
}
|
|
103
110
|
// One bounded read for every provider: the deployment's byte cap decides
|
|
104
111
|
// how much is read, the deadline above decides for how long, and a capped
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/providers/bitrix24/transport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/providers/bitrix24/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IntegrationError } from "../../errors.js";
|
|
2
|
-
import { TLS_FAILURE, causeCode } from "./read-policy.js";
|
|
2
|
+
import { TLS_FAILURE, causeCode, credentialRedirectFailure, isRedirectStatus, } from "./read-policy.js";
|
|
3
3
|
/** The provider's status folding, in the shape `FetchRetryPolicy` takes. */
|
|
4
4
|
export function statusErrorOf(policy) {
|
|
5
5
|
const { label } = policy;
|
|
@@ -9,6 +9,9 @@ export function statusErrorOf(policy) {
|
|
|
9
9
|
if (override !== undefined) {
|
|
10
10
|
return new IntegrationError(override[0], override[1]);
|
|
11
11
|
}
|
|
12
|
+
if (isRedirectStatus(status)) {
|
|
13
|
+
return credentialRedirectFailure(label);
|
|
14
|
+
}
|
|
12
15
|
if (status === 401) {
|
|
13
16
|
return new IntegrationError("CredentialRevoked", policy.rejectedCredential ?? `${label} rejected the stored token`);
|
|
14
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/providers/kernel/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA6B,MAAM,iBAAiB,CAAC;AAC9E,OAAO,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/providers/kernel/errors.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA6B,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EACL,WAAW,EACX,SAAS,EACT,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,kBAAkB,CAAC;AA0B1B,4EAA4E;AAC5E,MAAM,UAAU,aAAa,CAC3B,MAAyB;IAEzB,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IACzB,OAAO,CAAC,QAAQ,EAAE,EAAE;QAClB,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;QAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,OAAO,IAAI,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,gBAAgB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,OAAO,yBAAyB,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACnB,OAAO,IAAI,gBAAgB,CACzB,mBAAmB,EACnB,MAAM,CAAC,kBAAkB,IAAI,GAAG,KAAK,4BAA4B,CAClE,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACnB,OAAO,IAAI,gBAAgB,CACzB,0BAA0B,EAC1B,GAAG,KAAK,wBAAwB,CACjC,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACnB,OAAO,IAAI,gBAAgB,CACzB,kBAAkB,EAClB,GAAG,KAAK,qBAAqB,CAC9B,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACnB,OAAO,IAAI,gBAAgB,CAAC,aAAa,EAAE,GAAG,KAAK,qBAAqB,CAAC,CAAC;QAC5E,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,sBAAsB,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACnE,OAAO,IAAI,gBAAgB,CACzB,gBAAgB,EAChB,GAAG,KAAK,uBAAuB,CAChC,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,gBAAgB,CACzB,qBAAqB,EACrB,GAAG,KAAK,iBAAiB,CAC1B,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AASD;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,MAA8B;IAE9B,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CACzB,QAAQ;QACN,CAAC,CAAC,IAAI,gBAAgB,CAClB,iBAAiB,EACjB,GAAG,MAAM,CAAC,KAAK,iBAAiB,CACjC;QACH,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC,CAAC,IAAI,gBAAgB,CAClB,YAAY,EACZ,GAAG,MAAM,CAAC,KAAK,uBAAuB,CACvC;YACH,CAAC,CAAC,IAAI,gBAAgB,CAClB,qBAAqB,EACrB,MAAM,CAAC,WAAW,IAAI,GAAG,MAAM,CAAC,KAAK,iBAAiB,CACvD,CAAC;AACZ,CAAC"}
|
|
@@ -1,10 +1,14 @@
|
|
|
1
|
-
import { IntegrationError } from "../../errors.js";
|
|
1
|
+
import { IntegrationError, } from "../../errors.js";
|
|
2
2
|
export const RETRY_CAP_MS = 2_000;
|
|
3
3
|
export const BACKOFF_BASE_MS = 250;
|
|
4
4
|
/** Upstream codes that mean "the TLS handshake did not succeed". */
|
|
5
5
|
export const TLS_FAILURE = /CERT|TLS|SSL|UNABLE_TO_VERIFY|SELF_SIGNED|DEPTH_ZERO|ERR_TLS/u;
|
|
6
6
|
/** Content types that must never be handed to the model as text. */
|
|
7
7
|
export const BINARY_TYPE = /^(?:image|audio|video)\/|application\/(?:octet-stream|zip|gzip|pdf|x-tar|x-7z-compressed|wasm)/u;
|
|
8
|
+
/** A sign-in page is HTML; a gateway that renders one is not a JSON API. */
|
|
9
|
+
const HTML_TYPE = /^text\/html|^application\/xhtml/u;
|
|
10
|
+
/** The head of a document, whether or not the answer declared what it is. */
|
|
11
|
+
const HTML_HEAD = /^\s*<(?:!doctype\s+html|html(?:\s|>))/iu;
|
|
8
12
|
export function numberFrom(value) {
|
|
9
13
|
if (value === null || value.trim() === "")
|
|
10
14
|
return undefined;
|
|
@@ -28,6 +32,43 @@ export function looksBinary(contentType, bytes) {
|
|
|
28
32
|
}
|
|
29
33
|
return false;
|
|
30
34
|
}
|
|
35
|
+
/**
|
|
36
|
+
* Whether an unreadable JSON body is a sign-in page. Either half answers it: the
|
|
37
|
+
* media type the gateway declared, or the document's own opening. An upstream
|
|
38
|
+
* that moved its login behind the API path answers 200 with HTML, and that is a
|
|
39
|
+
* refused credential, not a malformed one.
|
|
40
|
+
*/
|
|
41
|
+
export function looksLikeSignInPage(contentType, text) {
|
|
42
|
+
if (contentType !== null && HTML_TYPE.test(contentType))
|
|
43
|
+
return true;
|
|
44
|
+
return HTML_HEAD.test(text);
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* Whether an answer is a redirect rather than data.
|
|
48
|
+
*
|
|
49
|
+
* Every transport of this package refuses to follow one — the credential must
|
|
50
|
+
* not travel to another origin — so a 3xx is always an answer this deployment
|
|
51
|
+
* read itself, never an address it was told to try.
|
|
52
|
+
*/
|
|
53
|
+
export function isRedirectStatus(status) {
|
|
54
|
+
return status >= 300 && status < 400;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* What a redirect means here: an upstream that no longer accepts the stored
|
|
58
|
+
* credential sends its caller to the sign-in page instead of answering. Folding
|
|
59
|
+
* it into `ProviderUnavailable` is what made an expired key read as an outage —
|
|
60
|
+
* one phrase for a dead token and a host that is down, no action in either.
|
|
61
|
+
*/
|
|
62
|
+
export function credentialRedirectFailure(label) {
|
|
63
|
+
return new IntegrationError("CredentialRevoked", `${label} redirected to a sign-in page instead of answering; reconnect the integration`);
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* The same refusal for the upstream that answers with a login page and calls it
|
|
67
|
+
* 200: the credential is spent either way, and the operator's action is one.
|
|
68
|
+
*/
|
|
69
|
+
export function credentialPageFailure(label) {
|
|
70
|
+
return new IntegrationError("CredentialRevoked", `${label} answered with a sign-in page instead of data; reconnect the integration`);
|
|
71
|
+
}
|
|
31
72
|
export function sleep(ms) {
|
|
32
73
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
33
74
|
}
|
|
@@ -44,6 +85,30 @@ export function causeCode(error) {
|
|
|
44
85
|
}
|
|
45
86
|
return "";
|
|
46
87
|
}
|
|
88
|
+
/**
|
|
89
|
+
* The class of a transport failure, as a log may name it: the upstream code
|
|
90
|
+
* where there is one (`ECONNREFUSED`, `UND_ERR_SOCKET`), the error's own name
|
|
91
|
+
* otherwise. A short token, and nothing a header value or a message could
|
|
92
|
+
* smuggle into a log line.
|
|
93
|
+
*/
|
|
94
|
+
export function errorClassOf(error) {
|
|
95
|
+
const code = causeCode(error);
|
|
96
|
+
const candidate = code !== "" ? code : error instanceof Error ? error.name : typeof error;
|
|
97
|
+
return logToken(candidate) ?? "unclassified";
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* A value safe to print: a short token of the characters a media type or an
|
|
101
|
+
* error code is written with, or nothing at all. A control character never
|
|
102
|
+
* reaches a log line, whatever an upstream put in a header.
|
|
103
|
+
*/
|
|
104
|
+
function logToken(value) {
|
|
105
|
+
if (value === undefined)
|
|
106
|
+
return undefined;
|
|
107
|
+
const token = value.trim().slice(0, 64);
|
|
108
|
+
return token !== "" && /^[A-Za-z0-9_.:;/+=, -]+$/u.test(token)
|
|
109
|
+
? token
|
|
110
|
+
: undefined;
|
|
111
|
+
}
|
|
47
112
|
export function backoff(response, attempt) {
|
|
48
113
|
const header = response.headers.get("retry-after");
|
|
49
114
|
const seconds = header === null ? Number.NaN : Number(header.trim());
|
|
@@ -153,18 +218,23 @@ export async function readBoundedText(response, maxBytes, label, signal) {
|
|
|
153
218
|
* classification are the shared policy; a transport only supplies the label it
|
|
154
219
|
* answers with, so the same limit cannot mean "narrow the request" in one
|
|
155
220
|
* provider and "try again later" in another, and no transport can quietly skip
|
|
156
|
-
* either of them.
|
|
221
|
+
* either of them. An unreadable body that is a sign-in page is the refused
|
|
222
|
+
* credential the status fold would have named, had the upstream answered with a
|
|
223
|
+
* status for it.
|
|
157
224
|
*/
|
|
158
225
|
export async function readBoundedJson(response, maxBytes, label, signal) {
|
|
226
|
+
const facts = answerDiagnostics(response);
|
|
159
227
|
const body = await readBoundedText(response, maxBytes, label, signal);
|
|
160
228
|
if (body.truncated) {
|
|
161
|
-
throw new IntegrationError("ResultTooLarge", `${label} response is too large`);
|
|
229
|
+
throw withTransportDiagnostics(new IntegrationError("ResultTooLarge", `${label} response is too large`), facts);
|
|
162
230
|
}
|
|
163
231
|
try {
|
|
164
232
|
return JSON.parse(body.text);
|
|
165
233
|
}
|
|
166
234
|
catch {
|
|
167
|
-
throw
|
|
235
|
+
throw withTransportDiagnostics(looksLikeSignInPage(response.headers.get("content-type"), body.text)
|
|
236
|
+
? credentialPageFailure(label)
|
|
237
|
+
: new IntegrationError("ProviderUnavailable", `${label} returned invalid JSON`), facts);
|
|
168
238
|
}
|
|
169
239
|
}
|
|
170
240
|
/**
|
|
@@ -192,6 +262,29 @@ export function withTransportBudget(error, budget) {
|
|
|
192
262
|
error.budget = budget;
|
|
193
263
|
return error;
|
|
194
264
|
}
|
|
265
|
+
/**
|
|
266
|
+
* Write what the upstream answer looked like onto the failure that carries it
|
|
267
|
+
* out, beside the budget that answer cost. The broker reports the refusal and
|
|
268
|
+
* knows the provider and the operation; only the loop ever held the response,
|
|
269
|
+
* and only the loop ever saw a fetch that raised. Facts about the shape of the
|
|
270
|
+
* answer — a status, a media type, a transport error class — and nothing of its
|
|
271
|
+
* content.
|
|
272
|
+
*/
|
|
273
|
+
export function withTransportDiagnostics(error, facts) {
|
|
274
|
+
error.diagnostics = { ...error.diagnostics, ...facts };
|
|
275
|
+
return error;
|
|
276
|
+
}
|
|
277
|
+
/**
|
|
278
|
+
* What an answer that arrived left for a log to say about it. Exported for the
|
|
279
|
+
* transports with a loop of their own, so a refusal reads alike whichever of
|
|
280
|
+
* them produced it.
|
|
281
|
+
*/
|
|
282
|
+
export function answerDiagnostics(response) {
|
|
283
|
+
const contentType = logToken(response.headers.get("content-type") ?? undefined);
|
|
284
|
+
return contentType === undefined
|
|
285
|
+
? { status: response.status }
|
|
286
|
+
: { status: response.status, contentType };
|
|
287
|
+
}
|
|
195
288
|
/**
|
|
196
289
|
* The shared transport loop: one bounded GET per attempt, transient answers
|
|
197
290
|
* retried with backoff, upstream failures folded into safe domain errors. The
|
|
@@ -202,9 +295,10 @@ export function withTransportBudget(error, budget) {
|
|
|
202
295
|
* retried by this loop unless its status says the upstream fault may be gone on
|
|
203
296
|
* a later try, and what `read` refuses on its own (a body over the cap, a body
|
|
204
297
|
* that is not JSON) stays the domain error it named. Whatever the loop hands
|
|
205
|
-
* back from a transport give-up carries the budget it spent
|
|
206
|
-
*
|
|
207
|
-
*
|
|
298
|
+
* back from a transport give-up carries the budget it spent and the shape of the
|
|
299
|
+
* answer it met — a status, a media type, the class of the failure — because the
|
|
300
|
+
* party reporting that failure to the operator knows the call and none of the
|
|
301
|
+
* arithmetic or the exchange behind it.
|
|
208
302
|
*/
|
|
209
303
|
export async function fetchWithRetries(fetcher, target, policy, read) {
|
|
210
304
|
const retriable = policy.retriable ?? DEADLINE_IS_THE_BUDGET;
|
|
@@ -228,14 +322,19 @@ export async function fetchWithRetries(fetcher, target, policy, read) {
|
|
|
228
322
|
response = await fetcher(target, {
|
|
229
323
|
method: "GET",
|
|
230
324
|
// An upstream that answers with a redirect is never followed: the
|
|
231
|
-
// credential must not travel to another origin.
|
|
232
|
-
|
|
325
|
+
// credential must not travel to another origin. `manual` rather than
|
|
326
|
+
// `error` because the answer itself is the finding — a refused key
|
|
327
|
+
// redirects to a sign-in page, and the provider's status fold is what
|
|
328
|
+
// says so. Under `error` the fetch only raises an opaque failure.
|
|
329
|
+
redirect: "manual",
|
|
233
330
|
headers: policy.headers,
|
|
234
331
|
signal: controller.signal,
|
|
235
332
|
});
|
|
236
333
|
}
|
|
237
334
|
catch (error) {
|
|
238
|
-
const failure = policy.transportFailure(error, timedOut)
|
|
335
|
+
const failure = withTransportDiagnostics(policy.transportFailure(error, timedOut), {
|
|
336
|
+
errorClass: errorClassOf(error),
|
|
337
|
+
});
|
|
239
338
|
if (attempt >= policy.retries || !retriable(failure)) {
|
|
240
339
|
throw withTransportBudget(failure, spent());
|
|
241
340
|
}
|
|
@@ -243,7 +342,7 @@ export async function fetchWithRetries(fetcher, target, policy, read) {
|
|
|
243
342
|
continue;
|
|
244
343
|
}
|
|
245
344
|
if (!response.ok) {
|
|
246
|
-
const failure = policy.statusFailure(response);
|
|
345
|
+
const failure = withTransportDiagnostics(policy.statusFailure(response), answerDiagnostics(response));
|
|
247
346
|
// Only throttling and upstream faults are retried; an authorization or
|
|
248
347
|
// not-found answer will not change by asking again.
|
|
249
348
|
const transient = response.status === 429 || response.status >= 500;
|
|
@@ -261,9 +360,9 @@ export async function fetchWithRetries(fetcher, target, policy, read) {
|
|
|
261
360
|
// refusal was: the attempts and the deadline are true of the call either
|
|
262
361
|
// way, and only the reader knows which of them ended it.
|
|
263
362
|
if (error instanceof IntegrationError) {
|
|
264
|
-
throw withTransportBudget(error, spent());
|
|
363
|
+
throw withTransportBudget(withTransportDiagnostics(error, answerDiagnostics(response)), spent());
|
|
265
364
|
}
|
|
266
|
-
throw withTransportBudget(policy.transportFailure(error, timedOut), spent());
|
|
365
|
+
throw withTransportBudget(withTransportDiagnostics(policy.transportFailure(error, timedOut), answerDiagnostics(response)), spent());
|
|
267
366
|
}
|
|
268
367
|
}
|
|
269
368
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-policy.js","sourceRoot":"","sources":["../../../src/providers/kernel/read-policy.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"read-policy.js","sourceRoot":"","sources":["../../../src/providers/kernel/read-policy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IntegrationError } from "../../errors.js";
|
|
2
|
-
import { TLS_FAILURE, causeCode, fetchWithRetries, readBoundedJson, readBoundedText, RESEND_AFTER_EVERY_FAULT, } from "../kernel/read-policy.js";
|
|
2
|
+
import { TLS_FAILURE, causeCode, credentialRedirectFailure, fetchWithRetries, isRedirectStatus, readBoundedJson, readBoundedText, RESEND_AFTER_EVERY_FAULT, } from "../kernel/read-policy.js";
|
|
3
3
|
import { canonicalServerUrl, serverUrlProblem } from "./network.js";
|
|
4
4
|
export function credentialFromPlaintext(plaintext) {
|
|
5
5
|
let parsed;
|
|
@@ -94,6 +94,11 @@ export class TeamCityTransport {
|
|
|
94
94
|
*/
|
|
95
95
|
failure(response) {
|
|
96
96
|
const status = response.status;
|
|
97
|
+
// A spent token is answered with the login redirect rather than a 401, and
|
|
98
|
+
// only the first of these two says what the user can do about it.
|
|
99
|
+
if (isRedirectStatus(status)) {
|
|
100
|
+
return credentialRedirectFailure("TeamCity");
|
|
101
|
+
}
|
|
97
102
|
if (status === 401) {
|
|
98
103
|
return new IntegrationError("CredentialRevoked", "TeamCity rejected the stored token");
|
|
99
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/providers/teamcity/transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/providers/teamcity/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IntegrationError } from "../../errors.js";
|
|
2
|
-
import { TLS_FAILURE, causeCode, fetchWithRetries, numberFrom, readBoundedJson, readBoundedText, } from "../kernel/read-policy.js";
|
|
2
|
+
import { TLS_FAILURE, causeCode, credentialRedirectFailure, fetchWithRetries, isRedirectStatus, numberFrom, readBoundedJson, readBoundedText, } from "../kernel/read-policy.js";
|
|
3
3
|
import { testitInstance, } from "./config.js";
|
|
4
4
|
export function credentialFromPlaintext(plaintext) {
|
|
5
5
|
let parsed;
|
|
@@ -118,6 +118,11 @@ export class TestitTransport {
|
|
|
118
118
|
*/
|
|
119
119
|
failure(response) {
|
|
120
120
|
const status = response.status;
|
|
121
|
+
// A spent token is answered with the login redirect rather than a 401, and
|
|
122
|
+
// only the first of these two says what the user can do about it.
|
|
123
|
+
if (isRedirectStatus(status)) {
|
|
124
|
+
return credentialRedirectFailure("Test IT");
|
|
125
|
+
}
|
|
121
126
|
if (status === 401) {
|
|
122
127
|
return new IntegrationError("CredentialRevoked", "Test IT rejected the stored token");
|
|
123
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/providers/testit/transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/providers/testit/transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IntegrationError } from "../../errors.js";
|
|
2
|
-
import { TLS_FAILURE, causeCode, fetchWithRetries, readBoundedJson, } from "../kernel/read-policy.js";
|
|
2
|
+
import { TLS_FAILURE, causeCode, credentialRedirectFailure, fetchWithRetries, isRedirectStatus, readBoundedJson, } from "../kernel/read-policy.js";
|
|
3
3
|
import { weblateInstance, } from "./config.js";
|
|
4
4
|
export function credentialFromPlaintext(plaintext) {
|
|
5
5
|
let parsed;
|
|
@@ -144,6 +144,11 @@ export class WeblateTransport {
|
|
|
144
144
|
}
|
|
145
145
|
failure(response) {
|
|
146
146
|
const status = response.status;
|
|
147
|
+
// A spent token is answered with the login redirect rather than a 401, and
|
|
148
|
+
// only the first of these two says what the user can do about it.
|
|
149
|
+
if (isRedirectStatus(status)) {
|
|
150
|
+
return credentialRedirectFailure("Weblate");
|
|
151
|
+
}
|
|
147
152
|
if (status === 401) {
|
|
148
153
|
return new IntegrationError("CredentialRevoked", "Weblate rejected the stored token");
|
|
149
154
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/providers/weblate/transport.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/providers/weblate/transport.ts"],"names":[],"mappings":"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"}
|
package/lib/types/broker.d.ts
CHANGED
|
@@ -132,6 +132,46 @@ export declare class IntegrationBroker {
|
|
|
132
132
|
* call again in the trail.
|
|
133
133
|
*/
|
|
134
134
|
private logTransportTimeout;
|
|
135
|
+
/**
|
|
136
|
+
* Write what one live call learned about its binding back onto that binding.
|
|
137
|
+
*
|
|
138
|
+
* `validate` already did this, but only for somebody who opened the connect
|
|
139
|
+
* form: a key that died between two visits left the row reading `connected`
|
|
140
|
+
* with an empty `last_error_code`, so the card kept promising the connection
|
|
141
|
+
* that was refusing every answer, and the only clue was the text the chat
|
|
142
|
+
* happened to show. A refused credential is a state of the row, so the call
|
|
143
|
+
* that met one records it.
|
|
144
|
+
*
|
|
145
|
+
* Only these codes are written. An unreachable host, a TLS chain the user
|
|
146
|
+
* cannot repair from the form, a rate limit or a resource that is not there
|
|
147
|
+
* say nothing about the validity of the binding, and a red card for those
|
|
148
|
+
* would send somebody to reconnect the very credential that was never the
|
|
149
|
+
* problem.
|
|
150
|
+
*/
|
|
151
|
+
private recordCallVerdict;
|
|
152
|
+
/**
|
|
153
|
+
* Clear the verdict an earlier live call filed, once a later call got data
|
|
154
|
+
* through the same credential. `status` and `last_error_code` are the card's
|
|
155
|
+
* only statement about a connection, and without this a binding repaired
|
|
156
|
+
* upstream — a re-issued token, a key the administrator un-revoked — would
|
|
157
|
+
* stay red until somebody thought to press a button that answers nothing new.
|
|
158
|
+
*/
|
|
159
|
+
private healAfterCall;
|
|
160
|
+
/**
|
|
161
|
+
* Say in this plugin's own log what a refused live call met.
|
|
162
|
+
*
|
|
163
|
+
* The chat carries the sentence the model was shown, the audit trail carries
|
|
164
|
+
* the result, and neither is where an operator looks; before this a live
|
|
165
|
+
* refusal left no line behind at all. The fields describe the shape of the
|
|
166
|
+
* answer — its status, its media type, the class of the transport failure —
|
|
167
|
+
* never its body, and never a credential.
|
|
168
|
+
*
|
|
169
|
+
* Two refusals are left to their own records: a call this deployment's
|
|
170
|
+
* deadline ended is `transport.timeout`, budget and all, and a refusal decided
|
|
171
|
+
* without any answer — a policy switch, a connection that is not there — has
|
|
172
|
+
* no upstream to report on, which is what the absence of diagnostics says.
|
|
173
|
+
*/
|
|
174
|
+
private logCallFailure;
|
|
135
175
|
/**
|
|
136
176
|
* Spend one unit of the service-mode ceiling before the call leaves for
|
|
137
177
|
* upstream. Both sides of the limit are consulted together: one principal may
|
|
@@ -29,6 +29,18 @@ export interface ValueProps<T> {
|
|
|
29
29
|
}
|
|
30
30
|
/** The control's DOM id, derived from its settings path: one per field. */
|
|
31
31
|
export declare function fieldId(path: readonly string[]): string;
|
|
32
|
+
/**
|
|
33
|
+
* One settings key spelled the way a test id has to be spelled: camelCase humps
|
|
34
|
+
* come apart (`allowedHosts` is `allowed-hosts`, and an acronym run belongs to
|
|
35
|
+
* the word after it, so `maxHTTPRetries` is `max-http-retries`) and every other
|
|
36
|
+
* run of non-alphanumerics collapses to one dash (`issues.read` is
|
|
37
|
+
* `issues-read`). Whatever the key looks like, the answer is ASCII kebab-case:
|
|
38
|
+
* an id carrying a dot or a stray capital is a selector the harness cannot quote.
|
|
39
|
+
*
|
|
40
|
+
* The provider card names its capability and boundary rows with this same rule,
|
|
41
|
+
* so one spelling of a vocabulary key cannot yield two different selectors.
|
|
42
|
+
*/
|
|
43
|
+
export declare function kebabSegment(segment: string): string;
|
|
32
44
|
/**
|
|
33
45
|
* The test id of the control that writes `path`: the settings key is what the
|
|
34
46
|
* Host stores the value under and what the card mutates by, so a reworded
|
package/lib/types/errors.d.ts
CHANGED
|
@@ -44,6 +44,20 @@ export interface TransportBudget {
|
|
|
44
44
|
/** Attempts spent, the first included. */
|
|
45
45
|
readonly attempts: number;
|
|
46
46
|
}
|
|
47
|
+
/**
|
|
48
|
+
* What an upstream answer looked like, as far as a log may say it: the shape of
|
|
49
|
+
* the answer, never its content. A status, a media type and the class of a
|
|
50
|
+
* transport failure are what tells an expired key from a host that is down —
|
|
51
|
+
* and none of them is a body, an address or a credential.
|
|
52
|
+
*/
|
|
53
|
+
export interface TransportDiagnostics {
|
|
54
|
+
/** Status of an answer that arrived; absent when nothing answered. */
|
|
55
|
+
readonly status?: number;
|
|
56
|
+
/** Media type the answer declared for itself. */
|
|
57
|
+
readonly contentType?: string;
|
|
58
|
+
/** Class of the failure the fetch itself raised, when nothing answered. */
|
|
59
|
+
readonly errorClass?: string;
|
|
60
|
+
}
|
|
47
61
|
/** Safe domain error: message and code never include upstream bodies or secrets. */
|
|
48
62
|
export declare class IntegrationError extends Error {
|
|
49
63
|
readonly code: IntegrationErrorCode;
|
|
@@ -52,6 +66,13 @@ export declare class IntegrationError extends Error {
|
|
|
52
66
|
* error that never reached one.
|
|
53
67
|
*/
|
|
54
68
|
budget?: TransportBudget;
|
|
69
|
+
/**
|
|
70
|
+
* Set by the transport that met the answer, on the failure it handed back.
|
|
71
|
+
* The broker logs it, because the call that failed is the one an operator is
|
|
72
|
+
* looking for and the party that decided the refusal no longer holds the
|
|
73
|
+
* response.
|
|
74
|
+
*/
|
|
75
|
+
diagnostics?: TransportDiagnostics;
|
|
55
76
|
constructor(code: IntegrationErrorCode, message: string, options?: ErrorOptions);
|
|
56
77
|
}
|
|
57
78
|
export declare function publicIntegrationError(error: unknown): Error;
|
|
@@ -3,9 +3,11 @@ import { IntegrationError, type IntegrationErrorCode } from "../../errors.js";
|
|
|
3
3
|
* The error policy shared by every provider: upstream failures fold into the
|
|
4
4
|
* same safe domain errors — a refused permission stays distinct from a
|
|
5
5
|
* missing resource, neither answer ever carries the upstream body, and the
|
|
6
|
-
* status mapping is alike wherever two upstreams answer alike. A
|
|
7
|
-
*
|
|
8
|
-
*
|
|
6
|
+
* status mapping is alike wherever two upstreams answer alike. A redirect and a
|
|
7
|
+
* sign-in page where data should be are read as a refused credential rather
|
|
8
|
+
* than as an outage, because that is the one answer a user can act on. A
|
|
9
|
+
* provider supplies only the word it calls itself in a message and, where it
|
|
10
|
+
* answers differently from the common rule, the statuses it reads differently.
|
|
9
11
|
*/
|
|
10
12
|
export interface StatusErrorPolicy {
|
|
11
13
|
/** How the provider names itself in a folded message. */
|