appview,knotmirror: use knotmirror to read the repository #1164

+21 -16

appview/config/config.go

reviewed

··· 46 46 PLCURL string `env:"URL, default=https://plc.directory"` 47 47 } 48 48 49 49 + type KnotMirrorConfig struct { 50 50 + Url string `env:"URL, required"` 51 51 + } 52 52 + 49 53 type JetstreamConfig struct { 50 54 Endpoint string `env:"ENDPOINT, default=wss://jetstream1.us-east.bsky.network/subscribe"` 51 55 } ··· 150 154 } 151 155 152 156 type Config struct { 153 153 - Core CoreConfig `env:",prefix=TANGLED_"` 154 154 - Jetstream JetstreamConfig `env:",prefix=TANGLED_JETSTREAM_"` 155 155 - Knotstream ConsumerConfig `env:",prefix=TANGLED_KNOTSTREAM_"` 156 156 - Spindlestream ConsumerConfig `env:",prefix=TANGLED_SPINDLESTREAM_"` 157 157 - Resend ResendConfig `env:",prefix=TANGLED_RESEND_"` 158 158 - Posthog PosthogConfig `env:",prefix=TANGLED_POSTHOG_"` 159 159 - Camo CamoConfig `env:",prefix=TANGLED_CAMO_"` 160 160 - Avatar AvatarConfig `env:",prefix=TANGLED_AVATAR_"` 161 161 - OAuth OAuthConfig `env:",prefix=TANGLED_OAUTH_"` 162 162 - Redis RedisConfig `env:",prefix=TANGLED_REDIS_"` 163 163 - Plc PlcConfig `env:",prefix=TANGLED_PLC_"` 164 164 - Pds PdsConfig `env:",prefix=TANGLED_PDS_"` 165 165 - Cloudflare Cloudflare `env:",prefix=TANGLED_CLOUDFLARE_"` 166 166 - Label LabelConfig `env:",prefix=TANGLED_LABEL_"` 167 167 - Bluesky BlueskyConfig `env:",prefix=TANGLED_BLUESKY_"` 168 168 - Sites SitesConfig `env:",prefix=TANGLED_SITES_"` 157 157 + Core CoreConfig `env:",prefix=TANGLED_"` 158 158 + Jetstream JetstreamConfig `env:",prefix=TANGLED_JETSTREAM_"` 159 159 + Knotstream ConsumerConfig `env:",prefix=TANGLED_KNOTSTREAM_"` 160 160 + Spindlestream ConsumerConfig `env:",prefix=TANGLED_SPINDLESTREAM_"` 161 161 + Resend ResendConfig `env:",prefix=TANGLED_RESEND_"` 162 162 + Posthog PosthogConfig `env:",prefix=TANGLED_POSTHOG_"` 163 163 + Camo CamoConfig `env:",prefix=TANGLED_CAMO_"` 164 164 + Avatar AvatarConfig `env:",prefix=TANGLED_AVATAR_"` 165 165 + OAuth OAuthConfig `env:",prefix=TANGLED_OAUTH_"` 166 166 + Redis RedisConfig `env:",prefix=TANGLED_REDIS_"` 167 167 + Plc PlcConfig `env:",prefix=TANGLED_PLC_"` 168 168 + Pds PdsConfig `env:",prefix=TANGLED_PDS_"` 169 169 + Cloudflare Cloudflare `env:",prefix=TANGLED_CLOUDFLARE_"` 170 170 + Label LabelConfig `env:",prefix=TANGLED_LABEL_"` 171 171 + Bluesky BlueskyConfig `env:",prefix=TANGLED_BLUESKY_"` 172 172 + Sites SitesConfig `env:",prefix=TANGLED_SITES_"` 173 173 + KnotMirror KnotMirrorConfig `env:",prefix=TANGLED_KNOTMIRROR_"` 169 174 } 170 175 171 176 func LoadConfig(ctx context.Context) (*Config, error) {

+16 -82

appview/pulls/pulls.go

reviewed

··· 411 411 return nil 412 412 } 413 413 414 414 - scheme := "http" 415 415 - if !s.config.Core.Dev { 416 416 - scheme = "https" 417 417 - } 418 418 - host := fmt.Sprintf("%s://%s", scheme, repo.Knot) 419 419 - xrpcc := &indigoxrpc.Client{ 420 420 - Host: host, 421 421 - } 422 422 - 423 423 - resp, err := tangled.RepoBranch(r.Context(), xrpcc, branch, fmt.Sprintf("%s/%s", repo.Did, repo.Name)) 414 414 + xrpcc := &indigoxrpc.Client{Host: s.config.KnotMirror.Url} 415 415 + resp, err := tangled.GitTempGetBranch(r.Context(), xrpcc, branch, repo.RepoAt().String()) 424 416 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 425 417 return nil 426 418 } ··· 436 428 return pages.Unknown 437 429 } 438 430 439 439 - var knot, ownerDid, repoName string 440 440 - 431 431 + var sourceRepo syntax.ATURI 441 432 if pull.PullSource.RepoAt != nil { 442 433 // fork-based pulls 443 443 - sourceRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String()) 444 444 - if err != nil { 445 445 - log.Println("failed to get source repo", err) 446 446 - return pages.Unknown 447 447 - } 448 448 - 449 449 - knot = sourceRepo.Knot 450 450 - ownerDid = sourceRepo.Did 451 451 - repoName = sourceRepo.Name 434 434 + sourceRepo = *pull.PullSource.RepoAt 452 435 } else { 453 436 // pulls within the same repo 454 454 - knot = repo.Knot 455 455 - ownerDid = repo.Did 456 456 - repoName = repo.Name 457 457 - } 458 458 - 459 459 - scheme := "http" 460 460 - if !s.config.Core.Dev { 461 461 - scheme = "https" 462 462 - } 463 463 - host := fmt.Sprintf("%s://%s", scheme, knot) 464 464 - xrpcc := &indigoxrpc.Client{ 465 465 - Host: host, 437 437 + sourceRepo = repo.RepoAt() 466 438 } 467 439 468 468 - didSlashName := fmt.Sprintf("%s/%s", ownerDid, repoName) 469 469 - branchResp, err := tangled.RepoBranch(r.Context(), xrpcc, pull.PullSource.Branch, didSlashName) 440 440 + xrpcc := &indigoxrpc.Client{Host: s.config.KnotMirror.Url} 441 441 + branchResp, err := tangled.GitTempGetBranch(r.Context(), xrpcc, pull.PullSource.Branch, sourceRepo.String()) 470 442 if err != nil { 471 443 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 472 444 log.Println("failed to call XRPC repo.branches", xrpcerr) ··· 904 876 905 877 switch r.Method { 906 878 case http.MethodGet: 907 907 - scheme := "http" 908 908 - if !s.config.Core.Dev { 909 909 - scheme = "https" 910 910 - } 911 911 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 912 912 - xrpcc := &indigoxrpc.Client{ 913 913 - Host: host, 914 914 - } 879 879 + xrpcc := &indigoxrpc.Client{Host: s.config.KnotMirror.Url} 915 880 916 916 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 917 917 - xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 881 881 + xrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 918 882 if err != nil { 919 883 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 920 884 log.Println("failed to call XRPC repo.branches", xrpcerr) ··· 1535 1499 return 1536 1500 } 1537 1501 1538 1538 - scheme := "http" 1539 1539 - if !s.config.Core.Dev { 1540 1540 - scheme = "https" 1541 1541 - } 1542 1542 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 1543 1543 - xrpcc := &indigoxrpc.Client{ 1544 1544 - Host: host, 1545 1545 - } 1502 1502 + xrpcc := &indigoxrpc.Client{Host: s.config.KnotMirror.Url} 1546 1503 1547 1547 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 1548 1548 - xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 1504 1504 + xrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 1549 1505 if err != nil { 1550 1550 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1551 1551 - log.Println("failed to call XRPC repo.branches", xrpcerr) 1552 1552 - s.pages.Error503(w) 1553 1553 - return 1554 1554 - } 1555 1506 log.Println("failed to fetch branches", err) 1507 1507 + s.pages.Error503(w) 1556 1508 return 1557 1509 } 1558 1510 ··· 1607 1559 return 1608 1560 } 1609 1561 1562 1562 + xrpcc := &indigoxrpc.Client{Host: s.config.KnotMirror.Url} 1563 1563 + 1610 1564 forkVal := r.URL.Query().Get("fork") 1611 1565 repoString := strings.SplitN(forkVal, "/", 2) 1612 1566 forkOwnerDid := repoString[0] ··· 1622 1576 return 1623 1577 } 1624 1578 1625 1625 - sourceScheme := "http" 1626 1626 - if !s.config.Core.Dev { 1627 1627 - sourceScheme = "https" 1628 1628 - } 1629 1629 - sourceHost := fmt.Sprintf("%s://%s", sourceScheme, repo.Knot) 1630 1630 - sourceXrpcc := &indigoxrpc.Client{ 1631 1631 - Host: sourceHost, 1632 1632 - } 1633 1633 - 1634 1634 - sourceRepo := fmt.Sprintf("%s/%s", forkOwnerDid, repo.Name) 1635 1635 - sourceXrpcBytes, err := tangled.RepoBranches(r.Context(), sourceXrpcc, "", 0, sourceRepo) 1579 1579 + sourceXrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, repo.RepoAt().String()) 1636 1580 if err != nil { 1637 1581 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1638 1582 log.Println("failed to call XRPC repo.branches for source", xrpcerr) ··· 1651 1595 return 1652 1596 } 1653 1597 1654 1654 - targetScheme := "http" 1655 1655 - if !s.config.Core.Dev { 1656 1656 - targetScheme = "https" 1657 1657 - } 1658 1658 - targetHost := fmt.Sprintf("%s://%s", targetScheme, f.Knot) 1659 1659 - targetXrpcc := &indigoxrpc.Client{ 1660 1660 - Host: targetHost, 1661 1661 - } 1662 1662 - 1663 1663 - targetRepo := fmt.Sprintf("%s/%s", f.Did, f.Name) 1664 1664 - targetXrpcBytes, err := tangled.RepoBranches(r.Context(), targetXrpcc, "", 0, targetRepo) 1598 1598 + targetXrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 1665 1599 if err != nil { 1666 1600 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 1667 1601 log.Println("failed to call XRPC repo.branches for target", xrpcerr)

+9 -19

appview/repo/archive.go

reviewed

··· 8 8 "strings" 9 9 10 10 "github.com/go-chi/chi/v5" 11 11 + "tangled.org/core/api/tangled" 11 12 ) 12 13 13 14 func (rp *Repo) DownloadArchive(w http.ResponseWriter, r *http.Request) { ··· 20 21 l.Error("failed to get repo and knot", "err", err) 21 22 return 22 23 } 23 23 - scheme := "http" 24 24 - if !rp.config.Core.Dev { 25 25 - scheme = "https" 26 26 - } 27 27 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 28 28 - didSlashRepo := f.DidSlashRepo() 29 24 30 25 // build the xrpc url 31 31 - u, err := url.Parse(host) 32 32 - if err != nil { 33 33 - l.Error("failed to parse host URL", "err", err) 34 34 - rp.pages.Error503(w) 35 35 - return 36 36 - } 37 37 - 38 38 - u.Path = "/xrpc/sh.tangled.repo.archive" 39 26 query := url.Values{} 27 27 + query.Set("repo", f.RepoAt().String()) 28 28 + query.Set("ref", ref) 40 29 query.Set("format", "tar.gz") 41 30 query.Set("prefix", r.URL.Query().Get("prefix")) 42 42 - query.Set("ref", ref) 43 43 - query.Set("repo", didSlashRepo) 44 44 - u.RawQuery = query.Encode() 45 45 - 46 46 - xrpcURL := u.String() 31 31 + xrpcURL := fmt.Sprintf( 32 32 + "%s/xrpc/%s?%s", 33 33 + rp.config.KnotMirror.Url, 34 34 + tangled.GitTempGetArchiveNSID, 35 35 + query.Encode(), 36 36 + ) 47 37 48 38 // make the get request 49 39 resp, err := http.Get(xrpcURL)

