-2

api/tangled/repoblob.go

··· 21 21 Hash string `json:"hash" cborgen:"hash"` 22 22 // message: Commit message 23 23 Message string `json:"message" cborgen:"message"` 24 24 - // shortHash: Short commit hash 25 25 - ShortHash *string `json:"shortHash,omitempty" cborgen:"shortHash,omitempty"` 26 24 // when: Commit timestamp 27 25 When string `json:"when" cborgen:"when"` 28 26 }

+33

api/tangled/repotag.go

··· 1 1 + // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. 2 2 + 3 3 + package tangled 4 4 + 5 5 + // schema: sh.tangled.repo.tag 6 6 + 7 7 + import ( 8 8 + "bytes" 9 9 + "context" 10 10 + 11 11 + "github.com/bluesky-social/indigo/lex/util" 12 12 + ) 13 13 + 14 14 + const ( 15 15 + RepoTagNSID = "sh.tangled.repo.tag" 16 16 + ) 17 17 + 18 18 + // RepoTag calls the XRPC method "sh.tangled.repo.tag". 19 19 + // 20 20 + // repo: Repository identifier in format 'did:plc:.../repoName' 21 21 + // tag: Name of tag, such as v1.3.0 22 22 + func RepoTag(ctx context.Context, c util.LexClient, repo string, tag string) ([]byte, error) { 23 23 + buf := new(bytes.Buffer) 24 24 + 25 25 + params := map[string]interface{}{} 26 26 + params["repo"] = repo 27 27 + params["tag"] = tag 28 28 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.tag", params, nil, buf); err != nil { 29 29 + return nil, err 30 30 + } 31 31 + 32 32 + return buf.Bytes(), nil 33 33 + }

+14 -2

api/tangled/repotree.go

··· 16 16 17 17 // RepoTree_LastCommit is a "lastCommit" in the sh.tangled.repo.tree schema. 18 18 type RepoTree_LastCommit struct { 19 19 + Author *RepoTree_Signature `json:"author,omitempty" cborgen:"author,omitempty"` 19 20 // hash: Commit hash 20 21 Hash string `json:"hash" cborgen:"hash"` 21 22 // message: Commit message ··· 27 28 // RepoTree_Output is the output of a sh.tangled.repo.tree call. 28 29 type RepoTree_Output struct { 29 30 // dotdot: Parent directory path 30 30 - Dotdot *string `json:"dotdot,omitempty" cborgen:"dotdot,omitempty"` 31 31 - Files []*RepoTree_TreeEntry `json:"files" cborgen:"files"` 31 31 + Dotdot *string `json:"dotdot,omitempty" cborgen:"dotdot,omitempty"` 32 32 + Files []*RepoTree_TreeEntry `json:"files" cborgen:"files"` 33 33 + LastCommit *RepoTree_LastCommit `json:"lastCommit,omitempty" cborgen:"lastCommit,omitempty"` 32 34 // parent: The parent path in the tree 33 35 Parent *string `json:"parent,omitempty" cborgen:"parent,omitempty"` 34 36 // readme: Readme for this file tree ··· 43 45 Contents string `json:"contents" cborgen:"contents"` 44 46 // filename: Name of the readme file 45 47 Filename string `json:"filename" cborgen:"filename"` 48 48 + } 49 49 + 50 50 + // RepoTree_Signature is a "signature" in the sh.tangled.repo.tree schema. 51 51 + type RepoTree_Signature struct { 52 52 + // email: Author email 53 53 + Email string `json:"email" cborgen:"email"` 54 54 + // name: Author name 55 55 + Name string `json:"name" cborgen:"name"` 56 56 + // when: Author timestamp 57 57 + When string `json:"when" cborgen:"when"` 46 58 } 47 59 48 60 // RepoTree_TreeEntry is a "treeEntry" in the sh.tangled.repo.tree schema.

+24

appview/db/db.go

··· 1181 1181 return err 1182 1182 }) 1183 1183 1184 1184 + orm.RunMigration(conn, logger, "remove-profile-stats-column-constraint", func(tx *sql.Tx) error { 1185 1185 + _, err := tx.Exec(` 1186 1186 + -- create new table without the check constraint 1187 1187 + create table profile_stats_new ( 1188 1188 + id integer primary key autoincrement, 1189 1189 + did text not null, 1190 1190 + kind text not null, -- no constraint this time 1191 1191 + foreign key (did) references profile(did) on delete cascade 1192 1192 + ); 1193 1193 + 1194 1194 + -- copy data from old table 1195 1195 + insert into profile_stats_new (id, did, kind) 1196 1196 + select id, did, kind 1197 1197 + from profile_stats; 1198 1198 + 1199 1199 + -- drop old table 1200 1200 + drop table profile_stats; 1201 1201 + 1202 1202 + -- rename new table 1203 1203 + alter table profile_stats_new rename to profile_stats; 1204 1204 + `) 1205 1205 + return err 1206 1206 + }) 1207 1207 + 1184 1208 return &DB{ 1185 1209 db, 1186 1210 logger,

+7

appview/db/profile.go

··· 450 450 case models.VanityStatRepositoryCount: 451 451 query = `select count(id) from repos where did = ?` 452 452 args = append(args, did) 453 453 + case models.VanityStatStarCount: 454 454 + query = `select count(id) from stars where subject_at like 'at://' || ? || '%'` 455 455 + args = append(args, did) 456 456 + case models.VanityStatNone: 457 457 + return 0, nil 458 458 + default: 459 459 + return 0, fmt.Errorf("invalid vanity stat kind: %s", stat) 453 460 } 454 461 455 462 var result uint64

+1 -1

appview/ingester.go

··· 317 317 var stats [2]models.VanityStat 318 318 for i, s := range record.Stats { 319 319 if i < 2 { 320 320 - stats[i].Kind = models.VanityStatKind(s) 320 320 + stats[i].Kind = models.ParseVanityStatKind(s) 321 321 } 322 322 } 323 323

+18 -1

appview/issues/issues.go

··· 822 822 823 823 keyword := params.Get("q") 824 824 825 825 + repoInfo := rp.repoResolver.GetRepoInfo(r, user) 826 826 + 825 827 var issues []models.Issue 826 828 searchOpts := models.IssueSearchOptions{ 827 829 Keyword: keyword, ··· 837 839 } 838 840 l.Debug("searched issues with indexer", "count", len(res.Hits)) 839 841 totalIssues = int(res.Total) 842 842 + 843 843 + // count matching issues in the opposite state to display correct counts 844 844 + countRes, err := rp.indexer.Search(r.Context(), models.IssueSearchOptions{ 845 845 + Keyword: keyword, RepoAt: f.RepoAt().String(), IsOpen: !isOpen, 846 846 + Page: pagination.Page{Limit: 1}, 847 847 + }) 848 848 + if err == nil { 849 849 + if isOpen { 850 850 + repoInfo.Stats.IssueCount.Open = int(res.Total) 851 851 + repoInfo.Stats.IssueCount.Closed = int(countRes.Total) 852 852 + } else { 853 853 + repoInfo.Stats.IssueCount.Closed = int(res.Total) 854 854 + repoInfo.Stats.IssueCount.Open = int(countRes.Total) 855 855 + } 856 856 + } 840 857 841 858 issues, err = db.GetIssues( 842 859 rp.db, ··· 884 901 885 902 rp.pages.RepoIssues(w, pages.RepoIssuesParams{ 886 903 LoggedInUser: rp.oauth.GetMultiAccountUser(r), 887 887 - RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 904 904 + RepoInfo: repoInfo, 888 905 Issues: issues, 889 906 IssueCount: totalIssues, 890 907 LabelDefs: defs,

+25 -17

appview/issues/opengraph.go

··· 124 124 } 125 125 126 126 // Split stats area: left side for status/comments (80%), right side for dolly (20%) 127 127 - statusCommentsArea, dollyArea := statsArea.Split(true, 80) 127 127 + statusArea, dollyArea := statsArea.Split(true, 80) 128 128 129 129 // Draw status and comment count in status/comments area 130 130 - statsBounds := statusCommentsArea.Img.Bounds() 130 130 + statsBounds := statusArea.Img.Bounds() 131 131 statsX := statsBounds.Min.X + 60 // left padding 132 132 statsY := statsBounds.Min.Y 133 133 ··· 140 140 // Draw status (open/closed) with colored icon and text 141 141 var statusIcon string 142 142 var statusText string 143 143 - var statusBgColor color.RGBA 143 143 + var statusColor color.RGBA 144 144 145 145 if issue.Open { 146 146 statusIcon = "circle-dot" 147 147 statusText = "open" 148 148 - statusBgColor = color.RGBA{34, 139, 34, 255} // green 148 148 + statusColor = color.RGBA{34, 139, 34, 255} // green 149 149 } else { 150 150 statusIcon = "ban" 151 151 statusText = "closed" 152 152 - statusBgColor = color.RGBA{52, 58, 64, 255} // dark gray 152 152 + statusColor = color.RGBA{52, 58, 64, 255} // dark gray 153 153 } 154 154 155 155 - badgeIconSize := 36 155 155 + statusTextWidth := statusArea.TextWidth(statusText, textSize) 156 156 + badgePadding := 12 157 157 + badgeHeight := int(textSize) + (badgePadding * 2) 158 158 + badgeWidth := iconSize + badgePadding + statusTextWidth + (badgePadding * 2) 159 159 + cornerRadius := 8 160 160 + badgeX := 60 161 161 + badgeY := 0 156 162 157 157 - // Draw icon with status color (no background) 158 158 - err = statusCommentsArea.DrawLucideIcon(statusIcon, statsX, statsY+iconBaselineOffset-badgeIconSize/2+5, badgeIconSize, statusBgColor) 163 163 + statusArea.DrawRoundedRect(badgeX, badgeY, badgeWidth, badgeHeight, cornerRadius, statusColor) 164 164 + 165 165 + whiteColor := color.RGBA{255, 255, 255, 255} 166 166 + iconX := statsX + badgePadding 167 167 + iconY := statsY + (badgeHeight-iconSize)/2 168 168 + err = statusArea.DrawLucideIcon(statusIcon, iconX, iconY, iconSize, whiteColor) 159 169 if err != nil { 160 170 log.Printf("failed to draw status icon: %v", err) 161 171 } 162 172 163 163 - // Draw text with status color (no background) 164 164 - textX := statsX + badgeIconSize + 12 165 165 - badgeTextSize := 32.0 166 166 - err = statusCommentsArea.DrawTextAt(statusText, textX, statsY+iconBaselineOffset, statusBgColor, badgeTextSize, ogcard.Middle, ogcard.Left) 173 173 + textX := statsX + badgePadding + iconSize + badgePadding 174 174 + textY := statsY + (badgeHeight-int(textSize))/2 - 5 175 175 + err = statusArea.DrawTextAt(statusText, textX, textY, whiteColor, textSize, ogcard.Top, ogcard.Left) 167 176 if err != nil { 168 177 log.Printf("failed to draw status text: %v", err) 169 178 } 170 179 171 171 - statusTextWidth := len(statusText) * 20 172 172 - currentX := statsX + badgeIconSize + 12 + statusTextWidth + 50 180 180 + currentX := statsX + badgeWidth + 50 173 181 174 182 // Draw comment count 175 175 - err = statusCommentsArea.DrawLucideIcon("message-square", currentX, statsY+iconBaselineOffset-iconSize/2+5, iconSize, iconColor) 183 183 + err = statusArea.DrawLucideIcon("message-square", currentX, iconY, iconSize, iconColor) 176 184 if err != nil { 177 185 log.Printf("failed to draw comment icon: %v", err) 178 186 } ··· 182 190 if commentCount == 1 { 183 191 commentText = "1 comment" 184 192 } 185 185 - err = statusCommentsArea.DrawTextAt(commentText, currentX, statsY+iconBaselineOffset, iconColor, textSize, ogcard.Middle, ogcard.Left) 193 193 + err = statusArea.DrawTextAt(commentText, currentX, textY, iconColor, textSize, ogcard.Top, ogcard.Left) 186 194 if err != nil { 187 195 log.Printf("failed to draw comment text: %v", err) 188 196 } ··· 205 213 openedDate := issue.Created.Format("Jan 2, 2006") 206 214 metaText := fmt.Sprintf("opened by %s · %s", authorHandle, openedDate) 207 215 208 208 - err = statusCommentsArea.DrawTextAt(metaText, statsX, labelY, iconColor, labelSize, ogcard.Top, ogcard.Left) 216 216 + err = statusArea.DrawTextAt(metaText, statsX, labelY, iconColor, labelSize, ogcard.Top, ogcard.Left) 209 217 if err != nil { 210 218 log.Printf("failed to draw metadata: %v", err) 211 219 }

+27 -1

appview/models/profile.go

··· 59 59 VanityStatOpenIssueCount VanityStatKind = "open-issue-count" 60 60 VanityStatClosedIssueCount VanityStatKind = "closed-issue-count" 61 61 VanityStatRepositoryCount VanityStatKind = "repository-count" 62 62 + VanityStatStarCount VanityStatKind = "star-count" 63 63 + VanityStatNone VanityStatKind = "" 62 64 ) 63 65 66 66 + func ParseVanityStatKind(s string) VanityStatKind { 67 67 + switch s { 68 68 + case "merged-pull-request-count": 69 69 + return VanityStatMergedPRCount 70 70 + case "closed-pull-request-count": 71 71 + return VanityStatClosedPRCount 72 72 + case "open-pull-request-count": 73 73 + return VanityStatOpenPRCount 74 74 + case "open-issue-count": 75 75 + return VanityStatOpenIssueCount 76 76 + case "closed-issue-count": 77 77 + return VanityStatClosedIssueCount 78 78 + case "repository-count": 79 79 + return VanityStatRepositoryCount 80 80 + case "star-count": 81 81 + return VanityStatStarCount 82 82 + default: 83 83 + return VanityStatNone 84 84 + } 85 85 + } 86 86 + 64 87 func (v VanityStatKind) String() string { 65 88 switch v { 66 89 case VanityStatMergedPRCount: ··· 75 98 return "Closed Issues" 76 99 case VanityStatRepositoryCount: 77 100 return "Repositories" 101 101 + case VanityStatStarCount: 102 102 + return "Stars Received" 103 103 + default: 104 104 + return "" 78 105 } 79 79 - return "" 80 106 } 81 107 82 108 type VanityStat struct {

+42 -14

appview/notify/db/db.go

··· 2 2 3 3 import ( 4 4 "context" 5 5 - "log" 6 5 "slices" 7 6 8 7 "github.com/bluesky-social/indigo/atproto/syntax" ··· 11 10 "tangled.org/core/appview/models" 12 11 "tangled.org/core/appview/notify" 13 12 "tangled.org/core/idresolver" 13 13 + "tangled.org/core/log" 14 14 "tangled.org/core/orm" 15 15 "tangled.org/core/sets" 16 16 ) ··· 38 38 } 39 39 40 40 func (n *databaseNotifier) NewStar(ctx context.Context, star *models.Star) { 41 41 + l := log.FromContext(ctx) 42 42 + 41 43 if star.RepoAt.Collection().String() != tangled.RepoNSID { 42 44 // skip string stars for now 43 45 return ··· 45 47 var err error 46 48 repo, err := db.GetRepo(n.db, orm.FilterEq("at_uri", string(star.RepoAt))) 47 49 if err != nil { 48 48 - log.Printf("NewStar: failed to get repos: %v", err) 50 50 + l.Error("failed to get repos", "err", err) 49 51 return 50 52 } 51 53 ··· 59 61 var pullId *int64 60 62 61 63 n.notifyEvent( 64 64 + ctx, 62 65 actorDid, 63 66 recipients, 64 67 eventType, ··· 75 78 } 76 79 77 80 func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) { 81 81 + l := log.FromContext(ctx) 82 82 + 78 83 collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", issue.Repo.RepoAt())) 79 84 if err != nil { 80 80 - log.Printf("failed to fetch collaborators: %v", err) 85 85 + l.Error("failed to fetch collaborators", "err", err) 81 86 return 82 87 } 83 88 ··· 101 106 var pullId *int64 102 107 103 108 n.notifyEvent( 109 109 + ctx, 104 110 actorDid, 105 111 recipients, 106 112 models.NotificationTypeIssueCreated, ··· 111 117 pullId, 112 118 ) 113 119 n.notifyEvent( 120 120 + ctx, 114 121 actorDid, 115 122 sets.Collect(slices.Values(mentions)), 116 123 models.NotificationTypeUserMentioned, ··· 123 130 } 124 131 125 132 func (n *databaseNotifier) NewIssueComment(ctx context.Context, comment *models.IssueComment, mentions []syntax.DID) { 133 133 + l := log.FromContext(ctx) 134 134 + 126 135 issues, err := db.GetIssues(n.db, orm.FilterEq("at_uri", comment.IssueAt)) 127 136 if err != nil { 128 128 - log.Printf("NewIssueComment: failed to get issues: %v", err) 137 137 + l.Error("failed to get issues", "err", err) 129 138 return 130 139 } 131 140 if len(issues) == 0 { 132 132 - log.Printf("NewIssueComment: no issue found for %s", comment.IssueAt) 141 141 + l.Error("no issue found for", "err", comment.IssueAt) 133 142 return 134 143 } 135 144 issue := issues[0] ··· 170 179 var pullId *int64 171 180 172 181 n.notifyEvent( 182 182 + ctx, 173 183 actorDid, 174 184 recipients, 175 185 models.NotificationTypeIssueCommented, ··· 180 190 pullId, 181 191 ) 182 192 n.notifyEvent( 193 193 + ctx, 183 194 actorDid, 184 195 sets.Collect(slices.Values(mentions)), 185 196 models.NotificationTypeUserMentioned, ··· 204 215 var repoId, issueId, pullId *int64 205 216 206 217 n.notifyEvent( 218 218 + ctx, 207 219 actorDid, 208 220 recipients, 209 221 eventType, ··· 220 232 } 221 233 222 234 func (n *databaseNotifier) NewPull(ctx context.Context, pull *models.Pull) { 235 235 + l := log.FromContext(ctx) 236 236 + 223 237 repo, err := db.GetRepo(n.db, orm.FilterEq("at_uri", string(pull.RepoAt))) 224 238 if err != nil { 225 225 - log.Printf("NewPull: failed to get repos: %v", err) 239 239 + l.Error("failed to get repos", "err", err) 226 240 return 227 241 } 228 242 collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", repo.RepoAt())) 229 243 if err != nil { 230 230 - log.Printf("failed to fetch collaborators: %v", err) 244 244 + l.Error("failed to fetch collaborators", "err", err) 231 245 return 232 246 } 233 247 ··· 249 263 pullId := &p 250 264 251 265 n.notifyEvent( 266 266 + ctx, 252 267 actorDid, 253 268 recipients, 254 269 eventType, ··· 261 276 } 262 277 263 278 func (n *databaseNotifier) NewPullComment(ctx context.Context, comment *models.PullComment, mentions []syntax.DID) { 279 279 + l := log.FromContext(ctx) 280 280 + 264 281 pull, err := db.GetPull(n.db, 265 282 syntax.ATURI(comment.RepoAt), 266 283 comment.PullId, 267 284 ) 268 285 if err != nil { 269 269 - log.Printf("NewPullComment: failed to get pulls: %v", err) 286 286 + l.Error("failed to get pulls", "err", err) 270 287 return 271 288 } 272 289 273 290 repo, err := db.GetRepo(n.db, orm.FilterEq("at_uri", comment.RepoAt)) 274 291 if err != nil { 275 275 - log.Printf("NewPullComment: failed to get repos: %v", err) 292 292 + l.Error("failed to get repos", "err", err) 276 293 return 277 294 } 278 295 ··· 298 315 pullId := &p 299 316 300 317 n.notifyEvent( 318 318 + ctx, 301 319 actorDid, 302 320 recipients, 303 321 eventType, ··· 308 326 pullId, 309 327 ) 310 328 n.notifyEvent( 329 329 + ctx, 311 330 actorDid, 312 331 sets.Collect(slices.Values(mentions)), 313 332 models.NotificationTypeUserMentioned, ··· 336 355 } 337 356 338 357 func (n *databaseNotifier) NewIssueState(ctx context.Context, actor syntax.DID, issue *models.Issue) { 358 358 + l := log.FromContext(ctx) 359 359 + 339 360 collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", issue.Repo.RepoAt())) 340 361 if err != nil { 341 341 - log.Printf("failed to fetch collaborators: %v", err) 362 362 + l.Error("failed to fetch collaborators", "err", err) 342 363 return 343 364 } 344 365 ··· 368 389 } 369 390 370 391 n.notifyEvent( 392 392 + ctx, 371 393 actor, 372 394 recipients, 373 395 eventType, ··· 380 402 } 381 403 382 404 func (n *databaseNotifier) NewPullState(ctx context.Context, actor syntax.DID, pull *models.Pull) { 405 405 + l := log.FromContext(ctx) 406 406 + 383 407 // Get repo details 384 408 repo, err := db.GetRepo(n.db, orm.FilterEq("at_uri", string(pull.RepoAt))) 385 409 if err != nil { 386 386 - log.Printf("NewPullState: failed to get repos: %v", err) 410 410 + l.Error("failed to get repos", "err", err) 387 411 return 388 412 } 389 413 390 414 collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", repo.RepoAt())) 391 415 if err != nil { 392 392 - log.Printf("failed to fetch collaborators: %v", err) 416 416 + l.Error("failed to fetch collaborators", "err", err) 393 417 return 394 418 } 395 419 ··· 417 441 case models.PullMerged: 418 442 eventType = models.NotificationTypePullMerged 419 443 default: 420 420 - log.Println("NewPullState: unexpected new PR state:", pull.State) 444 444 + l.Error("unexpected new PR state", "state", pull.State) 421 445 return 422 446 } 423 447 p := int64(pull.ID) 424 448 pullId := &p 425 449 426 450 n.notifyEvent( 451 451 + ctx, 427 452 actor, 428 453 recipients, 429 454 eventType, ··· 436 461 } 437 462 438 463 func (n *databaseNotifier) notifyEvent( 464 464 + ctx context.Context, 439 465 actorDid syntax.DID, 440 466 recipients sets.Set[syntax.DID], 441 467 eventType models.NotificationType, ··· 445 471 issueId *int64, 446 472 pullId *int64, 447 473 ) { 474 474 + l := log.FromContext(ctx) 475 475 + 448 476 // if the user is attempting to mention >maxMentions users, this is probably spam, do not mention anybody 449 477 if eventType == models.NotificationTypeUserMentioned && recipients.Len() > maxMentions { 450 478 return ··· 494 522 } 495 523 496 524 if err := db.CreateNotification(tx, notif); err != nil { 497 497 - log.Printf("notifyEvent: failed to create notification for %s: %v", recipientDid, err) 525 525 + l.Error("failed to create notification", "recipientDid", recipientDid, "err", err) 498 526 } 499 527 } 500 528

+105

appview/notify/logging_notifier.go

··· 1 1 + package notify 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "log/slog" 6 6 + 7 7 + "tangled.org/core/appview/models" 8 8 + tlog "tangled.org/core/log" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/syntax" 11 11 + ) 12 12 + 13 13 + type loggingNotifier struct { 14 14 + inner Notifier 15 15 + logger *slog.Logger 16 16 + } 17 17 + 18 18 + func NewLoggingNotifier(inner Notifier, logger *slog.Logger) Notifier { 19 19 + return &loggingNotifier{ 20 20 + inner, 21 21 + logger, 22 22 + } 23 23 + } 24 24 + 25 25 + var _ Notifier = &loggingNotifier{} 26 26 + 27 27 + func (l *loggingNotifier) NewRepo(ctx context.Context, repo *models.Repo) { 28 28 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewRepo")) 29 29 + l.inner.NewRepo(ctx, repo) 30 30 + } 31 31 + 32 32 + func (l *loggingNotifier) NewStar(ctx context.Context, star *models.Star) { 33 33 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewStar")) 34 34 + l.inner.NewStar(ctx, star) 35 35 + } 36 36 + 37 37 + func (l *loggingNotifier) DeleteStar(ctx context.Context, star *models.Star) { 38 38 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "DeleteStar")) 39 39 + l.inner.DeleteStar(ctx, star) 40 40 + } 41 41 + 42 42 + func (l *loggingNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) { 43 43 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewIssue")) 44 44 + l.inner.NewIssue(ctx, issue, mentions) 45 45 + } 46 46 + 47 47 + func (l *loggingNotifier) NewIssueComment(ctx context.Context, comment *models.IssueComment, mentions []syntax.DID) { 48 48 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewIssueComment")) 49 49 + l.inner.NewIssueComment(ctx, comment, mentions) 50 50 + } 51 51 + 52 52 + func (l *loggingNotifier) NewIssueState(ctx context.Context, actor syntax.DID, issue *models.Issue) { 53 53 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewIssueState")) 54 54 + l.inner.NewIssueState(ctx, actor, issue) 55 55 + } 56 56 + 57 57 + func (l *loggingNotifier) DeleteIssue(ctx context.Context, issue *models.Issue) { 58 58 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "DeleteIssue")) 59 59 + l.inner.DeleteIssue(ctx, issue) 60 60 + } 61 61 + 62 62 + func (l *loggingNotifier) NewFollow(ctx context.Context, follow *models.Follow) { 63 63 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewFollow")) 64 64 + l.inner.NewFollow(ctx, follow) 65 65 + } 66 66 + 67 67 + func (l *loggingNotifier) DeleteFollow(ctx context.Context, follow *models.Follow) { 68 68 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "DeleteFollow")) 69 69 + l.inner.DeleteFollow(ctx, follow) 70 70 + } 71 71 + 72 72 + func (l *loggingNotifier) NewPull(ctx context.Context, pull *models.Pull) { 73 73 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewPull")) 74 74 + l.inner.NewPull(ctx, pull) 75 75 + } 76 76 + 77 77 + func (l *loggingNotifier) NewPullComment(ctx context.Context, comment *models.PullComment, mentions []syntax.DID) { 78 78 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewPullComment")) 79 79 + l.inner.NewPullComment(ctx, comment, mentions) 80 80 + } 81 81 + 82 82 + func (l *loggingNotifier) NewPullState(ctx context.Context, actor syntax.DID, pull *models.Pull) { 83 83 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewPullState")) 84 84 + l.inner.NewPullState(ctx, actor, pull) 85 85 + } 86 86 + 87 87 + func (l *loggingNotifier) UpdateProfile(ctx context.Context, profile *models.Profile) { 88 88 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "UpdateProfile")) 89 89 + l.inner.UpdateProfile(ctx, profile) 90 90 + } 91 91 + 92 92 + func (l *loggingNotifier) NewString(ctx context.Context, s *models.String) { 93 93 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "NewString")) 94 94 + l.inner.NewString(ctx, s) 95 95 + } 96 96 + 97 97 + func (l *loggingNotifier) EditString(ctx context.Context, s *models.String) { 98 98 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "EditString")) 99 99 + l.inner.EditString(ctx, s) 100 100 + } 101 101 + 102 102 + func (l *loggingNotifier) DeleteString(ctx context.Context, did, rkey string) { 103 103 + ctx = tlog.IntoContext(ctx, tlog.SubLogger(l.logger, "DeleteString")) 104 104 + l.inner.DeleteString(ctx, did, rkey) 105 105 + }

+20 -31

appview/notify/merged_notifier.go

··· 2 2 3 3 import ( 4 4 "context" 5 5 - "log/slog" 6 6 - "reflect" 7 5 "sync" 8 6 9 7 "github.com/bluesky-social/indigo/atproto/syntax" 10 8 "tangled.org/core/appview/models" 11 11 - "tangled.org/core/log" 12 9 ) 13 10 14 11 type mergedNotifier struct { 15 12 notifiers []Notifier 16 16 - logger *slog.Logger 17 13 } 18 14 19 19 - func NewMergedNotifier(notifiers []Notifier, logger *slog.Logger) Notifier { 20 20 - return &mergedNotifier{notifiers, logger} 15 15 + func NewMergedNotifier(notifiers []Notifier) Notifier { 16 16 + return &mergedNotifier{notifiers} 21 17 } 22 18 23 19 var _ Notifier = &mergedNotifier{} 24 20 25 21 // fanout calls the same method on all notifiers concurrently 26 26 - func (m *mergedNotifier) fanout(method string, ctx context.Context, args ...any) { 27 27 - ctx = log.IntoContext(ctx, m.logger.With("method", method)) 22 22 + func (m *mergedNotifier) fanout(callback func(Notifier)) { 28 23 var wg sync.WaitGroup 29 24 for _, n := range m.notifiers { 30 25 wg.Add(1) 31 26 go func(notifier Notifier) { 32 27 defer wg.Done() 33 33 - v := reflect.ValueOf(notifier).MethodByName(method) 34 34 - in := make([]reflect.Value, len(args)+1) 35 35 - in[0] = reflect.ValueOf(ctx) 36 36 - for i, arg := range args { 37 37 - in[i+1] = reflect.ValueOf(arg) 38 38 - } 39 39 - v.Call(in) 28 28 + callback(n) 40 29 }(n) 41 30 } 42 31 } 43 32 44 33 func (m *mergedNotifier) NewRepo(ctx context.Context, repo *models.Repo) { 45 45 - m.fanout("NewRepo", ctx, repo) 34 34 + m.fanout(func(n Notifier) { n.NewRepo(ctx, repo) }) 46 35 } 47 36 48 37 func (m *mergedNotifier) NewStar(ctx context.Context, star *models.Star) { 49 49 - m.fanout("NewStar", ctx, star) 38 38 + m.fanout(func(n Notifier) { n.NewStar(ctx, star) }) 50 39 } 51 40 52 41 func (m *mergedNotifier) DeleteStar(ctx context.Context, star *models.Star) { 53 53 - m.fanout("DeleteStar", ctx, star) 42 42 + m.fanout(func(n Notifier) { n.DeleteStar(ctx, star) }) 54 43 } 55 44 56 45 func (m *mergedNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) { 57 57 - m.fanout("NewIssue", ctx, issue, mentions) 46 46 + m.fanout(func(n Notifier) { n.NewIssue(ctx, issue, mentions) }) 58 47 } 59 48 60 49 func (m *mergedNotifier) NewIssueComment(ctx context.Context, comment *models.IssueComment, mentions []syntax.DID) { 61 61 - m.fanout("NewIssueComment", ctx, comment, mentions) 50 50 + m.fanout(func(n Notifier) { n.NewIssueComment(ctx, comment, mentions) }) 62 51 } 63 52 64 53 func (m *mergedNotifier) NewIssueState(ctx context.Context, actor syntax.DID, issue *models.Issue) { 65 65 - m.fanout("NewIssueState", ctx, actor, issue) 54 54 + m.fanout(func(n Notifier) { n.NewIssueState(ctx, actor, issue) }) 66 55 } 67 56 68 57 func (m *mergedNotifier) DeleteIssue(ctx context.Context, issue *models.Issue) { 69 69 - m.fanout("DeleteIssue", ctx, issue) 58 58 + m.fanout(func(n Notifier) { n.DeleteIssue(ctx, issue) }) 70 59 } 71 60 72 61 func (m *mergedNotifier) NewFollow(ctx context.Context, follow *models.Follow) { 73 73 - m.fanout("NewFollow", ctx, follow) 62 62 + m.fanout(func(n Notifier) { n.NewFollow(ctx, follow) }) 74 63 } 75 64 76 65 func (m *mergedNotifier) DeleteFollow(ctx context.Context, follow *models.Follow) { 77 77 - m.fanout("DeleteFollow", ctx, follow) 66 66 + m.fanout(func(n Notifier) { n.DeleteFollow(ctx, follow) }) 78 67 } 79 68 80 69 func (m *mergedNotifier) NewPull(ctx context.Context, pull *models.Pull) { 81 81 - m.fanout("NewPull", ctx, pull) 70 70 + m.fanout(func(n Notifier) { n.NewPull(ctx, pull) }) 82 71 } 83 72 84 73 func (m *mergedNotifier) NewPullComment(ctx context.Context, comment *models.PullComment, mentions []syntax.DID) { 85 85 - m.fanout("NewPullComment", ctx, comment, mentions) 74 74 + m.fanout(func(n Notifier) { n.NewPullComment(ctx, comment, mentions) }) 86 75 } 87 76 88 77 func (m *mergedNotifier) NewPullState(ctx context.Context, actor syntax.DID, pull *models.Pull) { 89 89 - m.fanout("NewPullState", ctx, actor, pull) 78 78 + m.fanout(func(n Notifier) { n.NewPullState(ctx, actor, pull) }) 90 79 } 91 80 92 81 func (m *mergedNotifier) UpdateProfile(ctx context.Context, profile *models.Profile) { 93 93 - m.fanout("UpdateProfile", ctx, profile) 82 82 + m.fanout(func(n Notifier) { n.UpdateProfile(ctx, profile) }) 94 83 } 95 84 96 85 func (m *mergedNotifier) NewString(ctx context.Context, s *models.String) { 97 97 - m.fanout("NewString", ctx, s) 86 86 + m.fanout(func(n Notifier) { n.NewString(ctx, s) }) 98 87 } 99 88 100 89 func (m *mergedNotifier) EditString(ctx context.Context, s *models.String) { 101 101 - m.fanout("EditString", ctx, s) 90 90 + m.fanout(func(n Notifier) { n.EditString(ctx, s) }) 102 91 } 103 92 104 93 func (m *mergedNotifier) DeleteString(ctx context.Context, did, rkey string) { 105 105 - m.fanout("DeleteString", ctx, did, rkey) 94 94 + m.fanout(func(n Notifier) { n.DeleteString(ctx, did, rkey) }) 106 95 }

+56

appview/ogcard/card.go

··· 257 257 return textWidth, err 258 258 } 259 259 260 260 + func (c *Card) FontHeight(sizePt float64) int { 261 261 + ft := freetype.NewContext() 262 262 + ft.SetDPI(72) 263 263 + ft.SetFont(c.Font) 264 264 + ft.SetFontSize(sizePt) 265 265 + return ft.PointToFixed(sizePt).Ceil() 266 266 + } 267 267 + 268 268 + func (c *Card) TextWidth(text string, sizePt float64) int { 269 269 + face := truetype.NewFace(c.Font, &truetype.Options{Size: sizePt, DPI: 72}) 270 270 + lineWidth := font.MeasureString(face, text) 271 271 + textWidth := lineWidth.Ceil() 272 272 + return textWidth 273 273 + } 274 274 + 260 275 // DrawBoldText draws bold text by rendering multiple times with slight offsets 261 276 func (c *Card) DrawBoldText(text string, x, y int, textColor color.Color, sizePt float64, valign VAlign, halign HAlign) (int, error) { 262 277 // Draw the text multiple times with slight offsets to create bold effect ··· 582 597 func (c *Card) DrawRect(startX, startY, endX, endY int, color color.Color) { 583 598 draw.Draw(c.Img, image.Rect(startX, startY, endX, endY), &image.Uniform{color}, image.Point{}, draw.Src) 584 599 } 600 600 + 601 601 + // drawRoundedRect draws a filled rounded rectangle on the given card 602 602 + func (card *Card) DrawRoundedRect(x, y, width, height, cornerRadius int, fillColor color.RGBA) { 603 603 + cardBounds := card.Img.Bounds() 604 604 + for py := y; py < y+height; py++ { 605 605 + for px := x; px < x+width; px++ { 606 606 + // calculate distance from corners 607 607 + dx := 0 608 608 + dy := 0 609 609 + 610 610 + // check which corner region we're in 611 611 + if px < x+cornerRadius && py < y+cornerRadius { 612 612 + // top-left corner 613 613 + dx = x + cornerRadius - px 614 614 + dy = y + cornerRadius - py 615 615 + } else if px >= x+width-cornerRadius && py < y+cornerRadius { 616 616 + // top-right corner 617 617 + dx = px - (x + width - cornerRadius - 1) 618 618 + dy = y + cornerRadius - py 619 619 + } else if px < x+cornerRadius && py >= y+height-cornerRadius { 620 620 + // bottom-left corner 621 621 + dx = x + cornerRadius - px 622 622 + dy = py - (y + height - cornerRadius - 1) 623 623 + } else if px >= x+width-cornerRadius && py >= y+height-cornerRadius { 624 624 + // Bottom-right corner 625 625 + dx = px - (x + width - cornerRadius - 1) 626 626 + dy = py - (y + height - cornerRadius - 1) 627 627 + } 628 628 + 629 629 + // if we're in a corner, check if we're within the radius 630 630 + inCorner := (dx > 0 || dy > 0) 631 631 + withinRadius := dx*dx+dy*dy <= cornerRadius*cornerRadius 632 632 + 633 633 + // draw pixel if not in corner, or in corner and within radius 634 634 + // check bounds relative to the card's image bounds 635 635 + if (!inCorner || withinRadius) && px >= 0 && px < cardBounds.Dx() && py >= 0 && py < cardBounds.Dy() { 636 636 + card.Img.Set(px+cardBounds.Min.X, py+cardBounds.Min.Y, fillColor) 637 637 + } 638 638 + } 639 639 + } 640 640 + }

