Reduce terminal auth and analytics stalls
This commit is contained in:
@@ -55,7 +55,10 @@ import {
|
||||
mergeAccessStateWithAuthPayload,
|
||||
type AuthProfilePayload,
|
||||
} from "@/components/dashboard/scan-terminal/terminal-access-state";
|
||||
import { loadTerminalAuthProfile } from "@/components/dashboard/scan-terminal/terminal-auth-bootstrap";
|
||||
import {
|
||||
createAuthProfileRequestCache,
|
||||
loadTerminalAuthProfile,
|
||||
} from "@/components/dashboard/scan-terminal/terminal-auth-bootstrap";
|
||||
import {
|
||||
cityListItemsToScanRows,
|
||||
mergeScanRowsWithCityFallbackRows,
|
||||
@@ -962,7 +965,7 @@ function ScanTerminalScreen() {
|
||||
createEmptyAccess(true),
|
||||
);
|
||||
|
||||
const loadAuthProfile = useCallback(
|
||||
const rawLoadAuthProfile = useCallback(
|
||||
async (
|
||||
accessToken?: string | null,
|
||||
options?: { preferSnapshot?: boolean },
|
||||
@@ -984,6 +987,28 @@ function ScanTerminalScreen() {
|
||||
},
|
||||
[],
|
||||
);
|
||||
const authProfileRequestCacheRef = useRef<{
|
||||
load: typeof rawLoadAuthProfile;
|
||||
cached: ReturnType<typeof createAuthProfileRequestCache>;
|
||||
} | null>(null);
|
||||
const loadAuthProfile = useCallback(
|
||||
(
|
||||
accessToken?: string | null,
|
||||
options?: { preferSnapshot?: boolean },
|
||||
): Promise<AuthProfilePayload> => {
|
||||
const current = authProfileRequestCacheRef.current;
|
||||
if (current?.load === rawLoadAuthProfile) {
|
||||
return current.cached(accessToken, options);
|
||||
}
|
||||
const next = {
|
||||
load: rawLoadAuthProfile,
|
||||
cached: createAuthProfileRequestCache(rawLoadAuthProfile),
|
||||
};
|
||||
authProfileRequestCacheRef.current = next;
|
||||
return next.cached(accessToken, options);
|
||||
},
|
||||
[rawLoadAuthProfile],
|
||||
);
|
||||
|
||||
const refreshLiveAuthProfile = useCallback(async () => {
|
||||
const supabaseEnabled = hasSupabasePublicEnv();
|
||||
|
||||
@@ -96,7 +96,7 @@ export async function runTests() {
|
||||
chartLogicSource.includes("primeCityDetailCache"),
|
||||
"visible terminal chart detail fetches should be coalesced into one batch request and prime the shared chart cache",
|
||||
);
|
||||
const fetchHourlyBlock = chartLogicSource.match(/async function fetchHourlyForecastForCity[\s\S]*?\n}\n\nfunction fetchCityDetailWithTimeout/)?.[0] || "";
|
||||
const fetchHourlyBlock = chartLogicSource.match(/async function fetchHourlyForecastForCity[\s\S]*?\r?\n}\r?\n\r?\nfunction fetchCityDetailWithTimeout/)?.[0] || "";
|
||||
assert(
|
||||
fetchHourlyBlock.includes("queueCityDetailBatch(city, resParam)") &&
|
||||
!fetchHourlyBlock.includes("runQueuedHourlyDetailRequest"),
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import {
|
||||
createAuthProfileRequestCache,
|
||||
loadTerminalAuthProfile,
|
||||
type TerminalAuthProfilePayload,
|
||||
} from "@/components/dashboard/scan-terminal/terminal-auth-bootstrap";
|
||||
@@ -27,6 +28,41 @@ async function flushMicrotasks() {
|
||||
}
|
||||
|
||||
export async function runTests() {
|
||||
const pendingProfile = deferred<TerminalAuthProfilePayload>();
|
||||
let underlyingProfileLoads = 0;
|
||||
const cachedLoadAuthProfile = createAuthProfileRequestCache((
|
||||
accessToken?: string | null,
|
||||
options?: { preferSnapshot?: boolean },
|
||||
) => {
|
||||
underlyingProfileLoads += 1;
|
||||
assert(
|
||||
accessToken === "shared-token" && options?.preferSnapshot === true,
|
||||
"auth profile request cache should pass through the original token and snapshot preference",
|
||||
);
|
||||
return pendingProfile.promise;
|
||||
});
|
||||
const firstCachedProfile = cachedLoadAuthProfile("shared-token", {
|
||||
preferSnapshot: true,
|
||||
});
|
||||
const secondCachedProfile = cachedLoadAuthProfile("shared-token", {
|
||||
preferSnapshot: true,
|
||||
});
|
||||
assert(
|
||||
firstCachedProfile === secondCachedProfile && underlyingProfileLoads === 1,
|
||||
"auth profile request cache should dedupe identical in-flight profile loads",
|
||||
);
|
||||
pendingProfile.resolve({
|
||||
authenticated: true,
|
||||
user_id: "shared-user",
|
||||
subscription_active: true,
|
||||
});
|
||||
await firstCachedProfile;
|
||||
await cachedLoadAuthProfile("shared-token", { preferSnapshot: true });
|
||||
assert(
|
||||
underlyingProfileLoads === 2,
|
||||
"auth profile request cache should clear a key after the in-flight load settles",
|
||||
);
|
||||
|
||||
const slowCookieProfile = deferred<TerminalAuthProfilePayload>();
|
||||
const fastSession = deferred<{ data: { session: { access_token: string } } }>();
|
||||
const calls: string[] = [];
|
||||
|
||||
@@ -57,6 +57,32 @@ function canResolveProfileImmediately(
|
||||
return payload?.authenticated === true && payload.subscription_active === true;
|
||||
}
|
||||
|
||||
function authProfileRequestCacheKey(
|
||||
accessToken?: string | null,
|
||||
options?: { preferSnapshot?: boolean },
|
||||
) {
|
||||
const token = String(accessToken || "").trim();
|
||||
const scope = token ? `bearer:${token}` : "cookie";
|
||||
const mode = options?.preferSnapshot ? "snapshot" : "live";
|
||||
return `${mode}:${scope}`;
|
||||
}
|
||||
|
||||
export function createAuthProfileRequestCache(
|
||||
loadAuthProfile: LoadTerminalAuthProfileOptions["loadAuthProfile"],
|
||||
): LoadTerminalAuthProfileOptions["loadAuthProfile"] {
|
||||
const pending = new Map<string, Promise<TerminalAuthProfilePayload>>();
|
||||
return (accessToken, options) => {
|
||||
const key = authProfileRequestCacheKey(accessToken, options);
|
||||
const existing = pending.get(key);
|
||||
if (existing) return existing;
|
||||
const request = loadAuthProfile(accessToken, options).finally(() => {
|
||||
pending.delete(key);
|
||||
});
|
||||
pending.set(key, request);
|
||||
return request;
|
||||
};
|
||||
}
|
||||
|
||||
export async function loadTerminalAuthProfile({
|
||||
getSession,
|
||||
hasSupabasePublicEnv,
|
||||
|
||||
@@ -57,4 +57,26 @@ export function runTests() {
|
||||
for (const stage of ["auth_headers", "ops_auth", "backend_fetch", "backend_read"]) {
|
||||
assert.match(onlineUsersProxy, new RegExp(stage));
|
||||
}
|
||||
|
||||
const analyticsProxy = readFrontend("app", "api", "analytics", "events", "route.ts");
|
||||
assert.match(
|
||||
analyticsProxy,
|
||||
/ANALYTICS_PROXY_TIMEOUT_MS/,
|
||||
"analytics event proxy should use a short dedicated timeout instead of waiting for long backend stalls",
|
||||
);
|
||||
assert.match(
|
||||
analyticsProxy,
|
||||
/createProxyTimer\(req,\s*"analytics_events"\)/,
|
||||
"analytics event proxy should expose Server-Timing for HAR inspection",
|
||||
);
|
||||
assert.match(
|
||||
analyticsProxy,
|
||||
/AbortController/,
|
||||
"analytics event proxy should abort slow upstream tracking requests",
|
||||
);
|
||||
assert.match(
|
||||
analyticsProxy,
|
||||
/status:\s*202/,
|
||||
"analytics event proxy timeout should stay non-blocking for the fire-and-forget client event",
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user