Files
skillshare/internal/server/handler_overview.go
T
Willie 5307b3276e fix(server): use snapshot pattern to eliminate map races and narrow lock scope
Addresses P1 and P2 from code review on the RWMutex commit:

P1 — Stream handlers now snapshot config under RLock before streaming:
- handleDiffStream: clone Targets map to prevent concurrent map panic
- handleCheckStream, handleAuditStream: snapshot source/projectRoot
- handleUpdateStream: snapshot source (per-item Lock already correct)

P2 — All read handlers now use narrow snapshot instead of defer RUnlock:
- RLock → copy needed fields to locals → RUnlock → do work with locals
- Prevents slow I/O (git fetch, version check, audit scan) from blocking
  the auto-reload middleware's exclusive Lock on concurrent requests

Other changes:
- computeTargetDiff takes source parameter (no more s.cfg.Source access)
- Add cloneTargets() helper for safe map copying
- Add writeOpsLogTo/writeAuditLogTo for lock-free oplog writes
2026-03-17 04:48:42 +08:00

103 lines
2.2 KiB
Go

package server
import (
"net/http"
"os"
"path/filepath"
"strings"
"skillshare/internal/git"
"skillshare/internal/install"
"skillshare/internal/sync"
"skillshare/internal/utils"
versioncheck "skillshare/internal/version"
)
type trackedRepoItem struct {
Name string `json:"name"`
SkillCount int `json:"skillCount"`
Dirty bool `json:"dirty"`
}
func (s *Server) handleOverview(w http.ResponseWriter, r *http.Request) {
// Snapshot config under RLock, then release before I/O.
s.mu.RLock()
source := s.cfg.Source
cfgMode := s.cfg.Mode
targetCount := len(s.cfg.Targets)
projectRoot := s.projectRoot
s.mu.RUnlock()
isProjectMode := projectRoot != ""
// Count skills
skills, err := sync.DiscoverSourceSkills(source)
if err != nil {
writeError(w, http.StatusInternalServerError, err.Error())
return
}
// Count top-level source entries (for display)
topLevelCount := 0
entries, _ := os.ReadDir(source)
for _, e := range entries {
if e.IsDir() && !utils.IsHidden(e.Name()) {
topLevelCount++
}
}
mode := cfgMode
if mode == "" {
mode = "merge"
}
// Tracked repos
trackedRepos := buildTrackedRepos(source, skills)
resp := map[string]any{
"source": source,
"skillCount": len(skills),
"topLevelCount": topLevelCount,
"targetCount": targetCount,
"mode": mode,
"version": versioncheck.Version,
"trackedRepos": trackedRepos,
"isProjectMode": isProjectMode,
}
if isProjectMode {
resp["projectRoot"] = projectRoot
}
writeJSON(w, resp)
}
func buildTrackedRepos(sourceDir string, skills []sync.DiscoveredSkill) []trackedRepoItem {
repoNames, err := install.GetTrackedRepos(sourceDir)
if err != nil || len(repoNames) == 0 {
return []trackedRepoItem{}
}
items := make([]trackedRepoItem, 0, len(repoNames))
for _, repoName := range repoNames {
repoPath := filepath.Join(sourceDir, repoName)
// Count skills belonging to this repo
skillCount := 0
for _, sk := range skills {
if sk.IsInRepo && strings.HasPrefix(sk.RelPath, repoName+"/") {
skillCount++
}
}
// Check git dirty status
dirty, _ := git.IsDirty(repoPath)
items = append(items, trackedRepoItem{
Name: repoName,
SkillCount: skillCount,
Dirty: dirty,
})
}
return items
}