+30 -12

appview/pages/pages.go

··· 764 764 } 765 765 766 766 type RepoTreeParams struct { 767 767 - LoggedInUser *oauth.MultiAccountUser 768 768 - RepoInfo repoinfo.RepoInfo 769 769 - Active string 770 770 - BreadCrumbs [][]string 771 771 - TreePath string 772 772 - Raw bool 773 773 - HTMLReadme template.HTML 767 767 + LoggedInUser *oauth.MultiAccountUser 768 768 + RepoInfo repoinfo.RepoInfo 769 769 + Active string 770 770 + BreadCrumbs [][]string 771 771 + TreePath string 772 772 + Raw bool 773 773 + HTMLReadme template.HTML 774 774 + EmailToDid map[string]string 775 775 + LastCommitInfo *types.LastCommitInfo 774 776 types.RepoTreeResponse 775 777 } 776 778 ··· 844 846 return p.executeRepo("repo/tags", w, params) 845 847 } 846 848 849 849 + type RepoTagParams struct { 850 850 + LoggedInUser *oauth.MultiAccountUser 851 851 + RepoInfo repoinfo.RepoInfo 852 852 + Active string 853 853 + types.RepoTagResponse 854 854 + ArtifactMap map[plumbing.Hash][]models.Artifact 855 855 + DanglingArtifacts []models.Artifact 856 856 + } 857 857 + 858 858 + func (p *Pages) RepoTag(w io.Writer, params RepoTagParams) error { 859 859 + params.Active = "overview" 860 860 + return p.executeRepo("repo/tag", w, params) 861 861 + } 862 862 + 847 863 type RepoArtifactParams struct { 848 864 LoggedInUser *oauth.MultiAccountUser 849 865 RepoInfo repoinfo.RepoInfo ··· 855 871 } 856 872 857 873 type RepoBlobParams struct { 858 858 - LoggedInUser *oauth.MultiAccountUser 859 859 - RepoInfo repoinfo.RepoInfo 860 860 - Active string 861 861 - BreadCrumbs [][]string 862 862 - BlobView models.BlobView 874 874 + LoggedInUser *oauth.MultiAccountUser 875 875 + RepoInfo repoinfo.RepoInfo 876 876 + Active string 877 877 + BreadCrumbs [][]string 878 878 + BlobView models.BlobView 879 879 + EmailToDid map[string]string 880 880 + LastCommitInfo *types.LastCommitInfo 863 881 *tangled.RepoBlob_Output 864 882 } 865 883

+113

appview/pages/templates/fragments/resizeable.html

··· 1 1 + {{ define "fragments/resizable" }} 2 2 + <script> 3 3 + class ResizablePanel { 4 4 + constructor(resizerElement) { 5 5 + this.resizer = resizerElement; 6 6 + this.isResizing = false; 7 7 + this.type = resizerElement.dataset.resizer; 8 8 + this.targetId = resizerElement.dataset.target; 9 9 + this.target = document.getElementById(this.targetId); 10 10 + this.min = parseInt(resizerElement.dataset.min) || 100; 11 11 + this.max = parseInt(resizerElement.dataset.max) || Infinity; 12 12 + 13 13 + this.direction = resizerElement.dataset.direction || 'before'; // 'before' or 'after' 14 14 + 15 15 + this.handleMouseDown = this.handleMouseDown.bind(this); 16 16 + this.handleMouseMove = this.handleMouseMove.bind(this); 17 17 + this.handleMouseUp = this.handleMouseUp.bind(this); 18 18 + 19 19 + this.init(); 20 20 + } 21 21 + 22 22 + init() { 23 23 + this.resizer.addEventListener('mousedown', this.handleMouseDown); 24 24 + } 25 25 + 26 26 + handleMouseDown(e) { 27 27 + e.preventDefault(); 28 28 + this.isResizing = true; 29 29 + this.resizer.classList.add('resizing'); 30 30 + document.body.style.cursor = this.type === 'vertical' ? 'col-resize' : 'row-resize'; 31 31 + document.body.style.userSelect = 'none'; 32 32 + 33 33 + this.startX = e.clientX; 34 34 + this.startY = e.clientY; 35 35 + this.startWidth = this.target.offsetWidth; 36 36 + this.startHeight = this.target.offsetHeight; 37 37 + 38 38 + document.addEventListener('mousemove', this.handleMouseMove); 39 39 + document.addEventListener('mouseup', this.handleMouseUp); 40 40 + } 41 41 + 42 42 + handleMouseMove(e) { 43 43 + if (!this.isResizing) return; 44 44 + 45 45 + if (this.type === 'vertical') { 46 46 + let newWidth; 47 47 + 48 48 + if (this.direction === 'after') { 49 49 + const deltaX = this.startX - e.clientX; 50 50 + newWidth = this.startWidth + deltaX; 51 51 + } else { 52 52 + const deltaX = e.clientX - this.startX; 53 53 + newWidth = this.startWidth + deltaX; 54 54 + } 55 55 + 56 56 + if (newWidth >= this.min && newWidth <= this.max) { 57 57 + this.target.style.width = newWidth + 'px'; 58 58 + this.target.style.flexShrink = '0'; 59 59 + } 60 60 + } else { 61 61 + let newHeight; 62 62 + 63 63 + if (this.direction === 'after') { 64 64 + const deltaY = this.startY - e.clientY; 65 65 + newHeight = this.startHeight + deltaY; 66 66 + } else { 67 67 + const deltaY = e.clientY - this.startY; 68 68 + newHeight = this.startHeight + deltaY; 69 69 + } 70 70 + 71 71 + if (newHeight >= this.min && newHeight <= this.max) { 72 72 + this.target.style.height = newHeight + 'px'; 73 73 + } 74 74 + } 75 75 + } 76 76 + 77 77 + handleMouseUp() { 78 78 + if (!this.isResizing) return; 79 79 + 80 80 + this.isResizing = false; 81 81 + this.resizer.classList.remove('resizing'); 82 82 + document.body.style.cursor = ''; 83 83 + document.body.style.userSelect = ''; 84 84 + 85 85 + document.removeEventListener('mousemove', this.handleMouseMove); 86 86 + document.removeEventListener('mouseup', this.handleMouseUp); 87 87 + } 88 88 + 89 89 + destroy() { 90 90 + this.resizer.removeEventListener('mousedown', this.handleMouseDown); 91 91 + document.removeEventListener('mousemove', this.handleMouseMove); 92 92 + document.removeEventListener('mouseup', this.handleMouseUp); 93 93 + } 94 94 + } 95 95 + 96 96 + function initializeResizers() { 97 97 + const resizers = document.querySelectorAll('[data-resizer]'); 98 98 + const instances = []; 99 99 + 100 100 + resizers.forEach(resizer => { 101 101 + instances.push(new ResizablePanel(resizer)); 102 102 + }); 103 103 + 104 104 + return instances; 105 105 + } 106 106 + 107 107 + if (document.readyState === 'loading') { 108 108 + document.addEventListener('DOMContentLoaded', initializeResizers); 109 109 + } else { 110 110 + initializeResizers(); 111 111 + } 112 112 + </script> 113 113 + {{ end }}

+3 -3

appview/pages/templates/fragments/starBtn.html

··· 15 15 hx-disabled-elt="#starBtn" 16 16 > 17 17 {{ if .IsStarred }} 18 18 - {{ i "star" "w-4 h-4 fill-current" }} 18 18 + {{ i "star" "w-4 h-4 fill-current inline group-[.htmx-request]:hidden" }} 19 19 {{ else }} 20 20 - {{ i "star" "w-4 h-4" }} 20 20 + {{ i "star" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 21 21 {{ end }} 22 22 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 22 23 <span class="text-sm"> 23 24 {{ .StarCount }} 24 25 </span> 25 25 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 26 26 </button> 27 27 {{ end }}

+6

appview/pages/templates/repo/blob.html

··· 12 12 13 13 {{ define "repoContent" }} 14 14 {{ $linkstyle := "no-underline hover:underline" }} 15 15 + 15 16 <div class="pb-2 mb-3 text-base border-b border-gray-200 dark:border-gray-700"> 16 17 <div class="flex flex-col md:flex-row md:justify-between gap-2"> 17 18 <div id="breadcrumbs" class="overflow-x-auto whitespace-nowrap text-gray-400 dark:text-gray-500"> ··· 57 58 </div> 58 59 </div> 59 60 </div> 61 61 + 62 62 + {{ if .LastCommitInfo }} 63 63 + {{ template "repo/fragments/lastCommitPanel" $ }} 64 64 + {{ end }} 65 65 + 60 66 {{ if .BlobView.IsUnsupported }} 61 67 <p class="text-center text-gray-400 dark:text-gray-500"> 62 68 Previews are not supported for this file type.

+3 -2

appview/pages/templates/repo/fragments/artifact.html

··· 19 19 {{ if and .LoggedInUser (eq .LoggedInUser.Did .Artifact.Did) }} 20 20 <button 21 21 id="delete-{{ $unique }}" 22 22 - class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2" 22 22 + class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group" 23 23 title="Delete artifact" 24 24 hx-delete="/{{ .RepoInfo.FullName }}/tags/{{ .Artifact.Tag.String }}/{{ .Artifact.Name | urlquery }}" 25 25 hx-swap="outerHTML" 26 26 hx-target="#artifact-{{ $unique }}" 27 27 hx-disabled-elt="#delete-{{ $unique }}" 28 28 hx-confirm="Are you sure you want to delete the artifact '{{ .Artifact.Name }}'?"> 29 29 - {{ i "trash-2" "w-4 h-4" }} 29 29 + {{ i "trash-2" "size-4 inline group-[.htmx-request]:hidden" }} 30 30 + {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }} 30 31 </button> 31 32 {{ end }} 32 33 </div>

+70

appview/pages/templates/repo/fragments/artifactList.html

··· 1 1 + {{ define "repo/fragments/artifactList" }} 2 2 + {{ $root := index . 0 }} 3 3 + {{ $tag := index . 1 }} 4 4 + {{ $isPushAllowed := $root.RepoInfo.Roles.IsPushAllowed }} 5 5 + {{ $artifacts := index $root.ArtifactMap $tag.Tag.Hash }} 6 6 + 7 7 + <h2 class="my-4 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold">artifacts</h2> 8 8 + <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700"> 9 9 + {{ range $artifact := $artifacts }} 10 10 + {{ $args := dict "LoggedInUser" $root.LoggedInUser "RepoInfo" $root.RepoInfo "Artifact" $artifact }} 11 11 + {{ template "repo/fragments/artifact" $args }} 12 12 + {{ end }} 13 13 + <div id="artifact-git-source" class="flex items-center justify-between p-2 border-b border-gray-200 dark:border-gray-700"> 14 14 + <div id="left-side" class="flex items-center gap-2 min-w-0 max-w-[60%]"> 15 15 + {{ i "archive" "w-4 h-4" }} 16 16 + <a href="/{{ $root.RepoInfo.FullName }}/archive/{{ pathEscape (print "refs/tags/" $tag.Name) }}" class="no-underline hover:no-underline"> 17 17 + Source code (.tar.gz) 18 18 + </a> 19 19 + </div> 20 20 + </div> 21 21 + {{ if $isPushAllowed }} 22 22 + {{ template "uploadArtifact" (list $root $tag) }} 23 23 + {{ end }} 24 24 + </div> 25 25 + {{ end }} 26 26 + 27 27 + {{ define "uploadArtifact" }} 28 28 + {{ $root := index . 0 }} 29 29 + {{ $tag := index . 1 }} 30 30 + {{ $unique := $tag.Tag.Target.String }} 31 31 + <form 32 32 + id="upload-{{$unique}}" 33 33 + method="post" 34 34 + enctype="multipart/form-data" 35 35 + hx-post="/{{ $root.RepoInfo.FullName }}/tags/{{ $tag.Name | urlquery }}/upload" 36 36 + hx-on::after-request="if(event.detail.successful) this.reset()" 37 37 + hx-disabled-elt="#upload-btn-{{$unique}}" 38 38 + hx-swap="beforebegin" 39 39 + hx-target="#artifact-git-source" 40 40 + class="flex items-center gap-2 px-2 group"> 41 41 + <div class="flex-grow"> 42 42 + <input type="file" 43 43 + name="artifact" 44 44 + required 45 45 + class="block py-2 px-0 w-full border-none 46 46 + text-black dark:text-white 47 47 + bg-white dark:bg-gray-800 48 48 + file:mr-4 file:px-2 file:py-2 49 49 + file:rounded file:border-0 50 50 + file:text-sm file:font-medium 51 51 + file:text-gray-700 file:dark:text-gray-300 52 52 + file:bg-gray-200 file:dark:bg-gray-700 53 53 + file:hover:bg-gray-100 file:hover:dark:bg-gray-600 54 54 + "> 55 55 + </input> 56 56 + </div> 57 57 + <div class="flex justify-end"> 58 58 + <button 59 59 + type="submit" 60 60 + class="btn-create gap-2" 61 61 + id="upload-btn-{{$unique}}" 62 62 + title="Upload artifact"> 63 63 + {{ i "upload" "size-4 inline group-[.htmx-request]:hidden" }} 64 64 + {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }} 65 65 + <span class="hidden md:inline">upload</span> 66 66 + </button> 67 67 + </div> 68 68 + </form> 69 69 + {{ end }} 70 70 +

+19 -2

appview/pages/templates/repo/fragments/diff.html

··· 3 3 #filesToggle:checked ~ div label[for="filesToggle"] .show-text { display: none; } 4 4 #filesToggle:checked ~ div label[for="filesToggle"] .hide-text { display: inline; } 5 5 #filesToggle:not(:checked) ~ div label[for="filesToggle"] .hide-text { display: none; } 6 6 - #filesToggle:checked ~ div div#files { width: fit-content; max-width: 15vw; margin-right: 1rem; } 6 6 + #filesToggle:checked ~ div div#files { width: fit-content; max-width: 15vw; } 7 7 #filesToggle:not(:checked) ~ div div#files { width: 0; display: none; margin-right: 0; } 8 8 + #filesToggle:not(:checked) ~ div div#resize-files { display: none; } 8 9 </style> 9 10 10 11 {{ template "diffTopbar" . }} 11 12 {{ block "diffLayout" . }} {{ end }} 13 13 + {{ template "fragments/resizable" }} 12 14 {{ end }} 13 15 14 16 {{ define "diffTopbar" }} ··· 78 80 79 81 {{ end }} 80 82 83 83 + {{ define "resize-grip" }} 84 84 + {{ $id := index . 0 }} 85 85 + {{ $target := index . 1 }} 86 86 + {{ $direction := index . 2 }} 87 87 + <div id="{{ $id }}" 88 88 + data-resizer="vertical" 89 89 + data-target="{{ $target }}" 90 90 + data-direction="{{ $direction }}" 91 91 + class="resizer-vertical hidden md:flex w-4 sticky top-12 max-h-screen flex-col items-center justify-center group"> 92 92 + <div class="w-1 h-16 group-hover:h-24 group-[.resizing]:h-24 transition-all rounded-full bg-gray-400 dark:bg-gray-500 group-hover:bg-gray-500 group-hover:dark:bg-gray-400"></div> 93 93 + </div> 94 94 + {{ end }} 95 95 + 81 96 {{ define "diffLayout" }} 82 97 {{ $diff := index . 0 }} 83 98 {{ $opts := index . 1 }} ··· 90 105 </section> 91 106 </div> 92 107 108 108 + {{ template "resize-grip" (list "resize-files" "files" "before") }} 109 109 + 93 110 <!-- main content --> 94 94 - <div class="flex-1 min-w-0 sticky top-12 pb-12"> 111 111 + <div id="diff-files" class="flex-1 min-w-0 sticky top-12 pb-12"> 95 112 {{ template "diffFiles" (list $diff $opts) }} 96 113 </div> 97 114

+29

appview/pages/templates/repo/fragments/lastCommitPanel.html

··· 1 1 + {{ define "repo/fragments/lastCommitPanel" }} 2 2 + {{ $messageParts := splitN .LastCommitInfo.Message "\n\n" 2 }} 3 3 + <div class="pb-2 mb-3 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between text-sm"> 4 4 + <div class="flex items-center gap-1"> 5 5 + {{ if .LastCommitInfo.Author }} 6 6 + {{ $authorDid := index .EmailToDid .LastCommitInfo.Author.Email }} 7 7 + <span class="flex items-center gap-1"> 8 8 + {{ if $authorDid }} 9 9 + {{ template "user/fragments/picHandleLink" $authorDid }} 10 10 + {{ else }} 11 11 + {{ placeholderAvatar "tiny" }} 12 12 + <a href="mailto:{{ .LastCommitInfo.Author.Email }}" class="no-underline hover:underline">{{ .LastCommitInfo.Author.Name }}</a> 13 13 + {{ end }} 14 14 + </span> 15 15 + <span class="px-1 select-none before:content-['\00B7']"></span> 16 16 + {{ end }} 17 17 + <a href="/{{ .RepoInfo.FullName }}/commit/{{ .LastCommitInfo.Hash }}" 18 18 + class="inline no-underline hover:underline dark:text-white"> 19 19 + {{ index $messageParts 0 }} 20 20 + </a> 21 21 + <span class="px-1 select-none before:content-['\00B7']"></span> 22 22 + <span class="text-gray-400 dark:text-gray-500">{{ template "repo/fragments/time" .LastCommitInfo.When }}</span> 23 23 + </div> 24 24 + <a href="/{{ .RepoInfo.FullName }}/commit/{{ .LastCommitInfo.Hash.String }}" 25 25 + class="no-underline hover:underline text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-gray-900 px-2 py-1 rounded font-mono text-xs"> 26 26 + {{ slice .LastCommitInfo.Hash.String 0 8 }} 27 27 + </a> 28 28 + </div> 29 29 + {{ end }}

+67

appview/pages/templates/repo/fragments/singleTag.html

··· 1 1 + {{ define "repo/fragments/singleTag" }} 2 2 + {{ $root := index . 0 }} 3 3 + {{ $item := index . 1 }} 4 4 + {{ with $item }} 5 5 + <div class="md:grid md:grid-cols-12 md:items-start flex flex-col"> 6 6 + <!-- Header column (top on mobile, left on md+) --> 7 7 + <div class="md:col-span-2 md:border-r border-b md:border-b-0 border-gray-200 dark:border-gray-700 w-full md:h-full"> 8 8 + <!-- Mobile layout: horizontal --> 9 9 + <div class="flex md:hidden flex-col py-2 px-2 text-xl"> 10 10 + <a href="/{{ $root.RepoInfo.FullName }}/tags/{{ .Name | urlquery }}" class="no-underline hover:underline flex items-center gap-2 font-bold"> 11 11 + {{ i "tag" "w-4 h-4" }} 12 12 + {{ .Name }} 13 13 + </a> 14 14 + 15 15 + <div class="flex items-center gap-3 text-gray-500 dark:text-gray-400 text-sm"> 16 16 + {{ if .Tag }} 17 17 + <a href="/{{ $root.RepoInfo.FullName }}/commit/{{ .Tag.Target.String }}" 18 18 + class="no-underline hover:underline text-gray-500 dark:text-gray-400"> 19 19 + {{ slice .Tag.Target.String 0 8 }} 20 20 + </a> 21 21 + 22 22 + <span class="px-1 text-gray-500 dark:text-gray-400 select-none after:content-['·']"></span> 23 23 + <span>{{ .Tag.Tagger.Name }}</span> 24 24 + 25 25 + <span class="px-1 text-gray-500 dark:text-gray-400 select-none after:content-['·']"></span> 26 26 + {{ template "repo/fragments/shortTime" .Tag.Tagger.When }} 27 27 + {{ end }} 28 28 + </div> 29 29 + </div> 30 30 + 31 31 + <!-- Desktop layout: vertical and left-aligned --> 32 32 + <div class="hidden md:block text-left px-2 pb-6"> 33 33 + <a href="/{{ $root.RepoInfo.FullName }}/tags/{{ .Name | urlquery }}" class="no-underline hover:underline flex items-center gap-2 font-bold"> 34 34 + {{ i "tag" "w-4 h-4" }} 35 35 + {{ .Name }} 36 36 + </a> 37 37 + <div class="flex flex-grow flex-col text-gray-500 dark:text-gray-400 text-sm"> 38 38 + {{ if .Tag }} 39 39 + <a href="/{{ $root.RepoInfo.FullName }}/commit/{{ .Tag.Target.String }}" 40 40 + class="no-underline hover:underline text-gray-500 dark:text-gray-400 flex items-center gap-2"> 41 41 + {{ i "git-commit-horizontal" "w-4 h-4" }} 42 42 + {{ slice .Tag.Target.String 0 8 }} 43 43 + </a> 44 44 + <span>{{ .Tag.Tagger.Name }}</span> 45 45 + {{ template "repo/fragments/time" .Tag.Tagger.When }} 46 46 + {{ end }} 47 47 + </div> 48 48 + </div> 49 49 + </div> 50 50 + 51 51 + <!-- Content column (bottom on mobile, right on md+) --> 52 52 + <div class="md:col-span-10 px-2 py-3 md:py-0 md:pb-6"> 53 53 + {{ if .Tag }} 54 54 + {{ $messageParts := splitN .Tag.Message "\n\n" 2 }} 55 55 + <p class="font-bold text-lg">{{ index $messageParts 0 }}</p> 56 56 + {{ if gt (len $messageParts) 1 }} 57 57 + <p class="cursor-text py-2">{{ nl2br (index $messageParts 1) }}</p> 58 58 + {{ end }} 59 59 + {{ template "repo/fragments/artifactList" (list $root .) }} 60 60 + {{ else }} 61 61 + <p class="italic text-gray-500 dark:text-gray-400">no message</p> 62 62 + {{ end }} 63 63 + </div> 64 64 + </div> 65 65 + {{ end }} 66 66 + {{ end }} 67 67 +

+1 -1

appview/pages/templates/repo/index.html

··· 334 334 {{ with $tag }} 335 335 <div> 336 336 <div class="text-base flex items-center gap-2"> 337 337 - <a href="/{{ $.RepoInfo.FullName }}/tree/{{ .Reference.Name | urlquery }}" 337 337 + <a href="/{{ $.RepoInfo.FullName }}/tags/{{ .Reference.Name | urlquery }}" 338 338 class="inline no-underline hover:underline dark:text-white"> 339 339 {{ .Reference.Name }} 340 340 </a>

+2 -2

appview/pages/templates/repo/pulls/fragments/pullActions.html

··· 38 38 hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }' 39 39 hx-swap="none" 40 40 class="btn-flat p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 41 41 - {{ i "git-branch" "w-4 h-4" }} 42 42 - <span>delete branch</span> 41 41 + {{ i "git-branch" "w-4 h-4 inline group-[.htmx-request]:hidden" }} 43 42 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 43 43 + delete branch 44 44 </button> 45 45 {{ end }} 46 46 {{ if and $isPushAllowed $isOpen $isLastRound }}

+22 -5

appview/pages/templates/repo/pulls/pull.html

··· 111 111 {{ end }} 112 112 {{ end }} 113 113 114 114 + {{ define "resize-grip" }} 115 115 + {{ $id := index . 0 }} 116 116 + {{ $target := index . 1 }} 117 117 + {{ $direction := index . 2 }} 118 118 + <div id="{{ $id }}" 119 119 + data-resizer="vertical" 120 120 + data-target="{{ $target }}" 121 121 + data-direction="{{ $direction }}" 122 122 + class="resizer-vertical hidden md:flex w-4 sticky top-12 max-h-screen flex-col items-center justify-center group"> 123 123 + <div class="w-1 h-16 group-hover:h-24 group-[.resizing]:h-24 transition-all rounded-full bg-gray-400 dark:bg-gray-500 group-hover:bg-gray-500 group-hover:dark:bg-gray-400"></div> 124 124 + </div> 125 125 + {{ end }} 126 126 + 114 127 {{ define "diffLayout" }} 115 128 {{ $diff := index . 0 }} 116 129 {{ $opts := index . 1 }} ··· 124 137 </section> 125 138 </div> 126 139 140 140 + {{ template "resize-grip" (list "resize-files" "files" "before") }} 141 141 + 127 142 <!-- main content --> 128 128 - <div class="flex-1 min-w-0 sticky top-12 pb-12"> 143 143 + <div id="diff-files" class="flex-1 min-w-0 sticky top-12 pb-12"> 129 144 {{ template "diffFiles" (list $diff $opts) }} 130 145 </div> 146 146 + 147 147 + {{ template "resize-grip" (list "resize-subs" "subs" "after") }} 131 148 132 149 <!-- right panel --> 133 150 {{ template "subsPanel" $ }} ··· 187 204 188 205 {{ define "subsToggle" }} 189 206 <style> 190 190 - /* Mobile: full width */ 191 207 #subsToggle:checked ~ div div#subs { 192 208 width: 100%; 193 209 margin-left: 0; ··· 196 212 #subsToggle:checked ~ div label[for="subsToggle"] .hide-toggle { display: flex; } 197 213 #subsToggle:not(:checked) ~ div label[for="subsToggle"] .hide-toggle { display: none; } 198 214 199 199 - /* Desktop: 25vw with left margin */ 200 215 @media (min-width: 768px) { 201 216 #subsToggle:checked ~ div div#subs { 202 217 width: 25vw; 203 203 - margin-left: 1rem; 218 218 + max-width: 50vw; 204 219 } 205 205 - /* Unchecked state */ 206 220 #subsToggle:not(:checked) ~ div div#subs { 207 221 width: 0; 208 222 display: none; 209 223 margin-left: 0; 224 224 + } 225 225 + #subsToggle:not(:checked) ~ div div#resize-subs { 226 226 + display: none; 210 227 } 211 228 } 212 229 </style>

+16

appview/pages/templates/repo/tag.html

··· 1 1 + {{ define "title" }} 2 2 + tags · {{ .RepoInfo.FullName }} 3 3 + {{ end }} 4 4 + 5 5 + {{ define "extrameta" }} 6 6 + {{ $title := printf "tags &middot; %s" .RepoInfo.FullName }} 7 7 + {{ $url := printf "https://tangled.org/%s/tag/%s" .RepoInfo.FullName .Tag.Name }} 8 8 + 9 9 + {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} 10 10 + {{ end }} 11 11 + 12 12 + {{ define "repoContent" }} 13 13 + <section class="flex flex-col py-2 gap-12 md:gap-0"> 14 14 + {{ template "repo/fragments/singleTag" (list $ .Tag ) }} 15 15 + </section> 16 16 + {{ end }}

+1 -129

appview/pages/templates/repo/tags.html

··· 14 14 <h2 class="mb-4 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold">tags</h2> 15 15 <div class="flex flex-col py-2 gap-12 md:gap-0"> 16 16 {{ range .Tags }} 17 17 - <div class="md:grid md:grid-cols-12 md:items-start flex flex-col"> 18 18 - <!-- Header column (top on mobile, left on md+) --> 19 19 - <div class="md:col-span-2 md:border-r border-b md:border-b-0 border-gray-200 dark:border-gray-700 w-full md:h-full"> 20 20 - <!-- Mobile layout: horizontal --> 21 21 - <div class="flex md:hidden flex-col py-2 px-2 text-xl"> 22 22 - <a href="/{{ $.RepoInfo.FullName }}/tree/{{ .Name | urlquery }}" class="no-underline hover:underline flex items-center gap-2 font-bold"> 23 23 - {{ i "tag" "w-4 h-4" }} 24 24 - {{ .Name }} 25 25 - </a> 26 26 - 27 27 - <div class="flex items-center gap-3 text-gray-500 dark:text-gray-400 text-sm"> 28 28 - {{ if .Tag }} 29 29 - <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Tag.Target.String }}" 30 30 - class="no-underline hover:underline text-gray-500 dark:text-gray-400"> 31 31 - {{ slice .Tag.Target.String 0 8 }} 32 32 - </a> 33 33 - 34 34 - <span class="px-1 text-gray-500 dark:text-gray-400 select-none after:content-['·']"></span> 35 35 - <span>{{ .Tag.Tagger.Name }}</span> 36 36 - 37 37 - <span class="px-1 text-gray-500 dark:text-gray-400 select-none after:content-['·']"></span> 38 38 - {{ template "repo/fragments/shortTime" .Tag.Tagger.When }} 39 39 - {{ end }} 40 40 - </div> 41 41 - </div> 42 42 - 43 43 - <!-- Desktop layout: vertical and left-aligned --> 44 44 - <div class="hidden md:block text-left px-2 pb-6"> 45 45 - <a href="/{{ $.RepoInfo.FullName }}/tree/{{ .Name | urlquery }}" class="no-underline hover:underline flex items-center gap-2 font-bold"> 46 46 - {{ i "tag" "w-4 h-4" }} 47 47 - {{ .Name }} 48 48 - </a> 49 49 - <div class="flex flex-grow flex-col text-gray-500 dark:text-gray-400 text-sm"> 50 50 - {{ if .Tag }} 51 51 - <a href="/{{ $.RepoInfo.FullName }}/commit/{{ .Tag.Target.String }}" 52 52 - class="no-underline hover:underline text-gray-500 dark:text-gray-400 flex items-center gap-2"> 53 53 - {{ i "git-commit-horizontal" "w-4 h-4" }} 54 54 - {{ slice .Tag.Target.String 0 8 }} 55 55 - </a> 56 56 - <span>{{ .Tag.Tagger.Name }}</span> 57 57 - {{ template "repo/fragments/time" .Tag.Tagger.When }} 58 58 - {{ end }} 59 59 - </div> 60 60 - </div> 61 61 - </div> 62 62 - 63 63 - <!-- Content column (bottom on mobile, right on md+) --> 64 64 - <div class="md:col-span-10 px-2 py-3 md:py-0 md:pb-6"> 65 65 - {{ if .Tag }} 66 66 - {{ $messageParts := splitN .Tag.Message "\n\n" 2 }} 67 67 - <p class="font-bold text-lg">{{ index $messageParts 0 }}</p> 68 68 - {{ if gt (len $messageParts) 1 }} 69 69 - <p class="cursor-text py-2">{{ nl2br (index $messageParts 1) }}</p> 70 70 - {{ end }} 71 71 - {{ block "artifacts" (list $ .) }} {{ end }} 72 72 - {{ else }} 73 73 - <p class="italic text-gray-500 dark:text-gray-400">no message</p> 74 74 - {{ end }} 75 75 - </div> 76 76 - </div> 17 17 + {{ template "repo/fragments/singleTag" (list $ . ) }} 77 18 {{ else }} 78 19 <p class="text-center text-gray-400 dark:text-gray-500 p-4"> 79 20 This repository does not contain any tags. ··· 89 30 {{ block "dangling" . }} {{ end }} 90 31 </section> 91 32 {{ end }} 92 92 - {{ end }} 93 93 - 94 94 - {{ define "artifacts" }} 95 95 - {{ $root := index . 0 }} 96 96 - {{ $tag := index . 1 }} 97 97 - {{ $isPushAllowed := $root.RepoInfo.Roles.IsPushAllowed }} 98 98 - {{ $artifacts := index $root.ArtifactMap $tag.Tag.Hash }} 99 99 - 100 100 - <h2 class="my-4 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold">artifacts</h2> 101 101 - <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700"> 102 102 - {{ range $artifact := $artifacts }} 103 103 - {{ $args := dict "LoggedInUser" $root.LoggedInUser "RepoInfo" $root.RepoInfo "Artifact" $artifact }} 104 104 - {{ template "repo/fragments/artifact" $args }} 105 105 - {{ end }} 106 106 - <div id="artifact-git-source" class="flex items-center justify-between p-2 border-b border-gray-200 dark:border-gray-700"> 107 107 - <div id="left-side" class="flex items-center gap-2 min-w-0 max-w-[60%]"> 108 108 - {{ i "archive" "w-4 h-4" }} 109 109 - <a href="/{{ $root.RepoInfo.FullName }}/archive/{{ pathEscape (print "refs/tags/" $tag.Name) }}" class="no-underline hover:no-underline"> 110 110 - Source code (.tar.gz) 111 111 - </a> 112 112 - </div> 113 113 - </div> 114 114 - {{ if $isPushAllowed }} 115 115 - {{ block "uploadArtifact" (list $root $tag) }} {{ end }} 116 116 - {{ end }} 117 117 - </div> 118 118 - {{ end }} 119 119 - 120 120 - {{ define "uploadArtifact" }} 121 121 - {{ $root := index . 0 }} 122 122 - {{ $tag := index . 1 }} 123 123 - {{ $unique := $tag.Tag.Target.String }} 124 124 - <form 125 125 - id="upload-{{$unique}}" 126 126 - method="post" 127 127 - enctype="multipart/form-data" 128 128 - hx-post="/{{ $root.RepoInfo.FullName }}/tags/{{ $tag.Name | urlquery }}/upload" 129 129 - hx-on::after-request="if(event.detail.successful) this.reset()" 130 130 - hx-disabled-elt="#upload-btn-{{$unique}}" 131 131 - hx-swap="beforebegin" 132 132 - hx-target="this" 133 133 - class="flex items-center gap-2 px-2"> 134 134 - <div class="flex-grow"> 135 135 - <input type="file" 136 136 - name="artifact" 137 137 - required 138 138 - class="block py-2 px-0 w-full border-none 139 139 - text-black dark:text-white 140 140 - bg-white dark:bg-gray-800 141 141 - file:mr-4 file:px-2 file:py-2 142 142 - file:rounded file:border-0 143 143 - file:text-sm file:font-medium 144 144 - file:text-gray-700 file:dark:text-gray-300 145 145 - file:bg-gray-200 file:dark:bg-gray-700 146 146 - file:hover:bg-gray-100 file:hover:dark:bg-gray-600 147 147 - "> 148 148 - </input> 149 149 - </div> 150 150 - <div class="flex justify-end"> 151 151 - <button 152 152 - type="submit" 153 153 - class="btn gap-2" 154 154 - id="upload-btn-{{$unique}}" 155 155 - title="Upload artifact"> 156 156 - {{ i "upload" "w-4 h-4" }} 157 157 - <span class="hidden md:inline">upload</span> 158 158 - </button> 159 159 - </div> 160 160 - </form> 161 33 {{ end }} 162 34 163 35 {{ define "dangling" }}

