diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 29c8ed2..fdfd8a3 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -8,7 +8,7 @@ permissions: contents: read jobs: verify: - runs-on: ubuntu-24.04 + runs-on: ubuntu-26.04 timeout-minutes: 10 steps: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 @@ -18,5 +18,8 @@ jobs: - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 with: node-version: 24.19.0 - - run: bun install --frozen-lockfile + - run: bun install --frozen-lockfile --ignore-scripts + - run: sudo apt-get update + - run: sudo apt-get install -y libnss3-tools + - run: bun node_modules/playwright/cli.js install --with-deps firefox - run: bun run verify diff --git a/CHANGELOG.md b/CHANGELOG.md index 902d5b8..f65bc01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ ## [Unreleased] +### Fixed +- Resolve Node asset dependencies across nested module-mode boundaries (#137). + +### Changed +- Adopt selected-endpoint Identity contracts while retaining reusable UI and session ownership (#137). + +### Changed +- Qualify Admin presentation with exact SDK .12 UI .14 and Identity .3 archives (#137). + +- Render installed Admin through reusable UI providers while retaining Keycloak session boundaries (#137). +- Align exact shared SDK Identity and UI artifacts for reusable presentation (#137). + ### Added +- Admin: deliver Task 3C typed providers and mobile-first UI integration (#137). + - Add identity-backed installed administration plugins (#135). diff --git a/README.md b/README.md index 888de60..cd761aa 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,66 @@ Task 3B is authorized after the maintainer reviewed the isolated setup. Tracking Development: Bun 1.4.4, Node 24.19.0, TypeScript 5.9.3, native Cordis 4.0.0-rc.12. Run bun run verify (semantic class/source check, strict compiler, build and nonempty unit/integration/program smoke). Installed acceptance uses genuine exact package/OCI bytes, real identity/database/API/HTTPS and explicit isolated certificate trust. No global trust mutation or legacy service changes. All handwritten source, tools and tests are strict TypeScript classes. All capabilities that can be plugins, including container services, are native Cordis class plugins with typed swappable contracts. No parallel DI graph. Keep independent repository/public package boundaries, exact archive pins and original licenses. Migration PRs target cordis with Part of issue references. All issues remain open until authorized release; installer/Agent/generalized recovery are later tasks. + +## Task 3C contract + +Owner issue: https://github.com/treeseed-ai/admin/issues/137. Follow the approved Platform Task 3C service/provider/UI plan through exact public archives. Preserve independent repository ownership, strict TypeScript classes, native Cordis lifecycle, historical formats and all seven SDK operations. Expected-generation/idempotency, resource/credential/TLS retention and explicit unsafe restart/migration gates are mandatory. All issues remain open until release. + +Every visual component must be mobile-first from 320 CSS pixels to widescreen monitors; test 320/375/768/1024/1440/1920/2560 widths, long content, keyboard/touch and 200% text resizing. Keep authored controls at least 44×44 CSS pixels, required actions visible, logical/fluid dimensions and no page overflow (labeled local semantic-table overflow is permitted). UI owns components/styles/renderers; consumers retain domain behavior and Identity retains Keycloak authority. + +## Reusable UI presentation boundary + +Admin maps installed status and sign-out into validated UI stack/status/table/form models. +UI owns the complete mobile-first document, controls, styles, inert bootstrap and browser +hydration. Admin owns its routes, same-origin status/logout request adapters, cookie/session +boundaries and navigation. Keycloak login/callback/PKCE and issuer/session authority remain +in Identity. No bearer tokens, session cookies or client secrets enter browser/bootstrap data. + +The sign-out action carries only its public session-bound anti-CSRF nonce through typed +`actionData`; the existing server origin/nonce checks remain authoritative. Browser status +uses the existing authenticated `/admin/status` interface. Immutable browser/style assets +are served from verified owner bytes under the same-origin CSP, including `style-src 'self'`. +Native route/browser adapters remain swappable class providers. UI artifacts and all runtime +peers are selected by exact public package archives; no owner source import is introduced. +### Exact owner artifact adoption + +The current Task 3C dependency candidate aligns SDK `.12`, Identity `.4` and UI `.14` through exact +vendored public archives and peer pins. Admin constructs domain view models and delegates human +rendering to UI providers. Native session/route and browser-only asset checks remain required; +dependency qualification alone does not establish the genuine Keycloak installed assembly gate. + +Browser qualification uses exact Playwright 1.64.1 and a fresh Firefox/NSS profile with explicit +fixture certificate trust. Ubuntu 26.04 CI installs visible prerequisites; no global trust +change or ignored TLS failure is part of the acceptance gate. + +`GET /admin/presentation` is a session-protected, no-store human-interface bootstrap adapter +returning only the accepted public asset generation. The browser compares it through UI's +hydration contract before admitting actions. The server verifies its complete installed public +asset closure (package identity, path, bytes and digest), serves immutable same-origin assets, +and refuses a configured asset generation that differs from those actual bytes. Status refresh +uses the existing protected endpoint; logout drains UI actions before navigating to Keycloak's +existing login flow. These adapters add no installer or machine-operation endpoint. + +The selected-endpoint continuation adopts Identity `.4` from +`d837d23d99bc49eb1954bdd865397d34186d41a1`, archive SHA-256 +`0e377e4a0ad79ee649b20e41779c862e431f20979b19cae638b658925686d9f1`. +This removes the inherited fixed internal identity name/port in the owning adapter. Admin +continues to consume Identity's native session contract and UI `.14` public renderers; it does +not take ownership of OIDC or introduce another authority. Rebuild and qualify the browser +asset/package identity together. Genuine installed Keycloak acceptance remains in the API and +Platform assembled gates; authority fixtures in this repository are still explicitly fixtures. + +The adoption smoke checks installed SDK/UI/Identity versions against exact peer selections and +vendored archive hashes before accepting the candidate. Changed local tarball specifiers require +a forced fresh install; changing a cache directory alone can leave previous installed bytes. +The corrected Admin `.6` candidate is rebuilt and reverified after that read-back. Older private +candidate receipts remain historical; they do not stand in for this installed dependency check. + +### Node package-boundary asset resolution + +The default asset catalog must resolve every dependency to its matching named npm package +root. A nested `package.json` that only declares module mode is not a package identity; Node +may legitimately resolve a CommonJS export beneath that boundary (including Postgres). +Keep package names, versions, complete dependency traversal and asset-byte checks authoritative. +The built Node default-construction smoke runs with genuine installed dependencies, without +substituting an asset provider or requiring database or identity services. diff --git a/bun.lock b/bun.lock index 7e71283..f7c30a0 100644 --- a/bun.lock +++ b/bun.lock @@ -10,33 +10,50 @@ "devDependencies": { "@treeseed-cordis/identity": "file:vendor/identity.tgz", "@treeseed-cordis/sdk": "file:vendor/sdk.tgz", + "@treeseed-cordis/ui": "file:vendor/ui.tgz", "@types/bun": "1.4.4", "@types/node": "24.10.1", + "@types/react": "19.3.0", + "@types/react-dom": "19.3.0", + "playwright": "1.64.1", + "react": "19.3.1", + "react-dom": "19.3.1", "typescript": "5.9.3", }, "peerDependencies": { - "@treeseed-cordis/identity": "0.0.0-cordis.1", - "@treeseed-cordis/sdk": "0.0.0-cordis.4", + "@treeseed-cordis/identity": "0.0.0-cordis.4", + "@treeseed-cordis/sdk": "0.0.0-cordis.12", + "@treeseed-cordis/ui": "0.0.0-cordis.14", + "react": "19.3.1", + "react-dom": "19.3.1", }, }, }, "packages": { "@standard-schema/spec": ["@standard-schema/spec@1.1.0", "", {}, "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w=="], - "@treeseed-cordis/identity": ["@treeseed-cordis/identity@vendor/identity.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "openid-client": "6.8.8", "postgres": "3.4.9" }, "peerDependencies": { "@treeseed-cordis/sdk": "0.0.0-cordis.4" } }, "sha512-YwKbVwvDBPeyHDo21Jx1yEjV+gJVmWL2xgoFWuyz6Uj8PC/pa9e6wUJNFVbvP5YqrmoX4RPFH85F0rc2cgt4fQ=="], + "@treeseed-cordis/identity": ["@treeseed-cordis/identity@vendor/identity.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "openid-client": "6.8.8", "postgres": "3.4.9" }, "peerDependencies": { "@treeseed-cordis/sdk": "0.0.0-cordis.12" } }, "sha512-kLeBXP/9UjQOHJkyLTvZm03Gk8LhPmK3+w4tXjsbh3BlZwcFHNy+txoxGNezR863Tkm+Vpb5UH80QFTMS2qvuQ=="], - "@treeseed-cordis/sdk": ["@treeseed-cordis/sdk@vendor/sdk.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "jsonc-parser": "3.3.1", "semver": "7.8.5", "zod": "4.6.7" } }, "sha512-WSi3FYhgnA7TK9RGVn7vp+IgngCGlaCrv5lb1AJ8gGCGHW42/u40HIviMFINQDLxGyUILzMD7q19KnP+1VIDmQ=="], + "@treeseed-cordis/sdk": ["@treeseed-cordis/sdk@vendor/sdk.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "jsonc-parser": "3.3.1", "semver": "7.8.5", "zod": "4.6.7" } }, "sha512-J4owiPi1D2hLReae7VW2jwPF4qhPb+ZBnijnGBh+0R/QRrQOLYDWHNzfLGFj/Nkzkz8Epp8U+fKpY0aJu4tRCQ=="], + + "@treeseed-cordis/ui": ["@treeseed-cordis/ui@vendor/ui.tgz", { "dependencies": { "cordis": "4.0.0-rc.12", "zod": "4.6.7" }, "peerDependencies": { "@treeseed-cordis/sdk": "0.0.0-cordis.12", "react": "19.3.1", "react-dom": "19.3.1", "typescript": "5.9.3" }, "optionalPeers": ["typescript"] }, "sha512-tCzT0zvtsUthlktBYxoRZu6jktMPRA3KWKn/kg6zpSIFgzzZ3/6R1a26ya/6JHADpgYfNYSMEh+7wTK6x8wqRA=="], "@types/bun": ["@types/bun@1.4.4", "", { "dependencies": { "bun-types": "1.4.4" } }, "sha512-9wkRDXUXK124pEnAutE6n/l18j+i9GC5IAHK8TmX/2nlySETmky0OU6yL5U8pW1AoKh++AN9auDCr647BfurjQ=="], "@types/node": ["@types/node@24.10.1", "", { "dependencies": { "undici-types": "~7.16.0" } }, "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ=="], + "@types/react": ["@types/react@19.3.0", "", { "dependencies": { "csstype": "^3.2.2" } }, "sha512-N0rFCuH9YoxG9/m61l9MfpJKfmLOVU0em7ipIz6TRgSSkvReLB9vL85GB+yr8Bs5leqpvg96JSwF4ZS1s4viQg=="], + + "@types/react-dom": ["@types/react-dom@19.3.0", "", { "peerDependencies": { "@types/react": "^19.3.0" } }, "sha512-ZI7bU42mZXXKHn/qNLEw2IrbiINU7X5+vfgdixBHkCNpYWXjKgfQ/P+uyGb5CjOLB9UcnTeg3rylQtV2hym44Q=="], + "bun-types": ["bun-types@1.4.4", "", { "dependencies": { "@types/node": "*", "undici-types": "*" } }, "sha512-yjrJh5oGX7mMPKGd19YXyIjmEuj4G4zNC30bs7PM9Az7NQ3ndF3j6hbeRdvJTRQEhJ/FYQwW0a2moweEi2hMxQ=="], "cordis": ["cordis@4.0.0-rc.12", "", { "dependencies": { "@standard-schema/spec": "^1.1.0", "cosmokit": "^1.8.1" }, "peerDependencies": { "@cordisjs/plugin-include": "^1.2.0", "@cordisjs/plugin-loader": "^1.0.0-rc.9" }, "optionalPeers": ["@cordisjs/plugin-include", "@cordisjs/plugin-loader"], "bin": "bin.js" }, "sha512-/ZtRivYxr5sffTULPewHuX5kEy5sWi8oADHSpnt0KjAd8uKRIj+kv4fh3lxtutIfVlgwJVFVXWOQp/gYa+kIOQ=="], "cosmokit": ["cosmokit@1.8.1", "", {}, "sha512-PDBv4l90xZKrUsZ0vtoycgZpO/j4iFsqJXrAxsyBDsnQRI7ZMJXIjgDJsKNjd5L8jnVnnlrDCdhkFbTncgCVjQ=="], + "csstype": ["csstype@3.2.3", "", {}, "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ=="], + "jose": ["jose@6.2.13", "", {}, "sha512-7TIg10ZE1x82YediN+lcrPNvGMKge9yFHQD+Qho/b8y2adfugU3AsvvHfxV0fzyFllT6l9xCjf4RWY9g/Z9PJQ=="], "jsonc-parser": ["jsonc-parser@3.3.1", "", {}, "sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ=="], @@ -45,8 +62,18 @@ "openid-client": ["openid-client@6.8.8", "", { "dependencies": { "jose": "^6.2.12", "oauth4webapi": "^3.8.8" } }, "sha512-ZsucJA5Ad04Uv7YN4ql+s4GXNmb9uAYQwyJTsJx7CH/MX3JZioLE2pVKi1SC+YrbSLA4Px3Gi30dMjgOZtb6pA=="], + "playwright": ["playwright@1.64.1", "", { "dependencies": { "playwright-core": "1.64.1" }, "bin": { "playwright": "cli.js" } }, "sha512-HCrVhHr5QQuwYoswEUGTb7gGp522yflbv/ST8nF4sFWGuLjQCt17Q/EubpGGSNKYn1tsTCPZxqHhHCfVURu7UA=="], + + "playwright-core": ["playwright-core@1.64.1", "", { "bin": { "playwright-core": "cli.js" } }, "sha512-BC4s8y6SEVA6Q1rSxZTto8hI1KUI3xXlHGZgvGqP4IqPdI/a6FX9H29IDNz7vKo9l21b6LfYosScPL6M3xxyDQ=="], + "postgres": ["postgres@3.4.9", "", {}, "sha512-GD3qdB0x1z9xgFI6cdRD6xu2Sp2WCOEoe3mtnyB5Ee0XrrL5Pe+e4CCnJrRMnL1zYtRDZmQQVbvOttLnKDLnaw=="], + "react": ["react@19.3.1", "", {}, "sha512-QNhWdt7nrgVWWQG58QuGsAR3jv3Hbe4mb4vz7w2csnHavciZJgda1CPNaldF6eVxv90ud3jUXpKlHL69gO38yw=="], + + "react-dom": ["react-dom@19.3.1", "", { "dependencies": { "scheduler": "^0.28.0" }, "peerDependencies": { "react": "^19.3.1" } }, "sha512-Y0bARz53lhEC1NMCASs0/j+faB/zqt3R8hpvg1e8+61ZVJ4UL0UdC4cBbXfZMcIuhrfgeILTLe+ZeBCavQPtKQ=="], + + "scheduler": ["scheduler@0.28.0", "", {}, "sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw=="], + "semver": ["semver@7.8.5", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA=="], "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], diff --git a/package.json b/package.json index 28e6eb1..eff6b1c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@treeseed-cordis/admin", - "version": "0.0.0-cordis.1", + "version": "0.0.0-cordis.7", "private": true, "type": "module", "license": "Apache-2.0", @@ -24,23 +24,32 @@ "LICENSE" ], "scripts": { - "check": "bun node_modules/@treeseed-cordis/sdk/dist/src/source-policy.js check", - "build": "bun node_modules/@treeseed-cordis/sdk/dist/src/source-policy.js build && bun dist/src/admin.js --build-assets", + "check": "bun scripts/tooling.ts check", + "build": "bun scripts/tooling.ts build && bun dist/src/admin.js --build-assets", "test:unit": "bun test ./tests --test-name-pattern '^unit:'", "test:integration": "bun test ./tests --test-name-pattern '^integration:'", "test:smoke": "bun test ./tests --test-name-pattern '^smoke:'", "verify": "bun run check && bun run build && bun run test:unit && bun run test:integration && bun run test:smoke" }, "peerDependencies": { - "@treeseed-cordis/sdk": "0.0.0-cordis.4", - "@treeseed-cordis/identity": "0.0.0-cordis.1" + "@treeseed-cordis/sdk": "0.0.0-cordis.12", + "@treeseed-cordis/identity": "0.0.0-cordis.4", + "@treeseed-cordis/ui": "0.0.0-cordis.14", + "react": "19.3.1", + "react-dom": "19.3.1" }, "devDependencies": { "@treeseed-cordis/sdk": "file:vendor/sdk.tgz", "typescript": "5.9.3", "@types/bun": "1.4.4", "@types/node": "24.10.1", - "@treeseed-cordis/identity": "file:vendor/identity.tgz" + "@treeseed-cordis/identity": "file:vendor/identity.tgz", + "@treeseed-cordis/ui": "file:vendor/ui.tgz", + "react": "19.3.1", + "react-dom": "19.3.1", + "playwright": "1.64.1", + "@types/react": "19.3.0", + "@types/react-dom": "19.3.0" }, "dependencies": { "cordis": "4.0.0-rc.12" @@ -48,31 +57,343 @@ "cordisCandidate": { "sdk": { "repository": "https://github.com/treeseed-ai/sdk.git", - "commit": "f44ede394a58814b5d6e73146ba9ed7246b4f2ca", - "sha256": "16d3d7f699c55795b97972ca538bfeedeafdc6bfc4c32ed01708871ea02fe75c" + "commit": "4a0b12ca45478f58d92a02de4a7c144ed94c7417", + "sha256": "9652a1e1f830eb85c41b2d9ea207782ffdf291db2ef97331e338775dadf62fd4" }, "identity": { "repository": "https://github.com/treeseed-ai/identity.git", - "commit": "906d64e1dc9219786444f5f793968592bb8abd96", - "sha256": "dd3131499b01b8ad8d4c8aa78d0cb99de69da86c4fbad1da0670439c3d8bdddc" + "commit": "d837d23d99bc49eb1954bdd865397d34186d41a1", + "sha256": "0e377e4a0ad79ee649b20e41779c862e431f20979b19cae638b658925686d9f1" + }, + "ui": { + "repository": "https://github.com/treeseed-ai/ui.git", + "commit": "a0f28a2d4a3285cbb5203a97c2cdb620517871ae", + "sha256": "6c1032996990178f7a76d5cbde2e15a4b6467941159d6d6013a33526e799e7ad" } }, "cordis": { "id": "installed-admin", "pluginId": "admin", "capability": "admin.routes", - "contractVersion": "0.3.0-cordis.1", + "contractVersion": "0.4.0-cordis.1", "target": "api", "provide": [ "admin.routes" ], "inject": [ "identity.sessions", - "platform.invoker" + "platform.invoker", + "admin.assets", + "admin.presentation" ] }, "cordisAsset": { "path": "dist/src/browser.bundle.js", - "sha256": "bf4157e44f5289fb0137e7b3234d41a11582852b8292d916ccf54cd45737dbef" + "sha256": "acef1a77fb22d3d9851d6adffc485325a85ecb6715a8ce0edb5261949c746ebe" + }, + "cordisPackage": { + "formatVersion": 4, + "contractVersion": "0.4.0-cordis.1", + "pluginId": "admin", + "package": { + "name": "@treeseed-cordis/admin", + "version": "0.0.0-cordis.7" + }, + "providers": [ + { + "declaration": { + "id": "installed-admin", + "pluginId": "admin", + "capability": "admin.routes", + "contractVersion": "0.4.0-cordis.1", + "target": "api", + "provide": [ + "admin.routes" + ], + "inject": [ + "identity.sessions", + "platform.invoker", + "admin.assets", + "admin.presentation" + ] + }, + "entry": "dist/src/admin.js", + "classExport": "AdminPlugin", + "configurationSchema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": { + "installationId": { + "type": "string", + "minLength": 1 + }, + "origin": { + "type": "string", + "pattern": "^https:\\/\\/(localhost|127\\.0\\.0\\.1|\\[::1\\])(:[0-9]+)?$" + }, + "issuer": { + "type": "string", + "format": "uri" + }, + "identityInternalOrigin": { + "type": "string", + "format": "uri" + }, + "clientId": { + "type": "string", + "minLength": 1 + }, + "clientSecret": { + "type": "string", + "minLength": 1 + }, + "databaseUrl": { + "type": "string", + "minLength": 1 + }, + "bootstrapSubject": { + "type": "string", + "minLength": 1 + }, + "workerSocket": { + "type": "string", + "pattern": "^\\/" + }, + "assetDigest": { + "type": "string", + "pattern": "^[a-f0-9]{64}$" + } + }, + "required": [ + "installationId", + "origin", + "issuer", + "identityInternalOrigin", + "clientId", + "clientSecret", + "databaseUrl", + "bootstrapSubject", + "workerSocket", + "assetDigest" + ], + "additionalProperties": false + }, + "replacement": { + "kind": "restart", + "stateVersion": 1, + "qualificationDigest": null + }, + "commandIds": [] + }, + { + "declaration": { + "id": "admin.assets.default", + "pluginId": "admin", + "capability": "admin.assets", + "contractVersion": "0.4.0-cordis.1", + "target": "api", + "provide": [ + "admin.assets" + ], + "inject": [] + }, + "entry": "dist/src/admin.js", + "classExport": "AdminAssetsPlugin", + "configurationSchema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": {}, + "additionalProperties": false + }, + "replacement": { + "kind": "restart", + "stateVersion": 1, + "qualificationDigest": null + }, + "commandIds": [] + }, + { + "declaration": { + "id": "admin.presentation.default", + "pluginId": "admin", + "capability": "admin.presentation", + "contractVersion": "0.4.0-cordis.1", + "target": "api", + "provide": [ + "admin.presentation" + ], + "inject": [ + "admin.assets" + ] + }, + "entry": "dist/src/admin.js", + "classExport": "AdminPresentationPlugin", + "configurationSchema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": {}, + "additionalProperties": false + }, + "replacement": { + "kind": "restart", + "stateVersion": 1, + "qualificationDigest": null + }, + "commandIds": [] + }, + { + "declaration": { + "id": "admin.browser.presentation.default", + "pluginId": "admin", + "capability": "admin.browser.presentation", + "contractVersion": "0.4.0-cordis.1", + "target": "browser", + "provide": [ + "admin.browser.presentation" + ], + "inject": [] + }, + "entry": "dist/src/browser.js", + "classExport": "AdminBrowserStatePlugin", + "configurationSchema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": {}, + "additionalProperties": false + }, + "replacement": { + "kind": "restart", + "stateVersion": 1, + "qualificationDigest": null + }, + "commandIds": [] + }, + { + "declaration": { + "id": "admin.browser.status.default", + "pluginId": "admin", + "capability": "admin.browser.status", + "contractVersion": "0.4.0-cordis.1", + "target": "browser", + "provide": [ + "admin.browser.status" + ], + "inject": [] + }, + "entry": "dist/src/browser.js", + "classExport": "HttpStatusPlugin", + "configurationSchema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": {}, + "additionalProperties": false + }, + "replacement": { + "kind": "restart", + "stateVersion": 1, + "qualificationDigest": null + }, + "commandIds": [] + }, + { + "declaration": { + "id": "admin.browser.navigation.default", + "pluginId": "admin", + "capability": "admin.browser.navigation", + "contractVersion": "0.4.0-cordis.1", + "target": "browser", + "provide": [ + "admin.browser.navigation" + ], + "inject": [ + "admin.browser.presentation" + ] + }, + "entry": "dist/src/browser.js", + "classExport": "AdminNavigationPlugin", + "configurationSchema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": {}, + "additionalProperties": false + }, + "replacement": { + "kind": "restart", + "stateVersion": 1, + "qualificationDigest": null + }, + "commandIds": [] + }, + { + "declaration": { + "id": "admin.browser.actions.default", + "pluginId": "admin", + "capability": "admin.browser.actions", + "contractVersion": "0.4.0-cordis.1", + "target": "browser", + "provide": [ + "admin.browser.actions" + ], + "inject": [ + "admin.browser.status", + "admin.browser.presentation", + "admin.browser.navigation" + ] + }, + "entry": "dist/src/browser.js", + "classExport": "AdminActionsPlugin", + "configurationSchema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": {}, + "additionalProperties": false + }, + "replacement": { + "kind": "restart", + "stateVersion": 1, + "qualificationDigest": null + }, + "commandIds": [] + }, + { + "declaration": { + "id": "admin.browser.page.default", + "pluginId": "admin", + "capability": "admin.browser.page", + "contractVersion": "0.4.0-cordis.1", + "target": "browser", + "provide": [ + "admin.browser.page" + ], + "inject": [ + "admin.browser.status", + "admin.browser.presentation", + "admin.browser.actions" + ] + }, + "entry": "dist/src/browser.js", + "classExport": "StatusPagePlugin", + "configurationSchema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "type": "object", + "properties": {}, + "additionalProperties": false + }, + "replacement": { + "kind": "restart", + "stateVersion": 1, + "qualificationDigest": null + }, + "commandIds": [] + } + ], + "assets": [ + { + "path": "dist/src/browser.bundle.js", + "sha256": "acef1a77fb22d3d9851d6adffc485325a85ecb6715a8ce0edb5261949c746ebe", + "size": 454196 + } + ], + "images": [] } } diff --git a/scripts/tooling.ts b/scripts/tooling.ts new file mode 100644 index 0000000..d69a30f --- /dev/null +++ b/scripts/tooling.ts @@ -0,0 +1,4 @@ +import {ProjectTooling} from '@treeseed-cordis/sdk/source-policy'; +import {UiSourcePolicy} from '@treeseed-cordis/ui/source-policy'; +class AdminTooling{static run():void{new UiSourcePolicy().check();ProjectTooling.run();}} +AdminTooling.run(); diff --git a/src/admin.ts b/src/admin.ts index e4dd29e..41c7815 100644 --- a/src/admin.ts +++ b/src/admin.ts @@ -1,46 +1,63 @@ import {createHash} from 'node:crypto'; import {readFileSync,writeFileSync} from 'node:fs'; -import {CapabilityToken,ProviderSchemas,InstalledTokens,InstalledSchemas,CanonicalJson,type ProviderDeclaration,type ProviderArtifact,type PlatformInvoker,type ServerConfiguration,type TrustedPrincipal} from '@treeseed-cordis/sdk'; +import {CapabilityToken,ProviderV4Schemas,ServiceTokens,PlatformSchemas,PackageDefinition,InstalledSchemas,CanonicalJson,type NativeProviderDeclaration,type ProviderArtifact,type PlatformInvoker,type ServerConfiguration,type TrustedPrincipal} from '@treeseed-cordis/sdk'; import {Context,type ProviderRegistration} from '@treeseed-cordis/sdk/runtime'; +import {Service} from 'cordis'; +import {UiServerRenderer,type UiServerRendering} from '@treeseed-cordis/ui/server'; +import {AdminViews,AdminPackageIdentity} from './views.js'; +import {AdminAssetCatalog,type AdminAssets} from './assets.js'; +export {AdminAssetCatalog,type AdminAssets,type AdminPublicAsset} from './assets.js'; import {IdentitySessionsToken,type IdentitySessions} from '@treeseed-cordis/identity'; export interface AdminContribution {handle(request:Request):Promise;assetDigest():string;} class AdminAdapter {parse(value:unknown):AdminContribution{if(!value||typeof (value as AdminContribution).handle!=='function'||typeof (value as AdminContribution).assetDigest!=='function')throw new Error('Admin unavailable');return value as AdminContribution;}} -export const AdminToken=new CapabilityToken('admin.routes',ProviderSchemas.version,new AdminAdapter()); +export const AdminToken=new CapabilityToken('admin.routes',ProviderV4Schemas.version,new AdminAdapter()); export class AdminRoutes implements AdminContribution { - private readonly asset:{bytes:Buffer;digest:string}; - constructor(private readonly sessions:IdentitySessions,private readonly invoker:PlatformInvoker,private readonly settings:ServerConfiguration){this.asset=AdminBuild.asset();if(this.asset.digest!==settings.assetDigest)throw new Error('Admin asset mismatch');} - assetDigest():string{return this.asset.digest;} - static escape(value:string):string{return value.replaceAll('&','&').replaceAll('<','<').replaceAll('>','>').replaceAll('"','"').replaceAll("'",''');} + constructor(private readonly sessions:IdentitySessions,private readonly invoker:PlatformInvoker,private readonly settings:ServerConfiguration,private readonly assets:AdminAssets,private readonly presentation:UiServerRendering){if(assets.digest()!==settings.assetDigest)throw new Error('Admin asset mismatch');} + assetDigest():string{return this.assets.digest();} static cookie(header:string,name:string):string{let result='',found=false;for(const item of header.split(';')){const index=item.indexOf('=');if(index<0||item.slice(0,index).trim()!==name)continue;if(found)return '';found=true;result=item.slice(index+1).trim();}return result;} - private response(body:BodyInit|null,status=200,headers:Record={}):Response{return new Response(body,{status,headers:{'Cache-Control':'no-store','Referrer-Policy':'no-referrer','X-Content-Type-Options':'nosniff','Content-Security-Policy':"default-src 'none'; script-src 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'; base-uri 'none'",...headers}});} + private response(body:BodyInit|null,status=200,headers:Record={}):Response{return new Response(body,{status,headers:{'Cache-Control':'no-store','Referrer-Policy':'no-referrer','X-Content-Type-Options':'nosniff','Content-Security-Policy':"default-src 'none'; script-src 'self'; style-src 'self'; connect-src 'self'; form-action 'self'; frame-ancestors 'none'; base-uri 'none'",...headers}});} private redirect(location:string,cookies:string[]):Response{const response=this.response(null,303,{Location:location});for(const cookie of cookies)response.headers.append('Set-Cookie',cookie);return response;} static sessionCookieName(settings:Pick):string{return '__Host-cordis-'+CanonicalJson.digest({installationId:settings.installationId,origin:settings.origin}).slice(0,16);} private cookieValue(name:string,value:string,seconds:number):string{return name+'='+value+'; Path=/; Secure; HttpOnly; SameSite=Lax; Max-Age='+seconds;} async handle(request:Request):Promise{const url=new URL(request.url);if(url.origin!==this.settings.origin)return this.response('Origin refused',400);const path=url.pathname,header=request.headers.get('cookie')??'',sessionName=AdminRoutes.sessionCookieName(this.settings),stateName=sessionName+'-state',session=AdminRoutes.cookie(header,sessionName); - if(path==='/assets/admin-'+this.asset.digest+'.js'&&request.method==='GET')return this.response(new Uint8Array(this.asset.bytes),200,{'Content-Type':'text/javascript; charset=utf-8'}); + const asset=this.assets.asset(path);if(asset&&request.method==='GET')return this.response(new Uint8Array(asset.bytes),200,{'Content-Type':asset.contentType,'Cache-Control':'public, max-age=31536000, immutable'}); if(path==='/admin/login'&&request.method==='GET'){const login=await this.sessions.login();return this.redirect(login.location,[this.cookieValue(stateName,login.state,300)]);} if(path==='/admin/callback'&&request.method==='GET'){try{const cookie=await this.sessions.callback(url,AdminRoutes.cookie(header,stateName));return this.redirect('/admin',[this.cookieValue(sessionName,cookie,28800),this.cookieValue(stateName,'',0)]);}catch{return this.response('Identity callback refused',401);}} - if(!['/admin','/admin/','/admin/status','/admin/logout'].includes(path))return null; + if(!['/admin','/admin/','/admin/status','/admin/logout','/admin/presentation'].includes(path))return null; const principal=await this.sessions.principal(session);if(!principal||!principal.scopes.includes('platform.read'))return path==='/admin'||path==='/admin/'?this.redirect('/admin/login',[]):this.response('Authentication required',401); + if(path==='/admin/presentation'&&request.method==='GET')return this.response(JSON.stringify({assetGeneration:this.assetDigest()}),200,{'Content-Type':'application/json'}); if(path==='/admin/status'&&request.method==='GET')return this.response(JSON.stringify(await this.invoker.invoke('platform.status',{},principal)),200,{'Content-Type':'application/json'}); - if(path==='/admin/logout'&&request.method==='POST'){if(request.headers.get('origin')!==this.settings.origin||Number(request.headers.get('content-length')??0)>4096)return this.response('Origin refused',403);const body=await request.text();if(body.length>4096||new URLSearchParams(body).get('csrf')!==this.csrf(session,principal))return this.response('Request refused',403);await this.sessions.logout(session);return this.redirect('/admin',[this.cookieValue(sessionName,'',0)]);} - if((path==='/admin'||path==='/admin/')&&request.method==='GET'){const csrf=this.csrf(session,principal);return this.response('Cordis installed status

