mirror of
https://github.com/hanzoai/zip.git
synced 2026-10-30 20:11:40 +00:00
* wipe upstream zeekay/zip — rebuilding on Fiber v3
* core: zip on Fiber v3 — App, Ctx, Router, typed handlers, OpenAPI
zip wraps *fiber.App. Sinatra/Express idiom (app.Get/Post/...).
Generic zip.Get[I,O], zip.Post[I,O] etc. reflection-build OpenAPI 3.1
spec served at /.well-known/openapi.json + Swagger UI at /docs.
Ctx exposes Hanzo identity (Org/User/UserEmail/IsAdmin) from gateway
X-* headers per HIP-0026. luxfi/log per-request logger via c.Log().
Module(method+path, runtime, modulePath) mounts a HIP-0105 extension
as a Fiber route. Loader is duck-typed via zip/runtime.Loader so zip
does not pull hanzoai/base as a transitive dep — service binary
constructs *extruntime.Loader and injects via zip.Config.Loader.
go.mod: go 1.26.3 (forced by luxfi/log v1.4.3 floor; brief said
1.23.6 but luxfi canonical requires 1.26.x). Fiber v3.2.0, no major
bumps planned.
* middleware: Recover, RequestID, Logger, Timeout, MaxBody, CORS, Auth, RateLimit, Telemetry
Recover catches handler panics → luxfi/log + 500 JSON.
RequestID forwards X-Request-Id (or mints 16-byte hex).
Logger wraps each request with method/path/status/dur, enriches the
per-request luxfi/log Logger via c.SetLog().
Auth trusts gateway-minted X-* headers first; falls back to bearer
verification via injected AuthVerifier.
StripIdentityHeaders for non-gateway deployments.
RateLimit is per-org (or per-IP fallback) in-memory token bucket.
Telemetry plumbs to any O11ySink.
* adapters + wsx + zaprpc
AdaptNetHTTP/AdaptNetHTTPFunc/AdaptNetHTTPMiddleware via Fiber's
adaptor pkg. app.Mount(prefix, http.Handler) for legacy chi/gin/beego
migration. Each adapter doc'd as MIGRATION TOOL — costs ~5% vs native
Fiber dispatch.
wsx is fasthttp/websocket wrapped — wsx.Upgrade(fn) returns a
zip.Handler. Conn is *websocket.Conn from fasthttp/websocket; text/
binary/close/ping/pong message constants re-exported.
zaprpc ships Service + Registry + Dispatch. app.ZAPRegistry() returns
the per-App registry. app.ZAPListen(addr) reserves the port and logs
but the on-the-wire dispatcher is stubbed — full integration in a
follow-up PR pending zapc server type stabilization.
* examples + core tests
examples/
hello/ — minimal Sinatra-style API
zap-typed/ — generic typed handler + auto-OpenAPI + Swagger
subsystem-mount/ — HIP-0106 Mount(*App, deps) idiom
module-routes/ — app.Module() over a stub zip/runtime.Loader
websocket/ — wsx.Upgrade echo server
sse-streaming/ — c.SendStreamWriter Server-Sent Events
migrate-from-gin/ — gin→zip mechanical port
migrate-from-chi/ — chi→zip via AdaptNetHTTP
migrate-from-beego/— beego→zip via AdaptNetHTTP
Verified live: hello binary serves /hello + /health 200s; zap-typed
serves /v1/validate + /.well-known/openapi.json with reflection-
derived schemas. Tests pass: 5 cases (basic routing, HTTPError, typed
validation, groups, identity headers).
* docs: README, HANZO_CHANGES, MIGRATION, MIDDLEWARE, MODULE_HANDLERS
README pitches zip as canonical Hanzo Go framework on Fiber v3.
HANZO_CHANGES documents the diff from upstream zeekay/zip — every
file replaced; only the name kept.
MIGRATION covers gin/chi/beego/net-http with per-route recipes.
MIDDLEWARE covers Recover/RequestID/Logger/Auth/etc.
MODULE_HANDLERS covers app.Module() over HIP-0105 with the wire
envelope and per-runtime guidance.
* ctx.Bind validates via reflection tags; tighten AuthVerifier interface
c.Bind/BindQuery/BindURI now run validate() after parse and return
*HTTPError(400) directly — handler code is one line:
if err := c.Bind(&v); err != nil { return err }
AuthVerifier.Verify now takes context.Context (was an empty
interface{}). middleware import adjusted.
* module-routes: default Content-Type to application/json; add tests
Modules that don't set a Content-Type in their response envelope get
application/json; charset=utf-8 by default — the wire format is JSON
both directions.
Tests cover: happy path (POST /v1/eval echoed back), runtime mismatch
between caller and manifest, AllowedRuntimes refusal, nil Loader.
96 lines
1.9 KiB
Go
96 lines
1.9 KiB
Go
package middleware
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/hanzoai/zip"
|
|
)
|
|
|
|
// RateLimitConfig configures the per-key token bucket.
|
|
type RateLimitConfig struct {
|
|
// Limit is the number of requests permitted per Window.
|
|
Limit int
|
|
// Window is the time window (e.g. 1*time.Minute).
|
|
Window time.Duration
|
|
// KeyFn extracts the bucket key from the request. Default: c.Org()
|
|
// if present, else c.Fiber().IP().
|
|
KeyFn func(c *zip.Ctx) string
|
|
}
|
|
|
|
// RateLimit returns a per-org (or per-IP fallback) token-bucket limiter.
|
|
// Buckets are kept in-memory; suitable for single-pod deployments.
|
|
// Multi-pod deployments should use a distributed limiter at the gateway.
|
|
func RateLimit(cfg RateLimitConfig) zip.Handler {
|
|
if cfg.Limit <= 0 {
|
|
cfg.Limit = 100
|
|
}
|
|
if cfg.Window <= 0 {
|
|
cfg.Window = time.Minute
|
|
}
|
|
if cfg.KeyFn == nil {
|
|
cfg.KeyFn = func(c *zip.Ctx) string {
|
|
if org := c.Org(); org != "" {
|
|
return org
|
|
}
|
|
return c.Fiber().IP()
|
|
}
|
|
}
|
|
|
|
type bucket struct {
|
|
count int
|
|
reset time.Time
|
|
}
|
|
var (
|
|
mu sync.Mutex
|
|
buckets = map[string]*bucket{}
|
|
)
|
|
|
|
return func(c *zip.Ctx) error {
|
|
key := cfg.KeyFn(c)
|
|
now := time.Now()
|
|
|
|
mu.Lock()
|
|
b, ok := buckets[key]
|
|
if !ok || now.After(b.reset) {
|
|
b = &bucket{reset: now.Add(cfg.Window)}
|
|
buckets[key] = b
|
|
}
|
|
b.count++
|
|
remaining := cfg.Limit - b.count
|
|
exhausted := b.count > cfg.Limit
|
|
mu.Unlock()
|
|
|
|
if exhausted {
|
|
c.SetHeader("X-RateLimit-Limit", itoa(cfg.Limit))
|
|
c.SetHeader("X-RateLimit-Remaining", "0")
|
|
return zip.Errorf(429, "rate limit exceeded")
|
|
}
|
|
c.SetHeader("X-RateLimit-Limit", itoa(cfg.Limit))
|
|
c.SetHeader("X-RateLimit-Remaining", itoa(remaining))
|
|
return c.Continue()
|
|
}
|
|
}
|
|
|
|
func itoa(n int) string {
|
|
if n == 0 {
|
|
return "0"
|
|
}
|
|
neg := n < 0
|
|
if neg {
|
|
n = -n
|
|
}
|
|
var b [20]byte
|
|
pos := len(b)
|
|
for n > 0 {
|
|
pos--
|
|
b[pos] = byte('0' + n%10)
|
|
n /= 10
|
|
}
|
|
if neg {
|
|
pos--
|
|
b[pos] = '-'
|
|
}
|
|
return string(b[pos:])
|
|
}
|