+4

appview/pages/templates/repo/tree.html

··· 52 52 </div> 53 53 </div> 54 54 55 55 + {{ if .LastCommitInfo }} 56 56 + {{ template "repo/fragments/lastCommitPanel" $ }} 57 57 + {{ end }} 58 58 + 55 59 {{ range .Files }} 56 60 <div class="grid grid-cols-12 gap-4 items-center py-1"> 57 61 <div class="col-span-8 md:col-span-4">

+2 -1

appview/pages/templates/user/fragments/editBio.html

··· 110 110 {{ $id := index . 0 }} 111 111 {{ $stat := index . 1 }} 112 112 <select class="stat-group w-full p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700 text-sm" id="stat{{$id}}" name="stat{{$id}}"> 113 113 - <option value="">choose stat</option> 113 113 + <option value="">Choose Stat</option> 114 114 {{ $stats := assoc 115 115 "merged-pull-request-count" "Merged PR Count" 116 116 "closed-pull-request-count" "Closed PR Count" ··· 118 118 "open-issue-count" "Open Issue Count" 119 119 "closed-issue-count" "Closed Issue Count" 120 120 "repository-count" "Repository Count" 121 121 + "star-count" "Star Count" 121 122 }} 122 123 {{ range $s := $stats }} 123 124 {{ $value := index $s 0 }}

+6 -3

appview/pages/templates/user/fragments/follow.html

··· 13 13 hx-swap="outerHTML" 14 14 > 15 15 {{ if eq .FollowStatus.String "IsNotFollowing" }} 16 16 - {{ i "user-round-plus" "w-4 h-4" }} follow 16 16 + {{ i "user-round-plus" "size-4 inline group-[.htmx-request]:hidden" }} 17 17 + {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }} 18 18 + follow 17 19 {{ else }} 18 18 - {{ i "user-round-minus" "w-4 h-4" }} unfollow 20 20 + {{ i "user-round-minus" "size-4 inline group-[.htmx-request]:hidden" }} 21 21 + {{ i "loader-circle" "size-4 animate-spin hidden group-[.htmx-request]:inline" }} 22 22 + unfollow 19 23 {{ end }} 20 20 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 21 24 </button> 22 25 {{ end }}

+27 -19

appview/pulls/opengraph.go

··· 128 128 } 129 129 130 130 // Split stats area: left side for status/stats (80%), right side for dolly (20%) 131 131 - statusStatsArea, dollyArea := statsArea.Split(true, 80) 131 131 + statusArea, dollyArea := statsArea.Split(true, 80) 132 132 133 133 // Draw status and stats 134 134 - statsBounds := statusStatsArea.Img.Bounds() 134 134 + statsBounds := statusArea.Img.Bounds() 135 135 statsX := statsBounds.Min.X + 60 // left padding 136 136 statsY := statsBounds.Min.Y 137 137 ··· 157 157 } else { 158 158 statusIcon = "git-pull-request-closed" 159 159 statusText = "closed" 160 160 - statusColor = color.RGBA{128, 128, 128, 255} // gray 160 160 + statusColor = color.RGBA{52, 58, 64, 255} // dark gray 161 161 } 162 162 163 163 - statusIconSize := 36 163 163 + statusTextWidth := statusArea.TextWidth(statusText, textSize) 164 164 + badgePadding := 12 165 165 + badgeHeight := int(textSize) + (badgePadding * 2) 166 166 + badgeWidth := iconSize + badgePadding + statusTextWidth + (badgePadding * 2) 167 167 + cornerRadius := 8 168 168 + badgeX := 60 169 169 + badgeY := 0 170 170 + 171 171 + statusArea.DrawRoundedRect(badgeX, badgeY, badgeWidth, badgeHeight, cornerRadius, statusColor) 164 172 165 165 - // Draw icon with status color 166 166 - err = statusStatsArea.DrawLucideIcon(statusIcon, statsX, statsY+iconBaselineOffset-statusIconSize/2+5, statusIconSize, statusColor) 173 173 + whiteColor := color.RGBA{255, 255, 255, 255} 174 174 + iconX := statsX + badgePadding 175 175 + iconY := statsY + (badgeHeight-iconSize)/2 176 176 + err = statusArea.DrawLucideIcon(statusIcon, iconX, iconY, iconSize, whiteColor) 167 177 if err != nil { 168 178 log.Printf("failed to draw status icon: %v", err) 169 179 } 170 180 171 171 - // Draw text with status color 172 172 - textX := statsX + statusIconSize + 12 173 173 - statusTextSize := 32.0 174 174 - err = statusStatsArea.DrawTextAt(statusText, textX, statsY+iconBaselineOffset, statusColor, statusTextSize, ogcard.Middle, ogcard.Left) 181 181 + textX := statsX + badgePadding + iconSize + badgePadding 182 182 + textY := statsY + (badgeHeight-int(textSize))/2 - 5 183 183 + err = statusArea.DrawTextAt(statusText, textX, textY, whiteColor, textSize, ogcard.Top, ogcard.Left) 175 184 if err != nil { 176 185 log.Printf("failed to draw status text: %v", err) 177 186 } 178 187 179 179 - statusTextWidth := len(statusText) * 20 180 180 - currentX := statsX + statusIconSize + 12 + statusTextWidth + 40 188 188 + currentX := statsX + badgeWidth + 50 181 189 182 190 // Draw comment count 183 183 - err = statusStatsArea.DrawLucideIcon("message-square", currentX, statsY+iconBaselineOffset-iconSize/2+5, iconSize, iconColor) 191 191 + err = statusArea.DrawLucideIcon("message-square", currentX, iconY, iconSize, iconColor) 184 192 if err != nil { 185 193 log.Printf("failed to draw comment icon: %v", err) 186 194 } ··· 190 198 if commentCount == 1 { 191 199 commentText = "1 comment" 192 200 } 193 193 - err = statusStatsArea.DrawTextAt(commentText, currentX, statsY+iconBaselineOffset, iconColor, textSize, ogcard.Middle, ogcard.Left) 201 201 + err = statusArea.DrawTextAt(commentText, currentX, textY, iconColor, textSize, ogcard.Top, ogcard.Left) 194 202 if err != nil { 195 203 log.Printf("failed to draw comment text: %v", err) 196 204 } ··· 199 207 currentX += commentTextWidth + 40 200 208 201 209 // Draw files changed 202 202 - err = statusStatsArea.DrawLucideIcon("file-diff", currentX, statsY+iconBaselineOffset-iconSize/2+5, iconSize, iconColor) 210 210 + err = statusArea.DrawLucideIcon("file-diff", currentX, iconY, iconSize, iconColor) 203 211 if err != nil { 204 212 log.Printf("failed to draw file diff icon: %v", err) 205 213 } ··· 209 217 if filesChanged == 1 { 210 218 filesText = "1 file" 211 219 } 212 212 - err = statusStatsArea.DrawTextAt(filesText, currentX, statsY+iconBaselineOffset, iconColor, textSize, ogcard.Middle, ogcard.Left) 220 220 + err = statusArea.DrawTextAt(filesText, currentX, textY, iconColor, textSize, ogcard.Top, ogcard.Left) 213 221 if err != nil { 214 222 log.Printf("failed to draw files text: %v", err) 215 223 } ··· 220 228 // Draw additions (green +) 221 229 greenColor := color.RGBA{34, 139, 34, 255} 222 230 additionsText := fmt.Sprintf("+%d", diffStats.Insertions) 223 223 - err = statusStatsArea.DrawTextAt(additionsText, currentX, statsY+iconBaselineOffset, greenColor, textSize, ogcard.Middle, ogcard.Left) 231 231 + err = statusArea.DrawTextAt(additionsText, currentX, textY, greenColor, textSize, ogcard.Top, ogcard.Left) 224 232 if err != nil { 225 233 log.Printf("failed to draw additions text: %v", err) 226 234 } ··· 231 239 // Draw deletions (red -) right next to additions 232 240 redColor := color.RGBA{220, 20, 60, 255} 233 241 deletionsText := fmt.Sprintf("-%d", diffStats.Deletions) 234 234 - err = statusStatsArea.DrawTextAt(deletionsText, currentX, statsY+iconBaselineOffset, redColor, textSize, ogcard.Middle, ogcard.Left) 242 242 + err = statusArea.DrawTextAt(deletionsText, currentX, textY, redColor, textSize, ogcard.Top, ogcard.Left) 235 243 if err != nil { 236 244 log.Printf("failed to draw deletions text: %v", err) 237 245 } ··· 254 262 openedDate := pull.Created.Format("Jan 2, 2006") 255 263 metaText := fmt.Sprintf("opened by %s · %s", authorHandle, openedDate) 256 264 257 257 - err = statusStatsArea.DrawTextAt(metaText, statsX, labelY, iconColor, labelSize, ogcard.Top, ogcard.Left) 265 265 + err = statusArea.DrawTextAt(metaText, statsX, labelY, iconColor, labelSize, ogcard.Top, ogcard.Left) 258 266 if err != nil { 259 267 log.Printf("failed to draw metadata: %v", err) 260 268 }

+39 -30

appview/repo/artifact.go

··· 5 5 "encoding/json" 6 6 "fmt" 7 7 "io" 8 8 - "log" 9 8 "net/http" 10 9 "net/url" 11 10 "time" ··· 31 30 32 31 // TODO: proper statuses here on early exit 33 32 func (rp *Repo) AttachArtifact(w http.ResponseWriter, r *http.Request) { 33 33 + l := rp.logger.With("handler", "AttachArtifact") 34 34 + 34 35 user := rp.oauth.GetMultiAccountUser(r) 35 36 tagParam := chi.URLParam(r, "tag") 36 37 f, err := rp.repoResolver.Resolve(r) 37 38 if err != nil { 38 38 - log.Println("failed to get repo and knot", err) 39 39 + l.Error("failed to get repo and knot", "err", err) 39 40 rp.pages.Notice(w, "upload", "failed to upload artifact, error in repo resolution") 40 41 return 41 42 } 42 43 43 44 tag, err := rp.resolveTag(r.Context(), f, tagParam) 44 45 if err != nil { 45 45 - log.Println("failed to resolve tag", err) 46 46 + l.Error("failed to resolve tag", "err", err) 46 47 rp.pages.Notice(w, "upload", "failed to upload artifact, error in tag resolution") 47 48 return 48 49 } 49 50 50 51 file, header, err := r.FormFile("artifact") 51 52 if err != nil { 52 52 - log.Println("failed to upload artifact", err) 53 53 + l.Error("failed to upload artifact", "err", err) 53 54 rp.pages.Notice(w, "upload", "failed to upload artifact") 54 55 return 55 56 } ··· 57 58 58 59 client, err := rp.oauth.AuthorizedClient(r) 59 60 if err != nil { 60 60 - log.Println("failed to get authorized client", err) 61 61 + l.Error("failed to get authorized client", "err", err) 61 62 rp.pages.Notice(w, "upload", "failed to get authorized client") 62 63 return 63 64 } 64 65 65 66 uploadBlobResp, err := xrpc.RepoUploadBlob(r.Context(), client, file, header.Header.Get("Content-Type")) 66 67 if err != nil { 67 67 - log.Println("failed to upload blob", err) 68 68 + l.Error("failed to upload blob", "err", err) 68 69 rp.pages.Notice(w, "upload", "Failed to upload blob to your PDS. Try again later.") 69 70 return 70 71 } 71 72 72 72 - log.Println("uploaded blob", humanize.Bytes(uint64(uploadBlobResp.Blob.Size)), uploadBlobResp.Blob.Ref.String()) 73 73 + l.Info("uploaded blob", "size", humanize.Bytes(uint64(uploadBlobResp.Blob.Size)), "blobRef", uploadBlobResp.Blob.Ref.String()) 73 74 74 75 rkey := tid.TID() 75 76 createdAt := time.Now() ··· 89 90 }, 90 91 }) 91 92 if err != nil { 92 92 - log.Println("failed to create record", err) 93 93 + l.Error("failed to create record", "err", err) 93 94 rp.pages.Notice(w, "upload", "Failed to create artifact record. Try again later.") 94 95 return 95 96 } 96 97 97 97 - log.Println(putRecordResp.Uri) 98 98 + l.Debug("created record for blob", "aturi", putRecordResp.Uri) 98 99 99 100 tx, err := rp.db.BeginTx(r.Context(), nil) 100 101 if err != nil { 101 101 - log.Println("failed to start tx") 102 102 + l.Error("failed to start tx") 102 103 rp.pages.Notice(w, "upload", "Failed to create artifact. Try again later.") 103 104 return 104 105 } ··· 118 119 119 120 err = db.AddArtifact(tx, artifact) 120 121 if err != nil { 121 121 - log.Println("failed to add artifact record to db", err) 122 122 + l.Error("failed to add artifact record to db", "err", err) 122 123 rp.pages.Notice(w, "upload", "Failed to create artifact. Try again later.") 123 124 return 124 125 } 125 126 126 127 err = tx.Commit() 127 128 if err != nil { 128 128 - log.Println("failed to add artifact record to db") 129 129 + l.Error("failed to add artifact record to db") 129 130 rp.pages.Notice(w, "upload", "Failed to create artifact. Try again later.") 130 131 return 131 132 } ··· 138 139 } 139 140 140 141 func (rp *Repo) DownloadArtifact(w http.ResponseWriter, r *http.Request) { 142 142 + l := rp.logger.With("handler", "DownloadArtifact") 143 143 + 141 144 f, err := rp.repoResolver.Resolve(r) 142 145 if err != nil { 143 143 - log.Println("failed to get repo and knot", err) 146 146 + l.Error("failed to get repo and knot", "err", err) 144 147 http.Error(w, "failed to resolve repo", http.StatusInternalServerError) 145 148 return 146 149 } ··· 150 153 151 154 tag, err := rp.resolveTag(r.Context(), f, tagParam) 152 155 if err != nil { 153 153 - log.Println("failed to resolve tag", err) 156 156 + l.Error("failed to resolve tag", "err", err) 154 157 rp.pages.Notice(w, "upload", "failed to upload artifact, error in tag resolution") 155 158 return 156 159 } ··· 162 165 orm.FilterEq("name", filename), 163 166 ) 164 167 if err != nil { 165 165 - log.Println("failed to get artifacts", err) 168 168 + l.Error("failed to get artifacts", "err", err) 166 169 http.Error(w, "failed to get artifact", http.StatusInternalServerError) 167 170 return 168 171 } 169 172 170 173 if len(artifacts) != 1 { 171 171 - log.Printf("too many or too few artifacts found") 174 174 + l.Error("too many or too few artifacts found") 172 175 http.Error(w, "artifact not found", http.StatusNotFound) 173 176 return 174 177 } ··· 177 180 178 181 ownerId, err := rp.idResolver.ResolveIdent(r.Context(), f.Did) 179 182 if err != nil { 180 180 - log.Println("failed to resolve repo owner did", f.Did, err) 183 183 + l.Error("failed to resolve repo owner did", "did", f.Did, "err", err) 181 184 http.Error(w, "repository owner not found", http.StatusNotFound) 182 185 return 183 186 } ··· 191 194 192 195 req, err := http.NewRequest(http.MethodGet, url.String(), nil) 193 196 if err != nil { 194 194 - log.Println("failed to create request", err) 197 197 + l.Error("failed to create request", "err", err) 195 198 http.Error(w, "failed to create request", http.StatusInternalServerError) 196 199 return 197 200 } ··· 199 202 200 203 resp, err := http.DefaultClient.Do(req) 201 204 if err != nil { 202 202 - log.Println("failed to make request", err) 205 205 + l.Error("failed to make request", "err", err) 203 206 http.Error(w, "failed to make request to PDS", http.StatusInternalServerError) 204 207 return 205 208 } ··· 215 218 216 219 // stream the body directly to the client 217 220 if _, err := io.Copy(w, resp.Body); err != nil { 218 218 - log.Println("error streaming response to client:", err) 221 221 + l.Error("error streaming response to client:", "err", err) 219 222 } 220 223 } 221 224 222 225 // TODO: proper statuses here on early exit 223 226 func (rp *Repo) DeleteArtifact(w http.ResponseWriter, r *http.Request) { 227 227 + l := rp.logger.With("handler", "DeleteArtifact") 228 228 + 224 229 user := rp.oauth.GetMultiAccountUser(r) 225 230 tagParam := chi.URLParam(r, "tag") 226 231 filename := chi.URLParam(r, "file") 227 232 f, err := rp.repoResolver.Resolve(r) 228 233 if err != nil { 229 229 - log.Println("failed to get repo and knot", err) 234 234 + l.Error("failed to get repo and knot", "err", err) 230 235 return 231 236 } 232 237 ··· 241 246 orm.FilterEq("name", filename), 242 247 ) 243 248 if err != nil { 244 244 - log.Println("failed to get artifacts", err) 249 249 + l.Error("failed to get artifacts", "err", err) 245 250 rp.pages.Notice(w, "remove", "Failed to delete artifact. Try again later.") 246 251 return 247 252 } ··· 253 258 artifact := artifacts[0] 254 259 255 260 if user.Active.Did != artifact.Did { 256 256 - log.Println("user not authorized to delete artifact", err) 261 261 + l.Error("user not authorized to delete artifact", "err", err) 257 262 rp.pages.Notice(w, "remove", "Unauthorized deletion of artifact.") 258 263 return 259 264 } ··· 264 269 Rkey: artifact.Rkey, 265 270 }) 266 271 if err != nil { 267 267 - log.Println("failed to get blob from pds", err) 272 272 + l.Error("failed to get blob from pds", "err", err) 268 273 rp.pages.Notice(w, "remove", "Failed to remove blob from PDS.") 269 274 return 270 275 } 271 276 272 277 tx, err := rp.db.BeginTx(r.Context(), nil) 273 278 if err != nil { 274 274 - log.Println("failed to start tx") 279 279 + l.Error("failed to start tx") 275 280 rp.pages.Notice(w, "remove", "Failed to delete artifact. Try again later.") 276 281 return 277 282 } ··· 283 288 orm.FilterEq("name", filename), 284 289 ) 285 290 if err != nil { 286 286 - log.Println("failed to remove artifact record from db", err) 291 291 + l.Error("failed to remove artifact record from db", "err", err) 287 292 rp.pages.Notice(w, "remove", "Failed to delete artifact. Try again later.") 288 293 return 289 294 } 290 295 291 296 err = tx.Commit() 292 297 if err != nil { 293 293 - log.Println("failed to remove artifact record from db") 298 298 + l.Error("failed to remove artifact record from db") 294 299 rp.pages.Notice(w, "remove", "Failed to delete artifact. Try again later.") 295 300 return 296 301 } 302 302 + 303 303 + l.Info("successfully deleted artifact", "tag", tagParam, "file", filename) 297 304 298 305 w.Write([]byte{}) 299 306 } 300 307 301 308 func (rp *Repo) resolveTag(ctx context.Context, f *models.Repo, tagParam string) (*types.TagReference, error) { 309 309 + l := rp.logger.With("handler", "resolveTag") 310 310 + 302 311 tagParam, err := url.QueryUnescape(tagParam) 303 312 if err != nil { 304 313 return nil, err ··· 317 326 xrpcBytes, err := tangled.RepoTags(ctx, xrpcc, "", 0, repo) 318 327 if err != nil { 319 328 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 320 320 - log.Println("failed to call XRPC repo.tags", xrpcerr) 329 329 + l.Error("failed to call XRPC repo.tags", "err", xrpcerr) 321 330 return nil, xrpcerr 322 331 } 323 323 - log.Println("failed to reach knotserver", err) 332 332 + l.Error("failed to reach knotserver", "err", err) 324 333 return nil, err 325 334 } 326 335 327 336 var result types.RepoTagsResponse 328 337 if err := json.Unmarshal(xrpcBytes, &result); err != nil { 329 329 - log.Println("failed to decode XRPC tags response", err) 338 338 + l.Error("failed to decode XRPC tags response", "err", err) 330 339 return nil, err 331 340 } 332 341

+32

appview/repo/blob.go

··· 9 9 "path/filepath" 10 10 "slices" 11 11 "strings" 12 12 + "time" 12 13 13 14 "tangled.org/core/api/tangled" 14 15 "tangled.org/core/appview/config" 16 16 + "tangled.org/core/appview/db" 15 17 "tangled.org/core/appview/models" 16 18 "tangled.org/core/appview/pages" 17 19 "tangled.org/core/appview/pages/markup" 18 20 "tangled.org/core/appview/reporesolver" 19 21 xrpcclient "tangled.org/core/appview/xrpcclient" 22 22 + "tangled.org/core/types" 20 23 21 24 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 22 25 "github.com/go-chi/chi/v5" 26 26 + "github.com/go-git/go-git/v5/plumbing" 23 27 ) 24 28 25 29 // the content can be one of the following: ··· 78 82 79 83 user := rp.oauth.GetMultiAccountUser(r) 80 84 85 85 + // Get email to DID mapping for commit author 86 86 + var emails []string 87 87 + if resp.LastCommit != nil && resp.LastCommit.Author != nil { 88 88 + emails = append(emails, resp.LastCommit.Author.Email) 89 89 + } 90 90 + emailToDidMap, err := db.GetEmailToDid(rp.db, emails, true) 91 91 + if err != nil { 92 92 + l.Error("failed to get email to did mapping", "err", err) 93 93 + emailToDidMap = make(map[string]string) 94 94 + } 95 95 + 96 96 + var lastCommitInfo *types.LastCommitInfo 97 97 + if resp.LastCommit != nil { 98 98 + when, _ := time.Parse(time.RFC3339, resp.LastCommit.When) 99 99 + lastCommitInfo = &types.LastCommitInfo{ 100 100 + Hash: plumbing.NewHash(resp.LastCommit.Hash), 101 101 + Message: resp.LastCommit.Message, 102 102 + When: when, 103 103 + } 104 104 + if resp.LastCommit.Author != nil { 105 105 + lastCommitInfo.Author.Name = resp.LastCommit.Author.Name 106 106 + lastCommitInfo.Author.Email = resp.LastCommit.Author.Email 107 107 + lastCommitInfo.Author.When, _ = time.Parse(time.RFC3339, resp.LastCommit.Author.When) 108 108 + } 109 109 + } 110 110 + 81 111 rp.pages.RepoBlob(w, pages.RepoBlobParams{ 82 112 LoggedInUser: user, 83 113 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 84 114 BreadCrumbs: breadcrumbs, 85 115 BlobView: blobView, 116 116 + EmailToDid: emailToDidMap, 117 117 + LastCommitInfo: lastCommitInfo, 86 118 RepoBlob_Output: resp, 87 119 }) 88 120 }

+1

appview/repo/router.go

··· 23 23 r.Route("/tags", func(r chi.Router) { 24 24 r.Get("/", rp.Tags) 25 25 r.Route("/{tag}", func(r chi.Router) { 26 26 + r.Get("/", rp.Tag) 26 27 r.Get("/download/{file}", rp.DownloadArtifact) 27 28 28 29 // require repo:push to upload or delete artifacts

+58

appview/repo/tags.go

··· 14 14 "tangled.org/core/types" 15 15 16 16 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 17 17 + "github.com/go-chi/chi/v5" 17 18 "github.com/go-git/go-git/v5/plumbing" 18 19 ) 19 20 ··· 70 71 } 71 72 } 72 73 user := rp.oauth.GetMultiAccountUser(r) 74 74 + 73 75 rp.pages.RepoTags(w, pages.RepoTagsParams{ 74 76 LoggedInUser: user, 75 77 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), ··· 78 80 DanglingArtifacts: danglingArtifacts, 79 81 }) 80 82 } 83 83 + 84 84 + func (rp *Repo) Tag(w http.ResponseWriter, r *http.Request) { 85 85 + l := rp.logger.With("handler", "RepoTag") 86 86 + f, err := rp.repoResolver.Resolve(r) 87 87 + if err != nil { 88 88 + l.Error("failed to get repo and knot", "err", err) 89 89 + return 90 90 + } 91 91 + scheme := "http" 92 92 + if !rp.config.Core.Dev { 93 93 + scheme = "https" 94 94 + } 95 95 + host := fmt.Sprintf("%s://%s", scheme, f.Knot) 96 96 + xrpcc := &indigoxrpc.Client{ 97 97 + Host: host, 98 98 + } 99 99 + repo := fmt.Sprintf("%s/%s", f.Did, f.Name) 100 100 + tag := chi.URLParam(r, "tag") 101 101 + 102 102 + xrpcBytes, err := tangled.RepoTag(r.Context(), xrpcc, repo, tag) 103 103 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 104 104 + l.Error("failed to call XRPC repo.tags", "err", xrpcerr) 105 105 + rp.pages.Error503(w) 106 106 + return 107 107 + } 108 108 + var result types.RepoTagResponse 109 109 + if err := json.Unmarshal(xrpcBytes, &result); err != nil { 110 110 + l.Error("failed to decode XRPC response", "err", err) 111 111 + rp.pages.Error503(w) 112 112 + return 113 113 + } 114 114 + 115 115 + filters := []orm.Filter{orm.FilterEq("repo_at", f.RepoAt())} 116 116 + if result.Tag.Tag != nil { 117 117 + filters = append(filters, orm.FilterEq("tag", result.Tag.Tag.Hash[:])) 118 118 + } 119 119 + 120 120 + artifacts, err := db.GetArtifact(rp.db, filters...) 121 121 + if err != nil { 122 122 + l.Error("failed grab artifacts", "err", err) 123 123 + return 124 124 + } 125 125 + // convert artifacts to map for easy UI building 126 126 + artifactMap := make(map[plumbing.Hash][]models.Artifact) 127 127 + for _, a := range artifacts { 128 128 + artifactMap[a.Tag] = append(artifactMap[a.Tag], a) 129 129 + } 130 130 + 131 131 + user := rp.oauth.GetMultiAccountUser(r) 132 132 + rp.pages.RepoTag(w, pages.RepoTagParams{ 133 133 + LoggedInUser: user, 134 134 + RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 135 135 + RepoTagResponse: result, 136 136 + ArtifactMap: artifactMap, 137 137 + }) 138 138 + }

+29

appview/repo/tree.go

··· 8 8 "time" 9 9 10 10 "tangled.org/core/api/tangled" 11 11 + "tangled.org/core/appview/db" 11 12 "tangled.org/core/appview/pages" 12 13 "tangled.org/core/appview/reporesolver" 13 14 xrpcclient "tangled.org/core/appview/xrpcclient" ··· 98 99 } 99 100 sortFiles(result.Files) 100 101 102 102 + // Get email to DID mapping for commit author 103 103 + var emails []string 104 104 + if xrpcResp.LastCommit != nil && xrpcResp.LastCommit.Author != nil { 105 105 + emails = append(emails, xrpcResp.LastCommit.Author.Email) 106 106 + } 107 107 + emailToDidMap, err := db.GetEmailToDid(rp.db, emails, true) 108 108 + if err != nil { 109 109 + l.Error("failed to get email to did mapping", "err", err) 110 110 + emailToDidMap = make(map[string]string) 111 111 + } 112 112 + 113 113 + var lastCommitInfo *types.LastCommitInfo 114 114 + if xrpcResp.LastCommit != nil { 115 115 + when, _ := time.Parse(time.RFC3339, xrpcResp.LastCommit.When) 116 116 + lastCommitInfo = &types.LastCommitInfo{ 117 117 + Hash: plumbing.NewHash(xrpcResp.LastCommit.Hash), 118 118 + Message: xrpcResp.LastCommit.Message, 119 119 + When: when, 120 120 + } 121 121 + if xrpcResp.LastCommit.Author != nil { 122 122 + lastCommitInfo.Author.Name = xrpcResp.LastCommit.Author.Name 123 123 + lastCommitInfo.Author.Email = xrpcResp.LastCommit.Author.Email 124 124 + lastCommitInfo.Author.When, _ = time.Parse(time.RFC3339, xrpcResp.LastCommit.Author.When) 125 125 + } 126 126 + } 127 127 + 101 128 rp.pages.RepoTree(w, pages.RepoTreeParams{ 102 129 LoggedInUser: user, 103 130 BreadCrumbs: breadcrumbs, 104 131 TreePath: treePath, 105 132 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 133 133 + EmailToDid: emailToDidMap, 134 134 + LastCommitInfo: lastCommitInfo, 106 135 RepoTreeResponse: result, 107 136 }) 108 137 }

+2 -7

appview/state/profile.go

