mirror of
https://github.com/hanzoai/compute.git
synced 2026-10-30 14:50:41 +00:00
zeekayandHanzo Dev
2933bcae0c
Rip Beego out of visor's own source: routing, filters, auth, sessions,
logging, config and the guacamole websocket tunnel are now ZAP-native
(github.com/zap-proto/zip over fiber/fasthttp), mirroring the iam-canonical
idiom. vm's own tree is now 100% beego-free; Beego survives only as a
transitive dep of the iam-v1 identity SDK (github.com/hanzoai/iam-v1).
Also fixes the routers test panic: two Beego copies (beego + hanzoai/beego)
both registered the `graceful` flag at init, so `go test ./routers` aborted
with "flag redefined: graceful". Removing Beego removes the double init.
HTTP spine (the explicit deliverable):
- main.go: beego.Run() -> cobra root cmd -> app.Listen (HTTP edge :19000,
optional ZAP addr); a bare `/visor` still serves (container contract).
- pkg/visor/embed.go: ONE boot path Bootstrap() *zip.App; Handler() adapts to
net/http for the cloud mount.
- routers: beego.Router table -> Route(app) with app.Get/Post/Delete;
InsertFilter chain -> app.Use middleware (Recover, CORS, static, tenant,
ApiFilter authz seam, record). TransparentStatic short-circuits before the
authz seam exactly as the BeforeRouter filter did. *beego/context.Context
-> *zip.Ctx.
- util/log.go: request logger over luxfi/log.
Controllers (entailed by a green build; ApiController embedded beego.Controller):
- ApiController backed by *zip.Ctx; c.Input().Get -> c.Ctx.Query,
c.Ctx.Input.RequestBody -> c.Ctx.Body(), c.Ctx.Input.Param(":id") ->
c.Ctx.Param("id"); ServeJSON/ResponseOk/ResponseError write via zip and
stash the envelope on Locals for the record filter.
- Sessions: beego cookie/redis -> stateless Bearer-JWT Principal
(object.GetBearerUser). Signin returns claims+token; the client carries the
token thereafter.
- pagination.SetPaginator -> util.Paginate.
Object/glue:
- tenant_context: beego ctx Input.Data -> zip Locals.
- record.NewRecord(*zip.Ctx, respJSON).
- config: Beego AppConfig -> conf (ini.v1 + ${VAR||default} env expansion,
lazy-loaded). logging: beego/logs -> visor/logs over luxfi/log.
Websocket tunnel (the one Beego-adjacent API with no drop-in ZAP equivalent):
- gorilla/websocket hijack can't work on the fasthttp edge; ported guacamole +
tunnel handlers to github.com/fasthttp/websocket (gorilla-compatible fork,
already a dep). Query params are read before the hijack (fiber recycles the
ctx) and the post-upgrade callback isolates panics (it runs outside zip's
recover).
Build + tests green (host darwin/arm64 + linux/arm64 CI target); go vet clean.
Co-authored-by: Hanzo Dev <[email protected]>
89 lines
2.3 KiB
Go
89 lines
2.3 KiB
Go
// Copyright 2023 Hanzo Industries Inc. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package controllers
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/hanzoai/visor/object"
|
|
"github.com/hanzoai/visor/util"
|
|
)
|
|
|
|
type Response struct {
|
|
Status string `json:"status"`
|
|
Msg string `json:"msg"`
|
|
Data interface{} `json:"data"`
|
|
Data2 interface{} `json:"data2"`
|
|
}
|
|
|
|
// serve writes payload as the JSON response (HTTP 200, the SDK contract branches
|
|
// on the envelope status, not the code) and stashes it on the request context so
|
|
// the record filter can capture the response envelope after the handler returns.
|
|
func (c *ApiController) serve(payload interface{}) {
|
|
if c.Ctx == nil {
|
|
return
|
|
}
|
|
c.Ctx.Locals(object.RecordResponseKey, payload)
|
|
_ = c.Ctx.JSON(200, payload)
|
|
}
|
|
|
|
// ServeJSON writes the buffered Data["json"] payload — the Beego-shaped spelling
|
|
// the handlers use for the wrapActionResponse path.
|
|
func (c *ApiController) ServeJSON() {
|
|
c.serve(c.Data["json"])
|
|
}
|
|
|
|
func (c *ApiController) ResponseOk(data ...interface{}) {
|
|
resp := Response{Status: "ok"}
|
|
switch len(data) {
|
|
case 2:
|
|
resp.Data2 = data[1]
|
|
fallthrough
|
|
case 1:
|
|
resp.Data = data[0]
|
|
}
|
|
c.serve(resp)
|
|
}
|
|
|
|
func (c *ApiController) ResponseError(error string, data ...interface{}) {
|
|
resp := Response{Status: "error", Msg: error}
|
|
switch len(data) {
|
|
case 2:
|
|
resp.Data2 = data[1]
|
|
fallthrough
|
|
case 1:
|
|
resp.Data = data[0]
|
|
}
|
|
c.serve(resp)
|
|
}
|
|
|
|
func (c *ApiController) RequireSignedIn() bool {
|
|
if c.GetSessionUser() == nil {
|
|
c.ResponseError("please sign in first")
|
|
return true
|
|
}
|
|
|
|
return false
|
|
}
|
|
|
|
func (c *ApiController) getClientIp() string {
|
|
res := strings.Replace(util.ClientIPFromCtx(c.Ctx), ": ", "", -1)
|
|
return res
|
|
}
|
|
|
|
func (c *ApiController) getUserAgent() string {
|
|
return c.Ctx.Header("User-Agent")
|
|
}
|