mirror of
https://github.com/hanzoai/kms.git
synced 2026-10-17 11:18:16 +00:00
The coupling was one string. Mount(app, deps) took hanzoai/cloud's Deps and read exactly two fields out of it: a logger, which luxfi/log already publishes as a process default and which Embed has always used, and a data root. Everything else in that struct crossed the boundary to be discarded. An init() then pushed this package into cloud's registry so cloud could call Mount back. That points the dependency the wrong way. It makes the graph circular, since cloud imports kms in order to mount it, and it fixes the set of possible hosts at one: two editions of hanzoai/cloud declare the same module path, so cloud.Deps names a different type in each, and a package that takes it can be composed by one of them and never the other. kms.App(root) now builds the app and returns it, and a host composes it with app.Use. Routes are absolute, so composition neither moves nor shadows them; the bridge test runs through a host app with middleware in front of it to hold that. Teardown travels with the app rather than with the process: the Embedded server drains on a shutdown hook, and zip makes a parent drain the children it composed, so kms.Shutdown and the package global it read are gone. The readyz branch that answered 503 when that global was nil went with them, since a failed Embed returns an error and no app at all. The daemon read the host's config too, and that was a live bug: it bound $CLOUD_LISTEN, default :8080, while its own image sets KMS_LISTEN=:8443 and its HEALTHCHECK curls 8443. It now reads its own, through the one function that resolves that address for both the daemon and Embed. zip moves from v1.10.0 to v1.27.2, the version the host already selects, because Use taking a Component is what makes an app composable at all. middleware.Logger and the KMS_LOG_LEVEL=debug opt-in around it go with the bump; zip logs every request itself now, so that report is no longer something a binary can be missing. Dropping cloud drops what it dragged in. goja, esbuild and a sourcemap parser leave the graph: a secret store no longer links a JavaScript engine. Both go.sum files carried a pre-retag hash for luxfi/vm v1.3.1 that no longer matches the bits the proxy serves, which failed every build outside the workspace. Corrected against the checksum database, which agrees with the download. Co-authored-by: Hanzo Dev <[email protected]>
85 lines
3.3 KiB
Go
85 lines
3.3 KiB
Go
// KMS is an app. It builds its own zip.App and hands it back, so a host
|
|
// composes it — app.Use(kmsApp) — and nothing of the host's crosses into this
|
|
// module.
|
|
//
|
|
// It used to be the other way around: Mount(app, deps) took hanzoai/cloud's
|
|
// Deps and an app the host had already built, and an init() pushed itself into
|
|
// cloud's registry so cloud could call it back. That points the dependency the
|
|
// wrong way. It makes the graph circular, since cloud imports kms in order to
|
|
// mount it, and it fixes the set of possible hosts at exactly one — there are
|
|
// two editions of hanzoai/cloud declaring the same module path, so cloud.Deps
|
|
// names a different type in each and a package that takes it can be composed by
|
|
// one of them and never the other.
|
|
//
|
|
// Of the whole Deps struct this package read two fields: a logger, which
|
|
// luxfi/log already publishes as a process default and Embed already uses, and
|
|
// a data root, which is one string. So the coupling was one string.
|
|
//
|
|
// The strategy is still "wrap, don't rewrite": kms.Embed already returns an
|
|
// http.Handler carrying every KMS route, the JWT verifier, the audit ledger and
|
|
// the ZAP transport. That handler hangs off a wildcard route through zip's
|
|
// net/http adaptor; health and readiness are native zip handlers.
|
|
package kms
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/http"
|
|
"strings"
|
|
|
|
"github.com/zap-proto/zip"
|
|
)
|
|
|
|
// App builds the KMS surface and returns it as a zip.App.
|
|
//
|
|
// root is the one fact a host supplies: the data root KMS keeps its store
|
|
// under, as root/kms. Empty means KMS resolves its own — $KMS_DATA_DIR, else
|
|
// /data/hanzo-kms — which is what the standalone daemon wants.
|
|
//
|
|
// Embed runs with SkipListen: whoever composes this app owns the listener, and
|
|
// KMS only contributes routes. Teardown travels with the app rather than with
|
|
// the process — the Embedded handle owns zapdb, the ZAP node, the replicator
|
|
// and the audit ledger, and drains on the app's shutdown hook. zip makes a
|
|
// parent drain the children it composed, so there is no global handle to reach
|
|
// for and nothing a host has to remember to call.
|
|
//
|
|
// A failed Embed returns an error and no app. There is no mounted-but-broken
|
|
// state to probe for.
|
|
func App(root string) (*zip.App, error) {
|
|
cfg := EmbedConfig{SkipListen: true}
|
|
if root != "" {
|
|
cfg.DataDir = strings.TrimRight(root, "/") + "/kms"
|
|
}
|
|
em, err := Embed(context.Background(), cfg)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("kms: embed: %w", err)
|
|
}
|
|
|
|
app := zip.New(zip.Config{AppName: "kms"})
|
|
app.OnShutdown(em.Stop)
|
|
|
|
// Native probes, so liveness and readiness cost no trip through the
|
|
// adaptor. Registered before the wildcard that follows them.
|
|
probe := func(status string) zip.Handler {
|
|
return func(c *zip.Ctx) error {
|
|
return c.JSON(http.StatusOK, map[string]any{
|
|
"status": status,
|
|
"service": "kms",
|
|
"version": Version,
|
|
})
|
|
}
|
|
}
|
|
app.Get("/v1/kms/health", probe("ok"))
|
|
app.Get("/v1/kms/readyz", probe("ready"))
|
|
|
|
// Everything else, over the net/http bridge. AdaptNetHTTP costs ~5% against
|
|
// native dispatch and preserves the surface exactly. Two prefixes so the
|
|
// client libraries (/v1/kms/*) and the container probe (/healthz) both work
|
|
// unchanged; the trailing wildcard is optional, so /healthz itself resolves.
|
|
h := zip.AdaptNetHTTP(em.HTTPHandler())
|
|
app.All("/v1/kms/*", h)
|
|
app.All("/healthz/*", h)
|
|
|
|
return app, nil
|
|
}
|