··· 550 550 stat0 := r.FormValue("stat0") 551 551 stat1 := r.FormValue("stat1") 552 552 553 553 - if stat0 != "" { 554 554 - profile.Stats[0].Kind = models.VanityStatKind(stat0) 555 555 - } 556 556 - 557 557 - if stat1 != "" { 558 558 - profile.Stats[1].Kind = models.VanityStatKind(stat1) 559 559 - } 553 553 + profile.Stats[0].Kind = models.ParseVanityStatKind(stat0) 554 554 + profile.Stats[1].Kind = models.ParseVanityStatKind(stat1) 560 555 561 556 if err := db.ValidateProfile(s.db, profile); err != nil { 562 557 log.Println("invalid profile", err)

+2 -1

appview/state/state.go

··· 173 173 notifiers = append(notifiers, phnotify.NewPosthogNotifier(posthog)) 174 174 } 175 175 notifiers = append(notifiers, indexer) 176 176 - notifier := notify.NewMergedNotifier(notifiers, tlog.SubLogger(logger, "notify")) 176 176 + notifier := notify.NewMergedNotifier(notifiers) 177 177 + notifier = notify.NewLoggingNotifier(notifier, tlog.SubLogger(logger, "notify")) 177 178 178 179 state := &State{ 179 180 d,

+1 -1

appview/validator/label.go

··· 4 4 "context" 5 5 "fmt" 6 6 "regexp" 7 7 + "slices" 7 8 "strings" 8 9 9 10 "github.com/bluesky-social/indigo/atproto/syntax" 10 10 - "golang.org/x/exp/slices" 11 11 "tangled.org/core/api/tangled" 12 12 "tangled.org/core/appview/models" 13 13 )

-50

cmd/knotmirror/main.go

··· 1 1 - package main 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "log/slog" 6 6 - "os" 7 7 - "os/signal" 8 8 - "syscall" 9 9 - 10 10 - "github.com/carlmjohnson/versioninfo" 11 11 - "github.com/urfave/cli/v3" 12 12 - "tangled.org/core/knotmirror" 13 13 - "tangled.org/core/log" 14 14 - ) 15 15 - 16 16 - func main() { 17 17 - if err := run(os.Args); err != nil { 18 18 - slog.Error("error running knotmirror", "err", err) 19 19 - os.Exit(-1) 20 20 - } 21 21 - } 22 22 - 23 23 - func run(args []string) error { 24 24 - ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM) 25 25 - defer cancel() 26 26 - 27 27 - logger := log.New("knotmirror") 28 28 - slog.SetDefault(logger) 29 29 - ctx = log.IntoContext(ctx, logger) 30 30 - 31 31 - app := cli.Command{ 32 32 - Name: "knotmirror", 33 33 - Usage: "knot mirroring service", 34 34 - Version: versioninfo.Short(), 35 35 - } 36 36 - app.Flags = []cli.Flag{} 37 37 - app.Commands = []*cli.Command{ 38 38 - { 39 39 - Name: "serve", 40 40 - Usage: "run the knotmirror daemon", 41 41 - Action: runKnotMirror, 42 42 - Flags: []cli.Flag{}, 43 43 - }, 44 44 - } 45 45 - return app.Run(ctx, args) 46 46 - } 47 47 - 48 48 - func runKnotMirror(ctx context.Context, cmd *cli.Command) error { 49 49 - return knotmirror.Run(ctx) 50 50 - }

+83

docs/DOCS.md