+2 -10

appview/repo/artifact.go

reviewed

··· 313 313 return nil, err 314 314 } 315 315 316 316 - scheme := "http" 317 317 - if !rp.config.Core.Dev { 318 318 - scheme = "https" 319 319 - } 320 320 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 321 321 - xrpcc := &indigoxrpc.Client{ 322 322 - Host: host, 323 323 - } 316 316 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 324 317 325 325 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 326 326 - xrpcBytes, err := tangled.RepoTags(ctx, xrpcc, "", 0, repo) 318 318 + xrpcBytes, err := tangled.GitTempListTags(ctx, xrpcc, "", 0, f.RepoAt().String()) 327 319 if err != nil { 328 320 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 329 321 l.Error("failed to call XRPC repo.tags", "err", xrpcerr)

+5 -12

appview/repo/branches.go

reviewed

··· 21 21 l.Error("failed to get repo and knot", "err", err) 22 22 return 23 23 } 24 24 - scheme := "http" 25 25 - if !rp.config.Core.Dev { 26 26 - scheme = "https" 27 27 - } 28 28 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 29 29 - xrpcc := &indigoxrpc.Client{ 30 30 - Host: host, 31 31 - } 32 32 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 33 33 - xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 34 34 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 35 35 - l.Error("failed to call XRPC repo.branches", "err", xrpcerr) 24 24 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 25 25 + 26 26 + xrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 27 27 + if err != nil { 28 28 + l.Error("failed to call XRPC repo.branches", "err", err) 36 29 rp.pages.Error503(w) 37 30 return 38 31 }

+3 -11

appview/repo/compare.go

reviewed

