79bf0de110
The virtual engine now detects local members (repo_type=local) and generates their package index in-memory instead of trying to fetch from a non-existent upstream. - MemberIndex gains RepoType field so mergers use correct URL prefix (/api/v1/local/ vs /api/v1/remote/) - Virtual engine accepts a LocalIndexGenerator interface for producing local PyPI indexes - LocalHandler implements GeneratePyPIPackageHTML for reuse by both the direct serving path and the virtual merger - Includes local PyPI upload support (cherry-picked from benvin/local-pypi) Tested e2e: local wheel upload + virtual merge + uv pip install from both direct local and virtual URLs
145 lines
3.9 KiB
Go
145 lines
3.9 KiB
Go
package virtual
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"log/slog"
|
|
"strings"
|
|
"sync"
|
|
|
|
"git.unkin.net/unkin/artifactapi/internal/database"
|
|
"git.unkin.net/unkin/artifactapi/internal/provider"
|
|
"git.unkin.net/unkin/artifactapi/internal/proxy"
|
|
"git.unkin.net/unkin/artifactapi/pkg/models"
|
|
)
|
|
|
|
type LocalIndexGenerator interface {
|
|
GeneratePyPIPackageHTML(ctx context.Context, repoName, packageName string) ([]byte, error)
|
|
}
|
|
|
|
type Engine struct {
|
|
db *database.DB
|
|
proxyEngine *proxy.Engine
|
|
localGen LocalIndexGenerator
|
|
}
|
|
|
|
func NewEngine(db *database.DB, proxyEngine *proxy.Engine, localGen LocalIndexGenerator) *Engine {
|
|
return &Engine{db: db, proxyEngine: proxyEngine, localGen: localGen}
|
|
}
|
|
|
|
func (e *Engine) Fetch(ctx context.Context, virt models.Virtual, path string, proxyBaseURL string) ([]byte, string, error) {
|
|
merger, err := GetMerger(virt.PackageType)
|
|
if err != nil {
|
|
return nil, "", fmt.Errorf("unsupported virtual type %q: %w", virt.PackageType, err)
|
|
}
|
|
|
|
members, err := e.fetchMemberIndexes(ctx, virt, path)
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
|
|
if len(members) == 0 {
|
|
return nil, "", fmt.Errorf("no members reachable for virtual %q", virt.Name)
|
|
}
|
|
|
|
merged, err := merger.MergeIndexes(members, proxyBaseURL)
|
|
if err != nil {
|
|
return nil, "", fmt.Errorf("merge indexes: %w", err)
|
|
}
|
|
|
|
contentType := "application/octet-stream"
|
|
switch virt.PackageType {
|
|
case models.PackageHelm:
|
|
contentType = "text/yaml"
|
|
case models.PackagePyPI:
|
|
contentType = "text/html"
|
|
}
|
|
|
|
return merged, contentType, nil
|
|
}
|
|
|
|
func (e *Engine) fetchMemberIndexes(ctx context.Context, virt models.Virtual, path string) ([]MemberIndex, error) {
|
|
type result struct {
|
|
index MemberIndex
|
|
err error
|
|
}
|
|
|
|
results := make([]result, len(virt.Members))
|
|
var wg sync.WaitGroup
|
|
|
|
for i, memberName := range virt.Members {
|
|
wg.Add(1)
|
|
go func(idx int, name string) {
|
|
defer wg.Done()
|
|
|
|
remote, err := e.db.GetRemote(ctx, name)
|
|
if err != nil {
|
|
results[idx] = result{err: fmt.Errorf("remote %q: %w", name, err)}
|
|
return
|
|
}
|
|
|
|
if remote.RepoType == models.RepoTypeLocal {
|
|
body, err := e.fetchLocalIndex(ctx, *remote, virt.PackageType, path)
|
|
if err != nil {
|
|
results[idx] = result{err: fmt.Errorf("local index %q: %w", name, err)}
|
|
return
|
|
}
|
|
results[idx] = result{index: MemberIndex{RemoteName: name, RepoType: remote.RepoType, Body: body}}
|
|
return
|
|
}
|
|
|
|
prov, err := provider.Get(remote.PackageType)
|
|
if err != nil {
|
|
results[idx] = result{err: fmt.Errorf("provider %q: %w", remote.PackageType, err)}
|
|
return
|
|
}
|
|
|
|
fetchResult, err := e.proxyEngine.Fetch(ctx, *remote, path, prov)
|
|
if err != nil {
|
|
results[idx] = result{err: fmt.Errorf("fetch %q/%s: %w", name, path, err)}
|
|
return
|
|
}
|
|
defer fetchResult.Reader.Close()
|
|
|
|
body, err := io.ReadAll(fetchResult.Reader)
|
|
if err != nil {
|
|
results[idx] = result{err: fmt.Errorf("read %q: %w", name, err)}
|
|
return
|
|
}
|
|
|
|
results[idx] = result{index: MemberIndex{RemoteName: name, RepoType: remote.RepoType, Body: body}}
|
|
}(i, memberName)
|
|
}
|
|
|
|
wg.Wait()
|
|
|
|
var members []MemberIndex
|
|
for _, r := range results {
|
|
if r.err != nil {
|
|
slog.Warn("virtual member fetch failed", "error", r.err)
|
|
continue
|
|
}
|
|
members = append(members, r.index)
|
|
}
|
|
|
|
return members, nil
|
|
}
|
|
|
|
func (e *Engine) fetchLocalIndex(ctx context.Context, remote models.Remote, packageType models.PackageType, path string) ([]byte, error) {
|
|
switch packageType {
|
|
case models.PackagePyPI:
|
|
if e.localGen == nil {
|
|
return nil, fmt.Errorf("no local index generator configured")
|
|
}
|
|
parts := strings.SplitN(strings.TrimPrefix(path, "simple/"), "/", 2)
|
|
pkgName := strings.TrimSuffix(parts[0], "/")
|
|
if pkgName == "" {
|
|
return nil, fmt.Errorf("cannot determine package name from path %q", path)
|
|
}
|
|
return e.localGen.GeneratePyPIPackageHTML(ctx, remote.Name, pkgName)
|
|
default:
|
|
return nil, fmt.Errorf("local index generation not supported for %q", packageType)
|
|
}
|
|
}
|