··· 502 502 Note that you should add a newline at the end if setting a non-empty message 503 503 since the knot won't do this for you. 504 504 505 505 + ## Troubleshooting 506 506 + 507 507 + If you run your own knot, you may run into some of these 508 508 + common issues. You can always join the 509 509 + [IRC](https://web.libera.chat/#tangled) or 510 510 + [Discord](https://chat.tangled.org/) if this section does 511 511 + not help. 512 512 + 513 513 + ### Unable to push 514 514 + 515 515 + If you are unable to push to your knot or repository: 516 516 + 517 517 + 1. First, ensure that you have added your SSH public key to 518 518 + your account 519 519 + 2. Check to see that your knot has synced the key by running 520 520 + `knot keys` 521 521 + 3. Check to see if git is supplying the correct private key 522 522 + when pushing: `GIT_SSH_COMMAND="ssh -v" git push ...` 523 523 + 4. Check to see if `sshd` on the knot is rejecting the push 524 524 + for some reason: `journalctl -xeu ssh` (or `sshd`, 525 525 + depending on your machine). These logs are unavailable if 526 526 + using docker. 527 527 + 5. Check to see if the knot itself is rejecting the push, 528 528 + depending on your setup, the logs might be in one of the 529 529 + following paths: 530 530 + * `/tmp/knotguard.log` 531 531 + * `/home/git/log` 532 532 + * `/home/git/guard.log` 533 533 + 505 534 # Spindles 506 535 507 536 ## Pipelines ··· 1561 1590 Refer to the [jujutsu 1562 1591 documentation](https://jj-vcs.github.io/jj/latest/config/#commit-trailers) 1563 1592 for more information. 1593 1593 + 1594 1594 + # Troubleshooting guide 1595 1595 + 1596 1596 + ## Login issues 1597 1597 + 1598 1598 + Owing to the distributed nature of OAuth on AT Protocol, you 1599 1599 + may run into issues with logging in. If you run a 1600 1600 + self-hosted PDS: 1601 1601 + 1602 1602 + - You may need to ensure that your PDS is timesynced using 1603 1603 + NTP: 1604 1604 + * Enable the `ntpd` service 1605 1605 + * Run `ntpd -qg` to synchronize your clock 1606 1606 + - You may need to increase the default request timeout: 1607 1607 + `NODE_OPTIONS="--network-family-autoselection-attempt-timeout=500"` 1608 1608 + 1609 1609 + ## Empty punchcard 1610 1610 + 1611 1611 + For Tangled to register commits that you make across the 1612 1612 + network, you need to setup one of following: 1613 1613 + 1614 1614 + - The committer email should be a verified email associated 1615 1615 + to your account. You can add and verify emails on the 1616 1616 + settings page. 1617 1617 + - Or, the committer email should be set to your account's 1618 1618 + DID: `git config user.email "did:plc:foobar". You can find 1619 1619 + your account's DID on the settings page 1620 1620 + 1621 1621 + ## Commit is not marked as verified 1622 1622 + 1623 1623 + Presently, Tangled only supports SSH commit signatures. 1624 1624 + 1625 1625 + To sign commits using an SSH key with git: 1626 1626 + 1627 1627 + ``` 1628 1628 + git config --global gpg.format ssh 1629 1629 + git config --global user.signingkey ~/.ssh/tangled-key 1630 1630 + ``` 1631 1631 + 1632 1632 + To sign commits using an SSH key with jj, add this to your 1633 1633 + config: 1634 1634 + 1635 1635 + ``` 1636 1636 + [signing] 1637 1637 + behavior = "own" 1638 1638 + backend = "ssh" 1639 1639 + key = "~/.ssh/tangled-key" 1640 1640 + ``` 1641 1641 + 1642 1642 + ## Self-hosted knot issues 1643 1643 + 1644 1644 + If you need help troubleshooting a self-hosted knot, check 1645 1645 + out the [knot troubleshooting 1646 1646 + guide](/knot-self-hosting-guide.html#troubleshooting).

+1 -1

go.mod

··· 49 49 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc 50 50 gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab 51 51 golang.org/x/crypto v0.40.0 52 52 - golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b 53 52 golang.org/x/image v0.31.0 54 53 golang.org/x/net v0.42.0 55 54 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da ··· 203 202 go.uber.org/atomic v1.11.0 // indirect 204 203 go.uber.org/multierr v1.11.0 // indirect 205 204 go.uber.org/zap v1.27.0 // indirect 205 205 + golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect 206 206 golang.org/x/sync v0.17.0 // indirect 207 207 golang.org/x/sys v0.34.0 // indirect 208 208 golang.org/x/text v0.29.0 // indirect

+9

input.css

··· 175 175 @apply opacity-70; 176 176 } 177 177 178 178 + .prose h1:target, 179 179 + .prose h2:target, 180 180 + .prose h3:target, 181 181 + .prose h4:target, 182 182 + .prose h5:target, 183 183 + .prose h6:target { 184 184 + @apply bg-yellow-200/30 dark:bg-yellow-600/30; 185 185 + } 186 186 + 178 187 .prose a.footnote-backref { 179 188 @apply no-underline; 180 189 }

-23

knotmirror/config/config.go

··· 1 1 - package config 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - 6 6 - "github.com/sethvargo/go-envconfig" 7 7 - ) 8 8 - 9 9 - type Config struct { 10 10 - TapUrl string `env:"MIRROR_TAP_URL, default=http://localhost:2481"` 11 11 - DbPath string `env:"MIRROR_DB_PATH, default=mirror.db"` 12 12 - GitRepoBasePath string `env:"MIRROR_GIT_BASEPATH, default=repos"` 13 13 - KnotUseSSL bool `env:"MIRROR_KNOT_USE_SSL, default=false"` // use SSL for Knot when not schema is not specified 14 14 - ResyncParallelism int `env:"MIRROR_RESYNC_PARALLELISM, default=5"` 15 15 - } 16 16 - 17 17 - func Load(ctx context.Context) (*Config, error) { 18 18 - var cfg Config 19 19 - if err := envconfig.Process(ctx, &cfg); err != nil { 20 20 - return nil, err 21 21 - } 22 22 - return &cfg, nil 23 23 - }

-25

knotmirror/crawler.go

··· 1 1 - package knotmirror 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "database/sql" 6 6 - "log/slog" 7 7 - 8 8 - "tangled.org/core/log" 9 9 - ) 10 10 - 11 11 - type Crawler struct { 12 12 - logger *slog.Logger 13 13 - db *sql.DB 14 14 - } 15 15 - 16 16 - func NewCrawler(l *slog.Logger, db *sql.DB) *Crawler { 17 17 - return &Crawler{ 18 18 - logger: log.SubLogger(l, "crawler"), 19 19 - db: db, 20 20 - } 21 21 - } 22 22 - 23 23 - func (c *Crawler) Run(ctx context.Context) { 24 24 - // TODO: repository crawler 25 25 - }

-67

knotmirror/db/db.go

··· 1 1 - package db 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "database/sql" 6 6 - "fmt" 7 7 - "strings" 8 8 - ) 9 9 - 10 10 - func Make(ctx context.Context, dbPath string) (*sql.DB, error) { 11 11 - // https://github.com/mattn/go-sqlite3#connection-string 12 12 - opts := []string{ 13 13 - "_foreign_keys=1", 14 14 - "_journal_mode=WAL", 15 15 - "_synchronous=NORMAL", 16 16 - "_auto_vacuum=incremental", 17 17 - } 18 18 - 19 19 - db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&")) 20 20 - if err != nil { 21 21 - return nil, err 22 22 - } 23 23 - 24 24 - conn, err := db.Conn(ctx) 25 25 - if err != nil { 26 26 - return nil, err 27 27 - } 28 28 - defer conn.Close() 29 29 - 30 30 - _, err = conn.ExecContext(ctx, ` 31 31 - create table if not exists repos ( 32 32 - did text not null, 33 33 - rkey text not null, 34 34 - at_uri text generated always as ('at://' || did || '/' || 'sh.tangled.repo' || '/' || rkey) stored, 35 35 - cid text not null, 36 36 - 37 37 - -- record content 38 38 - name text not null, 39 39 - knot_domain text not null, 40 40 - 41 41 - -- sync data 42 42 - git_rev text not null, 43 43 - repo_sha text not null, 44 44 - state text not null default 'pending', 45 45 - error_msg text, 46 46 - retry_count integer not null default 0, 47 47 - retry_after integer not null default 0, 48 48 - 49 49 - unique(did, rkey) 50 50 - ); 51 51 - 52 52 - -- knot hosts 53 53 - create table if not exists hosts ( 54 54 - hostname text not null, 55 55 - no_ssl integer not null default 0, 56 56 - status text not null default 'active', 57 57 - last_seq integer not null default -1, 58 58 - 59 59 - unique(hostname) 60 60 - ); 61 61 - `) 62 62 - if err != nil { 63 63 - return nil, fmt.Errorf("initializing db schema: %w", err) 64 64 - } 65 65 - 66 66 - return db, nil 67 67 - }

-38

knotmirror/db/hosts.go

··· 1 1 - package db 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "database/sql" 6 6 - "fmt" 7 7 - 8 8 - "tangled.org/core/knotmirror/models" 9 9 - ) 10 10 - 11 11 - func ListHosts(ctx context.Context, e *sql.DB) ([]models.Host, error) { 12 12 - rows, err := e.QueryContext(ctx, ` 13 13 - select hostname, no_ssl, status, last_seq from hosts 14 14 - where status = 'active'; 15 15 - `) 16 16 - if err != nil { 17 17 - return nil, fmt.Errorf("querying hosts: %w", err) 18 18 - } 19 19 - defer rows.Close() 20 20 - 21 21 - var hosts []models.Host 22 22 - for rows.Next() { 23 23 - var host models.Host 24 24 - if err := rows.Scan( 25 25 - &host.Hostname, 26 26 - &host.NoSSL, 27 27 - &host.Status, 28 28 - &host.LastSeq, 29 29 - ); err != nil { 30 30 - return nil, fmt.Errorf("scanning row: %w", err) 31 31 - } 32 32 - hosts = append(hosts, host) 33 33 - } 34 34 - if err := rows.Err(); err != nil { 35 35 - return nil, fmt.Errorf("scanning rows: %w ", err) 36 36 - } 37 37 - return hosts, nil 38 38 - }

-139

knotmirror/db/repos.go

··· 1 1 - package db 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "database/sql" 6 6 - "fmt" 7 7 - 8 8 - "github.com/bluesky-social/indigo/atproto/syntax" 9 9 - "tangled.org/core/knotmirror/models" 10 10 - ) 11 11 - 12 12 - func UpsertRepo(ctx context.Context, e *sql.DB, repo *models.Repo) error { 13 13 - if _, err := e.ExecContext(ctx, 14 14 - `insert into repos (did, rkey, cid, name, knot_domain, git_rev, repo_sha, state, error_msg, retry_count, retry_after) 15 15 - values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) 16 16 - on conflict(did, rkey) do update set 17 17 - cid = excluded.cid, 18 18 - name = excluded.name, 19 19 - knot_domain = excluded.knot_domain, 20 20 - git_rev = excluded.git_rev, 21 21 - repo_sha = excluded.repo_sha, 22 22 - state = excluded.state, 23 23 - error_msg = excluded.error_msg, 24 24 - retry_count = excluded.retry_count, 25 25 - retry_after = excluded.retry_after 26 26 - on conflict(cid) do nothing`, 27 27 - repo.Did, 28 28 - repo.Rkey, 29 29 - repo.Cid, 30 30 - repo.Name, 31 31 - repo.KnotDomain, 32 32 - repo.GitRev, 33 33 - repo.RepoSha, 34 34 - repo.State, 35 35 - repo.ErrorMsg, 36 36 - repo.RetryCount, 37 37 - repo.RetryAfter, 38 38 - ); err != nil { 39 39 - return fmt.Errorf("upserting repo: %w", err) 40 40 - } 41 41 - return nil 42 42 - } 43 43 - 44 44 - func UpdateRepoState(ctx context.Context, e *sql.DB, did syntax.DID, rkey syntax.RecordKey, state models.RepoState) error { 45 45 - if _, err := e.ExecContext(ctx, 46 46 - `update repos 47 47 - set state = ? 48 48 - where did = ? and rkey = ?`, 49 49 - state, 50 50 - did, rkey, 51 51 - ); err != nil { 52 52 - return fmt.Errorf("updating repo: %w", err) 53 53 - } 54 54 - return nil 55 55 - } 56 56 - 57 57 - func DeleteRepo(ctx context.Context, e *sql.DB, did syntax.DID, rkey syntax.RecordKey) error { 58 58 - if _, err := e.ExecContext(ctx, 59 59 - `delete from repos where did = ? and rkey = ?`, 60 60 - did, 61 61 - rkey, 62 62 - ); err != nil { 63 63 - return fmt.Errorf("deleting repo: %w", err) 64 64 - } 65 65 - return nil 66 66 - } 67 67 - 68 68 - func GetRepoByName(ctx context.Context, e *sql.DB, did syntax.DID, name string) (*models.Repo, error) { 69 69 - var repo models.Repo 70 70 - if err := e.QueryRowContext(ctx, 71 71 - `select 72 72 - did, 73 73 - rkey, 74 74 - cid, 75 75 - name, 76 76 - knot_domain, 77 77 - git_rev, 78 78 - repo_sha, 79 79 - state, 80 80 - error_msg, 81 81 - retry_count, 82 82 - retry_after 83 83 - from repos 84 84 - where did = ? and name = ?`, 85 85 - did, 86 86 - name, 87 87 - ).Scan( 88 88 - &repo.Did, 89 89 - &repo.Rkey, 90 90 - &repo.Cid, 91 91 - &repo.Name, 92 92 - &repo.KnotDomain, 93 93 - &repo.GitRev, 94 94 - &repo.RepoSha, 95 95 - &repo.State, 96 96 - &repo.ErrorMsg, 97 97 - &repo.RetryCount, 98 98 - &repo.RetryAfter, 99 99 - ); err != nil { 100 100 - return nil, fmt.Errorf("querying repo: %w", err) 101 101 - } 102 102 - return &repo, nil 103 103 - } 104 104 - 105 105 - func GetRepoByAtUri(ctx context.Context, e *sql.DB, aturi syntax.ATURI) (*models.Repo, error) { 106 106 - var repo models.Repo 107 107 - if err := e.QueryRowContext(ctx, 108 108 - `select 109 109 - did, 110 110 - rkey, 111 111 - cid, 112 112 - name, 113 113 - knot_domain, 114 114 - git_rev, 115 115 - repo_sha, 116 116 - state, 117 117 - error_msg, 118 118 - retry_count, 119 119 - retry_after 120 120 - from repos 121 121 - where at_uri = ?`, 122 122 - aturi, 123 123 - ).Scan( 124 124 - &repo.Did, 125 125 - &repo.Rkey, 126 126 - &repo.Cid, 127 127 - &repo.Name, 128 128 - &repo.KnotDomain, 129 129 - &repo.GitRev, 130 130 - &repo.RepoSha, 131 131 - &repo.State, 132 132 - &repo.ErrorMsg, 133 133 - &repo.RetryCount, 134 134 - &repo.RetryAfter, 135 135 - ); err != nil { 136 136 - return nil, fmt.Errorf("querying repo: %w", err) 137 137 - } 138 138 - return &repo, nil 139 139 - }

-61

knotmirror/knotmirror.go

··· 1 1 - package knotmirror 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "fmt" 6 6 - "time" 7 7 - 8 8 - "tangled.org/core/knotmirror/config" 9 9 - "tangled.org/core/knotmirror/db" 10 10 - "tangled.org/core/knotmirror/knotstream" 11 11 - "tangled.org/core/log" 12 12 - ) 13 13 - 14 14 - func Run(ctx context.Context) error { 15 15 - logger := log.FromContext(ctx) 16 16 - cfg := loadConfig() 17 17 - 18 18 - db, err := db.Make(ctx, cfg.DbPath) 19 19 - if err != nil { 20 20 - return fmt.Errorf("initializing db: %w", err) 21 21 - } 22 22 - 23 23 - tap := NewTapClient(logger, cfg.TapUrl) 24 24 - knotstream := knotstream.NewKnotStream(logger, db) 25 25 - 26 26 - crawler := NewCrawler(logger, db) 27 27 - 28 28 - resyncer := NewResyncer(logger, db, cfg) 29 29 - 30 30 - // maintain repository list with tap 31 31 - // NOTE: this can be removed once we introduce did-for-repo because then we can just listen to KnotStream for #identity events. 32 32 - tap.Run(ctx) 33 33 - 34 34 - // listen to knotstream (currently we don't have relay for knots, so subscribe every known knots) 35 35 - if err := knotstream.ResubscribeAllHosts(ctx); err != nil { 36 36 - return fmt.Errorf("resubscribing known hosts: %w", err) 37 37 - } 38 38 - 39 39 - // periodically crawl the entire network to mirror the repositories 40 40 - crawler.Run(ctx) 41 41 - 42 42 - resyncer.Run(ctx) 43 43 - 44 44 - logger.Info("startup complete") 45 45 - 46 46 - <-ctx.Done() 47 47 - logger.Info("received shutdown signal", "reason", ctx.Err()) 48 48 - 49 49 - logger.Info("shutting down knotmirror") 50 50 - 51 51 - _, shutdownCancel := context.WithTimeout(context.Background(), 10*time.Second) 52 52 - defer shutdownCancel() 53 53 - // TODO: shutdown logic 54 54 - 55 55 - logger.Info("shutdown complete") 56 56 - return nil 57 57 - } 58 58 - 59 59 - func loadConfig() *config.Config { 60 60 - panic("unimplemented") 61 61 - }

-45

knotmirror/knotstream/knotstream.go

··· 1 1 - package knotstream 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "database/sql" 6 6 - "fmt" 7 7 - "log/slog" 8 8 - "time" 9 9 - 10 10 - "tangled.org/core/knotmirror/db" 11 11 - "tangled.org/core/log" 12 12 - ) 13 13 - 14 14 - type KnotStream struct { 15 15 - logger *slog.Logger 16 16 - db *sql.DB 17 17 - slurper *KnotSlurper 18 18 - } 19 19 - 20 20 - func NewKnotStream(l *slog.Logger, db *sql.DB) *KnotStream { 21 21 - l = log.SubLogger(l, "knotstream") 22 22 - return &KnotStream{ 23 23 - logger: l, 24 24 - db: db, 25 25 - slurper: NewKnotSlurper(l, db), 26 26 - } 27 27 - } 28 28 - 29 29 - func (s *KnotStream) ResubscribeAllHosts(ctx context.Context) error { 30 30 - hosts, err := db.ListHosts(ctx, s.db) 31 31 - if err != nil { 32 32 - return fmt.Errorf("listing hosts: %w", err) 33 33 - } 34 34 - 35 35 - for _, host := range hosts { 36 36 - l := s.logger.With("hostname", host.Hostname) 37 37 - l.Info("re-subscribing to active host") 38 38 - if err := s.slurper.Subscribe(ctx, host); err != nil { 39 39 - l.Warn("failed to re-subscribe to host", "err", err) 40 40 - } 41 41 - // sleep for a very short period, so we don't open tons of sockets at the same time 42 42 - time.Sleep(1 * time.Millisecond) 43 43 - } 44 44 - return nil 45 45 - }

-247

knotmirror/knotstream/slurper.go

··· 1 1 - package knotstream 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "database/sql" 6 6 - "encoding/json" 7 7 - "fmt" 8 8 - "log/slog" 9 9 - "math/rand" 10 10 - "net/http" 11 11 - "time" 12 12 - 13 13 - "github.com/bluesky-social/indigo/atproto/syntax" 14 14 - "github.com/bluesky-social/indigo/util/ssrf" 15 15 - "github.com/carlmjohnson/versioninfo" 16 16 - "github.com/gorilla/websocket" 17 17 - "tangled.org/core/api/tangled" 18 18 - "tangled.org/core/knotmirror/db" 19 19 - "tangled.org/core/knotmirror/models" 20 20 - "tangled.org/core/log" 21 21 - ) 22 22 - 23 23 - type KnotSlurper struct { 24 24 - logger *slog.Logger 25 25 - db *sql.DB 26 26 - concurrency int 27 27 - tskMngr *TaskManager 28 28 - } 29 29 - 30 30 - func NewKnotSlurper(l *slog.Logger, db *sql.DB) *KnotSlurper { 31 31 - return &KnotSlurper{ 32 32 - logger: log.SubLogger(l, "slurper"), 33 33 - db: db, 34 34 - concurrency: 1000, 35 35 - tskMngr: NewTaskManager(l), 36 36 - } 37 37 - } 38 38 - 39 39 - func (s *KnotSlurper) Start(ctx context.Context) { 40 40 - // start parallel workers in background 41 41 - for i := 0; i < s.concurrency; i++ { 42 42 - go s.worker(ctx) 43 43 - } 44 44 - } 45 45 - 46 46 - func (s *KnotSlurper) worker(ctx context.Context) { 47 47 - s.tskMngr.ForEach(ctx, func(task *Task) error { 48 48 - var legacyMessage LegacyGitEvent 49 49 - if err := json.Unmarshal(task.message, &legacyMessage); err != nil { 50 50 - return fmt.Errorf("unmarshaling message: %w", err) 51 51 - } 52 52 - 53 53 - if err := s.ProcessLegacyGitRefUpdate(ctx, &legacyMessage); err != nil { 54 54 - return fmt.Errorf("processing gitRefUpdate: %w", err) 55 55 - } 56 56 - return nil 57 57 - }) 58 58 - } 59 59 - 60 60 - func (s *KnotSlurper) Subscribe(ctx context.Context, host models.Host) error { 61 61 - go s.subscribeWithRedialer(ctx, host) 62 62 - return nil 63 63 - } 64 64 - 65 65 - func (s *KnotSlurper) subscribeWithRedialer(ctx context.Context, host models.Host) { 66 66 - l := s.logger.With("host", host.Hostname) 67 67 - 68 68 - dialer := websocket.Dialer{ 69 69 - HandshakeTimeout: time.Second * 5, 70 70 - } 71 71 - 72 72 - // if this isn't a localhost / private connection, then we should enable SSRF protections 73 73 - if !host.NoSSL { 74 74 - netDialer := ssrf.PublicOnlyDialer() 75 75 - dialer.NetDialContext = netDialer.DialContext 76 76 - } 77 77 - 78 78 - cursor := host.LastSeq 79 79 - 80 80 - // connectedInbound.Inc() 81 81 - // defer connectedInbound.Dec() 82 82 - 83 83 - var backoff int 84 84 - for { 85 85 - select { 86 86 - case <-ctx.Done(): 87 87 - return 88 88 - default: 89 89 - } 90 90 - u := host.LegacyEventsURL(cursor) 91 91 - 92 92 - // NOTE: manual backoff retry implementation to explicitly handle fails 93 93 - hdr := make(http.Header) 94 94 - hdr.Add("User-Agent", userAgent()) 95 95 - conn, resp, err := dialer.DialContext(ctx, u, hdr) 96 96 - if err != nil { 97 97 - l.Warn("dialing failed", "err", err, "backoff", backoff) 98 98 - time.Sleep(sleepForBackoff(backoff)) 99 99 - backoff++ 100 100 - if backoff > 15 { 101 101 - l.Warn("host does not appear to be online, disabling for now") 102 102 - return 103 103 - } 104 104 - continue 105 105 - } 106 106 - 107 107 - l.Debug("knot event subscription response", "code", resp.StatusCode, "url", u) 108 108 - 109 109 - if err := s.handleConnection(ctx, conn, host); err != nil { 110 110 - // TODO: measure the last N connection error times and if they're coming too fast reconnect slower or don't reconnect and wait for requestCrawl 111 111 - l.Warn("host connection failed", "err", err, "backoff", backoff) 112 112 - } 113 113 - 114 114 - // retry 115 115 - // TODO: don't reset backoff when cursor haven't advanced..? 116 116 - backoff = 0 117 117 - } 118 118 - } 119 119 - 120 120 - func (s *KnotSlurper) handleConnection(ctx context.Context, conn *websocket.Conn, host models.Host) error { 121 121 - // schedule ping on every 30s 122 122 - go func() { 123 123 - t := time.NewTicker(30 * time.Second) 124 124 - defer t.Stop() 125 125 - failcount := 0 126 126 - 127 127 - for { 128 128 - select { 129 129 - case <-t.C: 130 130 - if err := conn.WriteControl(websocket.PingMessage, []byte{}, time.Now().Add(time.Second*10)); err != nil { 131 131 - s.logger.Warn("failed to ping", "err", err) 132 132 - failcount++ 133 133 - if failcount >= 4 { 134 134 - s.logger.Error("too many ping fails", "count", failcount) 135 135 - _ = conn.Close() 136 136 - return 137 137 - } 138 138 - } else { 139 139 - failcount = 0 // ok ping 140 140 - } 141 141 - case <-ctx.Done(): 142 142 - _ = conn.Close() 143 143 - return 144 144 - } 145 145 - } 146 146 - }() 147 147 - 148 148 - conn.SetPingHandler(func(message string) error { 149 149 - err := conn.WriteControl(websocket.PongMessage, []byte(message), time.Now().Add(time.Minute)) 150 150 - if err == websocket.ErrCloseSent { 151 151 - return nil 152 152 - } 153 153 - return err 154 154 - }) 155 155 - conn.SetPongHandler(func(_ string) error { 156 156 - if err := conn.SetReadDeadline(time.Now().Add(time.Minute)); err != nil { 157 157 - s.logger.Error("failed to set read deadline", "err", err) 158 158 - } 159 159 - return nil 160 160 - }) 161 161 - 162 162 - for { 163 163 - select { 164 164 - case <-ctx.Done(): 165 165 - return ctx.Err() 166 166 - default: 167 167 - } 168 168 - msgType, msg, err := conn.ReadMessage() 169 169 - if err != nil { 170 170 - return err 171 171 - } 172 172 - 173 173 - if msgType != websocket.TextMessage { 174 174 - continue 175 175 - } 176 176 - 177 177 - s.tskMngr.AddTask(ctx, &Task{ 178 178 - key: host.Hostname, // TODO: replace to repository AT-URI for better concurrency 179 179 - message: msg, 180 180 - }) 181 181 - } 182 182 - } 183 183 - 184 184 - type LegacyGitEvent struct { 185 185 - Rkey string 186 186 - Nsid string 187 187 - Event tangled.GitRefUpdate 188 188 - } 189 189 - 190 190 - func (s *KnotSlurper) ProcessLegacyGitRefUpdate(ctx context.Context, evt *LegacyGitEvent) error { 191 191 - curr, err := db.GetRepoByName(ctx, s.db, syntax.DID(evt.Event.RepoDid), evt.Event.RepoName) 192 192 - if err != nil { 193 193 - return err 194 194 - } 195 195 - repoAt := curr.AtUri() 196 196 - if curr == nil { 197 197 - // if repo doesn't exist in DB, just ignore the event. That repo is unknown. 198 198 - // 199 199 - // Normally did+name is already enough to perform git-fetch as that's 200 200 - // what needed to fetch the repository. 201 201 - // But we want to store that in did/rkey in knot-mirror. 202 202 - // Therefore, we should ignore when the repository is unknown. 203 203 - // Hopefully crawler will sync it later. 204 204 - s.logger.Warn("skipping event from unknown repo", "repoAt", repoAt) 205 205 - return nil 206 206 - } 207 207 - 208 208 - // TODO: should plan resync to resyncBuffer on RepoStateResyncing 209 209 - if curr.State != models.RepoStateActive { 210 210 - s.logger.Debug("skipping non-active repo", "repoAt", repoAt) 211 211 - // firehoseEventsSkipped.Inc() 212 212 - return nil 213 213 - } 214 214 - 215 215 - if curr.GitRev != "" && evt.Rkey <= curr.GitRev.String() { 216 216 - s.logger.Debug("skipping replayed event", "repoAt", repoAt, "eventRev", evt.Rkey, "currentRev", curr.GitRev) 217 217 - // firehoseEventsSkipped.Inc() 218 218 - return nil 219 219 - } 220 220 - 221 221 - // if curr.State == models.RepoStateResyncing { 222 222 - // firehoseEventsSkipped.Inc() 223 223 - // return fp.events.addToResyncBuffer(ctx, commit) 224 224 - // } 225 225 - 226 226 - // can't skip anything, update repo state 227 227 - if err := db.UpdateRepoState(ctx, s.db, curr.Did, curr.Rkey, models.RepoStateDesynchronized); err != nil { 228 228 - return err 229 229 - } 230 230 - 231 231 - // firehoseEventsProcessed.Inc() 232 232 - return nil 233 233 - } 234 234 - 235 235 - func userAgent() string { 236 236 - return fmt.Sprintf("knotmirror/%s", versioninfo.Short()) 237 237 - } 238 238 - 239 239 - func sleepForBackoff(b int) time.Duration { 240 240 - if b == 0 { 241 241 - return 0 242 242 - } 243 243 - if b < 10 { 244 244 - return (time.Duration(b) * 2) + (time.Millisecond * time.Duration(rand.Intn(1000))) 245 245 - } 246 246 - return time.Second * 30 247 247 - }

-79

knotmirror/knotstream/taskmanager.go

··· 1 1 - package knotstream 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "log/slog" 6 6 - "sync" 7 7 - 8 8 - "tangled.org/core/log" 9 9 - ) 10 10 - 11 11 - type TaskManager struct { 12 12 - logger *slog.Logger 13 13 - lk sync.Mutex 14 14 - feeder chan *Task 15 15 - scheduled map[string][]*Task 16 16 - } 17 17 - 18 18 - type Task struct { 19 19 - key string 20 20 - message []byte 21 21 - } 22 22 - 23 23 - func NewTaskManager(l *slog.Logger) *TaskManager { 24 24 - return &TaskManager{ 25 25 - logger: log.SubLogger(l, "taskmanager"), 26 26 - feeder: make(chan *Task), 27 27 - scheduled: make(map[string][]*Task), 28 28 - } 29 29 - } 30 30 - 31 31 - func (m *TaskManager) AddTask(ctx context.Context, task *Task) { 32 32 - m.lk.Lock() 33 33 - if st, ok := m.scheduled[task.key]; ok { 34 34 - // schedule task 35 35 - m.scheduled[task.key] = append(st, task) 36 36 - m.lk.Unlock() 37 37 - return 38 38 - } 39 39 - m.scheduled[task.key] = []*Task{} 40 40 - m.lk.Unlock() 41 41 - 42 42 - select { 43 43 - case <-ctx.Done(): 44 44 - return 45 45 - case m.feeder <- task: 46 46 - return 47 47 - } 48 48 - } 49 49 - 50 50 - func (m *TaskManager) ForEach(ctx context.Context, fn func(task *Task) error) { 51 51 - for task := range m.feeder { 52 52 - for task != nil { 53 53 - select { 54 54 - case <-ctx.Done(): 55 55 - return 56 56 - default: 57 57 - } 58 58 - if err := fn(task); err != nil { 59 59 - m.logger.Error("event handler failed", "err", err) 60 60 - } 61 61 - 62 62 - m.lk.Lock() 63 63 - func() { 64 64 - rem, ok := m.scheduled[task.key] 65 65 - if !ok { 66 66 - m.logger.Error("should always have an 'active' entry if a worker is processing a job") 67 67 - } 68 68 - if len(rem) == 0 { 69 69 - delete(m.scheduled, task.key) 70 70 - task = nil 71 71 - } else { 72 72 - task = rem[0] 73 73 - m.scheduled[task.key] = rem[1:] 74 74 - } 75 75 - }() 76 76 - m.lk.Unlock() 77 77 - } 78 78 - } 79 79 - }

-79

knotmirror/models/models.go

··· 1 1 - package models 2 2 - 3 3 - import ( 4 4 - "fmt" 5 5 - 6 6 - "github.com/bluesky-social/indigo/atproto/syntax" 7 7 - "tangled.org/core/api/tangled" 8 8 - ) 9 9 - 10 10 - type Repo struct { 11 11 - Did syntax.DID 12 12 - Rkey syntax.RecordKey 13 13 - Cid *syntax.CID 14 14 - // content of tangled.Repo 15 15 - Name string 16 16 - KnotDomain string 17 17 - 18 18 - GitRev syntax.TID // last processed git.refUpdate revision 19 19 - RepoSha string // sha256 sum of git refs (to avoid no-op git fetch) 20 20 - State RepoState 21 21 - ErrorMsg string 22 22 - RetryCount int 23 23 - RetryAfter int64 // Unix timestamp (seconds) 24 24 - } 25 25 - 26 26 - func (r *Repo) AtUri() syntax.ATURI { 27 27 - return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", r.Did, tangled.RepoNSID, r.Rkey)) 28 28 - } 29 29 - 30 30 - type RepoState string 31 31 - 32 32 - const ( 33 33 - RepoStatePending RepoState = "pending" 34 34 - RepoStateDesynchronized RepoState = "desynchronized" 35 35 - RepoStateResyncing RepoState = "resyncing" 36 36 - RepoStateActive RepoState = "active" 37 37 - RepoStateError RepoState = "error" 38 38 - ) 39 39 - 40 40 - type Host struct { 41 41 - Hostname string 42 42 - NoSSL bool 43 43 - Status HostStatus 44 44 - LastSeq int64 45 45 - } 46 46 - 47 47 - type HostStatus string 48 48 - 49 49 - const ( 50 50 - HostStatusActive HostStatus = "active" 51 51 - HostStatusIdle HostStatus = "idle" 52 52 - HostStatusOffline HostStatus = "offline" 53 53 - HostStatusThrottled HostStatus = "throttled" 54 54 - HostStatusBanned HostStatus = "banned" 55 55 - ) 56 56 - 57 57 - // func (h *Host) SubscribeGitRefsURL(cursor int64) string { 58 58 - // scheme := "wss" 59 59 - // if h.NoSSL { 60 60 - // scheme = "ws" 61 61 - // } 62 62 - // u := fmt.Sprintf("%s://%s/xrpc/%s", scheme, h.Hostname, tangled.SubscribeGitRefsNSID) 63 63 - // if cursor > 0 { 64 64 - // u = fmt.Sprintf("%s?cursor=%d", u, h.LastSeq) 65 65 - // } 66 66 - // return u 67 67 - // } 68 68 - 69 69 - func (h *Host) LegacyEventsURL(cursor int64) string { 70 70 - scheme := "wss" 71 71 - if h.NoSSL { 72 72 - scheme = "ws" 73 73 - } 74 74 - u := fmt.Sprintf("%s://%s/events", scheme, h.Hostname) 75 75 - if cursor > 0 { 76 76 - u = fmt.Sprintf("%s?cursor=%d", u, h.LastSeq) 77 77 - } 78 78 - return u 79 79 - }

-8

knotmirror/readme.md

··· 1 1 - # KnotMirror 2 2 - 3 3 - Mirror of all known repos. Heavily inspired by [indigo/relay] and [indigo/tap]. 4 4 - 5 5 - Knot Mirror syncs repo list using tap and subscribe to all known knots as KnotStream. 6 6 - 7 7 - [indigo/relay]: https://github.com/bluesky-social/indigo/tree/main/cmd/relay 8 8 - [indigo/tap]: https://github.com/bluesky-social/indigo/tree/main/cmd/tap

-241

knotmirror/resyncer.go

··· 1 1 - package knotmirror 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "database/sql" 6 6 - "errors" 7 7 - "fmt" 8 8 - "log/slog" 9 9 - "math/rand" 10 10 - "net/url" 11 11 - "path" 12 12 - "sync" 13 13 - "time" 14 14 - 15 15 - "github.com/bluesky-social/indigo/atproto/syntax" 16 16 - "github.com/go-git/go-git/v5" 17 17 - gitconfig "github.com/go-git/go-git/v5/config" 18 18 - "tangled.org/core/knotmirror/config" 19 19 - "tangled.org/core/knotmirror/db" 20 20 - "tangled.org/core/knotmirror/models" 21 21 - "tangled.org/core/log" 22 22 - ) 23 23 - 24 24 - type Resyncer struct { 25 25 - logger *slog.Logger 26 26 - db *sql.DB 27 27 - 28 28 - claimJobMu sync.Mutex 29 29 - 30 30 - repoBasePath string 31 31 - repoFetchTimeout time.Duration 32 32 - knotUseSSL bool 33 33 - 34 34 - parallelism int 35 35 - } 36 36 - 37 37 - func NewResyncer(l *slog.Logger, db *sql.DB, cfg *config.Config) *Resyncer { 38 38 - return &Resyncer{ 39 39 - logger: log.SubLogger(l, "resyncer"), 40 40 - db: db, 41 41 - repoBasePath: cfg.GitRepoBasePath, 42 42 - repoFetchTimeout: 300 * time.Second, 43 43 - knotUseSSL: cfg.KnotUseSSL, 44 44 - parallelism: cfg.ResyncParallelism, 45 45 - } 46 46 - } 47 47 - 48 48 - func (r *Resyncer) Run(ctx context.Context) { 49 49 - for i := 0; i < r.parallelism; i++ { 50 50 - go r.runResyncWorker(ctx, i) 51 51 - } 52 52 - } 53 53 - 54 54 - func (r *Resyncer) runResyncWorker(ctx context.Context, workerID int) { 55 55 - l := r.logger.With("worker", workerID) 56 56 - for { 57 57 - select { 58 58 - case <-ctx.Done(): 59 59 - l.Info("resync worker shutting down", "error", ctx.Err()) 60 60 - return 61 61 - default: 62 62 - } 63 63 - repoAt, found, err := r.claimResyncJob(ctx) 64 64 - if err != nil { 65 65 - l.Error("failed to claim resync job", "error", err) 66 66 - time.Sleep(time.Second) 67 67 - continue 68 68 - } 69 69 - if !found { 70 70 - time.Sleep(time.Second) 71 71 - continue 72 72 - } 73 73 - l.Info("processing resync", "aturi", repoAt) 74 74 - if err := r.resyncRepo(ctx, repoAt); err != nil { 75 75 - l.Error("resync failed", "aturi", repoAt, "error", err) 76 76 - } 77 77 - } 78 78 - } 79 79 - 80 80 - func (r *Resyncer) claimResyncJob(ctx context.Context) (syntax.ATURI, bool, error) { 81 81 - // use mutex to prevent duplicated jobs 82 82 - r.claimJobMu.Lock() 83 83 - defer r.claimJobMu.Unlock() 84 84 - 85 85 - var repoAt syntax.ATURI 86 86 - now := time.Now().Unix() 87 87 - if err := r.db.QueryRowContext(ctx, 88 88 - `update repos 89 89 - set state = ? 90 90 - where at_uri = ( 91 91 - select at_uri from repos 92 92 - where state in (?, ?, ?) 93 93 - and (retry_after = 0 or retry_after < ?) 94 94 - limit 1 95 95 - ) 96 96 - returning at_uri 97 97 - `, 98 98 - models.RepoStateResyncing, 99 99 - models.RepoStatePending, models.RepoStateDesynchronized, models.RepoStateError, 100 100 - now, 101 101 - ).Scan(&repoAt); err != nil { 102 102 - if errors.Is(err, sql.ErrNoRows) { 103 103 - return "", false, nil 104 104 - } 105 105 - return "", false, err 106 106 - } 107 107 - 108 108 - return repoAt, true, nil 109 109 - } 110 110 - 111 111 - func (r *Resyncer) resyncRepo(ctx context.Context, repoAt syntax.ATURI) error { 112 112 - // ctx, span := tracer.Start(ctx, "resyncDid") 113 113 - // span.SetAttributes(attribute.String("did", did)) 114 114 - // defer span.End() 115 115 - // 116 116 - // resyncsStarted.Inc() 117 117 - // startTime := time.Now() 118 118 - 119 119 - r.logger.Info("starting resync", "aturi", repoAt) 120 120 - 121 121 - success, err := r.doResync(ctx, repoAt) 122 122 - if !success { 123 123 - // resyncsFailed.Inc() 124 124 - // resyncDuration.Observe(time.Since(startTime).Seconds()) 125 125 - return r.handleResyncError(ctx, repoAt, err) 126 126 - } 127 127 - 128 128 - // resyncsCompleted.Inc() 129 129 - // resyncDuration.Observe(time.Since(startTime).Seconds()) 130 130 - 131 131 - return nil 132 132 - } 133 133 - 134 134 - func (r *Resyncer) doResync(ctx context.Context, repoAt syntax.ATURI) (bool, error) { 135 135 - // ctx, span := tracer.Start(ctx, "doResync") 136 136 - // span.SetAttributes(attribute.String("did", did)) 137 137 - // defer span.End() 138 138 - 139 139 - repo, err := db.GetRepoByAtUri(ctx, r.db, repoAt) 140 140 - if err != nil { 141 141 - return false, fmt.Errorf("failed to get repo: %w", err) 142 142 - } 143 143 - 144 144 - repoPath := r.repoPath(repo) 145 145 - remoteUrl := r.repoRemoteURL(repo) 146 146 - 147 147 - // TODO: check if Knot is on backoff list. If so, return (false, nil) 148 148 - // TODO: use r.repoFetchTimeout on fetch 149 149 - 150 150 - // TODO: detect rate limit error (http.StatusTooManyRequests) to put Knot in backoff list 151 151 - gr, err := git.PlainOpen(repoPath) 152 152 - if errors.Is(err, git.ErrRepositoryNotExists) { 153 153 - // if err := exec.Command("git", "clone", "--mirror", remoteUrl, repoPath).Run(); err != nil { 154 154 - // return false, fmt.Errorf("cloning repo: %w", err) 155 155 - // } 156 156 - _, err := git.PlainCloneContext(ctx, repoPath, true, &git.CloneOptions{ 157 157 - URL: remoteUrl, 158 158 - Mirror: true, 159 159 - }) 160 160 - if err != nil { 161 161 - return false, fmt.Errorf("cloning repo: %w", err) 162 162 - } 163 163 - } else { 164 164 - // if err := exec.Command("git", "-C", repoPath, "fetch", "--mirror", remoteUrl).Run(); err != nil { 165 165 - // return false, fmt.Errorf("fetching repo: %w", err) 166 166 - // } 167 167 - if err != nil { 168 168 - return false, fmt.Errorf("laoding repo: %w", err) 169 169 - } 170 170 - if err := gr.FetchContext(ctx, &git.FetchOptions{ 171 171 - RemoteURL: remoteUrl, 172 172 - RefSpecs: []gitconfig.RefSpec{gitconfig.RefSpec("+refs/*:refs/*")}, 173 173 - Force: true, 174 174 - Prune: true, 175 175 - }); err != nil { 176 176 - return false, fmt.Errorf("fetching reppo: %w", err) 177 177 - } 178 178 - } 179 179 - 180 180 - // repo.GitRev = <processed git.refUpdate revision> 181 181 - // repo.RepoSha = <sha256 sum of git refs> 182 182 - repo.State = models.RepoStateActive 183 183 - repo.ErrorMsg = "" 184 184 - repo.RetryCount = 0 185 185 - repo.RetryAfter = 0 186 186 - if err := db.UpsertRepo(ctx, r.db, repo); err != nil { 187 187 - return false, fmt.Errorf("updating repo state to active %w", err) 188 188 - } 189 189 - return true, nil 190 190 - } 191 191 - 192 192 - func (r *Resyncer) handleResyncError(ctx context.Context, repoAt syntax.ATURI, err error) error { 193 193 - var state models.RepoState 194 194 - var errMsg string 195 195 - if err == nil { 196 196 - state = models.RepoStateDesynchronized 197 197 - errMsg = "" 198 198 - } else { 199 199 - state = models.RepoStateError 200 200 - errMsg = err.Error() 201 201 - } 202 202 - 203 203 - repo, err := db.GetRepoByAtUri(ctx, r.db, repoAt) 204 204 - if err != nil { 205 205 - return err 206 206 - } 207 207 - 208 208 - // start a 1 min & go up to 1 hr between retries 209 209 - retryAfter := time.Now().Add(backoff(repo.RetryCount, 60) * 60) 210 210 - 211 211 - repo.State = state 212 212 - repo.ErrorMsg = errMsg 213 213 - repo.RetryCount = repo.RetryCount + 1 214 214 - repo.RetryAfter = retryAfter.Unix() 215 215 - if dbErr := db.UpsertRepo(ctx, r.db, repo); dbErr != nil { 216 216 - return dbErr 217 217 - } 218 218 - return err 219 219 - } 220 220 - 221 221 - func (r *Resyncer) repoPath(repo *models.Repo) string { 222 222 - return path.Join(r.repoBasePath, repo.Did.String(), repo.Rkey.String()) 223 223 - } 224 224 - 225 225 - func (r *Resyncer) repoRemoteURL(repo *models.Repo) string { 226 226 - u, _ := url.Parse(repo.KnotDomain) 227 227 - if u.Scheme == "" { 228 228 - if r.knotUseSSL { 229 229 - u.Scheme = "https" 230 230 - } else { 231 231 - u.Scheme = "http" 232 232 - } 233 233 - } 234 234 - return u.String() 235 235 - } 236 236 - 237 237 - func backoff(retries int, max int) time.Duration { 238 238 - dur := min(1<<retries, max) 239 239 - jitter := time.Millisecond * time.Duration(rand.Intn(1000)) 240 240 - return time.Second*time.Duration(dur) + jitter 241 241 - }

-78

knotmirror/tapclient.go

··· 1 1 - package knotmirror 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "database/sql" 6 6 - "encoding/json" 7 7 - "fmt" 8 8 - "log/slog" 9 9 - 10 10 - "tangled.org/core/api/tangled" 11 11 - "tangled.org/core/knotmirror/db" 12 12 - "tangled.org/core/knotmirror/models" 13 13 - "tangled.org/core/log" 14 14 - "tangled.org/core/tap" 15 15 - ) 16 16 - 17 17 - type Tap struct { 18 18 - logger *slog.Logger 19 19 - tap tap.Client 20 20 - db *sql.DB 21 21 - } 22 22 - 23 23 - func NewTapClient(l *slog.Logger, tapUrl string) *Tap { 24 24 - return &Tap{ 25 25 - logger: log.SubLogger(l, "tapclient"), 26 26 - tap: tap.NewClient(tapUrl, ""), 27 27 - } 28 28 - } 29 29 - 30 30 - func (t *Tap) Run(ctx context.Context) { 31 31 - go t.tap.Connect(ctx, &tap.SimpleIndexer{ 32 32 - EventHandler: t.processEvent, 33 33 - }) 34 34 - } 35 35 - 36 36 - func (t *Tap) processEvent(ctx context.Context, evt tap.Event) error { 37 37 - l := t.logger.With("component", "tapIndexer") 38 38 - 39 39 - var err error 40 40 - switch evt.Type { 41 41 - case tap.EvtRecord: 42 42 - switch evt.Record.Collection.String() { 43 43 - case tangled.RepoNSID: 44 44 - err = t.processRepo(ctx, evt.Record) 45 45 - } 46 46 - } 47 47 - 48 48 - if err != nil { 49 49 - l.Error("failed to process message. will retry later", "event.ID", evt.ID, "err", err) 50 50 - return err 51 51 - } 52 52 - return nil 53 53 - } 54 54 - 55 55 - func (t *Tap) processRepo(ctx context.Context, evt *tap.RecordEventData) error { 56 56 - switch evt.Action { 57 57 - case tap.RecordCreateAction, tap.RecordUpdateAction: 58 58 - record := tangled.Repo{} 59 59 - if err := json.Unmarshal(evt.Record, &record); err != nil { 60 60 - return fmt.Errorf("parsing record: %w", err) 61 61 - } 62 62 - 63 63 - if err := db.UpsertRepo(ctx, t.db, &models.Repo{ 64 64 - Did: evt.Did, 65 65 - Rkey: evt.Rkey, 66 66 - Cid: evt.CID, 67 67 - Name: record.Name, 68 68 - KnotDomain: record.Knot, 69 69 - }); err != nil { 70 70 - return fmt.Errorf("upserting repo to db: %w", err) 71 71 - } 72 72 - case tap.RecordDeleteAction: 73 73 - if err := db.DeleteRepo(ctx, t.db, evt.Did, evt.Rkey); err != nil { 74 74 - return fmt.Errorf("deleting repo from db: %w", err) 75 75 - } 76 76 - } 77 77 - return nil 78 78 - }

+46 -3

knotserver/git/branch.go

··· 12 12 "tangled.org/core/types" 13 13 ) 14 14 15 15 - func (g *GitRepo) Branches() ([]types.Branch, error) { 15 15 + type BranchesOptions struct { 16 16 + Limit int 17 17 + Offset int 18 18 + } 19 19 + 20 20 + func (g *GitRepo) Branches(opts *BranchesOptions) ([]types.Branch, error) { 21 21 + if opts == nil { 22 22 + opts = &BranchesOptions{} 23 23 + } 24 24 + 16 25 fields := []string{ 17 26 "refname:short", 18 27 "objectname", ··· 33 42 if i != 0 { 34 43 outFormat.WriteString(fieldSeparator) 35 44 } 36 36 - outFormat.WriteString(fmt.Sprintf("%%(%s)", f)) 45 45 + fmt.Fprintf(&outFormat, "%%(%s)", f) 37 46 } 38 47 outFormat.WriteString("") 39 48 outFormat.WriteString(recordSeparator) 40 49 41 41 - output, err := g.forEachRef(outFormat.String(), "refs/heads") 50 50 + args := []string{outFormat.String(), "--sort=-creatordate"} 51 51 + 52 52 + // only add the count if the limit is a non-zero value, 53 53 + // if it is zero, get as many tags as we can 54 54 + if opts.Limit > 0 { 55 55 + args = append(args, fmt.Sprintf("--count=%d", opts.Offset+opts.Limit)) 56 56 + } 57 57 + 58 58 + args = append(args, "refs/heads") 59 59 + 60 60 + output, err := g.forEachRef(args...) 42 61 if err != nil { 43 62 return nil, fmt.Errorf("failed to get branches: %w", err) 44 63 } ··· 48 67 return nil, nil 49 68 } 50 69 70 70 + startIdx := opts.Offset 71 71 + if startIdx >= len(records) { 72 72 + return nil, nil 73 73 + } 74 74 + 75 75 + endIdx := len(records) 76 76 + if opts.Limit > 0 { 77 77 + endIdx = min(startIdx+opts.Limit, len(records)) 78 78 + } 79 79 + 80 80 + records = records[startIdx:endIdx] 51 81 branches := make([]types.Branch, 0, len(records)) 52 82 53 83 // ignore errors here ··· 109 139 110 140 slices.Reverse(branches) 111 141 return branches, nil 142 142 + } 143 143 + 144 144 + func (g *GitRepo) Branch(name string) (*plumbing.Reference, error) { 145 145 + ref, err := g.r.Reference(plumbing.NewBranchReferenceName(name), false) 146 146 + if err != nil { 147 147 + return nil, fmt.Errorf("branch: %w", err) 148 148 + } 149 149 + 150 150 + if !ref.Name().IsBranch() { 151 151 + return nil, fmt.Errorf("branch: %s is not a branch", ref.Name()) 152 152 + } 153 153 + 154 154 + return ref, nil 112 155 } 113 156 114 157 func (g *GitRepo) DeleteBranch(branch string) error {

+355

knotserver/git/branch_test.go

··· 1 1 + package git 2 2 + 3 3 + import ( 4 4 + "path/filepath" 5 5 + "slices" 6 6 + "testing" 7 7 + 8 8 + gogit "github.com/go-git/go-git/v5" 9 9 + "github.com/go-git/go-git/v5/plumbing" 10 10 + "github.com/stretchr/testify/assert" 11 11 + "github.com/stretchr/testify/require" 12 12 + "github.com/stretchr/testify/suite" 13 13 + 14 14 + "tangled.org/core/sets" 15 15 + ) 16 16 + 17 17 + type BranchSuite struct { 18 18 + suite.Suite 19 19 + *RepoSuite 20 20 + } 21 21 + 22 22 + func TestBranchSuite(t *testing.T) { 23 23 + t.Parallel() 24 24 + suite.Run(t, new(BranchSuite)) 25 25 + } 26 26 + 27 27 + func (s *BranchSuite) SetupTest() { 28 28 + s.RepoSuite = NewRepoSuite(s.T()) 29 29 + } 30 30 + 31 31 + func (s *BranchSuite) TearDownTest() { 32 32 + s.RepoSuite.cleanup() 33 33 + } 34 34 + 35 35 + func (s *BranchSuite) setupRepoWithBranches() { 36 36 + s.init() 37 37 + 38 38 + // get the initial commit on master 39 39 + head, err := s.repo.r.Head() 40 40 + require.NoError(s.T(), err) 41 41 + initialCommit := head.Hash() 42 42 + 43 43 + // create multiple branches with commits 44 44 + // branch-1 45 45 + s.createBranch("branch-1", initialCommit) 46 46 + s.checkoutBranch("branch-1") 47 47 + _ = s.commitFile("file1.txt", "content 1", "Add file1 on branch-1") 48 48 + 49 49 + // branch-2 50 50 + s.createBranch("branch-2", initialCommit) 51 51 + s.checkoutBranch("branch-2") 52 52 + _ = s.commitFile("file2.txt", "content 2", "Add file2 on branch-2") 53 53 + 54 54 + // branch-3 55 55 + s.createBranch("branch-3", initialCommit) 56 56 + s.checkoutBranch("branch-3") 57 57 + _ = s.commitFile("file3.txt", "content 3", "Add file3 on branch-3") 58 58 + 59 59 + // branch-4 60 60 + s.createBranch("branch-4", initialCommit) 61 61 + s.checkoutBranch("branch-4") 62 62 + s.commitFile("file4.txt", "content 4", "Add file4 on branch-4") 63 63 + 64 64 + // back to master and make a commit 65 65 + s.checkoutBranch("master") 66 66 + s.commitFile("master-file.txt", "master content", "Add file on master") 67 67 + 68 68 + // verify we have multiple branches 69 69 + refs, err := s.repo.r.References() 70 70 + require.NoError(s.T(), err) 71 71 + 72 72 + branchCount := 0 73 73 + err = refs.ForEach(func(ref *plumbing.Reference) error { 74 74 + if ref.Name().IsBranch() { 75 75 + branchCount++ 76 76 + } 77 77 + return nil 78 78 + }) 79 79 + require.NoError(s.T(), err) 80 80 + 81 81 + // we should have 5 branches: master, branch-1, branch-2, branch-3, branch-4 82 82 + assert.Equal(s.T(), 5, branchCount, "expected 5 branches") 83 83 + } 84 84 + 85 85 + func (s *BranchSuite) TestBranches_All() { 86 86 + s.setupRepoWithBranches() 87 87 + 88 88 + branches, err := s.repo.Branches(&BranchesOptions{}) 89 89 + require.NoError(s.T(), err) 90 90 + 91 91 + assert.Len(s.T(), branches, 5, "expected 5 branches") 92 92 + 93 93 + expectedBranches := sets.Collect(slices.Values([]string{ 94 94 + "master", 95 95 + "branch-1", 96 96 + "branch-2", 97 97 + "branch-3", 98 98 + "branch-4", 99 99 + })) 100 100 + 101 101 + for _, branch := range branches { 102 102 + assert.True(s.T(), expectedBranches.Contains(branch.Reference.Name), 103 103 + "unexpected branch: %s", branch.Reference.Name) 104 104 + assert.NotEmpty(s.T(), branch.Reference.Hash, "branch hash should not be empty") 105 105 + assert.NotNil(s.T(), branch.Commit, "branch commit should not be nil") 106 106 + } 107 107 + } 108 108 + 109 109 + func (s *BranchSuite) TestBranches_WithLimit() { 110 110 + s.setupRepoWithBranches() 111 111 + 112 112 + tests := []struct { 113 113 + name string 114 114 + limit int 115 115 + expectedCount int 116 116 + }{ 117 117 + { 118 118 + name: "limit 1", 119 119 + limit: 1, 120 120 + expectedCount: 1, 121 121 + }, 122 122 + { 123 123 + name: "limit 2", 124 124 + limit: 2, 125 125 + expectedCount: 2, 126 126 + }, 127 127 + { 128 128 + name: "limit 3", 129 129 + limit: 3, 130 130 + expectedCount: 3, 131 131 + }, 132 132 + { 133 133 + name: "limit 10 (more than available)", 134 134 + limit: 10, 135 135 + expectedCount: 5, 136 136 + }, 137 137 + } 138 138 + 139 139 + for _, tt := range tests { 140 140 + s.Run(tt.name, func() { 141 141 + branches, err := s.repo.Branches(&BranchesOptions{ 142 142 + Limit: tt.limit, 143 143 + }) 144 144 + require.NoError(s.T(), err) 145 145 + assert.Len(s.T(), branches, tt.expectedCount, "expected %d branches", tt.expectedCount) 146 146 + }) 147 147 + } 148 148 + } 149 149 + 150 150 + func (s *BranchSuite) TestBranches_WithOffset() { 151 151 + s.setupRepoWithBranches() 152 152 + 153 153 + tests := []struct { 154 154 + name string 155 155 + offset int 156 156 + expectedCount int 157 157 + }{ 158 158 + { 159 159 + name: "offset 0", 160 160 + offset: 0, 161 161 + expectedCount: 5, 162 162 + }, 163 163 + { 164 164 + name: "offset 1", 165 165 + offset: 1, 166 166 + expectedCount: 4, 167 167 + }, 168 168 + { 169 169 + name: "offset 2", 170 170 + offset: 2, 171 171 + expectedCount: 3, 172 172 + }, 173 173 + { 174 174 + name: "offset 4", 175 175 + offset: 4, 176 176 + expectedCount: 1, 177 177 + }, 178 178 + { 179 179 + name: "offset 5 (all skipped)", 180 180 + offset: 5, 181 181 + expectedCount: 0, 182 182 + }, 183 183 + { 184 184 + name: "offset 10 (more than available)", 185 185 + offset: 10, 186 186 + expectedCount: 0, 187 187 + }, 188 188 + } 189 189 + 190 190 + for _, tt := range tests { 191 191 + s.Run(tt.name, func() { 192 192 + branches, err := s.repo.Branches(&BranchesOptions{ 193 193 + Offset: tt.offset, 194 194 + }) 195 195 + require.NoError(s.T(), err) 196 196 + assert.Len(s.T(), branches, tt.expectedCount, "expected %d branches", tt.expectedCount) 197 197 + }) 198 198 + } 199 199 + } 200 200 + 201 201 + func (s *BranchSuite) TestBranches_WithLimitAndOffset() { 202 202 + s.setupRepoWithBranches() 203 203 + 204 204 + tests := []struct { 205 205 + name string 206 206 + limit int 207 207 + offset int 208 208 + expectedCount int 209 209 + }{ 210 210 + { 211 211 + name: "limit 2, offset 0", 212 212 + limit: 2, 213 213 + offset: 0, 214 214 + expectedCount: 2, 215 215 + }, 216 216 + { 217 217 + name: "limit 2, offset 1", 218 218 + limit: 2, 219 219 + offset: 1, 220 220 + expectedCount: 2, 221 221 + }, 222 222 + { 223 223 + name: "limit 2, offset 3", 224 224 + limit: 2, 225 225 + offset: 3, 226 226 + expectedCount: 2, 227 227 + }, 228 228 + { 229 229 + name: "limit 2, offset 4", 230 230 + limit: 2, 231 231 + offset: 4, 232 232 + expectedCount: 1, 233 233 + }, 234 234 + { 235 235 + name: "limit 3, offset 2", 236 236 + limit: 3, 237 237 + offset: 2, 238 238 + expectedCount: 3, 239 239 + }, 240 240 + { 241 241 + name: "limit 10, offset 3", 242 242 + limit: 10, 243 243 + offset: 3, 244 244 + expectedCount: 2, 245 245 + }, 246 246 + } 247 247 + 248 248 + for _, tt := range tests { 249 249 + s.Run(tt.name, func() { 250 250 + branches, err := s.repo.Branches(&BranchesOptions{ 251 251 + Limit: tt.limit, 252 252 + Offset: tt.offset, 253 253 + }) 254 254 + require.NoError(s.T(), err) 255 255 + assert.Len(s.T(), branches, tt.expectedCount, "expected %d branches", tt.expectedCount) 256 256 + }) 257 257 + } 258 258 + } 259 259 + 260 260 + func (s *BranchSuite) TestBranches_EmptyRepo() { 261 261 + repoPath := filepath.Join(s.tempDir, "empty-repo") 262 262 + 263 263 + _, err := gogit.PlainInit(repoPath, false) 264 264 + require.NoError(s.T(), err) 265 265 + 266 266 + gitRepo, err := PlainOpen(repoPath) 267 267 + require.NoError(s.T(), err) 268 268 + 269 269 + branches, err := gitRepo.Branches(&BranchesOptions{}) 270 270 + require.NoError(s.T(), err) 271 271 + 272 272 + if branches != nil { 273 273 + assert.Empty(s.T(), branches, "expected no branches in empty repo") 274 274 + } 275 275 + } 276 276 + 277 277 + func (s *BranchSuite) TestBranches_Pagination() { 278 278 + s.setupRepoWithBranches() 279 279 + 280 280 + allBranches, err := s.repo.Branches(&BranchesOptions{}) 281 281 + require.NoError(s.T(), err) 282 282 + assert.Len(s.T(), allBranches, 5, "expected 5 branches") 283 283 + 284 284 + pageSize := 2 285 285 + var paginatedBranches []string 286 286 + 287 287 + for offset := 0; offset < len(allBranches); offset += pageSize { 288 288 + branches, err := s.repo.Branches(&BranchesOptions{ 289 289 + Limit: pageSize, 290 290 + Offset: offset, 291 291 + }) 292 292 + require.NoError(s.T(), err) 293 293 + for _, branch := range branches { 294 294 + paginatedBranches = append(paginatedBranches, branch.Reference.Name) 295 295 + } 296 296 + } 297 297 + 298 298 + assert.Len(s.T(), paginatedBranches, len(allBranches), "pagination should return all branches") 299 299 + 300 300 + // create sets to verify all branches are present 301 301 + allBranchNames := sets.New[string]() 302 302 + for _, branch := range allBranches { 303 303 + allBranchNames.Insert(branch.Reference.Name) 304 304 + } 305 305 + 306 306 + paginatedBranchNames := sets.New[string]() 307 307 + for _, name := range paginatedBranches { 308 308 + paginatedBranchNames.Insert(name) 309 309 + } 310 310 + 311 311 + assert.EqualValues(s.T(), allBranchNames, paginatedBranchNames, 312 312 + "pagination should return the same set of branches") 313 313 + } 314 314 + 315 315 + func (s *BranchSuite) TestBranches_VerifyBranchFields() { 316 316 + s.setupRepoWithBranches() 317 317 + 318 318 + branches, err := s.repo.Branches(&BranchesOptions{}) 319 319 + require.NoError(s.T(), err) 320 320 + 321 321 + found := false 322 322 + for i := range branches { 323 323 + if branches[i].Reference.Name == "master" { 324 324 + found = true 325 325 + assert.Equal(s.T(), "master", branches[i].Reference.Name) 326 326 + assert.NotEmpty(s.T(), branches[i].Reference.Hash) 327 327 + assert.NotNil(s.T(), branches[i].Commit) 328 328 + assert.NotEmpty(s.T(), branches[i].Commit.Author.Name) 329 329 + assert.NotEmpty(s.T(), branches[i].Commit.Author.Email) 330 330 + assert.False(s.T(), branches[i].Commit.Hash.IsZero()) 331 331 + break 332 332 + } 333 333 + } 334 334 + 335 335 + assert.True(s.T(), found, "master branch not found") 336 336 + } 337 337 + 338 338 + func (s *BranchSuite) TestBranches_NilOptions() { 339 339 + s.setupRepoWithBranches() 340 340 + 341 341 + branches, err := s.repo.Branches(nil) 342 342 + require.NoError(s.T(), err) 343 343 + assert.Len(s.T(), branches, 5, "nil options should return all branches") 344 344 + } 345 345 + 346 346 + func (s *BranchSuite) TestBranches_ZeroLimitAndOffset() { 347 347 + s.setupRepoWithBranches() 348 348 + 349 349 + branches, err := s.repo.Branches(&BranchesOptions{ 350 350 + Limit: 0, 351 351 + Offset: 0, 352 352 + }) 353 353 + require.NoError(s.T(), err) 354 354 + assert.Len(s.T(), branches, 5, "zero limit should return all branches") 355 355 + }

+1 -14

knotserver/git/git.go

··· 122 122 func (g *GitRepo) TotalCommits() (int, error) { 123 123 output, err := g.revList( 124 124 g.h.String(), 125 125 - fmt.Sprintf("--count"), 125 125 + "--count", 126 126 ) 127 127 if err != nil { 128 128 return 0, fmt.Errorf("failed to run rev-list: %w", err) ··· 250 250 251 251 // path is not a submodule 252 252 return nil, ErrNotSubmodule 253 253 - } 254 254 - 255 255 - func (g *GitRepo) Branch(name string) (*plumbing.Reference, error) { 256 256 - ref, err := g.r.Reference(plumbing.NewBranchReferenceName(name), false) 257 257 - if err != nil { 258 258 - return nil, fmt.Errorf("branch: %w", err) 259 259 - } 260 260 - 261 261 - if !ref.Name().IsBranch() { 262 262 - return nil, fmt.Errorf("branch: %s is not a branch", ref.Name()) 263 263 - } 264 264 - 265 265 - return ref, nil 266 253 } 267 254 268 255 func (g *GitRepo) SetDefaultBranch(branch string) error {

+94 -31

knotserver/git/last_commit.go

··· 6 6 "crypto/sha256" 7 7 "fmt" 8 8 "io" 9 9 + "iter" 9 10 "os/exec" 10 11 "path" 12 12 + "strconv" 11 13 "strings" 12 14 "time" 13 15 14 16 "github.com/dgraph-io/ristretto" 15 17 "github.com/go-git/go-git/v5/plumbing" 16 16 - "github.com/go-git/go-git/v5/plumbing/object" 18 18 + "tangled.org/core/sets" 19 19 + "tangled.org/core/types" 17 20 ) 18 21 19 22 var ( ··· 72 75 type commit struct { 73 76 hash plumbing.Hash 74 77 when time.Time 75 75 - files []string 78 78 + files sets.Set[string] 76 79 message string 77 80 } 78 81 82 82 + func newCommit() commit { 83 83 + return commit{ 84 84 + files: sets.New[string](), 85 85 + } 86 86 + } 87 87 + 88 88 + type lastCommitDir struct { 89 89 + dir string 90 90 + entries []string 91 91 + } 92 92 + 93 93 + func (l lastCommitDir) children() iter.Seq[string] { 94 94 + return func(yield func(string) bool) { 95 95 + for _, child := range l.entries { 96 96 + if !yield(path.Join(l.dir, child)) { 97 97 + return 98 98 + } 99 99 + } 100 100 + } 101 101 + } 102 102 + 79 103 func cacheKey(g *GitRepo, path string) string { 80 104 sep := byte(':') 81 105 hash := sha256.Sum256(fmt.Append([]byte{}, g.path, sep, g.h.String(), sep, path)) 82 106 return fmt.Sprintf("%x", hash) 83 107 } 84 108 85 85 - func (g *GitRepo) calculateCommitTimeIn(ctx context.Context, subtree *object.Tree, parent string, timeout time.Duration) (map[string]commit, error) { 109 109 + func (g *GitRepo) lastCommitDirIn(ctx context.Context, parent lastCommitDir, timeout time.Duration) (map[string]commit, error) { 86 110 ctx, cancel := context.WithTimeout(ctx, timeout) 87 111 defer cancel() 88 88 - return g.calculateCommitTime(ctx, subtree, parent) 112 112 + return g.lastCommitDir(ctx, parent) 89 113 } 90 114 91 91 - func (g *GitRepo) calculateCommitTime(ctx context.Context, subtree *object.Tree, parent string) (map[string]commit, error) { 92 92 - filesToDo := make(map[string]struct{}) 115 115 + func (g *GitRepo) lastCommitDir(ctx context.Context, parent lastCommitDir) (map[string]commit, error) { 116 116 + filesToDo := sets.Collect(parent.children()) 93 117 filesDone := make(map[string]commit) 94 94 - for _, e := range subtree.Entries { 95 95 - fpath := path.Clean(path.Join(parent, e.Name)) 96 96 - filesToDo[fpath] = struct{}{} 97 97 - } 98 118 99 99 - for _, e := range subtree.Entries { 100 100 - f := path.Clean(path.Join(parent, e.Name)) 101 101 - cacheKey := cacheKey(g, f) 119 119 + for p := range filesToDo.All() { 120 120 + cacheKey := cacheKey(g, p) 102 121 if cached, ok := commitCache.Get(cacheKey); ok { 103 103 - filesDone[f] = cached.(commit) 104 104 - delete(filesToDo, f) 122 122 + filesDone[p] = cached.(commit) 123 123 + filesToDo.Remove(p) 105 124 } else { 106 106 - filesToDo[f] = struct{}{} 125 125 + filesToDo.Insert(p) 107 126 } 108 127 } 109 128 110 110 - if len(filesToDo) == 0 { 129 129 + if filesToDo.IsEmpty() { 111 130 return filesDone, nil 112 131 } 113 132 ··· 115 134 defer cancel() 116 135 117 136 pathSpec := "." 118 118 - if parent != "" { 119 119 - pathSpec = parent 137 137 + if parent.dir != "" { 138 138 + pathSpec = parent.dir 139 139 + } 140 140 + if filesToDo.Len() == 1 { 141 141 + // this is an optimization for the scenario where we want to calculate 142 142 + // the last commit for just one path, we can directly set the pathspec to that path 143 143 + for s := range filesToDo.All() { 144 144 + pathSpec = s 145 145 + } 120 146 } 121 121 - output, err := g.streamingGitLog(ctx, "--pretty=format:%H,%ad,%s", "--date=iso", "--name-only", "--", pathSpec) 147 147 + 148 148 + output, err := g.streamingGitLog(ctx, "--pretty=format:%H,%ad,%s", "--date=unix", "--name-only", "--", pathSpec) 122 149 if err != nil { 123 150 return nil, err 124 151 } 125 152 defer output.Close() // Ensure the git process is properly cleaned up 126 153 127 154 reader := bufio.NewReader(output) 128 128 - var current commit 155 155 + current := newCommit() 129 156 for { 130 157 line, err := reader.ReadString('\n') 131 158 if err != nil && err != io.EOF { ··· 136 163 if line == "" { 137 164 if !current.hash.IsZero() { 138 165 // we have a fully parsed commit 139 139 - for _, f := range current.files { 140 140 - if _, ok := filesToDo[f]; ok { 166 166 + for f := range current.files.All() { 167 167 + if filesToDo.Contains(f) { 141 168 filesDone[f] = current 142 142 - delete(filesToDo, f) 169 169 + filesToDo.Remove(f) 143 170 commitCache.Set(cacheKey(g, f), current, 0) 144 171 } 145 172 } 146 173 147 147 - if len(filesToDo) == 0 { 148 148 - cancel() 174 174 + if filesToDo.IsEmpty() { 149 175 break 150 176 } 151 151 - current = commit{} 177 177 + current = newCommit() 152 178 } 153 179 } else if current.hash.IsZero() { 154 180 parts := strings.SplitN(line, ",", 3) 155 181 if len(parts) == 3 { 156 182 current.hash = plumbing.NewHash(parts[0]) 157 157 - current.when, _ = time.Parse("2006-01-02 15:04:05 -0700", parts[1]) 183 183 + epochTime, _ := strconv.ParseInt(parts[1], 10, 64) 184 184 + current.when = time.Unix(epochTime, 0) 158 185 current.message = parts[2] 159 186 } 160 187 } else { 161 188 // all ancestors along this path should also be included 162 189 file := path.Clean(line) 163 163 - ancestors := ancestors(file) 164 164 - current.files = append(current.files, file) 165 165 - current.files = append(current.files, ancestors...) 190 190 + current.files.Insert(file) 191 191 + for _, a := range ancestors(file) { 192 192 + current.files.Insert(a) 193 193 + } 166 194 } 167 195 168 196 if err == io.EOF { ··· 171 199 } 172 200 173 201 return filesDone, nil 202 202 + } 203 203 + 204 204 + // LastCommitFile returns the last commit information for a specific file path 205 205 + func (g *GitRepo) LastCommitFile(ctx context.Context, filePath string) (*types.LastCommitInfo, error) { 206 206 + parent, child := path.Split(filePath) 207 207 + parent = path.Clean(parent) 208 208 + if parent == "." { 209 209 + parent = "" 210 210 + } 211 211 + 212 212 + lastCommitDir := lastCommitDir{ 213 213 + dir: parent, 214 214 + entries: []string{child}, 215 215 + } 216 216 + 217 217 + times, err := g.lastCommitDirIn(ctx, lastCommitDir, 2*time.Second) 218 218 + if err != nil { 219 219 + return nil, fmt.Errorf("calculate commit time: %w", err) 220 220 + } 221 221 + 222 222 + // extract the only element of the map, the commit info of the current path 223 223 + var commitInfo *commit 224 224 + for _, c := range times { 225 225 + commitInfo = &c 226 226 + } 227 227 + 228 228 + if commitInfo == nil { 229 229 + return nil, fmt.Errorf("no commit found for path: %s", filePath) 230 230 + } 231 231 + 232 232 + return &types.LastCommitInfo{ 233 233 + Hash: commitInfo.hash, 234 234 + Message: commitInfo.message, 235 235 + When: commitInfo.when, 236 236 + }, nil 174 237 } 175 238 176 239 func ancestors(p string) []string {

+30 -30

knotserver/git/merge.go

··· 107 107 return fmt.Sprintf("merge failed: %s", e.Message) 108 108 } 109 109 110 110 - func (g *GitRepo) createTempFileWithPatch(patchData string) (string, error) { 110 110 + func createTemp(data string) (string, error) { 111 111 tmpFile, err := os.CreateTemp("", "git-patch-*.patch") 112 112 if err != nil { 113 113 return "", fmt.Errorf("failed to create temporary patch file: %w", err) 114 114 } 115 115 116 116 - if _, err := tmpFile.Write([]byte(patchData)); err != nil { 116 116 + if _, err := tmpFile.Write([]byte(data)); err != nil { 117 117 tmpFile.Close() 118 118 os.Remove(tmpFile.Name()) 119 119 return "", fmt.Errorf("failed to write patch data to temporary file: %w", err) ··· 127 127 return tmpFile.Name(), nil 128 128 } 129 129 130 130 - func (g *GitRepo) cloneRepository(targetBranch string) (string, error) { 130 130 + func (g *GitRepo) cloneTemp(targetBranch string) (string, error) { 131 131 tmpDir, err := os.MkdirTemp("", "git-clone-") 132 132 if err != nil { 133 133 return "", fmt.Errorf("failed to create temporary directory: %w", err) ··· 147 147 return tmpDir, nil 148 148 } 149 149 150 150 - func (g *GitRepo) checkPatch(tmpDir, patchFile string) error { 151 151 - var stderr bytes.Buffer 152 152 - 153 153 - cmd := exec.Command("git", "-C", tmpDir, "apply", "--check", "-v", patchFile) 154 154 - cmd.Stderr = &stderr 155 155 - 156 156 - if err := cmd.Run(); err != nil { 157 157 - conflicts := parseGitApplyErrors(stderr.String()) 158 158 - return &ErrMerge{ 159 159 - Message: "patch cannot be applied cleanly", 160 160 - Conflicts: conflicts, 161 161 - HasConflict: len(conflicts) > 0, 162 162 - OtherError: err, 163 163 - } 164 164 - } 165 165 - return nil 166 166 - } 167 167 - 168 150 func (g *GitRepo) applyPatch(patchData, patchFile string, opts MergeOptions) error { 169 151 var stderr bytes.Buffer 170 152 var cmd *exec.Cmd ··· 173 155 exec.Command("git", "-C", g.path, "config", "user.name", opts.CommitterName).Run() 174 156 exec.Command("git", "-C", g.path, "config", "user.email", opts.CommitterEmail).Run() 175 157 exec.Command("git", "-C", g.path, "config", "advice.mergeConflict", "false").Run() 158 158 + exec.Command("git", "-C", g.path, "config", "advice.amWorkDir", "false").Run() 176 159 177 160 // if patch is a format-patch, apply using 'git am' 178 161 if opts.FormatPatch { ··· 213 196 cmd.Stderr = &stderr 214 197 215 198 if err := cmd.Run(); err != nil { 216 216 - return fmt.Errorf("patch application failed: %s", stderr.String()) 199 199 + conflicts := parseGitApplyErrors(stderr.String()) 200 200 + return &ErrMerge{ 201 201 + Message: "patch cannot be applied cleanly", 202 202 + Conflicts: conflicts, 203 203 + HasConflict: len(conflicts) > 0, 204 204 + OtherError: err, 205 205 + } 217 206 } 218 207 219 208 return nil ··· 241 230 } 242 231 243 232 func (g *GitRepo) applySingleMailbox(singlePatch types.FormatPatch) (plumbing.Hash, error) { 244 244 - tmpPatch, err := g.createTempFileWithPatch(singlePatch.Raw) 233 233 + tmpPatch, err := createTemp(singlePatch.Raw) 245 234 if err != nil { 246 235 return plumbing.ZeroHash, fmt.Errorf("failed to create temporary patch file for singluar mailbox patch: %w", err) 247 236 } ··· 257 246 log.Println("head before apply", head.Hash().String()) 258 247 259 248 if err := cmd.Run(); err != nil { 260 260 - return plumbing.ZeroHash, fmt.Errorf("patch application failed: %s", stderr.String()) 249 249 + conflicts := parseGitApplyErrors(stderr.String()) 250 250 + return plumbing.ZeroHash, &ErrMerge{ 251 251 + Message: "patch cannot be applied cleanly", 252 252 + Conflicts: conflicts, 253 253 + HasConflict: len(conflicts) > 0, 254 254 + OtherError: err, 255 255 + } 261 256 } 262 257 263 258 if err := g.Refresh(); err != nil { ··· 324 319 return newHash, nil 325 320 } 326 321 327 327 - func (g *GitRepo) MergeCheck(patchData string, targetBranch string) error { 322 322 + func (g *GitRepo) MergeCheckWithOptions(patchData string, targetBranch string, mo MergeOptions) error { 328 323 if val, ok := mergeCheckCache.Get(g, patchData, targetBranch); ok { 329 324 return val 330 325 } 331 326 332 332 - patchFile, err := g.createTempFileWithPatch(patchData) 327 327 + patchFile, err := createTemp(patchData) 333 328 if err != nil { 334 329 return &ErrMerge{ 335 330 Message: err.Error(), ··· 338 333 } 339 334 defer os.Remove(patchFile) 340 335 341 341 - tmpDir, err := g.cloneRepository(targetBranch) 336 336 + tmpDir, err := g.cloneTemp(targetBranch) 342 337 if err != nil { 343 338 return &ErrMerge{ 344 339 Message: err.Error(), ··· 347 342 } 348 343 defer os.RemoveAll(tmpDir) 349 344 350 350 - result := g.checkPatch(tmpDir, patchFile) 345 345 + tmpRepo, err := PlainOpen(tmpDir) 346 346 + if err != nil { 347 347 + return err 348 348 + } 349 349 + 350 350 + result := tmpRepo.applyPatch(patchData, patchFile, mo) 351 351 mergeCheckCache.Set(g, patchData, targetBranch, result) 352 352 return result 353 353 } 354 354 355 355 func (g *GitRepo) MergeWithOptions(patchData string, targetBranch string, opts MergeOptions) error { 356 356 - patchFile, err := g.createTempFileWithPatch(patchData) 356 356 + patchFile, err := createTemp(patchData) 357 357 if err != nil { 358 358 return &ErrMerge{ 359 359 Message: err.Error(), ··· 362 362 } 363 363 defer os.Remove(patchFile) 364 364 365 365 - tmpDir, err := g.cloneRepository(targetBranch) 365 365 + tmpDir, err := g.cloneTemp(targetBranch) 366 366 if err != nil { 367 367 return &ErrMerge{ 368 368 Message: err.Error(),

+706

knotserver/git/merge_test.go

··· 1 1 + package git 2 2 + 3 3 + import ( 4 4 + "os" 5 5 + "path/filepath" 6 6 + "strings" 7 7 + "testing" 8 8 + 9 9 + "github.com/go-git/go-git/v5" 10 10 + "github.com/go-git/go-git/v5/config" 11 11 + "github.com/go-git/go-git/v5/plumbing" 12 12 + "github.com/go-git/go-git/v5/plumbing/object" 13 13 + "github.com/stretchr/testify/assert" 14 14 + "github.com/stretchr/testify/require" 15 15 + ) 16 16 + 17 17 + type Helper struct { 18 18 + t *testing.T 19 19 + tempDir string 20 20 + repo *GitRepo 21 21 + } 22 22 + 23 23 + func helper(t *testing.T) *Helper { 24 24 + tempDir, err := os.MkdirTemp("", "git-merge-test-*") 25 25 + require.NoError(t, err) 26 26 + 27 27 + return &Helper{ 28 28 + t: t, 29 29 + tempDir: tempDir, 30 30 + } 31 31 + } 32 32 + 33 33 + func (h *Helper) cleanup() { 34 34 + if h.tempDir != "" { 35 35 + os.RemoveAll(h.tempDir) 36 36 + } 37 37 + } 38 38 + 39 39 + // initRepo initializes a git repository with an initial commit 40 40 + func (h *Helper) initRepo() *GitRepo { 41 41 + repoPath := filepath.Join(h.tempDir, "test-repo") 42 42 + 43 43 + // initialize repository 44 44 + r, err := git.PlainInit(repoPath, false) 45 45 + require.NoError(h.t, err) 46 46 + 47 47 + // configure git user 48 48 + cfg, err := r.Config() 49 49 + require.NoError(h.t, err) 50 50 + cfg.User.Name = "Test User" 51 51 + cfg.User.Email = "test@example.com" 52 52 + err = r.SetConfig(cfg) 53 53 + require.NoError(h.t, err) 54 54 + 55 55 + // create initial commit with a file 56 56 + w, err := r.Worktree() 57 57 + require.NoError(h.t, err) 58 58 + 59 59 + // create initial file 60 60 + initialFile := filepath.Join(repoPath, "README.md") 61 61 + err = os.WriteFile(initialFile, []byte("# Test Repository\n\nInitial content.\n"), 0644) 62 62 + require.NoError(h.t, err) 63 63 + 64 64 + _, err = w.Add("README.md") 65 65 + require.NoError(h.t, err) 66 66 + 67 67 + _, err = w.Commit("Initial commit", &git.CommitOptions{ 68 68 + Author: &object.Signature{ 69 69 + Name: "Test User", 70 70 + Email: "test@example.com", 71 71 + }, 72 72 + }) 73 73 + require.NoError(h.t, err) 74 74 + 75 75 + gitRepo, err := PlainOpen(repoPath) 76 76 + require.NoError(h.t, err) 77 77 + 78 78 + h.repo = gitRepo 79 79 + return gitRepo 80 80 + } 81 81 + 82 82 + // addFile creates a file in the repository 83 83 + func (h *Helper) addFile(filename, content string) { 84 84 + filePath := filepath.Join(h.repo.path, filename) 85 85 + dir := filepath.Dir(filePath) 86 86 + 87 87 + err := os.MkdirAll(dir, 0755) 88 88 + require.NoError(h.t, err) 89 89 + 90 90 + err = os.WriteFile(filePath, []byte(content), 0644) 91 91 + require.NoError(h.t, err) 92 92 + } 93 93 + 94 94 + // commitFile adds and commits a file 95 95 + func (h *Helper) commitFile(filename, content, message string) plumbing.Hash { 96 96 + h.addFile(filename, content) 97 97 + 98 98 + w, err := h.repo.r.Worktree() 99 99 + require.NoError(h.t, err) 100 100 + 101 101 + _, err = w.Add(filename) 102 102 + require.NoError(h.t, err) 103 103 + 104 104 + hash, err := w.Commit(message, &git.CommitOptions{ 105 105 + Author: &object.Signature{ 106 106 + Name: "Test User", 107 107 + Email: "test@example.com", 108 108 + }, 109 109 + }) 110 110 + require.NoError(h.t, err) 111 111 + 112 112 + return hash 113 113 + } 114 114 + 115 115 + // readFile reads a file from the repository 116 116 + func (h *Helper) readFile(filename string) string { 117 117 + content, err := os.ReadFile(filepath.Join(h.repo.path, filename)) 118 118 + require.NoError(h.t, err) 119 119 + return string(content) 120 120 + } 121 121 + 122 122 + // fileExists checks if a file exists in the repository 123 123 + func (h *Helper) fileExists(filename string) bool { 124 124 + _, err := os.Stat(filepath.Join(h.repo.path, filename)) 125 125 + return err == nil 126 126 + } 127 127 + 128 128 + func TestApplyPatch_Success(t *testing.T) { 129 129 + h := helper(t) 130 130 + defer h.cleanup() 131 131 + 132 132 + repo := h.initRepo() 133 133 + 134 134 + // modify README.md 135 135 + patch := `diff --git a/README.md b/README.md 136 136 + index 1234567..abcdefg 100644 137 137 + --- a/README.md 138 138 + +++ b/README.md 139 139 + @@ -1,3 +1,3 @@ 140 140 + # Test Repository 141 141 + 142 142 + -Initial content. 143 143 + +Modified content. 144 144 + ` 145 145 + 146 146 + patchFile, err := createTemp(patch) 147 147 + require.NoError(t, err) 148 148 + defer os.Remove(patchFile) 149 149 + 150 150 + opts := MergeOptions{ 151 151 + CommitMessage: "Apply test patch", 152 152 + CommitterName: "Test Committer", 153 153 + CommitterEmail: "committer@example.com", 154 154 + FormatPatch: false, 155 155 + } 156 156 + 157 157 + err = repo.applyPatch(patch, patchFile, opts) 158 158 + assert.NoError(t, err) 159 159 + 160 160 + // verify the file was modified 161 161 + content := h.readFile("README.md") 162 162 + assert.Contains(t, content, "Modified content.") 163 163 + } 164 164 + 165 165 + func TestApplyPatch_AddNewFile(t *testing.T) { 166 166 + h := helper(t) 167 167 + defer h.cleanup() 168 168 + 169 169 + repo := h.initRepo() 170 170 + 171 171 + // add a new file 172 172 + patch := `diff --git a/newfile.txt b/newfile.txt 173 173 + new file mode 100644 174 174 + index 0000000..ce01362 175 175 + --- /dev/null 176 176 + +++ b/newfile.txt 177 177 + @@ -0,0 +1 @@ 178 178 + +hello 179 179 + ` 180 180 + 181 181 + patchFile, err := createTemp(patch) 182 182 + require.NoError(t, err) 183 183 + defer os.Remove(patchFile) 184 184 + 185 185 + opts := MergeOptions{ 186 186 + CommitMessage: "Add new file", 187 187 + CommitterName: "Test Committer", 188 188 + CommitterEmail: "committer@example.com", 189 189 + FormatPatch: false, 190 190 + } 191 191 + 192 192 + err = repo.applyPatch(patch, patchFile, opts) 193 193 + assert.NoError(t, err) 194 194 + 195 195 + assert.True(t, h.fileExists("newfile.txt")) 196 196 + content := h.readFile("newfile.txt") 197 197 + assert.Equal(t, "hello\n", content) 198 198 + } 199 199 + 200 200 + func TestApplyPatch_DeleteFile(t *testing.T) { 201 201 + h := helper(t) 202 202 + defer h.cleanup() 203 203 + 204 204 + repo := h.initRepo() 205 205 + 206 206 + // add a file 207 207 + h.commitFile("deleteme.txt", "content to delete\n", "Add file to delete") 208 208 + 209 209 + // delete the file 210 210 + patch := `diff --git a/deleteme.txt b/deleteme.txt 211 211 + deleted file mode 100644 212 212 + index 1234567..0000000 213 213 + --- a/deleteme.txt 214 214 + +++ /dev/null 215 215 + @@ -1 +0,0 @@ 216 216 + -content to delete 217 217 + ` 218 218 + 219 219 + patchFile, err := createTemp(patch) 220 220 + require.NoError(t, err) 221 221 + defer os.Remove(patchFile) 222 222 + 223 223 + opts := MergeOptions{ 224 224 + CommitMessage: "Delete file", 225 225 + CommitterName: "Test Committer", 226 226 + CommitterEmail: "committer@example.com", 227 227 + FormatPatch: false, 228 228 + } 229 229 + 230 230 + err = repo.applyPatch(patch, patchFile, opts) 231 231 + assert.NoError(t, err) 232 232 + 233 233 + assert.False(t, h.fileExists("deleteme.txt")) 234 234 + } 235 235 + 236 236 + func TestApplyPatch_WithAuthor(t *testing.T) { 237 237 + h := helper(t) 238 238 + defer h.cleanup() 239 239 + 240 240 + repo := h.initRepo() 241 241 + 242 242 + patch := `diff --git a/README.md b/README.md 243 243 + index 1234567..abcdefg 100644 244 244 + --- a/README.md 245 245 + +++ b/README.md 246 246 + @@ -1,3 +1,4 @@ 247 247 + # Test Repository 248 248 + 249 249 + Initial content. 250 250 + +New line. 251 251 + ` 252 252 + 253 253 + patchFile, err := createTemp(patch) 254 254 + require.NoError(t, err) 255 255 + defer os.Remove(patchFile) 256 256 + 257 257 + opts := MergeOptions{ 258 258 + CommitMessage: "Patch with author", 259 259 + AuthorName: "Patch Author", 260 260 + AuthorEmail: "author@example.com", 261 261 + CommitterName: "Test Committer", 262 262 + CommitterEmail: "committer@example.com", 263 263 + FormatPatch: false, 264 264 + } 265 265 + 266 266 + err = repo.applyPatch(patch, patchFile, opts) 267 267 + assert.NoError(t, err) 268 268 + 269 269 + head, err := repo.r.Head() 270 270 + require.NoError(t, err) 271 271 + 272 272 + commit, err := repo.r.CommitObject(head.Hash()) 273 273 + require.NoError(t, err) 274 274 + 275 275 + assert.Equal(t, "Patch Author", commit.Author.Name) 276 276 + assert.Equal(t, "author@example.com", commit.Author.Email) 277 277 + } 278 278 + 279 279 + func TestApplyPatch_MissingFile(t *testing.T) { 280 280 + h := helper(t) 281 281 + defer h.cleanup() 282 282 + 283 283 + repo := h.initRepo() 284 284 + 285 285 + // patch that modifies a non-existent file 286 286 + patch := `diff --git a/nonexistent.txt b/nonexistent.txt 287 287 + index 1234567..abcdefg 100644 288 288 + --- a/nonexistent.txt 289 289 + +++ b/nonexistent.txt 290 290 + @@ -1 +1 @@ 291 291 + -old content 292 292 + +new content 293 293 + ` 294 294 + 295 295 + patchFile, err := createTemp(patch) 296 296 + require.NoError(t, err) 297 297 + defer os.Remove(patchFile) 298 298 + 299 299 + opts := MergeOptions{ 300 300 + CommitMessage: "Should fail", 301 301 + CommitterName: "Test Committer", 302 302 + CommitterEmail: "committer@example.com", 303 303 + FormatPatch: false, 304 304 + } 305 305 + 306 306 + err = repo.applyPatch(patch, patchFile, opts) 307 307 + assert.Error(t, err) 308 308 + assert.Contains(t, err.Error(), "patch application failed") 309 309 + } 310 310 + 311 311 + func TestApplyPatch_Conflict(t *testing.T) { 312 312 + h := helper(t) 313 313 + defer h.cleanup() 314 314 + 315 315 + repo := h.initRepo() 316 316 + 317 317 + // modify the file to create a conflict 318 318 + h.commitFile("README.md", "# Test Repository\n\nDifferent content.\n", "Modify README") 319 319 + 320 320 + // patch that expects different content 321 321 + patch := `diff --git a/README.md b/README.md 322 322 + index 1234567..abcdefg 100644 323 323 + --- a/README.md 324 324 + +++ b/README.md 325 325 + @@ -1,3 +1,3 @@ 326 326 + # Test Repository 327 327 + 328 328 + -Initial content. 329 329 + +Modified content. 330 330 + ` 331 331 + 332 332 + patchFile, err := createTemp(patch) 333 333 + require.NoError(t, err) 334 334 + defer os.Remove(patchFile) 335 335 + 336 336 + opts := MergeOptions{ 337 337 + CommitMessage: "Should conflict", 338 338 + CommitterName: "Test Committer", 339 339 + CommitterEmail: "committer@example.com", 340 340 + FormatPatch: false, 341 341 + } 342 342 + 343 343 + err = repo.applyPatch(patch, patchFile, opts) 344 344 + assert.Error(t, err) 345 345 + } 346 346 + 347 347 + func TestApplyPatch_MissingDirectory(t *testing.T) { 348 348 + h := helper(t) 349 349 + defer h.cleanup() 350 350 + 351 351 + repo := h.initRepo() 352 352 + 353 353 + // patch that adds a file in a non-existent directory 354 354 + patch := `diff --git a/subdir/newfile.txt b/subdir/newfile.txt 355 355 + new file mode 100644 356 356 + index 0000000..ce01362 357 357 + --- /dev/null 358 358 + +++ b/subdir/newfile.txt 359 359 + @@ -0,0 +1 @@ 360 360 + +content 361 361 + ` 362 362 + 363 363 + patchFile, err := createTemp(patch) 364 364 + require.NoError(t, err) 365 365 + defer os.Remove(patchFile) 366 366 + 367 367 + opts := MergeOptions{ 368 368 + CommitMessage: "Add file in subdir", 369 369 + CommitterName: "Test Committer", 370 370 + CommitterEmail: "committer@example.com", 371 371 + FormatPatch: false, 372 372 + } 373 373 + 374 374 + // git apply should create the directory automatically 375 375 + err = repo.applyPatch(patch, patchFile, opts) 376 376 + assert.NoError(t, err) 377 377 + 378 378 + // Verify the file and directory were created 379 379 + assert.True(t, h.fileExists("subdir/newfile.txt")) 380 380 + } 381 381 + 382 382 + func TestApplyMailbox_Single(t *testing.T) { 383 383 + h := helper(t) 384 384 + defer h.cleanup() 385 385 + 386 386 + repo := h.initRepo() 387 387 + 388 388 + // format-patch mailbox format 389 389 + patch := `From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 390 390 + From: Patch Author <author@example.com> 391 391 + Date: Mon, 1 Jan 2024 12:00:00 +0000 392 392 + Subject: [PATCH] Add new feature 393 393 + 394 394 + This is a test patch. 395 395 + --- 396 396 + newfile.txt | 1 + 397 397 + 1 file changed, 1 insertion(+) 398 398 + create mode 100644 newfile.txt 399 399 + 400 400 + diff --git a/newfile.txt b/newfile.txt 401 401 + new file mode 100644 402 402 + index 0000000..ce01362 403 403 + --- /dev/null 404 404 + +++ b/newfile.txt 405 405 + @@ -0,0 +1 @@ 406 406 + +hello 407 407 + -- 408 408 + 2.40.0 409 409 + ` 410 410 + 411 411 + err := repo.applyMailbox(patch) 412 412 + assert.NoError(t, err) 413 413 + 414 414 + assert.True(t, h.fileExists("newfile.txt")) 415 415 + content := h.readFile("newfile.txt") 416 416 + assert.Equal(t, "hello\n", content) 417 417 + } 418 418 + 419 419 + func TestApplyMailbox_Multiple(t *testing.T) { 420 420 + h := helper(t) 421 421 + defer h.cleanup() 422 422 + 423 423 + repo := h.initRepo() 424 424 + 425 425 + // multiple patches in mailbox format 426 426 + patch := `From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 427 427 + From: Patch Author <author@example.com> 428 428 + Date: Mon, 1 Jan 2024 12:00:00 +0000 429 429 + Subject: [PATCH 1/2] Add first file 430 430 + 431 431 + --- 432 432 + file1.txt | 1 + 433 433 + 1 file changed, 1 insertion(+) 434 434 + create mode 100644 file1.txt 435 435 + 436 436 + diff --git a/file1.txt b/file1.txt 437 437 + new file mode 100644 438 438 + index 0000000..ce01362 439 439 + --- /dev/null 440 440 + +++ b/file1.txt 441 441 + @@ -0,0 +1 @@ 442 442 + +first 443 443 + -- 444 444 + 2.40.0 445 445 + 446 446 + From 1111111111111111111111111111111111111111 Mon Sep 17 00:00:00 2001 447 447 + From: Patch Author <author@example.com> 448 448 + Date: Mon, 1 Jan 2024 12:01:00 +0000 449 449 + Subject: [PATCH 2/2] Add second file 450 450 + 451 451 + --- 452 452 + file2.txt | 1 + 453 453 + 1 file changed, 1 insertion(+) 454 454 + create mode 100644 file2.txt 455 455 + 456 456 + diff --git a/file2.txt b/file2.txt 457 457 + new file mode 100644 458 458 + index 0000000..ce01362 459 459 + --- /dev/null 460 460 + +++ b/file2.txt 461 461 + @@ -0,0 +1 @@ 462 462 + +second 463 463 + -- 464 464 + 2.40.0 465 465 + ` 466 466 + 467 467 + err := repo.applyMailbox(patch) 468 468 + assert.NoError(t, err) 469 469 + 470 470 + assert.True(t, h.fileExists("file1.txt")) 471 471 + assert.True(t, h.fileExists("file2.txt")) 472 472 + 473 473 + content1 := h.readFile("file1.txt") 474 474 + assert.Equal(t, "first\n", content1) 475 475 + 476 476 + content2 := h.readFile("file2.txt") 477 477 + assert.Equal(t, "second\n", content2) 478 478 + } 479 479 + 480 480 + func TestApplyMailbox_Conflict(t *testing.T) { 481 481 + h := helper(t) 482 482 + defer h.cleanup() 483 483 + 484 484 + repo := h.initRepo() 485 485 + 486 486 + h.commitFile("README.md", "# Test Repository\n\nConflicting content.\n", "Create conflict") 487 487 + 488 488 + patch := `From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 489 489 + From: Patch Author <author@example.com> 490 490 + Date: Mon, 1 Jan 2024 12:00:00 +0000 491 491 + Subject: [PATCH] Modify README 492 492 + 493 493 + --- 494 494 + README.md | 2 +- 495 495 + 1 file changed, 1 insertion(+), 1 deletion(-) 496 496 + 497 497 + diff --git a/README.md b/README.md 498 498 + index 1234567..abcdefg 100644 499 499 + --- a/README.md 500 500 + +++ b/README.md 501 501 + @@ -1,3 +1,3 @@ 502 502 + # Test Repository 503 503 + 504 504 + -Initial content. 505 505 + +Different content. 506 506 + -- 507 507 + 2.40.0 508 508 + ` 509 509 + 510 510 + err := repo.applyMailbox(patch) 511 511 + assert.Error(t, err) 512 512 + 513 513 + var mergeErr *ErrMerge 514 514 + assert.ErrorAs(t, err, &mergeErr) 515 515 + } 516 516 + 517 517 + func TestParseGitApplyErrors(t *testing.T) { 518 518 + tests := []struct { 519 519 + name string 520 520 + errorOutput string 521 521 + expectedCount int 522 522 + expectedReason string 523 523 + }{ 524 524 + { 525 525 + name: "file already exists", 526 526 + errorOutput: `error: path/to/file.txt: already exists in working directory`, 527 527 + expectedCount: 1, 528 528 + expectedReason: "file already exists", 529 529 + }, 530 530 + { 531 531 + name: "file does not exist", 532 532 + errorOutput: `error: path/to/file.txt: does not exist in working tree`, 533 533 + expectedCount: 1, 534 534 + expectedReason: "file does not exist", 535 535 + }, 536 536 + { 537 537 + name: "patch does not apply", 538 538 + errorOutput: `error: patch failed: file.txt:10 539 539 + error: file.txt: patch does not apply`, 540 540 + expectedCount: 1, 541 541 + expectedReason: "patch does not apply", 542 542 + }, 543 543 + { 544 544 + name: "multiple conflicts", 545 545 + errorOutput: `error: patch failed: file1.txt:5 546 546 + error: file1.txt:5: some error 547 547 + error: patch failed: file2.txt:10 548 548 + error: file2.txt:10: another error`, 549 549 + expectedCount: 2, 550 550 + }, 551 551 + } 552 552 + 553 553 + for _, tt := range tests { 554 554 + t.Run(tt.name, func(t *testing.T) { 555 555 + conflicts := parseGitApplyErrors(tt.errorOutput) 556 556 + assert.Len(t, conflicts, tt.expectedCount) 557 557 + 558 558 + if tt.expectedReason != "" && len(conflicts) > 0 { 559 559 + assert.Equal(t, tt.expectedReason, conflicts[0].Reason) 560 560 + } 561 561 + }) 562 562 + } 563 563 + } 564 564 + 565 565 + func TestErrMerge_Error(t *testing.T) { 566 566 + tests := []struct { 567 567 + name string 568 568 + err ErrMerge 569 569 + expectedMsg string 570 570 + }{ 571 571 + { 572 572 + name: "with conflicts", 573 573 + err: ErrMerge{ 574 574 + Message: "test merge failed", 575 575 + HasConflict: true, 576 576 + Conflicts: []ConflictInfo{ 577 577 + {Filename: "file1.txt", Reason: "conflict 1"}, 578 578 + {Filename: "file2.txt", Reason: "conflict 2"}, 579 579 + }, 580 580 + }, 581 581 + expectedMsg: "merge failed due to conflicts: test merge failed (2 conflicts)", 582 582 + }, 583 583 + { 584 584 + name: "with other error", 585 585 + err: ErrMerge{ 586 586 + Message: "command failed", 587 587 + OtherError: assert.AnError, 588 588 + }, 589 589 + expectedMsg: "merge failed: command failed:", 590 590 + }, 591 591 + { 592 592 + name: "message only", 593 593 + err: ErrMerge{ 594 594 + Message: "simple failure", 595 595 + }, 596 596 + expectedMsg: "merge failed: simple failure", 597 597 + }, 598 598 + } 599 599 + 600 600 + for _, tt := range tests { 601 601 + t.Run(tt.name, func(t *testing.T) { 602 602 + errMsg := tt.err.Error() 603 603 + assert.Contains(t, errMsg, tt.expectedMsg) 604 604 + }) 605 605 + } 606 606 + } 607 607 + 608 608 + func TestMergeWithOptions_Integration(t *testing.T) { 609 609 + h := helper(t) 610 610 + defer h.cleanup() 611 611 + 612 612 + // create a repository first with initial content 613 613 + workRepoPath := filepath.Join(h.tempDir, "work-repo") 614 614 + workRepo, err := git.PlainInit(workRepoPath, false) 615 615 + require.NoError(t, err) 616 616 + 617 617 + // configure git user 618 618 + cfg, err := workRepo.Config() 619 619 + require.NoError(t, err) 620 620 + cfg.User.Name = "Test User" 621 621 + cfg.User.Email = "test@example.com" 622 622 + err = workRepo.SetConfig(cfg) 623 623 + require.NoError(t, err) 624 624 + 625 625 + // Create initial commit 626 626 + w, err := workRepo.Worktree() 627 627 + require.NoError(t, err) 628 628 + 629 629 + err = os.WriteFile(filepath.Join(workRepoPath, "README.md"), []byte("# Initial\n"), 0644) 630 630 + require.NoError(t, err) 631 631 + 632 632 + _, err = w.Add("README.md") 633 633 + require.NoError(t, err) 634 634 + 635 635 + _, err = w.Commit("Initial commit", &git.CommitOptions{ 636 636 + Author: &object.Signature{ 637 637 + Name: "Test User", 638 638 + Email: "test@example.com", 639 639 + }, 640 640 + }) 641 641 + require.NoError(t, err) 642 642 + 643 643 + // create a bare repository (like production) 644 644 + bareRepoPath := filepath.Join(h.tempDir, "bare-repo") 645 645 + err = InitBare(bareRepoPath, "main") 646 646 + require.NoError(t, err) 647 647 + 648 648 + // add bare repo as remote and push to it 649 649 + _, err = workRepo.CreateRemote(&config.RemoteConfig{ 650 650 + Name: "origin", 651 651 + URLs: []string{"file://" + bareRepoPath}, 652 652 + }) 653 653 + require.NoError(t, err) 654 654 + 655 655 + err = workRepo.Push(&git.PushOptions{ 656 656 + RemoteName: "origin", 657 657 + RefSpecs: []config.RefSpec{"refs/heads/master:refs/heads/main"}, 658 658 + }) 659 659 + require.NoError(t, err) 660 660 + 661 661 + // now merge a patch into the bare repo 662 662 + gitRepo, err := PlainOpen(bareRepoPath) 663 663 + require.NoError(t, err) 664 664 + 665 665 + patch := `diff --git a/feature.txt b/feature.txt 666 666 + new file mode 100644 667 667 + index 0000000..5e1c309 668 668 + --- /dev/null 669 669 + +++ b/feature.txt 670 670 + @@ -0,0 +1 @@ 671 671 + +Hello World 672 672 + ` 673 673 + 674 674 + opts := MergeOptions{ 675 675 + CommitMessage: "Add feature", 676 676 + CommitterName: "Test Committer", 677 677 + CommitterEmail: "committer@example.com", 678 678 + FormatPatch: false, 679 679 + } 680 680 + 681 681 + err = gitRepo.MergeWithOptions(patch, "main", opts) 682 682 + assert.NoError(t, err) 683 683 + 684 684 + // Clone again and verify the changes were merged 685 685 + verifyRepoPath := filepath.Join(h.tempDir, "verify-repo") 686 686 + verifyRepo, err := git.PlainClone(verifyRepoPath, false, &git.CloneOptions{ 687 687 + URL: "file://" + bareRepoPath, 688 688 + }) 689 689 + require.NoError(t, err) 690 690 + 691 691 + // check that feature.txt exists 692 692 + featureFile := filepath.Join(verifyRepoPath, "feature.txt") 693 693 + assert.FileExists(t, featureFile) 694 694 + 695 695 + content, err := os.ReadFile(featureFile) 696 696 + require.NoError(t, err) 697 697 + assert.Equal(t, "Hello World\n", string(content)) 698 698 + 699 699 + // verify commit message 700 700 + head, err := verifyRepo.Head() 701 701 + require.NoError(t, err) 702 702 + 703 703 + commit, err := verifyRepo.CommitObject(head.Hash()) 704 704 + require.NoError(t, err) 705 705 + assert.Equal(t, "Add feature", strings.TrimSpace(commit.Message)) 706 706 + }

