371a06403a
Net **-650 LOC** by removing duplication and dead noise. All tests pass.
### Duplication & helpers
- Extracted shared slim helpers (`UserLogin`, `UserLogins`, `LabelNames`, `BodyWithAttachments`, `UserDetail`, `Repo`/`Repos`, `Label`/`Labels`) into `pkg/slim`. Deleted the 4 copies that lived in `issue/`, `pull/`, `search/`, `repo/` (plus duplicate `slimUserDetail`/`slimRepo`/`slimLabels` across packages).
- Added `params.GetOptionalBoolPtr` and `params.GetOptionalStringPtr`. Replaced 18 awkward `new(localVar); if !ok { = nil }` patterns across `repo/`, `pull/`, `issue/`, `label/`, `milestone/`, `search/`.
- Extracted `pullRequestReviewerFn` for the 99%-identical `createPullRequestReviewerFn`/`deletePullRequestReviewerFn` pair.
### Dead code & noise
- Deleted **122** `log.Debugf("Called X")` narration lines (`zap.AddCaller` already records the caller) and pruned 19 unused `log` imports.
- Removed the unused `log.Logger` wrapper; the mcp-go server now uses `log.Default().Sugar()` directly (matches `util.Logger`).
- Deleted dead `s.DeleteTools("")` — confirmed no-op in mcp-go.
- Stripped WHAT-narration comments per project guidance.
### Correctness & consistency
- Fixed `log.Errorf(err.Error())` format-string bug in `pkg/to/to.go` — a `%` in the error would have been interpreted as a directive.
- Standardized `to.TextResult`/`to.ErrorResult` usage; `release.go`, `tag.go`, `branch.go` were bypassing the helpers in 9 sites (skipping the wrapper's debug/error logging).
- Made `params.GetString` reject empty strings; dropped 21 redundant `err != nil || x == ""` checks in `operation/actions/`.
- Replaced raw `args["org"].(string)` in `ListOrgReposFn` with `params.GetString` to match the rest of the codebase.
### Performance
- **Cached `*gitea.Client` by host+token via `sync.Map`** + shared `*http.Transport` via `sync.Once` for both SDK and raw REST paths. Eliminates the SDK's `/api/v1/version` preflight on every tool call and enables connection keep-alive across requests.
- Gated `to.TextResult` debug log behind `flag.Debug` to skip the `string(bytes)` allocation when debug is off.
- Hoisted `8192` and `60s` magic numbers in `pkg/gitea/rest.go` into named constants.
---
This PR was written with the help of Claude Opus 4.7
---------
Co-authored-by: silverwind <silv3rwind@gmail.com>
Reviewed-on: https://gitea.com/gitea/gitea-mcp/pulls/195
Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: silverwind <me@silverwind.io>
Co-committed-by: silverwind <me@silverwind.io>
185 lines
4.4 KiB
Go
185 lines
4.4 KiB
Go
package gitea
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
"sync"
|
|
"time"
|
|
|
|
mcpContext "gitea.com/gitea/gitea-mcp/pkg/context"
|
|
"gitea.com/gitea/gitea-mcp/pkg/flag"
|
|
)
|
|
|
|
const (
|
|
httpClientTimeout = 60 * time.Second
|
|
errBodySnippetSize = 8192
|
|
)
|
|
|
|
type HTTPError struct {
|
|
StatusCode int
|
|
Body string
|
|
}
|
|
|
|
func (e *HTTPError) Error() string {
|
|
if e.Body == "" {
|
|
return fmt.Sprintf("request failed with status %d", e.StatusCode)
|
|
}
|
|
return fmt.Sprintf("request failed with status %d: %s", e.StatusCode, e.Body)
|
|
}
|
|
|
|
func tokenFromContext(ctx context.Context) string {
|
|
if ctx != nil {
|
|
if token, ok := ctx.Value(mcpContext.TokenContextKey).(string); ok && token != "" {
|
|
return token
|
|
}
|
|
}
|
|
return flag.Token
|
|
}
|
|
|
|
var (
|
|
restClientOnce sync.Once
|
|
restClient *http.Client
|
|
)
|
|
|
|
func restHTTPClient() *http.Client {
|
|
restClientOnce.Do(func() {
|
|
restClient = &http.Client{
|
|
Transport: sharedTransport(),
|
|
Timeout: httpClientTimeout,
|
|
CheckRedirect: checkRedirect,
|
|
}
|
|
})
|
|
return restClient
|
|
}
|
|
|
|
func buildAPIURL(path string, query url.Values) (string, error) {
|
|
host := strings.TrimRight(flag.Host, "/")
|
|
if host == "" {
|
|
return "", errors.New("gitea host is empty")
|
|
}
|
|
p := strings.TrimLeft(path, "/")
|
|
u, err := url.Parse(fmt.Sprintf("%s/api/v1/%s", host, p))
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
if query != nil {
|
|
u.RawQuery = query.Encode()
|
|
}
|
|
return u.String(), nil
|
|
}
|
|
|
|
// DoJSON performs an API request and decodes a JSON response into respOut (if non-nil).
|
|
// It returns the HTTP status code.
|
|
func DoJSON(ctx context.Context, method, path string, query url.Values, body, respOut any) (int, error) {
|
|
var bodyReader io.Reader
|
|
if body != nil {
|
|
b, err := json.Marshal(body)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("marshal request body: %w", err)
|
|
}
|
|
bodyReader = bytes.NewReader(b)
|
|
}
|
|
|
|
u, err := buildAPIURL(path, query)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
req, err := http.NewRequestWithContext(ctx, method, u, bodyReader)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("create request: %w", err)
|
|
}
|
|
|
|
token := tokenFromContext(ctx)
|
|
if token != "" {
|
|
req.Header.Set("Authorization", "token "+token)
|
|
}
|
|
req.Header.Set("Accept", "application/json")
|
|
if body != nil {
|
|
req.Header.Set("Content-Type", "application/json")
|
|
}
|
|
|
|
client := restHTTPClient()
|
|
resp, err := client.Do(req)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("do request: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
bodySnippet, _ := io.ReadAll(io.LimitReader(resp.Body, errBodySnippetSize))
|
|
return resp.StatusCode, &HTTPError{StatusCode: resp.StatusCode, Body: strings.TrimSpace(string(bodySnippet))}
|
|
}
|
|
|
|
if respOut == nil {
|
|
_, _ = io.Copy(io.Discard, resp.Body) // best-effort
|
|
return resp.StatusCode, nil
|
|
}
|
|
|
|
if err := json.NewDecoder(resp.Body).Decode(respOut); err != nil {
|
|
return resp.StatusCode, fmt.Errorf("decode response: %w", err)
|
|
}
|
|
return resp.StatusCode, nil
|
|
}
|
|
|
|
// DoBytes performs an API request and returns the raw response bytes.
|
|
// It returns the HTTP status code.
|
|
func DoBytes(ctx context.Context, method, path string, query url.Values, body any, accept string) ([]byte, int, error) {
|
|
var bodyReader io.Reader
|
|
if body != nil {
|
|
b, err := json.Marshal(body)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("marshal request body: %w", err)
|
|
}
|
|
bodyReader = bytes.NewReader(b)
|
|
}
|
|
|
|
u, err := buildAPIURL(path, query)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
req, err := http.NewRequestWithContext(ctx, method, u, bodyReader)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("create request: %w", err)
|
|
}
|
|
|
|
token := tokenFromContext(ctx)
|
|
if token != "" {
|
|
req.Header.Set("Authorization", "token "+token)
|
|
}
|
|
if accept != "" {
|
|
req.Header.Set("Accept", accept)
|
|
}
|
|
if body != nil {
|
|
req.Header.Set("Content-Type", "application/json")
|
|
}
|
|
|
|
client := restHTTPClient()
|
|
resp, err := client.Do(req)
|
|
if err != nil {
|
|
return nil, 0, fmt.Errorf("do request: %w", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
|
|
respBytes, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, resp.StatusCode, fmt.Errorf("read response: %w", err)
|
|
}
|
|
|
|
if resp.StatusCode < 200 || resp.StatusCode >= 300 {
|
|
bodySnippet := respBytes
|
|
if len(bodySnippet) > errBodySnippetSize {
|
|
bodySnippet = bodySnippet[:errBodySnippetSize]
|
|
}
|
|
return nil, resp.StatusCode, &HTTPError{StatusCode: resp.StatusCode, Body: strings.TrimSpace(string(bodySnippet))}
|
|
}
|
|
|
|
return respBytes, resp.StatusCode, nil
|
|
}
|