@undefineds.co/xpod 0.4.20 → 0.4.25

package/dist/tunnel/TunnelDeclaredOrigin.js

@@ -0,0 +1,185 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readDeclaredIngressOrigin = readDeclaredIngressOrigin;
+exports.readCloudflareRemoteOrigin = readCloudflareRemoteOrigin;
+const node_child_process_1 = require("node:child_process");
+const LocalTunnelProvider_1 = require("./LocalTunnelProvider");
+const SakuraFrpTunnelProvider_1 = require("./SakuraFrpTunnelProvider");
+const TunnelClientResolver_1 = require("./TunnelClientResolver");
+const TunnelProviderCatalog_1 = require("./TunnelProviderCatalog");
+const DEFAULT_CLOUDFLARE_READ_TIMEOUT_MS = 20_000;
+/**
+ * Reads the origin the active profile's console declares, using that provider's own reader.
+ *
+ * A provider that owns the origin at runtime (`originOwner: 'runtime'`) has nothing to read:
+ * the port is ours to choose, and pretending otherwise would invent a console value.
+ */
+async function readDeclaredIngressOrigin(profile, options = {}) {
+    const provider = (0, TunnelProviderCatalog_1.parseTunnelProvider)(profile.provider);
+    const descriptor = (0, TunnelProviderCatalog_1.tunnelProviderDescriptor)(provider);
+    if (!provider || !descriptor) {
+        return { error: `profile ${profile.id} declares unknown provider ${profile.provider}` };
+    }
+    if (descriptor.originOwner !== 'console') {
+        return { error: `provider ${descriptor.id} chooses its own origin port, so it declares none` };
+    }
+    const env = options.env ?? process.env;
+    const token = (profile.credentialEnvKey ? env[profile.credentialEnvKey] : undefined)
+        ?? env[descriptor.legacyCredentialEnvKey];
+    if (!token?.trim()) {
+        return { error: `${descriptor.id} profile ${profile.id} has no credential configured` };
+    }
+    if (descriptor.id === 'sakura_frp') {
+        const readSakura = options.readSakura ?? SakuraFrpTunnelProvider_1.resolveSakuraAssignedLocalPort;
+        const port = await readSakura(token, {
+            ...(options.sakuraApiBaseUrl ? { apiBaseUrl: options.sakuraApiBaseUrl } : {}),
+            ...(options.fetchImpl ? { fetchImpl: options.fetchImpl } : {}),
+        });
+        if (port === undefined) {
+            return { error: 'the SakuraFrp console reported no local_port for this credential (GET /v4/tunnels)' };
+        }
+        return { origin: { port, readBack: 'sakura_frp:GET /v4/tunnels local_port' } };
+    }
+    if (descriptor.id === 'cloudflare') {
+        if (options.active === false) {
+            return {
+                error: 'the Cloudflare dashboard origin is only read back for the active profile '
+                    + '(reading it starts a connector, and an inactive profile must not start one)',
+            };
+        }
+        const readCloudflare = options.readCloudflare ?? readCloudflareRemoteOrigin;
+        const resolved = await readCloudflare(token, {
+            command: resolveCloudflaredCommand(options),
+            timeoutMs: options.timeoutMs ?? DEFAULT_CLOUDFLARE_READ_TIMEOUT_MS,
+            env,
+        });
+        if (!resolved.origin) {
+            return { error: resolved.error };
+        }
+        return { origin: resolved.origin };
+    }
+    return { error: `provider ${descriptor.id} has no console origin reader` };
+}
+function resolveCloudflaredCommand(options) {
+    try {
+        return (0, TunnelClientResolver_1.resolveTunnelClient)('cloudflare', {
+            ...(options.cloudflaredPath ? { explicitPath: options.cloudflaredPath } : {}),
+            ...(options.env ? { env: options.env } : {}),
+        }).command;
+    }
+    catch {
+        // A configured-but-missing path must surface through the spawn error path, which reuses
+        // the same `binary-missing:<provider>:<binary>` message the providers report.
+        return options.cloudflaredPath ?? 'cloudflared';
+    }
+}
+/**
+ * Reads the remote configuration of a named tunnel from the connector that fetches it.
+ *
+ * A named tunnel's ingress is stored at Cloudflare, and the connector token is not a
+ * Cloudflare API credential, so the only local read-back is what cloudflared itself echoes
+ * when it fetches that configuration. The parser is `readDashboardOrigin` — the same one
+ * `LocalTunnelProvider` uses for its `origin-mismatch` diagnostic — so the two cannot drift.
+ *
+ * The probe connector is short-lived and is always terminated; the runtime's real connector
+ * starts later, and a tunnel tolerates several connectors while it is up.
+ */
+async function readCloudflareRemoteOrigin(token, options) {
+    const spawnImpl = options.spawnImpl ?? node_child_process_1.spawn;
+    const timeoutMs = options.timeoutMs ?? DEFAULT_CLOUDFLARE_READ_TIMEOUT_MS;
+    const log = [];
+    return await new Promise((resolve) => {
+        let settled = false;
+        let child;
+        const finish = (result) => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            clearTimeout(timer);
+            terminate(child);
+            resolve({ ...result, log });
+        };
+        const timer = setTimeout(() => {
+            finish({
+                error: `cloudflared did not report the tunnel's remote configuration within ${timeoutMs}ms `
+                    + '(a locally-managed tunnel keeps its ingress in a config file, which is not read back)',
+            });
+        }, timeoutMs);
+        timer.unref?.();
+        try {
+            child = spawnImpl(options.command, [
+                'tunnel',
+                '--no-autoupdate',
+                '--protocol', 'http2',
+                'run',
+                '--token',
+                token,
+            ], {
+                stdio: ['ignore', 'pipe', 'pipe'],
+                env: options.env,
+            });
+        }
+        catch (error) {
+            finish({ error: `cloudflared could not be started: ${error.message}` });
+            return;
+        }
+        const consume = (chunk) => {
+            for (const line of chunk.toString().split('\n')) {
+                if (!line.includes('service')) {
+                    continue;
+                }
+                log.push(line.trim().slice(0, 400));
+                const declared = (0, LocalTunnelProvider_1.readDashboardOrigin)(line);
+                if (declared) {
+                    finish({
+                        origin: {
+                            port: declared.port,
+                            scheme: declared.scheme,
+                            readBack: 'cloudflare:connector remote-config',
+                        },
+                    });
+                    return;
+                }
+            }
+        };
+        child.stdout?.on('data', consume);
+        child.stderr?.on('data', consume);
+        child.once('error', (error) => {
+            finish({ error: describeCloudflaredFailure(options.command, error) });
+        });
+        child.once('exit', (code) => {
+            finish({
+                error: `cloudflared exited with code ${code} before reporting the tunnel's remote configuration`,
+            });
+        });
+    });
+}
+function describeCloudflaredFailure(command, error) {
+    const code = error.code;
+    if (code === 'ENOENT') {
+        return `binary-missing:cloudflare:${command} (cloudflared is not installed or not on PATH)`;
+    }
+    return `cloudflared could not be started: ${error.message}`;
+}
+function terminate(child) {
+    if (!child || child.exitCode !== null) {
+        return;
+    }
+    try {
+        child.kill('SIGTERM');
+    }
+    catch {
+        return;
+    }
+    const killTimer = setTimeout(() => {
+        try {
+            child.kill('SIGKILL');
+        }
+        catch {
+            // Already gone.
+        }
+    }, 2_000);
+    killTimer.unref?.();
+}
+//# sourceMappingURL=TunnelDeclaredOrigin.js.map

