Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
184eb67282 | ||
|
|
c570996a97 | ||
|
|
44414c5244 | ||
|
|
37ca2c3172 |
@@ -25,6 +25,7 @@
|
|||||||
"test:all": "pnpm test:runtime-schema && pnpm test:unit && pnpm test:component && pnpm test:integration"
|
"test:all": "pnpm test:runtime-schema && pnpm test:unit && pnpm test:component && pnpm test:integration"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@tanstack/react-query": "5.101.4",
|
||||||
"react": "19.2.8",
|
"react": "19.2.8",
|
||||||
"react-dom": "19.2.8",
|
"react-dom": "19.2.8",
|
||||||
"zod": "4.4.3"
|
"zod": "4.4.3"
|
||||||
|
|||||||
Generated
+18
@@ -8,6 +8,9 @@ importers:
|
|||||||
|
|
||||||
.:
|
.:
|
||||||
dependencies:
|
dependencies:
|
||||||
|
'@tanstack/react-query':
|
||||||
|
specifier: 5.101.4
|
||||||
|
version: 5.101.4(react@19.2.8)
|
||||||
react:
|
react:
|
||||||
specifier: 19.2.8
|
specifier: 19.2.8
|
||||||
version: 19.2.8
|
version: 19.2.8
|
||||||
@@ -396,6 +399,14 @@ packages:
|
|||||||
'@standard-schema/spec@1.1.0':
|
'@standard-schema/spec@1.1.0':
|
||||||
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
|
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
|
||||||
|
|
||||||
|
'@tanstack/query-core@5.101.4':
|
||||||
|
resolution: {integrity: sha512-gNwcvOJcRbLWPOLG/2OBm+zM+Yv+MKsXKEOWC57USuZDEsI71hEErQsiEGx5wX9rzWWkfwM0fVSPoiIFSsxfiw==}
|
||||||
|
|
||||||
|
'@tanstack/react-query@5.101.4':
|
||||||
|
resolution: {integrity: sha512-yRg2pfOCxIs4ZJW3XYYHU/WgtD04FHSnfHlpRT7h7pR77hwkdRG4wxbKe4aq6P0RvXUTBSQpQeadS1SUYUe+KA==}
|
||||||
|
peerDependencies:
|
||||||
|
react: ^18 || ^19
|
||||||
|
|
||||||
'@testing-library/dom@10.4.1':
|
'@testing-library/dom@10.4.1':
|
||||||
resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
|
resolution: {integrity: sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==}
|
||||||
engines: {node: '>=18'}
|
engines: {node: '>=18'}
|
||||||
@@ -1840,6 +1851,13 @@ snapshots:
|
|||||||
|
|
||||||
'@standard-schema/spec@1.1.0': {}
|
'@standard-schema/spec@1.1.0': {}
|
||||||
|
|
||||||
|
'@tanstack/query-core@5.101.4': {}
|
||||||
|
|
||||||
|
'@tanstack/react-query@5.101.4(react@19.2.8)':
|
||||||
|
dependencies:
|
||||||
|
'@tanstack/query-core': 5.101.4
|
||||||
|
react: 19.2.8
|
||||||
|
|
||||||
'@testing-library/dom@10.4.1':
|
'@testing-library/dom@10.4.1':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@babel/code-frame': 7.29.7
|
'@babel/code-frame': 7.29.7
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
/**
|
||||||
|
* Creates the skeleton-owned side of an external session integration.
|
||||||
|
* Credential acquisition and storage stay inside the supplied external owner.
|
||||||
|
*
|
||||||
|
* @param {{
|
||||||
|
* readState(): import("../../application/ports/auth-session-port.js").SessionState,
|
||||||
|
* attachCredential(request: Request): Promise<Request>,
|
||||||
|
* recoverSession(): Promise<"restored" | "no-session">,
|
||||||
|
* notifyUnauthenticated(): void
|
||||||
|
* }} owner
|
||||||
|
* @returns {import("../../application/ports/auth-session-port.js").AuthSessionPort}
|
||||||
|
*/
|
||||||
|
export function createExternalAuthSessionAdapter(owner) {
|
||||||
|
return Object.freeze({
|
||||||
|
getState() {
|
||||||
|
return owner.readState();
|
||||||
|
},
|
||||||
|
async attach(request) {
|
||||||
|
const attached = await owner.attachCredential(request);
|
||||||
|
if (!(attached instanceof Request)) {
|
||||||
|
throw new TypeError("Auth owner returned an invalid request");
|
||||||
|
}
|
||||||
|
return attached;
|
||||||
|
},
|
||||||
|
async recover() {
|
||||||
|
const result = await owner.recoverSession();
|
||||||
|
if (result !== "restored" && result !== "no-session") {
|
||||||
|
throw new TypeError("Auth owner returned an invalid recovery state");
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
onUnauthenticated() {
|
||||||
|
owner.notifyUnauthenticated();
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function createAnonymousSessionAdapter() {
|
||||||
|
return createExternalAuthSessionAdapter({
|
||||||
|
readState: () => "unauthenticated",
|
||||||
|
attachCredential: async (request) => request,
|
||||||
|
recoverSession: async () => "no-session",
|
||||||
|
notifyUnauthenticated: () => {},
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -109,6 +109,11 @@ export function createHttpClient(dependencies) {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (outcome.error.httpStatus === 401 && recoveryUsed) {
|
||||||
|
authSession.onUnauthenticated();
|
||||||
|
return outcome;
|
||||||
|
}
|
||||||
|
|
||||||
if (!shouldRetry(operation, outcome.error, retryCount)) {
|
if (!shouldRetry(operation, outcome.error, retryCount)) {
|
||||||
return outcome;
|
return outcome;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
import { QueryClient } from "@tanstack/react-query";
|
||||||
|
|
||||||
|
import { createFailure } from "../../contracts/errors.js";
|
||||||
|
|
||||||
|
export const QUERY_CACHE_DEFAULTS = Object.freeze({
|
||||||
|
staleTime: 30_000,
|
||||||
|
gcTime: 300_000,
|
||||||
|
refetchOnWindowFocus: true,
|
||||||
|
retry: false,
|
||||||
|
mutationRetry: false,
|
||||||
|
persistence: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
export function createQueryClient() {
|
||||||
|
return new QueryClient({
|
||||||
|
defaultOptions: {
|
||||||
|
queries: {
|
||||||
|
staleTime: QUERY_CACHE_DEFAULTS.staleTime,
|
||||||
|
gcTime: QUERY_CACHE_DEFAULTS.gcTime,
|
||||||
|
refetchOnWindowFocus: QUERY_CACHE_DEFAULTS.refetchOnWindowFocus,
|
||||||
|
retry: QUERY_CACHE_DEFAULTS.retry,
|
||||||
|
},
|
||||||
|
mutations: {
|
||||||
|
retry: QUERY_CACHE_DEFAULTS.mutationRetry,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param {QueryClient} queryClient
|
||||||
|
* @returns {import("../../application/ports/query-cache-port.js").QueryCachePort}
|
||||||
|
*/
|
||||||
|
export function createQueryCacheAdapter(queryClient) {
|
||||||
|
return Object.freeze({
|
||||||
|
read(key) {
|
||||||
|
try {
|
||||||
|
return { ok: true, value: queryClient.getQueryData(key) };
|
||||||
|
} catch {
|
||||||
|
return cacheFailure("read", key);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
write(key, value) {
|
||||||
|
try {
|
||||||
|
queryClient.setQueryData(key, structuredClone(value));
|
||||||
|
return { ok: true };
|
||||||
|
} catch {
|
||||||
|
return cacheFailure("write", key);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async invalidate(namespace) {
|
||||||
|
try {
|
||||||
|
await queryClient.invalidateQueries({ queryKey: namespace, exact: false });
|
||||||
|
return { ok: true };
|
||||||
|
} catch {
|
||||||
|
return cacheFailure("invalidate", namespace);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** @param {string} phase @param {readonly unknown[]} key */
|
||||||
|
function cacheFailure(phase, key) {
|
||||||
|
const namespace = typeof key[0] === "string" ? key[0] : "unknown";
|
||||||
|
return {
|
||||||
|
ok: /** @type {false} */ (false),
|
||||||
|
error: createFailure("QUERY_CACHE_FAILURE", "QUERY_CACHE", 0, {
|
||||||
|
code: `QUERY_CACHE_${phase.toUpperCase()}_FAILED`,
|
||||||
|
causeClass: `namespace:${namespace}`,
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
/**
|
/**
|
||||||
* @typedef {{
|
* @typedef {{
|
||||||
* read(key: readonly unknown[]): unknown,
|
* read(key: readonly unknown[]): { ok: true, value: unknown } |
|
||||||
* write(key: readonly unknown[], value: unknown): void,
|
* { ok: false, error: import("../../contracts/errors.js").ApiFailure },
|
||||||
* invalidate(namespace: readonly unknown[]): Promise<void>
|
* write(key: readonly unknown[], value: unknown): { ok: true } |
|
||||||
|
* { ok: false, error: import("../../contracts/errors.js").ApiFailure },
|
||||||
|
* invalidate(namespace: readonly unknown[]): Promise<{ ok: true } |
|
||||||
|
* { ok: false, error: import("../../contracts/errors.js").ApiFailure }>
|
||||||
* }} QueryCachePort
|
* }} QueryCachePort
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
const RESOURCE_NAMESPACE = Object.freeze(["resource", 1]);
|
||||||
|
|
||||||
|
export const queryKeys = Object.freeze({
|
||||||
|
resource: Object.freeze({
|
||||||
|
all: () => RESOURCE_NAMESPACE,
|
||||||
|
list: (filters = {}) =>
|
||||||
|
Object.freeze([...RESOURCE_NAMESPACE, "list", canonicalize(filters)]),
|
||||||
|
/** @param {string} resourceId */
|
||||||
|
detail: (resourceId) =>
|
||||||
|
Object.freeze([...RESOURCE_NAMESPACE, "detail", String(resourceId)]),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
export const QUERY_REGISTRY = Object.freeze({
|
||||||
|
RESOURCE: Object.freeze({
|
||||||
|
namespace: RESOURCE_NAMESPACE,
|
||||||
|
serialization: "canonical-object-order",
|
||||||
|
identity: "no-pii-token-or-raw-url",
|
||||||
|
invalidation: "resource namespace after successful mutation",
|
||||||
|
version: 1,
|
||||||
|
persistence: "disabled",
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
/** @param {unknown} value @returns {unknown} */
|
||||||
|
export function canonicalize(value) {
|
||||||
|
if (Array.isArray(value)) return value.map(canonicalize);
|
||||||
|
if (value && typeof value === "object") {
|
||||||
|
return Object.fromEntries(
|
||||||
|
Object.entries(value)
|
||||||
|
.sort(([left], [right]) => left.localeCompare(right))
|
||||||
|
.map(([key, item]) => [key, canonicalize(item)]),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
@@ -0,0 +1,103 @@
|
|||||||
|
import { HttpResponse, http } from "msw";
|
||||||
|
import { setupServer } from "msw/node";
|
||||||
|
import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
import { createExternalAuthSessionAdapter } from "../../src/adapters/auth/external-session-adapter.js";
|
||||||
|
import { createHttpClient } from "../../src/adapters/http/client.js";
|
||||||
|
|
||||||
|
let responseStatuses = [];
|
||||||
|
const server = setupServer(
|
||||||
|
http.get("https://api.test/api/sample/resources", () => {
|
||||||
|
const status = responseStatuses.shift() ?? 200;
|
||||||
|
if (status === 401) {
|
||||||
|
return HttpResponse.json(
|
||||||
|
{
|
||||||
|
success: false,
|
||||||
|
error: { code: "UNAUTHENTICATED" },
|
||||||
|
meta: { requestId: "request-1", traceId: "trace-1" },
|
||||||
|
},
|
||||||
|
{ status },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
data: [{ id: "resource-1", name: "Example" }],
|
||||||
|
meta: { requestId: "request-2", traceId: "trace-1" },
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
beforeAll(() => server.listen({ onUnhandledRequest: "error" }));
|
||||||
|
afterEach(() => {
|
||||||
|
responseStatuses = [];
|
||||||
|
server.resetHandlers();
|
||||||
|
});
|
||||||
|
afterAll(() => server.close());
|
||||||
|
|
||||||
|
const clock = { now: () => 0, sleep: async () => {} };
|
||||||
|
|
||||||
|
describe("bounded 401 session recovery", () => {
|
||||||
|
it("calls recovery once and replays a safe request once", async () => {
|
||||||
|
responseStatuses = [401, 200];
|
||||||
|
const recoverSession = vi.fn(async () => "restored");
|
||||||
|
const authSession = createExternalAuthSessionAdapter({
|
||||||
|
readState: () => "authenticated",
|
||||||
|
attachCredential: async (request) => request,
|
||||||
|
recoverSession,
|
||||||
|
notifyUnauthenticated: vi.fn(),
|
||||||
|
});
|
||||||
|
const client = createHttpClient({
|
||||||
|
baseUrl: "https://api.test",
|
||||||
|
authSession,
|
||||||
|
clock,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(client.execute("LIST_SAMPLE_RESOURCES")).resolves.toMatchObject({
|
||||||
|
ok: true,
|
||||||
|
});
|
||||||
|
expect(recoverSession).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("stops after a second 401 and notifies unauthenticated once", async () => {
|
||||||
|
responseStatuses = [401, 401];
|
||||||
|
const notifyUnauthenticated = vi.fn();
|
||||||
|
const authSession = createExternalAuthSessionAdapter({
|
||||||
|
readState: () => "authenticated",
|
||||||
|
attachCredential: async (request) => request,
|
||||||
|
recoverSession: async () => "restored",
|
||||||
|
notifyUnauthenticated,
|
||||||
|
});
|
||||||
|
const client = createHttpClient({
|
||||||
|
baseUrl: "https://api.test",
|
||||||
|
authSession,
|
||||||
|
clock,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(client.execute("LIST_SAMPLE_RESOURCES")).resolves.toMatchObject({
|
||||||
|
ok: false,
|
||||||
|
error: { kind: "AUTH_REQUIRED" },
|
||||||
|
});
|
||||||
|
expect(notifyUnauthenticated).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("normalizes attach and invalid recovery failures", async () => {
|
||||||
|
const attachFailure = createExternalAuthSessionAdapter({
|
||||||
|
readState: () => "authenticated",
|
||||||
|
attachCredential: async () => {
|
||||||
|
throw new Error("credential detail");
|
||||||
|
},
|
||||||
|
recoverSession: async () => "restored",
|
||||||
|
notifyUnauthenticated: vi.fn(),
|
||||||
|
});
|
||||||
|
const client = createHttpClient({
|
||||||
|
baseUrl: "https://api.test",
|
||||||
|
authSession: attachFailure,
|
||||||
|
clock,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(client.execute("LIST_SAMPLE_RESOURCES")).resolves.toMatchObject({
|
||||||
|
ok: false,
|
||||||
|
error: { kind: "AUTH_INTEGRATION_FAILURE" },
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
import {
|
||||||
|
createAnonymousSessionAdapter,
|
||||||
|
createExternalAuthSessionAdapter,
|
||||||
|
} from "../../src/adapters/auth/external-session-adapter.js";
|
||||||
|
|
||||||
|
describe("external AuthSessionPort adapter", () => {
|
||||||
|
it("attaches opaque credentials without exposing a token-shaped session", async () => {
|
||||||
|
const adapter = createExternalAuthSessionAdapter({
|
||||||
|
readState: () => "authenticated",
|
||||||
|
attachCredential: async (request) => {
|
||||||
|
const headers = new Headers(request.headers);
|
||||||
|
headers.set("X-Session-Attached", "true");
|
||||||
|
return new Request(request, { headers });
|
||||||
|
},
|
||||||
|
recoverSession: async () => "restored",
|
||||||
|
notifyUnauthenticated: vi.fn(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const request = await adapter.attach(new Request("https://api.test/resource"));
|
||||||
|
expect(request.headers.get("X-Session-Attached")).toBe("true");
|
||||||
|
expect(adapter.getState()).toBe("authenticated");
|
||||||
|
expect(adapter).not.toHaveProperty("accessToken");
|
||||||
|
expect(adapter).not.toHaveProperty("refreshToken");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("fails invalid recovery states closed", async () => {
|
||||||
|
const adapter = createExternalAuthSessionAdapter({
|
||||||
|
readState: () => "authenticated",
|
||||||
|
attachCredential: async (request) => request,
|
||||||
|
recoverSession: async () => "unexpected",
|
||||||
|
notifyUnauthenticated: vi.fn(),
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(adapter.recover()).rejects.toThrow("invalid recovery state");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("provides a safe anonymous adapter", async () => {
|
||||||
|
const adapter = createAnonymousSessionAdapter();
|
||||||
|
expect(adapter.getState()).toBe("unauthenticated");
|
||||||
|
await expect(adapter.recover()).resolves.toBe("no-session");
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
import { QueryClient } from "@tanstack/react-query";
|
||||||
|
import { describe, expect, it, vi } from "vitest";
|
||||||
|
|
||||||
|
import {
|
||||||
|
createQueryCacheAdapter,
|
||||||
|
createQueryClient,
|
||||||
|
} from "../../src/adapters/query-cache/tanstack-query-cache.js";
|
||||||
|
import { queryKeys } from "../../src/contracts/query-keys.js";
|
||||||
|
|
||||||
|
describe("query key registry", () => {
|
||||||
|
it("canonicalizes filter order into the same stable key", () => {
|
||||||
|
expect(queryKeys.resource.list({ page: 1, status: "open" })).toEqual(
|
||||||
|
queryKeys.resource.list({ status: "open", page: 1 }),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("contains no raw URL or token material", () => {
|
||||||
|
expect(JSON.stringify(queryKeys.resource.detail("resource-1"))).toBe(
|
||||||
|
'["resource",1,"detail","resource-1"]',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("TanStack QueryCachePort adapter", () => {
|
||||||
|
it("reads, writes, and invalidates only the declared namespace", async () => {
|
||||||
|
const client = createQueryClient();
|
||||||
|
const adapter = createQueryCacheAdapter(client);
|
||||||
|
const listKey = queryKeys.resource.list({ page: 1 });
|
||||||
|
const otherKey = ["other", 1];
|
||||||
|
|
||||||
|
expect(adapter.write(listKey, [{ id: "resource-1" }])).toEqual({ ok: true });
|
||||||
|
expect(adapter.write(otherKey, "preserved")).toEqual({ ok: true });
|
||||||
|
expect(adapter.read(listKey)).toMatchObject({
|
||||||
|
ok: true,
|
||||||
|
value: [{ id: "resource-1" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
await adapter.invalidate(queryKeys.resource.all());
|
||||||
|
expect(client.getQueryState(listKey)?.isInvalidated).toBe(true);
|
||||||
|
expect(client.getQueryState(otherKey)?.isInvalidated).toBe(false);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("normalizes adapter exceptions without raw key data", async () => {
|
||||||
|
const client = new QueryClient();
|
||||||
|
vi.spyOn(client, "invalidateQueries").mockRejectedValue(new Error("secret-key"));
|
||||||
|
const adapter = createQueryCacheAdapter(client);
|
||||||
|
const result = await adapter.invalidate(["resource", "sensitive-filter"]);
|
||||||
|
|
||||||
|
expect(result).toMatchObject({
|
||||||
|
ok: false,
|
||||||
|
error: { kind: "QUERY_CACHE_FAILURE" },
|
||||||
|
});
|
||||||
|
expect(JSON.stringify(result)).not.toContain("sensitive-filter");
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user