7c8b5aeb23
Add per-planet cargo routes (COL/CAP/MAT/EMP) to the inspector with a renderer-driven destination picker (faded out-of-reach planets, cursor-line anchor, hover-highlight) and per-route arrows on the map. The pick-mode primitives are exposed via `MapPickService` so ship-group dispatch in Phase 19/20 can reuse the same surface. Pass A — generic map foundation: - hit-test now sizes the click zone to `pointRadiusPx + slopPx` so the visible disc is always part of the target. - `RendererHandle` gains `onPointerMove`, `onHoverChange`, `setPickMode`, `getPickState`, `getPrimitiveAlpha`, `setExtraPrimitives`, `getPrimitives`. The click dispatcher is centralised: pick-mode swallows clicks atomically so the standard selection consumers do not race against teardown. - `MapPickService` (`lib/map-pick.svelte.ts`) wraps the renderer contract in a promise-shaped `pick(...)`. The in-game shell layout owns the service so sidebar and bottom-sheet inspectors see the same instance. - Debug-surface registry exposes `getMapPrimitives`, `getMapPickState`, `getMapCamera` to e2e specs without spawning a separate debug page after navigation. Pass B — cargo-route feature: - `CargoLoadType`, `setCargoRoute`, `removeCargoRoute` typed variants with `(source, loadType)` collapse rule on the order draft; round-trip through the FBS encoder/decoder. - `GameReport` decodes `routes` and the local player's drive tech for the inline reach formula (40 × drive). `applyOrderOverlay` upserts/drops route entries for valid/submitting/applied commands. - `lib/inspectors/planet/cargo-routes.svelte` renders the four-slot section. `Add` / `Edit` call `MapPickService.pick`, `Remove` emits `removeCargoRoute`. - `map/cargo-routes.ts` builds shaft + arrowhead primitives per cargo type; the map view pushes them through `setExtraPrimitives` so the renderer never re-inits Pixi on route mutations (Pixi 8 doesn't support that on a reused canvas). Docs: - `docs/cargo-routes-ux.md` covers engine semantics + UI map. - `docs/renderer.md` documents pick mode and the debug surface. - `docs/calc-bridge.md` records the Phase 16 reach waiver. - `PLAN.md` rewrites Phase 16 to reflect the foundation + feature split and the decisions baked in (map-driven picker, inline reach, optimistic overlay via `setExtraPrimitives`). Tests: - `tests/map-pick-mode.test.ts` — pure overlay-spec helper. - `tests/map-cargo-routes.test.ts` — `buildCargoRouteLines`. - `tests/inspector-planet-cargo-routes.test.ts` — slot rendering, picker invocation, collapse, cancel, remove. - Extensions to `order-draft`, `submit`, `order-load`, `order-overlay`, `state-binding`, `inspector-planet`, `inspector-overlay`, `game-shell-sidebar`, `game-shell-header`. - `tests/e2e/cargo-routes.spec.ts` — Playwright happy path: add COL, add CAP, remove COL, asserting both the inspector and the arrow count via `__galaxyDebug.getMapPrimitives()`. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
153 lines
4.9 KiB
TypeScript
153 lines
4.9 KiB
TypeScript
// Verifies the Phase 6 storage layer end-to-end in real browser
|
|
// engines: a freshly generated device keypair persists across a page
|
|
// reload, signs deterministically with the same private key after the
|
|
// reload, and is wiped by `clearDeviceSession` so the next load
|
|
// generates a different keypair. The live-gateway round-trip is
|
|
// covered by Phase 7's e2e once the email-code login flow lands;
|
|
// this spec deliberately stops at the storage boundary.
|
|
|
|
import { expect, test, type Page } from "@playwright/test";
|
|
|
|
interface DebugSnapshot {
|
|
publicKey: number[];
|
|
deviceSessionId: string | null;
|
|
}
|
|
|
|
import type {
|
|
MapCameraSnapshot,
|
|
MapPickStateSnapshot,
|
|
MapPrimitiveSnapshot,
|
|
} from "../../src/lib/debug-surface.svelte";
|
|
|
|
// Mirrors the surface mounted by `routes/__debug/store/+page.svelte`.
|
|
// Other Playwright specs (`game-shell.spec.ts`, `order-composer.spec.ts`,
|
|
// `cargo-routes.spec.ts`) reuse the global declaration below, so this
|
|
// interface lists every helper any spec calls — not only those
|
|
// exercised by this file.
|
|
interface DebugSurface {
|
|
ready: true;
|
|
loadSession(): Promise<DebugSnapshot>;
|
|
clearSession(): Promise<void>;
|
|
signWithDevice(message: number[]): Promise<number[]>;
|
|
setDeviceSessionId(id: string): Promise<void>;
|
|
verifyWithStoredPublicKey(
|
|
message: number[],
|
|
signature: number[],
|
|
): Promise<boolean>;
|
|
seedOrderDraft(
|
|
gameId: string,
|
|
commands: ReadonlyArray<{
|
|
kind: "placeholder";
|
|
id: string;
|
|
label: string;
|
|
}>,
|
|
): Promise<void>;
|
|
clearOrderDraft(gameId: string): Promise<void>;
|
|
getMapPrimitives(): readonly MapPrimitiveSnapshot[];
|
|
getMapPickState(): MapPickStateSnapshot;
|
|
getMapCamera(): MapCameraSnapshot | null;
|
|
}
|
|
|
|
declare global {
|
|
interface Window {
|
|
__galaxyDebug?: DebugSurface;
|
|
}
|
|
}
|
|
|
|
const CANONICAL = Array.from(new TextEncoder().encode("phase-6-canonical"));
|
|
|
|
async function bootDebugPage(page: Page): Promise<void> {
|
|
await page.goto("/__debug/store");
|
|
await expect(page.getByTestId("debug-store-ready")).toBeVisible();
|
|
await page.waitForFunction(() => window.__galaxyDebug?.ready === true);
|
|
}
|
|
|
|
test("device keypair survives reload and produces verifiable signatures", async ({
|
|
page,
|
|
}) => {
|
|
await bootDebugPage(page);
|
|
// Wipe any leftover state from a previous Playwright run that
|
|
// shared the same browser profile.
|
|
await page.evaluate(() => window.__galaxyDebug!.clearSession());
|
|
|
|
const first = await page.evaluate(async (canonical) => {
|
|
const sess = await window.__galaxyDebug!.loadSession();
|
|
const signature = await window.__galaxyDebug!.signWithDevice(canonical);
|
|
return { publicKey: sess.publicKey, signature };
|
|
}, CANONICAL);
|
|
expect(first.publicKey.length).toBe(32);
|
|
expect(first.signature.length).toBe(64);
|
|
|
|
await page.reload();
|
|
await expect(page.getByTestId("debug-store-ready")).toBeVisible();
|
|
await page.waitForFunction(() => window.__galaxyDebug?.ready === true);
|
|
|
|
const second = await page.evaluate(
|
|
async ({ canonical, firstSig }) => {
|
|
const sess = await window.__galaxyDebug!.loadSession();
|
|
const fresh = await window.__galaxyDebug!.signWithDevice(canonical);
|
|
// Signatures produced before the reload must verify under the
|
|
// post-reload public key. A pre-reload signature only verifies
|
|
// when the persisted private key is identical to the original.
|
|
const prevVerifies =
|
|
await window.__galaxyDebug!.verifyWithStoredPublicKey(
|
|
canonical,
|
|
firstSig,
|
|
);
|
|
const freshVerifies =
|
|
await window.__galaxyDebug!.verifyWithStoredPublicKey(
|
|
canonical,
|
|
fresh,
|
|
);
|
|
return {
|
|
publicKey: sess.publicKey,
|
|
signature: fresh,
|
|
prevVerifies,
|
|
freshVerifies,
|
|
};
|
|
},
|
|
{ canonical: CANONICAL, firstSig: first.signature },
|
|
);
|
|
expect(second.publicKey).toEqual(first.publicKey);
|
|
expect(second.prevVerifies).toBe(true);
|
|
expect(second.freshVerifies).toBe(true);
|
|
});
|
|
|
|
test("clearDeviceSession forces a fresh keypair on next load", async ({
|
|
page,
|
|
}) => {
|
|
await bootDebugPage(page);
|
|
await page.evaluate(() => window.__galaxyDebug!.clearSession());
|
|
const before = await page.evaluate(async () => {
|
|
const sess = await window.__galaxyDebug!.loadSession();
|
|
return sess.publicKey;
|
|
});
|
|
|
|
await page.evaluate(() => window.__galaxyDebug!.clearSession());
|
|
const after = await page.evaluate(async () => {
|
|
const sess = await window.__galaxyDebug!.loadSession();
|
|
return sess.publicKey;
|
|
});
|
|
|
|
expect(after).not.toEqual(before);
|
|
});
|
|
|
|
test("setDeviceSessionId is observable through loadDeviceSession", async ({
|
|
page,
|
|
}) => {
|
|
await bootDebugPage(page);
|
|
await page.evaluate(() => window.__galaxyDebug!.clearSession());
|
|
const before = await page.evaluate(async () => {
|
|
const sess = await window.__galaxyDebug!.loadSession();
|
|
return sess.deviceSessionId;
|
|
});
|
|
expect(before).toBeNull();
|
|
|
|
await page.evaluate(() => window.__galaxyDebug!.setDeviceSessionId("dev-1"));
|
|
const after = await page.evaluate(async () => {
|
|
const sess = await window.__galaxyDebug!.loadSession();
|
|
return sess.deviceSessionId;
|
|
});
|
|
expect(after).toBe("dev-1");
|
|
});
|