package/dist/tunnel/TunnelLifecycle.d.ts

@@ -10,5 +10,13 @@ import type { TunnelStage, TunnelStatus } from './TunnelProvider';
 export declare function createTunnelStatus(stage: TunnelStage, patch?: Partial<TunnelStatus>): TunnelStatus;
 /** Keeps the previous error visible while a provider transitions through a restart. */
 export declare function mergeTunnelError(previous: string | undefined, next: string | undefined): string | undefined;
-/** Recognizes a missing client binary, which is a deployment fact, not a network failure. */
+/**
+ * Recognizes a missing client binary, which is a deployment fact, not a network failure.
+ *
+ * The prefix stays `binary-missing:<provider>:<binary>` (callers and acceptance assert on it);
+ * `<provider>` is resolved to the catalog id first, so an implementation that calls itself
+ * `sakura-frp` cannot put a provider id into the message that no catalog lookup resolves.
+ * The install hint from the provider catalog is appended so an operator reading the failure
+ * knows what to install instead of having to search (audit N16).
+ */
 export declare function describeSpawnError(provider: string, binary: string, error: unknown): string;

package/dist/tunnel/TunnelLifecycle.js

@@ -1,8 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTunnelStatus = createTunnelStatus;
 exports.mergeTunnelError = mergeTunnelError;
 exports.describeSpawnError = describeSpawnError;
