optimize matcher performance

2026-02-03 00:01:10 +08:00 · 2025-06-09 06:58:21 +08:00 · 2025-06-09 06:58:21 +08:00 · 5dde21a403
commit 5dde21a403
parent f706615d87
5 changed files with 536 additions and 115 deletions
--- a/proxy/match.go
+++ b/proxy/match.go
@ -6,152 +6,265 @@ import (
 	"net/url"
 	"regexp"
 	"strings"
+	"sync"
 )

+// Matcher 从原始URL路径中高效地解析并匹配代理规则.
 func Matcher(rawPath string, cfg *config.Config) (string, string, string, *GHProxyErrors) {
-	var (
-		user    string
-		repo    string
-		matcher string
-	)
-	// 匹配 "https://github.com"开头的链接
-	if strings.HasPrefix(rawPath, "https://github.com") {
-		remainingPath := strings.TrimPrefix(rawPath, "https://github.com")
-		/*
-			if strings.HasPrefix(remainingPath, "/") {
-				remainingPath = strings.TrimPrefix(remainingPath, "/")
-			}
-		*/
-		remainingPath = strings.TrimPrefix(remainingPath, "/")
-		// 预期格式/user/repo/more...
-		// 取出user和repo和最后部分
-		parts := strings.Split(remainingPath, "/")
-		if len(parts) <= 2 {
-			errMsg := "Not enough parts in path after matching 'https://github.com*'"
-			return "", "", "", NewErrorWithStatusLookup(400, errMsg)
-		}
-		user = parts[0]
-		repo = parts[1]
-		// 匹配 "https://github.com"开头的链接
-		if len(parts) >= 3 {
-			switch parts[2] {
-			case "releases", "archive":
-				matcher = "releases"
-			case "blob":
-				matcher = "blob"
-			case "raw":
-				matcher = "raw"
-			case "info", "git-upload-pack":
-				matcher = "clone"
-			default:
-				errMsg := "Url Matched 'https://github.com*', but didn't match the next matcher"
-				return "", "", "", NewErrorWithStatusLookup(400, errMsg)
-			}
-		}
-		return user, repo, matcher, nil
+	if len(rawPath) < 18 {
+		return "", "", "", NewErrorWithStatusLookup(404, "path too short")
 	}
-	// 匹配 "https://raw"开头的链接
-	if strings.HasPrefix(rawPath, "https://raw") {
-		remainingPath := strings.TrimPrefix(rawPath, "https://")
-		parts := strings.Split(remainingPath, "/")
-		if len(parts) <= 3 {
-			errMsg := "URL after matched 'https://raw*' should have at least 4 parts (user/repo/branch/file)."
-			return "", "", "", NewErrorWithStatusLookup(400, errMsg)
-		}
-		user = parts[1]
-		repo = parts[2]
-		matcher = "raw"

-		return user, repo, matcher, nil
-	}
-	// 匹配 "https://gist"开头的链接
-	if strings.HasPrefix(rawPath, "https://gist") {
-		remainingPath := strings.TrimPrefix(rawPath, "https://")
-		parts := strings.Split(remainingPath, "/")
-		if len(parts) <= 3 {
-			errMsg := "URL after matched 'https://gist*' should have at least 4 parts (user/gist_id)."
-			return "", "", "", NewErrorWithStatusLookup(400, errMsg)
+	// 匹配 "https://github.com/"
+	if strings.HasPrefix(rawPath, "https://github.com/") {
+		remaining := rawPath[19:]
+		i := strings.IndexByte(remaining, '/')
+		if i <= 0 {
+			return "", "", "", NewErrorWithStatusLookup(400, "malformed github path: missing user")
+		}
+		user := remaining[:i]
+		remaining = remaining[i+1:]
+		i = strings.IndexByte(remaining, '/')
+		if i <= 0 {
+			return "", "", "", NewErrorWithStatusLookup(400, "malformed github path: missing repo")
+		}
+		repo := remaining[:i]
+		remaining = remaining[i+1:]
+		if len(remaining) == 0 {
+			return "", "", "", NewErrorWithStatusLookup(400, "malformed github path: missing action")
+		}
+		i = strings.IndexByte(remaining, '/')
+		action := remaining
+		if i != -1 {
+			action = remaining[:i]
+		}
+		var matcher string
+		switch action {
+		case "releases", "archive":
+			matcher = "releases"
+		case "blob":
+			matcher = "blob"
+		case "raw":
+			matcher = "raw"
+		case "info", "git-upload-pack":
+			matcher = "clone"
+		default:
+			return "", "", "", NewErrorWithStatusLookup(400, fmt.Sprintf("unsupported github action: %s", action))
 		}
-		user = parts[1]
-		repo = ""
-		matcher = "gist"
 		return user, repo, matcher, nil
 	}
-	// 匹配 "https://api.github.com/"开头的链接
+
+	// 匹配 "https://raw.githubusercontent.com/"
+	if strings.HasPrefix(rawPath, "https://raw.githubusercontent.com/") {
+		remaining := rawPath[34:]
+		// 这里的逻辑与 github.com 的类似, 需要提取 user, repo, branch, file...
+		// 我们只需要 user 和 repo
+		i := strings.IndexByte(remaining, '/')
+		if i <= 0 {
+			return "", "", "", NewErrorWithStatusLookup(400, "malformed raw url: missing user")
+		}
+		user := remaining[:i]
+		remaining = remaining[i+1:]
+		i = strings.IndexByte(remaining, '/')
+		if i <= 0 {
+			return "", "", "", NewErrorWithStatusLookup(400, "malformed raw url: missing repo")
+		}
+		repo := remaining[:i]
+		// raw 链接至少需要 user/repo/branch 三部分
+		remaining = remaining[i+1:]
+		if len(remaining) == 0 {
+			return "", "", "", NewErrorWithStatusLookup(400, "malformed raw url: missing branch/commit")
+		}
+		return user, repo, "raw", nil
+	}
+
+	// 匹配 "https://gist.github.com/"
+	if strings.HasPrefix(rawPath, "https://gist.github.com/") {
+		remaining := rawPath[24:]
+		i := strings.IndexByte(remaining, '/')
+		if i <= 0 {
+			// case: https://gist.github.com/user
+			// 这种情况下, gist_id 缺失, 但我们仍然可以认为 user 是有效的
+			if len(remaining) > 0 {
+				return remaining, "", "gist", nil
+			}
+			return "", "", "", NewErrorWithStatusLookup(400, "malformed gist url: missing user")
+		}
+		// case: https://gist.github.com/user/gist_id...
+		user := remaining[:i]
+		return user, "", "gist", nil
+	}
+
+	// 匹配 "https://api.github.com/"
 	if strings.HasPrefix(rawPath, "https://api.github.com/") {
-		matcher = "api"
-		remainingPath := strings.TrimPrefix(rawPath, "https://api.github.com/")
-
-		parts := strings.Split(remainingPath, "/")
-		if parts[0] == "repos" {
-			user = parts[1]
-			repo = parts[2]
+		if !cfg.Auth.ForceAllowApi && (cfg.Auth.Method != "header" || !cfg.Auth.Enabled) {
+			return "", "", "", NewErrorWithStatusLookup(403, "API proxy requires header authentication")
 		}
-		if parts[0] == "users" {
-			user = parts[1]
-		}
-		if !cfg.Auth.ForceAllowApi {
-			if cfg.Auth.Method != "header" || !cfg.Auth.Enabled {
-				//return "", "", "", ErrAuthHeaderUnavailable
-				errMsg := "AuthHeader Unavailable, Need to open header auth to enable api proxy"
-				return "", "", "", NewErrorWithStatusLookup(403, errMsg)
+		remaining := rawPath[23:]
+		var user, repo string
+		if strings.HasPrefix(remaining, "repos/") {
+			parts := strings.SplitN(remaining[6:], "/", 3)
+			if len(parts) >= 2 {
+				user = parts[0]
+				repo = parts[1]
+			}
+		} else if strings.HasPrefix(remaining, "users/") {
+			parts := strings.SplitN(remaining[6:], "/", 2)
+			if len(parts) >= 1 {
+				user = parts[0]
 			}
 		}
-		return user, repo, matcher, nil
+		return user, repo, "api", nil
 	}
-	//return "", "", "", ErrNotFound
-	errMsg := "Didn't match any matcher"
-	return "", "", "", NewErrorWithStatusLookup(404, errMsg)
+
+	return "", "", "", NewErrorWithStatusLookup(404, "no matcher found for the given path")
 }

-var (
-	matchedMatchers = []string{
-		"blob",
-		"raw",
-		"gist",
+/*
+	func Matcher(rawPath string, cfg *config.Config) (string, string, string, *GHProxyErrors) {
+		var (
+			user    string
+			repo    string
+			matcher string
+		)
+		// 匹配 "https://github.com"开头的链接
+		if strings.HasPrefix(rawPath, "https://github.com") {
+			remainingPath := strings.TrimPrefix(rawPath, "https://github.com")
+
+				//if strings.HasPrefix(remainingPath, "/") {
+			//		remainingPath = strings.TrimPrefix(remainingPath, "/")
+				//}
+
+			remainingPath = strings.TrimPrefix(remainingPath, "/")
+			// 预期格式/user/repo/more...
+			// 取出user和repo和最后部分
+			parts := strings.Split(remainingPath, "/")
+			if len(parts) <= 2 {
+				errMsg := "Not enough parts in path after matching 'https://github.com*'"
+				return "", "", "", NewErrorWithStatusLookup(400, errMsg)
+			}
+			user = parts[0]
+			repo = parts[1]
+			// 匹配 "https://github.com"开头的链接
+			if len(parts) >= 3 {
+				switch parts[2] {
+				case "releases", "archive":
+					matcher = "releases"
+				case "blob":
+					matcher = "blob"
+				case "raw":
+					matcher = "raw"
+				case "info", "git-upload-pack":
+					matcher = "clone"
+				default:
+					errMsg := "Url Matched 'https://github.com*', but didn't match the next matcher"
+					return "", "", "", NewErrorWithStatusLookup(400, errMsg)
+				}
+			}
+			return user, repo, matcher, nil
+		}
+		// 匹配 "https://raw"开头的链接
+		if strings.HasPrefix(rawPath, "https://raw") {
+			remainingPath := strings.TrimPrefix(rawPath, "https://")
+			parts := strings.Split(remainingPath, "/")
+			if len(parts) <= 3 {
+				errMsg := "URL after matched 'https://raw*' should have at least 4 parts (user/repo/branch/file)."
+				return "", "", "", NewErrorWithStatusLookup(400, errMsg)
+			}
+			user = parts[1]
+			repo = parts[2]
+			matcher = "raw"
+
+			return user, repo, matcher, nil
+		}
+		// 匹配 "https://gist"开头的链接
+		if strings.HasPrefix(rawPath, "https://gist") {
+			remainingPath := strings.TrimPrefix(rawPath, "https://")
+			parts := strings.Split(remainingPath, "/")
+			if len(parts) <= 3 {
+				errMsg := "URL after matched 'https://gist*' should have at least 4 parts (user/gist_id)."
+				return "", "", "", NewErrorWithStatusLookup(400, errMsg)
+			}
+			user = parts[1]
+			repo = ""
+			matcher = "gist"
+			return user, repo, matcher, nil
+		}
+		// 匹配 "https://api.github.com/"开头的链接
+		if strings.HasPrefix(rawPath, "https://api.github.com/") {
+			matcher = "api"
+			remainingPath := strings.TrimPrefix(rawPath, "https://api.github.com/")
+
+			parts := strings.Split(remainingPath, "/")
+			if parts[0] == "repos" {
+				user = parts[1]
+				repo = parts[2]
+			}
+			if parts[0] == "users" {
+				user = parts[1]
+			}
+			if !cfg.Auth.ForceAllowApi {
+				if cfg.Auth.Method != "header" || !cfg.Auth.Enabled {
+					//return "", "", "", ErrAuthHeaderUnavailable
+					errMsg := "AuthHeader Unavailable, Need to open header auth to enable api proxy"
+					return "", "", "", NewErrorWithStatusLookup(403, errMsg)
+				}
+			}
+			return user, repo, matcher, nil
+		}
+		//return "", "", "", ErrNotFound
+		errMsg := "Didn't match any matcher"
+		return "", "", "", NewErrorWithStatusLookup(404, errMsg)
 	}
+*/
+var (
+	proxyableMatchersMap map[string]struct{}
+	initMatchersOnce     sync.Once
 )

-// matchString 检查目标字符串是否在给定的字符串集合中
-func matchString(target string, stringsToMatch []string) bool {
-	matchMap := make(map[string]struct{}, len(stringsToMatch))
-	for _, str := range stringsToMatch {
-		matchMap[str] = struct{}{}
-	}
-	_, exists := matchMap[target]
+func initMatchers() {
+	initMatchersOnce.Do(func() {
+		matchers := []string{"blob", "raw", "gist"}
+		proxyableMatchersMap = make(map[string]struct{}, len(matchers))
+		for _, m := range matchers {
+			proxyableMatchersMap[m] = struct{}{}
+		}
+	})
+}
+
+// matchString 与原始版本签名兼容
+func matchString(target string) bool {
+	initMatchers()
+	_, exists := proxyableMatchersMap[target]
 	return exists
 }

-// extractParts 从给定的 URL 中提取所需的部分
+// extractParts 与原始版本签名兼容
 func extractParts(rawURL string) (string, string, string, url.Values, error) {
-	// 解析 URL
 	parsedURL, err := url.Parse(rawURL)
 	if err != nil {
 		return "", "", "", nil, err
 	}

-	// 获取路径部分并分割
-	pathParts := strings.Split(parsedURL.Path, "/")
+	path := parsedURL.Path
+	if len(path) > 0 && path[0] == '/' {
+		path = path[1:]
+	}

-	// 提取所需的部分
-	if len(pathParts) < 3 {
+	parts := strings.SplitN(path, "/", 3)
+
+	if len(parts) < 2 {
 		return "", "", "", nil, fmt.Errorf("URL path is too short")
 	}

-	// 提取 /WJQSERVER-STUDIO 和 /go-utils.git
-	repoOwner := "/" + pathParts[1]
-	repoName := "/" + pathParts[2]
-
-	// 剩余部分
-	remainingPath := strings.Join(pathParts[3:], "/")
-	if remainingPath != "" {
-		remainingPath = "/" + remainingPath
+	repoOwner := "/" + parts[0]
+	repoName := "/" + parts[1]
+	var remainingPath string
+	if len(parts) > 2 {
+		remainingPath = "/" + parts[2]
 	}

-	// 查询参数
-	queryParams := parsedURL.Query()
-
-	return repoOwner, repoName, remainingPath, queryParams, nil
+	return repoOwner, repoName, remainingPath, parsedURL.Query(), nil
 }

 var urlPattern = regexp.MustCompile(`https?://[^\s'"]+`)