Files
skillshare/internal/server/handler_pi_extensions.go
Willie 6a9e9efbe2 fix(server): release the config lock before slow plugin, Pi and MCP reads (#747)
Every /api/ request reloads config under the write lock of s.mu. The
Plugins page's inventory (Agent CLIs) and update check (network) held
the read lock for their whole run, and Go's RWMutex makes later readers
queue behind a waiting writer. Switching pages or reloading while a
check ran froze the whole dashboard until the check finished.

Build each service under the read lock and release it before the slow
work: plugin list, discover and preview; Pi extensions view and
preview, which run the Pi CLI; and MCP check, which looks up hosts and
probes servers live. Writes still take the write lock, and apply paths
still compare revisions, so a read that races a write is refused at
apply time rather than applied.
2026-11-02 15:13:01 +08:00

128 lines
3.8 KiB
Go

package server
import (
"errors"
"net/http"
"time"
"skillshare/internal/config"
"skillshare/internal/plugin"
)
type piExtensionsRequest struct {
Changes []plugin.PiExtensionChange `json:"changes"`
Revision string `json:"revision,omitempty"`
}
// piExtensionsService resolves a Pi target, "pi", a Pi account or a project's Pi,
// to the plugin service and target name its settings belong to. It writes a 404
// for any other target. Callers must hold s.mu.
func (s *Server) piExtensionsService(w http.ResponseWriter, name string) (*plugin.Service, string, bool) {
tc, found := s.cfg.Targets[name]
service := s.pluginService()
target := name
switch {
case !found:
case tc.ProjectRoot() != "":
// A project of the global config, named <project>@pi.
if _, tool, _ := config.SplitProjectTarget(name); tool == "pi" {
service.ProjectRoot, service.Accounts, target = tc.ProjectRoot(), nil, "pi"
} else {
found = false
}
case name == "pi":
case !s.IsProjectMode() && tc.Agent == "pi" && tc.ConfigDir != "":
default:
found = false
}
if !found {
writeCodedError(w, http.StatusNotFound, "pi_extensions_not_pi", "not a Pi target: "+name, map[string]string{"target": name})
return nil, "", false
}
service.ExtrasSources = map[string]string{}
for _, extra := range s.extrasConfig() {
service.ExtrasSources[extra.Name] = s.extrasSourceDir(extra)
}
return service, target, true
}
func (s *Server) handlePiExtensions(w http.ResponseWriter, r *http.Request) {
s.mu.RLock()
service, target, ok := s.piExtensionsService(w, r.PathValue("name"))
s.mu.RUnlock()
if !ok {
return
}
// The Pi CLI runs without s.mu, so it cannot stall the dashboard's other requests.
view, err := service.PiExtensions(r.Context(), target)
if err != nil {
writePiExtensionsError(w, err)
return
}
view.Target = r.PathValue("name")
writeJSON(w, view)
}
func (s *Server) handlePiExtensionsPreview(w http.ResponseWriter, r *http.Request) {
var body piExtensionsRequest
if !decodePluginRequest(w, r, &body) {
return
}
s.mu.RLock()
service, target, ok := s.piExtensionsService(w, r.PathValue("name"))
s.mu.RUnlock()
if !ok {
return
}
plan, err := service.PreviewPiExtensions(r.Context(), target, body.Changes)
if err != nil {
writePiExtensionsError(w, err)
return
}
writeJSON(w, plan)
}
func (s *Server) handlePiExtensionsApply(w http.ResponseWriter, r *http.Request) {
var body piExtensionsRequest
if !decodePluginRequest(w, r, &body) {
return
}
if body.Revision == "" {
writeCodedError(w, http.StatusBadRequest, "pi_extensions_preview_first", "preview before applying extension changes", nil)
return
}
s.mu.Lock()
defer s.mu.Unlock()
name := r.PathValue("name")
service, target, ok := s.piExtensionsService(w, name)
if !ok {
return
}
start := time.Now()
plan, err := service.ApplyPiExtensions(r.Context(), target, body.Changes, body.Revision)
status, message := "ok", ""
if err != nil {
status, message = "error", err.Error()
}
s.writeOpsLog("pi-extensions", status, start, map[string]any{"scope": "ui", "target": name, "changes": len(body.Changes)}, message)
if err != nil {
writePiExtensionsError(w, err)
return
}
writeJSON(w, plan)
}
// writePiExtensionsError answers with a code the dashboard translates.
func writePiExtensionsError(w http.ResponseWriter, err error) {
switch {
case errors.Is(err, plugin.ErrPiExtensionsStale):
writeCodedError(w, http.StatusConflict, "pi_extensions_stale", err.Error(), nil)
case errors.Is(err, plugin.ErrPiExtensionsBusy):
writeCodedError(w, http.StatusConflict, "pi_extensions_busy", err.Error(), nil)
case errors.Is(err, plugin.ErrPiExtensionsReadOnly):
writeCodedError(w, http.StatusForbidden, "pi_extensions_read_only", err.Error(), nil)
default:
writeCodedError(w, http.StatusBadRequest, "pi_extensions_invalid", err.Error(), nil)
}
}