Cordis installed status

Installation '+AdminRoutes.escape(this.settings.installationId)+'

Loading installed status…
',200,{'Content-Type':'text/html; charset=utf-8'});} + if(path==='/admin/logout'&&request.method==='POST'){if(request.headers.get('origin')!==this.settings.origin||Number(request.headers.get('content-length')??0)>4096)return this.response('Origin refused',403);const body=await request.text();if(body.length>4096||new URLSearchParams(body).get('csrf')!==this.csrf(session,principal))return this.response('Request refused',403);await this.sessions.logout(session);if(request.headers.get('accept')==='application/json')return this.response(JSON.stringify({success:true}),200,{'Content-Type':'application/json','Set-Cookie':this.cookieValue(sessionName,'',0)});return this.redirect('/admin',[this.cookieValue(sessionName,'',0)]);} + if((path==='/admin'||path==='/admin/')&&request.method==='GET'){const page=await this.presentation.document({title:'Cordis installed status',view:AdminViews.initial(this.settings.installationId,this.csrf(session,principal)),script:this.assets.script(),assetGeneration:this.assetDigest(),actionIds:['admin.refresh','admin.logout']});return this.response(page.html,200,{'Content-Type':'text/html; charset=utf-8'});} return this.response('Method refused',405); } private csrf(session:string,principal:TrustedPrincipal):string{return CanonicalJson.digest({purpose:'logout',session,principal:principal.principalId});} } +class AdminValidator{constructor(private readonly methods:string[]){}parse(value:unknown):T{if(!value||typeof value!=='object')throw new Error('ADMIN_PROVIDER_UNAVAILABLE');for(const method of this.methods)if(typeof Reflect.get(value,method)!=='function')throw new Error('ADMIN_PROVIDER_UNAVAILABLE');return value as T;}} +export const AdminAssetsToken=new CapabilityToken('admin.assets',ProviderV4Schemas.version,new AdminValidator(['digest','script','asset'])); +export const AdminPresentationToken=new CapabilityToken('admin.presentation',ProviderV4Schemas.version,new AdminValidator(['render','document','styles'])); +class AdminDeclaration{static readonly replacement=Object.freeze({kind:'restart' as const,stateVersion:1,qualificationDigest:null});static create(id:string,capability:string,inject:string[]):NativeProviderDeclaration{return ProviderV4Schemas.declaration.parse({id,pluginId:'admin',capability,contractVersion:ProviderV4Schemas.version,target:'api',provide:[capability],inject});}} +export class AdminAssetsPlugin { + static readonly declaration=AdminDeclaration.create('admin.assets.default',AdminAssetsToken.id,[]);static readonly provide=this.declaration.provide;static readonly inject=this.declaration.inject;static readonly Config=PlatformSchemas.empty;static readonly replacement=AdminDeclaration.replacement; + constructor(context:Context){context.provide(AdminAssetsToken.id,new AdminAssetCatalog());} +} +export class AdminPresentationPlugin { + static readonly declaration=AdminDeclaration.create('admin.presentation.default',AdminPresentationToken.id,[AdminAssetsToken.id]);static readonly provide=this.declaration.provide;static readonly inject=this.declaration.inject;static readonly Config=PlatformSchemas.empty;static readonly replacement=AdminDeclaration.replacement; + constructor(private readonly context:Context){} + async [Service.init]():Promise<()=>Promise>{const renderer=await UiServerRenderer.create();try{const style=await renderer.styles(),asset=AdminAssetsToken.parse(Reflect.get(this.context,AdminAssetsToken.id)).asset(style.path);if(!asset||asset.sha256!==style.digest||new TextDecoder().decode(asset.bytes)!==style.css)throw new Error('ADMIN_STYLE_MISMATCH');this.context.provide(AdminPresentationToken.id,renderer);return renderer.dispose.bind(renderer);}catch(error){await renderer.dispose();throw error;}} +} export class AdminPlugin { - static readonly declaration:ProviderDeclaration=ProviderSchemas.declaration.parse({id:'installed-admin',pluginId:'admin',capability:AdminToken.id,contractVersion:ProviderSchemas.version,target:'api',provide:[AdminToken.id],inject:[IdentitySessionsToken.id,InstalledTokens.invoker.id]}); - static readonly provide=this.declaration.provide;static readonly inject=this.declaration.inject;static readonly Config=InstalledSchemas.serverConfiguration; - constructor(context:Context,settings:ServerConfiguration){context.provide(AdminToken.id,new AdminRoutes(IdentitySessionsToken.parse(Reflect.get(context,IdentitySessionsToken.id)),InstalledTokens.invoker.parse(Reflect.get(context,InstalledTokens.invoker.id)),settings));} + static readonly declaration=AdminDeclaration.create('installed-admin',AdminToken.id,[IdentitySessionsToken.id,ServiceTokens.invoker.id,AdminAssetsToken.id,AdminPresentationToken.id]); + static readonly provide=this.declaration.provide;static readonly inject=this.declaration.inject;static readonly Config=InstalledSchemas.serverConfiguration;static readonly replacement=AdminDeclaration.replacement; + constructor(context:Context,settings:ServerConfiguration){context.provide(AdminToken.id,new AdminRoutes(IdentitySessionsToken.parse(Reflect.get(context,IdentitySessionsToken.id)),ServiceTokens.invoker.parse(Reflect.get(context,ServiceTokens.invoker.id)),settings,AdminAssetsToken.parse(Reflect.get(context,AdminAssetsToken.id)),AdminPresentationToken.parse(Reflect.get(context,AdminPresentationToken.id))));} } export class AdminComposition { - static registrations(settings:ServerConfiguration,artifact:ProviderArtifact):ProviderRegistration[]{return [{token:AdminToken,plugin:AdminPlugin,declaration:AdminPlugin.declaration,configuration:settings,artifact}];} - static selections(scopeId:string):Array<{scopeId:string;capability:string;providerId:string}>{return [{scopeId,capability:AdminToken.id,providerId:AdminPlugin.declaration.id}];} + static registrations(settings:ServerConfiguration,artifact:ProviderArtifact):ProviderRegistration[]{return [{token:AdminAssetsToken,plugin:AdminAssetsPlugin,declaration:AdminAssetsPlugin.declaration,configuration:{},artifact},{token:AdminPresentationToken,plugin:AdminPresentationPlugin,declaration:AdminPresentationPlugin.declaration,configuration:{},artifact},{token:AdminToken,plugin:AdminPlugin,declaration:AdminPlugin.declaration,configuration:settings,artifact}];} + static selections(scopeId:string):Array<{scopeId:string;capability:string;providerId:string}>{return [{scopeId,capability:AdminAssetsToken.id,providerId:AdminAssetsPlugin.declaration.id},{scopeId,capability:AdminPresentationToken.id,providerId:AdminPresentationPlugin.declaration.id},{scopeId,capability:AdminToken.id,providerId:AdminPlugin.declaration.id}];} } export class AdminBuild { - static metadata():ProviderDeclaration{return AdminPlugin.declaration;} + static metadata():NativeProviderDeclaration{return AdminPlugin.declaration;} static asset(file=new URL('./browser.bundle.js',import.meta.url)):{bytes:Buffer;digest:string}{const bytes=readFileSync(file);return {bytes,digest:createHash('sha256').update(bytes).digest('hex')};} - static async run():Promise{if(!import.meta.main)return;if(process.argv[2]==='--build-assets'){const result=await Bun.build({entrypoints:['src/browser.ts'],outdir:'dist/src',naming:'browser.bundle.js',target:'browser',minify:true});if(!result.success)throw new Error('Browser build failed');const metadata=JSON.parse(readFileSync('package.json','utf8')) as Record;metadata.cordis=this.metadata();metadata.cordisAsset={path:"dist/src/browser.bundle.js",sha256:this.asset().digest};writeFileSync('package.json',JSON.stringify(metadata,null,2)+'\n');}else if(process.argv[2]==='--describe')process.stdout.write(JSON.stringify(this.metadata())+'\n');else{process.stderr.write('Unsupported admin program invocation.\n');process.exitCode=2;}} + static async run():Promise{if(!import.meta.main)return;if(process.argv[2]==='--build-assets'){const result=await Bun.build({entrypoints:['src/browser.ts'],outdir:'dist/src',naming:'browser.bundle.js',target:'browser',minify:true,define:{'process.env.NODE_ENV':JSON.stringify('production')}});if(!result.success)throw new Error('Browser build failed');const metadata=JSON.parse(readFileSync('package.json','utf8')) as {name:string;version:string;cordis?:unknown;cordisAsset?:unknown;cordisPackage?:unknown};if(metadata.version!==AdminPackageIdentity.version)throw new Error('ADMIN_PACKAGE_IDENTITY_DRIFT');metadata.cordis=this.metadata();metadata.cordisAsset={path:'dist/src/browser.bundle.js',sha256:this.asset().digest};const browser=await import('./browser.js'),providers=[PackageDefinition.export(AdminPlugin,'dist/src/admin.js','AdminPlugin'),PackageDefinition.export(AdminAssetsPlugin,'dist/src/admin.js','AdminAssetsPlugin'),PackageDefinition.export(AdminPresentationPlugin,'dist/src/admin.js','AdminPresentationPlugin')];for(const plugin of [browser.AdminBrowserStatePlugin,browser.HttpStatusPlugin,browser.AdminNavigationPlugin,browser.AdminActionsPlugin,browser.StatusPagePlugin])providers.push(PackageDefinition.export(plugin,'dist/src/browser.js',plugin.name));const asset=this.asset();metadata.cordisPackage=PackageDefinition.define(metadata.name,metadata.version,'admin',providers,[{path:'dist/src/browser.bundle.js',sha256:asset.digest,size:asset.bytes.length}]);writeFileSync('package.json',JSON.stringify(metadata,null,2)+'\n');}else if(process.argv[2]==='--describe')process.stdout.write(JSON.stringify(this.metadata())+'\n');else{process.stderr.write('Unsupported admin program invocation.\n');process.exitCode=2;}} } await AdminBuild.run(); diff --git a/src/assets.ts b/src/assets.ts new file mode 100644 index 0000000..5f07511 --- /dev/null +++ b/src/assets.ts @@ -0,0 +1,19 @@ +import {createHash} from 'node:crypto'; +import {createRequire} from 'node:module'; +import {readFileSync,realpathSync,statSync} from 'node:fs'; +import {dirname,join,relative,resolve,extname} from 'node:path'; +import {CanonicalJson,PluginManagementSchemas} from '@treeseed-cordis/sdk'; +export interface AdminPublicAsset {path:string;sha256:string;bytes:Uint8Array;contentType:string;} +export interface AdminAssets{digest():string;script():{path:string;sha256:string};asset(path:string):AdminPublicAsset|null;} +export class AdminAssetCatalog implements AdminAssets { + private readonly assets=new Map();private readonly identity:string;private readonly scriptAsset:AdminPublicAsset; + constructor(){const resolver=createRequire(import.meta.url),pending=[{entry:resolver.resolve('@treeseed-cordis/admin'),name:'@treeseed-cordis/admin'}],seen=new Set(),records:Array<{package:string;version:string;path:string;sha256:string}>=[];let script:AdminPublicAsset|undefined; + while(pending.length){const selected=pending.pop()!;let root=dirname(realpathSync(selected.entry));while(true){try{if(statSync(join(root,'package.json')).isFile()&&JSON.parse(readFileSync(join(root,'package.json'),'utf8')).name===selected.name)break;}catch{}const parent=dirname(root);if(parent===root)throw new Error('ASSET_PACKAGE_UNAVAILABLE');root=parent;}if(seen.has(root))continue;if(seen.size>=512)throw new Error('ASSET_CLOSURE_LIMIT');seen.add(root);const metadata=JSON.parse(readFileSync(join(root,'package.json'),'utf8')) as {name:string;version:string;dependencies?:Record;peerDependencies?:Record;peerDependenciesMeta?:Record;cordisPackage?:unknown};if(!metadata.name||!metadata.version)throw new Error('ASSET_PACKAGE_UNAVAILABLE');const local=createRequire(join(root,'package.json'));for(const name of Object.keys({...metadata.dependencies,...metadata.peerDependencies})){try{pending.push({entry:local.resolve(name),name});}catch{if(!metadata.peerDependenciesMeta?.[name]?.optional)throw new Error('ASSET_DEPENDENCY_UNAVAILABLE');}} + if(metadata.cordisPackage){const descriptor=PluginManagementSchemas.packageDescriptor.parse(metadata.cordisPackage);if(descriptor.package.name!==metadata.name||descriptor.package.version!==metadata.version)throw new Error('ASSET_PACKAGE_MISMATCH');for(const asset of descriptor.assets){const file=realpathSync(resolve(root,asset.path)),inside=relative(root,file);if(inside.startsWith('..')||inside==='')throw new Error('ASSET_PATH_REFUSED');const bytes=readFileSync(file),sha256=createHash('sha256').update(bytes).digest('hex');if(sha256!==asset.sha256||bytes.length!==asset.size)throw new Error('ASSET_BYTES_MISMATCH');const extension=extname(asset.path);if(!['.js','.css'].includes(extension))throw new Error('ASSET_TYPE_UNSUPPORTED');const path='/assets/'+(extension==='.css'?'ui/':'')+sha256+extension,value={path,sha256,bytes:new Uint8Array(bytes),contentType:extension==='.js'?'text/javascript; charset=utf-8':'text/css; charset=utf-8'};this.assets.set(path,value);records.push({package:metadata.name,version:metadata.version,path:asset.path,sha256});if(metadata.name==='@treeseed-cordis/admin'&&asset.path==='dist/src/browser.bundle.js')script=value;}} + }if(!script)throw new Error('ADMIN_SCRIPT_UNAVAILABLE');this.scriptAsset=script;records.sort(AdminAssetCatalog.order);this.identity=CanonicalJson.digest(records); + } + private static order(a:{package:string;version:string;path:string},b:{package:string;version:string;path:string}):number{const left=a.package+':'+a.path,right=b.package+':'+b.path;return leftright?1:0;} + digest():string{return this.identity;} + script():{path:string;sha256:string}{return {path:this.scriptAsset.path,sha256:this.scriptAsset.sha256};} + asset(path:string):AdminPublicAsset|null{const found=this.assets.get(path);return found?{...found,bytes:new Uint8Array(found.bytes)}:null;} +} diff --git a/src/browser.ts b/src/browser.ts index 0b461d4..eb33e9f 100644 --- a/src/browser.ts +++ b/src/browser.ts @@ -1,11 +1,71 @@ -import {Context,Service} from 'cordis'; -interface StatusReader {read():Promise;} -class StatusClient implements StatusReader {async read():Promise{const response=await fetch('/admin/status',{credentials:'same-origin',cache:'no-store',redirect:'error'});if(!response.ok)throw new Error('Status unavailable');return response.json();}} -class HttpStatusPlugin {static readonly provide=['admin.browser.status'];constructor(context:Context){context.provide('admin.browser.status',new StatusClient());}} -class StatusPagePlugin { - static readonly inject=['admin.browser.status']; +import {Context,type ProviderRegistration,CordisComposition,CordisServiceLocator,type CompositionHandle,type ProviderLease} from '@treeseed-cordis/sdk/composition'; +import {Service} from 'cordis'; +import {CapabilityToken,ProviderV4Schemas,PlatformSchemas,type NativeProviderDeclaration} from '@treeseed-cordis/sdk/portable'; +import {UiBrowserApplication} from '@treeseed-cordis/ui/browser'; +import {type UiMount,type UiActionDispatcher,type UiActionResult} from '@treeseed-cordis/ui/contracts'; +import {AdminViews,AdminPackageIdentity} from './views.js'; +export interface StatusReader {read():Promise;presentation():Promise;logout(csrf:string):Promise;} +export interface AdminPresentationState{open(actions:UiActionDispatcher,assetGeneration:string):Promise;refresh(value:unknown):Promise;close():Promise;} +export interface AdminNavigation {navigate(path:string):void;} +class BrowserAdapter{constructor(private readonly methods:string[]){}parse(value:unknown):T{if(!value||typeof value!=='object')throw new Error('ADMIN_BROWSER_PROVIDER_UNAVAILABLE');for(const method of this.methods)if(typeof Reflect.get(value,method)!=='function')throw new Error('ADMIN_BROWSER_PROVIDER_UNAVAILABLE');return value as T;}} +export class AdminBrowserTokens { + static readonly status=new CapabilityToken('admin.browser.status',ProviderV4Schemas.version,new BrowserAdapter(['read','presentation','logout'])); + static readonly presentation=new CapabilityToken('admin.browser.presentation',ProviderV4Schemas.version,new BrowserAdapter(['open','refresh','close'])); + static readonly navigation=new CapabilityToken('admin.browser.navigation',ProviderV4Schemas.version,new BrowserAdapter(['navigate'])); + static readonly actions=new CapabilityToken('admin.browser.actions',ProviderV4Schemas.version,new BrowserAdapter(['invoke'])); + static readonly page=new CapabilityToken<{close():Promise}>('admin.browser.page',ProviderV4Schemas.version,new BrowserAdapter<{close():Promise}>(['close'])); +} +class BrowserDeclaration { + static readonly replacement=Object.freeze({kind:'restart' as const,stateVersion:1,qualificationDigest:null}); + static create(id:string,capability:string,inject:string[]):NativeProviderDeclaration{return ProviderV4Schemas.declaration.parse({id,pluginId:'admin',capability,contractVersion:ProviderV4Schemas.version,target:'browser',provide:[capability],inject});} +} +export class StatusClient implements StatusReader { + private async request(path:string,options:RequestInit={}):Promise{const response=await fetch(path,{credentials:'same-origin',cache:'no-store',redirect:'error',signal:AbortSignal.timeout(15000),...options});if(!response.ok||!response.headers.get('content-type')?.startsWith('application/json')||Number(response.headers.get('content-length')??0)>1024*1024)throw new Error('ADMIN_REQUEST_REFUSED');const reader=response.body?.getReader();if(!reader)throw new Error('ADMIN_REQUEST_REFUSED');const chunks:Uint8Array[]=[];let size=0;try{while(true){const part=await reader.read();if(part.done)break;size+=part.value.byteLength;if(size>1024*1024)throw new Error('ADMIN_RESPONSE_LIMIT');chunks.push(part.value);}const bytes=new Uint8Array(size);let offset=0;for(const chunk of chunks){bytes.set(chunk,offset);offset+=chunk.length;}return JSON.parse(new TextDecoder().decode(bytes));}finally{await reader.cancel();reader.releaseLock();}} + read():Promise{return this.request('/admin/status');} + async presentation():Promise{const value=await this.request('/admin/presentation'),digest=value&&typeof value==='object'?Reflect.get(value,'assetGeneration'):undefined;return PlatformSchemas.digest.parse(digest);} + async logout(csrf:string):Promise{const value=await this.request('/admin/logout',{method:'POST',headers:{'Content-Type':'application/x-www-form-urlencoded','Accept':'application/json'},body:new URLSearchParams({csrf}).toString()});if(!value||typeof value!=='object'||Reflect.get(value,'success')!==true)throw new Error('ADMIN_LOGOUT_REFUSED');} +} +export class HttpStatusPlugin extends StatusClient { + static readonly declaration=BrowserDeclaration.create('admin.browser.status.default',AdminBrowserTokens.status.id,[]);static readonly provide=this.declaration.provide;static readonly inject=this.declaration.inject;static readonly Config=PlatformSchemas.empty;static readonly replacement=BrowserDeclaration.replacement; + constructor(context:Context){super();context.provide(AdminBrowserTokens.status.id,this);} +} +export class AdminBrowserState implements AdminPresentationState { + private mount:UiMount|undefined;private closed=false; + async open(actions:UiActionDispatcher,assetGeneration:string):Promise{if(this.mount||this.closed)throw new Error('ADMIN_PRESENTATION_CLOSED');this.mount=await UiBrowserApplication.hydrateDocument({actions,actionIds:['admin.refresh','admin.logout'],assetGeneration});} + async refresh(value:unknown):Promise{if(!this.mount||this.closed)throw new Error('ADMIN_PRESENTATION_CLOSED');await this.mount.update(AdminViews.refreshed(this.mount.view(),value));} + async close():Promise{this.closed=true;await this.mount?.dispose();} +} +export class AdminBrowserStatePlugin extends AdminBrowserState { + static readonly declaration=BrowserDeclaration.create('admin.browser.presentation.default',AdminBrowserTokens.presentation.id,[]);static readonly provide=this.declaration.provide;static readonly inject=this.declaration.inject;static readonly Config=PlatformSchemas.empty;static readonly replacement=BrowserDeclaration.replacement; + constructor(context:Context){super();context.provide(AdminBrowserTokens.presentation.id,this);} +} +export class AdminNavigationPlugin implements AdminNavigation { + static readonly declaration=BrowserDeclaration.create('admin.browser.navigation.default',AdminBrowserTokens.navigation.id,[AdminBrowserTokens.presentation.id]);static readonly provide=this.declaration.provide;static readonly inject=this.declaration.inject;static readonly Config=PlatformSchemas.empty;static readonly replacement=BrowserDeclaration.replacement; + private destination:string|null=null;private timer:ReturnType|undefined; + constructor(private readonly context:Context){context.provide(AdminBrowserTokens.navigation.id,this);} + navigate(path:string):void{if(path!=='/admin'||this.destination)throw new Error('ADMIN_NAVIGATION_REFUSED');this.destination=path;this.timer=setTimeout(this.leave.bind(this),0);} + [Service.init]():()=>void{return this.cancel.bind(this);} + private cancel():void{clearTimeout(this.timer);} + private async leave():Promise{try{await AdminBrowserTokens.presentation.parse(Reflect.get(this.context,AdminBrowserTokens.presentation.id)).close();window.location.assign(this.destination!);}catch{console.error('ADMIN_NAVIGATION_FAILED');}} +} +export class AdminActionsPlugin implements UiActionDispatcher { + static readonly declaration=BrowserDeclaration.create('admin.browser.actions.default',AdminBrowserTokens.actions.id,[AdminBrowserTokens.status.id,AdminBrowserTokens.presentation.id,AdminBrowserTokens.navigation.id]);static readonly provide=this.declaration.provide;static readonly inject=this.declaration.inject;static readonly Config=PlatformSchemas.empty;static readonly replacement=BrowserDeclaration.replacement; + constructor(private readonly context:Context){context.provide(AdminBrowserTokens.actions.id,this);} + async invoke(actionId:string,input:Readonly>):Promise{const reader=AdminBrowserTokens.status.parse(Reflect.get(this.context,AdminBrowserTokens.status.id));try{if(actionId==='admin.refresh'){await AdminBrowserTokens.presentation.parse(Reflect.get(this.context,AdminBrowserTokens.presentation.id)).refresh(await reader.read());return {success:true,message:'Status refreshed'};}if(actionId==='admin.logout'&&typeof input.csrf==='string'&&/^[a-f0-9]{64}$/.test(input.csrf)){await reader.logout(input.csrf);AdminBrowserTokens.navigation.parse(Reflect.get(this.context,AdminBrowserTokens.navigation.id)).navigate('/admin');return {success:true,message:'Signed out'};}return {success:false,message:'Action refused'};}catch{return {success:false,message:'Request unavailable'};}} +} +export class StatusPagePlugin { + static readonly declaration=BrowserDeclaration.create('admin.browser.page.default',AdminBrowserTokens.page.id,[AdminBrowserTokens.status.id,AdminBrowserTokens.presentation.id,AdminBrowserTokens.actions.id]);static readonly provide=this.declaration.provide;static readonly inject=this.declaration.inject;static readonly Config=PlatformSchemas.empty;static readonly replacement=BrowserDeclaration.replacement; constructor(private readonly context:Context){} - async [Service.init]():Promise{const reader=Reflect.get(this.context,'admin.browser.status') as StatusReader,element=document.getElementById('installed-status');if(!element)throw new Error('Status element missing');try{element.textContent=JSON.stringify(await reader.read(),null,2);element.setAttribute('data-loaded','true');}catch{element.textContent='Installed status is unavailable.';element.setAttribute('data-loaded','failed');}} + async [Service.init]():Promise<()=>Promise>{const state=AdminBrowserTokens.presentation.parse(Reflect.get(this.context,AdminBrowserTokens.presentation.id)),reader=AdminBrowserTokens.status.parse(Reflect.get(this.context,AdminBrowserTokens.status.id));await state.open(AdminBrowserTokens.actions.parse(Reflect.get(this.context,AdminBrowserTokens.actions.id)),await reader.presentation());this.context.provide(AdminBrowserTokens.page.id,state);return state.close.bind(state);} +} +export class AdminBrowserApplication { + private disposal:Promise|null=null; + private constructor(private readonly handle:CompositionHandle,private readonly lease:ProviderLease<{close():Promise}>){window.addEventListener('pagehide',this.pageHide);} + private readonly pageHide=this.stop.bind(this); + private stop():void{void this.dispose().catch(AdminBrowserApplication.failed);} + static failed():void{console.error('ADMIN_BROWSER_UNAVAILABLE');} + static async start():Promise{if(typeof document==='undefined')return;const scopeId='admin.browser',registrations:ProviderRegistration[]=[],artifact={kind:'bundled' as const,identity:AdminPackageIdentity.artifact};for(const [token,plugin] of [[AdminBrowserTokens.presentation,AdminBrowserStatePlugin],[AdminBrowserTokens.status,HttpStatusPlugin],[AdminBrowserTokens.navigation,AdminNavigationPlugin],[AdminBrowserTokens.actions,AdminActionsPlugin],[AdminBrowserTokens.page,StatusPagePlugin]] as const)registrations.push({token,plugin,declaration:plugin.declaration,configuration:{},artifact});const selections=[];for(const registration of registrations)selections.push({scopeId,capability:registration.token.id,providerId:ProviderV4Schemas.declaration.parse(registration.declaration).id});const handle=await CordisComposition.start({registrations,selections},{scopeId,target:'browser',principalId:'session-bound-browser',resourceScope:window.location.origin});try{const receiver:{context?:Context}={};class PageConsumer{static readonly inject=['cordis.composition',AdminBrowserTokens.page.id];constructor(context:Context){receiver.context=context;}}await handle.mount(PageConsumer,undefined);return new AdminBrowserApplication(handle,await CordisServiceLocator.from(receiver.context!).acquire(AdminBrowserTokens.page));}catch(error){await handle.dispose();throw error;}} + dispose():Promise{if(!this.disposal)this.disposal=this.close();return this.disposal;} + private async close():Promise{window.removeEventListener('pagehide',this.pageHide);try{await this.lease.value.close();}finally{try{await this.lease.release();}finally{await this.handle.dispose();}}} } -export class AdminBrowserApplication {static async start():Promise{if(typeof document==='undefined')return;const context=new Context();await context.plugin(HttpStatusPlugin);await context.plugin(StatusPagePlugin);}} await AdminBrowserApplication.start(); diff --git a/src/views.ts b/src/views.ts new file mode 100644 index 0000000..19bbc37 --- /dev/null +++ b/src/views.ts @@ -0,0 +1,6 @@ +import {UiSchemas,type UiViewModel} from '@treeseed-cordis/ui/contracts'; +export class AdminPackageIdentity{static readonly version='0.0.0-cordis.7';static readonly artifact='@treeseed-cordis/admin@'+this.version;} +export class AdminViews { + static initial(installationId:string,csrf:string):UiViewModel{return UiSchemas.view.parse({id:'admin.page',componentId:'stack',model:{title:'Cordis installed status',children:[{id:'admin.installation',componentId:'text',model:{text:'Installation '+installationId}},{id:'admin.status',componentId:'status',model:{title:'Installed status',state:'Loading'}},{id:'admin.refresh',componentId:'form',model:{title:'Status',actionId:'admin.refresh',submitLabel:'Refresh status',fields:[]}},{id:'admin.logout',componentId:'form',model:{title:'Session',actionId:'admin.logout',submitLabel:'Sign out',actionData:{csrf},fields:[]}}]}});} + static refreshed(view:UiViewModel,envelope:unknown):UiViewModel{const stack=UiSchemas.stackModel.parse(view.model);if(!envelope||typeof envelope!=='object'||Reflect.get(envelope,'success')!==true)throw new Error('STATUS_UNAVAILABLE');const result=Reflect.get(envelope,'result');if(!result||typeof result!=='object')throw new Error('STATUS_UNAVAILABLE');const children:UiViewModel[]=[];for(const child of stack.children)if(child.id!=='admin.status'&&child.id!=='admin.services')children.push(child);const ready=Reflect.get(result,'ready')===true,generation=Reflect.get(result,'activeComposition');children.splice(1,0,{id:'admin.status',componentId:'status',model:{title:'Installed status',state:ready?'Ready':'Not ready',detail:typeof generation==='string'?generation:'No active composition'}});const rows:string[][]=[];const services=Reflect.get(result,'services');if(Array.isArray(services)){if(services.length>256)throw new Error('STATUS_UNAVAILABLE');for(const item of services){if(!item||typeof item!=='object')throw new Error('STATUS_UNAVAILABLE');const id=Reflect.get(item,'serviceId'),state=Reflect.get(item,'state');if(typeof id!=='string'||(typeof state!=='string'&&typeof Reflect.get(item,'ready')!=='boolean'))throw new Error('STATUS_UNAVAILABLE');rows.push([id,typeof state==='string'?state:Reflect.get(item,'ready')?'Ready':'Not ready']);}}children.splice(2,0,{id:'admin.services',componentId:'table',model:{title:'Services',columns:['Service','State'],rows}});return UiSchemas.view.parse({...view,model:{...stack,children}});} +} diff --git a/tests/admin.test.ts b/tests/admin.test.ts index ca439ad..6141ed0 100644 --- a/tests/admin.test.ts +++ b/tests/admin.test.ts @@ -1,10 +1,22 @@ import {test,expect} from 'bun:test'; import {spawnSync} from 'node:child_process'; -import {AdminBuild,AdminRoutes} from '../src/admin.js'; -import {readFileSync} from 'node:fs'; +import {AdminBuild,AdminRoutes,AdminAssetCatalog} from '../src/admin.js'; +import {readFileSync,writeFileSync} from 'node:fs'; +import {createRequire} from 'node:module'; +import {dirname,join} from 'node:path'; +import {UiSourcePolicy} from '@treeseed-cordis/ui/source-policy'; class AdminTests { + assets():void{const catalog=new AdminAssetCatalog();expect(catalog.digest()).toMatch(/^[a-f0-9]{64}$/);const script=catalog.script(),asset=catalog.asset(script.path)!;expect(asset.sha256).toBe(script.sha256);asset.bytes[0]=0;expect(catalog.asset(script.path)!.bytes[0]).not.toBe(0);expect(catalog.asset('/assets/../../private')).toBeNull();const resolve=createRequire(import.meta.url),root=join(dirname(resolve.resolve('@treeseed-cordis/ui/contracts')),'../..'),metadata=JSON.parse(readFileSync(join(root,'package.json'),'utf8')),file=join(root,metadata.cordisPackage.assets[0].path),bytes=readFileSync(file);try{writeFileSync(file,Buffer.concat([bytes,Buffer.from('tamper')]));expect(AdminTests.newCatalog).toThrow('ASSET_BYTES_MISMATCH');}finally{writeFileSync(file,bytes);}} + static newCatalog():void{new AdminAssetCatalog();} + policy():void{const policy=new UiSourcePolicy();expect(policy.inspect('src/copied.ts','class Copied {render(){return "";}}').length).toBeGreaterThan(0);expect(policy.inspect('src/copied.ts','class Copied {render(){document.body.textContent="status";}}').length).toBeGreaterThan(0);expect(policy.inspect('src/adapter.ts','class Adapter {read(){return {componentId:"status",model:{state:"Ready"}};}}')).toEqual([]);} + + nodeAssets():void{const code="import {AdminAssetCatalog} from './dist/src/admin.js'; class Program { static run(){const catalog=new AdminAssetCatalog(),script=catalog.script();if(!/^[a-f0-9]{64}$/.test(catalog.digest())||catalog.asset(script.path)?.sha256!==script.sha256)throw new Error('INVALID_DEFAULT_ASSETS');process.stdout.write('node-assets-ok\\n');}} Program.run();";const result=spawnSync('node',['--input-type=module','-e',code],{encoding:'utf8'});expect(result.stderr).toBe('');expect(result.status).toBe(0);expect(result.stdout).toBe('node-assets-ok\n');} program():void{const result=spawnSync('node',['dist/src/admin.js','--describe'],{encoding:'utf8'});expect(result.status).toBe(0);expect(result.stderr).toBe('');expect(JSON.parse(result.stdout).capability).toBe('admin.routes');} - cookies():void{expect(AdminRoutes.sessionCookieName({installationId:'one',origin:'https://localhost:8443'})).not.toBe(AdminRoutes.sessionCookieName({installationId:'two',origin:'https://localhost:8443'}));expect(AdminRoutes.sessionCookieName({installationId:'one',origin:'https://localhost:8443'})).not.toBe(AdminRoutes.sessionCookieName({installationId:'one',origin:'https://localhost:8444'}));expect(AdminRoutes.cookie('other=x; __Host-cordis=value','__Host-cordis')).toBe('value');expect(AdminRoutes.cookie('__Host-cordis=a; __Host-cordis=b','__Host-cordis')).toBe('');expect(AdminRoutes.escape('