··· 27 27 return 28 28 } 29 29 30 30 - scheme := "http" 31 31 - if !rp.config.Core.Dev { 32 32 - scheme = "https" 33 33 - } 34 34 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 35 35 - xrpcc := &indigoxrpc.Client{ 36 36 - Host: host, 37 37 - } 30 30 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 38 31 39 39 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 40 40 - branchBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 32 32 + branchBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 41 33 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 42 34 l.Error("failed to call XRPC repo.branches", "err", xrpcerr) 43 35 rp.pages.Error503(w) ··· 74 66 head = queryHead 75 67 } 76 68 77 77 - tagBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo) 69 69 + tagBytes, err := tangled.GitTempListTags(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 78 70 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 79 71 l.Error("failed to call XRPC repo.tags", "err", xrpcerr) 80 72 rp.pages.Error503(w)

+27 -52

appview/repo/index.go

reviewed

··· 22 22 "tangled.org/core/appview/db" 23 23 "tangled.org/core/appview/models" 24 24 "tangled.org/core/appview/pages" 25 25 - "tangled.org/core/appview/xrpcclient" 26 25 "tangled.org/core/orm" 27 26 "tangled.org/core/types" 28 27 ··· 42 41 return 43 42 } 44 43 45 45 - scheme := "http" 46 46 - if !rp.config.Core.Dev { 47 47 - scheme = "https" 48 48 - } 49 49 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 50 50 - xrpcc := &indigoxrpc.Client{ 51 51 - Host: host, 52 52 - } 53 53 - 54 44 user := rp.oauth.GetMultiAccountUser(r) 55 45 56 46 // Build index response from multiple XRPC calls 57 57 - result, err := rp.buildIndexResponse(r.Context(), xrpcc, f, ref) 58 58 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 59 59 - if errors.Is(xrpcerr, xrpcclient.ErrXrpcUnsupported) { 60 60 - l.Error("failed to call XRPC repo.index", "err", err) 61 61 - rp.pages.RepoIndexPage(w, pages.RepoIndexParams{ 62 62 - LoggedInUser: user, 63 63 - NeedsKnotUpgrade: true, 64 64 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 65 65 - }) 66 66 - return 67 67 - } else { 68 68 - l.Error("failed to build index response", "err", err) 69 69 - rp.pages.RepoIndexPage(w, pages.RepoIndexParams{ 70 70 - LoggedInUser: user, 71 71 - KnotUnreachable: true, 72 72 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 73 73 - }) 74 74 - return 75 75 - } 47 47 + result, err := rp.buildIndexResponse(r.Context(), f, ref) 48 48 + if err != nil { 49 49 + l.Error("failed to build index response", "err", err) 50 50 + rp.pages.RepoIndexPage(w, pages.RepoIndexParams{ 51 51 + LoggedInUser: user, 52 52 + KnotUnreachable: true, 53 53 + RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 54 54 + }) 55 55 + return 76 56 } 77 57 78 58 tagMap := make(map[string][]string) ··· 133 113 } 134 114 135 115 // TODO: a bit dirty 136 136 - languageInfo, err := rp.getLanguageInfo(r.Context(), l, f, xrpcc, result.Ref, ref == "") 116 116 + languageInfo, err := rp.getLanguageInfo(r.Context(), l, f, result.Ref, ref == "") 137 117 if err != nil { 138 118 l.Warn("failed to compute language percentages", "err", err) 139 119 // non-fatal ··· 169 149 ctx context.Context, 170 150 l *slog.Logger, 171 151 repo *models.Repo, 172 172 - xrpcc *indigoxrpc.Client, 173 152 currentRef string, 174 153 isDefaultRef bool, 175 154 ) ([]types.RepoLanguageDetails, error) { ··· 182 161 183 162 if err != nil || langs == nil { 184 163 // non-fatal, fetch langs from ks via XRPC 185 185 - didSlashRepo := fmt.Sprintf("%s/%s", repo.Did, repo.Name) 186 186 - ls, err := tangled.RepoLanguages(ctx, xrpcc, currentRef, didSlashRepo) 164 164 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 165 165 + ls, err := tangled.GitTempListLanguages(ctx, xrpcc, currentRef, repo.RepoAt().String()) 187 166 if err != nil { 188 188 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 189 189 - l.Error("failed to call XRPC repo.languages", "err", xrpcerr) 190 190 - return nil, xrpcerr 191 191 - } 192 192 - return nil, err 167 167 + return nil, fmt.Errorf("calling knotmirror git.listLanguages: %w", err) 193 168 } 194 169 195 170 if ls == nil || ls.Languages == nil { ··· 258 233 } 259 234 260 235 // buildIndexResponse creates a RepoIndexResponse by combining multiple xrpc calls in parallel 261 261 - func (rp *Repo) buildIndexResponse(ctx context.Context, xrpcc *indigoxrpc.Client, repo *models.Repo, ref string) (*types.RepoIndexResponse, error) { 262 262 - didSlashRepo := fmt.Sprintf("%s/%s", repo.Did, repo.Name) 236 236 + func (rp *Repo) buildIndexResponse(ctx context.Context, repo *models.Repo, ref string) (*types.RepoIndexResponse, error) { 237 237 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 263 238 264 239 // first get branches to determine the ref if not specified 265 265 - branchesBytes, err := tangled.RepoBranches(ctx, xrpcc, "", 0, didSlashRepo) 240 240 + branchesBytes, err := tangled.GitTempListBranches(ctx, xrpcc, "", 0, repo.RepoAt().String()) 266 241 if err != nil { 267 267 - return nil, fmt.Errorf("failed to call repoBranches: %w", err) 242 242 + return nil, fmt.Errorf("calling knotmirror git.listBranches: %w", err) 268 243 } 269 244 270 245 var branchesResp types.RepoBranchesResponse ··· 296 271 297 272 var ( 298 273 tagsResp types.RepoTagsResponse 299 299 - treeResp *tangled.RepoTree_Output 274 274 + treeResp *tangled.GitTempGetTree_Output 300 275 logResp types.RepoLogResponse 301 276 readmeContent string 302 277 readmeFileName string ··· 304 279 305 280 // tags 306 281 wg.Go(func() { 307 307 - tagsBytes, err := tangled.RepoTags(ctx, xrpcc, "", 0, didSlashRepo) 282 282 + tagsBytes, err := tangled.GitTempListTags(ctx, xrpcc, "", 0, repo.RepoAt().String()) 308 283 if err != nil { 309 309 - errs = errors.Join(errs, fmt.Errorf("failed to call repoTags: %w", err)) 284 284 + errs = errors.Join(errs, fmt.Errorf("failed to call git.ListTags: %w", err)) 310 285 return 311 286 } 312 287 313 288 if err := json.Unmarshal(tagsBytes, &tagsResp); err != nil { 314 314 - errs = errors.Join(errs, fmt.Errorf("failed to unmarshal repoTags: %w", err)) 289 289 + errs = errors.Join(errs, fmt.Errorf("failed to unmarshal git.ListTags: %w", err)) 315 290 } 316 291 }) 317 292 318 293 // tree/files 319 294 wg.Go(func() { 320 320 - resp, err := tangled.RepoTree(ctx, xrpcc, "", ref, didSlashRepo) 295 295 + resp, err := tangled.GitTempGetTree(ctx, xrpcc, "", ref, repo.RepoAt().String()) 321 296 if err != nil { 322 322 - errs = errors.Join(errs, fmt.Errorf("failed to call repoTree: %w", err)) 297 297 + errs = errors.Join(errs, fmt.Errorf("failed to call git.GetTree: %w", err)) 323 298 return 324 299 } 325 300 treeResp = resp ··· 327 302 328 303 // commits 329 304 wg.Go(func() { 330 330 - logBytes, err := tangled.RepoLog(ctx, xrpcc, "", 50, "", ref, didSlashRepo) 305 305 + logBytes, err := tangled.GitTempListCommits(ctx, xrpcc, "", 50, ref, repo.RepoAt().String()) 331 306 if err != nil { 332 332 - errs = errors.Join(errs, fmt.Errorf("failed to call repoLog: %w", err)) 307 307 + errs = errors.Join(errs, fmt.Errorf("failed to call git.ListCommits: %w", err)) 333 308 return 334 309 } 335 310 336 311 if err := json.Unmarshal(logBytes, &logResp); err != nil { 337 337 - errs = errors.Join(errs, fmt.Errorf("failed to unmarshal repoLog: %w", err)) 312 312 + errs = errors.Join(errs, fmt.Errorf("failed to unmarshal git.ListCommits: %w", err)) 338 313 } 339 314 }) 340 315 ··· 376 351 Readme: readmeContent, 377 352 ReadmeFileName: readmeFileName, 378 353 Commits: logResp.Commits, 379 379 - Description: logResp.Description, 354 354 + Description: "", 380 355 Files: files, 381 356 Branches: branchesResp.Branches, 382 357 Tags: tagsResp.Tags,

+10 -18

appview/repo/log.go

reviewed

··· 40 40 ref := chi.URLParam(r, "ref") 41 41 ref, _ = url.PathUnescape(ref) 42 42 43 43 - scheme := "http" 44 44 - if !rp.config.Core.Dev { 45 45 - scheme = "https" 46 46 - } 47 47 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 48 48 - xrpcc := &indigoxrpc.Client{ 49 49 - Host: host, 50 50 - } 43 43 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 51 44 52 45 limit := int64(60) 53 46 cursor := "" ··· 57 50 cursor = strconv.Itoa(offset) 58 51 } 59 52 60 60 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 61 61 - xrpcBytes, err := tangled.RepoLog(r.Context(), xrpcc, cursor, limit, "", ref, repo) 62 62 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 63 63 - l.Error("failed to call XRPC repo.log", "err", xrpcerr) 53 53 + xrpcBytes, err := tangled.GitTempListCommits(r.Context(), xrpcc, cursor, limit, ref, f.RepoAt().String()) 54 54 + if err != nil { 55 55 + l.Error("failed to call XRPC repo.log", "err", err) 64 56 rp.pages.Error503(w) 65 57 return 66 58 } ··· 72 64 return 73 65 } 74 66 75 75 - tagBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo) 76 76 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 77 77 - l.Error("failed to call XRPC repo.tags", "err", xrpcerr) 67 67 + tagBytes, err := tangled.GitTempListTags(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 68 68 + if err != nil { 69 69 + l.Error("failed to call XRPC repo.tags", "err", err) 78 70 rp.pages.Error503(w) 79 71 return 80 72 } ··· 93 85 } 94 86 } 95 87 96 96 - branchBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 97 97 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 98 98 - l.Error("failed to call XRPC repo.branches", "err", xrpcerr) 88 88 + branchBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 89 89 + if err != nil { 90 90 + l.Error("failed to call XRPC repo.branches", "err", err) 99 91 rp.pages.Error503(w) 100 92 return 101 93 }

+2 -10

appview/repo/settings.go

reviewed

··· 386 386 f, err := rp.repoResolver.Resolve(r) 387 387 user := rp.oauth.GetMultiAccountUser(r) 388 388 389 389 - scheme := "http" 390 390 - if !rp.config.Core.Dev { 391 391 - scheme = "https" 392 392 - } 393 393 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 394 394 - xrpcc := &indigoxrpc.Client{ 395 395 - Host: host, 396 396 - } 389 389 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 397 390 398 398 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 399 399 - xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo) 391 391 + xrpcBytes, err := tangled.GitTempListBranches(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 400 392 var result types.RepoBranchesResponse 401 393 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 402 394 l.Error("failed to call XRPC repo.branches", "err", xrpcerr)

+8 -23

appview/repo/tags.go

reviewed

··· 27 27 l.Error("failed to get repo and knot", "err", err) 28 28 return 29 29 } 30 30 - scheme := "http" 31 31 - if !rp.config.Core.Dev { 32 32 - scheme = "https" 33 33 - } 34 34 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 35 35 - xrpcc := &indigoxrpc.Client{ 36 36 - Host: host, 37 37 - } 38 38 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 39 39 - xrpcBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo) 40 40 - if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 41 41 - l.Error("failed to call XRPC repo.tags", "err", xrpcerr) 30 30 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 31 31 + xrpcBytes, err := tangled.GitTempListTags(r.Context(), xrpcc, "", 0, f.RepoAt().String()) 32 32 + if err != nil { 33 33 + l.Error("failed to call XRPC repo.tags", "err", err) 42 34 rp.pages.Error503(w) 43 35 return 44 36 } ··· 90 82 l.Error("failed to get repo and knot", "err", err) 91 83 return 92 84 } 93 93 - scheme := "http" 94 94 - if !rp.config.Core.Dev { 95 95 - scheme = "https" 96 96 - } 97 97 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 98 98 - xrpcc := &indigoxrpc.Client{ 99 99 - Host: host, 100 100 - } 101 101 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 102 85 tag := chi.URLParam(r, "tag") 103 86 104 104 - xrpcBytes, err := tangled.RepoTag(r.Context(), xrpcc, repo, tag) 87 87 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 88 88 + 89 89 + xrpcBytes, err := tangled.GitTempGetTag(r.Context(), xrpcc, f.RepoAt().String(), tag) 105 90 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 106 91 // if we don't match an existing tag, and the tag we're trying 107 92 // to match is "latest", resolve to the most recent tag 108 93 if tag == "latest" { 109 109 - tagsBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 1, repo) 94 94 + tagsBytes, err := tangled.GitTempListTags(r.Context(), xrpcc, "", 1, f.RepoAt().String()) 110 95 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 111 96 l.Error("failed to call XRPC repo.tags for latest", "err", xrpcerr) 112 97 rp.pages.Error503(w)