+const node_path_1 = __importDefault(require("node:path"));
+const TunnelClientResolver_1 = require("./TunnelClientResolver");
+const TunnelProviderCatalog_1 = require("./TunnelProviderCatalog");
 /**
  * Tunnel readiness is a sequence, not a boolean.
  *
@@ -23,12 +29,27 @@ function createTunnelStatus(stage, patch = {}) {
 function mergeTunnelError(previous, next) {
     return next ?? previous;
 }
-/** Recognizes a missing client binary, which is a deployment fact, not a network failure. */
+/**
+ * Recognizes a missing client binary, which is a deployment fact, not a network failure.
+ *
+ * The prefix stays `binary-missing:<provider>:<binary>` (callers and acceptance assert on it);
+ * `<provider>` is resolved to the catalog id first, so an implementation that calls itself
+ * `sakura-frp` cannot put a provider id into the message that no catalog lookup resolves.
+ * The install hint from the provider catalog is appended so an operator reading the failure
+ * knows what to install instead of having to search (audit N16).
+ */
 function describeSpawnError(provider, binary, error) {
     const code = typeof error === 'object' && error && 'code' in error ? String(error.code) : '';
+    // `spawn-failed` is a plain diagnostic, but its provider segment is normalized the same way
+    // so both families of message name the same provider.
+    const id = (0, TunnelProviderCatalog_1.canonicalTunnelProviderId)(provider) ?? provider;
     if (code === 'ENOENT') {
-        return `binary-missing:${provider}:${binary}`;
+        // The prefix stays `binary-missing:<provider>:<binary name>` because callers assert on it;
+        // when the command was an absolute path, which file was tried is appended for the operator.
+        const name = node_path_1.default.basename(binary);
+        const message = (0, TunnelClientResolver_1.describeTunnelClientMissing)(id, name);
+        return name === binary ? message : `${message} (tried: ${binary})`;
     }
-    return `spawn-failed:${provider}:${error?.message ?? String(error)}`;
+    return `spawn-failed:${id}:${error?.message ?? String(error)}`;
 }
 //# sourceMappingURL=TunnelLifecycle.js.map

package/dist/tunnel/TunnelProviderCatalog.d.ts

@@ -21,9 +21,32 @@ export interface TunnelProviderParameterField {
     key: string;
     label: string;
 }