+1 -1

knotserver/git/post_receive.go

··· 95 95 // git rev-list <newsha> ^other-branches --not ^this-branch 96 96 args = append(args, line.NewSha.String()) 97 97 98 98 - branches, _ := g.Branches() 98 98 + branches, _ := g.Branches(nil) 99 99 for _, b := range branches { 100 100 if !strings.Contains(line.Ref, b.Name) { 101 101 args = append(args, fmt.Sprintf("^%s", b.Name))

+38 -3

knotserver/git/tag.go

··· 10 10 "github.com/go-git/go-git/v5/plumbing/object" 11 11 ) 12 12 13 13 - func (g *GitRepo) Tags() ([]object.Tag, error) { 13 13 + type TagsOptions struct { 14 14 + Limit int 15 15 + Offset int 16 16 + Pattern string 17 17 + } 18 18 + 19 19 + func (g *GitRepo) Tags(opts *TagsOptions) ([]object.Tag, error) { 20 20 + if opts == nil { 21 21 + opts = &TagsOptions{} 22 22 + } 23 23 + 24 24 + if opts.Pattern == "" { 25 25 + opts.Pattern = "refs/tags" 26 26 + } 27 27 + 14 28 fields := []string{ 15 29 "refname:short", 16 30 "objectname", ··· 29 43 if i != 0 { 30 44 outFormat.WriteString(fieldSeparator) 31 45 } 32 32 - outFormat.WriteString(fmt.Sprintf("%%(%s)", f)) 46 46 + fmt.Fprintf(&outFormat, "%%(%s)", f) 33 47 } 34 48 outFormat.WriteString("") 35 49 outFormat.WriteString(recordSeparator) 36 50 37 37 - output, err := g.forEachRef(outFormat.String(), "--sort=-creatordate", "refs/tags") 51 51 + args := []string{outFormat.String(), "--sort=-creatordate"} 52 52 + 53 53 + // only add the count if the limit is a non-zero value, 54 54 + // if it is zero, get as many tags as we can 55 55 + if opts.Limit > 0 { 56 56 + args = append(args, fmt.Sprintf("--count=%d", opts.Offset+opts.Limit)) 57 57 + } 58 58 + 59 59 + args = append(args, opts.Pattern) 60 60 + 61 61 + output, err := g.forEachRef(args...) 38 62 if err != nil { 39 63 return nil, fmt.Errorf("failed to get tags: %w", err) 40 64 } ··· 44 68 return nil, nil 45 69 } 46 70 71 71 + startIdx := opts.Offset 72 72 + if startIdx >= len(records) { 73 73 + return nil, nil 74 74 + } 75 75 + 76 76 + endIdx := len(records) 77 77 + if opts.Limit > 0 { 78 78 + endIdx = min(startIdx+opts.Limit, len(records)) 79 79 + } 80 80 + 81 81 + records = records[startIdx:endIdx] 47 82 tags := make([]object.Tag, 0, len(records)) 48 83 49 84 for _, line := range records {

+365

knotserver/git/tag_test.go

··· 1 1 + package git 2 2 + 3 3 + import ( 4 4 + "path/filepath" 5 5 + "testing" 6 6 + "time" 7 7 + 8 8 + gogit "github.com/go-git/go-git/v5" 9 9 + "github.com/go-git/go-git/v5/plumbing" 10 10 + "github.com/go-git/go-git/v5/plumbing/object" 11 11 + "github.com/stretchr/testify/assert" 12 12 + "github.com/stretchr/testify/require" 13 13 + "github.com/stretchr/testify/suite" 14 14 + ) 15 15 + 16 16 + type TagSuite struct { 17 17 + suite.Suite 18 18 + *RepoSuite 19 19 + } 20 20 + 21 21 + func TestTagSuite(t *testing.T) { 22 22 + t.Parallel() 23 23 + suite.Run(t, new(TagSuite)) 24 24 + } 25 25 + 26 26 + func (s *TagSuite) SetupTest() { 27 27 + s.RepoSuite = NewRepoSuite(s.T()) 28 28 + } 29 29 + 30 30 + func (s *TagSuite) TearDownTest() { 31 31 + s.RepoSuite.cleanup() 32 32 + } 33 33 + 34 34 + func (s *TagSuite) setupRepoWithTags() { 35 35 + s.init() 36 36 + 37 37 + // create commits for tagging 38 38 + commit1 := s.commitFile("file1.txt", "content 1", "Add file1") 39 39 + commit2 := s.commitFile("file2.txt", "content 2", "Add file2") 40 40 + commit3 := s.commitFile("file3.txt", "content 3", "Add file3") 41 41 + commit4 := s.commitFile("file4.txt", "content 4", "Add file4") 42 42 + commit5 := s.commitFile("file5.txt", "content 5", "Add file5") 43 43 + 44 44 + // create annotated tags 45 45 + s.createAnnotatedTag( 46 46 + "v1.0.0", 47 47 + commit1, 48 48 + "Tagger One", 49 49 + "tagger1@example.com", 50 50 + "Release version 1.0.0\n\nThis is the first stable release.", 51 51 + s.baseTime.Add(1*time.Hour), 52 52 + ) 53 53 + 54 54 + s.createAnnotatedTag( 55 55 + "v1.1.0", 56 56 + commit2, 57 57 + "Tagger Two", 58 58 + "tagger2@example.com", 59 59 + "Release version 1.1.0", 60 60 + s.baseTime.Add(2*time.Hour), 61 61 + ) 62 62 + 63 63 + // create lightweight tags 64 64 + s.createLightweightTag("v2.0.0", commit3) 65 65 + s.createLightweightTag("v2.1.0", commit4) 66 66 + 67 67 + // create another annotated tag 68 68 + s.createAnnotatedTag( 69 69 + "v3.0.0", 70 70 + commit5, 71 71 + "Tagger Three", 72 72 + "tagger3@example.com", 73 73 + "Major version 3.0.0\n\nBreaking changes included.", 74 74 + s.baseTime.Add(3*time.Hour), 75 75 + ) 76 76 + } 77 77 + 78 78 + func (s *TagSuite) TestTags_All() { 79 79 + s.setupRepoWithTags() 80 80 + 81 81 + tags, err := s.repo.Tags(nil) 82 82 + require.NoError(s.T(), err) 83 83 + 84 84 + // we created 5 tags total (3 annotated, 2 lightweight) 85 85 + assert.Len(s.T(), tags, 5, "expected 5 tags") 86 86 + 87 87 + // verify tags are sorted by creation date (newest first) 88 88 + expectedAnnotated := map[string]bool{ 89 89 + "v1.0.0": true, 90 90 + "v1.1.0": true, 91 91 + "v3.0.0": true, 92 92 + } 93 93 + 94 94 + expectedLightweight := map[string]bool{ 95 95 + "v2.0.0": true, 96 96 + "v2.1.0": true, 97 97 + } 98 98 + 99 99 + for _, tag := range tags { 100 100 + if expectedAnnotated[tag.Name] { 101 101 + // annotated tags should have tagger info 102 102 + assert.NotEmpty(s.T(), tag.Tagger.Name, "annotated tag %s should have tagger name", tag.Name) 103 103 + assert.NotEmpty(s.T(), tag.Message, "annotated tag %s should have message", tag.Name) 104 104 + } else if expectedLightweight[tag.Name] { 105 105 + // lightweight tags won't have tagger info or message (they'll have empty values) 106 106 + } else { 107 107 + s.T().Errorf("unexpected tag name: %s", tag.Name) 108 108 + } 109 109 + } 110 110 + } 111 111 + 112 112 + func (s *TagSuite) TestTags_WithLimit() { 113 113 + s.setupRepoWithTags() 114 114 + 115 115 + tests := []struct { 116 116 + name string 117 117 + limit int 118 118 + expectedCount int 119 119 + }{ 120 120 + { 121 121 + name: "limit 1", 122 122 + limit: 1, 123 123 + expectedCount: 1, 124 124 + }, 125 125 + { 126 126 + name: "limit 2", 127 127 + limit: 2, 128 128 + expectedCount: 2, 129 129 + }, 130 130 + { 131 131 + name: "limit 3", 132 132 + limit: 3, 133 133 + expectedCount: 3, 134 134 + }, 135 135 + { 136 136 + name: "limit 10 (more than available)", 137 137 + limit: 10, 138 138 + expectedCount: 5, 139 139 + }, 140 140 + } 141 141 + 142 142 + for _, tt := range tests { 143 143 + s.Run(tt.name, func() { 144 144 + tags, err := s.repo.Tags(&TagsOptions{ 145 145 + Limit: tt.limit, 146 146 + }) 147 147 + require.NoError(s.T(), err) 148 148 + assert.Len(s.T(), tags, tt.expectedCount, "expected %d tags", tt.expectedCount) 149 149 + }) 150 150 + } 151 151 + } 152 152 + 153 153 + func (s *TagSuite) TestTags_WithOffset() { 154 154 + s.setupRepoWithTags() 155 155 + 156 156 + tests := []struct { 157 157 + name string 158 158 + offset int 159 159 + expectedCount int 160 160 + }{ 161 161 + { 162 162 + name: "offset 0", 163 163 + offset: 0, 164 164 + expectedCount: 5, 165 165 + }, 166 166 + { 167 167 + name: "offset 1", 168 168 + offset: 1, 169 169 + expectedCount: 4, 170 170 + }, 171 171 + { 172 172 + name: "offset 2", 173 173 + offset: 2, 174 174 + expectedCount: 3, 175 175 + }, 176 176 + { 177 177 + name: "offset 4", 178 178 + offset: 4, 179 179 + expectedCount: 1, 180 180 + }, 181 181 + { 182 182 + name: "offset 5 (all skipped)", 183 183 + offset: 5, 184 184 + expectedCount: 0, 185 185 + }, 186 186 + { 187 187 + name: "offset 10 (more than available)", 188 188 + offset: 10, 189 189 + expectedCount: 0, 190 190 + }, 191 191 + } 192 192 + 193 193 + for _, tt := range tests { 194 194 + s.Run(tt.name, func() { 195 195 + tags, err := s.repo.Tags(&TagsOptions{ 196 196 + Offset: tt.offset, 197 197 + }) 198 198 + require.NoError(s.T(), err) 199 199 + assert.Len(s.T(), tags, tt.expectedCount, "expected %d tags", tt.expectedCount) 200 200 + }) 201 201 + } 202 202 + } 203 203 + 204 204 + func (s *TagSuite) TestTags_WithLimitAndOffset() { 205 205 + s.setupRepoWithTags() 206 206 + 207 207 + tests := []struct { 208 208 + name string 209 209 + limit int 210 210 + offset int 211 211 + expectedCount int 212 212 + }{ 213 213 + { 214 214 + name: "limit 2, offset 0", 215 215 + limit: 2, 216 216 + offset: 0, 217 217 + expectedCount: 2, 218 218 + }, 219 219 + { 220 220 + name: "limit 2, offset 1", 221 221 + limit: 2, 222 222 + offset: 1, 223 223 + expectedCount: 2, 224 224 + }, 225 225 + { 226 226 + name: "limit 2, offset 3", 227 227 + limit: 2, 228 228 + offset: 3, 229 229 + expectedCount: 2, 230 230 + }, 231 231 + { 232 232 + name: "limit 2, offset 4", 233 233 + limit: 2, 234 234 + offset: 4, 235 235 + expectedCount: 1, 236 236 + }, 237 237 + { 238 238 + name: "limit 3, offset 2", 239 239 + limit: 3, 240 240 + offset: 2, 241 241 + expectedCount: 3, 242 242 + }, 243 243 + { 244 244 + name: "limit 10, offset 3", 245 245 + limit: 10, 246 246 + offset: 3, 247 247 + expectedCount: 2, 248 248 + }, 249 249 + } 250 250 + 251 251 + for _, tt := range tests { 252 252 + s.Run(tt.name, func() { 253 253 + tags, err := s.repo.Tags(&TagsOptions{ 254 254 + Limit: tt.limit, 255 255 + Offset: tt.offset, 256 256 + }) 257 257 + require.NoError(s.T(), err) 258 258 + assert.Len(s.T(), tags, tt.expectedCount, "expected %d tags", tt.expectedCount) 259 259 + }) 260 260 + } 261 261 + } 262 262 + 263 263 + func (s *TagSuite) TestTags_EmptyRepo() { 264 264 + repoPath := filepath.Join(s.tempDir, "empty-repo") 265 265 + 266 266 + _, err := gogit.PlainInit(repoPath, false) 267 267 + require.NoError(s.T(), err) 268 268 + 269 269 + gitRepo, err := PlainOpen(repoPath) 270 270 + require.NoError(s.T(), err) 271 271 + 272 272 + tags, err := gitRepo.Tags(nil) 273 273 + require.NoError(s.T(), err) 274 274 + 275 275 + if tags != nil { 276 276 + assert.Empty(s.T(), tags, "expected no tags in empty repo") 277 277 + } 278 278 + } 279 279 + 280 280 + func (s *TagSuite) TestTags_Pagination() { 281 281 + s.setupRepoWithTags() 282 282 + 283 283 + allTags, err := s.repo.Tags(nil) 284 284 + require.NoError(s.T(), err) 285 285 + assert.Len(s.T(), allTags, 5, "expected 5 tags") 286 286 + 287 287 + pageSize := 2 288 288 + var paginatedTags []object.Tag 289 289 + 290 290 + for offset := 0; offset < len(allTags); offset += pageSize { 291 291 + tags, err := s.repo.Tags(&TagsOptions{ 292 292 + Limit: pageSize, 293 293 + Offset: offset, 294 294 + }) 295 295 + require.NoError(s.T(), err) 296 296 + paginatedTags = append(paginatedTags, tags...) 297 297 + } 298 298 + 299 299 + assert.Len(s.T(), paginatedTags, len(allTags), "pagination should return all tags") 300 300 + 301 301 + for i := range allTags { 302 302 + assert.Equal(s.T(), allTags[i].Name, paginatedTags[i].Name, 303 303 + "tag at index %d differs", i) 304 304 + } 305 305 + } 306 306 + 307 307 + func (s *TagSuite) TestTags_VerifyAnnotatedTagFields() { 308 308 + s.setupRepoWithTags() 309 309 + 310 310 + tags, err := s.repo.Tags(nil) 311 311 + require.NoError(s.T(), err) 312 312 + 313 313 + var v1Tag *object.Tag 314 314 + for i := range tags { 315 315 + if tags[i].Name == "v1.0.0" { 316 316 + v1Tag = &tags[i] 317 317 + break 318 318 + } 319 319 + } 320 320 + 321 321 + require.NotNil(s.T(), v1Tag, "v1.0.0 tag not found") 322 322 + 323 323 + assert.Equal(s.T(), "Tagger One", v1Tag.Tagger.Name, "tagger name should match") 324 324 + assert.Equal(s.T(), "tagger1@example.com", v1Tag.Tagger.Email, "tagger email should match") 325 325 + 326 326 + assert.Equal(s.T(), "Release version 1.0.0\n\nThis is the first stable release.", 327 327 + v1Tag.Message, "tag message should match") 328 328 + 329 329 + assert.Equal(s.T(), plumbing.TagObject, v1Tag.TargetType, 330 330 + "target type should be CommitObject") 331 331 + 332 332 + assert.False(s.T(), v1Tag.Hash.IsZero(), "tag hash should be set") 333 333 + 334 334 + assert.False(s.T(), v1Tag.Target.IsZero(), "target hash should be set") 335 335 + } 336 336 + 337 337 + func (s *TagSuite) TestTags_NilOptions() { 338 338 + s.setupRepoWithTags() 339 339 + 340 340 + tags, err := s.repo.Tags(nil) 341 341 + require.NoError(s.T(), err) 342 342 + assert.Len(s.T(), tags, 5, "nil options should return all tags") 343 343 + } 344 344 + 345 345 + func (s *TagSuite) TestTags_ZeroLimitAndOffset() { 346 346 + s.setupRepoWithTags() 347 347 + 348 348 + tags, err := s.repo.Tags(&TagsOptions{ 349 349 + Limit: 0, 350 350 + Offset: 0, 351 351 + }) 352 352 + require.NoError(s.T(), err) 353 353 + assert.Len(s.T(), tags, 5, "zero limit should return all tags") 354 354 + } 355 355 + 356 356 + func (s *TagSuite) TestTags_Pattern() { 357 357 + s.setupRepoWithTags() 358 358 + 359 359 + v1tag, err := s.repo.Tags(&TagsOptions{ 360 360 + Pattern: "refs/tags/v1.0.0", 361 361 + }) 362 362 + 363 363 + require.NoError(s.T(), err) 364 364 + assert.Len(s.T(), v1tag, 1, "expected 1 tag") 365 365 + }

+141

knotserver/git/test_common.go

··· 1 1 + package git 2 2 + 3 3 + import ( 4 4 + "os" 5 5 + "path/filepath" 6 6 + "testing" 7 7 + "time" 8 8 + 9 9 + gogit "github.com/go-git/go-git/v5" 10 10 + "github.com/go-git/go-git/v5/plumbing" 11 11 + "github.com/go-git/go-git/v5/plumbing/object" 12 12 + "github.com/stretchr/testify/require" 13 13 + ) 14 14 + 15 15 + type RepoSuite struct { 16 16 + t *testing.T 17 17 + tempDir string 18 18 + repo *GitRepo 19 19 + baseTime time.Time 20 20 + } 21 21 + 22 22 + func NewRepoSuite(t *testing.T) *RepoSuite { 23 23 + tempDir, err := os.MkdirTemp("", "git-test-*") 24 24 + require.NoError(t, err) 25 25 + 26 26 + return &RepoSuite{ 27 27 + t: t, 28 28 + tempDir: tempDir, 29 29 + baseTime: time.Date(2024, 1, 1, 0, 0, 0, 0, time.UTC), 30 30 + } 31 31 + } 32 32 + 33 33 + func (h *RepoSuite) cleanup() { 34 34 + if h.tempDir != "" { 35 35 + os.RemoveAll(h.tempDir) 36 36 + } 37 37 + } 38 38 + 39 39 + func (h *RepoSuite) init() *GitRepo { 40 40 + repoPath := filepath.Join(h.tempDir, "test-repo") 41 41 + 42 42 + // initialize repository 43 43 + r, err := gogit.PlainInit(repoPath, false) 44 44 + require.NoError(h.t, err) 45 45 + 46 46 + // configure git user 47 47 + cfg, err := r.Config() 48 48 + require.NoError(h.t, err) 49 49 + cfg.User.Name = "Test User" 50 50 + cfg.User.Email = "test@example.com" 51 51 + err = r.SetConfig(cfg) 52 52 + require.NoError(h.t, err) 53 53 + 54 54 + // create initial commit with a file 55 55 + w, err := r.Worktree() 56 56 + require.NoError(h.t, err) 57 57 + 58 58 + // create initial file 59 59 + initialFile := filepath.Join(repoPath, "README.md") 60 60 + err = os.WriteFile(initialFile, []byte("# Test Repository\n\nInitial content.\n"), 0644) 61 61 + require.NoError(h.t, err) 62 62 + 63 63 + _, err = w.Add("README.md") 64 64 + require.NoError(h.t, err) 65 65 + 66 66 + _, err = w.Commit("Initial commit", &gogit.CommitOptions{ 67 67 + Author: &object.Signature{ 68 68 + Name: "Test User", 69 69 + Email: "test@example.com", 70 70 + When: h.baseTime, 71 71 + }, 72 72 + }) 73 73 + require.NoError(h.t, err) 74 74 + 75 75 + gitRepo, err := PlainOpen(repoPath) 76 76 + require.NoError(h.t, err) 77 77 + 78 78 + h.repo = gitRepo 79 79 + return gitRepo 80 80 + } 81 81 + 82 82 + func (h *RepoSuite) commitFile(filename, content, message string) plumbing.Hash { 83 83 + filePath := filepath.Join(h.repo.path, filename) 84 84 + dir := filepath.Dir(filePath) 85 85 + 86 86 + err := os.MkdirAll(dir, 0755) 87 87 + require.NoError(h.t, err) 88 88 + 89 89 + err = os.WriteFile(filePath, []byte(content), 0644) 90 90 + require.NoError(h.t, err) 91 91 + 92 92 + w, err := h.repo.r.Worktree() 93 93 + require.NoError(h.t, err) 94 94 + 95 95 + _, err = w.Add(filename) 96 96 + require.NoError(h.t, err) 97 97 + 98 98 + hash, err := w.Commit(message, &gogit.CommitOptions{ 99 99 + Author: &object.Signature{ 100 100 + Name: "Test User", 101 101 + Email: "test@example.com", 102 102 + }, 103 103 + }) 104 104 + require.NoError(h.t, err) 105 105 + 106 106 + return hash 107 107 + } 108 108 + 109 109 + func (h *RepoSuite) createAnnotatedTag(name string, commit plumbing.Hash, taggerName, taggerEmail, message string, when time.Time) { 110 110 + _, err := h.repo.r.CreateTag(name, commit, &gogit.CreateTagOptions{ 111 111 + Tagger: &object.Signature{ 112 112 + Name: taggerName, 113 113 + Email: taggerEmail, 114 114 + When: when, 115 115 + }, 116 116 + Message: message, 117 117 + }) 118 118 + require.NoError(h.t, err) 119 119 + } 120 120 + 121 121 + func (h *RepoSuite) createLightweightTag(name string, commit plumbing.Hash) { 122 122 + ref := plumbing.NewReferenceFromStrings("refs/tags/"+name, commit.String()) 123 123 + err := h.repo.r.Storer.SetReference(ref) 124 124 + require.NoError(h.t, err) 125 125 + } 126 126 + 127 127 + func (h *RepoSuite) createBranch(name string, commit plumbing.Hash) { 128 128 + ref := plumbing.NewReferenceFromStrings("refs/heads/"+name, commit.String()) 129 129 + err := h.repo.r.Storer.SetReference(ref) 130 130 + require.NoError(h.t, err) 131 131 + } 132 132 + 133 133 + func (h *RepoSuite) checkoutBranch(name string) { 134 134 + w, err := h.repo.r.Worktree() 135 135 + require.NoError(h.t, err) 136 136 + 137 137 + err = w.Checkout(&gogit.CheckoutOptions{ 138 138 + Branch: plumbing.NewBranchReferenceName(name), 139 139 + }) 140 140 + require.NoError(h.t, err) 141 141 + }

+11 -1

knotserver/git/tree.go

··· 48 48 func (g *GitRepo) makeNiceTree(ctx context.Context, subtree *object.Tree, parent string) []types.NiceTree { 49 49 nts := []types.NiceTree{} 50 50 51 51 - times, err := g.calculateCommitTimeIn(ctx, subtree, parent, 2*time.Second) 51 51 + entries := make([]string, len(subtree.Entries)) 52 52 + for _, e := range subtree.Entries { 53 53 + entries = append(entries, e.Name) 54 54 + } 55 55 + 56 56 + lastCommitDir := lastCommitDir{ 57 57 + dir: parent, 58 58 + entries: entries, 59 59 + } 60 60 + 61 61 + times, err := g.lastCommitDirIn(ctx, lastCommitDir, 2*time.Second) 52 62 if err != nil { 53 63 return nts 54 64 }

+25

knotserver/router.go

··· 5 5 "fmt" 6 6 "log/slog" 7 7 "net/http" 8 8 + "strings" 8 9 9 10 "github.com/go-chi/chi/v5" 10 11 "tangled.org/core/idresolver" ··· 79 80 }) 80 81 81 82 r.Route("/{did}", func(r chi.Router) { 83 83 + r.Use(h.resolveDidRedirect) 82 84 r.Route("/{name}", func(r chi.Router) { 83 85 // routes for git operations 84 86 r.Get("/info/refs", h.InfoRefs) ··· 114 116 } 115 117 116 118 return xrpc.Router() 119 119 + } 120 120 + 121 121 + func (h *Knot) resolveDidRedirect(next http.Handler) http.Handler { 122 122 + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 123 123 + didOrHandle := chi.URLParam(r, "did") 124 124 + if strings.HasPrefix(didOrHandle, "did:") { 125 125 + next.ServeHTTP(w, r) 126 126 + return 127 127 + } 128 128 + 129 129 + trimmed := strings.TrimPrefix(didOrHandle, "@") 130 130 + id, err := h.resolver.ResolveIdent(r.Context(), trimmed) 131 131 + if err != nil { 132 132 + // invalid did or handle 133 133 + h.l.Error("failed to resolve did/handle", "handle", trimmed, "err", err) 134 134 + http.Error(w, fmt.Sprintf("failed to resolve did/handle: %s", trimmed), http.StatusInternalServerError) 135 135 + return 136 136 + } 137 137 + 138 138 + suffix := strings.TrimPrefix(r.URL.Path, "/"+didOrHandle) 139 139 + newPath := fmt.Sprintf("/%s/%s?%s", id.DID.String(), suffix, r.URL.RawQuery) 140 140 + http.Redirect(w, r, newPath, http.StatusTemporaryRedirect) 141 141 + }) 117 142 } 118 143 119 144 func (h *Knot) configureOwner() error {

+7 -1

knotserver/xrpc/merge_check.go

··· 9 9 securejoin "github.com/cyphar/filepath-securejoin" 10 10 "tangled.org/core/api/tangled" 11 11 "tangled.org/core/knotserver/git" 12 12 + "tangled.org/core/patchutil" 12 13 xrpcerr "tangled.org/core/xrpc/errors" 13 14 ) 14 15 ··· 51 52 return 52 53 } 53 54 54 54 - err = gr.MergeCheck(data.Patch, data.Branch) 55 55 + mo := git.MergeOptions{} 56 56 + mo.CommitterName = x.Config.Git.UserName 57 57 + mo.CommitterEmail = x.Config.Git.UserEmail 58 58 + mo.FormatPatch = patchutil.IsFormatPatch(data.Patch) 59 59 + 60 60 + err = gr.MergeCheckWithOptions(data.Patch, data.Branch, mo) 55 61 56 62 response := tangled.RepoMergeCheck_Output{ 57 63 Is_conflicted: false,

+23

knotserver/xrpc/repo_blob.go

··· 1 1 package xrpc 2 2 3 3 import ( 4 4 + "context" 4 5 "crypto/sha256" 5 6 "encoding/base64" 6 7 "fmt" ··· 8 9 "path/filepath" 9 10 "slices" 10 11 "strings" 12 12 + "time" 11 13 12 14 "tangled.org/core/api/tangled" 13 15 "tangled.org/core/knotserver/git" ··· 140 142 141 143 if mimeType != "" { 142 144 response.MimeType = &mimeType 145 145 + } 146 146 + 147 147 + ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second) 148 148 + defer cancel() 149 149 + 150 150 + lastCommit, err := gr.LastCommitFile(ctx, treePath) 151 151 + if err == nil && lastCommit != nil { 152 152 + response.LastCommit = &tangled.RepoBlob_LastCommit{ 153 153 + Hash: lastCommit.Hash.String(), 154 154 + Message: lastCommit.Message, 155 155 + When: lastCommit.When.Format(time.RFC3339), 156 156 + } 157 157 + 158 158 + // try to get author information 159 159 + commit, err := gr.Commit(lastCommit.Hash) 160 160 + if err == nil { 161 161 + response.LastCommit.Author = &tangled.RepoBlob_Signature{ 162 162 + Name: commit.Author.Name, 163 163 + Email: commit.Author.Email, 164 164 + } 165 165 + } 143 166 } 144 167 145 168 writeJson(w, response)

+14 -21

knotserver/xrpc/repo_branches.go

··· 17 17 return 18 18 } 19 19 20 20 - cursor := r.URL.Query().Get("cursor") 20 20 + // default 21 21 + limit := 50 22 22 + offset := 0 21 23 22 22 - // limit := 50 // default 23 23 - // if limitStr := r.URL.Query().Get("limit"); limitStr != "" { 24 24 - // if l, err := strconv.Atoi(limitStr); err == nil && l > 0 && l <= 100 { 25 25 - // limit = l 26 26 - // } 27 27 - // } 24 24 + if l, err := strconv.Atoi(r.URL.Query().Get("limit")); err == nil && l > 0 && l <= 100 { 25 25 + limit = l 26 26 + } 28 27 29 29 - limit := 500 28 28 + if o, err := strconv.Atoi(r.URL.Query().Get("cursor")); err == nil && o > 0 { 29 29 + offset = o 30 30 + } 30 31 31 32 gr, err := git.PlainOpen(repoPath) 32 33 if err != nil { ··· 34 35 return 35 36 } 36 37 37 37 - branches, _ := gr.Branches() 38 38 - 39 39 - offset := 0 40 40 - if cursor != "" { 41 41 - if o, err := strconv.Atoi(cursor); err == nil && o >= 0 && o < len(branches) { 42 42 - offset = o 43 43 - } 44 44 - } 45 45 - 46 46 - end := min(offset+limit, len(branches)) 47 47 - 48 48 - paginatedBranches := branches[offset:end] 38 38 + branches, _ := gr.Branches(&git.BranchesOptions{ 39 39 + Limit: limit, 40 40 + Offset: offset, 41 41 + }) 49 42 50 43 // Create response using existing types.RepoBranchesResponse 51 44 response := types.RepoBranchesResponse{ 52 52 - Branches: paginatedBranches, 45 45 + Branches: branches, 53 46 } 54 47 55 48 writeJson(w, response)

+85

knotserver/xrpc/repo_tag.go

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "net/http" 6 6 + 7 7 + "github.com/go-git/go-git/v5/plumbing" 8 8 + "github.com/go-git/go-git/v5/plumbing/object" 9 9 + 10 10 + "tangled.org/core/knotserver/git" 11 11 + "tangled.org/core/types" 12 12 + xrpcerr "tangled.org/core/xrpc/errors" 13 13 + ) 14 14 + 15 15 + func (x *Xrpc) RepoTag(w http.ResponseWriter, r *http.Request) { 16 16 + repo := r.URL.Query().Get("repo") 17 17 + repoPath, err := x.parseRepoParam(repo) 18 18 + if err != nil { 19 19 + writeError(w, err.(xrpcerr.XrpcError), http.StatusBadRequest) 20 20 + return 21 21 + } 22 22 + 23 23 + tagName := r.URL.Query().Get("tag") 24 24 + if tagName == "" { 25 25 + writeError(w, xrpcerr.NewXrpcError( 26 26 + xrpcerr.WithTag("InvalidRequest"), 27 27 + xrpcerr.WithMessage("missing name parameter"), 28 28 + ), http.StatusBadRequest) 29 29 + return 30 30 + } 31 31 + 32 32 + gr, err := git.PlainOpen(repoPath) 33 33 + if err != nil { 34 34 + x.Logger.Error("failed to open", "error", err) 35 35 + writeError(w, xrpcerr.RepoNotFoundError, http.StatusNoContent) 36 36 + return 37 37 + } 38 38 + 39 39 + // if this is not already formatted as refs/tags/v0.1.0, then format it 40 40 + if !plumbing.ReferenceName(tagName).IsTag() { 41 41 + tagName = plumbing.NewTagReferenceName(tagName).String() 42 42 + } 43 43 + 44 44 + tags, err := gr.Tags(&git.TagsOptions{ 45 45 + Pattern: tagName, 46 46 + }) 47 47 + 48 48 + if len(tags) != 1 { 49 49 + writeError(w, xrpcerr.NewXrpcError( 50 50 + xrpcerr.WithTag("TagNotFound"), 51 51 + xrpcerr.WithMessage(fmt.Sprintf("expected 1 tag to be returned, got %d tags", len(tags))), 52 52 + ), http.StatusBadRequest) 53 53 + return 54 54 + } 55 55 + 56 56 + tag := tags[0] 57 57 + 58 58 + if err != nil { 59 59 + x.Logger.Warn("getting tags", "error", err.Error()) 60 60 + tags = []object.Tag{} 61 61 + } 62 62 + 63 63 + var target *object.Tag 64 64 + if tag.Target != plumbing.ZeroHash { 65 65 + target = &tag 66 66 + } 67 67 + tr := types.TagReference{ 68 68 + Tag: target, 69 69 + } 70 70 + 71 71 + tr.Reference = types.Reference{ 72 72 + Name: tag.Name, 73 73 + Hash: tag.Hash.String(), 74 74 + } 75 75 + 76 76 + if tag.Message != "" { 77 77 + tr.Message = tag.Message 78 78 + } 79 79 + 80 80 + response := types.RepoTagResponse{ 81 81 + Tag: &tr, 82 82 + } 83 83 + 84 84 + writeJson(w, response) 85 85 + }

+15 -22

knotserver/xrpc/repo_tags.go

··· 20 20 return 21 21 } 22 22 23 23 - cursor := r.URL.Query().Get("cursor") 23 23 + // default 24 24 + limit := 50 25 25 + offset := 0 24 26 25 25 - limit := 50 // default 26 26 - if limitStr := r.URL.Query().Get("limit"); limitStr != "" { 27 27 - if l, err := strconv.Atoi(limitStr); err == nil && l > 0 && l <= 100 { 28 28 - limit = l 29 29 - } 27 27 + if l, err := strconv.Atoi(r.URL.Query().Get("limit")); err == nil && l > 0 && l <= 100 { 28 28 + limit = l 29 29 + } 30 30 + 31 31 + if o, err := strconv.Atoi(r.URL.Query().Get("cursor")); err == nil && o > 0 { 32 32 + offset = o 30 33 } 31 34 32 35 gr, err := git.PlainOpen(repoPath) ··· 36 39 return 37 40 } 38 41 39 39 - tags, err := gr.Tags() 42 42 + tags, err := gr.Tags(&git.TagsOptions{ 43 43 + Limit: limit, 44 44 + Offset: offset, 45 45 + }) 46 46 + 40 47 if err != nil { 41 48 x.Logger.Warn("getting tags", "error", err.Error()) 42 49 tags = []object.Tag{} ··· 64 71 rtags = append(rtags, &tr) 65 72 } 66 73 67 67 - // apply pagination manually 68 68 - offset := 0 69 69 - if cursor != "" { 70 70 - if o, err := strconv.Atoi(cursor); err == nil && o >= 0 && o < len(rtags) { 71 71 - offset = o 72 72 - } 73 73 - } 74 74 - 75 75 - // calculate end index 76 76 - end := min(offset+limit, len(rtags)) 77 77 - 78 78 - paginatedTags := rtags[offset:end] 79 79 - 80 80 - // Create response using existing types.RepoTagsResponse 81 74 response := types.RepoTagsResponse{ 82 82 - Tags: paginatedTags, 75 75 + Tags: rtags, 83 76 } 84 77 85 78 writeJson(w, response)

+35

knotserver/xrpc/repo_tree.go

··· 9 9 "tangled.org/core/api/tangled" 10 10 "tangled.org/core/appview/pages/markup" 11 11 "tangled.org/core/knotserver/git" 12 12 + "tangled.org/core/types" 12 13 xrpcerr "tangled.org/core/xrpc/errors" 13 14 ) 14 15 ··· 105 106 Filename: readmeFileName, 106 107 Contents: readmeContents, 107 108 }, 109 109 + } 110 110 + 111 111 + // calculate lastCommit for the directory as a whole 112 112 + var lastCommitTree *types.LastCommitInfo 113 113 + for _, e := range files { 114 114 + if e.LastCommit == nil { 115 115 + continue 116 116 + } 117 117 + 118 118 + if lastCommitTree == nil { 119 119 + lastCommitTree = e.LastCommit 120 120 + continue 121 121 + } 122 122 + 123 123 + if lastCommitTree.When.After(e.LastCommit.When) { 124 124 + lastCommitTree = e.LastCommit 125 125 + } 126 126 + } 127 127 + 128 128 + if lastCommitTree != nil { 129 129 + response.LastCommit = &tangled.RepoTree_LastCommit{ 130 130 + Hash: lastCommitTree.Hash.String(), 131 131 + Message: lastCommitTree.Message, 132 132 + When: lastCommitTree.When.Format(time.RFC3339), 133 133 + } 134 134 + 135 135 + // try to get author information 136 136 + commit, err := gr.Commit(lastCommitTree.Hash) 137 137 + if err == nil { 138 138 + response.LastCommit.Author = &tangled.RepoTree_Signature{ 139 139 + Name: commit.Author.Name, 140 140 + Email: commit.Author.Email, 141 141 + } 142 142 + } 108 143 } 109 144 110 145 writeJson(w, response)

+1

knotserver/xrpc/xrpc.go

··· 59 59 r.Get("/"+tangled.RepoLogNSID, x.RepoLog) 60 60 r.Get("/"+tangled.RepoBranchesNSID, x.RepoBranches) 61 61 r.Get("/"+tangled.RepoTagsNSID, x.RepoTags) 62 62 + r.Get("/"+tangled.RepoTagNSID, x.RepoTag) 62 63 r.Get("/"+tangled.RepoBlobNSID, x.RepoBlob) 63 64 r.Get("/"+tangled.RepoDiffNSID, x.RepoDiff) 64 65 r.Get("/"+tangled.RepoCompareNSID, x.RepoCompare)

+2 -1

lexicons/actor/profile.json

··· 45 45 "open-pull-request-count", 46 46 "open-issue-count", 47 47 "closed-issue-count", 48 48 - "repository-count" 48 48 + "repository-count", 49 49 + "star-count" 49 50 ] 50 51 } 51 52 },