+3 -10

appview/repo/tree.go

reviewed

··· 33 33 treePath := chi.URLParam(r, "*") 34 34 treePath, _ = url.PathUnescape(treePath) 35 35 treePath = strings.TrimSuffix(treePath, "/") 36 36 - scheme := "http" 37 37 - if !rp.config.Core.Dev { 38 38 - scheme = "https" 39 39 - } 40 40 - host := fmt.Sprintf("%s://%s", scheme, f.Knot) 41 41 - xrpcc := &indigoxrpc.Client{ 42 42 - Host: host, 43 43 - } 44 44 - repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 45 45 - xrpcResp, err := tangled.RepoTree(r.Context(), xrpcc, treePath, ref, repo) 36 36 + 37 37 + xrpcc := &indigoxrpc.Client{Host: rp.config.KnotMirror.Url} 38 38 + xrpcResp, err := tangled.GitTempGetTree(r.Context(), xrpcc, treePath, ref, f.RepoAt().String()) 46 39 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 47 40 l.Error("failed to call XRPC repo.tree", "err", xrpcerr) 48 41 rp.pages.Error503(w)

+11

knotmirror/config/config.go

reviewed

··· 8 8 ) 9 9 10 10 type Config struct { 11 11 + PlcUrl string `env:"MIRROR_PLC_URL, default=https://plc.directory"` 11 12 TapUrl string `env:"MIRROR_TAP_URL, default=http://localhost:2480"` 12 13 DbUrl string `env:"MIRROR_DB_URL, required"` 13 14 KnotUseSSL bool `env:"MIRROR_KNOT_USE_SSL, default=false"` // use SSL for Knot when not scheme is not specified ··· 16 17 GitRepoFetchTimeout time.Duration `env:"MIRROR_GIT_FETCH_TIMEOUT, default=600s"` 17 18 ResyncParallelism int `env:"MIRROR_RESYNC_PARALLELISM, default=5"` 18 19 Slurper SlurperConfig `env:",prefix=MIRROR_SLURPER_"` 20 20 + UseSSL bool `env:"MIRROR_USE_SSL, default=false"` 21 21 + Hostname string `env:"MIRROR_HOSTNAME, required"` 22 22 + Listen string `env:"MIRROR_LISTEN, default=:7000"` 19 23 MetricsListen string `env:"MIRROR_METRICS_LISTEN, default=127.0.0.1:7100"` 20 24 AdminListen string `env:"MIRROR_ADMIN_LISTEN, default=127.0.0.1:7200"` 21 25 } 22 26 27 27 + func (c *Config) BaseUrl() string { 28 28 + if c.UseSSL { 29 29 + return "https://" + c.Hostname 30 30 + } 31 31 + return "http://" + c.Hostname 32 32 + } 33 33 + 23 34 type SlurperConfig struct { 24 35 PersistCursorPeriod time.Duration `env:"PERSIST_CURSOR_PERIOD, default=4s"` 25 36 ConcurrencyPerHost int `env:"CONCURRENCY, default=4"`

+21

knotmirror/knotmirror.go

reviewed

··· 7 7 _ "net/http/pprof" 8 8 "time" 9 9 10 10 + "github.com/go-chi/chi/v5" 10 11 "github.com/prometheus/client_golang/prometheus/promhttp" 12 12 + "tangled.org/core/idresolver" 11 13 "tangled.org/core/knotmirror/config" 12 14 "tangled.org/core/knotmirror/db" 13 15 "tangled.org/core/knotmirror/knotstream" 14 16 "tangled.org/core/knotmirror/models" 17 17 + "tangled.org/core/knotmirror/xrpc" 15 18 "tangled.org/core/log" 16 19 ) 17 20 ··· 27 30 return fmt.Errorf("initializing db: %w", err) 28 31 } 29 32 33 33 + resolver := idresolver.DefaultResolver(cfg.PlcUrl) 34 34 + 30 35 // NOTE: using plain git-cli for clone/fetch as go-git is too memory-intensive. 31 36 gitm := NewCliGitMirrorManager(cfg.GitRepoBasePath, cfg.KnotUseSSL) 32 37 ··· 44 49 } 45 50 logger.Info(fmt.Sprintf("clearing resyning states: %d records updated", rows)) 46 51 52 52 + xrpc := xrpc.New(logger, cfg, db, resolver) 47 53 knotstream := knotstream.NewKnotStream(logger, db, cfg) 48 54 crawler := NewCrawler(logger, db) 49 55 resyncer := NewResyncer(logger, db, gitm, cfg) ··· 53 59 // NOTE: this can be removed once we introduce did-for-repo because then we can just listen to KnotStream for #identity events. 54 60 tap := NewTapClient(logger, cfg, db, gitm, knotstream) 55 61 62 62 + // start http server 63 63 + go func() { 64 64 + logger.Info("starting http server", "addr", cfg.Listen) 65 65 + 66 66 + mux := chi.NewRouter() 67 67 + mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { 68 68 + w.Write([]byte("Welcome to a knotmirror server.\n")) 69 69 + }) 70 70 + mux.Mount("/xrpc", xrpc.Router()) 71 71 + 72 72 + if err := http.ListenAndServe(cfg.Listen, mux); err != nil { 73 73 + logger.Error("xrpc server failed", "error", err) 74 74 + } 75 75 + }() 76 76 + 56 77 // start metrics endpoint 57 78 go func() { 58 79 metricsAddr := cfg.MetricsListen

+106

