mirror of
https://github.com/Rain-kl/OpenFlare.git
synced 2026-09-30 14:26:36 +08:00
dbaa3bf140
docs(changelog): 修正表述笔误
refactor(cordis): 磁盘缓存改用上上游能力并清理本地副本
按上游/下游归属规约:类型断言守卫已回流 Wavelet(f3d85d5,附回归用例),
本仓库删除 OpenFlare/plugins/server/pkg/cache 整包并改 import 到
Wavelet/pkg/cache/disk,同步后与上游零漂移。
验证:go build 通过;go test ./... exit 0(137 包 ok);256 条路由对拍与
232 条 swagger 操作均零差异;make build-all 四进制;前端零改动。
docs(cordis): 记录 T1 清理结果与五个复用阻塞点
refactor(cordis): server 复用上游 pkg 能力并删除等价本地副本
按上游/下游归属规约清理重复实现,删除 7 个与上游等价的本地包并改 import:
shared/response→pkg/response、pkg/{logger,mail,trace,httppool,cache/ram}→
上游同名包、infra/persistence/batchwriter→pkg/batchwriter。逐项核过差异:
httppool 逐字节相同;logger 的 Config 字段完全一致;response 的 7 个 Abort*
一致;cache/ram 换过去顺带把裸 go 变回带 panic 恢复的 util.Go。
两处非等价差异按语义处理:
- batchwriter.Stats 与 status DTO 原为类型别名,改为消费侧逐字段转换,
避免 model 反向依赖基础设施类型;
- 上游 pkg/idgen 要求显式 Init(本地副本为懒加载自动初始化),本次保留本地
副本,待与 infra 初始化一并迁移(已登记在清理计划)。
验证:go build 通过;go test ./... exit 0(138 包 ok);256 条路由对拍零差异;
make swagger 232 条操作零增减,且归一化后与旧文档深度相等——差异仅为
response.Any / logger.LogEntry 两个定义名随包路径改名,接口形状未变。
chore(cordis): 回流内核与 pkg/util 通用能力并清理 vendoring 污染
按新增的上游/下游归属规约:HandleRaw/BasePath 与版本比较、网络、格式化助手
属通用能力,已提交到 Wavelet 分支 feat/cordis-router-raw-routes,本仓库改为
纯同步获取(pkg/util 已零漂移),补丁登记保留至上游合并。
同时修掉我此前 git add -A 造成的污染:首次 vendoring 把上游工作区里被
gitignore 的运行期产物一起提交进来(upload 的 diskcache 缓存块 650 个与
driver_http/dist 前端构建物 380 个,共 12872 行/1030 文件)。sync-upstream.sh
现显式排除 uploads/dist/data/*.db,.gitignore 补上对应兜底规则。
AGENTS.md 增加上游/下游改动归属规约,并把仍指向前 Cordis 布局的硬性约束
(internal/router + Serve、internal/repository/logstore、internal/platform/bootstrap、
internal/cmd)改到当前插件路径。
验证:go build 通过;go test ./... exit 0(144 包 ok);make swagger 232 条
操作与基线逐条一致;make build-all 四进制;gofmt 干净。
feat(cordis): server 插件化并改由内核挂载控制面路由
新增 plugins/server/plugin.go:Apply 以 ctx.Router().Group(app.api_prefix)
声明根级与 /v1 全部路由;33 个注册函数由 *gin.RouterGroup 改为
core.RouterExtension,RegisterCollection 改用内核新增的 HandleRaw 保留
尾部斜杠变体,AdminMiddlewares 返回 []any(Go 不允许把 []T 展开为 ...any)。
删除 router.Serve 与 registerRoutes,装配根改为 core.App +
driver_http.New(WithEngine(router.BuildEngine())),监听、信号与优雅退出归内核;
前端 SPA 的 NoRoute 兜底因内核暂无贡献点而保留在引擎层。
路由保真证据:plugin_parity_test 对拍 baseline/routes-engine.txt 的 256 条
(方法 路径) 零差异;go test ./... exit 0(144 包 ok,含真实 handler 的
openflare/integration 用例走同一条挂载路径);make swagger 232 条操作与基线
逐条一致;golangci-lint 0 issues;make build-all 四进制;embed_frontend
标签编译通过;前端零改动。
已知待补:带 Redis 的实机 HTTP 冒烟(本机 6379 未启动,session store 与
改造前一样在建店阶段即 fatal),以及 bootstrap 的任务/设置/迁移注册迁入 Apply。
feat(core): RouterExtension 增加 HandleRaw 与 BasePath 以保真尾部斜杠路由
server 插件化的前置:Handle 经 cleanPath 会剥掉尾部斜杠,无法表达
/resource 与 /resource/ 两条不同路由,而 OpenFlare 有 20 个历史 list
端点两者都注册且部署关闭了 RedirectTrailingSlash,缺失即 404。新增
HandleRaw 与 BasePath(作用域包装器同样登记反注册),补 extpoints 用例;
并把 router.Serve 拆出 BuildEngine 以便交给 driver_http.WithEngine 复用,
新增路由表导出 harness,固化 256 条 (方法 路径) 基线供插件化对拍。
上游补丁登记于 backend/OpenFlare/upstream-patches.md,同步脚本改为按目录
前缀输出差异并在同步后提醒确认补丁是否仍在。
验证:go build 通过;go test ./... exit 0(143 包 ok);gofmt 干净。
docs(cordis): 记录 server 插件接入内核的可行路径与内核能力缺口
feat(cordis): agent/relay/flared 落地为内核驱动插件
三个边缘守护进程各新增 plugin.go,实现 core.Plugin + core.Driver
(自定义 DriverType 与同名 profile),装配与生命周期从 main 迁入
Apply/Start/Stop:Apply 负责 JSON 配置加载、运行环境与用户确保、
openresty/frps/frpc 管理器与各服务装配;Start 以 util.Go 拉起阻塞式
runner 与 GeoIP 周期更新;Stop 收敛主循环结果并在超时时报错而非静默。
入口改为 core.NewApp(core.WithProfile(...)) + Prepare/Run,保持
-config 旗标、默认路径、退出码与启动/停止日志不变。
验证:go build 通过;go test ./... exit 0(143 包 ok,含 3 个插件身份
与配置失败路径测试);make build-all 四进制产出;三进制实跑缺失配置
均 exit 1 且错误链保留 load {agent,relay,flared} config 原因;gofmt 干净。
refactor(cordis): 按功能职责拆分为 4 个插件与 share 共享层
backend/OpenFlare 不再平铺遗留分层,改为 plugins/{server,agent,relay,flared}
加 share/:控制面业务(openflare/admin/oauth/user/upload/cap/config/health 与
repository/model/infra/router 等支撑层)归 server;三个边缘守护进程各自成插件;
被两个以上插件消费的 protocol/geoip/wsclient/render/pagesarchive/edge 归 share。
同时把 pkg/util 与 buildinfo 合并回上游 pkg(上游已覆盖全部符号,仅 8 个函数与
2 个类型为 OpenFlare 独有,已一并迁入),装配根统一到 backend/cmd(含三个 daemon
入口),Dockerfile 与 release 工作流的构建路径和 -X 注入路径同步更新。
验证:go build 通过;go test ./... exit 0(141 包 ok);make swagger exit 0 且
232 条 API 操作与基线逐条一致;make build-all 产出 4 进制;-X 注入经二进制
strings 实测生效;日志后端直连门禁改写为按 server 插件业务域扫描并在扫描数为 0
时报错(防门禁静默失效);前端零改动。
feat(cordis): 落地 backend/share 共享层与上游同步脚本
跨插件共享资源(控制消息协议、GeoIP+iputil、边缘守护进程日志)从下游包
移入 backend/share,并声明其只能依赖 core/pkg 与标准/第三方库,禁止反向
引用下游业务与具体插件实现;新增 scripts/sync-upstream.sh 只覆盖
backend/{core,pkg,plugins},同步后 --check 报告零差异,证明与上游逐字一致。
go build 通过,go test ./... exit 0(142 包 ok),前端零改动。
refactor(cordis): 采用与 Wavelet 同构的单模块布局并引入上游内核
按上游结构落位:backend/{core,pkg,plugins} 为 Wavelet 上游拷贝,OpenFlare
全部业务收拢到上游 downstream 所对应的位置 backend/OpenFlare/,模块名保持
Wavelet 以保证上游 import 路径逐字一致、同步零改写;三个 daemon 入口移至
backend/OpenFlare/cmd,backend/cmd 与 main.go 作为控制面装配根。
行为不变:go build 通过,142 个测试包全绿(含上游插件测试),232 条 API
操作与改造前逐条一致,四进制产物正常,前端零改动。swagger 暂只扫描下游代码,
待 P4 挂载上游路由后再纳入 plugins/。
style: 修正模块路径改写导致的 import 分组排序漂移
refactor(layout): Go 代码迁入 backend/ 并将模块名简化为 OpenFlare
对齐上游 Wavelet 的仓库布局,为以第二 module 形态 vendoring Cordis 内核与
平台插件做准备:模块路径整体改写为 OpenFlare,Go 目标加 cd backend,
swaggo 产物移至 backend/docs 并把 json/yaml 复制回 docs/ 供站点消费,
Dockerfile 与 release 工作流的构建目录、ldflags 模块路径同步更新。
行为保持不变:232 条路由与改造前逐条一致,95 个测试包全绿,
四进制产物正常,前端零改动。
chore(cordis): 落地改造计划与 schema/路由基线
新增 legacy_dump_test 迁移快照 harness:在临时 sqlite 库上按生产顺序
(goose.UpTo → zone 导入 → goose.Up)跑完 76 个历史迁移并导出 schema 与
版本序列,作为改造前后一致性门禁的唯一事实来源。同时记录 232 条路由清单
与 foundation 实施计划。
docs(cordis): add OpenFlare Cordis 架构改造设计
明确上游以第二 module 形态 vendoring 进 backend/Wavelet、4 个插件
(server/agent/relay/flared) 全部装载内核,并规定保留 76 个历史 goose
迁移 + 一次性版本 stamp 桥接的迁移方案,配套三方 schema 一致性门禁,
确保已部署库不重跑历史、不丢数据。
388 lines
9.3 KiB
Go
388 lines
9.3 KiB
Go
// Copyright 2026 Arctel.net
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package core
|
|
|
|
import (
|
|
"Wavelet/core/extpoints"
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// Context is the central micro-kernel service bus and runtime lifecycle container.
|
|
// It embeds Go standard context.Context compatibility, hierarchical scoping,
|
|
// service resolution, and LIFO disposer teardown.
|
|
type Context struct {
|
|
goCtx context.Context
|
|
cancel context.CancelFunc
|
|
parent *Context
|
|
container *Container
|
|
|
|
events *EventBus
|
|
router extpoints.RouterExtension
|
|
migrations extpoints.MigrationExtension
|
|
tasks extpoints.TaskExtension
|
|
schedules extpoints.ScheduleExtension
|
|
settings extpoints.SettingExtension
|
|
config extpoints.ConfigExtension
|
|
|
|
mu sync.RWMutex
|
|
children []*Context
|
|
disposers []Disposer
|
|
drivers []Driver
|
|
values map[any]any
|
|
disposed bool
|
|
}
|
|
|
|
// NewContext creates a new root Context wrapping a standard Go context.
|
|
// If base is nil, context.Background() is used by default.
|
|
//
|
|
//nolint:contextcheck
|
|
func NewContext(base context.Context) *Context {
|
|
if base == nil {
|
|
base = context.Background()
|
|
}
|
|
ctx, cancel := context.WithCancel(base)
|
|
|
|
return &Context{
|
|
goCtx: ctx,
|
|
cancel: cancel,
|
|
container: NewContainer(nil),
|
|
events: NewEventBus(),
|
|
router: extpoints.NewRouterRegistry(),
|
|
migrations: extpoints.NewMigrationRegistry(),
|
|
tasks: extpoints.NewTaskRegistry(),
|
|
schedules: extpoints.NewScheduleRegistry(),
|
|
settings: extpoints.NewSettingRegistry(),
|
|
config: extpoints.NewConfigRegistry(nil),
|
|
values: make(map[any]any),
|
|
}
|
|
}
|
|
|
|
// Deadline returns the time when work done on behalf of this context should be canceled.
|
|
func (c *Context) Deadline() (deadline time.Time, ok bool) {
|
|
return c.goCtx.Deadline()
|
|
}
|
|
|
|
// Done returns a channel that's closed when work done on behalf of this context should be canceled.
|
|
func (c *Context) Done() <-chan struct{} {
|
|
return c.goCtx.Done()
|
|
}
|
|
|
|
// Err returns a non-nil error value after Done is closed.
|
|
func (c *Context) Err() error {
|
|
return c.goCtx.Err()
|
|
}
|
|
|
|
// Value returns the value associated with key, searching the local values map,
|
|
// the underlying Go context, and fallback parent Contexts.
|
|
func (c *Context) Value(key any) any {
|
|
c.mu.RLock()
|
|
if v, ok := c.values[key]; ok {
|
|
c.mu.RUnlock()
|
|
return v
|
|
}
|
|
c.mu.RUnlock()
|
|
|
|
if v := c.goCtx.Value(key); v != nil {
|
|
return v
|
|
}
|
|
|
|
if c.parent != nil {
|
|
return c.parent.Value(key)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// GoContext returns the underlying standard Go context.Context.
|
|
func (c *Context) GoContext() context.Context {
|
|
return c.goCtx
|
|
}
|
|
|
|
// Set stores an arbitrary key-value pair in this Context's local storage.
|
|
func (c *Context) Set(key, val any) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
if c.values == nil {
|
|
c.values = make(map[any]any)
|
|
}
|
|
c.values[key] = val
|
|
}
|
|
|
|
// Get retrieves a key-value pair from this Context's local storage.
|
|
func (c *Context) Get(key any) (any, bool) {
|
|
c.mu.RLock()
|
|
defer c.mu.RUnlock()
|
|
if c.values == nil {
|
|
return nil, false
|
|
}
|
|
v, ok := c.values[key]
|
|
return v, ok
|
|
}
|
|
|
|
// Container returns the underlying IoC container for this Context.
|
|
func (c *Context) Container() *Container {
|
|
return c.container
|
|
}
|
|
|
|
// Parent returns the parent Context, or nil if this is a root Context.
|
|
func (c *Context) Parent() *Context {
|
|
return c.parent
|
|
}
|
|
|
|
// Root returns the root Context in the hierarchy.
|
|
func (c *Context) Root() *Context {
|
|
curr := c
|
|
for curr.parent != nil {
|
|
curr = curr.parent
|
|
}
|
|
return curr
|
|
}
|
|
|
|
// Fork creates a child Context with its own scoped IoC container and values,
|
|
// linked to this Context for hierarchical fallback resolution and cascading teardown.
|
|
func (c *Context) Fork() *Context {
|
|
return c.ForkWithContext(c.goCtx)
|
|
}
|
|
|
|
// ForkWithContext creates a child Context using a specific standard Go context.
|
|
//
|
|
//nolint:contextcheck
|
|
func (c *Context) ForkWithContext(base context.Context) *Context {
|
|
if base == nil {
|
|
base = c.goCtx
|
|
}
|
|
ctx, cancel := context.WithCancel(base)
|
|
|
|
child := &Context{
|
|
goCtx: ctx,
|
|
cancel: cancel,
|
|
parent: c,
|
|
container: NewContainer(c.container),
|
|
events: c.events,
|
|
router: c.router,
|
|
migrations: c.migrations,
|
|
tasks: c.tasks,
|
|
schedules: c.schedules,
|
|
settings: c.settings,
|
|
config: c.config,
|
|
values: make(map[any]any),
|
|
}
|
|
|
|
c.mu.Lock()
|
|
c.children = append(c.children, child)
|
|
c.mu.Unlock()
|
|
|
|
return child
|
|
}
|
|
|
|
// Events returns the domain EventBus associated with this Context hierarchy.
|
|
func (c *Context) Events() *EventBus {
|
|
return c.events
|
|
}
|
|
|
|
// On registers an event listener on the EventBus and automatically attaches its Disposer
|
|
// to this Context's teardown stack for automatic revocation when disposed.
|
|
func (c *Context) On(topic string, handler any) Disposer {
|
|
disposer := c.events.On(topic, handler)
|
|
c.OnDispose(disposer)
|
|
return disposer
|
|
}
|
|
|
|
// Effect registers a reversible side-effect cleanup callback on this Context.
|
|
func (c *Context) Effect(fn any) {
|
|
c.OnDispose(fn)
|
|
}
|
|
|
|
// Router returns the scoped RouterExtension registry with automatic disposer tracking.
|
|
func (c *Context) Router() extpoints.RouterExtension {
|
|
return newScopedRouterExtension(c, c.router)
|
|
}
|
|
|
|
// Migrations returns the MigrationExtension registry.
|
|
func (c *Context) Migrations() extpoints.MigrationExtension {
|
|
return c.migrations
|
|
}
|
|
|
|
// Tasks returns the scoped TaskExtension registry with automatic disposer tracking.
|
|
func (c *Context) Tasks() extpoints.TaskExtension {
|
|
return newScopedTaskExtension(c, c.tasks)
|
|
}
|
|
|
|
// Task is an alias for Tasks().
|
|
func (c *Context) Task() extpoints.TaskExtension {
|
|
return c.Tasks()
|
|
}
|
|
|
|
// Schedules returns the scoped ScheduleExtension registry with automatic disposer tracking.
|
|
func (c *Context) Schedules() extpoints.ScheduleExtension {
|
|
return newScopedScheduleExtension(c, c.schedules)
|
|
}
|
|
|
|
// Schedule is an alias for Schedules().
|
|
func (c *Context) Schedule() extpoints.ScheduleExtension {
|
|
return c.Schedules()
|
|
}
|
|
|
|
// Settings returns the scoped SettingExtension registry with automatic disposer tracking.
|
|
func (c *Context) Settings() extpoints.SettingExtension {
|
|
return newScopedSettingExtension(c, c.settings)
|
|
}
|
|
|
|
// Setting is an alias for Settings().
|
|
func (c *Context) Setting() extpoints.SettingExtension {
|
|
return c.Settings()
|
|
}
|
|
|
|
// Config returns the process-level configuration extension point. The registry is
|
|
// shared by every fork because configuration declarations are global facts, and it
|
|
// carries no per-scope disposers: values are resolved once before Apply runs.
|
|
func (c *Context) Config() extpoints.ConfigExtension {
|
|
return c.config
|
|
}
|
|
|
|
// OnDispose registers a cleanup callback function to be executed when this Context is disposed.
|
|
// It accepts func() error, func(), or Disposer.
|
|
func (c *Context) OnDispose(fn any) {
|
|
if fn == nil {
|
|
return
|
|
}
|
|
|
|
var d Disposer
|
|
switch f := fn.(type) {
|
|
case Disposer:
|
|
d = f
|
|
case func() error:
|
|
d = f
|
|
case func():
|
|
d = func() error {
|
|
f()
|
|
return nil
|
|
}
|
|
default:
|
|
panic(fmt.Sprintf("core: OnDispose expects func() error or func(), got %T", fn))
|
|
}
|
|
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
c.disposers = append(c.disposers, d)
|
|
}
|
|
|
|
// Dispose shuts down this Context and all child Contexts, running registered disposers in LIFO order.
|
|
func (c *Context) Dispose() error {
|
|
c.mu.Lock()
|
|
if c.disposed {
|
|
c.mu.Unlock()
|
|
return nil
|
|
}
|
|
c.disposed = true
|
|
|
|
// Copy children and disposers under lock
|
|
children := make([]*Context, len(c.children))
|
|
copy(children, c.children)
|
|
|
|
disposers := make([]Disposer, len(c.disposers))
|
|
copy(disposers, c.disposers)
|
|
c.mu.Unlock()
|
|
|
|
var errs []error
|
|
|
|
// 1. Dispose all child contexts in reverse order
|
|
for i := len(children) - 1; i >= 0; i-- {
|
|
if err := children[i].Dispose(); err != nil {
|
|
errs = append(errs, err)
|
|
}
|
|
}
|
|
|
|
// 2. Run local disposers in LIFO order
|
|
for i := len(disposers) - 1; i >= 0; i-- {
|
|
if err := disposers[i](); err != nil {
|
|
errs = append(errs, err)
|
|
}
|
|
}
|
|
|
|
// 3. Cancel the Go context
|
|
if c.cancel != nil {
|
|
c.cancel()
|
|
}
|
|
|
|
// 4. Detach from parent
|
|
if c.parent != nil {
|
|
c.parent.removeChild(c)
|
|
}
|
|
|
|
return errors.Join(errs...)
|
|
}
|
|
|
|
func (c *Context) removeChild(target *Context) {
|
|
c.mu.Lock()
|
|
defer c.mu.Unlock()
|
|
for i, child := range c.children {
|
|
if child == target {
|
|
c.children = append(c.children[:i], c.children[i+1:]...)
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// IsDisposed returns true if this Context has been disposed.
|
|
func (c *Context) IsDisposed() bool {
|
|
c.mu.RLock()
|
|
defer c.mu.RUnlock()
|
|
return c.disposed
|
|
}
|
|
|
|
// RegisterDriver registers a runtime driver engine on this Context hierarchy.
|
|
func (c *Context) RegisterDriver(d Driver) error {
|
|
if d == nil {
|
|
return ErrNilService
|
|
}
|
|
|
|
root := c.Root()
|
|
root.mu.Lock()
|
|
root.drivers = append(root.drivers, d)
|
|
root.mu.Unlock()
|
|
|
|
c.OnDispose(func() error {
|
|
root.mu.Lock()
|
|
defer root.mu.Unlock()
|
|
for i, drv := range root.drivers {
|
|
if drv == d {
|
|
root.drivers = append(root.drivers[:i], root.drivers[i+1:]...)
|
|
break
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
return nil
|
|
}
|
|
|
|
// Drivers returns a copy of all drivers registered on this Context.
|
|
func (c *Context) Drivers() []Driver {
|
|
root := c.Root()
|
|
root.mu.RLock()
|
|
defer root.mu.RUnlock()
|
|
|
|
result := make([]Driver, len(root.drivers))
|
|
copy(result, root.drivers)
|
|
return result
|
|
}
|
|
|
|
// Driver looks up a registered driver by its driver type.
|
|
func (c *Context) Driver(driverType DriverType) (Driver, bool) {
|
|
root := c.Root()
|
|
root.mu.RLock()
|
|
defer root.mu.RUnlock()
|
|
|
|
for _, d := range root.drivers {
|
|
if d.Type() == driverType {
|
|
return d, true
|
|
}
|
|
}
|
|
return nil, false
|
|
}
|