@devbie/fewbie-cli 1.4.5 → 1.4.6
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/dist/commands/create.d.ts +1 -1
- package/dist/commands/create.js +1 -1
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/modules/apply.js +4 -1
- package/dist/commands/modules/apply.js.map +1 -1
- package/dist/commands/template/update.js +1 -0
- package/dist/commands/template/update.js.map +1 -1
- package/dist/registry/api-client/item.json +1 -1
- package/package.json +1 -1
|
@@ -12,5 +12,5 @@ export interface ResolvedTemplate {
|
|
|
12
12
|
source: string;
|
|
13
13
|
cleanup?: () => Promise<void>;
|
|
14
14
|
}
|
|
15
|
-
export declare function resolveTemplate(options: Pick<CreateOptions, "templatePath" | "templateRef">): Promise<ResolvedTemplate>;
|
|
15
|
+
export declare function resolveTemplate(options: Pick<CreateOptions, "templatePath" | "templateRef" | "cwd">): Promise<ResolvedTemplate>;
|
|
16
16
|
export declare function runCreate(options: CreateOptions): Promise<void>;
|
package/dist/commands/create.js
CHANGED
|
@@ -19,7 +19,7 @@ const COPY_IGNORE = new Set(["node_modules", ".next", "dist", ".git", ".env"]);
|
|
|
19
19
|
async function resolveTemplate(options) {
|
|
20
20
|
const explicit = options.templatePath ?? process.env[exports.TEMPLATE_PATH_ENV];
|
|
21
21
|
if (explicit) {
|
|
22
|
-
const root = node_path_1.default.resolve(explicit);
|
|
22
|
+
const root = node_path_1.default.resolve(options.cwd ?? process.cwd(), explicit);
|
|
23
23
|
await promises_1.default.access(node_path_1.default.join(root, "package.json"));
|
|
24
24
|
return { root, source: root };
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":";;;;;;AAqCA,
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/commands/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -107,8 +107,11 @@ async function applyModuleSelection(options) {
|
|
|
107
107
|
}
|
|
108
108
|
if (currentTargets.has(file.target))
|
|
109
109
|
continue;
|
|
110
|
+
const content = await (0, store_1.readItemFileContent)(file);
|
|
111
|
+
if ((await (0, cli_kit_1.readTextIfExists)(node_path_1.default.join(projectRoot, file.target))) === content)
|
|
112
|
+
continue;
|
|
110
113
|
if (options.force) {
|
|
111
|
-
writes.push({ target: file.target, content
|
|
114
|
+
writes.push({ target: file.target, content });
|
|
112
115
|
}
|
|
113
116
|
else {
|
|
114
117
|
conflicts.push(file.target);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/commands/modules/apply.ts"],"names":[],"mappings":";;;;;AAmCA,4BAwCC;AAkFD,
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/commands/modules/apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,6 +93,7 @@ async function runTemplateUpdate(options) {
|
|
|
93
93
|
const template = await (0, create_1.resolveTemplate)({
|
|
94
94
|
templatePath: options.templatePath,
|
|
95
95
|
templateRef: options.templateRef,
|
|
96
|
+
cwd: projectRoot,
|
|
96
97
|
});
|
|
97
98
|
try {
|
|
98
99
|
console.info((0, colorette_1.cyan)(`Template source: ${template.source}`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/template/update.ts"],"names":[],"mappings":";;;;;AAsIA,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../src/commands/template/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"files": [
|
|
12
12
|
{
|
|
13
13
|
"path": "src/lib/api-client.ts",
|
|
14
|
-
"content": "import axios, { type AxiosRequestConfig, type AxiosResponse, type InternalAxiosRequestConfig } from \"axios\";\n\n// ---------------------------------------------------------------------------\n// Project-specific configuration — edit these for your backend contract.\n// ---------------------------------------------------------------------------\n\n/** Base URL of the API; same-origin by default. */\nconst BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL ?? \"\";\n\n/** localStorage key of the short-lived access token. */\nconst ACCESS_TOKEN_KEY = \"access-token\";\n\n/** localStorage key of the access-token expiry epoch in milliseconds. */\nconst ACCESS_TOKEN_EXPIRES_AT_KEY = \"access-token-expires-at\";\n\n/** Endpoint that exchanges the httpOnly refresh cookie for a new access token. */\nconst REFRESH_PATH = \"/auth/refresh-access-token\";\n\n/** Paths that must never trigger a silent refresh (would recurse). */\nconst AUTH_PATH_PATTERN = /^\\/auth\\//;\n\n/** Cross-tab Web Lock that serializes refresh calls (see ADR-001). */\nconst REFRESH_LOCK_NAME = \"refresh-token\";\n\n/** Refresh this early so business requests never carry an expired token. */\nconst PROACTIVE_REFRESH_LEAD_MS = 60_000;\n\n/** How often the proactive scheduler checks expiry. */\nconst PROACTIVE_REFRESH_CHECK_INTERVAL_MS = 30_000;\n\n/**\n * Pause before retrying a failed refresh. When another tab rotates the\n * refresh cookie, the Set-Cookie reaches this tab a moment later; the retry\n * then carries the renewed cookie.\n */\nconst REFRESH_RETRY_DELAY_MS = 1_500;\n\n// ---------------------------------------------------------------------------\n// Response envelope (newbie backend contract)\n// ---------------------------------------------------------------------------\n\n/**\n * Standard JSON envelope: success is `{ code: 0, error: null, data }` and\n * failure is a non-2xx status with `{ code, error: { message }, data: null }`.\n */\nexport interface ApiEnvelope<T = unknown> {\n data?: T;\n code?: number;\n error?: { message?: string; description?: string } | null;\n}\n\n/** Whether a response body is a newbie envelope rather than a raw payload. */\nfunction isEnvelope(body: unknown): body is ApiEnvelope {\n if (body === null || typeof body !== \"object\") return false;\n if (Array.isArray(body)) return false;\n const record = body as Record<string, unknown>;\n // Every envelope carries both markers; a domain object that happens to\n // have a `data` field alone is not unwrapped.\n return \"code\" in record && \"data\" in record;\n}\n\n// ---------------------------------------------------------------------------\n// Token storage\n// ---------------------------------------------------------------------------\n\nexport function getAccessToken(): string {\n if (typeof window === \"undefined\") return \"\";\n return window.localStorage.getItem(ACCESS_TOKEN_KEY) ?? \"\";\n}\n\n/** Persist token + expiry after login or refresh. */\nexport function setSession(token: string, expiresInSeconds?: number): void {\n if (typeof window === \"undefined\") return;\n window.localStorage.setItem(ACCESS_TOKEN_KEY, token);\n if (typeof expiresInSeconds === \"number\" && expiresInSeconds > 0) {\n window.localStorage.setItem(ACCESS_TOKEN_EXPIRES_AT_KEY, String(Date.now() + expiresInSeconds * 1000));\n }\n}\n\n/** Remove all locally stored session data. */\nexport function clearSession(): void {\n if (typeof window === \"undefined\") return;\n window.localStorage.removeItem(ACCESS_TOKEN_KEY);\n window.localStorage.removeItem(ACCESS_TOKEN_EXPIRES_AT_KEY);\n}\n\n/** Normalized error so callers never depend on the axios error shape. */\nexport class ApiError extends Error {\n readonly status: number;\n readonly code?: number;\n readonly data: unknown;\n\n constructor(message: string, status: number, data?: unknown, code?: number) {\n super(message);\n this.name = \"ApiError\";\n this.status = status;\n this.code = code;\n this.data = data;\n }\n}\n\n/**\n * Hook invoked when the refresh cookie is missing/expired. Wire it to your\n * router (e.g. redirect to the login page); the client itself stays\n * router-agnostic.\n */\nlet sessionExpiredHandler: (() => void) | null = null;\nexport function onSessionExpired(handler: () => void): void {\n sessionExpiredHandler = handler;\n}\n\n/**\n * Hook invoked exactly once per failed request, after any 401 refresh/replay\n * attempt has been exhausted. Wire it to your toast layer; the client itself\n * never imports a UI library.\n */\nlet errorHandler: ((error: ApiError) => void) | null = null;\nexport function onError(handler: (error: ApiError) => void): void {\n errorHandler = handler;\n}\n\n// ---------------------------------------------------------------------------\n// Refresh-token rotation\n// ---------------------------------------------------------------------------\n\nfunction isUnauthorized(error: unknown): boolean {\n return axios.isAxiosError(error) && error.response?.status === 401;\n}\n\n/**\n * Whether the access token is still due for a refresh. After acquiring the\n * cross-tab lock, another tab may have already refreshed while we waited;\n * this check lets us skip the network call and reuse the new token.\n */\nfunction isRefreshStillDue(): boolean {\n const expiresAt = Number(window.localStorage.getItem(ACCESS_TOKEN_EXPIRES_AT_KEY) ?? 0);\n if (!expiresAt) return true;\n return Date.now() >= expiresAt - PROACTIVE_REFRESH_LEAD_MS;\n}\n\n/** One refresh round-trip; persists the renewed token and its expiry. */\nasync function requestRefreshOnce(): Promise<string | null> {\n const response = await axios.get(`${BASE_URL}${REFRESH_PATH}`, {\n withCredentials: true,\n });\n const body = response.data as ApiEnvelope<{\n token?: string;\n tokenExpiresInSeconds?: number;\n }>;\n const token = body?.data?.token ?? \"\";\n if (!token) return null;\n setSession(token, body.data?.tokenExpiresInSeconds);\n return token;\n}\n\n/** Send the refresh request with one retry on 401 (cross-tab cookie race). */\nasync function requestRefreshWithRetry(): Promise<string | null> {\n try {\n return await requestRefreshOnce();\n } catch (firstError) {\n if (isUnauthorized(firstError)) {\n // Possible cross-tab rotation race: retry once with the renewed cookie.\n await new Promise((resolve) => setTimeout(resolve, REFRESH_RETRY_DELAY_MS));\n try {\n return await requestRefreshOnce();\n } catch {\n return null;\n }\n }\n // Network or other non-auth failure: nothing a retry can fix.\n return null;\n }\n}\n\n// Shared in-flight refresh. The backend rotates the refresh cookie on every\n// call, so concurrent 401s must await the same request instead of issuing\n// parallel refreshes that invalidate each other's cookie.\nlet refreshPromise: Promise<string | null> | null = null;\n\n/**\n * Exchange the httpOnly refresh cookie for a new access token.\n *\n * Two layers of dedup prevent concurrent refresh calls that would trigger\n * the backend's refresh-token-reuse detection and revoke the session:\n * 1. Single-tab: module-level refreshPromise — concurrent 401s in this tab\n * reuse the same promise.\n * 2. Cross-tab: Web Locks (navigator.locks) serialize refreshes across tabs.\n * After acquiring the lock, re-check whether refresh is still needed.\n * Pass force=true from the 401 reactive path: a 401 proves the token is\n * invalid regardless of the stored expiry, so the lock-time re-check must\n * not short-circuit. Environments without Web Locks fall back to the\n * single-flight + retry mitigation.\n */\nfunction refreshAccessToken(force = false): Promise<string | null> {\n if (refreshPromise) return refreshPromise;\n\n refreshPromise = (async () => {\n try {\n if (typeof navigator !== \"undefined\" && navigator.locks) {\n return await navigator.locks.request(REFRESH_LOCK_NAME, async () => {\n if (!force && !isRefreshStillDue()) return getAccessToken();\n return requestRefreshWithRetry();\n });\n }\n return requestRefreshWithRetry();\n } finally {\n refreshPromise = null;\n }\n })();\n\n return refreshPromise;\n}\n\n// ---------------------------------------------------------------------------\n// Proactive refresh scheduler (module-level singleton)\n// ---------------------------------------------------------------------------\n\nlet schedulerTimer: ReturnType<typeof setInterval> | null = null;\n\n/**\n * Start the scheduler that renews the token shortly before expiry. Call once\n * on the client (e.g. in the authenticated layout). Reactive 401 refresh\n * stays as a fallback for laptop sleep / scheduler drift.\n */\nexport function initProactiveTokenRefresh(): void {\n if (typeof window === \"undefined\" || schedulerTimer) return;\n\n const refreshIfDue = (): void => {\n const token = getAccessToken();\n const expiresAt = Number(window.localStorage.getItem(ACCESS_TOKEN_EXPIRES_AT_KEY) ?? 0);\n if (token && expiresAt && Date.now() >= expiresAt - PROACTIVE_REFRESH_LEAD_MS) {\n void refreshAccessToken();\n }\n };\n\n // Run immediately (tabs reopened after sleep) and then on an interval.\n refreshIfDue();\n schedulerTimer = setInterval(refreshIfDue, PROACTIVE_REFRESH_CHECK_INTERVAL_MS);\n}\n\n// ---------------------------------------------------------------------------\n// Error normalization (the single failure channel)\n// ---------------------------------------------------------------------------\n\n/** Map any thrown value to the normalized ApiError shape. */\nfunction toApiError(error: unknown): ApiError {\n if (error instanceof ApiError) return error;\n if (axios.isAxiosError(error)) {\n const body = error.response?.data as ApiEnvelope | undefined;\n return new ApiError(\n body?.error?.message ?? error.message,\n error.response?.status ?? 0,\n body ?? error.response?.data,\n body?.code,\n );\n }\n if (error instanceof Error) return new ApiError(error.message, 0);\n return new ApiError(\"Request failed\", 0);\n}\n\n// ---------------------------------------------------------------------------\n// Axios instance\n// ---------------------------------------------------------------------------\n\nexport const api = axios.create({\n baseURL: BASE_URL,\n withCredentials: true,\n});\n\napi.interceptors.request.use((config) => {\n const token = getAccessToken();\n // Within the interceptor chain headers is always an AxiosHeaders instance.\n if (token) {\n config.headers.set(\"Authorization\", `Bearer ${token}`);\n }\n return config;\n});\n\n// Success channel: only unwrap the envelope; failures never arrive here\n// (they carry non-2xx status — see newbie ADR-001).\napi.interceptors.response.use(\n (response) => {\n if (isEnvelope(response.data)) {\n return { ...response, data: response.data.data };\n }\n return response;\n },\n async (error) => {\n const original = error?.config as (InternalAxiosRequestConfig & { _retriedAfterRefresh?: boolean }) | undefined;\n const url: string = original?.url ?? \"\";\n const canSilentlyRefresh =\n typeof window !== \"undefined\" && !original?._retriedAfterRefresh && !AUTH_PATH_PATTERN.test(url);\n\n if (isUnauthorized(error) && original && canSilentlyRefresh) {\n original._retriedAfterRefresh = true;\n const renewed = await refreshAccessToken(true);\n if (renewed) {\n original.headers.set(\"Authorization\", `Bearer ${renewed}`);\n // Replay goes through the same interceptor chain; its outcome is\n // returned directly so this failure never reaches the handler.\n return api(original);\n }\n // Refresh cookie missing or expired: the session is over.\n clearSession();\n sessionExpiredHandler?.();\n }\n\n // Single exit for every final failure: normalize once, notify once.\n const normalized = toApiError(error);\n errorHandler?.(normalized);\n throw normalized;\n },\n);\n\n// ---------------------------------------------------------------------------\n// Typed convenience methods — resolve to the unwrapped response body.\n// ---------------------------------------------------------------------------\n\nexport const apiClient = {\n get<T>(url: string, config?: AxiosRequestConfig): Promise<T> {\n return api.get<unknown, AxiosResponse<T>>(url, config).then((r) => r.data);\n },\n post<T>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T> {\n return api.post<unknown, AxiosResponse<T>>(url, data, config).then((r) => r.data);\n },\n put<T>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T> {\n return api.put<unknown, AxiosResponse<T>>(url, data, config).then((r) => r.data);\n },\n patch<T>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T> {\n return api.patch<unknown, AxiosResponse<T>>(url, data, config).then((r) => r.data);\n },\n delete<T>(url: string, config?: AxiosRequestConfig): Promise<T> {\n return api.delete<unknown, AxiosResponse<T>>(url, config).then((r) => r.data);\n },\n // HEAD/OPTIONS responses carry no body; resolve to the full AxiosResponse\n // so callers can still inspect status and headers.\n head<T>(url: string, config?: AxiosRequestConfig): Promise<AxiosResponse<T>> {\n return api.head<unknown, AxiosResponse<T>>(url, config);\n },\n options<T>(url: string, config?: AxiosRequestConfig): Promise<AxiosResponse<T>> {\n return api.options<unknown, AxiosResponse<T>>(url, config);\n },\n};\n",
|
|
14
|
+
"content": "import axios, { type AxiosRequestConfig, type AxiosResponse, type InternalAxiosRequestConfig } from \"axios\";\n\n/**\n * Per-request opt-out for the framework's default error toast.\n *\n * By default every failed request surfaces the backend error via the\n * `onError` hook (currently wired to `toast.error` in request.ts). Set\n * `enabledDefaultErrorToast: false` when the caller renders its own richer\n * error UX (a confirm dialog, an inline form error, ...) so the same\n * failure is not surfaced twice. Defaults to true for backward safety.\n */\ndeclare module \"axios\" {\n interface AxiosRequestConfig {\n enabledDefaultErrorToast?: boolean;\n }\n}\n\n// ---------------------------------------------------------------------------\n// Project-specific configuration — edit these for your backend contract.\n// ---------------------------------------------------------------------------\n\n/** Base URL of the API; same-origin by default. */\nconst BASE_URL = process.env.NEXT_PUBLIC_API_BASE_URL ?? \"\";\n\n/** localStorage key of the short-lived access token. */\nconst ACCESS_TOKEN_KEY = \"access-token\";\n\n/** localStorage key of the access-token expiry epoch in milliseconds. */\nconst ACCESS_TOKEN_EXPIRES_AT_KEY = \"access-token-expires-at\";\n\n/** Endpoint that exchanges the httpOnly refresh cookie for a new access token. */\nconst REFRESH_PATH = \"/auth/refresh-access-token\";\n\n/** Paths that must never trigger a silent refresh (would recurse). */\nconst AUTH_PATH_PATTERN = /^\\/auth\\//;\n\n/**\n * Hard ceiling for every API request, including the refresh exchange. Without\n * it a hung request (or a refresh that never settles) keeps `refreshPromise`\n * locked forever and every later 401 waits on it (R5-P2-13).\n */\nconst API_TIMEOUT_MS = 15_000;\n\n/** Cross-tab Web Lock that serializes refresh calls (see ADR-001). */\nconst REFRESH_LOCK_NAME = \"refresh-token\";\n\n/** Refresh this early so business requests never carry an expired token. */\nconst PROACTIVE_REFRESH_LEAD_MS = 60_000;\n\n/** How often the proactive scheduler checks expiry. */\nconst PROACTIVE_REFRESH_CHECK_INTERVAL_MS = 30_000;\n\n/**\n * Pause before retrying a failed refresh. When another tab rotates the\n * refresh cookie, the Set-Cookie reaches this tab a moment later; the retry\n * then carries the renewed cookie.\n */\nconst REFRESH_RETRY_DELAY_MS = 1_500;\n\n// ---------------------------------------------------------------------------\n// Response envelope (newbie backend contract)\n// ---------------------------------------------------------------------------\n\n/**\n * Standard JSON envelope: success is `{ code: 0, error: null, data }` and\n * failure is a non-2xx status with `{ code, error: { message }, data: null }`.\n */\nexport interface ApiEnvelope<T = unknown> {\n data?: T;\n code?: number;\n error?: { message?: string; description?: string } | null;\n}\n\n/** Whether a response body is a newbie envelope rather than a raw payload. */\nfunction isEnvelope(body: unknown): body is ApiEnvelope {\n if (body === null || typeof body !== \"object\") return false;\n if (Array.isArray(body)) return false;\n const record = body as Record<string, unknown>;\n // Every envelope carries both markers; a domain object that happens to\n // have a `data` field alone is not unwrapped.\n return \"code\" in record && \"data\" in record;\n}\n\n// ---------------------------------------------------------------------------\n// Token storage\n// ---------------------------------------------------------------------------\n\nexport function getAccessToken(): string {\n if (typeof window === \"undefined\") return \"\";\n return window.localStorage.getItem(ACCESS_TOKEN_KEY) ?? \"\";\n}\n\n/** Persist token + expiry after login or refresh. */\nexport function setSession(token: string, expiresInSeconds?: number): void {\n if (typeof window === \"undefined\") return;\n window.localStorage.setItem(ACCESS_TOKEN_KEY, token);\n // A fresh session re-arms the session-expired notification (R22-06).\n sessionExpiredNotified = false;\n if (typeof expiresInSeconds === \"number\" && expiresInSeconds > 0) {\n window.localStorage.setItem(ACCESS_TOKEN_EXPIRES_AT_KEY, String(Date.now() + expiresInSeconds * 1000));\n }\n}\n\n/** Remove all locally stored session data. */\nexport function clearSession(): void {\n if (typeof window === \"undefined\") return;\n window.localStorage.removeItem(ACCESS_TOKEN_KEY);\n window.localStorage.removeItem(ACCESS_TOKEN_EXPIRES_AT_KEY);\n}\n\n// Fires at most once per session: after the first notification the user is on\n// their way to the login page, so repeat calls (concurrent 401s, or the SSE\n// and axios paths racing) must not stack redirects (R22-06). setSession()\n// re-arms it.\nlet sessionExpiredNotified = false;\n\n/**\n * Fire the session-expired handler directly. Used by non-axios transports\n * (raw fetch for SSE streams) that can't go through the response interceptor\n * but still need the same \"refresh cookie gone → bounce to login\" path.\n */\nexport function triggerSessionExpired(): void {\n if (sessionExpiredNotified) return;\n sessionExpiredNotified = true;\n sessionExpiredHandler?.();\n}\n\n/** Normalized error so callers never depend on the axios error shape. */\nexport class ApiError extends Error {\n readonly status: number;\n readonly code?: number;\n readonly data: unknown;\n\n constructor(message: string, status: number, data?: unknown, code?: number) {\n super(message);\n this.name = \"ApiError\";\n this.status = status;\n this.code = code;\n this.data = data;\n }\n}\n\n/**\n * Hook invoked when the refresh cookie is missing/expired. Wire it to your\n * router (e.g. redirect to the login page); the client itself stays\n * router-agnostic.\n */\nlet sessionExpiredHandler: (() => void) | null = null;\nexport function onSessionExpired(handler: () => void): void {\n sessionExpiredHandler = handler;\n}\n\n/**\n * Hook invoked exactly once per failed request, after any 401 refresh/replay\n * attempt has been exhausted. Wire it to your toast layer; the client itself\n * never imports a UI library.\n */\nlet errorHandler: ((error: ApiError) => void) | null = null;\nexport function onError(handler: (error: ApiError) => void): void {\n errorHandler = handler;\n}\n\n// ---------------------------------------------------------------------------\n// Refresh-token rotation\n// ---------------------------------------------------------------------------\n\nfunction isUnauthorized(error: unknown): boolean {\n return axios.isAxiosError(error) && error.response?.status === 401;\n}\n\n/**\n * Whether the access token is still due for a refresh. After acquiring the\n * cross-tab lock, another tab may have already refreshed while we waited;\n * this check lets us skip the network call and reuse the new token.\n */\nfunction isRefreshStillDue(): boolean {\n const expiresAt = Number(window.localStorage.getItem(ACCESS_TOKEN_EXPIRES_AT_KEY) ?? 0);\n if (!expiresAt) return true;\n return Date.now() >= expiresAt - PROACTIVE_REFRESH_LEAD_MS;\n}\n\n/** One refresh round-trip; persists the renewed token and its expiry. */\nasync function requestRefreshOnce(): Promise<string | null> {\n const response = await axios.get(`${BASE_URL}${REFRESH_PATH}`, {\n withCredentials: true,\n timeout: API_TIMEOUT_MS,\n });\n const body = response.data as ApiEnvelope<{\n token?: string;\n tokenExpiresInSeconds?: number;\n }>;\n const token = body?.data?.token ?? \"\";\n if (!token) return null;\n setSession(token, body.data?.tokenExpiresInSeconds);\n return token;\n}\n\n/**\n * Outcome of one refresh attempt: the renewed token plus whether the session\n * is definitively over.\n */\nexport interface RefreshOutcome {\n token: string | null;\n /**\n * True only when the server rejected the refresh exchange (401/400) or a 2xx\n * response carried no token — i.e. the refresh credential is dead. Network\n * errors and 5xx are transient: the session must be kept and the caller\n * surfaces the original failure instead of forcing a logout (R22-05).\n */\n sessionOver: boolean;\n}\n\n/** Send the refresh request with one retry on 401 (cross-tab cookie race). */\nasync function requestRefreshWithRetry(): Promise<RefreshOutcome> {\n const classify = (error: unknown): RefreshOutcome =>\n // Only an auth rejection proves the cookie is dead; anything else\n // (offline, timeout, 5xx) is transient and must not end the session.\n axios.isAxiosError(error) && (error.response?.status === 401 || error.response?.status === 400)\n ? { token: null, sessionOver: true }\n : { token: null, sessionOver: false };\n try {\n const token = await requestRefreshOnce();\n return { token, sessionOver: token === null };\n } catch (firstError) {\n if (isUnauthorized(firstError)) {\n // Possible cross-tab rotation race: retry once with the renewed cookie.\n await new Promise((resolve) => setTimeout(resolve, REFRESH_RETRY_DELAY_MS));\n try {\n const token = await requestRefreshOnce();\n return { token, sessionOver: token === null };\n } catch (secondError) {\n return classify(secondError);\n }\n }\n // Network or other non-auth failure: nothing a retry can fix.\n return classify(firstError);\n }\n}\n\n// Shared in-flight refresh. The backend rotates the refresh cookie on every\n// call, so concurrent 401s must await the same request instead of issuing\n// parallel refreshes that invalidate each other's cookie.\nlet refreshPromise: Promise<RefreshOutcome> | null = null;\n/** Whether the in-flight refresh was started with force=true (R20-12). */\nlet refreshPromiseForced = false;\n\n/**\n * Exchange the httpOnly refresh cookie for a new access token.\n *\n * Two layers of dedup prevent concurrent refresh calls that would trigger\n * the backend's refresh-token-reuse detection and revoke the session:\n * 1. Single-tab: module-level refreshPromise — concurrent 401s in this tab\n * reuse the same promise.\n * 2. Cross-tab: Web Locks (navigator.locks) serialize refreshes across tabs.\n * After acquiring the lock, re-check whether refresh is still needed.\n * Pass force=true from the 401 reactive path: a 401 proves the token is\n * invalid regardless of the stored expiry, so the lock-time re-check must\n * not short-circuit. A forced caller must not ride a non-forced in-flight\n * refresh either — that promise may resolve through the not-due shortcut\n * with a token the server already rejects — so it chains a forced refresh\n * after the in-flight one instead (R20-12). Environments without Web Locks\n * fall back to the single-flight + retry mitigation.\n *\n * Exported so non-axios transports (raw fetch for SSE streams) can also\n * participate in the 401 silent-refresh chain. The outcome distinguishes a\n * dead refresh credential (`sessionOver`) from a transient failure, so\n * callers only end the session on the former (R22-05).\n */\nexport function refreshAccessToken(force = false): Promise<RefreshOutcome> {\n if (refreshPromise) {\n if (!force || refreshPromiseForced) return refreshPromise;\n return refreshPromise.then((outcome) => (outcome.sessionOver ? outcome : refreshAccessToken(true)));\n }\n\n refreshPromiseForced = force;\n refreshPromise = (async (): Promise<RefreshOutcome> => {\n try {\n if (typeof navigator !== \"undefined\" && navigator.locks) {\n return await navigator.locks.request(REFRESH_LOCK_NAME, async () => {\n if (!force && !isRefreshStillDue()) return { token: getAccessToken(), sessionOver: false };\n return requestRefreshWithRetry();\n });\n }\n // The await matters: without it the finally below runs at construction\n // time and refreshPromise would keep the settled outcome forever, so\n // no-locks environments could never refresh again (R20-12).\n return await requestRefreshWithRetry();\n } finally {\n refreshPromise = null;\n refreshPromiseForced = false;\n }\n })();\n\n return refreshPromise;\n}\n\n/**\n * Shared 401 handling for non-axios transports (raw fetch for SSE streams):\n * force a silent refresh and replay once with the renewed token. The session\n * ends only when the refresh credential is dead; a transient refresh failure\n * keeps the session and hands the original 401 back to the caller (R22-05,\n * R23-06).\n */\nexport async function replayOnUnauthorized(\n response: Response,\n replay: (token: string) => Promise<Response>,\n): Promise<Response> {\n if (response.status !== 401) return response;\n const outcome = await refreshAccessToken(true);\n if (outcome.token) return replay(outcome.token);\n if (outcome.sessionOver) {\n // Dead refresh credential: same session-end path as the axios interceptor.\n clearSession();\n triggerSessionExpired();\n }\n return response;\n}\n\n// ---------------------------------------------------------------------------\n// Proactive refresh scheduler (module-level singleton)\n// ---------------------------------------------------------------------------\n\nlet schedulerTimer: ReturnType<typeof setInterval> | null = null;\n\n/**\n * Start the scheduler that renews the token shortly before expiry. Call once\n * on the client (e.g. in the authenticated layout). Reactive 401 refresh\n * stays as a fallback for laptop sleep / scheduler drift.\n */\nexport function initProactiveTokenRefresh(): void {\n if (typeof window === \"undefined\" || schedulerTimer) return;\n\n const refreshIfDue = (): void => {\n const token = getAccessToken();\n if (!token) return;\n const expiresAt = Number(window.localStorage.getItem(ACCESS_TOKEN_EXPIRES_AT_KEY) ?? 0);\n // A session without a stored expiry (legacy login or a provider that\n // omitted expiresIn) still needs renewal: refresh now and persist the\n // expiry the backend returns, instead of never scheduling a refresh.\n if (!expiresAt || Date.now() >= expiresAt - PROACTIVE_REFRESH_LEAD_MS) {\n void refreshAccessToken().then((outcome) => {\n // A dead refresh cookie found proactively bounces to login now\n // instead of waiting for the next business request to 401 (R22-05).\n if (outcome.sessionOver) {\n clearSession();\n triggerSessionExpired();\n }\n });\n }\n };\n\n // Run immediately (tabs reopened after sleep) and then on an interval.\n refreshIfDue();\n schedulerTimer = setInterval(refreshIfDue, PROACTIVE_REFRESH_CHECK_INTERVAL_MS);\n}\n\n// ---------------------------------------------------------------------------\n// Error normalization (the single failure channel)\n// ---------------------------------------------------------------------------\n\n/** Map any thrown value to the normalized ApiError shape. */\nfunction toApiError(error: unknown): ApiError {\n if (error instanceof ApiError) return error;\n if (axios.isAxiosError(error)) {\n const body = error.response?.data as ApiEnvelope | undefined;\n return new ApiError(\n body?.error?.message ?? error.message,\n error.response?.status ?? 0,\n body ?? error.response?.data,\n body?.code,\n );\n }\n if (error instanceof Error) return new ApiError(error.message, 0);\n return new ApiError(\"Request failed\", 0);\n}\n\n// ---------------------------------------------------------------------------\n// Axios instance\n// ---------------------------------------------------------------------------\n\nexport const api = axios.create({\n baseURL: BASE_URL,\n withCredentials: true,\n timeout: API_TIMEOUT_MS,\n});\n\n/**\n * Whether the request resolves to our own origin (the configured baseURL, or\n * the page origin when baseURL is empty). The bearer token must never be\n * attached to an absolute URL pointing at a third party (R23-02).\n */\nfunction isOwnOriginRequest(config: InternalAxiosRequestConfig): boolean {\n const base = config.baseURL ?? BASE_URL;\n const fallbackOrigin = typeof window !== \"undefined\" ? window.location.origin : \"http://localhost\";\n try {\n const resolved = new URL(config.url ?? \"\", base || fallbackOrigin);\n const baseOrigin = new URL(base || fallbackOrigin, fallbackOrigin).origin;\n return resolved.origin === baseOrigin;\n } catch {\n return false;\n }\n}\n\napi.interceptors.request.use((config) => {\n const token = getAccessToken();\n // Within the interceptor chain headers is always an AxiosHeaders instance.\n if (token && isOwnOriginRequest(config)) {\n config.headers.set(\"Authorization\", `Bearer ${token}`);\n }\n return config;\n});\n\n/**\n * Request config fields owned by the response interceptor.\n *\n * `_retriedAfterRefresh` marks a request that already went through the silent\n * refresh + replay chain once, so a second 401 does not recurse.\n */\ntype RotatingRequestConfig = InternalAxiosRequestConfig & {\n _retriedAfterRefresh?: boolean;\n};\n\n// Success channel: only unwrap the envelope; failures never arrive here\n// (they carry non-2xx status — see newbie ADR-001).\napi.interceptors.response.use(\n (response) => {\n if (isEnvelope(response.data)) {\n return { ...response, data: response.data.data };\n }\n return response;\n },\n async (error) => {\n const original = error?.config as RotatingRequestConfig | undefined;\n const url: string = original?.url ?? \"\";\n const canSilentlyRefresh =\n typeof window !== \"undefined\" && !original?._retriedAfterRefresh && !AUTH_PATH_PATTERN.test(url);\n\n if (isUnauthorized(error) && original && canSilentlyRefresh) {\n original._retriedAfterRefresh = true;\n const outcome = await refreshAccessToken(true);\n if (outcome.token) {\n original.headers.set(\"Authorization\", `Bearer ${outcome.token}`);\n // Replay goes through the same interceptor chain; its outcome is\n // returned directly so this failure never reaches the handler.\n return api(original);\n }\n if (outcome.sessionOver) {\n // The server rejected the refresh credential: the session is over.\n clearSession();\n triggerSessionExpired();\n // This request failed because the session was already gone; the user is\n // being bounced to the login page, so its message is noise (R21-01).\n // Suppress it through the public per-request opt-out rather than a\n // private marker — one suppression concept, not two (R22-01).\n original.enabledDefaultErrorToast = false;\n }\n // Transient refresh failure (offline/5xx): keep the session and let the\n // original 401 surface normally (R22-05).\n }\n\n // Single exit for every final failure: normalize once, notify once.\n // Callers that render their own error UX pass enabledDefaultErrorToast:\n // false to suppress the default toast and avoid double notification.\n const normalized = toApiError(error);\n if (error?.config?.enabledDefaultErrorToast !== false) {\n errorHandler?.(normalized);\n }\n throw normalized;\n },\n);\n\n// ---------------------------------------------------------------------------\n// Typed convenience methods — resolve to the unwrapped response body.\n// ---------------------------------------------------------------------------\n\nexport const apiClient = {\n get<T>(url: string, config?: AxiosRequestConfig): Promise<T> {\n return api.get<unknown, AxiosResponse<T>>(url, config).then((r) => r.data);\n },\n post<T>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T> {\n return api.post<unknown, AxiosResponse<T>>(url, data, config).then((r) => r.data);\n },\n put<T>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T> {\n return api.put<unknown, AxiosResponse<T>>(url, data, config).then((r) => r.data);\n },\n patch<T>(url: string, data?: unknown, config?: AxiosRequestConfig): Promise<T> {\n return api.patch<unknown, AxiosResponse<T>>(url, data, config).then((r) => r.data);\n },\n delete<T>(url: string, config?: AxiosRequestConfig): Promise<T> {\n return api.delete<unknown, AxiosResponse<T>>(url, config).then((r) => r.data);\n },\n // HEAD/OPTIONS responses carry no body; resolve to the full AxiosResponse\n // so callers can still inspect status and headers.\n head<T>(url: string, config?: AxiosRequestConfig): Promise<AxiosResponse<T>> {\n return api.head<unknown, AxiosResponse<T>>(url, config);\n },\n options<T>(url: string, config?: AxiosRequestConfig): Promise<AxiosResponse<T>> {\n return api.options<unknown, AxiosResponse<T>>(url, config);\n },\n};\n",
|
|
15
15
|
"type": "registry:lib"
|
|
16
16
|
}
|
|
17
17
|
]
|