knotmirror/xrpc/git_getArchive.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "compress/gzip" 5 5 + "fmt" 6 6 + "net/http" 7 7 + "net/url" 8 8 + "strings" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/atclient" 11 11 + "github.com/bluesky-social/indigo/atproto/syntax" 12 12 + "github.com/go-git/go-git/v5/plumbing" 13 13 + "tangled.org/core/api/tangled" 14 14 + "tangled.org/core/knotmirror/db" 15 15 + "tangled.org/core/knotserver/git" 16 16 + ) 17 17 + 18 18 + func (x *Xrpc) GetArchive(w http.ResponseWriter, r *http.Request) { 19 19 + var ( 20 20 + repoQuery = r.URL.Query().Get("repo") 21 21 + ref = r.URL.Query().Get("ref") 22 22 + format = r.URL.Query().Get("format") 23 23 + prefix = r.URL.Query().Get("prefix") 24 24 + ) 25 25 + 26 26 + repo, err := syntax.ParseATURI(repoQuery) 27 27 + if err != nil || repo.RecordKey() == "" { 28 28 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("repo parameter invalid: %s", repoQuery)}) 29 29 + return 30 30 + } 31 31 + 32 32 + if format != "tar.gz" { 33 33 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: "only tar.gz format is supported"}) 34 34 + return 35 35 + } 36 36 + if format == "" { 37 37 + format = "tar.gz" 38 38 + } 39 39 + 40 40 + l := x.logger.With("repo", repo, "ref", ref, "format", format, "prefix", prefix) 41 41 + ctx := r.Context() 42 42 + 43 43 + repoPath, err := x.makeRepoPath(ctx, repo) 44 44 + if err != nil { 45 45 + l.Error("failed to resolve repo at-uri", "err", err) 46 46 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to resolve repo"}) 47 47 + return 48 48 + } 49 49 + 50 50 + gr, err := git.Open(repoPath, ref) 51 51 + if err != nil { 52 52 + l.Error("failed to open git repo", "err", err) 53 53 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to open git repo"}) 54 54 + return 55 55 + } 56 56 + 57 57 + repoName, err := func() (string, error) { 58 58 + r, err := db.GetRepoByAtUri(ctx, x.db, repo) 59 59 + if err != nil { 60 60 + return "", err 61 61 + } 62 62 + if r == nil { 63 63 + return "", fmt.Errorf("repo not found: %s", repo) 64 64 + } 65 65 + return r.Name, nil 66 66 + }() 67 67 + if err != nil { 68 68 + l.Error("failed to get repo name", "err", err) 69 69 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to retrieve repo name"}) 70 70 + return 71 71 + } 72 72 + 73 73 + safeRefFilename := strings.ReplaceAll(plumbing.ReferenceName(ref).Short(), "/", "-") 74 74 + immutableLink := func() string { 75 75 + params := url.Values{} 76 76 + params.Set("repo", repo.String()) 77 77 + params.Set("ref", gr.Hash().String()) 78 78 + params.Set("format", format) 79 79 + params.Set("prefix", prefix) 80 80 + return fmt.Sprintf("%s/xrpc/%s?%s", x.cfg.BaseUrl(), tangled.GitTempGetArchiveNSID, params.Encode()) 81 81 + }() 82 82 + 83 83 + filename := fmt.Sprintf("%s-%s.tar.gz", repoName, safeRefFilename) 84 84 + w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename)) 85 85 + w.Header().Set("Content-Type", "application/gzip") 86 86 + w.Header().Set("Link", fmt.Sprintf("<%s>; rel=\"immutable\"", immutableLink)) 87 87 + 88 88 + gw := gzip.NewWriter(w) 89 89 + defer gw.Close() 90 90 + 91 91 + if err := gr.WriteTar(gw, prefix); err != nil { 92 92 + // once we start writing to the body we can't report error anymore 93 93 + // so we are only left with logging the error 94 94 + l.Error("writing tar file", "err", err.Error()) 95 95 + w.WriteHeader(http.StatusInternalServerError) 96 96 + return 97 97 + } 98 98 + 99 99 + if err := gw.Flush(); err != nil { 100 100 + // once we start writing to the body we can't report error anymore 101 101 + // so we are only left with logging the error 102 102 + l.Error("flushing", "err", err.Error()) 103 103 + w.WriteHeader(http.StatusInternalServerError) 104 104 + return 105 105 + } 106 106 + }

+86

knotmirror/xrpc/git_getBlob.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "fmt" 6 6 + "io" 7 7 + "net/http" 8 8 + "slices" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/atclient" 11 11 + "github.com/bluesky-social/indigo/atproto/syntax" 12 12 + "github.com/go-git/go-git/v5/plumbing/object" 13 13 + "tangled.org/core/knotserver/git" 14 14 + ) 15 15 + 16 16 + func (x *Xrpc) GetBlob(w http.ResponseWriter, r *http.Request) { 17 17 + var ( 18 18 + repoQuery = r.URL.Query().Get("repo") 19 19 + ref = r.URL.Query().Get("ref") // ref can be empty (git.Open handles this) 20 20 + path = r.URL.Query().Get("path") 21 21 + ) 22 22 + 23 23 + repo, err := syntax.ParseATURI(repoQuery) 24 24 + if err != nil || repo.RecordKey() == "" { 25 25 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("repo parameter invalid: %s", repoQuery)}) 26 26 + return 27 27 + } 28 28 + 29 29 + l := x.logger.With("repo", repo, "ref", ref, "path", path) 30 30 + 31 31 + if path == "" { 32 32 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: "missing path parameter"}) 33 33 + return 34 34 + } 35 35 + 36 36 + file, err := x.getFile(r.Context(), repo, ref, path) 37 37 + if err != nil { 38 38 + // TODO: better error return 39 39 + l.Error("failed to get blob", "err", err) 40 40 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to get blob"}) 41 41 + return 42 42 + } 43 43 + 44 44 + reader, err := file.Reader() 45 45 + if err != nil { 46 46 + l.Error("failed to read blob", "err", err) 47 47 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to read the blob"}) 48 48 + return 49 49 + } 50 50 + defer reader.Close() 51 51 + 52 52 + w.Header().Set("Content-Type", "application/octet-stream") 53 53 + if _, err := io.Copy(w, reader); err != nil { 54 54 + l.Error("failed to serve the blob", "err", err) 55 55 + } 56 56 + } 57 57 + 58 58 + func (x *Xrpc) getFile(ctx context.Context, repo syntax.ATURI, ref, path string) (*object.File, error) { 59 59 + repoPath, err := x.makeRepoPath(ctx, repo) 60 60 + if err != nil { 61 61 + return nil, fmt.Errorf("resolving repo at-uri: %w", err) 62 62 + } 63 63 + 64 64 + gr, err := git.Open(repoPath, ref) 65 65 + if err != nil { 66 66 + return nil, fmt.Errorf("opening git repo: %w", err) 67 67 + } 68 68 + 69 69 + return gr.File(path) 70 70 + } 71 71 + 72 72 + var textualMimeTypes = []string{ 73 73 + "application/json", 74 74 + "application/xml", 75 75 + "application/yaml", 76 76 + "application/x-yaml", 77 77 + "application/toml", 78 78 + "application/javascript", 79 79 + "application/ecmascript", 80 80 + } 81 81 + 82 82 + // isTextualMimeType returns true if the MIME type represents textual content 83 83 + // that should be served as text/plain for security reasons 84 84 + func isTextualMimeType(mimeType string) bool { 85 85 + return slices.Contains(textualMimeTypes, mimeType) 86 86 + }

+85

knotmirror/xrpc/git_getBranch.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "fmt" 6 6 + "net/http" 7 7 + "net/url" 8 8 + "time" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/atclient" 11 11 + "github.com/bluesky-social/indigo/atproto/syntax" 12 12 + "tangled.org/core/api/tangled" 13 13 + "tangled.org/core/knotserver/git" 14 14 + ) 15 15 + 16 16 + // TODO: maybe rename to `sh.tangled.repo.temp.getCommit`? 17 17 + // then, we should ensure the given `ref` is valid 18 18 + func (x *Xrpc) GetBranch(w http.ResponseWriter, r *http.Request) { 19 19 + var ( 20 20 + repoQuery = r.URL.Query().Get("repo") 21 21 + nameQuery = r.URL.Query().Get("name") 22 22 + ) 23 23 + 24 24 + repo, err := syntax.ParseATURI(repoQuery) 25 25 + if err != nil || repo.RecordKey() == "" { 26 26 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("repo parameter invalid: %s", repoQuery)}) 27 27 + return 28 28 + } 29 29 + 30 30 + if nameQuery == "" { 31 31 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: "missing name parameter"}) 32 32 + return 33 33 + } 34 34 + branchName, _ := url.PathUnescape(nameQuery) 35 35 + 36 36 + l := x.logger.With("repo", repo, "branch", branchName) 37 37 + 38 38 + out, err := x.getBranch(r.Context(), repo, branchName) 39 39 + if err != nil { 40 40 + // TODO: better error return 41 41 + l.Error("failed to get branch", "err", err) 42 42 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to get branch"}) 43 43 + return 44 44 + } 45 45 + writeJson(w, http.StatusOK, out) 46 46 + } 47 47 + 48 48 + func (x *Xrpc) getBranch(ctx context.Context, repo syntax.ATURI, branchName string) (*tangled.GitTempGetBranch_Output, error) { 49 49 + repoPath, err := x.makeRepoPath(ctx, repo) 50 50 + if err != nil { 51 51 + return nil, fmt.Errorf("failed to resolve repo at-uri: %w", err) 52 52 + } 53 53 + 54 54 + gr, err := git.PlainOpen(repoPath) 55 55 + if err != nil { 56 56 + return nil, fmt.Errorf("failed to open git repo: %w", err) 57 57 + } 58 58 + 59 59 + ref, err := gr.Branch(branchName) 60 60 + if err != nil { 61 61 + return nil, fmt.Errorf("getting branch '%s': %w", branchName, err) 62 62 + } 63 63 + 64 64 + commit, err := gr.Commit(ref.Hash()) 65 65 + if err != nil { 66 66 + return nil, fmt.Errorf("getting commit '%s': %w", ref.Hash(), err) 67 67 + } 68 68 + 69 69 + out := tangled.GitTempGetBranch_Output{ 70 70 + Name: ref.Name().Short(), 71 71 + Hash: ref.Hash().String(), 72 72 + When: commit.Author.When.Format(time.RFC3339), 73 73 + Author: &tangled.GitTempDefs_Signature{ 74 74 + Name: commit.Author.Name, 75 75 + Email: commit.Author.Email, 76 76 + When: commit.Author.When.Format(time.RFC3339), 77 77 + }, 78 78 + } 79 79 + 80 80 + if commit.Message != "" { 81 81 + out.Message = &commit.Message 82 82 + } 83 83 + 84 84 + return &out, nil 85 85 + }

+92