+/**
+ * The local client this provider needs (audit N16).
+ *
+ * Declared here so there is one place that knows the executable name, how an operator points at
+ * a specific build, whether the artifact may ship the binary at all, and what to tell them when
+ * it is missing. Providers consume it instead of each keeping its own default string.
+ */
+export interface TunnelProviderClient {
+    /** Executable name; also the name reported in `binary-missing:<provider>:<binary>`. */
+    binary: string;
+    /** Env var that names an explicit path; highest precedence, and never silently ignored. */
+    envKey: string;
+    /** Where an operator can get it (shown next to a missing-binary failure). */
+    installHint: string;
+    /**
+     * Whether the release artifact may ship this binary. ngrok and the natfrp frpc fork are not
+     * ours to redistribute; cloudflared and upstream frpc are Apache-2.0 and could be bundled.
+     */
+    redistributable: boolean;
+    /** Upstream licence / redistribution note, for whoever changes that decision later. */
+    license: string;
+}
 export interface TunnelProviderDescriptor {
     id: TunnelProviderId;
     label: string;
+    client: TunnelProviderClient;
     /** Legacy provider-scoped credential key, still honoured for single-profile setups. */
     legacyCredentialEnvKey: string;
     /** Legacy env keys that used to declare this provider's public entry. */
@@ -52,6 +75,15 @@ export interface TunnelProviderDescriptor {
 export declare const TUNNEL_PROVIDERS: readonly TunnelProviderDescriptor[];
 /** Normalizes any stored/legacy spelling onto the canonical provider vocabulary. */
 export declare function parseTunnelProvider(value: unknown): ActiveTunnelProvider | undefined;
+/**
+ * The one spelling of a provider that may appear in machine-readable messages.
+ *
+ * Provider implementations and callers historically used their own hyphenated names
+ * (`sakura-frp`), which is how a failure detail ended up carrying a provider id that no
+ * catalog lookup could resolve. Anything that renders a provider into a message resolves it
+ * here first, so the catalog id is the only one that can reach an operator.
+ */
+export declare function canonicalTunnelProviderId(value: unknown): TunnelProviderId | undefined;
 export declare function isTunnelProviderId(value: unknown): value is TunnelProviderId;
 export declare function tunnelProviderDescriptor(id: unknown): TunnelProviderDescriptor | undefined;
 export declare function tunnelProviderIds(): TunnelProviderId[];

package/dist/tunnel/TunnelProviderCatalog.js

@@ -11,6 +11,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TUNNEL_PROFILE_CREDENTIAL_PREFIX = exports.TUNNEL_PROVIDERS = exports.TUNNEL_PROVIDER_IDS = void 0;
 exports.parseTunnelProvider = parseTunnelProvider;
+exports.canonicalTunnelProviderId = canonicalTunnelProviderId;
 exports.isTunnelProviderId = isTunnelProviderId;
 exports.tunnelProviderDescriptor = tunnelProviderDescriptor;
 exports.tunnelProviderIds = tunnelProviderIds;
@@ -32,6 +33,14 @@ exports.TUNNEL_PROVIDERS = [
     {
         id: 'ngrok',
         label: 'ngrok',
+        client: {
+            binary: 'ngrok',
+            envKey: 'NGROK_BIN',
+            installHint: 'install the ngrok agent and put it on PATH (or set NGROK_BIN)',
+            // ngrok's agent is proprietary: bundling it in our artifact needs their permission.
+            redistributable: false,
+            license: 'proprietary (ngrok terms of service)',
+        },
         legacyCredentialEnvKey: 'NGROK_AUTHTOKEN',
         legacyPublicUrlKeys: ['NGROK_URL'],
         endpointSource: 'discovered',
@@ -46,6 +55,13 @@ exports.TUNNEL_PROVIDERS = [
     {
         id: 'cloudflare',
         label: 'Cloudflare Tunnel',
+        client: {
+            binary: 'cloudflared',
+            envKey: 'CLOUDFLARED_BIN',
+            installHint: 'install cloudflared and put it on PATH (or set CLOUDFLARED_BIN)',
+            redistributable: true,
+            license: 'Apache-2.0',
+        },
         legacyCredentialEnvKey: 'CLOUDFLARE_TUNNEL_TOKEN',
         legacyPublicUrlKeys: ['CLOUDFLARE_TUNNEL_URL', 'XPOD_TUNNEL_PUBLIC_URL'],
         // The hostname is configured in the Cloudflare dashboard and cloudflared is only
@@ -61,6 +77,14 @@ exports.TUNNEL_PROVIDERS = [
     {
         id: 'sakura_frp',
         label: 'Sakura FRP',
+        client: {
+            binary: 'frpc',
+            envKey: 'FRPC_BIN',
+            // The official client is required: upstream frpc cannot express `-f <token>`.
+            installHint: 'install the natfrp client (its frpc accepts `-f <token>`) and put it on PATH',
+            redistributable: false,
+            license: 'natfrp fork (no published source; redistribution needs their permission)',
+        },
         legacyCredentialEnvKey: 'SAKURA_TUNNEL_TOKEN',
         legacyPublicUrlKeys: ['SAKURA_TUNNEL_URL', 'XPOD_TUNNEL_PUBLIC_URL'],
         // The console only asks for a node and a local port: the public entry (node host +
@@ -76,6 +100,13 @@ exports.TUNNEL_PROVIDERS = [
     {
         id: 'frp',
         label: 'FRP',
+        client: {
+            binary: 'frpc',
+            envKey: 'FRPC_BIN',
+            installHint: 'install upstream frpc and put it on PATH (or set FRPC_BIN)',
+            redistributable: true,
+            license: 'Apache-2.0',
+        },
         legacyCredentialEnvKey: 'FRP_TUNNEL_TOKEN',
         legacyPublicUrlKeys: ['FRP_TUNNEL_URL'],
         endpointSource: 'declared',
@@ -101,6 +132,18 @@ function parseTunnelProvider(value) {
     }
     return PROVIDER_ALIASES[value.trim().toLowerCase()];
 }
+/**
+ * The one spelling of a provider that may appear in machine-readable messages.
+ *
+ * Provider implementations and callers historically used their own hyphenated names
+ * (`sakura-frp`), which is how a failure detail ended up carrying a provider id that no
+ * catalog lookup could resolve. Anything that renders a provider into a message resolves it
+ * here first, so the catalog id is the only one that can reach an operator.
+ */
+function canonicalTunnelProviderId(value) {
+    const provider = parseTunnelProvider(value);
+    return provider && provider !== 'none' ? provider : undefined;
+}
 function isTunnelProviderId(value) {
     return parseTunnelProvider(value) !== undefined && parseTunnelProvider(value) !== 'none';
 }

package/dist/util/identifiers/ClusterIdentifierStrategy.d.ts

@@ -10,6 +10,7 @@ export interface ClusterIdentifierStrategyOptions {
      */
     allowedHosts?: string[] | string;
 }
+export declare const SERVER_ROOT_SEGMENTS: Set<string>;
 /**
  * Identifier strategy that accepts both the primary cluster host and any
  * node subdomain under the same base domain.

package/dist/util/identifiers/ClusterIdentifierStrategy.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ClusterIdentifierStrategy = void 0;
+exports.ClusterIdentifierStrategy = exports.SERVER_ROOT_SEGMENTS = void 0;
 const node_url_1 = require("node:url");
 const global_logger_factory_1 = require("global-logger-factory");
 const community_server_1 = require("@solid/community-server");
 const PathUtil_1 = require("@solid/community-server/dist/util/PathUtil");
-const SERVER_ROOT_SEGMENTS = new Set([
+exports.SERVER_ROOT_SEGMENTS = new Set([
     '.account',
     '.oidc',
     '.well-known',
@@ -104,7 +104,7 @@ class ClusterIdentifierStrategy extends community_server_1.BaseIdentifierStrateg
                 }
                 const relative = pathname.slice(basePath.length).replace(/^\/+/, '');
                 const segments = relative.split('/').filter(Boolean);
-                return segments.length === 1 && !SERVER_ROOT_SEGMENTS.has(segments[0].toLowerCase());
+                return segments.length === 1 && !exports.SERVER_ROOT_SEGMENTS.has(segments[0].toLowerCase());
             }
             return target.pathname === '/' || target.pathname === '';
         }

package/node_modules/@inrupt/solid-client-authn-core/dist/authenticatedFetch/dpopUtils.d.ts

@@ -12,5 +12,7 @@ export type KeyPair = {
  * @param dpopKey Key used to sign the token.
  * @returns A JWT that can be used as a DPoP Authorization header.
  */
-export declare function createDpopHeader(audience: string, method: string, dpopKey: KeyPair): Promise<string>;
+export declare function createDpopHeader(audience: string, method: string, dpopKey: KeyPair, accessToken?: string): Promise<string>;
 export declare function generateDpopKeyPair(): Promise<KeyPair>;
+
+// XPOD_INRUPT_RESOURCE_DPOP_ATH

package/node_modules/@inrupt/solid-client-authn-core/dist/index.js

@@ -1209,11 +1209,14 @@ function normalizeHTU(audience) {
  * @param dpopKey Key used to sign the token.
  * @returns A JWT that can be used as a DPoP Authorization header.
  */
-async function createDpopHeader(audience, method, dpopKey) {
+async function createDpopHeader(audience, method, dpopKey, accessToken) {
     return new jose.SignJWT({
         htu: normalizeHTU(audience),
         htm: method.toUpperCase(),
         jti: uuid.v4(),
+        ...(accessToken === undefined ? {} : { ath: jose.base64url.encode(
+            new Uint8Array(await globalThis.crypto.subtle.digest("SHA-256", new TextEncoder().encode(accessToken)))
+        ) }),
     })
         .setProtectedHeader({
         alg: PREFERRED_SIGNING_ALG[0],
@@ -1269,7 +1272,7 @@ async function buildDpopFetchOptions(targetUrl, authToken, dpopKey, defaultOptio
     const headers = new Headers(defaultOptions?.headers);
     // Any pre-existing Authorization header should be overriden.
     headers.set("Authorization", `DPoP ${authToken}`);
-    headers.set("DPoP", await createDpopHeader(targetUrl, defaultOptions?.method ?? "get", dpopKey));
+    headers.set("DPoP", await createDpopHeader(targetUrl, defaultOptions?.method ?? "get", dpopKey, authToken));
     return {
         ...defaultOptions,
         headers,
@@ -1324,6 +1327,12 @@ const computeRefreshDelay = (expiresIn) => {
  */
 function buildAuthenticatedFetch(accessToken, options) {
     let currentAccessToken = accessToken;
+    // XPOD_REFRESH_ON_REQUEST: use real expiry even when the proactive timer was suspended.
+    let accessTokenExpiresAt = Date.now() + (options?.expiresIn ?? DEFAULT_EXPIRATION_TIME_SECONDS) * 1000;
+    let refreshBeforeRequest;
+    let refreshInFlight;
+    let refreshTerminated = false;
+    let lastRefreshError;
     let latestTimeout;
     let refreshRetryAttempt = 0;
     const XPOD_REFRESH_RETRY_MAX_DELAY_MS = 60000;
@@ -1333,64 +1342,77 @@ function buildAuthenticatedFetch(accessToken, options) {
     // the first expiration date.
     if (currentRefreshOptions !== undefined) {
         const proactivelyRefreshToken = async () => {
-            try {
-                const { accessToken: refreshedAccessToken, refreshToken, expiresIn, } = await refreshAccessToken(currentRefreshOptions, 
-                // If currentRefreshOptions is defined, options is necessarily defined too.
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                options.dpopKey, 
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                options.eventEmitter);
-                // Update the tokens in the closure if appropriate.
-                currentAccessToken = refreshedAccessToken;
-                refreshRetryAttempt = 0;
-                if (refreshToken !== undefined) {
-                    currentRefreshOptions.refreshToken = refreshToken;
-                }
-                // Each time the access token is refreshed, we must plan for the next
-                // refresh iteration.
-                clearTimeout(latestTimeout);
-                latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(expiresIn) * 1000);
-                // If currentRefreshOptions is defined, options is necessarily defined too.
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                options.eventEmitter?.emit(EVENTS.TIMEOUT_SET, latestTimeout);
-            }
-            catch (e) {
-                // It is possible that an underlying library throws an error on refresh flow failure.
-                // If we used a log framework, the error could be logged at the `debug` level,
-                // but otherwise the failure of the refresh flow should not blow up in the user's
-                // face, so we just swallow the error.
-                const terminalProviderError = e instanceof OidcProviderError &&
-                    e.error !== "server_error" &&
-                    e.error !== "temporarily_unavailable";
-                if (terminalProviderError) {
-                    // The OIDC provider refused to refresh the access token and returned an error instead.
-                    /* istanbul ignore next 100% coverage would require testing that nothing
-                        happens here if the emitter is undefined, which is more cumbersome
-                        than what it's worth. */
-                    options?.eventEmitter?.emit(EVENTS.ERROR, e.error, e.errorDescription);
-                    /* istanbul ignore next 100% coverage would require testing that nothing
-                      happens here if the emitter is undefined, which is more cumbersome
-                      than what it's worth. */
-                    options?.eventEmitter?.emit(EVENTS.SESSION_EXPIRED);
-                }
-                const invalidTokenResponse = e instanceof InvalidResponseError &&
-                    e.missingFields.includes("access_token");
-                if (invalidTokenResponse) {
-                    // In this case, the OIDC provider returned a non-standard response, but
-                    // did not specify that it was an error. We cannot refresh nonetheless.
-                    /* istanbul ignore next 100% coverage would require testing that nothing
-                      happens here if the emitter is undefined, which is more cumbersome
-                      than what it's worth. */
-                    options?.eventEmitter?.emit(EVENTS.SESSION_EXPIRED);
-                }
-                if (!terminalProviderError && !invalidTokenResponse) {
-                    const retryDelay = Math.min(1000 * 2 ** refreshRetryAttempt, XPOD_REFRESH_RETRY_MAX_DELAY_MS);
-                    refreshRetryAttempt += 1;
+            if (refreshTerminated) return false;
+            if (refreshInFlight) return refreshInFlight;
+            refreshInFlight = (async () => {
+                try {
+                    const { accessToken: refreshedAccessToken, refreshToken, expiresIn, } = await refreshAccessToken(currentRefreshOptions, 
+                    // If currentRefreshOptions is defined, options is necessarily defined too.
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    options.dpopKey, 
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    options.eventEmitter);
+                    // Update the tokens in the closure if appropriate.
+                    currentAccessToken = refreshedAccessToken;
+                    accessTokenExpiresAt = Date.now() + (expiresIn ?? DEFAULT_EXPIRATION_TIME_SECONDS) * 1000;
+                    refreshRetryAttempt = 0;
+                    if (refreshToken !== undefined) {
+                        currentRefreshOptions.refreshToken = refreshToken;
+                    }
+                    // Each time the access token is refreshed, we must plan for the next
+                    // refresh iteration.
                     clearTimeout(latestTimeout);
-                    latestTimeout = setTimeout(proactivelyRefreshToken, retryDelay);
-                    options?.eventEmitter?.emit(EVENTS.TIMEOUT_SET, latestTimeout);
+                    latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(expiresIn) * 1000);
+                    // If currentRefreshOptions is defined, options is necessarily defined too.
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                    options.eventEmitter?.emit(EVENTS.TIMEOUT_SET, latestTimeout);
+                    return true;
                 }
-            }
+                catch (e) {
+                    lastRefreshError = e;
+                    // It is possible that an underlying library throws an error on refresh flow failure.
+                    // If we used a log framework, the error could be logged at the `debug` level,
+                    // but otherwise the failure of the refresh flow should not blow up in the user's
+                    // face, so we just swallow the error.
+                    const terminalProviderError = e instanceof OidcProviderError &&
+                        e.error !== "server_error" &&
+                        e.error !== "temporarily_unavailable";
+                    if (terminalProviderError) {
+                        // The OIDC provider refused to refresh the access token and returned an error instead.
+                        /* istanbul ignore next 100% coverage would require testing that nothing
+                            happens here if the emitter is undefined, which is more cumbersome
+                            than what it's worth. */
+                        options?.eventEmitter?.emit(EVENTS.ERROR, e.error, e.errorDescription);
+                        /* istanbul ignore next 100% coverage would require testing that nothing
+                          happens here if the emitter is undefined, which is more cumbersome
+                          than what it's worth. */
+                        options?.eventEmitter?.emit(EVENTS.SESSION_EXPIRED);
+                    }
+                    const invalidTokenResponse = e instanceof InvalidResponseError &&
+                        e.missingFields.includes("access_token");
+                    if (invalidTokenResponse) {
+                        // In this case, the OIDC provider returned a non-standard response, but
+                        // did not specify that it was an error. We cannot refresh nonetheless.
+                        /* istanbul ignore next 100% coverage would require testing that nothing
+                          happens here if the emitter is undefined, which is more cumbersome
+                          than what it's worth. */
+                        options?.eventEmitter?.emit(EVENTS.SESSION_EXPIRED);
+                    }
+                    refreshTerminated = terminalProviderError || invalidTokenResponse;
+                    if (!terminalProviderError && !invalidTokenResponse) {
+                        const retryDelay = Math.min(1000 * 2 ** refreshRetryAttempt, XPOD_REFRESH_RETRY_MAX_DELAY_MS);
+                        refreshRetryAttempt += 1;
+                        clearTimeout(latestTimeout);
+                        latestTimeout = setTimeout(proactivelyRefreshToken, retryDelay);
+                        options?.eventEmitter?.emit(EVENTS.TIMEOUT_SET, latestTimeout);
+                    }
+                    return false;
+                }
+            })().finally(() => { refreshInFlight = undefined; });
+            return refreshInFlight;
+        };
+        refreshBeforeRequest = async () => {
+            if (!await proactivelyRefreshToken()) throw lastRefreshError;
         };
         latestTimeout = setTimeout(proactivelyRefreshToken, 
         // If currentRefreshOptions is defined, options is necessarily defined too.
@@ -1411,6 +1433,9 @@ function buildAuthenticatedFetch(accessToken, options) {
         options.eventEmitter.emit(EVENTS.TIMEOUT_SET, expirationTimeout);
     }
     return async (url, requestInit) => {
+        if (refreshBeforeRequest && Date.now() >= accessTokenExpiresAt) {
+            await refreshBeforeRequest();
+        }
         let response = await makeAuthenticatedRequest(currentAccessToken, url, requestInit, options?.dpopKey, options?.fetch);
         const failedButNotExpectedAuthError = !response.ok && !isExpectedAuthError(response.status);
         if (response.ok || failedButNotExpectedAuthError) {
@@ -1543,3 +1568,5 @@ exports.normalizeScopes = normalizeScopes;
 exports.removeOpenIdParams = removeOpenIdParams;
 exports.saveSessionInfoToStorage = saveSessionInfoToStorage;
 //# sourceMappingURL=index.js.map
+
+// XPOD_INRUPT_RESOURCE_DPOP_ATH