Compare commits
5 Commits
632f309ffc
...
devin/1776
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
69d8635f3c | ||
| b66ec0a78f | |||
| 3ef71332dc | |||
| fd575000fe | |||
| cb376eda31 |
42
.github/workflows/ci.yml
vendored
42
.github/workflows/ci.yml
vendored
@@ -108,6 +108,48 @@ jobs:
|
||||
working-directory: orchestrator
|
||||
run: npm run build
|
||||
|
||||
orchestrator-test:
|
||||
name: Orchestrator Unit Tests
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: "18"
|
||||
cache: "npm"
|
||||
cache-dependency-path: orchestrator/package-lock.json
|
||||
- name: Install dependencies
|
||||
working-directory: orchestrator
|
||||
run: npm ci
|
||||
- name: Type check
|
||||
working-directory: orchestrator
|
||||
run: npx tsc --noEmit
|
||||
- name: Unit tests
|
||||
working-directory: orchestrator
|
||||
run: npm test
|
||||
|
||||
orchestrator-e2e:
|
||||
name: Orchestrator E2E (Testcontainers)
|
||||
runs-on: ubuntu-latest
|
||||
# Gap-analysis v2 §7.8 / §10.8 — opt-in E2E suite that brings up
|
||||
# a real Postgres container and exercises the lifecycle against it.
|
||||
# Gated on a workflow label so PR runs default to the fast unit
|
||||
# suite; add the `run-e2e` label to a PR to include this job.
|
||||
if: contains(github.event.pull_request.labels.*.name, 'run-e2e') || github.event_name == 'push'
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
- uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: "18"
|
||||
cache: "npm"
|
||||
cache-dependency-path: orchestrator/package-lock.json
|
||||
- name: Install dependencies
|
||||
working-directory: orchestrator
|
||||
run: npm ci
|
||||
- name: E2E tests (Testcontainers Postgres)
|
||||
working-directory: orchestrator
|
||||
run: npm run test:e2e
|
||||
|
||||
# Smart Contracts CI
|
||||
contracts-compile:
|
||||
name: Contracts Compile
|
||||
|
||||
@@ -4,6 +4,6 @@ module.exports = {
|
||||
testEnvironment: "node",
|
||||
roots: ["<rootDir>/tests"],
|
||||
testMatch: ["**/*.test.ts"],
|
||||
testPathIgnorePatterns: ["/node_modules/", "/integration/", "/chaos/", "/load/"],
|
||||
testPathIgnorePatterns: ["/node_modules/", "/integration/", "/chaos/", "/load/", "/e2e/"],
|
||||
moduleFileExtensions: ["ts", "js", "json"],
|
||||
};
|
||||
|
||||
18
orchestrator/jest.e2e.config.js
Normal file
18
orchestrator/jest.e2e.config.js
Normal file
@@ -0,0 +1,18 @@
|
||||
/** @type {import('jest').Config} */
|
||||
// E2E suite — runs the Testcontainers-backed integration tests
|
||||
// under tests/e2e/. Separate from the default jest.config.js because
|
||||
// it requires Docker and takes significantly longer.
|
||||
//
|
||||
// Usage:
|
||||
// RUN_E2E=1 npx jest --config=jest.e2e.config.js
|
||||
//
|
||||
// CI wires this into a dedicated e2e workflow step so the normal
|
||||
// unit-test suite stays <5s.
|
||||
module.exports = {
|
||||
preset: "ts-jest",
|
||||
testEnvironment: "node",
|
||||
roots: ["<rootDir>/tests/e2e"],
|
||||
testMatch: ["**/*.e2e.test.ts"],
|
||||
moduleFileExtensions: ["ts", "js", "json"],
|
||||
testTimeout: 120_000,
|
||||
};
|
||||
@@ -8,6 +8,7 @@
|
||||
"dev": "ts-node src/index.ts",
|
||||
"start": "node dist/index.js",
|
||||
"test": "jest",
|
||||
"test:e2e": "RUN_E2E=1 jest --config=jest.e2e.config.js",
|
||||
"migrate": "ts-node src/db/migrations/index.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
@@ -27,6 +28,7 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@jest/globals": "^30.3.0",
|
||||
"@testcontainers/postgresql": "^11.14.0",
|
||||
"@types/cors": "^2.8.17",
|
||||
"@types/express": "^4.17.21",
|
||||
"@types/jest": "^30.0.0",
|
||||
@@ -36,6 +38,7 @@
|
||||
"@types/uuid": "^9.0.6",
|
||||
"jest": "^30.3.0",
|
||||
"supertest": "^7.2.2",
|
||||
"testcontainers": "^11.14.0",
|
||||
"ts-jest": "^29.4.9",
|
||||
"ts-node": "^10.9.2",
|
||||
"typescript": "^5.3.3"
|
||||
|
||||
44
orchestrator/src/db/migrations/004_idempotency_keys.ts
Normal file
44
orchestrator/src/db/migrations/004_idempotency_keys.ts
Normal file
@@ -0,0 +1,44 @@
|
||||
import { query } from "../postgres";
|
||||
|
||||
/**
|
||||
* Migration 004 — idempotency keys + replay protection (arch §13,
|
||||
* §15: deterministic state transitions, idempotent event handling,
|
||||
* resilience to duplicate messages).
|
||||
*
|
||||
* A caller supplies an `Idempotency-Key` header on POST requests.
|
||||
* The server records `{ key, request_hash, response_body, status_code }`
|
||||
* on first success and replays the cached response on subsequent
|
||||
* requests with the same key. If the request body changes while the
|
||||
* key is reused the server returns 422 with `key_reused_with_different_payload`.
|
||||
*
|
||||
* Scoped by `(method, path, key)` so the same key can safely appear
|
||||
* across unrelated endpoints.
|
||||
*
|
||||
* Rows expire after 24h — enough to cover retry windows, short enough
|
||||
* to keep the table bounded.
|
||||
*/
|
||||
export async function up() {
|
||||
await query(
|
||||
`CREATE TABLE IF NOT EXISTS idempotency_keys (
|
||||
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
method VARCHAR(8) NOT NULL,
|
||||
path VARCHAR(512) NOT NULL,
|
||||
key VARCHAR(255) NOT NULL,
|
||||
request_hash CHAR(64) NOT NULL,
|
||||
status_code INTEGER NOT NULL,
|
||||
response_body JSONB NOT NULL,
|
||||
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
expires_at TIMESTAMPTZ NOT NULL DEFAULT (CURRENT_TIMESTAMP + INTERVAL '24 hours'),
|
||||
UNIQUE (method, path, key)
|
||||
)`,
|
||||
);
|
||||
|
||||
await query(
|
||||
`CREATE INDEX IF NOT EXISTS idx_idempotency_expires_at
|
||||
ON idempotency_keys(expires_at)`,
|
||||
);
|
||||
}
|
||||
|
||||
export async function down() {
|
||||
await query("DROP TABLE IF EXISTS idempotency_keys CASCADE");
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
import { up as up001 } from "./001_initial_schema";
|
||||
import { up as up002 } from "./002_transaction_state";
|
||||
import { up as up003 } from "./003_events";
|
||||
import { up as up004 } from "./004_idempotency_keys";
|
||||
|
||||
/**
|
||||
* Run all migrations
|
||||
@@ -10,6 +11,7 @@ export async function runMigration() {
|
||||
await up001();
|
||||
await up002();
|
||||
await up003();
|
||||
await up004();
|
||||
console.log("All migrations completed");
|
||||
} catch (error) {
|
||||
console.error("Migration failed:", error);
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
requestId,
|
||||
apiKeyAuth,
|
||||
auditLog,
|
||||
idempotencyMiddleware,
|
||||
} from "./middleware";
|
||||
import { requestTimeout } from "./middleware/timeout";
|
||||
import { logger } from "./logging/logger";
|
||||
@@ -86,7 +87,7 @@ app.use("/api", apiLimiter);
|
||||
|
||||
// Plan management endpoints
|
||||
app.get("/api/plans", listPlansEndpoint);
|
||||
app.post("/api/plans", auditLog("CREATE_PLAN", "plan"), createPlan);
|
||||
app.post("/api/plans", idempotencyMiddleware, auditLog("CREATE_PLAN", "plan"), createPlan);
|
||||
app.get("/api/plans/:planId", getPlan);
|
||||
app.get("/api/plans/:planId/state", getPlanState);
|
||||
app.get("/api/plans/:planId/events", getPlanEvents);
|
||||
@@ -97,7 +98,7 @@ app.post("/api/plans/:planId/validate", validatePlanEndpoint);
|
||||
// Execution endpoints
|
||||
import { executePlan, getExecutionStatus, abortExecution } from "./api/execution";
|
||||
import { registerWebhook } from "./api/webhooks";
|
||||
app.post("/api/plans/:planId/execute", auditLog("EXECUTE_PLAN", "plan"), executePlan);
|
||||
app.post("/api/plans/:planId/execute", idempotencyMiddleware, auditLog("EXECUTE_PLAN", "plan"), executePlan);
|
||||
app.get("/api/plans/:planId/status", getExecutionStatus);
|
||||
app.post("/api/plans/:planId/abort", auditLog("ABORT_PLAN", "plan"), abortExecution);
|
||||
app.post("/api/webhooks", registerWebhook);
|
||||
|
||||
120
orchestrator/src/middleware/idempotency.ts
Normal file
120
orchestrator/src/middleware/idempotency.ts
Normal file
@@ -0,0 +1,120 @@
|
||||
/**
|
||||
* Idempotency-Key middleware (arch §13 security requirements,
|
||||
* §15 non-functional: idempotent event handling, replay protection).
|
||||
*
|
||||
* Contract
|
||||
* --------
|
||||
* - If the client sends `Idempotency-Key`, the server records the
|
||||
* first successful (2xx) response and replays it verbatim on
|
||||
* subsequent requests with the same key + method + path.
|
||||
* - If the same key is re-used with a different request body the
|
||||
* server returns 422 `idempotency_key_reused` — this catches
|
||||
* client bugs where a key is accidentally reused across unrelated
|
||||
* requests.
|
||||
* - Keys are scoped by `(method, path, key)` and expire after 24h.
|
||||
* - Responses are captured by shimming `res.json()` — no deep
|
||||
* integration with route handlers required.
|
||||
* - Non-2xx responses are **not** cached so transient errors can be
|
||||
* retried without poisoning the cache.
|
||||
*
|
||||
* The middleware is transport-agnostic: routes that opt in just mount
|
||||
* `idempotencyMiddleware` ahead of the handler.
|
||||
*/
|
||||
|
||||
import type { NextFunction, Request, Response } from "express";
|
||||
import { createHash } from "crypto";
|
||||
import { query } from "../db/postgres";
|
||||
import { logger } from "../logging/logger";
|
||||
|
||||
export const IDEMPOTENCY_HEADER = "idempotency-key";
|
||||
const KEY_PATTERN = /^[A-Za-z0-9_\-:.]{8,255}$/;
|
||||
|
||||
function hashBody(body: unknown): string {
|
||||
const canonical = body === undefined ? "" : JSON.stringify(body);
|
||||
return createHash("sha256").update(canonical).digest("hex");
|
||||
}
|
||||
|
||||
interface CachedRow {
|
||||
request_hash: string;
|
||||
status_code: number;
|
||||
response_body: unknown;
|
||||
}
|
||||
|
||||
export async function idempotencyMiddleware(
|
||||
req: Request,
|
||||
res: Response,
|
||||
next: NextFunction,
|
||||
): Promise<void> {
|
||||
const rawKey = req.header(IDEMPOTENCY_HEADER);
|
||||
if (!rawKey) {
|
||||
next();
|
||||
return;
|
||||
}
|
||||
if (!KEY_PATTERN.test(rawKey)) {
|
||||
res.status(400).json({
|
||||
error: "idempotency_key_invalid",
|
||||
message: "Idempotency-Key must match /^[A-Za-z0-9_\\-:.]{8,255}$/",
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
const key = rawKey;
|
||||
const method = req.method;
|
||||
const path = req.baseUrl + req.path;
|
||||
const requestHash = hashBody(req.body);
|
||||
|
||||
try {
|
||||
const rows = await query<CachedRow>(
|
||||
`SELECT request_hash, status_code, response_body
|
||||
FROM idempotency_keys
|
||||
WHERE method = $1 AND path = $2 AND key = $3
|
||||
AND expires_at > CURRENT_TIMESTAMP
|
||||
LIMIT 1`,
|
||||
[method, path, key],
|
||||
);
|
||||
|
||||
if (rows.length > 0) {
|
||||
const cached = rows[0];
|
||||
if (cached.request_hash !== requestHash) {
|
||||
res.status(422).json({
|
||||
error: "idempotency_key_reused",
|
||||
message: "This Idempotency-Key was previously used with a different request body.",
|
||||
});
|
||||
return;
|
||||
}
|
||||
res.setHeader("Idempotent-Replayed", "true");
|
||||
res.status(cached.status_code).json(cached.response_body);
|
||||
return;
|
||||
}
|
||||
} catch (err) {
|
||||
// Fail open: if the lookup fails we still process the request so
|
||||
// the caller never sees a hard 500 because the dedup table is
|
||||
// unavailable. The downside (a missed replay on the first retry)
|
||||
// is much less bad than every write failing.
|
||||
logger.warn({ err }, "[Idempotency] lookup failed, falling open");
|
||||
}
|
||||
|
||||
const originalJson = res.json.bind(res);
|
||||
res.json = (body: unknown): Response => {
|
||||
const statusCode = res.statusCode;
|
||||
// Only cache 2xx — transient 5xx / validation 4xx stays retryable.
|
||||
if (statusCode >= 200 && statusCode < 300) {
|
||||
// Fire-and-forget; response is already known and can be sent.
|
||||
query(
|
||||
`INSERT INTO idempotency_keys
|
||||
(method, path, key, request_hash, status_code, response_body)
|
||||
VALUES ($1, $2, $3, $4, $5, $6::jsonb)
|
||||
ON CONFLICT (method, path, key) DO NOTHING`,
|
||||
[method, path, key, requestHash, statusCode, JSON.stringify(body)],
|
||||
).catch((err) => {
|
||||
logger.warn({ err, key, method, path }, "[Idempotency] write failed");
|
||||
});
|
||||
}
|
||||
return originalJson(body);
|
||||
};
|
||||
|
||||
next();
|
||||
}
|
||||
|
||||
/** exposed for tests */
|
||||
export const __testing = { hashBody, KEY_PATTERN };
|
||||
@@ -5,4 +5,5 @@ export { validate, sanitizeInput } from "./validation";
|
||||
export { ipWhitelist, getClientIP } from "./ipWhitelist";
|
||||
export { auditLog } from "./auditLog";
|
||||
export { sessionManager } from "./session";
|
||||
export { idempotencyMiddleware, IDEMPOTENCY_HEADER } from "./idempotency";
|
||||
|
||||
|
||||
178
orchestrator/tests/e2e/transactionLifecycle.e2e.test.ts
Normal file
178
orchestrator/tests/e2e/transactionLifecycle.e2e.test.ts
Normal file
@@ -0,0 +1,178 @@
|
||||
/**
|
||||
* E2E transaction lifecycle (gap-analysis v2 §7.8 / §10.8).
|
||||
*
|
||||
* Brings up:
|
||||
* - Postgres via @testcontainers/postgresql
|
||||
* - All migrations 001–006 applied
|
||||
* - A real in-process Express app wired with the plans/transitions
|
||||
* endpoints, backed by the live container pool.
|
||||
*
|
||||
* Skipped unless RUN_E2E=1 and Docker is reachable. This is the
|
||||
* pattern used across the codebase for heavyweight integration
|
||||
* tests so CI runs can opt in via a single flag.
|
||||
*
|
||||
* NB: Chain-138 RPC, SWIFT gateway, and Redis are all mocked-local
|
||||
* by default. PR Q is the scaffolding; PR R stands up the FIN-link
|
||||
* sandbox transport; a follow-up can swap the DLT mock for a ganache
|
||||
* container when the contract fixtures are stable.
|
||||
*/
|
||||
|
||||
import { describe, it, expect, beforeAll, afterAll } from "@jest/globals";
|
||||
import express from "express";
|
||||
import request from "supertest";
|
||||
|
||||
const shouldRun = process.env.RUN_E2E === "1";
|
||||
|
||||
// Use describe.skip when the env flag is off so Jest reports the
|
||||
// suite as skipped instead of failing to import testcontainers.
|
||||
const d = shouldRun ? describe : describe.skip;
|
||||
|
||||
d("E2E transaction lifecycle (Postgres testcontainer)", () => {
|
||||
let pgContainer: unknown;
|
||||
let connectionString = "";
|
||||
let app: express.Express;
|
||||
|
||||
beforeAll(async () => {
|
||||
const { PostgreSqlContainer } = await import("@testcontainers/postgresql");
|
||||
const container = await new PostgreSqlContainer("postgres:15-alpine")
|
||||
.withDatabase("ccflow_e2e")
|
||||
.withUsername("ccflow")
|
||||
.withPassword("ccflow")
|
||||
.start();
|
||||
pgContainer = container;
|
||||
connectionString = container.getConnectionUri();
|
||||
|
||||
process.env.DATABASE_URL = connectionString;
|
||||
process.env.SESSION_SECRET =
|
||||
"e2e-session-secret-must-be-at-least-32-chars-long!";
|
||||
process.env.NODE_ENV = "test";
|
||||
|
||||
// Import after env set so migrations/pool read the container URL.
|
||||
const { getPool, query } = await import("../../src/db/postgres");
|
||||
await query(`CREATE EXTENSION IF NOT EXISTS pgcrypto`);
|
||||
|
||||
// schema.sql contains $$...$$ dollar-quoted functions that break
|
||||
// the naive semicolon splitter in 001_initial_schema.ts. Feed the
|
||||
// file straight to pg's simple-query protocol (supports multi-stmt).
|
||||
const fs = await import("fs");
|
||||
const path = await import("path");
|
||||
const schemaSql = fs.readFileSync(
|
||||
path.join(__dirname, "../../src/db/schema.sql"),
|
||||
"utf-8",
|
||||
);
|
||||
const pool = getPool();
|
||||
const client = await pool.connect();
|
||||
try {
|
||||
await client.query(schemaSql);
|
||||
} finally {
|
||||
client.release();
|
||||
}
|
||||
|
||||
// Run the numbered migrations after schema.sql.
|
||||
const { up: up002 } = await import("../../src/db/migrations/002_transaction_state");
|
||||
const { up: up003 } = await import("../../src/db/migrations/003_events");
|
||||
const { up: up004 } = await import("../../src/db/migrations/004_idempotency_keys");
|
||||
await up002();
|
||||
await up003();
|
||||
await up004();
|
||||
|
||||
// Minimal app wiring — only the routes this suite exercises.
|
||||
const { createPlan, getPlan } = await import("../../src/api/plans");
|
||||
|
||||
app = express();
|
||||
app.use(express.json());
|
||||
app.post("/api/plans", createPlan);
|
||||
app.get("/api/plans/:planId", getPlan);
|
||||
}, 120_000);
|
||||
|
||||
afterAll(async () => {
|
||||
const { closePool } = await import("../../src/db/postgres");
|
||||
await closePool();
|
||||
if (pgContainer && typeof (pgContainer as { stop?: () => Promise<void> }).stop === "function") {
|
||||
await (pgContainer as { stop: () => Promise<void> }).stop();
|
||||
}
|
||||
}, 60_000);
|
||||
|
||||
const validPayStep = {
|
||||
type: "pay",
|
||||
asset: "USD",
|
||||
amount: 100,
|
||||
beneficiary: { IBAN: "AE070331234567890123456", BIC: "EBILAEAD", name: "Beneficiary Co" },
|
||||
};
|
||||
|
||||
it("persists a created plan and reads it back", async () => {
|
||||
const create = await request(app)
|
||||
.post("/api/plans")
|
||||
.send({
|
||||
creator: "0xtest-creator",
|
||||
steps: [validPayStep],
|
||||
})
|
||||
.expect(201);
|
||||
|
||||
expect(create.body.plan_id).toBeDefined();
|
||||
expect(create.body.plan_hash).toMatch(/^[0-9a-fA-F]{64}$/);
|
||||
|
||||
const read = await request(app)
|
||||
.get(`/api/plans/${create.body.plan_id}`)
|
||||
.expect(200);
|
||||
expect(read.body.plan_id).toBe(create.body.plan_id);
|
||||
}, 30_000);
|
||||
|
||||
it("publishes a signed event row via the live event bus", async () => {
|
||||
const create = await request(app)
|
||||
.post("/api/plans")
|
||||
.send({
|
||||
creator: "0xtest-creator-2",
|
||||
steps: [validPayStep],
|
||||
})
|
||||
.expect(201);
|
||||
|
||||
const { publish, getEventsForPlan, verifyChain } = await import(
|
||||
"../../src/services/eventBus"
|
||||
);
|
||||
await publish({
|
||||
planId: create.body.plan_id,
|
||||
type: "transaction.created",
|
||||
actor: "e2e",
|
||||
payload: { plan_hash: create.body.plan_hash },
|
||||
});
|
||||
await publish({
|
||||
planId: create.body.plan_id,
|
||||
type: "transaction.prepared",
|
||||
actor: "e2e",
|
||||
payload: {},
|
||||
});
|
||||
|
||||
const events = await getEventsForPlan(create.body.plan_id);
|
||||
expect(events).toHaveLength(2);
|
||||
expect(events[0].prev_hash).toBeNull();
|
||||
expect(events[1].prev_hash).toBe(events[0].signature);
|
||||
|
||||
const chain = await verifyChain(create.body.plan_id);
|
||||
expect(chain.ok).toBe(true);
|
||||
}, 30_000);
|
||||
|
||||
it("idempotency_keys table persists a request-id fingerprint", async () => {
|
||||
const { query } = await import("../../src/db/postgres");
|
||||
await query(
|
||||
`INSERT INTO idempotency_keys (key, method, path, request_hash, response_body, status_code)
|
||||
VALUES ($1, $2, $3, $4, $5::jsonb, $6)`,
|
||||
["e2e-key-1", "POST", "/api/plans", "h".repeat(64), JSON.stringify({ ok: true }), 201],
|
||||
);
|
||||
const rows = await query<{ key: string }>(
|
||||
`SELECT key FROM idempotency_keys WHERE key = $1`,
|
||||
["e2e-key-1"],
|
||||
);
|
||||
expect(rows).toHaveLength(1);
|
||||
}, 30_000);
|
||||
});
|
||||
|
||||
describe("E2E suite guard", () => {
|
||||
it("skipped when RUN_E2E is not set", () => {
|
||||
if (!shouldRun) {
|
||||
expect(shouldRun).toBe(false);
|
||||
return;
|
||||
}
|
||||
expect(true).toBe(true);
|
||||
});
|
||||
});
|
||||
177
orchestrator/tests/unit/idempotency.test.ts
Normal file
177
orchestrator/tests/unit/idempotency.test.ts
Normal file
@@ -0,0 +1,177 @@
|
||||
import { describe, it, expect, beforeEach, jest } from "@jest/globals";
|
||||
import type { Request, Response, NextFunction } from "express";
|
||||
|
||||
type Row = {
|
||||
method: string;
|
||||
path: string;
|
||||
key: string;
|
||||
request_hash: string;
|
||||
status_code: number;
|
||||
response_body: unknown;
|
||||
};
|
||||
|
||||
const store = new Map<string, Row>();
|
||||
|
||||
jest.mock("../../src/db/postgres", () => ({
|
||||
query: async (sql: string, params: unknown[] = []) => {
|
||||
if (sql.startsWith("SELECT request_hash")) {
|
||||
const [method, path, key] = params as [string, string, string];
|
||||
const row = store.get(`${method}|${path}|${key}`);
|
||||
return row ? [row] : [];
|
||||
}
|
||||
if (sql.startsWith("INSERT INTO idempotency_keys")) {
|
||||
const [method, path, key, request_hash, status_code, body] = params as [
|
||||
string, string, string, string, number, string,
|
||||
];
|
||||
const k = `${method}|${path}|${key}`;
|
||||
if (!store.has(k)) {
|
||||
store.set(k, {
|
||||
method,
|
||||
path,
|
||||
key,
|
||||
request_hash,
|
||||
status_code,
|
||||
response_body: JSON.parse(body),
|
||||
});
|
||||
}
|
||||
return [];
|
||||
}
|
||||
return [];
|
||||
},
|
||||
}));
|
||||
|
||||
import { idempotencyMiddleware, IDEMPOTENCY_HEADER } from "../../src/middleware/idempotency";
|
||||
|
||||
function makeReqRes(overrides: {
|
||||
header?: string;
|
||||
method?: string;
|
||||
baseUrl?: string;
|
||||
path?: string;
|
||||
body?: unknown;
|
||||
}) {
|
||||
const req = {
|
||||
method: overrides.method ?? "POST",
|
||||
baseUrl: overrides.baseUrl ?? "",
|
||||
path: overrides.path ?? "/api/plans",
|
||||
body: overrides.body ?? { a: 1 },
|
||||
header(name: string) {
|
||||
return name.toLowerCase() === IDEMPOTENCY_HEADER ? overrides.header : undefined;
|
||||
},
|
||||
} as unknown as Request;
|
||||
const captured: { status?: number; body?: unknown; headers: Record<string, string> } = {
|
||||
headers: {},
|
||||
};
|
||||
const res: Partial<Response> = {
|
||||
statusCode: 200,
|
||||
status(code: number) {
|
||||
this.statusCode = code;
|
||||
captured.status = code;
|
||||
return this as Response;
|
||||
},
|
||||
json(body: unknown) {
|
||||
captured.body = body;
|
||||
if (captured.status === undefined) captured.status = this.statusCode;
|
||||
return this as Response;
|
||||
},
|
||||
setHeader(name: string, value: string | number | readonly string[]) {
|
||||
captured.headers[name] = String(value);
|
||||
return this as Response;
|
||||
},
|
||||
};
|
||||
return { req, res: res as Response, captured };
|
||||
}
|
||||
|
||||
describe("Idempotency middleware", () => {
|
||||
beforeEach(() => {
|
||||
store.clear();
|
||||
});
|
||||
|
||||
it("skips when no Idempotency-Key header is set", async () => {
|
||||
const { req, res } = makeReqRes({});
|
||||
const next = jest.fn() as unknown as NextFunction;
|
||||
await idempotencyMiddleware(req, res, next);
|
||||
expect(next).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("rejects malformed keys with 400", async () => {
|
||||
const { req, res, captured } = makeReqRes({ header: "short" });
|
||||
const next = jest.fn() as unknown as NextFunction;
|
||||
await idempotencyMiddleware(req, res, next);
|
||||
expect(next).not.toHaveBeenCalled();
|
||||
expect(captured.status).toBe(400);
|
||||
expect((captured.body as { error: string }).error).toBe("idempotency_key_invalid");
|
||||
});
|
||||
|
||||
it("caches 2xx responses on first call and replays on second", async () => {
|
||||
const key = "ABC12345_test-key";
|
||||
|
||||
const first = makeReqRes({ header: key });
|
||||
const next1 = jest.fn() as unknown as NextFunction;
|
||||
await idempotencyMiddleware(first.req, first.res, next1);
|
||||
expect(next1).toHaveBeenCalledTimes(1);
|
||||
// Simulate handler sending JSON response
|
||||
first.res.status(201);
|
||||
first.res.json({ plan_id: "p-1", created: true });
|
||||
|
||||
// Let the fire-and-forget INSERT microtask flush
|
||||
await new Promise((r) => setImmediate(r));
|
||||
|
||||
const second = makeReqRes({ header: key });
|
||||
const next2 = jest.fn() as unknown as NextFunction;
|
||||
await idempotencyMiddleware(second.req, second.res, next2);
|
||||
expect(next2).not.toHaveBeenCalled();
|
||||
expect(second.captured.status).toBe(201);
|
||||
expect(second.captured.body).toEqual({ plan_id: "p-1", created: true });
|
||||
expect(second.captured.headers["Idempotent-Replayed"]).toBe("true");
|
||||
});
|
||||
|
||||
it("rejects reuse with a different body as 422", async () => {
|
||||
const key = "ABC12345_test-key";
|
||||
|
||||
const first = makeReqRes({ header: key, body: { a: 1 } });
|
||||
const next1 = jest.fn() as unknown as NextFunction;
|
||||
await idempotencyMiddleware(first.req, first.res, next1);
|
||||
first.res.status(200);
|
||||
first.res.json({ ok: true });
|
||||
await new Promise((r) => setImmediate(r));
|
||||
|
||||
const second = makeReqRes({ header: key, body: { a: 2 } });
|
||||
const next2 = jest.fn() as unknown as NextFunction;
|
||||
await idempotencyMiddleware(second.req, second.res, next2);
|
||||
expect(next2).not.toHaveBeenCalled();
|
||||
expect(second.captured.status).toBe(422);
|
||||
expect((second.captured.body as { error: string }).error).toBe("idempotency_key_reused");
|
||||
});
|
||||
|
||||
it("does NOT cache non-2xx responses (retryable)", async () => {
|
||||
const key = "ABC12345_test-key";
|
||||
|
||||
const first = makeReqRes({ header: key });
|
||||
await idempotencyMiddleware(first.req, first.res, jest.fn() as unknown as NextFunction);
|
||||
first.res.status(500);
|
||||
first.res.json({ error: "boom" });
|
||||
await new Promise((r) => setImmediate(r));
|
||||
|
||||
// Retry should go through (no replay)
|
||||
const second = makeReqRes({ header: key });
|
||||
const next2 = jest.fn() as unknown as NextFunction;
|
||||
await idempotencyMiddleware(second.req, second.res, next2);
|
||||
expect(next2).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("scopes by (method, path, key)", async () => {
|
||||
const key = "ABC12345_test-key";
|
||||
|
||||
const createPlan = makeReqRes({ header: key, path: "/api/plans" });
|
||||
await idempotencyMiddleware(createPlan.req, createPlan.res, jest.fn() as unknown as NextFunction);
|
||||
createPlan.res.status(201);
|
||||
createPlan.res.json({ plan_id: "p-1" });
|
||||
await new Promise((r) => setImmediate(r));
|
||||
|
||||
// Same key on a different path: should pass through, not replay
|
||||
const execute = makeReqRes({ header: key, path: "/api/plans/p-1/execute" });
|
||||
const nextExec = jest.fn() as unknown as NextFunction;
|
||||
await idempotencyMiddleware(execute.req, execute.res, nextExec);
|
||||
expect(nextExec).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
@@ -7,6 +7,7 @@ import TreasuryPage from './pages/TreasuryPage';
|
||||
import ReportingPage from './pages/ReportingPage';
|
||||
import CompliancePage from './pages/CompliancePage';
|
||||
import SettlementsPage from './pages/SettlementsPage';
|
||||
import TransactionsPage from './pages/TransactionsPage';
|
||||
import PortalLayout from './components/portal/PortalLayout';
|
||||
import LiveChainBanner from './components/portal/LiveChainBanner';
|
||||
import App from './App';
|
||||
@@ -131,6 +132,28 @@ export default function Portal() {
|
||||
}
|
||||
/>
|
||||
|
||||
<Route
|
||||
path="/transactions"
|
||||
element={
|
||||
<ProtectedRoute>
|
||||
<PortalLayout>
|
||||
<TransactionsPage />
|
||||
</PortalLayout>
|
||||
</ProtectedRoute>
|
||||
}
|
||||
/>
|
||||
|
||||
<Route
|
||||
path="/transactions/:planId"
|
||||
element={
|
||||
<ProtectedRoute>
|
||||
<PortalLayout>
|
||||
<TransactionsPage />
|
||||
</PortalLayout>
|
||||
</ProtectedRoute>
|
||||
}
|
||||
/>
|
||||
|
||||
<Route
|
||||
path="/settings"
|
||||
element={
|
||||
|
||||
@@ -4,12 +4,13 @@ import { useAuth } from '../../contexts/AuthContext';
|
||||
import {
|
||||
LayoutDashboard, Zap, Building2, Landmark, FileText, Shield, CheckSquare,
|
||||
Settings, LogOut, ChevronLeft, ChevronRight, Bell, User, Copy,
|
||||
ExternalLink, ChevronDown
|
||||
ExternalLink, ChevronDown, GitBranch
|
||||
} from 'lucide-react';
|
||||
|
||||
const navItems = [
|
||||
{ id: 'dashboard', label: 'Overview', icon: LayoutDashboard, path: '/dashboard' },
|
||||
{ id: 'transaction-builder', label: 'Transaction Builder', icon: Zap, path: '/transaction-builder' },
|
||||
{ id: 'transactions', label: 'Transactions', icon: GitBranch, path: '/transactions' },
|
||||
{ id: 'accounts', label: 'Accounts', icon: Building2, path: '/accounts' },
|
||||
{ id: 'treasury', label: 'Treasury', icon: Landmark, path: '/treasury' },
|
||||
{ id: 'reporting', label: 'Reporting', icon: FileText, path: '/reporting' },
|
||||
|
||||
51
src/components/portal/StateMachineView.tsx
Normal file
51
src/components/portal/StateMachineView.tsx
Normal file
@@ -0,0 +1,51 @@
|
||||
import { TRANSACTION_STATES, type StateTransition, type TransactionState } from '../../services/orchestrator';
|
||||
|
||||
interface StateMachineViewProps {
|
||||
current: TransactionState;
|
||||
transitions: StateTransition[];
|
||||
}
|
||||
|
||||
/**
|
||||
* Renders the 12-state transaction machine from the architecture note
|
||||
* §8. Visited states are highlighted in the order they were entered;
|
||||
* the current state is emphasised. Intended as an audit-friendly view
|
||||
* for the /transactions page, NOT a full graph editor.
|
||||
*/
|
||||
export default function StateMachineView({ current, transitions }: StateMachineViewProps) {
|
||||
const visited = new Set<string>(transitions.map((t) => t.to_state));
|
||||
if (transitions.length > 0 && transitions[0].from_state === null) {
|
||||
visited.add(transitions[0].to_state);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="state-machine-view">
|
||||
<div className="state-machine-grid">
|
||||
{TRANSACTION_STATES.map((state) => {
|
||||
const isCurrent = state === current;
|
||||
const isVisited = visited.has(state);
|
||||
const isTerminal = state === 'COMMITTED' || state === 'ABORTED' || state === 'CLOSED';
|
||||
const classes = [
|
||||
'state-pill',
|
||||
isCurrent ? 'state-pill--current' : '',
|
||||
!isCurrent && isVisited ? 'state-pill--visited' : '',
|
||||
!isVisited ? 'state-pill--pending' : '',
|
||||
isTerminal ? 'state-pill--terminal' : '',
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' ');
|
||||
return (
|
||||
<div key={state} className={classes} data-testid={`state-${state}`}>
|
||||
<span className="state-pill-dot" aria-hidden="true" />
|
||||
<span className="state-pill-label">{state.replace(/_/g, ' ')}</span>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
<div className="state-machine-legend">
|
||||
<span className="legend-item"><span className="dot dot--current" />current</span>
|
||||
<span className="legend-item"><span className="dot dot--visited" />visited</span>
|
||||
<span className="legend-item"><span className="dot dot--pending" />not yet reached</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -40,6 +40,13 @@ export interface EndpointConfig {
|
||||
* banking API is stood up. */
|
||||
mocked: true;
|
||||
};
|
||||
orchestrator: {
|
||||
/** CurrenciCombo/orchestrator base URL (plan-state + event stream
|
||||
* for /transactions page). Empty string means "not deployed —
|
||||
* fall back to mock demo data". */
|
||||
baseUrl: string;
|
||||
deployed: boolean;
|
||||
};
|
||||
}
|
||||
|
||||
const env = (import.meta as unknown as { env?: Record<string, string> }).env ?? {};
|
||||
@@ -66,12 +73,16 @@ export const endpoints: EndpointConfig = {
|
||||
apiBaseUrl: env.VITE_DBIS_CORE_API_BASE_URL || 'https://api.dbis-core.d-bis.org',
|
||||
mocked: true,
|
||||
},
|
||||
orchestrator: {
|
||||
baseUrl: env.VITE_ORCHESTRATOR_URL || '',
|
||||
deployed: Boolean(env.VITE_ORCHESTRATOR_URL),
|
||||
},
|
||||
};
|
||||
|
||||
export type BackendStatus = 'live' | 'bff-required' | 'mocked' | 'degraded';
|
||||
|
||||
export interface BackendDescriptor {
|
||||
id: 'chain138' | 'explorer' | 'proxmox' | 'dbisCore';
|
||||
id: 'chain138' | 'explorer' | 'proxmox' | 'dbisCore' | 'orchestrator';
|
||||
name: string;
|
||||
status: BackendStatus;
|
||||
url: string;
|
||||
@@ -107,4 +118,13 @@ export const backendCatalog: BackendDescriptor[] = [
|
||||
url: endpoints.dbisCore.apiBaseUrl,
|
||||
note: 'No public deployment yet. UI falls back to sample portal data.',
|
||||
},
|
||||
{
|
||||
id: 'orchestrator',
|
||||
name: 'Transaction Orchestrator',
|
||||
status: endpoints.orchestrator.deployed ? 'live' : 'mocked',
|
||||
url: endpoints.orchestrator.baseUrl || '(not deployed)',
|
||||
note: endpoints.orchestrator.deployed
|
||||
? 'CurrenciCombo orchestrator — plan state + event stream.'
|
||||
: 'Orchestrator not yet deployed. /transactions page renders demo plans.',
|
||||
},
|
||||
];
|
||||
|
||||
@@ -3851,3 +3851,96 @@ html, body, #root {
|
||||
border-radius: 4px;
|
||||
color: var(--accent);
|
||||
}
|
||||
|
||||
/* ================================================================= */
|
||||
/* /transactions page (PR G — arch step 8) */
|
||||
/* ================================================================= */
|
||||
|
||||
.transactions-page { padding: 24px; display: flex; flex-direction: column; gap: 20px; }
|
||||
.transactions-page .back-button {
|
||||
background: none; border: none; color: var(--accent);
|
||||
cursor: pointer; font-size: 13px; padding: 0; margin-bottom: 8px;
|
||||
}
|
||||
.transactions-page .back-button:hover { text-decoration: underline; }
|
||||
|
||||
.source-badge {
|
||||
font-size: 10px; letter-spacing: 0.08em; padding: 2px 8px;
|
||||
border-radius: 10px; font-weight: 600; text-transform: uppercase;
|
||||
}
|
||||
.source-badge--live { background: rgba(34,197,94,0.15); color: #22c55e; }
|
||||
.source-badge--degraded { background: rgba(239,68,68,0.15); color: #ef4444; }
|
||||
.source-badge--mocked { background: rgba(148,163,184,0.20); color: #94a3b8; }
|
||||
|
||||
.portal-table { width: 100%; border-collapse: collapse; font-size: 13px; }
|
||||
.portal-table th, .portal-table td { padding: 10px 12px; text-align: left; border-bottom: 1px solid rgba(148,163,184,0.12); }
|
||||
.portal-table th { font-size: 11px; text-transform: uppercase; letter-spacing: 0.06em; color: #94a3b8; font-weight: 600; }
|
||||
.portal-table tbody tr { transition: background 0.12s ease; }
|
||||
.portal-table .portal-table-row { cursor: pointer; }
|
||||
.portal-table .portal-table-row:hover { background: rgba(99,102,241,0.06); }
|
||||
.portal-table .mono { font-family: ui-monospace, Menlo, Consolas, monospace; font-size: 12px; }
|
||||
.portal-table .truncate { max-width: 180px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||
.portal-table .row-chevron { color: #64748b; }
|
||||
|
||||
.state-chip, .role-chip {
|
||||
display: inline-flex; align-items: center; gap: 6px;
|
||||
padding: 3px 10px; border-radius: 999px; font-size: 11px;
|
||||
font-weight: 600; letter-spacing: 0.04em; text-transform: uppercase;
|
||||
background: rgba(99,102,241,0.14); color: #a5b4fc;
|
||||
}
|
||||
.state-chip--committed { background: rgba(34,197,94,0.15); color: #22c55e; }
|
||||
.state-chip--aborted { background: rgba(239,68,68,0.15); color: #ef4444; }
|
||||
.state-chip--validating,
|
||||
.state-chip--executing,
|
||||
.state-chip--partially_executed { background: rgba(245,158,11,0.15); color: #f59e0b; }
|
||||
.state-chip--draft { background: rgba(148,163,184,0.18); color: #cbd5e1; }
|
||||
.state-chip--closed { background: rgba(148,163,184,0.25); color: #e2e8f0; }
|
||||
|
||||
.role-chip--submitter { background: rgba(99,102,241,0.14); color: #a5b4fc; }
|
||||
.role-chip--approver { background: rgba(245,158,11,0.14); color: #f59e0b; }
|
||||
.role-chip--releaser { background: rgba(14,165,233,0.14); color: #38bdf8; }
|
||||
.role-chip--validator { background: rgba(168,85,247,0.14); color: #c084fc; }
|
||||
.role-chip--coordinator{ background: rgba(148,163,184,0.18); color: #cbd5e1; }
|
||||
|
||||
.state-machine-view { padding: 12px 8px 4px; }
|
||||
.state-machine-grid {
|
||||
display: grid; gap: 10px;
|
||||
grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
|
||||
}
|
||||
.state-pill {
|
||||
display: flex; align-items: center; gap: 10px;
|
||||
padding: 10px 14px; border-radius: 10px;
|
||||
border: 1px solid rgba(148,163,184,0.18);
|
||||
background: rgba(15,23,42,0.35); color: #e2e8f0;
|
||||
font-size: 12px; font-weight: 500; letter-spacing: 0.03em;
|
||||
}
|
||||
.state-pill-dot {
|
||||
width: 10px; height: 10px; border-radius: 50%;
|
||||
background: rgba(148,163,184,0.45);
|
||||
}
|
||||
.state-pill--visited { border-color: rgba(99,102,241,0.35); }
|
||||
.state-pill--visited .state-pill-dot { background: #818cf8; }
|
||||
.state-pill--current {
|
||||
border-color: #22c55e;
|
||||
box-shadow: 0 0 0 2px rgba(34,197,94,0.18);
|
||||
background: rgba(34,197,94,0.08);
|
||||
}
|
||||
.state-pill--current .state-pill-dot { background: #22c55e; }
|
||||
.state-pill--pending { opacity: 0.55; }
|
||||
.state-pill--terminal.state-pill--visited { border-color: #f59e0b; }
|
||||
.state-machine-legend {
|
||||
display: flex; gap: 16px; padding: 12px 4px 0;
|
||||
font-size: 11px; color: #94a3b8;
|
||||
}
|
||||
.legend-item { display: inline-flex; align-items: center; gap: 6px; }
|
||||
.legend-item .dot { width: 8px; height: 8px; border-radius: 50%; }
|
||||
.legend-item .dot--current { background: #22c55e; }
|
||||
.legend-item .dot--visited { background: #818cf8; }
|
||||
.legend-item .dot--pending { background: rgba(148,163,184,0.45); }
|
||||
|
||||
.loading-row, .empty-row { padding: 20px; color: #94a3b8; text-align: center; font-size: 13px; }
|
||||
.error-banner {
|
||||
padding: 10px 14px; border-radius: 8px; font-size: 12px;
|
||||
background: rgba(239,68,68,0.10); color: #fca5a5;
|
||||
border: 1px solid rgba(239,68,68,0.25); margin: 8px 0;
|
||||
}
|
||||
.muted { color: #94a3b8; }
|
||||
|
||||
243
src/pages/TransactionsPage.tsx
Normal file
243
src/pages/TransactionsPage.tsx
Normal file
@@ -0,0 +1,243 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useNavigate, useParams } from 'react-router-dom';
|
||||
import { listPlans, getPlanState, getPlanEvents, type PlanSummary, type PlanStateDetail, type PlanEvent } from '../services/orchestrator';
|
||||
import StateMachineView from '../components/portal/StateMachineView';
|
||||
import { endpoints } from '../config/endpoints';
|
||||
|
||||
type Source = 'live' | 'mocked' | 'degraded';
|
||||
|
||||
function SourceBadge({ source }: { source: Source }) {
|
||||
const label = source === 'live' ? 'LIVE' : source === 'degraded' ? 'DEGRADED' : 'DEMO';
|
||||
return <span className={`source-badge source-badge--${source}`}>{label}</span>;
|
||||
}
|
||||
|
||||
export default function TransactionsPage() {
|
||||
const { planId } = useParams<{ planId?: string }>();
|
||||
return planId ? <TransactionDetail planId={planId} /> : <TransactionsList />;
|
||||
}
|
||||
|
||||
function TransactionsList() {
|
||||
const navigate = useNavigate();
|
||||
const [plans, setPlans] = useState<PlanSummary[] | null>(null);
|
||||
const [source, setSource] = useState<Source>('mocked');
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
setPlans(null);
|
||||
setError(null);
|
||||
listPlans()
|
||||
.then((res) => {
|
||||
if (cancelled) return;
|
||||
setPlans(res.plans);
|
||||
setSource(res.source);
|
||||
})
|
||||
.catch((err) => {
|
||||
if (cancelled) return;
|
||||
setError(err instanceof Error ? err.message : String(err));
|
||||
});
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div className="transactions-page">
|
||||
<div className="page-header">
|
||||
<h1>Transactions</h1>
|
||||
<p className="page-subtitle">
|
||||
Multi-layer atomic settlement plans. State machine per architecture note §8.
|
||||
{!endpoints.orchestrator.deployed && (
|
||||
<span className="muted">
|
||||
{' '}Orchestrator not deployed — showing demo plans.
|
||||
</span>
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="dashboard-card">
|
||||
<div className="card-header">
|
||||
<h3>Recent plans</h3>
|
||||
<SourceBadge source={source} />
|
||||
</div>
|
||||
{error && <div className="error-banner">{error}</div>}
|
||||
{plans === null ? (
|
||||
<div className="loading-row">Loading…</div>
|
||||
) : plans.length === 0 ? (
|
||||
<div className="empty-row">No plans yet.</div>
|
||||
) : (
|
||||
<table className="portal-table" data-testid="transactions-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Plan ID</th>
|
||||
<th>State</th>
|
||||
<th>Instrument</th>
|
||||
<th>Owner</th>
|
||||
<th>Updated</th>
|
||||
<th aria-label="open" />
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{plans.map((p) => (
|
||||
<tr
|
||||
key={p.plan_id}
|
||||
className="portal-table-row"
|
||||
onClick={() => navigate(`/transactions/${encodeURIComponent(p.plan_id)}`)}
|
||||
data-testid={`plan-row-${p.plan_id}`}
|
||||
>
|
||||
<td className="mono">{p.plan_id}</td>
|
||||
<td>
|
||||
<span className={`state-chip state-chip--${p.status.toLowerCase()}`}>
|
||||
{p.status.replace(/_/g, ' ')}
|
||||
</span>
|
||||
</td>
|
||||
<td>{p.instrument_hint ?? '—'}</td>
|
||||
<td>{p.actor_id ?? '—'}</td>
|
||||
<td>{new Date(p.updated_at).toLocaleString()}</td>
|
||||
<td className="row-chevron">›</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function TransactionDetail({ planId }: { planId: string }) {
|
||||
const navigate = useNavigate();
|
||||
const [detail, setDetail] = useState<PlanStateDetail | null>(null);
|
||||
const [events, setEvents] = useState<PlanEvent[] | null>(null);
|
||||
const [source, setSource] = useState<Source>('mocked');
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
setDetail(null);
|
||||
setEvents(null);
|
||||
setError(null);
|
||||
Promise.all([getPlanState(planId), getPlanEvents(planId)])
|
||||
.then(([s, e]) => {
|
||||
if (cancelled) return;
|
||||
setDetail(s.detail);
|
||||
setEvents(e.events);
|
||||
setSource(s.source === 'live' && e.source === 'live' ? 'live' : s.source);
|
||||
})
|
||||
.catch((err) => {
|
||||
if (cancelled) return;
|
||||
setError(err instanceof Error ? err.message : String(err));
|
||||
});
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [planId]);
|
||||
|
||||
return (
|
||||
<div className="transactions-page">
|
||||
<div className="page-header">
|
||||
<button className="back-button" onClick={() => navigate('/transactions')}>
|
||||
← All transactions
|
||||
</button>
|
||||
<h1>
|
||||
Plan <span className="mono">{planId}</span>
|
||||
</h1>
|
||||
<p className="page-subtitle">
|
||||
{detail ? (
|
||||
<>Current state: <strong>{detail.current_state.replace(/_/g, ' ')}</strong></>
|
||||
) : (
|
||||
'Loading plan state…'
|
||||
)}
|
||||
</p>
|
||||
</div>
|
||||
|
||||
{error && <div className="error-banner">{error}</div>}
|
||||
|
||||
<div className="dashboard-card">
|
||||
<div className="card-header">
|
||||
<h3>12-state machine</h3>
|
||||
<SourceBadge source={source} />
|
||||
</div>
|
||||
{detail ? (
|
||||
<StateMachineView current={detail.current_state} transitions={detail.transitions} />
|
||||
) : (
|
||||
<div className="loading-row">Loading…</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="dashboard-card">
|
||||
<div className="card-header">
|
||||
<h3>Audit trail</h3>
|
||||
</div>
|
||||
{detail === null ? (
|
||||
<div className="loading-row">Loading…</div>
|
||||
) : detail.transitions.length === 0 ? (
|
||||
<div className="empty-row">No transitions recorded.</div>
|
||||
) : (
|
||||
<table className="portal-table" data-testid="audit-trail">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>From → To</th>
|
||||
<th>Actor</th>
|
||||
<th>Role</th>
|
||||
<th>Reason</th>
|
||||
<th>At</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{detail.transitions.map((t, i) => (
|
||||
<tr key={i}>
|
||||
<td>{i + 1}</td>
|
||||
<td className="mono">
|
||||
{t.from_state ?? '∅'} → {t.to_state}
|
||||
</td>
|
||||
<td>{t.actor_id}</td>
|
||||
<td>
|
||||
<span className={`role-chip role-chip--${t.actor_role}`}>{t.actor_role}</span>
|
||||
</td>
|
||||
<td>{t.reason ?? '—'}</td>
|
||||
<td>{new Date(t.occurred_at).toLocaleString()}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="dashboard-card">
|
||||
<div className="card-header">
|
||||
<h3>Signed event stream</h3>
|
||||
</div>
|
||||
{events === null ? (
|
||||
<div className="loading-row">Loading…</div>
|
||||
) : events.length === 0 ? (
|
||||
<div className="empty-row">No events.</div>
|
||||
) : (
|
||||
<table className="portal-table" data-testid="event-stream">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Type</th>
|
||||
<th>Signature</th>
|
||||
<th>Prev hash</th>
|
||||
<th>At</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{events.map((e) => (
|
||||
<tr key={e.id}>
|
||||
<td>{e.id}</td>
|
||||
<td className="mono">{e.type}</td>
|
||||
<td className="mono truncate">{e.signature}</td>
|
||||
<td className="mono truncate">{e.prev_hash ?? '∅'}</td>
|
||||
<td>{new Date(e.created_at).toLocaleString()}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
281
src/services/orchestrator.ts
Normal file
281
src/services/orchestrator.ts
Normal file
@@ -0,0 +1,281 @@
|
||||
/**
|
||||
* CurrenciCombo/orchestrator API client — consumed by the portal's
|
||||
* /transactions page.
|
||||
*
|
||||
* When `VITE_ORCHESTRATOR_URL` is unset or the endpoint is unreachable,
|
||||
* every call falls back to deterministic demo data so the page still
|
||||
* renders something meaningful. This mirrors how the other services
|
||||
* treat unreachable backends (chain138, explorer, dbisCore).
|
||||
*
|
||||
* The shape of the data matches the orchestrator's API (see
|
||||
* orchestrator/src/api/plans.ts + orchestrator/src/api/eventBus.ts).
|
||||
* Re-sync if the orchestrator evolves.
|
||||
*/
|
||||
|
||||
import { endpoints } from '../config/endpoints';
|
||||
|
||||
export type TransactionState =
|
||||
| 'DRAFT'
|
||||
| 'INITIATED'
|
||||
| 'PRECONDITIONS_PENDING'
|
||||
| 'READY_FOR_PREPARE'
|
||||
| 'PREPARED'
|
||||
| 'EXECUTING'
|
||||
| 'PARTIALLY_EXECUTED'
|
||||
| 'VALIDATING'
|
||||
| 'COMMITTED'
|
||||
| 'ABORTED'
|
||||
| 'UNWIND_PENDING'
|
||||
| 'CLOSED';
|
||||
|
||||
export const TRANSACTION_STATES: TransactionState[] = [
|
||||
'DRAFT',
|
||||
'INITIATED',
|
||||
'PRECONDITIONS_PENDING',
|
||||
'READY_FOR_PREPARE',
|
||||
'PREPARED',
|
||||
'EXECUTING',
|
||||
'PARTIALLY_EXECUTED',
|
||||
'VALIDATING',
|
||||
'COMMITTED',
|
||||
'ABORTED',
|
||||
'UNWIND_PENDING',
|
||||
'CLOSED',
|
||||
];
|
||||
|
||||
export interface PlanSummary {
|
||||
plan_id: string;
|
||||
status: TransactionState;
|
||||
actor_id: string | null;
|
||||
created_at: string;
|
||||
updated_at: string;
|
||||
instrument_hint?: string;
|
||||
}
|
||||
|
||||
export interface StateTransition {
|
||||
from_state: TransactionState | null;
|
||||
to_state: TransactionState;
|
||||
actor_id: string;
|
||||
actor_role: string;
|
||||
reason: string | null;
|
||||
occurred_at: string;
|
||||
}
|
||||
|
||||
export interface PlanStateDetail {
|
||||
plan_id: string;
|
||||
current_state: TransactionState;
|
||||
transitions: StateTransition[];
|
||||
}
|
||||
|
||||
export interface PlanEvent {
|
||||
id: number;
|
||||
plan_id: string;
|
||||
type: string;
|
||||
payload: Record<string, unknown>;
|
||||
signature: string;
|
||||
prev_hash: string | null;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
type OrchestratorStatus = 'live' | 'mocked' | 'degraded';
|
||||
|
||||
export interface OrchestratorProbe {
|
||||
status: OrchestratorStatus;
|
||||
latencyMs: number | null;
|
||||
error?: string;
|
||||
}
|
||||
|
||||
const base = endpoints.orchestrator.baseUrl;
|
||||
const deployed = endpoints.orchestrator.deployed;
|
||||
|
||||
async function fetchJson<T>(path: string, init?: RequestInit): Promise<T> {
|
||||
const res = await fetch(`${base}${path}`, {
|
||||
...init,
|
||||
headers: { Accept: 'application/json', ...(init?.headers ?? {}) },
|
||||
});
|
||||
if (!res.ok) {
|
||||
throw new Error(`orchestrator ${res.status} on ${path}`);
|
||||
}
|
||||
return res.json() as Promise<T>;
|
||||
}
|
||||
|
||||
export async function probeOrchestrator(): Promise<OrchestratorProbe> {
|
||||
if (!deployed) return { status: 'mocked', latencyMs: null };
|
||||
const t0 = performance.now();
|
||||
try {
|
||||
const res = await fetch(`${base}/health`, { method: 'GET' });
|
||||
const latencyMs = Math.round(performance.now() - t0);
|
||||
if (!res.ok) return { status: 'degraded', latencyMs, error: `HTTP ${res.status}` };
|
||||
return { status: 'live', latencyMs };
|
||||
} catch (err) {
|
||||
return {
|
||||
status: 'degraded',
|
||||
latencyMs: null,
|
||||
error: err instanceof Error ? err.message : String(err),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
export async function listPlans(): Promise<{ plans: PlanSummary[]; source: OrchestratorStatus }> {
|
||||
if (!deployed) return { plans: demoPlans(), source: 'mocked' };
|
||||
try {
|
||||
const data = await fetchJson<{ plans: PlanSummary[] }>('/api/plans');
|
||||
return { plans: data.plans ?? [], source: 'live' };
|
||||
} catch {
|
||||
return { plans: demoPlans(), source: 'degraded' };
|
||||
}
|
||||
}
|
||||
|
||||
export async function getPlanState(
|
||||
planId: string,
|
||||
): Promise<{ detail: PlanStateDetail; source: OrchestratorStatus }> {
|
||||
if (!deployed) return { detail: demoPlanState(planId), source: 'mocked' };
|
||||
try {
|
||||
const detail = await fetchJson<PlanStateDetail>(`/api/plans/${encodeURIComponent(planId)}/state`);
|
||||
return { detail, source: 'live' };
|
||||
} catch {
|
||||
return { detail: demoPlanState(planId), source: 'degraded' };
|
||||
}
|
||||
}
|
||||
|
||||
export async function getPlanEvents(
|
||||
planId: string,
|
||||
): Promise<{ events: PlanEvent[]; source: OrchestratorStatus }> {
|
||||
if (!deployed) return { events: demoPlanEvents(planId), source: 'mocked' };
|
||||
try {
|
||||
const data = await fetchJson<{ events: PlanEvent[] }>(
|
||||
`/api/plans/${encodeURIComponent(planId)}/events`,
|
||||
);
|
||||
return { events: data.events ?? [], source: 'live' };
|
||||
} catch {
|
||||
return { events: demoPlanEvents(planId), source: 'degraded' };
|
||||
}
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------
|
||||
// Demo data — used only when VITE_ORCHESTRATOR_URL is unset. Lets the
|
||||
// /transactions page demonstrate the 12-state machine visualisation
|
||||
// without needing a deployed orchestrator.
|
||||
// ---------------------------------------------------------------------
|
||||
|
||||
function demoPlans(): PlanSummary[] {
|
||||
const now = Date.now();
|
||||
return [
|
||||
{
|
||||
plan_id: 'demo-sblc-001',
|
||||
status: 'VALIDATING',
|
||||
actor_id: 'ops.alice',
|
||||
created_at: new Date(now - 1000 * 60 * 55).toISOString(),
|
||||
updated_at: new Date(now - 1000 * 30).toISOString(),
|
||||
instrument_hint: 'MT760 / EIB beneficiary format',
|
||||
},
|
||||
{
|
||||
plan_id: 'demo-pay-014',
|
||||
status: 'COMMITTED',
|
||||
actor_id: 'ops.bob',
|
||||
created_at: new Date(now - 1000 * 60 * 60 * 3).toISOString(),
|
||||
updated_at: new Date(now - 1000 * 60 * 7).toISOString(),
|
||||
instrument_hint: 'pacs.009 FI-to-FI',
|
||||
},
|
||||
{
|
||||
plan_id: 'demo-sblc-003',
|
||||
status: 'ABORTED',
|
||||
actor_id: 'ops.alice',
|
||||
created_at: new Date(now - 1000 * 60 * 60 * 8).toISOString(),
|
||||
updated_at: new Date(now - 1000 * 60 * 60 * 2).toISOString(),
|
||||
instrument_hint: 'MT202 COV',
|
||||
},
|
||||
{
|
||||
plan_id: 'demo-draft-029',
|
||||
status: 'DRAFT',
|
||||
actor_id: null,
|
||||
created_at: new Date(now - 1000 * 60 * 4).toISOString(),
|
||||
updated_at: new Date(now - 1000 * 60 * 4).toISOString(),
|
||||
instrument_hint: 'Pending review',
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
function demoPlanState(planId: string): PlanStateDetail {
|
||||
const plan = demoPlans().find((p) => p.plan_id === planId) ?? demoPlans()[0];
|
||||
const base = new Date(plan.created_at).getTime();
|
||||
const mk = (i: number, from: TransactionState | null, to: TransactionState, role: string, actor: string, reason: string) => ({
|
||||
from_state: from,
|
||||
to_state: to,
|
||||
actor_id: actor,
|
||||
actor_role: role,
|
||||
reason,
|
||||
occurred_at: new Date(base + i * 1000 * 60 * 5).toISOString(),
|
||||
});
|
||||
|
||||
if (plan.status === 'COMMITTED') {
|
||||
return {
|
||||
plan_id: plan.plan_id,
|
||||
current_state: 'COMMITTED',
|
||||
transitions: [
|
||||
mk(0, null, 'DRAFT', 'submitter', 'ops.bob', 'plan created'),
|
||||
mk(1, 'DRAFT', 'INITIATED', 'submitter', 'ops.bob', 'initiation'),
|
||||
mk(2, 'INITIATED', 'PRECONDITIONS_PENDING', 'coordinator', 'system', 'await controls'),
|
||||
mk(3, 'PRECONDITIONS_PENDING', 'READY_FOR_PREPARE', 'coordinator', 'system', 'preconditions satisfied'),
|
||||
mk(4, 'READY_FOR_PREPARE', 'PREPARED', 'approver', 'ops.chen', 'approve — prepare (SoD)'),
|
||||
mk(5, 'PREPARED', 'EXECUTING', 'releaser', 'ops.dey', 'release — execute (SoD)'),
|
||||
mk(6, 'EXECUTING', 'VALIDATING', 'coordinator', 'system', 'both legs dispatched'),
|
||||
mk(7, 'VALIDATING', 'COMMITTED', 'validator', 'ops.eve', 'reconciled + committed (SoD)'),
|
||||
],
|
||||
};
|
||||
}
|
||||
if (plan.status === 'ABORTED') {
|
||||
return {
|
||||
plan_id: plan.plan_id,
|
||||
current_state: 'ABORTED',
|
||||
transitions: [
|
||||
mk(0, null, 'DRAFT', 'submitter', 'ops.alice', 'plan created'),
|
||||
mk(1, 'DRAFT', 'INITIATED', 'submitter', 'ops.alice', 'initiation'),
|
||||
mk(2, 'INITIATED', 'PRECONDITIONS_PENDING', 'coordinator', 'system', 'await controls'),
|
||||
mk(3, 'PRECONDITIONS_PENDING', 'READY_FOR_PREPARE', 'coordinator', 'system', 'preconditions satisfied'),
|
||||
mk(4, 'READY_FOR_PREPARE', 'PREPARED', 'approver', 'ops.chen', 'approve — prepare (SoD)'),
|
||||
mk(5, 'PREPARED', 'EXECUTING', 'releaser', 'ops.dey', 'release — execute (SoD)'),
|
||||
mk(6, 'EXECUTING', 'VALIDATING', 'coordinator', 'system', 'both legs dispatched'),
|
||||
mk(7, 'VALIDATING', 'ABORTED', 'validator', 'ops.eve', 'amount mismatch on camt.054'),
|
||||
],
|
||||
};
|
||||
}
|
||||
if (plan.status === 'DRAFT') {
|
||||
return {
|
||||
plan_id: plan.plan_id,
|
||||
current_state: 'DRAFT',
|
||||
transitions: [mk(0, null, 'DRAFT', 'submitter', 'ops.frank', 'plan created')],
|
||||
};
|
||||
}
|
||||
return {
|
||||
plan_id: plan.plan_id,
|
||||
current_state: 'VALIDATING',
|
||||
transitions: [
|
||||
mk(0, null, 'DRAFT', 'submitter', 'ops.alice', 'plan created'),
|
||||
mk(1, 'DRAFT', 'INITIATED', 'submitter', 'ops.alice', 'initiation'),
|
||||
mk(2, 'INITIATED', 'PRECONDITIONS_PENDING', 'coordinator', 'system', 'await controls'),
|
||||
mk(3, 'PRECONDITIONS_PENDING', 'READY_FOR_PREPARE', 'coordinator', 'system', 'preconditions satisfied'),
|
||||
mk(4, 'READY_FOR_PREPARE', 'PREPARED', 'approver', 'ops.chen', 'approve — prepare (SoD)'),
|
||||
mk(5, 'PREPARED', 'EXECUTING', 'releaser', 'ops.dey', 'release — execute (SoD)'),
|
||||
mk(6, 'EXECUTING', 'VALIDATING', 'coordinator', 'system', 'both legs dispatched, awaiting reconciliation'),
|
||||
],
|
||||
};
|
||||
}
|
||||
|
||||
function demoPlanEvents(planId: string): PlanEvent[] {
|
||||
const detail = demoPlanState(planId);
|
||||
return detail.transitions.map((t, i) => ({
|
||||
id: i + 1,
|
||||
plan_id: planId,
|
||||
type: `state.${t.to_state.toLowerCase()}`,
|
||||
payload: {
|
||||
from: t.from_state,
|
||||
to: t.to_state,
|
||||
actor_role: t.actor_role,
|
||||
reason: t.reason,
|
||||
},
|
||||
signature: `demo-sig-${i.toString(16).padStart(4, '0')}`,
|
||||
prev_hash: i === 0 ? null : `demo-hash-${(i - 1).toString(16).padStart(4, '0')}`,
|
||||
created_at: t.occurred_at,
|
||||
}));
|
||||
}
|
||||
Reference in New Issue
Block a user