knotmirror/xrpc/git_getTag.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "fmt" 6 6 + "net/http" 7 7 + 8 8 + "github.com/bluesky-social/indigo/atproto/atclient" 9 9 + "github.com/bluesky-social/indigo/atproto/syntax" 10 10 + "github.com/go-git/go-git/v5/plumbing" 11 11 + "github.com/go-git/go-git/v5/plumbing/object" 12 12 + "tangled.org/core/knotserver/git" 13 13 + "tangled.org/core/types" 14 14 + ) 15 15 + 16 16 + func (x *Xrpc) GetTag(w http.ResponseWriter, r *http.Request) { 17 17 + var ( 18 18 + repoQuery = r.URL.Query().Get("repo") 19 19 + tagName = r.URL.Query().Get("tag") 20 20 + ) 21 21 + 22 22 + repo, err := syntax.ParseATURI(repoQuery) 23 23 + if err != nil || repo.RecordKey() == "" { 24 24 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("repo parameter invalid: %s", repoQuery)}) 25 25 + return 26 26 + } 27 27 + 28 28 + if tagName == "" { 29 29 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: "missing 'tag' parameter"}) 30 30 + return 31 31 + } 32 32 + 33 33 + l := x.logger.With("repo", repo, "tag", tagName) 34 34 + 35 35 + out, err := x.getTag(r.Context(), repo, tagName) 36 36 + if err != nil { 37 37 + // TODO: better error return 38 38 + l.Error("failed to get tag", "err", err) 39 39 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to get tag"}) 40 40 + return 41 41 + } 42 42 + writeJson(w, http.StatusOK, out) 43 43 + } 44 44 + 45 45 + func (x *Xrpc) getTag(ctx context.Context, repo syntax.ATURI, tagName string) (*types.RepoTagResponse, error) { 46 46 + repoPath, err := x.makeRepoPath(ctx, repo) 47 47 + if err != nil { 48 48 + return nil, fmt.Errorf("failed to resolve repo at-uri: %w", err) 49 49 + } 50 50 + 51 51 + gr, err := git.PlainOpen(repoPath) 52 52 + if err != nil { 53 53 + return nil, fmt.Errorf("failed to open git repo: %w", err) 54 54 + } 55 55 + 56 56 + // if this is not already formatted as refs/tags/v0.1.0, then format it 57 57 + if !plumbing.ReferenceName(tagName).IsTag() { 58 58 + tagName = plumbing.NewTagReferenceName(tagName).String() 59 59 + } 60 60 + 61 61 + tag, err := func() (object.Tag, error) { 62 62 + tags, err := gr.Tags(&git.TagsOptions{ 63 63 + Pattern: tagName, 64 64 + }) 65 65 + if err != nil { 66 66 + return object.Tag{}, err 67 67 + } 68 68 + if len(tags) != 1 { 69 69 + return object.Tag{}, fmt.Errorf("expected 1 tag to be returned, got %d tags", len(tags)) 70 70 + } 71 71 + return tags[0], nil 72 72 + }() 73 73 + if err != nil { 74 74 + return nil, fmt.Errorf("getting tag: %w", err) 75 75 + } 76 76 + 77 77 + var target *object.Tag 78 78 + if tag.Target != plumbing.ZeroHash { 79 79 + target = &tag 80 80 + } 81 81 + 82 82 + return &types.RepoTagResponse{ 83 83 + Tag: &types.TagReference{ 84 84 + Tag: target, 85 85 + Reference: types.Reference{ 86 86 + Name: tag.Name, 87 87 + Hash: tag.Hash.String(), 88 88 + }, 89 89 + Message: tag.Message, 90 90 + }, 91 91 + }, nil 92 92 + }

+118

knotmirror/xrpc/git_getTree.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "fmt" 6 6 + "net/http" 7 7 + "path/filepath" 8 8 + "time" 9 9 + "unicode/utf8" 10 10 + 11 11 + "github.com/bluesky-social/indigo/atproto/atclient" 12 12 + "github.com/bluesky-social/indigo/atproto/syntax" 13 13 + "tangled.org/core/api/tangled" 14 14 + "tangled.org/core/appview/pages/markup" 15 15 + "tangled.org/core/knotserver/git" 16 16 + ) 17 17 + 18 18 + func (x *Xrpc) GetTree(w http.ResponseWriter, r *http.Request) { 19 19 + var ( 20 20 + repoQuery = r.URL.Query().Get("repo") 21 21 + ref = r.URL.Query().Get("ref") // ref can be empty (git.Open handles this) 22 22 + path = r.URL.Query().Get("path") // path can be empty (defaults to root) 23 23 + ) 24 24 + 25 25 + repo, err := syntax.ParseATURI(repoQuery) 26 26 + if err != nil || repo.RecordKey() == "" { 27 27 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("repo parameter invalid: %s", repoQuery)}) 28 28 + return 29 29 + } 30 30 + 31 31 + l := x.logger.With("repo", repo, "ref", ref, "path", path) 32 32 + 33 33 + out, err := x.getTree(r.Context(), repo, ref, path) 34 34 + if err != nil { 35 35 + // TODO: better error return 36 36 + l.Error("failed to get tree", "err", err) 37 37 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to get tree"}) 38 38 + return 39 39 + } 40 40 + writeJson(w, http.StatusOK, out) 41 41 + } 42 42 + 43 43 + func (x *Xrpc) getTree(ctx context.Context, repo syntax.ATURI, ref, path string) (*tangled.GitTempGetTree_Output, error) { 44 44 + repoPath, err := x.makeRepoPath(ctx, repo) 45 45 + if err != nil { 46 46 + return nil, fmt.Errorf("failed to resolve repo at-uri: %w", err) 47 47 + } 48 48 + 49 49 + gr, err := git.Open(repoPath, ref) 50 50 + if err != nil { 51 51 + return nil, fmt.Errorf("opening git repo: %w", err) 52 52 + } 53 53 + 54 54 + files, err := gr.FileTree(ctx, path) 55 55 + if err != nil { 56 56 + return nil, fmt.Errorf("reading file tree: %w", err) 57 57 + } 58 58 + 59 59 + // if any of these files are a readme candidate, pass along its blob contents too 60 60 + var readmeFileName string 61 61 + var readmeContents string 62 62 + for _, file := range files { 63 63 + if markup.IsReadmeFile(file.Name) { 64 64 + contents, err := gr.RawContent(filepath.Join(path, file.Name)) 65 65 + if err != nil { 66 66 + x.logger.Error("failed to read contents of file", "path", path, "file", file.Name) 67 67 + } 68 68 + 69 69 + if utf8.Valid(contents) { 70 70 + readmeFileName = file.Name 71 71 + readmeContents = string(contents) 72 72 + break 73 73 + } 74 74 + } 75 75 + } 76 76 + 77 77 + // convert NiceTree -> tangled.RepoTempGetTree_TreeEntry 78 78 + treeEntries := make([]*tangled.GitTempGetTree_TreeEntry, len(files)) 79 79 + for i, file := range files { 80 80 + entry := &tangled.GitTempGetTree_TreeEntry{ 81 81 + Name: file.Name, 82 82 + Mode: file.Mode, 83 83 + Size: file.Size, 84 84 + } 85 85 + if file.LastCommit != nil { 86 86 + entry.Last_commit = &tangled.GitTempGetTree_LastCommit{ 87 87 + Hash: file.LastCommit.Hash.String(), 88 88 + Message: file.LastCommit.Message, 89 89 + When: file.LastCommit.When.Format(time.RFC3339), 90 90 + } 91 91 + } 92 92 + treeEntries[i] = entry 93 93 + } 94 94 + 95 95 + var parentPtr *string 96 96 + if path != "" { 97 97 + parentPtr = &path 98 98 + } 99 99 + 100 100 + var dotdotPtr *string 101 101 + if path != "" { 102 102 + dotdot := filepath.Dir(path) 103 103 + if dotdot != "." { 104 104 + dotdotPtr = &dotdot 105 105 + } 106 106 + } 107 107 + 108 108 + return &tangled.GitTempGetTree_Output{ 109 109 + Ref: ref, 110 110 + Parent: parentPtr, 111 111 + Dotdot: dotdotPtr, 112 112 + Files: treeEntries, 113 113 + Readme: &tangled.GitTempGetTree_Readme{ 114 114 + Filename: readmeFileName, 115 115 + Contents: readmeContents, 116 116 + }, 117 117 + }, nil 118 118 + }

+95

knotmirror/xrpc/git_listBranches.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "fmt" 6 6 + "net/http" 7 7 + "path/filepath" 8 8 + "strconv" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/atclient" 11 11 + "github.com/bluesky-social/indigo/atproto/syntax" 12 12 + "tangled.org/core/knotserver/git" 13 13 + "tangled.org/core/types" 14 14 + ) 15 15 + 16 16 + func (x *Xrpc) ListBranches(w http.ResponseWriter, r *http.Request) { 17 17 + var ( 18 18 + repoQuery = r.URL.Query().Get("repo") 19 19 + limitQuery = r.URL.Query().Get("limit") 20 20 + cursorQuery = r.URL.Query().Get("cursor") 21 21 + ) 22 22 + 23 23 + repo, err := syntax.ParseATURI(repoQuery) 24 24 + if err != nil || repo.RecordKey() == "" { 25 25 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("repo parameter invalid: %s", repoQuery)}) 26 26 + return 27 27 + } 28 28 + 29 29 + limit := 50 30 30 + if limitQuery != "" { 31 31 + limit, err = strconv.Atoi(limitQuery) 32 32 + if err != nil || limit < 1 || limit > 1000 { 33 33 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("limit parameter invalid: %s", limitQuery)}) 34 34 + return 35 35 + } 36 36 + } 37 37 + 38 38 + var cursor int64 39 39 + if cursorQuery != "" { 40 40 + cursor, err = strconv.ParseInt(cursorQuery, 10, 64) 41 41 + if err != nil || cursor < 0 { 42 42 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("cursor parameter invalid: %s", cursorQuery)}) 43 43 + return 44 44 + } 45 45 + } 46 46 + 47 47 + l := x.logger.With("repo", repoQuery, "limit", limit, "cursor", cursor) 48 48 + 49 49 + out, err := x.listBranches(r.Context(), repo, limit, cursor) 50 50 + if err != nil { 51 51 + // TODO: better error return 52 52 + l.Error("failed to list branches", "err", err) 53 53 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to list branches"}) 54 54 + return 55 55 + } 56 56 + writeJson(w, http.StatusOK, out) 57 57 + } 58 58 + 59 59 + func (x *Xrpc) listBranches(ctx context.Context, repo syntax.ATURI, limit int, cursor int64) (*types.RepoBranchesResponse, error) { 60 60 + repoPath, err := x.makeRepoPath(ctx, repo) 61 61 + if err != nil { 62 62 + return nil, fmt.Errorf("resolving repo at-uri: %w", err) 63 63 + } 64 64 + 65 65 + gr, err := git.PlainOpen(repoPath) 66 66 + if err != nil { 67 67 + return nil, fmt.Errorf("opening git repo: %w", err) 68 68 + } 69 69 + 70 70 + branches, err := gr.Branches(&git.BranchesOptions{ 71 71 + Limit: limit, 72 72 + Offset: int(cursor), 73 73 + }) 74 74 + if err != nil { 75 75 + return nil, fmt.Errorf("listing git branches: %w", err) 76 76 + } 77 77 + 78 78 + return &types.RepoBranchesResponse{ 79 79 + // TODO: include default branch and cursor 80 80 + Branches: branches, 81 81 + }, nil 82 82 + } 83 83 + 84 84 + func (x *Xrpc) makeRepoPath(ctx context.Context, repo syntax.ATURI) (string, error) { 85 85 + id, err := x.resolver.ResolveIdent(ctx, repo.Authority().String()) 86 86 + if err != nil { 87 87 + return "", err 88 88 + } 89 89 + 90 90 + return filepath.Join( 91 91 + x.cfg.GitRepoBasePath, 92 92 + id.DID.String(), 93 93 + repo.RecordKey().String(), 94 94 + ), nil 95 95 + }

+95

knotmirror/xrpc/git_listCommits.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "fmt" 6 6 + "net/http" 7 7 + "strconv" 8 8 + 9 9 + "github.com/bluesky-social/indigo/atproto/atclient" 10 10 + "github.com/bluesky-social/indigo/atproto/syntax" 11 11 + "tangled.org/core/knotserver/git" 12 12 + "tangled.org/core/types" 13 13 + ) 14 14 + 15 15 + func (x *Xrpc) ListCommits(w http.ResponseWriter, r *http.Request) { 16 16 + var ( 17 17 + repoQuery = r.URL.Query().Get("repo") 18 18 + ref = r.URL.Query().Get("ref") // ref can be empty (git.Open handles this) 19 19 + limitQuery = r.URL.Query().Get("limit") 20 20 + cursorQuery = r.URL.Query().Get("cursor") 21 21 + ) 22 22 + 23 23 + repo, err := syntax.ParseATURI(repoQuery) 24 24 + if err != nil || repo.RecordKey() == "" { 25 25 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("repo parameter invalid: %s", repoQuery)}) 26 26 + return 27 27 + } 28 28 + 29 29 + limit := 50 30 30 + if limitQuery != "" { 31 31 + limit, err = strconv.Atoi(limitQuery) 32 32 + if err != nil || limit < 1 || limit > 1000 { 33 33 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("limit parameter invalid: %s", limitQuery)}) 34 34 + return 35 35 + } 36 36 + } 37 37 + 38 38 + var cursor int64 39 39 + if cursorQuery != "" { 40 40 + cursor, err = strconv.ParseInt(cursorQuery, 10, 64) 41 41 + if err != nil || cursor < 0 { 42 42 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("cursor parameter invalid: %s", cursorQuery)}) 43 43 + return 44 44 + } 45 45 + } 46 46 + 47 47 + l := x.logger.With("repo", repo, "ref", ref) 48 48 + 49 49 + out, err := x.listCommits(r.Context(), repo, ref, limit, cursor) 50 50 + if err != nil { 51 51 + // TODO: better error return 52 52 + l.Error("failed to list commits", "err", err) 53 53 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to list commits"}) 54 54 + return 55 55 + } 56 56 + writeJson(w, http.StatusOK, out) 57 57 + } 58 58 + 59 59 + func (x *Xrpc) listCommits(ctx context.Context, repo syntax.ATURI, ref string, limit int, cursor int64) (*types.RepoLogResponse, error) { 60 60 + repoPath, err := x.makeRepoPath(ctx, repo) 61 61 + if err != nil { 62 62 + return nil, fmt.Errorf("resolving repo at-uri: %w", err) 63 63 + } 64 64 + 65 65 + gr, err := git.Open(repoPath, ref) 66 66 + if err != nil { 67 67 + return nil, fmt.Errorf("opening git repo: %w", err) 68 68 + } 69 69 + 70 70 + offset := int(cursor) 71 71 + 72 72 + commits, err := gr.Commits(offset, limit) 73 73 + if err != nil { 74 74 + return nil, fmt.Errorf("listing git commits: %w", err) 75 75 + } 76 76 + 77 77 + tcommits := make([]types.Commit, len(commits)) 78 78 + for i, c := range commits { 79 79 + tcommits[i].FromGoGitCommit(c) 80 80 + } 81 81 + 82 82 + total, err := gr.TotalCommits() 83 83 + if err != nil { 84 84 + return nil, fmt.Errorf("counting total commits: %w", err) 85 85 + } 86 86 + 87 87 + return &types.RepoLogResponse{ 88 88 + Commits: tcommits, 89 89 + Ref: ref, 90 90 + Page: (offset / limit) + 1, 91 91 + PerPage: limit, 92 92 + Total: total, 93 93 + Log: true, 94 94 + }, nil 95 95 + }

+86

knotmirror/xrpc/git_listLanguages.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "fmt" 6 6 + "math" 7 7 + "net/http" 8 8 + "time" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/atclient" 11 11 + "github.com/bluesky-social/indigo/atproto/syntax" 12 12 + "tangled.org/core/api/tangled" 13 13 + "tangled.org/core/knotserver/git" 14 14 + ) 15 15 + 16 16 + func (x *Xrpc) ListLanguages(w http.ResponseWriter, r *http.Request) { 17 17 + var ( 18 18 + repoQuery = r.URL.Query().Get("repo") 19 19 + ref = r.URL.Query().Get("ref") 20 20 + ) 21 21 + l := x.logger.With("repo", repoQuery, "ref", ref) 22 22 + 23 23 + repo, err := syntax.ParseATURI(repoQuery) 24 24 + if err != nil || repo.RecordKey() == "" { 25 25 + l.Error("invalid repo at-uri", "err", err) 26 26 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("repo parameter invalid: %s", repoQuery)}) 27 27 + return 28 28 + } 29 29 + 30 30 + out, err := x.listLanguages(r.Context(), repo, ref) 31 31 + if err != nil { 32 32 + l.Error("failed to list languages", "err", err) 33 33 + writeErr(w, err) 34 34 + return 35 35 + } 36 36 + 37 37 + writeJson(w, http.StatusOK, out) 38 38 + } 39 39 + 40 40 + func (x *Xrpc) listLanguages(ctx context.Context, repo syntax.ATURI, ref string) (*tangled.GitTempListLanguages_Output, error) { 41 41 + repoPath, err := x.makeRepoPath(ctx, repo) 42 42 + if err != nil { 43 43 + return nil, fmt.Errorf("resolving repo at-uri: %w", err) 44 44 + } 45 45 + 46 46 + gr, err := git.Open(repoPath, ref) 47 47 + if err != nil { 48 48 + return nil, &atclient.APIError{StatusCode: http.StatusNotFound, Name: "RepoNotFound", Message: "failed to find git repo"} 49 49 + } 50 50 + 51 51 + ctx, cancel := context.WithTimeout(ctx, 1*time.Second) 52 52 + defer cancel() 53 53 + 54 54 + sizes, err := gr.AnalyzeLanguages(ctx) 55 55 + if err != nil { 56 56 + return nil, fmt.Errorf("analyzing languages: %w", err) 57 57 + } 58 58 + 59 59 + return &tangled.GitTempListLanguages_Output{ 60 60 + Ref: ref, 61 61 + Languages: sizesToLanguages(sizes), 62 62 + }, nil 63 63 + } 64 64 + 65 65 + func sizesToLanguages(sizes git.LangBreakdown) []*tangled.GitTempListLanguages_Language { 66 66 + var apiLanguages []*tangled.GitTempListLanguages_Language 67 67 + var totalSize int64 68 68 + for _, size := range sizes { 69 69 + totalSize += size 70 70 + } 71 71 + 72 72 + for name, size := range sizes { 73 73 + percentagef64 := float64(size) / float64(totalSize) * 100 74 74 + percentage := math.Round(percentagef64) 75 75 + 76 76 + lang := &tangled.GitTempListLanguages_Language{ 77 77 + Name: name, 78 78 + Size: size, 79 79 + Percentage: int64(percentage), 80 80 + } 81 81 + 82 82 + apiLanguages = append(apiLanguages, lang) 83 83 + } 84 84 + 85 85 + return apiLanguages 86 86 + }

+98

knotmirror/xrpc/git_listTags.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "fmt" 6 6 + "net/http" 7 7 + "strconv" 8 8 + 9 9 + "github.com/bluesky-social/indigo/atproto/atclient" 10 10 + "github.com/bluesky-social/indigo/atproto/syntax" 11 11 + "github.com/go-git/go-git/v5/plumbing" 12 12 + "github.com/go-git/go-git/v5/plumbing/object" 13 13 + "tangled.org/core/knotserver/git" 14 14 + "tangled.org/core/types" 15 15 + ) 16 16 + 17 17 + func (x *Xrpc) ListTags(w http.ResponseWriter, r *http.Request) { 18 18 + var ( 19 19 + repoQuery = r.URL.Query().Get("repo") 20 20 + limitQuery = r.URL.Query().Get("limit") 21 21 + cursorQuery = r.URL.Query().Get("cursor") 22 22 + ) 23 23 + 24 24 + repo, err := syntax.ParseATURI(repoQuery) 25 25 + if err != nil || repo.RecordKey() == "" { 26 26 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("repo parameter invalid: %s", repoQuery)}) 27 27 + return 28 28 + } 29 29 + 30 30 + limit := 50 31 31 + if limitQuery != "" { 32 32 + limit, err = strconv.Atoi(limitQuery) 33 33 + if err != nil || limit < 1 || limit > 1000 { 34 34 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("limit parameter invalid: %s", limitQuery)}) 35 35 + return 36 36 + } 37 37 + } 38 38 + 39 39 + var cursor int64 40 40 + if cursorQuery != "" { 41 41 + cursor, err = strconv.ParseInt(cursorQuery, 10, 64) 42 42 + if err != nil || cursor < 0 { 43 43 + writeJson(w, http.StatusBadRequest, atclient.ErrorBody{Name: "BadRequest", Message: fmt.Sprintf("cursor parameter invalid: %s", cursorQuery)}) 44 44 + return 45 45 + } 46 46 + } 47 47 + 48 48 + l := x.logger.With("repo", repo, "limit", limit, "cursor", cursor) 49 49 + 50 50 + out, err := x.listTags(r.Context(), repo, limit, cursor) 51 51 + if err != nil { 52 52 + // TODO: better error return 53 53 + l.Error("failed to list tags", "err", err) 54 54 + writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "failed to list tags"}) 55 55 + return 56 56 + } 57 57 + writeJson(w, http.StatusOK, out) 58 58 + } 59 59 + 60 60 + func (x *Xrpc) listTags(ctx context.Context, repo syntax.ATURI, limit int, cursor int64) (*types.RepoTagsResponse, error) { 61 61 + repoPath, err := x.makeRepoPath(ctx, repo) 62 62 + if err != nil { 63 63 + return nil, fmt.Errorf("failed to resolve repo at-uri: %w", err) 64 64 + } 65 65 + 66 66 + gr, err := git.PlainOpen(repoPath) 67 67 + if err != nil { 68 68 + return nil, fmt.Errorf("failed to open git repo: %w", err) 69 69 + } 70 70 + 71 71 + tags, err := gr.Tags(&git.TagsOptions{ 72 72 + Limit: limit, 73 73 + Offset: int(cursor), 74 74 + }) 75 75 + if err != nil { 76 76 + return nil, fmt.Errorf("failed to get git tags: %w", err) 77 77 + } 78 78 + 79 79 + rtags := make([]*types.TagReference, len(tags)) 80 80 + for i, tag := range tags { 81 81 + var target *object.Tag 82 82 + if tag.Target != plumbing.ZeroHash { 83 83 + target = &tag 84 84 + } 85 85 + rtags[i] = &types.TagReference{ 86 86 + Reference: types.Reference{ 87 87 + Name: tag.Name, 88 88 + Hash: tag.Hash.String(), 89 89 + }, 90 90 + Tag: target, 91 91 + Message: tag.Message, 92 92 + } 93 93 + } 94 94 + 95 95 + return &types.RepoTagsResponse{ 96 96 + Tags: rtags, 97 97 + }, nil 98 98 + }

+69

knotmirror/xrpc/xrpc.go

reviewed

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + "encoding/json" 6 6 + "errors" 7 7 + "log/slog" 8 8 + "net/http" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/atclient" 11 11 + "github.com/go-chi/chi/v5" 12 12 + "tangled.org/core/api/tangled" 13 13 + "tangled.org/core/idresolver" 14 14 + "tangled.org/core/knotmirror/config" 15 15 + "tangled.org/core/log" 16 16 + ) 17 17 + 18 18 + type Xrpc struct { 19 19 + cfg *config.Config 20 20 + db *sql.DB 21 21 + resolver *idresolver.Resolver 22 22 + logger *slog.Logger 23 23 + } 24 24 + 25 25 + func New(logger *slog.Logger, cfg *config.Config, db *sql.DB, resolver *idresolver.Resolver) *Xrpc { 26 26 + return &Xrpc{ 27 27 + cfg, 28 28 + db, 29 29 + resolver, 30 30 + log.SubLogger(logger, "xrpc"), 31 31 + } 32 32 + } 33 33 + 34 34 + func (x *Xrpc) Router() http.Handler { 35 35 + r := chi.NewRouter() 36 36 + 37 37 + r.Get("/"+tangled.GitTempGetArchiveNSID, x.GetArchive) 38 38 + r.Get("/"+tangled.GitTempGetBlobNSID, x.GetBlob) 39 39 + r.Get("/"+tangled.GitTempGetBranchNSID, x.GetBranch) 40 40 + // r.Get("/"+tangled.GitTempGetCommitNSID, x.GetCommit) // todo 41 41 + // r.Get("/"+tangled.GitTempGetDiffNSID, x.GetDiff) // todo 42 42 + // r.Get("/"+tangled.GitTempGetEntityNSID, x.GetEntity) // todo 43 43 + // r.Get("/"+tangled.GitTempGetHeadNSID, x.GetHead) // todo 44 44 + r.Get("/"+tangled.GitTempGetTagNSID, x.GetTag) // using types.Response 45 45 + r.Get("/"+tangled.GitTempGetTreeNSID, x.GetTree) 46 46 + r.Get("/"+tangled.GitTempListBranchesNSID, x.ListBranches) // wip, unknown output 47 47 + r.Get("/"+tangled.GitTempListCommitsNSID, x.ListCommits) 48 48 + r.Get("/"+tangled.GitTempListLanguagesNSID, x.ListLanguages) 49 49 + r.Get("/"+tangled.GitTempListTagsNSID, x.ListTags) 50 50 + 51 51 + return r 52 52 + } 53 53 + 54 54 + func writeJson(w http.ResponseWriter, status int, response any) error { 55 55 + w.Header().Set("Content-Type", "application/json") 56 56 + w.WriteHeader(status) 57 57 + if err := json.NewEncoder(w).Encode(response); err != nil { 58 58 + return err 59 59 + } 60 60 + return nil 61 61 + } 62 62 + 63 63 + func writeErr(w http.ResponseWriter, err error) error { 64 64 + var apiErr *atclient.APIError 65 65 + if errors.As(err, &apiErr) { 66 66 + return writeJson(w, apiErr.StatusCode, atclient.ErrorBody{Name: apiErr.Name, Message: apiErr.Message}) 67 67 + } 68 68 + return writeJson(w, http.StatusInternalServerError, atclient.ErrorBody{Name: "InternalServerError", Message: "internal server error"}) 69 69 + }

+14

knotserver/git/git.go

reviewed

··· 199 199 return io.ReadAll(reader) 200 200 } 201 201 202 202 + func (g *GitRepo) File(path string) (*object.File, error) { 203 203 + c, err := g.r.CommitObject(g.h) 204 204 + if err != nil { 205 205 + return nil, fmt.Errorf("commit object: %w", err) 206 206 + } 207 207 + 208 208 + tree, err := c.Tree() 209 209 + if err != nil { 210 210 + return nil, fmt.Errorf("file tree: %w", err) 211 211 + } 212 212 + 213 213 + return tree.File(path) 214 214 + } 215 215 + 202 216 // read and parse .gitmodules 203 217 func (g *GitRepo) Submodules() (*config.Modules, error) { 204 218 c, err := g.r.CommitObject(g.h)