github/hubproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化镜像搜索

Browse Source
This commit is contained in:
NewName
2025-05-20 16:41:42 +08:00
parent 14c069c9d3
commit 6ebd2394d0
2 changed files with 175 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
ghproxy/public/search.html
View File

@@ -352,6 +352,45 @@
.back-to-search:hover { .back-to-search:hover {
text-decoration: underline; text-decoration: underline;
} }
.meta-item {
display: inline-flex;
align-items: center;
margin-right: 15px;
color: var(--fontcolor);
opacity: 0.8;
}
.badge-automated {
background-color: #28a745;
color: white;
margin-left: 5px;
}
.tag-meta {
display: flex;
flex-wrap: wrap;
gap: 15px;
margin: 10px 0;
font-size: 0.9rem;
color: var(--fontcolor);
opacity: 0.8;
}
.vulnerability-indicator {
display: inline-flex;
align-items: center;
gap: 5px;
margin-left: 10px;
}
.arch-item {
background-color: var(--inputcolor);
padding: 5px 10px;
border-radius: 5px;
font-size: 0.8rem;
cursor: help;
}
</style> </style>
</head> </head>
<body> <body>
@@ -526,11 +565,7 @@
return; return;
} }
console.log('搜索结果:', results);
results.forEach(result => { results.forEach(result => {
console.log('处理结果:', result);
const card = document.createElement('div'); const card = document.createElement('div');
card.className = 'result-card'; card.className = 'result-card';
@@ -540,23 +575,25 @@
const starCount = result.star_count || 0; const starCount = result.star_count || 0;
const pullCount = result.pull_count || 0; const pullCount = result.pull_count || 0;
const lastUpdated = result.last_updated || new Date(); const lastUpdated = result.last_updated || new Date();
const stars = starCount ? `⭐ ${formatNumber(starCount)}` : '';
const pulls = pullCount ? `⬇️ ${formatNumber(pullCount)}` : '';
const repoName = namespace ? `${namespace}/${name}` : name; const repoName = namespace ? `${namespace}/${name}` : name;
const officialBadge = result.is_official ? '<span class="badge badge-official">官方</span>' : ''; const officialBadge = result.is_official ? '<span class="badge badge-official">官方</span>' : '';
const orgBadge = result.organization ? `<span class="badge badge-organization">By ${result.organization}</span>` : ''; const orgBadge = result.organization ? `<span class="badge badge-organization">By ${result.organization}</span>` : '';
const automatedBadge = result.is_automated ? '<span class="badge badge-automated">自动构建</span>' : '';
card.innerHTML = ` card.innerHTML = `
<div class="result-title"> <div class="result-title">
${repoName} ${repoName}
${officialBadge} ${officialBadge}
${orgBadge} ${orgBadge}
${automatedBadge}
</div> </div>
<div class="result-description">${description}</div> <div class="result-description">${description}</div>
<div class="result-meta"> <div class="result-meta">
<span>${stars} ${pulls}</span> <span>
<span>更新于 ${formatTimeAgo(lastUpdated)}</span> ${starCount > 0 ? `<span class="meta-item">⭐ ${formatNumber(starCount)}</span>` : ''}
${pullCount > 0 ? `<span class="meta-item">⬇️ ${formatNumber(pullCount)}</span>` : ''}
</span>
<span class="meta-item">更新于 ${formatTimeAgo(lastUpdated)}</span>
</div> </div>
`; `;
@@ -599,8 +636,15 @@
<div class="tag-title"> <div class="tag-title">
${repoName} ${repoName}
${currentRepo.is_official ? '<span class="badge badge-official">官方</span>' : ''} ${currentRepo.is_official ? '<span class="badge badge-official">官方</span>' : ''}
${currentRepo.organization ? `<span class="badge badge-organization">By ${currentRepo.organization}</span>` : ''}
${currentRepo.is_automated ? '<span class="badge badge-automated">自动构建</span>' : ''}
</div> </div>
<div class="tag-description">${currentRepo.description || '暂无描述'}</div> <div class="tag-description">${currentRepo.description || '暂无描述'}</div>
<div class="tag-meta">
${currentRepo.star_count > 0 ? `<span class="meta-item">⭐ ${formatNumber(currentRepo.star_count)}</span>` : ''}
${currentRepo.pull_count > 0 ? `<span class="meta-item">⬇️ ${formatNumber(currentRepo.pull_count)}</span>` : ''}
<span class="meta-item">更新于 ${formatTimeAgo(currentRepo.last_updated)}</span>
</div>
<div class="tag-pull-command"> <div class="tag-pull-command">
docker pull ${repoName} docker pull ${repoName}
<button class="copy-button" onclick="copyToClipboard('docker pull ${repoName}')">复制</button> <button class="copy-button" onclick="copyToClipboard('docker pull ${repoName}')">复制</button>
@@ -610,32 +654,33 @@
`; `;
let tagsHtml = tags.map(tag => { let tagsHtml = tags.map(tag => {
const vulnIndicators = Object.entries(tag.vulnerabilities) const vulnIndicators = Object.entries(tag.vulnerabilities || {})
.map(([level, count]) => count > 0 ? `<span class="vulnerability-dot vulnerability-${level.toLowerCase()}" title="${level}: ${count}"></span>` : '') .map(([level, count]) => count > 0 ? `<span class="vulnerability-dot vulnerability-${level.toLowerCase()}" title="${level}: ${count}"></span>` : '')
.join(''); .join('');
const images = tag.images || [];
const architectures = images.map(img => {
const arch = `${img.os}/${img.architecture}${img.variant ? '/' + img.variant : ''}`;
const size = formatSize(img.size);
return `<div class="arch-item" title="大小: ${size}">${arch}</div>`;
}).join('');
return ` return `
<div class="tag-item"> <div class="tag-item">
<div class="tag-name"> <div class="tag-name">
${tag.name} ${tag.name}
<div class="vulnerability-indicator">${vulnIndicators}</div> ${vulnIndicators ? `<div class="vulnerability-indicator">${vulnIndicators}</div>` : ''}
</div> </div>
<div class="tag-meta"> <div class="tag-meta">
最后更新: ${formatTimeAgo(tag.last_updated)} <span>最后更新: ${formatTimeAgo(tag.last_updated)}</span>
由 ${tag.last_pusher} 推送 ${tag.last_pusher ? `<span>由 ${tag.last_pusher} 推送</span>` : ''}
${tag.full_size ? `<span>大小: ${formatSize(tag.full_size)}</span>` : ''}
</div> </div>
<div class="tag-pull-command"> <div class="tag-pull-command">
docker pull ${repoName}:${tag.name} docker pull ${repoName}:${tag.name}
<button class="copy-button" onclick="copyToClipboard('docker pull ${repoName}:${tag.name}')">复制</button> <button class="copy-button" onclick="copyToClipboard('docker pull ${repoName}:${tag.name}')">复制</button>
</div> </div>
<div class="tag-architectures"> ${architectures ? `<div class="tag-architectures">${architectures}</div>` : ''}
${tag.images.map(img => `
<div class="arch-item">
${img.os}/${img.architecture}${img.variant ? '/' + img.variant : ''}
(${formatSize(img.size)})
</div>
`).join('')}
</div>
</div> </div>
`; `;
}).join(''); }).join('');

189
ghproxy/search.go
View File

@@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"io" "io"
"net/http" "net/http"
"os/exec" "net/url"
"strings" "strings"
"sync" "sync"
"time" "time"
@@ -28,6 +28,7 @@ type Repository struct {
Namespace string `json:"namespace"` Namespace string `json:"namespace"`
Description string `json:"description"` Description string `json:"description"`
IsOfficial bool `json:"is_official"` IsOfficial bool `json:"is_official"`
IsAutomated bool `json:"is_automated"`
StarCount int `json:"star_count"` StarCount int `json:"star_count"`
PullCount int `json:"pull_count"` PullCount int `json:"pull_count"`
LastUpdated time.Time `json:"last_updated"` LastUpdated time.Time `json:"last_updated"`
@@ -95,96 +96,110 @@ func setCacheResult(key string, data interface{}) {
} }
} }
// searchWithSkopeo 使用skopeo搜索镜像 // searchDockerHub 搜索镜像
func searchWithSkopeo(ctx context.Context, query string) (*SearchResult, error) { func searchDockerHub(ctx context.Context, query string, page, pageSize int) (*SearchResult, error) {
// 执行skopeo search命令 cacheKey := fmt.Sprintf("search:%s:%d:%d", query, page, pageSize)
cmd := exec.CommandContext(ctx, "skopeo", "list-tags", fmt.Sprintf("docker://docker.io/%s", query)) if cached, ok := getCachedResult(cacheKey); ok {
output, err := cmd.CombinedOutput() return cached.(*SearchResult), nil
}
// 构建Docker Hub API请求
baseURL := "https://hub.docker.com/v2/search/repositories/"
params := url.Values{}
params.Set("query", query)
params.Set("page", fmt.Sprintf("%d", page))
params.Set("page_size", fmt.Sprintf("%d", pageSize))
req, err := http.NewRequestWithContext(ctx, "GET", baseURL+"?"+params.Encode(), nil)
if err != nil { if err != nil {
// 如果是因为找不到镜像，尝试搜索 return nil, fmt.Errorf("创建请求失败: %v", err)
cmd = exec.CommandContext(ctx, "skopeo", "search", fmt.Sprintf("docker://%s", query))
output, err = cmd.CombinedOutput()
if err != nil {
return nil, fmt.Errorf("搜索失败: %v, 输出: %s", err, string(output))
}
} }
// 解析输出 // 添加必要的请求头
req.Header.Set("Accept", "application/json")
req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36")
// 发送请求
client := &http.Client{Timeout: 10 * time.Second}
resp, err := client.Do(req)
if err != nil {
return nil, fmt.Errorf("发送请求失败: %v", err)
}
defer resp.Body.Close()
// 检查响应状态码
if resp.StatusCode != http.StatusOK {
body, _ := io.ReadAll(resp.Body)
return nil, fmt.Errorf("请求失败: 状态码=%d, 响应=%s", resp.StatusCode, string(body))
}
// 解析响应
var result SearchResult var result SearchResult
result.Results = make([]Repository, 0) if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
return nil, fmt.Errorf("解析响应失败: %v", err)
// 按行解析输出
lines := strings.Split(string(output), "\n")
for _, line := range lines {
line = strings.TrimSpace(line)
if line == "" {
continue
}
// 解析仓库信息
parts := strings.Fields(line)
if len(parts) < 1 {
continue
}
fullName := parts[0]
nameParts := strings.Split(fullName, "/")
repo := Repository{}
if len(nameParts) == 1 {
repo.Name = nameParts[0]
repo.Namespace = "library"
repo.IsOfficial = true
} else {
repo.Name = nameParts[len(nameParts)-1]
repo.Namespace = strings.Join(nameParts[:len(nameParts)-1], "/")
}
if len(parts) > 1 {
repo.Description = strings.Join(parts[1:], " ")
}
result.Results = append(result.Results, repo)
} }
result.Count = len(result.Results) // 缓存结果
setCacheResult(cacheKey, &result)
return &result, nil return &result, nil
} }
// getTagsWithSkopeo 使用skopeo获取标签信息 // getRepositoryTags 获取仓库标签信息
func getTagsWithSkopeo(ctx context.Context, namespace, name string) ([]TagInfo, error) { func getRepositoryTags(ctx context.Context, namespace, name string) ([]TagInfo, error) {
repoName := name cacheKey := fmt.Sprintf("tags:%s:%s", namespace, name)
if namespace != "library" { if cached, ok := getCachedResult(cacheKey); ok {
repoName = namespace + "/" + name return cached.([]TagInfo), nil
} }
// 执行skopeo list-tags命令 // 构建API URL
cmd := exec.CommandContext(ctx, "skopeo", "list-tags", fmt.Sprintf("docker://docker.io/%s", repoName)) var baseURL string
output, err := cmd.CombinedOutput() if namespace == "library" {
baseURL = fmt.Sprintf("https://hub.docker.com/v2/repositories/library/%s/tags", name)
} else {
baseURL = fmt.Sprintf("https://hub.docker.com/v2/repositories/%s/%s/tags", namespace, name)
}
params := url.Values{}
params.Set("page_size", "100")
params.Set("ordering", "last_updated")
req, err := http.NewRequestWithContext(ctx, "GET", baseURL+"?"+params.Encode(), nil)
if err != nil { if err != nil {
return nil, fmt.Errorf("获取标签失败: %v, 输出: %s", err, string(output)) return nil, fmt.Errorf("创建请求失败: %v", err)
} }
var tags []TagInfo // 添加必要的请求头
if err := json.Unmarshal(output, &tags); err != nil { req.Header.Set("Accept", "application/json")
// 如果解析JSON失败，尝试按行解析 req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36")
lines := strings.Split(string(output), "\n")
for _, line := range lines { // 发送请求
line = strings.TrimSpace(line) client := &http.Client{Timeout: 10 * time.Second}
if line == "" { resp, err := client.Do(req)
continue if err != nil {
} return nil, fmt.Errorf("发送请求失败: %v", err)
}
tag := TagInfo{ defer resp.Body.Close()
Name: line,
LastUpdated: time.Now(), // 检查响应状态码
} if resp.StatusCode != http.StatusOK {
tags = append(tags, tag) body, _ := io.ReadAll(resp.Body)
} return nil, fmt.Errorf("请求失败: 状态码=%d, 响应=%s", resp.StatusCode, string(body))
} }
return tags, nil // 解析响应
var result struct {
Count int `json:"count"`
Next string `json:"next"`
Previous string `json:"previous"`
Results []TagInfo `json:"results"`
}
if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
return nil, fmt.Errorf("解析响应失败: %v", err)
}
// 缓存结果
setCacheResult(cacheKey, result.Results)
return result.Results, nil
} }
// RegisterSearchRoute 注册搜索相关路由 // RegisterSearchRoute 注册搜索相关路由
@@ -197,7 +212,23 @@ func RegisterSearchRoute(r *gin.Engine) {
return return
} }
result, err := searchWithSkopeo(c.Request.Context(), query) page := 1
pageSize := 25
if p := c.Query("page"); p != "" {
fmt.Sscanf(p, "%d", &page)
}
if ps := c.Query("page_size"); ps != "" {
fmt.Sscanf(ps, "%d", &pageSize)
}
// 如果是搜索官方镜像
if strings.HasPrefix(query, "library/") || !strings.Contains(query, "/") {
if !strings.HasPrefix(query, "library/") {
query = "library/" + query
}
}
result, err := searchDockerHub(c.Request.Context(), query, page, pageSize)
if err != nil { if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return return
@@ -210,10 +241,8 @@ func RegisterSearchRoute(r *gin.Engine) {
r.GET("/tags/:namespace/:name", func(c *gin.Context) { r.GET("/tags/:namespace/:name", func(c *gin.Context) {
namespace := c.Param("namespace") namespace := c.Param("namespace")
name := c.Param("name") name := c.Param("name")
fmt.Printf("获取标签请求: namespace=%s, name=%s\n", namespace, name) tags, err := getRepositoryTags(c.Request.Context(), namespace, name)
tags, err := getTagsWithSkopeo(c.Request.Context(), namespace, name)
if err != nil { if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return return