airkjw/CLIProxyAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf(watcher): reduce auth cache memory

Browse Source
This commit is contained in:
ailuntz
2026-03-10 16:27:10 +08:00
parent ce53d3a287
commit c3762328a5
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
internal/watcher/clients.go
View File

@@ -75,7 +75,12 @@ func (w *Watcher) reloadClients(rescanAuth bool, affectedOAuthProviders []string
w.clientsMutex.Lock() w.clientsMutex.Lock()
w.lastAuthHashes = make(map[string]string) w.lastAuthHashes = make(map[string]string)
w.lastAuthContents = make(map[string]*coreauth.Auth) cacheAuthContents := log.IsLevelEnabled(log.DebugLevel)
if cacheAuthContents {
w.lastAuthContents = make(map[string]*coreauth.Auth)
} else {
w.lastAuthContents = nil
}
w.fileAuthsByPath = make(map[string]map[string]*coreauth.Auth) w.fileAuthsByPath = make(map[string]map[string]*coreauth.Auth)
if resolvedAuthDir, errResolveAuthDir := util.ResolveAuthDir(cfg.AuthDir); errResolveAuthDir != nil { if resolvedAuthDir, errResolveAuthDir := util.ResolveAuthDir(cfg.AuthDir); errResolveAuthDir != nil {
log.Errorf("failed to resolve auth directory for hash cache: %v", errResolveAuthDir) log.Errorf("failed to resolve auth directory for hash cache: %v", errResolveAuthDir)
@@ -89,10 +94,12 @@ func (w *Watcher) reloadClients(rescanAuth bool, affectedOAuthProviders []string
sum := sha256.Sum256(data) sum := sha256.Sum256(data)
normalizedPath := w.normalizeAuthPath(path) normalizedPath := w.normalizeAuthPath(path)
w.lastAuthHashes[normalizedPath] = hex.EncodeToString(sum[:]) w.lastAuthHashes[normalizedPath] = hex.EncodeToString(sum[:])
// Parse and cache auth content for future diff comparisons // Parse and cache auth content for future diff comparisons (debug only).
var auth coreauth.Auth if cacheAuthContents {
if errParse := json.Unmarshal(data, &auth); errParse == nil { var auth coreauth.Auth
w.lastAuthContents[normalizedPath] = &auth if errParse := json.Unmarshal(data, &auth); errParse == nil {
w.lastAuthContents[normalizedPath] = &auth
}
} }
ctx := &synthesizer.SynthesisContext{ ctx := &synthesizer.SynthesisContext{
Config: cfg, Config: cfg,
@@ -102,7 +109,7 @@ func (w *Watcher) reloadClients(rescanAuth bool, affectedOAuthProviders []string
} }
if generated := synthesizer.SynthesizeAuthFile(ctx, path, data); len(generated) > 0 { if generated := synthesizer.SynthesizeAuthFile(ctx, path, data); len(generated) > 0 {
if pathAuths := authSliceToMap(generated); len(pathAuths) > 0 { if pathAuths := authSliceToMap(generated); len(pathAuths) > 0 {
w.fileAuthsByPath[normalizedPath] = pathAuths w.fileAuthsByPath[normalizedPath] = authIDSet(pathAuths)
} }
} }
} }
@@ -171,25 +178,30 @@ func (w *Watcher) addOrUpdateClient(path string) {
} }
// Get old auth for diff comparison // Get old auth for diff comparison
cacheAuthContents := log.IsLevelEnabled(log.DebugLevel)
var oldAuth *coreauth.Auth var oldAuth *coreauth.Auth
if w.lastAuthContents != nil { if cacheAuthContents && w.lastAuthContents != nil {
oldAuth = w.lastAuthContents[normalized] oldAuth = w.lastAuthContents[normalized]
} }
// Compute and log field changes // Compute and log field changes
if changes := diff.BuildAuthChangeDetails(oldAuth, &newAuth); len(changes) > 0 { if cacheAuthContents {
log.Debugf("auth field changes for %s:", filepath.Base(path)) if changes := diff.BuildAuthChangeDetails(oldAuth, &newAuth); len(changes) > 0 {
for _, c := range changes { log.Debugf("auth field changes for %s:", filepath.Base(path))
log.Debugf(" %s", c) for _, c := range changes {
log.Debugf(" %s", c)
}
} }
} }
// Update caches // Update caches
w.lastAuthHashes[normalized] = curHash w.lastAuthHashes[normalized] = curHash
if w.lastAuthContents == nil { if cacheAuthContents {
w.lastAuthContents = make(map[string]*coreauth.Auth) if w.lastAuthContents == nil {
w.lastAuthContents = make(map[string]*coreauth.Auth)
}
w.lastAuthContents[normalized] = &newAuth
} }
w.lastAuthContents[normalized] = &newAuth
oldByID := make(map[string]*coreauth.Auth, len(w.fileAuthsByPath[normalized])) oldByID := make(map[string]*coreauth.Auth, len(w.fileAuthsByPath[normalized]))
for id, a := range w.fileAuthsByPath[normalized] { for id, a := range w.fileAuthsByPath[normalized] {
@@ -206,7 +218,7 @@ func (w *Watcher) addOrUpdateClient(path string) {
generated := synthesizer.SynthesizeAuthFile(sctx, path, data) generated := synthesizer.SynthesizeAuthFile(sctx, path, data)
newByID := authSliceToMap(generated) newByID := authSliceToMap(generated)
if len(newByID) > 0 { if len(newByID) > 0 {
w.fileAuthsByPath[normalized] = newByID w.fileAuthsByPath[normalized] = authIDSet(newByID)
} else { } else {
delete(w.fileAuthsByPath, normalized) delete(w.fileAuthsByPath, normalized)
} }
@@ -273,6 +285,14 @@ func authSliceToMap(auths []*coreauth.Auth) map[string]*coreauth.Auth {
return byID return byID
} }
func authIDSet(auths map[string]*coreauth.Auth) map[string]*coreauth.Auth {
set := make(map[string]*coreauth.Auth, len(auths))
for id := range auths {
set[id] = nil
}
return set
}
func (w *Watcher) loadFileClients(cfg *config.Config) int { func (w *Watcher) loadFileClients(cfg *config.Config) int {
authFileCount := 0 authFileCount := 0
successfulAuthCount := 0 successfulAuthCount := 0