-4

lexicons/repo/blob.json

··· 115 115 "type": "string", 116 116 "description": "Commit hash" 117 117 }, 118 118 - "shortHash": { 119 119 - "type": "string", 120 120 - "description": "Short commit hash" 121 121 - }, 122 118 "message": { 123 119 "type": "string", 124 120 "description": "Commit message"

+43

lexicons/repo/tag.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.tag", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "parameters": { 8 8 + "type": "params", 9 9 + "required": [ 10 10 + "repo", 11 11 + "tag" 12 12 + ], 13 13 + "properties": { 14 14 + "repo": { 15 15 + "type": "string", 16 16 + "description": "Repository identifier in format 'did:plc:.../repoName'" 17 17 + }, 18 18 + "tag": { 19 19 + "type": "string", 20 20 + "description": "Name of tag, such as v1.3.0" 21 21 + } 22 22 + } 23 23 + }, 24 24 + "output": { 25 25 + "encoding": "*/*" 26 26 + }, 27 27 + "errors": [ 28 28 + { 29 29 + "name": "RepoNotFound", 30 30 + "description": "Repository not found or access denied" 31 31 + }, 32 32 + { 33 33 + "name": "TagNotFound", 34 34 + "description": "Tag not found" 35 35 + }, 36 36 + { 37 37 + "name": "InvalidRequest", 38 38 + "description": "Invalid request parameters" 39 39 + } 40 40 + ] 41 41 + } 42 42 + } 43 43 + }

+53 -5

lexicons/repo/tree.json

··· 6 6 "type": "query", 7 7 "parameters": { 8 8 "type": "params", 9 9 - "required": ["repo", "ref"], 9 9 + "required": [ 10 10 + "repo", 11 11 + "ref" 12 12 + ], 10 13 "properties": { 11 14 "repo": { 12 15 "type": "string", ··· 27 30 "encoding": "application/json", 28 31 "schema": { 29 32 "type": "object", 30 30 - "required": ["ref", "files"], 33 33 + "required": [ 34 34 + "ref", 35 35 + "files" 36 36 + ], 31 37 "properties": { 32 38 "ref": { 33 39 "type": "string", ··· 45 51 "type": "ref", 46 52 "ref": "#readme", 47 53 "description": "Readme for this file tree" 54 54 + }, 55 55 + "lastCommit": { 56 56 + "type": "ref", 57 57 + "ref": "#lastCommit" 48 58 }, 49 59 "files": { 50 60 "type": "array", ··· 77 87 }, 78 88 "readme": { 79 89 "type": "object", 80 80 - "required": ["filename", "contents"], 90 90 + "required": [ 91 91 + "filename", 92 92 + "contents" 93 93 + ], 81 94 "properties": { 82 95 "filename": { 83 96 "type": "string", ··· 91 104 }, 92 105 "treeEntry": { 93 106 "type": "object", 94 94 - "required": ["name", "mode", "size"], 107 107 + "required": [ 108 108 + "name", 109 109 + "mode", 110 110 + "size" 111 111 + ], 95 112 "properties": { 96 113 "name": { 97 114 "type": "string", ··· 113 130 }, 114 131 "lastCommit": { 115 132 "type": "object", 116 116 - "required": ["hash", "message", "when"], 133 133 + "required": [ 134 134 + "hash", 135 135 + "message", 136 136 + "when" 137 137 + ], 117 138 "properties": { 118 139 "hash": { 119 140 "type": "string", ··· 123 144 "type": "string", 124 145 "description": "Commit message" 125 146 }, 147 147 + "author": { 148 148 + "type": "ref", 149 149 + "ref": "#signature" 150 150 + }, 126 151 "when": { 127 152 "type": "string", 128 153 "format": "datetime", 129 154 "description": "Commit timestamp" 155 155 + } 156 156 + } 157 157 + }, 158 158 + "signature": { 159 159 + "type": "object", 160 160 + "required": [ 161 161 + "name", 162 162 + "email", 163 163 + "when" 164 164 + ], 165 165 + "properties": { 166 166 + "name": { 167 167 + "type": "string", 168 168 + "description": "Author name" 169 169 + }, 170 170 + "email": { 171 171 + "type": "string", 172 172 + "description": "Author email" 173 173 + }, 174 174 + "when": { 175 175 + "type": "string", 176 176 + "format": "datetime", 177 177 + "description": "Author timestamp" 130 178 } 131 179 } 132 180 }

+16 -14

spindle/engine/engine.go

··· 30 30 } 31 31 } 32 32 33 33 + secretValues := make([]string, len(allSecrets)) 34 34 + for i, s := range allSecrets { 35 35 + secretValues[i] = s.Value 36 36 + } 37 37 + 33 38 var wg sync.WaitGroup 34 39 for eng, wfs := range pipeline.Workflows { 35 40 workflowTimeout := eng.WorkflowTimeout() ··· 45 50 Name: w.Name, 46 51 } 47 52 48 48 - err := db.StatusRunning(wid, n) 53 53 + wfLogger, err := models.NewFileWorkflowLogger(cfg.Server.LogDir, wid, secretValues) 54 54 + if err != nil { 55 55 + l.Warn("failed to setup step logger; logs will not be persisted", "error", err) 56 56 + wfLogger = models.NullLogger{} 57 57 + } else { 58 58 + l.Info("setup step logger; logs will be persisted", "logDir", cfg.Server.LogDir, "wid", wid) 59 59 + defer wfLogger.Close() 60 60 + } 61 61 + 62 62 + err = db.StatusRunning(wid, n) 49 63 if err != nil { 50 64 l.Error("failed to set workflow status to running", "wid", wid, "err", err) 51 65 return 52 66 } 53 67 54 54 - err = eng.SetupWorkflow(ctx, wid, &w) 68 68 + err = eng.SetupWorkflow(ctx, wid, &w, wfLogger) 55 69 if err != nil { 56 70 // TODO(winter): Should this always set StatusFailed? 57 71 // In the original, we only do in a subset of cases. ··· 69 83 return 70 84 } 71 85 defer eng.DestroyWorkflow(ctx, wid) 72 72 - 73 73 - secretValues := make([]string, len(allSecrets)) 74 74 - for i, s := range allSecrets { 75 75 - secretValues[i] = s.Value 76 76 - } 77 77 - wfLogger, err := models.NewWorkflowLogger(cfg.Server.LogDir, wid, secretValues) 78 78 - if err != nil { 79 79 - l.Warn("failed to setup step logger; logs will not be persisted", "error", err) 80 80 - wfLogger = nil 81 81 - } else { 82 82 - defer wfLogger.Close() 83 83 - } 84 86 85 87 ctx, cancel := context.WithTimeout(ctx, workflowTimeout) 86 88 defer cancel()

+52 -9

spindle/engines/nixery/engine.go

··· 1 1 package nixery 2 2 3 3 import ( 4 4 + "bufio" 4 5 "context" 5 6 "errors" 6 7 "fmt" 7 8 "io" 8 9 "log/slog" 9 9 - "os" 10 10 "path" 11 11 "runtime" 12 12 "sync" ··· 169 169 return e, nil 170 170 } 171 171 172 172 - func (e *Engine) SetupWorkflow(ctx context.Context, wid models.WorkflowId, wf *models.Workflow) error { 173 173 - e.l.Info("setting up workflow", "workflow", wid) 172 172 + func (e *Engine) SetupWorkflow(ctx context.Context, wid models.WorkflowId, wf *models.Workflow, wfLogger models.WorkflowLogger) error { 173 173 + /// -------------------------INITIAL SETUP------------------------------------------ 174 174 + l := e.l.With("workflow", wid) 175 175 + l.Info("setting up workflow") 176 176 + 177 177 + setupStep := Step{ 178 178 + name: "nixery image pull", 179 179 + kind: models.StepKindSystem, 180 180 + } 181 181 + setupStepIdx := -1 182 182 + 183 183 + wfLogger.ControlWriter(setupStepIdx, setupStep, models.StepStatusStart).Write([]byte{0}) 184 184 + defer wfLogger.ControlWriter(setupStepIdx, setupStep, models.StepStatusEnd).Write([]byte{0}) 174 185 186 186 + /// -------------------------NETWORK CREATION--------------------------------------- 175 187 _, err := e.docker.NetworkCreate(ctx, networkName(wid), network.CreateOptions{ 176 188 Driver: "bridge", 177 189 }) 178 190 if err != nil { 179 191 return err 180 192 } 193 193 + 181 194 e.registerCleanup(wid, func(ctx context.Context) error { 182 195 if err := e.docker.NetworkRemove(ctx, networkName(wid)); err != nil { 183 196 return fmt.Errorf("removing network: %w", err) ··· 185 198 return nil 186 199 }) 187 200 201 201 + /// -------------------------IMAGE PULL--------------------------------------------- 188 202 addl := wf.Data.(addlFields) 203 203 + l.Info("pulling image", "image", addl.image) 204 204 + fmt.Fprintf( 205 205 + wfLogger.DataWriter(setupStepIdx, "stdout"), 206 206 + "pulling image: %s", 207 207 + addl.image, 208 208 + ) 189 209 190 210 reader, err := e.docker.ImagePull(ctx, addl.image, image.PullOptions{}) 191 211 if err != nil { 192 192 - e.l.Error("pipeline image pull failed!", "image", addl.image, "workflowId", wid, "error", err.Error()) 193 193 - 212 212 + l.Error("pipeline image pull failed!", "error", err.Error()) 213 213 + fmt.Fprintf(wfLogger.DataWriter(setupStepIdx, "stderr"), "image pull failed: %s", err) 194 214 return fmt.Errorf("pulling image: %w", err) 195 215 } 196 216 defer reader.Close() 197 197 - io.Copy(os.Stdout, reader) 217 217 + 218 218 + scanner := bufio.NewScanner(reader) 219 219 + for scanner.Scan() { 220 220 + line := scanner.Text() 221 221 + wfLogger.DataWriter(setupStepIdx, "stdout").Write([]byte(line)) 222 222 + l.Info("image pull progress", "stdout", line) 223 223 + } 224 224 + 225 225 + /// -------------------------CONTAINER CREATION------------------------------------- 226 226 + l.Info("creating container") 227 227 + wfLogger.DataWriter(setupStepIdx, "stdout").Write([]byte("creating container...")) 198 228 199 229 resp, err := e.docker.ContainerCreate(ctx, &container.Config{ 200 230 Image: addl.image, ··· 229 259 ExtraHosts: []string{"host.docker.internal:host-gateway"}, 230 260 }, nil, nil, "") 231 261 if err != nil { 262 262 + fmt.Fprintf( 263 263 + wfLogger.DataWriter(setupStepIdx, "stderr"), 264 264 + "container creation failed: %s", 265 265 + err, 266 266 + ) 232 267 return fmt.Errorf("creating container: %w", err) 233 268 } 269 269 + 234 270 e.registerCleanup(wid, func(ctx context.Context) error { 235 271 if err := e.docker.ContainerStop(ctx, resp.ID, container.StopOptions{}); err != nil { 236 272 return fmt.Errorf("stopping container: %w", err) ··· 244 280 if err != nil { 245 281 return fmt.Errorf("removing container: %w", err) 246 282 } 283 283 + 247 284 return nil 248 285 }) 249 286 287 287 + /// -------------------------CONTAINER START---------------------------------------- 288 288 + wfLogger.DataWriter(setupStepIdx, "stdout").Write([]byte("starting container...")) 250 289 if err := e.docker.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil { 251 290 return fmt.Errorf("starting container: %w", err) 252 291 } ··· 273 312 return err 274 313 } 275 314 315 315 + /// -----------------------------------FINISH--------------------------------------- 276 316 execInspectResp, err := e.docker.ContainerExecInspect(ctx, mkExecResp.ID) 277 317 if err != nil { 278 318 return err ··· 290 330 return nil 291 331 } 292 332 293 293 - func (e *Engine) RunStep(ctx context.Context, wid models.WorkflowId, w *models.Workflow, idx int, secrets []secrets.UnlockedSecret, wfLogger *models.WorkflowLogger) error { 333 333 + func (e *Engine) RunStep(ctx context.Context, wid models.WorkflowId, w *models.Workflow, idx int, secrets []secrets.UnlockedSecret, wfLogger models.WorkflowLogger) error { 294 334 addl := w.Data.(addlFields) 295 335 workflowEnvs := ConstructEnvs(w.Environment) 296 336 // TODO(winter): should SetupWorkflow also have secret access? ··· 313 353 envs.AddEnv(k, v) 314 354 } 315 355 } 356 356 + 316 357 envs.AddEnv("HOME", homeDir) 358 358 + existingPath := "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" 359 359 + envs.AddEnv("PATH", fmt.Sprintf("%s/.nix-profile/bin:/nix/var/nix/profiles/default/bin:%s", homeDir, existingPath)) 317 360 318 361 mkExecResp, err := e.docker.ContainerExecCreate(ctx, addl.container, container.ExecOptions{ 319 362 Cmd: []string{"bash", "-c", step.Command()}, ··· 328 371 // start tailing logs in background 329 372 tailDone := make(chan error, 1) 330 373 go func() { 331 331 - tailDone <- e.tailStep(ctx, wfLogger, mkExecResp.ID, wid, idx, step) 374 374 + tailDone <- e.tailStep(ctx, wfLogger, mkExecResp.ID, idx) 332 375 }() 333 376 334 377 select { ··· 374 417 return nil 375 418 } 376 419 377 377 - func (e *Engine) tailStep(ctx context.Context, wfLogger *models.WorkflowLogger, execID string, wid models.WorkflowId, stepIdx int, step models.Step) error { 420 420 + func (e *Engine) tailStep(ctx context.Context, wfLogger models.WorkflowLogger, execID string, stepIdx int) error { 378 421 if wfLogger == nil { 379 422 return nil 380 423 }

+1 -1

spindle/engines/nixery/setup_steps.go

··· 37 37 } 38 38 39 39 if len(customPackages) > 0 { 40 40 - installCmd := "nix --extra-experimental-features nix-command --extra-experimental-features flakes profile install" 40 40 + installCmd := "nix --extra-experimental-features nix-command --extra-experimental-features flakes profile add" 41 41 cmd := fmt.Sprintf("%s %s", installCmd, strings.Join(customPackages, " ")) 42 42 installStep := Step{ 43 43 command: cmd,

+2 -2

spindle/models/engine.go

··· 10 10 11 11 type Engine interface { 12 12 InitWorkflow(twf tangled.Pipeline_Workflow, tpl tangled.Pipeline) (*Workflow, error) 13 13 - SetupWorkflow(ctx context.Context, wid WorkflowId, wf *Workflow) error 13 13 + SetupWorkflow(ctx context.Context, wid WorkflowId, wf *Workflow, wfLogger WorkflowLogger) error 14 14 WorkflowTimeout() time.Duration 15 15 DestroyWorkflow(ctx context.Context, wid WorkflowId) error 16 16 - RunStep(ctx context.Context, wid WorkflowId, w *Workflow, idx int, secrets []secrets.UnlockedSecret, wfLogger *WorkflowLogger) error 16 16 + RunStep(ctx context.Context, wid WorkflowId, w *Workflow, idx int, secrets []secrets.UnlockedSecret, wfLogger WorkflowLogger) error 17 17 }

+22 -10

spindle/models/logger.go

··· 9 9 "strings" 10 10 ) 11 11 12 12 - type WorkflowLogger struct { 12 12 + type WorkflowLogger interface { 13 13 + Close() error 14 14 + DataWriter(idx int, stream string) io.Writer 15 15 + ControlWriter(idx int, step Step, stepStatus StepStatus) io.Writer 16 16 + } 17 17 + 18 18 + type NullLogger struct{} 19 19 + 20 20 + func (l NullLogger) Close() error { return nil } 21 21 + func (l NullLogger) DataWriter(idx int, stream string) io.Writer { return io.Discard } 22 22 + func (l NullLogger) ControlWriter(idx int, step Step, stepStatus StepStatus) io.Writer { 23 23 + return io.Discard 24 24 + } 25 25 + 26 26 + type FileWorkflowLogger struct { 13 27 file *os.File 14 28 encoder *json.Encoder 15 29 mask *SecretMask 16 30 } 17 31 18 18 - func NewWorkflowLogger(baseDir string, wid WorkflowId, secretValues []string) (*WorkflowLogger, error) { 32 32 + func NewFileWorkflowLogger(baseDir string, wid WorkflowId, secretValues []string) (WorkflowLogger, error) { 19 33 path := LogFilePath(baseDir, wid) 20 20 - 21 34 file, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644) 22 35 if err != nil { 23 36 return nil, fmt.Errorf("creating log file: %w", err) 24 37 } 25 25 - 26 26 - return &WorkflowLogger{ 38 38 + return &FileWorkflowLogger{ 27 39 file: file, 28 40 encoder: json.NewEncoder(file), 29 41 mask: NewSecretMask(secretValues), ··· 35 47 return logFilePath 36 48 } 37 49 38 38 - func (l *WorkflowLogger) Close() error { 50 50 + func (l *FileWorkflowLogger) Close() error { 39 51 return l.file.Close() 40 52 } 41 53 42 42 - func (l *WorkflowLogger) DataWriter(idx int, stream string) io.Writer { 54 54 + func (l *FileWorkflowLogger) DataWriter(idx int, stream string) io.Writer { 43 55 return &dataWriter{ 44 56 logger: l, 45 57 idx: idx, ··· 47 59 } 48 60 } 49 61 50 50 - func (l *WorkflowLogger) ControlWriter(idx int, step Step, stepStatus StepStatus) io.Writer { 62 62 + func (l *FileWorkflowLogger) ControlWriter(idx int, step Step, stepStatus StepStatus) io.Writer { 51 63 return &controlWriter{ 52 64 logger: l, 53 65 idx: idx, ··· 57 69 } 58 70 59 71 type dataWriter struct { 60 60 - logger *WorkflowLogger 72 72 + logger *FileWorkflowLogger 61 73 idx int 62 74 stream string 63 75 } ··· 75 87 } 76 88 77 89 type controlWriter struct { 78 78 - logger *WorkflowLogger 90 90 + logger *FileWorkflowLogger 79 91 idx int 80 92 step Step 81 93 stepStatus StepStatus

+4 -10

types/repo.go

··· 94 94 Tags []*TagReference `json:"tags,omitempty"` 95 95 } 96 96 97 97 + type RepoTagResponse struct { 98 98 + Tag *TagReference `json:"tag,omitempty"` 99 99 + } 100 100 + 97 101 type RepoBranchesResponse struct { 98 102 Branches []Branch `json:"branches,omitempty"` 99 103 } ··· 104 108 105 109 type RepoDefaultBranchResponse struct { 106 110 Branch string `json:"branch,omitempty"` 107 107 - } 108 108 - 109 109 - type RepoBlobResponse struct { 110 110 - Contents string `json:"contents,omitempty"` 111 111 - Ref string `json:"ref,omitempty"` 112 112 - Path string `json:"path,omitempty"` 113 113 - IsBinary bool `json:"is_binary,omitempty"` 114 114 - 115 115 - Lines int `json:"lines,omitempty"` 116 116 - SizeHint uint64 `json:"size_hint,omitempty"` 117 111 } 118 112 119 113 type ForkStatus int

+5

types/tree.go

··· 105 105 Hash plumbing.Hash 106 106 Message string 107 107 When time.Time 108 108 + Author struct { 109 109 + Email string 110 110 + Name string 111 111 + When time.Time 112 112 + } 108 113 }