mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-22 03:50:30 +00:00
fix(services): let slow handshakes reach the TREK services
Node gives each address of a dual-stack name 250 ms before it moves on. From Australia that is shorter than one round trip to Europe, so on a network without IPv6 the IPv4 handshake to places.liketrek.com was cut off, the IPv6 attempt failed at once and every request ended in ETIMEDOUT. The installation never got its services key, sharing place details stayed unavailable and searches fell back to OpenStreetMap. Raise the per-address attempt timeout to 2 s at startup, keeping a larger value an operator already set, and log the reason behind undici's bare "fetch failed" for each address tried.
This commit is contained in:
@@ -18,11 +18,17 @@ import { flushLogFileSync, logError } from './nest/audit/audit-log.logger';
|
||||
import type { DatabaseLifecycle } from './nest/database/database-lifecycle.service';
|
||||
import { ReadinessService } from './nest/health/readiness.service';
|
||||
import { createFatalHandler } from './shutdown';
|
||||
import { widenConnectAttemptTimeout } from './utils/connectAttempt';
|
||||
import type { INestApplication } from '@nestjs/common';
|
||||
|
||||
import fs from 'node:fs';
|
||||
import http from 'node:http';
|
||||
|
||||
// Before any outbound request: Node's 250 ms per-address attempt is shorter
|
||||
// than a round trip from Australia to Europe, which cut off every connection
|
||||
// to the TREK services there on networks without IPv6.
|
||||
widenConnectAttemptTimeout();
|
||||
|
||||
// data/tmp is the driver-agnostic global scratch dir (restore-upload spool,
|
||||
// mirror stream staging) and stays boot-created here. Driver-owned roots — the
|
||||
// uploads/ category tree and data/backups — are ensured by LocalDriver.init on
|
||||
|
||||
@@ -72,3 +72,26 @@ export function serverDateMs(headers: Headers): number | null {
|
||||
export function keyFingerprint(token: string): string {
|
||||
return createHash('sha256').update(token).digest('hex').slice(0, 16);
|
||||
}
|
||||
|
||||
/**
|
||||
* A failure as one log line. undici only says "fetch failed" and keeps the
|
||||
* reason in `cause`, an AggregateError when every address was tried, so each
|
||||
* attempt's code and address are spelled out (ETIMEDOUT 203.0.113.7:443).
|
||||
*/
|
||||
export function describeFailure(err: unknown): string {
|
||||
if (!(err instanceof Error)) return String(err);
|
||||
const cause = (err as { cause?: unknown }).cause;
|
||||
if (!(cause instanceof Error)) return err.message;
|
||||
const attempts = cause instanceof AggregateError ? cause.errors : [cause];
|
||||
const reasons = attempts.map(describeAttempt).filter(Boolean);
|
||||
return reasons.length > 0 ? `${err.message} (${reasons.join(', ')})` : err.message;
|
||||
}
|
||||
|
||||
function describeAttempt(attempt: unknown): string {
|
||||
if (!(attempt instanceof Error)) return String(attempt);
|
||||
const { code, address, port } = attempt as { code?: unknown; address?: unknown; port?: unknown };
|
||||
if (typeof code !== 'string') return attempt.message;
|
||||
if (typeof address !== 'string') return code;
|
||||
const host = address.includes(':') ? `[${address}]` : address;
|
||||
return typeof port === 'number' ? `${code} ${host}:${port}` : `${code} ${host}`;
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ import { RefusalStreak } from './refusal-streak';
|
||||
import type { RegistrationDialect } from './registration-dialect.types';
|
||||
import { ServiceClock } from './service-clock';
|
||||
import { REGISTRATION_DIALECT, SERVICE_ISSUER_ORIGIN } from './service-identity.constants';
|
||||
import { isAllowlisted, keyFingerprint, sameServiceUrl } from './service-identity.helpers';
|
||||
import { describeFailure, isAllowlisted, keyFingerprint, sameServiceUrl } from './service-identity.helpers';
|
||||
import { parseServiceKey, type ServiceKey } from './service-key.format';
|
||||
import { solvePow } from './service-key.pow';
|
||||
import { EMPTY_KEY_STATE, ServiceKeyStore, type KeyState, type StoredIdentity } from './service-key.store';
|
||||
@@ -235,7 +235,7 @@ export class ServiceKeyService {
|
||||
const previous = this.work ?? Promise.resolve();
|
||||
const run = previous.then(() => withRequestContext(this.orm, task));
|
||||
const next = run
|
||||
.catch((err: unknown) => logWarn(`TREK services: ${err instanceof Error ? err.message : String(err)}`))
|
||||
.catch((err: unknown) => logWarn(`TREK services: ${describeFailure(err)}`))
|
||||
.finally(() => {
|
||||
if (this.work === next) this.work = null;
|
||||
});
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
import net from 'node:net';
|
||||
|
||||
/**
|
||||
* How long Node waits for one address of a dual-stack name before it gives up
|
||||
* on that connection attempt and tries the next address.
|
||||
*
|
||||
* Node's default is 250 ms. That is shorter than a single round trip from
|
||||
* Australia or New Zealand to a server in Europe, so on a network without IPv6
|
||||
* the IPv4 handshake is cut off before it can finish, the IPv6 attempt fails at
|
||||
* once, and the request ends in ETIMEDOUT although the host was reachable all
|
||||
* along. Two seconds lets a slow but working handshake through; a host that
|
||||
* really does not answer on one family still moves on to the other.
|
||||
*/
|
||||
export const CONNECT_ATTEMPT_TIMEOUT_MS = 2_000;
|
||||
|
||||
/**
|
||||
* Raises Node's per-address connect attempt timeout for every outbound
|
||||
* connection, global fetch and undici agents alike (undici leaves the attempt
|
||||
* timeout to Node unless a caller sets autoSelectFamily itself). A larger value
|
||||
* an operator already set, for example through
|
||||
* NODE_OPTIONS=--network-family-autoselection-attempt-timeout, is kept.
|
||||
*/
|
||||
export function widenConnectAttemptTimeout(): number {
|
||||
const current = net.getDefaultAutoSelectFamilyAttemptTimeout();
|
||||
if (current >= CONNECT_ATTEMPT_TIMEOUT_MS) return current;
|
||||
net.setDefaultAutoSelectFamilyAttemptTimeout(CONNECT_ATTEMPT_TIMEOUT_MS);
|
||||
return CONNECT_ATTEMPT_TIMEOUT_MS;
|
||||
}
|
||||
Reference in New Issue
Block a user