+178

patchutil/image.go

··· 1 1 + package patchutil 2 2 + 3 3 + import ( 4 4 + "bytes" 5 5 + "fmt" 6 6 + "strings" 7 7 + 8 8 + "github.com/bluekeyes/go-gitdiff/gitdiff" 9 9 + ) 10 10 + 11 11 + type Line struct { 12 12 + LineNumber int64 13 13 + Content string 14 14 + IsUnknown bool 15 15 + } 16 16 + 17 17 + func NewLineAt(lineNumber int64, content string) Line { 18 18 + return Line{ 19 19 + LineNumber: lineNumber, 20 20 + Content: content, 21 21 + IsUnknown: false, 22 22 + } 23 23 + } 24 24 + 25 25 + type Image struct { 26 26 + File string 27 27 + Data []*Line 28 28 + } 29 29 + 30 30 + func (r *Image) String() string { 31 31 + var i, j int64 32 32 + var b strings.Builder 33 33 + for { 34 34 + i += 1 35 35 + 36 36 + if int(j) >= (len(r.Data)) { 37 37 + break 38 38 + } 39 39 + 40 40 + if r.Data[j].LineNumber == i { 41 41 + // b.WriteString(fmt.Sprintf("%d:", r.Data[j].LineNumber)) 42 42 + b.WriteString(r.Data[j].Content) 43 43 + j += 1 44 44 + } else { 45 45 + //b.WriteString(fmt.Sprintf("%d:\n", i)) 46 46 + b.WriteString("\n") 47 47 + } 48 48 + } 49 49 + 50 50 + return b.String() 51 51 + } 52 52 + 53 53 + func (r *Image) AddLine(line *Line) { 54 54 + r.Data = append(r.Data, line) 55 55 + } 56 56 + 57 57 + // rebuild the original file from a patch 58 58 + func CreatePreImage(file *gitdiff.File) Image { 59 59 + rf := Image{ 60 60 + File: bestName(file), 61 61 + } 62 62 + 63 63 + for _, fragment := range file.TextFragments { 64 64 + position := fragment.OldPosition 65 65 + for _, line := range fragment.Lines { 66 66 + switch line.Op { 67 67 + case gitdiff.OpContext: 68 68 + rl := NewLineAt(position, line.Line) 69 69 + rf.Data = append(rf.Data, &rl) 70 70 + position += 1 71 71 + case gitdiff.OpDelete: 72 72 + rl := NewLineAt(position, line.Line) 73 73 + rf.Data = append(rf.Data, &rl) 74 74 + position += 1 75 75 + case gitdiff.OpAdd: 76 76 + // do nothing here 77 77 + } 78 78 + } 79 79 + } 80 80 + 81 81 + return rf 82 82 + } 83 83 + 84 84 + // rebuild the revised file from a patch 85 85 + func CreatePostImage(file *gitdiff.File) Image { 86 86 + rf := Image{ 87 87 + File: bestName(file), 88 88 + } 89 89 + 90 90 + for _, fragment := range file.TextFragments { 91 91 + position := fragment.NewPosition 92 92 + for _, line := range fragment.Lines { 93 93 + switch line.Op { 94 94 + case gitdiff.OpContext: 95 95 + rl := NewLineAt(position, line.Line) 96 96 + rf.Data = append(rf.Data, &rl) 97 97 + position += 1 98 98 + case gitdiff.OpAdd: 99 99 + rl := NewLineAt(position, line.Line) 100 100 + rf.Data = append(rf.Data, &rl) 101 101 + position += 1 102 102 + case gitdiff.OpDelete: 103 103 + // do nothing here 104 104 + } 105 105 + } 106 106 + } 107 107 + 108 108 + return rf 109 109 + } 110 110 + 111 111 + type MergeError struct { 112 112 + msg string 113 113 + mismatchingLine int64 114 114 + } 115 115 + 116 116 + func (m MergeError) Error() string { 117 117 + return fmt.Sprintf("%s: %v", m.msg, m.mismatchingLine) 118 118 + } 119 119 + 120 120 + // best effort merging of two reconstructed files 121 121 + func (this *Image) Merge(other *Image) (*Image, error) { 122 122 + mergedFile := Image{} 123 123 + 124 124 + var i, j int64 125 125 + 126 126 + for int(i) < len(this.Data) || int(j) < len(other.Data) { 127 127 + if int(i) >= len(this.Data) { 128 128 + // first file is done; the rest of the lines from file 2 can go in 129 129 + mergedFile.AddLine(other.Data[j]) 130 130 + j++ 131 131 + continue 132 132 + } 133 133 + 134 134 + if int(j) >= len(other.Data) { 135 135 + // first file is done; the rest of the lines from file 2 can go in 136 136 + mergedFile.AddLine(this.Data[i]) 137 137 + i++ 138 138 + continue 139 139 + } 140 140 + 141 141 + line1 := this.Data[i] 142 142 + line2 := other.Data[j] 143 143 + 144 144 + if line1.LineNumber == line2.LineNumber { 145 145 + if line1.Content != line2.Content { 146 146 + return nil, MergeError{ 147 147 + msg: "mismatching lines, this patch might have undergone rebase", 148 148 + mismatchingLine: line1.LineNumber, 149 149 + } 150 150 + } else { 151 151 + mergedFile.AddLine(line1) 152 152 + } 153 153 + i++ 154 154 + j++ 155 155 + } else if line1.LineNumber < line2.LineNumber { 156 156 + mergedFile.AddLine(line1) 157 157 + i++ 158 158 + } else { 159 159 + mergedFile.AddLine(line2) 160 160 + j++ 161 161 + } 162 162 + } 163 163 + 164 164 + return &mergedFile, nil 165 165 + } 166 166 + 167 167 + func (r *Image) Apply(patch *gitdiff.File) (string, error) { 168 168 + original := r.String() 169 169 + var buffer bytes.Buffer 170 170 + reader := strings.NewReader(original) 171 171 + 172 172 + err := gitdiff.Apply(&buffer, reader, patch) 173 173 + if err != nil { 174 174 + return "", err 175 175 + } 176 176 + 177 177 + return buffer.String(), nil 178 178 + }

+1

types/capabilities.go

··· 2 2 3 3 type Capabilities struct { 4 4 PullRequests struct { 5 5 + FormatPatch bool `json:"format_patch"` 5 6 PatchSubmissions bool `json:"patch_submissions"` 6 7 BranchSubmissions bool `json:"branch_submissions"` 7 8 ForkSubmissions bool `json:"fork_submissions"`

+106 -80

appview/state/settings.go appview/state/settings/settings.go

··· 1 1 - package state 1 1 + package settings 2 2 3 3 import ( 4 4 "database/sql" ··· 10 10 "strings" 11 11 "time" 12 12 13 13 - comatproto "github.com/bluesky-social/indigo/api/atproto" 14 14 - lexutil "github.com/bluesky-social/indigo/lex/util" 15 15 - "github.com/gliderlabs/ssh" 16 16 - "github.com/google/uuid" 13 13 + "github.com/go-chi/chi/v5" 17 14 "tangled.sh/tangled.sh/core/api/tangled" 15 15 + "tangled.sh/tangled.sh/core/appview" 16 16 + "tangled.sh/tangled.sh/core/appview/auth" 18 17 "tangled.sh/tangled.sh/core/appview/db" 19 18 "tangled.sh/tangled.sh/core/appview/email" 19 19 + "tangled.sh/tangled.sh/core/appview/middleware" 20 20 "tangled.sh/tangled.sh/core/appview/pages" 21 21 + 22 22 + comatproto "github.com/bluesky-social/indigo/api/atproto" 23 23 + lexutil "github.com/bluesky-social/indigo/lex/util" 24 24 + "github.com/gliderlabs/ssh" 25 25 + "github.com/google/uuid" 21 26 ) 22 27 23 23 - func (s *State) Settings(w http.ResponseWriter, r *http.Request) { 24 24 - user := s.auth.GetUser(r) 25 25 - pubKeys, err := db.GetPublicKeys(s.db, user.Did) 28 28 + type Settings struct { 29 29 + Db *db.DB 30 30 + Auth *auth.Auth 31 31 + Pages *pages.Pages 32 32 + Config *appview.Config 33 33 + } 34 34 + 35 35 + func (s *Settings) Router(r chi.Router) { 36 36 + r.Use(middleware.AuthMiddleware(s.Auth)) 37 37 + 38 38 + r.Get("/", s.settings) 39 39 + r.Put("/keys", s.keys) 40 40 + r.Delete("/keys", s.keys) 41 41 + r.Put("/emails", s.emails) 42 42 + r.Delete("/emails", s.emails) 43 43 + r.Get("/emails/verify", s.emailsVerify) 44 44 + r.Post("/emails/verify/resend", s.emailsVerifyResend) 45 45 + r.Post("/emails/primary", s.emailsPrimary) 46 46 + 47 47 + } 48 48 + 49 49 + func (s *Settings) settings(w http.ResponseWriter, r *http.Request) { 50 50 + user := s.Auth.GetUser(r) 51 51 + pubKeys, err := db.GetPublicKeys(s.Db, user.Did) 26 52 if err != nil { 27 53 log.Println(err) 28 54 } 29 55 30 30 - emails, err := db.GetAllEmails(s.db, user.Did) 56 56 + emails, err := db.GetAllEmails(s.Db, user.Did) 31 57 if err != nil { 32 58 log.Println(err) 33 59 } 34 60 35 35 - s.pages.Settings(w, pages.SettingsParams{ 61 61 + s.Pages.Settings(w, pages.SettingsParams{ 36 62 LoggedInUser: user, 37 63 PubKeys: pubKeys, 38 64 Emails: emails, ··· 40 66 } 41 67 42 68 // buildVerificationEmail creates an email.Email struct for verification emails 43 43 - func (s *State) buildVerificationEmail(emailAddr, did, code string) email.Email { 69 69 + func (s *Settings) buildVerificationEmail(emailAddr, did, code string) email.Email { 44 70 verifyURL := s.verifyUrl(did, emailAddr, code) 45 71 46 72 return email.Email{ 47 47 - APIKey: s.config.ResendApiKey, 73 73 + APIKey: s.Config.ResendApiKey, 48 74 From: "noreply@notifs.tangled.sh", 49 75 To: emailAddr, 50 76 Subject: "Verify your Tangled email", ··· 56 82 } 57 83 58 84 // sendVerificationEmail handles the common logic for sending verification emails 59 59 - func (s *State) sendVerificationEmail(w http.ResponseWriter, did, emailAddr, code string, errorContext string) error { 85 85 + func (s *Settings) sendVerificationEmail(w http.ResponseWriter, did, emailAddr, code string, errorContext string) error { 60 86 emailToSend := s.buildVerificationEmail(emailAddr, did, code) 61 87 62 88 err := email.SendEmail(emailToSend) 63 89 if err != nil { 64 90 log.Printf("sending email: %s", err) 65 65 - s.pages.Notice(w, "settings-emails-error", fmt.Sprintf("Unable to send verification email at this moment, try again later. %s", errorContext)) 91 91 + s.Pages.Notice(w, "settings-emails-error", fmt.Sprintf("Unable to send verification email at this moment, try again later. %s", errorContext)) 66 92 return err 67 93 } 68 94 69 95 return nil 70 96 } 71 97 72 72 - func (s *State) SettingsEmails(w http.ResponseWriter, r *http.Request) { 98 98 + func (s *Settings) emails(w http.ResponseWriter, r *http.Request) { 73 99 switch r.Method { 74 100 case http.MethodGet: 75 75 - s.pages.Notice(w, "settings-emails", "Unimplemented.") 101 101 + s.Pages.Notice(w, "settings-emails", "Unimplemented.") 76 102 log.Println("unimplemented") 77 103 return 78 104 case http.MethodPut: 79 79 - did := s.auth.GetDid(r) 105 105 + did := s.Auth.GetDid(r) 80 106 emAddr := r.FormValue("email") 81 107 emAddr = strings.TrimSpace(emAddr) 82 108 83 109 if !email.IsValidEmail(emAddr) { 84 84 - s.pages.Notice(w, "settings-emails-error", "Invalid email address.") 110 110 + s.Pages.Notice(w, "settings-emails-error", "Invalid email address.") 85 111 return 86 112 } 87 113 88 114 // check if email already exists in database 89 89 - existingEmail, err := db.GetEmail(s.db, did, emAddr) 115 115 + existingEmail, err := db.GetEmail(s.Db, did, emAddr) 90 116 if err != nil && !errors.Is(err, sql.ErrNoRows) { 91 117 log.Printf("checking for existing email: %s", err) 92 92 - s.pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.") 118 118 + s.Pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.") 93 119 return 94 120 } 95 121 96 122 if err == nil { 97 123 if existingEmail.Verified { 98 98 - s.pages.Notice(w, "settings-emails-error", "This email is already verified.") 124 124 + s.Pages.Notice(w, "settings-emails-error", "This email is already verified.") 99 125 return 100 126 } 101 127 102 102 - s.pages.Notice(w, "settings-emails-error", "This email is already added but not verified. Check your inbox for the verification link.") 128 128 + s.Pages.Notice(w, "settings-emails-error", "This email is already added but not verified. Check your inbox for the verification link.") 103 129 return 104 130 } 105 131 106 132 code := uuid.New().String() 107 133 108 134 // Begin transaction 109 109 - tx, err := s.db.Begin() 135 135 + tx, err := s.Db.Begin() 110 136 if err != nil { 111 137 log.Printf("failed to start transaction: %s", err) 112 112 - s.pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.") 138 138 + s.Pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.") 113 139 return 114 140 } 115 141 defer tx.Rollback() ··· 121 147 VerificationCode: code, 122 148 }); err != nil { 123 149 log.Printf("adding email: %s", err) 124 124 - s.pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.") 150 150 + s.Pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.") 125 151 return 126 152 } 127 153 ··· 132 158 // Commit transaction 133 159 if err := tx.Commit(); err != nil { 134 160 log.Printf("failed to commit transaction: %s", err) 135 135 - s.pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.") 161 161 + s.Pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.") 136 162 return 137 163 } 138 164 139 139 - s.pages.Notice(w, "settings-emails-success", "Click the link in the email we sent you to verify your email address.") 165 165 + s.Pages.Notice(w, "settings-emails-success", "Click the link in the email we sent you to verify your email address.") 140 166 return 141 167 case http.MethodDelete: 142 142 - did := s.auth.GetDid(r) 168 168 + did := s.Auth.GetDid(r) 143 169 emailAddr := r.FormValue("email") 144 170 emailAddr = strings.TrimSpace(emailAddr) 145 171 146 172 // Begin transaction 147 147 - tx, err := s.db.Begin() 173 173 + tx, err := s.Db.Begin() 148 174 if err != nil { 149 175 log.Printf("failed to start transaction: %s", err) 150 150 - s.pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.") 176 176 + s.Pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.") 151 177 return 152 178 } 153 179 defer tx.Rollback() 154 180 155 181 if err := db.DeleteEmail(tx, did, emailAddr); err != nil { 156 182 log.Printf("deleting email: %s", err) 157 157 - s.pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.") 183 183 + s.Pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.") 158 184 return 159 185 } 160 186 161 187 // Commit transaction 162 188 if err := tx.Commit(); err != nil { 163 189 log.Printf("failed to commit transaction: %s", err) 164 164 - s.pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.") 190 190 + s.Pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.") 165 191 return 166 192 } 167 193 168 168 - s.pages.HxLocation(w, "/settings") 194 194 + s.Pages.HxLocation(w, "/settings") 169 195 return 170 196 } 171 197 } 172 198 173 173 - func (s *State) verifyUrl(did string, email string, code string) string { 199 199 + func (s *Settings) verifyUrl(did string, email string, code string) string { 174 200 var appUrl string 175 175 - if s.config.Dev { 176 176 - appUrl = "http://" + s.config.ListenAddr 201 201 + if s.Config.Dev { 202 202 + appUrl = "http://" + s.Config.ListenAddr 177 203 } else { 178 204 appUrl = "https://tangled.sh" 179 205 } ··· 181 207 return fmt.Sprintf("%s/settings/emails/verify?did=%s&email=%s&code=%s", appUrl, url.QueryEscape(did), url.QueryEscape(email), url.QueryEscape(code)) 182 208 } 183 209 184 184 - func (s *State) SettingsEmailsVerify(w http.ResponseWriter, r *http.Request) { 210 210 + func (s *Settings) emailsVerify(w http.ResponseWriter, r *http.Request) { 185 211 q := r.URL.Query() 186 212 187 213 // Get the parameters directly from the query ··· 189 215 did := q.Get("did") 190 216 code := q.Get("code") 191 217 192 192 - valid, err := db.CheckValidVerificationCode(s.db, did, emailAddr, code) 218 218 + valid, err := db.CheckValidVerificationCode(s.Db, did, emailAddr, code) 193 219 if err != nil { 194 220 log.Printf("checking email verification: %s", err) 195 195 - s.pages.Notice(w, "settings-emails-error", "Error verifying email. Please try again later.") 221 221 + s.Pages.Notice(w, "settings-emails-error", "Error verifying email. Please try again later.") 196 222 return 197 223 } 198 224 199 225 if !valid { 200 200 - s.pages.Notice(w, "settings-emails-error", "Invalid verification code. Please request a new verification email.") 226 226 + s.Pages.Notice(w, "settings-emails-error", "Invalid verification code. Please request a new verification email.") 201 227 return 202 228 } 203 229 204 230 // Mark email as verified in the database 205 205 - if err := db.MarkEmailVerified(s.db, did, emailAddr); err != nil { 231 231 + if err := db.MarkEmailVerified(s.Db, did, emailAddr); err != nil { 206 232 log.Printf("marking email as verified: %s", err) 207 207 - s.pages.Notice(w, "settings-emails-error", "Error updating email verification status. Please try again later.") 233 233 + s.Pages.Notice(w, "settings-emails-error", "Error updating email verification status. Please try again later.") 208 234 return 209 235 } 210 236 211 237 http.Redirect(w, r, "/settings", http.StatusSeeOther) 212 238 } 213 239 214 214 - func (s *State) SettingsEmailsVerifyResend(w http.ResponseWriter, r *http.Request) { 240 240 + func (s *Settings) emailsVerifyResend(w http.ResponseWriter, r *http.Request) { 215 241 if r.Method != http.MethodPost { 216 216 - s.pages.Notice(w, "settings-emails-error", "Invalid request method.") 242 242 + s.Pages.Notice(w, "settings-emails-error", "Invalid request method.") 217 243 return 218 244 } 219 245 220 220 - did := s.auth.GetDid(r) 246 246 + did := s.Auth.GetDid(r) 221 247 emAddr := r.FormValue("email") 222 248 emAddr = strings.TrimSpace(emAddr) 223 249 224 250 if !email.IsValidEmail(emAddr) { 225 225 - s.pages.Notice(w, "settings-emails-error", "Invalid email address.") 251 251 + s.Pages.Notice(w, "settings-emails-error", "Invalid email address.") 226 252 return 227 253 } 228 254 229 255 // Check if email exists and is unverified 230 230 - existingEmail, err := db.GetEmail(s.db, did, emAddr) 256 256 + existingEmail, err := db.GetEmail(s.Db, did, emAddr) 231 257 if err != nil { 232 258 if errors.Is(err, sql.ErrNoRows) { 233 233 - s.pages.Notice(w, "settings-emails-error", "Email not found. Please add it first.") 259 259 + s.Pages.Notice(w, "settings-emails-error", "Email not found. Please add it first.") 234 260 } else { 235 261 log.Printf("checking for existing email: %s", err) 236 236 - s.pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.") 262 262 + s.Pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.") 237 263 } 238 264 return 239 265 } 240 266 241 267 if existingEmail.Verified { 242 242 - s.pages.Notice(w, "settings-emails-error", "This email is already verified.") 268 268 + s.Pages.Notice(w, "settings-emails-error", "This email is already verified.") 243 269 return 244 270 } 245 271 ··· 248 274 timeSinceLastSent := time.Since(*existingEmail.LastSent) 249 275 if timeSinceLastSent < 10*time.Minute { 250 276 waitTime := 10*time.Minute - timeSinceLastSent 251 251 - s.pages.Notice(w, "settings-emails-error", fmt.Sprintf("Please wait %d minutes before requesting another verification email.", int(waitTime.Minutes()+1))) 277 277 + s.Pages.Notice(w, "settings-emails-error", fmt.Sprintf("Please wait %d minutes before requesting another verification email.", int(waitTime.Minutes()+1))) 252 278 return 253 279 } 254 280 } ··· 257 283 code := uuid.New().String() 258 284 259 285 // Begin transaction 260 260 - tx, err := s.db.Begin() 286 286 + tx, err := s.Db.Begin() 261 287 if err != nil { 262 288 log.Printf("failed to start transaction: %s", err) 263 263 - s.pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.") 289 289 + s.Pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.") 264 290 return 265 291 } 266 292 defer tx.Rollback() ··· 268 294 // Update the verification code and last sent time 269 295 if err := db.UpdateVerificationCode(tx, did, emAddr, code); err != nil { 270 296 log.Printf("updating email verification: %s", err) 271 271 - s.pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.") 297 297 + s.Pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.") 272 298 return 273 299 } 274 300 ··· 280 306 // Commit transaction 281 307 if err := tx.Commit(); err != nil { 282 308 log.Printf("failed to commit transaction: %s", err) 283 283 - s.pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.") 309 309 + s.Pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.") 284 310 return 285 311 } 286 312 287 287 - s.pages.Notice(w, "settings-emails-success", "Verification email resent. Click the link in the email we sent you to verify your email address.") 313 313 + s.Pages.Notice(w, "settings-emails-success", "Verification email resent. Click the link in the email we sent you to verify your email address.") 288 314 } 289 315 290 290 - func (s *State) SettingsEmailsPrimary(w http.ResponseWriter, r *http.Request) { 291 291 - did := s.auth.GetDid(r) 316 316 + func (s *Settings) emailsPrimary(w http.ResponseWriter, r *http.Request) { 317 317 + did := s.Auth.GetDid(r) 292 318 emailAddr := r.FormValue("email") 293 319 emailAddr = strings.TrimSpace(emailAddr) 294 320 295 321 if emailAddr == "" { 296 296 - s.pages.Notice(w, "settings-emails-error", "Email address cannot be empty.") 322 322 + s.Pages.Notice(w, "settings-emails-error", "Email address cannot be empty.") 297 323 return 298 324 } 299 325 300 300 - if err := db.MakeEmailPrimary(s.db, did, emailAddr); err != nil { 326 326 + if err := db.MakeEmailPrimary(s.Db, did, emailAddr); err != nil { 301 327 log.Printf("setting primary email: %s", err) 302 302 - s.pages.Notice(w, "settings-emails-error", "Error setting primary email. Please try again later.") 328 328 + s.Pages.Notice(w, "settings-emails-error", "Error setting primary email. Please try again later.") 303 329 return 304 330 } 305 331 306 306 - s.pages.HxLocation(w, "/settings") 332 332 + s.Pages.HxLocation(w, "/settings") 307 333 } 308 334 309 309 - func (s *State) SettingsKeys(w http.ResponseWriter, r *http.Request) { 335 335 + func (s *Settings) keys(w http.ResponseWriter, r *http.Request) { 310 336 switch r.Method { 311 337 case http.MethodGet: 312 312 - s.pages.Notice(w, "settings-keys", "Unimplemented.") 338 338 + s.Pages.Notice(w, "settings-keys", "Unimplemented.") 313 339 log.Println("unimplemented") 314 340 return 315 341 case http.MethodPut: 316 316 - did := s.auth.GetDid(r) 342 342 + did := s.Auth.GetDid(r) 317 343 key := r.FormValue("key") 318 344 key = strings.TrimSpace(key) 319 345 name := r.FormValue("name") 320 320 - client, _ := s.auth.AuthorizedClient(r) 346 346 + client, _ := s.Auth.AuthorizedClient(r) 321 347 322 348 _, _, _, _, err := ssh.ParseAuthorizedKey([]byte(key)) 323 349 if err != nil { 324 350 log.Printf("parsing public key: %s", err) 325 325 - s.pages.Notice(w, "settings-keys", "That doesn't look like a valid public key. Make sure it's a <strong>public</strong> key.") 351 351 + s.Pages.Notice(w, "settings-keys", "That doesn't look like a valid public key. Make sure it's a <strong>public</strong> key.") 326 352 return 327 353 } 328 354 329 329 - rkey := s.TID() 355 355 + rkey := appview.TID() 330 356 331 331 - tx, err := s.db.Begin() 357 357 + tx, err := s.Db.Begin() 332 358 if err != nil { 333 359 log.Printf("failed to start tx; adding public key: %s", err) 334 334 - s.pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.") 360 360 + s.Pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.") 335 361 return 336 362 } 337 363 defer tx.Rollback() 338 364 339 365 if err := db.AddPublicKey(tx, did, name, key, rkey); err != nil { 340 366 log.Printf("adding public key: %s", err) 341 341 - s.pages.Notice(w, "settings-keys", "Failed to add public key.") 367 367 + s.Pages.Notice(w, "settings-keys", "Failed to add public key.") 342 368 return 343 369 } 344 370 ··· 357 383 // invalid record 358 384 if err != nil { 359 385 log.Printf("failed to create record: %s", err) 360 360 - s.pages.Notice(w, "settings-keys", "Failed to create record.") 386 386 + s.Pages.Notice(w, "settings-keys", "Failed to create record.") 361 387 return 362 388 } 363 389 ··· 366 392 err = tx.Commit() 367 393 if err != nil { 368 394 log.Printf("failed to commit tx; adding public key: %s", err) 369 369 - s.pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.") 395 395 + s.Pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.") 370 396 return 371 397 } 372 398 373 373 - s.pages.HxLocation(w, "/settings") 399 399 + s.Pages.HxLocation(w, "/settings") 374 400 return 375 401 376 402 case http.MethodDelete: 377 377 - did := s.auth.GetDid(r) 403 403 + did := s.Auth.GetDid(r) 378 404 q := r.URL.Query() 379 405 380 406 name := q.Get("name") ··· 385 411 log.Println(rkey) 386 412 log.Println(key) 387 413 388 388 - client, _ := s.auth.AuthorizedClient(r) 414 414 + client, _ := s.Auth.AuthorizedClient(r) 389 415 390 390 - if err := db.RemovePublicKey(s.db, did, name, key); err != nil { 416 416 + if err := db.RemovePublicKey(s.Db, did, name, key); err != nil { 391 417 log.Printf("removing public key: %s", err) 392 392 - s.pages.Notice(w, "settings-keys", "Failed to remove public key.") 418 418 + s.Pages.Notice(w, "settings-keys", "Failed to remove public key.") 393 419 return 394 420 } 395 421 ··· 404 430 // invalid record 405 431 if err != nil { 406 432 log.Printf("failed to delete record from PDS: %s", err) 407 407 - s.pages.Notice(w, "settings-keys", "Failed to remove key from PDS.") 433 433 + s.Pages.Notice(w, "settings-keys", "Failed to remove key from PDS.") 408 434 return 409 435 } 410 436 } 411 437 log.Println("deleted successfully") 412 438 413 413 - s.pages.HxLocation(w, "/settings") 439 439 + s.Pages.HxLocation(w, "/settings") 414 440 return 415 441 } 416 442 }

+62

appview/filetree/filetree.go

··· 1 1 + package filetree 2 2 + 3 3 + import ( 4 4 + "path/filepath" 5 5 + "sort" 6 6 + "strings" 7 7 + ) 8 8 + 9 9 + type FileTreeNode struct { 10 10 + Name string 11 11 + Path string 12 12 + IsDirectory bool 13 13 + Children map[string]*FileTreeNode 14 14 + } 15 15 + 16 16 + // NewNode creates a new node 17 17 + func newNode(name, path string, isDir bool) *FileTreeNode { 18 18 + return &FileTreeNode{ 19 19 + Name: name, 20 20 + Path: path, 21 21 + IsDirectory: isDir, 22 22 + Children: make(map[string]*FileTreeNode), 23 23 + } 24 24 + } 25 25 + 26 26 + func FileTree(files []string) *FileTreeNode { 27 27 + rootNode := newNode("", "", true) 28 28 + 29 29 + sort.Strings(files) 30 30 + 31 31 + for _, file := range files { 32 32 + if file == "" { 33 33 + continue 34 34 + } 35 35 + 36 36 + parts := strings.Split(filepath.Clean(file), "/") 37 37 + if len(parts) == 0 { 38 38 + continue 39 39 + } 40 40 + 41 41 + currentNode := rootNode 42 42 + currentPath := "" 43 43 + 44 44 + for i, part := range parts { 45 45 + if currentPath == "" { 46 46 + currentPath = part 47 47 + } else { 48 48 + currentPath = filepath.Join(currentPath, part) 49 49 + } 50 50 + 51 51 + isDir := i < len(parts)-1 52 52 + 53 53 + if _, exists := currentNode.Children[part]; !exists { 54 54 + currentNode.Children[part] = newNode(part, currentPath, isDir) 55 55 + } 56 56 + 57 57 + currentNode = currentNode.Children[part] 58 58 + } 59 59 + } 60 60 + 61 61 + return rootNode 62 62 + }

+1 -1

api/tangled/issuestate.go

··· 20 20 LexiconTypeID string `json:"$type,const=sh.tangled.repo.issue.state" cborgen:"$type,const=sh.tangled.repo.issue.state"` 21 21 Issue string `json:"issue" cborgen:"issue"` 22 22 // state: state of the issue 23 23 - State *string `json:"state,omitempty" cborgen:"state,omitempty"` 23 23 + State string `json:"state" cborgen:"state"` 24 24 }

+4 -4

api/tangled/knotmember.go

··· 17 17 } // 18 18 // RECORDTYPE: KnotMember 19 19 type KnotMember struct { 20 20 - LexiconTypeID string `json:"$type,const=sh.tangled.knot.member" cborgen:"$type,const=sh.tangled.knot.member"` 21 21 - AddedAt *string `json:"addedAt,omitempty" cborgen:"addedAt,omitempty"` 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.knot.member" cborgen:"$type,const=sh.tangled.knot.member"` 21 21 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 22 22 // domain: domain that this member now belongs to 23 23 - Domain string `json:"domain" cborgen:"domain"` 24 24 - Member string `json:"member" cborgen:"member"` 23 23 + Domain string `json:"domain" cborgen:"domain"` 24 24 + Subject string `json:"subject" cborgen:"subject"` 25 25 }

+1 -1

api/tangled/pullstatus.go

··· 20 20 LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull.status" cborgen:"$type,const=sh.tangled.repo.pull.status"` 21 21 Pull string `json:"pull" cborgen:"pull"` 22 22 // status: status of the pull request 23 23 - Status *string `json:"status,omitempty" cborgen:"status,omitempty"` 23 23 + Status string `json:"status" cborgen:"status"` 24 24 }

+2 -2

api/tangled/tangledpublicKey.go

··· 18 18 // RECORDTYPE: PublicKey 19 19 type PublicKey struct { 20 20 LexiconTypeID string `json:"$type,const=sh.tangled.publicKey" cborgen:"$type,const=sh.tangled.publicKey"` 21 21 - // created: key upload timestamp 22 22 - Created string `json:"created" cborgen:"created"` 21 21 + // createdAt: key upload timestamp 22 22 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 // key: public key contents 24 24 Key string `json:"key" cborgen:"key"` 25 25 // name: human-readable name for this key

+6 -7

lexicons/follow.json

··· 10 10 "record": { 11 11 "type": "object", 12 12 "required": [ 13 13 - "createdAt", 14 14 - "subject" 13 13 + "subject", 14 14 + "createdAt" 15 15 ], 16 16 "properties": { 17 17 - "createdAt": { 18 18 - "type": "string", 19 19 - "format": "datetime" 20 20 - }, 21 17 "subject": { 22 18 "type": "string", 23 19 "format": "did" 20 20 + }, 21 21 + "createdAt": { 22 22 + "type": "string", 23 23 + "format": "datetime" 24 24 } 25 25 } 26 26 } 27 27 } 28 28 } 29 29 } 30 30 -

+4 -1

lexicons/issue/state.json

··· 9 9 "key": "tid", 10 10 "record": { 11 11 "type": "object", 12 12 - "required": ["issue"], 12 12 + "required": [ 13 13 + "issue", 14 14 + "state" 15 15 + ], 13 16 "properties": { 14 17 "issue": { 15 18 "type": "string",

+5 -4

lexicons/member.json

··· 10 10 "record": { 11 11 "type": "object", 12 12 "required": [ 13 13 - "member", 14 14 - "domain" 13 13 + "subject", 14 14 + "domain", 15 15 + "createdAt" 15 16 ], 16 17 "properties": { 17 17 - "member": { 18 18 + "subject": { 18 19 "type": "string", 19 20 "format": "did" 20 21 }, ··· 22 23 "type": "string", 23 24 "description": "domain that this member now belongs to" 24 25 }, 25 25 - "addedAt": { 26 26 + "createdAt": { 26 27 "type": "string", 27 28 "format": "datetime" 28 29 }

+4 -1

lexicons/pulls/state.json

··· 9 9 "key": "tid", 10 10 "record": { 11 11 "type": "object", 12 12 - "required": ["pull"], 12 12 + "required": [ 13 13 + "pull", 14 14 + "status" 15 15 + ], 13 16 "properties": { 14 17 "pull": { 15 18 "type": "string",

+6 -8

lexicons/star.json

··· 10 10 "record": { 11 11 "type": "object", 12 12 "required": [ 13 13 - "createdAt", 14 14 - "subject" 13 13 + "subject", 14 14 + "createdAt" 15 15 ], 16 16 "properties": { 17 17 - "createdAt": { 18 18 - "type": "string", 19 19 - "format": "datetime" 20 20 - }, 21 17 "subject": { 22 18 "type": "string", 23 19 "format": "at-uri" 20 20 + }, 21 21 + "createdAt": { 22 22 + "type": "string", 23 23 + "format": "datetime" 24 24 } 25 25 } 26 26 } 27 27 } 28 28 } 29 29 } 30 30 - 31 31 -

lexicons/star.json lexicons/feed/star.json

lexicons/follow.json lexicons/graph/follow.json

lexicons/member.json lexicons/knot/member.json

+31

api/tangled/repoartifact.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.artifact 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + RepoArtifactNSID = "sh.tangled.repo.artifact" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("sh.tangled.repo.artifact", &RepoArtifact{}) 17 17 + } // 18 18 + // RECORDTYPE: RepoArtifact 19 19 + type RepoArtifact struct { 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.repo.artifact" cborgen:"$type,const=sh.tangled.repo.artifact"` 21 21 + // artifact: the artifact 22 22 + Artifact *util.LexBlob `json:"artifact" cborgen:"artifact"` 23 23 + // createdAt: time of creation of this artifact 24 24 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 25 25 + // name: name of the artifact 26 26 + Name string `json:"name" cborgen:"name"` 27 27 + // repo: repo that this artifact is being uploaded to 28 28 + Repo string `json:"repo" cborgen:"repo"` 29 29 + // tag: hash of the tag object that this artifact is attached to (only annotated tags are supported) 30 30 + Tag util.LexBytes `json:"tag,omitempty" cborgen:"tag,omitempty"` 31 31 + }

+18 -2

appview/state/signer.go

··· 350 350 return us.client.Do(req) 351 351 } 352 352 353 353 - func (us *UnsignedClient) Tags(ownerDid, repoName string) (*http.Response, error) { 353 353 + func (us *UnsignedClient) Tags(ownerDid, repoName string) (*types.RepoTagsResponse, error) { 354 354 const ( 355 355 Method = "GET" 356 356 ) ··· 362 362 return nil, err 363 363 } 364 364 365 365 - return us.client.Do(req) 365 365 + resp, err := us.client.Do(req) 366 366 + if err != nil { 367 367 + return nil, err 368 368 + } 369 369 + 370 370 + body, err := io.ReadAll(resp.Body) 371 371 + if err != nil { 372 372 + return nil, err 373 373 + } 374 374 + 375 375 + var result types.RepoTagsResponse 376 376 + err = json.Unmarshal(body, &result) 377 377 + if err != nil { 378 378 + return nil, err 379 379 + } 380 380 + 381 381 + return &result, nil 366 382 } 367 383 368 384 func (us *UnsignedClient) Branch(ownerDid, repoName, branch string) (*http.Response, error) {

-70

appview/state/jetstream.go

··· 1 1 - package state 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "encoding/json" 6 6 - "fmt" 7 7 - "log" 8 8 - 9 9 - "github.com/bluesky-social/indigo/atproto/syntax" 10 10 - "github.com/bluesky-social/jetstream/pkg/models" 11 11 - "tangled.sh/tangled.sh/core/api/tangled" 12 12 - "tangled.sh/tangled.sh/core/appview/db" 13 13 - ) 14 14 - 15 15 - type Ingester func(ctx context.Context, e *models.Event) error 16 16 - 17 17 - func jetstreamIngester(d db.DbWrapper) Ingester { 18 18 - return func(ctx context.Context, e *models.Event) error { 19 19 - var err error 20 20 - defer func() { 21 21 - eventTime := e.TimeUS 22 22 - lastTimeUs := eventTime + 1 23 23 - if err := d.SaveLastTimeUs(lastTimeUs); err != nil { 24 24 - err = fmt.Errorf("(deferred) failed to save last time us: %w", err) 25 25 - } 26 26 - }() 27 27 - 28 28 - if e.Kind != models.EventKindCommit { 29 29 - return nil 30 30 - } 31 31 - 32 32 - did := e.Did 33 33 - raw := json.RawMessage(e.Commit.Record) 34 34 - 35 35 - switch e.Commit.Collection { 36 36 - case tangled.GraphFollowNSID: 37 37 - record := tangled.GraphFollow{} 38 38 - err := json.Unmarshal(raw, &record) 39 39 - if err != nil { 40 40 - log.Println("invalid record") 41 41 - return err 42 42 - } 43 43 - err = db.AddFollow(d, did, record.Subject, e.Commit.RKey) 44 44 - if err != nil { 45 45 - return fmt.Errorf("failed to add follow to db: %w", err) 46 46 - } 47 47 - case tangled.FeedStarNSID: 48 48 - record := tangled.FeedStar{} 49 49 - err := json.Unmarshal(raw, &record) 50 50 - if err != nil { 51 51 - log.Println("invalid record") 52 52 - return err 53 53 - } 54 54 - 55 55 - subjectUri, err := syntax.ParseATURI(record.Subject) 56 56 - 57 57 - if err != nil { 58 58 - log.Println("invalid record") 59 59 - return err 60 60 - } 61 61 - 62 62 - err = db.AddStar(d, did, subjectUri, e.Commit.RKey) 63 63 - if err != nil { 64 64 - return fmt.Errorf("failed to add follow to db: %w", err) 65 65 - } 66 66 - } 67 67 - 68 68 - return err 69 69 - } 70 70 - }

+174

camo/.gitignore

··· 1 1 + # Logs 2 2 + 3 3 + ./test.sh 4 4 + 5 5 + logs 6 6 + _.log 7 7 + npm-debug.log_ 8 8 + yarn-debug.log* 9 9 + yarn-error.log* 10 10 + lerna-debug.log* 11 11 + .pnpm-debug.log* 12 12 + 13 13 + # Diagnostic reports (https://nodejs.org/api/report.html) 14 14 + 15 15 + report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json 16 16 + 17 17 + # Runtime data 18 18 + 19 19 + pids 20 20 + _.pid 21 21 + _.seed 22 22 + \*.pid.lock 23 23 + 24 24 + # Directory for instrumented libs generated by jscoverage/JSCover 25 25 + 26 26 + lib-cov 27 27 + 28 28 + # Coverage directory used by tools like istanbul 29 29 + 30 30 + coverage 31 31 + \*.lcov 32 32 + 33 33 + # nyc test coverage 34 34 + 35 35 + .nyc_output 36 36 + 37 37 + # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) 38 38 + 39 39 + .grunt 40 40 + 41 41 + # Bower dependency directory (https://bower.io/) 42 42 + 43 43 + bower_components 44 44 + 45 45 + # node-waf configuration 46 46 + 47 47 + .lock-wscript 48 48 + 49 49 + # Compiled binary addons (https://nodejs.org/api/addons.html) 50 50 + 51 51 + build/Release 52 52 + 53 53 + # Dependency directories 54 54 + 55 55 + node_modules/ 56 56 + jspm_packages/ 57 57 + 58 58 + # Snowpack dependency directory (https://snowpack.dev/) 59 59 + 60 60 + web_modules/ 61 61 + 62 62 + # TypeScript cache 63 63 + 64 64 + \*.tsbuildinfo 65 65 + 66 66 + # Optional npm cache directory 67 67 + 68 68 + .npm 69 69 + 70 70 + # Optional eslint cache 71 71 + 72 72 + .eslintcache 73 73 + 74 74 + # Optional stylelint cache 75 75 + 76 76 + .stylelintcache 77 77 + 78 78 + # Microbundle cache 79 79 + 80 80 + .rpt2_cache/ 81 81 + .rts2_cache_cjs/ 82 82 + .rts2_cache_es/ 83 83 + .rts2_cache_umd/ 84 84 + 85 85 + # Optional REPL history 86 86 + 87 87 + .node_repl_history 88 88 + 89 89 + # Output of 'npm pack' 90 90 + 91 91 + \*.tgz 92 92 + 93 93 + # Yarn Integrity file 94 94 + 95 95 + .yarn-integrity 96 96 + 97 97 + # dotenv environment variable files 98 98 + 99 99 + .env 100 100 + .env.development.local 101 101 + .env.test.local 102 102 + .env.production.local 103 103 + .env.local 104 104 + 105 105 + # parcel-bundler cache (https://parceljs.org/) 106 106 + 107 107 + .cache 108 108 + .parcel-cache 109 109 + 110 110 + # Next.js build output 111 111 + 112 112 + .next 113 113 + out 114 114 + 115 115 + # Nuxt.js build / generate output 116 116 + 117 117 + .nuxt 118 118 + dist 119 119 + 120 120 + # Gatsby files 121 121 + 122 122 + .cache/ 123 123 + 124 124 + # Comment in the public line in if your project uses Gatsby and not Next.js 125 125 + 126 126 + # https://nextjs.org/blog/next-9-1#public-directory-support 127 127 + 128 128 + # public 129 129 + 130 130 + # vuepress build output 131 131 + 132 132 + .vuepress/dist 133 133 + 134 134 + # vuepress v2.x temp and cache directory 135 135 + 136 136 + .temp 137 137 + .cache 138 138 + 139 139 + # Docusaurus cache and generated files 140 140 + 141 141 + .docusaurus 142 142 + 143 143 + # Serverless directories 144 144 + 145 145 + .serverless/ 146 146 + 147 147 + # FuseBox cache 148 148 + 149 149 + .fusebox/ 150 150 + 151 151 + # DynamoDB Local files 152 152 + 153 153 + .dynamodb/ 154 154 + 155 155 + # TernJS port file 156 156 + 157 157 + .tern-port 158 158 + 159 159 + # Stores VSCode versions used for testing VSCode extensions 160 160 + 161 161 + .vscode-test 162 162 + 163 163 + # yarn v2 164 164 + 165 165 + .yarn/cache 166 166 + .yarn/unplugged 167 167 + .yarn/build-state.yml 168 168 + .yarn/install-state.gz 169 169 + .pnp.\* 170 170 + 171 171 + # wrangler project 172 172 + 173 173 + .dev.vars 174 174 + .wrangler/

+3024

camo/package-lock.json

··· 1 1 + { 2 2 + "name": "camo", 3 3 + "version": "0.0.0", 4 4 + "lockfileVersion": 3, 5 5 + "requires": true, 6 6 + "packages": { 7 7 + "": { 8 8 + "name": "camo", 9 9 + "version": "0.0.0", 10 10 + "devDependencies": { 11 11 + "@cloudflare/vitest-pool-workers": "^0.8.19", 12 12 + "vitest": "~3.0.7", 13 13 + "wrangler": "^4.14.1" 14 14 + } 15 15 + }, 16 16 + "node_modules/@cloudflare/kv-asset-handler": { 17 17 + "version": "0.4.0", 18 18 + "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.4.0.tgz", 19 19 + "integrity": "sha512-+tv3z+SPp+gqTIcImN9o0hqE9xyfQjI1XD9pL6NuKjua9B1y7mNYv0S9cP+QEbA4ppVgGZEmKOvHX5G5Ei1CVA==", 20 20 + "dev": true, 21 21 + "license": "MIT OR Apache-2.0", 22 22 + "dependencies": { 23 23 + "mime": "^3.0.0" 24 24 + }, 25 25 + "engines": { 26 26 + "node": ">=18.0.0" 27 27 + } 28 28 + }, 29 29 + "node_modules/@cloudflare/unenv-preset": { 30 30 + "version": "2.3.1", 31 31 + "resolved": "https://registry.npmjs.org/@cloudflare/unenv-preset/-/unenv-preset-2.3.1.tgz", 32 32 + "integrity": "sha512-Xq57Qd+ADpt6hibcVBO0uLG9zzRgyRhfCUgBT9s+g3+3Ivg5zDyVgLFy40ES1VdNcu8rPNSivm9A+kGP5IVaPg==", 33 33 + "dev": true, 34 34 + "license": "MIT OR Apache-2.0", 35 35 + "peerDependencies": { 36 36 + "unenv": "2.0.0-rc.15", 37 37 + "workerd": "^1.20250320.0" 38 38 + }, 39 39 + "peerDependenciesMeta": { 40 40 + "workerd": { 41 41 + "optional": true 42 42 + } 43 43 + } 44 44 + }, 45 45 + "node_modules/@cloudflare/vitest-pool-workers": { 46 46 + "version": "0.8.24", 47 47 + "resolved": "https://registry.npmjs.org/@cloudflare/vitest-pool-workers/-/vitest-pool-workers-0.8.24.tgz", 48 48 + "integrity": "sha512-wT2PABJQ9YLYWrVu4CRZOjvmjHkdbMyLTZPU9n/7JEMM3pgG8dY41F1Rj31UsXRQaXX39A/CTPGlk58dcMUysA==", 49 49 + "dev": true, 50 50 + "license": "MIT", 51 51 + "dependencies": { 52 52 + "birpc": "0.2.14", 53 53 + "cjs-module-lexer": "^1.2.3", 54 54 + "devalue": "^4.3.0", 55 55 + "miniflare": "4.20250428.1", 56 56 + "semver": "^7.7.1", 57 57 + "wrangler": "4.14.1", 58 58 + "zod": "^3.22.3" 59 59 + }, 60 60 + "peerDependencies": { 61 61 + "@vitest/runner": "2.0.x - 3.1.x", 62 62 + "@vitest/snapshot": "2.0.x - 3.1.x", 63 63 + "vitest": "2.0.x - 3.1.x" 64 64 + } 65 65 + }, 66 66 + "node_modules/@cloudflare/workerd-darwin-64": { 67 67 + "version": "1.20250428.0", 68 68 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20250428.0.tgz", 69 69 + "integrity": "sha512-6nVe9oV4Hdec6ctzMtW80TiDvNTd2oFPi3VsKqSDVaJSJbL+4b6seyJ7G/UEPI+si6JhHBSLV2/9lNXNGLjClA==", 70 70 + "cpu": [ 71 71 + "x64" 72 72 + ], 73 73 + "dev": true, 74 74 + "license": "Apache-2.0", 75 75 + "optional": true, 76 76 + "os": [ 77 77 + "darwin" 78 78 + ], 79 79 + "engines": { 80 80 + "node": ">=16" 81 81 + } 82 82 + }, 83 83 + "node_modules/@cloudflare/workerd-darwin-arm64": { 84 84 + "version": "1.20250428.0", 85 85 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20250428.0.tgz", 86 86 + "integrity": "sha512-/TB7bh7SIJ5f+6r4PHsAz7+9Qal/TK1cJuKFkUno1kqGlZbdrMwH0ATYwlWC/nBFeu2FB3NUolsTntEuy23hnQ==", 87 87 + "cpu": [ 88 88 + "arm64" 89 89 + ], 90 90 + "dev": true, 91 91 + "license": "Apache-2.0", 92 92 + "optional": true, 93 93 + "os": [ 94 94 + "darwin" 95 95 + ], 96 96 + "engines": { 97 97 + "node": ">=16" 98 98 + } 99 99 + }, 100 100 + "node_modules/@cloudflare/workerd-linux-64": { 101 101 + "version": "1.20250428.0", 102 102 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20250428.0.tgz", 103 103 + "integrity": "sha512-9eCbj+R3CKqpiXP6DfAA20DxKge+OTj7Hyw3ZewiEhWH9INIHiJwJQYybu4iq9kJEGjnGvxgguLFjSCWm26hgg==", 104 104 + "cpu": [ 105 105 + "x64" 106 106 + ], 107 107 + "dev": true, 108 108 + "license": "Apache-2.0", 109 109 + "optional": true, 110 110 + "os": [ 111 111 + "linux" 112 112 + ], 113 113 + "engines": { 114 114 + "node": ">=16" 115 115 + } 116 116 + }, 117 117 + "node_modules/@cloudflare/workerd-linux-arm64": { 118 118 + "version": "1.20250428.0", 119 119 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20250428.0.tgz", 120 120 + "integrity": "sha512-D9NRBnW46nl1EQsP13qfkYb5lbt4C6nxl38SBKY/NOcZAUoHzNB5K0GaK8LxvpkM7X/97ySojlMfR5jh5DNXYQ==", 121 121 + "cpu": [ 122 122 + "arm64" 123 123 + ], 124 124 + "dev": true, 125 125 + "license": "Apache-2.0", 126 126 + "optional": true, 127 127 + "os": [ 128 128 + "linux" 129 129 + ], 130 130 + "engines": { 131 131 + "node": ">=16" 132 132 + } 133 133 + }, 134 134 + "node_modules/@cloudflare/workerd-windows-64": { 135 135 + "version": "1.20250428.0", 136 136 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20250428.0.tgz", 137 137 + "integrity": "sha512-RQCRj28eitjKD0tmei6iFOuWqMuHMHdNGEigRmbkmuTlpbWHNAoHikgCzZQ/dkKDdatA76TmcpbyECNf31oaTA==", 138 138 + "cpu": [ 139 139 + "x64" 140 140 + ], 141 141 + "dev": true, 142 142 + "license": "Apache-2.0", 143 143 + "optional": true, 144 144 + "os": [ 145 145 + "win32" 146 146 + ], 147 147 + "engines": { 148 148 + "node": ">=16" 149 149 + } 150 150 + }, 151 151 + "node_modules/@cspotcode/source-map-support": { 152 152 + "version": "0.8.1", 153 153 + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", 154 154 + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", 155 155 + "dev": true, 156 156 + "license": "MIT", 157 157 + "dependencies": { 158 158 + "@jridgewell/trace-mapping": "0.3.9" 159 159 + }, 160 160 + "engines": { 161 161 + "node": ">=12" 162 162 + } 163 163 + }, 164 164 + "node_modules/@emnapi/runtime": { 165 165 + "version": "1.4.3", 166 166 + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz", 167 167 + "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==", 168 168 + "dev": true, 169 169 + "license": "MIT", 170 170 + "optional": true, 171 171 + "dependencies": { 172 172 + "tslib": "^2.4.0" 173 173 + } 174 174 + }, 175 175 + "node_modules/@esbuild/aix-ppc64": { 176 176 + "version": "0.25.3", 177 177 + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.3.tgz", 178 178 + "integrity": "sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==", 179 179 + "cpu": [ 180 180 + "ppc64" 181 181 + ], 182 182 + "dev": true, 183 183 + "license": "MIT", 184 184 + "optional": true, 185 185 + "os": [ 186 186 + "aix" 187 187 + ], 188 188 + "engines": { 189 189 + "node": ">=18" 190 190 + } 191 191 + }, 192 192 + "node_modules/@esbuild/android-arm": { 193 193 + "version": "0.25.3", 194 194 + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.3.tgz", 195 195 + "integrity": "sha512-PuwVXbnP87Tcff5I9ngV0lmiSu40xw1At6i3GsU77U7cjDDB4s0X2cyFuBiDa1SBk9DnvWwnGvVaGBqoFWPb7A==", 196 196 + "cpu": [ 197 197 + "arm" 198 198 + ], 199 199 + "dev": true, 200 200 + "license": "MIT", 201 201 + "optional": true, 202 202 + "os": [ 203 203 + "android" 204 204 + ], 205 205 + "engines": { 206 206 + "node": ">=18" 207 207 + } 208 208 + }, 209 209 + "node_modules/@esbuild/android-arm64": { 210 210 + "version": "0.25.3", 211 211 + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.3.tgz", 212 212 + "integrity": "sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==", 213 213 + "cpu": [ 214 214 + "arm64" 215 215 + ], 216 216 + "dev": true, 217 217 + "license": "MIT", 218 218 + "optional": true, 219 219 + "os": [ 220 220 + "android" 221 221 + ], 222 222 + "engines": { 223 223 + "node": ">=18" 224 224 + } 225 225 + }, 226 226 + "node_modules/@esbuild/android-x64": { 227 227 + "version": "0.25.3", 228 228 + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.3.tgz", 229 229 + "integrity": "sha512-ogtTpYHT/g1GWS/zKM0cc/tIebFjm1F9Aw1boQ2Y0eUQ+J89d0jFY//s9ei9jVIlkYi8AfOjiixcLJSGNSOAdQ==", 230 230 + "cpu": [ 231 231 + "x64" 232 232 + ], 233 233 + "dev": true, 234 234 + "license": "MIT", 235 235 + "optional": true, 236 236 + "os": [ 237 237 + "android" 238 238 + ], 239 239 + "engines": { 240 240 + "node": ">=18" 241 241 + } 242 242 + }, 243 243 + "node_modules/@esbuild/darwin-arm64": { 244 244 + "version": "0.25.3", 245 245 + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.3.tgz", 246 246 + "integrity": "sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==", 247 247 + "cpu": [ 248 248 + "arm64" 249 249 + ], 250 250 + "dev": true, 251 251 + "license": "MIT", 252 252 + "optional": true, 253 253 + "os": [ 254 254 + "darwin" 255 255 + ], 256 256 + "engines": { 257 257 + "node": ">=18" 258 258 + } 259 259 + }, 260 260 + "node_modules/@esbuild/darwin-x64": { 261 261 + "version": "0.25.3", 262 262 + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.3.tgz", 263 263 + "integrity": "sha512-Kd8glo7sIZtwOLcPbW0yLpKmBNWMANZhrC1r6K++uDR2zyzb6AeOYtI6udbtabmQpFaxJ8uduXMAo1gs5ozz8A==", 264 264 + "cpu": [ 265 265 + "x64" 266 266 + ], 267 267 + "dev": true, 268 268 + "license": "MIT", 269 269 + "optional": true, 270 270 + "os": [ 271 271 + "darwin" 272 272 + ], 273 273 + "engines": { 274 274 + "node": ">=18" 275 275 + } 276 276 + }, 277 277 + "node_modules/@esbuild/freebsd-arm64": { 278 278 + "version": "0.25.3", 279 279 + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.3.tgz", 280 280 + "integrity": "sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==", 281 281 + "cpu": [ 282 282 + "arm64" 283 283 + ], 284 284 + "dev": true, 285 285 + "license": "MIT", 286 286 + "optional": true, 287 287 + "os": [ 288 288 + "freebsd" 289 289 + ], 290 290 + "engines": { 291 291 + "node": ">=18" 292 292 + } 293 293 + }, 294 294 + "node_modules/@esbuild/freebsd-x64": { 295 295 + "version": "0.25.3", 296 296 + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.3.tgz", 297 297 + "integrity": "sha512-Q+wSjaLpGxYf7zC0kL0nDlhsfuFkoN+EXrx2KSB33RhinWzejOd6AvgmP5JbkgXKmjhmpfgKZq24pneodYqE8Q==", 298 298 + "cpu": [ 299 299 + "x64" 300 300 + ], 301 301 + "dev": true, 302 302 + "license": "MIT", 303 303 + "optional": true, 304 304 + "os": [ 305 305 + "freebsd" 306 306 + ], 307 307 + "engines": { 308 308 + "node": ">=18" 309 309 + } 310 310 + }, 311 311 + "node_modules/@esbuild/linux-arm": { 312 312 + "version": "0.25.3", 313 313 + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.3.tgz", 314 314 + "integrity": "sha512-dUOVmAUzuHy2ZOKIHIKHCm58HKzFqd+puLaS424h6I85GlSDRZIA5ycBixb3mFgM0Jdh+ZOSB6KptX30DD8YOQ==", 315 315 + "cpu": [ 316 316 + "arm" 317 317 + ], 318 318 + "dev": true, 319 319 + "license": "MIT", 320 320 + "optional": true, 321 321 + "os": [ 322 322 + "linux" 323 323 + ], 324 324 + "engines": { 325 325 + "node": ">=18" 326 326 + } 327 327 + }, 328 328 + "node_modules/@esbuild/linux-arm64": { 329 329 + "version": "0.25.3", 330 330 + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.3.tgz", 331 331 + "integrity": "sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==", 332 332 + "cpu": [ 333 333 + "arm64" 334 334 + ], 335 335 + "dev": true, 336 336 + "license": "MIT", 337 337 + "optional": true, 338 338 + "os": [ 339 339 + "linux" 340 340 + ], 341 341 + "engines": { 342 342 + "node": ">=18" 343 343 + } 344 344 + }, 345 345 + "node_modules/@esbuild/linux-ia32": { 346 346 + "version": "0.25.3", 347 347 + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.3.tgz", 348 348 + "integrity": "sha512-yplPOpczHOO4jTYKmuYuANI3WhvIPSVANGcNUeMlxH4twz/TeXuzEP41tGKNGWJjuMhotpGabeFYGAOU2ummBw==", 349 349 + "cpu": [ 350 350 + "ia32" 351 351 + ], 352 352 + "dev": true, 353 353 + "license": "MIT", 354 354 + "optional": true, 355 355 + "os": [ 356 356 + "linux" 357 357 + ], 358 358 + "engines": { 359 359 + "node": ">=18" 360 360 + } 361 361 + }, 362 362 + "node_modules/@esbuild/linux-loong64": { 363 363 + "version": "0.25.3", 364 364 + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.3.tgz", 365 365 + "integrity": "sha512-P4BLP5/fjyihmXCELRGrLd793q/lBtKMQl8ARGpDxgzgIKJDRJ/u4r1A/HgpBpKpKZelGct2PGI4T+axcedf6g==", 366 366 + "cpu": [ 367 367 + "loong64" 368 368 + ], 369 369 + "dev": true, 370 370 + "license": "MIT", 371 371 + "optional": true, 372 372 + "os": [ 373 373 + "linux" 374 374 + ], 375 375 + "engines": { 376 376 + "node": ">=18" 377 377 + } 378 378 + }, 379 379 + "node_modules/@esbuild/linux-mips64el": { 380 380 + "version": "0.25.3", 381 381 + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.3.tgz", 382 382 + "integrity": "sha512-eRAOV2ODpu6P5divMEMa26RRqb2yUoYsuQQOuFUexUoQndm4MdpXXDBbUoKIc0iPa4aCO7gIhtnYomkn2x+bag==", 383 383 + "cpu": [ 384 384 + "mips64el" 385 385 + ], 386 386 + "dev": true, 387 387 + "license": "MIT", 388 388 + "optional": true, 389 389 + "os": [ 390 390 + "linux" 391 391 + ], 392 392 + "engines": { 393 393 + "node": ">=18" 394 394 + } 395 395 + }, 396 396 + "node_modules/@esbuild/linux-ppc64": { 397 397 + "version": "0.25.3", 398 398 + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.3.tgz", 399 399 + "integrity": "sha512-ZC4jV2p7VbzTlnl8nZKLcBkfzIf4Yad1SJM4ZMKYnJqZFD4rTI+pBG65u8ev4jk3/MPwY9DvGn50wi3uhdaghg==", 400 400 + "cpu": [ 401 401 + "ppc64" 402 402 + ], 403 403 + "dev": true, 404 404 + "license": "MIT", 405 405 + "optional": true, 406 406 + "os": [ 407 407 + "linux" 408 408 + ], 409 409 + "engines": { 410 410 + "node": ">=18" 411 411 + } 412 412 + }, 413 413 + "node_modules/@esbuild/linux-riscv64": { 414 414 + "version": "0.25.3", 415 415 + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.3.tgz", 416 416 + "integrity": "sha512-LDDODcFzNtECTrUUbVCs6j9/bDVqy7DDRsuIXJg6so+mFksgwG7ZVnTruYi5V+z3eE5y+BJZw7VvUadkbfg7QA==", 417 417 + "cpu": [ 418 418 + "riscv64" 419 419 + ], 420 420 + "dev": true, 421 421 + "license": "MIT", 422 422 + "optional": true, 423 423 + "os": [ 424 424 + "linux" 425 425 + ], 426 426 + "engines": { 427 427 + "node": ">=18" 428 428 + } 429 429 + }, 430 430 + "node_modules/@esbuild/linux-s390x": { 431 431 + "version": "0.25.3", 432 432 + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.3.tgz", 433 433 + "integrity": "sha512-s+w/NOY2k0yC2p9SLen+ymflgcpRkvwwa02fqmAwhBRI3SC12uiS10edHHXlVWwfAagYSY5UpmT/zISXPMW3tQ==", 434 434 + "cpu": [ 435 435 + "s390x" 436 436 + ], 437 437 + "dev": true, 438 438 + "license": "MIT", 439 439 + "optional": true, 440 440 + "os": [ 441 441 + "linux" 442 442 + ], 443 443 + "engines": { 444 444 + "node": ">=18" 445 445 + } 446 446 + }, 447 447 + "node_modules/@esbuild/linux-x64": { 448 448 + "version": "0.25.3", 449 449 + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.3.tgz", 450 450 + "integrity": "sha512-nQHDz4pXjSDC6UfOE1Fw9Q8d6GCAd9KdvMZpfVGWSJztYCarRgSDfOVBY5xwhQXseiyxapkiSJi/5/ja8mRFFA==", 451 451 + "cpu": [ 452 452 + "x64" 453 453 + ], 454 454 + "dev": true, 455 455 + "license": "MIT", 456 456 + "optional": true, 457 457 + "os": [ 458 458 + "linux" 459 459 + ], 460 460 + "engines": { 461 461 + "node": ">=18" 462 462 + } 463 463 + }, 464 464 + "node_modules/@esbuild/netbsd-arm64": { 465 465 + "version": "0.25.3", 466 466 + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.3.tgz", 467 467 + "integrity": "sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==", 468 468 + "cpu": [ 469 469 + "arm64" 470 470 + ], 471 471 + "dev": true, 472 472 + "license": "MIT", 473 473 + "optional": true, 474 474 + "os": [ 475 475 + "netbsd" 476 476 + ], 477 477 + "engines": { 478 478 + "node": ">=18" 479 479 + } 480 480 + }, 481 481 + "node_modules/@esbuild/netbsd-x64": { 482 482 + "version": "0.25.3", 483 483 + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.3.tgz", 484 484 + "integrity": "sha512-i5Hm68HXHdgv8wkrt+10Bc50zM0/eonPb/a/OFVfB6Qvpiirco5gBA5bz7S2SHuU+Y4LWn/zehzNX14Sp4r27g==", 485 485 + "cpu": [ 486 486 + "x64" 487 487 + ], 488 488 + "dev": true, 489 489 + "license": "MIT", 490 490 + "optional": true, 491 491 + "os": [ 492 492 + "netbsd" 493 493 + ], 494 494 + "engines": { 495 495 + "node": ">=18" 496 496 + } 497 497 + }, 498 498 + "node_modules/@esbuild/openbsd-arm64": { 499 499 + "version": "0.25.3", 500 500 + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.3.tgz", 501 501 + "integrity": "sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==", 502 502 + "cpu": [ 503 503 + "arm64" 504 504 + ], 505 505 + "dev": true, 506 506 + "license": "MIT", 507 507 + "optional": true, 508 508 + "os": [ 509 509 + "openbsd" 510 510 + ], 511 511 + "engines": { 512 512 + "node": ">=18" 513 513 + } 514 514 + }, 515 515 + "node_modules/@esbuild/openbsd-x64": { 516 516 + "version": "0.25.3", 517 517 + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.3.tgz", 518 518 + "integrity": "sha512-fpqctI45NnCIDKBH5AXQBsD0NDPbEFczK98hk/aa6HJxbl+UtLkJV2+Bvy5hLSLk3LHmqt0NTkKNso1A9y1a4w==", 519 519 + "cpu": [ 520 520 + "x64" 521 521 + ], 522 522 + "dev": true, 523 523 + "license": "MIT", 524 524 + "optional": true, 525 525 + "os": [ 526 526 + "openbsd" 527 527 + ], 528 528 + "engines": { 529 529 + "node": ">=18" 530 530 + } 531 531 + }, 532 532 + "node_modules/@esbuild/sunos-x64": { 533 533 + "version": "0.25.3", 534 534 + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.3.tgz", 535 535 + "integrity": "sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==", 536 536 + "cpu": [ 537 537 + "x64" 538 538 + ], 539 539 + "dev": true, 540 540 + "license": "MIT", 541 541 + "optional": true, 542 542 + "os": [ 543 543 + "sunos" 544 544 + ], 545 545 + "engines": { 546 546 + "node": ">=18" 547 547 + } 548 548 + }, 549 549 + "node_modules/@esbuild/win32-arm64": { 550 550 + "version": "0.25.3", 551 551 + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.3.tgz", 552 552 + "integrity": "sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==", 553 553 + "cpu": [ 554 554 + "arm64" 555 555 + ], 556 556 + "dev": true, 557 557 + "license": "MIT", 558 558 + "optional": true, 559 559 + "os": [ 560 560 + "win32" 561 561 + ], 562 562 + "engines": { 563 563 + "node": ">=18" 564 564 + } 565 565 + }, 566 566 + "node_modules/@esbuild/win32-ia32": { 567 567 + "version": "0.25.3", 568 568 + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.3.tgz", 569 569 + "integrity": "sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==", 570 570 + "cpu": [ 571 571 + "ia32" 572 572 + ], 573 573 + "dev": true, 574 574 + "license": "MIT", 575 575 + "optional": true, 576 576 + "os": [ 577 577 + "win32" 578 578 + ], 579 579 + "engines": { 580 580 + "node": ">=18" 581 581 + } 582 582 + }, 583 583 + "node_modules/@esbuild/win32-x64": { 584 584 + "version": "0.25.3", 585 585 + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.3.tgz", 586 586 + "integrity": "sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==", 587 587 + "cpu": [ 588 588 + "x64" 589 589 + ], 590 590 + "dev": true, 591 591 + "license": "MIT", 592 592 + "optional": true, 593 593 + "os": [ 594 594 + "win32" 595 595 + ], 596 596 + "engines": { 597 597 + "node": ">=18" 598 598 + } 599 599 + }, 600 600 + "node_modules/@fastify/busboy": { 601 601 + "version": "2.1.1", 602 602 + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", 603 603 + "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==", 604 604 + "dev": true, 605 605 + "license": "MIT", 606 606 + "engines": { 607 607 + "node": ">=14" 608 608 + } 609 609 + }, 610 610 + "node_modules/@img/sharp-darwin-arm64": { 611 611 + "version": "0.33.5", 612 612 + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz", 613 613 + "integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==", 614 614 + "cpu": [ 615 615 + "arm64" 616 616 + ], 617 617 + "dev": true, 618 618 + "license": "Apache-2.0", 619 619 + "optional": true, 620 620 + "os": [ 621 621 + "darwin" 622 622 + ], 623 623 + "engines": { 624 624 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 625 625 + }, 626 626 + "funding": { 627 627 + "url": "https://opencollective.com/libvips" 628 628 + }, 629 629 + "optionalDependencies": { 630 630 + "@img/sharp-libvips-darwin-arm64": "1.0.4" 631 631 + } 632 632 + }, 633 633 + "node_modules/@img/sharp-darwin-x64": { 634 634 + "version": "0.33.5", 635 635 + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz", 636 636 + "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==", 637 637 + "cpu": [ 638 638 + "x64" 639 639 + ], 640 640 + "dev": true, 641 641 + "license": "Apache-2.0", 642 642 + "optional": true, 643 643 + "os": [ 644 644 + "darwin" 645 645 + ], 646 646 + "engines": { 647 647 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 648 648 + }, 649 649 + "funding": { 650 650 + "url": "https://opencollective.com/libvips" 651 651 + }, 652 652 + "optionalDependencies": { 653 653 + "@img/sharp-libvips-darwin-x64": "1.0.4" 654 654 + } 655 655 + }, 656 656 + "node_modules/@img/sharp-libvips-darwin-arm64": { 657 657 + "version": "1.0.4", 658 658 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz", 659 659 + "integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==", 660 660 + "cpu": [ 661 661 + "arm64" 662 662 + ], 663 663 + "dev": true, 664 664 + "license": "LGPL-3.0-or-later", 665 665 + "optional": true, 666 666 + "os": [ 667 667 + "darwin" 668 668 + ], 669 669 + "funding": { 670 670 + "url": "https://opencollective.com/libvips" 671 671 + } 672 672 + }, 673 673 + "node_modules/@img/sharp-libvips-darwin-x64": { 674 674 + "version": "1.0.4", 675 675 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz", 676 676 + "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==", 677 677 + "cpu": [ 678 678 + "x64" 679 679 + ], 680 680 + "dev": true, 681 681 + "license": "LGPL-3.0-or-later", 682 682 + "optional": true, 683 683 + "os": [ 684 684 + "darwin" 685 685 + ], 686 686 + "funding": { 687 687 + "url": "https://opencollective.com/libvips" 688 688 + } 689 689 + }, 690 690 + "node_modules/@img/sharp-libvips-linux-arm": { 691 691 + "version": "1.0.5", 692 692 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz", 693 693 + "integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==", 694 694 + "cpu": [ 695 695 + "arm" 696 696 + ], 697 697 + "dev": true, 698 698 + "license": "LGPL-3.0-or-later", 699 699 + "optional": true, 700 700 + "os": [ 701 701 + "linux" 702 702 + ], 703 703 + "funding": { 704 704 + "url": "https://opencollective.com/libvips" 705 705 + } 706 706 + }, 707 707 + "node_modules/@img/sharp-libvips-linux-arm64": { 708 708 + "version": "1.0.4", 709 709 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz", 710 710 + "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==", 711 711 + "cpu": [ 712 712 + "arm64" 713 713 + ], 714 714 + "dev": true, 715 715 + "license": "LGPL-3.0-or-later", 716 716 + "optional": true, 717 717 + "os": [ 718 718 + "linux" 719 719 + ], 720 720 + "funding": { 721 721 + "url": "https://opencollective.com/libvips" 722 722 + } 723 723 + }, 724 724 + "node_modules/@img/sharp-libvips-linux-s390x": { 725 725 + "version": "1.0.4", 726 726 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz", 727 727 + "integrity": "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==", 728 728 + "cpu": [ 729 729 + "s390x" 730 730 + ], 731 731 + "dev": true, 732 732 + "license": "LGPL-3.0-or-later", 733 733 + "optional": true, 734 734 + "os": [ 735 735 + "linux" 736 736 + ], 737 737 + "funding": { 738 738 + "url": "https://opencollective.com/libvips" 739 739 + } 740 740 + }, 741 741 + "node_modules/@img/sharp-libvips-linux-x64": { 742 742 + "version": "1.0.4", 743 743 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz", 744 744 + "integrity": "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==", 745 745 + "cpu": [ 746 746 + "x64" 747 747 + ], 748 748 + "dev": true, 749 749 + "license": "LGPL-3.0-or-later", 750 750 + "optional": true, 751 751 + "os": [ 752 752 + "linux" 753 753 + ], 754 754 + "funding": { 755 755 + "url": "https://opencollective.com/libvips" 756 756 + } 757 757 + }, 758 758 + "node_modules/@img/sharp-libvips-linuxmusl-arm64": { 759 759 + "version": "1.0.4", 760 760 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz", 761 761 + "integrity": "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==", 762 762 + "cpu": [ 763 763 + "arm64" 764 764 + ], 765 765 + "dev": true, 766 766 + "license": "LGPL-3.0-or-later", 767 767 + "optional": true, 768 768 + "os": [ 769 769 + "linux" 770 770 + ], 771 771 + "funding": { 772 772 + "url": "https://opencollective.com/libvips" 773 773 + } 774 774 + }, 775 775 + "node_modules/@img/sharp-libvips-linuxmusl-x64": { 776 776 + "version": "1.0.4", 777 777 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz", 778 778 + "integrity": "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==", 779 779 + "cpu": [ 780 780 + "x64" 781 781 + ], 782 782 + "dev": true, 783 783 + "license": "LGPL-3.0-or-later", 784 784 + "optional": true, 785 785 + "os": [ 786 786 + "linux" 787 787 + ], 788 788 + "funding": { 789 789 + "url": "https://opencollective.com/libvips" 790 790 + } 791 791 + }, 792 792 + "node_modules/@img/sharp-linux-arm": { 793 793 + "version": "0.33.5", 794 794 + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz", 795 795 + "integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==", 796 796 + "cpu": [ 797 797 + "arm" 798 798 + ], 799 799 + "dev": true, 800 800 + "license": "Apache-2.0", 801 801 + "optional": true, 802 802 + "os": [ 803 803 + "linux" 804 804 + ], 805 805 + "engines": { 806 806 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 807 807 + }, 808 808 + "funding": { 809 809 + "url": "https://opencollective.com/libvips" 810 810 + }, 811 811 + "optionalDependencies": { 812 812 + "@img/sharp-libvips-linux-arm": "1.0.5" 813 813 + } 814 814 + }, 815 815 + "node_modules/@img/sharp-linux-arm64": { 816 816 + "version": "0.33.5", 817 817 + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz", 818 818 + "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==", 819 819 + "cpu": [ 820 820 + "arm64" 821 821 + ], 822 822 + "dev": true, 823 823 + "license": "Apache-2.0", 824 824 + "optional": true, 825 825 + "os": [ 826 826 + "linux" 827 827 + ], 828 828 + "engines": { 829 829 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 830 830 + }, 831 831 + "funding": { 832 832 + "url": "https://opencollective.com/libvips" 833 833 + }, 834 834 + "optionalDependencies": { 835 835 + "@img/sharp-libvips-linux-arm64": "1.0.4" 836 836 + } 837 837 + }, 838 838 + "node_modules/@img/sharp-linux-s390x": { 839 839 + "version": "0.33.5", 840 840 + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz", 841 841 + "integrity": "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==", 842 842 + "cpu": [ 843 843 + "s390x" 844 844 + ], 845 845 + "dev": true, 846 846 + "license": "Apache-2.0", 847 847 + "optional": true, 848 848 + "os": [ 849 849 + "linux" 850 850 + ], 851 851 + "engines": { 852 852 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 853 853 + }, 854 854 + "funding": { 855 855 + "url": "https://opencollective.com/libvips" 856 856 + }, 857 857 + "optionalDependencies": { 858 858 + "@img/sharp-libvips-linux-s390x": "1.0.4" 859 859 + } 860 860 + }, 861 861 + "node_modules/@img/sharp-linux-x64": { 862 862 + "version": "0.33.5", 863 863 + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz", 864 864 + "integrity": "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==", 865 865 + "cpu": [ 866 866 + "x64" 867 867 + ], 868 868 + "dev": true, 869 869 + "license": "Apache-2.0", 870 870 + "optional": true, 871 871 + "os": [ 872 872 + "linux" 873 873 + ], 874 874 + "engines": { 875 875 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 876 876 + }, 877 877 + "funding": { 878 878 + "url": "https://opencollective.com/libvips" 879 879 + }, 880 880 + "optionalDependencies": { 881 881 + "@img/sharp-libvips-linux-x64": "1.0.4" 882 882 + } 883 883 + }, 884 884 + "node_modules/@img/sharp-linuxmusl-arm64": { 885 885 + "version": "0.33.5", 886 886 + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz", 887 887 + "integrity": "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==", 888 888 + "cpu": [ 889 889 + "arm64" 890 890 + ], 891 891 + "dev": true, 892 892 + "license": "Apache-2.0", 893 893 + "optional": true, 894 894 + "os": [ 895 895 + "linux" 896 896 + ], 897 897 + "engines": { 898 898 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 899 899 + }, 900 900 + "funding": { 901 901 + "url": "https://opencollective.com/libvips" 902 902 + }, 903 903 + "optionalDependencies": { 904 904 + "@img/sharp-libvips-linuxmusl-arm64": "1.0.4" 905 905 + } 906 906 + }, 907 907 + "node_modules/@img/sharp-linuxmusl-x64": { 908 908 + "version": "0.33.5", 909 909 + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz", 910 910 + "integrity": "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==", 911 911 + "cpu": [ 912 912 + "x64" 913 913 + ], 914 914 + "dev": true, 915 915 + "license": "Apache-2.0", 916 916 + "optional": true, 917 917 + "os": [ 918 918 + "linux" 919 919 + ], 920 920 + "engines": { 921 921 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 922 922 + }, 923 923 + "funding": { 924 924 + "url": "https://opencollective.com/libvips" 925 925 + }, 926 926 + "optionalDependencies": { 927 927 + "@img/sharp-libvips-linuxmusl-x64": "1.0.4" 928 928 + } 929 929 + }, 930 930 + "node_modules/@img/sharp-wasm32": { 931 931 + "version": "0.33.5", 932 932 + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz", 933 933 + "integrity": "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==", 934 934 + "cpu": [ 935 935 + "wasm32" 936 936 + ], 937 937 + "dev": true, 938 938 + "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", 939 939 + "optional": true, 940 940 + "dependencies": { 941 941 + "@emnapi/runtime": "^1.2.0" 942 942 + }, 943 943 + "engines": { 944 944 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 945 945 + }, 946 946 + "funding": { 947 947 + "url": "https://opencollective.com/libvips" 948 948 + } 949 949 + }, 950 950 + "node_modules/@img/sharp-win32-ia32": { 951 951 + "version": "0.33.5", 952 952 + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz", 953 953 + "integrity": "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==", 954 954 + "cpu": [ 955 955 + "ia32" 956 956 + ], 957 957 + "dev": true, 958 958 + "license": "Apache-2.0 AND LGPL-3.0-or-later", 959 959 + "optional": true, 960 960 + "os": [ 961 961 + "win32" 962 962 + ], 963 963 + "engines": { 964 964 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 965 965 + }, 966 966 + "funding": { 967 967 + "url": "https://opencollective.com/libvips" 968 968 + } 969 969 + }, 970 970 + "node_modules/@img/sharp-win32-x64": { 971 971 + "version": "0.33.5", 972 972 + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz", 973 973 + "integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==", 974 974 + "cpu": [ 975 975 + "x64" 976 976 + ], 977 977 + "dev": true, 978 978 + "license": "Apache-2.0 AND LGPL-3.0-or-later", 979 979 + "optional": true, 980 980 + "os": [ 981 981 + "win32" 982 982 + ], 983 983 + "engines": { 984 984 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 985 985 + }, 986 986 + "funding": { 987 987 + "url": "https://opencollective.com/libvips" 988 988 + } 989 989 + }, 990 990 + "node_modules/@jridgewell/resolve-uri": { 991 991 + "version": "3.1.2", 992 992 + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", 993 993 + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", 994 994 + "dev": true, 995 995 + "license": "MIT", 996 996 + "engines": { 997 997 + "node": ">=6.0.0" 998 998 + } 999 999 + }, 1000 1000 + "node_modules/@jridgewell/sourcemap-codec": { 1001 1001 + "version": "1.5.0", 1002 1002 + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", 1003 1003 + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", 1004 1004 + "dev": true, 1005 1005 + "license": "MIT" 1006 1006 + }, 1007 1007 + "node_modules/@jridgewell/trace-mapping": { 1008 1008 + "version": "0.3.9", 1009 1009 + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", 1010 1010 + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", 1011 1011 + "dev": true, 1012 1012 + "license": "MIT", 1013 1013 + "dependencies": { 1014 1014 + "@jridgewell/resolve-uri": "^3.0.3", 1015 1015 + "@jridgewell/sourcemap-codec": "^1.4.10" 1016 1016 + } 1017 1017 + }, 1018 1018 + "node_modules/@rollup/rollup-android-arm-eabi": { 1019 1019 + "version": "4.40.1", 1020 1020 + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.1.tgz", 1021 1021 + "integrity": "sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==", 1022 1022 + "cpu": [ 1023 1023 + "arm" 1024 1024 + ], 1025 1025 + "dev": true, 1026 1026 + "license": "MIT", 1027 1027 + "optional": true, 1028 1028 + "os": [ 1029 1029 + "android" 1030 1030 + ] 1031 1031 + }, 1032 1032 + "node_modules/@rollup/rollup-android-arm64": { 1033 1033 + "version": "4.40.1", 1034 1034 + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.1.tgz", 1035 1035 + "integrity": "sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==", 1036 1036 + "cpu": [ 1037 1037 + "arm64" 1038 1038 + ], 1039 1039 + "dev": true, 1040 1040 + "license": "MIT", 1041 1041 + "optional": true, 1042 1042 + "os": [ 1043 1043 + "android" 1044 1044 + ] 1045 1045 + }, 1046 1046 + "node_modules/@rollup/rollup-darwin-arm64": { 1047 1047 + "version": "4.40.1", 1048 1048 + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.1.tgz", 1049 1049 + "integrity": "sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA==", 1050 1050 + "cpu": [ 1051 1051 + "arm64" 1052 1052 + ], 1053 1053 + "dev": true, 1054 1054 + "license": "MIT", 1055 1055 + "optional": true, 1056 1056 + "os": [ 1057 1057 + "darwin" 1058 1058 + ] 1059 1059 + }, 1060 1060 + "node_modules/@rollup/rollup-darwin-x64": { 1061 1061 + "version": "4.40.1", 1062 1062 + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.1.tgz", 1063 1063 + "integrity": "sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==", 1064 1064 + "cpu": [ 1065 1065 + "x64" 1066 1066 + ], 1067 1067 + "dev": true, 1068 1068 + "license": "MIT", 1069 1069 + "optional": true, 1070 1070 + "os": [ 1071 1071 + "darwin" 1072 1072 + ] 1073 1073 + }, 1074 1074 + "node_modules/@rollup/rollup-freebsd-arm64": { 1075 1075 + "version": "4.40.1", 1076 1076 + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.1.tgz", 1077 1077 + "integrity": "sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==", 1078 1078 + "cpu": [ 1079 1079 + "arm64" 1080 1080 + ], 1081 1081 + "dev": true, 1082 1082 + "license": "MIT", 1083 1083 + "optional": true, 1084 1084 + "os": [ 1085 1085 + "freebsd" 1086 1086 + ] 1087 1087 + }, 1088 1088 + "node_modules/@rollup/rollup-freebsd-x64": { 1089 1089 + "version": "4.40.1", 1090 1090 + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.1.tgz", 1091 1091 + "integrity": "sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==", 1092 1092 + "cpu": [ 1093 1093 + "x64" 1094 1094 + ], 1095 1095 + "dev": true, 1096 1096 + "license": "MIT", 1097 1097 + "optional": true, 1098 1098 + "os": [ 1099 1099 + "freebsd" 1100 1100 + ] 1101 1101 + }, 1102 1102 + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { 1103 1103 + "version": "4.40.1", 1104 1104 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.1.tgz", 1105 1105 + "integrity": "sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==", 1106 1106 + "cpu": [ 1107 1107 + "arm" 1108 1108 + ], 1109 1109 + "dev": true, 1110 1110 + "license": "MIT", 1111 1111 + "optional": true, 1112 1112 + "os": [ 1113 1113 + "linux" 1114 1114 + ] 1115 1115 + }, 1116 1116 + "node_modules/@rollup/rollup-linux-arm-musleabihf": { 1117 1117 + "version": "4.40.1", 1118 1118 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.1.tgz", 1119 1119 + "integrity": "sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==", 1120 1120 + "cpu": [ 1121 1121 + "arm" 1122 1122 + ], 1123 1123 + "dev": true, 1124 1124 + "license": "MIT", 1125 1125 + "optional": true, 1126 1126 + "os": [ 1127 1127 + "linux" 1128 1128 + ] 1129 1129 + }, 1130 1130 + "node_modules/@rollup/rollup-linux-arm64-gnu": { 1131 1131 + "version": "4.40.1", 1132 1132 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.1.tgz", 1133 1133 + "integrity": "sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==", 1134 1134 + "cpu": [ 1135 1135 + "arm64" 1136 1136 + ], 1137 1137 + "dev": true, 1138 1138 + "license": "MIT", 1139 1139 + "optional": true, 1140 1140 + "os": [ 1141 1141 + "linux" 1142 1142 + ] 1143 1143 + }, 1144 1144 + "node_modules/@rollup/rollup-linux-arm64-musl": { 1145 1145 + "version": "4.40.1", 1146 1146 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.1.tgz", 1147 1147 + "integrity": "sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==", 1148 1148 + "cpu": [ 1149 1149 + "arm64" 1150 1150 + ], 1151 1151 + "dev": true, 1152 1152 + "license": "MIT", 1153 1153 + "optional": true, 1154 1154 + "os": [ 1155 1155 + "linux" 1156 1156 + ] 1157 1157 + }, 1158 1158 + "node_modules/@rollup/rollup-linux-loongarch64-gnu": { 1159 1159 + "version": "4.40.1", 1160 1160 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.1.tgz", 1161 1161 + "integrity": "sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==", 1162 1162 + "cpu": [ 1163 1163 + "loong64" 1164 1164 + ], 1165 1165 + "dev": true, 1166 1166 + "license": "MIT", 1167 1167 + "optional": true, 1168 1168 + "os": [ 1169 1169 + "linux" 1170 1170 + ] 1171 1171 + }, 1172 1172 + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { 1173 1173 + "version": "4.40.1", 1174 1174 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.1.tgz", 1175 1175 + "integrity": "sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==", 1176 1176 + "cpu": [ 1177 1177 + "ppc64" 1178 1178 + ], 1179 1179 + "dev": true, 1180 1180 + "license": "MIT", 1181 1181 + "optional": true, 1182 1182 + "os": [ 1183 1183 + "linux" 1184 1184 + ] 1185 1185 + }, 1186 1186 + "node_modules/@rollup/rollup-linux-riscv64-gnu": { 1187 1187 + "version": "4.40.1", 1188 1188 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.1.tgz", 1189 1189 + "integrity": "sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==", 1190 1190 + "cpu": [ 1191 1191 + "riscv64" 1192 1192 + ], 1193 1193 + "dev": true, 1194 1194 + "license": "MIT", 1195 1195 + "optional": true, 1196 1196 + "os": [ 1197 1197 + "linux" 1198 1198 + ] 1199 1199 + }, 1200 1200 + "node_modules/@rollup/rollup-linux-riscv64-musl": { 1201 1201 + "version": "4.40.1", 1202 1202 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.1.tgz", 1203 1203 + "integrity": "sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==", 1204 1204 + "cpu": [ 1205 1205 + "riscv64" 1206 1206 + ], 1207 1207 + "dev": true, 1208 1208 + "license": "MIT", 1209 1209 + "optional": true, 1210 1210 + "os": [ 1211 1211 + "linux" 1212 1212 + ] 1213 1213 + }, 1214 1214 + "node_modules/@rollup/rollup-linux-s390x-gnu": { 1215 1215 + "version": "4.40.1", 1216 1216 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.1.tgz", 1217 1217 + "integrity": "sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==", 1218 1218 + "cpu": [ 1219 1219 + "s390x" 1220 1220 + ], 1221 1221 + "dev": true, 1222 1222 + "license": "MIT", 1223 1223 + "optional": true, 1224 1224 + "os": [ 1225 1225 + "linux" 1226 1226 + ] 1227 1227 + }, 1228 1228 + "node_modules/@rollup/rollup-linux-x64-gnu": { 1229 1229 + "version": "4.40.1", 1230 1230 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.1.tgz", 1231 1231 + "integrity": "sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ==", 1232 1232 + "cpu": [ 1233 1233 + "x64" 1234 1234 + ], 1235 1235 + "dev": true, 1236 1236 + "license": "MIT", 1237 1237 + "optional": true, 1238 1238 + "os": [ 1239 1239 + "linux" 1240 1240 + ] 1241 1241 + }, 1242 1242 + "node_modules/@rollup/rollup-linux-x64-musl": { 1243 1243 + "version": "4.40.1", 1244 1244 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.1.tgz", 1245 1245 + "integrity": "sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==", 1246 1246 + "cpu": [ 1247 1247 + "x64" 1248 1248 + ], 1249 1249 + "dev": true, 1250 1250 + "license": "MIT", 1251 1251 + "optional": true, 1252 1252 + "os": [ 1253 1253 + "linux" 1254 1254 + ] 1255 1255 + }, 1256 1256 + "node_modules/@rollup/rollup-win32-arm64-msvc": { 1257 1257 + "version": "4.40.1", 1258 1258 + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.1.tgz", 1259 1259 + "integrity": "sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==", 1260 1260 + "cpu": [ 1261 1261 + "arm64" 1262 1262 + ], 1263 1263 + "dev": true, 1264 1264 + "license": "MIT", 1265 1265 + "optional": true, 1266 1266 + "os": [ 1267 1267 + "win32" 1268 1268 + ] 1269 1269 + }, 1270 1270 + "node_modules/@rollup/rollup-win32-ia32-msvc": { 1271 1271 + "version": "4.40.1", 1272 1272 + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.1.tgz", 1273 1273 + "integrity": "sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==", 1274 1274 + "cpu": [ 1275 1275 + "ia32" 1276 1276 + ], 1277 1277 + "dev": true, 1278 1278 + "license": "MIT", 1279 1279 + "optional": true, 1280 1280 + "os": [ 1281 1281 + "win32" 1282 1282 + ] 1283 1283 + }, 1284 1284 + "node_modules/@rollup/rollup-win32-x64-msvc": { 1285 1285 + "version": "4.40.1", 1286 1286 + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.1.tgz", 1287 1287 + "integrity": "sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==", 1288 1288 + "cpu": [ 1289 1289 + "x64" 1290 1290 + ], 1291 1291 + "dev": true, 1292 1292 + "license": "MIT", 1293 1293 + "optional": true, 1294 1294 + "os": [ 1295 1295 + "win32" 1296 1296 + ] 1297 1297 + }, 1298 1298 + "node_modules/@types/estree": { 1299 1299 + "version": "1.0.7", 1300 1300 + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", 1301 1301 + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", 1302 1302 + "dev": true, 1303 1303 + "license": "MIT" 1304 1304 + }, 1305 1305 + "node_modules/@vitest/expect": { 1306 1306 + "version": "3.0.9", 1307 1307 + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.9.tgz", 1308 1308 + "integrity": "sha512-5eCqRItYgIML7NNVgJj6TVCmdzE7ZVgJhruW0ziSQV4V7PvLkDL1bBkBdcTs/VuIz0IxPb5da1IDSqc1TR9eig==", 1309 1309 + "dev": true, 1310 1310 + "license": "MIT", 1311 1311 + "dependencies": { 1312 1312 + "@vitest/spy": "3.0.9", 1313 1313 + "@vitest/utils": "3.0.9", 1314 1314 + "chai": "^5.2.0", 1315 1315 + "tinyrainbow": "^2.0.0" 1316 1316 + }, 1317 1317 + "funding": { 1318 1318 + "url": "https://opencollective.com/vitest" 1319 1319 + } 1320 1320 + }, 1321 1321 + "node_modules/@vitest/mocker": { 1322 1322 + "version": "3.0.9", 1323 1323 + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.9.tgz", 1324 1324 + "integrity": "sha512-ryERPIBOnvevAkTq+L1lD+DTFBRcjueL9lOUfXsLfwP92h4e+Heb+PjiqS3/OURWPtywfafK0kj++yDFjWUmrA==", 1325 1325 + "dev": true, 1326 1326 + "license": "MIT", 1327 1327 + "dependencies": { 1328 1328 + "@vitest/spy": "3.0.9", 1329 1329 + "estree-walker": "^3.0.3", 1330 1330 + "magic-string": "^0.30.17" 1331 1331 + }, 1332 1332 + "funding": { 1333 1333 + "url": "https://opencollective.com/vitest" 1334 1334 + }, 1335 1335 + "peerDependencies": { 1336 1336 + "msw": "^2.4.9", 1337 1337 + "vite": "^5.0.0 || ^6.0.0" 1338 1338 + }, 1339 1339 + "peerDependenciesMeta": { 1340 1340 + "msw": { 1341 1341 + "optional": true 1342 1342 + }, 1343 1343 + "vite": { 1344 1344 + "optional": true 1345 1345 + } 1346 1346 + } 1347 1347 + }, 1348 1348 + "node_modules/@vitest/pretty-format": { 1349 1349 + "version": "3.1.2", 1350 1350 + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.2.tgz", 1351 1351 + "integrity": "sha512-R0xAiHuWeDjTSB3kQ3OQpT8Rx3yhdOAIm/JM4axXxnG7Q/fS8XUwggv/A4xzbQA+drYRjzkMnpYnOGAc4oeq8w==", 1352 1352 + "dev": true, 1353 1353 + "license": "MIT", 1354 1354 + "dependencies": { 1355 1355 + "tinyrainbow": "^2.0.0" 1356 1356 + }, 1357 1357 + "funding": { 1358 1358 + "url": "https://opencollective.com/vitest" 1359 1359 + } 1360 1360 + }, 1361 1361 + "node_modules/@vitest/runner": { 1362 1362 + "version": "3.0.9", 1363 1363 + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.9.tgz", 1364 1364 + "integrity": "sha512-NX9oUXgF9HPfJSwl8tUZCMP1oGx2+Sf+ru6d05QjzQz4OwWg0psEzwY6VexP2tTHWdOkhKHUIZH+fS6nA7jfOw==", 1365 1365 + "dev": true, 1366 1366 + "license": "MIT", 1367 1367 + "dependencies": { 1368 1368 + "@vitest/utils": "3.0.9", 1369 1369 + "pathe": "^2.0.3" 1370 1370 + }, 1371 1371 + "funding": { 1372 1372 + "url": "https://opencollective.com/vitest" 1373 1373 + } 1374 1374 + }, 1375 1375 + "node_modules/@vitest/snapshot": { 1376 1376 + "version": "3.0.9", 1377 1377 + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.9.tgz", 1378 1378 + "integrity": "sha512-AiLUiuZ0FuA+/8i19mTYd+re5jqjEc2jZbgJ2up0VY0Ddyyxg/uUtBDpIFAy4uzKaQxOW8gMgBdAJJ2ydhu39A==", 1379 1379 + "dev": true, 1380 1380 + "license": "MIT", 1381 1381 + "dependencies": { 1382 1382 + "@vitest/pretty-format": "3.0.9", 1383 1383 + "magic-string": "^0.30.17", 1384 1384 + "pathe": "^2.0.3" 1385 1385 + }, 1386 1386 + "funding": { 1387 1387 + "url": "https://opencollective.com/vitest" 1388 1388 + } 1389 1389 + }, 1390 1390 + "node_modules/@vitest/snapshot/node_modules/@vitest/pretty-format": { 1391 1391 + "version": "3.0.9", 1392 1392 + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.9.tgz", 1393 1393 + "integrity": "sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==", 1394 1394 + "dev": true, 1395 1395 + "license": "MIT", 1396 1396 + "dependencies": { 1397 1397 + "tinyrainbow": "^2.0.0" 1398 1398 + }, 1399 1399 + "funding": { 1400 1400 + "url": "https://opencollective.com/vitest" 1401 1401 + } 1402 1402 + }, 1403 1403 + "node_modules/@vitest/spy": { 1404 1404 + "version": "3.0.9", 1405 1405 + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.9.tgz", 1406 1406 + "integrity": "sha512-/CcK2UDl0aQ2wtkp3YVWldrpLRNCfVcIOFGlVGKO4R5eajsH393Z1yiXLVQ7vWsj26JOEjeZI0x5sm5P4OGUNQ==", 1407 1407 + "dev": true, 1408 1408 + "license": "MIT", 1409 1409 + "dependencies": { 1410 1410 + "tinyspy": "^3.0.2" 1411 1411 + }, 1412 1412 + "funding": { 1413 1413 + "url": "https://opencollective.com/vitest" 1414 1414 + } 1415 1415 + }, 1416 1416 + "node_modules/@vitest/utils": { 1417 1417 + "version": "3.0.9", 1418 1418 + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.9.tgz", 1419 1419 + "integrity": "sha512-ilHM5fHhZ89MCp5aAaM9uhfl1c2JdxVxl3McqsdVyVNN6JffnEen8UMCdRTzOhGXNQGo5GNL9QugHrz727Wnng==", 1420 1420 + "dev": true, 1421 1421 + "license": "MIT", 1422 1422 + "dependencies": { 1423 1423 + "@vitest/pretty-format": "3.0.9", 1424 1424 + "loupe": "^3.1.3", 1425 1425 + "tinyrainbow": "^2.0.0" 1426 1426 + }, 1427 1427 + "funding": { 1428 1428 + "url": "https://opencollective.com/vitest" 1429 1429 + } 1430 1430 + }, 1431 1431 + "node_modules/@vitest/utils/node_modules/@vitest/pretty-format": { 1432 1432 + "version": "3.0.9", 1433 1433 + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.9.tgz", 1434 1434 + "integrity": "sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==", 1435 1435 + "dev": true, 1436 1436 + "license": "MIT", 1437 1437 + "dependencies": { 1438 1438 + "tinyrainbow": "^2.0.0" 1439 1439 + }, 1440 1440 + "funding": { 1441 1441 + "url": "https://opencollective.com/vitest" 1442 1442 + } 1443 1443 + }, 1444 1444 + "node_modules/acorn": { 1445 1445 + "version": "8.14.0", 1446 1446 + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", 1447 1447 + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", 1448 1448 + "dev": true, 1449 1449 + "license": "MIT", 1450 1450 + "bin": { 1451 1451 + "acorn": "bin/acorn" 1452 1452 + }, 1453 1453 + "engines": { 1454 1454 + "node": ">=0.4.0" 1455 1455 + } 1456 1456 + }, 1457 1457 + "node_modules/acorn-walk": { 1458 1458 + "version": "8.3.2", 1459 1459 + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", 1460 1460 + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", 1461 1461 + "dev": true, 1462 1462 + "license": "MIT", 1463 1463 + "engines": { 1464 1464 + "node": ">=0.4.0" 1465 1465 + } 1466 1466 + }, 1467 1467 + "node_modules/as-table": { 1468 1468 + "version": "1.0.55", 1469 1469 + "resolved": "https://registry.npmjs.org/as-table/-/as-table-1.0.55.tgz", 1470 1470 + "integrity": "sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==", 1471 1471 + "dev": true, 1472 1472 + "license": "MIT", 1473 1473 + "dependencies": { 1474 1474 + "printable-characters": "^1.0.42" 1475 1475 + } 1476 1476 + }, 1477 1477 + "node_modules/assertion-error": { 1478 1478 + "version": "2.0.1", 1479 1479 + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", 1480 1480 + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", 1481 1481 + "dev": true, 1482 1482 + "license": "MIT", 1483 1483 + "engines": { 1484 1484 + "node": ">=12" 1485 1485 + } 1486 1486 + }, 1487 1487 + "node_modules/birpc": { 1488 1488 + "version": "0.2.14", 1489 1489 + "resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.14.tgz", 1490 1490 + "integrity": "sha512-37FHE8rqsYM5JEKCnXFyHpBCzvgHEExwVVTq+nUmloInU7l8ezD1TpOhKpS8oe1DTYFqEK27rFZVKG43oTqXRA==", 1491 1491 + "dev": true, 1492 1492 + "license": "MIT", 1493 1493 + "funding": { 1494 1494 + "url": "https://github.com/sponsors/antfu" 1495 1495 + } 1496 1496 + }, 1497 1497 + "node_modules/blake3-wasm": { 1498 1498 + "version": "2.1.5", 1499 1499 + "resolved": "https://registry.npmjs.org/blake3-wasm/-/blake3-wasm-2.1.5.tgz", 1500 1500 + "integrity": "sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==", 1501 1501 + "dev": true, 1502 1502 + "license": "MIT" 1503 1503 + }, 1504 1504 + "node_modules/cac": { 1505 1505 + "version": "6.7.14", 1506 1506 + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", 1507 1507 + "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", 1508 1508 + "dev": true, 1509 1509 + "license": "MIT", 1510 1510 + "engines": { 1511 1511 + "node": ">=8" 1512 1512 + } 1513 1513 + }, 1514 1514 + "node_modules/chai": { 1515 1515 + "version": "5.2.0", 1516 1516 + "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz", 1517 1517 + "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==", 1518 1518 + "dev": true, 1519 1519 + "license": "MIT", 1520 1520 + "dependencies": { 1521 1521 + "assertion-error": "^2.0.1", 1522 1522 + "check-error": "^2.1.1", 1523 1523 + "deep-eql": "^5.0.1", 1524 1524 + "loupe": "^3.1.0", 1525 1525 + "pathval": "^2.0.0" 1526 1526 + }, 1527 1527 + "engines": { 1528 1528 + "node": ">=12" 1529 1529 + } 1530 1530 + }, 1531 1531 + "node_modules/check-error": { 1532 1532 + "version": "2.1.1", 1533 1533 + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", 1534 1534 + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", 1535 1535 + "dev": true, 1536 1536 + "license": "MIT", 1537 1537 + "engines": { 1538 1538 + "node": ">= 16" 1539 1539 + } 1540 1540 + }, 1541 1541 + "node_modules/cjs-module-lexer": { 1542 1542 + "version": "1.4.3", 1543 1543 + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", 1544 1544 + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", 1545 1545 + "dev": true, 1546 1546 + "license": "MIT" 1547 1547 + }, 1548 1548 + "node_modules/color": { 1549 1549 + "version": "4.2.3", 1550 1550 + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", 1551 1551 + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", 1552 1552 + "dev": true, 1553 1553 + "license": "MIT", 1554 1554 + "optional": true, 1555 1555 + "dependencies": { 1556 1556 + "color-convert": "^2.0.1", 1557 1557 + "color-string": "^1.9.0" 1558 1558 + }, 1559 1559 + "engines": { 1560 1560 + "node": ">=12.5.0" 1561 1561 + } 1562 1562 + }, 1563 1563 + "node_modules/color-convert": { 1564 1564 + "version": "2.0.1", 1565 1565 + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", 1566 1566 + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", 1567 1567 + "dev": true, 1568 1568 + "license": "MIT", 1569 1569 + "optional": true, 1570 1570 + "dependencies": { 1571 1571 + "color-name": "~1.1.4" 1572 1572 + }, 1573 1573 + "engines": { 1574 1574 + "node": ">=7.0.0" 1575 1575 + } 1576 1576 + }, 1577 1577 + "node_modules/color-name": { 1578 1578 + "version": "1.1.4", 1579 1579 + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", 1580 1580 + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", 1581 1581 + "dev": true, 1582 1582 + "license": "MIT", 1583 1583 + "optional": true 1584 1584 + }, 1585 1585 + "node_modules/color-string": { 1586 1586 + "version": "1.9.1", 1587 1587 + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", 1588 1588 + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", 1589 1589 + "dev": true, 1590 1590 + "license": "MIT", 1591 1591 + "optional": true, 1592 1592 + "dependencies": { 1593 1593 + "color-name": "^1.0.0", 1594 1594 + "simple-swizzle": "^0.2.2" 1595 1595 + } 1596 1596 + }, 1597 1597 + "node_modules/cookie": { 1598 1598 + "version": "0.7.2", 1599 1599 + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", 1600 1600 + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", 1601 1601 + "dev": true, 1602 1602 + "license": "MIT", 1603 1603 + "engines": { 1604 1604 + "node": ">= 0.6" 1605 1605 + } 1606 1606 + }, 1607 1607 + "node_modules/data-uri-to-buffer": { 1608 1608 + "version": "2.0.2", 1609 1609 + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.2.tgz", 1610 1610 + "integrity": "sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==", 1611 1611 + "dev": true, 1612 1612 + "license": "MIT" 1613 1613 + }, 1614 1614 + "node_modules/debug": { 1615 1615 + "version": "4.4.0", 1616 1616 + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", 1617 1617 + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", 1618 1618 + "dev": true, 1619 1619 + "license": "MIT", 1620 1620 + "dependencies": { 1621 1621 + "ms": "^2.1.3" 1622 1622 + }, 1623 1623 + "engines": { 1624 1624 + "node": ">=6.0" 1625 1625 + }, 1626 1626 + "peerDependenciesMeta": { 1627 1627 + "supports-color": { 1628 1628 + "optional": true 1629 1629 + } 1630 1630 + } 1631 1631 + }, 1632 1632 + "node_modules/deep-eql": { 1633 1633 + "version": "5.0.2", 1634 1634 + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", 1635 1635 + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", 1636 1636 + "dev": true, 1637 1637 + "license": "MIT", 1638 1638 + "engines": { 1639 1639 + "node": ">=6" 1640 1640 + } 1641 1641 + }, 1642 1642 + "node_modules/defu": { 1643 1643 + "version": "6.1.4", 1644 1644 + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz", 1645 1645 + "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==", 1646 1646 + "dev": true, 1647 1647 + "license": "MIT" 1648 1648 + }, 1649 1649 + "node_modules/detect-libc": { 1650 1650 + "version": "2.0.4", 1651 1651 + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", 1652 1652 + "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", 1653 1653 + "dev": true, 1654 1654 + "license": "Apache-2.0", 1655 1655 + "optional": true, 1656 1656 + "engines": { 1657 1657 + "node": ">=8" 1658 1658 + } 1659 1659 + }, 1660 1660 + "node_modules/devalue": { 1661 1661 + "version": "4.3.3", 1662 1662 + "resolved": "https://registry.npmjs.org/devalue/-/devalue-4.3.3.tgz", 1663 1663 + "integrity": "sha512-UH8EL6H2ifcY8TbD2QsxwCC/pr5xSwPvv85LrLXVihmHVC3T3YqTCIwnR5ak0yO1KYqlxrPVOA/JVZJYPy2ATg==", 1664 1664 + "dev": true, 1665 1665 + "license": "MIT" 1666 1666 + }, 1667 1667 + "node_modules/es-module-lexer": { 1668 1668 + "version": "1.7.0", 1669 1669 + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz", 1670 1670 + "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==", 1671 1671 + "dev": true, 1672 1672 + "license": "MIT" 1673 1673 + }, 1674 1674 + "node_modules/esbuild": { 1675 1675 + "version": "0.25.3", 1676 1676 + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.3.tgz", 1677 1677 + "integrity": "sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==", 1678 1678 + "dev": true, 1679 1679 + "hasInstallScript": true, 1680 1680 + "license": "MIT", 1681 1681 + "bin": { 1682 1682 + "esbuild": "bin/esbuild" 1683 1683 + }, 1684 1684 + "engines": { 1685 1685 + "node": ">=18" 1686 1686 + }, 1687 1687 + "optionalDependencies": { 1688 1688 + "@esbuild/aix-ppc64": "0.25.3", 1689 1689 + "@esbuild/android-arm": "0.25.3", 1690 1690 + "@esbuild/android-arm64": "0.25.3", 1691 1691 + "@esbuild/android-x64": "0.25.3", 1692 1692 + "@esbuild/darwin-arm64": "0.25.3", 1693 1693 + "@esbuild/darwin-x64": "0.25.3", 1694 1694 + "@esbuild/freebsd-arm64": "0.25.3", 1695 1695 + "@esbuild/freebsd-x64": "0.25.3", 1696 1696 + "@esbuild/linux-arm": "0.25.3", 1697 1697 + "@esbuild/linux-arm64": "0.25.3", 1698 1698 + "@esbuild/linux-ia32": "0.25.3", 1699 1699 + "@esbuild/linux-loong64": "0.25.3", 1700 1700 + "@esbuild/linux-mips64el": "0.25.3", 1701 1701 + "@esbuild/linux-ppc64": "0.25.3", 1702 1702 + "@esbuild/linux-riscv64": "0.25.3", 1703 1703 + "@esbuild/linux-s390x": "0.25.3", 1704 1704 + "@esbuild/linux-x64": "0.25.3", 1705 1705 + "@esbuild/netbsd-arm64": "0.25.3", 1706 1706 + "@esbuild/netbsd-x64": "0.25.3", 1707 1707 + "@esbuild/openbsd-arm64": "0.25.3", 1708 1708 + "@esbuild/openbsd-x64": "0.25.3", 1709 1709 + "@esbuild/sunos-x64": "0.25.3", 1710 1710 + "@esbuild/win32-arm64": "0.25.3", 1711 1711 + "@esbuild/win32-ia32": "0.25.3", 1712 1712 + "@esbuild/win32-x64": "0.25.3" 1713 1713 + } 1714 1714 + }, 1715 1715 + "node_modules/estree-walker": { 1716 1716 + "version": "3.0.3", 1717 1717 + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", 1718 1718 + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", 1719 1719 + "dev": true, 1720 1720 + "license": "MIT", 1721 1721 + "dependencies": { 1722 1722 + "@types/estree": "^1.0.0" 1723 1723 + } 1724 1724 + }, 1725 1725 + "node_modules/exit-hook": { 1726 1726 + "version": "2.2.1", 1727 1727 + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz", 1728 1728 + "integrity": "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==", 1729 1729 + "dev": true, 1730 1730 + "license": "MIT", 1731 1731 + "engines": { 1732 1732 + "node": ">=6" 1733 1733 + }, 1734 1734 + "funding": { 1735 1735 + "url": "https://github.com/sponsors/sindresorhus" 1736 1736 + } 1737 1737 + }, 1738 1738 + "node_modules/expect-type": { 1739 1739 + "version": "1.2.1", 1740 1740 + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz", 1741 1741 + "integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==", 1742 1742 + "dev": true, 1743 1743 + "license": "Apache-2.0", 1744 1744 + "engines": { 1745 1745 + "node": ">=12.0.0" 1746 1746 + } 1747 1747 + }, 1748 1748 + "node_modules/exsolve": { 1749 1749 + "version": "1.0.5", 1750 1750 + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.5.tgz", 1751 1751 + "integrity": "sha512-pz5dvkYYKQ1AHVrgOzBKWeP4u4FRb3a6DNK2ucr0OoNwYIU4QWsJ+NM36LLzORT+z845MzKHHhpXiUF5nvQoJg==", 1752 1752 + "dev": true, 1753 1753 + "license": "MIT" 1754 1754 + }, 1755 1755 + "node_modules/fdir": { 1756 1756 + "version": "6.4.4", 1757 1757 + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", 1758 1758 + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", 1759 1759 + "dev": true, 1760 1760 + "license": "MIT", 1761 1761 + "peerDependencies": { 1762 1762 + "picomatch": "^3 || ^4" 1763 1763 + }, 1764 1764 + "peerDependenciesMeta": { 1765 1765 + "picomatch": { 1766 1766 + "optional": true 1767 1767 + } 1768 1768 + } 1769 1769 + }, 1770 1770 + "node_modules/fsevents": { 1771 1771 + "version": "2.3.3", 1772 1772 + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", 1773 1773 + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", 1774 1774 + "dev": true, 1775 1775 + "hasInstallScript": true, 1776 1776 + "license": "MIT", 1777 1777 + "optional": true, 1778 1778 + "os": [ 1779 1779 + "darwin" 1780 1780 + ], 1781 1781 + "engines": { 1782 1782 + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" 1783 1783 + } 1784 1784 + }, 1785 1785 + "node_modules/get-source": { 1786 1786 + "version": "2.0.12", 1787 1787 + "resolved": "https://registry.npmjs.org/get-source/-/get-source-2.0.12.tgz", 1788 1788 + "integrity": "sha512-X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w==", 1789 1789 + "dev": true, 1790 1790 + "license": "Unlicense", 1791 1791 + "dependencies": { 1792 1792 + "data-uri-to-buffer": "^2.0.0", 1793 1793 + "source-map": "^0.6.1" 1794 1794 + } 1795 1795 + }, 1796 1796 + "node_modules/glob-to-regexp": { 1797 1797 + "version": "0.4.1", 1798 1798 + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", 1799 1799 + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", 1800 1800 + "dev": true, 1801 1801 + "license": "BSD-2-Clause" 1802 1802 + }, 1803 1803 + "node_modules/is-arrayish": { 1804 1804 + "version": "0.3.2", 1805 1805 + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", 1806 1806 + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", 1807 1807 + "dev": true, 1808 1808 + "license": "MIT", 1809 1809 + "optional": true 1810 1810 + }, 1811 1811 + "node_modules/loupe": { 1812 1812 + "version": "3.1.3", 1813 1813 + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", 1814 1814 + "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==", 1815 1815 + "dev": true, 1816 1816 + "license": "MIT" 1817 1817 + }, 1818 1818 + "node_modules/magic-string": { 1819 1819 + "version": "0.30.17", 1820 1820 + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", 1821 1821 + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", 1822 1822 + "dev": true, 1823 1823 + "license": "MIT", 1824 1824 + "dependencies": { 1825 1825 + "@jridgewell/sourcemap-codec": "^1.5.0" 1826 1826 + } 1827 1827 + }, 1828 1828 + "node_modules/mime": { 1829 1829 + "version": "3.0.0", 1830 1830 + "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", 1831 1831 + "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", 1832 1832 + "dev": true, 1833 1833 + "license": "MIT", 1834 1834 + "bin": { 1835 1835 + "mime": "cli.js" 1836 1836 + }, 1837 1837 + "engines": { 1838 1838 + "node": ">=10.0.0" 1839 1839 + } 1840 1840 + }, 1841 1841 + "node_modules/miniflare": { 1842 1842 + "version": "4.20250428.1", 1843 1843 + "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-4.20250428.1.tgz", 1844 1844 + "integrity": "sha512-M3qcJXjeAEimHrEeWXEhrJiC3YHB5M3QSqqK67pOTI+lHn0QyVG/2iFUjVJ/nv+i10uxeAEva8GRGeu+tKRCmQ==", 1845 1845 + "dev": true, 1846 1846 + "license": "MIT", 1847 1847 + "dependencies": { 1848 1848 + "@cspotcode/source-map-support": "0.8.1", 1849 1849 + "acorn": "8.14.0", 1850 1850 + "acorn-walk": "8.3.2", 1851 1851 + "exit-hook": "2.2.1", 1852 1852 + "glob-to-regexp": "0.4.1", 1853 1853 + "stoppable": "1.1.0", 1854 1854 + "undici": "^5.28.5", 1855 1855 + "workerd": "1.20250428.0", 1856 1856 + "ws": "8.18.0", 1857 1857 + "youch": "3.3.4", 1858 1858 + "zod": "3.22.3" 1859 1859 + }, 1860 1860 + "bin": { 1861 1861 + "miniflare": "bootstrap.js" 1862 1862 + }, 1863 1863 + "engines": { 1864 1864 + "node": ">=18.0.0" 1865 1865 + } 1866 1866 + }, 1867 1867 + "node_modules/miniflare/node_modules/zod": { 1868 1868 + "version": "3.22.3", 1869 1869 + "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz", 1870 1870 + "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==", 1871 1871 + "dev": true, 1872 1872 + "license": "MIT", 1873 1873 + "funding": { 1874 1874 + "url": "https://github.com/sponsors/colinhacks" 1875 1875 + } 1876 1876 + }, 1877 1877 + "node_modules/ms": { 1878 1878 + "version": "2.1.3", 1879 1879 + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", 1880 1880 + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", 1881 1881 + "dev": true, 1882 1882 + "license": "MIT" 1883 1883 + }, 1884 1884 + "node_modules/mustache": { 1885 1885 + "version": "4.2.0", 1886 1886 + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", 1887 1887 + "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", 1888 1888 + "dev": true, 1889 1889 + "license": "MIT", 1890 1890 + "bin": { 1891 1891 + "mustache": "bin/mustache" 1892 1892 + } 1893 1893 + }, 1894 1894 + "node_modules/nanoid": { 1895 1895 + "version": "3.3.11", 1896 1896 + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", 1897 1897 + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", 1898 1898 + "dev": true, 1899 1899 + "funding": [ 1900 1900 + { 1901 1901 + "type": "github", 1902 1902 + "url": "https://github.com/sponsors/ai" 1903 1903 + } 1904 1904 + ], 1905 1905 + "license": "MIT", 1906 1906 + "bin": { 1907 1907 + "nanoid": "bin/nanoid.cjs" 1908 1908 + }, 1909 1909 + "engines": { 1910 1910 + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" 1911 1911 + } 1912 1912 + }, 1913 1913 + "node_modules/ohash": { 1914 1914 + "version": "2.0.11", 1915 1915 + "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz", 1916 1916 + "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==", 1917 1917 + "dev": true, 1918 1918 + "license": "MIT" 1919 1919 + }, 1920 1920 + "node_modules/path-to-regexp": { 1921 1921 + "version": "6.3.0", 1922 1922 + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", 1923 1923 + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", 1924 1924 + "dev": true, 1925 1925 + "license": "MIT" 1926 1926 + }, 1927 1927 + "node_modules/pathe": { 1928 1928 + "version": "2.0.3", 1929 1929 + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", 1930 1930 + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", 1931 1931 + "dev": true, 1932 1932 + "license": "MIT" 1933 1933 + }, 1934 1934 + "node_modules/pathval": { 1935 1935 + "version": "2.0.0", 1936 1936 + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", 1937 1937 + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", 1938 1938 + "dev": true, 1939 1939 + "license": "MIT", 1940 1940 + "engines": { 1941 1941 + "node": ">= 14.16" 1942 1942 + } 1943 1943 + }, 1944 1944 + "node_modules/picocolors": { 1945 1945 + "version": "1.1.1", 1946 1946 + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", 1947 1947 + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", 1948 1948 + "dev": true, 1949 1949 + "license": "ISC" 1950 1950 + }, 1951 1951 + "node_modules/picomatch": { 1952 1952 + "version": "4.0.2", 1953 1953 + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", 1954 1954 + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", 1955 1955 + "dev": true, 1956 1956 + "license": "MIT", 1957 1957 + "engines": { 1958 1958 + "node": ">=12" 1959 1959 + }, 1960 1960 + "funding": { 1961 1961 + "url": "https://github.com/sponsors/jonschlinkert" 1962 1962 + } 1963 1963 + }, 1964 1964 + "node_modules/postcss": { 1965 1965 + "version": "8.5.3", 1966 1966 + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", 1967 1967 + "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", 1968 1968 + "dev": true, 1969 1969 + "funding": [ 1970 1970 + { 1971 1971 + "type": "opencollective", 1972 1972 + "url": "https://opencollective.com/postcss/" 1973 1973 + }, 1974 1974 + { 1975 1975 + "type": "tidelift", 1976 1976 + "url": "https://tidelift.com/funding/github/npm/postcss" 1977 1977 + }, 1978 1978 + { 1979 1979 + "type": "github", 1980 1980 + "url": "https://github.com/sponsors/ai" 1981 1981 + } 1982 1982 + ], 1983 1983 + "license": "MIT", 1984 1984 + "dependencies": { 1985 1985 + "nanoid": "^3.3.8", 1986 1986 + "picocolors": "^1.1.1", 1987 1987 + "source-map-js": "^1.2.1" 1988 1988 + }, 1989 1989 + "engines": { 1990 1990 + "node": "^10 || ^12 || >=14" 1991 1991 + } 1992 1992 + }, 1993 1993 + "node_modules/printable-characters": { 1994 1994 + "version": "1.0.42", 1995 1995 + "resolved": "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.42.tgz", 1996 1996 + "integrity": "sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ==", 1997 1997 + "dev": true, 1998 1998 + "license": "Unlicense" 1999 1999 + }, 2000 2000 + "node_modules/rollup": { 2001 2001 + "version": "4.40.1", 2002 2002 + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.1.tgz", 2003 2003 + "integrity": "sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==", 2004 2004 + "dev": true, 2005 2005 + "license": "MIT", 2006 2006 + "dependencies": { 2007 2007 + "@types/estree": "1.0.7" 2008 2008 + }, 2009 2009 + "bin": { 2010 2010 + "rollup": "dist/bin/rollup" 2011 2011 + }, 2012 2012 + "engines": { 2013 2013 + "node": ">=18.0.0", 2014 2014 + "npm": ">=8.0.0" 2015 2015 + }, 2016 2016 + "optionalDependencies": { 2017 2017 + "@rollup/rollup-android-arm-eabi": "4.40.1", 2018 2018 + "@rollup/rollup-android-arm64": "4.40.1", 2019 2019 + "@rollup/rollup-darwin-arm64": "4.40.1", 2020 2020 + "@rollup/rollup-darwin-x64": "4.40.1", 2021 2021 + "@rollup/rollup-freebsd-arm64": "4.40.1", 2022 2022 + "@rollup/rollup-freebsd-x64": "4.40.1", 2023 2023 + "@rollup/rollup-linux-arm-gnueabihf": "4.40.1", 2024 2024 + "@rollup/rollup-linux-arm-musleabihf": "4.40.1", 2025 2025 + "@rollup/rollup-linux-arm64-gnu": "4.40.1", 2026 2026 + "@rollup/rollup-linux-arm64-musl": "4.40.1", 2027 2027 + "@rollup/rollup-linux-loongarch64-gnu": "4.40.1", 2028 2028 + "@rollup/rollup-linux-powerpc64le-gnu": "4.40.1", 2029 2029 + "@rollup/rollup-linux-riscv64-gnu": "4.40.1", 2030 2030 + "@rollup/rollup-linux-riscv64-musl": "4.40.1", 2031 2031 + "@rollup/rollup-linux-s390x-gnu": "4.40.1", 2032 2032 + "@rollup/rollup-linux-x64-gnu": "4.40.1", 2033 2033 + "@rollup/rollup-linux-x64-musl": "4.40.1", 2034 2034 + "@rollup/rollup-win32-arm64-msvc": "4.40.1", 2035 2035 + "@rollup/rollup-win32-ia32-msvc": "4.40.1", 2036 2036 + "@rollup/rollup-win32-x64-msvc": "4.40.1", 2037 2037 + "fsevents": "~2.3.2" 2038 2038 + } 2039 2039 + }, 2040 2040 + "node_modules/semver": { 2041 2041 + "version": "7.7.1", 2042 2042 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", 2043 2043 + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", 2044 2044 + "dev": true, 2045 2045 + "license": "ISC", 2046 2046 + "bin": { 2047 2047 + "semver": "bin/semver.js" 2048 2048 + }, 2049 2049 + "engines": { 2050 2050 + "node": ">=10" 2051 2051 + } 2052 2052 + }, 2053 2053 + "node_modules/sharp": { 2054 2054 + "version": "0.33.5", 2055 2055 + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz", 2056 2056 + "integrity": "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==", 2057 2057 + "dev": true, 2058 2058 + "hasInstallScript": true, 2059 2059 + "license": "Apache-2.0", 2060 2060 + "optional": true, 2061 2061 + "dependencies": { 2062 2062 + "color": "^4.2.3", 2063 2063 + "detect-libc": "^2.0.3", 2064 2064 + "semver": "^7.6.3" 2065 2065 + }, 2066 2066 + "engines": { 2067 2067 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2068 2068 + }, 2069 2069 + "funding": { 2070 2070 + "url": "https://opencollective.com/libvips" 2071 2071 + }, 2072 2072 + "optionalDependencies": { 2073 2073 + "@img/sharp-darwin-arm64": "0.33.5", 2074 2074 + "@img/sharp-darwin-x64": "0.33.5", 2075 2075 + "@img/sharp-libvips-darwin-arm64": "1.0.4", 2076 2076 + "@img/sharp-libvips-darwin-x64": "1.0.4", 2077 2077 + "@img/sharp-libvips-linux-arm": "1.0.5", 2078 2078 + "@img/sharp-libvips-linux-arm64": "1.0.4", 2079 2079 + "@img/sharp-libvips-linux-s390x": "1.0.4", 2080 2080 + "@img/sharp-libvips-linux-x64": "1.0.4", 2081 2081 + "@img/sharp-libvips-linuxmusl-arm64": "1.0.4", 2082 2082 + "@img/sharp-libvips-linuxmusl-x64": "1.0.4", 2083 2083 + "@img/sharp-linux-arm": "0.33.5", 2084 2084 + "@img/sharp-linux-arm64": "0.33.5", 2085 2085 + "@img/sharp-linux-s390x": "0.33.5", 2086 2086 + "@img/sharp-linux-x64": "0.33.5", 2087 2087 + "@img/sharp-linuxmusl-arm64": "0.33.5", 2088 2088 + "@img/sharp-linuxmusl-x64": "0.33.5", 2089 2089 + "@img/sharp-wasm32": "0.33.5", 2090 2090 + "@img/sharp-win32-ia32": "0.33.5", 2091 2091 + "@img/sharp-win32-x64": "0.33.5" 2092 2092 + } 2093 2093 + }, 2094 2094 + "node_modules/siginfo": { 2095 2095 + "version": "2.0.0", 2096 2096 + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", 2097 2097 + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", 2098 2098 + "dev": true, 2099 2099 + "license": "ISC" 2100 2100 + }, 2101 2101 + "node_modules/simple-swizzle": { 2102 2102 + "version": "0.2.2", 2103 2103 + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", 2104 2104 + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", 2105 2105 + "dev": true, 2106 2106 + "license": "MIT", 2107 2107 + "optional": true, 2108 2108 + "dependencies": { 2109 2109 + "is-arrayish": "^0.3.1" 2110 2110 + } 2111 2111 + }, 2112 2112 + "node_modules/source-map": { 2113 2113 + "version": "0.6.1", 2114 2114 + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", 2115 2115 + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", 2116 2116 + "dev": true, 2117 2117 + "license": "BSD-3-Clause", 2118 2118 + "engines": { 2119 2119 + "node": ">=0.10.0" 2120 2120 + } 2121 2121 + }, 2122 2122 + "node_modules/source-map-js": { 2123 2123 + "version": "1.2.1", 2124 2124 + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", 2125 2125 + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", 2126 2126 + "dev": true, 2127 2127 + "license": "BSD-3-Clause", 2128 2128 + "engines": { 2129 2129 + "node": ">=0.10.0" 2130 2130 + } 2131 2131 + }, 2132 2132 + "node_modules/stackback": { 2133 2133 + "version": "0.0.2", 2134 2134 + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", 2135 2135 + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", 2136 2136 + "dev": true, 2137 2137 + "license": "MIT" 2138 2138 + }, 2139 2139 + "node_modules/stacktracey": { 2140 2140 + "version": "2.1.8", 2141 2141 + "resolved": "https://registry.npmjs.org/stacktracey/-/stacktracey-2.1.8.tgz", 2142 2142 + "integrity": "sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw==", 2143 2143 + "dev": true, 2144 2144 + "license": "Unlicense", 2145 2145 + "dependencies": { 2146 2146 + "as-table": "^1.0.36", 2147 2147 + "get-source": "^2.0.12" 2148 2148 + } 2149 2149 + }, 2150 2150 + "node_modules/std-env": { 2151 2151 + "version": "3.9.0", 2152 2152 + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz", 2153 2153 + "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==", 2154 2154 + "dev": true, 2155 2155 + "license": "MIT" 2156 2156 + }, 2157 2157 + "node_modules/stoppable": { 2158 2158 + "version": "1.1.0", 2159 2159 + "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz", 2160 2160 + "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==", 2161 2161 + "dev": true, 2162 2162 + "license": "MIT", 2163 2163 + "engines": { 2164 2164 + "node": ">=4", 2165 2165 + "npm": ">=6" 2166 2166 + } 2167 2167 + }, 2168 2168 + "node_modules/tinybench": { 2169 2169 + "version": "2.9.0", 2170 2170 + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", 2171 2171 + "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", 2172 2172 + "dev": true, 2173 2173 + "license": "MIT" 2174 2174 + }, 2175 2175 + "node_modules/tinyexec": { 2176 2176 + "version": "0.3.2", 2177 2177 + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", 2178 2178 + "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", 2179 2179 + "dev": true, 2180 2180 + "license": "MIT" 2181 2181 + }, 2182 2182 + "node_modules/tinyglobby": { 2183 2183 + "version": "0.2.13", 2184 2184 + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", 2185 2185 + "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", 2186 2186 + "dev": true, 2187 2187 + "license": "MIT", 2188 2188 + "dependencies": { 2189 2189 + "fdir": "^6.4.4", 2190 2190 + "picomatch": "^4.0.2" 2191 2191 + }, 2192 2192 + "engines": { 2193 2193 + "node": ">=12.0.0" 2194 2194 + }, 2195 2195 + "funding": { 2196 2196 + "url": "https://github.com/sponsors/SuperchupuDev" 2197 2197 + } 2198 2198 + }, 2199 2199 + "node_modules/tinypool": { 2200 2200 + "version": "1.0.2", 2201 2201 + "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz", 2202 2202 + "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==", 2203 2203 + "dev": true, 2204 2204 + "license": "MIT", 2205 2205 + "engines": { 2206 2206 + "node": "^18.0.0 || >=20.0.0" 2207 2207 + } 2208 2208 + }, 2209 2209 + "node_modules/tinyrainbow": { 2210 2210 + "version": "2.0.0", 2211 2211 + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz", 2212 2212 + "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==", 2213 2213 + "dev": true, 2214 2214 + "license": "MIT", 2215 2215 + "engines": { 2216 2216 + "node": ">=14.0.0" 2217 2217 + } 2218 2218 + }, 2219 2219 + "node_modules/tinyspy": { 2220 2220 + "version": "3.0.2", 2221 2221 + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz", 2222 2222 + "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==", 2223 2223 + "dev": true, 2224 2224 + "license": "MIT", 2225 2225 + "engines": { 2226 2226 + "node": ">=14.0.0" 2227 2227 + } 2228 2228 + }, 2229 2229 + "node_modules/tslib": { 2230 2230 + "version": "2.8.1", 2231 2231 + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", 2232 2232 + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", 2233 2233 + "dev": true, 2234 2234 + "license": "0BSD", 2235 2235 + "optional": true 2236 2236 + }, 2237 2237 + "node_modules/ufo": { 2238 2238 + "version": "1.6.1", 2239 2239 + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.1.tgz", 2240 2240 + "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==", 2241 2241 + "dev": true, 2242 2242 + "license": "MIT" 2243 2243 + }, 2244 2244 + "node_modules/undici": { 2245 2245 + "version": "5.29.0", 2246 2246 + "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz", 2247 2247 + "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==", 2248 2248 + "dev": true, 2249 2249 + "license": "MIT", 2250 2250 + "dependencies": { 2251 2251 + "@fastify/busboy": "^2.0.0" 2252 2252 + }, 2253 2253 + "engines": { 2254 2254 + "node": ">=14.0" 2255 2255 + } 2256 2256 + }, 2257 2257 + "node_modules/unenv": { 2258 2258 + "version": "2.0.0-rc.15", 2259 2259 + "resolved": "https://registry.npmjs.org/unenv/-/unenv-2.0.0-rc.15.tgz", 2260 2260 + "integrity": "sha512-J/rEIZU8w6FOfLNz/hNKsnY+fFHWnu9MH4yRbSZF3xbbGHovcetXPs7sD+9p8L6CeNC//I9bhRYAOsBt2u7/OA==", 2261 2261 + "dev": true, 2262 2262 + "license": "MIT", 2263 2263 + "dependencies": { 2264 2264 + "defu": "^6.1.4", 2265 2265 + "exsolve": "^1.0.4", 2266 2266 + "ohash": "^2.0.11", 2267 2267 + "pathe": "^2.0.3", 2268 2268 + "ufo": "^1.5.4" 2269 2269 + } 2270 2270 + }, 2271 2271 + "node_modules/vite": { 2272 2272 + "version": "6.3.4", 2273 2273 + "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.4.tgz", 2274 2274 + "integrity": "sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==", 2275 2275 + "dev": true, 2276 2276 + "license": "MIT", 2277 2277 + "dependencies": { 2278 2278 + "esbuild": "^0.25.0", 2279 2279 + "fdir": "^6.4.4", 2280 2280 + "picomatch": "^4.0.2", 2281 2281 + "postcss": "^8.5.3", 2282 2282 + "rollup": "^4.34.9", 2283 2283 + "tinyglobby": "^0.2.13" 2284 2284 + }, 2285 2285 + "bin": { 2286 2286 + "vite": "bin/vite.js" 2287 2287 + }, 2288 2288 + "engines": { 2289 2289 + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" 2290 2290 + }, 2291 2291 + "funding": { 2292 2292 + "url": "https://github.com/vitejs/vite?sponsor=1" 2293 2293 + }, 2294 2294 + "optionalDependencies": { 2295 2295 + "fsevents": "~2.3.3" 2296 2296 + }, 2297 2297 + "peerDependencies": { 2298 2298 + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", 2299 2299 + "jiti": ">=1.21.0", 2300 2300 + "less": "*", 2301 2301 + "lightningcss": "^1.21.0", 2302 2302 + "sass": "*", 2303 2303 + "sass-embedded": "*", 2304 2304 + "stylus": "*", 2305 2305 + "sugarss": "*", 2306 2306 + "terser": "^5.16.0", 2307 2307 + "tsx": "^4.8.1", 2308 2308 + "yaml": "^2.4.2" 2309 2309 + }, 2310 2310 + "peerDependenciesMeta": { 2311 2311 + "@types/node": { 2312 2312 + "optional": true 2313 2313 + }, 2314 2314 + "jiti": { 2315 2315 + "optional": true 2316 2316 + }, 2317 2317 + "less": { 2318 2318 + "optional": true 2319 2319 + }, 2320 2320 + "lightningcss": { 2321 2321 + "optional": true 2322 2322 + }, 2323 2323 + "sass": { 2324 2324 + "optional": true 2325 2325 + }, 2326 2326 + "sass-embedded": { 2327 2327 + "optional": true 2328 2328 + }, 2329 2329 + "stylus": { 2330 2330 + "optional": true 2331 2331 + }, 2332 2332 + "sugarss": { 2333 2333 + "optional": true 2334 2334 + }, 2335 2335 + "terser": { 2336 2336 + "optional": true 2337 2337 + }, 2338 2338 + "tsx": { 2339 2339 + "optional": true 2340 2340 + }, 2341 2341 + "yaml": { 2342 2342 + "optional": true 2343 2343 + } 2344 2344 + } 2345 2345 + }, 2346 2346 + "node_modules/vite-node": { 2347 2347 + "version": "3.0.9", 2348 2348 + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.9.tgz", 2349 2349 + "integrity": "sha512-w3Gdx7jDcuT9cNn9jExXgOyKmf5UOTb6WMHz8LGAm54eS1Elf5OuBhCxl6zJxGhEeIkgsE1WbHuoL0mj/UXqXg==", 2350 2350 + "dev": true, 2351 2351 + "license": "MIT", 2352 2352 + "dependencies": { 2353 2353 + "cac": "^6.7.14", 2354 2354 + "debug": "^4.4.0", 2355 2355 + "es-module-lexer": "^1.6.0", 2356 2356 + "pathe": "^2.0.3", 2357 2357 + "vite": "^5.0.0 || ^6.0.0" 2358 2358 + }, 2359 2359 + "bin": { 2360 2360 + "vite-node": "vite-node.mjs" 2361 2361 + }, 2362 2362 + "engines": { 2363 2363 + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" 2364 2364 + }, 2365 2365 + "funding": { 2366 2366 + "url": "https://opencollective.com/vitest" 2367 2367 + } 2368 2368 + }, 2369 2369 + "node_modules/vitest": { 2370 2370 + "version": "3.0.9", 2371 2371 + "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.9.tgz", 2372 2372 + "integrity": "sha512-BbcFDqNyBlfSpATmTtXOAOj71RNKDDvjBM/uPfnxxVGrG+FSH2RQIwgeEngTaTkuU/h0ScFvf+tRcKfYXzBybQ==", 2373 2373 + "dev": true, 2374 2374 + "license": "MIT", 2375 2375 + "dependencies": { 2376 2376 + "@vitest/expect": "3.0.9", 2377 2377 + "@vitest/mocker": "3.0.9", 2378 2378 + "@vitest/pretty-format": "^3.0.9", 2379 2379 + "@vitest/runner": "3.0.9", 2380 2380 + "@vitest/snapshot": "3.0.9", 2381 2381 + "@vitest/spy": "3.0.9", 2382 2382 + "@vitest/utils": "3.0.9", 2383 2383 + "chai": "^5.2.0", 2384 2384 + "debug": "^4.4.0", 2385 2385 + "expect-type": "^1.1.0", 2386 2386 + "magic-string": "^0.30.17", 2387 2387 + "pathe": "^2.0.3", 2388 2388 + "std-env": "^3.8.0", 2389 2389 + "tinybench": "^2.9.0", 2390 2390 + "tinyexec": "^0.3.2", 2391 2391 + "tinypool": "^1.0.2", 2392 2392 + "tinyrainbow": "^2.0.0", 2393 2393 + "vite": "^5.0.0 || ^6.0.0", 2394 2394 + "vite-node": "3.0.9", 2395 2395 + "why-is-node-running": "^2.3.0" 2396 2396 + }, 2397 2397 + "bin": { 2398 2398 + "vitest": "vitest.mjs" 2399 2399 + }, 2400 2400 + "engines": { 2401 2401 + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" 2402 2402 + }, 2403 2403 + "funding": { 2404 2404 + "url": "https://opencollective.com/vitest" 2405 2405 + }, 2406 2406 + "peerDependencies": { 2407 2407 + "@edge-runtime/vm": "*", 2408 2408 + "@types/debug": "^4.1.12", 2409 2409 + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", 2410 2410 + "@vitest/browser": "3.0.9", 2411 2411 + "@vitest/ui": "3.0.9", 2412 2412 + "happy-dom": "*", 2413 2413 + "jsdom": "*" 2414 2414 + }, 2415 2415 + "peerDependenciesMeta": { 2416 2416 + "@edge-runtime/vm": { 2417 2417 + "optional": true 2418 2418 + }, 2419 2419 + "@types/debug": { 2420 2420 + "optional": true 2421 2421 + }, 2422 2422 + "@types/node": { 2423 2423 + "optional": true 2424 2424 + }, 2425 2425 + "@vitest/browser": { 2426 2426 + "optional": true 2427 2427 + }, 2428 2428 + "@vitest/ui": { 2429 2429 + "optional": true 2430 2430 + }, 2431 2431 + "happy-dom": { 2432 2432 + "optional": true 2433 2433 + }, 2434 2434 + "jsdom": { 2435 2435 + "optional": true 2436 2436 + } 2437 2437 + } 2438 2438 + }, 2439 2439 + "node_modules/why-is-node-running": { 2440 2440 + "version": "2.3.0", 2441 2441 + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", 2442 2442 + "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", 2443 2443 + "dev": true, 2444 2444 + "license": "MIT", 2445 2445 + "dependencies": { 2446 2446 + "siginfo": "^2.0.0", 2447 2447 + "stackback": "0.0.2" 2448 2448 + }, 2449 2449 + "bin": { 2450 2450 + "why-is-node-running": "cli.js" 2451 2451 + }, 2452 2452 + "engines": { 2453 2453 + "node": ">=8" 2454 2454 + } 2455 2455 + }, 2456 2456 + "node_modules/workerd": { 2457 2457 + "version": "1.20250428.0", 2458 2458 + "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20250428.0.tgz", 2459 2459 + "integrity": "sha512-JJNWkHkwPQKQdvtM9UORijgYdcdJsihA4SfYjwh02IUQsdMyZ9jizV1sX9yWi9B9ptlohTW8UNHJEATuphGgdg==", 2460 2460 + "dev": true, 2461 2461 + "hasInstallScript": true, 2462 2462 + "license": "Apache-2.0", 2463 2463 + "bin": { 2464 2464 + "workerd": "bin/workerd" 2465 2465 + }, 2466 2466 + "engines": { 2467 2467 + "node": ">=16" 2468 2468 + }, 2469 2469 + "optionalDependencies": { 2470 2470 + "@cloudflare/workerd-darwin-64": "1.20250428.0", 2471 2471 + "@cloudflare/workerd-darwin-arm64": "1.20250428.0", 2472 2472 + "@cloudflare/workerd-linux-64": "1.20250428.0", 2473 2473 + "@cloudflare/workerd-linux-arm64": "1.20250428.0", 2474 2474 + "@cloudflare/workerd-windows-64": "1.20250428.0" 2475 2475 + } 2476 2476 + }, 2477 2477 + "node_modules/wrangler": { 2478 2478 + "version": "4.14.1", 2479 2479 + "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-4.14.1.tgz", 2480 2480 + "integrity": "sha512-EU7IThP7i68TBftJJSveogvWZ5k/WRijcJh3UclDWiWWhDZTPbL6LOJEFhHKqFzHOaC4Y2Aewt48rfTz0e7oCw==", 2481 2481 + "dev": true, 2482 2482 + "license": "MIT OR Apache-2.0", 2483 2483 + "dependencies": { 2484 2484 + "@cloudflare/kv-asset-handler": "0.4.0", 2485 2485 + "@cloudflare/unenv-preset": "2.3.1", 2486 2486 + "blake3-wasm": "2.1.5", 2487 2487 + "esbuild": "0.25.2", 2488 2488 + "miniflare": "4.20250428.1", 2489 2489 + "path-to-regexp": "6.3.0", 2490 2490 + "unenv": "2.0.0-rc.15", 2491 2491 + "workerd": "1.20250428.0" 2492 2492 + }, 2493 2493 + "bin": { 2494 2494 + "wrangler": "bin/wrangler.js", 2495 2495 + "wrangler2": "bin/wrangler.js" 2496 2496 + }, 2497 2497 + "engines": { 2498 2498 + "node": ">=18.0.0" 2499 2499 + }, 2500 2500 + "optionalDependencies": { 2501 2501 + "fsevents": "~2.3.2", 2502 2502 + "sharp": "^0.33.5" 2503 2503 + }, 2504 2504 + "peerDependencies": { 2505 2505 + "@cloudflare/workers-types": "^4.20250428.0" 2506 2506 + }, 2507 2507 + "peerDependenciesMeta": { 2508 2508 + "@cloudflare/workers-types": { 2509 2509 + "optional": true 2510 2510 + } 2511 2511 + } 2512 2512 + }, 2513 2513 + "node_modules/wrangler/node_modules/@esbuild/aix-ppc64": { 2514 2514 + "version": "0.25.2", 2515 2515 + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz", 2516 2516 + "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==", 2517 2517 + "cpu": [ 2518 2518 + "ppc64" 2519 2519 + ], 2520 2520 + "dev": true, 2521 2521 + "license": "MIT", 2522 2522 + "optional": true, 2523 2523 + "os": [ 2524 2524 + "aix" 2525 2525 + ], 2526 2526 + "engines": { 2527 2527 + "node": ">=18" 2528 2528 + } 2529 2529 + }, 2530 2530 + "node_modules/wrangler/node_modules/@esbuild/android-arm": { 2531 2531 + "version": "0.25.2", 2532 2532 + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz", 2533 2533 + "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==", 2534 2534 + "cpu": [ 2535 2535 + "arm" 2536 2536 + ], 2537 2537 + "dev": true, 2538 2538 + "license": "MIT", 2539 2539 + "optional": true, 2540 2540 + "os": [ 2541 2541 + "android" 2542 2542 + ], 2543 2543 + "engines": { 2544 2544 + "node": ">=18" 2545 2545 + } 2546 2546 + }, 2547 2547 + "node_modules/wrangler/node_modules/@esbuild/android-arm64": { 2548 2548 + "version": "0.25.2", 2549 2549 + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz", 2550 2550 + "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==", 2551 2551 + "cpu": [ 2552 2552 + "arm64" 2553 2553 + ], 2554 2554 + "dev": true, 2555 2555 + "license": "MIT", 2556 2556 + "optional": true, 2557 2557 + "os": [ 2558 2558 + "android" 2559 2559 + ], 2560 2560 + "engines": { 2561 2561 + "node": ">=18" 2562 2562 + } 2563 2563 + }, 2564 2564 + "node_modules/wrangler/node_modules/@esbuild/android-x64": { 2565 2565 + "version": "0.25.2", 2566 2566 + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz", 2567 2567 + "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==", 2568 2568 + "cpu": [ 2569 2569 + "x64" 2570 2570 + ], 2571 2571 + "dev": true, 2572 2572 + "license": "MIT", 2573 2573 + "optional": true, 2574 2574 + "os": [ 2575 2575 + "android" 2576 2576 + ], 2577 2577 + "engines": { 2578 2578 + "node": ">=18" 2579 2579 + } 2580 2580 + }, 2581 2581 + "node_modules/wrangler/node_modules/@esbuild/darwin-arm64": { 2582 2582 + "version": "0.25.2", 2583 2583 + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz", 2584 2584 + "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==", 2585 2585 + "cpu": [ 2586 2586 + "arm64" 2587 2587 + ], 2588 2588 + "dev": true, 2589 2589 + "license": "MIT", 2590 2590 + "optional": true, 2591 2591 + "os": [ 2592 2592 + "darwin" 2593 2593 + ], 2594 2594 + "engines": { 2595 2595 + "node": ">=18" 2596 2596 + } 2597 2597 + }, 2598 2598 + "node_modules/wrangler/node_modules/@esbuild/darwin-x64": { 2599 2599 + "version": "0.25.2", 2600 2600 + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz", 2601 2601 + "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==", 2602 2602 + "cpu": [ 2603 2603 + "x64" 2604 2604 + ], 2605 2605 + "dev": true, 2606 2606 + "license": "MIT", 2607 2607 + "optional": true, 2608 2608 + "os": [ 2609 2609 + "darwin" 2610 2610 + ], 2611 2611 + "engines": { 2612 2612 + "node": ">=18" 2613 2613 + } 2614 2614 + }, 2615 2615 + "node_modules/wrangler/node_modules/@esbuild/freebsd-arm64": { 2616 2616 + "version": "0.25.2", 2617 2617 + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz", 2618 2618 + "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==", 2619 2619 + "cpu": [ 2620 2620 + "arm64" 2621 2621 + ], 2622 2622 + "dev": true, 2623 2623 + "license": "MIT", 2624 2624 + "optional": true, 2625 2625 + "os": [ 2626 2626 + "freebsd" 2627 2627 + ], 2628 2628 + "engines": { 2629 2629 + "node": ">=18" 2630 2630 + } 2631 2631 + }, 2632 2632 + "node_modules/wrangler/node_modules/@esbuild/freebsd-x64": { 2633 2633 + "version": "0.25.2", 2634 2634 + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz", 2635 2635 + "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==", 2636 2636 + "cpu": [ 2637 2637 + "x64" 2638 2638 + ], 2639 2639 + "dev": true, 2640 2640 + "license": "MIT", 2641 2641 + "optional": true, 2642 2642 + "os": [ 2643 2643 + "freebsd" 2644 2644 + ], 2645 2645 + "engines": { 2646 2646 + "node": ">=18" 2647 2647 + } 2648 2648 + }, 2649 2649 + "node_modules/wrangler/node_modules/@esbuild/linux-arm": { 2650 2650 + "version": "0.25.2", 2651 2651 + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz", 2652 2652 + "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==", 2653 2653 + "cpu": [ 2654 2654 + "arm" 2655 2655 + ], 2656 2656 + "dev": true, 2657 2657 + "license": "MIT", 2658 2658 + "optional": true, 2659 2659 + "os": [ 2660 2660 + "linux" 2661 2661 + ], 2662 2662 + "engines": { 2663 2663 + "node": ">=18" 2664 2664 + } 2665 2665 + }, 2666 2666 + "node_modules/wrangler/node_modules/@esbuild/linux-arm64": { 2667 2667 + "version": "0.25.2", 2668 2668 + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz", 2669 2669 + "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==", 2670 2670 + "cpu": [ 2671 2671 + "arm64" 2672 2672 + ], 2673 2673 + "dev": true, 2674 2674 + "license": "MIT", 2675 2675 + "optional": true, 2676 2676 + "os": [ 2677 2677 + "linux" 2678 2678 + ], 2679 2679 + "engines": { 2680 2680 + "node": ">=18" 2681 2681 + } 2682 2682 + }, 2683 2683 + "node_modules/wrangler/node_modules/@esbuild/linux-ia32": { 2684 2684 + "version": "0.25.2", 2685 2685 + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz", 2686 2686 + "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==", 2687 2687 + "cpu": [ 2688 2688 + "ia32" 2689 2689 + ], 2690 2690 + "dev": true, 2691 2691 + "license": "MIT", 2692 2692 + "optional": true, 2693 2693 + "os": [ 2694 2694 + "linux" 2695 2695 + ], 2696 2696 + "engines": { 2697 2697 + "node": ">=18" 2698 2698 + } 2699 2699 + }, 2700 2700 + "node_modules/wrangler/node_modules/@esbuild/linux-loong64": { 2701 2701 + "version": "0.25.2", 2702 2702 + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz", 2703 2703 + "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==", 2704 2704 + "cpu": [ 2705 2705 + "loong64" 2706 2706 + ], 2707 2707 + "dev": true, 2708 2708 + "license": "MIT", 2709 2709 + "optional": true, 2710 2710 + "os": [ 2711 2711 + "linux" 2712 2712 + ], 2713 2713 + "engines": { 2714 2714 + "node": ">=18" 2715 2715 + } 2716 2716 + }, 2717 2717 + "node_modules/wrangler/node_modules/@esbuild/linux-mips64el": { 2718 2718 + "version": "0.25.2", 2719 2719 + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz", 2720 2720 + "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==", 2721 2721 + "cpu": [ 2722 2722 + "mips64el" 2723 2723 + ], 2724 2724 + "dev": true, 2725 2725 + "license": "MIT", 2726 2726 + "optional": true, 2727 2727 + "os": [ 2728 2728 + "linux" 2729 2729 + ], 2730 2730 + "engines": { 2731 2731 + "node": ">=18" 2732 2732 + } 2733 2733 + }, 2734 2734 + "node_modules/wrangler/node_modules/@esbuild/linux-ppc64": { 2735 2735 + "version": "0.25.2", 2736 2736 + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz", 2737 2737 + "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==", 2738 2738 + "cpu": [ 2739 2739 + "ppc64" 2740 2740 + ], 2741 2741 + "dev": true, 2742 2742 + "license": "MIT", 2743 2743 + "optional": true, 2744 2744 + "os": [ 2745 2745 + "linux" 2746 2746 + ], 2747 2747 + "engines": { 2748 2748 + "node": ">=18" 2749 2749 + } 2750 2750 + }, 2751 2751 + "node_modules/wrangler/node_modules/@esbuild/linux-riscv64": { 2752 2752 + "version": "0.25.2", 2753 2753 + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz", 2754 2754 + "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==", 2755 2755 + "cpu": [ 2756 2756 + "riscv64" 2757 2757 + ], 2758 2758 + "dev": true, 2759 2759 + "license": "MIT", 2760 2760 + "optional": true, 2761 2761 + "os": [ 2762 2762 + "linux" 2763 2763 + ], 2764 2764 + "engines": { 2765 2765 + "node": ">=18" 2766 2766 + } 2767 2767 + }, 2768 2768 + "node_modules/wrangler/node_modules/@esbuild/linux-s390x": { 2769 2769 + "version": "0.25.2", 2770 2770 + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz", 2771 2771 + "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==", 2772 2772 + "cpu": [ 2773 2773 + "s390x" 2774 2774 + ], 2775 2775 + "dev": true, 2776 2776 + "license": "MIT", 2777 2777 + "optional": true, 2778 2778 + "os": [ 2779 2779 + "linux" 2780 2780 + ], 2781 2781 + "engines": { 2782 2782 + "node": ">=18" 2783 2783 + } 2784 2784 + }, 2785 2785 + "node_modules/wrangler/node_modules/@esbuild/linux-x64": { 2786 2786 + "version": "0.25.2", 2787 2787 + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz", 2788 2788 + "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==", 2789 2789 + "cpu": [ 2790 2790 + "x64" 2791 2791 + ], 2792 2792 + "dev": true, 2793 2793 + "license": "MIT", 2794 2794 + "optional": true, 2795 2795 + "os": [ 2796 2796 + "linux" 2797 2797 + ], 2798 2798 + "engines": { 2799 2799 + "node": ">=18" 2800 2800 + } 2801 2801 + }, 2802 2802 + "node_modules/wrangler/node_modules/@esbuild/netbsd-arm64": { 2803 2803 + "version": "0.25.2", 2804 2804 + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz", 2805 2805 + "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==", 2806 2806 + "cpu": [ 2807 2807 + "arm64" 2808 2808 + ], 2809 2809 + "dev": true, 2810 2810 + "license": "MIT", 2811 2811 + "optional": true, 2812 2812 + "os": [ 2813 2813 + "netbsd" 2814 2814 + ], 2815 2815 + "engines": { 2816 2816 + "node": ">=18" 2817 2817 + } 2818 2818 + }, 2819 2819 + "node_modules/wrangler/node_modules/@esbuild/netbsd-x64": { 2820 2820 + "version": "0.25.2", 2821 2821 + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz", 2822 2822 + "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==", 2823 2823 + "cpu": [ 2824 2824 + "x64" 2825 2825 + ], 2826 2826 + "dev": true, 2827 2827 + "license": "MIT", 2828 2828 + "optional": true, 2829 2829 + "os": [ 2830 2830 + "netbsd" 2831 2831 + ], 2832 2832 + "engines": { 2833 2833 + "node": ">=18" 2834 2834 + } 2835 2835 + }, 2836 2836 + "node_modules/wrangler/node_modules/@esbuild/openbsd-arm64": { 2837 2837 + "version": "0.25.2", 2838 2838 + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz", 2839 2839 + "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==", 2840 2840 + "cpu": [ 2841 2841 + "arm64" 2842 2842 + ], 2843 2843 + "dev": true, 2844 2844 + "license": "MIT", 2845 2845 + "optional": true, 2846 2846 + "os": [ 2847 2847 + "openbsd" 2848 2848 + ], 2849 2849 + "engines": { 2850 2850 + "node": ">=18" 2851 2851 + } 2852 2852 + }, 2853 2853 + "node_modules/wrangler/node_modules/@esbuild/openbsd-x64": { 2854 2854 + "version": "0.25.2", 2855 2855 + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz", 2856 2856 + "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==", 2857 2857 + "cpu": [ 2858 2858 + "x64" 2859 2859 + ], 2860 2860 + "dev": true, 2861 2861 + "license": "MIT", 2862 2862 + "optional": true, 2863 2863 + "os": [ 2864 2864 + "openbsd" 2865 2865 + ], 2866 2866 + "engines": { 2867 2867 + "node": ">=18" 2868 2868 + } 2869 2869 + }, 2870 2870 + "node_modules/wrangler/node_modules/@esbuild/sunos-x64": { 2871 2871 + "version": "0.25.2", 2872 2872 + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz", 2873 2873 + "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==", 2874 2874 + "cpu": [ 2875 2875 + "x64" 2876 2876 + ], 2877 2877 + "dev": true, 2878 2878 + "license": "MIT", 2879 2879 + "optional": true, 2880 2880 + "os": [ 2881 2881 + "sunos" 2882 2882 + ], 2883 2883 + "engines": { 2884 2884 + "node": ">=18" 2885 2885 + } 2886 2886 + }, 2887 2887 + "node_modules/wrangler/node_modules/@esbuild/win32-arm64": { 2888 2888 + "version": "0.25.2", 2889 2889 + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz", 2890 2890 + "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==", 2891 2891 + "cpu": [ 2892 2892 + "arm64" 2893 2893 + ], 2894 2894 + "dev": true, 2895 2895 + "license": "MIT", 2896 2896 + "optional": true, 2897 2897 + "os": [ 2898 2898 + "win32" 2899 2899 + ], 2900 2900 + "engines": { 2901 2901 + "node": ">=18" 2902 2902 + } 2903 2903 + }, 2904 2904 + "node_modules/wrangler/node_modules/@esbuild/win32-ia32": { 2905 2905 + "version": "0.25.2", 2906 2906 + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz", 2907 2907 + "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==", 2908 2908 + "cpu": [ 2909 2909 + "ia32" 2910 2910 + ], 2911 2911 + "dev": true, 2912 2912 + "license": "MIT", 2913 2913 + "optional": true, 2914 2914 + "os": [ 2915 2915 + "win32" 2916 2916 + ], 2917 2917 + "engines": { 2918 2918 + "node": ">=18" 2919 2919 + } 2920 2920 + }, 2921 2921 + "node_modules/wrangler/node_modules/@esbuild/win32-x64": { 2922 2922 + "version": "0.25.2", 2923 2923 + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz", 2924 2924 + "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==", 2925 2925 + "cpu": [ 2926 2926 + "x64" 2927 2927 + ], 2928 2928 + "dev": true, 2929 2929 + "license": "MIT", 2930 2930 + "optional": true, 2931 2931 + "os": [ 2932 2932 + "win32" 2933 2933 + ], 2934 2934 + "engines": { 2935 2935 + "node": ">=18" 2936 2936 + } 2937 2937 + }, 2938 2938 + "node_modules/wrangler/node_modules/esbuild": { 2939 2939 + "version": "0.25.2", 2940 2940 + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz", 2941 2941 + "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==", 2942 2942 + "dev": true, 2943 2943 + "hasInstallScript": true, 2944 2944 + "license": "MIT", 2945 2945 + "bin": { 2946 2946 + "esbuild": "bin/esbuild" 2947 2947 + }, 2948 2948 + "engines": { 2949 2949 + "node": ">=18" 2950 2950 + }, 2951 2951 + "optionalDependencies": { 2952 2952 + "@esbuild/aix-ppc64": "0.25.2", 2953 2953 + "@esbuild/android-arm": "0.25.2", 2954 2954 + "@esbuild/android-arm64": "0.25.2", 2955 2955 + "@esbuild/android-x64": "0.25.2", 2956 2956 + "@esbuild/darwin-arm64": "0.25.2", 2957 2957 + "@esbuild/darwin-x64": "0.25.2", 2958 2958 + "@esbuild/freebsd-arm64": "0.25.2", 2959 2959 + "@esbuild/freebsd-x64": "0.25.2", 2960 2960 + "@esbuild/linux-arm": "0.25.2", 2961 2961 + "@esbuild/linux-arm64": "0.25.2", 2962 2962 + "@esbuild/linux-ia32": "0.25.2", 2963 2963 + "@esbuild/linux-loong64": "0.25.2", 2964 2964 + "@esbuild/linux-mips64el": "0.25.2", 2965 2965 + "@esbuild/linux-ppc64": "0.25.2", 2966 2966 + "@esbuild/linux-riscv64": "0.25.2", 2967 2967 + "@esbuild/linux-s390x": "0.25.2", 2968 2968 + "@esbuild/linux-x64": "0.25.2", 2969 2969 + "@esbuild/netbsd-arm64": "0.25.2", 2970 2970 + "@esbuild/netbsd-x64": "0.25.2", 2971 2971 + "@esbuild/openbsd-arm64": "0.25.2", 2972 2972 + "@esbuild/openbsd-x64": "0.25.2", 2973 2973 + "@esbuild/sunos-x64": "0.25.2", 2974 2974 + "@esbuild/win32-arm64": "0.25.2", 2975 2975 + "@esbuild/win32-ia32": "0.25.2", 2976 2976 + "@esbuild/win32-x64": "0.25.2" 2977 2977 + } 2978 2978 + }, 2979 2979 + "node_modules/ws": { 2980 2980 + "version": "8.18.0", 2981 2981 + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", 2982 2982 + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", 2983 2983 + "dev": true, 2984 2984 + "license": "MIT", 2985 2985 + "engines": { 2986 2986 + "node": ">=10.0.0" 2987 2987 + }, 2988 2988 + "peerDependencies": { 2989 2989 + "bufferutil": "^4.0.1", 2990 2990 + "utf-8-validate": ">=5.0.2" 2991 2991 + }, 2992 2992 + "peerDependenciesMeta": { 2993 2993 + "bufferutil": { 2994 2994 + "optional": true 2995 2995 + }, 2996 2996 + "utf-8-validate": { 2997 2997 + "optional": true 2998 2998 + } 2999 2999 + } 3000 3000 + }, 3001 3001 + "node_modules/youch": { 3002 3002 + "version": "3.3.4", 3003 3003 + "resolved": "https://registry.npmjs.org/youch/-/youch-3.3.4.tgz", 3004 3004 + "integrity": "sha512-UeVBXie8cA35DS6+nBkls68xaBBXCye0CNznrhszZjTbRVnJKQuNsyLKBTTL4ln1o1rh2PKtv35twV7irj5SEg==", 3005 3005 + "dev": true, 3006 3006 + "license": "MIT", 3007 3007 + "dependencies": { 3008 3008 + "cookie": "^0.7.1", 3009 3009 + "mustache": "^4.2.0", 3010 3010 + "stacktracey": "^2.1.8" 3011 3011 + } 3012 3012 + }, 3013 3013 + "node_modules/zod": { 3014 3014 + "version": "3.24.3", 3015 3015 + "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.3.tgz", 3016 3016 + "integrity": "sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==", 3017 3017 + "dev": true, 3018 3018 + "license": "MIT", 3019 3019 + "funding": { 3020 3020 + "url": "https://github.com/sponsors/colinhacks" 3021 3021 + } 3022 3022 + } 3023 3023 + } 3024 3024 + }

+16

camo/package.json

··· 1 1 + { 2 2 + "name": "camo", 3 3 + "version": "0.0.0", 4 4 + "private": true, 5 5 + "scripts": { 6 6 + "deploy": "wrangler deploy", 7 7 + "dev": "wrangler dev", 8 8 + "start": "wrangler dev", 9 9 + "test": "vitest" 10 10 + }, 11 11 + "devDependencies": { 12 12 + "@cloudflare/vitest-pool-workers": "^0.8.19", 13 13 + "vitest": "~3.0.7", 14 14 + "wrangler": "^4.14.1" 15 15 + } 16 16 + }

+17

camo/readme.md

··· 1 1 + # camo 2 2 + 3 3 + Camo is Tangled's "camouflage" service much like that of [GitHub's](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/about-anonymized-urls). 4 4 + 5 5 + Camo uses a shared secret `CAMO_SHARED_SECRET` to verify HMAC signatures. URLs are of the form: 6 6 + 7 7 + ``` 8 8 + https://camo.tangled.sh/<signature>/<hex-encoded-origin-url> 9 9 + ``` 10 10 + 11 11 + It's pretty barebones for the moment and doesn't support a whole lot of what the 12 12 + big G's does. Ours is a Cloudflare Worker, deployed using `wrangler` like so: 13 13 + 14 14 + ``` 15 15 + npx wrangler deploy 16 16 + npx wrangler secrets put CAMO_SHARED_SECRET 17 17 + ```

+101

camo/src/index.js

··· 1 1 + export default { 2 2 + async fetch(request, env) { 3 3 + const url = new URL(request.url); 4 4 + 5 5 + if (url.pathname === "/" || url.pathname === "") { 6 6 + return new Response( 7 7 + "This is Tangled's Camo service. It proxies images served from knots via Cloudflare.", 8 8 + ); 9 9 + } 10 10 + 11 11 + const cache = caches.default; 12 12 + 13 13 + const pathParts = url.pathname.slice(1).split("/"); 14 14 + if (pathParts.length < 2) { 15 15 + return new Response("Bad URL", { status: 400 }); 16 16 + } 17 17 + 18 18 + const [signatureHex, ...hexUrlParts] = pathParts; 19 19 + const hexUrl = hexUrlParts.join(""); 20 20 + const urlBytes = Uint8Array.from( 21 21 + hexUrl.match(/.{2}/g).map((b) => parseInt(b, 16)), 22 22 + ); 23 23 + const targetUrl = new TextDecoder().decode(urlBytes); 24 24 + 25 25 + // check if we have an entry in the cache with the target url 26 26 + let cacheKey = new Request(targetUrl); 27 27 + let response = await cache.match(cacheKey); 28 28 + if (response) { 29 29 + return response; 30 30 + } 31 31 + 32 32 + // else compute the signature 33 33 + const key = await crypto.subtle.importKey( 34 34 + "raw", 35 35 + new TextEncoder().encode(env.CAMO_SHARED_SECRET), 36 36 + { name: "HMAC", hash: "SHA-256" }, 37 37 + false, 38 38 + ["sign", "verify"], 39 39 + ); 40 40 + 41 41 + const computedSigBuffer = await crypto.subtle.sign("HMAC", key, urlBytes); 42 42 + const computedSig = Array.from(new Uint8Array(computedSigBuffer)) 43 43 + .map((b) => b.toString(16).padStart(2, "0")) 44 44 + .join(""); 45 45 + 46 46 + console.log({ 47 47 + level: "debug", 48 48 + message: "camo target: " + targetUrl, 49 49 + computedSignature: computedSig, 50 50 + providedSignature: signatureHex, 51 51 + targetUrl: targetUrl, 52 52 + }); 53 53 + 54 54 + const sigBytes = Uint8Array.from( 55 55 + signatureHex.match(/.{2}/g).map((b) => parseInt(b, 16)), 56 56 + ); 57 57 + const valid = await crypto.subtle.verify("HMAC", key, sigBytes, urlBytes); 58 58 + 59 59 + if (!valid) { 60 60 + return new Response("Invalid signature", { status: 403 }); 61 61 + } 62 62 + 63 63 + let parsedUrl; 64 64 + try { 65 65 + parsedUrl = new URL(targetUrl); 66 66 + if (!["https:", "http:"].includes(parsedUrl.protocol)) { 67 67 + return new Response("Only HTTP(S) allowed", { status: 400 }); 68 68 + } 69 69 + } catch { 70 70 + return new Response("Malformed URL", { status: 400 }); 71 71 + } 72 72 + 73 73 + // fetch from the parsed URL 74 74 + const res = await fetch(parsedUrl.toString(), { 75 75 + headers: { "User-Agent": "Tangled Camo v0.1.0" }, 76 76 + }); 77 77 + 78 78 + const allowedMimeTypes = require("./mimetypes.json"); 79 79 + 80 80 + const contentType = 81 81 + res.headers.get("Content-Type") || "application/octet-stream"; 82 82 + 83 83 + if (!allowedMimeTypes.includes(contentType.split(";")[0].trim())) { 84 84 + return new Response("Unsupported media type", { status: 415 }); 85 85 + } 86 86 + 87 87 + const headers = new Headers(); 88 88 + headers.set("Content-Type", contentType); 89 89 + headers.set("Cache-Control", "public, max-age=86400, immutable"); 90 90 + 91 91 + // serve and cache it with cf 92 92 + response = new Response(await res.arrayBuffer(), { 93 93 + status: res.status, 94 94 + headers, 95 95 + }); 96 96 + 97 97 + await cache.put(cacheKey, response.clone()); 98 98 + 99 99 + return response; 100 100 + }, 101 101 + };

+20

camo/wrangler.jsonc

··· 1 1 + /** 2 2 + * For more details on how to configure Wrangler, refer to: 3 3 + * https://developers.cloudflare.com/workers/wrangler/configuration/ 4 4 + */ 5 5 + { 6 6 + "$schema": "node_modules/wrangler/config-schema.json", 7 7 + "name": "camo", 8 8 + "main": "src/index.js", 9 9 + "compatibility_date": "2025-04-30", 10 10 + "observability": { 11 11 + "enabled": true, 12 12 + }, 13 13 + 14 14 + "routes": [ 15 15 + { 16 16 + "pattern": "camo.tangled.sh", 17 17 + "custom_domain": true, 18 18 + }, 19 19 + ], 20 20 + }

+172

avatar/.gitignore

··· 1 1 + # Logs 2 2 + 3 3 + logs 4 4 + _.log 5 5 + npm-debug.log_ 6 6 + yarn-debug.log* 7 7 + yarn-error.log* 8 8 + lerna-debug.log* 9 9 + .pnpm-debug.log* 10 10 + 11 11 + # Diagnostic reports (https://nodejs.org/api/report.html) 12 12 + 13 13 + report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json 14 14 + 15 15 + # Runtime data 16 16 + 17 17 + pids 18 18 + _.pid 19 19 + _.seed 20 20 + \*.pid.lock 21 21 + 22 22 + # Directory for instrumented libs generated by jscoverage/JSCover 23 23 + 24 24 + lib-cov 25 25 + 26 26 + # Coverage directory used by tools like istanbul 27 27 + 28 28 + coverage 29 29 + \*.lcov 30 30 + 31 31 + # nyc test coverage 32 32 + 33 33 + .nyc_output 34 34 + 35 35 + # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files) 36 36 + 37 37 + .grunt 38 38 + 39 39 + # Bower dependency directory (https://bower.io/) 40 40 + 41 41 + bower_components 42 42 + 43 43 + # node-waf configuration 44 44 + 45 45 + .lock-wscript 46 46 + 47 47 + # Compiled binary addons (https://nodejs.org/api/addons.html) 48 48 + 49 49 + build/Release 50 50 + 51 51 + # Dependency directories 52 52 + 53 53 + node_modules/ 54 54 + jspm_packages/ 55 55 + 56 56 + # Snowpack dependency directory (https://snowpack.dev/) 57 57 + 58 58 + web_modules/ 59 59 + 60 60 + # TypeScript cache 61 61 + 62 62 + \*.tsbuildinfo 63 63 + 64 64 + # Optional npm cache directory 65 65 + 66 66 + .npm 67 67 + 68 68 + # Optional eslint cache 69 69 + 70 70 + .eslintcache 71 71 + 72 72 + # Optional stylelint cache 73 73 + 74 74 + .stylelintcache 75 75 + 76 76 + # Microbundle cache 77 77 + 78 78 + .rpt2_cache/ 79 79 + .rts2_cache_cjs/ 80 80 + .rts2_cache_es/ 81 81 + .rts2_cache_umd/ 82 82 + 83 83 + # Optional REPL history 84 84 + 85 85 + .node_repl_history 86 86 + 87 87 + # Output of 'npm pack' 88 88 + 89 89 + \*.tgz 90 90 + 91 91 + # Yarn Integrity file 92 92 + 93 93 + .yarn-integrity 94 94 + 95 95 + # dotenv environment variable files 96 96 + 97 97 + .env 98 98 + .env.development.local 99 99 + .env.test.local 100 100 + .env.production.local 101 101 + .env.local 102 102 + 103 103 + # parcel-bundler cache (https://parceljs.org/) 104 104 + 105 105 + .cache 106 106 + .parcel-cache 107 107 + 108 108 + # Next.js build output 109 109 + 110 110 + .next 111 111 + out 112 112 + 113 113 + # Nuxt.js build / generate output 114 114 + 115 115 + .nuxt 116 116 + dist 117 117 + 118 118 + # Gatsby files 119 119 + 120 120 + .cache/ 121 121 + 122 122 + # Comment in the public line in if your project uses Gatsby and not Next.js 123 123 + 124 124 + # https://nextjs.org/blog/next-9-1#public-directory-support 125 125 + 126 126 + # public 127 127 + 128 128 + # vuepress build output 129 129 + 130 130 + .vuepress/dist 131 131 + 132 132 + # vuepress v2.x temp and cache directory 133 133 + 134 134 + .temp 135 135 + .cache 136 136 + 137 137 + # Docusaurus cache and generated files 138 138 + 139 139 + .docusaurus 140 140 + 141 141 + # Serverless directories 142 142 + 143 143 + .serverless/ 144 144 + 145 145 + # FuseBox cache 146 146 + 147 147 + .fusebox/ 148 148 + 149 149 + # DynamoDB Local files 150 150 + 151 151 + .dynamodb/ 152 152 + 153 153 + # TernJS port file 154 154 + 155 155 + .tern-port 156 156 + 157 157 + # Stores VSCode versions used for testing VSCode extensions 158 158 + 159 159 + .vscode-test 160 160 + 161 161 + # yarn v2 162 162 + 163 163 + .yarn/cache 164 164 + .yarn/unplugged 165 165 + .yarn/build-state.yml 166 166 + .yarn/install-state.gz 167 167 + .pnp.\* 168 168 + 169 169 + # wrangler project 170 170 + 171 171 + .dev.vars 172 172 + .wrangler/

+3024

avatar/package-lock.json

··· 1 1 + { 2 2 + "name": "avatar", 3 3 + "version": "0.0.0", 4 4 + "lockfileVersion": 3, 5 5 + "requires": true, 6 6 + "packages": { 7 7 + "": { 8 8 + "name": "avatar", 9 9 + "version": "0.0.0", 10 10 + "devDependencies": { 11 11 + "@cloudflare/vitest-pool-workers": "^0.8.19", 12 12 + "vitest": "~3.0.7", 13 13 + "wrangler": "^4.14.1" 14 14 + } 15 15 + }, 16 16 + "node_modules/@cloudflare/kv-asset-handler": { 17 17 + "version": "0.4.0", 18 18 + "resolved": "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.4.0.tgz", 19 19 + "integrity": "sha512-+tv3z+SPp+gqTIcImN9o0hqE9xyfQjI1XD9pL6NuKjua9B1y7mNYv0S9cP+QEbA4ppVgGZEmKOvHX5G5Ei1CVA==", 20 20 + "dev": true, 21 21 + "license": "MIT OR Apache-2.0", 22 22 + "dependencies": { 23 23 + "mime": "^3.0.0" 24 24 + }, 25 25 + "engines": { 26 26 + "node": ">=18.0.0" 27 27 + } 28 28 + }, 29 29 + "node_modules/@cloudflare/unenv-preset": { 30 30 + "version": "2.3.1", 31 31 + "resolved": "https://registry.npmjs.org/@cloudflare/unenv-preset/-/unenv-preset-2.3.1.tgz", 32 32 + "integrity": "sha512-Xq57Qd+ADpt6hibcVBO0uLG9zzRgyRhfCUgBT9s+g3+3Ivg5zDyVgLFy40ES1VdNcu8rPNSivm9A+kGP5IVaPg==", 33 33 + "dev": true, 34 34 + "license": "MIT OR Apache-2.0", 35 35 + "peerDependencies": { 36 36 + "unenv": "2.0.0-rc.15", 37 37 + "workerd": "^1.20250320.0" 38 38 + }, 39 39 + "peerDependenciesMeta": { 40 40 + "workerd": { 41 41 + "optional": true 42 42 + } 43 43 + } 44 44 + }, 45 45 + "node_modules/@cloudflare/vitest-pool-workers": { 46 46 + "version": "0.8.24", 47 47 + "resolved": "https://registry.npmjs.org/@cloudflare/vitest-pool-workers/-/vitest-pool-workers-0.8.24.tgz", 48 48 + "integrity": "sha512-wT2PABJQ9YLYWrVu4CRZOjvmjHkdbMyLTZPU9n/7JEMM3pgG8dY41F1Rj31UsXRQaXX39A/CTPGlk58dcMUysA==", 49 49 + "dev": true, 50 50 + "license": "MIT", 51 51 + "dependencies": { 52 52 + "birpc": "0.2.14", 53 53 + "cjs-module-lexer": "^1.2.3", 54 54 + "devalue": "^4.3.0", 55 55 + "miniflare": "4.20250428.1", 56 56 + "semver": "^7.7.1", 57 57 + "wrangler": "4.14.1", 58 58 + "zod": "^3.22.3" 59 59 + }, 60 60 + "peerDependencies": { 61 61 + "@vitest/runner": "2.0.x - 3.1.x", 62 62 + "@vitest/snapshot": "2.0.x - 3.1.x", 63 63 + "vitest": "2.0.x - 3.1.x" 64 64 + } 65 65 + }, 66 66 + "node_modules/@cloudflare/workerd-darwin-64": { 67 67 + "version": "1.20250428.0", 68 68 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-64/-/workerd-darwin-64-1.20250428.0.tgz", 69 69 + "integrity": "sha512-6nVe9oV4Hdec6ctzMtW80TiDvNTd2oFPi3VsKqSDVaJSJbL+4b6seyJ7G/UEPI+si6JhHBSLV2/9lNXNGLjClA==", 70 70 + "cpu": [ 71 71 + "x64" 72 72 + ], 73 73 + "dev": true, 74 74 + "license": "Apache-2.0", 75 75 + "optional": true, 76 76 + "os": [ 77 77 + "darwin" 78 78 + ], 79 79 + "engines": { 80 80 + "node": ">=16" 81 81 + } 82 82 + }, 83 83 + "node_modules/@cloudflare/workerd-darwin-arm64": { 84 84 + "version": "1.20250428.0", 85 85 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-darwin-arm64/-/workerd-darwin-arm64-1.20250428.0.tgz", 86 86 + "integrity": "sha512-/TB7bh7SIJ5f+6r4PHsAz7+9Qal/TK1cJuKFkUno1kqGlZbdrMwH0ATYwlWC/nBFeu2FB3NUolsTntEuy23hnQ==", 87 87 + "cpu": [ 88 88 + "arm64" 89 89 + ], 90 90 + "dev": true, 91 91 + "license": "Apache-2.0", 92 92 + "optional": true, 93 93 + "os": [ 94 94 + "darwin" 95 95 + ], 96 96 + "engines": { 97 97 + "node": ">=16" 98 98 + } 99 99 + }, 100 100 + "node_modules/@cloudflare/workerd-linux-64": { 101 101 + "version": "1.20250428.0", 102 102 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-64/-/workerd-linux-64-1.20250428.0.tgz", 103 103 + "integrity": "sha512-9eCbj+R3CKqpiXP6DfAA20DxKge+OTj7Hyw3ZewiEhWH9INIHiJwJQYybu4iq9kJEGjnGvxgguLFjSCWm26hgg==", 104 104 + "cpu": [ 105 105 + "x64" 106 106 + ], 107 107 + "dev": true, 108 108 + "license": "Apache-2.0", 109 109 + "optional": true, 110 110 + "os": [ 111 111 + "linux" 112 112 + ], 113 113 + "engines": { 114 114 + "node": ">=16" 115 115 + } 116 116 + }, 117 117 + "node_modules/@cloudflare/workerd-linux-arm64": { 118 118 + "version": "1.20250428.0", 119 119 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-linux-arm64/-/workerd-linux-arm64-1.20250428.0.tgz", 120 120 + "integrity": "sha512-D9NRBnW46nl1EQsP13qfkYb5lbt4C6nxl38SBKY/NOcZAUoHzNB5K0GaK8LxvpkM7X/97ySojlMfR5jh5DNXYQ==", 121 121 + "cpu": [ 122 122 + "arm64" 123 123 + ], 124 124 + "dev": true, 125 125 + "license": "Apache-2.0", 126 126 + "optional": true, 127 127 + "os": [ 128 128 + "linux" 129 129 + ], 130 130 + "engines": { 131 131 + "node": ">=16" 132 132 + } 133 133 + }, 134 134 + "node_modules/@cloudflare/workerd-windows-64": { 135 135 + "version": "1.20250428.0", 136 136 + "resolved": "https://registry.npmjs.org/@cloudflare/workerd-windows-64/-/workerd-windows-64-1.20250428.0.tgz", 137 137 + "integrity": "sha512-RQCRj28eitjKD0tmei6iFOuWqMuHMHdNGEigRmbkmuTlpbWHNAoHikgCzZQ/dkKDdatA76TmcpbyECNf31oaTA==", 138 138 + "cpu": [ 139 139 + "x64" 140 140 + ], 141 141 + "dev": true, 142 142 + "license": "Apache-2.0", 143 143 + "optional": true, 144 144 + "os": [ 145 145 + "win32" 146 146 + ], 147 147 + "engines": { 148 148 + "node": ">=16" 149 149 + } 150 150 + }, 151 151 + "node_modules/@cspotcode/source-map-support": { 152 152 + "version": "0.8.1", 153 153 + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", 154 154 + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", 155 155 + "dev": true, 156 156 + "license": "MIT", 157 157 + "dependencies": { 158 158 + "@jridgewell/trace-mapping": "0.3.9" 159 159 + }, 160 160 + "engines": { 161 161 + "node": ">=12" 162 162 + } 163 163 + }, 164 164 + "node_modules/@emnapi/runtime": { 165 165 + "version": "1.4.3", 166 166 + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz", 167 167 + "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==", 168 168 + "dev": true, 169 169 + "license": "MIT", 170 170 + "optional": true, 171 171 + "dependencies": { 172 172 + "tslib": "^2.4.0" 173 173 + } 174 174 + }, 175 175 + "node_modules/@esbuild/aix-ppc64": { 176 176 + "version": "0.25.3", 177 177 + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.3.tgz", 178 178 + "integrity": "sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==", 179 179 + "cpu": [ 180 180 + "ppc64" 181 181 + ], 182 182 + "dev": true, 183 183 + "license": "MIT", 184 184 + "optional": true, 185 185 + "os": [ 186 186 + "aix" 187 187 + ], 188 188 + "engines": { 189 189 + "node": ">=18" 190 190 + } 191 191 + }, 192 192 + "node_modules/@esbuild/android-arm": { 193 193 + "version": "0.25.3", 194 194 + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.3.tgz", 195 195 + "integrity": "sha512-PuwVXbnP87Tcff5I9ngV0lmiSu40xw1At6i3GsU77U7cjDDB4s0X2cyFuBiDa1SBk9DnvWwnGvVaGBqoFWPb7A==", 196 196 + "cpu": [ 197 197 + "arm" 198 198 + ], 199 199 + "dev": true, 200 200 + "license": "MIT", 201 201 + "optional": true, 202 202 + "os": [ 203 203 + "android" 204 204 + ], 205 205 + "engines": { 206 206 + "node": ">=18" 207 207 + } 208 208 + }, 209 209 + "node_modules/@esbuild/android-arm64": { 210 210 + "version": "0.25.3", 211 211 + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.3.tgz", 212 212 + "integrity": "sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==", 213 213 + "cpu": [ 214 214 + "arm64" 215 215 + ], 216 216 + "dev": true, 217 217 + "license": "MIT", 218 218 + "optional": true, 219 219 + "os": [ 220 220 + "android" 221 221 + ], 222 222 + "engines": { 223 223 + "node": ">=18" 224 224 + } 225 225 + }, 226 226 + "node_modules/@esbuild/android-x64": { 227 227 + "version": "0.25.3", 228 228 + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.3.tgz", 229 229 + "integrity": "sha512-ogtTpYHT/g1GWS/zKM0cc/tIebFjm1F9Aw1boQ2Y0eUQ+J89d0jFY//s9ei9jVIlkYi8AfOjiixcLJSGNSOAdQ==", 230 230 + "cpu": [ 231 231 + "x64" 232 232 + ], 233 233 + "dev": true, 234 234 + "license": "MIT", 235 235 + "optional": true, 236 236 + "os": [ 237 237 + "android" 238 238 + ], 239 239 + "engines": { 240 240 + "node": ">=18" 241 241 + } 242 242 + }, 243 243 + "node_modules/@esbuild/darwin-arm64": { 244 244 + "version": "0.25.3", 245 245 + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.3.tgz", 246 246 + "integrity": "sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==", 247 247 + "cpu": [ 248 248 + "arm64" 249 249 + ], 250 250 + "dev": true, 251 251 + "license": "MIT", 252 252 + "optional": true, 253 253 + "os": [ 254 254 + "darwin" 255 255 + ], 256 256 + "engines": { 257 257 + "node": ">=18" 258 258 + } 259 259 + }, 260 260 + "node_modules/@esbuild/darwin-x64": { 261 261 + "version": "0.25.3", 262 262 + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.3.tgz", 263 263 + "integrity": "sha512-Kd8glo7sIZtwOLcPbW0yLpKmBNWMANZhrC1r6K++uDR2zyzb6AeOYtI6udbtabmQpFaxJ8uduXMAo1gs5ozz8A==", 264 264 + "cpu": [ 265 265 + "x64" 266 266 + ], 267 267 + "dev": true, 268 268 + "license": "MIT", 269 269 + "optional": true, 270 270 + "os": [ 271 271 + "darwin" 272 272 + ], 273 273 + "engines": { 274 274 + "node": ">=18" 275 275 + } 276 276 + }, 277 277 + "node_modules/@esbuild/freebsd-arm64": { 278 278 + "version": "0.25.3", 279 279 + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.3.tgz", 280 280 + "integrity": "sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==", 281 281 + "cpu": [ 282 282 + "arm64" 283 283 + ], 284 284 + "dev": true, 285 285 + "license": "MIT", 286 286 + "optional": true, 287 287 + "os": [ 288 288 + "freebsd" 289 289 + ], 290 290 + "engines": { 291 291 + "node": ">=18" 292 292 + } 293 293 + }, 294 294 + "node_modules/@esbuild/freebsd-x64": { 295 295 + "version": "0.25.3", 296 296 + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.3.tgz", 297 297 + "integrity": "sha512-Q+wSjaLpGxYf7zC0kL0nDlhsfuFkoN+EXrx2KSB33RhinWzejOd6AvgmP5JbkgXKmjhmpfgKZq24pneodYqE8Q==", 298 298 + "cpu": [ 299 299 + "x64" 300 300 + ], 301 301 + "dev": true, 302 302 + "license": "MIT", 303 303 + "optional": true, 304 304 + "os": [ 305 305 + "freebsd" 306 306 + ], 307 307 + "engines": { 308 308 + "node": ">=18" 309 309 + } 310 310 + }, 311 311 + "node_modules/@esbuild/linux-arm": { 312 312 + "version": "0.25.3", 313 313 + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.3.tgz", 314 314 + "integrity": "sha512-dUOVmAUzuHy2ZOKIHIKHCm58HKzFqd+puLaS424h6I85GlSDRZIA5ycBixb3mFgM0Jdh+ZOSB6KptX30DD8YOQ==", 315 315 + "cpu": [ 316 316 + "arm" 317 317 + ], 318 318 + "dev": true, 319 319 + "license": "MIT", 320 320 + "optional": true, 321 321 + "os": [ 322 322 + "linux" 323 323 + ], 324 324 + "engines": { 325 325 + "node": ">=18" 326 326 + } 327 327 + }, 328 328 + "node_modules/@esbuild/linux-arm64": { 329 329 + "version": "0.25.3", 330 330 + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.3.tgz", 331 331 + "integrity": "sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==", 332 332 + "cpu": [ 333 333 + "arm64" 334 334 + ], 335 335 + "dev": true, 336 336 + "license": "MIT", 337 337 + "optional": true, 338 338 + "os": [ 339 339 + "linux" 340 340 + ], 341 341 + "engines": { 342 342 + "node": ">=18" 343 343 + } 344 344 + }, 345 345 + "node_modules/@esbuild/linux-ia32": { 346 346 + "version": "0.25.3", 347 347 + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.3.tgz", 348 348 + "integrity": "sha512-yplPOpczHOO4jTYKmuYuANI3WhvIPSVANGcNUeMlxH4twz/TeXuzEP41tGKNGWJjuMhotpGabeFYGAOU2ummBw==", 349 349 + "cpu": [ 350 350 + "ia32" 351 351 + ], 352 352 + "dev": true, 353 353 + "license": "MIT", 354 354 + "optional": true, 355 355 + "os": [ 356 356 + "linux" 357 357 + ], 358 358 + "engines": { 359 359 + "node": ">=18" 360 360 + } 361 361 + }, 362 362 + "node_modules/@esbuild/linux-loong64": { 363 363 + "version": "0.25.3", 364 364 + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.3.tgz", 365 365 + "integrity": "sha512-P4BLP5/fjyihmXCELRGrLd793q/lBtKMQl8ARGpDxgzgIKJDRJ/u4r1A/HgpBpKpKZelGct2PGI4T+axcedf6g==", 366 366 + "cpu": [ 367 367 + "loong64" 368 368 + ], 369 369 + "dev": true, 370 370 + "license": "MIT", 371 371 + "optional": true, 372 372 + "os": [ 373 373 + "linux" 374 374 + ], 375 375 + "engines": { 376 376 + "node": ">=18" 377 377 + } 378 378 + }, 379 379 + "node_modules/@esbuild/linux-mips64el": { 380 380 + "version": "0.25.3", 381 381 + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.3.tgz", 382 382 + "integrity": "sha512-eRAOV2ODpu6P5divMEMa26RRqb2yUoYsuQQOuFUexUoQndm4MdpXXDBbUoKIc0iPa4aCO7gIhtnYomkn2x+bag==", 383 383 + "cpu": [ 384 384 + "mips64el" 385 385 + ], 386 386 + "dev": true, 387 387 + "license": "MIT", 388 388 + "optional": true, 389 389 + "os": [ 390 390 + "linux" 391 391 + ], 392 392 + "engines": { 393 393 + "node": ">=18" 394 394 + } 395 395 + }, 396 396 + "node_modules/@esbuild/linux-ppc64": { 397 397 + "version": "0.25.3", 398 398 + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.3.tgz", 399 399 + "integrity": "sha512-ZC4jV2p7VbzTlnl8nZKLcBkfzIf4Yad1SJM4ZMKYnJqZFD4rTI+pBG65u8ev4jk3/MPwY9DvGn50wi3uhdaghg==", 400 400 + "cpu": [ 401 401 + "ppc64" 402 402 + ], 403 403 + "dev": true, 404 404 + "license": "MIT", 405 405 + "optional": true, 406 406 + "os": [ 407 407 + "linux" 408 408 + ], 409 409 + "engines": { 410 410 + "node": ">=18" 411 411 + } 412 412 + }, 413 413 + "node_modules/@esbuild/linux-riscv64": { 414 414 + "version": "0.25.3", 415 415 + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.3.tgz", 416 416 + "integrity": "sha512-LDDODcFzNtECTrUUbVCs6j9/bDVqy7DDRsuIXJg6so+mFksgwG7ZVnTruYi5V+z3eE5y+BJZw7VvUadkbfg7QA==", 417 417 + "cpu": [ 418 418 + "riscv64" 419 419 + ], 420 420 + "dev": true, 421 421 + "license": "MIT", 422 422 + "optional": true, 423 423 + "os": [ 424 424 + "linux" 425 425 + ], 426 426 + "engines": { 427 427 + "node": ">=18" 428 428 + } 429 429 + }, 430 430 + "node_modules/@esbuild/linux-s390x": { 431 431 + "version": "0.25.3", 432 432 + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.3.tgz", 433 433 + "integrity": "sha512-s+w/NOY2k0yC2p9SLen+ymflgcpRkvwwa02fqmAwhBRI3SC12uiS10edHHXlVWwfAagYSY5UpmT/zISXPMW3tQ==", 434 434 + "cpu": [ 435 435 + "s390x" 436 436 + ], 437 437 + "dev": true, 438 438 + "license": "MIT", 439 439 + "optional": true, 440 440 + "os": [ 441 441 + "linux" 442 442 + ], 443 443 + "engines": { 444 444 + "node": ">=18" 445 445 + } 446 446 + }, 447 447 + "node_modules/@esbuild/linux-x64": { 448 448 + "version": "0.25.3", 449 449 + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.3.tgz", 450 450 + "integrity": "sha512-nQHDz4pXjSDC6UfOE1Fw9Q8d6GCAd9KdvMZpfVGWSJztYCarRgSDfOVBY5xwhQXseiyxapkiSJi/5/ja8mRFFA==", 451 451 + "cpu": [ 452 452 + "x64" 453 453 + ], 454 454 + "dev": true, 455 455 + "license": "MIT", 456 456 + "optional": true, 457 457 + "os": [ 458 458 + "linux" 459 459 + ], 460 460 + "engines": { 461 461 + "node": ">=18" 462 462 + } 463 463 + }, 464 464 + "node_modules/@esbuild/netbsd-arm64": { 465 465 + "version": "0.25.3", 466 466 + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.3.tgz", 467 467 + "integrity": "sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==", 468 468 + "cpu": [ 469 469 + "arm64" 470 470 + ], 471 471 + "dev": true, 472 472 + "license": "MIT", 473 473 + "optional": true, 474 474 + "os": [ 475 475 + "netbsd" 476 476 + ], 477 477 + "engines": { 478 478 + "node": ">=18" 479 479 + } 480 480 + }, 481 481 + "node_modules/@esbuild/netbsd-x64": { 482 482 + "version": "0.25.3", 483 483 + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.3.tgz", 484 484 + "integrity": "sha512-i5Hm68HXHdgv8wkrt+10Bc50zM0/eonPb/a/OFVfB6Qvpiirco5gBA5bz7S2SHuU+Y4LWn/zehzNX14Sp4r27g==", 485 485 + "cpu": [ 486 486 + "x64" 487 487 + ], 488 488 + "dev": true, 489 489 + "license": "MIT", 490 490 + "optional": true, 491 491 + "os": [ 492 492 + "netbsd" 493 493 + ], 494 494 + "engines": { 495 495 + "node": ">=18" 496 496 + } 497 497 + }, 498 498 + "node_modules/@esbuild/openbsd-arm64": { 499 499 + "version": "0.25.3", 500 500 + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.3.tgz", 501 501 + "integrity": "sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==", 502 502 + "cpu": [ 503 503 + "arm64" 504 504 + ], 505 505 + "dev": true, 506 506 + "license": "MIT", 507 507 + "optional": true, 508 508 + "os": [ 509 509 + "openbsd" 510 510 + ], 511 511 + "engines": { 512 512 + "node": ">=18" 513 513 + } 514 514 + }, 515 515 + "node_modules/@esbuild/openbsd-x64": { 516 516 + "version": "0.25.3", 517 517 + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.3.tgz", 518 518 + "integrity": "sha512-fpqctI45NnCIDKBH5AXQBsD0NDPbEFczK98hk/aa6HJxbl+UtLkJV2+Bvy5hLSLk3LHmqt0NTkKNso1A9y1a4w==", 519 519 + "cpu": [ 520 520 + "x64" 521 521 + ], 522 522 + "dev": true, 523 523 + "license": "MIT", 524 524 + "optional": true, 525 525 + "os": [ 526 526 + "openbsd" 527 527 + ], 528 528 + "engines": { 529 529 + "node": ">=18" 530 530 + } 531 531 + }, 532 532 + "node_modules/@esbuild/sunos-x64": { 533 533 + "version": "0.25.3", 534 534 + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.3.tgz", 535 535 + "integrity": "sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==", 536 536 + "cpu": [ 537 537 + "x64" 538 538 + ], 539 539 + "dev": true, 540 540 + "license": "MIT", 541 541 + "optional": true, 542 542 + "os": [ 543 543 + "sunos" 544 544 + ], 545 545 + "engines": { 546 546 + "node": ">=18" 547 547 + } 548 548 + }, 549 549 + "node_modules/@esbuild/win32-arm64": { 550 550 + "version": "0.25.3", 551 551 + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.3.tgz", 552 552 + "integrity": "sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==", 553 553 + "cpu": [ 554 554 + "arm64" 555 555 + ], 556 556 + "dev": true, 557 557 + "license": "MIT", 558 558 + "optional": true, 559 559 + "os": [ 560 560 + "win32" 561 561 + ], 562 562 + "engines": { 563 563 + "node": ">=18" 564 564 + } 565 565 + }, 566 566 + "node_modules/@esbuild/win32-ia32": { 567 567 + "version": "0.25.3", 568 568 + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.3.tgz", 569 569 + "integrity": "sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==", 570 570 + "cpu": [ 571 571 + "ia32" 572 572 + ], 573 573 + "dev": true, 574 574 + "license": "MIT", 575 575 + "optional": true, 576 576 + "os": [ 577 577 + "win32" 578 578 + ], 579 579 + "engines": { 580 580 + "node": ">=18" 581 581 + } 582 582 + }, 583 583 + "node_modules/@esbuild/win32-x64": { 584 584 + "version": "0.25.3", 585 585 + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.3.tgz", 586 586 + "integrity": "sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==", 587 587 + "cpu": [ 588 588 + "x64" 589 589 + ], 590 590 + "dev": true, 591 591 + "license": "MIT", 592 592 + "optional": true, 593 593 + "os": [ 594 594 + "win32" 595 595 + ], 596 596 + "engines": { 597 597 + "node": ">=18" 598 598 + } 599 599 + }, 600 600 + "node_modules/@fastify/busboy": { 601 601 + "version": "2.1.1", 602 602 + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz", 603 603 + "integrity": "sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==", 604 604 + "dev": true, 605 605 + "license": "MIT", 606 606 + "engines": { 607 607 + "node": ">=14" 608 608 + } 609 609 + }, 610 610 + "node_modules/@img/sharp-darwin-arm64": { 611 611 + "version": "0.33.5", 612 612 + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.33.5.tgz", 613 613 + "integrity": "sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==", 614 614 + "cpu": [ 615 615 + "arm64" 616 616 + ], 617 617 + "dev": true, 618 618 + "license": "Apache-2.0", 619 619 + "optional": true, 620 620 + "os": [ 621 621 + "darwin" 622 622 + ], 623 623 + "engines": { 624 624 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 625 625 + }, 626 626 + "funding": { 627 627 + "url": "https://opencollective.com/libvips" 628 628 + }, 629 629 + "optionalDependencies": { 630 630 + "@img/sharp-libvips-darwin-arm64": "1.0.4" 631 631 + } 632 632 + }, 633 633 + "node_modules/@img/sharp-darwin-x64": { 634 634 + "version": "0.33.5", 635 635 + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.33.5.tgz", 636 636 + "integrity": "sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==", 637 637 + "cpu": [ 638 638 + "x64" 639 639 + ], 640 640 + "dev": true, 641 641 + "license": "Apache-2.0", 642 642 + "optional": true, 643 643 + "os": [ 644 644 + "darwin" 645 645 + ], 646 646 + "engines": { 647 647 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 648 648 + }, 649 649 + "funding": { 650 650 + "url": "https://opencollective.com/libvips" 651 651 + }, 652 652 + "optionalDependencies": { 653 653 + "@img/sharp-libvips-darwin-x64": "1.0.4" 654 654 + } 655 655 + }, 656 656 + "node_modules/@img/sharp-libvips-darwin-arm64": { 657 657 + "version": "1.0.4", 658 658 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.0.4.tgz", 659 659 + "integrity": "sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==", 660 660 + "cpu": [ 661 661 + "arm64" 662 662 + ], 663 663 + "dev": true, 664 664 + "license": "LGPL-3.0-or-later", 665 665 + "optional": true, 666 666 + "os": [ 667 667 + "darwin" 668 668 + ], 669 669 + "funding": { 670 670 + "url": "https://opencollective.com/libvips" 671 671 + } 672 672 + }, 673 673 + "node_modules/@img/sharp-libvips-darwin-x64": { 674 674 + "version": "1.0.4", 675 675 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.0.4.tgz", 676 676 + "integrity": "sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==", 677 677 + "cpu": [ 678 678 + "x64" 679 679 + ], 680 680 + "dev": true, 681 681 + "license": "LGPL-3.0-or-later", 682 682 + "optional": true, 683 683 + "os": [ 684 684 + "darwin" 685 685 + ], 686 686 + "funding": { 687 687 + "url": "https://opencollective.com/libvips" 688 688 + } 689 689 + }, 690 690 + "node_modules/@img/sharp-libvips-linux-arm": { 691 691 + "version": "1.0.5", 692 692 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.0.5.tgz", 693 693 + "integrity": "sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==", 694 694 + "cpu": [ 695 695 + "arm" 696 696 + ], 697 697 + "dev": true, 698 698 + "license": "LGPL-3.0-or-later", 699 699 + "optional": true, 700 700 + "os": [ 701 701 + "linux" 702 702 + ], 703 703 + "funding": { 704 704 + "url": "https://opencollective.com/libvips" 705 705 + } 706 706 + }, 707 707 + "node_modules/@img/sharp-libvips-linux-arm64": { 708 708 + "version": "1.0.4", 709 709 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.0.4.tgz", 710 710 + "integrity": "sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==", 711 711 + "cpu": [ 712 712 + "arm64" 713 713 + ], 714 714 + "dev": true, 715 715 + "license": "LGPL-3.0-or-later", 716 716 + "optional": true, 717 717 + "os": [ 718 718 + "linux" 719 719 + ], 720 720 + "funding": { 721 721 + "url": "https://opencollective.com/libvips" 722 722 + } 723 723 + }, 724 724 + "node_modules/@img/sharp-libvips-linux-s390x": { 725 725 + "version": "1.0.4", 726 726 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.0.4.tgz", 727 727 + "integrity": "sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==", 728 728 + "cpu": [ 729 729 + "s390x" 730 730 + ], 731 731 + "dev": true, 732 732 + "license": "LGPL-3.0-or-later", 733 733 + "optional": true, 734 734 + "os": [ 735 735 + "linux" 736 736 + ], 737 737 + "funding": { 738 738 + "url": "https://opencollective.com/libvips" 739 739 + } 740 740 + }, 741 741 + "node_modules/@img/sharp-libvips-linux-x64": { 742 742 + "version": "1.0.4", 743 743 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.0.4.tgz", 744 744 + "integrity": "sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==", 745 745 + "cpu": [ 746 746 + "x64" 747 747 + ], 748 748 + "dev": true, 749 749 + "license": "LGPL-3.0-or-later", 750 750 + "optional": true, 751 751 + "os": [ 752 752 + "linux" 753 753 + ], 754 754 + "funding": { 755 755 + "url": "https://opencollective.com/libvips" 756 756 + } 757 757 + }, 758 758 + "node_modules/@img/sharp-libvips-linuxmusl-arm64": { 759 759 + "version": "1.0.4", 760 760 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.0.4.tgz", 761 761 + "integrity": "sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==", 762 762 + "cpu": [ 763 763 + "arm64" 764 764 + ], 765 765 + "dev": true, 766 766 + "license": "LGPL-3.0-or-later", 767 767 + "optional": true, 768 768 + "os": [ 769 769 + "linux" 770 770 + ], 771 771 + "funding": { 772 772 + "url": "https://opencollective.com/libvips" 773 773 + } 774 774 + }, 775 775 + "node_modules/@img/sharp-libvips-linuxmusl-x64": { 776 776 + "version": "1.0.4", 777 777 + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.0.4.tgz", 778 778 + "integrity": "sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==", 779 779 + "cpu": [ 780 780 + "x64" 781 781 + ], 782 782 + "dev": true, 783 783 + "license": "LGPL-3.0-or-later", 784 784 + "optional": true, 785 785 + "os": [ 786 786 + "linux" 787 787 + ], 788 788 + "funding": { 789 789 + "url": "https://opencollective.com/libvips" 790 790 + } 791 791 + }, 792 792 + "node_modules/@img/sharp-linux-arm": { 793 793 + "version": "0.33.5", 794 794 + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.33.5.tgz", 795 795 + "integrity": "sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==", 796 796 + "cpu": [ 797 797 + "arm" 798 798 + ], 799 799 + "dev": true, 800 800 + "license": "Apache-2.0", 801 801 + "optional": true, 802 802 + "os": [ 803 803 + "linux" 804 804 + ], 805 805 + "engines": { 806 806 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 807 807 + }, 808 808 + "funding": { 809 809 + "url": "https://opencollective.com/libvips" 810 810 + }, 811 811 + "optionalDependencies": { 812 812 + "@img/sharp-libvips-linux-arm": "1.0.5" 813 813 + } 814 814 + }, 815 815 + "node_modules/@img/sharp-linux-arm64": { 816 816 + "version": "0.33.5", 817 817 + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.33.5.tgz", 818 818 + "integrity": "sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==", 819 819 + "cpu": [ 820 820 + "arm64" 821 821 + ], 822 822 + "dev": true, 823 823 + "license": "Apache-2.0", 824 824 + "optional": true, 825 825 + "os": [ 826 826 + "linux" 827 827 + ], 828 828 + "engines": { 829 829 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 830 830 + }, 831 831 + "funding": { 832 832 + "url": "https://opencollective.com/libvips" 833 833 + }, 834 834 + "optionalDependencies": { 835 835 + "@img/sharp-libvips-linux-arm64": "1.0.4" 836 836 + } 837 837 + }, 838 838 + "node_modules/@img/sharp-linux-s390x": { 839 839 + "version": "0.33.5", 840 840 + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.33.5.tgz", 841 841 + "integrity": "sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==", 842 842 + "cpu": [ 843 843 + "s390x" 844 844 + ], 845 845 + "dev": true, 846 846 + "license": "Apache-2.0", 847 847 + "optional": true, 848 848 + "os": [ 849 849 + "linux" 850 850 + ], 851 851 + "engines": { 852 852 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 853 853 + }, 854 854 + "funding": { 855 855 + "url": "https://opencollective.com/libvips" 856 856 + }, 857 857 + "optionalDependencies": { 858 858 + "@img/sharp-libvips-linux-s390x": "1.0.4" 859 859 + } 860 860 + }, 861 861 + "node_modules/@img/sharp-linux-x64": { 862 862 + "version": "0.33.5", 863 863 + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.33.5.tgz", 864 864 + "integrity": "sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==", 865 865 + "cpu": [ 866 866 + "x64" 867 867 + ], 868 868 + "dev": true, 869 869 + "license": "Apache-2.0", 870 870 + "optional": true, 871 871 + "os": [ 872 872 + "linux" 873 873 + ], 874 874 + "engines": { 875 875 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 876 876 + }, 877 877 + "funding": { 878 878 + "url": "https://opencollective.com/libvips" 879 879 + }, 880 880 + "optionalDependencies": { 881 881 + "@img/sharp-libvips-linux-x64": "1.0.4" 882 882 + } 883 883 + }, 884 884 + "node_modules/@img/sharp-linuxmusl-arm64": { 885 885 + "version": "0.33.5", 886 886 + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.33.5.tgz", 887 887 + "integrity": "sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==", 888 888 + "cpu": [ 889 889 + "arm64" 890 890 + ], 891 891 + "dev": true, 892 892 + "license": "Apache-2.0", 893 893 + "optional": true, 894 894 + "os": [ 895 895 + "linux" 896 896 + ], 897 897 + "engines": { 898 898 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 899 899 + }, 900 900 + "funding": { 901 901 + "url": "https://opencollective.com/libvips" 902 902 + }, 903 903 + "optionalDependencies": { 904 904 + "@img/sharp-libvips-linuxmusl-arm64": "1.0.4" 905 905 + } 906 906 + }, 907 907 + "node_modules/@img/sharp-linuxmusl-x64": { 908 908 + "version": "0.33.5", 909 909 + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.33.5.tgz", 910 910 + "integrity": "sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==", 911 911 + "cpu": [ 912 912 + "x64" 913 913 + ], 914 914 + "dev": true, 915 915 + "license": "Apache-2.0", 916 916 + "optional": true, 917 917 + "os": [ 918 918 + "linux" 919 919 + ], 920 920 + "engines": { 921 921 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 922 922 + }, 923 923 + "funding": { 924 924 + "url": "https://opencollective.com/libvips" 925 925 + }, 926 926 + "optionalDependencies": { 927 927 + "@img/sharp-libvips-linuxmusl-x64": "1.0.4" 928 928 + } 929 929 + }, 930 930 + "node_modules/@img/sharp-wasm32": { 931 931 + "version": "0.33.5", 932 932 + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.33.5.tgz", 933 933 + "integrity": "sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==", 934 934 + "cpu": [ 935 935 + "wasm32" 936 936 + ], 937 937 + "dev": true, 938 938 + "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", 939 939 + "optional": true, 940 940 + "dependencies": { 941 941 + "@emnapi/runtime": "^1.2.0" 942 942 + }, 943 943 + "engines": { 944 944 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 945 945 + }, 946 946 + "funding": { 947 947 + "url": "https://opencollective.com/libvips" 948 948 + } 949 949 + }, 950 950 + "node_modules/@img/sharp-win32-ia32": { 951 951 + "version": "0.33.5", 952 952 + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.33.5.tgz", 953 953 + "integrity": "sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==", 954 954 + "cpu": [ 955 955 + "ia32" 956 956 + ], 957 957 + "dev": true, 958 958 + "license": "Apache-2.0 AND LGPL-3.0-or-later", 959 959 + "optional": true, 960 960 + "os": [ 961 961 + "win32" 962 962 + ], 963 963 + "engines": { 964 964 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 965 965 + }, 966 966 + "funding": { 967 967 + "url": "https://opencollective.com/libvips" 968 968 + } 969 969 + }, 970 970 + "node_modules/@img/sharp-win32-x64": { 971 971 + "version": "0.33.5", 972 972 + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.33.5.tgz", 973 973 + "integrity": "sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==", 974 974 + "cpu": [ 975 975 + "x64" 976 976 + ], 977 977 + "dev": true, 978 978 + "license": "Apache-2.0 AND LGPL-3.0-or-later", 979 979 + "optional": true, 980 980 + "os": [ 981 981 + "win32" 982 982 + ], 983 983 + "engines": { 984 984 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 985 985 + }, 986 986 + "funding": { 987 987 + "url": "https://opencollective.com/libvips" 988 988 + } 989 989 + }, 990 990 + "node_modules/@jridgewell/resolve-uri": { 991 991 + "version": "3.1.2", 992 992 + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", 993 993 + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", 994 994 + "dev": true, 995 995 + "license": "MIT", 996 996 + "engines": { 997 997 + "node": ">=6.0.0" 998 998 + } 999 999 + }, 1000 1000 + "node_modules/@jridgewell/sourcemap-codec": { 1001 1001 + "version": "1.5.0", 1002 1002 + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", 1003 1003 + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", 1004 1004 + "dev": true, 1005 1005 + "license": "MIT" 1006 1006 + }, 1007 1007 + "node_modules/@jridgewell/trace-mapping": { 1008 1008 + "version": "0.3.9", 1009 1009 + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", 1010 1010 + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", 1011 1011 + "dev": true, 1012 1012 + "license": "MIT", 1013 1013 + "dependencies": { 1014 1014 + "@jridgewell/resolve-uri": "^3.0.3", 1015 1015 + "@jridgewell/sourcemap-codec": "^1.4.10" 1016 1016 + } 1017 1017 + }, 1018 1018 + "node_modules/@rollup/rollup-android-arm-eabi": { 1019 1019 + "version": "4.40.1", 1020 1020 + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.1.tgz", 1021 1021 + "integrity": "sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==", 1022 1022 + "cpu": [ 1023 1023 + "arm" 1024 1024 + ], 1025 1025 + "dev": true, 1026 1026 + "license": "MIT", 1027 1027 + "optional": true, 1028 1028 + "os": [ 1029 1029 + "android" 1030 1030 + ] 1031 1031 + }, 1032 1032 + "node_modules/@rollup/rollup-android-arm64": { 1033 1033 + "version": "4.40.1", 1034 1034 + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.1.tgz", 1035 1035 + "integrity": "sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==", 1036 1036 + "cpu": [ 1037 1037 + "arm64" 1038 1038 + ], 1039 1039 + "dev": true, 1040 1040 + "license": "MIT", 1041 1041 + "optional": true, 1042 1042 + "os": [ 1043 1043 + "android" 1044 1044 + ] 1045 1045 + }, 1046 1046 + "node_modules/@rollup/rollup-darwin-arm64": { 1047 1047 + "version": "4.40.1", 1048 1048 + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.1.tgz", 1049 1049 + "integrity": "sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA==", 1050 1050 + "cpu": [ 1051 1051 + "arm64" 1052 1052 + ], 1053 1053 + "dev": true, 1054 1054 + "license": "MIT", 1055 1055 + "optional": true, 1056 1056 + "os": [ 1057 1057 + "darwin" 1058 1058 + ] 1059 1059 + }, 1060 1060 + "node_modules/@rollup/rollup-darwin-x64": { 1061 1061 + "version": "4.40.1", 1062 1062 + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.1.tgz", 1063 1063 + "integrity": "sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==", 1064 1064 + "cpu": [ 1065 1065 + "x64" 1066 1066 + ], 1067 1067 + "dev": true, 1068 1068 + "license": "MIT", 1069 1069 + "optional": true, 1070 1070 + "os": [ 1071 1071 + "darwin" 1072 1072 + ] 1073 1073 + }, 1074 1074 + "node_modules/@rollup/rollup-freebsd-arm64": { 1075 1075 + "version": "4.40.1", 1076 1076 + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.1.tgz", 1077 1077 + "integrity": "sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==", 1078 1078 + "cpu": [ 1079 1079 + "arm64" 1080 1080 + ], 1081 1081 + "dev": true, 1082 1082 + "license": "MIT", 1083 1083 + "optional": true, 1084 1084 + "os": [ 1085 1085 + "freebsd" 1086 1086 + ] 1087 1087 + }, 1088 1088 + "node_modules/@rollup/rollup-freebsd-x64": { 1089 1089 + "version": "4.40.1", 1090 1090 + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.1.tgz", 1091 1091 + "integrity": "sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==", 1092 1092 + "cpu": [ 1093 1093 + "x64" 1094 1094 + ], 1095 1095 + "dev": true, 1096 1096 + "license": "MIT", 1097 1097 + "optional": true, 1098 1098 + "os": [ 1099 1099 + "freebsd" 1100 1100 + ] 1101 1101 + }, 1102 1102 + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { 1103 1103 + "version": "4.40.1", 1104 1104 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.1.tgz", 1105 1105 + "integrity": "sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==", 1106 1106 + "cpu": [ 1107 1107 + "arm" 1108 1108 + ], 1109 1109 + "dev": true, 1110 1110 + "license": "MIT", 1111 1111 + "optional": true, 1112 1112 + "os": [ 1113 1113 + "linux" 1114 1114 + ] 1115 1115 + }, 1116 1116 + "node_modules/@rollup/rollup-linux-arm-musleabihf": { 1117 1117 + "version": "4.40.1", 1118 1118 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.1.tgz", 1119 1119 + "integrity": "sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==", 1120 1120 + "cpu": [ 1121 1121 + "arm" 1122 1122 + ], 1123 1123 + "dev": true, 1124 1124 + "license": "MIT", 1125 1125 + "optional": true, 1126 1126 + "os": [ 1127 1127 + "linux" 1128 1128 + ] 1129 1129 + }, 1130 1130 + "node_modules/@rollup/rollup-linux-arm64-gnu": { 1131 1131 + "version": "4.40.1", 1132 1132 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.1.tgz", 1133 1133 + "integrity": "sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==", 1134 1134 + "cpu": [ 1135 1135 + "arm64" 1136 1136 + ], 1137 1137 + "dev": true, 1138 1138 + "license": "MIT", 1139 1139 + "optional": true, 1140 1140 + "os": [ 1141 1141 + "linux" 1142 1142 + ] 1143 1143 + }, 1144 1144 + "node_modules/@rollup/rollup-linux-arm64-musl": { 1145 1145 + "version": "4.40.1", 1146 1146 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.1.tgz", 1147 1147 + "integrity": "sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==", 1148 1148 + "cpu": [ 1149 1149 + "arm64" 1150 1150 + ], 1151 1151 + "dev": true, 1152 1152 + "license": "MIT", 1153 1153 + "optional": true, 1154 1154 + "os": [ 1155 1155 + "linux" 1156 1156 + ] 1157 1157 + }, 1158 1158 + "node_modules/@rollup/rollup-linux-loongarch64-gnu": { 1159 1159 + "version": "4.40.1", 1160 1160 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.1.tgz", 1161 1161 + "integrity": "sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==", 1162 1162 + "cpu": [ 1163 1163 + "loong64" 1164 1164 + ], 1165 1165 + "dev": true, 1166 1166 + "license": "MIT", 1167 1167 + "optional": true, 1168 1168 + "os": [ 1169 1169 + "linux" 1170 1170 + ] 1171 1171 + }, 1172 1172 + "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { 1173 1173 + "version": "4.40.1", 1174 1174 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.1.tgz", 1175 1175 + "integrity": "sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==", 1176 1176 + "cpu": [ 1177 1177 + "ppc64" 1178 1178 + ], 1179 1179 + "dev": true, 1180 1180 + "license": "MIT", 1181 1181 + "optional": true, 1182 1182 + "os": [ 1183 1183 + "linux" 1184 1184 + ] 1185 1185 + }, 1186 1186 + "node_modules/@rollup/rollup-linux-riscv64-gnu": { 1187 1187 + "version": "4.40.1", 1188 1188 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.1.tgz", 1189 1189 + "integrity": "sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==", 1190 1190 + "cpu": [ 1191 1191 + "riscv64" 1192 1192 + ], 1193 1193 + "dev": true, 1194 1194 + "license": "MIT", 1195 1195 + "optional": true, 1196 1196 + "os": [ 1197 1197 + "linux" 1198 1198 + ] 1199 1199 + }, 1200 1200 + "node_modules/@rollup/rollup-linux-riscv64-musl": { 1201 1201 + "version": "4.40.1", 1202 1202 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.1.tgz", 1203 1203 + "integrity": "sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==", 1204 1204 + "cpu": [ 1205 1205 + "riscv64" 1206 1206 + ], 1207 1207 + "dev": true, 1208 1208 + "license": "MIT", 1209 1209 + "optional": true, 1210 1210 + "os": [ 1211 1211 + "linux" 1212 1212 + ] 1213 1213 + }, 1214 1214 + "node_modules/@rollup/rollup-linux-s390x-gnu": { 1215 1215 + "version": "4.40.1", 1216 1216 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.1.tgz", 1217 1217 + "integrity": "sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==", 1218 1218 + "cpu": [ 1219 1219 + "s390x" 1220 1220 + ], 1221 1221 + "dev": true, 1222 1222 + "license": "MIT", 1223 1223 + "optional": true, 1224 1224 + "os": [ 1225 1225 + "linux" 1226 1226 + ] 1227 1227 + }, 1228 1228 + "node_modules/@rollup/rollup-linux-x64-gnu": { 1229 1229 + "version": "4.40.1", 1230 1230 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.1.tgz", 1231 1231 + "integrity": "sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ==", 1232 1232 + "cpu": [ 1233 1233 + "x64" 1234 1234 + ], 1235 1235 + "dev": true, 1236 1236 + "license": "MIT", 1237 1237 + "optional": true, 1238 1238 + "os": [ 1239 1239 + "linux" 1240 1240 + ] 1241 1241 + }, 1242 1242 + "node_modules/@rollup/rollup-linux-x64-musl": { 1243 1243 + "version": "4.40.1", 1244 1244 + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.1.tgz", 1245 1245 + "integrity": "sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==", 1246 1246 + "cpu": [ 1247 1247 + "x64" 1248 1248 + ], 1249 1249 + "dev": true, 1250 1250 + "license": "MIT", 1251 1251 + "optional": true, 1252 1252 + "os": [ 1253 1253 + "linux" 1254 1254 + ] 1255 1255 + }, 1256 1256 + "node_modules/@rollup/rollup-win32-arm64-msvc": { 1257 1257 + "version": "4.40.1", 1258 1258 + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.1.tgz", 1259 1259 + "integrity": "sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==", 1260 1260 + "cpu": [ 1261 1261 + "arm64" 1262 1262 + ], 1263 1263 + "dev": true, 1264 1264 + "license": "MIT", 1265 1265 + "optional": true, 1266 1266 + "os": [ 1267 1267 + "win32" 1268 1268 + ] 1269 1269 + }, 1270 1270 + "node_modules/@rollup/rollup-win32-ia32-msvc": { 1271 1271 + "version": "4.40.1", 1272 1272 + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.1.tgz", 1273 1273 + "integrity": "sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==", 1274 1274 + "cpu": [ 1275 1275 + "ia32" 1276 1276 + ], 1277 1277 + "dev": true, 1278 1278 + "license": "MIT", 1279 1279 + "optional": true, 1280 1280 + "os": [ 1281 1281 + "win32" 1282 1282 + ] 1283 1283 + }, 1284 1284 + "node_modules/@rollup/rollup-win32-x64-msvc": { 1285 1285 + "version": "4.40.1", 1286 1286 + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.1.tgz", 1287 1287 + "integrity": "sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==", 1288 1288 + "cpu": [ 1289 1289 + "x64" 1290 1290 + ], 1291 1291 + "dev": true, 1292 1292 + "license": "MIT", 1293 1293 + "optional": true, 1294 1294 + "os": [ 1295 1295 + "win32" 1296 1296 + ] 1297 1297 + }, 1298 1298 + "node_modules/@types/estree": { 1299 1299 + "version": "1.0.7", 1300 1300 + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", 1301 1301 + "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", 1302 1302 + "dev": true, 1303 1303 + "license": "MIT" 1304 1304 + }, 1305 1305 + "node_modules/@vitest/expect": { 1306 1306 + "version": "3.0.9", 1307 1307 + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.0.9.tgz", 1308 1308 + "integrity": "sha512-5eCqRItYgIML7NNVgJj6TVCmdzE7ZVgJhruW0ziSQV4V7PvLkDL1bBkBdcTs/VuIz0IxPb5da1IDSqc1TR9eig==", 1309 1309 + "dev": true, 1310 1310 + "license": "MIT", 1311 1311 + "dependencies": { 1312 1312 + "@vitest/spy": "3.0.9", 1313 1313 + "@vitest/utils": "3.0.9", 1314 1314 + "chai": "^5.2.0", 1315 1315 + "tinyrainbow": "^2.0.0" 1316 1316 + }, 1317 1317 + "funding": { 1318 1318 + "url": "https://opencollective.com/vitest" 1319 1319 + } 1320 1320 + }, 1321 1321 + "node_modules/@vitest/mocker": { 1322 1322 + "version": "3.0.9", 1323 1323 + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.0.9.tgz", 1324 1324 + "integrity": "sha512-ryERPIBOnvevAkTq+L1lD+DTFBRcjueL9lOUfXsLfwP92h4e+Heb+PjiqS3/OURWPtywfafK0kj++yDFjWUmrA==", 1325 1325 + "dev": true, 1326 1326 + "license": "MIT", 1327 1327 + "dependencies": { 1328 1328 + "@vitest/spy": "3.0.9", 1329 1329 + "estree-walker": "^3.0.3", 1330 1330 + "magic-string": "^0.30.17" 1331 1331 + }, 1332 1332 + "funding": { 1333 1333 + "url": "https://opencollective.com/vitest" 1334 1334 + }, 1335 1335 + "peerDependencies": { 1336 1336 + "msw": "^2.4.9", 1337 1337 + "vite": "^5.0.0 || ^6.0.0" 1338 1338 + }, 1339 1339 + "peerDependenciesMeta": { 1340 1340 + "msw": { 1341 1341 + "optional": true 1342 1342 + }, 1343 1343 + "vite": { 1344 1344 + "optional": true 1345 1345 + } 1346 1346 + } 1347 1347 + }, 1348 1348 + "node_modules/@vitest/pretty-format": { 1349 1349 + "version": "3.1.2", 1350 1350 + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.2.tgz", 1351 1351 + "integrity": "sha512-R0xAiHuWeDjTSB3kQ3OQpT8Rx3yhdOAIm/JM4axXxnG7Q/fS8XUwggv/A4xzbQA+drYRjzkMnpYnOGAc4oeq8w==", 1352 1352 + "dev": true, 1353 1353 + "license": "MIT", 1354 1354 + "dependencies": { 1355 1355 + "tinyrainbow": "^2.0.0" 1356 1356 + }, 1357 1357 + "funding": { 1358 1358 + "url": "https://opencollective.com/vitest" 1359 1359 + } 1360 1360 + }, 1361 1361 + "node_modules/@vitest/runner": { 1362 1362 + "version": "3.0.9", 1363 1363 + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.0.9.tgz", 1364 1364 + "integrity": "sha512-NX9oUXgF9HPfJSwl8tUZCMP1oGx2+Sf+ru6d05QjzQz4OwWg0psEzwY6VexP2tTHWdOkhKHUIZH+fS6nA7jfOw==", 1365 1365 + "dev": true, 1366 1366 + "license": "MIT", 1367 1367 + "dependencies": { 1368 1368 + "@vitest/utils": "3.0.9", 1369 1369 + "pathe": "^2.0.3" 1370 1370 + }, 1371 1371 + "funding": { 1372 1372 + "url": "https://opencollective.com/vitest" 1373 1373 + } 1374 1374 + }, 1375 1375 + "node_modules/@vitest/snapshot": { 1376 1376 + "version": "3.0.9", 1377 1377 + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.0.9.tgz", 1378 1378 + "integrity": "sha512-AiLUiuZ0FuA+/8i19mTYd+re5jqjEc2jZbgJ2up0VY0Ddyyxg/uUtBDpIFAy4uzKaQxOW8gMgBdAJJ2ydhu39A==", 1379 1379 + "dev": true, 1380 1380 + "license": "MIT", 1381 1381 + "dependencies": { 1382 1382 + "@vitest/pretty-format": "3.0.9", 1383 1383 + "magic-string": "^0.30.17", 1384 1384 + "pathe": "^2.0.3" 1385 1385 + }, 1386 1386 + "funding": { 1387 1387 + "url": "https://opencollective.com/vitest" 1388 1388 + } 1389 1389 + }, 1390 1390 + "node_modules/@vitest/snapshot/node_modules/@vitest/pretty-format": { 1391 1391 + "version": "3.0.9", 1392 1392 + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.9.tgz", 1393 1393 + "integrity": "sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==", 1394 1394 + "dev": true, 1395 1395 + "license": "MIT", 1396 1396 + "dependencies": { 1397 1397 + "tinyrainbow": "^2.0.0" 1398 1398 + }, 1399 1399 + "funding": { 1400 1400 + "url": "https://opencollective.com/vitest" 1401 1401 + } 1402 1402 + }, 1403 1403 + "node_modules/@vitest/spy": { 1404 1404 + "version": "3.0.9", 1405 1405 + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.0.9.tgz", 1406 1406 + "integrity": "sha512-/CcK2UDl0aQ2wtkp3YVWldrpLRNCfVcIOFGlVGKO4R5eajsH393Z1yiXLVQ7vWsj26JOEjeZI0x5sm5P4OGUNQ==", 1407 1407 + "dev": true, 1408 1408 + "license": "MIT", 1409 1409 + "dependencies": { 1410 1410 + "tinyspy": "^3.0.2" 1411 1411 + }, 1412 1412 + "funding": { 1413 1413 + "url": "https://opencollective.com/vitest" 1414 1414 + } 1415 1415 + }, 1416 1416 + "node_modules/@vitest/utils": { 1417 1417 + "version": "3.0.9", 1418 1418 + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.0.9.tgz", 1419 1419 + "integrity": "sha512-ilHM5fHhZ89MCp5aAaM9uhfl1c2JdxVxl3McqsdVyVNN6JffnEen8UMCdRTzOhGXNQGo5GNL9QugHrz727Wnng==", 1420 1420 + "dev": true, 1421 1421 + "license": "MIT", 1422 1422 + "dependencies": { 1423 1423 + "@vitest/pretty-format": "3.0.9", 1424 1424 + "loupe": "^3.1.3", 1425 1425 + "tinyrainbow": "^2.0.0" 1426 1426 + }, 1427 1427 + "funding": { 1428 1428 + "url": "https://opencollective.com/vitest" 1429 1429 + } 1430 1430 + }, 1431 1431 + "node_modules/@vitest/utils/node_modules/@vitest/pretty-format": { 1432 1432 + "version": "3.0.9", 1433 1433 + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.0.9.tgz", 1434 1434 + "integrity": "sha512-OW9F8t2J3AwFEwENg3yMyKWweF7oRJlMyHOMIhO5F3n0+cgQAJZBjNgrF8dLwFTEXl5jUqBLXd9QyyKv8zEcmA==", 1435 1435 + "dev": true, 1436 1436 + "license": "MIT", 1437 1437 + "dependencies": { 1438 1438 + "tinyrainbow": "^2.0.0" 1439 1439 + }, 1440 1440 + "funding": { 1441 1441 + "url": "https://opencollective.com/vitest" 1442 1442 + } 1443 1443 + }, 1444 1444 + "node_modules/acorn": { 1445 1445 + "version": "8.14.0", 1446 1446 + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz", 1447 1447 + "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==", 1448 1448 + "dev": true, 1449 1449 + "license": "MIT", 1450 1450 + "bin": { 1451 1451 + "acorn": "bin/acorn" 1452 1452 + }, 1453 1453 + "engines": { 1454 1454 + "node": ">=0.4.0" 1455 1455 + } 1456 1456 + }, 1457 1457 + "node_modules/acorn-walk": { 1458 1458 + "version": "8.3.2", 1459 1459 + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", 1460 1460 + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", 1461 1461 + "dev": true, 1462 1462 + "license": "MIT", 1463 1463 + "engines": { 1464 1464 + "node": ">=0.4.0" 1465 1465 + } 1466 1466 + }, 1467 1467 + "node_modules/as-table": { 1468 1468 + "version": "1.0.55", 1469 1469 + "resolved": "https://registry.npmjs.org/as-table/-/as-table-1.0.55.tgz", 1470 1470 + "integrity": "sha512-xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==", 1471 1471 + "dev": true, 1472 1472 + "license": "MIT", 1473 1473 + "dependencies": { 1474 1474 + "printable-characters": "^1.0.42" 1475 1475 + } 1476 1476 + }, 1477 1477 + "node_modules/assertion-error": { 1478 1478 + "version": "2.0.1", 1479 1479 + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", 1480 1480 + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", 1481 1481 + "dev": true, 1482 1482 + "license": "MIT", 1483 1483 + "engines": { 1484 1484 + "node": ">=12" 1485 1485 + } 1486 1486 + }, 1487 1487 + "node_modules/birpc": { 1488 1488 + "version": "0.2.14", 1489 1489 + "resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.14.tgz", 1490 1490 + "integrity": "sha512-37FHE8rqsYM5JEKCnXFyHpBCzvgHEExwVVTq+nUmloInU7l8ezD1TpOhKpS8oe1DTYFqEK27rFZVKG43oTqXRA==", 1491 1491 + "dev": true, 1492 1492 + "license": "MIT", 1493 1493 + "funding": { 1494 1494 + "url": "https://github.com/sponsors/antfu" 1495 1495 + } 1496 1496 + }, 1497 1497 + "node_modules/blake3-wasm": { 1498 1498 + "version": "2.1.5", 1499 1499 + "resolved": "https://registry.npmjs.org/blake3-wasm/-/blake3-wasm-2.1.5.tgz", 1500 1500 + "integrity": "sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==", 1501 1501 + "dev": true, 1502 1502 + "license": "MIT" 1503 1503 + }, 1504 1504 + "node_modules/cac": { 1505 1505 + "version": "6.7.14", 1506 1506 + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", 1507 1507 + "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", 1508 1508 + "dev": true, 1509 1509 + "license": "MIT", 1510 1510 + "engines": { 1511 1511 + "node": ">=8" 1512 1512 + } 1513 1513 + }, 1514 1514 + "node_modules/chai": { 1515 1515 + "version": "5.2.0", 1516 1516 + "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz", 1517 1517 + "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==", 1518 1518 + "dev": true, 1519 1519 + "license": "MIT", 1520 1520 + "dependencies": { 1521 1521 + "assertion-error": "^2.0.1", 1522 1522 + "check-error": "^2.1.1", 1523 1523 + "deep-eql": "^5.0.1", 1524 1524 + "loupe": "^3.1.0", 1525 1525 + "pathval": "^2.0.0" 1526 1526 + }, 1527 1527 + "engines": { 1528 1528 + "node": ">=12" 1529 1529 + } 1530 1530 + }, 1531 1531 + "node_modules/check-error": { 1532 1532 + "version": "2.1.1", 1533 1533 + "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", 1534 1534 + "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", 1535 1535 + "dev": true, 1536 1536 + "license": "MIT", 1537 1537 + "engines": { 1538 1538 + "node": ">= 16" 1539 1539 + } 1540 1540 + }, 1541 1541 + "node_modules/cjs-module-lexer": { 1542 1542 + "version": "1.4.3", 1543 1543 + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz", 1544 1544 + "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q==", 1545 1545 + "dev": true, 1546 1546 + "license": "MIT" 1547 1547 + }, 1548 1548 + "node_modules/color": { 1549 1549 + "version": "4.2.3", 1550 1550 + "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz", 1551 1551 + "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==", 1552 1552 + "dev": true, 1553 1553 + "license": "MIT", 1554 1554 + "optional": true, 1555 1555 + "dependencies": { 1556 1556 + "color-convert": "^2.0.1", 1557 1557 + "color-string": "^1.9.0" 1558 1558 + }, 1559 1559 + "engines": { 1560 1560 + "node": ">=12.5.0" 1561 1561 + } 1562 1562 + }, 1563 1563 + "node_modules/color-convert": { 1564 1564 + "version": "2.0.1", 1565 1565 + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", 1566 1566 + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", 1567 1567 + "dev": true, 1568 1568 + "license": "MIT", 1569 1569 + "optional": true, 1570 1570 + "dependencies": { 1571 1571 + "color-name": "~1.1.4" 1572 1572 + }, 1573 1573 + "engines": { 1574 1574 + "node": ">=7.0.0" 1575 1575 + } 1576 1576 + }, 1577 1577 + "node_modules/color-name": { 1578 1578 + "version": "1.1.4", 1579 1579 + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", 1580 1580 + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", 1581 1581 + "dev": true, 1582 1582 + "license": "MIT", 1583 1583 + "optional": true 1584 1584 + }, 1585 1585 + "node_modules/color-string": { 1586 1586 + "version": "1.9.1", 1587 1587 + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", 1588 1588 + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", 1589 1589 + "dev": true, 1590 1590 + "license": "MIT", 1591 1591 + "optional": true, 1592 1592 + "dependencies": { 1593 1593 + "color-name": "^1.0.0", 1594 1594 + "simple-swizzle": "^0.2.2" 1595 1595 + } 1596 1596 + }, 1597 1597 + "node_modules/cookie": { 1598 1598 + "version": "0.7.2", 1599 1599 + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", 1600 1600 + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", 1601 1601 + "dev": true, 1602 1602 + "license": "MIT", 1603 1603 + "engines": { 1604 1604 + "node": ">= 0.6" 1605 1605 + } 1606 1606 + }, 1607 1607 + "node_modules/data-uri-to-buffer": { 1608 1608 + "version": "2.0.2", 1609 1609 + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.2.tgz", 1610 1610 + "integrity": "sha512-ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==", 1611 1611 + "dev": true, 1612 1612 + "license": "MIT" 1613 1613 + }, 1614 1614 + "node_modules/debug": { 1615 1615 + "version": "4.4.0", 1616 1616 + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz", 1617 1617 + "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==", 1618 1618 + "dev": true, 1619 1619 + "license": "MIT", 1620 1620 + "dependencies": { 1621 1621 + "ms": "^2.1.3" 1622 1622 + }, 1623 1623 + "engines": { 1624 1624 + "node": ">=6.0" 1625 1625 + }, 1626 1626 + "peerDependenciesMeta": { 1627 1627 + "supports-color": { 1628 1628 + "optional": true 1629 1629 + } 1630 1630 + } 1631 1631 + }, 1632 1632 + "node_modules/deep-eql": { 1633 1633 + "version": "5.0.2", 1634 1634 + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", 1635 1635 + "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==", 1636 1636 + "dev": true, 1637 1637 + "license": "MIT", 1638 1638 + "engines": { 1639 1639 + "node": ">=6" 1640 1640 + } 1641 1641 + }, 1642 1642 + "node_modules/defu": { 1643 1643 + "version": "6.1.4", 1644 1644 + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz", 1645 1645 + "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==", 1646 1646 + "dev": true, 1647 1647 + "license": "MIT" 1648 1648 + }, 1649 1649 + "node_modules/detect-libc": { 1650 1650 + "version": "2.0.4", 1651 1651 + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", 1652 1652 + "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", 1653 1653 + "dev": true, 1654 1654 + "license": "Apache-2.0", 1655 1655 + "optional": true, 1656 1656 + "engines": { 1657 1657 + "node": ">=8" 1658 1658 + } 1659 1659 + }, 1660 1660 + "node_modules/devalue": { 1661 1661 + "version": "4.3.3", 1662 1662 + "resolved": "https://registry.npmjs.org/devalue/-/devalue-4.3.3.tgz", 1663 1663 + "integrity": "sha512-UH8EL6H2ifcY8TbD2QsxwCC/pr5xSwPvv85LrLXVihmHVC3T3YqTCIwnR5ak0yO1KYqlxrPVOA/JVZJYPy2ATg==", 1664 1664 + "dev": true, 1665 1665 + "license": "MIT" 1666 1666 + }, 1667 1667 + "node_modules/es-module-lexer": { 1668 1668 + "version": "1.7.0", 1669 1669 + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.7.0.tgz", 1670 1670 + "integrity": "sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==", 1671 1671 + "dev": true, 1672 1672 + "license": "MIT" 1673 1673 + }, 1674 1674 + "node_modules/esbuild": { 1675 1675 + "version": "0.25.3", 1676 1676 + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.3.tgz", 1677 1677 + "integrity": "sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==", 1678 1678 + "dev": true, 1679 1679 + "hasInstallScript": true, 1680 1680 + "license": "MIT", 1681 1681 + "bin": { 1682 1682 + "esbuild": "bin/esbuild" 1683 1683 + }, 1684 1684 + "engines": { 1685 1685 + "node": ">=18" 1686 1686 + }, 1687 1687 + "optionalDependencies": { 1688 1688 + "@esbuild/aix-ppc64": "0.25.3", 1689 1689 + "@esbuild/android-arm": "0.25.3", 1690 1690 + "@esbuild/android-arm64": "0.25.3", 1691 1691 + "@esbuild/android-x64": "0.25.3", 1692 1692 + "@esbuild/darwin-arm64": "0.25.3", 1693 1693 + "@esbuild/darwin-x64": "0.25.3", 1694 1694 + "@esbuild/freebsd-arm64": "0.25.3", 1695 1695 + "@esbuild/freebsd-x64": "0.25.3", 1696 1696 + "@esbuild/linux-arm": "0.25.3", 1697 1697 + "@esbuild/linux-arm64": "0.25.3", 1698 1698 + "@esbuild/linux-ia32": "0.25.3", 1699 1699 + "@esbuild/linux-loong64": "0.25.3", 1700 1700 + "@esbuild/linux-mips64el": "0.25.3", 1701 1701 + "@esbuild/linux-ppc64": "0.25.3", 1702 1702 + "@esbuild/linux-riscv64": "0.25.3", 1703 1703 + "@esbuild/linux-s390x": "0.25.3", 1704 1704 + "@esbuild/linux-x64": "0.25.3", 1705 1705 + "@esbuild/netbsd-arm64": "0.25.3", 1706 1706 + "@esbuild/netbsd-x64": "0.25.3", 1707 1707 + "@esbuild/openbsd-arm64": "0.25.3", 1708 1708 + "@esbuild/openbsd-x64": "0.25.3", 1709 1709 + "@esbuild/sunos-x64": "0.25.3", 1710 1710 + "@esbuild/win32-arm64": "0.25.3", 1711 1711 + "@esbuild/win32-ia32": "0.25.3", 1712 1712 + "@esbuild/win32-x64": "0.25.3" 1713 1713 + } 1714 1714 + }, 1715 1715 + "node_modules/estree-walker": { 1716 1716 + "version": "3.0.3", 1717 1717 + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", 1718 1718 + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", 1719 1719 + "dev": true, 1720 1720 + "license": "MIT", 1721 1721 + "dependencies": { 1722 1722 + "@types/estree": "^1.0.0" 1723 1723 + } 1724 1724 + }, 1725 1725 + "node_modules/exit-hook": { 1726 1726 + "version": "2.2.1", 1727 1727 + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz", 1728 1728 + "integrity": "sha512-eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==", 1729 1729 + "dev": true, 1730 1730 + "license": "MIT", 1731 1731 + "engines": { 1732 1732 + "node": ">=6" 1733 1733 + }, 1734 1734 + "funding": { 1735 1735 + "url": "https://github.com/sponsors/sindresorhus" 1736 1736 + } 1737 1737 + }, 1738 1738 + "node_modules/expect-type": { 1739 1739 + "version": "1.2.1", 1740 1740 + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz", 1741 1741 + "integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==", 1742 1742 + "dev": true, 1743 1743 + "license": "Apache-2.0", 1744 1744 + "engines": { 1745 1745 + "node": ">=12.0.0" 1746 1746 + } 1747 1747 + }, 1748 1748 + "node_modules/exsolve": { 1749 1749 + "version": "1.0.5", 1750 1750 + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.5.tgz", 1751 1751 + "integrity": "sha512-pz5dvkYYKQ1AHVrgOzBKWeP4u4FRb3a6DNK2ucr0OoNwYIU4QWsJ+NM36LLzORT+z845MzKHHhpXiUF5nvQoJg==", 1752 1752 + "dev": true, 1753 1753 + "license": "MIT" 1754 1754 + }, 1755 1755 + "node_modules/fdir": { 1756 1756 + "version": "6.4.4", 1757 1757 + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", 1758 1758 + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", 1759 1759 + "dev": true, 1760 1760 + "license": "MIT", 1761 1761 + "peerDependencies": { 1762 1762 + "picomatch": "^3 || ^4" 1763 1763 + }, 1764 1764 + "peerDependenciesMeta": { 1765 1765 + "picomatch": { 1766 1766 + "optional": true 1767 1767 + } 1768 1768 + } 1769 1769 + }, 1770 1770 + "node_modules/fsevents": { 1771 1771 + "version": "2.3.3", 1772 1772 + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", 1773 1773 + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", 1774 1774 + "dev": true, 1775 1775 + "hasInstallScript": true, 1776 1776 + "license": "MIT", 1777 1777 + "optional": true, 1778 1778 + "os": [ 1779 1779 + "darwin" 1780 1780 + ], 1781 1781 + "engines": { 1782 1782 + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" 1783 1783 + } 1784 1784 + }, 1785 1785 + "node_modules/get-source": { 1786 1786 + "version": "2.0.12", 1787 1787 + "resolved": "https://registry.npmjs.org/get-source/-/get-source-2.0.12.tgz", 1788 1788 + "integrity": "sha512-X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w==", 1789 1789 + "dev": true, 1790 1790 + "license": "Unlicense", 1791 1791 + "dependencies": { 1792 1792 + "data-uri-to-buffer": "^2.0.0", 1793 1793 + "source-map": "^0.6.1" 1794 1794 + } 1795 1795 + }, 1796 1796 + "node_modules/glob-to-regexp": { 1797 1797 + "version": "0.4.1", 1798 1798 + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", 1799 1799 + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", 1800 1800 + "dev": true, 1801 1801 + "license": "BSD-2-Clause" 1802 1802 + }, 1803 1803 + "node_modules/is-arrayish": { 1804 1804 + "version": "0.3.2", 1805 1805 + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", 1806 1806 + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", 1807 1807 + "dev": true, 1808 1808 + "license": "MIT", 1809 1809 + "optional": true 1810 1810 + }, 1811 1811 + "node_modules/loupe": { 1812 1812 + "version": "3.1.3", 1813 1813 + "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", 1814 1814 + "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==", 1815 1815 + "dev": true, 1816 1816 + "license": "MIT" 1817 1817 + }, 1818 1818 + "node_modules/magic-string": { 1819 1819 + "version": "0.30.17", 1820 1820 + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz", 1821 1821 + "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==", 1822 1822 + "dev": true, 1823 1823 + "license": "MIT", 1824 1824 + "dependencies": { 1825 1825 + "@jridgewell/sourcemap-codec": "^1.5.0" 1826 1826 + } 1827 1827 + }, 1828 1828 + "node_modules/mime": { 1829 1829 + "version": "3.0.0", 1830 1830 + "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", 1831 1831 + "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", 1832 1832 + "dev": true, 1833 1833 + "license": "MIT", 1834 1834 + "bin": { 1835 1835 + "mime": "cli.js" 1836 1836 + }, 1837 1837 + "engines": { 1838 1838 + "node": ">=10.0.0" 1839 1839 + } 1840 1840 + }, 1841 1841 + "node_modules/miniflare": { 1842 1842 + "version": "4.20250428.1", 1843 1843 + "resolved": "https://registry.npmjs.org/miniflare/-/miniflare-4.20250428.1.tgz", 1844 1844 + "integrity": "sha512-M3qcJXjeAEimHrEeWXEhrJiC3YHB5M3QSqqK67pOTI+lHn0QyVG/2iFUjVJ/nv+i10uxeAEva8GRGeu+tKRCmQ==", 1845 1845 + "dev": true, 1846 1846 + "license": "MIT", 1847 1847 + "dependencies": { 1848 1848 + "@cspotcode/source-map-support": "0.8.1", 1849 1849 + "acorn": "8.14.0", 1850 1850 + "acorn-walk": "8.3.2", 1851 1851 + "exit-hook": "2.2.1", 1852 1852 + "glob-to-regexp": "0.4.1", 1853 1853 + "stoppable": "1.1.0", 1854 1854 + "undici": "^5.28.5", 1855 1855 + "workerd": "1.20250428.0", 1856 1856 + "ws": "8.18.0", 1857 1857 + "youch": "3.3.4", 1858 1858 + "zod": "3.22.3" 1859 1859 + }, 1860 1860 + "bin": { 1861 1861 + "miniflare": "bootstrap.js" 1862 1862 + }, 1863 1863 + "engines": { 1864 1864 + "node": ">=18.0.0" 1865 1865 + } 1866 1866 + }, 1867 1867 + "node_modules/miniflare/node_modules/zod": { 1868 1868 + "version": "3.22.3", 1869 1869 + "resolved": "https://registry.npmjs.org/zod/-/zod-3.22.3.tgz", 1870 1870 + "integrity": "sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==", 1871 1871 + "dev": true, 1872 1872 + "license": "MIT", 1873 1873 + "funding": { 1874 1874 + "url": "https://github.com/sponsors/colinhacks" 1875 1875 + } 1876 1876 + }, 1877 1877 + "node_modules/ms": { 1878 1878 + "version": "2.1.3", 1879 1879 + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", 1880 1880 + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", 1881 1881 + "dev": true, 1882 1882 + "license": "MIT" 1883 1883 + }, 1884 1884 + "node_modules/mustache": { 1885 1885 + "version": "4.2.0", 1886 1886 + "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz", 1887 1887 + "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==", 1888 1888 + "dev": true, 1889 1889 + "license": "MIT", 1890 1890 + "bin": { 1891 1891 + "mustache": "bin/mustache" 1892 1892 + } 1893 1893 + }, 1894 1894 + "node_modules/nanoid": { 1895 1895 + "version": "3.3.11", 1896 1896 + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", 1897 1897 + "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", 1898 1898 + "dev": true, 1899 1899 + "funding": [ 1900 1900 + { 1901 1901 + "type": "github", 1902 1902 + "url": "https://github.com/sponsors/ai" 1903 1903 + } 1904 1904 + ], 1905 1905 + "license": "MIT", 1906 1906 + "bin": { 1907 1907 + "nanoid": "bin/nanoid.cjs" 1908 1908 + }, 1909 1909 + "engines": { 1910 1910 + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" 1911 1911 + } 1912 1912 + }, 1913 1913 + "node_modules/ohash": { 1914 1914 + "version": "2.0.11", 1915 1915 + "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz", 1916 1916 + "integrity": "sha512-RdR9FQrFwNBNXAr4GixM8YaRZRJ5PUWbKYbE5eOsrwAjJW0q2REGcf79oYPsLyskQCZG1PLN+S/K1V00joZAoQ==", 1917 1917 + "dev": true, 1918 1918 + "license": "MIT" 1919 1919 + }, 1920 1920 + "node_modules/path-to-regexp": { 1921 1921 + "version": "6.3.0", 1922 1922 + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", 1923 1923 + "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", 1924 1924 + "dev": true, 1925 1925 + "license": "MIT" 1926 1926 + }, 1927 1927 + "node_modules/pathe": { 1928 1928 + "version": "2.0.3", 1929 1929 + "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", 1930 1930 + "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==", 1931 1931 + "dev": true, 1932 1932 + "license": "MIT" 1933 1933 + }, 1934 1934 + "node_modules/pathval": { 1935 1935 + "version": "2.0.0", 1936 1936 + "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", 1937 1937 + "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==", 1938 1938 + "dev": true, 1939 1939 + "license": "MIT", 1940 1940 + "engines": { 1941 1941 + "node": ">= 14.16" 1942 1942 + } 1943 1943 + }, 1944 1944 + "node_modules/picocolors": { 1945 1945 + "version": "1.1.1", 1946 1946 + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", 1947 1947 + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", 1948 1948 + "dev": true, 1949 1949 + "license": "ISC" 1950 1950 + }, 1951 1951 + "node_modules/picomatch": { 1952 1952 + "version": "4.0.2", 1953 1953 + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", 1954 1954 + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", 1955 1955 + "dev": true, 1956 1956 + "license": "MIT", 1957 1957 + "engines": { 1958 1958 + "node": ">=12" 1959 1959 + }, 1960 1960 + "funding": { 1961 1961 + "url": "https://github.com/sponsors/jonschlinkert" 1962 1962 + } 1963 1963 + }, 1964 1964 + "node_modules/postcss": { 1965 1965 + "version": "8.5.3", 1966 1966 + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", 1967 1967 + "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", 1968 1968 + "dev": true, 1969 1969 + "funding": [ 1970 1970 + { 1971 1971 + "type": "opencollective", 1972 1972 + "url": "https://opencollective.com/postcss/" 1973 1973 + }, 1974 1974 + { 1975 1975 + "type": "tidelift", 1976 1976 + "url": "https://tidelift.com/funding/github/npm/postcss" 1977 1977 + }, 1978 1978 + { 1979 1979 + "type": "github", 1980 1980 + "url": "https://github.com/sponsors/ai" 1981 1981 + } 1982 1982 + ], 1983 1983 + "license": "MIT", 1984 1984 + "dependencies": { 1985 1985 + "nanoid": "^3.3.8", 1986 1986 + "picocolors": "^1.1.1", 1987 1987 + "source-map-js": "^1.2.1" 1988 1988 + }, 1989 1989 + "engines": { 1990 1990 + "node": "^10 || ^12 || >=14" 1991 1991 + } 1992 1992 + }, 1993 1993 + "node_modules/printable-characters": { 1994 1994 + "version": "1.0.42", 1995 1995 + "resolved": "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.42.tgz", 1996 1996 + "integrity": "sha512-dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ==", 1997 1997 + "dev": true, 1998 1998 + "license": "Unlicense" 1999 1999 + }, 2000 2000 + "node_modules/rollup": { 2001 2001 + "version": "4.40.1", 2002 2002 + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.40.1.tgz", 2003 2003 + "integrity": "sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==", 2004 2004 + "dev": true, 2005 2005 + "license": "MIT", 2006 2006 + "dependencies": { 2007 2007 + "@types/estree": "1.0.7" 2008 2008 + }, 2009 2009 + "bin": { 2010 2010 + "rollup": "dist/bin/rollup" 2011 2011 + }, 2012 2012 + "engines": { 2013 2013 + "node": ">=18.0.0", 2014 2014 + "npm": ">=8.0.0" 2015 2015 + }, 2016 2016 + "optionalDependencies": { 2017 2017 + "@rollup/rollup-android-arm-eabi": "4.40.1", 2018 2018 + "@rollup/rollup-android-arm64": "4.40.1", 2019 2019 + "@rollup/rollup-darwin-arm64": "4.40.1", 2020 2020 + "@rollup/rollup-darwin-x64": "4.40.1", 2021 2021 + "@rollup/rollup-freebsd-arm64": "4.40.1", 2022 2022 + "@rollup/rollup-freebsd-x64": "4.40.1", 2023 2023 + "@rollup/rollup-linux-arm-gnueabihf": "4.40.1", 2024 2024 + "@rollup/rollup-linux-arm-musleabihf": "4.40.1", 2025 2025 + "@rollup/rollup-linux-arm64-gnu": "4.40.1", 2026 2026 + "@rollup/rollup-linux-arm64-musl": "4.40.1", 2027 2027 + "@rollup/rollup-linux-loongarch64-gnu": "4.40.1", 2028 2028 + "@rollup/rollup-linux-powerpc64le-gnu": "4.40.1", 2029 2029 + "@rollup/rollup-linux-riscv64-gnu": "4.40.1", 2030 2030 + "@rollup/rollup-linux-riscv64-musl": "4.40.1", 2031 2031 + "@rollup/rollup-linux-s390x-gnu": "4.40.1", 2032 2032 + "@rollup/rollup-linux-x64-gnu": "4.40.1", 2033 2033 + "@rollup/rollup-linux-x64-musl": "4.40.1", 2034 2034 + "@rollup/rollup-win32-arm64-msvc": "4.40.1", 2035 2035 + "@rollup/rollup-win32-ia32-msvc": "4.40.1", 2036 2036 + "@rollup/rollup-win32-x64-msvc": "4.40.1", 2037 2037 + "fsevents": "~2.3.2" 2038 2038 + } 2039 2039 + }, 2040 2040 + "node_modules/semver": { 2041 2041 + "version": "7.7.1", 2042 2042 + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", 2043 2043 + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", 2044 2044 + "dev": true, 2045 2045 + "license": "ISC", 2046 2046 + "bin": { 2047 2047 + "semver": "bin/semver.js" 2048 2048 + }, 2049 2049 + "engines": { 2050 2050 + "node": ">=10" 2051 2051 + } 2052 2052 + }, 2053 2053 + "node_modules/sharp": { 2054 2054 + "version": "0.33.5", 2055 2055 + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.33.5.tgz", 2056 2056 + "integrity": "sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==", 2057 2057 + "dev": true, 2058 2058 + "hasInstallScript": true, 2059 2059 + "license": "Apache-2.0", 2060 2060 + "optional": true, 2061 2061 + "dependencies": { 2062 2062 + "color": "^4.2.3", 2063 2063 + "detect-libc": "^2.0.3", 2064 2064 + "semver": "^7.6.3" 2065 2065 + }, 2066 2066 + "engines": { 2067 2067 + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" 2068 2068 + }, 2069 2069 + "funding": { 2070 2070 + "url": "https://opencollective.com/libvips" 2071 2071 + }, 2072 2072 + "optionalDependencies": { 2073 2073 + "@img/sharp-darwin-arm64": "0.33.5", 2074 2074 + "@img/sharp-darwin-x64": "0.33.5", 2075 2075 + "@img/sharp-libvips-darwin-arm64": "1.0.4", 2076 2076 + "@img/sharp-libvips-darwin-x64": "1.0.4", 2077 2077 + "@img/sharp-libvips-linux-arm": "1.0.5", 2078 2078 + "@img/sharp-libvips-linux-arm64": "1.0.4", 2079 2079 + "@img/sharp-libvips-linux-s390x": "1.0.4", 2080 2080 + "@img/sharp-libvips-linux-x64": "1.0.4", 2081 2081 + "@img/sharp-libvips-linuxmusl-arm64": "1.0.4", 2082 2082 + "@img/sharp-libvips-linuxmusl-x64": "1.0.4", 2083 2083 + "@img/sharp-linux-arm": "0.33.5", 2084 2084 + "@img/sharp-linux-arm64": "0.33.5", 2085 2085 + "@img/sharp-linux-s390x": "0.33.5", 2086 2086 + "@img/sharp-linux-x64": "0.33.5", 2087 2087 + "@img/sharp-linuxmusl-arm64": "0.33.5", 2088 2088 + "@img/sharp-linuxmusl-x64": "0.33.5", 2089 2089 + "@img/sharp-wasm32": "0.33.5", 2090 2090 + "@img/sharp-win32-ia32": "0.33.5", 2091 2091 + "@img/sharp-win32-x64": "0.33.5" 2092 2092 + } 2093 2093 + }, 2094 2094 + "node_modules/siginfo": { 2095 2095 + "version": "2.0.0", 2096 2096 + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", 2097 2097 + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", 2098 2098 + "dev": true, 2099 2099 + "license": "ISC" 2100 2100 + }, 2101 2101 + "node_modules/simple-swizzle": { 2102 2102 + "version": "0.2.2", 2103 2103 + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", 2104 2104 + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", 2105 2105 + "dev": true, 2106 2106 + "license": "MIT", 2107 2107 + "optional": true, 2108 2108 + "dependencies": { 2109 2109 + "is-arrayish": "^0.3.1" 2110 2110 + } 2111 2111 + }, 2112 2112 + "node_modules/source-map": { 2113 2113 + "version": "0.6.1", 2114 2114 + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", 2115 2115 + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", 2116 2116 + "dev": true, 2117 2117 + "license": "BSD-3-Clause", 2118 2118 + "engines": { 2119 2119 + "node": ">=0.10.0" 2120 2120 + } 2121 2121 + }, 2122 2122 + "node_modules/source-map-js": { 2123 2123 + "version": "1.2.1", 2124 2124 + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", 2125 2125 + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", 2126 2126 + "dev": true, 2127 2127 + "license": "BSD-3-Clause", 2128 2128 + "engines": { 2129 2129 + "node": ">=0.10.0" 2130 2130 + } 2131 2131 + }, 2132 2132 + "node_modules/stackback": { 2133 2133 + "version": "0.0.2", 2134 2134 + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", 2135 2135 + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", 2136 2136 + "dev": true, 2137 2137 + "license": "MIT" 2138 2138 + }, 2139 2139 + "node_modules/stacktracey": { 2140 2140 + "version": "2.1.8", 2141 2141 + "resolved": "https://registry.npmjs.org/stacktracey/-/stacktracey-2.1.8.tgz", 2142 2142 + "integrity": "sha512-Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw==", 2143 2143 + "dev": true, 2144 2144 + "license": "Unlicense", 2145 2145 + "dependencies": { 2146 2146 + "as-table": "^1.0.36", 2147 2147 + "get-source": "^2.0.12" 2148 2148 + } 2149 2149 + }, 2150 2150 + "node_modules/std-env": { 2151 2151 + "version": "3.9.0", 2152 2152 + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz", 2153 2153 + "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==", 2154 2154 + "dev": true, 2155 2155 + "license": "MIT" 2156 2156 + }, 2157 2157 + "node_modules/stoppable": { 2158 2158 + "version": "1.1.0", 2159 2159 + "resolved": "https://registry.npmjs.org/stoppable/-/stoppable-1.1.0.tgz", 2160 2160 + "integrity": "sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==", 2161 2161 + "dev": true, 2162 2162 + "license": "MIT", 2163 2163 + "engines": { 2164 2164 + "node": ">=4", 2165 2165 + "npm": ">=6" 2166 2166 + } 2167 2167 + }, 2168 2168 + "node_modules/tinybench": { 2169 2169 + "version": "2.9.0", 2170 2170 + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", 2171 2171 + "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", 2172 2172 + "dev": true, 2173 2173 + "license": "MIT" 2174 2174 + }, 2175 2175 + "node_modules/tinyexec": { 2176 2176 + "version": "0.3.2", 2177 2177 + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", 2178 2178 + "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==", 2179 2179 + "dev": true, 2180 2180 + "license": "MIT" 2181 2181 + }, 2182 2182 + "node_modules/tinyglobby": { 2183 2183 + "version": "0.2.13", 2184 2184 + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", 2185 2185 + "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", 2186 2186 + "dev": true, 2187 2187 + "license": "MIT", 2188 2188 + "dependencies": { 2189 2189 + "fdir": "^6.4.4", 2190 2190 + "picomatch": "^4.0.2" 2191 2191 + }, 2192 2192 + "engines": { 2193 2193 + "node": ">=12.0.0" 2194 2194 + }, 2195 2195 + "funding": { 2196 2196 + "url": "https://github.com/sponsors/SuperchupuDev" 2197 2197 + } 2198 2198 + }, 2199 2199 + "node_modules/tinypool": { 2200 2200 + "version": "1.0.2", 2201 2201 + "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz", 2202 2202 + "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==", 2203 2203 + "dev": true, 2204 2204 + "license": "MIT", 2205 2205 + "engines": { 2206 2206 + "node": "^18.0.0 || >=20.0.0" 2207 2207 + } 2208 2208 + }, 2209 2209 + "node_modules/tinyrainbow": { 2210 2210 + "version": "2.0.0", 2211 2211 + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz", 2212 2212 + "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==", 2213 2213 + "dev": true, 2214 2214 + "license": "MIT", 2215 2215 + "engines": { 2216 2216 + "node": ">=14.0.0" 2217 2217 + } 2218 2218 + }, 2219 2219 + "node_modules/tinyspy": { 2220 2220 + "version": "3.0.2", 2221 2221 + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz", 2222 2222 + "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==", 2223 2223 + "dev": true, 2224 2224 + "license": "MIT", 2225 2225 + "engines": { 2226 2226 + "node": ">=14.0.0" 2227 2227 + } 2228 2228 + }, 2229 2229 + "node_modules/tslib": { 2230 2230 + "version": "2.8.1", 2231 2231 + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", 2232 2232 + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", 2233 2233 + "dev": true, 2234 2234 + "license": "0BSD", 2235 2235 + "optional": true 2236 2236 + }, 2237 2237 + "node_modules/ufo": { 2238 2238 + "version": "1.6.1", 2239 2239 + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.1.tgz", 2240 2240 + "integrity": "sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==", 2241 2241 + "dev": true, 2242 2242 + "license": "MIT" 2243 2243 + }, 2244 2244 + "node_modules/undici": { 2245 2245 + "version": "5.29.0", 2246 2246 + "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz", 2247 2247 + "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==", 2248 2248 + "dev": true, 2249 2249 + "license": "MIT", 2250 2250 + "dependencies": { 2251 2251 + "@fastify/busboy": "^2.0.0" 2252 2252 + }, 2253 2253 + "engines": { 2254 2254 + "node": ">=14.0" 2255 2255 + } 2256 2256 + }, 2257 2257 + "node_modules/unenv": { 2258 2258 + "version": "2.0.0-rc.15", 2259 2259 + "resolved": "https://registry.npmjs.org/unenv/-/unenv-2.0.0-rc.15.tgz", 2260 2260 + "integrity": "sha512-J/rEIZU8w6FOfLNz/hNKsnY+fFHWnu9MH4yRbSZF3xbbGHovcetXPs7sD+9p8L6CeNC//I9bhRYAOsBt2u7/OA==", 2261 2261 + "dev": true, 2262 2262 + "license": "MIT", 2263 2263 + "dependencies": { 2264 2264 + "defu": "^6.1.4", 2265 2265 + "exsolve": "^1.0.4", 2266 2266 + "ohash": "^2.0.11", 2267 2267 + "pathe": "^2.0.3", 2268 2268 + "ufo": "^1.5.4" 2269 2269 + } 2270 2270 + }, 2271 2271 + "node_modules/vite": { 2272 2272 + "version": "6.3.4", 2273 2273 + "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.4.tgz", 2274 2274 + "integrity": "sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==", 2275 2275 + "dev": true, 2276 2276 + "license": "MIT", 2277 2277 + "dependencies": { 2278 2278 + "esbuild": "^0.25.0", 2279 2279 + "fdir": "^6.4.4", 2280 2280 + "picomatch": "^4.0.2", 2281 2281 + "postcss": "^8.5.3", 2282 2282 + "rollup": "^4.34.9", 2283 2283 + "tinyglobby": "^0.2.13" 2284 2284 + }, 2285 2285 + "bin": { 2286 2286 + "vite": "bin/vite.js" 2287 2287 + }, 2288 2288 + "engines": { 2289 2289 + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" 2290 2290 + }, 2291 2291 + "funding": { 2292 2292 + "url": "https://github.com/vitejs/vite?sponsor=1" 2293 2293 + }, 2294 2294 + "optionalDependencies": { 2295 2295 + "fsevents": "~2.3.3" 2296 2296 + }, 2297 2297 + "peerDependencies": { 2298 2298 + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", 2299 2299 + "jiti": ">=1.21.0", 2300 2300 + "less": "*", 2301 2301 + "lightningcss": "^1.21.0", 2302 2302 + "sass": "*", 2303 2303 + "sass-embedded": "*", 2304 2304 + "stylus": "*", 2305 2305 + "sugarss": "*", 2306 2306 + "terser": "^5.16.0", 2307 2307 + "tsx": "^4.8.1", 2308 2308 + "yaml": "^2.4.2" 2309 2309 + }, 2310 2310 + "peerDependenciesMeta": { 2311 2311 + "@types/node": { 2312 2312 + "optional": true 2313 2313 + }, 2314 2314 + "jiti": { 2315 2315 + "optional": true 2316 2316 + }, 2317 2317 + "less": { 2318 2318 + "optional": true 2319 2319 + }, 2320 2320 + "lightningcss": { 2321 2321 + "optional": true 2322 2322 + }, 2323 2323 + "sass": { 2324 2324 + "optional": true 2325 2325 + }, 2326 2326 + "sass-embedded": { 2327 2327 + "optional": true 2328 2328 + }, 2329 2329 + "stylus": { 2330 2330 + "optional": true 2331 2331 + }, 2332 2332 + "sugarss": { 2333 2333 + "optional": true 2334 2334 + }, 2335 2335 + "terser": { 2336 2336 + "optional": true 2337 2337 + }, 2338 2338 + "tsx": { 2339 2339 + "optional": true 2340 2340 + }, 2341 2341 + "yaml": { 2342 2342 + "optional": true 2343 2343 + } 2344 2344 + } 2345 2345 + }, 2346 2346 + "node_modules/vite-node": { 2347 2347 + "version": "3.0.9", 2348 2348 + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.0.9.tgz", 2349 2349 + "integrity": "sha512-w3Gdx7jDcuT9cNn9jExXgOyKmf5UOTb6WMHz8LGAm54eS1Elf5OuBhCxl6zJxGhEeIkgsE1WbHuoL0mj/UXqXg==", 2350 2350 + "dev": true, 2351 2351 + "license": "MIT", 2352 2352 + "dependencies": { 2353 2353 + "cac": "^6.7.14", 2354 2354 + "debug": "^4.4.0", 2355 2355 + "es-module-lexer": "^1.6.0", 2356 2356 + "pathe": "^2.0.3", 2357 2357 + "vite": "^5.0.0 || ^6.0.0" 2358 2358 + }, 2359 2359 + "bin": { 2360 2360 + "vite-node": "vite-node.mjs" 2361 2361 + }, 2362 2362 + "engines": { 2363 2363 + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" 2364 2364 + }, 2365 2365 + "funding": { 2366 2366 + "url": "https://opencollective.com/vitest" 2367 2367 + } 2368 2368 + }, 2369 2369 + "node_modules/vitest": { 2370 2370 + "version": "3.0.9", 2371 2371 + "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.0.9.tgz", 2372 2372 + "integrity": "sha512-BbcFDqNyBlfSpATmTtXOAOj71RNKDDvjBM/uPfnxxVGrG+FSH2RQIwgeEngTaTkuU/h0ScFvf+tRcKfYXzBybQ==", 2373 2373 + "dev": true, 2374 2374 + "license": "MIT", 2375 2375 + "dependencies": { 2376 2376 + "@vitest/expect": "3.0.9", 2377 2377 + "@vitest/mocker": "3.0.9", 2378 2378 + "@vitest/pretty-format": "^3.0.9", 2379 2379 + "@vitest/runner": "3.0.9", 2380 2380 + "@vitest/snapshot": "3.0.9", 2381 2381 + "@vitest/spy": "3.0.9", 2382 2382 + "@vitest/utils": "3.0.9", 2383 2383 + "chai": "^5.2.0", 2384 2384 + "debug": "^4.4.0", 2385 2385 + "expect-type": "^1.1.0", 2386 2386 + "magic-string": "^0.30.17", 2387 2387 + "pathe": "^2.0.3", 2388 2388 + "std-env": "^3.8.0", 2389 2389 + "tinybench": "^2.9.0", 2390 2390 + "tinyexec": "^0.3.2", 2391 2391 + "tinypool": "^1.0.2", 2392 2392 + "tinyrainbow": "^2.0.0", 2393 2393 + "vite": "^5.0.0 || ^6.0.0", 2394 2394 + "vite-node": "3.0.9", 2395 2395 + "why-is-node-running": "^2.3.0" 2396 2396 + }, 2397 2397 + "bin": { 2398 2398 + "vitest": "vitest.mjs" 2399 2399 + }, 2400 2400 + "engines": { 2401 2401 + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" 2402 2402 + }, 2403 2403 + "funding": { 2404 2404 + "url": "https://opencollective.com/vitest" 2405 2405 + }, 2406 2406 + "peerDependencies": { 2407 2407 + "@edge-runtime/vm": "*", 2408 2408 + "@types/debug": "^4.1.12", 2409 2409 + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", 2410 2410 + "@vitest/browser": "3.0.9", 2411 2411 + "@vitest/ui": "3.0.9", 2412 2412 + "happy-dom": "*", 2413 2413 + "jsdom": "*" 2414 2414 + }, 2415 2415 + "peerDependenciesMeta": { 2416 2416 + "@edge-runtime/vm": { 2417 2417 + "optional": true 2418 2418 + }, 2419 2419 + "@types/debug": { 2420 2420 + "optional": true 2421 2421 + }, 2422 2422 + "@types/node": { 2423 2423 + "optional": true 2424 2424 + }, 2425 2425 + "@vitest/browser": { 2426 2426 + "optional": true 2427 2427 + }, 2428 2428 + "@vitest/ui": { 2429 2429 + "optional": true 2430 2430 + }, 2431 2431 + "happy-dom": { 2432 2432 + "optional": true 2433 2433 + }, 2434 2434 + "jsdom": { 2435 2435 + "optional": true 2436 2436 + } 2437 2437 + } 2438 2438 + }, 2439 2439 + "node_modules/why-is-node-running": { 2440 2440 + "version": "2.3.0", 2441 2441 + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", 2442 2442 + "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", 2443 2443 + "dev": true, 2444 2444 + "license": "MIT", 2445 2445 + "dependencies": { 2446 2446 + "siginfo": "^2.0.0", 2447 2447 + "stackback": "0.0.2" 2448 2448 + }, 2449 2449 + "bin": { 2450 2450 + "why-is-node-running": "cli.js" 2451 2451 + }, 2452 2452 + "engines": { 2453 2453 + "node": ">=8" 2454 2454 + } 2455 2455 + }, 2456 2456 + "node_modules/workerd": { 2457 2457 + "version": "1.20250428.0", 2458 2458 + "resolved": "https://registry.npmjs.org/workerd/-/workerd-1.20250428.0.tgz", 2459 2459 + "integrity": "sha512-JJNWkHkwPQKQdvtM9UORijgYdcdJsihA4SfYjwh02IUQsdMyZ9jizV1sX9yWi9B9ptlohTW8UNHJEATuphGgdg==", 2460 2460 + "dev": true, 2461 2461 + "hasInstallScript": true, 2462 2462 + "license": "Apache-2.0", 2463 2463 + "bin": { 2464 2464 + "workerd": "bin/workerd" 2465 2465 + }, 2466 2466 + "engines": { 2467 2467 + "node": ">=16" 2468 2468 + }, 2469 2469 + "optionalDependencies": { 2470 2470 + "@cloudflare/workerd-darwin-64": "1.20250428.0", 2471 2471 + "@cloudflare/workerd-darwin-arm64": "1.20250428.0", 2472 2472 + "@cloudflare/workerd-linux-64": "1.20250428.0", 2473 2473 + "@cloudflare/workerd-linux-arm64": "1.20250428.0", 2474 2474 + "@cloudflare/workerd-windows-64": "1.20250428.0" 2475 2475 + } 2476 2476 + }, 2477 2477 + "node_modules/wrangler": { 2478 2478 + "version": "4.14.1", 2479 2479 + "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-4.14.1.tgz", 2480 2480 + "integrity": "sha512-EU7IThP7i68TBftJJSveogvWZ5k/WRijcJh3UclDWiWWhDZTPbL6LOJEFhHKqFzHOaC4Y2Aewt48rfTz0e7oCw==", 2481 2481 + "dev": true, 2482 2482 + "license": "MIT OR Apache-2.0", 2483 2483 + "dependencies": { 2484 2484 + "@cloudflare/kv-asset-handler": "0.4.0", 2485 2485 + "@cloudflare/unenv-preset": "2.3.1", 2486 2486 + "blake3-wasm": "2.1.5", 2487 2487 + "esbuild": "0.25.2", 2488 2488 + "miniflare": "4.20250428.1", 2489 2489 + "path-to-regexp": "6.3.0", 2490 2490 + "unenv": "2.0.0-rc.15", 2491 2491 + "workerd": "1.20250428.0" 2492 2492 + }, 2493 2493 + "bin": { 2494 2494 + "wrangler": "bin/wrangler.js", 2495 2495 + "wrangler2": "bin/wrangler.js" 2496 2496 + }, 2497 2497 + "engines": { 2498 2498 + "node": ">=18.0.0" 2499 2499 + }, 2500 2500 + "optionalDependencies": { 2501 2501 + "fsevents": "~2.3.2", 2502 2502 + "sharp": "^0.33.5" 2503 2503 + }, 2504 2504 + "peerDependencies": { 2505 2505 + "@cloudflare/workers-types": "^4.20250428.0" 2506 2506 + }, 2507 2507 + "peerDependenciesMeta": { 2508 2508 + "@cloudflare/workers-types": { 2509 2509 + "optional": true 2510 2510 + } 2511 2511 + } 2512 2512 + }, 2513 2513 + "node_modules/wrangler/node_modules/@esbuild/aix-ppc64": { 2514 2514 + "version": "0.25.2", 2515 2515 + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.2.tgz", 2516 2516 + "integrity": "sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==", 2517 2517 + "cpu": [ 2518 2518 + "ppc64" 2519 2519 + ], 2520 2520 + "dev": true, 2521 2521 + "license": "MIT", 2522 2522 + "optional": true, 2523 2523 + "os": [ 2524 2524 + "aix" 2525 2525 + ], 2526 2526 + "engines": { 2527 2527 + "node": ">=18" 2528 2528 + } 2529 2529 + }, 2530 2530 + "node_modules/wrangler/node_modules/@esbuild/android-arm": { 2531 2531 + "version": "0.25.2", 2532 2532 + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.2.tgz", 2533 2533 + "integrity": "sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==", 2534 2534 + "cpu": [ 2535 2535 + "arm" 2536 2536 + ], 2537 2537 + "dev": true, 2538 2538 + "license": "MIT", 2539 2539 + "optional": true, 2540 2540 + "os": [ 2541 2541 + "android" 2542 2542 + ], 2543 2543 + "engines": { 2544 2544 + "node": ">=18" 2545 2545 + } 2546 2546 + }, 2547 2547 + "node_modules/wrangler/node_modules/@esbuild/android-arm64": { 2548 2548 + "version": "0.25.2", 2549 2549 + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.2.tgz", 2550 2550 + "integrity": "sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==", 2551 2551 + "cpu": [ 2552 2552 + "arm64" 2553 2553 + ], 2554 2554 + "dev": true, 2555 2555 + "license": "MIT", 2556 2556 + "optional": true, 2557 2557 + "os": [ 2558 2558 + "android" 2559 2559 + ], 2560 2560 + "engines": { 2561 2561 + "node": ">=18" 2562 2562 + } 2563 2563 + }, 2564 2564 + "node_modules/wrangler/node_modules/@esbuild/android-x64": { 2565 2565 + "version": "0.25.2", 2566 2566 + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.2.tgz", 2567 2567 + "integrity": "sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==", 2568 2568 + "cpu": [ 2569 2569 + "x64" 2570 2570 + ], 2571 2571 + "dev": true, 2572 2572 + "license": "MIT", 2573 2573 + "optional": true, 2574 2574 + "os": [ 2575 2575 + "android" 2576 2576 + ], 2577 2577 + "engines": { 2578 2578 + "node": ">=18" 2579 2579 + } 2580 2580 + }, 2581 2581 + "node_modules/wrangler/node_modules/@esbuild/darwin-arm64": { 2582 2582 + "version": "0.25.2", 2583 2583 + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.2.tgz", 2584 2584 + "integrity": "sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==", 2585 2585 + "cpu": [ 2586 2586 + "arm64" 2587 2587 + ], 2588 2588 + "dev": true, 2589 2589 + "license": "MIT", 2590 2590 + "optional": true, 2591 2591 + "os": [ 2592 2592 + "darwin" 2593 2593 + ], 2594 2594 + "engines": { 2595 2595 + "node": ">=18" 2596 2596 + } 2597 2597 + }, 2598 2598 + "node_modules/wrangler/node_modules/@esbuild/darwin-x64": { 2599 2599 + "version": "0.25.2", 2600 2600 + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.2.tgz", 2601 2601 + "integrity": "sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==", 2602 2602 + "cpu": [ 2603 2603 + "x64" 2604 2604 + ], 2605 2605 + "dev": true, 2606 2606 + "license": "MIT", 2607 2607 + "optional": true, 2608 2608 + "os": [ 2609 2609 + "darwin" 2610 2610 + ], 2611 2611 + "engines": { 2612 2612 + "node": ">=18" 2613 2613 + } 2614 2614 + }, 2615 2615 + "node_modules/wrangler/node_modules/@esbuild/freebsd-arm64": { 2616 2616 + "version": "0.25.2", 2617 2617 + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.2.tgz", 2618 2618 + "integrity": "sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==", 2619 2619 + "cpu": [ 2620 2620 + "arm64" 2621 2621 + ], 2622 2622 + "dev": true, 2623 2623 + "license": "MIT", 2624 2624 + "optional": true, 2625 2625 + "os": [ 2626 2626 + "freebsd" 2627 2627 + ], 2628 2628 + "engines": { 2629 2629 + "node": ">=18" 2630 2630 + } 2631 2631 + }, 2632 2632 + "node_modules/wrangler/node_modules/@esbuild/freebsd-x64": { 2633 2633 + "version": "0.25.2", 2634 2634 + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.2.tgz", 2635 2635 + "integrity": "sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==", 2636 2636 + "cpu": [ 2637 2637 + "x64" 2638 2638 + ], 2639 2639 + "dev": true, 2640 2640 + "license": "MIT", 2641 2641 + "optional": true, 2642 2642 + "os": [ 2643 2643 + "freebsd" 2644 2644 + ], 2645 2645 + "engines": { 2646 2646 + "node": ">=18" 2647 2647 + } 2648 2648 + }, 2649 2649 + "node_modules/wrangler/node_modules/@esbuild/linux-arm": { 2650 2650 + "version": "0.25.2", 2651 2651 + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.2.tgz", 2652 2652 + "integrity": "sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==", 2653 2653 + "cpu": [ 2654 2654 + "arm" 2655 2655 + ], 2656 2656 + "dev": true, 2657 2657 + "license": "MIT", 2658 2658 + "optional": true, 2659 2659 + "os": [ 2660 2660 + "linux" 2661 2661 + ], 2662 2662 + "engines": { 2663 2663 + "node": ">=18" 2664 2664 + } 2665 2665 + }, 2666 2666 + "node_modules/wrangler/node_modules/@esbuild/linux-arm64": { 2667 2667 + "version": "0.25.2", 2668 2668 + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.2.tgz", 2669 2669 + "integrity": "sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==", 2670 2670 + "cpu": [ 2671 2671 + "arm64" 2672 2672 + ], 2673 2673 + "dev": true, 2674 2674 + "license": "MIT", 2675 2675 + "optional": true, 2676 2676 + "os": [ 2677 2677 + "linux" 2678 2678 + ], 2679 2679 + "engines": { 2680 2680 + "node": ">=18" 2681 2681 + } 2682 2682 + }, 2683 2683 + "node_modules/wrangler/node_modules/@esbuild/linux-ia32": { 2684 2684 + "version": "0.25.2", 2685 2685 + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.2.tgz", 2686 2686 + "integrity": "sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==", 2687 2687 + "cpu": [ 2688 2688 + "ia32" 2689 2689 + ], 2690 2690 + "dev": true, 2691 2691 + "license": "MIT", 2692 2692 + "optional": true, 2693 2693 + "os": [ 2694 2694 + "linux" 2695 2695 + ], 2696 2696 + "engines": { 2697 2697 + "node": ">=18" 2698 2698 + } 2699 2699 + }, 2700 2700 + "node_modules/wrangler/node_modules/@esbuild/linux-loong64": { 2701 2701 + "version": "0.25.2", 2702 2702 + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.2.tgz", 2703 2703 + "integrity": "sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==", 2704 2704 + "cpu": [ 2705 2705 + "loong64" 2706 2706 + ], 2707 2707 + "dev": true, 2708 2708 + "license": "MIT", 2709 2709 + "optional": true, 2710 2710 + "os": [ 2711 2711 + "linux" 2712 2712 + ], 2713 2713 + "engines": { 2714 2714 + "node": ">=18" 2715 2715 + } 2716 2716 + }, 2717 2717 + "node_modules/wrangler/node_modules/@esbuild/linux-mips64el": { 2718 2718 + "version": "0.25.2", 2719 2719 + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.2.tgz", 2720 2720 + "integrity": "sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==", 2721 2721 + "cpu": [ 2722 2722 + "mips64el" 2723 2723 + ], 2724 2724 + "dev": true, 2725 2725 + "license": "MIT", 2726 2726 + "optional": true, 2727 2727 + "os": [ 2728 2728 + "linux" 2729 2729 + ], 2730 2730 + "engines": { 2731 2731 + "node": ">=18" 2732 2732 + } 2733 2733 + }, 2734 2734 + "node_modules/wrangler/node_modules/@esbuild/linux-ppc64": { 2735 2735 + "version": "0.25.2", 2736 2736 + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.2.tgz", 2737 2737 + "integrity": "sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==", 2738 2738 + "cpu": [ 2739 2739 + "ppc64" 2740 2740 + ], 2741 2741 + "dev": true, 2742 2742 + "license": "MIT", 2743 2743 + "optional": true, 2744 2744 + "os": [ 2745 2745 + "linux" 2746 2746 + ], 2747 2747 + "engines": { 2748 2748 + "node": ">=18" 2749 2749 + } 2750 2750 + }, 2751 2751 + "node_modules/wrangler/node_modules/@esbuild/linux-riscv64": { 2752 2752 + "version": "0.25.2", 2753 2753 + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.2.tgz", 2754 2754 + "integrity": "sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==", 2755 2755 + "cpu": [ 2756 2756 + "riscv64" 2757 2757 + ], 2758 2758 + "dev": true, 2759 2759 + "license": "MIT", 2760 2760 + "optional": true, 2761 2761 + "os": [ 2762 2762 + "linux" 2763 2763 + ], 2764 2764 + "engines": { 2765 2765 + "node": ">=18" 2766 2766 + } 2767 2767 + }, 2768 2768 + "node_modules/wrangler/node_modules/@esbuild/linux-s390x": { 2769 2769 + "version": "0.25.2", 2770 2770 + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.2.tgz", 2771 2771 + "integrity": "sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==", 2772 2772 + "cpu": [ 2773 2773 + "s390x" 2774 2774 + ], 2775 2775 + "dev": true, 2776 2776 + "license": "MIT", 2777 2777 + "optional": true, 2778 2778 + "os": [ 2779 2779 + "linux" 2780 2780 + ], 2781 2781 + "engines": { 2782 2782 + "node": ">=18" 2783 2783 + } 2784 2784 + }, 2785 2785 + "node_modules/wrangler/node_modules/@esbuild/linux-x64": { 2786 2786 + "version": "0.25.2", 2787 2787 + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.2.tgz", 2788 2788 + "integrity": "sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==", 2789 2789 + "cpu": [ 2790 2790 + "x64" 2791 2791 + ], 2792 2792 + "dev": true, 2793 2793 + "license": "MIT", 2794 2794 + "optional": true, 2795 2795 + "os": [ 2796 2796 + "linux" 2797 2797 + ], 2798 2798 + "engines": { 2799 2799 + "node": ">=18" 2800 2800 + } 2801 2801 + }, 2802 2802 + "node_modules/wrangler/node_modules/@esbuild/netbsd-arm64": { 2803 2803 + "version": "0.25.2", 2804 2804 + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.2.tgz", 2805 2805 + "integrity": "sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==", 2806 2806 + "cpu": [ 2807 2807 + "arm64" 2808 2808 + ], 2809 2809 + "dev": true, 2810 2810 + "license": "MIT", 2811 2811 + "optional": true, 2812 2812 + "os": [ 2813 2813 + "netbsd" 2814 2814 + ], 2815 2815 + "engines": { 2816 2816 + "node": ">=18" 2817 2817 + } 2818 2818 + }, 2819 2819 + "node_modules/wrangler/node_modules/@esbuild/netbsd-x64": { 2820 2820 + "version": "0.25.2", 2821 2821 + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.2.tgz", 2822 2822 + "integrity": "sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==", 2823 2823 + "cpu": [ 2824 2824 + "x64" 2825 2825 + ], 2826 2826 + "dev": true, 2827 2827 + "license": "MIT", 2828 2828 + "optional": true, 2829 2829 + "os": [ 2830 2830 + "netbsd" 2831 2831 + ], 2832 2832 + "engines": { 2833 2833 + "node": ">=18" 2834 2834 + } 2835 2835 + }, 2836 2836 + "node_modules/wrangler/node_modules/@esbuild/openbsd-arm64": { 2837 2837 + "version": "0.25.2", 2838 2838 + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.2.tgz", 2839 2839 + "integrity": "sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==", 2840 2840 + "cpu": [ 2841 2841 + "arm64" 2842 2842 + ], 2843 2843 + "dev": true, 2844 2844 + "license": "MIT", 2845 2845 + "optional": true, 2846 2846 + "os": [ 2847 2847 + "openbsd" 2848 2848 + ], 2849 2849 + "engines": { 2850 2850 + "node": ">=18" 2851 2851 + } 2852 2852 + }, 2853 2853 + "node_modules/wrangler/node_modules/@esbuild/openbsd-x64": { 2854 2854 + "version": "0.25.2", 2855 2855 + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.2.tgz", 2856 2856 + "integrity": "sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==", 2857 2857 + "cpu": [ 2858 2858 + "x64" 2859 2859 + ], 2860 2860 + "dev": true, 2861 2861 + "license": "MIT", 2862 2862 + "optional": true, 2863 2863 + "os": [ 2864 2864 + "openbsd" 2865 2865 + ], 2866 2866 + "engines": { 2867 2867 + "node": ">=18" 2868 2868 + } 2869 2869 + }, 2870 2870 + "node_modules/wrangler/node_modules/@esbuild/sunos-x64": { 2871 2871 + "version": "0.25.2", 2872 2872 + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.2.tgz", 2873 2873 + "integrity": "sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==", 2874 2874 + "cpu": [ 2875 2875 + "x64" 2876 2876 + ], 2877 2877 + "dev": true, 2878 2878 + "license": "MIT", 2879 2879 + "optional": true, 2880 2880 + "os": [ 2881 2881 + "sunos" 2882 2882 + ], 2883 2883 + "engines": { 2884 2884 + "node": ">=18" 2885 2885 + } 2886 2886 + }, 2887 2887 + "node_modules/wrangler/node_modules/@esbuild/win32-arm64": { 2888 2888 + "version": "0.25.2", 2889 2889 + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.2.tgz", 2890 2890 + "integrity": "sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==", 2891 2891 + "cpu": [ 2892 2892 + "arm64" 2893 2893 + ], 2894 2894 + "dev": true, 2895 2895 + "license": "MIT", 2896 2896 + "optional": true, 2897 2897 + "os": [ 2898 2898 + "win32" 2899 2899 + ], 2900 2900 + "engines": { 2901 2901 + "node": ">=18" 2902 2902 + } 2903 2903 + }, 2904 2904 + "node_modules/wrangler/node_modules/@esbuild/win32-ia32": { 2905 2905 + "version": "0.25.2", 2906 2906 + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.2.tgz", 2907 2907 + "integrity": "sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==", 2908 2908 + "cpu": [ 2909 2909 + "ia32" 2910 2910 + ], 2911 2911 + "dev": true, 2912 2912 + "license": "MIT", 2913 2913 + "optional": true, 2914 2914 + "os": [ 2915 2915 + "win32" 2916 2916 + ], 2917 2917 + "engines": { 2918 2918 + "node": ">=18" 2919 2919 + } 2920 2920 + }, 2921 2921 + "node_modules/wrangler/node_modules/@esbuild/win32-x64": { 2922 2922 + "version": "0.25.2", 2923 2923 + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.2.tgz", 2924 2924 + "integrity": "sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==", 2925 2925 + "cpu": [ 2926 2926 + "x64" 2927 2927 + ], 2928 2928 + "dev": true, 2929 2929 + "license": "MIT", 2930 2930 + "optional": true, 2931 2931 + "os": [ 2932 2932 + "win32" 2933 2933 + ], 2934 2934 + "engines": { 2935 2935 + "node": ">=18" 2936 2936 + } 2937 2937 + }, 2938 2938 + "node_modules/wrangler/node_modules/esbuild": { 2939 2939 + "version": "0.25.2", 2940 2940 + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.2.tgz", 2941 2941 + "integrity": "sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==", 2942 2942 + "dev": true, 2943 2943 + "hasInstallScript": true, 2944 2944 + "license": "MIT", 2945 2945 + "bin": { 2946 2946 + "esbuild": "bin/esbuild" 2947 2947 + }, 2948 2948 + "engines": { 2949 2949 + "node": ">=18" 2950 2950 + }, 2951 2951 + "optionalDependencies": { 2952 2952 + "@esbuild/aix-ppc64": "0.25.2", 2953 2953 + "@esbuild/android-arm": "0.25.2", 2954 2954 + "@esbuild/android-arm64": "0.25.2", 2955 2955 + "@esbuild/android-x64": "0.25.2", 2956 2956 + "@esbuild/darwin-arm64": "0.25.2", 2957 2957 + "@esbuild/darwin-x64": "0.25.2", 2958 2958 + "@esbuild/freebsd-arm64": "0.25.2", 2959 2959 + "@esbuild/freebsd-x64": "0.25.2", 2960 2960 + "@esbuild/linux-arm": "0.25.2", 2961 2961 + "@esbuild/linux-arm64": "0.25.2", 2962 2962 + "@esbuild/linux-ia32": "0.25.2", 2963 2963 + "@esbuild/linux-loong64": "0.25.2", 2964 2964 + "@esbuild/linux-mips64el": "0.25.2", 2965 2965 + "@esbuild/linux-ppc64": "0.25.2", 2966 2966 + "@esbuild/linux-riscv64": "0.25.2", 2967 2967 + "@esbuild/linux-s390x": "0.25.2", 2968 2968 + "@esbuild/linux-x64": "0.25.2", 2969 2969 + "@esbuild/netbsd-arm64": "0.25.2", 2970 2970 + "@esbuild/netbsd-x64": "0.25.2", 2971 2971 + "@esbuild/openbsd-arm64": "0.25.2", 2972 2972 + "@esbuild/openbsd-x64": "0.25.2", 2973 2973 + "@esbuild/sunos-x64": "0.25.2", 2974 2974 + "@esbuild/win32-arm64": "0.25.2", 2975 2975 + "@esbuild/win32-ia32": "0.25.2", 2976 2976 + "@esbuild/win32-x64": "0.25.2" 2977 2977 + } 2978 2978 + }, 2979 2979 + "node_modules/ws": { 2980 2980 + "version": "8.18.0", 2981 2981 + "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz", 2982 2982 + "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==", 2983 2983 + "dev": true, 2984 2984 + "license": "MIT", 2985 2985 + "engines": { 2986 2986 + "node": ">=10.0.0" 2987 2987 + }, 2988 2988 + "peerDependencies": { 2989 2989 + "bufferutil": "^4.0.1", 2990 2990 + "utf-8-validate": ">=5.0.2" 2991 2991 + }, 2992 2992 + "peerDependenciesMeta": { 2993 2993 + "bufferutil": { 2994 2994 + "optional": true 2995 2995 + }, 2996 2996 + "utf-8-validate": { 2997 2997 + "optional": true 2998 2998 + } 2999 2999 + } 3000 3000 + }, 3001 3001 + "node_modules/youch": { 3002 3002 + "version": "3.3.4", 3003 3003 + "resolved": "https://registry.npmjs.org/youch/-/youch-3.3.4.tgz", 3004 3004 + "integrity": "sha512-UeVBXie8cA35DS6+nBkls68xaBBXCye0CNznrhszZjTbRVnJKQuNsyLKBTTL4ln1o1rh2PKtv35twV7irj5SEg==", 3005 3005 + "dev": true, 3006 3006 + "license": "MIT", 3007 3007 + "dependencies": { 3008 3008 + "cookie": "^0.7.1", 3009 3009 + "mustache": "^4.2.0", 3010 3010 + "stacktracey": "^2.1.8" 3011 3011 + } 3012 3012 + }, 3013 3013 + "node_modules/zod": { 3014 3014 + "version": "3.24.3", 3015 3015 + "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.3.tgz", 3016 3016 + "integrity": "sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg==", 3017 3017 + "dev": true, 3018 3018 + "license": "MIT", 3019 3019 + "funding": { 3020 3020 + "url": "https://github.com/sponsors/colinhacks" 3021 3021 + } 3022 3022 + } 3023 3023 + } 3024 3024 + }

+16

avatar/package.json

··· 1 1 + { 2 2 + "name": "avatar", 3 3 + "version": "0.0.0", 4 4 + "private": true, 5 5 + "scripts": { 6 6 + "deploy": "wrangler deploy", 7 7 + "dev": "wrangler dev", 8 8 + "start": "wrangler dev", 9 9 + "test": "vitest" 10 10 + }, 11 11 + "devDependencies": { 12 12 + "@cloudflare/vitest-pool-workers": "^0.8.19", 13 13 + "vitest": "~3.0.7", 14 14 + "wrangler": "^4.14.1" 15 15 + } 16 16 + }

+11

avatar/readme.md

··· 1 1 + # avatar 2 2 + 3 3 + avatar is a small service that fetches your pretty Bluesky avatar and caches it on Cloudflare. 4 4 + It uses a shared secret `AVATAR_SHARED_SECRET` to ensure requests only originate from the trusted appview. 5 5 + 6 6 + It's deployed using `wrangler` like so: 7 7 + 8 8 + ``` 9 9 + npx wrangler deploy 10 10 + npx wrangler secrets put AVATAR_SHARED_SECRET 11 11 + ```

+15

avatar/wrangler.jsonc

··· 1 1 + { 2 2 + "$schema": "node_modules/wrangler/config-schema.json", 3 3 + "name": "avatar", 4 4 + "main": "src/index.js", 5 5 + "compatibility_date": "2025-05-03", 6 6 + "observability": { 7 7 + "enabled": true, 8 8 + }, 9 9 + "routes": [ 10 10 + { 11 11 + "pattern": "avatar.tangled.sh", 12 12 + "custom_domain": true, 13 13 + }, 14 14 + ], 15 15 + }

+3

appview/consts.go

··· 9 9 SessionRefreshJwt = "refreshJwt" 10 10 SessionExpiry = "expiry" 11 11 SessionAuthenticated = "authenticated" 12 12 + 13 13 + SessionDpopPrivateJwk = "dpopPrivateJwk" 14 14 + SessionDpopAuthServerNonce = "dpopAuthServerNonce" 12 15 )

-217

appview/auth/auth.go

··· 1 1 - package auth 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "fmt" 6 6 - "net/http" 7 7 - "time" 8 8 - 9 9 - comatproto "github.com/bluesky-social/indigo/api/atproto" 10 10 - "github.com/bluesky-social/indigo/atproto/identity" 11 11 - "github.com/bluesky-social/indigo/xrpc" 12 12 - "github.com/gorilla/sessions" 13 13 - "tangled.sh/tangled.sh/core/appview" 14 14 - ) 15 15 - 16 16 - type Auth struct { 17 17 - Store *sessions.CookieStore 18 18 - } 19 19 - 20 20 - type AtSessionCreate struct { 21 21 - comatproto.ServerCreateSession_Output 22 22 - PDSEndpoint string 23 23 - } 24 24 - 25 25 - type AtSessionRefresh struct { 26 26 - comatproto.ServerRefreshSession_Output 27 27 - PDSEndpoint string 28 28 - } 29 29 - 30 30 - func Make(secret string) (*Auth, error) { 31 31 - store := sessions.NewCookieStore([]byte(secret)) 32 32 - return &Auth{store}, nil 33 33 - } 34 34 - 35 35 - func (a *Auth) CreateInitialSession(ctx context.Context, resolved *identity.Identity, appPassword string) (*comatproto.ServerCreateSession_Output, error) { 36 36 - 37 37 - pdsUrl := resolved.PDSEndpoint() 38 38 - client := xrpc.Client{ 39 39 - Host: pdsUrl, 40 40 - } 41 41 - 42 42 - atSession, err := comatproto.ServerCreateSession(ctx, &client, &comatproto.ServerCreateSession_Input{ 43 43 - Identifier: resolved.DID.String(), 44 44 - Password: appPassword, 45 45 - }) 46 46 - if err != nil { 47 47 - return nil, fmt.Errorf("invalid app password") 48 48 - } 49 49 - 50 50 - return atSession, nil 51 51 - } 52 52 - 53 53 - // Sessionish is an interface that provides access to the common fields of both types. 54 54 - type Sessionish interface { 55 55 - GetAccessJwt() string 56 56 - GetActive() *bool 57 57 - GetDid() string 58 58 - GetDidDoc() *interface{} 59 59 - GetHandle() string 60 60 - GetRefreshJwt() string 61 61 - GetStatus() *string 62 62 - } 63 63 - 64 64 - // Create a wrapper type for ServerRefreshSession_Output 65 65 - type RefreshSessionWrapper struct { 66 66 - *comatproto.ServerRefreshSession_Output 67 67 - } 68 68 - 69 69 - func (s *RefreshSessionWrapper) GetAccessJwt() string { 70 70 - return s.AccessJwt 71 71 - } 72 72 - 73 73 - func (s *RefreshSessionWrapper) GetActive() *bool { 74 74 - return s.Active 75 75 - } 76 76 - 77 77 - func (s *RefreshSessionWrapper) GetDid() string { 78 78 - return s.Did 79 79 - } 80 80 - 81 81 - func (s *RefreshSessionWrapper) GetDidDoc() *interface{} { 82 82 - return s.DidDoc 83 83 - } 84 84 - 85 85 - func (s *RefreshSessionWrapper) GetHandle() string { 86 86 - return s.Handle 87 87 - } 88 88 - 89 89 - func (s *RefreshSessionWrapper) GetRefreshJwt() string { 90 90 - return s.RefreshJwt 91 91 - } 92 92 - 93 93 - func (s *RefreshSessionWrapper) GetStatus() *string { 94 94 - return s.Status 95 95 - } 96 96 - 97 97 - // Create a wrapper type for ServerRefreshSession_Output 98 98 - type CreateSessionWrapper struct { 99 99 - *comatproto.ServerCreateSession_Output 100 100 - } 101 101 - 102 102 - func (s *CreateSessionWrapper) GetAccessJwt() string { 103 103 - return s.AccessJwt 104 104 - } 105 105 - 106 106 - func (s *CreateSessionWrapper) GetActive() *bool { 107 107 - return s.Active 108 108 - } 109 109 - 110 110 - func (s *CreateSessionWrapper) GetDid() string { 111 111 - return s.Did 112 112 - } 113 113 - 114 114 - func (s *CreateSessionWrapper) GetDidDoc() *interface{} { 115 115 - return s.DidDoc 116 116 - } 117 117 - 118 118 - func (s *CreateSessionWrapper) GetHandle() string { 119 119 - return s.Handle 120 120 - } 121 121 - 122 122 - func (s *CreateSessionWrapper) GetRefreshJwt() string { 123 123 - return s.RefreshJwt 124 124 - } 125 125 - 126 126 - func (s *CreateSessionWrapper) GetStatus() *string { 127 127 - return s.Status 128 128 - } 129 129 - 130 130 - func (a *Auth) ClearSession(r *http.Request, w http.ResponseWriter) error { 131 131 - clientSession, err := a.Store.Get(r, appview.SessionName) 132 132 - if err != nil { 133 133 - return fmt.Errorf("invalid session", err) 134 134 - } 135 135 - if clientSession.IsNew { 136 136 - return fmt.Errorf("invalid session") 137 137 - } 138 138 - clientSession.Options.MaxAge = -1 139 139 - return clientSession.Save(r, w) 140 140 - } 141 141 - 142 142 - func (a *Auth) StoreSession(r *http.Request, w http.ResponseWriter, atSessionish Sessionish, pdsEndpoint string) error { 143 143 - clientSession, _ := a.Store.Get(r, appview.SessionName) 144 144 - clientSession.Values[appview.SessionHandle] = atSessionish.GetHandle() 145 145 - clientSession.Values[appview.SessionDid] = atSessionish.GetDid() 146 146 - clientSession.Values[appview.SessionPds] = pdsEndpoint 147 147 - clientSession.Values[appview.SessionAccessJwt] = atSessionish.GetAccessJwt() 148 148 - clientSession.Values[appview.SessionRefreshJwt] = atSessionish.GetRefreshJwt() 149 149 - clientSession.Values[appview.SessionExpiry] = time.Now().Add(time.Minute * 15).Format(time.RFC3339) 150 150 - clientSession.Values[appview.SessionAuthenticated] = true 151 151 - return clientSession.Save(r, w) 152 152 - } 153 153 - 154 154 - func (a *Auth) AuthorizedClient(r *http.Request) (*xrpc.Client, error) { 155 155 - clientSession, err := a.Store.Get(r, "appview-session") 156 156 - if err != nil || clientSession.IsNew { 157 157 - return nil, err 158 158 - } 159 159 - 160 160 - did := clientSession.Values["did"].(string) 161 161 - pdsUrl := clientSession.Values["pds"].(string) 162 162 - accessJwt := clientSession.Values["accessJwt"].(string) 163 163 - refreshJwt := clientSession.Values["refreshJwt"].(string) 164 164 - 165 165 - client := &xrpc.Client{ 166 166 - Host: pdsUrl, 167 167 - Auth: &xrpc.AuthInfo{ 168 168 - AccessJwt: accessJwt, 169 169 - RefreshJwt: refreshJwt, 170 170 - Did: did, 171 171 - }, 172 172 - } 173 173 - 174 174 - return client, nil 175 175 - } 176 176 - 177 177 - func (a *Auth) GetSession(r *http.Request) (*sessions.Session, error) { 178 178 - return a.Store.Get(r, appview.SessionName) 179 179 - } 180 180 - 181 181 - func (a *Auth) GetDid(r *http.Request) string { 182 182 - clientSession, err := a.Store.Get(r, appview.SessionName) 183 183 - if err != nil || clientSession.IsNew { 184 184 - return "" 185 185 - } 186 186 - 187 187 - return clientSession.Values[appview.SessionDid].(string) 188 188 - } 189 189 - 190 190 - func (a *Auth) GetHandle(r *http.Request) string { 191 191 - clientSession, err := a.Store.Get(r, appview.SessionName) 192 192 - if err != nil || clientSession.IsNew { 193 193 - return "" 194 194 - } 195 195 - 196 196 - return clientSession.Values[appview.SessionHandle].(string) 197 197 - } 198 198 - 199 199 - type User struct { 200 200 - Handle string 201 201 - Did string 202 202 - Pds string 203 203 - } 204 204 - 205 205 - func (a *Auth) GetUser(r *http.Request) *User { 206 206 - clientSession, err := a.Store.Get(r, appview.SessionName) 207 207 - 208 208 - if err != nil || clientSession.IsNew { 209 209 - return nil 210 210 - } 211 211 - 212 212 - return &User{ 213 213 - Handle: clientSession.Values[appview.SessionHandle].(string), 214 214 - Did: clientSession.Values[appview.SessionDid].(string), 215 215 - Pds: clientSession.Values[appview.SessionPds].(string), 216 216 - } 217 217 - }

+5

scripts/generate-jwks.sh

··· 1 1 + #! /usr/bin/env bash 2 2 + 3 3 + set -e 4 4 + 5 5 + go run ./cmd/genjwks/

+3 -1

lexicons/actor/profile.json

··· 8 8 "key": "literal:self", 9 9 "record": { 10 10 "type": "object", 11 11 - "required": ["bluesky"], 11 11 + "required": [ 12 12 + "bluesky" 13 13 + ], 12 14 "properties": { 13 15 "description": { 14 16 "type": "string",

-21

appview/pages/templates/index.html

··· 1 1 - <html> 2 2 - {{ template "layouts/head" . }} 3 3 - 4 4 - <header> 5 5 - <h1>{{ .meta.Title }}</h1> 6 6 - <h2>{{ .meta.Description }}</h2> 7 7 - </header> 8 8 - <body> 9 9 - <main> 10 10 - <div class="index"> 11 11 - {{ range .info }} 12 12 - <div class="index-name"> 13 13 - <a href="/{{ .Name }}">{{ .DisplayName }}</a> 14 14 - </div> 15 15 - <div class="desc">{{ .Desc }}</div> 16 16 - <div>{{ .Idle }}</div> 17 17 - {{ end }} 18 18 - </div> 19 19 - </main> 20 20 - </body> 21 21 - </html>

+6

appview/pages/htmx.go

··· 15 15 w.Write([]byte(html)) 16 16 } 17 17 18 18 + // HxRefresh is a client-side full refresh of the page. 19 19 + func (s *Pages) HxRefresh(w http.ResponseWriter) { 20 20 + w.Header().Set("HX-Refresh", "true") 21 21 + w.WriteHeader(http.StatusOK) 22 22 + } 23 23 + 18 24 // HxRedirect is a full page reload with a new location. 19 25 func (s *Pages) HxRedirect(w http.ResponseWriter, location string) { 20 26 w.Header().Set("HX-Redirect", location)

+2 -1

license

··· 1 1 MIT License 2 2 3 3 - Copyright (c) 2025 Anirudh Oppiliappan, Akshay Oppiliappan 3 3 + Copyright (c) 2025 Anirudh Oppiliappan, Akshay Oppiliappan and 4 4 + contributors. 4 5 5 6 Permission is hereby granted, free of charge, to any person obtaining a copy 6 7 of this software and associated documentation files (the "Software"), to deal

+1

types/tree.go

··· 8 8 9 9 // A nicer git tree representation. 10 10 type NiceTree struct { 11 11 + // Relative path 11 12 Name string `json:"name"` 12 13 Mode string `json:"mode"` 13 14 Size int64 `json:"size"`

+17 -13

appview/knotclient/signer.go

··· 106 106 return s.client.Do(req) 107 107 } 108 108 109 109 - func (s *SignedClient) RepoLanguages(ownerDid, source, name, branch string) (*types.RepoLanguageResponse, error) { 109 109 + func (s *SignedClient) RepoLanguages(ownerDid, repoName, ref string) (*types.RepoLanguageResponse, error) { 110 110 const ( 111 111 Method = "GET" 112 112 ) 113 113 - endpoint := fmt.Sprintf("/repo/languages/%s", url.PathEscape(branch)) 113 113 + endpoint := fmt.Sprintf("/%s/%s/languages/%s", ownerDid, repoName, url.PathEscape(ref)) 114 114 115 115 - body, _ := json.Marshal(map[string]any{ 116 116 - "did": ownerDid, 117 117 - "source": source, 118 118 - "name": name, 119 119 - }) 120 120 - 121 121 - req, err := s.newRequest(Method, endpoint, body) 115 115 + req, err := s.newRequest(Method, endpoint, nil) 122 116 if err != nil { 123 117 return nil, err 124 118 } ··· 128 122 return nil, err 129 123 } 130 124 131 131 - var languagePercentages types.RepoLanguageResponse 132 132 - if err := json.NewDecoder(resp.Body).Decode(&languagePercentages); err != nil { 133 133 - log.Printf("failed to decode fork status: %s", err) 125 125 + var result types.RepoLanguageResponse 126 126 + if resp.StatusCode != http.StatusOK { 127 127 + log.Println("failed to calculate languages", resp.Status) 128 128 + return &types.RepoLanguageResponse{}, nil 129 129 + } 130 130 + 131 131 + body, err := io.ReadAll(resp.Body) 132 132 + if err != nil { 133 133 + return nil, err 134 134 + } 135 135 + 136 136 + err = json.Unmarshal(body, &result) 137 137 + if err != nil { 134 138 return nil, err 135 139 } 136 140 137 137 - return &languagePercentages, nil 141 141 + return &result, nil 138 142 } 139 143 140 144 func (s *SignedClient) RepoForkAheadBehind(ownerDid, source, name, branch, hiddenRef string) (*http.Response, error) {

+20

types/patch.go

··· 1 1 + package types 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + 6 6 + "github.com/bluekeyes/go-gitdiff/gitdiff" 7 7 + ) 8 8 + 9 9 + type FormatPatch struct { 10 10 + Files []*gitdiff.File 11 11 + *gitdiff.PatchHeader 12 12 + Raw string 13 13 + } 14 14 + 15 15 + func (f FormatPatch) ChangeId() (string, error) { 16 16 + if vals, ok := f.RawHeaders["Change-Id"]; ok && len(vals) == 1 { 17 17 + return vals[0], nil 18 18 + } 19 19 + return "", fmt.Errorf("no change-id found") 20 20 + }

+45 -1

appview/resolver.go

··· 2 2 3 3 import ( 4 4 "context" 5 5 + "net" 6 6 + "net/http" 5 7 "sync" 8 8 + "time" 6 9 7 10 "github.com/bluesky-social/indigo/atproto/identity" 11 11 + "github.com/bluesky-social/indigo/atproto/identity/redisdir" 8 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 13 + "github.com/carlmjohnson/versioninfo" 9 14 ) 10 15 11 16 type Resolver struct { 12 17 directory identity.Directory 13 18 } 14 19 15 15 - func NewResolver() *Resolver { 20 20 + func BaseDirectory() identity.Directory { 21 21 + base := identity.BaseDirectory{ 22 22 + PLCURL: identity.DefaultPLCURL, 23 23 + HTTPClient: http.Client{ 24 24 + Timeout: time.Second * 10, 25 25 + Transport: &http.Transport{ 26 26 + // would want this around 100ms for services doing lots of handle resolution. Impacts PLC connections as well, but not too bad. 27 27 + IdleConnTimeout: time.Millisecond * 1000, 28 28 + MaxIdleConns: 100, 29 29 + }, 30 30 + }, 31 31 + Resolver: net.Resolver{ 32 32 + Dial: func(ctx context.Context, network, address string) (net.Conn, error) { 33 33 + d := net.Dialer{Timeout: time.Second * 3} 34 34 + return d.DialContext(ctx, network, address) 35 35 + }, 36 36 + }, 37 37 + TryAuthoritativeDNS: true, 38 38 + // primary Bluesky PDS instance only supports HTTP resolution method 39 39 + SkipDNSDomainSuffixes: []string{".bsky.social"}, 40 40 + UserAgent: "indigo-identity/" + versioninfo.Short(), 41 41 + } 42 42 + return &base 43 43 + } 44 44 + 45 45 + func RedisDirectory(url string) (identity.Directory, error) { 46 46 + return redisdir.NewRedisDirectory(BaseDirectory(), url, time.Hour*24, time.Hour*1, time.Hour*1, 10000) 47 47 + } 48 48 + 49 49 + func DefaultResolver() *Resolver { 16 50 return &Resolver{ 17 51 directory: identity.DefaultDirectory(), 18 52 } 19 53 } 20 54 55 55 + func RedisResolver(config RedisConfig) (*Resolver, error) { 56 56 + directory, err := RedisDirectory(config.ToURL()) 57 57 + if err != nil { 58 58 + return nil, err 59 59 + } 60 60 + return &Resolver{ 61 61 + directory: directory, 62 62 + }, nil 63 63 + } 64 64 + 21 65 func (r *Resolver) ResolveIdent(ctx context.Context, arg string) (*identity.Identity, error) { 22 66 id, err := syntax.ParseAtIdentifier(arg) 23 67 if err != nil {

+5 -5

appview/state/repo.go

··· 699 699 return 700 700 } 701 701 702 702 - collaboratorIdent, err := s.resolver.ResolveIdent(r.Context(), collaborator) 702 702 + collaboratorIdent, err := s.idResolver.ResolveIdent(r.Context(), collaborator) 703 703 if err != nil { 704 704 w.Write([]byte("failed to resolve collaborator did to a handle")) 705 705 return ··· 993 993 return 994 994 } 995 995 996 996 - issueOwnerIdent, err := s.resolver.ResolveIdent(r.Context(), issue.OwnerDid) 996 996 + issueOwnerIdent, err := s.idResolver.ResolveIdent(r.Context(), issue.OwnerDid) 997 997 if err != nil { 998 998 log.Println("failed to resolve issue owner", err) 999 999 } ··· 1002 1002 for i, comment := range comments { 1003 1003 identsToResolve[i] = comment.OwnerDid 1004 1004 } 1005 1005 - resolvedIds := s.resolver.ResolveIdents(r.Context(), identsToResolve) 1005 1005 + resolvedIds := s.idResolver.ResolveIdents(r.Context(), identsToResolve) 1006 1006 didHandleMap := make(map[string]string) 1007 1007 for _, identity := range resolvedIds { 1008 1008 if !identity.Handle.IsInvalidHandle() { ··· 1269 1269 return 1270 1270 } 1271 1271 1272 1272 - identity, err := s.resolver.ResolveIdent(r.Context(), comment.OwnerDid) 1272 1272 + identity, err := s.idResolver.ResolveIdent(r.Context(), comment.OwnerDid) 1273 1273 if err != nil { 1274 1274 log.Println("failed to resolve did") 1275 1275 return ··· 1550 1550 for i, issue := range issues { 1551 1551 identsToResolve[i] = issue.OwnerDid 1552 1552 } 1553 1553 - resolvedIds := s.resolver.ResolveIdents(r.Context(), identsToResolve) 1553 1553 + resolvedIds := s.idResolver.ResolveIdents(r.Context(), identsToResolve) 1554 1554 didHandleMap := make(map[string]string) 1555 1555 for _, identity := range resolvedIds { 1556 1556 if !identity.Handle.IsInvalidHandle() {

+1 -1

appview/state/repo_util.go

··· 67 67 for _, v := range emailToDid { 68 68 dids = append(dids, v) 69 69 } 70 70 - resolvedIdents := s.resolver.ResolveIdents(context.Background(), dids) 70 70 + resolvedIdents := s.idResolver.ResolveIdents(context.Background(), dids) 71 71 72 72 didHandleMap := make(map[string]string) 73 73 for _, identity := range resolvedIdents {

-15

cmd/keyfetch/format.go

··· 1 1 - package main 2 2 - 3 3 - import ( 4 4 - "fmt" 5 5 - ) 6 6 - 7 7 - func formatKeyData(repoguardPath, gitDir, logPath, endpoint string, data []map[string]interface{}) string { 8 8 - var result string 9 9 - for _, entry := range data { 10 10 - result += fmt.Sprintf( 11 11 - `command="%s -base-dir %s -user %s -log-path %s -internal-api %s",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty %s`+"\n", 12 12 - repoguardPath, gitDir, entry["did"], logPath, endpoint, entry["key"]) 13 13 - } 14 14 - return result 15 15 - }

-46

cmd/keyfetch/main.go

··· 1 1 - // This program must be configured to run as the sshd AuthorizedKeysCommand. 2 2 - // The format looks something like this: 3 3 - // Match User git 4 4 - // AuthorizedKeysCommand /keyfetch -internal-api http://localhost:5444 -repoguard-path /home/git/repoguard 5 5 - // AuthorizedKeysCommandUser nobody 6 6 - // 7 7 - // The command and its parent directories must be owned by root and set to 0755. Hence, the ideal location for this is 8 8 - // somewhere already owned by root so you don't have to mess with directory perms. 9 9 - 10 10 - package main 11 11 - 12 12 - import ( 13 13 - "encoding/json" 14 14 - "flag" 15 15 - "fmt" 16 16 - "io" 17 17 - "log" 18 18 - "net/http" 19 19 - ) 20 20 - 21 21 - func main() { 22 22 - endpoint := flag.String("internal-api", "http://localhost:5444", "Internal API endpoint") 23 23 - repoguardPath := flag.String("repoguard-path", "/home/git/repoguard", "Path to the repoguard binary") 24 24 - gitDir := flag.String("git-dir", "/home/git", "Path to the git directory") 25 25 - logPath := flag.String("log-path", "/home/git/log", "Path to log file") 26 26 - flag.Parse() 27 27 - 28 28 - resp, err := http.Get(*endpoint + "/keys") 29 29 - if err != nil { 30 30 - log.Fatalf("error fetching keys: %v", err) 31 31 - } 32 32 - defer resp.Body.Close() 33 33 - 34 34 - body, err := io.ReadAll(resp.Body) 35 35 - if err != nil { 36 36 - log.Fatalf("error reading response body: %v", err) 37 37 - } 38 38 - 39 39 - var data []map[string]interface{} 40 40 - err = json.Unmarshal(body, &data) 41 41 - if err != nil { 42 42 - log.Fatalf("error unmarshalling response body: %v", err) 43 43 - } 44 44 - 45 45 - fmt.Print(formatKeyData(*repoguardPath, *gitDir, *logPath, *endpoint, data)) 46 46 - }

-207

cmd/repoguard/main.go

··· 1 1 - package main 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "flag" 6 6 - "fmt" 7 7 - "log" 8 8 - "net/http" 9 9 - "net/url" 10 10 - "os" 11 11 - "os/exec" 12 12 - "strings" 13 13 - "time" 14 14 - 15 15 - securejoin "github.com/cyphar/filepath-securejoin" 16 16 - "tangled.sh/tangled.sh/core/appview/idresolver" 17 17 - ) 18 18 - 19 19 - var ( 20 20 - logger *log.Logger 21 21 - logFile *os.File 22 22 - clientIP string 23 23 - 24 24 - // Command line flags 25 25 - incomingUser = flag.String("user", "", "Allowed git user") 26 26 - baseDirFlag = flag.String("base-dir", "/home/git", "Base directory for git repositories") 27 27 - logPathFlag = flag.String("log-path", "/var/log/git-wrapper.log", "Path to log file") 28 28 - endpoint = flag.String("internal-api", "http://localhost:5444", "Internal API endpoint") 29 29 - ) 30 30 - 31 31 - func main() { 32 32 - flag.Parse() 33 33 - 34 34 - defer cleanup() 35 35 - initLogger() 36 36 - 37 37 - // Get client IP from SSH environment 38 38 - if connInfo := os.Getenv("SSH_CONNECTION"); connInfo != "" { 39 39 - parts := strings.Fields(connInfo) 40 40 - if len(parts) > 0 { 41 41 - clientIP = parts[0] 42 42 - } 43 43 - } 44 44 - 45 45 - if *incomingUser == "" { 46 46 - exitWithLog("access denied: no user specified") 47 47 - } 48 48 - 49 49 - sshCommand := os.Getenv("SSH_ORIGINAL_COMMAND") 50 50 - 51 51 - logEvent("Connection attempt", map[string]interface{}{ 52 52 - "user": *incomingUser, 53 53 - "command": sshCommand, 54 54 - "client": clientIP, 55 55 - }) 56 56 - 57 57 - if sshCommand == "" { 58 58 - exitWithLog("access denied: we don't serve interactive shells :)") 59 59 - } 60 60 - 61 61 - cmdParts := strings.Fields(sshCommand) 62 62 - if len(cmdParts) < 2 { 63 63 - exitWithLog("invalid command format") 64 64 - } 65 65 - 66 66 - gitCommand := cmdParts[0] 67 67 - 68 68 - // did:foo/repo-name or 69 69 - // handle/repo-name or 70 70 - // any of the above with a leading slash (/) 71 71 - 72 72 - components := strings.Split(strings.TrimPrefix(strings.Trim(cmdParts[1], "'"), "/"), "/") 73 73 - logEvent("Command components", map[string]interface{}{ 74 74 - "components": components, 75 75 - }) 76 76 - if len(components) != 2 { 77 77 - exitWithLog("invalid repo format, needs <user>/<repo> or /<user>/<repo>") 78 78 - } 79 79 - 80 80 - didOrHandle := components[0] 81 81 - did := resolveToDid(didOrHandle) 82 82 - repoName := components[1] 83 83 - qualifiedRepoName, _ := securejoin.SecureJoin(did, repoName) 84 84 - 85 85 - validCommands := map[string]bool{ 86 86 - "git-receive-pack": true, 87 87 - "git-upload-pack": true, 88 88 - "git-upload-archive": true, 89 89 - } 90 90 - if !validCommands[gitCommand] { 91 91 - exitWithLog("access denied: invalid git command") 92 92 - } 93 93 - 94 94 - if gitCommand != "git-upload-pack" { 95 95 - if !isPushPermitted(*incomingUser, qualifiedRepoName) { 96 96 - logEvent("all infos", map[string]interface{}{ 97 97 - "did": *incomingUser, 98 98 - "reponame": qualifiedRepoName, 99 99 - }) 100 100 - exitWithLog("access denied: user not allowed") 101 101 - } 102 102 - } 103 103 - 104 104 - fullPath, _ := securejoin.SecureJoin(*baseDirFlag, qualifiedRepoName) 105 105 - 106 106 - logEvent("Processing command", map[string]interface{}{ 107 107 - "user": *incomingUser, 108 108 - "command": gitCommand, 109 109 - "repo": repoName, 110 110 - "fullPath": fullPath, 111 111 - "client": clientIP, 112 112 - }) 113 113 - 114 114 - if gitCommand == "git-upload-pack" { 115 115 - fmt.Fprintf(os.Stderr, "\x02%s\n", "Welcome to this knot!") 116 116 - } else { 117 117 - fmt.Fprintf(os.Stderr, "%s\n", "Welcome to this knot!") 118 118 - } 119 119 - 120 120 - cmd := exec.Command(gitCommand, fullPath) 121 121 - cmd.Stdout = os.Stdout 122 122 - cmd.Stderr = os.Stderr 123 123 - cmd.Stdin = os.Stdin 124 124 - 125 125 - if err := cmd.Run(); err != nil { 126 126 - exitWithLog(fmt.Sprintf("command failed: %v", err)) 127 127 - } 128 128 - 129 129 - logEvent("Command completed", map[string]interface{}{ 130 130 - "user": *incomingUser, 131 131 - "command": gitCommand, 132 132 - "repo": repoName, 133 133 - "success": true, 134 134 - }) 135 135 - } 136 136 - 137 137 - func resolveToDid(didOrHandle string) string { 138 138 - resolver := idresolver.DefaultResolver() 139 139 - ident, err := resolver.ResolveIdent(context.Background(), didOrHandle) 140 140 - if err != nil { 141 141 - exitWithLog(fmt.Sprintf("error resolving handle: %v", err)) 142 142 - } 143 143 - 144 144 - // did:plc:foobarbaz/repo 145 145 - return ident.DID.String() 146 146 - } 147 147 - 148 148 - func initLogger() { 149 149 - var err error 150 150 - logFile, err = os.OpenFile(*logPathFlag, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0600) 151 151 - if err != nil { 152 152 - fmt.Fprintf(os.Stderr, "failed to open log file: %v\n", err) 153 153 - os.Exit(1) 154 154 - } 155 155 - 156 156 - logger = log.New(logFile, "", 0) 157 157 - } 158 158 - 159 159 - func logEvent(event string, fields map[string]interface{}) { 160 160 - entry := fmt.Sprintf( 161 161 - "timestamp=%q event=%q", 162 162 - time.Now().Format(time.RFC3339), 163 163 - event, 164 164 - ) 165 165 - 166 166 - for k, v := range fields { 167 167 - entry += fmt.Sprintf(" %s=%q", k, v) 168 168 - } 169 169 - 170 170 - logger.Println(entry) 171 171 - } 172 172 - 173 173 - func exitWithLog(message string) { 174 174 - logEvent("Access denied", map[string]interface{}{ 175 175 - "error": message, 176 176 - }) 177 177 - logFile.Sync() 178 178 - fmt.Fprintf(os.Stderr, "error: %s\n", message) 179 179 - os.Exit(1) 180 180 - } 181 181 - 182 182 - func cleanup() { 183 183 - if logFile != nil { 184 184 - logFile.Sync() 185 185 - logFile.Close() 186 186 - } 187 187 - } 188 188 - 189 189 - func isPushPermitted(user, qualifiedRepoName string) bool { 190 190 - u, _ := url.Parse(*endpoint + "/push-allowed") 191 191 - q := u.Query() 192 192 - q.Add("user", user) 193 193 - q.Add("repo", qualifiedRepoName) 194 194 - u.RawQuery = q.Encode() 195 195 - 196 196 - req, err := http.Get(u.String()) 197 197 - if err != nil { 198 198 - exitWithLog(fmt.Sprintf("error verifying permissions: %v", err)) 199 199 - } 200 200 - 201 201 - logEvent("url", map[string]interface{}{ 202 202 - "url": u.String(), 203 203 - "status": req.Status, 204 204 - }) 205 205 - 206 206 - return req.StatusCode == http.StatusNoContent 207 207 - }

-71

cmd/knotserver/main.go

··· 1 1 - package main 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "net/http" 6 6 - 7 7 - "tangled.sh/tangled.sh/core/api/tangled" 8 8 - "tangled.sh/tangled.sh/core/jetstream" 9 9 - "tangled.sh/tangled.sh/core/knotserver" 10 10 - "tangled.sh/tangled.sh/core/knotserver/config" 11 11 - "tangled.sh/tangled.sh/core/knotserver/db" 12 12 - "tangled.sh/tangled.sh/core/log" 13 13 - "tangled.sh/tangled.sh/core/rbac" 14 14 - 15 15 - _ "net/http/pprof" 16 16 - ) 17 17 - 18 18 - func main() { 19 19 - ctx := context.Background() 20 20 - // ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM) 21 21 - // defer stop() 22 22 - 23 23 - l := log.New("knotserver") 24 24 - 25 25 - c, err := config.Load(ctx) 26 26 - if err != nil { 27 27 - l.Error("failed to load config", "error", err) 28 28 - return 29 29 - } 30 30 - 31 31 - if c.Server.Dev { 32 32 - l.Info("running in dev mode, signature verification is disabled") 33 33 - } 34 34 - 35 35 - db, err := db.Setup(c.Server.DBPath) 36 36 - if err != nil { 37 37 - l.Error("failed to setup db", "error", err) 38 38 - return 39 39 - } 40 40 - 41 41 - e, err := rbac.NewEnforcer(c.Server.DBPath) 42 42 - if err != nil { 43 43 - l.Error("failed to setup rbac enforcer", "error", err) 44 44 - return 45 45 - } 46 46 - 47 47 - e.E.EnableAutoSave(true) 48 48 - 49 49 - jc, err := jetstream.NewJetstreamClient(c.Server.JetstreamEndpoint, "knotserver", []string{ 50 50 - tangled.PublicKeyNSID, 51 51 - tangled.KnotMemberNSID, 52 52 - }, nil, l, db, true) 53 53 - if err != nil { 54 54 - l.Error("failed to setup jetstream", "error", err) 55 55 - } 56 56 - 57 57 - mux, err := knotserver.Setup(ctx, c, db, e, jc, l) 58 58 - if err != nil { 59 59 - l.Error("failed to setup server", "error", err) 60 60 - return 61 61 - } 62 62 - imux := knotserver.Internal(ctx, db, e) 63 63 - 64 64 - l.Info("starting internal server", "address", c.Server.InternalListenAddr) 65 65 - go http.ListenAndServe(c.Server.InternalListenAddr, imux) 66 66 - 67 67 - l.Info("starting main server", "address", c.Server.ListenAddr) 68 68 - l.Error("server error", "error", http.ListenAndServe(c.Server.ListenAddr, mux)) 69 69 - 70 70 - return 71 71 - }

+1 -1

systemd/knotserver.service

··· 4 4 5 5 6 6 [Service] 7 7 - ExecStart=/usr/local/bin/knotserver 7 7 + ExecStart=/usr/local/bin/knot server 8 8 Restart=always 9 9 User=git 10 10 WorkingDirectory=/home/git

+43

knotserver/notifier/notifier.go

··· 1 1 + package notifier 2 2 + 3 3 + import ( 4 4 + "sync" 5 5 + ) 6 6 + 7 7 + type Notifier struct { 8 8 + subscribers map[chan struct{}]struct{} 9 9 + mu sync.Mutex 10 10 + } 11 11 + 12 12 + func New() Notifier { 13 13 + return Notifier{ 14 14 + subscribers: make(map[chan struct{}]struct{}), 15 15 + } 16 16 + } 17 17 + 18 18 + func (n *Notifier) Subscribe() chan struct{} { 19 19 + ch := make(chan struct{}, 1) 20 20 + n.mu.Lock() 21 21 + n.subscribers[ch] = struct{}{} 22 22 + n.mu.Unlock() 23 23 + return ch 24 24 + } 25 25 + 26 26 + func (n *Notifier) Unsubscribe(ch chan struct{}) { 27 27 + n.mu.Lock() 28 28 + delete(n.subscribers, ch) 29 29 + close(ch) 30 30 + n.mu.Unlock() 31 31 + } 32 32 + 33 33 + func (n *Notifier) NotifyAll() { 34 34 + n.mu.Lock() 35 35 + for ch := range n.subscribers { 36 36 + select { 37 37 + case ch <- struct{}{}: 38 38 + default: 39 39 + // avoid blocking if channel is full 40 40 + } 41 41 + } 42 42 + n.mu.Unlock() 43 43 + }

-37

docker/Dockerfile

··· 1 1 - FROM docker.io/golang:1.24-alpine3.21 AS build 2 2 - 3 3 - ENV CGO_ENABLED=1 4 4 - WORKDIR /usr/src/app 5 5 - COPY go.mod go.sum ./ 6 6 - 7 7 - RUN apk add --no-cache gcc musl-dev 8 8 - RUN go mod download 9 9 - 10 10 - COPY . . 11 11 - RUN go build -v \ 12 12 - -o /usr/local/bin/knot \ 13 13 - -ldflags='-s -w -extldflags "-static"' \ 14 14 - ./cmd/knot 15 15 - 16 16 - FROM docker.io/alpine:3.21 17 17 - 18 18 - LABEL org.opencontainers.image.title=Tangled 19 19 - LABEL org.opencontainers.image.description="Tangled is a decentralized and open code collaboration platform, built on atproto." 20 20 - LABEL org.opencontainers.image.vendor=Tangled.sh 21 21 - LABEL org.opencontainers.image.licenses=MIT 22 22 - LABEL org.opencontainers.image.url=https://tangled.sh 23 23 - LABEL org.opencontainers.image.source=https://tangled.sh/@tangled.sh/core 24 24 - 25 25 - RUN apk add --no-cache shadow s6-overlay execline openssh git && \ 26 26 - adduser --disabled-password git && \ 27 27 - # We need to set password anyway since otherwise ssh won't work 28 28 - head -c 32 /dev/random | base64 | tr -dc 'a-zA-Z0-9' | passwd git --stdin && \ 29 29 - mkdir /app && mkdir /home/git/repositories 30 30 - 31 31 - COPY --from=build /usr/local/bin/knot /usr/local/bin 32 32 - COPY docker/rootfs/ . 33 33 - 34 34 - EXPOSE 22 35 35 - EXPOSE 5555 36 36 - 37 37 - ENTRYPOINT ["/bin/sh", "-c", "chown git:git /app && chown git:git /home/git/repositories && /init"]

-1

docker/rootfs/etc/s6-overlay/s6-rc.d/create-sshd-host-keys/type

··· 1 1 - oneshot

-1

docker/rootfs/etc/s6-overlay/s6-rc.d/create-sshd-host-keys/up

··· 1 1 - /etc/s6-overlay/scripts/create-sshd-host-keys

docker/rootfs/etc/s6-overlay/s6-rc.d/knotserver/dependencies.d/base

-1

docker/rootfs/etc/s6-overlay/s6-rc.d/knotserver/type

··· 1 1 - longrun

docker/rootfs/etc/s6-overlay/s6-rc.d/sshd/dependencies.d/base

docker/rootfs/etc/s6-overlay/s6-rc.d/sshd/dependencies.d/create-sshd-host-keys

-3

docker/rootfs/etc/s6-overlay/s6-rc.d/sshd/run

··· 1 1 - #!/usr/bin/execlineb -P 2 2 - 3 3 - /usr/sbin/sshd -e -D

-1

docker/rootfs/etc/s6-overlay/s6-rc.d/sshd/type

··· 1 1 - longrun

docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/knotserver

docker/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/sshd

-21

docker/rootfs/etc/s6-overlay/scripts/create-sshd-host-keys

··· 1 1 - #!/usr/bin/execlineb -P 2 2 - 3 3 - foreground { 4 4 - if -n { test -d /etc/ssh/keys } 5 5 - mkdir /etc/ssh/keys 6 6 - } 7 7 - 8 8 - foreground { 9 9 - if -n { test -f /etc/ssh/keys/ssh_host_rsa_key } 10 10 - ssh-keygen -t rsa -f /etc/ssh/keys/ssh_host_rsa_key -q -N "" 11 11 - } 12 12 - 13 13 - foreground { 14 14 - if -n { test -f /etc/ssh/keys/ssh_host_ecdsa_key } 15 15 - ssh-keygen -t rsa -f /etc/ssh/keys/ssh_host_ecdsa_key -q -N "" 16 16 - } 17 17 - 18 18 - foreground { 19 19 - if -n { test -f /etc/ssh/keys/ssh_host_ed25519_key } 20 20 - ssh-keygen -t rsa -f /etc/ssh/keys/ssh_host_ed25519_key -q -N "" 21 21 - }

+14

appview/cache/cache.go

··· 1 1 + package cache 2 2 + 3 3 + import "github.com/redis/go-redis/v9" 4 4 + 5 5 + type Cache struct { 6 6 + *redis.Client 7 7 + } 8 8 + 9 9 + func New(addr string) *Cache { 10 10 + rdb := redis.NewClient(&redis.Options{ 11 11 + Addr: addr, 12 12 + }) 13 13 + return &Cache{rdb} 14 14 + }

+18

nix/pkgs/sqlite-lib.nix

··· 1 1 + { 2 2 + gcc, 3 3 + stdenv, 4 4 + sqlite-lib-src, 5 5 + }: 6 6 + stdenv.mkDerivation { 7 7 + name = "sqlite-lib"; 8 8 + src = sqlite-lib-src; 9 9 + nativeBuildInputs = [gcc]; 10 10 + buildPhase = '' 11 11 + gcc -c sqlite3.c 12 12 + ar rcs libsqlite3.a sqlite3.o 13 13 + ranlib libsqlite3.a 14 14 + mkdir -p $out/include $out/lib 15 15 + cp *.h $out/include 16 16 + cp libsqlite3.a $out/lib 17 17 + ''; 18 18 + }

+20

nix/pkgs/knot.nix

··· 1 1 + { 2 2 + knot-unwrapped, 3 3 + makeWrapper, 4 4 + git, 5 5 + }: 6 6 + knot-unwrapped.overrideAttrs (after: before: { 7 7 + nativeBuildInputs = (before.nativeBuildInputs or []) ++ [makeWrapper]; 8 8 + 9 9 + installPhase = '' 10 10 + runHook preInstall 11 11 + 12 12 + mkdir -p $out/bin 13 13 + cp $GOPATH/bin/knot $out/bin/knot 14 14 + 15 15 + wrapProgram $out/bin/knot \ 16 16 + --prefix PATH : ${git}/bin 17 17 + 18 18 + runHook postInstall 19 19 + ''; 20 20 + })

-70

knotserver/db/oplog.go

··· 1 1 - package db 2 2 - 3 3 - import ( 4 4 - "fmt" 5 5 - 6 6 - "tangled.sh/tangled.sh/core/knotserver/notifier" 7 7 - ) 8 8 - 9 9 - type Op struct { 10 10 - Tid string // time based ID, easy to enumerate & monotonic 11 11 - Did string // did of pusher 12 12 - Repo string // <did/repo> fully qualified repo 13 13 - OldSha string // old sha of reference being updated 14 14 - NewSha string // new sha of reference being updated 15 15 - Ref string // the reference being updated 16 16 - } 17 17 - 18 18 - func (d *DB) InsertOp(op Op, notifier *notifier.Notifier) error { 19 19 - _, err := d.db.Exec( 20 20 - `insert into oplog (tid, did, repo, old_sha, new_sha, ref) values (?, ?, ?, ?, ?, ?)`, 21 21 - op.Tid, 22 22 - op.Did, 23 23 - op.Repo, 24 24 - op.OldSha, 25 25 - op.NewSha, 26 26 - op.Ref, 27 27 - ) 28 28 - if err != nil { 29 29 - return err 30 30 - } 31 31 - 32 32 - notifier.NotifyAll() 33 33 - return nil 34 34 - } 35 35 - 36 36 - func (d *DB) GetOps(cursor string) ([]Op, error) { 37 37 - whereClause := "" 38 38 - args := []any{} 39 39 - if cursor != "" { 40 40 - whereClause = "where tid > ?" 41 41 - args = append(args, cursor) 42 42 - } 43 43 - 44 44 - query := fmt.Sprintf(` 45 45 - select tid, did, repo, old_sha, new_sha, ref 46 46 - from oplog 47 47 - %s 48 48 - order by tid asc 49 49 - limit 100 50 50 - `, whereClause) 51 51 - 52 52 - rows, err := d.db.Query(query, args...) 53 53 - if err != nil { 54 54 - return nil, err 55 55 - } 56 56 - defer rows.Close() 57 57 - 58 58 - var ops []Op 59 59 - for rows.Next() { 60 60 - var op Op 61 61 - rows.Scan(&op.Tid, &op.Did, &op.Repo, &op.OldSha, &op.NewSha, &op.Ref) 62 62 - ops = append(ops, op) 63 63 - } 64 64 - 65 65 - if err := rows.Err(); err != nil { 66 66 - return nil, err 67 67 - } 68 68 - 69 69 - return ops, nil 70 70 - }

+9

spindle/tid.go

··· 1 1 + package spindle 2 2 + 3 3 + import "github.com/bluesky-social/indigo/atproto/syntax" 4 4 + 5 5 + var TIDClock = syntax.NewTIDClock(0) 6 6 + 7 7 + func TID() string { 8 8 + return TIDClock.Next().String() 9 9 + }

knotserver/notifier/notifier.go notifier/notifier.go

+23

knotclient/cursor/memory.go

··· 1 1 + package cursor 2 2 + 3 3 + import ( 4 4 + "sync" 5 5 + ) 6 6 + 7 7 + type MemoryStore struct { 8 8 + store sync.Map 9 9 + } 10 10 + 11 11 + func (m *MemoryStore) Set(knot string, cursor int64) { 12 12 + m.store.Store(knot, cursor) 13 13 + } 14 14 + 15 15 + func (m *MemoryStore) Get(knot string) (cursor int64) { 16 16 + if result, ok := m.store.Load(knot); ok { 17 17 + if val, ok := result.(int64); ok { 18 18 + return val 19 19 + } 20 20 + } 21 21 + 22 22 + return 0 23 23 + }

+43

knotclient/cursor/redis.go

··· 1 1 + package cursor 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "fmt" 6 6 + "strconv" 7 7 + 8 8 + "tangled.sh/tangled.sh/core/appview/cache" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + cursorKey = "cursor:%s" 13 13 + ) 14 14 + 15 15 + type RedisStore struct { 16 16 + rdb *cache.Cache 17 17 + } 18 18 + 19 19 + func NewRedisCursorStore(cache *cache.Cache) RedisStore { 20 20 + return RedisStore{ 21 21 + rdb: cache, 22 22 + } 23 23 + } 24 24 + 25 25 + func (r *RedisStore) Set(knot string, cursor int64) { 26 26 + key := fmt.Sprintf(cursorKey, knot) 27 27 + r.rdb.Set(context.Background(), key, cursor, 0) 28 28 + } 29 29 + 30 30 + func (r *RedisStore) Get(knot string) (cursor int64) { 31 31 + key := fmt.Sprintf(cursorKey, knot) 32 32 + val, err := r.rdb.Get(context.Background(), key).Result() 33 33 + if err != nil { 34 34 + return 0 35 35 + } 36 36 + cursor, err = strconv.ParseInt(val, 10, 64) 37 37 + if err != nil { 38 38 + // TODO: log here 39 39 + return 0 40 40 + } 41 41 + 42 42 + return cursor 43 43 + }

+6

knotclient/cursor/store.go

··· 1 1 + package cursor 2 2 + 3 3 + type Store interface { 4 4 + Set(knot string, cursor int64) 5 5 + Get(knot string) (cursor int64) 6 6 + }

+83

knotclient/cursor/sqlite.go

··· 1 1 + package cursor 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + "fmt" 6 6 + 7 7 + _ "github.com/mattn/go-sqlite3" 8 8 + ) 9 9 + 10 10 + type SqliteStore struct { 11 11 + db *sql.DB 12 12 + tableName string 13 13 + } 14 14 + 15 15 + type SqliteStoreOpt func(*SqliteStore) 16 16 + 17 17 + func WithTableName(name string) SqliteStoreOpt { 18 18 + return func(s *SqliteStore) { 19 19 + s.tableName = name 20 20 + } 21 21 + } 22 22 + 23 23 + func NewSQLiteStore(dbPath string, opts ...SqliteStoreOpt) (*SqliteStore, error) { 24 24 + db, err := sql.Open("sqlite3", dbPath) 25 25 + if err != nil { 26 26 + return nil, fmt.Errorf("failed to open sqlite database: %w", err) 27 27 + } 28 28 + 29 29 + store := &SqliteStore{ 30 30 + db: db, 31 31 + tableName: "cursors", 32 32 + } 33 33 + 34 34 + for _, o := range opts { 35 35 + o(store) 36 36 + } 37 37 + 38 38 + if err := store.init(); err != nil { 39 39 + return nil, err 40 40 + } 41 41 + 42 42 + return store, nil 43 43 + } 44 44 + 45 45 + func (s *SqliteStore) init() error { 46 46 + createTable := fmt.Sprintf(` 47 47 + create table if not exists %s ( 48 48 + knot text primary key, 49 49 + cursor text 50 50 + );`, s.tableName) 51 51 + _, err := s.db.Exec(createTable) 52 52 + return err 53 53 + } 54 54 + 55 55 + func (s *SqliteStore) Set(knot string, cursor int64) { 56 56 + query := fmt.Sprintf(` 57 57 + insert into %s (knot, cursor) 58 58 + values (?, ?) 59 59 + on conflict(knot) do update set cursor=excluded.cursor; 60 60 + `, s.tableName) 61 61 + 62 62 + _, err := s.db.Exec(query, knot, cursor) 63 63 + 64 64 + if err != nil { 65 65 + // TODO: log here 66 66 + } 67 67 + } 68 68 + 69 69 + func (s *SqliteStore) Get(knot string) (cursor int64) { 70 70 + query := fmt.Sprintf(` 71 71 + select cursor from %s where knot = ?; 72 72 + `, s.tableName) 73 73 + err := s.db.QueryRow(query, knot).Scan(&cursor) 74 74 + 75 75 + if err != nil { 76 76 + if err != sql.ErrNoRows { 77 77 + // TODO: log here 78 78 + } 79 79 + return 0 80 80 + } 81 81 + 82 82 + return cursor 83 83 + }

+1 -1

spindle/tid.go tid/tid.go

··· 1 1 - package spindle 1 1 + package tid 2 2 3 3 import "github.com/bluesky-social/indigo/atproto/syntax" 4 4

+44

spindle/db/known_dids.go

··· 1 1 + package db 2 2 + 3 3 + func (d *DB) AddDid(did string) error { 4 4 + _, err := d.Exec(`insert or ignore into known_dids (did) values (?)`, did) 5 5 + return err 6 6 + } 7 7 + 8 8 + func (d *DB) RemoveDid(did string) error { 9 9 + _, err := d.Exec(`delete from known_dids where did = ?`, did) 10 10 + return err 11 11 + } 12 12 + 13 13 + func (d *DB) GetAllDids() ([]string, error) { 14 14 + var dids []string 15 15 + 16 16 + rows, err := d.Query(`select did from known_dids`) 17 17 + if err != nil { 18 18 + return nil, err 19 19 + } 20 20 + defer rows.Close() 21 21 + 22 22 + for rows.Next() { 23 23 + var did string 24 24 + if err := rows.Scan(&did); err != nil { 25 25 + return nil, err 26 26 + } 27 27 + dids = append(dids, did) 28 28 + } 29 29 + 30 30 + if err := rows.Err(); err != nil { 31 31 + return nil, err 32 32 + } 33 33 + 34 34 + return dids, nil 35 35 + } 36 36 + 37 37 + func (d *DB) HasKnownDids() bool { 38 38 + var count int 39 39 + err := d.QueryRow(`select count(*) from known_dids`).Scan(&count) 40 40 + if err != nil { 41 41 + return false 42 42 + } 43 43 + return count > 0 44 44 + }

+22

api/tangled/tangledspindle.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.spindle 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + SpindleNSID = "sh.tangled.spindle" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("sh.tangled.spindle", &Spindle{}) 17 17 + } // 18 18 + // RECORDTYPE: Spindle 19 19 + type Spindle struct { 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.spindle" cborgen:"$type,const=sh.tangled.spindle"` 21 21 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 22 22 + }

+25

lexicons/spindle.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.spindle", 4 4 + "needsCbor": true, 5 5 + "needsType": true, 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "key": "any", 10 10 + "record": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "createdAt" 14 14 + ], 15 15 + "properties": { 16 16 + "createdAt": { 17 17 + "type": "string", 18 18 + "format": "datetime" 19 19 + } 20 20 + } 21 21 + } 22 22 + } 23 23 + } 24 24 + } 25 25 +

+6

knotclient/events.go

··· 150 150 } 151 151 152 152 func (c *EventConsumer) AddSource(ctx context.Context, s EventSource) { 153 153 + // we are already listening to this source 154 154 + if _, ok := c.cfg.Sources[s]; ok { 155 155 + c.logger.Info("source already present", "source", s) 156 156 + return 157 157 + } 158 158 + 153 159 c.cfgMu.Lock() 154 160 c.cfg.Sources[s] = struct{}{} 155 161 c.wg.Add(1)

knotclient/cursor/memory.go eventconsumer/cursor/memory.go

knotclient/cursor/store.go eventconsumer/cursor/store.go

+39

eventconsumer/knot.go

··· 1 1 + package eventconsumer 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "net/url" 6 6 + ) 7 7 + 8 8 + type KnotSource struct { 9 9 + Knot string 10 10 + } 11 11 + 12 12 + func (k KnotSource) Key() string { 13 13 + return k.Knot 14 14 + } 15 15 + 16 16 + func (k KnotSource) Url(cursor int64, dev bool) (*url.URL, error) { 17 17 + scheme := "wss" 18 18 + if dev { 19 19 + scheme = "ws" 20 20 + } 21 21 + 22 22 + u, err := url.Parse(scheme + "://" + k.Knot + "/events") 23 23 + if err != nil { 24 24 + return nil, err 25 25 + } 26 26 + 27 27 + if cursor != 0 { 28 28 + query := url.Values{} 29 29 + query.Add("cursor", fmt.Sprintf("%d", cursor)) 30 30 + u.RawQuery = query.Encode() 31 31 + } 32 32 + return u, nil 33 33 + } 34 34 + 35 35 + func NewKnotSource(knot string) KnotSource { 36 36 + return KnotSource{ 37 37 + Knot: knot, 38 38 + } 39 39 + }

+39

eventconsumer/spindle.go

··· 1 1 + package eventconsumer 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "net/url" 6 6 + ) 7 7 + 8 8 + type SpindleSource struct { 9 9 + Spindle string 10 10 + } 11 11 + 12 12 + func (s SpindleSource) Key() string { 13 13 + return s.Spindle 14 14 + } 15 15 + 16 16 + func (s SpindleSource) Url(cursor int64, dev bool) (*url.URL, error) { 17 17 + scheme := "wss" 18 18 + if dev { 19 19 + scheme = "ws" 20 20 + } 21 21 + 22 22 + u, err := url.Parse(scheme + "://" + s.Spindle + "/events") 23 23 + if err != nil { 24 24 + return nil, err 25 25 + } 26 26 + 27 27 + if cursor != 0 { 28 28 + query := url.Values{} 29 29 + query.Add("cursor", fmt.Sprintf("%d", cursor)) 30 30 + u.RawQuery = query.Encode() 31 31 + } 32 32 + return u, nil 33 33 + } 34 34 + 35 35 + func NewSpindleSource(spindle string) SpindleSource { 36 36 + return SpindleSource{ 37 37 + Spindle: spindle, 38 38 + } 39 39 + }

-119

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

··· 1 1 - {{ define "repo/fragments/pipelineStatusSymbol" }} 2 2 - <div class="group relative inline-block"> 3 3 - {{ block "icon" $ }} {{ end }} 4 4 - {{ block "tooltip" $ }} {{ end }} 5 5 - </div> 6 6 - {{ end }} 7 7 - 8 8 - {{ define "icon" }} 9 9 - <div class="cursor-pointer"> 10 10 - {{ $c := .Counts }} 11 11 - {{ $statuses := .Statuses }} 12 12 - {{ $total := len $statuses }} 13 13 - {{ $success := index $c "success" }} 14 14 - {{ $allPass := eq $success $total }} 15 15 - 16 16 - {{ if $allPass }} 17 17 - <div class="flex gap-1 items-center"> 18 18 - {{ i "check" "size-4 text-green-600 dark:text-green-400 " }} 19 19 - <span>{{ $total }}/{{ $total }}</span> 20 20 - </div> 21 21 - {{ else }} 22 22 - {{ $radius := f64 8 }} 23 23 - {{ $circumference := mulf64 2.0 (mulf64 3.1416 $radius) }} 24 24 - {{ $offset := 0.0 }} 25 25 - <div class="flex gap-1 items-center"> 26 26 - <svg class="w-4 h-4 transform -rotate-90" viewBox="0 0 20 20"> 27 27 - <circle cx="10" cy="10" r="{{ $radius }}" fill="none" stroke="#f3f4f633" stroke-width="2"/> 28 28 - 29 29 - {{ range $kind, $count := $c }} 30 30 - {{ $color := "" }} 31 31 - {{ if or (eq $kind "pending") (eq $kind "running") }} 32 32 - {{ $color = "#eab308" }} 33 33 - {{ else if eq $kind "success" }} 34 34 - {{ $color = "#10b981" }} 35 35 - {{ else if eq $kind "cancelled" }} 36 36 - {{ $color = "#6b7280" }} 37 37 - {{ else }} 38 38 - {{ $color = "#ef4444" }} 39 39 - {{ end }} 40 40 - 41 41 - {{ $percent := divf64 (f64 $count) (f64 $total) }} 42 42 - {{ $length := mulf64 $percent $circumference }} 43 43 - 44 44 - <circle 45 45 - cx="10" cy="10" r="{{ $radius }}" 46 46 - fill="none" 47 47 - stroke="{{ $color }}" 48 48 - stroke-width="2" 49 49 - stroke-dasharray="{{ printf "%.2f %.2f" $length (subf64 $circumference $length) }}" 50 50 - stroke-dashoffset="{{ printf "%.2f" (negf64 $offset) }}" 51 51 - /> 52 52 - {{ $offset = addf64 $offset $length }} 53 53 - {{ end }} 54 54 - </svg> 55 55 - <span>{{$success}}/{{ $total }}</span> 56 56 - </div> 57 57 - {{ end }} 58 58 - </div> 59 59 - {{ end }} 60 60 - 61 61 - {{ define "tooltip" }} 62 62 - <div class="absolute z-[9999] hidden group-hover:block bg-white dark:bg-gray-900 text-sm text-black dark:text-white rounded-md shadow p-2 w-80 top-full mt-2"> 63 63 - <div class="flex flex-col divide-y divide-gray-200 dark:divide-gray-700"> 64 64 - {{ range $name, $all := .Statuses }} 65 65 - <div class="flex items-center justify-between p-1"> 66 66 - {{ $lastStatus := $all.Latest }} 67 67 - {{ $kind := $lastStatus.Status.String }} 68 68 - 69 69 - {{ $icon := "dot" }} 70 70 - {{ $color := "text-gray-600 dark:text-gray-500" }} 71 71 - {{ $text := "Failed" }} 72 72 - {{ $time := "" }} 73 73 - 74 74 - {{ if eq $kind "pending" }} 75 75 - {{ $icon = "circle-dashed" }} 76 76 - {{ $color = "text-yellow-600 dark:text-yellow-500" }} 77 77 - {{ $text = "Queued" }} 78 78 - {{ $time = timeFmt $lastStatus.Created }} 79 79 - {{ else if eq $kind "running" }} 80 80 - {{ $icon = "circle-dashed" }} 81 81 - {{ $color = "text-yellow-600 dark:text-yellow-500" }} 82 82 - {{ $text = "Running" }} 83 83 - {{ $time = timeFmt $lastStatus.Created }} 84 84 - {{ else if eq $kind "success" }} 85 85 - {{ $icon = "check" }} 86 86 - {{ $color = "text-green-600 dark:text-green-500" }} 87 87 - {{ $text = "Success" }} 88 88 - {{ with $all.TimeTaken }} 89 89 - {{ $time = durationFmt . }} 90 90 - {{ end }} 91 91 - {{ else if eq $kind "cancelled" }} 92 92 - {{ $icon = "circle-slash" }} 93 93 - {{ $color = "text-gray-600 dark:text-gray-500" }} 94 94 - {{ $text = "Cancelled" }} 95 95 - {{ with $all.TimeTaken }} 96 96 - {{ $time = durationFmt . }} 97 97 - {{ end }} 98 98 - {{ else }} 99 99 - {{ $icon = "x" }} 100 100 - {{ $color = "text-red-600 dark:text-red-500" }} 101 101 - {{ $text = "Failed" }} 102 102 - {{ with $all.TimeTaken }} 103 103 - {{ $time = durationFmt . }} 104 104 - {{ end }} 105 105 - {{ end }} 106 106 - 107 107 - <div id="left" class="flex items-center gap-2 flex-shrink-0"> 108 108 - {{ i $icon "size-4" $color }} 109 109 - {{ $name }} 110 110 - </div> 111 111 - <div id="right" class="flex items-center gap-2 flex-shrink-0"> 112 112 - <span class="font-bold">{{ $text }}</span> 113 113 - <time class="text-gray-400 dark:text-gray-600">{{ $time }}</time> 114 114 - </div> 115 115 - </div> 116 116 - {{ end }} 117 117 - </div> 118 118 - </div> 119 119 - {{ end }}

+118

appview/spindleverify/verify.go

··· 1 1 + package spindleverify 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "errors" 6 6 + "fmt" 7 7 + "io" 8 8 + "net/http" 9 9 + "strings" 10 10 + "time" 11 11 + 12 12 + "tangled.sh/tangled.sh/core/appview/db" 13 13 + "tangled.sh/tangled.sh/core/rbac" 14 14 + ) 15 15 + 16 16 + var ( 17 17 + FetchError = errors.New("failed to fetch owner") 18 18 + ) 19 19 + 20 20 + // TODO: move this to "spindleclient" or similar 21 21 + func fetchOwner(ctx context.Context, domain string, dev bool) (string, error) { 22 22 + scheme := "https" 23 23 + if dev { 24 24 + scheme = "http" 25 25 + } 26 26 + 27 27 + url := fmt.Sprintf("%s://%s/owner", scheme, domain) 28 28 + req, err := http.NewRequest("GET", url, nil) 29 29 + if err != nil { 30 30 + return "", err 31 31 + } 32 32 + 33 33 + client := &http.Client{ 34 34 + Timeout: 1 * time.Second, 35 35 + } 36 36 + 37 37 + resp, err := client.Do(req.WithContext(ctx)) 38 38 + if err != nil || resp.StatusCode != 200 { 39 39 + return "", fmt.Errorf("failed to fetch /owner") 40 40 + } 41 41 + 42 42 + body, err := io.ReadAll(io.LimitReader(resp.Body, 1024)) // read atmost 1kb of data 43 43 + if err != nil { 44 44 + return "", fmt.Errorf("failed to read /owner response: %w", err) 45 45 + } 46 46 + 47 47 + did := strings.TrimSpace(string(body)) 48 48 + if did == "" { 49 49 + return "", fmt.Errorf("empty DID in /owner response") 50 50 + } 51 51 + 52 52 + return did, nil 53 53 + } 54 54 + 55 55 + type OwnerMismatch struct { 56 56 + expected string 57 57 + observed string 58 58 + } 59 59 + 60 60 + func (e *OwnerMismatch) Error() string { 61 61 + return fmt.Sprintf("owner mismatch: %q != %q", e.expected, e.observed) 62 62 + } 63 63 + 64 64 + func RunVerification(ctx context.Context, instance, expectedOwner string, dev bool) error { 65 65 + // begin verification 66 66 + observedOwner, err := fetchOwner(ctx, instance, dev) 67 67 + if err != nil { 68 68 + return fmt.Errorf("%w: %w", FetchError, err) 69 69 + } 70 70 + 71 71 + if observedOwner != expectedOwner { 72 72 + return &OwnerMismatch{ 73 73 + expected: expectedOwner, 74 74 + observed: observedOwner, 75 75 + } 76 76 + } 77 77 + 78 78 + return nil 79 79 + } 80 80 + 81 81 + // mark this spindle as verified in the DB and add this user as its owner 82 82 + func MarkVerified(d *db.DB, e *rbac.Enforcer, instance, owner string) (int64, error) { 83 83 + tx, err := d.Begin() 84 84 + if err != nil { 85 85 + return 0, fmt.Errorf("failed to create txn: %w", err) 86 86 + } 87 87 + defer func() { 88 88 + tx.Rollback() 89 89 + e.E.LoadPolicy() 90 90 + }() 91 91 + 92 92 + // mark this spindle as verified in the db 93 93 + rowId, err := db.VerifySpindle( 94 94 + tx, 95 95 + db.FilterEq("owner", owner), 96 96 + db.FilterEq("instance", instance), 97 97 + ) 98 98 + if err != nil { 99 99 + return 0, fmt.Errorf("failed to write to DB: %w", err) 100 100 + } 101 101 + 102 102 + err = e.AddSpindleOwner(instance, owner) 103 103 + if err != nil { 104 104 + return 0, fmt.Errorf("failed to update ACL: %w", err) 105 105 + } 106 106 + 107 107 + err = tx.Commit() 108 108 + if err != nil { 109 109 + return 0, fmt.Errorf("failed to commit txn: %w", err) 110 110 + } 111 111 + 112 112 + err = e.E.SavePolicy() 113 113 + if err != nil { 114 114 + return 0, fmt.Errorf("failed to update ACL: %w", err) 115 115 + } 116 116 + 117 117 + return rowId, nil 118 118 + }

+27 -12

spindle/engine/logger.go

··· 41 41 42 42 func (l *WorkflowLogger) DataWriter(stream string) io.Writer { 43 43 // TODO: emit stream 44 44 - return &jsonWriter{logger: l, kind: models.LogKindData} 44 44 + return &dataWriter{ 45 45 + logger: l, 46 46 + stream: stream, 47 47 + } 45 48 } 46 49 47 47 - func (l *WorkflowLogger) ControlWriter() io.Writer { 48 48 - return &jsonWriter{logger: l, kind: models.LogKindControl} 50 50 + func (l *WorkflowLogger) ControlWriter(idx int, step models.Step) io.Writer { 51 51 + return &controlWriter{ 52 52 + logger: l, 53 53 + idx: idx, 54 54 + step: step, 55 55 + } 49 56 } 50 57 51 51 - type jsonWriter struct { 58 58 + type dataWriter struct { 52 59 logger *WorkflowLogger 53 53 - kind models.LogKind 60 60 + stream string 54 61 } 55 62 56 56 - func (w *jsonWriter) Write(p []byte) (int, error) { 63 63 + func (w *dataWriter) Write(p []byte) (int, error) { 57 64 line := strings.TrimRight(string(p), "\r\n") 58 58 - 59 59 - entry := models.LogLine{ 60 60 - Kind: w.kind, 61 61 - Content: line, 65 65 + entry := models.NewDataLogLine(line, w.stream) 66 66 + if err := w.logger.encoder.Encode(entry); err != nil { 67 67 + return 0, err 62 68 } 69 69 + return len(p), nil 70 70 + } 71 71 + 72 72 + type controlWriter struct { 73 73 + logger *WorkflowLogger 74 74 + idx int 75 75 + step models.Step 76 76 + } 63 77 78 78 + func (w *controlWriter) Write(_ []byte) (int, error) { 79 79 + entry := models.NewControlLogLine(w.idx, w.step) 64 80 if err := w.logger.encoder.Encode(entry); err != nil { 65 81 return 0, err 66 82 } 67 67 - 68 68 - return len(p), nil 83 83 + return len(w.step.Name), nil 69 84 }

+85 -54

lexicons/pipeline.json

··· 9 9 "key": "tid", 10 10 "record": { 11 11 "type": "object", 12 12 - "required": ["triggerMetadata", "workflows"], 12 12 + "required": [ 13 13 + "triggerMetadata", 14 14 + "workflows" 15 15 + ], 13 16 "properties": { 14 17 "triggerMetadata": { 15 18 "type": "ref", ··· 27 30 }, 28 31 "triggerMetadata": { 29 32 "type": "object", 30 30 - "required": ["kind", "repo"], 33 33 + "required": [ 34 34 + "kind", 35 35 + "repo" 36 36 + ], 31 37 "properties": { 32 38 "kind": { 33 39 "type": "string", 34 34 - "enum": ["push", "pull_request", "manual"] 40 40 + "enum": [ 41 41 + "push", 42 42 + "pull_request", 43 43 + "manual" 44 44 + ] 35 45 }, 36 46 "repo": { 37 47 "type": "ref", ··· 53 63 }, 54 64 "triggerRepo": { 55 65 "type": "object", 56 56 - "required": ["knot", "did", "repo", "defaultBranch"], 66 66 + "required": [ 67 67 + "knot", 68 68 + "did", 69 69 + "repo", 70 70 + "defaultBranch" 71 71 + ], 57 72 "properties": { 58 73 "knot": { 59 74 "type": "string" ··· 72 87 }, 73 88 "pushTriggerData": { 74 89 "type": "object", 75 75 - "required": ["ref", "newSha", "oldSha"], 90 90 + "required": [ 91 91 + "ref", 92 92 + "newSha", 93 93 + "oldSha" 94 94 + ], 76 95 "properties": { 77 96 "ref": { 78 97 "type": "string" ··· 91 110 }, 92 111 "pullRequestTriggerData": { 93 112 "type": "object", 94 94 - "required": ["sourceBranch", "targetBranch", "sourceSha", "action"], 113 113 + "required": [ 114 114 + "sourceBranch", 115 115 + "targetBranch", 116 116 + "sourceSha", 117 117 + "action" 118 118 + ], 95 119 "properties": { 96 120 "sourceBranch": { 97 121 "type": "string" ··· 115 139 "inputs": { 116 140 "type": "array", 117 141 "items": { 118 118 - "type": "object", 119 119 - "required": ["key", "value"], 120 120 - "properties": { 121 121 - "key": { 122 122 - "type": "string" 123 123 - }, 124 124 - "value": { 125 125 - "type": "string" 126 126 - } 127 127 - } 142 142 + "type": "ref", 143 143 + "ref": "#pair" 128 144 } 129 145 } 130 146 } 131 147 }, 132 148 "workflow": { 133 149 "type": "object", 134 134 - "required": ["name", "dependencies", "steps", "environment", "clone"], 150 150 + "required": [ 151 151 + "name", 152 152 + "dependencies", 153 153 + "steps", 154 154 + "environment", 155 155 + "clone" 156 156 + ], 135 157 "properties": { 136 158 "name": { 137 159 "type": "string" 138 160 }, 139 161 "dependencies": { 140 140 - "type": "ref", 141 141 - "ref": "#dependencies" 162 162 + "type": "array", 163 163 + "items": { 164 164 + "type": "ref", 165 165 + "ref": "#dependency" 166 166 + } 142 167 }, 143 168 "steps": { 144 169 "type": "array", ··· 150 175 "environment": { 151 176 "type": "array", 152 177 "items": { 153 153 - "type": "object", 154 154 - "required": ["key", "value"], 155 155 - "properties": { 156 156 - "key": { 157 157 - "type": "string" 158 158 - }, 159 159 - "value": { 160 160 - "type": "string" 161 161 - } 162 162 - } 178 178 + "type": "ref", 179 179 + "ref": "#pair" 163 180 } 164 181 }, 165 182 "clone": { ··· 168 185 } 169 186 } 170 187 }, 171 171 - "dependencies": { 172 172 - "type": "array", 173 173 - "items": { 174 174 - "type": "object", 175 175 - "required": ["registry", "packages"], 176 176 - "properties": { 177 177 - "registry": { 188 188 + "dependency": { 189 189 + "type": "object", 190 190 + "required": [ 191 191 + "registry", 192 192 + "packages" 193 193 + ], 194 194 + "properties": { 195 195 + "registry": { 196 196 + "type": "string" 197 197 + }, 198 198 + "packages": { 199 199 + "type": "array", 200 200 + "items": { 178 201 "type": "string" 179 179 - }, 180 180 - "packages": { 181 181 - "type": "array", 182 182 - "items": { 183 183 - "type": "string" 184 184 - } 185 202 } 186 203 } 187 204 } 188 205 }, 189 206 "cloneOpts": { 190 207 "type": "object", 191 191 - "required": ["skip", "depth", "submodules"], 208 208 + "required": [ 209 209 + "skip", 210 210 + "depth", 211 211 + "submodules" 212 212 + ], 192 213 "properties": { 193 214 "skip": { 194 215 "type": "boolean" ··· 203 224 }, 204 225 "step": { 205 226 "type": "object", 206 206 - "required": ["name", "command"], 227 227 + "required": [ 228 228 + "name", 229 229 + "command" 230 230 + ], 207 231 "properties": { 208 232 "name": { 209 233 "type": "string" ··· 214 238 "environment": { 215 239 "type": "array", 216 240 "items": { 217 217 - "type": "object", 218 218 - "required": ["key", "value"], 219 219 - "properties": { 220 220 - "key": { 221 221 - "type": "string" 222 222 - }, 223 223 - "value": { 224 224 - "type": "string" 225 225 - } 226 226 - } 241 241 + "type": "ref", 242 242 + "ref": "#pair" 227 243 } 228 244 } 229 245 } 246 246 + }, 247 247 + "pair": { 248 248 + "type": "object", 249 249 + "required": [ 250 250 + "key", 251 251 + "value" 252 252 + ], 253 253 + "properties": { 254 254 + "key": { 255 255 + "type": "string" 256 256 + }, 257 257 + "value": { 258 258 + "type": "string" 259 259 + } 260 260 + } 230 261 } 231 262 } 232 263 }

-147

knotserver/jetstream.go

··· 1 1 - package knotserver 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "encoding/json" 6 6 - "fmt" 7 7 - "io" 8 8 - "net/http" 9 9 - "net/url" 10 10 - "strings" 11 11 - 12 12 - "github.com/bluesky-social/jetstream/pkg/models" 13 13 - "tangled.sh/tangled.sh/core/api/tangled" 14 14 - "tangled.sh/tangled.sh/core/knotserver/db" 15 15 - "tangled.sh/tangled.sh/core/log" 16 16 - ) 17 17 - 18 18 - func (h *Handle) processPublicKey(ctx context.Context, did string, record tangled.PublicKey) error { 19 19 - l := log.FromContext(ctx) 20 20 - pk := db.PublicKey{ 21 21 - Did: did, 22 22 - PublicKey: record, 23 23 - } 24 24 - if err := h.db.AddPublicKey(pk); err != nil { 25 25 - l.Error("failed to add public key", "error", err) 26 26 - return fmt.Errorf("failed to add public key: %w", err) 27 27 - } 28 28 - l.Info("added public key from firehose", "did", did) 29 29 - return nil 30 30 - } 31 31 - 32 32 - func (h *Handle) processKnotMember(ctx context.Context, did string, record tangled.KnotMember) error { 33 33 - l := log.FromContext(ctx) 34 34 - 35 35 - if record.Domain != h.c.Server.Hostname { 36 36 - l.Error("domain mismatch", "domain", record.Domain, "expected", h.c.Server.Hostname) 37 37 - return fmt.Errorf("domain mismatch: %s != %s", record.Domain, h.c.Server.Hostname) 38 38 - } 39 39 - 40 40 - ok, err := h.e.E.Enforce(did, ThisServer, ThisServer, "server:invite") 41 41 - if err != nil || !ok { 42 42 - l.Error("failed to add member", "did", did) 43 43 - return fmt.Errorf("failed to enforce permissions: %w", err) 44 44 - } 45 45 - 46 46 - if err := h.e.AddKnotMember(ThisServer, record.Subject); err != nil { 47 47 - l.Error("failed to add member", "error", err) 48 48 - return fmt.Errorf("failed to add member: %w", err) 49 49 - } 50 50 - l.Info("added member from firehose", "member", record.Subject) 51 51 - 52 52 - if err := h.db.AddDid(did); err != nil { 53 53 - l.Error("failed to add did", "error", err) 54 54 - return fmt.Errorf("failed to add did: %w", err) 55 55 - } 56 56 - h.jc.AddDid(did) 57 57 - 58 58 - if err := h.fetchAndAddKeys(ctx, did); err != nil { 59 59 - return fmt.Errorf("failed to fetch and add keys: %w", err) 60 60 - } 61 61 - 62 62 - return nil 63 63 - } 64 64 - 65 65 - func (h *Handle) fetchAndAddKeys(ctx context.Context, did string) error { 66 66 - l := log.FromContext(ctx) 67 67 - 68 68 - keysEndpoint, err := url.JoinPath(h.c.AppViewEndpoint, "keys", did) 69 69 - if err != nil { 70 70 - l.Error("error building endpoint url", "did", did, "error", err.Error()) 71 71 - return fmt.Errorf("error building endpoint url: %w", err) 72 72 - } 73 73 - 74 74 - resp, err := http.Get(keysEndpoint) 75 75 - if err != nil { 76 76 - l.Error("error getting keys", "did", did, "error", err) 77 77 - return fmt.Errorf("error getting keys: %w", err) 78 78 - } 79 79 - defer resp.Body.Close() 80 80 - 81 81 - if resp.StatusCode == http.StatusNotFound { 82 82 - l.Info("no keys found for did", "did", did) 83 83 - return nil 84 84 - } 85 85 - 86 86 - plaintext, err := io.ReadAll(resp.Body) 87 87 - if err != nil { 88 88 - l.Error("error reading response body", "error", err) 89 89 - return fmt.Errorf("error reading response body: %w", err) 90 90 - } 91 91 - 92 92 - for _, key := range strings.Split(string(plaintext), "\n") { 93 93 - if key == "" { 94 94 - continue 95 95 - } 96 96 - pk := db.PublicKey{ 97 97 - Did: did, 98 98 - } 99 99 - pk.Key = key 100 100 - if err := h.db.AddPublicKey(pk); err != nil { 101 101 - l.Error("failed to add public key", "error", err) 102 102 - return fmt.Errorf("failed to add public key: %w", err) 103 103 - } 104 104 - } 105 105 - return nil 106 106 - } 107 107 - 108 108 - func (h *Handle) processMessages(ctx context.Context, event *models.Event) error { 109 109 - did := event.Did 110 110 - if event.Kind != models.EventKindCommit { 111 111 - return nil 112 112 - } 113 113 - 114 114 - var err error 115 115 - defer func() { 116 116 - eventTime := event.TimeUS 117 117 - lastTimeUs := eventTime + 1 118 118 - fmt.Println("lastTimeUs", lastTimeUs) 119 119 - if err := h.db.SaveLastTimeUs(lastTimeUs); err != nil { 120 120 - err = fmt.Errorf("(deferred) failed to save last time us: %w", err) 121 121 - } 122 122 - }() 123 123 - 124 124 - raw := json.RawMessage(event.Commit.Record) 125 125 - 126 126 - switch event.Commit.Collection { 127 127 - case tangled.PublicKeyNSID: 128 128 - var record tangled.PublicKey 129 129 - if err := json.Unmarshal(raw, &record); err != nil { 130 130 - return fmt.Errorf("failed to unmarshal record: %w", err) 131 131 - } 132 132 - if err := h.processPublicKey(ctx, did, record); err != nil { 133 133 - return fmt.Errorf("failed to process public key: %w", err) 134 134 - } 135 135 - 136 136 - case tangled.KnotMemberNSID: 137 137 - var record tangled.KnotMember 138 138 - if err := json.Unmarshal(raw, &record); err != nil { 139 139 - return fmt.Errorf("failed to unmarshal record: %w", err) 140 140 - } 141 141 - if err := h.processKnotMember(ctx, did, record); err != nil { 142 142 - return fmt.Errorf("failed to process knot member: %w", err) 143 143 - } 144 144 - } 145 145 - 146 146 - return err 147 147 - }

+1 -1

spindle/engine/envs_test.go

··· 34 34 if got == nil { 35 35 got = EnvVars{} 36 36 } 37 37 - assert.Equal(t, tt.want, got) 37 37 + assert.ElementsMatch(t, tt.want, got) 38 38 }) 39 39 } 40 40 }

+8 -1

docs/spindle/hosting.md

··· 36 36 go build -o cmd/spindle/spindle cmd/spindle/main.go 37 37 ``` 38 38 39 39 - 3. **Run the Spindle binary.** 39 39 + 3. **Create the log directory.** 40 40 + 41 41 + ```shell 42 42 + sudo mkdir -p /var/log/spindle 43 43 + sudo chown $USER:$USER -R /var/log/spindle 44 44 + ``` 45 45 + 46 46 + 4. **Run the Spindle binary.** 40 47 41 48 ```shell 42 49 ./cmd/spindle/spindle

+24

api/tangled/feedreaction.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.feed.reaction 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + FeedReactionNSID = "sh.tangled.feed.reaction" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("sh.tangled.feed.reaction", &FeedReaction{}) 17 17 + } // 18 18 + // RECORDTYPE: FeedReaction 19 19 + type FeedReaction struct { 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.feed.reaction" cborgen:"$type,const=sh.tangled.feed.reaction"` 21 21 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 22 22 + Reaction string `json:"reaction" cborgen:"reaction"` 23 23 + Subject string `json:"subject" cborgen:"subject"` 24 24 + }

+34

lexicons/feed/reaction.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.feed.reaction", 4 4 + "needsCbor": true, 5 5 + "needsType": true, 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "key": "tid", 10 10 + "record": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "subject", 14 14 + "reaction", 15 15 + "createdAt" 16 16 + ], 17 17 + "properties": { 18 18 + "subject": { 19 19 + "type": "string", 20 20 + "format": "at-uri" 21 21 + }, 22 22 + "reaction": { 23 23 + "type": "string", 24 24 + "enum": [ "👍", "👎", "😆", "🎉", "🫤", "❤️", "🚀", "👀" ] 25 25 + }, 26 26 + "createdAt": { 27 27 + "type": "string", 28 28 + "format": "datetime" 29 29 + } 30 30 + } 31 31 + } 32 32 + } 33 33 + } 34 34 + }

-98

appview/pages/templates/knot.html

··· 1 1 - {{ define "title" }}{{ .Registration.Domain }}{{ end }} 2 2 - 3 3 - {{ define "content" }} 4 4 - <div class="p-6"> 5 5 - <p class="text-xl font-bold dark:text-white">{{ .Registration.Domain }}</p> 6 6 - </div> 7 7 - 8 8 - <div class="flex flex-col"> 9 9 - {{ block "registration-info" . }} {{ end }} 10 10 - {{ block "members" . }} {{ end }} 11 11 - {{ block "add-member" . }} {{ end }} 12 12 - </div> 13 13 - {{ end }} 14 14 - 15 15 - {{ define "registration-info" }} 16 16 - <section class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit"> 17 17 - <dl class="grid grid-cols-[auto_1fr] gap-x-4 dark:text-gray-200"> 18 18 - <dt class="font-bold">opened by</dt> 19 19 - <dd> 20 20 - <span> 21 21 - {{ index $.DidHandleMap .Registration.ByDid }} <span class="text-gray-500 dark:text-gray-400 font-mono">{{ .Registration.ByDid }}</span> 22 22 - </span> 23 23 - {{ if eq $.LoggedInUser.Did $.Registration.ByDid }} 24 24 - <span class="text-xs bg-blue-100 dark:bg-blue-900 text-blue-800 dark:text-blue-200 px-2 py-1 rounded ml-2">you</span> 25 25 - {{ end }} 26 26 - </dd> 27 27 - 28 28 - <dt class="font-bold">opened</dt> 29 29 - <dd>{{ template "repo/fragments/time" .Registration.Created }}</dd> 30 30 - 31 31 - {{ if .Registration.Registered }} 32 32 - <dt class="font-bold">registered</dt> 33 33 - <dd>{{ template "repo/fragments/time" .Registration.Registered }}</dd> 34 34 - {{ else }} 35 35 - <dt class="font-bold">status</dt> 36 36 - <dd class="text-yellow-800 dark:text-yellow-200 bg-yellow-100 dark:bg-yellow-900 rounded px-2 py-1 inline-block"> 37 37 - Pending Registration 38 38 - </dd> 39 39 - {{ end }} 40 40 - </dl> 41 41 - 42 42 - {{ if not .Registration.Registered }} 43 43 - <div class="mt-4"> 44 44 - <button 45 45 - class="btn dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600" 46 46 - hx-post="/knots/{{.Domain}}/init" 47 47 - hx-swap="none"> 48 48 - Initialize Registration 49 49 - </button> 50 50 - </div> 51 51 - {{ end }} 52 52 - </section> 53 53 - {{ end }} 54 54 - 55 55 - {{ define "members" }} 56 56 - <h2 class="text-sm font-bold py-2 px-6 uppercase dark:text-gray-300">members</h2> 57 57 - <section class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit"> 58 58 - {{ if .Registration.Registered }} 59 59 - <div id="member-list" class="flex flex-col gap-4"> 60 60 - {{ range $.Members }} 61 61 - <div class="inline-flex items-center gap-4"> 62 62 - {{ i "user" "w-4 h-4 dark:text-gray-300" }} 63 63 - <a href="/{{index $.DidHandleMap .}}" class="text-gray-900 dark:text-white">{{index $.DidHandleMap .}} 64 64 - <span class="text-gray-500 dark:text-gray-400 font-mono">{{.}}</span> 65 65 - </a> 66 66 - </div> 67 67 - {{ else }} 68 68 - <p class="text-gray-500 dark:text-gray-400">No members have been added yet.</p> 69 69 - {{ end }} 70 70 - </div> 71 71 - {{ else }} 72 72 - <p class="text-gray-500 dark:text-gray-400">Members can be added after registration is complete.</p> 73 73 - {{ end }} 74 74 - </section> 75 75 - {{ end }} 76 76 - 77 77 - {{ define "add-member" }} 78 78 - {{ if $.IsOwner }} 79 79 - <h2 class="text-sm font-bold py-2 px-6 uppercase dark:text-gray-300">add member</h2> 80 80 - <section class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit"> 81 81 - <form 82 82 - hx-put="/knots/{{.Registration.Domain}}/member" 83 83 - class="max-w-2xl space-y-4"> 84 84 - <input 85 85 - type="text" 86 86 - id="subject" 87 87 - name="subject" 88 88 - placeholder="did or handle" 89 89 - required 90 90 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400"/> 91 91 - 92 92 - <button class="btn dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600" type="submit">add member</button> 93 93 - 94 94 - <div id="add-member-error" class="error dark:text-red-400"></div> 95 95 - </form> 96 96 - </section> 97 97 - {{ end }} 98 98 - {{ end }}

+42

knotserver/git/cmd.go

··· 1 1 + package git 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "os/exec" 6 6 + ) 7 7 + 8 8 + const ( 9 9 + fieldSeparator = "\x1f" // ASCII Unit Separator 10 10 + recordSeparator = "\x1e" // ASCII Record Separator 11 11 + ) 12 12 + 13 13 + func (g *GitRepo) runGitCmd(command string, extraArgs ...string) ([]byte, error) { 14 14 + var args []string 15 15 + args = append(args, command) 16 16 + args = append(args, extraArgs...) 17 17 + 18 18 + cmd := exec.Command("git", args...) 19 19 + cmd.Dir = g.path 20 20 + 21 21 + out, err := cmd.Output() 22 22 + if err != nil { 23 23 + if exitErr, ok := err.(*exec.ExitError); ok { 24 24 + return nil, fmt.Errorf("%w, stderr: %s", err, string(exitErr.Stderr)) 25 25 + } 26 26 + return nil, err 27 27 + } 28 28 + 29 29 + return out, nil 30 30 + } 31 31 + 32 32 + func (g *GitRepo) revList(extraArgs ...string) ([]byte, error) { 33 33 + return g.runGitCmd("rev-list", extraArgs...) 34 34 + } 35 35 + 36 36 + func (g *GitRepo) forEachRef(extraArgs ...string) ([]byte, error) { 37 37 + return g.runGitCmd("for-each-ref", extraArgs...) 38 38 + } 39 39 + 40 40 + func (g *GitRepo) revParse(extraArgs ...string) ([]byte, error) { 41 41 + return g.runGitCmd("rev-parse", extraArgs...) 42 42 + }

+26

types/diff.go

··· 5 5 "github.com/go-git/go-git/v5/plumbing/object" 6 6 ) 7 7 8 8 + type DiffOpts struct { 9 9 + Split bool `json:"split"` 10 10 + } 11 11 + 8 12 type TextFragment struct { 9 13 Header string `json:"comment"` 10 14 Lines []gitdiff.Line `json:"lines"` ··· 77 81 78 82 return files 79 83 } 84 84 + 85 85 + // used by html elements as a unique ID for hrefs 86 86 + func (d *Diff) Id() string { 87 87 + return d.Name.New 88 88 + } 89 89 + 90 90 + func (d *Diff) Split() *SplitDiff { 91 91 + fragments := make([]SplitFragment, len(d.TextFragments)) 92 92 + for i, fragment := range d.TextFragments { 93 93 + leftLines, rightLines := SeparateLines(&fragment) 94 94 + fragments[i] = SplitFragment{ 95 95 + Header: fragment.Header(), 96 96 + LeftLines: leftLines, 97 97 + RightLines: rightLines, 98 98 + } 99 99 + } 100 100 + 101 101 + return &SplitDiff{ 102 102 + Name: d.Id(), 103 103 + TextFragments: fragments, 104 104 + } 105 105 + }

-11

appview/tid.go

··· 1 1 - package appview 2 2 - 3 3 - import ( 4 4 - "github.com/bluesky-social/indigo/atproto/syntax" 5 5 - ) 6 6 - 7 7 - var c syntax.TIDClock = syntax.NewTIDClock(0) 8 8 - 9 9 - func TID() string { 10 10 - return c.Next().String() 11 11 - }

+3 -1

api/tangled/stateclosed.go

··· 4 4 5 5 // schema: sh.tangled.repo.issue.state.closed 6 6 7 7 - const () 7 7 + const ( 8 8 + RepoIssueStateClosedNSID = "sh.tangled.repo.issue.state.closed" 9 9 + ) 8 10 9 11 const RepoIssueStateClosed = "sh.tangled.repo.issue.state.closed"

+3 -1

api/tangled/stateopen.go

··· 4 4 5 5 // schema: sh.tangled.repo.issue.state.open 6 6 7 7 - const () 7 7 + const ( 8 8 + RepoIssueStateOpenNSID = "sh.tangled.repo.issue.state.open" 9 9 + ) 8 10 9 11 const RepoIssueStateOpen = "sh.tangled.repo.issue.state.open"

+3 -1

api/tangled/statusclosed.go

··· 4 4 5 5 // schema: sh.tangled.repo.pull.status.closed 6 6 7 7 - const () 7 7 + const ( 8 8 + RepoPullStatusClosedNSID = "sh.tangled.repo.pull.status.closed" 9 9 + ) 8 10 9 11 const RepoPullStatusClosed = "sh.tangled.repo.pull.status.closed"

+3 -1

api/tangled/statusmerged.go

··· 4 4 5 5 // schema: sh.tangled.repo.pull.status.merged 6 6 7 7 - const () 7 7 + const ( 8 8 + RepoPullStatusMergedNSID = "sh.tangled.repo.pull.status.merged" 9 9 + ) 8 10 9 11 const RepoPullStatusMerged = "sh.tangled.repo.pull.status.merged"

+3 -1

api/tangled/statusopen.go

··· 4 4 5 5 // schema: sh.tangled.repo.pull.status.open 6 6 7 7 - const () 7 7 + const ( 8 8 + RepoPullStatusOpenNSID = "sh.tangled.repo.pull.status.open" 9 9 + ) 8 10 9 11 const RepoPullStatusOpen = "sh.tangled.repo.pull.status.open"

+4

appview/idresolver/resolver.go

··· 111 111 112 112 return r.directory.Purge(ctx, *id) 113 113 } 114 114 + 115 115 + func (r *Resolver) Directory() identity.Directory { 116 116 + return r.directory 117 117 + }

+2 -3

appview/idresolver/resolver.go idresolver/resolver.go

··· 11 11 "github.com/bluesky-social/indigo/atproto/identity/redisdir" 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 13 "github.com/carlmjohnson/versioninfo" 14 14 - "tangled.sh/tangled.sh/core/appview/config" 15 14 ) 16 15 17 16 type Resolver struct { ··· 56 55 } 57 56 } 58 57 59 59 - func RedisResolver(config config.RedisConfig) (*Resolver, error) { 60 60 - directory, err := RedisDirectory(config.ToURL()) 58 58 + func RedisResolver(redisUrl string) (*Resolver, error) { 59 59 + directory, err := RedisDirectory(redisUrl) 61 60 if err != nil { 62 61 return nil, err 63 62 }

+30

api/tangled/reposetDefaultBranch.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.setDefaultBranch 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoSetDefaultBranchNSID = "sh.tangled.repo.setDefaultBranch" 15 15 + ) 16 16 + 17 17 + // RepoSetDefaultBranch_Input is the input argument to a sh.tangled.repo.setDefaultBranch call. 18 18 + type RepoSetDefaultBranch_Input struct { 19 19 + DefaultBranch string `json:"defaultBranch" cborgen:"defaultBranch"` 20 20 + Repo string `json:"repo" cborgen:"repo"` 21 21 + } 22 22 + 23 23 + // RepoSetDefaultBranch calls the XRPC method "sh.tangled.repo.setDefaultBranch". 24 24 + func RepoSetDefaultBranch(ctx context.Context, c util.LexClient, input *RepoSetDefaultBranch_Input) error { 25 25 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.setDefaultBranch", nil, input, nil); err != nil { 26 26 + return err 27 27 + } 28 28 + 29 29 + return nil 30 30 + }

+29

lexicons/defaultBranch.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.setDefaultBranch", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Set the default branch for a repository", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "repo", 14 14 + "defaultBranch" 15 15 + ], 16 16 + "properties": { 17 17 + "repo": { 18 18 + "type": "string", 19 19 + "format": "at-uri" 20 20 + }, 21 21 + "defaultBranch": { 22 22 + "type": "string" 23 23 + } 24 24 + } 25 25 + } 26 26 + } 27 27 + } 28 28 + } 29 29 + }

+6 -1

hook/setup.go

··· 133 133 134 134 hookContent := fmt.Sprintf(`#!/usr/bin/env bash 135 135 # AUTO GENERATED BY KNOT, DO NOT MODIFY 136 136 - %s hook -git-dir "$GIT_DIR" -user-did "$GIT_USER_DID" -user-handle "$GIT_USER_HANDLE" -internal-api "%s" post-recieve 136 136 + push_options=() 137 137 + for ((i=0; i<GIT_PUSH_OPTION_COUNT; i++)); do 138 138 + option_var="GIT_PUSH_OPTION_$i" 139 139 + push_options+=(-push-option "${!option_var}") 140 140 + done 141 141 + %s hook -git-dir "$GIT_DIR" -user-did "$GIT_USER_DID" -user-handle "$GIT_USER_HANDLE" -internal-api "%s" "${push_options[@]}" post-recieve 137 142 `, executablePath, config.internalApi) 138 143 139 144 return os.WriteFile(hookPath, []byte(hookContent), 0755)

+14

hook/hook.go

··· 3 3 import ( 4 4 "bufio" 5 5 "context" 6 6 + "encoding/json" 6 7 "fmt" 7 8 "net/http" 8 9 "os" ··· 11 12 "github.com/urfave/cli/v3" 12 13 ) 13 14 15 15 + type HookResponse struct { 16 16 + Messages []string `json:"messages"` 17 17 + } 18 18 + 14 19 // The hook command is nested like so: 15 20 // 16 21 // knot hook --[flags] [hook] ··· 88 93 return fmt.Errorf("unexpected status code: %d", resp.StatusCode) 89 94 } 90 95 96 96 + var data HookResponse 97 97 + if err := json.NewDecoder(resp.Body).Decode(&data); err != nil { 98 98 + return fmt.Errorf("failed to decode response: %w", err) 99 99 + } 100 100 + 101 101 + for _, message := range data.Messages { 102 102 + fmt.Println(message) 103 103 + } 104 104 + 91 105 return nil 92 106 }

+31

api/tangled/repoaddSecret.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.addSecret 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoAddSecretNSID = "sh.tangled.repo.addSecret" 15 15 + ) 16 16 + 17 17 + // RepoAddSecret_Input is the input argument to a sh.tangled.repo.addSecret call. 18 18 + type RepoAddSecret_Input struct { 19 19 + Key string `json:"key" cborgen:"key"` 20 20 + Repo string `json:"repo" cborgen:"repo"` 21 21 + Value string `json:"value" cborgen:"value"` 22 22 + } 23 23 + 24 24 + // RepoAddSecret calls the XRPC method "sh.tangled.repo.addSecret". 25 25 + func RepoAddSecret(ctx context.Context, c util.LexClient, input *RepoAddSecret_Input) error { 26 26 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.addSecret", nil, input, nil); err != nil { 27 27 + return err 28 28 + } 29 29 + 30 30 + return nil 31 31 + }

+41

api/tangled/repolistSecrets.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.listSecrets 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoListSecretsNSID = "sh.tangled.repo.listSecrets" 15 15 + ) 16 16 + 17 17 + // RepoListSecrets_Output is the output of a sh.tangled.repo.listSecrets call. 18 18 + type RepoListSecrets_Output struct { 19 19 + Secrets []*RepoListSecrets_Secret `json:"secrets" cborgen:"secrets"` 20 20 + } 21 21 + 22 22 + // RepoListSecrets_Secret is a "secret" in the sh.tangled.repo.listSecrets schema. 23 23 + type RepoListSecrets_Secret struct { 24 24 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 25 25 + CreatedBy string `json:"createdBy" cborgen:"createdBy"` 26 26 + Key string `json:"key" cborgen:"key"` 27 27 + Repo string `json:"repo" cborgen:"repo"` 28 28 + } 29 29 + 30 30 + // RepoListSecrets calls the XRPC method "sh.tangled.repo.listSecrets". 31 31 + func RepoListSecrets(ctx context.Context, c util.LexClient, repo string) (*RepoListSecrets_Output, error) { 32 32 + var out RepoListSecrets_Output 33 33 + 34 34 + params := map[string]interface{}{} 35 35 + params["repo"] = repo 36 36 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.listSecrets", params, nil, &out); err != nil { 37 37 + return nil, err 38 38 + } 39 39 + 40 40 + return &out, nil 41 41 + }

+30

api/tangled/reporemoveSecret.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.removeSecret 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoRemoveSecretNSID = "sh.tangled.repo.removeSecret" 15 15 + ) 16 16 + 17 17 + // RepoRemoveSecret_Input is the input argument to a sh.tangled.repo.removeSecret call. 18 18 + type RepoRemoveSecret_Input struct { 19 19 + Key string `json:"key" cborgen:"key"` 20 20 + Repo string `json:"repo" cborgen:"repo"` 21 21 + } 22 22 + 23 23 + // RepoRemoveSecret calls the XRPC method "sh.tangled.repo.removeSecret". 24 24 + func RepoRemoveSecret(ctx context.Context, c util.LexClient, input *RepoRemoveSecret_Input) error { 25 25 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.removeSecret", nil, input, nil); err != nil { 26 26 + return err 27 27 + } 28 28 + 29 29 + return nil 30 30 + }

+37

lexicons/addSecret.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.addSecret", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Add a CI secret", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "repo", 14 14 + "key", 15 15 + "value" 16 16 + ], 17 17 + "properties": { 18 18 + "repo": { 19 19 + "type": "string", 20 20 + "format": "at-uri" 21 21 + }, 22 22 + "key": { 23 23 + "type": "string", 24 24 + "maxLength": 50, 25 25 + "minLength": 1 26 26 + }, 27 27 + "value": { 28 28 + "type": "string", 29 29 + "maxLength": 200, 30 30 + "minLength": 1 31 31 + } 32 32 + } 33 33 + } 34 34 + } 35 35 + } 36 36 + } 37 37 + }

+67

lexicons/listSecrets.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.listSecrets", 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 + ], 12 12 + "properties": { 13 13 + "repo": { 14 14 + "type": "string", 15 15 + "format": "at-uri" 16 16 + } 17 17 + } 18 18 + }, 19 19 + "output": { 20 20 + "encoding": "application/json", 21 21 + "schema": { 22 22 + "type": "object", 23 23 + "required": [ 24 24 + "secrets" 25 25 + ], 26 26 + "properties": { 27 27 + "secrets": { 28 28 + "type": "array", 29 29 + "items": { 30 30 + "type": "ref", 31 31 + "ref": "#secret" 32 32 + } 33 33 + } 34 34 + } 35 35 + } 36 36 + } 37 37 + }, 38 38 + "secret": { 39 39 + "type": "object", 40 40 + "required": [ 41 41 + "repo", 42 42 + "key", 43 43 + "createdAt", 44 44 + "createdBy" 45 45 + ], 46 46 + "properties": { 47 47 + "repo": { 48 48 + "type": "string", 49 49 + "format": "at-uri" 50 50 + }, 51 51 + "key": { 52 52 + "type": "string", 53 53 + "maxLength": 50, 54 54 + "minLength": 1 55 55 + }, 56 56 + "createdAt": { 57 57 + "type": "string", 58 58 + "format": "datetime" 59 59 + }, 60 60 + "createdBy": { 61 61 + "type": "string", 62 62 + "format": "did" 63 63 + } 64 64 + } 65 65 + } 66 66 + } 67 67 + }

+31

lexicons/removeSecret.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.removeSecret", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Remove a CI secret", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "repo", 14 14 + "key" 15 15 + ], 16 16 + "properties": { 17 17 + "repo": { 18 18 + "type": "string", 19 19 + "format": "at-uri" 20 20 + }, 21 21 + "key": { 22 22 + "type": "string", 23 23 + "maxLength": 50, 24 24 + "minLength": 1 25 25 + } 26 26 + } 27 27 + } 28 28 + } 29 29 + } 30 30 + } 31 31 + }

+25

spindle/motd

··· 1 1 + **** 2 2 + *** *** 3 3 + *** ** ****** ** 4 4 + ** * ***** 5 5 + * ** ** 6 6 + * * * *************** 7 7 + ** ** *# ** 8 8 + * ** ** *** ** 9 9 + * * ** ** * ****** 10 10 + * ** ** * ** * * 11 11 + ** ** *** ** ** * 12 12 + ** ** * ** * * 13 13 + ** **** ** * * 14 14 + ** *** ** ** ** 15 15 + *** ** ***** 16 16 + ******************** 17 17 + ** 18 18 + * 19 19 + #************** 20 20 + ** 21 21 + ******** 22 22 + 23 23 + This is a spindle server. More info at https://tangled.sh/@tangled.sh/core/tree/master/docs/spindle 24 24 + 25 25 + Most API routes are under /xrpc/

+2 -2

appview/pages/markup/camo.go

··· 9 9 "github.com/yuin/goldmark/ast" 10 10 ) 11 11 12 12 - func generateCamoURL(baseURL, secret, imageURL string) string { 12 12 + func GenerateCamoURL(baseURL, secret, imageURL string) string { 13 13 h := hmac.New(sha256.New, []byte(secret)) 14 14 h.Write([]byte(imageURL)) 15 15 signature := hex.EncodeToString(h.Sum(nil)) ··· 24 24 } 25 25 26 26 if rctx.CamoUrl != "" && rctx.CamoSecret != "" { 27 27 - return generateCamoURL(rctx.CamoUrl, rctx.CamoSecret, dst) 27 27 + return GenerateCamoURL(rctx.CamoUrl, rctx.CamoSecret, dst) 28 28 } 29 29 30 30 return dst

+104

appview/signup/requests.go

··· 1 1 + package signup 2 2 + 3 3 + // We have this extra code here for now since the xrpcclient package 4 4 + // only supports OAuth'd requests; these are unauthenticated or use PDS admin auth. 5 5 + 6 6 + import ( 7 7 + "bytes" 8 8 + "encoding/json" 9 9 + "fmt" 10 10 + "io" 11 11 + "net/http" 12 12 + "net/url" 13 13 + ) 14 14 + 15 15 + // makePdsRequest is a helper method to make requests to the PDS service 16 16 + func (s *Signup) makePdsRequest(method, endpoint string, body interface{}, useAuth bool) (*http.Response, error) { 17 17 + jsonData, err := json.Marshal(body) 18 18 + if err != nil { 19 19 + return nil, err 20 20 + } 21 21 + 22 22 + url := fmt.Sprintf("%s/xrpc/%s", s.config.Pds.Host, endpoint) 23 23 + req, err := http.NewRequest(method, url, bytes.NewBuffer(jsonData)) 24 24 + if err != nil { 25 25 + return nil, err 26 26 + } 27 27 + 28 28 + req.Header.Set("Content-Type", "application/json") 29 29 + 30 30 + if useAuth { 31 31 + req.SetBasicAuth("admin", s.config.Pds.AdminSecret) 32 32 + } 33 33 + 34 34 + return http.DefaultClient.Do(req) 35 35 + } 36 36 + 37 37 + // handlePdsError processes error responses from the PDS service 38 38 + func (s *Signup) handlePdsError(resp *http.Response, action string) error { 39 39 + var errorResp struct { 40 40 + Error string `json:"error"` 41 41 + Message string `json:"message"` 42 42 + } 43 43 + 44 44 + respBody, _ := io.ReadAll(resp.Body) 45 45 + if err := json.Unmarshal(respBody, &errorResp); err == nil && errorResp.Message != "" { 46 46 + return fmt.Errorf("Failed to %s: %s - %s.", action, errorResp.Error, errorResp.Message) 47 47 + } 48 48 + 49 49 + // Fallback if we couldn't parse the error 50 50 + return fmt.Errorf("failed to %s, status code: %d", action, resp.StatusCode) 51 51 + } 52 52 + 53 53 + func (s *Signup) inviteCodeRequest() (string, error) { 54 54 + body := map[string]any{"useCount": 1} 55 55 + 56 56 + resp, err := s.makePdsRequest("POST", "com.atproto.server.createInviteCode", body, true) 57 57 + if err != nil { 58 58 + return "", err 59 59 + } 60 60 + defer resp.Body.Close() 61 61 + 62 62 + if resp.StatusCode != http.StatusOK { 63 63 + return "", s.handlePdsError(resp, "create invite code") 64 64 + } 65 65 + 66 66 + var result map[string]string 67 67 + json.NewDecoder(resp.Body).Decode(&result) 68 68 + return result["code"], nil 69 69 + } 70 70 + 71 71 + func (s *Signup) createAccountRequest(username, password, email, code string) (string, error) { 72 72 + parsedURL, err := url.Parse(s.config.Pds.Host) 73 73 + if err != nil { 74 74 + return "", fmt.Errorf("invalid PDS host URL: %w", err) 75 75 + } 76 76 + 77 77 + pdsDomain := parsedURL.Hostname() 78 78 + 79 79 + body := map[string]string{ 80 80 + "email": email, 81 81 + "handle": fmt.Sprintf("%s.%s", username, pdsDomain), 82 82 + "password": password, 83 83 + "inviteCode": code, 84 84 + } 85 85 + 86 86 + resp, err := s.makePdsRequest("POST", "com.atproto.server.createAccount", body, false) 87 87 + if err != nil { 88 88 + return "", err 89 89 + } 90 90 + defer resp.Body.Close() 91 91 + 92 92 + if resp.StatusCode != http.StatusOK { 93 93 + return "", s.handlePdsError(resp, "create account") 94 94 + } 95 95 + 96 96 + var result struct { 97 97 + DID string `json:"did"` 98 98 + } 99 99 + if err := json.NewDecoder(resp.Body).Decode(&result); err != nil { 100 100 + return "", fmt.Errorf("failed to decode create account response: %w", err) 101 101 + } 102 102 + 103 103 + return result.DID, nil 104 104 + }

lexicons/addSecret.json lexicons/repo/addSecret.json

lexicons/artifact.json lexicons/repo/artifact.json

lexicons/defaultBranch.json lexicons/repo/defaultBranch.json

lexicons/listSecrets.json lexicons/repo/listSecrets.json

lexicons/removeSecret.json lexicons/repo/removeSecret.json

lexicons/spindle.json lexicons/spindle/spindle.json

+25

api/tangled/repocollaborator.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.collaborator 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + RepoCollaboratorNSID = "sh.tangled.repo.collaborator" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("sh.tangled.repo.collaborator", &RepoCollaborator{}) 17 17 + } // 18 18 + // RECORDTYPE: RepoCollaborator 19 19 + type RepoCollaborator struct { 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.repo.collaborator" cborgen:"$type,const=sh.tangled.repo.collaborator"` 21 21 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 22 22 + // repo: repo to add this user to 23 23 + Repo string `json:"repo" cborgen:"repo"` 24 24 + Subject string `json:"subject" cborgen:"subject"` 25 25 + }

+36

lexicons/repo/collaborator.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.collaborator", 4 4 + "needsCbor": true, 5 5 + "needsType": true, 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "key": "tid", 10 10 + "record": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "subject", 14 14 + "repo", 15 15 + "createdAt" 16 16 + ], 17 17 + "properties": { 18 18 + "subject": { 19 19 + "type": "string", 20 20 + "format": "did" 21 21 + }, 22 22 + "repo": { 23 23 + "type": "string", 24 24 + "description": "repo to add this user to", 25 25 + "format": "at-uri" 26 26 + }, 27 27 + "createdAt": { 28 28 + "type": "string", 29 29 + "format": "datetime" 30 30 + } 31 31 + } 32 32 + } 33 33 + } 34 34 + } 35 35 + } 36 36 +

+25

api/tangled/tangledstring.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.string 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + StringNSID = "sh.tangled.string" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("sh.tangled.string", &String{}) 17 17 + } // 18 18 + // RECORDTYPE: String 19 19 + type String struct { 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.string" cborgen:"$type,const=sh.tangled.string"` 21 21 + Contents string `json:"contents" cborgen:"contents"` 22 22 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 + Description string `json:"description" cborgen:"description"` 24 24 + Filename string `json:"filename" cborgen:"filename"` 25 25 + }

+40

lexicons/string/string.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.string", 4 4 + "needsCbor": true, 5 5 + "needsType": true, 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "key": "tid", 10 10 + "record": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "filename", 14 14 + "description", 15 15 + "createdAt", 16 16 + "contents" 17 17 + ], 18 18 + "properties": { 19 19 + "filename": { 20 20 + "type": "string", 21 21 + "maxGraphemes": 140, 22 22 + "minGraphemes": 1 23 23 + }, 24 24 + "description": { 25 25 + "type": "string", 26 26 + "maxGraphemes": 280 27 27 + }, 28 28 + "createdAt": { 29 29 + "type": "string", 30 30 + "format": "datetime" 31 31 + }, 32 32 + "contents": { 33 33 + "type": "string", 34 34 + "minGraphemes": 1 35 35 + } 36 36 + } 37 37 + } 38 38 + } 39 39 + } 40 40 + }

+2 -3

nix/pkgs/spindle.nix

··· 2 2 buildGoApplication, 3 3 modules, 4 4 sqlite-lib, 5 5 - gitignoreSource, 5 5 + src, 6 6 }: 7 7 buildGoApplication { 8 8 pname = "spindle"; 9 9 version = "0.1.0"; 10 10 - src = gitignoreSource ../..; 11 11 - inherit modules; 10 10 + inherit src modules; 12 11 13 12 doCheck = false; 14 13

+59

spindle/db/member.go

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "time" 5 5 + 6 6 + "github.com/bluesky-social/indigo/atproto/syntax" 7 7 + ) 8 8 + 9 9 + type SpindleMember struct { 10 10 + Id int 11 11 + Did syntax.DID // owner of the record 12 12 + Rkey string // rkey of the record 13 13 + Instance string 14 14 + Subject syntax.DID // the member being added 15 15 + Created time.Time 16 16 + } 17 17 + 18 18 + func AddSpindleMember(db *DB, member SpindleMember) error { 19 19 + _, err := db.Exec( 20 20 + `insert or ignore into spindle_members (did, rkey, instance, subject) values (?, ?, ?, ?)`, 21 21 + member.Did, 22 22 + member.Rkey, 23 23 + member.Instance, 24 24 + member.Subject, 25 25 + ) 26 26 + return err 27 27 + } 28 28 + 29 29 + func RemoveSpindleMember(db *DB, owner_did, rkey string) error { 30 30 + _, err := db.Exec( 31 31 + "delete from spindle_members where did = ? and rkey = ?", 32 32 + owner_did, 33 33 + rkey, 34 34 + ) 35 35 + return err 36 36 + } 37 37 + 38 38 + func GetSpindleMember(db *DB, did, rkey string) (*SpindleMember, error) { 39 39 + query := 40 40 + `select id, did, rkey, instance, subject, created 41 41 + from spindle_members 42 42 + where did = ? and rkey = ?` 43 43 + 44 44 + var member SpindleMember 45 45 + var createdAt string 46 46 + err := db.QueryRow(query, did, rkey).Scan( 47 47 + &member.Id, 48 48 + &member.Did, 49 49 + &member.Rkey, 50 50 + &member.Instance, 51 51 + &member.Subject, 52 52 + &createdAt, 53 53 + ) 54 54 + if err != nil { 55 55 + return nil, err 56 56 + } 57 57 + 58 58 + return &member, nil 59 59 + }

+1 -1

spindle/secrets/openbao.go

··· 132 132 return ErrKeyNotFound 133 133 } 134 134 135 135 - err = v.client.KVv2(v.mountPath).Delete(ctx, secretPath) 135 135 + err = v.client.KVv2(v.mountPath).DeleteMetadata(ctx, secretPath) 136 136 if err != nil { 137 137 return fmt.Errorf("failed to delete secret from openbao: %w", err) 138 138 }

-62

appview/db/migrations/20250305_113405.sql

··· 1 1 - -- Simplified SQLite Database Migration Script for Issues and Comments 2 2 - 3 3 - -- Migration for issues table 4 4 - CREATE TABLE issues_new ( 5 5 - id integer primary key autoincrement, 6 6 - owner_did text not null, 7 7 - repo_at text not null, 8 8 - issue_id integer not null, 9 9 - title text not null, 10 10 - body text not null, 11 11 - open integer not null default 1, 12 12 - created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 13 13 - issue_at text, 14 14 - unique(repo_at, issue_id), 15 15 - foreign key (repo_at) references repos(at_uri) on delete cascade 16 16 - ); 17 17 - 18 18 - -- Migrate data to new issues table 19 19 - INSERT INTO issues_new ( 20 20 - id, owner_did, repo_at, issue_id, 21 21 - title, body, open, created, issue_at 22 22 - ) 23 23 - SELECT 24 24 - id, owner_did, repo_at, issue_id, 25 25 - title, body, open, created, issue_at 26 26 - FROM issues; 27 27 - 28 28 - -- Drop old issues table 29 29 - DROP TABLE issues; 30 30 - 31 31 - -- Rename new issues table 32 32 - ALTER TABLE issues_new RENAME TO issues; 33 33 - 34 34 - -- Migration for comments table 35 35 - CREATE TABLE comments_new ( 36 36 - id integer primary key autoincrement, 37 37 - owner_did text not null, 38 38 - issue_id integer not null, 39 39 - repo_at text not null, 40 40 - comment_id integer not null, 41 41 - comment_at text not null, 42 42 - body text not null, 43 43 - created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 44 44 - unique(issue_id, comment_id), 45 45 - foreign key (repo_at, issue_id) references issues(repo_at, issue_id) on delete cascade 46 46 - ); 47 47 - 48 48 - -- Migrate data to new comments table 49 49 - INSERT INTO comments_new ( 50 50 - id, owner_did, issue_id, repo_at, 51 51 - comment_id, comment_at, body, created 52 52 - ) 53 53 - SELECT 54 54 - id, owner_did, issue_id, repo_at, 55 55 - comment_id, comment_at, body, created 56 56 - FROM comments; 57 57 - 58 58 - -- Drop old comments table 59 59 - DROP TABLE comments; 60 60 - 61 61 - -- Rename new comments table 62 62 - ALTER TABLE comments_new RENAME TO comments;

-66

appview/db/migrations/validate.sql

··· 1 1 - -- Validation Queries for Database Migration 2 2 - 3 3 - -- 1. Verify Issues Table Structure 4 4 - PRAGMA table_info(issues); 5 5 - 6 6 - -- 2. Verify Comments Table Structure 7 7 - PRAGMA table_info(comments); 8 8 - 9 9 - -- 3. Check Total Row Count Consistency 10 10 - SELECT 11 11 - 'Issues Row Count' AS check_type, 12 12 - (SELECT COUNT(*) FROM issues) AS row_count 13 13 - UNION ALL 14 14 - SELECT 15 15 - 'Comments Row Count' AS check_type, 16 16 - (SELECT COUNT(*) FROM comments) AS row_count; 17 17 - 18 18 - -- 4. Verify Unique Constraint on Issues 19 19 - SELECT 20 20 - repo_at, 21 21 - issue_id, 22 22 - COUNT(*) as duplicate_count 23 23 - FROM issues 24 24 - GROUP BY repo_at, issue_id 25 25 - HAVING duplicate_count > 1; 26 26 - 27 27 - -- 5. Verify Foreign Key Integrity for Comments 28 28 - SELECT 29 29 - 'Orphaned Comments' AS check_type, 30 30 - COUNT(*) AS orphaned_count 31 31 - FROM comments c 32 32 - LEFT JOIN issues i ON c.repo_at = i.repo_at AND c.issue_id = i.issue_id 33 33 - WHERE i.id IS NULL; 34 34 - 35 35 - -- 6. Check Foreign Key Constraint 36 36 - PRAGMA foreign_key_list(comments); 37 37 - 38 38 - -- 7. Sample Data Integrity Check 39 39 - SELECT 40 40 - 'Sample Issues' AS check_type, 41 41 - repo_at, 42 42 - issue_id, 43 43 - title, 44 44 - created 45 45 - FROM issues 46 46 - LIMIT 5; 47 47 - 48 48 - -- 8. Sample Comments Data Integrity Check 49 49 - SELECT 50 50 - 'Sample Comments' AS check_type, 51 51 - repo_at, 52 52 - issue_id, 53 53 - comment_id, 54 54 - body, 55 55 - created 56 56 - FROM comments 57 57 - LIMIT 5; 58 58 - 59 59 - -- 9. Verify Constraint on Comments (Issue ID and Comment ID Uniqueness) 60 60 - SELECT 61 61 - issue_id, 62 62 - comment_id, 63 63 - COUNT(*) as duplicate_count 64 64 - FROM comments 65 65 - GROUP BY issue_id, comment_id 66 66 - HAVING duplicate_count > 1;

+14

nix/modules/appview.nix

··· 27 27 default = "00000000000000000000000000000000"; 28 28 description = "Cookie secret"; 29 29 }; 30 30 + environmentFile = mkOption { 31 31 + type = with types; nullOr path; 32 32 + default = null; 33 33 + example = "/etc/tangled-appview.env"; 34 34 + description = '' 35 35 + Additional environment file as defined in {manpage}`systemd.exec(5)`. 36 36 + 37 37 + Sensitive secrets such as {env}`TANGLED_COOKIE_SECRET` may be 38 38 + passed to the service without makeing them world readable in the 39 39 + nix store. 40 40 + 41 41 + ''; 42 42 + }; 30 43 }; 31 44 }; 32 45 ··· 39 52 ListenStream = "0.0.0.0:${toString cfg.port}"; 40 53 ExecStart = "${cfg.package}/bin/appview"; 41 54 Restart = "always"; 55 55 + EnvironmentFile = optional (cfg.environmentFile != null) cfg.environmentFile; 42 56 }; 43 57 44 58 environment = {

+2 -1

.gitignore

··· 16 16 *.rdb 17 17 .envrc 18 18 # Created if following hacking.md 19 19 - genjwks.out 19 19 + genjwks.out 20 20 + /nix/vm-data

+1 -1

appview/pages/templates/repo/pipelines/fragments/workflowSymbol.html

··· 19 19 {{ $color = "text-gray-600 dark:text-gray-500" }} 20 20 {{ else if eq $kind "timeout" }} 21 21 {{ $icon = "clock-alert" }} 22 22 - {{ $color = "text-orange-400 dark:text-orange-300" }} 22 22 + {{ $color = "text-orange-400 dark:text-orange-500" }} 23 23 {{ else }} 24 24 {{ $icon = "x" }} 25 25 {{ $color = "text-red-600 dark:text-red-500" }}

+1 -1

tailwind.config.js

··· 36 36 css: { 37 37 maxWidth: "none", 38 38 pre: { 39 39 - "@apply font-normal text-black bg-gray-100 dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700 border": {}, 39 39 + "@apply font-normal text-black bg-gray-50 dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700 border": {}, 40 40 }, 41 41 code: { 42 42 "@apply font-normal font-mono p-1 rounded text-black bg-gray-100 dark:bg-gray-900 dark:text-gray-300 dark:border-gray-700": {},

+1 -1

spindle/secrets/sqlite.go

··· 24 24 } 25 25 26 26 func NewSQLiteManager(dbPath string, opts ...SqliteManagerOpt) (*SqliteManager, error) { 27 27 - db, err := sql.Open("sqlite3", dbPath) 27 27 + db, err := sql.Open("sqlite3", dbPath+"?_foreign_keys=1") 28 28 if err != nil { 29 29 return nil, fmt.Errorf("failed to open sqlite database: %w", err) 30 30 }

+14 -9

knotserver/db/init.go

··· 2 2 3 3 import ( 4 4 "database/sql" 5 5 + "strings" 5 6 6 7 _ "github.com/mattn/go-sqlite3" 7 8 ) ··· 11 12 } 12 13 13 14 func Setup(dbPath string) (*DB, error) { 14 14 - db, err := sql.Open("sqlite3", dbPath+"?_foreign_keys=1") 15 15 + // https://github.com/mattn/go-sqlite3#connection-string 16 16 + opts := []string{ 17 17 + "_foreign_keys=1", 18 18 + "_journal_mode=WAL", 19 19 + "_synchronous=NORMAL", 20 20 + "_auto_vacuum=incremental", 21 21 + } 22 22 + 23 23 + db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&")) 15 24 if err != nil { 16 25 return nil, err 17 26 } 18 27 19 19 - _, err = db.Exec(` 20 20 - pragma journal_mode = WAL; 21 21 - pragma synchronous = normal; 22 22 - pragma temp_store = memory; 23 23 - pragma mmap_size = 30000000000; 24 24 - pragma page_size = 32768; 25 25 - pragma auto_vacuum = incremental; 26 26 - pragma busy_timeout = 5000; 28 28 + // NOTE: If any other migration is added here, you MUST 29 29 + // copy the pattern in appview: use a single sql.Conn 30 30 + // for every migration. 27 31 32 32 + _, err = db.Exec(` 28 33 create table if not exists known_dids ( 29 34 did text primary key 30 35 );

+14 -9

spindle/db/db.go

··· 2 2 3 3 import ( 4 4 "database/sql" 5 5 + "strings" 5 6 6 7 _ "github.com/mattn/go-sqlite3" 7 8 ) ··· 11 12 } 12 13 13 14 func Make(dbPath string) (*DB, error) { 14 14 - db, err := sql.Open("sqlite3", dbPath+"?_foreign_keys=1") 15 15 + // https://github.com/mattn/go-sqlite3#connection-string 16 16 + opts := []string{ 17 17 + "_foreign_keys=1", 18 18 + "_journal_mode=WAL", 19 19 + "_synchronous=NORMAL", 20 20 + "_auto_vacuum=incremental", 21 21 + } 22 22 + 23 23 + db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&")) 15 24 if err != nil { 16 25 return nil, err 17 26 } 18 27 19 19 - _, err = db.Exec(` 20 20 - pragma journal_mode = WAL; 21 21 - pragma synchronous = normal; 22 22 - pragma temp_store = memory; 23 23 - pragma mmap_size = 30000000000; 24 24 - pragma page_size = 32768; 25 25 - pragma auto_vacuum = incremental; 26 26 - pragma busy_timeout = 5000; 28 28 + // NOTE: If any other migration is added here, you MUST 29 29 + // copy the pattern in appview: use a single sql.Conn 30 30 + // for every migration. 27 31 32 32 + _, err = db.Exec(` 28 33 create table if not exists _jetstream ( 29 34 id integer primary key autoincrement, 30 35 last_time_us integer not null

+12

.prettierrc.json

··· 1 1 + { 2 2 + "overrides": [ 3 3 + { 4 4 + "files": ["*.html"], 5 5 + "options": { 6 6 + "parser": "go-template" 7 7 + } 8 8 + } 9 9 + ], 10 10 + "bracketSameLine": true, 11 11 + "htmlWhitespaceSensitivity": "ignore" 12 12 + }

-16

.zed/settings.json

··· 1 1 - // Folder-specific settings 2 2 - // 3 3 - // For a full list of overridable settings, and general information on folder-specific settings, 4 4 - // see the documentation: https://zed.dev/docs/configuring-zed#settings-files 5 5 - { 6 6 - "languages": { 7 7 - "HTML": { 8 8 - "prettier": { 9 9 - "format_on_save": false, 10 10 - "allowed": true, 11 11 - "parser": "go-template", 12 12 - "plugins": ["prettier-plugin-go-template"] 13 13 - } 14 14 - } 15 15 - } 16 16 - }

+37 -83

appview/pages/templates/layouts/footer.html

··· 1 1 {{ define "layouts/footer" }} 2 2 - <div 3 3 - class="w-full p-4 md:p-8 bg-white dark:bg-gray-800 rounded-t drop-shadow-sm"> 4 4 - <div class="container mx-auto max-w-7xl px-4"> 5 5 - <div 6 6 - class="flex flex-col lg:flex-row justify-between items-start text-gray-600 dark:text-gray-400 text-sm gap-8"> 7 7 - <div class="mb-4 md:mb-0"> 8 8 - <a href="/" hx-boost="true" class="flex gap-2 font-semibold italic"> 9 9 - tangled 10 10 - _alpha 11 11 - </a> 12 12 - </div> 13 13 - 14 14 - {{ $headerStyle := "text-gray-900 dark:text-gray-200 font-bold text-xs uppercase tracking-wide mb-1" }} 15 15 - {{ $linkStyle := "text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200 hover:underline inline-flex gap-1 items-center" }} 16 16 - {{ $iconStyle := "w-4 h-4 flex-shrink-0" }} 17 17 - <div 18 18 - class="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-4 sm:gap-6 md:gap-2 gap-6 flex-1"> 19 19 - <div class="flex flex-col gap-1"> 20 20 - <div class="{{ $headerStyle }}">legal</div> 21 21 - <a href="/terms" class="{{ $linkStyle }}"> 22 22 - {{ i "file-text" $iconStyle }} terms of service 23 23 - </a> 24 24 - <a href="/privacy" class="{{ $linkStyle }}"> 25 25 - {{ i "shield" $iconStyle }} privacy policy 26 26 - </a> 27 27 - </div> 2 2 + <div class="w-full p-4 md:p-8 bg-white dark:bg-gray-800 rounded-t drop-shadow-sm"> 3 3 + <div class="container mx-auto max-w-7xl px-4"> 4 4 + <div class="flex flex-col lg:flex-row justify-between items-start text-gray-600 dark:text-gray-400 text-sm gap-8"> 5 5 + <div class="mb-4 md:mb-0"> 6 6 + <a href="/" hx-boost="true" class="flex gap-2 font-semibold italic"> 7 7 + tangled_alpha 8 8 + </a> 9 9 + </div> 28 10 29 29 - <div class="flex flex-col gap-1"> 30 30 - <div class="{{ $headerStyle }}">resources</div> 31 31 - <a 32 32 - href="https://blog.tangled.sh" 33 33 - class="{{ $linkStyle }}" 34 34 - target="_blank" 35 35 - rel="noopener noreferrer"> 36 36 - {{ i "book-open" $iconStyle }} blog 37 37 - </a> 38 38 - <a 39 39 - href="https://tangled.sh/@tangled.sh/core/tree/master/docs" 40 40 - class="{{ $linkStyle }}"> 41 41 - {{ i "book" $iconStyle }} docs 42 42 - </a> 43 43 - <a 44 44 - href="https://tangled.sh/@tangled.sh/core" 45 45 - class="{{ $linkStyle }}"> 46 46 - {{ i "code" $iconStyle }} source 47 47 - </a> 48 48 - </div> 11 11 + {{ $headerStyle := "text-gray-900 dark:text-gray-200 font-bold text-xs uppercase tracking-wide mb-1" }} 12 12 + {{ $linkStyle := "text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200 hover:underline inline-flex gap-1 items-center" }} 13 13 + {{ $iconStyle := "w-4 h-4 flex-shrink-0" }} 14 14 + <div class="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-4 sm:gap-6 md:gap-2 gap-6 flex-1"> 15 15 + <div class="flex flex-col gap-1"> 16 16 + <div class="{{ $headerStyle }}">legal</div> 17 17 + <a href="/terms" class="{{ $linkStyle }}">{{ i "file-text" $iconStyle }} terms of service</a> 18 18 + <a href="/privacy" class="{{ $linkStyle }}">{{ i "shield" $iconStyle }} privacy policy</a> 19 19 + </div> 49 20 50 50 - <div class="flex flex-col gap-1"> 51 51 - <div class="{{ $headerStyle }}">social</div> 52 52 - <a 53 53 - href="https://chat.tangled.sh" 54 54 - class="{{ $linkStyle }}" 55 55 - target="_blank" 56 56 - rel="noopener noreferrer"> 57 57 - {{ i "message-circle" $iconStyle }} discord 58 58 - </a> 59 59 - <a 60 60 - href="https://web.libera.chat/#tangled" 61 61 - class="{{ $linkStyle }}" 62 62 - target="_blank" 63 63 - rel="noopener noreferrer"> 64 64 - {{ i "hash" $iconStyle }} irc 65 65 - </a> 66 66 - <a 67 67 - href="https://bsky.app/profile/tangled.sh" 68 68 - class="{{ $linkStyle }}" 69 69 - target="_blank" 70 70 - rel="noopener noreferrer"> 71 71 - {{ template "user/fragments/bluesky" $iconStyle }} bluesky 72 72 - </a> 73 73 - </div> 21 21 + <div class="flex flex-col gap-1"> 22 22 + <div class="{{ $headerStyle }}">resources</div> 23 23 + <a href="https://blog.tangled.sh" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a> 24 24 + <a href="https://tangled.sh/@tangled.sh/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a> 25 25 + <a href="https://tangled.sh/@tangled.sh/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a> 26 26 + </div> 74 27 75 75 - <div class="flex flex-col gap-1"> 76 76 - <div class="{{ $headerStyle }}">contact</div> 77 77 - <a href="mailto:team@tangled.sh" class="{{ $linkStyle }}"> 78 78 - {{ i "mail" "w-4 h-4 flex-shrink-0" }} team@tangled.sh 79 79 - </a> 80 80 - <a href="mailto:security@tangled.sh" class="{{ $linkStyle }}"> 81 81 - {{ i "shield-check" "w-4 h-4 flex-shrink-0" }} security@tangled.sh 82 82 - </a> 83 83 - </div> 28 28 + <div class="flex flex-col gap-1"> 29 29 + <div class="{{ $headerStyle }}">social</div> 30 30 + <a href="https://chat.tangled.sh" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "message-circle" $iconStyle }} discord</a> 31 31 + <a href="https://web.libera.chat/#tangled" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "hash" $iconStyle }} irc</a> 32 32 + <a href="https://bsky.app/profile/tangled.sh" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ template "user/fragments/bluesky" $iconStyle }} bluesky</a> 84 33 </div> 85 34 86 86 - <div class="text-center lg:text-right flex-shrink-0"> 87 87 - <div class="text-xs"> 88 88 - &copy; 2025 Tangled Labs Oy. All rights reserved. 89 89 - </div> 35 35 + <div class="flex flex-col gap-1"> 36 36 + <div class="{{ $headerStyle }}">contact</div> 37 37 + <a href="mailto:team@tangled.sh" class="{{ $linkStyle }}">{{ i "mail" "w-4 h-4 flex-shrink-0" }} team@tangled.sh</a> 38 38 + <a href="mailto:security@tangled.sh" class="{{ $linkStyle }}">{{ i "shield-check" "w-4 h-4 flex-shrink-0" }} security@tangled.sh</a> 90 39 </div> 91 40 </div> 41 41 + 42 42 + <div class="text-center lg:text-right flex-shrink-0"> 43 43 + <div class="text-xs">&copy; 2025 Tangled Labs Oy. All rights reserved.</div> 44 44 + </div> 92 45 </div> 93 46 </div> 47 47 + </div> 94 48 {{ end }}

+9 -16

appview/pages/templates/repo/compare/new.html

··· 1 1 {{ define "title" }} 2 2 - compare refs on 3 3 - {{ .RepoInfo.FullName }} 2 2 + compare refs on {{ .RepoInfo.FullName }} 4 3 {{ end }} 5 4 6 5 {{ define "repoContent" }} ··· 10 9 {{ define "repoAfter" }} 11 10 {{ $brs := take .Branches 5 }} 12 11 {{ if $brs }} 13 13 - <section 14 14 - class="p-6 mt-4 rounded-br rounded-bl bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm w-full mx-auto"> 12 12 + <section class="p-6 mt-4 rounded-br rounded-bl bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm w-full mx-auto"> 15 13 <div class="flex flex-col items-center"> 16 14 <p class="text-center text-black dark:text-white"> 17 17 - Recently updated branches in this repository: 15 15 + Recently updated branches in this repository: 18 16 </p> 19 19 - <div 20 20 - class="mt-4 grid grid-cols-1 divide-y divide-gray-200 dark:divide-gray-700 rounded border border-gray-200 dark:border-gray-700 w-full md:w-1/2"> 21 21 - {{ range $br := $brs }} 22 22 - <a 23 23 - href="/{{ $.RepoInfo.FullName }}/compare?head={{ $br.Name | urlquery }}" 24 24 - class="no-underline hover:no-underline"> 17 17 + <div class="mt-4 grid grid-cols-1 divide-y divide-gray-200 dark:divide-gray-700 rounded border border-gray-200 dark:border-gray-700 w-full md:w-1/2"> 18 18 + {{ range $br := $brs }} 19 19 + <a href="/{{ $.RepoInfo.FullName }}/compare?head={{ $br.Name | urlquery }}" class="no-underline hover:no-underline"> 25 20 <div class="flex items-center justify-between p-2"> 26 21 {{ $br.Name }} 27 27 - <span class="text-gray-500 dark:text-gray-400"> 28 28 - {{ template "repo/fragments/time" $br.Commit.Committer.When }} 29 29 - </span> 22 22 + <span class="text-gray-500 dark:text-gray-400">{{ template "repo/fragments/time" $br.Commit.Committer.When }}</span> 30 23 </div> 31 24 </a> 32 32 - {{ end }} 33 33 - </div> 25 25 + {{ end }} 26 26 + </div> 34 27 </div> 35 28 </section> 36 29 {{ end }}

+13 -27

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

··· 1 1 {{ define "repo/fragments/artifact" }} 2 2 - {{ $unique := .Artifact.BlobCid.String }} 3 3 - <div 4 4 - id="artifact-{{ $unique }}" 5 5 - class="flex items-center justify-between p-2 border-b border-gray-200 dark:border-gray-700"> 6 6 - <div id="left-side" class="flex items-center gap-2 min-w-0 max-w-[60%]"> 7 7 - {{ i "box" "w-4 h-4" }} 8 8 - <a 9 9 - href="/{{ .RepoInfo.FullName }}/tags/{{ .Artifact.Tag.String }}/download/{{ .Artifact.Name | urlquery }}" 10 10 - class="no-underline hover:no-underline"> 11 11 - {{ .Artifact.Name }} 12 12 - </a> 13 13 - <span class="text-gray-500 dark:text-gray-400 pl-2 text-sm"> 14 14 - {{ byteFmt .Artifact.Size }} 15 15 - </span> 16 16 - </div> 2 2 + {{ $unique := .Artifact.BlobCid.String }} 3 3 + <div id="artifact-{{ $unique }}" class="flex items-center justify-between p-2 border-b border-gray-200 dark:border-gray-700"> 4 4 + <div id="left-side" class="flex items-center gap-2 min-w-0 max-w-[60%]"> 5 5 + {{ i "box" "w-4 h-4" }} 6 6 + <a href="/{{ .RepoInfo.FullName }}/tags/{{ .Artifact.Tag.String }}/download/{{ .Artifact.Name | urlquery }}" class="no-underline hover:no-underline"> 7 7 + {{ .Artifact.Name }} 8 8 + </a> 9 9 + <span class="text-gray-500 dark:text-gray-400 pl-2 text-sm">{{ byteFmt .Artifact.Size }}</span> 10 10 + </div> 17 11 18 18 - <div 19 19 - id="right-side" 20 20 - class="text-gray-500 dark:text-gray-400 flex items-center flex-shrink-0 gap-2 text-sm"> 21 21 - <span class="hidden md:inline"> 22 22 - {{ template "repo/fragments/time" .Artifact.CreatedAt }} 23 23 - </span> 24 24 - <span class=" md:hidden"> 25 25 - {{ template "repo/fragments/shortTime" .Artifact.CreatedAt }} 26 26 - </span> 12 12 + <div id="right-side" class="text-gray-500 dark:text-gray-400 flex items-center flex-shrink-0 gap-2 text-sm"> 13 13 + <span class="hidden md:inline">{{ template "repo/fragments/time" .Artifact.CreatedAt }}</span> 14 14 + <span class=" md:hidden">{{ template "repo/fragments/shortTime" .Artifact.CreatedAt }}</span> 27 15 28 16 <span class="select-none after:content-['·'] hidden md:inline"></span> 29 29 - <span class="truncate max-w-[100px] hidden md:inline"> 30 30 - {{ .Artifact.MimeType }} 31 31 - </span> 17 17 + <span class="truncate max-w-[100px] hidden md:inline">{{ .Artifact.MimeType }}</span> 32 18 33 19 {{ if and .LoggedInUser (eq .LoggedInUser.Did .Artifact.Did) }} 34 20 <button

+54 -63

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

··· 1 1 {{ define "repo/fragments/compareForm" }} 2 2 - <div id="compare-select"> 3 3 - <h2 class="font-bold text-sm mb-2 uppercase dark:text-white"> 4 4 - Compare changes 5 5 - </h2> 6 6 - <p>Choose any two refs to compare.</p> 2 2 + <div id="compare-select"> 3 3 + <h2 class="font-bold text-sm mb-2 uppercase dark:text-white"> 4 4 + Compare changes 5 5 + </h2> 6 6 + <p>Choose any two refs to compare.</p> 7 7 8 8 - <form id="compare-form" class="flex items-center gap-2 py-4"> 9 9 - <div> 10 10 - <span class="hidden md:inline">base:</span> 11 11 - {{ block "dropdown" (list $ "base" $.Base) }}{{ end }} 12 12 - </div> 13 13 - <span class="flex-shrink-0"> 14 14 - {{ i "arrow-left" "w-4 h-4" }} 15 15 - </span> 16 16 - <div> 17 17 - <span class="hidden md:inline">compare:</span> 18 18 - {{ block "dropdown" (list $ "head" $.Head) }}{{ end }} 19 19 - </div> 20 20 - <button 21 21 - id="compare-button" 22 22 - class="btn disabled:opacity-50 disabled:cursor-not-allowed" 23 23 - type="button" 24 24 - hx-boost="true" 25 25 - onclick=" 8 8 + <form id="compare-form" class="flex items-center gap-2 py-4"> 9 9 + <div> 10 10 + <span class="hidden md:inline">base:</span> 11 11 + {{ block "dropdown" (list $ "base" $.Base) }} {{ end }} 12 12 + </div> 13 13 + <span class="flex-shrink-0"> 14 14 + {{ i "arrow-left" "w-4 h-4" }} 15 15 + </span> 16 16 + <div> 17 17 + <span class="hidden md:inline">compare:</span> 18 18 + {{ block "dropdown" (list $ "head" $.Head) }} {{ end }} 19 19 + </div> 20 20 + <button 21 21 + id="compare-button" 22 22 + class="btn disabled:opacity-50 disabled:cursor-not-allowed" 23 23 + type="button" 24 24 + hx-boost="true" 25 25 + onclick=" 26 26 const base = document.getElementById('base-select').value; 27 27 const head = document.getElementById('head-select').value; 28 28 - window.location.href = `/{{ $.RepoInfo.FullName }}/compare/${encodeURIComponent(base)}...${encodeURIComponent(head)}`; 28 28 + window.location.href = `/{{$.RepoInfo.FullName}}/compare/${encodeURIComponent(base)}...${encodeURIComponent(head)}`; 29 29 "> 30 30 - go 31 31 - </button> 32 32 - </form> 33 33 - </div> 34 34 - <script> 35 35 - const baseSelect = document.getElementById("base-select"); 36 36 - const headSelect = document.getElementById("head-select"); 37 37 - const compareButton = document.getElementById("compare-button"); 30 30 + go 31 31 + </button> 32 32 + </form> 33 33 + </div> 34 34 + <script> 35 35 + const baseSelect = document.getElementById('base-select'); 36 36 + const headSelect = document.getElementById('head-select'); 37 37 + const compareButton = document.getElementById('compare-button'); 38 38 39 39 - function toggleButtonState() { 40 40 - compareButton.disabled = baseSelect.value === headSelect.value; 41 41 - } 39 39 + function toggleButtonState() { 40 40 + compareButton.disabled = baseSelect.value === headSelect.value; 41 41 + } 42 42 43 43 - baseSelect.addEventListener("change", toggleButtonState); 44 44 - headSelect.addEventListener("change", toggleButtonState); 43 43 + baseSelect.addEventListener('change', toggleButtonState); 44 44 + headSelect.addEventListener('change', toggleButtonState); 45 45 46 46 - // Run once on page load 47 47 - toggleButtonState(); 48 48 - </script> 46 46 + // Run once on page load 47 47 + toggleButtonState(); 48 48 + </script> 49 49 {{ end }} 50 50 51 51 {{ define "dropdown" }} 52 52 - {{ $root := index . 0 }} 53 53 - {{ $name := index . 1 }} 54 54 - {{ $default := index . 2 }} 55 55 - <select 56 56 - name="{{ $name }}" 57 57 - id="{{ $name }}-select" 58 58 - class="p-1 border max-w-32 md:max-w-64 border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"> 52 52 + {{ $root := index . 0 }} 53 53 + {{ $name := index . 1 }} 54 54 + {{ $default := index . 2 }} 55 55 + <select name="{{$name}}" id="{{$name}}-select" class="p-1 border max-w-32 md:max-w-64 border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"> 59 56 <optgroup label="branches ({{ len $root.Branches }})" class="bold text-sm"> 60 57 {{ range $root.Branches }} 61 61 - <option 62 62 - value="{{ .Reference.Name }}" 63 63 - class="py-1" 64 64 - {{ if eq .Reference.Name $default }}selected{{ end }}> 58 58 + <option value="{{ .Reference.Name }}" class="py-1" {{if eq .Reference.Name $default}}selected{{end}}> 65 59 {{ .Reference.Name }} 66 60 </option> 67 61 {{ end }} 68 62 </optgroup> 69 69 - <optgroup label="tags ({{ len $root.Tags }})" class="bold text-sm"> 70 70 - {{ range $root.Tags }} 71 71 - <option 72 72 - value="{{ .Reference.Name }}" 73 73 - class="py-1" 74 74 - {{ if eq .Reference.Name $default }}selected{{ end }}> 75 75 - {{ .Reference.Name }} 76 76 - </option> 77 77 - {{ else }} 78 78 - <option class="py-1" disabled>no tags found</option> 79 79 - {{ end }} 80 80 - </optgroup> 63 63 + <optgroup label="tags ({{ len $root.Tags }})" class="bold text-sm"> 64 64 + {{ range $root.Tags }} 65 65 + <option value="{{ .Reference.Name }}" class="py-1" {{if eq .Reference.Name $default}}selected{{end}}> 66 66 + {{ .Reference.Name }} 67 67 + </option> 68 68 + {{ else }} 69 69 + <option class="py-1" disabled>no tags found</option> 70 70 + {{ end }} 71 71 + </optgroup> 81 72 </select> 82 73 {{ end }}

+6 -14

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

··· 1 1 {{ define "repo/fragments/diffOpts" }} 2 2 - <section 3 3 - class="flex flex-col gap-2 overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 2 2 + <section class="flex flex-col gap-2 overflow-x-auto text-sm px-6 py-2 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm"> 4 3 <strong class="text-sm uppercase dark:text-gray-200">options</strong> 5 4 {{ $active := "unified" }} 6 5 {{ if .Split }} 7 6 {{ $active = "split" }} 8 7 {{ end }} 9 8 {{ $values := list "unified" "split" }} 10 10 - {{ block "tabSelector" (dict "Name" "diff" "Values" $values "Active" $active) }} 11 11 - {{ end }} 9 9 + {{ block "tabSelector" (dict "Name" "diff" "Values" $values "Active" $active) }} {{ end }} 12 10 </section> 13 11 {{ end }} 14 12 ··· 16 14 {{ $name := .Name }} 17 15 {{ $all := .Values }} 18 16 {{ $active := .Active }} 19 19 - <div 20 20 - class="flex justify-between divide-x divide-gray-200 dark:divide-gray-700 rounded border border-gray-200 dark:border-gray-700 overflow-hidden"> 17 17 + <div class="flex justify-between divide-x divide-gray-200 dark:divide-gray-700 rounded border border-gray-200 dark:border-gray-700 overflow-hidden"> 21 18 {{ $activeTab := "bg-white dark:bg-gray-700 shadow-sm" }} 22 19 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800 shadow-inner" }} 23 20 {{ range $index, $value := $all }} 24 21 {{ $isActive := eq $value $active }} 25 25 - <a 26 26 - href="?{{ $name }}={{ $value }}" 27 27 - class="py-2 text-sm w-full block hover:no-underline text-center {{ if $isActive }} 28 28 - {{ $activeTab }} 29 29 - {{ else }} 30 30 - {{ $inactiveTab }} 31 31 - {{ end }}"> 32 32 - {{ $value }} 22 22 + <a href="?{{ $name }}={{ $value }}" 23 23 + class="py-2 text-sm w-full block hover:no-underline text-center {{ if $isActive }} {{$activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 24 24 + {{ $value }} 33 25 </a> 34 26 {{ end }} 35 27 </div>

+5 -16

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

··· 1 1 {{ define "repo/fragments/diffStatPill" }} 2 2 <div class="flex items-center font-mono text-sm"> 3 3 {{ if and .Insertions .Deletions }} 4 4 - <span 5 5 - class="rounded-l p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400"> 6 6 - +{{ .Insertions }} 7 7 - </span> 8 8 - <span 9 9 - class="rounded-r p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400"> 10 10 - -{{ .Deletions }} 11 11 - </span> 4 4 + <span class="rounded-l p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span> 5 5 + <span class="rounded-r p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span> 12 6 {{ else if .Insertions }} 13 13 - <span 14 14 - class="rounded p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400"> 15 15 - +{{ .Insertions }} 16 16 - </span> 7 7 + <span class="rounded p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span> 17 8 {{ else if .Deletions }} 18 18 - <span 19 19 - class="rounded p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400"> 20 20 - -{{ .Deletions }} 21 21 - </span> 9 9 + <span class="rounded p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span> 22 10 {{ end }} 23 11 </div> 24 12 {{ end }} 13 13 +

+24 -18

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

··· 1 1 {{ define "repo/fragments/reactionsPopUp" }} 2 2 - <details id="reactionsPopUp" class="relative inline-block"> 3 3 - <summary 4 4 - class="flex justify-center items-center min-w-8 min-h-8 rounded border border-gray-200 dark:border-gray-700 2 2 + <details 3 3 + id="reactionsPopUp" 4 4 + class="relative inline-block" 5 5 + > 6 6 + <summary 7 7 + class="flex justify-center items-center min-w-8 min-h-8 rounded border border-gray-200 dark:border-gray-700 5 8 hover:bg-gray-50 6 9 hover:border-gray-300 7 10 dark:hover:bg-gray-700 8 11 dark:hover:border-gray-600 9 9 - cursor-pointer list-none"> 10 10 - {{ i "smile" "size-4" }} 11 11 - </summary> 12 12 - <div 13 13 - class="absolute flex left-0 z-10 mt-4 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg"> 14 14 - {{ range $kind := . }} 15 15 - <button 16 16 - id="reactBtn-{{ $kind }}" 17 17 - class="size-12 hover:bg-gray-100 dark:hover:bg-gray-700" 18 18 - hx-on:click="this.parentElement.parentElement.removeAttribute('open')"> 19 19 - {{ $kind }} 20 20 - </button> 21 21 - {{ end }} 22 22 - </div> 23 23 - </details> 12 12 + cursor-pointer list-none" 13 13 + > 14 14 + {{ i "smile" "size-4" }} 15 15 + </summary> 16 16 + <div 17 17 + class="absolute flex left-0 z-10 mt-4 rounded bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700 shadow-lg" 18 18 + > 19 19 + {{ range $kind := . }} 20 20 + <button 21 21 + id="reactBtn-{{ $kind }}" 22 22 + class="size-12 hover:bg-gray-100 dark:hover:bg-gray-700" 23 23 + hx-on:click="this.parentElement.parentElement.removeAttribute('open')" 24 24 + > 25 25 + {{ $kind }} 26 26 + </button> 27 27 + {{ end }} 28 28 + </div> 29 29 + </details> 24 30 {{ end }}

+23 -22

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

··· 1 1 {{ define "repo/fragments/repoStar" }} 2 2 - <button 3 3 - id="starBtn" 4 4 - class="btn disabled:opacity-50 disabled:cursor-not-allowed flex gap-2 items-center group" 5 5 - {{ if .IsStarred }} 6 6 - hx-delete="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}" 7 7 - {{ else }} 8 8 - hx-post="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}" 9 9 - {{ end }} 2 2 + <button 3 3 + id="starBtn" 4 4 + class="btn disabled:opacity-50 disabled:cursor-not-allowed flex gap-2 items-center group" 5 5 + {{ if .IsStarred }} 6 6 + hx-delete="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}" 7 7 + {{ else }} 8 8 + hx-post="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}" 9 9 + {{ end }} 10 10 11 11 - hx-trigger="click" 12 12 - hx-target="this" 13 13 - hx-swap="outerHTML" 14 14 - hx-disabled-elt="#starBtn"> 15 15 - {{ if .IsStarred }} 16 16 - {{ i "star" "w-4 h-4 fill-current" }} 17 17 - {{ else }} 18 18 - {{ i "star" "w-4 h-4" }} 19 19 - {{ end }} 20 20 - <span class="text-sm"> 21 21 - {{ .Stats.StarCount }} 22 22 - </span> 23 23 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 24 24 - </button> 11 11 + hx-trigger="click" 12 12 + hx-target="this" 13 13 + hx-swap="outerHTML" 14 14 + hx-disabled-elt="#starBtn" 15 15 + > 16 16 + {{ if .IsStarred }} 17 17 + {{ i "star" "w-4 h-4 fill-current" }} 18 18 + {{ else }} 19 19 + {{ i "star" "w-4 h-4" }} 20 20 + {{ end }} 21 21 + <span class="text-sm"> 22 22 + {{ .Stats.StarCount }} 23 23 + </span> 24 24 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 25 25 + </button> 25 26 {{ end }}

+58 -113

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

··· 1 1 {{ define "repo/fragments/splitDiff" }} 2 2 - {{ $name := .Id }} 3 3 - {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800" -}} 4 4 - {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}} 5 5 - {{- $lineNrSepStyle := "pr-2 border-r border-gray-200 dark:border-gray-700" -}} 6 6 - {{- $containerStyle := "flex min-w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 7 7 - {{- $emptyStyle := "bg-gray-200/30 dark:bg-gray-700/30" -}} 8 8 - {{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400" -}} 9 9 - {{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}} 10 10 - {{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}} 11 11 - {{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}} 12 12 - <div class="grid grid-cols-2 divide-x divide-gray-200 dark:divide-gray-700"> 13 13 - <pre 14 14 - class="overflow-x-auto col-span-1"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}} 15 15 - <div 16 16 - class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center"> 17 17 - &middot;&middot;&middot; 18 18 - </div> 19 19 - {{- range .LeftLines -}} 20 20 - {{- if .IsEmpty -}} 21 21 - <div class="{{ $emptyStyle }} {{ $containerStyle }}"> 22 22 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"> 23 23 - <span aria-hidden="true" class="invisible"> 24 24 - {{ .LineNumber }} 25 25 - </span> 26 26 - </div> 27 27 - <div class="{{ $opStyle }}"> 28 28 - <span aria-hidden="true" class="invisible">{{ .Op.String }}</span> 29 29 - </div> 30 30 - <div class="px-2 invisible" aria-hidden="true">{{ .Content }}</div> 31 31 - </div> 32 32 - {{- else if eq .Op.String "-" -}} 33 33 - <div 34 34 - class="{{ $delStyle }} {{ $containerStyle }}" 35 35 - id="{{ $name }}-O{{ .LineNumber }}"> 36 36 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"> 37 37 - <a 38 38 - class="{{ $linkStyle }}" 39 39 - href="#{{ $name }}-O{{ .LineNumber }}"> 40 40 - {{ .LineNumber }} 41 41 - </a> 42 42 - </div> 43 43 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 44 44 - <div class="px-2">{{ .Content }}</div> 45 45 - </div> 46 46 - {{- else if eq .Op.String " " -}} 47 47 - <div 48 48 - class="{{ $ctxStyle }} {{ $containerStyle }}" 49 49 - id="{{ $name }}-O{{ .LineNumber }}"> 50 50 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"> 51 51 - <a 52 52 - class="{{ $linkStyle }}" 53 53 - href="#{{ $name }}-O{{ .LineNumber }}"> 54 54 - {{ .LineNumber }} 55 55 - </a> 56 56 - </div> 57 57 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 58 58 - <div class="px-2">{{ .Content }}</div> 59 59 - </div> 60 60 - {{- end -}} 61 61 - {{- end -}} 62 62 - {{- end -}} 63 63 - </div></div></pre> 2 2 + {{ $name := .Id }} 3 3 + {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800" -}} 4 4 + {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}} 5 5 + {{- $lineNrSepStyle := "pr-2 border-r border-gray-200 dark:border-gray-700" -}} 6 6 + {{- $containerStyle := "flex min-w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 7 7 + {{- $emptyStyle := "bg-gray-200/30 dark:bg-gray-700/30" -}} 8 8 + {{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400" -}} 9 9 + {{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}} 10 10 + {{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}} 11 11 + {{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}} 12 12 + <div class="grid grid-cols-2 divide-x divide-gray-200 dark:divide-gray-700"> 13 13 + <pre class="overflow-x-auto col-span-1"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div> 14 14 + {{- range .LeftLines -}} 15 15 + {{- if .IsEmpty -}} 16 16 + <div class="{{ $emptyStyle }} {{ $containerStyle }}"> 17 17 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></div> 18 18 + <div class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></div> 19 19 + <div class="px-2 invisible" aria-hidden="true">{{ .Content }}</div> 20 20 + </div> 21 21 + {{- else if eq .Op.String "-" -}} 22 22 + <div class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}"> 23 23 + <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></div> 24 24 + <div class="{{ $opStyle }}">{{ .Op.String }}</div> 25 25 + <div class="px-2">{{ .Content }}</div> 26 26 + </div> 27 27 + {{- else if eq .Op.String " " -}} 28 28 + <div class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}"> 29 29 + <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></div> 30 30 + <div class="{{ $opStyle }}">{{ .Op.String }}</div> 31 31 + <div class="px-2">{{ .Content }}</div> 32 32 + </div> 33 33 + {{- end -}} 34 34 + {{- end -}} 35 35 + {{- end -}}</div></div></pre> 64 36 65 65 - <pre 66 66 - class="overflow-x-auto col-span-1"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}} 67 67 - <div 68 68 - class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center"> 69 69 - &middot;&middot;&middot; 70 70 - </div> 71 71 - {{- range .RightLines -}} 72 72 - {{- if .IsEmpty -}} 73 73 - <div class="{{ $emptyStyle }} {{ $containerStyle }}"> 74 74 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"> 75 75 - <span aria-hidden="true" class="invisible"> 76 76 - {{ .LineNumber }} 77 77 - </span> 78 78 - </div> 79 79 - <div class="{{ $opStyle }}"> 80 80 - <span aria-hidden="true" class="invisible">{{ .Op.String }}</span> 81 81 - </div> 82 82 - <div class="px-2 invisible" aria-hidden="true">{{ .Content }}</div> 83 83 - </div> 84 84 - {{- else if eq .Op.String "+" -}} 85 85 - <div 86 86 - class="{{ $addStyle }} {{ $containerStyle }}" 87 87 - id="{{ $name }}-N{{ .LineNumber }}"> 88 88 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"> 89 89 - <a 90 90 - class="{{ $linkStyle }}" 91 91 - href="#{{ $name }}-N{{ .LineNumber }}"> 92 92 - {{ .LineNumber }} 93 93 - </a> 94 94 - </div> 95 95 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 96 96 - <div class="px-2">{{ .Content }}</div> 97 97 - </div> 98 98 - {{- else if eq .Op.String " " -}} 99 99 - <div 100 100 - class="{{ $ctxStyle }} {{ $containerStyle }}" 101 101 - id="{{ $name }}-N{{ .LineNumber }}"> 102 102 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"> 103 103 - <a 104 104 - class="{{ $linkStyle }}" 105 105 - href="#{{ $name }}-N{{ .LineNumber }}"> 106 106 - {{ .LineNumber }} 107 107 - </a> 108 108 - </div> 109 109 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 110 110 - <div class="px-2">{{ .Content }}</div> 111 111 - </div> 112 112 - {{- end -}} 113 113 - {{- end -}} 114 114 - {{- end -}}</div></div></pre> 115 115 - </div> 37 37 + <pre class="overflow-x-auto col-span-1"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div> 38 38 + {{- range .RightLines -}} 39 39 + {{- if .IsEmpty -}} 40 40 + <div class="{{ $emptyStyle }} {{ $containerStyle }}"> 41 41 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></div> 42 42 + <div class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></div> 43 43 + <div class="px-2 invisible" aria-hidden="true">{{ .Content }}</div> 44 44 + </div> 45 45 + {{- else if eq .Op.String "+" -}} 46 46 + <div class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}"> 47 47 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a></div> 48 48 + <div class="{{ $opStyle }}">{{ .Op.String }}</div> 49 49 + <div class="px-2" >{{ .Content }}</div> 50 50 + </div> 51 51 + {{- else if eq .Op.String " " -}} 52 52 + <div class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}"> 53 53 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a></div> 54 54 + <div class="{{ $opStyle }}">{{ .Op.String }}</div> 55 55 + <div class="px-2">{{ .Content }}</div> 56 56 + </div> 57 57 + {{- end -}} 58 58 + {{- end -}} 59 59 + {{- end -}}</div></div></pre> 60 60 + </div> 116 61 {{ end }}

+45 -79

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

··· 1 1 {{ define "repo/fragments/unifiedDiff" }} 2 2 - {{ $name := .Id }} 3 3 - <pre 4 4 - class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}} 5 5 - <div 6 6 - class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center"> 7 7 - &middot;&middot;&middot; 8 8 - </div> 9 9 - {{- $oldStart := .OldPosition -}} 10 10 - {{- $newStart := .NewPosition -}} 11 11 - {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800 target:bg-yellow-200 target:dark:bg-yellow-600" -}} 12 12 - {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}} 13 13 - {{- $lineNrSepStyle1 := "" -}} 14 14 - {{- $lineNrSepStyle2 := "pr-2 border-r border-gray-200 dark:border-gray-700" -}} 15 15 - {{- $containerStyle := "flex min-w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 16 16 - {{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 " -}} 17 17 - {{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}} 18 18 - {{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}} 19 19 - {{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}} 20 20 - {{- range .Lines -}} 21 21 - {{- if eq .Op.String "+" -}} 22 22 - <div 23 23 - class="{{ $addStyle }} {{ $containerStyle }}" 24 24 - id="{{ $name }}-N{{ $newStart }}"> 25 25 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle1 }}"> 26 26 - <span aria-hidden="true" class="invisible">{{ $newStart }}</span> 27 27 - </div> 28 28 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle2 }}"> 29 29 - <a class="{{ $linkStyle }}" href="#{{ $name }}-N{{ $newStart }}"> 30 30 - {{ $newStart }} 31 31 - </a> 32 32 - </div> 33 33 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 34 34 - <div class="px-2">{{ .Line }}</div> 35 35 - </div> 36 36 - {{- $newStart = add64 $newStart 1 -}} 37 37 - {{- end -}} 38 38 - {{- if eq .Op.String "-" -}} 39 39 - <div 40 40 - class="{{ $delStyle }} {{ $containerStyle }}" 41 41 - id="{{ $name }}-O{{ $oldStart }}"> 42 42 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle1 }}"> 43 43 - <a class="{{ $linkStyle }}" href="#{{ $name }}-O{{ $oldStart }}"> 44 44 - {{ $oldStart }} 45 45 - </a> 46 46 - </div> 47 47 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle2 }}"> 48 48 - <span aria-hidden="true" class="invisible">{{ $oldStart }}</span> 49 49 - </div> 50 50 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 51 51 - <div class="px-2">{{ .Line }}</div> 52 52 - </div> 53 53 - {{- $oldStart = add64 $oldStart 1 -}} 54 54 - {{- end -}} 55 55 - {{- if eq .Op.String " " -}} 56 56 - <div 57 57 - class="{{ $ctxStyle }} {{ $containerStyle }}" 58 58 - id="{{ $name }}-O{{ $oldStart }}-N{{ $newStart }}"> 59 59 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle1 }}"> 60 60 - <a 61 61 - class="{{ $linkStyle }}" 62 62 - href="#{{ $name }}-O{{ $oldStart }}-N{{ $newStart }}"> 63 63 - {{ $oldStart }} 64 64 - </a> 65 65 - </div> 66 66 - <div class="{{ $lineNrStyle }} {{ $lineNrSepStyle2 }}"> 67 67 - <a 68 68 - class="{{ $linkStyle }}" 69 69 - href="#{{ $name }}-O{{ $oldStart }}-N{{ $newStart }}"> 70 70 - {{ $newStart }} 71 71 - </a> 72 72 - </div> 73 73 - <div class="{{ $opStyle }}">{{ .Op.String }}</div> 74 74 - <div class="px-2">{{ .Line }}</div> 75 75 - </div> 76 76 - {{- $newStart = add64 $newStart 1 -}} 77 77 - {{- $oldStart = add64 $oldStart 1 -}} 78 78 - {{- end -}} 79 79 - {{- end -}} 80 80 - {{- end -}}</div></div></pre> 2 2 + {{ $name := .Id }} 3 3 + <pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div> 4 4 + {{- $oldStart := .OldPosition -}} 5 5 + {{- $newStart := .NewPosition -}} 6 6 + {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800 target:bg-yellow-200 target:dark:bg-yellow-600" -}} 7 7 + {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}} 8 8 + {{- $lineNrSepStyle1 := "" -}} 9 9 + {{- $lineNrSepStyle2 := "pr-2 border-r border-gray-200 dark:border-gray-700" -}} 10 10 + {{- $containerStyle := "flex min-w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}} 11 11 + {{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 " -}} 12 12 + {{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}} 13 13 + {{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}} 14 14 + {{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}} 15 15 + {{- range .Lines -}} 16 16 + {{- if eq .Op.String "+" -}} 17 17 + <div class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{$newStart}}"> 18 18 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><span aria-hidden="true" class="invisible">{{$newStart}}</span></div> 19 19 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div> 20 20 + <div class="{{ $opStyle }}">{{ .Op.String }}</div> 21 21 + <div class="px-2">{{ .Line }}</div> 22 22 + </div> 23 23 + {{- $newStart = add64 $newStart 1 -}} 24 24 + {{- end -}} 25 25 + {{- if eq .Op.String "-" -}} 26 26 + <div class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}"> 27 27 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div> 28 28 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><span aria-hidden="true" class="invisible">{{$oldStart}}</span></div> 29 29 + <div class="{{ $opStyle }}">{{ .Op.String }}</div> 30 30 + <div class="px-2">{{ .Line }}</div> 31 31 + </div> 32 32 + {{- $oldStart = add64 $oldStart 1 -}} 33 33 + {{- end -}} 34 34 + {{- if eq .Op.String " " -}} 35 35 + <div class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}-N{{$newStart}}"> 36 36 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $oldStart }}</a></div> 37 37 + <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $newStart }}</a></div> 38 38 + <div class="{{ $opStyle }}">{{ .Op.String }}</div> 39 39 + <div class="px-2">{{ .Line }}</div> 40 40 + </div> 41 41 + {{- $newStart = add64 $newStart 1 -}} 42 42 + {{- $oldStart = add64 $oldStart 1 -}} 43 43 + {{- end -}} 44 44 + {{- end -}} 45 45 + {{- end -}}</div></div></pre> 81 46 {{ end }} 47 47 +

+12 -21

appview/pages/templates/repo/pipelines/fragments/logBlock.html

··· 1 1 {{ define "repo/pipelines/fragments/logBlock" }} 2 2 - <div id="lines" hx-swap-oob="beforeend"> 3 3 - <details 4 4 - id="step-{{ .Id }}" 5 5 - {{ if not .Collapsed }}open{{ end }} 6 6 - class="group pb-2 rounded-sm border border-gray-200 dark:border-gray-700"> 7 7 - <summary 8 8 - class="sticky top-0 pt-2 px-2 group-open:pb-2 group-open:mb-2 list-none cursor-pointer group-open:border-b border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 hover:text-gray-500 hover:dark:text-gray-400"> 9 9 - <div class="group-open:hidden flex items-center gap-1"> 10 10 - {{ i "chevron-right" "w-4 h-4" }} 11 11 - {{ .Name }} 12 12 - </div> 13 13 - <div class="hidden group-open:flex items-center gap-1"> 14 14 - {{ i "chevron-down" "w-4 h-4" }} 15 15 - {{ .Name }} 16 16 - </div> 17 17 - </summary> 18 18 - <div class="font-mono whitespace-pre overflow-x-auto px-2"> 19 19 - <div class="text-blue-600 dark:text-blue-300">{{ .Command }}</div> 20 20 - <div id="step-body-{{ .Id }}"></div> 2 2 + <div id="lines" hx-swap-oob="beforeend"> 3 3 + <details id="step-{{ .Id }}" {{if not .Collapsed}}open{{end}} class="group pb-2 rounded-sm border border-gray-200 dark:border-gray-700"> 4 4 + <summary class="sticky top-0 pt-2 px-2 group-open:pb-2 group-open:mb-2 list-none cursor-pointer group-open:border-b border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 hover:text-gray-500 hover:dark:text-gray-400"> 5 5 + <div class="group-open:hidden flex items-center gap-1"> 6 6 + {{ i "chevron-right" "w-4 h-4" }} {{ .Name }} 21 7 </div> 22 22 - </details> 23 23 - </div> 8 8 + <div class="hidden group-open:flex items-center gap-1"> 9 9 + {{ i "chevron-down" "w-4 h-4" }} {{ .Name }} 10 10 + </div> 11 11 + </summary> 12 12 + <div class="font-mono whitespace-pre overflow-x-auto px-2"><div class="text-blue-600 dark:text-blue-300">{{ .Command }}</div><div id="step-body-{{ .Id }}"></div></div> 13 13 + </details> 14 14 + </div> 24 15 {{ end }}

+39 -42

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

··· 1 1 {{ define "repo/pulls/fragments/pullCompareBranches" }} 2 2 - <div id="patch-upload"> 3 3 - <label for="targetBranch" class="dark:text-white"> 4 4 - select a source branch 5 5 - </label> 6 6 - <div class="flex flex-wrap gap-2 items-center"> 7 7 - <select 8 8 - name="sourceBranch" 9 9 - class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"> 10 10 - <option disabled selected>source branch</option> 2 2 + <div id="patch-upload"> 3 3 + <label for="targetBranch" class="dark:text-white">select a source branch</label> 4 4 + <div class="flex flex-wrap gap-2 items-center"> 5 5 + <select 6 6 + name="sourceBranch" 7 7 + class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 8 8 + > 9 9 + <option disabled selected>source branch</option> 11 10 12 12 - {{ $recent := index .Branches 0 }} 13 13 - {{ range .Branches }} 14 14 - {{ $isRecent := eq .Reference.Name $recent.Reference.Name }} 15 15 - {{ $preset := false }} 16 16 - {{ if $.SourceBranch }} 17 17 - {{ $preset = eq .Reference.Name $.SourceBranch }} 18 18 - {{ else }} 19 19 - {{ $preset = $isRecent }} 20 20 - {{ end }} 21 21 - 22 22 - 23 23 - <option 24 24 - value="{{ .Reference.Name }}" 25 25 - {{ if $preset }} 26 26 - selected 27 27 - {{ end }} 28 28 - class="py-1"> 29 29 - {{ .Reference.Name }} 30 30 - {{ if $isRecent }}(new){{ end }} 31 31 - </option> 32 32 - {{ end }} 33 33 - </select> 11 11 + {{ $recent := index .Branches 0 }} 12 12 + {{ range .Branches }} 13 13 + {{ $isRecent := eq .Reference.Name $recent.Reference.Name }} 14 14 + {{ $preset := false }} 15 15 + {{ if $.SourceBranch }} 16 16 + {{ $preset = eq .Reference.Name $.SourceBranch }} 17 17 + {{ else }} 18 18 + {{ $preset = $isRecent }} 19 19 + {{ end }} 20 20 + 21 21 + <option 22 22 + value="{{ .Reference.Name }}" 23 23 + {{ if $preset }} 24 24 + selected 25 25 + {{ end }} 26 26 + class="py-1" 27 27 + > 28 28 + {{ .Reference.Name }} 29 29 + {{ if $isRecent }}(new){{ end }} 30 30 + </option> 31 31 + {{ end }} 32 32 + </select> 33 33 + </div> 34 34 </div> 35 35 - </div> 36 35 37 37 - <div class="flex items-center gap-2"> 38 38 - <input type="checkbox" id="isStacked" name="isStacked" value="on" /> 39 39 - <label for="isStacked" class="my-0 py-0 normal-case font-normal"> 40 40 - Submit as stacked PRs 41 41 - </label> 42 42 - </div> 36 36 + <div class="flex items-center gap-2"> 37 37 + <input type="checkbox" id="isStacked" name="isStacked" value="on"> 38 38 + <label for="isStacked" class="my-0 py-0 normal-case font-normal">Submit as stacked PRs</label> 39 39 + </div> 43 40 44 44 - <p class="mt-4"> 45 45 - Title and description are optional; if left out, they will be extracted from 46 46 - the first commit. 47 47 - </p> 41 41 + <p class="mt-4"> 42 42 + Title and description are optional; if left out, they will be extracted 43 43 + from the first commit. 44 44 + </p> 48 45 {{ end }}

+22 -20

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

··· 1 1 {{ define "repo/pulls/fragments/pullCompareForksBranches" }} 2 2 - <div class="flex flex-wrap gap-2 items-center"> 3 3 - <select 4 4 - name="sourceBranch" 5 5 - class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"> 6 6 - <option disabled selected>source branch</option> 2 2 + <div class="flex flex-wrap gap-2 items-center"> 3 3 + <select 4 4 + name="sourceBranch" 5 5 + class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 6 6 + > 7 7 + <option disabled selected>source branch</option> 7 8 8 8 - {{ $recent := index .SourceBranches 0 }} 9 9 - {{ range .SourceBranches }} 10 10 - {{ $isRecent := eq .Reference.Name $recent.Reference.Name }} 11 11 - <option 12 12 - value="{{ .Reference.Name }}" 13 13 - {{ if $isRecent }} 14 14 - selected 15 15 - {{ end }} 16 16 - class="py-1"> 17 17 - {{ .Reference.Name }} 18 18 - {{ if $isRecent }}(new){{ end }} 19 19 - </option> 20 20 - {{ end }} 21 21 - </select> 22 22 - </div> 9 9 + {{ $recent := index .SourceBranches 0 }} 10 10 + {{ range .SourceBranches }} 11 11 + {{ $isRecent := eq .Reference.Name $recent.Reference.Name }} 12 12 + <option 13 13 + value="{{ .Reference.Name }}" 14 14 + {{ if $isRecent }} 15 15 + selected 16 16 + {{ end }} 17 17 + class="py-1" 18 18 + > 19 19 + {{ .Reference.Name }} 20 20 + {{ if $isRecent }}(new){{ end }} 21 21 + </option> 22 22 + {{ end }} 23 23 + </select> 24 24 + </div> 23 25 {{ end }}

+57 -53

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

··· 1 1 {{ define "repo/pulls/fragments/pullResubmit" }} 2 2 <div 3 3 - id="resubmit-pull-card" 4 4 - class="rounded relative border bg-amber-50 dark:bg-amber-900 border-amber-200 dark:border-amber-500 px-6 py-2"> 5 5 - <div class="flex items-center gap-2 text-amber-500 dark:text-amber-50"> 6 6 - {{ i "pencil" "w-4 h-4" }} 7 7 - <span class="font-medium">resubmit your patch</span> 8 8 - </div> 3 3 + id="resubmit-pull-card" 4 4 + class="rounded relative border bg-amber-50 dark:bg-amber-900 border-amber-200 dark:border-amber-500 px-6 py-2"> 9 5 10 10 - <div class="mt-2 text-sm text-gray-700 dark:text-gray-200"> 11 11 - You can update this patch to address any reviews. This will begin a new 12 12 - round of reviews, but you'll still be able to view your previous 13 13 - submissions and feedback. 14 14 - </div> 6 6 + <div class="flex items-center gap-2 text-amber-500 dark:text-amber-50"> 7 7 + {{ i "pencil" "w-4 h-4" }} 8 8 + <span class="font-medium">resubmit your patch</span> 9 9 + </div> 15 10 16 16 - <div class="mt-4 flex flex-col"> 17 17 - <form 18 18 - hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 19 19 - hx-swap="none" 20 20 - class="w-full flex flex-wrap gap-2" 21 21 - hx-indicator="#resubmit-spinner"> 22 22 - <textarea 23 23 - name="patch" 24 24 - class="w-full p-2 mb-2" 25 25 - placeholder="Paste your updated patch here." 26 26 - rows="15"> 27 27 - {{ .Pull.LatestPatch }} 28 28 - </textarea 11 11 + <div class="mt-2 text-sm text-gray-700 dark:text-gray-200"> 12 12 + You can update this patch to address any reviews. 13 13 + This will begin a new round of reviews, 14 14 + but you'll still be able to view your previous submissions and feedback. 15 15 + </div> 16 16 + 17 17 + <div class="mt-4 flex flex-col"> 18 18 + <form 19 19 + hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 20 20 + hx-swap="none" 21 21 + class="w-full flex flex-wrap gap-2" 22 22 + hx-indicator="#resubmit-spinner" 29 23 > 30 30 - <button 31 31 - type="submit" 32 32 - class="btn flex items-center gap-2" 33 33 - {{ if or .Pull.State.IsClosed }} 34 34 - disabled 35 35 - {{ end }}> 36 36 - {{ i "rotate-ccw" "w-4 h-4" }} 37 37 - <span>resubmit</span> 38 38 - <span id="resubmit-spinner" class="group"> 39 39 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 40 40 - </span> 41 41 - </button> 42 42 - <button 43 43 - type="button" 44 44 - class="btn flex items-center gap-2" 45 45 - hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Pull.LastRoundNumber }}/actions" 46 46 - hx-swap="outerHTML" 47 47 - hx-target="#resubmit-pull-card" 48 48 - hx-indicator="#cancel-resubmit-spinner"> 49 49 - {{ i "x" "w-4 h-4" }} 50 50 - <span>cancel</span> 51 51 - <span id="cancel-resubmit-spinner" class="group"> 52 52 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 53 53 - </span> 54 54 - </button> 55 55 - </form> 24 24 + <textarea 25 25 + name="patch" 26 26 + class="w-full p-2 mb-2" 27 27 + placeholder="Paste your updated patch here." 28 28 + rows="15" 29 29 + > 30 30 + {{.Pull.LatestPatch}} 31 31 + </textarea> 32 32 + <button 33 33 + type="submit" 34 34 + class="btn flex items-center gap-2" 35 35 + {{ if or .Pull.State.IsClosed }} 36 36 + disabled 37 37 + {{ end }} 38 38 + > 39 39 + {{ i "rotate-ccw" "w-4 h-4" }} 40 40 + <span>resubmit</span> 41 41 + <span id="resubmit-spinner" class="group"> 42 42 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 43 43 + </span> 44 44 + </button> 45 45 + <button 46 46 + type="button" 47 47 + class="btn flex items-center gap-2" 48 48 + hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Pull.LastRoundNumber }}/actions" 49 49 + hx-swap="outerHTML" 50 50 + hx-target="#resubmit-pull-card" 51 51 + hx-indicator="#cancel-resubmit-spinner" 52 52 + > 53 53 + {{ i "x" "w-4 h-4" }} 54 54 + <span>cancel</span> 55 55 + <span id="cancel-resubmit-spinner" class="group"> 56 56 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 57 57 + </span> 58 58 + </button> 59 59 + </form> 56 60 57 57 - <div id="resubmit-error" class="error"></div> 58 58 - <div id="resubmit-success" class="success"></div> 59 59 - </div> 61 61 + <div id="resubmit-error" class="error"></div> 62 62 + <div id="resubmit-success" class="success"></div> 63 63 + </div> 60 64 </div> 61 65 {{ end }}

+1

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

··· 17 17 18 18 {{ i $icon $style }} 19 19 {{ end }} 20 20 +

+146 -136

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

··· 1 1 {{ define "title" }}new pull &middot; {{ .RepoInfo.FullName }}{{ end }} 2 2 3 3 {{ define "repoContent" }} 4 4 - <h2 class="font-bold text-sm mb-4 uppercase dark:text-white"> 5 5 - Create new pull request 6 6 - </h2> 7 7 - 8 8 - <form 9 9 - hx-post="/{{ .RepoInfo.FullName }}/pulls/new" 10 10 - hx-indicator="#create-pull-spinner" 11 11 - hx-swap="none"> 12 12 - <div class="flex flex-col gap-6"> 13 13 - <div class="flex gap-2 items-center"> 14 14 - <p>First, choose a target branch on {{ .RepoInfo.FullName }}:</p> 15 15 - <div> 16 16 - <select 17 17 - required 18 18 - name="targetBranch" 19 19 - class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"> 20 20 - <option disabled selected>target branch</option> 21 21 - 22 22 - {{ range .Branches }} 23 23 - {{ $preset := false }} 24 24 - {{ if $.TargetBranch }} 25 25 - {{ $preset = eq .Reference.Name $.TargetBranch }} 26 26 - {{ else }} 27 27 - {{ $preset = .IsDefault }} 28 28 - {{ end }} 29 29 - 30 30 - 31 31 - <option 32 32 - value="{{ .Reference.Name }}" 33 33 - class="py-1" 34 34 - {{ if $preset }}selected{{ end }}> 35 35 - {{ .Reference.Name }} 36 36 - </option> 37 37 - {{ end }} 38 38 - </select> 39 39 - </div> 40 40 - </div> 41 41 - 42 42 - <div class="flex flex-col gap-2"> 43 43 - <h2 class="font-bold text-sm mb-4 uppercase dark:text-white"> 44 44 - Choose pull strategy 45 45 - </h2> 46 46 - <nav class="flex space-x-4 items-center"> 47 47 - <button 48 48 - type="button" 49 49 - class="btn" 50 50 - hx-get="/{{ .RepoInfo.FullName }}/pulls/new/patch-upload" 51 51 - hx-target="#patch-strategy" 52 52 - hx-swap="innerHTML"> 53 53 - paste patch 54 54 - </button> 55 55 - 56 56 - {{ if .RepoInfo.Roles.IsPushAllowed }} 57 57 - <span class="text-sm text-gray-500 dark:text-gray-400">or</span> 58 58 - <button 59 59 - type="button" 60 60 - class="btn" 61 61 - hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-branches" 62 62 - hx-target="#patch-strategy" 63 63 - hx-swap="innerHTML"> 64 64 - compare branches 65 65 - </button> 66 66 - {{ end }} 67 67 - 68 68 - 69 69 - <span class="text-sm text-gray-500 dark:text-gray-400">or</span> 70 70 - <script> 71 71 - function getQueryParams() { 72 72 - return Object.fromEntries( 73 73 - new URLSearchParams(window.location.search), 74 74 - ); 75 75 - } 76 76 - </script> 77 77 - <!-- 4 4 + <h2 class="font-bold text-sm mb-4 uppercase dark:text-white"> 5 5 + Create new pull request 6 6 + </h2> 7 7 + 8 8 + <form 9 9 + hx-post="/{{ .RepoInfo.FullName }}/pulls/new" 10 10 + hx-indicator="#create-pull-spinner" 11 11 + hx-swap="none" 12 12 + > 13 13 + <div class="flex flex-col gap-6"> 14 14 + <div class="flex gap-2 items-center"> 15 15 + <p>First, choose a target branch on {{ .RepoInfo.FullName }}:</p> 16 16 + <div> 17 17 + <select 18 18 + required 19 19 + name="targetBranch" 20 20 + class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600" 21 21 + > 22 22 + <option disabled selected>target branch</option> 23 23 + 24 24 + 25 25 + {{ range .Branches }} 26 26 + 27 27 + {{ $preset := false }} 28 28 + {{ if $.TargetBranch }} 29 29 + {{ $preset = eq .Reference.Name $.TargetBranch }} 30 30 + {{ else }} 31 31 + {{ $preset = .IsDefault }} 32 32 + {{ end }} 33 33 + 34 34 + <option value="{{ .Reference.Name }}" class="py-1" {{if $preset}}selected{{end}}> 35 35 + {{ .Reference.Name }} 36 36 + </option> 37 37 + {{ end }} 38 38 + </select> 39 39 + </div> 40 40 + </div> 41 41 + 42 42 + <div class="flex flex-col gap-2"> 43 43 + <h2 class="font-bold text-sm mb-4 uppercase dark:text-white"> 44 44 + Choose pull strategy 45 45 + </h2> 46 46 + <nav class="flex space-x-4 items-center"> 47 47 + <button 48 48 + type="button" 49 49 + class="btn" 50 50 + hx-get="/{{ .RepoInfo.FullName }}/pulls/new/patch-upload" 51 51 + hx-target="#patch-strategy" 52 52 + hx-swap="innerHTML" 53 53 + > 54 54 + paste patch 55 55 + </button> 56 56 + 57 57 + {{ if .RepoInfo.Roles.IsPushAllowed }} 58 58 + <span class="text-sm text-gray-500 dark:text-gray-400"> 59 59 + or 60 60 + </span> 61 61 + <button 62 62 + type="button" 63 63 + class="btn" 64 64 + hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-branches" 65 65 + hx-target="#patch-strategy" 66 66 + hx-swap="innerHTML" 67 67 + > 68 68 + compare branches 69 69 + </button> 70 70 + {{ end }} 71 71 + 72 72 + 73 73 + <span class="text-sm text-gray-500 dark:text-gray-400"> 74 74 + or 75 75 + </span> 76 76 + <script> 77 77 + function getQueryParams() { 78 78 + return Object.fromEntries(new URLSearchParams(window.location.search)); 79 79 + } 80 80 + </script> 81 81 + <!-- 78 82 since compare-forks need the server to load forks, we 79 83 hx-get this button; unlike simply loading the pullCompareForks template 80 84 as we do for the rest of the gang below. the hx-vals thing just populates 81 85 the query params so the forks page gets it. 82 86 --> 83 83 - <button 84 84 - type="button" 85 85 - class="btn" 86 86 - hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-forks" 87 87 - hx-target="#patch-strategy" 88 88 - hx-swap="innerHTML" 89 89 - {{ if eq .Strategy "fork" }} 90 90 - hx-trigger="click, load" hx-vals='js:{...getQueryParams()}' 91 91 - {{ end }}> 92 92 - compare forks 93 93 - </button> 94 94 - </nav> 95 95 - <section id="patch-strategy" class="flex flex-col gap-2"> 96 96 - {{ if eq .Strategy "patch" }} 97 97 - {{ template "repo/pulls/fragments/pullPatchUpload" . }} 98 98 - {{ else if eq .Strategy "branch" }} 99 99 - {{ template "repo/pulls/fragments/pullCompareBranches" . }} 100 100 - {{ else }} 101 101 - {{ template "repo/pulls/fragments/pullPatchUpload" . }} 102 102 - {{ end }} 103 103 - </section> 104 104 - 105 105 - <div id="patch-error" class="error dark:text-red-300"></div> 106 106 - </div> 107 107 - 108 108 - <div> 109 109 - <label for="title" class="dark:text-white">write a title</label> 110 110 - 111 111 - <input 112 112 - type="text" 113 113 - name="title" 114 114 - id="title" 115 115 - value="{{ .Title }}" 116 116 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600" 117 117 - placeholder="One-line summary of your change." /> 118 118 - </div> 119 119 - 120 120 - <div> 121 121 - <label for="body" class="dark:text-white">add a description</label> 122 122 - 123 123 - <textarea 124 124 - name="body" 125 125 - id="body" 126 126 - rows="6" 127 127 - class="w-full resize-y dark:bg-gray-700 dark:text-white dark:border-gray-600" 128 128 - placeholder="Describe your change. Markdown is supported."> 129 129 - {{ .Body }}</textarea 130 130 - > 131 131 - </div> 132 132 - 133 133 - <div class="flex justify-start items-center gap-2 mt-4"> 134 134 - <button type="submit" class="btn-create flex items-center gap-2"> 135 135 - {{ i "git-pull-request-create" "w-4 h-4" }} 136 136 - create pull 137 137 - <span id="create-pull-spinner" class="group"> 138 138 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 139 139 - </span> 140 140 - </button> 141 141 - </div> 142 142 - </div> 143 143 - <div id="pull" class="error dark:text-red-300"></div> 144 144 - </form> 87 87 + <button 88 88 + type="button" 89 89 + class="btn" 90 90 + hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-forks" 91 91 + hx-target="#patch-strategy" 92 92 + hx-swap="innerHTML" 93 93 + {{ if eq .Strategy "fork" }} 94 94 + hx-trigger="click, load" 95 95 + hx-vals='js:{...getQueryParams()}' 96 96 + {{ end }} 97 97 + > 98 98 + compare forks 99 99 + </button> 100 100 + 101 101 + 102 102 + </nav> 103 103 + <section id="patch-strategy" class="flex flex-col gap-2"> 104 104 + {{ if eq .Strategy "patch" }} 105 105 + {{ template "repo/pulls/fragments/pullPatchUpload" . }} 106 106 + {{ else if eq .Strategy "branch" }} 107 107 + {{ template "repo/pulls/fragments/pullCompareBranches" . }} 108 108 + {{ else }} 109 109 + {{ template "repo/pulls/fragments/pullPatchUpload" . }} 110 110 + {{ end }} 111 111 + </section> 112 112 + 113 113 + <div id="patch-error" class="error dark:text-red-300"></div> 114 114 + </div> 115 115 + 116 116 + <div> 117 117 + <label for="title" class="dark:text-white">write a title</label> 118 118 + 119 119 + <input 120 120 + type="text" 121 121 + name="title" 122 122 + id="title" 123 123 + value="{{ .Title }}" 124 124 + class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600" 125 125 + placeholder="One-line summary of your change." 126 126 + /> 127 127 + </div> 128 128 + 129 129 + <div> 130 130 + <label for="body" class="dark:text-white" 131 131 + >add a description</label 132 132 + > 133 133 + 134 134 + <textarea 135 135 + name="body" 136 136 + id="body" 137 137 + rows="6" 138 138 + class="w-full resize-y dark:bg-gray-700 dark:text-white dark:border-gray-600" 139 139 + placeholder="Describe your change. Markdown is supported." 140 140 + >{{ .Body }}</textarea> 141 141 + </div> 142 142 + 143 143 + <div class="flex justify-start items-center gap-2 mt-4"> 144 144 + <button type="submit" class="btn-create flex items-center gap-2"> 145 145 + {{ i "git-pull-request-create" "w-4 h-4" }} 146 146 + create pull 147 147 + <span id="create-pull-spinner" class="group"> 148 148 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 149 149 + </span> 150 150 + </button> 151 151 + </div> 152 152 + </div> 153 153 + <div id="pull" class="error dark:text-red-300"></div> 154 154 + </form> 145 155 {{ end }}

+8 -15

appview/pages/templates/repo/settings/fragments/secretListing.html

··· 1 1 {{ define "repo/settings/fragments/secretListing" }} 2 2 {{ $root := index . 0 }} 3 3 {{ $secret := index . 1 }} 4 4 - <div 5 5 - id="secret-{{ $secret.Key }}" 6 6 - class="flex items-center justify-between p-2"> 7 7 - <div 8 8 - class="hover:no-underline flex flex-col gap-1 text-sm min-w-0 max-w-[80%]"> 4 4 + <div id="secret-{{$secret.Key}}" class="flex items-center justify-between p-2"> 5 5 + <div class="hover:no-underline flex flex-col gap-1 text-sm min-w-0 max-w-[80%]"> 9 6 <span class="font-mono"> 10 7 {{ $secret.Key }} 11 8 </span> 12 12 - <div 13 13 - class="flex flex-wrap text items-center gap-1 text-gray-500 dark:text-gray-400"> 9 9 + <div class="flex flex-wrap text items-center gap-1 text-gray-500 dark:text-gray-400"> 14 10 <span>added by</span> 15 15 - <span> 16 16 - {{ template "user/fragments/picHandleLink" $secret.CreatedBy }} 17 17 - </span> 11 11 + <span>{{ template "user/fragments/picHandleLink" $secret.CreatedBy }}</span> 18 12 <span class="before:content-['·'] before:select-none"></span> 19 19 - <span> 20 20 - {{ template "repo/fragments/shortTimeAgo" $secret.CreatedAt }} 21 21 - </span> 13 13 + <span>{{ template "repo/fragments/shortTimeAgo" $secret.CreatedAt }}</span> 22 14 </div> 23 15 </div> 24 16 <button ··· 27 19 hx-delete="/{{ $root.RepoInfo.FullName }}/settings/secrets" 28 20 hx-swap="none" 29 21 hx-vals='{"key": "{{ $secret.Key }}"}' 30 30 - hx-confirm="Are you sure you want to delete the secret {{ $secret.Key }}?"> 22 22 + hx-confirm="Are you sure you want to delete the secret {{ $secret.Key }}?" 23 23 + > 31 24 {{ i "trash-2" "w-5 h-5" }} 32 32 - <span class="hidden md:inline">delete</span> 25 25 + <span class="hidden md:inline">delete</span> 33 26 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 34 27 </button> 35 28 </div>

+7 -15

appview/pages/templates/repo/settings/fragments/sidebar.html

··· 1 1 {{ define "repo/settings/fragments/sidebar" }} 2 2 {{ $active := .Tab }} 3 3 {{ $tabs := .Tabs }} 4 4 - <div 5 5 - class="sticky top-2 grid grid-cols-1 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 shadow-inner"> 4 4 + <div class="sticky top-2 grid grid-cols-1 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 shadow-inner"> 6 5 {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 7 6 {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 8 7 {{ range $tabs }} 9 9 - <a 10 10 - href="/{{ $.RepoInfo.FullName }}/settings?tab={{ .Name }}" 11 11 - class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 12 12 - <div 13 13 - class="flex gap-3 items-center p-2 {{ if eq .Name $active }} 14 14 - {{ $activeTab }} 15 15 - {{ else }} 16 16 - {{ $inactiveTab }} 17 17 - {{ end }}"> 18 18 - {{ i .Icon "size-4" }} 19 19 - {{ .Name }} 20 20 - </div> 21 21 - </a> 8 8 + <a href="/{{ $.RepoInfo.FullName }}/settings?tab={{.Name}}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 9 9 + <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 10 10 + {{ i .Icon "size-4" }} 11 11 + {{ .Name }} 12 12 + </div> 13 13 + </a> 22 14 {{ end }} 23 15 </div> 24 16 {{ end }}

+4 -12

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

··· 1 1 {{ define "user/fragments/bluesky" }} 2 2 - <svg 3 3 - class="{{ . }}" 4 4 - xmlns="http://www.w3.org/2000/svg" 5 5 - role="img" 6 6 - viewBox="-3 -3 30 30"> 7 7 - <title>Bluesky</title> 8 8 - <path 9 9 - fill="none" 10 10 - stroke="currentColor" 11 11 - d="M12 10.8c-1.087-2.114-4.046-6.053-6.798-7.995C2.566.944 1.561 1.266.902 1.565.139 1.908 0 3.08 0 3.768c0 .69.378 5.65.624 6.479.815 2.736 3.713 3.66 6.383 3.364.136-.02.275-.039.415-.056-.138.022-.276.04-.415.056-3.912.58-7.387 2.005-2.83 7.078 5.013 5.19 6.87-1.113 7.823-4.308.953 3.195 2.05 9.271 7.733 4.308 4.267-4.308 1.172-6.498-2.74-7.078a8.741 8.741 0 0 1-.415-.056c.14.017.279.036.415.056 2.67.297 5.568-.628 6.383-3.364.246-.828.624-5.79.624-6.478 0-.69-.139-1.861-.902-2.206-.659-.298-1.664-.62-4.3 1.24C16.046 4.748 13.087 8.687 12 10.8Z" 12 12 - stroke-width="2.25" /> 13 13 - </svg> 2 2 + <svg class="{{.}}" xmlns="http://www.w3.org/2000/svg" role="img" viewBox="-3 -3 30 30"> 3 3 + <title>Bluesky</title> 4 4 + <path fill="none" stroke="currentColor" d="M12 10.8c-1.087-2.114-4.046-6.053-6.798-7.995C2.566.944 1.561 1.266.902 1.565.139 1.908 0 3.08 0 3.768c0 .69.378 5.65.624 6.479.815 2.736 3.713 3.66 6.383 3.364.136-.02.275-.039.415-.056-.138.022-.276.04-.415.056-3.912.58-7.387 2.005-2.83 7.078 5.013 5.19 6.87-1.113 7.823-4.308.953 3.195 2.05 9.271 7.733 4.308 4.267-4.308 1.172-6.498-2.74-7.078a8.741 8.741 0 0 1-.415-.056c.14.017.279.036.415.056 2.67.297 5.568-.628 6.383-3.364.246-.828.624-5.79.624-6.478 0-.69-.139-1.861-.902-2.206-.659-.298-1.664-.62-4.3 1.24C16.046 4.748 13.087 8.687 12 10.8Z" stroke-width="2.25"/> 5 5 + </svg> 14 6 {{ end }}

-55

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

··· 1 1 - {{ define "repo/fragments/cloneInstructions" }} 2 2 - {{ $knot := .RepoInfo.Knot }} 3 3 - {{ if eq $knot "knot1.tangled.sh" }} 4 4 - {{ $knot = "tangled.sh" }} 5 5 - {{ end }} 6 6 - <section 7 7 - class="mt-4 p-6 rounded drop-shadow-sm bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto flex flex-col gap-4" 8 8 - > 9 9 - <div class="flex flex-col gap-2"> 10 10 - <strong>push</strong> 11 11 - <div class="md:pl-4 overflow-x-auto whitespace-nowrap"> 12 12 - <code class="dark:text-gray-100" 13 13 - >git remote add origin 14 14 - git@{{ $knot }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code 15 15 - > 16 16 - </div> 17 17 - </div> 18 18 - 19 19 - <div class="flex flex-col gap-2"> 20 20 - <strong>clone</strong> 21 21 - <div class="md:pl-4 flex flex-col gap-2"> 22 22 - <div class="flex items-center gap-3"> 23 23 - <span 24 24 - class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white" 25 25 - >HTTP</span 26 26 - > 27 27 - <div class="overflow-x-auto whitespace-nowrap flex-1"> 28 28 - <code class="dark:text-gray-100" 29 29 - >git clone 30 30 - https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code 31 31 - > 32 32 - </div> 33 33 - </div> 34 34 - 35 35 - <div class="flex items-center gap-3"> 36 36 - <span 37 37 - class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white" 38 38 - >SSH</span 39 39 - > 40 40 - <div class="overflow-x-auto whitespace-nowrap flex-1"> 41 41 - <code class="dark:text-gray-100" 42 42 - >git clone 43 43 - git@{{ $knot }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code 44 44 - > 45 45 - </div> 46 46 - </div> 47 47 - </div> 48 48 - </div> 49 49 - 50 50 - <p class="py-2 text-gray-500 dark:text-gray-400"> 51 51 - Note that for self-hosted knots, clone URLs may be different based 52 52 - on your setup. 53 53 - </p> 54 54 - </section> 55 55 - {{ end }}

-4

appview/pages/templates/repo/empty.html

··· 44 44 {{ end }} 45 45 </main> 46 46 {{ end }} 47 47 - 48 48 - {{ define "repoAfter" }} 49 49 - {{ template "repo/fragments/cloneInstructions" . }} 50 50 - {{ end }}

+1 -1

spindle/engine/ansi_stripper.go spindle/engines/nixery/ansi_stripper.go

··· 1 1 - package engine 1 1 + package nixery 2 2 3 3 import ( 4 4 "io"

+1 -1

spindle/engine/envs.go spindle/engines/nixery/envs.go

··· 1 1 - package engine 1 1 + package nixery 2 2 3 3 import ( 4 4 "fmt"

+1 -1

spindle/engine/envs_test.go spindle/engines/nixery/envs_test.go

··· 1 1 - package engine 1 1 + package nixery 2 2 3 3 import ( 4 4 "testing"

+7

spindle/engines/nixery/errors.go

··· 1 1 + package nixery 2 2 + 3 3 + import "errors" 4 4 + 5 5 + var ( 6 6 + ErrOOMKilled = errors.New("oom killed") 7 7 + )

+8 -10

spindle/engine/logger.go spindle/models/logger.go

··· 1 1 - package engine 1 1 + package models 2 2 3 3 import ( 4 4 "encoding/json" ··· 7 7 "os" 8 8 "path/filepath" 9 9 "strings" 10 10 - 11 11 - "tangled.sh/tangled.sh/core/spindle/models" 12 10 ) 13 11 14 12 type WorkflowLogger struct { ··· 16 14 encoder *json.Encoder 17 15 } 18 16 19 19 - func NewWorkflowLogger(baseDir string, wid models.WorkflowId) (*WorkflowLogger, error) { 17 17 + func NewWorkflowLogger(baseDir string, wid WorkflowId) (*WorkflowLogger, error) { 20 18 path := LogFilePath(baseDir, wid) 21 19 22 20 file, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644) ··· 30 28 }, nil 31 29 } 32 30 33 33 - func LogFilePath(baseDir string, workflowID models.WorkflowId) string { 31 31 + func LogFilePath(baseDir string, workflowID WorkflowId) string { 34 32 logFilePath := filepath.Join(baseDir, fmt.Sprintf("%s.log", workflowID.String())) 35 33 return logFilePath 36 34 } ··· 47 45 } 48 46 } 49 47 50 50 - func (l *WorkflowLogger) ControlWriter(idx int, step models.Step) io.Writer { 48 48 + func (l *WorkflowLogger) ControlWriter(idx int, step Step) io.Writer { 51 49 return &controlWriter{ 52 50 logger: l, 53 51 idx: idx, ··· 62 60 63 61 func (w *dataWriter) Write(p []byte) (int, error) { 64 62 line := strings.TrimRight(string(p), "\r\n") 65 65 - entry := models.NewDataLogLine(line, w.stream) 63 63 + entry := NewDataLogLine(line, w.stream) 66 64 if err := w.logger.encoder.Encode(entry); err != nil { 67 65 return 0, err 68 66 } ··· 72 70 type controlWriter struct { 73 71 logger *WorkflowLogger 74 72 idx int 75 75 - step models.Step 73 73 + step Step 76 74 } 77 75 78 76 func (w *controlWriter) Write(_ []byte) (int, error) { 79 79 - entry := models.NewControlLogLine(w.idx, w.step) 77 77 + entry := NewControlLogLine(w.idx, w.step) 80 78 if err := w.logger.encoder.Encode(entry); err != nil { 81 79 return 0, err 82 80 } 83 83 - return len(w.step.Name), nil 81 81 + return len(w.step.Name()), nil 84 82 }

+8 -103

spindle/models/pipeline.go

··· 1 1 package models 2 2 3 3 - import ( 4 4 - "path" 5 5 - 6 6 - "tangled.sh/tangled.sh/core/api/tangled" 7 7 - "tangled.sh/tangled.sh/core/spindle/config" 8 8 - ) 9 9 - 10 3 type Pipeline struct { 11 4 RepoOwner string 12 5 RepoName string 13 13 - Workflows []Workflow 6 6 + Workflows map[Engine][]Workflow 14 7 } 15 8 16 16 - type Step struct { 17 17 - Command string 18 18 - Name string 19 19 - Environment map[string]string 20 20 - Kind StepKind 9 9 + type Step interface { 10 10 + Name() string 11 11 + Command() string 12 12 + Kind() StepKind 21 13 } 22 14 23 15 type StepKind int ··· 30 22 ) 31 23 32 24 type Workflow struct { 33 33 - Steps []Step 34 34 - Environment map[string]string 35 35 - Name string 36 36 - Image string 37 37 - } 38 38 - 39 39 - // setupSteps get added to start of Steps 40 40 - type setupSteps []Step 41 41 - 42 42 - // addStep adds a step to the beginning of the workflow's steps. 43 43 - func (ss *setupSteps) addStep(step Step) { 44 44 - *ss = append(*ss, step) 45 45 - } 46 46 - 47 47 - // ToPipeline converts a tangled.Pipeline into a model.Pipeline. 48 48 - // In the process, dependencies are resolved: nixpkgs deps 49 49 - // are constructed atop nixery and set as the Workflow.Image, 50 50 - // and ones from custom registries 51 51 - func ToPipeline(pl tangled.Pipeline, cfg config.Config) *Pipeline { 52 52 - workflows := []Workflow{} 53 53 - 54 54 - for _, twf := range pl.Workflows { 55 55 - swf := &Workflow{} 56 56 - for _, tstep := range twf.Steps { 57 57 - sstep := Step{} 58 58 - sstep.Environment = stepEnvToMap(tstep.Environment) 59 59 - sstep.Command = tstep.Command 60 60 - sstep.Name = tstep.Name 61 61 - sstep.Kind = StepKindUser 62 62 - swf.Steps = append(swf.Steps, sstep) 63 63 - } 64 64 - swf.Name = twf.Name 65 65 - swf.Environment = workflowEnvToMap(twf.Environment) 66 66 - swf.Image = workflowImage(twf.Dependencies, cfg.Pipelines.Nixery) 67 67 - 68 68 - setup := &setupSteps{} 69 69 - 70 70 - setup.addStep(nixConfStep()) 71 71 - setup.addStep(cloneStep(*twf, *pl.TriggerMetadata, cfg.Server.Dev)) 72 72 - // this step could be empty 73 73 - if s := dependencyStep(*twf); s != nil { 74 74 - setup.addStep(*s) 75 75 - } 76 76 - 77 77 - // append setup steps in order to the start of workflow steps 78 78 - swf.Steps = append(*setup, swf.Steps...) 79 79 - 80 80 - workflows = append(workflows, *swf) 81 81 - } 82 82 - repoOwner := pl.TriggerMetadata.Repo.Did 83 83 - repoName := pl.TriggerMetadata.Repo.Repo 84 84 - return &Pipeline{ 85 85 - RepoOwner: repoOwner, 86 86 - RepoName: repoName, 87 87 - Workflows: workflows, 88 88 - } 89 89 - } 90 90 - 91 91 - func workflowEnvToMap(envs []*tangled.Pipeline_Pair) map[string]string { 92 92 - envMap := map[string]string{} 93 93 - for _, env := range envs { 94 94 - if env != nil { 95 95 - envMap[env.Key] = env.Value 96 96 - } 97 97 - } 98 98 - return envMap 99 99 - } 100 100 - 101 101 - func stepEnvToMap(envs []*tangled.Pipeline_Pair) map[string]string { 102 102 - envMap := map[string]string{} 103 103 - for _, env := range envs { 104 104 - if env != nil { 105 105 - envMap[env.Key] = env.Value 106 106 - } 107 107 - } 108 108 - return envMap 109 109 - } 110 110 - 111 111 - func workflowImage(deps []*tangled.Pipeline_Dependency, nixery string) string { 112 112 - var dependencies string 113 113 - for _, d := range deps { 114 114 - if d.Registry == "nixpkgs" { 115 115 - dependencies = path.Join(d.Packages...) 116 116 - } 117 117 - } 118 118 - 119 119 - // load defaults from somewhere else 120 120 - dependencies = path.Join(dependencies, "bash", "git", "coreutils", "nix") 121 121 - 122 122 - return path.Join(nixery, dependencies) 25 25 + Steps []Step 26 26 + Name string 27 27 + Data any 123 28 }

+1 -86

workflow/def_test.go

··· 10 10 yamlData := ` 11 11 when: 12 12 - event: ["push", "pull_request"] 13 13 - branch: ["main", "develop"] 14 14 - 15 15 - dependencies: 16 16 - nixpkgs: 17 17 - - go 18 18 - - git 19 19 - - curl 20 20 - 21 21 - steps: 22 22 - - name: "Test" 23 23 - command: | 24 24 - go test ./...` 13 13 + branch: ["main", "develop"]` 25 14 26 15 wf, err := FromFile("test.yml", []byte(yamlData)) 27 16 assert.NoError(t, err, "YAML should unmarshal without error") ··· 30 19 assert.ElementsMatch(t, []string{"main", "develop"}, wf.When[0].Branch) 31 20 assert.ElementsMatch(t, []string{"push", "pull_request"}, wf.When[0].Event) 32 21 33 33 - assert.Len(t, wf.Steps, 1) 34 34 - assert.Equal(t, "Test", wf.Steps[0].Name) 35 35 - assert.Equal(t, "go test ./...", wf.Steps[0].Command) 36 36 - 37 37 - pkgs, ok := wf.Dependencies["nixpkgs"] 38 38 - assert.True(t, ok, "`nixpkgs` should be present in dependencies") 39 39 - assert.ElementsMatch(t, []string{"go", "git", "curl"}, pkgs) 40 40 - 41 22 assert.False(t, wf.CloneOpts.Skip, "Skip should default to false") 42 23 } 43 24 44 44 - func TestUnmarshalCustomRegistry(t *testing.T) { 45 45 - yamlData := ` 46 46 - when: 47 47 - - event: push 48 48 - branch: main 49 49 - 50 50 - dependencies: 51 51 - git+https://tangled.sh/@oppi.li/tbsp: 52 52 - - tbsp 53 53 - git+https://git.peppe.rs/languages/statix: 54 54 - - statix 55 55 - 56 56 - steps: 57 57 - - name: "Check" 58 58 - command: | 59 59 - statix check` 60 60 - 61 61 - wf, err := FromFile("test.yml", []byte(yamlData)) 62 62 - assert.NoError(t, err, "YAML should unmarshal without error") 63 63 - 64 64 - assert.ElementsMatch(t, []string{"push"}, wf.When[0].Event) 65 65 - assert.ElementsMatch(t, []string{"main"}, wf.When[0].Branch) 66 66 - 67 67 - assert.ElementsMatch(t, []string{"tbsp"}, wf.Dependencies["git+https://tangled.sh/@oppi.li/tbsp"]) 68 68 - assert.ElementsMatch(t, []string{"statix"}, wf.Dependencies["git+https://git.peppe.rs/languages/statix"]) 69 69 - } 70 70 - 71 25 func TestUnmarshalCloneFalse(t *testing.T) { 72 26 yamlData := ` 73 27 when: ··· 75 29 76 30 clone: 77 31 skip: true 78 78 - 79 79 - dependencies: 80 80 - nixpkgs: 81 81 - - python3 82 82 - 83 83 - steps: 84 84 - - name: Notify 85 85 - command: | 86 86 - python3 ./notify.py 87 32 ` 88 33 89 34 wf, err := FromFile("test.yml", []byte(yamlData)) ··· 93 38 94 39 assert.True(t, wf.CloneOpts.Skip, "Skip should be false") 95 40 } 96 96 - 97 97 - func TestUnmarshalEnv(t *testing.T) { 98 98 - yamlData := ` 99 99 - when: 100 100 - - event: ["pull_request_close"] 101 101 - 102 102 - clone: 103 103 - skip: false 104 104 - 105 105 - environment: 106 106 - HOME: /home/foo bar/baz 107 107 - CGO_ENABLED: 1 108 108 - 109 109 - steps: 110 110 - - name: Something 111 111 - command: echo "hello" 112 112 - environment: 113 113 - FOO: bar 114 114 - BAZ: qux 115 115 - ` 116 116 - 117 117 - wf, err := FromFile("test.yml", []byte(yamlData)) 118 118 - assert.NoError(t, err) 119 119 - 120 120 - assert.Len(t, wf.Environment, 2) 121 121 - assert.Equal(t, "/home/foo bar/baz", wf.Environment["HOME"]) 122 122 - assert.Equal(t, "1", wf.Environment["CGO_ENABLED"]) 123 123 - assert.Equal(t, "bar", wf.Steps[0].Environment["FOO"]) 124 124 - assert.Equal(t, "qux", wf.Steps[0].Environment["BAZ"]) 125 125 - }

+1 -1

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

··· 1 1 {{ define "repo/fragments/repoDescription" }} 2 2 <span id="repo-description" class="flex flex-wrap items-center gap-2 text-sm" hx-target="this" hx-swap="outerHTML"> 3 3 {{ if .RepoInfo.Description }} 4 4 - {{ .RepoInfo.Description }} 4 4 + {{ .RepoInfo.Description | description }} 5 5 {{ else }} 6 6 <span class="italic">this repo has no description</span> 7 7 {{ end }}

+4 -8

knotserver/git/fork.go

··· 10 10 ) 11 11 12 12 func Fork(repoPath, source string) error { 13 13 - _, err := git.PlainClone(repoPath, true, &git.CloneOptions{ 14 14 - URL: source, 15 15 - SingleBranch: false, 16 16 - }) 17 17 - 18 18 - if err != nil { 13 13 + cloneCmd := exec.Command("git", "clone", "--bare", source, repoPath) 14 14 + if err := cloneCmd.Run(); err != nil { 19 15 return fmt.Errorf("failed to bare clone repository: %w", err) 20 16 } 21 17 22 22 - err = exec.Command("git", "-C", repoPath, "config", "receive.hideRefs", "refs/hidden").Run() 23 23 - if err != nil { 18 18 + configureCmd := exec.Command("git", "-C", repoPath, "config", "receive.hideRefs", "refs/hidden") 19 19 + if err := configureCmd.Run(); err != nil { 24 20 return fmt.Errorf("failed to configure hidden refs: %w", err) 25 21 } 26 22

+1 -1

appview/pages/templates/strings/fragments/form.html

··· 13 13 type="text" 14 14 id="filename" 15 15 name="filename" 16 16 - placeholder="Filename with extension" 16 16 + placeholder="Filename" 17 17 required 18 18 value="{{ .String.Filename }}" 19 19 class="md:max-w-64 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 px-3 py-2 border rounded"

-192

appview/pages/templates/settings.html

··· 1 1 - {{ define "title" }}settings{{ end }} 2 2 - 3 3 - {{ define "content" }} 4 4 - <div class="p-6"> 5 5 - <p class="text-xl font-bold dark:text-white">Settings</p> 6 6 - </div> 7 7 - <div class="flex flex-col"> 8 8 - {{ block "profile" . }} {{ end }} 9 9 - {{ block "keys" . }} {{ end }} 10 10 - {{ block "emails" . }} {{ end }} 11 11 - </div> 12 12 - {{ end }} 13 13 - 14 14 - {{ define "profile" }} 15 15 - <h2 class="text-sm font-bold py-2 px-6 uppercase dark:text-gray-300">profile</h2> 16 16 - <section class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit"> 17 17 - <dl class="grid grid-cols-[auto_1fr] gap-x-4 dark:text-gray-200"> 18 18 - {{ if .LoggedInUser.Handle }} 19 19 - <dt class="font-bold">handle</dt> 20 20 - <dd>@{{ .LoggedInUser.Handle }}</dd> 21 21 - {{ end }} 22 22 - <dt class="font-bold">did</dt> 23 23 - <dd>{{ .LoggedInUser.Did }}</dd> 24 24 - <dt class="font-bold">pds</dt> 25 25 - <dd>{{ .LoggedInUser.Pds }}</dd> 26 26 - </dl> 27 27 - </section> 28 28 - {{ end }} 29 29 - 30 30 - {{ define "keys" }} 31 31 - <h2 class="text-sm font-bold py-2 px-6 uppercase dark:text-gray-300">ssh keys</h2> 32 32 - <section class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit"> 33 33 - <p class="mb-8 dark:text-gray-300">SSH public keys added here will be broadcasted to knots that you are a member of, <br> allowing you to push to repositories there.</p> 34 34 - <div id="key-list" class="flex flex-col gap-6 mb-8"> 35 35 - {{ range $index, $key := .PubKeys }} 36 36 - <div class="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-4"> 37 37 - <div class="flex flex-col gap-1"> 38 38 - <div class="inline-flex items-center gap-4"> 39 39 - {{ i "key" "w-3 h-3 dark:text-gray-300" }} 40 40 - <p class="font-bold dark:text-white">{{ .Name }}</p> 41 41 - </div> 42 42 - <p class="text-sm text-gray-500 dark:text-gray-400">added {{ template "repo/fragments/time" .Created }}</p> 43 43 - <div class="overflow-x-auto whitespace-nowrap flex-1 max-w-full"> 44 44 - <code class="text-sm text-gray-500 dark:text-gray-400">{{ .Key }}</code> 45 45 - </div> 46 46 - </div> 47 47 - <button 48 48 - class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group" 49 49 - title="Delete key" 50 50 - hx-delete="/settings/keys?name={{urlquery .Name}}&rkey={{urlquery .Rkey}}&key={{urlquery .Key}}" 51 51 - hx-confirm="Are you sure you want to delete the key '{{ .Name }}'?" 52 52 - > 53 53 - {{ i "trash-2" "w-5 h-5" }} 54 54 - <span class="hidden md:inline">delete</span> 55 55 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 56 56 - </button> 57 57 - </div> 58 58 - {{ end }} 59 59 - </div> 60 60 - <form 61 61 - hx-put="/settings/keys" 62 62 - hx-indicator="#add-sshkey-spinner" 63 63 - hx-swap="none" 64 64 - class="max-w-2xl mb-8 space-y-4" 65 65 - > 66 66 - <input 67 67 - type="text" 68 68 - id="name" 69 69 - name="name" 70 70 - placeholder="key name" 71 71 - required 72 72 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400"/> 73 73 - 74 74 - <input 75 75 - id="key" 76 76 - name="key" 77 77 - placeholder="ssh-rsa AAAAAA..." 78 78 - required 79 79 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400"/> 80 80 - 81 81 - <button class="btn dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600 flex gap-2 items-center" type="submit"> 82 82 - <span>add key</span> 83 83 - <span id="add-sshkey-spinner" class="group"> 84 84 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 85 85 - </span> 86 86 - </button> 87 87 - 88 88 - <div id="settings-keys" class="error dark:text-red-400"></div> 89 89 - </form> 90 90 - </section> 91 91 - {{ end }} 92 92 - 93 93 - {{ define "emails" }} 94 94 - <h2 class="text-sm font-bold py-2 px-6 uppercase dark:text-gray-300">email addresses</h2> 95 95 - <section class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit"> 96 96 - <p class="mb-8 dark:text-gray-300">Commits authored using emails listed here will be associated with your Tangled profile.</p> 97 97 - <div id="email-list" class="flex flex-col gap-6 mb-8"> 98 98 - {{ range $index, $email := .Emails }} 99 99 - <div class="grid grid-cols-[minmax(0,1fr)_auto] items-center gap-4"> 100 100 - <div class="flex flex-col gap-2"> 101 101 - <div class="inline-flex items-center gap-4"> 102 102 - {{ i "mail" "w-3 h-3 dark:text-gray-300" }} 103 103 - <p class="font-bold dark:text-white">{{ .Address }}</p> 104 104 - <div class="inline-flex items-center gap-1"> 105 105 - {{ if .Verified }} 106 106 - <span class="text-xs bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 px-2 py-1 rounded">verified</span> 107 107 - {{ else }} 108 108 - <span class="text-xs bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 px-2 py-1 rounded">unverified</span> 109 109 - {{ end }} 110 110 - {{ if .Primary }} 111 111 - <span class="text-xs bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-200 px-2 py-1 rounded">primary</span> 112 112 - {{ end }} 113 113 - </div> 114 114 - </div> 115 115 - <p class="text-sm text-gray-500 dark:text-gray-400">added {{ template "repo/fragments/time" .CreatedAt }}</p> 116 116 - </div> 117 117 - <div class="flex gap-2 items-center"> 118 118 - {{ if not .Verified }} 119 119 - <button 120 120 - class="btn flex gap-2 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600" 121 121 - hx-post="/settings/emails/verify/resend" 122 122 - hx-swap="none" 123 123 - href="#" 124 124 - hx-vals='{"email": "{{ .Address }}"}'> 125 125 - {{ i "rotate-cw" "w-5 h-5" }} 126 126 - <span class="hidden md:inline">resend</span> 127 127 - </button> 128 128 - {{ end }} 129 129 - {{ if and (not .Primary) .Verified }} 130 130 - <a 131 131 - class="text-sm dark:text-blue-400 dark:hover:text-blue-300" 132 132 - hx-post="/settings/emails/primary" 133 133 - hx-swap="none" 134 134 - href="#" 135 135 - hx-vals='{"email": "{{ .Address }}"}'> 136 136 - set as primary 137 137 - </a> 138 138 - {{ end }} 139 139 - {{ if not .Primary }} 140 140 - <form 141 141 - hx-delete="/settings/emails" 142 142 - hx-confirm="Are you sure you wish to delete the email '{{ .Address }}'?" 143 143 - hx-indicator="#delete-email-{{ $index }}-spinner" 144 144 - > 145 145 - <input type="hidden" name="email" value="{{ .Address }}"> 146 146 - <button 147 147 - class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 flex gap-2 items-center" 148 148 - title="Delete email" 149 149 - type="submit" 150 150 - > 151 151 - {{ i "trash-2" "w-5 h-5" }} 152 152 - <span class="hidden md:inline">delete</span> 153 153 - <span id="delete-email-{{ $index }}-spinner" class="group"> 154 154 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 155 155 - </span> 156 156 - </button> 157 157 - </form> 158 158 - {{ end }} 159 159 - </div> 160 160 - </div> 161 161 - {{ end }} 162 162 - </div> 163 163 - <form 164 164 - hx-put="/settings/emails" 165 165 - hx-swap="none" 166 166 - class="max-w-2xl mb-8 space-y-4" 167 167 - hx-indicator="#add-email-spinner" 168 168 - > 169 169 - <input 170 170 - type="email" 171 171 - id="email" 172 172 - name="email" 173 173 - placeholder="your@email.com" 174 174 - required 175 175 - class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400" 176 176 - > 177 177 - 178 178 - <button 179 179 - class="btn dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600 flex gap-2 items-center" 180 180 - type="submit" 181 181 - > 182 182 - <span>add email</span> 183 183 - <span id="add-email-spinner" class="group"> 184 184 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 185 185 - </span> 186 186 - </button> 187 187 - 188 188 - <div id="settings-emails-error" class="error dark:text-red-400"></div> 189 189 - <div id="settings-emails-success" class="success dark:text-green-400"></div> 190 190 - </form> 191 191 - </section> 192 192 - {{ end }}

+62

appview/pages/templates/user/settings/fragments/emailListing.html

··· 1 1 + {{ define "user/settings/fragments/emailListing" }} 2 2 + {{ $root := index . 0 }} 3 3 + {{ $email := index . 1 }} 4 4 + <div id="email-{{$email.Address}}" class="flex items-center justify-between p-2"> 5 5 + <div class="hover:no-underline flex flex-col gap-1 min-w-0 max-w-[80%]"> 6 6 + <div class="flex items-center gap-2"> 7 7 + {{ i "mail" "w-4 h-4 text-gray-500 dark:text-gray-400" }} 8 8 + <span class="font-bold"> 9 9 + {{ $email.Address }} 10 10 + </span> 11 11 + <div class="inline-flex items-center gap-1"> 12 12 + {{ if $email.Verified }} 13 13 + <span class="text-xs bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 px-2 py-1 rounded">verified</span> 14 14 + {{ else }} 15 15 + <span class="text-xs bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 px-2 py-1 rounded">unverified</span> 16 16 + {{ end }} 17 17 + {{ if $email.Primary }} 18 18 + <span class="text-xs bg-blue-100 text-blue-800 dark:bg-blue-900 dark:text-blue-200 px-2 py-1 rounded">primary</span> 19 19 + {{ end }} 20 20 + </div> 21 21 + </div> 22 22 + <div class="flex text-sm flex-wrap text items-center gap-1 text-gray-500 dark:text-gray-400"> 23 23 + <span>added {{ template "repo/fragments/time" $email.CreatedAt }}</span> 24 24 + </div> 25 25 + </div> 26 26 + <div class="flex gap-2 items-center"> 27 27 + {{ if not $email.Verified }} 28 28 + <button 29 29 + class="btn flex gap-2 text-sm px-2 py-1" 30 30 + hx-post="/settings/emails/verify/resend" 31 31 + hx-swap="none" 32 32 + hx-vals='{"email": "{{ $email.Address }}"}'> 33 33 + {{ i "rotate-cw" "w-4 h-4" }} 34 34 + <span class="hidden md:inline">resend</span> 35 35 + </button> 36 36 + {{ end }} 37 37 + {{ if and (not $email.Primary) $email.Verified }} 38 38 + <button 39 39 + class="btn text-sm px-2 py-1 text-blue-500 hover:text-blue-700 dark:text-blue-400 dark:hover:text-blue-300" 40 40 + hx-post="/settings/emails/primary" 41 41 + hx-swap="none" 42 42 + hx-vals='{"email": "{{ $email.Address }}"}'> 43 43 + set as primary 44 44 + </button> 45 45 + {{ end }} 46 46 + {{ if not $email.Primary }} 47 47 + <button 48 48 + class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group" 49 49 + title="Delete email" 50 50 + hx-delete="/settings/emails" 51 51 + hx-swap="none" 52 52 + hx-vals='{"email": "{{ $email.Address }}"}' 53 53 + hx-confirm="Are you sure you want to delete the email {{ $email.Address }}?" 54 54 + > 55 55 + {{ i "trash-2" "w-5 h-5" }} 56 56 + <span class="hidden md:inline">delete</span> 57 57 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 58 58 + </button> 59 59 + {{ end }} 60 60 + </div> 61 61 + </div> 62 62 + {{ end }}

+31

appview/pages/templates/user/settings/fragments/keyListing.html

··· 1 1 + {{ define "user/settings/fragments/keyListing" }} 2 2 + {{ $root := index . 0 }} 3 3 + {{ $key := index . 1 }} 4 4 + <div id="key-{{$key.Name}}" class="flex items-center justify-between p-2"> 5 5 + <div class="hover:no-underline flex flex-col gap-1 text min-w-0 max-w-[80%]"> 6 6 + <div class="flex items-center gap-2"> 7 7 + <span>{{ i "key" "w-4" "h-4" }}</span> 8 8 + <span class="font-bold"> 9 9 + {{ $key.Name }} 10 10 + </span> 11 11 + </div> 12 12 + <span class="font-mono text-sm text-gray-500 dark:text-gray-400"> 13 13 + {{ sshFingerprint $key.Key }} 14 14 + </span> 15 15 + <div class="flex flex-wrap text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 16 16 + <span>added {{ template "repo/fragments/time" $key.Created }}</span> 17 17 + </div> 18 18 + </div> 19 19 + <button 20 20 + class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group" 21 21 + title="Delete key" 22 22 + hx-delete="/settings/keys?name={{urlquery $key.Name}}&rkey={{urlquery $key.Rkey}}&key={{urlquery $key.Key}}" 23 23 + hx-swap="none" 24 24 + hx-confirm="Are you sure you want to delete the key {{ $key.Name }}?" 25 25 + > 26 26 + {{ i "trash-2" "w-5 h-5" }} 27 27 + <span class="hidden md:inline">delete</span> 28 28 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 29 29 + </button> 30 30 + </div> 31 31 + {{ end }}

+16

appview/pages/templates/user/settings/fragments/sidebar.html

··· 1 1 + {{ define "user/settings/fragments/sidebar" }} 2 2 + {{ $active := .Tab }} 3 3 + {{ $tabs := .Tabs }} 4 4 + <div class="sticky top-2 grid grid-cols-1 rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 shadow-inner"> 5 5 + {{ $activeTab := "bg-white dark:bg-gray-700 drop-shadow-sm" }} 6 6 + {{ $inactiveTab := "bg-gray-100 dark:bg-gray-800" }} 7 7 + {{ range $tabs }} 8 8 + <a href="/settings/{{.Name}}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 9 9 + <div class="flex gap-3 items-center p-2 {{ if eq .Name $active }} {{ $activeTab }} {{ else }} {{ $inactiveTab }} {{ end }}"> 10 10 + {{ i .Icon "size-4" }} 11 11 + {{ .Name }} 12 12 + </div> 13 13 + </a> 14 14 + {{ end }} 15 15 + </div> 16 16 + {{ end }}

+34

api/tangled/repocreate.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.create 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoCreateNSID = "sh.tangled.repo.create" 15 15 + ) 16 16 + 17 17 + // RepoCreate_Input is the input argument to a sh.tangled.repo.create call. 18 18 + type RepoCreate_Input struct { 19 19 + // defaultBranch: Default branch to push to 20 20 + DefaultBranch *string `json:"defaultBranch,omitempty" cborgen:"defaultBranch,omitempty"` 21 21 + // rkey: Rkey of the repository record 22 22 + Rkey string `json:"rkey" cborgen:"rkey"` 23 23 + // source: A source URL to clone from, populate this when forking or importing a repository. 24 24 + Source *string `json:"source,omitempty" cborgen:"source,omitempty"` 25 25 + } 26 26 + 27 27 + // RepoCreate calls the XRPC method "sh.tangled.repo.create". 28 28 + func RepoCreate(ctx context.Context, c util.LexClient, input *RepoCreate_Input) error { 29 29 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.create", nil, input, nil); err != nil { 30 30 + return err 31 31 + } 32 32 + 33 33 + return nil 34 34 + }

+45

api/tangled/repoforkStatus.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.forkStatus 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoForkStatusNSID = "sh.tangled.repo.forkStatus" 15 15 + ) 16 16 + 17 17 + // RepoForkStatus_Input is the input argument to a sh.tangled.repo.forkStatus call. 18 18 + type RepoForkStatus_Input struct { 19 19 + // branch: Branch to check status for 20 20 + Branch string `json:"branch" cborgen:"branch"` 21 21 + // did: DID of the fork owner 22 22 + Did string `json:"did" cborgen:"did"` 23 23 + // hiddenRef: Hidden ref to use for comparison 24 24 + HiddenRef string `json:"hiddenRef" cborgen:"hiddenRef"` 25 25 + // name: Name of the forked repository 26 26 + Name string `json:"name" cborgen:"name"` 27 27 + // source: Source repository URL 28 28 + Source string `json:"source" cborgen:"source"` 29 29 + } 30 30 + 31 31 + // RepoForkStatus_Output is the output of a sh.tangled.repo.forkStatus call. 32 32 + type RepoForkStatus_Output struct { 33 33 + // status: Fork status: 0=UpToDate, 1=FastForwardable, 2=Conflict, 3=MissingBranch 34 34 + Status int64 `json:"status" cborgen:"status"` 35 35 + } 36 36 + 37 37 + // RepoForkStatus calls the XRPC method "sh.tangled.repo.forkStatus". 38 38 + func RepoForkStatus(ctx context.Context, c util.LexClient, input *RepoForkStatus_Input) (*RepoForkStatus_Output, error) { 39 39 + var out RepoForkStatus_Output 40 40 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.forkStatus", nil, input, &out); err != nil { 41 41 + return nil, err 42 42 + } 43 43 + 44 44 + return &out, nil 45 45 + }

+36

api/tangled/repoforkSync.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.forkSync 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoForkSyncNSID = "sh.tangled.repo.forkSync" 15 15 + ) 16 16 + 17 17 + // RepoForkSync_Input is the input argument to a sh.tangled.repo.forkSync call. 18 18 + type RepoForkSync_Input struct { 19 19 + // branch: Branch to sync 20 20 + Branch string `json:"branch" cborgen:"branch"` 21 21 + // did: DID of the fork owner 22 22 + Did string `json:"did" cborgen:"did"` 23 23 + // name: Name of the forked repository 24 24 + Name string `json:"name" cborgen:"name"` 25 25 + // source: AT-URI of the source repository 26 26 + Source string `json:"source" cborgen:"source"` 27 27 + } 28 28 + 29 29 + // RepoForkSync calls the XRPC method "sh.tangled.repo.forkSync". 30 30 + func RepoForkSync(ctx context.Context, c util.LexClient, input *RepoForkSync_Input) error { 31 31 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.forkSync", nil, input, nil); err != nil { 32 32 + return err 33 33 + } 34 34 + 35 35 + return nil 36 36 + }

+45

api/tangled/repohiddenRef.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.hiddenRef 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoHiddenRefNSID = "sh.tangled.repo.hiddenRef" 15 15 + ) 16 16 + 17 17 + // RepoHiddenRef_Input is the input argument to a sh.tangled.repo.hiddenRef call. 18 18 + type RepoHiddenRef_Input struct { 19 19 + // forkRef: Fork reference name 20 20 + ForkRef string `json:"forkRef" cborgen:"forkRef"` 21 21 + // remoteRef: Remote reference name 22 22 + RemoteRef string `json:"remoteRef" cborgen:"remoteRef"` 23 23 + // repo: AT-URI of the repository 24 24 + Repo string `json:"repo" cborgen:"repo"` 25 25 + } 26 26 + 27 27 + // RepoHiddenRef_Output is the output of a sh.tangled.repo.hiddenRef call. 28 28 + type RepoHiddenRef_Output struct { 29 29 + // error: Error message if creation failed 30 30 + Error *string `json:"error,omitempty" cborgen:"error,omitempty"` 31 31 + // ref: The created hidden ref name 32 32 + Ref *string `json:"ref,omitempty" cborgen:"ref,omitempty"` 33 33 + // success: Whether the hidden ref was created successfully 34 34 + Success bool `json:"success" cborgen:"success"` 35 35 + } 36 36 + 37 37 + // RepoHiddenRef calls the XRPC method "sh.tangled.repo.hiddenRef". 38 38 + func RepoHiddenRef(ctx context.Context, c util.LexClient, input *RepoHiddenRef_Input) (*RepoHiddenRef_Output, error) { 39 39 + var out RepoHiddenRef_Output 40 40 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.hiddenRef", nil, input, &out); err != nil { 41 41 + return nil, err 42 42 + } 43 43 + 44 44 + return &out, nil 45 45 + }

+44

api/tangled/repomerge.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.merge 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoMergeNSID = "sh.tangled.repo.merge" 15 15 + ) 16 16 + 17 17 + // RepoMerge_Input is the input argument to a sh.tangled.repo.merge call. 18 18 + type RepoMerge_Input struct { 19 19 + // authorEmail: Author email for the merge commit 20 20 + AuthorEmail *string `json:"authorEmail,omitempty" cborgen:"authorEmail,omitempty"` 21 21 + // authorName: Author name for the merge commit 22 22 + AuthorName *string `json:"authorName,omitempty" cborgen:"authorName,omitempty"` 23 23 + // branch: Target branch to merge into 24 24 + Branch string `json:"branch" cborgen:"branch"` 25 25 + // commitBody: Additional commit message body 26 26 + CommitBody *string `json:"commitBody,omitempty" cborgen:"commitBody,omitempty"` 27 27 + // commitMessage: Merge commit message 28 28 + CommitMessage *string `json:"commitMessage,omitempty" cborgen:"commitMessage,omitempty"` 29 29 + // did: DID of the repository owner 30 30 + Did string `json:"did" cborgen:"did"` 31 31 + // name: Name of the repository 32 32 + Name string `json:"name" cborgen:"name"` 33 33 + // patch: Patch content to merge 34 34 + Patch string `json:"patch" cborgen:"patch"` 35 35 + } 36 36 + 37 37 + // RepoMerge calls the XRPC method "sh.tangled.repo.merge". 38 38 + func RepoMerge(ctx context.Context, c util.LexClient, input *RepoMerge_Input) error { 39 39 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.merge", nil, input, nil); err != nil { 40 40 + return err 41 41 + } 42 42 + 43 43 + return nil 44 44 + }

+57

api/tangled/repomergeCheck.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.mergeCheck 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoMergeCheckNSID = "sh.tangled.repo.mergeCheck" 15 15 + ) 16 16 + 17 17 + // RepoMergeCheck_ConflictInfo is a "conflictInfo" in the sh.tangled.repo.mergeCheck schema. 18 18 + type RepoMergeCheck_ConflictInfo struct { 19 19 + // filename: Name of the conflicted file 20 20 + Filename string `json:"filename" cborgen:"filename"` 21 21 + // reason: Reason for the conflict 22 22 + Reason string `json:"reason" cborgen:"reason"` 23 23 + } 24 24 + 25 25 + // RepoMergeCheck_Input is the input argument to a sh.tangled.repo.mergeCheck call. 26 26 + type RepoMergeCheck_Input struct { 27 27 + // branch: Target branch to merge into 28 28 + Branch string `json:"branch" cborgen:"branch"` 29 29 + // did: DID of the repository owner 30 30 + Did string `json:"did" cborgen:"did"` 31 31 + // name: Name of the repository 32 32 + Name string `json:"name" cborgen:"name"` 33 33 + // patch: Patch or pull request to check for merge conflicts 34 34 + Patch string `json:"patch" cborgen:"patch"` 35 35 + } 36 36 + 37 37 + // RepoMergeCheck_Output is the output of a sh.tangled.repo.mergeCheck call. 38 38 + type RepoMergeCheck_Output struct { 39 39 + // conflicts: List of files with merge conflicts 40 40 + Conflicts []*RepoMergeCheck_ConflictInfo `json:"conflicts,omitempty" cborgen:"conflicts,omitempty"` 41 41 + // error: Error message if check failed 42 42 + Error *string `json:"error,omitempty" cborgen:"error,omitempty"` 43 43 + // is_conflicted: Whether the merge has conflicts 44 44 + Is_conflicted bool `json:"is_conflicted" cborgen:"is_conflicted"` 45 45 + // message: Additional message about the merge check 46 46 + Message *string `json:"message,omitempty" cborgen:"message,omitempty"` 47 47 + } 48 48 + 49 49 + // RepoMergeCheck calls the XRPC method "sh.tangled.repo.mergeCheck". 50 50 + func RepoMergeCheck(ctx context.Context, c util.LexClient, input *RepoMergeCheck_Input) (*RepoMergeCheck_Output, error) { 51 51 + var out RepoMergeCheck_Output 52 52 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.mergeCheck", nil, input, &out); err != nil { 53 53 + return nil, err 54 54 + } 55 55 + 56 56 + return &out, nil 57 57 + }

+24

lexicons/knot/knot.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.knot", 4 4 + "needsCbor": true, 5 5 + "needsType": true, 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "key": "any", 10 10 + "record": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "createdAt" 14 14 + ], 15 15 + "properties": { 16 16 + "createdAt": { 17 17 + "type": "string", 18 18 + "format": "datetime" 19 19 + } 20 20 + } 21 21 + } 22 22 + } 23 23 + } 24 24 + }

+33

lexicons/repo/create.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.create", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Create a new repository", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "rkey" 14 14 + ], 15 15 + "properties": { 16 16 + "rkey": { 17 17 + "type": "string", 18 18 + "description": "Rkey of the repository record" 19 19 + }, 20 20 + "defaultBranch": { 21 21 + "type": "string", 22 22 + "description": "Default branch to push to" 23 23 + }, 24 24 + "source": { 25 25 + "type": "string", 26 26 + "description": "A source URL to clone from, populate this when forking or importing a repository." 27 27 + } 28 28 + } 29 29 + } 30 30 + } 31 31 + } 32 32 + } 33 33 + }

+53

lexicons/repo/forkStatus.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.forkStatus", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Check fork status relative to upstream source", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": ["did", "name", "source", "branch", "hiddenRef"], 13 13 + "properties": { 14 14 + "did": { 15 15 + "type": "string", 16 16 + "format": "did", 17 17 + "description": "DID of the fork owner" 18 18 + }, 19 19 + "name": { 20 20 + "type": "string", 21 21 + "description": "Name of the forked repository" 22 22 + }, 23 23 + "source": { 24 24 + "type": "string", 25 25 + "description": "Source repository URL" 26 26 + }, 27 27 + "branch": { 28 28 + "type": "string", 29 29 + "description": "Branch to check status for" 30 30 + }, 31 31 + "hiddenRef": { 32 32 + "type": "string", 33 33 + "description": "Hidden ref to use for comparison" 34 34 + } 35 35 + } 36 36 + } 37 37 + }, 38 38 + "output": { 39 39 + "encoding": "application/json", 40 40 + "schema": { 41 41 + "type": "object", 42 42 + "required": ["status"], 43 43 + "properties": { 44 44 + "status": { 45 45 + "type": "integer", 46 46 + "description": "Fork status: 0=UpToDate, 1=FastForwardable, 2=Conflict, 3=MissingBranch" 47 47 + } 48 48 + } 49 49 + } 50 50 + } 51 51 + } 52 52 + } 53 53 + }

+42

lexicons/repo/forkSync.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.forkSync", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Sync a forked repository with its upstream source", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "did", 14 14 + "source", 15 15 + "name", 16 16 + "branch" 17 17 + ], 18 18 + "properties": { 19 19 + "did": { 20 20 + "type": "string", 21 21 + "format": "did", 22 22 + "description": "DID of the fork owner" 23 23 + }, 24 24 + "source": { 25 25 + "type": "string", 26 26 + "format": "at-uri", 27 27 + "description": "AT-URI of the source repository" 28 28 + }, 29 29 + "name": { 30 30 + "type": "string", 31 31 + "description": "Name of the forked repository" 32 32 + }, 33 33 + "branch": { 34 34 + "type": "string", 35 35 + "description": "Branch to sync" 36 36 + } 37 37 + } 38 38 + } 39 39 + } 40 40 + } 41 41 + } 42 42 + }

+59

lexicons/repo/hiddenRef.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.hiddenRef", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Create a hidden ref in a repository", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "repo", 14 14 + "forkRef", 15 15 + "remoteRef" 16 16 + ], 17 17 + "properties": { 18 18 + "repo": { 19 19 + "type": "string", 20 20 + "format": "at-uri", 21 21 + "description": "AT-URI of the repository" 22 22 + }, 23 23 + "forkRef": { 24 24 + "type": "string", 25 25 + "description": "Fork reference name" 26 26 + }, 27 27 + "remoteRef": { 28 28 + "type": "string", 29 29 + "description": "Remote reference name" 30 30 + } 31 31 + } 32 32 + } 33 33 + }, 34 34 + "output": { 35 35 + "encoding": "application/json", 36 36 + "schema": { 37 37 + "type": "object", 38 38 + "required": [ 39 39 + "success" 40 40 + ], 41 41 + "properties": { 42 42 + "success": { 43 43 + "type": "boolean", 44 44 + "description": "Whether the hidden ref was created successfully" 45 45 + }, 46 46 + "ref": { 47 47 + "type": "string", 48 48 + "description": "The created hidden ref name" 49 49 + }, 50 50 + "error": { 51 51 + "type": "string", 52 52 + "description": "Error message if creation failed" 53 53 + } 54 54 + } 55 55 + } 56 56 + } 57 57 + } 58 58 + } 59 59 + }

+52

lexicons/repo/merge.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.merge", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Merge a patch into a repository branch", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": ["did", "name", "patch", "branch"], 13 13 + "properties": { 14 14 + "did": { 15 15 + "type": "string", 16 16 + "format": "did", 17 17 + "description": "DID of the repository owner" 18 18 + }, 19 19 + "name": { 20 20 + "type": "string", 21 21 + "description": "Name of the repository" 22 22 + }, 23 23 + "patch": { 24 24 + "type": "string", 25 25 + "description": "Patch content to merge" 26 26 + }, 27 27 + "branch": { 28 28 + "type": "string", 29 29 + "description": "Target branch to merge into" 30 30 + }, 31 31 + "authorName": { 32 32 + "type": "string", 33 33 + "description": "Author name for the merge commit" 34 34 + }, 35 35 + "authorEmail": { 36 36 + "type": "string", 37 37 + "description": "Author email for the merge commit" 38 38 + }, 39 39 + "commitBody": { 40 40 + "type": "string", 41 41 + "description": "Additional commit message body" 42 42 + }, 43 43 + "commitMessage": { 44 44 + "type": "string", 45 45 + "description": "Merge commit message" 46 46 + } 47 47 + } 48 48 + } 49 49 + } 50 50 + } 51 51 + } 52 52 + }

+79

lexicons/repo/mergeCheck.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.mergeCheck", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Check if a merge is possible between two branches", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": ["did", "name", "patch", "branch"], 13 13 + "properties": { 14 14 + "did": { 15 15 + "type": "string", 16 16 + "format": "did", 17 17 + "description": "DID of the repository owner" 18 18 + }, 19 19 + "name": { 20 20 + "type": "string", 21 21 + "description": "Name of the repository" 22 22 + }, 23 23 + "patch": { 24 24 + "type": "string", 25 25 + "description": "Patch or pull request to check for merge conflicts" 26 26 + }, 27 27 + "branch": { 28 28 + "type": "string", 29 29 + "description": "Target branch to merge into" 30 30 + } 31 31 + } 32 32 + } 33 33 + }, 34 34 + "output": { 35 35 + "encoding": "application/json", 36 36 + "schema": { 37 37 + "type": "object", 38 38 + "required": ["is_conflicted"], 39 39 + "properties": { 40 40 + "is_conflicted": { 41 41 + "type": "boolean", 42 42 + "description": "Whether the merge has conflicts" 43 43 + }, 44 44 + "conflicts": { 45 45 + "type": "array", 46 46 + "description": "List of files with merge conflicts", 47 47 + "items": { 48 48 + "type": "ref", 49 49 + "ref": "#conflictInfo" 50 50 + } 51 51 + }, 52 52 + "message": { 53 53 + "type": "string", 54 54 + "description": "Additional message about the merge check" 55 55 + }, 56 56 + "error": { 57 57 + "type": "string", 58 58 + "description": "Error message if check failed" 59 59 + } 60 60 + } 61 61 + } 62 62 + } 63 63 + }, 64 64 + "conflictInfo": { 65 65 + "type": "object", 66 66 + "required": ["filename", "reason"], 67 67 + "properties": { 68 68 + "filename": { 69 69 + "type": "string", 70 70 + "description": "Name of the conflicted file" 71 71 + }, 72 72 + "reason": { 73 73 + "type": "string", 74 74 + "description": "Reason for the conflict" 75 75 + } 76 76 + } 77 77 + } 78 78 + } 79 79 + }

+22

api/tangled/tangledknot.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.knot 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + KnotNSID = "sh.tangled.knot" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("sh.tangled.knot", &Knot{}) 17 17 + } // 18 18 + // RECORDTYPE: Knot 19 19 + type Knot struct { 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.knot" cborgen:"$type,const=sh.tangled.knot"` 21 21 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 22 22 + }

+93 -28

appview/pages/templates/knots/dashboard.html

··· 1 1 - {{ define "title" }}{{ .Registration.Domain }}{{ end }} 1 1 + {{ define "title" }}{{ .Registration.Domain }} &middot; knots{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <div class="px-6 py-4"> 5 5 - <div class="flex justify-between items-center"> 6 6 - <div id="left-side" class="flex gap-2 items-center"> 7 7 - <h1 class="text-xl font-bold dark:text-white"> 8 8 - {{ .Registration.Domain }} 9 9 - </h1> 10 10 - <span class="text-gray-500 text-base"> 11 11 - {{ template "repo/fragments/shortTimeAgo" .Registration.Created }} 12 12 - </span> 13 13 - </div> 14 14 - <div id="right-side" class="flex gap-2"> 15 15 - {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2" }} 16 16 - {{ if .Registration.Registered }} 17 17 - <span class="bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 {{$style}}">{{ i "shield-check" "w-4 h-4" }} verified</span> 4 4 + <div class="px-6 py-4"> 5 5 + <div class="flex justify-between items-center"> 6 6 + <h1 class="text-xl font-bold dark:text-white">{{ .Registration.Domain }}</h1> 7 7 + <div id="right-side" class="flex gap-2"> 8 8 + {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2" }} 9 9 + {{ $isOwner := and .LoggedInUser (eq .LoggedInUser.Did .Registration.ByDid) }} 10 10 + {{ if .Registration.IsRegistered }} 11 11 + <span class="bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 {{$style}}">{{ i "shield-check" "w-4 h-4" }} verified</span> 12 12 + {{ if $isOwner }} 18 13 {{ template "knots/fragments/addMemberModal" .Registration }} 19 19 - {{ else }} 20 20 - <span class="bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200 {{$style}}">{{ i "shield-off" "w-4 h-4" }} pending</span> 21 14 {{ end }} 22 22 - </div> 15 15 + {{ else if .Registration.IsReadOnly }} 16 16 + <span class="bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 {{$style}}"> 17 17 + {{ i "shield-alert" "w-4 h-4" }} read-only 18 18 + </span> 19 19 + {{ if $isOwner }} 20 20 + {{ block "retryButton" .Registration }} {{ end }} 21 21 + {{ end }} 22 22 + {{ else }} 23 23 + <span class="bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200 {{$style}}">{{ i "shield-off" "w-4 h-4" }} unverified</span> 24 24 + {{ if $isOwner }} 25 25 + {{ block "retryButton" .Registration }} {{ end }} 26 26 + {{ end }} 27 27 + {{ end }} 28 28 + 29 29 + {{ if $isOwner }} 30 30 + {{ block "deleteButton" .Registration }} {{ end }} 31 31 + {{ end }} 23 32 </div> 24 24 - <div id="operation-error" class="dark:text-red-400"></div> 25 33 </div> 34 34 + <div id="operation-error" class="dark:text-red-400"></div> 35 35 + </div> 26 36 27 27 - {{ if .Members }} 28 28 - <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 29 29 - <div class="flex flex-col gap-2"> 30 30 - {{ block "knotMember" . }} {{ end }} 31 31 - </div> 32 32 - </section> 33 33 - {{ end }} 37 37 + {{ if .Members }} 38 38 + <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 39 39 + <div class="flex flex-col gap-2"> 40 40 + {{ block "member" . }} {{ end }} 41 41 + </div> 42 42 + </section> 43 43 + {{ end }} 34 44 {{ end }} 35 45 36 36 - {{ define "knotMember" }} 46 46 + 47 47 + {{ define "member" }} 37 48 {{ range .Members }} 38 49 <div> 39 50 <div class="flex justify-between items-center"> ··· 41 52 {{ template "user/fragments/picHandleLink" . }} 42 53 <span class="ml-2 font-mono text-gray-500">{{.}}</span> 43 54 </div> 55 55 + {{ if ne $.LoggedInUser.Did . }} 56 56 + {{ block "removeMemberButton" (list $ . ) }} {{ end }} 57 57 + {{ end }} 44 58 </div> 45 59 <div class="ml-2 pl-2 pt-2 border-l border-gray-200 dark:border-gray-700"> 46 60 {{ $repos := index $.Repos . }} ··· 53 67 </div> 54 68 {{ else }} 55 69 <div class="text-gray-500 dark:text-gray-400"> 56 56 - No repositories created yet. 70 70 + No repositories configured yet. 57 71 </div> 58 72 {{ end }} 59 73 </div> 60 74 </div> 61 75 {{ end }} 62 76 {{ end }} 77 77 + 78 78 + {{ define "deleteButton" }} 79 79 + <button 80 80 + class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group" 81 81 + title="Delete knot" 82 82 + hx-delete="/knots/{{ .Domain }}" 83 83 + hx-swap="outerHTML" 84 84 + hx-confirm="Are you sure you want to delete the knot '{{ .Domain }}'?" 85 85 + hx-headers='{"shouldRedirect": "true"}' 86 86 + > 87 87 + {{ i "trash-2" "w-5 h-5" }} 88 88 + <span class="hidden md:inline">delete</span> 89 89 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 90 90 + </button> 91 91 + {{ end }} 92 92 + 93 93 + 94 94 + {{ define "retryButton" }} 95 95 + <button 96 96 + class="btn gap-2 group" 97 97 + title="Retry knot verification" 98 98 + hx-post="/knots/{{ .Domain }}/retry" 99 99 + hx-swap="none" 100 100 + hx-headers='{"shouldRefresh": "true"}' 101 101 + > 102 102 + {{ i "rotate-ccw" "w-5 h-5" }} 103 103 + <span class="hidden md:inline">retry</span> 104 104 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 105 105 + </button> 106 106 + {{ end }} 107 107 + 108 108 + 109 109 + {{ define "removeMemberButton" }} 110 110 + {{ $root := index . 0 }} 111 111 + {{ $member := index . 1 }} 112 112 + {{ $memberHandle := resolve $member }} 113 113 + <button 114 114 + class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group" 115 115 + title="Remove member" 116 116 + hx-post="/knots/{{ $root.Registration.Domain }}/remove" 117 117 + hx-swap="none" 118 118 + hx-vals='{"member": "{{$member}}" }' 119 119 + hx-confirm="Are you sure you want to remove {{ $memberHandle }} from this knot?" 120 120 + > 121 121 + {{ i "user-minus" "w-4 h-4" }} 122 122 + remove 123 123 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 124 124 + </button> 125 125 + {{ end }} 126 126 + 127 127 +

+6 -7

appview/pages/templates/knots/fragments/addMemberModal.html

··· 1 1 {{ define "knots/fragments/addMemberModal" }} 2 2 <button 3 3 class="btn gap-2 group" 4 4 - title="Add member to this spindle" 4 4 + title="Add member to this knot" 5 5 popovertarget="add-member-{{ .Id }}" 6 6 popovertargetaction="toggle" 7 7 > ··· 20 20 21 21 {{ define "addKnotMemberPopover" }} 22 22 <form 23 23 - hx-put="/knots/{{ .Domain }}/member" 23 23 + hx-post="/knots/{{ .Domain }}/add" 24 24 hx-indicator="#spinner" 25 25 hx-swap="none" 26 26 class="flex flex-col gap-2" ··· 28 28 <label for="member-did-{{ .Id }}" class="uppercase p-0"> 29 29 ADD MEMBER 30 30 </label> 31 31 - <p class="text-sm text-gray-500 dark:text-gray-400">Members can create repositories on this knot.</p> 31 31 + <p class="text-sm text-gray-500 dark:text-gray-400">Members can create repositories and run workflows on this knot.</p> 32 32 <input 33 33 type="text" 34 34 id="member-did-{{ .Id }}" 35 35 - name="subject" 35 35 + name="member" 36 36 required 37 37 placeholder="@foo.bsky.social" 38 38 /> 39 39 <div class="flex gap-2 pt-2"> 40 40 - <button 40 40 + <button 41 41 type="button" 42 42 popovertarget="add-member-{{ .Id }}" 43 43 popovertargetaction="hide" ··· 54 54 </div> 55 55 <div id="add-member-error-{{ .Id }}" class="text-red-500 dark:text-red-400"></div> 56 56 </form> 57 57 - {{ end }} 58 58 - 57 57 + {{ end }}

+2 -2

appview/pages/templates/spindles/fragments/addMemberModal.html

··· 14 14 id="add-member-{{ .Instance }}" 15 15 popover 16 16 class="bg-white w-full md:w-96 dark:bg-gray-800 p-4 rounded border border-gray-200 dark:border-gray-700 drop-shadow dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50"> 17 17 - {{ block "addMemberPopover" . }} {{ end }} 17 17 + {{ block "addSpindleMemberPopover" . }} {{ end }} 18 18 </div> 19 19 {{ end }} 20 20 21 21 - {{ define "addMemberPopover" }} 21 21 + {{ define "addSpindleMemberPopover" }} 22 22 <form 23 23 hx-post="/spindles/{{ .Instance }}/add" 24 24 hx-indicator="#spinner"

-299

knotclient/signer.go

··· 1 1 - package knotclient 2 2 - 3 3 - import ( 4 4 - "bytes" 5 5 - "crypto/hmac" 6 6 - "crypto/sha256" 7 7 - "encoding/hex" 8 8 - "encoding/json" 9 9 - "fmt" 10 10 - "net/http" 11 11 - "net/url" 12 12 - "time" 13 13 - 14 14 - "tangled.sh/tangled.sh/core/types" 15 15 - ) 16 16 - 17 17 - type SignerTransport struct { 18 18 - Secret string 19 19 - } 20 20 - 21 21 - func (s SignerTransport) RoundTrip(req *http.Request) (*http.Response, error) { 22 22 - timestamp := time.Now().Format(time.RFC3339) 23 23 - mac := hmac.New(sha256.New, []byte(s.Secret)) 24 24 - message := req.Method + req.URL.Path + timestamp 25 25 - mac.Write([]byte(message)) 26 26 - signature := hex.EncodeToString(mac.Sum(nil)) 27 27 - req.Header.Set("X-Signature", signature) 28 28 - req.Header.Set("X-Timestamp", timestamp) 29 29 - return http.DefaultTransport.RoundTrip(req) 30 30 - } 31 31 - 32 32 - type SignedClient struct { 33 33 - Secret string 34 34 - Url *url.URL 35 35 - client *http.Client 36 36 - } 37 37 - 38 38 - func NewSignedClient(domain, secret string, dev bool) (*SignedClient, error) { 39 39 - client := &http.Client{ 40 40 - Timeout: 5 * time.Second, 41 41 - Transport: SignerTransport{ 42 42 - Secret: secret, 43 43 - }, 44 44 - } 45 45 - 46 46 - scheme := "https" 47 47 - if dev { 48 48 - scheme = "http" 49 49 - } 50 50 - url, err := url.Parse(fmt.Sprintf("%s://%s", scheme, domain)) 51 51 - if err != nil { 52 52 - return nil, err 53 53 - } 54 54 - 55 55 - signedClient := &SignedClient{ 56 56 - Secret: secret, 57 57 - client: client, 58 58 - Url: url, 59 59 - } 60 60 - 61 61 - return signedClient, nil 62 62 - } 63 63 - 64 64 - func (s *SignedClient) newRequest(method, endpoint string, body []byte) (*http.Request, error) { 65 65 - return http.NewRequest(method, s.Url.JoinPath(endpoint).String(), bytes.NewReader(body)) 66 66 - } 67 67 - 68 68 - func (s *SignedClient) Init(did string) (*http.Response, error) { 69 69 - const ( 70 70 - Method = "POST" 71 71 - Endpoint = "/init" 72 72 - ) 73 73 - 74 74 - body, _ := json.Marshal(map[string]any{ 75 75 - "did": did, 76 76 - }) 77 77 - 78 78 - req, err := s.newRequest(Method, Endpoint, body) 79 79 - if err != nil { 80 80 - return nil, err 81 81 - } 82 82 - 83 83 - return s.client.Do(req) 84 84 - } 85 85 - 86 86 - func (s *SignedClient) NewRepo(did, repoName, defaultBranch string) (*http.Response, error) { 87 87 - const ( 88 88 - Method = "PUT" 89 89 - Endpoint = "/repo/new" 90 90 - ) 91 91 - 92 92 - body, _ := json.Marshal(map[string]any{ 93 93 - "did": did, 94 94 - "name": repoName, 95 95 - "default_branch": defaultBranch, 96 96 - }) 97 97 - 98 98 - req, err := s.newRequest(Method, Endpoint, body) 99 99 - if err != nil { 100 100 - return nil, err 101 101 - } 102 102 - 103 103 - return s.client.Do(req) 104 104 - } 105 105 - 106 106 - func (s *SignedClient) RepoForkAheadBehind(ownerDid, source, name, branch, hiddenRef string) (*http.Response, error) { 107 107 - const ( 108 108 - Method = "GET" 109 109 - ) 110 110 - endpoint := fmt.Sprintf("/repo/fork/sync/%s", url.PathEscape(branch)) 111 111 - 112 112 - body, _ := json.Marshal(map[string]any{ 113 113 - "did": ownerDid, 114 114 - "source": source, 115 115 - "name": name, 116 116 - "hiddenref": hiddenRef, 117 117 - }) 118 118 - 119 119 - req, err := s.newRequest(Method, endpoint, body) 120 120 - if err != nil { 121 121 - return nil, err 122 122 - } 123 123 - 124 124 - return s.client.Do(req) 125 125 - } 126 126 - 127 127 - func (s *SignedClient) SyncRepoFork(ownerDid, source, name, branch string) (*http.Response, error) { 128 128 - const ( 129 129 - Method = "POST" 130 130 - ) 131 131 - endpoint := fmt.Sprintf("/repo/fork/sync/%s", url.PathEscape(branch)) 132 132 - 133 133 - body, _ := json.Marshal(map[string]any{ 134 134 - "did": ownerDid, 135 135 - "source": source, 136 136 - "name": name, 137 137 - }) 138 138 - 139 139 - req, err := s.newRequest(Method, endpoint, body) 140 140 - if err != nil { 141 141 - return nil, err 142 142 - } 143 143 - 144 144 - return s.client.Do(req) 145 145 - } 146 146 - 147 147 - func (s *SignedClient) ForkRepo(ownerDid, source, name string) (*http.Response, error) { 148 148 - const ( 149 149 - Method = "POST" 150 150 - Endpoint = "/repo/fork" 151 151 - ) 152 152 - 153 153 - body, _ := json.Marshal(map[string]any{ 154 154 - "did": ownerDid, 155 155 - "source": source, 156 156 - "name": name, 157 157 - }) 158 158 - 159 159 - req, err := s.newRequest(Method, Endpoint, body) 160 160 - if err != nil { 161 161 - return nil, err 162 162 - } 163 163 - 164 164 - return s.client.Do(req) 165 165 - } 166 166 - 167 167 - func (s *SignedClient) RemoveRepo(did, repoName string) (*http.Response, error) { 168 168 - const ( 169 169 - Method = "DELETE" 170 170 - Endpoint = "/repo" 171 171 - ) 172 172 - 173 173 - body, _ := json.Marshal(map[string]any{ 174 174 - "did": did, 175 175 - "name": repoName, 176 176 - }) 177 177 - 178 178 - req, err := s.newRequest(Method, Endpoint, body) 179 179 - if err != nil { 180 180 - return nil, err 181 181 - } 182 182 - 183 183 - return s.client.Do(req) 184 184 - } 185 185 - 186 186 - func (s *SignedClient) AddMember(did string) (*http.Response, error) { 187 187 - const ( 188 188 - Method = "PUT" 189 189 - Endpoint = "/member/add" 190 190 - ) 191 191 - 192 192 - body, _ := json.Marshal(map[string]any{ 193 193 - "did": did, 194 194 - }) 195 195 - 196 196 - req, err := s.newRequest(Method, Endpoint, body) 197 197 - if err != nil { 198 198 - return nil, err 199 199 - } 200 200 - 201 201 - return s.client.Do(req) 202 202 - } 203 203 - 204 204 - func (s *SignedClient) SetDefaultBranch(ownerDid, repoName, branch string) (*http.Response, error) { 205 205 - const ( 206 206 - Method = "PUT" 207 207 - ) 208 208 - endpoint := fmt.Sprintf("/%s/%s/branches/default", ownerDid, repoName) 209 209 - 210 210 - body, _ := json.Marshal(map[string]any{ 211 211 - "branch": branch, 212 212 - }) 213 213 - 214 214 - req, err := s.newRequest(Method, endpoint, body) 215 215 - if err != nil { 216 216 - return nil, err 217 217 - } 218 218 - 219 219 - return s.client.Do(req) 220 220 - } 221 221 - 222 222 - func (s *SignedClient) AddCollaborator(ownerDid, repoName, memberDid string) (*http.Response, error) { 223 223 - const ( 224 224 - Method = "POST" 225 225 - ) 226 226 - endpoint := fmt.Sprintf("/%s/%s/collaborator/add", ownerDid, repoName) 227 227 - 228 228 - body, _ := json.Marshal(map[string]any{ 229 229 - "did": memberDid, 230 230 - }) 231 231 - 232 232 - req, err := s.newRequest(Method, endpoint, body) 233 233 - if err != nil { 234 234 - return nil, err 235 235 - } 236 236 - 237 237 - return s.client.Do(req) 238 238 - } 239 239 - 240 240 - func (s *SignedClient) Merge( 241 241 - patch []byte, 242 242 - ownerDid, targetRepo, branch, commitMessage, commitBody, authorName, authorEmail string, 243 243 - ) (*http.Response, error) { 244 244 - const ( 245 245 - Method = "POST" 246 246 - ) 247 247 - endpoint := fmt.Sprintf("/%s/%s/merge", ownerDid, targetRepo) 248 248 - 249 249 - mr := types.MergeRequest{ 250 250 - Branch: branch, 251 251 - CommitMessage: commitMessage, 252 252 - CommitBody: commitBody, 253 253 - AuthorName: authorName, 254 254 - AuthorEmail: authorEmail, 255 255 - Patch: string(patch), 256 256 - } 257 257 - 258 258 - body, _ := json.Marshal(mr) 259 259 - 260 260 - req, err := s.newRequest(Method, endpoint, body) 261 261 - if err != nil { 262 262 - return nil, err 263 263 - } 264 264 - 265 265 - return s.client.Do(req) 266 266 - } 267 267 - 268 268 - func (s *SignedClient) MergeCheck(patch []byte, ownerDid, targetRepo, branch string) (*http.Response, error) { 269 269 - const ( 270 270 - Method = "POST" 271 271 - ) 272 272 - endpoint := fmt.Sprintf("/%s/%s/merge/check", ownerDid, targetRepo) 273 273 - 274 274 - body, _ := json.Marshal(map[string]any{ 275 275 - "patch": string(patch), 276 276 - "branch": branch, 277 277 - }) 278 278 - 279 279 - req, err := s.newRequest(Method, endpoint, body) 280 280 - if err != nil { 281 281 - return nil, err 282 282 - } 283 283 - 284 284 - return s.client.Do(req) 285 285 - } 286 286 - 287 287 - func (s *SignedClient) NewHiddenRef(ownerDid, targetRepo, forkBranch, remoteBranch string) (*http.Response, error) { 288 288 - const ( 289 289 - Method = "POST" 290 290 - ) 291 291 - endpoint := fmt.Sprintf("/%s/%s/hidden-ref/%s/%s", ownerDid, targetRepo, url.PathEscape(forkBranch), url.PathEscape(remoteBranch)) 292 292 - 293 293 - req, err := s.newRequest(Method, endpoint, nil) 294 294 - if err != nil { 295 295 - return nil, err 296 296 - } 297 297 - 298 298 - return s.client.Do(req) 299 299 - }

-7

nix/modules/knot.nix

··· 99 99 description = "DID of owner (required)"; 100 100 }; 101 101 102 102 - secretFile = mkOption { 103 103 - type = lib.types.path; 104 104 - example = "KNOT_SERVER_SECRET=<hash>"; 105 105 - description = "File containing secret key provided by appview (required)"; 106 106 - }; 107 107 - 108 102 dbPath = mkOption { 109 103 type = types.path; 110 104 default = "${cfg.stateDir}/knotserver.db"; ··· 207 201 "KNOT_SERVER_HOSTNAME=${cfg.server.hostname}" 208 202 "KNOT_SERVER_OWNER=${cfg.server.owner}" 209 203 ]; 210 210 - EnvironmentFile = cfg.server.secretFile; 211 204 ExecStart = "${cfg.package}/bin/knot server"; 212 205 Restart = "always"; 213 206 };

+2 -2

rbac/rbac.go

··· 281 281 return e.E.Enforce(user, domain, domain, "repo:create") 282 282 } 283 283 284 284 - func (e *Enforcer) IsRepoDeleteAllowed(user, domain string) (bool, error) { 285 285 - return e.E.Enforce(user, domain, domain, "repo:delete") 284 284 + func (e *Enforcer) IsRepoDeleteAllowed(user, domain, repo string) (bool, error) { 285 285 + return e.E.Enforce(user, domain, repo, "repo:delete") 286 286 } 287 287 288 288 func (e *Enforcer) IsPushAllowed(user, domain, repo string) (bool, error) {

+2 -2

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

··· 19 19 > 20 20 <option disabled selected>select a fork</option> 21 21 {{ range .Forks }} 22 22 - <option value="{{ .Name }}" {{ if eq .Name $.Selected }}selected{{ end }} class="py-1"> 23 23 - {{ .Name }} 22 22 + <option value="{{ .Did }}/{{ .Name }}" {{ if eq .Name $.Selected }}selected{{ end }} class="py-1"> 23 23 + {{ .Did | resolve }}/{{ .Name }} 24 24 </option> 25 25 {{ end }} 26 26 </select>

+3 -3

docs/contributing.md

··· 11 11 ### message format 12 12 13 13 ``` 14 14 - <service/top-level directory>: <affected package/directory>: <short summary of change> 14 14 + <service/top-level directory>/<affected package/directory>: <short summary of change> 15 15 16 16 17 17 Optional longer description can go here, if necessary. Explain what the ··· 23 23 Here are some examples: 24 24 25 25 ``` 26 26 - appview: state: fix token expiry check in middleware 26 26 + appview/state: fix token expiry check in middleware 27 27 28 28 The previous check did not account for clock drift, leading to premature 29 29 token invalidation. 30 30 ``` 31 31 32 32 ``` 33 33 - knotserver: git/service: improve error checking in upload-pack 33 33 + knotserver/git/service: improve error checking in upload-pack 34 34 ``` 35 35 36 36

+16

nix/modules/spindle.nix

··· 55 55 description = "DID of owner (required)"; 56 56 }; 57 57 58 58 + maxJobCount = mkOption { 59 59 + type = types.int; 60 60 + default = 2; 61 61 + example = 5; 62 62 + description = "Maximum number of concurrent jobs to run"; 63 63 + }; 64 64 + 65 65 + queueSize = mkOption { 66 66 + type = types.int; 67 67 + default = 100; 68 68 + example = 100; 69 69 + description = "Maximum number of jobs queue up"; 70 70 + }; 71 71 + 58 72 secrets = { 59 73 provider = mkOption { 60 74 type = types.str; ··· 108 122 "SPINDLE_SERVER_JETSTREAM=${cfg.server.jetstreamEndpoint}" 109 123 "SPINDLE_SERVER_DEV=${lib.boolToString cfg.server.dev}" 110 124 "SPINDLE_SERVER_OWNER=${cfg.server.owner}" 125 125 + "SPINDLE_SERVER_MAX_JOB_COUNT=${toString cfg.server.maxJobCount}" 126 126 + "SPINDLE_SERVER_QUEUE_SIZE=${toString cfg.server.queueSize}" 111 127 "SPINDLE_SERVER_SECRETS_PROVIDER=${cfg.server.secrets.provider}" 112 128 "SPINDLE_SERVER_SECRETS_OPENBAO_PROXY_ADDR=${cfg.server.secrets.openbao.proxyAddr}" 113 129 "SPINDLE_SERVER_SECRETS_OPENBAO_MOUNT=${cfg.server.secrets.openbao.mount}"

+51 -50

docs/hacking.md

··· 48 48 redis-server 49 49 ``` 50 50 51 51 - ## running knots and spindles in a VM 51 51 + ## running knots and spindles 52 52 53 53 An end-to-end knot setup requires setting up a machine with 54 54 `sshd`, `AuthorizedKeysCommand`, and git user, which is 55 55 quite cumbersome. So the nix flake provides a 56 56 `nixosConfiguration` to do so. 57 57 58 58 - ### Mac-specific: setting up a Nix builder 59 59 - 60 60 - In order to build Tangled's dev VM on macOS, you will first need to set up a 61 61 - Linux Nix builder. The recommended way to do so is to run a 62 62 - [`darwin.linux-builder` VM][darwin builder vm] and to register it in `nix.conf` 63 63 - as a builder for Linux with the same architecture as your Mac (`linux-aarch64` 64 64 - if you are using Apple Silicon). 65 65 - 66 66 - > IMPORTANT: You must build `darwin.linux-builder` somewhere other than inside 67 67 - > the tangled repo so that it doesn't conflict with the other VM. For example, 68 68 - > you can do 69 69 - > 70 70 - > ```shell 71 71 - > cd $(mktemp -d buildervm.XXXXX) && nix run nixpkgs#darwin.linux-builder 72 72 - > ``` 73 73 - > 74 74 - > to store the builder VM in a temporary dir. 75 75 - > 76 76 - > You should read and follow [all the other intructions][darwin builder vm] to 77 77 - > avoid subtle problems. 78 78 - 79 79 - Alternatively, you can use any other method to set up a Linux machine with `nix` 80 80 - installed that you can `sudo ssh` into (in other words, root user on your Mac 81 81 - has to be able to ssh into the Linux machine without entering a password) and 82 82 - that has the same architecture as your Mac. See [remote builder instructions] 83 83 - for how to register such a builder in `nix.conf`. 84 84 - 85 85 - > WARNING: If you'd like to use 86 86 - > [`nixos-lima`](https://github.com/nixos-lima/nixos-lima) or 87 87 - > [Orbstack](https://orbstack.dev/), note that setting them up so that `sudo 88 88 - > ssh` works can be tricky. It seems to be [possible with 89 89 - > Orbstack](https://github.com/orgs/orbstack/discussions/1669). 90 90 - 91 91 - [darwin builder vm]: 92 92 - https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder 93 93 - [remote builder instructions]: 94 94 - https://nix.dev/manual/nix/2.28/advanced-topics/distributed-builds.html#requirements 95 95 - 96 96 - ### Running a knot on a dev VM 58 58 + <details> 59 59 + <summary><strong>MacOS users will have to setup a Nix Builder first</strong></summary> 60 60 + 61 61 + In order to build Tangled's dev VM on macOS, you will 62 62 + first need to set up a Linux Nix builder. The recommended 63 63 + way to do so is to run a [`darwin.linux-builder` 64 64 + VM](https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder) 65 65 + and to register it in `nix.conf` as a builder for Linux 66 66 + with the same architecture as your Mac (`linux-aarch64` if 67 67 + you are using Apple Silicon). 68 68 + 69 69 + > IMPORTANT: You must build `darwin.linux-builder` somewhere other than inside 70 70 + > the tangled repo so that it doesn't conflict with the other VM. For example, 71 71 + > you can do 72 72 + > 73 73 + > ```shell 74 74 + > cd $(mktemp -d buildervm.XXXXX) && nix run nixpkgs#darwin.linux-builder 75 75 + > ``` 76 76 + > 77 77 + > to store the builder VM in a temporary dir. 78 78 + > 79 79 + > You should read and follow [all the other intructions][darwin builder vm] to 80 80 + > avoid subtle problems. 81 81 + 82 82 + Alternatively, you can use any other method to set up a 83 83 + Linux machine with `nix` installed that you can `sudo ssh` 84 84 + into (in other words, root user on your Mac has to be able 85 85 + to ssh into the Linux machine without entering a password) 86 86 + and that has the same architecture as your Mac. See 87 87 + [remote builder 88 88 + instructions](https://nix.dev/manual/nix/2.28/advanced-topics/distributed-builds.html#requirements) 89 89 + for how to register such a builder in `nix.conf`. 90 90 + 91 91 + > WARNING: If you'd like to use 92 92 + > [`nixos-lima`](https://github.com/nixos-lima/nixos-lima) or 93 93 + > [Orbstack](https://orbstack.dev/), note that setting them up so that `sudo 94 94 + > ssh` works can be tricky. It seems to be [possible with 95 95 + > Orbstack](https://github.com/orgs/orbstack/discussions/1669). 96 96 + 97 97 + </details> 97 98 98 99 To begin, grab your DID from http://localhost:3000/settings. 99 100 Then, set `TANGLED_VM_KNOT_OWNER` and 100 100 - `TANGLED_VM_SPINDLE_OWNER` to your DID. 101 101 - 102 102 - If you don't want to [set up a spindle](#running-a-spindle), 103 103 - you can use any placeholder value. 104 104 - 105 105 - You can now start a lightweight NixOS VM like so: 101 101 + `TANGLED_VM_SPINDLE_OWNER` to your DID. You can now start a 102 102 + lightweight NixOS VM like so: 106 103 107 104 ```bash 108 105 nix run --impure .#vm ··· 114 111 with `ssh` exposed on port 2222. 115 112 116 113 Once the services are running, head to 117 117 - http://localhost:3000/knots and hit verify (and similarly, 118 118 - http://localhost:3000/spindles to verify your spindle). It 119 119 - should verify the ownership of the services instantly if 120 120 - everything went smoothly. 114 114 + http://localhost:3000/knots and hit verify. It should 115 115 + verify the ownership of the services instantly if everything 116 116 + went smoothly. 121 117 122 118 You can push repositories to this VM with this ssh config 123 119 block on your main machine: ··· 159 155 # litecli has a nicer REPL interface: 160 156 litecli /var/lib/spindle/spindle.db 161 157 ``` 158 158 + 159 159 + If for any reason you wish to disable either one of the 160 160 + services in the VM, modify [nix/vm.nix](/nix/vm.nix) and set 161 161 + `services.tangled-spindle.enable` (or 162 162 + `services.tangled-knot.enable`) to `false`.

+2 -2

appview/pages/templates/repo/compare/compare.html

··· 12 12 13 13 {{ define "topbarLayout" }} 14 14 <header class="px-1 col-span-full" style="z-index: 20;"> 15 15 - {{ template "layouts/topbar" . }} 15 15 + {{ template "layouts/fragments/topbar" . }} 16 16 </header> 17 17 {{ end }} 18 18 ··· 37 37 38 38 {{ define "footerLayout" }} 39 39 <footer class="px-1 col-span-full mt-12"> 40 40 - {{ template "layouts/footer" . }} 40 40 + {{ template "layouts/fragments/footer" . }} 41 41 </footer> 42 42 {{ end }} 43 43

+4

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

··· 1 1 + {{ define "repo/fragments/duration" }} 2 2 + <time datetime="{{ . | iso8601DurationFmt }}" title="{{ . | longDurationFmt }}">{{ . | durationFmt }}</time> 3 3 + {{ end }} 4 4 +

+4

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

··· 1 1 + {{ define "repo/fragments/shortTime" }} 2 2 + {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | shortRelTimeFmt)) }} 3 3 + {{ end }} 4 4 +

-16

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

··· 1 1 - {{ define "repo/fragments/timeWrapper" }} 2 2 - <time datetime="{{ .Time | iso8601DateTimeFmt }}" title="{{ .Time | longTimeFmt }}">{{ .Content }}</time> 3 3 - {{ end }} 4 4 - 5 1 {{ define "repo/fragments/time" }} 6 2 {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | relTimeFmt)) }} 7 3 {{ end }} 8 8 - 9 9 - {{ define "repo/fragments/shortTime" }} 10 10 - {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (. | shortRelTimeFmt)) }} 11 11 - {{ end }} 12 12 - 13 13 - {{ define "repo/fragments/shortTimeAgo" }} 14 14 - {{ template "repo/fragments/timeWrapper" (dict "Time" . "Content" (print (. | shortRelTimeFmt) " ago")) }} 15 15 - {{ end }} 16 16 - 17 17 - {{ define "repo/fragments/duration" }} 18 18 - <time datetime="{{ . | iso8601DurationFmt }}" title="{{ . | longDurationFmt }}">{{ . | durationFmt }}</time> 19 19 - {{ end }}

+5

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

··· 1 1 + {{ define "repo/fragments/timeWrapper" }} 2 2 + <time datetime="{{ .Time | iso8601DateTimeFmt }}" title="{{ .Time | longTimeFmt }}">{{ .Content }}</time> 3 3 + {{ end }} 4 4 + 5 5 +

+1 -1

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

··· 52 52 </div> 53 53 {{ end }} 54 54 <div class="{{ if not $isCurrent }} pl-6 {{ end }} flex-grow min-w-0 w-full py-2"> 55 55 - {{ template "repo/pulls/fragments/summarizedHeader" (list $pull $pipeline) }} 55 55 + {{ template "repo/pulls/fragments/summarizedPullHeader" (list $pull $pipeline) }} 56 56 </div> 57 57 </div> 58 58 </a>

+35

appview/pages/cache.go

··· 1 1 + package pages 2 2 + 3 3 + import ( 4 4 + "sync" 5 5 + ) 6 6 + 7 7 + type TmplCache[K comparable, V any] struct { 8 8 + data map[K]V 9 9 + mutex sync.RWMutex 10 10 + } 11 11 + 12 12 + func NewTmplCache[K comparable, V any]() *TmplCache[K, V] { 13 13 + return &TmplCache[K, V]{ 14 14 + data: make(map[K]V), 15 15 + } 16 16 + } 17 17 + 18 18 + func (c *TmplCache[K, V]) Get(key K) (V, bool) { 19 19 + c.mutex.RLock() 20 20 + defer c.mutex.RUnlock() 21 21 + val, exists := c.data[key] 22 22 + return val, exists 23 23 + } 24 24 + 25 25 + func (c *TmplCache[K, V]) Set(key K, value V) { 26 26 + c.mutex.Lock() 27 27 + defer c.mutex.Unlock() 28 28 + c.data[key] = value 29 29 + } 30 30 + 31 31 + func (c *TmplCache[K, V]) Size() int { 32 32 + c.mutex.RLock() 33 33 + defer c.mutex.RUnlock() 34 34 + return len(c.data) 35 35 + }

+7 -18

appview/pages/templates/user/repos.html

··· 1 1 {{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} · repos {{ end }} 2 2 3 3 - {{ define "extrameta" }} 4 4 - <meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid }}'s repos" /> 5 5 - <meta property="og:type" content="object" /> 6 6 - <meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid }}?tab=repos" /> 7 7 - <meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" /> 8 8 - {{ end }} 9 9 - 10 10 - {{ define "content" }} 11 11 - <div class="grid grid-cols-1 md:grid-cols-11 gap-4"> 12 12 - <div class="md:col-span-3 order-1 md:order-1"> 13 13 - {{ template "user/fragments/profileCard" .Card }} 14 14 - </div> 15 15 - <div id="all-repos" class="md:col-span-8 order-2 md:order-2"> 16 16 - {{ block "ownRepos" . }}{{ end }} 17 17 - </div> 18 18 - </div> 3 3 + {{ define "profileContent" }} 4 4 + <div id="all-repos" class="md:col-span-8 order-2 md:order-2"> 5 5 + {{ block "ownRepos" . }}{{ end }} 6 6 + </div> 19 7 {{ end }} 20 8 21 9 {{ define "ownRepos" }} 22 22 - <p class="text-sm font-bold p-2 dark:text-white">ALL REPOSITORIES</p> 23 10 <div id="repos" class="grid grid-cols-1 gap-4 mb-6"> 24 11 {{ range .Repos }} 25 25 - {{ template "user/fragments/repoCard" (list $ . false) }} 12 12 + <div class="border border-gray-200 dark:border-gray-700 rounded-sm"> 13 13 + {{ template "user/fragments/repoCard" (list $ . false) }} 14 14 + </div> 26 15 {{ else }} 27 16 <p class="px-6 dark:text-white">This user does not have any repos yet.</p> 28 17 {{ end }}

+19

appview/pages/templates/user/starred.html

··· 1 1 + {{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} · repos {{ end }} 2 2 + 3 3 + {{ define "profileContent" }} 4 4 + <div id="all-repos" class="md:col-span-8 order-2 md:order-2"> 5 5 + {{ block "starredRepos" . }}{{ end }} 6 6 + </div> 7 7 + {{ end }} 8 8 + 9 9 + {{ define "starredRepos" }} 10 10 + <div id="repos" class="grid grid-cols-1 gap-4 mb-6"> 11 11 + {{ range .Repos }} 12 12 + <div class="border border-gray-200 dark:border-gray-700 rounded-sm"> 13 13 + {{ template "user/fragments/repoCard" (list $ . true) }} 14 14 + </div> 15 15 + {{ else }} 16 16 + <p class="px-6 dark:text-white">This user does not have any starred repos yet.</p> 17 17 + {{ end }} 18 18 + </div> 19 19 + {{ end }}

+45

appview/pages/templates/user/strings.html

··· 1 1 + {{ define "title" }}{{ or .Card.UserHandle .Card.UserDid }} · strings {{ end }} 2 2 + 3 3 + {{ define "profileContent" }} 4 4 + <div id="all-strings" class="md:col-span-8 order-2 md:order-2"> 5 5 + {{ block "allStrings" . }}{{ end }} 6 6 + </div> 7 7 + {{ end }} 8 8 + 9 9 + {{ define "allStrings" }} 10 10 + <div id="strings" class="grid grid-cols-1 gap-4 mb-6"> 11 11 + {{ range .Strings }} 12 12 + <div class="border border-gray-200 dark:border-gray-700 rounded-sm"> 13 13 + {{ template "singleString" (list $ .) }} 14 14 + </div> 15 15 + {{ else }} 16 16 + <p class="px-6 dark:text-white">This user does not have any strings yet.</p> 17 17 + {{ end }} 18 18 + </div> 19 19 + {{ end }} 20 20 + 21 21 + {{ define "singleString" }} 22 22 + {{ $root := index . 0 }} 23 23 + {{ $s := index . 1 }} 24 24 + <div class="py-4 px-6 rounded bg-white dark:bg-gray-800"> 25 25 + <div class="font-medium dark:text-white flex gap-2 items-center"> 26 26 + <a href="/strings/{{ or $root.Card.UserHandle $root.Card.UserDid }}/{{ $s.Rkey }}">{{ $s.Filename }}</a> 27 27 + </div> 28 28 + {{ with $s.Description }} 29 29 + <div class="text-gray-600 dark:text-gray-300 text-sm"> 30 30 + {{ . }} 31 31 + </div> 32 32 + {{ end }} 33 33 + 34 34 + {{ $stat := $s.Stats }} 35 35 + <div class="text-gray-400 pt-4 text-sm font-mono inline-flex gap-2 mt-auto"> 36 36 + <span>{{ $stat.LineCount }} line{{if ne $stat.LineCount 1}}s{{end}}</span> 37 37 + <span class="select-none [&:before]:content-['·']"></span> 38 38 + {{ with $s.Edited }} 39 39 + <span>edited {{ template "repo/fragments/shortTimeAgo" . }}</span> 40 40 + {{ else }} 41 41 + {{ template "repo/fragments/shortTimeAgo" $s.Created }} 42 42 + {{ end }} 43 43 + </div> 44 44 + </div> 45 45 + {{ end }}

+22 -2

knotserver/routes.go

··· 156 156 } 157 157 158 158 var modVer string 159 159 + var sha string 160 160 + var modified bool 161 161 + 159 162 for _, mod := range info.Deps { 160 163 if mod.Path == "tangled.sh/tangled.sh/knotserver" { 161 161 - version = mod.Version 164 164 + modVer = mod.Version 162 165 break 163 166 } 164 167 } 165 168 169 169 + for _, setting := range info.Settings { 170 170 + switch setting.Key { 171 171 + case "vcs.revision": 172 172 + sha = setting.Value 173 173 + case "vcs.modified": 174 174 + modified = setting.Value == "true" 175 175 + } 176 176 + } 177 177 + 166 178 if modVer == "" { 167 167 - version = "unknown" 179 179 + modVer = "unknown" 180 180 + } 181 181 + 182 182 + if sha == "" { 183 183 + version = modVer 184 184 + } else if modified { 185 185 + version = fmt.Sprintf("%s (%s with modifications)", modVer, sha) 186 186 + } else { 187 187 + version = fmt.Sprintf("%s (%s)", modVer, sha) 168 188 } 169 189 } 170 190

+1 -1

patchutil/combinediff.go

··· 119 119 // we have f1 and f2, combine them 120 120 combined, err := combineFiles(f1, f2) 121 121 if err != nil { 122 122 - fmt.Println(err) 122 122 + // fmt.Println(err) 123 123 } 124 124 125 125 // combined can be nil commit 2 reverted all changes from commit 1

+1 -1

appview/pages/templates/errors/knot404.html

··· 17 17 The repository you were looking for could not be found. The knot serving the repository may be unavailable. 18 18 </p> 19 19 <div class="flex flex-col sm:flex-row gap-3 justify-center items-center mt-6"> 20 20 - <a href="/" class="btn px-4 py-2 rounded flex items-center gap-2 no-underline hover:no-underline"> 20 20 + <a href="/" class="btn flex items-center gap-2 no-underline hover:no-underline"> 21 21 {{ i "arrow-left" "w-4 h-4" }} 22 22 back to timeline 23 23 </a>

+25

appview/pages/templates/timeline/fragments/trending.html

··· 1 1 + {{ define "timeline/fragments/trending" }} 2 2 + <div class="w-full md:mx-0 py-4"> 3 3 + <div class="px-6 pb-4"> 4 4 + <h3 class="text-xl font-bold dark:text-white flex items-center gap-2"> 5 5 + Trending 6 6 + {{ i "trending-up" "size-4 flex-shrink-0" }} 7 7 + </h3> 8 8 + </div> 9 9 + <div class="flex gap-4 overflow-x-auto scrollbar-hide items-stretch"> 10 10 + {{ range $index, $repo := .Repos }} 11 11 + <div class="flex-none h-full border border-gray-200 dark:border-gray-700 rounded-sm w-96"> 12 12 + {{ template "user/fragments/repoCard" (list $ $repo true) }} 13 13 + </div> 14 14 + {{ else }} 15 15 + <div class="py-8 px-6 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-sm"> 16 16 + <div class="text-sm text-gray-500 dark:text-gray-400 text-center"> 17 17 + No trending repositories this week 18 18 + </div> 19 19 + </div> 20 20 + {{ end }} 21 21 + </div> 22 22 + </div> 23 23 + {{ end }} 24 24 + 25 25 +

+109

legal/terms.md

··· 1 1 + # Terms of Service 2 2 + 3 3 + **Last updated:** January 15, 2025 4 4 + 5 5 + Welcome to Tangled. These Terms of Service ("Terms") govern your access 6 6 + to and use of the Tangled platform and services (the "Service") 7 7 + operated by us ("Tangled," "we," "us," or "our"). 8 8 + 9 9 + ## 1. Acceptance of Terms 10 10 + 11 11 + By accessing or using our Service, you agree to be bound by these Terms. 12 12 + If you disagree with any part of these terms, then you may not access 13 13 + the Service. 14 14 + 15 15 + ## 2. Account Registration 16 16 + 17 17 + To use certain features of the Service, you must register for an 18 18 + account. You agree to provide accurate, current, and complete 19 19 + information during the registration process and to update such 20 20 + information to keep it accurate, current, and complete. 21 21 + 22 22 + ## 3. Account Termination 23 23 + 24 24 + > **Important Notice** 25 25 + > 26 26 + > **We reserve the right to terminate, suspend, or restrict access to 27 27 + > your account at any time, for any reason, or for no reason at all, at 28 28 + > our sole discretion.** This includes, but is not limited to, 29 29 + > termination for violation of these Terms, inappropriate conduct, spam, 30 30 + > abuse, or any other behavior we deem harmful to the Service or other 31 31 + > users. 32 32 + > 33 33 + > Account termination may result in the loss of access to your 34 34 + > repositories, data, and other content associated with your account. We 35 35 + > are not obligated to provide advance notice of termination, though we 36 36 + > may do so in our discretion. 37 37 + 38 38 + ## 4. Acceptable Use 39 39 + 40 40 + You agree not to use the Service to: 41 41 + 42 42 + - Violate any applicable laws or regulations 43 43 + - Infringe upon the rights of others 44 44 + - Upload, store, or share content that is illegal, harmful, threatening, 45 45 + abusive, harassing, defamatory, vulgar, obscene, or otherwise 46 46 + objectionable 47 47 + - Engage in spam, phishing, or other deceptive practices 48 48 + - Attempt to gain unauthorized access to the Service or other users' 49 49 + accounts 50 50 + - Interfere with or disrupt the Service or servers connected to the 51 51 + Service 52 52 + 53 53 + ## 5. Content and Intellectual Property 54 54 + 55 55 + You retain ownership of the content you upload to the Service. By 56 56 + uploading content, you grant us a non-exclusive, worldwide, royalty-free 57 57 + license to use, reproduce, modify, and distribute your content as 58 58 + necessary to provide the Service. 59 59 + 60 60 + ## 6. Privacy 61 61 + 62 62 + Your privacy is important to us. Please review our [Privacy 63 63 + Policy](/privacy), which also governs your use of the Service. 64 64 + 65 65 + ## 7. Disclaimers 66 66 + 67 67 + The Service is provided on an "AS IS" and "AS AVAILABLE" basis. We make 68 68 + no warranties, expressed or implied, and hereby disclaim and negate all 69 69 + other warranties including without limitation, implied warranties or 70 70 + conditions of merchantability, fitness for a particular purpose, or 71 71 + non-infringement of intellectual property or other violation of rights. 72 72 + 73 73 + ## 8. Limitation of Liability 74 74 + 75 75 + In no event shall Tangled, nor its directors, employees, partners, 76 76 + agents, suppliers, or affiliates, be liable for any indirect, 77 77 + incidental, special, consequential, or punitive damages, including 78 78 + without limitation, loss of profits, data, use, goodwill, or other 79 79 + intangible losses, resulting from your use of the Service. 80 80 + 81 81 + ## 9. Indemnification 82 82 + 83 83 + You agree to defend, indemnify, and hold harmless Tangled and its 84 84 + affiliates, officers, directors, employees, and agents from and against 85 85 + any and all claims, damages, obligations, losses, liabilities, costs, 86 86 + or debt, and expenses (including attorney's fees). 87 87 + 88 88 + ## 10. Governing Law 89 89 + 90 90 + These Terms shall be interpreted and governed by the laws of Finland, 91 91 + without regard to its conflict of law provisions. 92 92 + 93 93 + ## 11. Changes to Terms 94 94 + 95 95 + We reserve the right to modify or replace these Terms at any time. If a 96 96 + revision is material, we will try to provide at least 30 days notice 97 97 + prior to any new terms taking effect. 98 98 + 99 99 + ## 12. Contact Information 100 100 + 101 101 + If you have any questions about these Terms of Service, please contact 102 102 + us through our platform or via email. 103 103 + 104 104 + --- 105 105 + 106 106 + These terms are effective as of the last updated date shown above and 107 107 + will remain in effect except with respect to any changes in their 108 108 + provisions in the future, which will be in effect immediately after 109 109 + being posted on this page.

+53

api/tangled/knotlistKeys.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.knot.listKeys 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + KnotListKeysNSID = "sh.tangled.knot.listKeys" 15 15 + ) 16 16 + 17 17 + // KnotListKeys_Output is the output of a sh.tangled.knot.listKeys call. 18 18 + type KnotListKeys_Output struct { 19 19 + // cursor: Pagination cursor for next page 20 20 + Cursor *string `json:"cursor,omitempty" cborgen:"cursor,omitempty"` 21 21 + Keys []*KnotListKeys_PublicKey `json:"keys" cborgen:"keys"` 22 22 + } 23 23 + 24 24 + // KnotListKeys_PublicKey is a "publicKey" in the sh.tangled.knot.listKeys schema. 25 25 + type KnotListKeys_PublicKey struct { 26 26 + // createdAt: Key upload timestamp 27 27 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 28 28 + // did: DID associated with the public key 29 29 + Did string `json:"did" cborgen:"did"` 30 30 + // key: Public key contents 31 31 + Key string `json:"key" cborgen:"key"` 32 32 + } 33 33 + 34 34 + // KnotListKeys calls the XRPC method "sh.tangled.knot.listKeys". 35 35 + // 36 36 + // cursor: Pagination cursor 37 37 + // limit: Maximum number of keys to return 38 38 + func KnotListKeys(ctx context.Context, c util.LexClient, cursor string, limit int64) (*KnotListKeys_Output, error) { 39 39 + var out KnotListKeys_Output 40 40 + 41 41 + params := map[string]interface{}{} 42 42 + if cursor != "" { 43 43 + params["cursor"] = cursor 44 44 + } 45 45 + if limit != 0 { 46 46 + params["limit"] = limit 47 47 + } 48 48 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.knot.listKeys", params, nil, &out); err != nil { 49 49 + return nil, err 50 50 + } 51 51 + 52 52 + return &out, nil 53 53 + }

+41

api/tangled/repoarchive.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.archive 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 + RepoArchiveNSID = "sh.tangled.repo.archive" 16 16 + ) 17 17 + 18 18 + // RepoArchive calls the XRPC method "sh.tangled.repo.archive". 19 19 + // 20 20 + // format: Archive format 21 21 + // prefix: Prefix for files in the archive 22 22 + // ref: Git reference (branch, tag, or commit SHA) 23 23 + // repo: Repository identifier in format 'did:plc:.../repoName' 24 24 + func RepoArchive(ctx context.Context, c util.LexClient, format string, prefix string, ref string, repo string) ([]byte, error) { 25 25 + buf := new(bytes.Buffer) 26 26 + 27 27 + params := map[string]interface{}{} 28 28 + if format != "" { 29 29 + params["format"] = format 30 30 + } 31 31 + if prefix != "" { 32 32 + params["prefix"] = prefix 33 33 + } 34 34 + params["ref"] = ref 35 35 + params["repo"] = repo 36 36 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.archive", params, nil, buf); err != nil { 37 37 + return nil, err 38 38 + } 39 39 + 40 40 + return buf.Bytes(), nil 41 41 + }

+80

api/tangled/repoblob.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.blob 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoBlobNSID = "sh.tangled.repo.blob" 15 15 + ) 16 16 + 17 17 + // RepoBlob_LastCommit is a "lastCommit" in the sh.tangled.repo.blob schema. 18 18 + type RepoBlob_LastCommit struct { 19 19 + Author *RepoBlob_Signature `json:"author,omitempty" cborgen:"author,omitempty"` 20 20 + // hash: Commit hash 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 26 + // when: Commit timestamp 27 27 + When string `json:"when" cborgen:"when"` 28 28 + } 29 29 + 30 30 + // RepoBlob_Output is the output of a sh.tangled.repo.blob call. 31 31 + type RepoBlob_Output struct { 32 32 + // content: File content (base64 encoded for binary files) 33 33 + Content string `json:"content" cborgen:"content"` 34 34 + // encoding: Content encoding 35 35 + Encoding *string `json:"encoding,omitempty" cborgen:"encoding,omitempty"` 36 36 + // isBinary: Whether the file is binary 37 37 + IsBinary *bool `json:"isBinary,omitempty" cborgen:"isBinary,omitempty"` 38 38 + LastCommit *RepoBlob_LastCommit `json:"lastCommit,omitempty" cborgen:"lastCommit,omitempty"` 39 39 + // mimeType: MIME type of the file 40 40 + MimeType *string `json:"mimeType,omitempty" cborgen:"mimeType,omitempty"` 41 41 + // path: The file path 42 42 + Path string `json:"path" cborgen:"path"` 43 43 + // ref: The git reference used 44 44 + Ref string `json:"ref" cborgen:"ref"` 45 45 + // size: File size in bytes 46 46 + Size *int64 `json:"size,omitempty" cborgen:"size,omitempty"` 47 47 + } 48 48 + 49 49 + // RepoBlob_Signature is a "signature" in the sh.tangled.repo.blob schema. 50 50 + type RepoBlob_Signature struct { 51 51 + // email: Author email 52 52 + Email string `json:"email" cborgen:"email"` 53 53 + // name: Author name 54 54 + Name string `json:"name" cborgen:"name"` 55 55 + // when: Author timestamp 56 56 + When string `json:"when" cborgen:"when"` 57 57 + } 58 58 + 59 59 + // RepoBlob calls the XRPC method "sh.tangled.repo.blob". 60 60 + // 61 61 + // path: Path to the file within the repository 62 62 + // raw: Return raw file content instead of JSON response 63 63 + // ref: Git reference (branch, tag, or commit SHA) 64 64 + // repo: Repository identifier in format 'did:plc:.../repoName' 65 65 + func RepoBlob(ctx context.Context, c util.LexClient, path string, raw bool, ref string, repo string) (*RepoBlob_Output, error) { 66 66 + var out RepoBlob_Output 67 67 + 68 68 + params := map[string]interface{}{} 69 69 + params["path"] = path 70 70 + if raw { 71 71 + params["raw"] = raw 72 72 + } 73 73 + params["ref"] = ref 74 74 + params["repo"] = repo 75 75 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.blob", params, nil, &out); err != nil { 76 76 + return nil, err 77 77 + } 78 78 + 79 79 + return &out, nil 80 80 + }

+59

api/tangled/repobranch.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.branch 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoBranchNSID = "sh.tangled.repo.branch" 15 15 + ) 16 16 + 17 17 + // RepoBranch_Output is the output of a sh.tangled.repo.branch call. 18 18 + type RepoBranch_Output struct { 19 19 + Author *RepoBranch_Signature `json:"author,omitempty" cborgen:"author,omitempty"` 20 20 + // hash: Latest commit hash on this branch 21 21 + Hash string `json:"hash" cborgen:"hash"` 22 22 + // isDefault: Whether this is the default branch 23 23 + IsDefault *bool `json:"isDefault,omitempty" cborgen:"isDefault,omitempty"` 24 24 + // message: Latest commit message 25 25 + Message *string `json:"message,omitempty" cborgen:"message,omitempty"` 26 26 + // name: Branch name 27 27 + Name string `json:"name" cborgen:"name"` 28 28 + // shortHash: Short commit hash 29 29 + ShortHash *string `json:"shortHash,omitempty" cborgen:"shortHash,omitempty"` 30 30 + // when: Timestamp of latest commit 31 31 + When string `json:"when" cborgen:"when"` 32 32 + } 33 33 + 34 34 + // RepoBranch_Signature is a "signature" in the sh.tangled.repo.branch schema. 35 35 + type RepoBranch_Signature struct { 36 36 + // email: Author email 37 37 + Email string `json:"email" cborgen:"email"` 38 38 + // name: Author name 39 39 + Name string `json:"name" cborgen:"name"` 40 40 + // when: Author timestamp 41 41 + When string `json:"when" cborgen:"when"` 42 42 + } 43 43 + 44 44 + // RepoBranch calls the XRPC method "sh.tangled.repo.branch". 45 45 + // 46 46 + // name: Branch name to get information for 47 47 + // repo: Repository identifier in format 'did:plc:.../repoName' 48 48 + func RepoBranch(ctx context.Context, c util.LexClient, name string, repo string) (*RepoBranch_Output, error) { 49 49 + var out RepoBranch_Output 50 50 + 51 51 + params := map[string]interface{}{} 52 52 + params["name"] = name 53 53 + params["repo"] = repo 54 54 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.branch", params, nil, &out); err != nil { 55 55 + return nil, err 56 56 + } 57 57 + 58 58 + return &out, nil 59 59 + }

+39

api/tangled/repobranches.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.branches 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 + RepoBranchesNSID = "sh.tangled.repo.branches" 16 16 + ) 17 17 + 18 18 + // RepoBranches calls the XRPC method "sh.tangled.repo.branches". 19 19 + // 20 20 + // cursor: Pagination cursor 21 21 + // limit: Maximum number of branches to return 22 22 + // repo: Repository identifier in format 'did:plc:.../repoName' 23 23 + func RepoBranches(ctx context.Context, c util.LexClient, cursor string, limit int64, repo string) ([]byte, error) { 24 24 + buf := new(bytes.Buffer) 25 25 + 26 26 + params := map[string]interface{}{} 27 27 + if cursor != "" { 28 28 + params["cursor"] = cursor 29 29 + } 30 30 + if limit != 0 { 31 31 + params["limit"] = limit 32 32 + } 33 33 + params["repo"] = repo 34 34 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.branches", params, nil, buf); err != nil { 35 35 + return nil, err 36 36 + } 37 37 + 38 38 + return buf.Bytes(), nil 39 39 + }

+35

api/tangled/repocompare.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.compare 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 + RepoCompareNSID = "sh.tangled.repo.compare" 16 16 + ) 17 17 + 18 18 + // RepoCompare calls the XRPC method "sh.tangled.repo.compare". 19 19 + // 20 20 + // repo: Repository identifier in format 'did:plc:.../repoName' 21 21 + // rev1: First revision (commit, branch, or tag) 22 22 + // rev2: Second revision (commit, branch, or tag) 23 23 + func RepoCompare(ctx context.Context, c util.LexClient, repo string, rev1 string, rev2 string) ([]byte, error) { 24 24 + buf := new(bytes.Buffer) 25 25 + 26 26 + params := map[string]interface{}{} 27 27 + params["repo"] = repo 28 28 + params["rev1"] = rev1 29 29 + params["rev2"] = rev2 30 30 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.compare", params, nil, buf); err != nil { 31 31 + return nil, err 32 32 + } 33 33 + 34 34 + return buf.Bytes(), nil 35 35 + }

+33

api/tangled/repodiff.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.diff 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 + RepoDiffNSID = "sh.tangled.repo.diff" 16 16 + ) 17 17 + 18 18 + // RepoDiff calls the XRPC method "sh.tangled.repo.diff". 19 19 + // 20 20 + // ref: Git reference (branch, tag, or commit SHA) 21 21 + // repo: Repository identifier in format 'did:plc:.../repoName' 22 22 + func RepoDiff(ctx context.Context, c util.LexClient, ref string, repo string) ([]byte, error) { 23 23 + buf := new(bytes.Buffer) 24 24 + 25 25 + params := map[string]interface{}{} 26 26 + params["ref"] = ref 27 27 + params["repo"] = repo 28 28 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.diff", params, nil, buf); err != nil { 29 29 + return nil, err 30 30 + } 31 31 + 32 32 + return buf.Bytes(), nil 33 33 + }

+55

api/tangled/repogetDefaultBranch.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.getDefaultBranch 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoGetDefaultBranchNSID = "sh.tangled.repo.getDefaultBranch" 15 15 + ) 16 16 + 17 17 + // RepoGetDefaultBranch_Output is the output of a sh.tangled.repo.getDefaultBranch call. 18 18 + type RepoGetDefaultBranch_Output struct { 19 19 + Author *RepoGetDefaultBranch_Signature `json:"author,omitempty" cborgen:"author,omitempty"` 20 20 + // hash: Latest commit hash on default branch 21 21 + Hash string `json:"hash" cborgen:"hash"` 22 22 + // message: Latest commit message 23 23 + Message *string `json:"message,omitempty" cborgen:"message,omitempty"` 24 24 + // name: Default branch name 25 25 + Name string `json:"name" cborgen:"name"` 26 26 + // shortHash: Short commit hash 27 27 + ShortHash *string `json:"shortHash,omitempty" cborgen:"shortHash,omitempty"` 28 28 + // when: Timestamp of latest commit 29 29 + When string `json:"when" cborgen:"when"` 30 30 + } 31 31 + 32 32 + // RepoGetDefaultBranch_Signature is a "signature" in the sh.tangled.repo.getDefaultBranch schema. 33 33 + type RepoGetDefaultBranch_Signature struct { 34 34 + // email: Author email 35 35 + Email string `json:"email" cborgen:"email"` 36 36 + // name: Author name 37 37 + Name string `json:"name" cborgen:"name"` 38 38 + // when: Author timestamp 39 39 + When string `json:"when" cborgen:"when"` 40 40 + } 41 41 + 42 42 + // RepoGetDefaultBranch calls the XRPC method "sh.tangled.repo.getDefaultBranch". 43 43 + // 44 44 + // repo: Repository identifier in format 'did:plc:.../repoName' 45 45 + func RepoGetDefaultBranch(ctx context.Context, c util.LexClient, repo string) (*RepoGetDefaultBranch_Output, error) { 46 46 + var out RepoGetDefaultBranch_Output 47 47 + 48 48 + params := map[string]interface{}{} 49 49 + params["repo"] = repo 50 50 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.getDefaultBranch", params, nil, &out); err != nil { 51 51 + return nil, err 52 52 + } 53 53 + 54 54 + return &out, nil 55 55 + }

+61

api/tangled/repolanguages.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.languages 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoLanguagesNSID = "sh.tangled.repo.languages" 15 15 + ) 16 16 + 17 17 + // RepoLanguages_Language is a "language" in the sh.tangled.repo.languages schema. 18 18 + type RepoLanguages_Language struct { 19 19 + // color: Hex color code for this language 20 20 + Color *string `json:"color,omitempty" cborgen:"color,omitempty"` 21 21 + // extensions: File extensions associated with this language 22 22 + Extensions []string `json:"extensions,omitempty" cborgen:"extensions,omitempty"` 23 23 + // fileCount: Number of files in this language 24 24 + FileCount *int64 `json:"fileCount,omitempty" cborgen:"fileCount,omitempty"` 25 25 + // name: Programming language name 26 26 + Name string `json:"name" cborgen:"name"` 27 27 + // percentage: Percentage of total codebase (0-100) 28 28 + Percentage int64 `json:"percentage" cborgen:"percentage"` 29 29 + // size: Total size of files in this language (bytes) 30 30 + Size int64 `json:"size" cborgen:"size"` 31 31 + } 32 32 + 33 33 + // RepoLanguages_Output is the output of a sh.tangled.repo.languages call. 34 34 + type RepoLanguages_Output struct { 35 35 + Languages []*RepoLanguages_Language `json:"languages" cborgen:"languages"` 36 36 + // ref: The git reference used 37 37 + Ref string `json:"ref" cborgen:"ref"` 38 38 + // totalFiles: Total number of files analyzed 39 39 + TotalFiles *int64 `json:"totalFiles,omitempty" cborgen:"totalFiles,omitempty"` 40 40 + // totalSize: Total size of all analyzed files in bytes 41 41 + TotalSize *int64 `json:"totalSize,omitempty" cborgen:"totalSize,omitempty"` 42 42 + } 43 43 + 44 44 + // RepoLanguages calls the XRPC method "sh.tangled.repo.languages". 45 45 + // 46 46 + // ref: Git reference (branch, tag, or commit SHA) 47 47 + // repo: Repository identifier in format 'did:plc:.../repoName' 48 48 + func RepoLanguages(ctx context.Context, c util.LexClient, ref string, repo string) (*RepoLanguages_Output, error) { 49 49 + var out RepoLanguages_Output 50 50 + 51 51 + params := map[string]interface{}{} 52 52 + if ref != "" { 53 53 + params["ref"] = ref 54 54 + } 55 55 + params["repo"] = repo 56 56 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.languages", params, nil, &out); err != nil { 57 57 + return nil, err 58 58 + } 59 59 + 60 60 + return &out, nil 61 61 + }

+45

api/tangled/repolog.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.log 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 + RepoLogNSID = "sh.tangled.repo.log" 16 16 + ) 17 17 + 18 18 + // RepoLog calls the XRPC method "sh.tangled.repo.log". 19 19 + // 20 20 + // cursor: Pagination cursor (commit SHA) 21 21 + // limit: Maximum number of commits to return 22 22 + // path: Path to filter commits by 23 23 + // ref: Git reference (branch, tag, or commit SHA) 24 24 + // repo: Repository identifier in format 'did:plc:.../repoName' 25 25 + func RepoLog(ctx context.Context, c util.LexClient, cursor string, limit int64, path string, ref string, repo string) ([]byte, error) { 26 26 + buf := new(bytes.Buffer) 27 27 + 28 28 + params := map[string]interface{}{} 29 29 + if cursor != "" { 30 30 + params["cursor"] = cursor 31 31 + } 32 32 + if limit != 0 { 33 33 + params["limit"] = limit 34 34 + } 35 35 + if path != "" { 36 36 + params["path"] = path 37 37 + } 38 38 + params["ref"] = ref 39 39 + params["repo"] = repo 40 40 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.log", params, nil, buf); err != nil { 41 41 + return nil, err 42 42 + } 43 43 + 44 44 + return buf.Bytes(), nil 45 45 + }

+39

api/tangled/repotags.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.tags 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 + RepoTagsNSID = "sh.tangled.repo.tags" 16 16 + ) 17 17 + 18 18 + // RepoTags calls the XRPC method "sh.tangled.repo.tags". 19 19 + // 20 20 + // cursor: Pagination cursor 21 21 + // limit: Maximum number of tags to return 22 22 + // repo: Repository identifier in format 'did:plc:.../repoName' 23 23 + func RepoTags(ctx context.Context, c util.LexClient, cursor string, limit int64, repo string) ([]byte, error) { 24 24 + buf := new(bytes.Buffer) 25 25 + 26 26 + params := map[string]interface{}{} 27 27 + if cursor != "" { 28 28 + params["cursor"] = cursor 29 29 + } 30 30 + if limit != 0 { 31 31 + params["limit"] = limit 32 32 + } 33 33 + params["repo"] = repo 34 34 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.tags", params, nil, buf); err != nil { 35 35 + return nil, err 36 36 + } 37 37 + 38 38 + return buf.Bytes(), nil 39 39 + }

+73

lexicons/knot/listKeys.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.knot.listKeys", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "description": "List all public keys stored in the knot server", 8 8 + "parameters": { 9 9 + "type": "params", 10 10 + "properties": { 11 11 + "limit": { 12 12 + "type": "integer", 13 13 + "description": "Maximum number of keys to return", 14 14 + "minimum": 1, 15 15 + "maximum": 1000, 16 16 + "default": 100 17 17 + }, 18 18 + "cursor": { 19 19 + "type": "string", 20 20 + "description": "Pagination cursor" 21 21 + } 22 22 + } 23 23 + }, 24 24 + "output": { 25 25 + "encoding": "application/json", 26 26 + "schema": { 27 27 + "type": "object", 28 28 + "required": ["keys"], 29 29 + "properties": { 30 30 + "keys": { 31 31 + "type": "array", 32 32 + "items": { 33 33 + "type": "ref", 34 34 + "ref": "#publicKey" 35 35 + } 36 36 + }, 37 37 + "cursor": { 38 38 + "type": "string", 39 39 + "description": "Pagination cursor for next page" 40 40 + } 41 41 + } 42 42 + } 43 43 + }, 44 44 + "errors": [ 45 45 + { 46 46 + "name": "InternalServerError", 47 47 + "description": "Failed to retrieve public keys" 48 48 + } 49 49 + ] 50 50 + }, 51 51 + "publicKey": { 52 52 + "type": "object", 53 53 + "required": ["did", "key", "createdAt"], 54 54 + "properties": { 55 55 + "did": { 56 56 + "type": "string", 57 57 + "format": "did", 58 58 + "description": "DID associated with the public key" 59 59 + }, 60 60 + "key": { 61 61 + "type": "string", 62 62 + "maxLength": 4096, 63 63 + "description": "Public key contents" 64 64 + }, 65 65 + "createdAt": { 66 66 + "type": "string", 67 67 + "format": "datetime", 68 68 + "description": "Key upload timestamp" 69 69 + } 70 70 + } 71 71 + } 72 72 + } 73 73 + }

+55

lexicons/repo/archive.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.archive", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "parameters": { 8 8 + "type": "params", 9 9 + "required": ["repo", "ref"], 10 10 + "properties": { 11 11 + "repo": { 12 12 + "type": "string", 13 13 + "description": "Repository identifier in format 'did:plc:.../repoName'" 14 14 + }, 15 15 + "ref": { 16 16 + "type": "string", 17 17 + "description": "Git reference (branch, tag, or commit SHA)" 18 18 + }, 19 19 + "format": { 20 20 + "type": "string", 21 21 + "description": "Archive format", 22 22 + "enum": ["tar", "zip", "tar.gz", "tar.bz2", "tar.xz"], 23 23 + "default": "tar.gz" 24 24 + }, 25 25 + "prefix": { 26 26 + "type": "string", 27 27 + "description": "Prefix for files in the archive" 28 28 + } 29 29 + } 30 30 + }, 31 31 + "output": { 32 32 + "encoding": "*/*", 33 33 + "description": "Binary archive data" 34 34 + }, 35 35 + "errors": [ 36 36 + { 37 37 + "name": "RepoNotFound", 38 38 + "description": "Repository not found or access denied" 39 39 + }, 40 40 + { 41 41 + "name": "RefNotFound", 42 42 + "description": "Git reference not found" 43 43 + }, 44 44 + { 45 45 + "name": "InvalidRequest", 46 46 + "description": "Invalid request parameters" 47 47 + }, 48 48 + { 49 49 + "name": "ArchiveError", 50 50 + "description": "Failed to create archive" 51 51 + } 52 52 + ] 53 53 + } 54 54 + } 55 55 + }

+138

lexicons/repo/blob.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.blob", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "parameters": { 8 8 + "type": "params", 9 9 + "required": ["repo", "ref", "path"], 10 10 + "properties": { 11 11 + "repo": { 12 12 + "type": "string", 13 13 + "description": "Repository identifier in format 'did:plc:.../repoName'" 14 14 + }, 15 15 + "ref": { 16 16 + "type": "string", 17 17 + "description": "Git reference (branch, tag, or commit SHA)" 18 18 + }, 19 19 + "path": { 20 20 + "type": "string", 21 21 + "description": "Path to the file within the repository" 22 22 + }, 23 23 + "raw": { 24 24 + "type": "boolean", 25 25 + "description": "Return raw file content instead of JSON response", 26 26 + "default": false 27 27 + } 28 28 + } 29 29 + }, 30 30 + "output": { 31 31 + "encoding": "application/json", 32 32 + "schema": { 33 33 + "type": "object", 34 34 + "required": ["ref", "path", "content"], 35 35 + "properties": { 36 36 + "ref": { 37 37 + "type": "string", 38 38 + "description": "The git reference used" 39 39 + }, 40 40 + "path": { 41 41 + "type": "string", 42 42 + "description": "The file path" 43 43 + }, 44 44 + "content": { 45 45 + "type": "string", 46 46 + "description": "File content (base64 encoded for binary files)" 47 47 + }, 48 48 + "encoding": { 49 49 + "type": "string", 50 50 + "description": "Content encoding", 51 51 + "enum": ["utf-8", "base64"] 52 52 + }, 53 53 + "size": { 54 54 + "type": "integer", 55 55 + "description": "File size in bytes" 56 56 + }, 57 57 + "isBinary": { 58 58 + "type": "boolean", 59 59 + "description": "Whether the file is binary" 60 60 + }, 61 61 + "mimeType": { 62 62 + "type": "string", 63 63 + "description": "MIME type of the file" 64 64 + }, 65 65 + "lastCommit": { 66 66 + "type": "ref", 67 67 + "ref": "#lastCommit" 68 68 + } 69 69 + } 70 70 + } 71 71 + }, 72 72 + "errors": [ 73 73 + { 74 74 + "name": "RepoNotFound", 75 75 + "description": "Repository not found or access denied" 76 76 + }, 77 77 + { 78 78 + "name": "RefNotFound", 79 79 + "description": "Git reference not found" 80 80 + }, 81 81 + { 82 82 + "name": "FileNotFound", 83 83 + "description": "File not found at the specified path" 84 84 + }, 85 85 + { 86 86 + "name": "InvalidRequest", 87 87 + "description": "Invalid request parameters" 88 88 + } 89 89 + ] 90 90 + }, 91 91 + "lastCommit": { 92 92 + "type": "object", 93 93 + "required": ["hash", "message", "when"], 94 94 + "properties": { 95 95 + "hash": { 96 96 + "type": "string", 97 97 + "description": "Commit hash" 98 98 + }, 99 99 + "shortHash": { 100 100 + "type": "string", 101 101 + "description": "Short commit hash" 102 102 + }, 103 103 + "message": { 104 104 + "type": "string", 105 105 + "description": "Commit message" 106 106 + }, 107 107 + "author": { 108 108 + "type": "ref", 109 109 + "ref": "#signature" 110 110 + }, 111 111 + "when": { 112 112 + "type": "string", 113 113 + "format": "datetime", 114 114 + "description": "Commit timestamp" 115 115 + } 116 116 + } 117 117 + }, 118 118 + "signature": { 119 119 + "type": "object", 120 120 + "required": ["name", "email", "when"], 121 121 + "properties": { 122 122 + "name": { 123 123 + "type": "string", 124 124 + "description": "Author name" 125 125 + }, 126 126 + "email": { 127 127 + "type": "string", 128 128 + "description": "Author email" 129 129 + }, 130 130 + "when": { 131 131 + "type": "string", 132 132 + "format": "datetime", 133 133 + "description": "Author timestamp" 134 134 + } 135 135 + } 136 136 + } 137 137 + } 138 138 + }

+94

lexicons/repo/branch.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.branch", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "parameters": { 8 8 + "type": "params", 9 9 + "required": ["repo", "name"], 10 10 + "properties": { 11 11 + "repo": { 12 12 + "type": "string", 13 13 + "description": "Repository identifier in format 'did:plc:.../repoName'" 14 14 + }, 15 15 + "name": { 16 16 + "type": "string", 17 17 + "description": "Branch name to get information for" 18 18 + } 19 19 + } 20 20 + }, 21 21 + "output": { 22 22 + "encoding": "application/json", 23 23 + "schema": { 24 24 + "type": "object", 25 25 + "required": ["name", "hash", "when"], 26 26 + "properties": { 27 27 + "name": { 28 28 + "type": "string", 29 29 + "description": "Branch name" 30 30 + }, 31 31 + "hash": { 32 32 + "type": "string", 33 33 + "description": "Latest commit hash on this branch" 34 34 + }, 35 35 + "shortHash": { 36 36 + "type": "string", 37 37 + "description": "Short commit hash" 38 38 + }, 39 39 + "when": { 40 40 + "type": "string", 41 41 + "format": "datetime", 42 42 + "description": "Timestamp of latest commit" 43 43 + }, 44 44 + "message": { 45 45 + "type": "string", 46 46 + "description": "Latest commit message" 47 47 + }, 48 48 + "author": { 49 49 + "type": "ref", 50 50 + "ref": "#signature" 51 51 + }, 52 52 + "isDefault": { 53 53 + "type": "boolean", 54 54 + "description": "Whether this is the default branch" 55 55 + } 56 56 + } 57 57 + } 58 58 + }, 59 59 + "errors": [ 60 60 + { 61 61 + "name": "RepoNotFound", 62 62 + "description": "Repository not found or access denied" 63 63 + }, 64 64 + { 65 65 + "name": "BranchNotFound", 66 66 + "description": "Branch not found" 67 67 + }, 68 68 + { 69 69 + "name": "InvalidRequest", 70 70 + "description": "Invalid request parameters" 71 71 + } 72 72 + ] 73 73 + }, 74 74 + "signature": { 75 75 + "type": "object", 76 76 + "required": ["name", "email", "when"], 77 77 + "properties": { 78 78 + "name": { 79 79 + "type": "string", 80 80 + "description": "Author name" 81 81 + }, 82 82 + "email": { 83 83 + "type": "string", 84 84 + "description": "Author email" 85 85 + }, 86 86 + "when": { 87 87 + "type": "string", 88 88 + "format": "datetime", 89 89 + "description": "Author timestamp" 90 90 + } 91 91 + } 92 92 + } 93 93 + } 94 94 + }

+43

lexicons/repo/branches.json

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

+49

lexicons/repo/compare.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.compare", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "parameters": { 8 8 + "type": "params", 9 9 + "required": ["repo", "rev1", "rev2"], 10 10 + "properties": { 11 11 + "repo": { 12 12 + "type": "string", 13 13 + "description": "Repository identifier in format 'did:plc:.../repoName'" 14 14 + }, 15 15 + "rev1": { 16 16 + "type": "string", 17 17 + "description": "First revision (commit, branch, or tag)" 18 18 + }, 19 19 + "rev2": { 20 20 + "type": "string", 21 21 + "description": "Second revision (commit, branch, or tag)" 22 22 + } 23 23 + } 24 24 + }, 25 25 + "output": { 26 26 + "encoding": "*/*", 27 27 + "description": "Compare output in application/json" 28 28 + }, 29 29 + "errors": [ 30 30 + { 31 31 + "name": "RepoNotFound", 32 32 + "description": "Repository not found or access denied" 33 33 + }, 34 34 + { 35 35 + "name": "RevisionNotFound", 36 36 + "description": "One or both revisions not found" 37 37 + }, 38 38 + { 39 39 + "name": "InvalidRequest", 40 40 + "description": "Invalid request parameters" 41 41 + }, 42 42 + { 43 43 + "name": "CompareError", 44 44 + "description": "Failed to compare revisions" 45 45 + } 46 46 + ] 47 47 + } 48 48 + } 49 49 + }

+40

lexicons/repo/diff.json

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

+82

lexicons/repo/getDefaultBranch.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.getDefaultBranch", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "parameters": { 8 8 + "type": "params", 9 9 + "required": ["repo"], 10 10 + "properties": { 11 11 + "repo": { 12 12 + "type": "string", 13 13 + "description": "Repository identifier in format 'did:plc:.../repoName'" 14 14 + } 15 15 + } 16 16 + }, 17 17 + "output": { 18 18 + "encoding": "application/json", 19 19 + "schema": { 20 20 + "type": "object", 21 21 + "required": ["name", "hash", "when"], 22 22 + "properties": { 23 23 + "name": { 24 24 + "type": "string", 25 25 + "description": "Default branch name" 26 26 + }, 27 27 + "hash": { 28 28 + "type": "string", 29 29 + "description": "Latest commit hash on default branch" 30 30 + }, 31 31 + "shortHash": { 32 32 + "type": "string", 33 33 + "description": "Short commit hash" 34 34 + }, 35 35 + "when": { 36 36 + "type": "string", 37 37 + "format": "datetime", 38 38 + "description": "Timestamp of latest commit" 39 39 + }, 40 40 + "message": { 41 41 + "type": "string", 42 42 + "description": "Latest commit message" 43 43 + }, 44 44 + "author": { 45 45 + "type": "ref", 46 46 + "ref": "#signature" 47 47 + } 48 48 + } 49 49 + } 50 50 + }, 51 51 + "errors": [ 52 52 + { 53 53 + "name": "RepoNotFound", 54 54 + "description": "Repository not found or access denied" 55 55 + }, 56 56 + { 57 57 + "name": "InvalidRequest", 58 58 + "description": "Invalid request parameters" 59 59 + } 60 60 + ] 61 61 + }, 62 62 + "signature": { 63 63 + "type": "object", 64 64 + "required": ["name", "email", "when"], 65 65 + "properties": { 66 66 + "name": { 67 67 + "type": "string", 68 68 + "description": "Author name" 69 69 + }, 70 70 + "email": { 71 71 + "type": "string", 72 72 + "description": "Author email" 73 73 + }, 74 74 + "when": { 75 75 + "type": "string", 76 76 + "format": "datetime", 77 77 + "description": "Author timestamp" 78 78 + } 79 79 + } 80 80 + } 81 81 + } 82 82 + }

+99

lexicons/repo/languages.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.languages", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "parameters": { 8 8 + "type": "params", 9 9 + "required": ["repo"], 10 10 + "properties": { 11 11 + "repo": { 12 12 + "type": "string", 13 13 + "description": "Repository identifier in format 'did:plc:.../repoName'" 14 14 + }, 15 15 + "ref": { 16 16 + "type": "string", 17 17 + "description": "Git reference (branch, tag, or commit SHA)", 18 18 + "default": "HEAD" 19 19 + } 20 20 + } 21 21 + }, 22 22 + "output": { 23 23 + "encoding": "application/json", 24 24 + "schema": { 25 25 + "type": "object", 26 26 + "required": ["ref", "languages"], 27 27 + "properties": { 28 28 + "ref": { 29 29 + "type": "string", 30 30 + "description": "The git reference used" 31 31 + }, 32 32 + "languages": { 33 33 + "type": "array", 34 34 + "items": { 35 35 + "type": "ref", 36 36 + "ref": "#language" 37 37 + } 38 38 + }, 39 39 + "totalSize": { 40 40 + "type": "integer", 41 41 + "description": "Total size of all analyzed files in bytes" 42 42 + }, 43 43 + "totalFiles": { 44 44 + "type": "integer", 45 45 + "description": "Total number of files analyzed" 46 46 + } 47 47 + } 48 48 + } 49 49 + }, 50 50 + "errors": [ 51 51 + { 52 52 + "name": "RepoNotFound", 53 53 + "description": "Repository not found or access denied" 54 54 + }, 55 55 + { 56 56 + "name": "RefNotFound", 57 57 + "description": "Git reference not found" 58 58 + }, 59 59 + { 60 60 + "name": "InvalidRequest", 61 61 + "description": "Invalid request parameters" 62 62 + } 63 63 + ] 64 64 + }, 65 65 + "language": { 66 66 + "type": "object", 67 67 + "required": ["name", "size", "percentage"], 68 68 + "properties": { 69 69 + "name": { 70 70 + "type": "string", 71 71 + "description": "Programming language name" 72 72 + }, 73 73 + "size": { 74 74 + "type": "integer", 75 75 + "description": "Total size of files in this language (bytes)" 76 76 + }, 77 77 + "percentage": { 78 78 + "type": "integer", 79 79 + "description": "Percentage of total codebase (0-100)" 80 80 + }, 81 81 + "fileCount": { 82 82 + "type": "integer", 83 83 + "description": "Number of files in this language" 84 84 + }, 85 85 + "color": { 86 86 + "type": "string", 87 87 + "description": "Hex color code for this language" 88 88 + }, 89 89 + "extensions": { 90 90 + "type": "array", 91 91 + "items": { 92 92 + "type": "string" 93 93 + }, 94 94 + "description": "File extensions associated with this language" 95 95 + } 96 96 + } 97 97 + } 98 98 + } 99 99 + }

+60

lexicons/repo/log.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.log", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "parameters": { 8 8 + "type": "params", 9 9 + "required": ["repo", "ref"], 10 10 + "properties": { 11 11 + "repo": { 12 12 + "type": "string", 13 13 + "description": "Repository identifier in format 'did:plc:.../repoName'" 14 14 + }, 15 15 + "ref": { 16 16 + "type": "string", 17 17 + "description": "Git reference (branch, tag, or commit SHA)" 18 18 + }, 19 19 + "path": { 20 20 + "type": "string", 21 21 + "description": "Path to filter commits by", 22 22 + "default": "" 23 23 + }, 24 24 + "limit": { 25 25 + "type": "integer", 26 26 + "description": "Maximum number of commits to return", 27 27 + "minimum": 1, 28 28 + "maximum": 100, 29 29 + "default": 50 30 30 + }, 31 31 + "cursor": { 32 32 + "type": "string", 33 33 + "description": "Pagination cursor (commit SHA)" 34 34 + } 35 35 + } 36 36 + }, 37 37 + "output": { 38 38 + "encoding": "*/*" 39 39 + }, 40 40 + "errors": [ 41 41 + { 42 42 + "name": "RepoNotFound", 43 43 + "description": "Repository not found or access denied" 44 44 + }, 45 45 + { 46 46 + "name": "RefNotFound", 47 47 + "description": "Git reference not found" 48 48 + }, 49 49 + { 50 50 + "name": "PathNotFound", 51 51 + "description": "Path not found in repository" 52 52 + }, 53 53 + { 54 54 + "name": "InvalidRequest", 55 55 + "description": "Invalid request parameters" 56 56 + } 57 57 + ] 58 58 + } 59 59 + } 60 60 + }

+43

lexicons/repo/tags.json

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

+6

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

··· 11 11 {{ $last := sub (len $diff) 1 }} 12 12 13 13 <div class="flex flex-col gap-4"> 14 14 + {{ if eq (len $diff) 0 }} 15 15 + <div class="text-center text-gray-500 dark:text-gray-400 py-8"> 16 16 + <p>No differences found between the selected revisions.</p> 17 17 + </div> 18 18 + {{ else }} 14 19 {{ range $idx, $hunk := $diff }} 15 20 {{ with $hunk }} 16 21 <details open id="file-{{ .Name.New }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}"> ··· 50 55 </details> 51 56 {{ end }} 52 57 {{ end }} 58 58 + {{ end }} 53 59 </div> 54 60 {{ end }}

-285

knotclient/unsigned.go

··· 1 1 - package knotclient 2 2 - 3 3 - import ( 4 4 - "bytes" 5 5 - "encoding/json" 6 6 - "fmt" 7 7 - "io" 8 8 - "log" 9 9 - "net/http" 10 10 - "net/url" 11 11 - "strconv" 12 12 - "time" 13 13 - 14 14 - "tangled.sh/tangled.sh/core/types" 15 15 - ) 16 16 - 17 17 - type UnsignedClient struct { 18 18 - Url *url.URL 19 19 - client *http.Client 20 20 - } 21 21 - 22 22 - func NewUnsignedClient(domain string, dev bool) (*UnsignedClient, error) { 23 23 - client := &http.Client{ 24 24 - Timeout: 5 * time.Second, 25 25 - } 26 26 - 27 27 - scheme := "https" 28 28 - if dev { 29 29 - scheme = "http" 30 30 - } 31 31 - url, err := url.Parse(fmt.Sprintf("%s://%s", scheme, domain)) 32 32 - if err != nil { 33 33 - return nil, err 34 34 - } 35 35 - 36 36 - unsignedClient := &UnsignedClient{ 37 37 - client: client, 38 38 - Url: url, 39 39 - } 40 40 - 41 41 - return unsignedClient, nil 42 42 - } 43 43 - 44 44 - func (us *UnsignedClient) newRequest(method, endpoint string, query url.Values, body []byte) (*http.Request, error) { 45 45 - reqUrl := us.Url.JoinPath(endpoint) 46 46 - 47 47 - // add query parameters 48 48 - if query != nil { 49 49 - reqUrl.RawQuery = query.Encode() 50 50 - } 51 51 - 52 52 - return http.NewRequest(method, reqUrl.String(), bytes.NewReader(body)) 53 53 - } 54 54 - 55 55 - func do[T any](us *UnsignedClient, req *http.Request) (*T, error) { 56 56 - resp, err := us.client.Do(req) 57 57 - if err != nil { 58 58 - return nil, err 59 59 - } 60 60 - defer resp.Body.Close() 61 61 - 62 62 - body, err := io.ReadAll(resp.Body) 63 63 - if err != nil { 64 64 - log.Printf("Error reading response body: %v", err) 65 65 - return nil, err 66 66 - } 67 67 - 68 68 - var result T 69 69 - err = json.Unmarshal(body, &result) 70 70 - if err != nil { 71 71 - log.Printf("Error unmarshalling response body: %v", err) 72 72 - return nil, err 73 73 - } 74 74 - 75 75 - return &result, nil 76 76 - } 77 77 - 78 78 - func (us *UnsignedClient) Index(ownerDid, repoName, ref string) (*types.RepoIndexResponse, error) { 79 79 - const ( 80 80 - Method = "GET" 81 81 - ) 82 82 - 83 83 - endpoint := fmt.Sprintf("/%s/%s/tree/%s", ownerDid, repoName, ref) 84 84 - if ref == "" { 85 85 - endpoint = fmt.Sprintf("/%s/%s", ownerDid, repoName) 86 86 - } 87 87 - 88 88 - req, err := us.newRequest(Method, endpoint, nil, nil) 89 89 - if err != nil { 90 90 - return nil, err 91 91 - } 92 92 - 93 93 - return do[types.RepoIndexResponse](us, req) 94 94 - } 95 95 - 96 96 - func (us *UnsignedClient) Log(ownerDid, repoName, ref string, page int) (*types.RepoLogResponse, error) { 97 97 - const ( 98 98 - Method = "GET" 99 99 - ) 100 100 - 101 101 - endpoint := fmt.Sprintf("/%s/%s/log/%s", ownerDid, repoName, url.PathEscape(ref)) 102 102 - 103 103 - query := url.Values{} 104 104 - query.Add("page", strconv.Itoa(page)) 105 105 - query.Add("per_page", strconv.Itoa(60)) 106 106 - 107 107 - req, err := us.newRequest(Method, endpoint, query, nil) 108 108 - if err != nil { 109 109 - return nil, err 110 110 - } 111 111 - 112 112 - return do[types.RepoLogResponse](us, req) 113 113 - } 114 114 - 115 115 - func (us *UnsignedClient) Branches(ownerDid, repoName string) (*types.RepoBranchesResponse, error) { 116 116 - const ( 117 117 - Method = "GET" 118 118 - ) 119 119 - 120 120 - endpoint := fmt.Sprintf("/%s/%s/branches", ownerDid, repoName) 121 121 - 122 122 - req, err := us.newRequest(Method, endpoint, nil, nil) 123 123 - if err != nil { 124 124 - return nil, err 125 125 - } 126 126 - 127 127 - return do[types.RepoBranchesResponse](us, req) 128 128 - } 129 129 - 130 130 - func (us *UnsignedClient) Tags(ownerDid, repoName string) (*types.RepoTagsResponse, error) { 131 131 - const ( 132 132 - Method = "GET" 133 133 - ) 134 134 - 135 135 - endpoint := fmt.Sprintf("/%s/%s/tags", ownerDid, repoName) 136 136 - 137 137 - req, err := us.newRequest(Method, endpoint, nil, nil) 138 138 - if err != nil { 139 139 - return nil, err 140 140 - } 141 141 - 142 142 - return do[types.RepoTagsResponse](us, req) 143 143 - } 144 144 - 145 145 - func (us *UnsignedClient) Branch(ownerDid, repoName, branch string) (*types.RepoBranchResponse, error) { 146 146 - const ( 147 147 - Method = "GET" 148 148 - ) 149 149 - 150 150 - endpoint := fmt.Sprintf("/%s/%s/branches/%s", ownerDid, repoName, url.PathEscape(branch)) 151 151 - 152 152 - req, err := us.newRequest(Method, endpoint, nil, nil) 153 153 - if err != nil { 154 154 - return nil, err 155 155 - } 156 156 - 157 157 - return do[types.RepoBranchResponse](us, req) 158 158 - } 159 159 - 160 160 - func (us *UnsignedClient) DefaultBranch(ownerDid, repoName string) (*types.RepoDefaultBranchResponse, error) { 161 161 - const ( 162 162 - Method = "GET" 163 163 - ) 164 164 - 165 165 - endpoint := fmt.Sprintf("/%s/%s/branches/default", ownerDid, repoName) 166 166 - 167 167 - req, err := us.newRequest(Method, endpoint, nil, nil) 168 168 - if err != nil { 169 169 - return nil, err 170 170 - } 171 171 - 172 172 - resp, err := us.client.Do(req) 173 173 - if err != nil { 174 174 - return nil, err 175 175 - } 176 176 - defer resp.Body.Close() 177 177 - 178 178 - var defaultBranch types.RepoDefaultBranchResponse 179 179 - if err := json.NewDecoder(resp.Body).Decode(&defaultBranch); err != nil { 180 180 - return nil, err 181 181 - } 182 182 - 183 183 - return &defaultBranch, nil 184 184 - } 185 185 - 186 186 - func (us *UnsignedClient) Capabilities() (*types.Capabilities, error) { 187 187 - const ( 188 188 - Method = "GET" 189 189 - Endpoint = "/capabilities" 190 190 - ) 191 191 - 192 192 - req, err := us.newRequest(Method, Endpoint, nil, nil) 193 193 - if err != nil { 194 194 - return nil, err 195 195 - } 196 196 - 197 197 - resp, err := us.client.Do(req) 198 198 - if err != nil { 199 199 - return nil, err 200 200 - } 201 201 - defer resp.Body.Close() 202 202 - 203 203 - var capabilities types.Capabilities 204 204 - if err := json.NewDecoder(resp.Body).Decode(&capabilities); err != nil { 205 205 - return nil, err 206 206 - } 207 207 - 208 208 - return &capabilities, nil 209 209 - } 210 210 - 211 211 - func (us *UnsignedClient) Compare(ownerDid, repoName, rev1, rev2 string) (*types.RepoFormatPatchResponse, error) { 212 212 - const ( 213 213 - Method = "GET" 214 214 - ) 215 215 - 216 216 - endpoint := fmt.Sprintf("/%s/%s/compare/%s/%s", ownerDid, repoName, url.PathEscape(rev1), url.PathEscape(rev2)) 217 217 - 218 218 - req, err := us.newRequest(Method, endpoint, nil, nil) 219 219 - if err != nil { 220 220 - return nil, fmt.Errorf("Failed to create request.") 221 221 - } 222 222 - 223 223 - compareResp, err := us.client.Do(req) 224 224 - if err != nil { 225 225 - return nil, fmt.Errorf("Failed to create request.") 226 226 - } 227 227 - defer compareResp.Body.Close() 228 228 - 229 229 - switch compareResp.StatusCode { 230 230 - case 404: 231 231 - case 400: 232 232 - return nil, fmt.Errorf("Branch comparisons not supported on this knot.") 233 233 - } 234 234 - 235 235 - respBody, err := io.ReadAll(compareResp.Body) 236 236 - if err != nil { 237 237 - log.Println("failed to compare across branches") 238 238 - return nil, fmt.Errorf("Failed to compare branches.") 239 239 - } 240 240 - defer compareResp.Body.Close() 241 241 - 242 242 - var formatPatchResponse types.RepoFormatPatchResponse 243 243 - err = json.Unmarshal(respBody, &formatPatchResponse) 244 244 - if err != nil { 245 245 - log.Println("failed to unmarshal format-patch response", err) 246 246 - return nil, fmt.Errorf("failed to compare branches.") 247 247 - } 248 248 - 249 249 - return &formatPatchResponse, nil 250 250 - } 251 251 - 252 252 - func (s *UnsignedClient) RepoLanguages(ownerDid, repoName, ref string) (*types.RepoLanguageResponse, error) { 253 253 - const ( 254 254 - Method = "GET" 255 255 - ) 256 256 - endpoint := fmt.Sprintf("/%s/%s/languages/%s", ownerDid, repoName, url.PathEscape(ref)) 257 257 - 258 258 - req, err := s.newRequest(Method, endpoint, nil, nil) 259 259 - if err != nil { 260 260 - return nil, err 261 261 - } 262 262 - 263 263 - resp, err := s.client.Do(req) 264 264 - if err != nil { 265 265 - return nil, err 266 266 - } 267 267 - 268 268 - var result types.RepoLanguageResponse 269 269 - if resp.StatusCode != http.StatusOK { 270 270 - log.Println("failed to calculate languages", resp.Status) 271 271 - return &types.RepoLanguageResponse{}, nil 272 272 - } 273 273 - 274 274 - body, err := io.ReadAll(resp.Body) 275 275 - if err != nil { 276 276 - return nil, err 277 277 - } 278 278 - 279 279 - err = json.Unmarshal(body, &result) 280 280 - if err != nil { 281 281 - return nil, err 282 282 - } 283 283 - 284 284 - return &result, nil 285 285 - }

+30

api/tangled/tangledowner.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.owner 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + OwnerNSID = "sh.tangled.owner" 15 15 + ) 16 16 + 17 17 + // Owner_Output is the output of a sh.tangled.owner call. 18 18 + type Owner_Output struct { 19 19 + Owner string `json:"owner" cborgen:"owner"` 20 20 + } 21 21 + 22 22 + // Owner calls the XRPC method "sh.tangled.owner". 23 23 + func Owner(ctx context.Context, c util.LexClient) (*Owner_Output, error) { 24 24 + var out Owner_Output 25 25 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.owner", nil, nil, &out); err != nil { 26 26 + return nil, err 27 27 + } 28 28 + 29 29 + return &out, nil 30 30 + }

+31

lexicons/owner.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.owner", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "description": "Get the owner of a service", 8 8 + "output": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "owner" 14 14 + ], 15 15 + "properties": { 16 16 + "owner": { 17 17 + "type": "string", 18 18 + "format": "did" 19 19 + } 20 20 + } 21 21 + } 22 22 + }, 23 23 + "errors": [ 24 24 + { 25 25 + "name": "OwnerNotFound", 26 26 + "description": "Owner is not set for this service" 27 27 + } 28 28 + ] 29 29 + } 30 30 + } 31 31 + }

-12

appview/pages/templates/knots/fragments/bannerRequiresUpgrade.html

··· 1 1 - {{ define "knots/fragments/bannerRequiresUpgrade" }} 2 2 - <div class="px-6 py-2"> 3 3 - The following knots that you administer will have to be upgraded to be compatible with the latest version of Tangled: 4 4 - <ul class="list-disc mx-12 my-2"> 5 5 - {{range $i, $r := .Registrations}} 6 6 - <li>{{ $r.Domain }}</li> 7 7 - {{ end }} 8 8 - </ul> 9 9 - Repositories hosted on these knots will not be accessible until upgraded. 10 10 - <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/migrations/knot-1.8.0.md">Click to read the upgrade guide</a>. 11 11 - </div> 12 12 - {{ end }}

+30

api/tangled/knotversion.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.knot.version 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + KnotVersionNSID = "sh.tangled.knot.version" 15 15 + ) 16 16 + 17 17 + // KnotVersion_Output is the output of a sh.tangled.knot.version call. 18 18 + type KnotVersion_Output struct { 19 19 + Version string `json:"version" cborgen:"version"` 20 20 + } 21 21 + 22 22 + // KnotVersion calls the XRPC method "sh.tangled.knot.version". 23 23 + func KnotVersion(ctx context.Context, c util.LexClient) (*KnotVersion_Output, error) { 24 24 + var out KnotVersion_Output 25 25 + if err := c.LexDo(ctx, util.Query, "", "sh.tangled.knot.version", nil, nil, &out); err != nil { 26 26 + return nil, err 27 27 + } 28 28 + 29 29 + return &out, nil 30 30 + }

+25

lexicons/knot/version.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.knot.version", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "query", 7 7 + "description": "Get the version of a knot", 8 8 + "output": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "version" 14 14 + ], 15 15 + "properties": { 16 16 + "version": { 17 17 + "type": "string" 18 18 + } 19 19 + } 20 20 + } 21 21 + }, 22 22 + "errors": [] 23 23 + } 24 24 + } 25 25 + }

+6 -1

appview/pages/templates/spindles/fragments/spindleListing.html

··· 30 30 {{ define "spindleRightSide" }} 31 31 <div id="right-side" class="flex gap-2"> 32 32 {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2 text-sm" }} 33 33 - {{ if .Verified }} 33 33 + 34 34 + {{ if .NeedsUpgrade }} 35 35 + <span class="bg-yellow-100 text-yellow-800 dark:bg-yellow-900 dark:text-yellow-200 {{$style}}"> {{ i "shield-alert" "w-4 h-4" }} needs upgrade </span> 36 36 + {{ block "spindleRetryButton" . }} {{ end }} 37 37 + {{ else if .Verified }} 34 38 <span class="bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 {{$style}}">{{ i "shield-check" "w-4 h-4" }} verified</span> 35 39 {{ template "spindles/fragments/addMemberModal" . }} 36 40 {{ else }} 37 41 <span class="bg-red-100 text-red-800 dark:bg-red-900 dark:text-red-200 {{$style}}">{{ i "shield-off" "w-4 h-4" }} unverified</span> 38 42 {{ block "spindleRetryButton" . }} {{ end }} 39 43 {{ end }} 44 44 + 40 45 {{ block "spindleDeleteButton" . }} {{ end }} 41 46 </div> 42 47 {{ end }}

+1 -2

api/tangled/issuecomment.go

··· 21 21 Body string `json:"body" cborgen:"body"` 22 22 CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 Issue string `json:"issue" cborgen:"issue"` 24 24 - Owner *string `json:"owner,omitempty" cborgen:"owner,omitempty"` 25 25 - Repo *string `json:"repo,omitempty" cborgen:"repo,omitempty"` 24 24 + ReplyTo *string `json:"replyTo,omitempty" cborgen:"replyTo,omitempty"` 26 25 }

+9 -9

lexicons/issue/comment.json

··· 9 9 "key": "tid", 10 10 "record": { 11 11 "type": "object", 12 12 - "required": ["issue", "body", "createdAt"], 12 12 + "required": [ 13 13 + "issue", 14 14 + "body", 15 15 + "createdAt" 16 16 + ], 13 17 "properties": { 14 18 "issue": { 15 19 "type": "string", 16 20 "format": "at-uri" 17 21 }, 18 18 - "repo": { 19 19 - "type": "string", 20 20 - "format": "at-uri" 21 21 - }, 22 22 - "owner": { 23 23 - "type": "string", 24 24 - "format": "did" 25 25 - }, 26 22 "body": { 27 23 "type": "string" 28 24 }, 29 25 "createdAt": { 30 26 "type": "string", 31 27 "format": "datetime" 28 28 + }, 29 29 + "replyTo": { 30 30 + "type": "string", 31 31 + "format": "at-uri" 32 32 } 33 33 } 34 34 }

+9

appview/pages/templates/repo/issues/fragments/issueCommentBody.html

··· 1 1 + {{ define "repo/issues/fragments/issueCommentBody" }} 2 2 + <div id="comment-body-{{.Comment.Id}}"> 3 3 + {{ if not .Comment.Deleted }} 4 4 + <div class="prose dark:prose-invert">{{ .Comment.Body | markdown }}</div> 5 5 + {{ else }} 6 6 + <div class="prose dark:prose-invert italic text-gray-500 dark:text-gray-400">[deleted by author]</div> 7 7 + {{ end }} 8 8 + </div> 9 9 + {{ end }}

+57

appview/pages/templates/repo/issues/fragments/putIssue.html

··· 1 1 + {{ define "repo/issues/fragments/putIssue" }} 2 2 + <!-- this form is used for new and edit, .Issue is passed when editing --> 3 3 + <form 4 4 + {{ if eq .Action "edit" }} 5 5 + hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/edit" 6 6 + {{ else }} 7 7 + hx-post="/{{ .RepoInfo.FullName }}/issues/new" 8 8 + {{ end }} 9 9 + hx-swap="none" 10 10 + hx-indicator="#spinner"> 11 11 + <div class="flex flex-col gap-2"> 12 12 + <div> 13 13 + <label for="title">title</label> 14 14 + <input type="text" name="title" id="title" class="w-full" value="{{ if .Issue }}{{ .Issue.Title }}{{ end }}" /> 15 15 + </div> 16 16 + <div> 17 17 + <label for="body">body</label> 18 18 + <textarea 19 19 + name="body" 20 20 + id="body" 21 21 + rows="6" 22 22 + class="w-full resize-y" 23 23 + placeholder="Describe your issue. Markdown is supported." 24 24 + >{{ if .Issue }}{{ .Issue.Body }}{{ end }}</textarea> 25 25 + </div> 26 26 + <div class="flex justify-between"> 27 27 + <div id="issues" class="error"></div> 28 28 + <div class="flex gap-2 items-center"> 29 29 + <a 30 30 + class="btn flex items-center gap-2 no-underline hover:no-underline" 31 31 + type="button" 32 32 + {{ if .Issue }} 33 33 + href="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}" 34 34 + {{ else }} 35 35 + href="/{{ .RepoInfo.FullName }}/issues" 36 36 + {{ end }} 37 37 + > 38 38 + {{ i "x" "w-4 h-4" }} 39 39 + cancel 40 40 + </a> 41 41 + <button type="submit" class="btn-create flex items-center gap-2"> 42 42 + {{ if eq .Action "edit" }} 43 43 + {{ i "pencil" "w-4 h-4" }} 44 44 + {{ .Action }} issue 45 45 + {{ else }} 46 46 + {{ i "circle-plus" "w-4 h-4" }} 47 47 + {{ .Action }} issue 48 48 + {{ end }} 49 49 + <span id="spinner" class="group"> 50 50 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 51 51 + </span> 52 52 + </button> 53 53 + </div> 54 54 + </div> 55 55 + </div> 56 56 + </form> 57 57 + {{ end }}

+5

xrpc/errors/errors.go

··· 61 61 WithMessage("failed to access repository"), 62 62 ) 63 63 64 64 + var RefNotFoundError = NewXrpcError( 65 65 + WithTag("RefNotFound"), 66 66 + WithMessage("failed to access ref"), 67 67 + ) 68 68 + 64 69 var AuthError = func(err error) XrpcError { 65 70 return NewXrpcError( 66 71 WithTag("Auth"),

+15

flake.lock

··· 1 1 { 2 2 "nodes": { 3 3 + "flake-compat": { 4 4 + "flake": false, 5 5 + "locked": { 6 6 + "lastModified": 1751685974, 7 7 + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", 8 8 + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", 9 9 + "type": "tarball", 10 10 + "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1" 11 11 + }, 12 12 + "original": { 13 13 + "type": "tarball", 14 14 + "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz" 15 15 + } 16 16 + }, 3 17 "flake-utils": { 4 18 "inputs": { 5 19 "systems": "systems" ··· 136 150 }, 137 151 "root": { 138 152 "inputs": { 153 153 + "flake-compat": "flake-compat", 139 154 "gomod2nix": "gomod2nix", 140 155 "htmx-src": "htmx-src", 141 156 "htmx-ws-src": "htmx-ws-src",

+44

contrib/Tiltfile

··· 1 1 + common_env = { 2 2 + "TANGLED_VM_SPINDLE_OWNER": os.getenv("TANGLED_VM_SPINDLE_OWNER", default=""), 3 3 + "TANGLED_VM_KNOT_OWNER": os.getenv("TANGLED_VM_KNOT_OWNER", default=""), 4 4 + "TANGLED_DB_PATH": os.getenv("TANGLED_DB_PATH", default="dev.db"), 5 5 + "TANGLED_DEV": os.getenv("TANGLED_DEV", default="true"), 6 6 + } 7 7 + 8 8 + nix_globs = ["nix/**", "flake.nix", "flake.lock"] 9 9 + 10 10 + local_resource( 11 11 + name="appview", 12 12 + serve_cmd="nix run .#watch-appview", 13 13 + serve_dir="..", 14 14 + deps=nix_globs, 15 15 + env=common_env, 16 16 + allow_parallel=True, 17 17 + ) 18 18 + 19 19 + local_resource( 20 20 + name="tailwind", 21 21 + serve_cmd="nix run .#watch-tailwind", 22 22 + serve_dir="..", 23 23 + deps=nix_globs, 24 24 + env=common_env, 25 25 + allow_parallel=True, 26 26 + ) 27 27 + 28 28 + local_resource( 29 29 + name="redis", 30 30 + serve_cmd="redis-server", 31 31 + serve_dir="..", 32 32 + deps=nix_globs, 33 33 + env=common_env, 34 34 + allow_parallel=True, 35 35 + ) 36 36 + 37 37 + local_resource( 38 38 + name="vm", 39 39 + serve_cmd="nix run --impure .#vm", 40 40 + serve_dir="..", 41 41 + deps=nix_globs, 42 42 + env=common_env, 43 43 + allow_parallel=True, 44 44 + )

+90

appview/pages/templates/fragments/multiline-select.html

··· 1 1 + {{ define "fragments/multiline-select" }} 2 2 + <script> 3 3 + function highlight(scroll = false) { 4 4 + document.querySelectorAll(".hl").forEach(el => { 5 5 + el.classList.remove("hl"); 6 6 + }); 7 7 + 8 8 + const hash = window.location.hash; 9 9 + if (!hash || !hash.startsWith("#L")) { 10 10 + return; 11 11 + } 12 12 + 13 13 + const rangeStr = hash.substring(2); 14 14 + const parts = rangeStr.split("-"); 15 15 + let startLine, endLine; 16 16 + 17 17 + if (parts.length === 2) { 18 18 + startLine = parseInt(parts[0], 10); 19 19 + endLine = parseInt(parts[1], 10); 20 20 + } else { 21 21 + startLine = parseInt(parts[0], 10); 22 22 + endLine = startLine; 23 23 + } 24 24 + 25 25 + if (isNaN(startLine) || isNaN(endLine)) { 26 26 + console.log("nan"); 27 27 + console.log(startLine); 28 28 + console.log(endLine); 29 29 + return; 30 30 + } 31 31 + 32 32 + let target = null; 33 33 + 34 34 + for (let i = startLine; i<= endLine; i++) { 35 35 + const idEl = document.getElementById(`L${i}`); 36 36 + if (idEl) { 37 37 + const el = idEl.closest(".line"); 38 38 + if (el) { 39 39 + el.classList.add("hl"); 40 40 + target = el; 41 41 + } 42 42 + } 43 43 + } 44 44 + 45 45 + if (scroll && target) { 46 46 + target.scrollIntoView({ 47 47 + behavior: "smooth", 48 48 + block: "center", 49 49 + }); 50 50 + } 51 51 + } 52 52 + 53 53 + document.addEventListener("DOMContentLoaded", () => { 54 54 + console.log("DOMContentLoaded"); 55 55 + highlight(true); 56 56 + }); 57 57 + window.addEventListener("hashchange", () => { 58 58 + console.log("hashchange"); 59 59 + highlight(); 60 60 + }); 61 61 + window.addEventListener("popstate", () => { 62 62 + console.log("popstate"); 63 63 + highlight(); 64 64 + }); 65 65 + 66 66 + const lineNumbers = document.querySelectorAll('a[href^="#L"'); 67 67 + let startLine = null; 68 68 + 69 69 + lineNumbers.forEach(el => { 70 70 + el.addEventListener("click", (event) => { 71 71 + event.preventDefault(); 72 72 + const currentLine = parseInt(el.href.split("#L")[1]); 73 73 + 74 74 + if (event.shiftKey && startLine !== null) { 75 75 + const endLine = currentLine; 76 76 + const min = Math.min(startLine, endLine); 77 77 + const max = Math.max(startLine, endLine); 78 78 + const newHash = `#L${min}-${max}`; 79 79 + history.pushState(null, '', newHash); 80 80 + } else { 81 81 + const newHash = `#L${currentLine}`; 82 82 + history.pushState(null, '', newHash); 83 83 + startLine = currentLine; 84 84 + } 85 85 + 86 86 + highlight(); 87 87 + }); 88 88 + }); 89 89 + </script> 90 90 + {{ end }}

+56

appview/pages/templates/fragments/dolly/logo.html

··· 1 1 + {{ define "fragments/dolly/logo" }} 2 2 + <svg 3 3 + version="1.1" 4 4 + id="svg1" 5 5 + class="{{.}}" 6 6 + width="25" 7 7 + height="25" 8 8 + viewBox="0 0 25 25" 9 9 + sodipodi:docname="tangled_dolly_face_only.png" 10 10 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 11 11 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 12 12 + xmlns:xlink="http://www.w3.org/1999/xlink" 13 13 + xmlns="http://www.w3.org/2000/svg" 14 14 + xmlns:svg="http://www.w3.org/2000/svg"> 15 15 + <title>Dolly</title> 16 16 + <defs 17 17 + id="defs1" /> 18 18 + <sodipodi:namedview 19 19 + id="namedview1" 20 20 + pagecolor="#ffffff" 21 21 + bordercolor="#000000" 22 22 + borderopacity="0.25" 23 23 + inkscape:showpageshadow="2" 24 24 + inkscape:pageopacity="0.0" 25 25 + inkscape:pagecheckerboard="true" 26 26 + inkscape:deskcolor="#d5d5d5"> 27 27 + <inkscape:page 28 28 + x="0" 29 29 + y="0" 30 30 + width="25" 31 31 + height="25" 32 32 + id="page2" 33 33 + margin="0" 34 34 + bleed="0" /> 35 35 + </sodipodi:namedview> 36 36 + <g 37 37 + inkscape:groupmode="layer" 38 38 + inkscape:label="Image" 39 39 + id="g1"> 40 40 + <image 41 41 + width="252.48" 42 42 + height="248.96001" 43 43 + preserveAspectRatio="none" 44 44 + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAxUAAAMKCAYAAADznWlEAAABg2lDQ1BJQ0MgcHJvZmlsZQAAKJF9&#10;kT1Iw0AcxV9TpVoqDmYQcchQneyiIo61CkWoEGqFVh1MLv2CJi1Jiouj4Fpw8GOx6uDirKuDqyAI&#10;foC4C06KLlLi/5JCixgPjvvx7t7j7h0gNCtMt3rigG7YZjqZkLK5VSn0in6EISKGsMKs2pwsp+A7&#10;vu4R4OtdjGf5n/tzDGh5iwEBiTjOaqZNvEE8s2nXOO8Ti6ykaMTnxBMmXZD4keuqx2+ciy4LPFM0&#10;M+l5YpFYKnax2sWsZOrE08RRTTcoX8h6rHHe4qxX6qx9T/7CSN5YWeY6zVEksYglyJCgoo4yKrCp&#10;rzIMUiykaT/h4x9x/TK5VHKVwcixgCp0KK4f/A9+d2sVpia9pEgC6H1xnI8xILQLtBqO833sOK0T&#10;IPgMXBkdf7UJzH6S3uho0SNgcBu4uO5o6h5wuQMMP9UUU3GlIE2hUADez+ibcsDQLRBe83pr7+P0&#10;AchQV6kb4OAQGC9S9rrPu/u6e/v3TLu/H4tGcrDFxPPTAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBI&#10;WXMAAC4jAAAuIwF4pT92AAAAB3RJTUUH6QkPFQ8jl/6e6wAAABl0RVh0Q29tbWVudABDcmVhdGVk&#10;IHdpdGggR0lNUFeBDhcAACAASURBVHic7N3nc5xXmqb564UjCXoripShvKNMqVSSynWXmZ6emd39&#10;NhH7R+6HjdiN6d3emZ7uru6ukqpKXUbeUKIMJZKitwBhzn64z1uZpEiJIAGkea9fRAZIgCCTQCLz&#10;3O95nueAJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS&#10;JEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS&#10;JEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmSJEmS&#10;JEmSJEmSJEmSJEmSJOkONYO+A5IkjYtSSgNM0Ht9LX036vvbj7fvX+77K/pfl0vTNAVJGgGGCkmS&#10;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&#10;U2QU7On6+9OkT6L5/hwwWxRFZ13erbQJGVRIknSFpqampn7961/vuf/++/ft27fvjsnJyVvKsrxp&#10;YWFh79LS0r52u33L2NjY9vHx8ZGhoSGSyNBVWgYuAB8Dh0h50wfACRJAnCc7J+bsmZDWj1c5SZKu&#10;0muvvVa0Wq3ij3/84/D09PT2bdu23XPnnXd+7Y477nhg7969e3fv3r1lbGxsBBiqqmq4LMtxYKrd&#10;bt/QarXGi6Jwq3eUZI/EMslILJKdEvMk63AceIfsljhMMhKz9d9f4m4bad05zkKSpKv06KOPVkA1&#10;MjKy9KMf/ejM+Pj4+bIs36iqarjT6QzNzMwMTU9PD09PT08uLCzsHB0dvWPbtm1f3bVr1wOTk5P7&#10;hoeHd5CSqWbpXtME3qLu1+j5vp97Nio+2wfRvJpAYh64RHZJNFuuT5JsxCf199Ok/Gmp/nMGEtIG&#10;0q8XJ0mS+snQD3/4w5Ef//jHE/fdd9/Wffv2TW3ZsmViaGhotCzL4bIsR1qt1mir1RpvtVpbgJ3A&#10;rcC++utNwBSfDUD6Qe9kpjlSxnSW9D+crl9n69dFElhcIlmIebKUbqH+8ys2XEsbl0GFJEnrr7V/&#10;//6he++9d2R8fHyCBBA3kuBiB7ANGCdlVC2gKMuyqKqqVZZlM962KIqiaLVaFEXRvJrMRxsYrf8Z&#10;k/XXYYCyLKuyLKmqqirLsvefUbXb7SaT0DQ8T9TvZ0/93qZI1UNJt1zpEgkQLtSvi6Tv4QIpZTpf&#10;f21+b5YEHIskC2HwIPUhgwpJkvpPb5lUqyiK1k9/+tPioYceKu6++2727dvH1q1bi8nJyWJoaKhF&#10;HvzHSRAwBdxAPalqaWmJxcXFanl5uVpZWSlarVZreHiYkZGRamxsbLlufl6u/503ALcAdwN3kgzK&#10;KAkoLvKPWYhpulmIWbpZhw4JRD77H2U5k9S37KmQJKn/VEDnBz/4QTk1NcXu3bu5/fbb2b59O+Pj&#10;4wwNDdFkLGoFyRAUn3v9g38yqar3Qb8gQcRWkknZTrIgcyRDMUMChyVghbr3ge5uiQp7IaSBZKZC&#10;kiR9aVVVNVmSofpV0G267gAdgwZJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ&#10;kiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ&#10;kiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ&#10;kiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ&#10;kiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ&#10;kiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ&#10;kiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJktbC&#10;/wcO9A7eMaXQEQAAAABJRU5ErkJggg==&#10;" 45 45 + id="image1" 46 46 + x="-233.6257" 47 47 + y="10.383364" 48 48 + style="display:none" /> 49 49 + <path 50 50 + fill="currentColor" 51 51 + style="stroke-width:0.111183" 52 52 + d="m 16.348974,24.09935 -0.06485,-0.03766 -0.202005,-0.0106 -0.202008,-0.01048 -0.275736,-0.02601 -0.275734,-0.02602 v -0.02649 -0.02648 l -0.204577,-0.04019 -0.204578,-0.04019 -0.167616,-0.08035 -0.167617,-0.08035 -0.0014,-0.04137 -0.0014,-0.04137 -0.266473,-0.143735 -0.266475,-0.143735 -0.276098,-0.20335 -0.2761,-0.203347 -0.262064,-0.251949 -0.262064,-0.25195 -0.22095,-0.284628 -0.220948,-0.284629 -0.170253,-0.284631 -0.170252,-0.284628 -0.01341,-0.0144 -0.0134,-0.0144 -0.141982,0.161297 -0.14198,0.1613 -0.22313,0.21426 -0.223132,0.214264 -0.186025,0.146053 -0.186023,0.14605 -0.252501,0.163342 -0.252502,0.163342 -0.249014,0.115348 -0.249013,0.115336 0.0053,0.03241 0.0053,0.03241 -0.1716725,0.04599 -0.171669,0.046 -0.3379966,0.101058 -0.3379972,0.101058 -0.1778925,0.04506 -0.1778935,0.04508 -0.3913655,0.02601 -0.3913643,0.02603 -0.3557868,-0.03514 -0.3557863,-0.03514 -0.037426,-0.03029 -0.037427,-0.03029 -0.076924,0.02011 -0.076924,0.02011 -0.050508,-0.05051 -0.050405,-0.05056 L 6.6604532,23.110188 6.451745,23.063961 6.1546135,22.960559 5.8574835,22.857156 5.5319879,22.694039 5.2064938,22.530922 4.8793922,22.302961 4.5522905,22.075005 4.247598,21.786585 3.9429055,21.49817 3.7185335,21.208777 3.4941628,20.919385 3.3669822,20.705914 3.239803,20.492443 3.1335213,20.278969 3.0272397,20.065499 2.9015252,19.7275 2.7758105,19.389504 2.6925225,18.998139 2.6092345,18.606774 2.6096814,17.91299 2.6101284,17.219208 2.6744634,16.90029 2.7387984,16.581374 2.8474286,16.242088 2.9560588,15.9028 3.1137374,15.583492 3.2714148,15.264182 3.3415068,15.150766 3.4115988,15.03735 3.3127798,14.96945 3.2139618,14.90157 3.0360685,14.800239 2.8581753,14.698908 2.5913347,14.503228 2.3244955,14.307547 2.0621238,14.055599 1.7997507,13.803651 1.6111953,13.56878 1.4226411,13.333906 1.2632237,13.087474 1.1038089,12.841042 0.97442,12.575195 0.8450307,12.30935 0.724603,11.971351 0.6041766,11.633356 0.52150365,11.241991 0.4388285,10.850626 0.44091592,10.156842 0.44300333,9.4630594 0.54235911,9.0369608 0.6417149,8.6108622 0.7741173,8.2694368 0.9065196,7.9280115 1.0736303,7.6214262 1.2407515,7.3148397 1.45931,7.0191718 1.6778685,6.7235039 1.9300326,6.4611321 2.1821966,6.1987592 2.4134579,6.0137228 2.6447193,5.8286865 2.8759792,5.6776409 3.1072406,5.526594 3.4282004,5.3713977 3.7491603,5.2162016 3.9263009,5.1508695 4.1034416,5.0855373 4.2813348,4.7481598 4.4592292,4.4107823 4.6718,4.108422 4.8843733,3.8060618 5.198353,3.4805372 5.5123313,3.155014 5.7685095,2.9596425 6.0246877,2.7642722 6.329187,2.5851365 6.6336863,2.406002 6.9497657,2.2751596 7.2658453,2.1443184 7.4756394,2.0772947 7.6854348,2.01027 8.0825241,1.931086 8.4796139,1.851902 l 0.5870477,0.00291 0.5870469,0.00291 0.4447315,0.092455 0.444734,0.092455 0.302419,0.1105495 0.302417,0.1105495 0.329929,0.1646046 0.32993,0.1646033 0.239329,-0.2316919 0.239329,-0.2316919 0.160103,-0.1256767 0.160105,-0.1256767 0.160102,-0.1021909 0.160105,-0.1021899 0.142315,-0.082328 0.142314,-0.082328 0.231262,-0.1090091 0.231259,-0.1090091 0.26684,-0.098743 0.266839,-0.098743 0.320208,-0.073514 0.320209,-0.073527 0.355787,-0.041833 0.355785,-0.041834 0.426942,0.023827 0.426945,0.023828 0.355785,0.071179 0.355788,0.0711791 0.284627,0.09267 0.284629,0.09267 0.28514,0.1310267 0.28514,0.1310255 0.238179,0.1446969 0.238174,0.1446979 0.259413,0.1955332 0.259413,0.1955319 0.290757,0.296774 0.290758,0.2967753 0.151736,0.1941581 0.151734,0.1941594 0.135326,0.2149951 0.135327,0.2149952 0.154755,0.3202073 0.154758,0.3202085 0.09409,0.2677358 0.09409,0.267737 0.06948,0.3319087 0.06948,0.3319099 0.01111,0.00808 0.01111,0.00808 0.444734,0.2173653 0.444734,0.2173665 0.309499,0.2161102 0.309497,0.2161101 0.309694,0.2930023 0.309694,0.2930037 0.18752,0.2348726 0.187524,0.2348727 0.166516,0.2574092 0.166519,0.2574108 0.15273,0.3260252 0.152734,0.3260262 0.08972,0.2668403 0.08971,0.2668391 0.08295,0.3913655 0.08295,0.3913652 -6.21e-4,0.6582049 -6.21e-4,0.658204 -0.06362,0.315725 -0.06362,0.315725 -0.09046,0.289112 -0.09046,0.289112 -0.122759,0.281358 -0.12276,0.281356 -0.146626,0.252323 -0.146629,0.252322 -0.190443,0.258668 -0.190448,0.258671 -0.254911,0.268356 -0.254911,0.268355 -0.286872,0.223127 -0.286874,0.223127 -0.320203,0.187693 -0.320209,0.187693 -0.04347,0.03519 -0.04347,0.03521 0.0564,0.12989 0.0564,0.129892 0.08728,0.213472 0.08728,0.213471 0.189755,0.729363 0.189753,0.729362 0.0652,0.302417 0.0652,0.302419 -0.0018,0.675994 -0.0018,0.675995 -0.0801,0.373573 -0.08009,0.373577 -0.09,0.266839 -0.09,0.26684 -0.190389,0.391364 -0.19039,0.391366 -0.223169,0.320207 -0.223167,0.320209 -0.303585,0.315294 -0.303584,0.315291 -0.284631,0.220665 -0.284629,0.220663 -0.220128,0.132359 -0.220127,0.132358 -0.242395,0.106698 -0.242394,0.106699 -0.08895,0.04734 -0.08895,0.04733 -0.249052,0.07247 -0.24905,0.07247 -0.322042,0.0574 -0.322044,0.0574 -0.282794,-0.003 -0.282795,-0.003 -0.07115,-0.0031 -0.07115,-0.0031 -0.177894,-0.0033 -0.177893,-0.0033 -0.124528,0.02555 -0.124528,0.02555 z m -4.470079,-5.349839 0.214838,-0.01739 0.206601,-0.06782 0.206602,-0.06782 0.244389,-0.117874 0.244393,-0.11786 0.274473,-0.206822 0.27447,-0.20682 0.229308,-0.257201 0.229306,-0.2572 0.219161,-0.28463 0.219159,-0.284629 0.188541,-0.284628 0.188543,-0.28463 0.214594,-0.373574 0.214593,-0.373577 0.133861,-0.312006 0.133865,-0.312007 0.02861,-0.01769 0.02861,-0.01769 0.197275,0.26212 0.197278,0.262119 0.163613,0.150814 0.163614,0.150814 0.201914,0.09276 0.201914,0.09276 0.302417,0.01421 0.302418,0.01421 0.213472,-0.08025 0.213471,-0.08025 0.200606,-0.204641 0.200606,-0.204642 0.09242,-0.278887 0.09241,-0.278888 0.05765,-0.302418 0.05764,-0.302416 L 18.41327,13.768114 18.39502,13.34117 18.31849,12.915185 18.24196,12.4892 18.15595,12.168033 18.06994,11.846867 17.928869,11.444534 17.787801,11.042201 17.621278,10.73296 17.454757,10.423723 17.337388,10.263619 17.220021,10.103516 17.095645,9.9837986 16.971268,9.8640816 16.990048,9.6813736 17.008828,9.4986654 16.947568,9.249616 16.886308,9.0005655 16.752419,8.7159355 16.618521,8.4313217 16.435707,8.2294676 16.252892,8.0276114 16.079629,7.9004245 15.906366,7.773238 l -0.20429,0.1230127 -0.204289,0.1230121 -0.26702,0.059413 -0.267022,0.059413 -0.205761,-0.021508 -0.205766,-0.021508 -0.23495,-0.08844 -0.234953,-0.08844 -0.118429,-0.090334 -0.118428,-0.090333 h -0.03944 -0.03944 L 13.711268,7.8540732 13.655958,7.9706205 13.497227,8.1520709 13.338499,8.3335203 13.168394,8.4419112 12.998289,8.550301 12.777045,8.624223 12.5558,8.698155 H 12.275611 11.995429 L 11.799973,8.6309015 11.604513,8.5636472 11.491311,8.5051061 11.37811,8.446565 11.138172,8.2254579 10.898231,8.0043497 l -0.09565,-0.084618 -0.09565,-0.084613 -0.218822,0.198024 -0.218822,0.1980231 -0.165392,0.078387 -0.1653925,0.078387 -0.177894,0.047948 -0.177892,0.047948 L 9.3635263,8.4842631 9.144328,8.4846889 8.9195029,8.4147138 8.6946778,8.3447386 8.5931214,8.4414036 8.491565,8.5380686 8.3707618,8.7019598 8.2499597,8.8658478 8.0802403,8.9290726 7.9105231,8.9922974 7.7952769,9.0780061 7.6800299,9.1637148 7.5706169,9.2778257 7.4612038,9.3919481 7.1059768,9.9205267 6.7507497,10.449105 l -0.2159851,0.449834 -0.2159839,0.449834 -0.2216572,0.462522 -0.2216559,0.462523 -0.1459343,0.337996 -0.1459342,0.337998 -0.055483,0.220042 -0.055483,0.220041 -0.015885,0.206903 -0.015872,0.206901 0.034307,0.242939 0.034307,0.24294 0.096281,0.196632 0.096281,0.196634 0.143607,0.125222 0.1436071,0.125222 0.1873143,0.08737 0.1873141,0.08737 0.2752084,0.002 0.2752084,0.002 0.2312297,-0.09773 0.231231,-0.09772 0.1067615,-0.07603 0.1067614,-0.07603 0.3679062,-0.29377 0.3679065,-0.293771 0.026804,0.01656 0.026804,0.01656 0.023626,0.466819 0.023626,0.466815 0.088326,0.513195 0.088326,0.513193 0.08897,0.364413 0.08897,0.364411 0.1315362,0.302418 0.1315352,0.302418 0.1051964,0.160105 0.1051954,0.160103 0.1104741,0.11877 0.1104731,0.118769 0.2846284,0.205644 0.2846305,0.205642 0.144448,0.07312 0.144448,0.07312 0.214787,0.05566 0.214787,0.05566 0.245601,0.03075 0.245602,0.03075 0.204577,-0.0125 0.204578,-0.0125 z m 0.686342,-3.497495 -0.11281,-0.06077 -0.106155,-0.134033 -0.106155,-0.134031 -0.04406,-0.18371 -0.04406,-0.183707 0.02417,-0.553937 0.02417,-0.553936 0.03513,-0.426945 0.03513,-0.426942 0.07225,-0.373576 0.07225,-0.373575 0.05417,-0.211338 0.05417,-0.211339 0.0674,-0.132112 0.0674,-0.132112 0.132437,-0.10916 0.132437,-0.109161 0.187436,-0.04195 0.187438,-0.04195 0.170366,0.06469 0.170364,0.06469 0.114312,0.124073 0.114313,0.124086 0.04139,0.18495 0.04139,0.184951 -0.111218,0.459845 -0.111219,0.459844 -0.03383,0.26584 -0.03382,0.265841 -0.03986,0.818307 -0.03986,0.818309 -0.0378,0.15162 -0.03779,0.151621 -0.11089,0.110562 -0.110891,0.110561 -0.114489,0.04913 -0.114489,0.04913 -0.187932,-0.0016 -0.187929,-0.0016 z m -2.8087655,-0.358124 -0.146445,-0.06848 -0.088025,-0.119502 -0.088024,-0.119502 -0.038581,-0.106736 -0.038581,-0.106736 -0.02237,-0.134956 -0.02239,-0.134957 -0.031955,-0.46988 -0.031955,-0.469881 0.036203,-0.444733 0.036203,-0.444731 0.048862,-0.215257 0.048862,-0.215255 0.076082,-0.203349 0.076081,-0.203348 0.0936,-0.111244 0.0936,-0.111245 0.143787,-0.06531 0.1437865,-0.06532 h 0.142315 0.142314 l 0.142314,0.06588 0.142316,0.06588 0.093,0.102325 0.093,0.102325 0.04042,0.120942 0.04042,0.120942 v 0.152479 0.152477 l -0.03347,0.08804 -0.03347,0.08805 -0.05693,0.275653 -0.05693,0.275651 2.11e-4,0.430246 2.12e-4,0.430243 0.04294,0.392646 0.04295,0.392647 -0.09189,0.200702 -0.09189,0.200702 -0.148688,0.0984 -0.148687,0.0984 -0.20136,0.01212 -0.2013595,0.01212 z" 53 53 + id="path4" /> 54 54 + </g> 55 55 + </svg> 56 56 + {{ end }}

+57

appview/pages/templates/fragments/dolly/silhouette.html

··· 1 1 + {{ define "fragments/dolly/silhouette" }} 2 2 + <svg 3 3 + version="1.1" 4 4 + id="svg1" 5 5 + width="32" 6 6 + height="32" 7 7 + viewBox="0 0 25 25" 8 8 + sodipodi:docname="tangled_dolly_silhouette.png" 9 9 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 10 10 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 11 11 + xmlns="http://www.w3.org/2000/svg" 12 12 + xmlns:svg="http://www.w3.org/2000/svg"> 13 13 + <style> 14 14 + .dolly { 15 15 + color: #000000; 16 16 + } 17 17 + 18 18 + @media (prefers-color-scheme: dark) { 19 19 + .dolly { 20 20 + color: #ffffff; 21 21 + } 22 22 + } 23 23 + </style> 24 24 + <title>Dolly</title> 25 25 + <defs 26 26 + id="defs1" /> 27 27 + <sodipodi:namedview 28 28 + id="namedview1" 29 29 + pagecolor="#ffffff" 30 30 + bordercolor="#000000" 31 31 + borderopacity="0.25" 32 32 + inkscape:showpageshadow="2" 33 33 + inkscape:pageopacity="0.0" 34 34 + inkscape:pagecheckerboard="true" 35 35 + inkscape:deskcolor="#d1d1d1"> 36 36 + <inkscape:page 37 37 + x="0" 38 38 + y="0" 39 39 + width="25" 40 40 + height="25" 41 41 + id="page2" 42 42 + margin="0" 43 43 + bleed="0" /> 44 44 + </sodipodi:namedview> 45 45 + <g 46 46 + inkscape:groupmode="layer" 47 47 + inkscape:label="Image" 48 48 + id="g1"> 49 49 + <path 50 50 + class="dolly" 51 51 + fill="currentColor" 52 52 + style="stroke-width:1.12248" 53 53 + d="m 16.208435,23.914069 c -0.06147,-0.02273 -0.147027,-0.03034 -0.190158,-0.01691 -0.197279,0.06145 -1.31068,-0.230493 -1.388819,-0.364153 -0.01956,-0.03344 -0.163274,-0.134049 -0.319377,-0.223561 -0.550395,-0.315603 -1.010951,-0.696643 -1.428383,-1.181771 -0.264598,-0.307509 -0.597257,-0.785384 -0.597257,-0.857979 0,-0.0216 -0.02841,-0.06243 -0.06313,-0.0907 -0.04977,-0.04053 -0.160873,0.0436 -0.52488,0.397463 -0.479803,0.466432 -0.78924,0.689475 -1.355603,0.977118 -0.183693,0.0933 -0.323426,0.179989 -0.310516,0.192658 0.02801,0.02748 -0.7656391,0.270031 -1.209129,0.369517 -0.5378332,0.120647 -1.6341809,0.08626 -1.9721503,-0.06186 C 6.7977157,23.031391 6.56735,22.957551 6.3371134,22.889782 4.9717169,22.487902 3.7511914,21.481518 3.1172396,20.234838 2.6890391,19.392772 2.5582276,18.827446 2.5610489,17.831154 2.5639589,16.802192 2.7366641,16.125844 3.2142117,15.273187 3.3040457,15.112788 3.3713143,14.976533 3.3636956,14.9704 3.3560756,14.9643 3.2459634,14.90305 3.1189994,14.834381 1.7582586,14.098312 0.77760984,12.777439 0.44909837,11.23818 0.33531456,10.705039 0.33670119,9.7067968 0.45195381,9.1778795 0.72259241,7.9359287 1.3827188,6.8888436 2.4297498,6.0407205 2.6856126,5.8334648 3.2975489,5.4910878 3.6885849,5.3364049 L 4.0584319,5.190106 4.2333984,4.860432 C 4.8393906,3.7186139 5.8908314,2.7968028 7.1056396,2.3423025 7.7690673,2.0940921 8.2290216,2.0150935 9.01853,2.0137575 c 0.9625627,-0.00163 1.629181,0.1532762 2.485864,0.5776514 l 0.271744,0.1346134 0.42911,-0.3607688 c 1.082666,-0.9102346 2.185531,-1.3136811 3.578383,-1.3090327 0.916696,0.00306 1.573918,0.1517893 2.356121,0.5331927 1.465948,0.7148 2.54506,2.0625628 2.865177,3.57848 l 0.07653,0.362429 0.515095,0.2556611 c 1.022872,0.5076874 1.756122,1.1690944 2.288361,2.0641468 0.401896,0.6758594 0.537303,1.0442682 0.675505,1.8378683 0.288575,1.6570823 -0.266229,3.3548023 -1.490464,4.5608743 -0.371074,0.36557 -0.840205,0.718265 -1.203442,0.904754 -0.144112,0.07398 -0.271303,0.15826 -0.282647,0.187269 -0.01134,0.02901 0.02121,0.142764 0.07234,0.25279 0.184248,0.396467 0.451371,1.331823 0.619371,2.168779 0.463493,2.30908 -0.754646,4.693707 -2.92278,5.721632 -0.479538,0.227352 -0.717629,0.309322 -1.144194,0.39393 -0.321869,0.06383 -1.850573,0.09139 -2.000174,0.03604 z M 12.25443,18.636956 c 0.739923,-0.24652 1.382521,-0.718922 1.874623,-1.37812 0.0752,-0.100718 0.213883,-0.275851 0.308198,-0.389167 0.09432,-0.113318 0.210136,-0.271056 0.257381,-0.350531 0.416347,-0.700389 0.680936,-1.176102 0.766454,-1.378041 0.05594,-0.132087 0.114653,-0.239607 0.130477,-0.238929 0.01583,6.79e-4 0.08126,0.08531 0.145412,0.188069 0.178029,0.285173 0.614305,0.658998 0.868158,0.743878 0.259802,0.08686 0.656158,0.09598 0.911369,0.02095 0.213812,-0.06285 0.507296,-0.298016 0.645179,-0.516947 0.155165,-0.246374 0.327989,-0.989595 0.327989,-1.410501 0,-1.26718 -0.610975,-3.143405 -1.237774,-3.801045 -0.198483,-0.2082486 -0.208557,-0.2319396 -0.208557,-0.4904655 0,-0.2517771 -0.08774,-0.5704927 -0.258476,-0.938956 C 16.694963,8.50313 16.375697,8.1377479 16.135846,7.9543702 L 15.932296,7.7987471 15.683004,7.9356529 C 15.131767,8.2383821 14.435638,8.1945733 13.943459,7.8261812 L 13.782862,7.7059758 13.686773,7.8908012 C 13.338849,8.5600578 12.487087,8.8811064 11.743178,8.6233891 11.487199,8.5347109 11.358897,8.4505994 11.063189,8.1776138 L 10.69871,7.8411436 10.453484,8.0579255 C 10.318608,8.1771557 10.113778,8.3156283 9.9983037,8.3656417 9.7041488,8.4930449 9.1808299,8.5227884 8.8979004,8.4281886 8.7754792,8.3872574 8.6687415,8.3537661 8.6607053,8.3537661 c -0.03426,0 -0.3092864,0.3066098 -0.3791974,0.42275 -0.041935,0.069664 -0.1040482,0.1266636 -0.1380294,0.1266636 -0.1316419,0 -0.4197402,0.1843928 -0.6257041,0.4004735 -0.1923125,0.2017571 -0.6853701,0.9036038 -0.8926582,1.2706578 -0.042662,0.07554 -0.1803555,0.353687 -0.3059848,0.618091 -0.1256293,0.264406 -0.3270073,0.686768 -0.4475067,0.938581 -0.1204992,0.251816 -0.2469926,0.519654 -0.2810961,0.595199 -0.2592829,0.574347 -0.285919,1.391094 -0.057822,1.77304 0.1690683,0.283105 0.4224039,0.480895 0.7285507,0.568809 0.487122,0.139885 0.9109638,-0.004 1.6013422,-0.543768 l 0.4560939,-0.356568 0.0036,0.172041 c 0.01635,0.781837 0.1831084,1.813183 0.4016641,2.484154 0.1160449,0.356262 0.3781448,0.83968 0.5614081,1.035462 0.2171883,0.232025 0.7140951,0.577268 1.0100284,0.701749 0.121485,0.0511 0.351032,0.110795 0.510105,0.132647 0.396966,0.05452 1.2105,0.02265 1.448934,-0.05679 z" 54 54 + id="path1" /> 55 55 + </g> 56 56 + </svg> 57 57 + {{ end }}

+9

appview/pages/templates/fragments/logotypeSmall.html

··· 1 1 + {{ define "fragments/logotypeSmall" }} 2 2 + <span class="flex items-center gap-2"> 3 3 + {{ template "fragments/dolly/logo" "size-8 text-black dark:text-white" }} 4 4 + <span class="font-bold text-xl not-italic">tangled</span> 5 5 + <span class="font-normal not-italic text-xs rounded bg-gray-100 dark:bg-gray-700 px-1"> 6 6 + alpha 7 7 + </span> 8 8 + <span> 9 9 + {{ end }}

+1 -1

appview/pages/templates/repo/blob.html

··· 4 4 {{ template "repo/fragments/meta" . }} 5 5 6 6 {{ $title := printf "%s at %s &middot; %s" .Path .Ref .RepoInfo.FullName }} 7 7 - {{ $url := printf "https://tangled.sh/%s/blob/%s/%s" .RepoInfo.FullName .Ref .Path }} 7 7 + {{ $url := printf "https://tangled.org/%s/blob/%s/%s" .RepoInfo.FullName .Ref .Path }} 8 8 9 9 {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} 10 10

+5 -5

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

··· 1 1 {{ define "repo/fragments/meta" }} 2 2 <meta 3 3 name="vcs:clone" 4 4 - content="https://tangled.sh/{{ .RepoInfo.FullName }}" 4 4 + content="https://tangled.org/{{ .RepoInfo.FullName }}" 5 5 /> 6 6 <meta 7 7 name="forge:summary" 8 8 - content="https://tangled.sh/{{ .RepoInfo.FullName }}" 8 8 + content="https://tangled.org/{{ .RepoInfo.FullName }}" 9 9 /> 10 10 <meta 11 11 name="forge:dir" 12 12 - content="https://tangled.sh/{{ .RepoInfo.FullName }}/tree/{ref}/{path}" 12 12 + content="https://tangled.org/{{ .RepoInfo.FullName }}/tree/{ref}/{path}" 13 13 /> 14 14 <meta 15 15 name="forge:file" 16 16 - content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}" 16 16 + content="https://tangled.org/{{ .RepoInfo.FullName }}/blob/{ref}/{path}" 17 17 /> 18 18 <meta 19 19 name="forge:line" 20 20 - content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}" 20 20 + content="https://tangled.org/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}" 21 21 /> 22 22 <meta 23 23 name="go-import"

+2 -2

appview/pages/templates/repo/pipelines/pipelines.html

··· 2 2 3 3 {{ define "extrameta" }} 4 4 {{ $title := "pipelines"}} 5 5 - {{ $url := printf "https://tangled.sh/%s/pipelines" .RepoInfo.FullName }} 5 5 + {{ $url := printf "https://tangled.org/%s/pipelines" .RepoInfo.FullName }} 6 6 {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} 7 7 {{ end }} 8 8 ··· 60 60 <span class="inline-flex gap-2 items-center"> 61 61 <span class="font-bold">{{ $target }}</span> 62 62 {{ i "arrow-left" "size-4" }} 63 63 - {{ .Trigger.PRSourceBranch }} 63 63 + {{ .Trigger.PRSourceBranch }} 64 64 <span class="text-sm font-mono"> 65 65 @ 66 66 <a href="/{{ $root.RepoInfo.FullName }}/commit/{{ $sha }}">{{ slice $sha 0 8 }}</a>

+1 -1

appview/pages/templates/repo/pipelines/workflow.html

··· 2 2 3 3 {{ define "extrameta" }} 4 4 {{ $title := "pipelines"}} 5 5 - {{ $url := printf "https://tangled.sh/%s/pipelines" .RepoInfo.FullName }} 5 5 + {{ $url := printf "https://tangled.org/%s/pipelines" .RepoInfo.FullName }} 6 6 {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} 7 7 {{ end }} 8 8

+1 -1

appview/pages/templates/spindles/index.html

··· 5 5 <h1 class="text-xl font-bold dark:text-white">Spindles</h1> 6 6 <span class="flex items-center gap-1"> 7 7 {{ i "book" "w-3 h-3" }} 8 8 - <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/spindle/hosting.md">docs</a> 8 8 + <a href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md">docs</a> 9 9 </span> 10 10 </div> 11 11

+1 -1

appview/pages/templates/strings/dashboard.html

··· 3 3 {{ define "extrameta" }} 4 4 <meta property="og:title" content="{{ or .Card.UserHandle .Card.UserDid }}" /> 5 5 <meta property="og:type" content="profile" /> 6 6 - <meta property="og:url" content="https://tangled.sh/{{ or .Card.UserHandle .Card.UserDid }}" /> 6 6 + <meta property="og:url" content="https://tangled.org/{{ or .Card.UserHandle .Card.UserDid }}" /> 7 7 <meta property="og:description" content="{{ or .Card.Profile.Description .Card.UserHandle .Card.UserDid }}" /> 8 8 {{ end }} 9 9

+1 -1

appview/pages/templates/strings/string.html

··· 4 4 {{ $ownerId := didOrHandle .Owner.DID.String .Owner.Handle.String }} 5 5 <meta property="og:title" content="{{ .String.Filename }} · by {{ $ownerId }}" /> 6 6 <meta property="og:type" content="object" /> 7 7 - <meta property="og:url" content="https://tangled.sh/strings/{{ $ownerId }}/{{ .String.Rkey }}" /> 7 7 + <meta property="og:url" content="https://tangled.org/strings/{{ $ownerId }}/{{ .String.Rkey }}" /> 8 8 <meta property="og:description" content="{{ .String.Description }}" /> 9 9 {{ end }} 10 10

+1 -2

appview/pages/templates/timeline/fragments/hero.html

··· 22 22 </div> 23 23 24 24 <figure class="w-full hidden md:block md:w-auto"> 25 25 - <a href="https://tangled.sh/@tangled.sh/core" class="block"> 25 25 + <a href="https://tangled.org/@tangled.org/core" class="block"> 26 26 <img src="https://assets.tangled.network/hero-repo.png" alt="Screenshot of the Tangled monorepo." class="max-w-md mx-auto md:max-w-none w-full md:w-[30vw] h-auto shadow-sm rounded" /> 27 27 </a> 28 28 <figcaption class="text-sm text-gray-600 dark:text-gray-400 mt-2 text-center"> ··· 31 31 </figure> 32 32 </div> 33 33 {{ end }} 34 34 -

+1 -1

appview/cache/session/store.go

··· 6 6 "fmt" 7 7 "time" 8 8 9 9 - "tangled.sh/tangled.sh/core/appview/cache" 9 9 + "tangled.org/core/appview/cache" 10 10 ) 11 11 12 12 type OAuthSession struct {

+1 -1

appview/pipelines/router.go

··· 4 4 "net/http" 5 5 6 6 "github.com/go-chi/chi/v5" 7 7 - "tangled.sh/tangled.sh/core/appview/middleware" 7 7 + "tangled.org/core/appview/middleware" 8 8 ) 9 9 10 10 func (p *Pipelines) Router(mw *middleware.Middleware) http.Handler {

+1 -1

appview/pulls/router.go

··· 4 4 "net/http" 5 5 6 6 "github.com/go-chi/chi/v5" 7 7 - "tangled.sh/tangled.sh/core/appview/middleware" 7 7 + "tangled.org/core/appview/middleware" 8 8 ) 9 9 10 10 func (s *Pulls) Router(mw *middleware.Middleware) http.Handler {

+4 -4

appview/serververify/verify.go

··· 6 6 "fmt" 7 7 8 8 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 9 9 - "tangled.sh/tangled.sh/core/api/tangled" 10 10 - "tangled.sh/tangled.sh/core/appview/db" 11 11 - "tangled.sh/tangled.sh/core/appview/xrpcclient" 12 12 - "tangled.sh/tangled.sh/core/rbac" 9 9 + "tangled.org/core/api/tangled" 10 10 + "tangled.org/core/appview/db" 11 11 + "tangled.org/core/appview/xrpcclient" 12 12 + "tangled.org/core/rbac" 13 13 ) 14 14 15 15 var (

+4 -5

docs/migrations.md

··· 14 14 For knots: 15 15 16 16 - Upgrade to latest tag (v1.9.0 or above) 17 17 - - Head to the [knot dashboard](https://tangled.sh/knots) and 17 17 + - Head to the [knot dashboard](https://tangled.org/knots) and 18 18 hit the "retry" button to verify your knot 19 19 20 20 For spindles: 21 21 22 22 - Upgrade to latest tag (v1.9.0 or above) 23 23 - Head to the [spindle 24 24 - dashboard](https://tangled.sh/spindles) and hit the 24 24 + dashboard](https://tangled.org/spindles) and hit the 25 25 "retry" button to verify your spindle 26 26 27 27 ## Upgrading from v1.7.x ··· 38 38 environment variable entirely 39 39 - `KNOT_SERVER_OWNER` is now required on boot, set this to 40 40 your DID. You can find your DID in the 41 41 - [settings](https://tangled.sh/settings) page. 41 41 + [settings](https://tangled.org/settings) page. 42 42 - Restart your knot once you have replaced the environment 43 43 variable 44 44 - - Head to the [knot dashboard](https://tangled.sh/knots) and 44 44 + - Head to the [knot dashboard](https://tangled.org/knots) and 45 45 hit the "retry" button to verify your knot. This simply 46 46 writes a `sh.tangled.knot` record to your PDS. 47 47 ··· 57 57 }; 58 58 }; 59 59 ``` 60 60 -

+1 -1

keyfetch/keyfetch.go

··· 10 10 "strings" 11 11 12 12 "github.com/urfave/cli/v3" 13 13 - "tangled.sh/tangled.sh/core/log" 13 13 + "tangled.org/core/log" 14 14 ) 15 15 16 16 func Command() *cli.Command {

+1 -1

knotserver/db/events.go

··· 4 4 "fmt" 5 5 "time" 6 6 7 7 - "tangled.sh/tangled.sh/core/notifier" 7 7 + "tangled.org/core/notifier" 8 8 ) 9 9 10 10 type Event struct {

+1 -1

knotserver/db/pubkeys.go

··· 4 4 "strconv" 5 5 "time" 6 6 7 7 - "tangled.sh/tangled.sh/core/api/tangled" 7 7 + "tangled.org/core/api/tangled" 8 8 ) 9 9 10 10 type PublicKey struct {

+2 -2

knotserver/git/diff.go

··· 12 12 "github.com/bluekeyes/go-gitdiff/gitdiff" 13 13 "github.com/go-git/go-git/v5/plumbing" 14 14 "github.com/go-git/go-git/v5/plumbing/object" 15 15 - "tangled.sh/tangled.sh/core/patchutil" 16 16 - "tangled.sh/tangled.sh/core/types" 15 15 + "tangled.org/core/patchutil" 16 16 + "tangled.org/core/types" 17 17 ) 18 18 19 19 func (g *GitRepo) Diff() (*types.NiceDiff, error) {

+1 -1

knotserver/git/post_receive.go

··· 9 9 "strings" 10 10 "time" 11 11 12 12 - "tangled.sh/tangled.sh/core/api/tangled" 12 12 + "tangled.org/core/api/tangled" 13 13 14 14 "github.com/go-git/go-git/v5/plumbing" 15 15 )

+1 -1

knotserver/git/tree.go

··· 8 8 "time" 9 9 10 10 "github.com/go-git/go-git/v5/plumbing/object" 11 11 - "tangled.sh/tangled.sh/core/types" 11 11 + "tangled.org/core/types" 12 12 ) 13 13 14 14 func (g *GitRepo) FileTree(ctx context.Context, path string) ([]types.NiceTree, error) {

+3 -3

knotserver/xrpc/delete_repo.go

··· 11 11 "github.com/bluesky-social/indigo/atproto/syntax" 12 12 "github.com/bluesky-social/indigo/xrpc" 13 13 securejoin "github.com/cyphar/filepath-securejoin" 14 14 - "tangled.sh/tangled.sh/core/api/tangled" 15 15 - "tangled.sh/tangled.sh/core/rbac" 16 16 - xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 14 14 + "tangled.org/core/api/tangled" 15 15 + "tangled.org/core/rbac" 16 16 + xrpcerr "tangled.org/core/xrpc/errors" 17 17 ) 18 18 19 19 func (x *Xrpc) DeleteRepo(w http.ResponseWriter, r *http.Request) {

+2 -2

knotserver/xrpc/list_keys.go

··· 4 4 "net/http" 5 5 "strconv" 6 6 7 7 - "tangled.sh/tangled.sh/core/api/tangled" 8 8 - xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 7 7 + "tangled.org/core/api/tangled" 8 8 + xrpcerr "tangled.org/core/xrpc/errors" 9 9 ) 10 10 11 11 func (x *Xrpc) ListKeys(w http.ResponseWriter, r *http.Request) {

+2 -2

knotserver/xrpc/owner.go

··· 3 3 import ( 4 4 "net/http" 5 5 6 6 - "tangled.sh/tangled.sh/core/api/tangled" 7 7 - xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 6 6 + "tangled.org/core/api/tangled" 7 7 + xrpcerr "tangled.org/core/xrpc/errors" 8 8 ) 9 9 10 10 func (x *Xrpc) Owner(w http.ResponseWriter, r *http.Request) {

+3 -3

knotserver/xrpc/repo_branch.go

··· 5 5 "net/url" 6 6 "time" 7 7 8 8 - "tangled.sh/tangled.sh/core/api/tangled" 9 9 - "tangled.sh/tangled.sh/core/knotserver/git" 10 10 - xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 8 8 + "tangled.org/core/api/tangled" 9 9 + "tangled.org/core/knotserver/git" 10 10 + xrpcerr "tangled.org/core/xrpc/errors" 11 11 ) 12 12 13 13 func (x *Xrpc) RepoBranch(w http.ResponseWriter, r *http.Request) {

+3 -3

knotserver/xrpc/repo_compare.go

··· 4 4 "fmt" 5 5 "net/http" 6 6 7 7 - "tangled.sh/tangled.sh/core/knotserver/git" 8 8 - "tangled.sh/tangled.sh/core/types" 9 9 - xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 7 7 + "tangled.org/core/knotserver/git" 8 8 + "tangled.org/core/types" 9 9 + xrpcerr "tangled.org/core/xrpc/errors" 10 10 ) 11 11 12 12 func (x *Xrpc) RepoCompare(w http.ResponseWriter, r *http.Request) {

+3 -3

knotserver/xrpc/repo_diff.go

··· 3 3 import ( 4 4 "net/http" 5 5 6 6 - "tangled.sh/tangled.sh/core/knotserver/git" 7 7 - "tangled.sh/tangled.sh/core/types" 8 8 - xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 6 6 + "tangled.org/core/knotserver/git" 7 7 + "tangled.org/core/types" 8 8 + xrpcerr "tangled.org/core/xrpc/errors" 9 9 ) 10 10 11 11 func (x *Xrpc) RepoDiff(w http.ResponseWriter, r *http.Request) {

+3 -3

knotserver/xrpc/repo_languages.go

··· 6 6 "net/http" 7 7 "time" 8 8 9 9 - "tangled.sh/tangled.sh/core/api/tangled" 10 10 - "tangled.sh/tangled.sh/core/knotserver/git" 11 11 - xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 9 9 + "tangled.org/core/api/tangled" 10 10 + "tangled.org/core/knotserver/git" 11 11 + xrpcerr "tangled.org/core/xrpc/errors" 12 12 ) 13 13 14 14 func (x *Xrpc) RepoLanguages(w http.ResponseWriter, r *http.Request) {

+3 -3

knotserver/xrpc/repo_tags.go

··· 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.sh/tangled.sh/core/knotserver/git" 11 11 - "tangled.sh/tangled.sh/core/types" 12 12 - xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 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) RepoTags(w http.ResponseWriter, r *http.Request) {

+2 -2

knotserver/xrpc/version.go

··· 5 5 "net/http" 6 6 "runtime/debug" 7 7 8 8 - "tangled.sh/tangled.sh/core/api/tangled" 8 8 + "tangled.org/core/api/tangled" 9 9 ) 10 10 11 11 // version is set during build time. ··· 24 24 var modified bool 25 25 26 26 for _, mod := range info.Deps { 27 27 - if mod.Path == "tangled.sh/tangled.sh/knotserver/xrpc" { 27 27 + if mod.Path == "tangled.org/tangled.org/knotserver/xrpc" { 28 28 modVer = mod.Version 29 29 break 30 30 }

+1 -1

lexicon-build-config.json

··· 3 3 "package": "tangled", 4 4 "prefix": "sh.tangled", 5 5 "outdir": "api/tangled", 6 6 - "import": "tangled.sh/tangled.sh/core/api/tangled", 6 6 + "import": "tangled.org/core/api/tangled", 7 7 "gen-server": true 8 8 } 9 9 ]

+1 -1

patchutil/patchutil.go

··· 10 10 "strings" 11 11 12 12 "github.com/bluekeyes/go-gitdiff/gitdiff" 13 13 - "tangled.sh/tangled.sh/core/types" 13 13 + "tangled.org/core/types" 14 14 ) 15 15 16 16 func ExtractPatches(formatPatch string) ([]types.FormatPatch, error) {

+4 -4

spindle/db/events.go

··· 5 5 "fmt" 6 6 "time" 7 7 8 8 - "tangled.sh/tangled.sh/core/api/tangled" 9 9 - "tangled.sh/tangled.sh/core/notifier" 10 10 - "tangled.sh/tangled.sh/core/spindle/models" 11 11 - "tangled.sh/tangled.sh/core/tid" 8 8 + "tangled.org/core/api/tangled" 9 9 + "tangled.org/core/notifier" 10 10 + "tangled.org/core/spindle/models" 11 11 + "tangled.org/core/tid" 12 12 ) 13 13 14 14 type Event struct {

+5 -5

spindle/engine/engine.go

··· 8 8 9 9 securejoin "github.com/cyphar/filepath-securejoin" 10 10 "golang.org/x/sync/errgroup" 11 11 - "tangled.sh/tangled.sh/core/notifier" 12 12 - "tangled.sh/tangled.sh/core/spindle/config" 13 13 - "tangled.sh/tangled.sh/core/spindle/db" 14 14 - "tangled.sh/tangled.sh/core/spindle/models" 15 15 - "tangled.sh/tangled.sh/core/spindle/secrets" 11 11 + "tangled.org/core/notifier" 12 12 + "tangled.org/core/spindle/config" 13 13 + "tangled.org/core/spindle/db" 14 14 + "tangled.org/core/spindle/models" 15 15 + "tangled.org/core/spindle/secrets" 16 16 ) 17 17 18 18 var (

+2 -2

spindle/engines/nixery/setup_steps.go

··· 5 5 "path" 6 6 "strings" 7 7 8 8 - "tangled.sh/tangled.sh/core/api/tangled" 9 9 - "tangled.sh/tangled.sh/core/workflow" 8 8 + "tangled.org/core/api/tangled" 9 9 + "tangled.org/core/workflow" 10 10 ) 11 11 12 12 func nixConfStep() Step {

+9 -9

spindle/xrpc/xrpc.go

··· 8 8 9 9 "github.com/go-chi/chi/v5" 10 10 11 11 - "tangled.sh/tangled.sh/core/api/tangled" 12 12 - "tangled.sh/tangled.sh/core/idresolver" 13 13 - "tangled.sh/tangled.sh/core/rbac" 14 14 - "tangled.sh/tangled.sh/core/spindle/config" 15 15 - "tangled.sh/tangled.sh/core/spindle/db" 16 16 - "tangled.sh/tangled.sh/core/spindle/models" 17 17 - "tangled.sh/tangled.sh/core/spindle/secrets" 18 18 - xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors" 19 19 - "tangled.sh/tangled.sh/core/xrpc/serviceauth" 11 11 + "tangled.org/core/api/tangled" 12 12 + "tangled.org/core/idresolver" 13 13 + "tangled.org/core/rbac" 14 14 + "tangled.org/core/spindle/config" 15 15 + "tangled.org/core/spindle/db" 16 16 + "tangled.org/core/spindle/models" 17 17 + "tangled.org/core/spindle/secrets" 18 18 + xrpcerr "tangled.org/core/xrpc/errors" 19 19 + "tangled.org/core/xrpc/serviceauth" 20 20 ) 21 21 22 22 const ActorDid string = "ActorDid"

+1 -1

workflow/def.go

··· 6 6 "slices" 7 7 "strings" 8 8 9 9 - "tangled.sh/tangled.sh/core/api/tangled" 9 9 + "tangled.org/core/api/tangled" 10 10 11 11 "github.com/go-git/go-git/v5/plumbing" 12 12 "gopkg.in/yaml.v3"

+42

api/tangled/labeldefinition.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.label.definition 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + LabelDefinitionNSID = "sh.tangled.label.definition" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("sh.tangled.label.definition", &LabelDefinition{}) 17 17 + } // 18 18 + // RECORDTYPE: LabelDefinition 19 19 + type LabelDefinition struct { 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.label.definition" cborgen:"$type,const=sh.tangled.label.definition"` 21 21 + // color: The hex value for the background color for the label. Appviews may choose to respect this. 22 22 + Color *string `json:"color,omitempty" cborgen:"color,omitempty"` 23 23 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 24 24 + // multiple: Whether this label can be repeated for a given entity, eg.: [reviewer:foo, reviewer:bar] 25 25 + Multiple *bool `json:"multiple,omitempty" cborgen:"multiple,omitempty"` 26 26 + // name: The display name of this label. 27 27 + Name string `json:"name" cborgen:"name"` 28 28 + // scope: The areas of the repo this label may apply to, eg.: sh.tangled.repo.issue. Appviews may choose to respect this. 29 29 + Scope []string `json:"scope" cborgen:"scope"` 30 30 + // valueType: The type definition of this label. Appviews may allow sorting for certain types. 31 31 + ValueType *LabelDefinition_ValueType `json:"valueType" cborgen:"valueType"` 32 32 + } 33 33 + 34 34 + // LabelDefinition_ValueType is a "valueType" in the sh.tangled.label.definition schema. 35 35 + type LabelDefinition_ValueType struct { 36 36 + // enum: Closed set of values that this label can take. 37 37 + Enum []string `json:"enum,omitempty" cborgen:"enum,omitempty"` 38 38 + // format: An optional constraint that can be applied on string concrete types. 39 39 + Format string `json:"format" cborgen:"format"` 40 40 + // type: The concrete type of this label's value. 41 41 + Type string `json:"type" cborgen:"type"` 42 42 + }

+89

lexicons/label/definition.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.label.definition", 4 4 + "needsCbor": true, 5 5 + "needsType": true, 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "key": "any", 10 10 + "record": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "name", 14 14 + "valueType", 15 15 + "scope", 16 16 + "createdAt" 17 17 + ], 18 18 + "properties": { 19 19 + "name": { 20 20 + "type": "string", 21 21 + "description": "The display name of this label.", 22 22 + "minGraphemes": 1, 23 23 + "maxGraphemes": 40 24 24 + }, 25 25 + "valueType": { 26 26 + "type": "ref", 27 27 + "ref": "#valueType", 28 28 + "description": "The type definition of this label. Appviews may allow sorting for certain types." 29 29 + }, 30 30 + "scope": { 31 31 + "type": "array", 32 32 + "description": "The areas of the repo this label may apply to, eg.: sh.tangled.repo.issue. Appviews may choose to respect this.", 33 33 + "items": { 34 34 + "type": "string", 35 35 + "format": "nsid" 36 36 + } 37 37 + }, 38 38 + "color": { 39 39 + "type": "string", 40 40 + "description": "The hex value for the background color for the label. Appviews may choose to respect this." 41 41 + }, 42 42 + "createdAt": { 43 43 + "type": "string", 44 44 + "format": "datetime" 45 45 + }, 46 46 + "multiple": { 47 47 + "type": "boolean", 48 48 + "description": "Whether this label can be repeated for a given entity, eg.: [reviewer:foo, reviewer:bar]" 49 49 + } 50 50 + } 51 51 + } 52 52 + }, 53 53 + "valueType": { 54 54 + "type": "object", 55 55 + "required": [ 56 56 + "type", 57 57 + "format" 58 58 + ], 59 59 + "properties": { 60 60 + "type": { 61 61 + "type": "string", 62 62 + "enum": [ 63 63 + "null", 64 64 + "boolean", 65 65 + "integer", 66 66 + "string" 67 67 + ], 68 68 + "description": "The concrete type of this label's value." 69 69 + }, 70 70 + "format": { 71 71 + "type": "string", 72 72 + "enum": [ 73 73 + "any", 74 74 + "did", 75 75 + "nsid" 76 76 + ], 77 77 + "description": "An optional constraint that can be applied on string concrete types." 78 78 + }, 79 79 + "enum": { 80 80 + "type": "array", 81 81 + "description": "Closed set of values that this label can take.", 82 82 + "items": { 83 83 + "type": "string" 84 84 + } 85 85 + } 86 86 + } 87 87 + } 88 88 + } 89 89 + }

+34

api/tangled/labelop.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.label.op 6 6 + 7 7 + import ( 8 8 + "github.com/bluesky-social/indigo/lex/util" 9 9 + ) 10 10 + 11 11 + const ( 12 12 + LabelOpNSID = "sh.tangled.label.op" 13 13 + ) 14 14 + 15 15 + func init() { 16 16 + util.RegisterType("sh.tangled.label.op", &LabelOp{}) 17 17 + } // 18 18 + // RECORDTYPE: LabelOp 19 19 + type LabelOp struct { 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.label.op" cborgen:"$type,const=sh.tangled.label.op"` 21 21 + Add []*LabelOp_Operand `json:"add" cborgen:"add"` 22 22 + Delete []*LabelOp_Operand `json:"delete" cborgen:"delete"` 23 23 + PerformedAt string `json:"performedAt" cborgen:"performedAt"` 24 24 + // subject: The subject (task, pull or discussion) of this label. Appviews may apply a `scope` check and refuse this op. 25 25 + Subject string `json:"subject" cborgen:"subject"` 26 26 + } 27 27 + 28 28 + // LabelOp_Operand is a "operand" in the sh.tangled.label.op schema. 29 29 + type LabelOp_Operand struct { 30 30 + // key: ATURI to the label definition 31 31 + Key string `json:"key" cborgen:"key"` 32 32 + // value: Stringified value of the label. This is first unstringed by appviews and then interpreted as a concrete value. 33 33 + Value string `json:"value" cborgen:"value"` 34 34 + }

+2

cmd/gen.go

··· 28 28 tangled.KnotMember{}, 29 29 tangled.LabelDefinition{}, 30 30 tangled.LabelDefinition_ValueType{}, 31 31 + tangled.LabelOp{}, 32 32 + tangled.LabelOp_Operand{}, 31 33 tangled.Pipeline{}, 32 34 tangled.Pipeline_CloneOpts{}, 33 35 tangled.Pipeline_ManualTriggerData{},

+64

lexicons/label/op.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.label.op", 4 4 + "needsCbor": true, 5 5 + "needsType": true, 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "key": "tid", 10 10 + "record": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "subject", 14 14 + "add", 15 15 + "delete", 16 16 + "performedAt" 17 17 + ], 18 18 + "properties": { 19 19 + "subject": { 20 20 + "type": "string", 21 21 + "format": "at-uri", 22 22 + "description": "The subject (task, pull or discussion) of this label. Appviews may apply a `scope` check and refuse this op." 23 23 + }, 24 24 + "performedAt": { 25 25 + "type": "string", 26 26 + "format": "datetime" 27 27 + }, 28 28 + "add": { 29 29 + "type": "array", 30 30 + "items": { 31 31 + "type": "ref", 32 32 + "ref": "#operand" 33 33 + } 34 34 + }, 35 35 + "delete": { 36 36 + "type": "array", 37 37 + "items": { 38 38 + "type": "ref", 39 39 + "ref": "#operand" 40 40 + } 41 41 + } 42 42 + } 43 43 + } 44 44 + }, 45 45 + "operand": { 46 46 + "type": "object", 47 47 + "required": [ 48 48 + "key", 49 49 + "value" 50 50 + ], 51 51 + "properties": { 52 52 + "key": { 53 53 + "type": "string", 54 54 + "format": "at-uri", 55 55 + "description": "ATURI to the label definition" 56 56 + }, 57 57 + "value": { 58 58 + "type": "string", 59 59 + "description": "Stringified value of the label. This is first unstringed by appviews and then interpreted as a concrete value." 60 60 + } 61 61 + } 62 62 + } 63 63 + } 64 64 + }

+3 -2

api/tangled/tangledrepo.go

··· 22 22 Description *string `json:"description,omitempty" cborgen:"description,omitempty"` 23 23 // knot: knot where the repo was created 24 24 Knot string `json:"knot" cborgen:"knot"` 25 25 + // labels: List of labels that this repo subscribes to 26 26 + Labels []string `json:"labels,omitempty" cborgen:"labels,omitempty"` 25 27 // name: name of the repo 26 26 - Name string `json:"name" cborgen:"name"` 27 27 - Owner string `json:"owner" cborgen:"owner"` 28 28 + Name string `json:"name" cborgen:"name"` 28 29 // source: source of the repo 29 30 Source *string `json:"source,omitempty" cborgen:"source,omitempty"` 30 31 // spindle: CI runner to send jobs to and receive results from

-36

knotserver/util.go

··· 1 1 package knotserver 2 2 3 3 import ( 4 4 - "net/http" 5 5 - "os" 6 6 - "path/filepath" 7 7 - 8 4 "github.com/bluesky-social/indigo/atproto/syntax" 9 9 - securejoin "github.com/cyphar/filepath-securejoin" 10 10 - "github.com/go-chi/chi/v5" 11 5 ) 12 6 13 13 - func didPath(r *http.Request) string { 14 14 - did := chi.URLParam(r, "did") 15 15 - name := chi.URLParam(r, "name") 16 16 - path, _ := securejoin.SecureJoin(did, name) 17 17 - filepath.Clean(path) 18 18 - return path 19 19 - } 20 20 - 21 21 - func getDescription(path string) (desc string) { 22 22 - db, err := os.ReadFile(filepath.Join(path, "description")) 23 23 - if err == nil { 24 24 - desc = string(db) 25 25 - } else { 26 26 - desc = "" 27 27 - } 28 28 - return 29 29 - } 30 30 - func setContentDisposition(w http.ResponseWriter, name string) { 31 31 - h := "inline; filename=\"" + name + "\"" 32 32 - w.Header().Add("Content-Disposition", h) 33 33 - } 34 34 - 35 35 - func setGZipMIME(w http.ResponseWriter) { 36 36 - setMIME(w, "application/gzip") 37 37 - } 38 38 - 39 39 - func setMIME(w http.ResponseWriter, mime string) { 40 40 - w.Header().Add("Content-Type", mime) 41 41 - } 42 42 - 43 7 var TIDClock = syntax.NewTIDClock(0) 44 8 45 9 func TID() string {

+8 -5

lexicons/repo/repo.json

··· 12 12 "required": [ 13 13 "name", 14 14 "knot", 15 15 - "owner", 16 15 "createdAt" 17 16 ], 18 17 "properties": { ··· 20 19 "type": "string", 21 20 "description": "name of the repo" 22 21 }, 23 23 - "owner": { 24 24 - "type": "string", 25 25 - "format": "did" 26 26 - }, 27 22 "knot": { 28 23 "type": "string", 29 24 "description": "knot where the repo was created" ··· 42 37 "format": "uri", 43 38 "description": "source of the repo" 44 39 }, 40 40 + "labels": { 41 41 + "type": "array", 42 42 + "description": "List of labels that this repo subscribes to", 43 43 + "items": { 44 44 + "type": "string", 45 45 + "format": "at-uri" 46 46 + } 47 47 + }, 45 48 "createdAt": { 46 49 "type": "string", 47 50 "format": "datetime"

+1 -1

spindle/xrpc/add_secret.go

··· 62 62 } 63 63 64 64 repo := resp.Value.Val.(*tangled.Repo) 65 65 - didPath, err := securejoin.SecureJoin(repo.Owner, repo.Name) 65 65 + didPath, err := securejoin.SecureJoin(ident.DID.String(), repo.Name) 66 66 if err != nil { 67 67 fail(xrpcerr.GenericError(err)) 68 68 return

+1 -1

spindle/xrpc/list_secrets.go

··· 57 57 } 58 58 59 59 repo := resp.Value.Val.(*tangled.Repo) 60 60 - didPath, err := securejoin.SecureJoin(repo.Owner, repo.Name) 60 60 + didPath, err := securejoin.SecureJoin(ident.DID.String(), repo.Name) 61 61 if err != nil { 62 62 fail(xrpcerr.GenericError(err)) 63 63 return

+1 -1

spindle/xrpc/remove_secret.go

··· 56 56 } 57 57 58 58 repo := resp.Value.Val.(*tangled.Repo) 59 59 - didPath, err := securejoin.SecureJoin(repo.Owner, repo.Name) 59 59 + didPath, err := securejoin.SecureJoin(ident.DID.String(), repo.Name) 60 60 if err != nil { 61 61 fail(xrpcerr.GenericError(err)) 62 62 return

+6

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

··· 1 1 + {{ define "repo/fragments/colorBall" }} 2 2 + <div 3 3 + class="size-2 rounded-full {{ .classes }}" 4 4 + style="background: radial-gradient(circle at 35% 35%, color-mix(in srgb, {{ .color }} 70%, white), {{ .color }} 30%, color-mix(in srgb, {{ .color }} 85%, black));" 5 5 + ></div> 6 6 + {{ end }}

+1 -1

appview/pages/templates/repo/index.html

··· 49 49 <div 50 50 class="flex flex-grow items-center gap-2 text-xs align-items-center justify-center" 51 51 > 52 52 - {{ template "repo/fragments/languageBall" $value.Name }} 52 52 + {{ template "repo/fragments/colorBall" (dict "color" (langColor $value.Name)) }} 53 53 <div>{{ or $value.Name "Other" }} 54 54 <span class="text-gray-500 dark:text-gray-400"> 55 55 {{ if lt $value.Percentage 0.05 }}

+1 -1

appview/pages/templates/user/overview.html

··· 73 73 {{ with .Repo.RepoStats }} 74 74 {{ with .Language }} 75 75 <div class="flex gap-2 items-center text-xs font-mono text-gray-400 "> 76 76 - {{ template "repo/fragments/languageBall" . }} 76 76 + {{ template "repo/fragments/colorBall" (dict "color" (langColor .)) }} 77 77 <span>{{ . }}</span> 78 78 </div> 79 79 {{end }}

+1 -1

appview/issues/router.go

··· 14 14 r.With(middleware.Paginate).Get("/", i.RepoIssues) 15 15 16 16 r.Route("/{issue}", func(r chi.Router) { 17 17 - r.Use(mw.ResolveIssue()) 17 17 + r.Use(mw.ResolveIssue) 18 18 r.Get("/", i.RepoSingleIssue) 19 19 20 20 // authenticated routes

+1 -1

appview/pages/templates/repo/settings/pipelines.html

··· 109 109 hx-swap="none" 110 110 class="flex flex-col gap-2" 111 111 > 112 112 - <p class="uppercase p-0">ADD SECRET</p> 112 112 + <p class="uppercase p-0 font-bold">ADD SECRET</p> 113 113 <p class="text-sm text-gray-500 dark:text-gray-400">Secrets are available as environment variables in the workflow.</p> 114 114 <input 115 115 type="text"

+6

appview/pages/templates/labels/fragments/labelDef.html

··· 1 1 + {{ define "labels/fragments/labelDef" }} 2 2 + <span class="flex items-center gap-2 font-normal normal-case"> 3 3 + {{ template "repo/fragments/colorBall" (dict "color" .GetColor) }} 4 4 + {{ .Name }} 5 5 + </span> 6 6 + {{ end }}

+4 -4

appview/pages/templates/repo/issues/fragments/commentList.html

··· 3 3 {{ range $item := .CommentList }} 4 4 {{ template "commentListing" (list $ .) }} 5 5 {{ end }} 6 6 - <div> 6 6 + </div> 7 7 {{ end }} 8 8 9 9 {{ define "commentListing" }} ··· 16 16 "Issue" $root.Issue 17 17 "Comment" $comment.Self) }} 18 18 19 19 - <div class="rounded border border-gray-300 dark:border-gray-700 w-full overflow-hidden shadow-sm"> 19 19 + <div class="rounded border border-gray-200 dark:border-gray-700 w-full overflow-hidden shadow-sm bg-gray-50 dark:bg-gray-800/50"> 20 20 {{ template "topLevelComment" $params }} 21 21 22 22 - <div class="relative ml-4 border-l border-gray-300 dark:border-gray-700"> 22 22 + <div class="relative ml-4 border-l-2 border-gray-200 dark:border-gray-700"> 23 23 {{ range $index, $reply := $comment.Replies }} 24 24 <div class="relative "> 25 25 <!-- Horizontal connector --> 26 26 - <div class="absolute left-0 top-6 w-4 h-px bg-gray-300 dark:bg-gray-700"></div> 26 26 + <div class="absolute left-0 top-6 w-4 h-1 bg-gray-200 dark:bg-gray-700"></div> 27 27 28 28 <div class="pl-2"> 29 29 {{

-127

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

··· 1 1 - {{ define "repo/fragments/addLabelModal" }} 2 2 - {{ $root := .root }} 3 3 - {{ $subject := .subject }} 4 4 - {{ $state := .state }} 5 5 - {{ with $root }} 6 6 - <form 7 7 - hx-put="/{{ .RepoInfo.FullName }}/labels/perform" 8 8 - hx-on::after-request="this.reset()" 9 9 - hx-indicator="#spinner" 10 10 - hx-swap="none" 11 11 - class="flex flex-col gap-4" 12 12 - > 13 13 - <p class="text-gray-500 dark:text-gray-400">Add, remove or update labels.</p> 14 14 - 15 15 - <input class="hidden" name="repo" value="{{ .RepoInfo.RepoAt.String }}"> 16 16 - <input class="hidden" name="subject" value="{{ $subject }}"> 17 17 - 18 18 - <div class="flex flex-col gap-2"> 19 19 - {{ $id := 0 }} 20 20 - {{ range $k, $valset := $state.Inner }} 21 21 - {{ $d := index $root.LabelDefs $k }} 22 22 - {{ range $v, $s := $valset }} 23 23 - {{ template "labelCheckbox" (dict "def" $d "key" $k "val" $v "id" $id "isChecked" true) }} 24 24 - {{ $id = add $id 1 }} 25 25 - {{ end }} 26 26 - {{ end }} 27 27 - 28 28 - {{ range $k, $d := $root.LabelDefs }} 29 29 - {{ if not ($state.ContainsLabel $k) }} 30 30 - {{ template "labelCheckbox" (dict "def" $d "key" $k "val" "" "id" $id "isChecked" false) }} 31 31 - {{ $id = add $id 1 }} 32 32 - {{ end }} 33 33 - {{ else }} 34 34 - <span> 35 35 - No labels defined yet. You can define custom labels in <a class="underline" href="/{{ .RepoInfo.FullName }}/settings">settings</a>. 36 36 - </span> 37 37 - {{ end }} 38 38 - </div> 39 39 - 40 40 - <div class="flex gap-2 pt-2"> 41 41 - <button 42 42 - type="button" 43 43 - popovertarget="add-label-modal" 44 44 - popovertargetaction="hide" 45 45 - class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300" 46 46 - > 47 47 - {{ i "x" "size-4" }} cancel 48 48 - </button> 49 49 - <button type="submit" class="btn w-1/2 flex items-center"> 50 50 - <span class="inline-flex gap-2 items-center">{{ i "check" "size-4" }} save</span> 51 51 - <span id="spinner" class="group"> 52 52 - {{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 53 53 - </span> 54 54 - </button> 55 55 - </div> 56 56 - <div id="add-label-error" class="text-red-500 dark:text-red-400"></div> 57 57 - </form> 58 58 - {{ end }} 59 59 - {{ end }} 60 60 - 61 61 - {{ define "labelCheckbox" }} 62 62 - {{ $key := .key }} 63 63 - {{ $val := .val }} 64 64 - {{ $def := .def }} 65 65 - {{ $id := .id }} 66 66 - {{ $isChecked := .isChecked }} 67 67 - <div class="grid grid-cols-[auto_1fr_50%] gap-2 items-center cursor-pointer"> 68 68 - <input type="checkbox" id="op-{{$id}}" name="op-{{$id}}" value="add" {{if $isChecked}}checked{{end}} class="peer"> 69 69 - <label for="op-{{$id}}" class="flex items-center gap-2 text-base">{{ template "labels/fragments/labelDef" $def }}</label> 70 70 - <div class="w-full hidden peer-checked:block">{{ template "valueTypeInput" (dict "valueType" $def.ValueType "value" $val "key" $key) }}</div> 71 71 - <input type="hidden" name="operand-key" value="{{ $key }}"> 72 72 - </div> 73 73 - {{ end }} 74 74 - 75 75 - {{ define "valueTypeInput" }} 76 76 - {{ $valueType := .valueType }} 77 77 - {{ $value := .value }} 78 78 - {{ $key := .key }} 79 79 - 80 80 - {{ if $valueType.IsEnumType }} 81 81 - {{ template "enumTypeInput" $ }} 82 82 - {{ else if $valueType.IsBool }} 83 83 - {{ template "boolTypeInput" $ }} 84 84 - {{ else if $valueType.IsInt }} 85 85 - {{ template "intTypeInput" $ }} 86 86 - {{ else if $valueType.IsString }} 87 87 - {{ template "stringTypeInput" $ }} 88 88 - {{ else if $valueType.IsNull }} 89 89 - {{ template "nullTypeInput" $ }} 90 90 - {{ end }} 91 91 - {{ end }} 92 92 - 93 93 - {{ define "enumTypeInput" }} 94 94 - {{ $valueType := .valueType }} 95 95 - {{ $value := .value }} 96 96 - <select name="operand-val" class="w-full p-1 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600"> 97 97 - {{ range $valueType.Enum }} 98 98 - <option value="{{.}}" {{ if eq $value . }} selected {{ end }}>{{.}}</option> 99 99 - {{ end }} 100 100 - </select> 101 101 - {{ end }} 102 102 - 103 103 - {{ define "boolTypeInput" }} 104 104 - {{ $value := .value }} 105 105 - <select name="operand-val" class="w-full p-1 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600"> 106 106 - <option value="true" {{ if $value }} selected {{ end }}>true</option> 107 107 - <option value="false" {{ if not $value }} selected {{ end }}>false</option> 108 108 - </select> 109 109 - {{ end }} 110 110 - 111 111 - {{ define "intTypeInput" }} 112 112 - {{ $value := .value }} 113 113 - <input class="p-1 w-full" type="number" name="operand-val" value="{{$value}}" max="100"> 114 114 - {{ end }} 115 115 - 116 116 - {{ define "stringTypeInput" }} 117 117 - {{ $valueType := .valueType }} 118 118 - {{ $value := .value }} 119 119 - {{ if $valueType.IsDidFormat }} 120 120 - {{ $value = resolve .value }} 121 121 - {{ end }} 122 122 - <input class="p-1 w-full" type="text" name="operand-val" value="{{$value}}"> 123 123 - {{ end }} 124 124 - 125 125 - {{ define "nullTypeInput" }} 126 126 - <input class="p-1" type="hidden" name="operand-val" value="null"> 127 127 - {{ end }}

+208

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

··· 1 1 + {{ define "repo/fragments/editLabelPanel" }} 2 2 + <form 3 3 + id="edit-label-panel" 4 4 + hx-put="/{{ .RepoInfo.FullName }}/labels/perform" 5 5 + hx-indicator="#spinner" 6 6 + hx-disabled-elt="#save-btn,#cancel-btn" 7 7 + hx-swap="none" 8 8 + class="flex flex-col gap-6" 9 9 + > 10 10 + <input type="hidden" name="repo" value="{{ .RepoInfo.RepoAt }}"> 11 11 + <input type="hidden" name="subject" value="{{ .Subject }}"> 12 12 + {{ template "editBasicLabels" . }} 13 13 + {{ template "editKvLabels" . }} 14 14 + {{ template "editLabelPanelActions" . }} 15 15 + <div id="add-label-error" class="text-red-500 dark:text-red-400"></div> 16 16 + </form> 17 17 + {{ end }} 18 18 + 19 19 + {{ define "editBasicLabels" }} 20 20 + {{ $defs := .Defs }} 21 21 + {{ $subject := .Subject }} 22 22 + {{ $state := .State }} 23 23 + {{ $labelStyle := "flex items-center gap-2 rounded py-1 px-2 border border-gray-200 dark:border-gray-700 text-sm bg-white dark:bg-gray-800 text-black dark:text-white" }} 24 24 + <div> 25 25 + {{ template "repo/fragments/labelSectionHeaderText" "Labels" }} 26 26 + 27 27 + <div class="flex gap-1 items-center flex-wrap"> 28 28 + {{ range $k, $d := $defs }} 29 29 + {{ $isChecked := $state.ContainsLabel $k }} 30 30 + {{ if $d.ValueType.IsNull }} 31 31 + {{ $fieldName := $d.AtUri }} 32 32 + <label class="{{$labelStyle}}"> 33 33 + <input type="checkbox" id="{{ $fieldName }}" name="{{ $fieldName }}" value="null" {{if $isChecked}}checked{{end}}> 34 34 + {{ template "labels/fragments/labelDef" $d }} 35 35 + </label> 36 36 + {{ end }} 37 37 + {{ else }} 38 38 + <p class="text-gray-500 dark:text-gray-400 text-sm py-1"> 39 39 + No labels defined yet. You can choose default labels or define custom 40 40 + labels in <a class="underline" href="/{{ $.RepoInfo.FullName }}/settings">settings</a>. 41 41 + </p> 42 42 + {{ end }} 43 43 + </div> 44 44 + </div> 45 45 + {{ end }} 46 46 + 47 47 + {{ define "editKvLabels" }} 48 48 + {{ $defs := .Defs }} 49 49 + {{ $subject := .Subject }} 50 50 + {{ $state := .State }} 51 51 + {{ $labelStyle := "font-normal normal-case flex items-center gap-2 p-0" }} 52 52 + 53 53 + {{ range $k, $d := $defs }} 54 54 + {{ if (not $d.ValueType.IsNull) }} 55 55 + {{ $fieldName := $d.AtUri }} 56 56 + {{ $valset := $state.GetValSet $k }} 57 57 + <div id="label-{{$d.Id}}" class="flex flex-col gap-1"> 58 58 + {{ template "repo/fragments/labelSectionHeaderText" $d.Name }} 59 59 + {{ if (and $d.Multiple $d.ValueType.IsEnum) }} 60 60 + <!-- checkbox --> 61 61 + {{ range $variant := $d.ValueType.Enum }} 62 62 + <label class="{{$labelStyle}}"> 63 63 + <input type="checkbox" name="{{ $fieldName }}" value="{{$variant}}" {{if $state.ContainsLabelAndVal $k $variant}}checked{{end}}> 64 64 + {{ $variant }} 65 65 + </label> 66 66 + {{ end }} 67 67 + {{ else if $d.Multiple }} 68 68 + <!-- dynamically growing input fields --> 69 69 + {{ range $v, $s := $valset }} 70 70 + {{ template "multipleInputField" (dict "def" $d "value" $v "key" $k) }} 71 71 + {{ else }} 72 72 + {{ template "multipleInputField" (dict "def" $d "value" "" "key" $k) }} 73 73 + {{ end }} 74 74 + {{ template "addFieldButton" $d }} 75 75 + {{ else if $d.ValueType.IsEnum }} 76 76 + <!-- radio buttons --> 77 77 + {{ $isUsed := $state.ContainsLabel $k }} 78 78 + {{ range $variant := $d.ValueType.Enum }} 79 79 + <label class="{{$labelStyle}}"> 80 80 + <input type="radio" name="{{ $fieldName }}" value="{{$variant}}" {{if $state.ContainsLabelAndVal $k $variant}}checked{{end}}> 81 81 + {{ $variant }} 82 82 + </label> 83 83 + {{ end }} 84 84 + <label class="{{$labelStyle}}"> 85 85 + <input type="radio" name="{{ $fieldName }}" value="" {{ if not $isUsed }}checked{{ end }}> 86 86 + None 87 87 + </label> 88 88 + {{ else }} 89 89 + <!-- single input field based on value type --> 90 90 + {{ range $v, $s := $valset }} 91 91 + {{ template "valueTypeInput" (dict "def" $d "value" $v "key" $k) }} 92 92 + {{ else }} 93 93 + {{ template "valueTypeInput" (dict "def" $d "value" "" "key" $k) }} 94 94 + {{ end }} 95 95 + {{ end }} 96 96 + </div> 97 97 + {{ end }} 98 98 + {{ end }} 99 99 + {{ end }} 100 100 + 101 101 + {{ define "multipleInputField" }} 102 102 + <div class="flex gap-1 items-stretch"> 103 103 + {{ template "valueTypeInput" . }} 104 104 + {{ template "removeFieldButton" }} 105 105 + </div> 106 106 + {{ end }} 107 107 + 108 108 + {{ define "addFieldButton" }} 109 109 + <div style="display:none" id="tpl-{{ .Id }}"> 110 110 + {{ template "multipleInputField" (dict "def" . "value" "" "key" .AtUri.String) }} 111 111 + </div> 112 112 + <button type="button" onClick="this.insertAdjacentHTML('beforebegin', document.getElementById('tpl-{{ .Id }}').innerHTML)" class="w-full btn flex items-center gap-2"> 113 113 + {{ i "plus" "size-4" }} add 114 114 + </button> 115 115 + {{ end }} 116 116 + 117 117 + {{ define "removeFieldButton" }} 118 118 + <button type="button" onClick="this.parentElement.remove()" class="btn flex items-center gap-2 text-red-400 dark:text-red-500"> 119 119 + {{ i "trash-2" "size-4" }} 120 120 + </button> 121 121 + {{ end }} 122 122 + 123 123 + {{ define "valueTypeInput" }} 124 124 + {{ $def := .def }} 125 125 + {{ $valueType := $def.ValueType }} 126 126 + {{ $value := .value }} 127 127 + {{ $key := .key }} 128 128 + 129 129 + {{ if $valueType.IsBool }} 130 130 + {{ template "boolTypeInput" $ }} 131 131 + {{ else if $valueType.IsInt }} 132 132 + {{ template "intTypeInput" $ }} 133 133 + {{ else if $valueType.IsString }} 134 134 + {{ template "stringTypeInput" $ }} 135 135 + {{ else if $valueType.IsNull }} 136 136 + {{ template "nullTypeInput" $ }} 137 137 + {{ end }} 138 138 + {{ end }} 139 139 + 140 140 + {{ define "boolTypeInput" }} 141 141 + {{ $def := .def }} 142 142 + {{ $fieldName := $def.AtUri }} 143 143 + {{ $value := .value }} 144 144 + {{ $labelStyle = "font-normal normal-case flex items-center gap-2" }} 145 145 + <div class="flex flex-col gap-1"> 146 146 + <label class="{{$labelStyle}}"> 147 147 + <input type="radio" name="{{ $fieldName }}" value="true" {{ if not $value }}checked{{ end }}> 148 148 + None 149 149 + </label> 150 150 + <label class="{{$labelStyle}}"> 151 151 + <input type="radio" name="{{ $fieldName }}" value="true" {{ if not $value }}checked{{ end }}> 152 152 + None 153 153 + </label> 154 154 + <label class="{{$labelStyle}}"> 155 155 + <input type="radio" name="{{ $fieldName }}" value="true" {{ if not $value }}checked{{ end }}> 156 156 + None 157 157 + </label> 158 158 + </div> 159 159 + {{ end }} 160 160 + 161 161 + {{ define "intTypeInput" }} 162 162 + {{ $def := .def }} 163 163 + {{ $fieldName := $def.AtUri }} 164 164 + {{ $value := .value }} 165 165 + <input class="p-1 w-full" type="number" name="{{$fieldName}}" value="{{$value}}"> 166 166 + {{ end }} 167 167 + 168 168 + {{ define "stringTypeInput" }} 169 169 + {{ $def := .def }} 170 170 + {{ $fieldName := $def.AtUri }} 171 171 + {{ $valueType := $def.ValueType }} 172 172 + {{ $value := .value }} 173 173 + {{ if $valueType.IsDidFormat }} 174 174 + {{ $value = trimPrefix (resolve .value) "@" }} 175 175 + {{ end }} 176 176 + <input class="p-1 w-full" type="text" name="{{$fieldName}}" value="{{$value}}"> 177 177 + {{ end }} 178 178 + 179 179 + {{ define "nullTypeInput" }} 180 180 + {{ $def := .def }} 181 181 + {{ $fieldName := $def.AtUri }} 182 182 + <input class="p-1" type="hidden" name="{{$fieldName}}" value="null"> 183 183 + {{ end }} 184 184 + 185 185 + {{ define "editLabelPanelActions" }} 186 186 + <div class="flex gap-2 pt-2"> 187 187 + <button 188 188 + id="cancel-btn" 189 189 + type="button" 190 190 + hx-get="/{{ .RepoInfo.FullName }}/label" 191 191 + hx-vals='{"subject": "{{.Subject}}"}' 192 192 + hx-swap="outerHTML" 193 193 + hx-target="#edit-label-panel" 194 194 + class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 group"> 195 195 + {{ i "x" "size-4" }} cancel 196 196 + </button> 197 197 + 198 198 + <button 199 199 + id="save-btn" 200 200 + type="submit" 201 201 + class="btn w-1/2 flex items-center"> 202 202 + <span class="inline-flex gap-2 items-center">{{ i "check" "size-4" }} save</span> 203 203 + <span id="spinner" class="group"> 204 204 + {{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 205 205 + </span> 206 206 + </button> 207 207 + </div> 208 208 + {{ end }}

+16

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

··· 1 1 + {{ define "repo/fragments/labelSectionHeader" }} 2 2 + 3 3 + <div class="flex justify-between items-center gap-2"> 4 4 + {{ template "repo/fragments/labelSectionHeaderText" .Name }} 5 5 + {{ if (or .RepoInfo.Roles.IsOwner .RepoInfo.Roles.IsCollaborator) }} 6 6 + <a 7 7 + class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group" 8 8 + hx-get="/{{ .RepoInfo.FullName }}/label/edit" 9 9 + hx-vals='{"subject": "{{.Subject}}"}' 10 10 + hx-swap="outerHTML" 11 11 + hx-target="#label-panel"> 12 12 + {{ i "pencil" "size-3" }} 13 13 + </a> 14 14 + {{ end }} 15 15 + </div> 16 16 + {{ end }}

+3

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

··· 1 1 + {{ define "repo/fragments/labelSectionHeaderText" }} 2 2 + <span class="text-sm py-1 font-bold text-gray-500 dark:text-gray-400 capitalize">{{ . }}</span> 3 3 + {{ end }}

+138 -86

appview/pages/templates/repo/settings/fragments/addLabelDefModal.html

··· 1 1 {{ define "repo/settings/fragments/addLabelDefModal" }} 2 2 - <form 3 3 - hx-put="/{{ $.RepoInfo.FullName }}/settings/label" 4 4 - hx-indicator="#spinner" 5 5 - hx-swap="none" 6 6 - hx-on::after-request="if(event.detail.successful) this.reset()" 7 7 - class="flex flex-col gap-4" 8 8 - > 9 9 - <p class="text-gray-500 dark:text-gray-400">Labels can have a name and a value. Set the value type to "none" to create a simple label.</p> 2 2 + <div class="grid grid-cols-2"> 3 3 + <input type="radio" name="tab" id="basic-tab" value="basic" class="hidden peer/basic" checked> 4 4 + <input type="radio" name="tab" id="kv-tab" value="kv" class="hidden peer/kv"> 10 5 11 11 - <div class="w-full"> 12 12 - <label for="name">Name</label> 13 13 - <input class="w-full" type="text" id="label-name" name="name" required placeholder="improvement"/> 6 6 + <!-- Labels as direct siblings --> 7 7 + {{ $base := "py-2 text-sm font-normal normal-case block hover:no-underline text-center cursor-pointer bg-gray-100 dark:bg-gray-800 shadow-inner border border-gray-200 dark:border-gray-700" }} 8 8 + <label for="basic-tab" class="{{$base}} peer-checked/basic:bg-white peer-checked/basic:dark:bg-gray-700 peer-checked/basic:shadow-sm rounded-l"> 9 9 + Basic Labels 10 10 + </label> 11 11 + <label for="kv-tab" class="{{$base}} peer-checked/kv:bg-white peer-checked/kv:dark:bg-gray-700 peer-checked/kv:shadow-sm rounded-r"> 12 12 + Key-value Labels 13 13 + </label> 14 14 + 15 15 + <!-- Basic Labels Content - direct sibling --> 16 16 + <div class="mt-4 hidden peer-checked/basic:block col-span-full"> 17 17 + {{ template "basicLabelDef" . }} 14 18 </div> 15 19 16 16 - <!-- Value Type --> 17 17 - <div class="w-full"> 18 18 - <label for="valueType">Value Type</label> 19 19 - <select id="value-type" name="valueType" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600"> 20 20 - <option value="null" selected>None</option> 21 21 - <option value="string">String</option> 22 22 - <option value="integer">Integer</option> 23 23 - <option value="boolean">Boolean</option> 24 24 - </select> 25 25 - <details id="constrain-values" class="group hidden"> 26 26 - <summary class="list-none cursor-pointer flex items-center gap-2 py-2"> 27 27 - <span class="group-open:hidden inline text-gray-500 dark:text-gray-400">{{ i "square-plus" "w-4 h-4" }}</span> 28 28 - <span class="hidden group-open:inline text-gray-500 dark:text-gray-400">{{ i "square-minus" "w-4 h-4" }}</span> 29 29 - <span>Constrain values</span> 30 30 - </summary> 31 31 - <label for="enumValues">Permitted values</label> 32 32 - <input type="text" id="enumValues" name="enumValues" placeholder="value1, value2, value3" class="w-full"/> 33 33 - <p class="text-sm text-gray-400 dark:text-gray-500 mt-1">Enter comma-separated list of permitted values.</p> 34 34 - 35 35 - <label for="valueFormat">String format</label> 36 36 - <select id="valueFormat" name="valueFormat" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600"> 37 37 - <option value="any" selected>Any</option> 38 38 - <option value="did">DID</option> 39 39 - </select> 40 40 - <p class="text-sm text-gray-400 dark:text-gray-500 mt-1">Choose a string format.</p> 41 41 - </details> 20 20 + <!-- Key-value Labels Content - direct sibling --> 21 21 + <div class="mt-4 hidden peer-checked/kv:block col-span-full"> 22 22 + {{ template "kvLabelDef" . }} 42 23 </div> 43 24 44 44 - <!-- Scope --> 25 25 + <div id="add-label-error" class="text-red-500 dark:text-red-400 col-span-full"></div> 26 26 + </div> 27 27 + {{ end }} 28 28 + 29 29 + {{ define "basicLabelDef" }} 30 30 + <form 31 31 + hx-put="/{{ $.RepoInfo.FullName }}/settings/label" 32 32 + hx-indicator="#spinner" 33 33 + hx-swap="none" 34 34 + hx-on::after-request="if(event.detail.successful) this.reset()" 35 35 + class="flex flex-col space-y-4"> 36 36 + 37 37 + <p class="text-gray-500 dark:text-gray-400">These labels can have a name and a color.</p> 38 38 + 39 39 + {{ template "nameInput" . }} 40 40 + {{ template "scopeInput" . }} 41 41 + {{ template "colorInput" . }} 42 42 + 43 43 + <div class="flex gap-2 pt-2"> 44 44 + {{ template "cancelButton" . }} 45 45 + {{ template "submitButton" . }} 46 46 + </div> 47 47 + </form> 48 48 + {{ end }} 49 49 + 50 50 + {{ define "kvLabelDef" }} 51 51 + <form 52 52 + hx-put="/{{ $.RepoInfo.FullName }}/settings/label" 53 53 + hx-indicator="#spinner" 54 54 + hx-swap="none" 55 55 + hx-on::after-request="if(event.detail.successful) this.reset()" 56 56 + class="flex flex-col space-y-4"> 57 57 + 58 58 + <p class="text-gray-500 dark:text-gray-400"> 59 59 + These labels are more detailed, they can have a key and an associated 60 60 + value. You may define additional constraints on label values. 61 61 + </p> 62 62 + 63 63 + {{ template "nameInput" . }} 64 64 + {{ template "valueInput" . }} 65 65 + {{ template "multipleInput" . }} 66 66 + {{ template "scopeInput" . }} 67 67 + {{ template "colorInput" . }} 68 68 + 69 69 + <div class="flex gap-2 pt-2"> 70 70 + {{ template "cancelButton" . }} 71 71 + {{ template "submitButton" . }} 72 72 + </div> 73 73 + </form> 74 74 + {{ end }} 75 75 + 76 76 + {{ define "nameInput" }} 45 77 <div class="w-full"> 46 46 - <label for="scope">Scope</label> 47 47 - <select id="scope" name="scope" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600"> 48 48 - <option value="sh.tangled.repo.issue">Issues</option> 49 49 - <option value="sh.tangled.repo.pull">Pull Requests</option> 50 50 - </select> 78 78 + <label for="name">Name</label> 79 79 + <input class="w-full" type="text" id="label-name" name="name" required placeholder="improvement"/> 51 80 </div> 81 81 + {{ end }} 52 82 53 53 - <!-- Color --> 83 83 + {{ define "colorInput" }} 54 84 <div class="w-full"> 55 85 <label for="color">Color</label> 56 86 <div class="grid grid-cols-4 grid-rows-2 place-items-center"> ··· 63 93 {{ end }} 64 94 </div> 65 95 </div> 96 96 + {{ end }} 66 97 67 67 - <!-- Multiple --> 68 68 - <div class="w-full flex flex-wrap gap-2"> 69 69 - <input type="checkbox" id="multiple" name="multiple" value="true" /> 70 70 - <span> 71 71 - Allow multiple values 72 72 - </span> 98 98 + {{ define "scopeInput" }} 99 99 + <div class="w-full"> 100 100 + <label>Scope</label> 101 101 + <label class="font-normal normal-case flex items-center gap-2 p-0"> 102 102 + <input type="checkbox" id="issue-scope" name="scope" value="sh.tangled.repo.issue" checked /> 103 103 + Issues 104 104 + </label> 105 105 + <label class="font-normal normal-case flex items-center gap-2 p-0"> 106 106 + <input type="checkbox" id="pulls-scope" name="scope" value="sh.tangled.repo.pull" checked /> 107 107 + Pull Requests 108 108 + </label> 109 109 + </div> 110 110 + {{ end }} 111 111 + 112 112 + {{ define "valueInput" }} 113 113 + <div class="w-full"> 114 114 + <label for="valueType">Value Type</label> 115 115 + <select id="value-type" name="valueType" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600"> 116 116 + <option value="string">String</option> 117 117 + <option value="integer">Integer</option> 118 118 + </select> 73 119 </div> 74 120 75 75 - <div class="flex gap-2 pt-2"> 76 76 - <button 77 77 - type="button" 78 78 - popovertarget="add-labeldef-modal" 79 79 - popovertargetaction="hide" 80 80 - class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300" 81 81 - > 82 82 - {{ i "x" "size-4" }} cancel 83 83 - </button> 84 84 - <button type="submit" class="btn w-1/2 flex items-center"> 85 85 - <span class="inline-flex gap-2 items-center">{{ i "plus" "size-4" }} add</span> 86 86 - <span id="spinner" class="group"> 87 87 - {{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 88 88 - </span> 89 89 - </button> 121 121 + <div class="w-full"> 122 122 + <label for="enumValues">Permitted values</label> 123 123 + <input type="text" id="enumValues" name="enumValues" placeholder="value1, value2, value3" class="w-full"/> 124 124 + <p class="text-sm text-gray-400 dark:text-gray-500 mt-1"> 125 125 + Enter comma-separated list of permitted values, or leave empty to allow any value. 126 126 + </p> 90 127 </div> 91 91 - <div id="add-label-error" class="text-red-500 dark:text-red-400"></div> 92 92 - </form> 93 93 - 94 94 - <script> 95 95 - document.getElementById('value-type').addEventListener('change', function() { 96 96 - const constrainValues = document.getElementById('constrain-values'); 97 97 - const selectedValue = this.value; 98 98 - 99 99 - if (selectedValue === 'string') { 100 100 - constrainValues.classList.remove('hidden'); 101 101 - } else { 102 102 - constrainValues.classList.add('hidden'); 103 103 - constrainValues.removeAttribute('open'); 104 104 - document.getElementById('enumValues').value = ''; 105 105 - } 106 106 - }); 107 107 - 108 108 - function toggleDarkMode() { 109 109 - document.documentElement.classList.toggle('dark'); 110 110 - } 111 111 - </script> 128 128 + 129 129 + <div class="w-full"> 130 130 + <label for="valueFormat">String format</label> 131 131 + <select id="valueFormat" name="valueFormat" class="w-full p-3 rounded border border-gray-300 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-600"> 132 132 + <option value="any" selected>Any</option> 133 133 + <option value="did">DID</option> 134 134 + </select> 135 135 + </div> 136 136 + {{ end }} 137 137 + 138 138 + {{ define "multipleInput" }} 139 139 + <div class="w-full flex flex-wrap gap-2"> 140 140 + <input type="checkbox" id="multiple" name="multiple" value="true" /> 141 141 + <span>Allow multiple values</span> 142 142 + </div> 112 143 {{ end }} 113 144 145 145 + {{ define "cancelButton" }} 146 146 + <button 147 147 + type="button" 148 148 + popovertarget="add-labeldef-modal" 149 149 + popovertargetaction="hide" 150 150 + class="btn w-1/2 flex items-center gap-2 text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300" 151 151 + > 152 152 + {{ i "x" "size-4" }} cancel 153 153 + </button> 154 154 + {{ end }} 155 155 + 156 156 + {{ define "submitButton" }} 157 157 + <button type="submit" class="btn-create w-1/2 flex items-center"> 158 158 + <span class="inline-flex gap-2 items-center">{{ i "plus" "size-4" }} add</span> 159 159 + <span id="spinner" class="group"> 160 160 + {{ i "loader-circle" "ml-2 w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 161 161 + </span> 162 162 + </button> 163 163 + {{ end }} 164 164 + 165 165 +

+25 -27

appview/pages/templates/repo/settings/fragments/labelListing.html

··· 1 1 {{ define "repo/settings/fragments/labelListing" }} 2 2 {{ $root := index . 0 }} 3 3 {{ $label := index . 1 }} 4 4 - <div id="label-{{$label.Id}}" class="flex items-center justify-between p-2 pl-4"> 5 5 - <div class="flex flex-col gap-1 text-sm min-w-0 max-w-[80%]"> 6 6 - {{ template "labels/fragments/labelDef" $label }} 7 7 - <div class="flex flex-wrap text items-center gap-1 text-gray-500 dark:text-gray-400"> 4 4 + <div class="flex flex-col gap-1 text-sm min-w-0 max-w-[80%]"> 5 5 + {{ template "labels/fragments/labelDef" $label }} 6 6 + <div class="flex flex-wrap text items-center gap-1 text-gray-500 dark:text-gray-400"> 7 7 + {{ if $label.ValueType.IsNull }} 8 8 + basic 9 9 + {{ else }} 8 10 {{ $label.ValueType.Type }} type 9 9 - {{ if $label.ValueType.IsEnumType }} 10 10 - <span class="before:content-['·'] before:select-none"></span> 11 11 - {{ join $label.ValueType.Enum ", " }} 12 12 - {{ end }} 13 13 - {{ if $label.ValueType.IsDidFormat }} 14 14 - <span class="before:content-['·'] before:select-none"></span> 15 15 - DID format 16 16 - {{ end }} 17 17 - </div> 11 11 + {{ end }} 12 12 + 13 13 + {{ if $label.ValueType.IsEnum }} 14 14 + <span class="before:content-['·'] before:select-none"></span> 15 15 + {{ join $label.ValueType.Enum ", " }} 16 16 + {{ end }} 17 17 + 18 18 + {{ if $label.ValueType.IsDidFormat }} 19 19 + <span class="before:content-['·'] before:select-none"></span> 20 20 + DID format 21 21 + {{ end }} 22 22 + 23 23 + {{ if $label.Multiple }} 24 24 + <span class="before:content-['·'] before:select-none"></span> 25 25 + multiple 26 26 + {{ end }} 27 27 + 28 28 + <span class="before:content-['·'] before:select-none"></span> 29 29 + {{ join $label.Scope ", " }} 18 30 </div> 19 19 - {{ if $root.RepoInfo.Roles.IsOwner }} 20 20 - <button 21 21 - class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group" 22 22 - title="Delete label" 23 23 - hx-delete="/{{ $root.RepoInfo.FullName }}/settings/label" 24 24 - hx-swap="none" 25 25 - hx-vals='{"label-id": "{{ $label.Id }}"}' 26 26 - hx-confirm="Are you sure you want to delete the label `{{ $label.Name }}`?" 27 27 - > 28 28 - {{ i "trash-2" "w-5 h-5" }} 29 29 - <span class="hidden md:inline">delete</span> 30 30 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 31 31 - </button> 32 32 - {{ end }} 33 31 </div> 34 32 {{ end }}

+9

consts/consts.go

··· 1 1 + package consts 2 2 + 3 3 + const ( 4 4 + TangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli" 5 5 + IcyDid = "did:plc:hwevmowznbiukdf6uk5dwrrq" 6 6 + 7 7 + DefaultSpindle = "spindle.tangled.sh" 8 8 + DefaultKnot = "knot1.tangled.sh" 9 9 + )

+5 -25

appview/db/artifact.go

··· 5 5 "strings" 6 6 "time" 7 7 8 8 - "github.com/bluesky-social/indigo/atproto/syntax" 9 8 "github.com/go-git/go-git/v5/plumbing" 10 9 "github.com/ipfs/go-cid" 11 11 - "tangled.org/core/api/tangled" 10 10 + "tangled.org/core/appview/models" 12 11 ) 13 12 14 14 - type Artifact struct { 15 15 - Id uint64 16 16 - Did string 17 17 - Rkey string 18 18 - 19 19 - RepoAt syntax.ATURI 20 20 - Tag plumbing.Hash 21 21 - CreatedAt time.Time 22 22 - 23 23 - BlobCid cid.Cid 24 24 - Name string 25 25 - Size uint64 26 26 - MimeType string 27 27 - } 28 28 - 29 29 - func (a *Artifact) ArtifactAt() syntax.ATURI { 30 30 - return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", a.Did, tangled.RepoArtifactNSID, a.Rkey)) 31 31 - } 32 32 - 33 33 - func AddArtifact(e Execer, artifact Artifact) error { 13 13 + func AddArtifact(e Execer, artifact models.Artifact) error { 34 14 _, err := e.Exec( 35 15 `insert or ignore into artifacts ( 36 16 did, ··· 57 37 return err 58 38 } 59 39 60 60 - func GetArtifact(e Execer, filters ...filter) ([]Artifact, error) { 61 61 - var artifacts []Artifact 40 40 + func GetArtifact(e Execer, filters ...filter) ([]models.Artifact, error) { 41 41 + var artifacts []models.Artifact 62 42 63 43 var conditions []string 64 44 var args []any ··· 94 74 defer rows.Close() 95 75 96 76 for rows.Next() { 97 97 - var artifact Artifact 77 77 + var artifact models.Artifact 98 78 var createdAt string 99 79 var tag []byte 100 80 var blobCid string

+30

appview/models/artifact.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "time" 6 6 + 7 7 + "github.com/bluesky-social/indigo/atproto/syntax" 8 8 + "github.com/go-git/go-git/v5/plumbing" 9 9 + "github.com/ipfs/go-cid" 10 10 + "tangled.org/core/api/tangled" 11 11 + ) 12 12 + 13 13 + type Artifact struct { 14 14 + Id uint64 15 15 + Did string 16 16 + Rkey string 17 17 + 18 18 + RepoAt syntax.ATURI 19 19 + Tag plumbing.Hash 20 20 + CreatedAt time.Time 21 21 + 22 22 + BlobCid cid.Cid 23 23 + Name string 24 24 + Size uint64 25 25 + MimeType string 26 26 + } 27 27 + 28 28 + func (a *Artifact) ArtifactAt() syntax.ATURI { 29 29 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", a.Did, tangled.RepoArtifactNSID, a.Rkey)) 30 30 + }

+21

appview/models/collaborator.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "time" 5 5 + 6 6 + "github.com/bluesky-social/indigo/atproto/syntax" 7 7 + ) 8 8 + 9 9 + type Collaborator struct { 10 10 + // identifiers for the record 11 11 + Id int64 12 12 + Did syntax.DID 13 13 + Rkey string 14 14 + 15 15 + // content 16 16 + SubjectDid syntax.DID 17 17 + RepoAt syntax.ATURI 18 18 + 19 19 + // meta 20 20 + Created time.Time 21 21 + }

+16

appview/models/email.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "time" 5 5 + ) 6 6 + 7 7 + type Email struct { 8 8 + ID int64 9 9 + Did string 10 10 + Address string 11 11 + Verified bool 12 12 + Primary bool 13 13 + VerificationCode string 14 14 + LastSent *time.Time 15 15 + CreatedAt time.Time 16 16 + }

+38

appview/models/follow.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "time" 5 5 + ) 6 6 + 7 7 + type Follow struct { 8 8 + UserDid string 9 9 + SubjectDid string 10 10 + FollowedAt time.Time 11 11 + Rkey string 12 12 + } 13 13 + 14 14 + type FollowStats struct { 15 15 + Followers int64 16 16 + Following int64 17 17 + } 18 18 + 19 19 + type FollowStatus int 20 20 + 21 21 + const ( 22 22 + IsNotFollowing FollowStatus = iota 23 23 + IsFollowing 24 24 + IsSelf 25 25 + ) 26 26 + 27 27 + func (s FollowStatus) String() string { 28 28 + switch s { 29 29 + case IsNotFollowing: 30 30 + return "IsNotFollowing" 31 31 + case IsFollowing: 32 32 + return "IsFollowing" 33 33 + case IsSelf: 34 34 + return "IsSelf" 35 35 + default: 36 36 + return "IsNotFollowing" 37 37 + } 38 38 + }

+3 -3

appview/pages/repoinfo/repoinfo.go

··· 7 7 "strings" 8 8 9 9 "github.com/bluesky-social/indigo/atproto/syntax" 10 10 - "tangled.org/core/appview/db" 10 10 + "tangled.org/core/appview/models" 11 11 "tangled.org/core/appview/state/userutil" 12 12 ) 13 13 ··· 60 60 Spindle string 61 61 RepoAt syntax.ATURI 62 62 IsStarred bool 63 63 - Stats db.RepoStats 63 63 + Stats models.RepoStats 64 64 Roles RolesInRepo 65 65 - Source *db.Repo 65 65 + Source *models.Repo 66 66 SourceHandle string 67 67 Ref string 68 68 DisableFork bool

+4 -4

appview/state/git_http.go

··· 8 8 9 9 "github.com/bluesky-social/indigo/atproto/identity" 10 10 "github.com/go-chi/chi/v5" 11 11 - "tangled.org/core/appview/db" 11 11 + "tangled.org/core/appview/models" 12 12 ) 13 13 14 14 func (s *State) InfoRefs(w http.ResponseWriter, r *http.Request) { 15 15 user := r.Context().Value("resolvedId").(identity.Identity) 16 16 - repo := r.Context().Value("repo").(*db.Repo) 16 16 + repo := r.Context().Value("repo").(*models.Repo) 17 17 18 18 scheme := "https" 19 19 if s.config.Core.Dev { ··· 31 31 http.Error(w, "failed to resolve user", http.StatusInternalServerError) 32 32 return 33 33 } 34 34 - repo := r.Context().Value("repo").(*db.Repo) 34 34 + repo := r.Context().Value("repo").(*models.Repo) 35 35 36 36 scheme := "https" 37 37 if s.config.Core.Dev { ··· 48 48 http.Error(w, "failed to resolve user", http.StatusInternalServerError) 49 49 return 50 50 } 51 51 - repo := r.Context().Value("repo").(*db.Repo) 51 51 + repo := r.Context().Value("repo").(*models.Repo) 52 52 53 53 scheme := "https" 54 54 if s.config.Core.Dev {

+194

appview/models/issue.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "sort" 6 6 + "time" 7 7 + 8 8 + "github.com/bluesky-social/indigo/atproto/syntax" 9 9 + "tangled.org/core/api/tangled" 10 10 + ) 11 11 + 12 12 + type Issue struct { 13 13 + Id int64 14 14 + Did string 15 15 + Rkey string 16 16 + RepoAt syntax.ATURI 17 17 + IssueId int 18 18 + Created time.Time 19 19 + Edited *time.Time 20 20 + Deleted *time.Time 21 21 + Title string 22 22 + Body string 23 23 + Open bool 24 24 + 25 25 + // optionally, populate this when querying for reverse mappings 26 26 + // like comment counts, parent repo etc. 27 27 + Comments []IssueComment 28 28 + Labels LabelState 29 29 + Repo *Repo 30 30 + } 31 31 + 32 32 + func (i *Issue) AtUri() syntax.ATURI { 33 33 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", i.Did, tangled.RepoIssueNSID, i.Rkey)) 34 34 + } 35 35 + 36 36 + func (i *Issue) AsRecord() tangled.RepoIssue { 37 37 + return tangled.RepoIssue{ 38 38 + Repo: i.RepoAt.String(), 39 39 + Title: i.Title, 40 40 + Body: &i.Body, 41 41 + CreatedAt: i.Created.Format(time.RFC3339), 42 42 + } 43 43 + } 44 44 + 45 45 + func (i *Issue) State() string { 46 46 + if i.Open { 47 47 + return "open" 48 48 + } 49 49 + return "closed" 50 50 + } 51 51 + 52 52 + type CommentListItem struct { 53 53 + Self *IssueComment 54 54 + Replies []*IssueComment 55 55 + } 56 56 + 57 57 + func (i *Issue) CommentList() []CommentListItem { 58 58 + // Create a map to quickly find comments by their aturi 59 59 + toplevel := make(map[string]*CommentListItem) 60 60 + var replies []*IssueComment 61 61 + 62 62 + // collect top level comments into the map 63 63 + for _, comment := range i.Comments { 64 64 + if comment.IsTopLevel() { 65 65 + toplevel[comment.AtUri().String()] = &CommentListItem{ 66 66 + Self: &comment, 67 67 + } 68 68 + } else { 69 69 + replies = append(replies, &comment) 70 70 + } 71 71 + } 72 72 + 73 73 + for _, r := range replies { 74 74 + parentAt := *r.ReplyTo 75 75 + if parent, exists := toplevel[parentAt]; exists { 76 76 + parent.Replies = append(parent.Replies, r) 77 77 + } 78 78 + } 79 79 + 80 80 + var listing []CommentListItem 81 81 + for _, v := range toplevel { 82 82 + listing = append(listing, *v) 83 83 + } 84 84 + 85 85 + // sort everything 86 86 + sortFunc := func(a, b *IssueComment) bool { 87 87 + return a.Created.Before(b.Created) 88 88 + } 89 89 + sort.Slice(listing, func(i, j int) bool { 90 90 + return sortFunc(listing[i].Self, listing[j].Self) 91 91 + }) 92 92 + for _, r := range listing { 93 93 + sort.Slice(r.Replies, func(i, j int) bool { 94 94 + return sortFunc(r.Replies[i], r.Replies[j]) 95 95 + }) 96 96 + } 97 97 + 98 98 + return listing 99 99 + } 100 100 + 101 101 + func (i *Issue) Participants() []string { 102 102 + participantSet := make(map[string]struct{}) 103 103 + participants := []string{} 104 104 + 105 105 + addParticipant := func(did string) { 106 106 + if _, exists := participantSet[did]; !exists { 107 107 + participantSet[did] = struct{}{} 108 108 + participants = append(participants, did) 109 109 + } 110 110 + } 111 111 + 112 112 + addParticipant(i.Did) 113 113 + 114 114 + for _, c := range i.Comments { 115 115 + addParticipant(c.Did) 116 116 + } 117 117 + 118 118 + return participants 119 119 + } 120 120 + 121 121 + func IssueFromRecord(did, rkey string, record tangled.RepoIssue) Issue { 122 122 + created, err := time.Parse(time.RFC3339, record.CreatedAt) 123 123 + if err != nil { 124 124 + created = time.Now() 125 125 + } 126 126 + 127 127 + body := "" 128 128 + if record.Body != nil { 129 129 + body = *record.Body 130 130 + } 131 131 + 132 132 + return Issue{ 133 133 + RepoAt: syntax.ATURI(record.Repo), 134 134 + Did: did, 135 135 + Rkey: rkey, 136 136 + Created: created, 137 137 + Title: record.Title, 138 138 + Body: body, 139 139 + Open: true, // new issues are open by default 140 140 + } 141 141 + } 142 142 + 143 143 + type IssueComment struct { 144 144 + Id int64 145 145 + Did string 146 146 + Rkey string 147 147 + IssueAt string 148 148 + ReplyTo *string 149 149 + Body string 150 150 + Created time.Time 151 151 + Edited *time.Time 152 152 + Deleted *time.Time 153 153 + } 154 154 + 155 155 + func (i *IssueComment) AtUri() syntax.ATURI { 156 156 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", i.Did, tangled.RepoIssueCommentNSID, i.Rkey)) 157 157 + } 158 158 + 159 159 + func (i *IssueComment) AsRecord() tangled.RepoIssueComment { 160 160 + return tangled.RepoIssueComment{ 161 161 + Body: i.Body, 162 162 + Issue: i.IssueAt, 163 163 + CreatedAt: i.Created.Format(time.RFC3339), 164 164 + ReplyTo: i.ReplyTo, 165 165 + } 166 166 + } 167 167 + 168 168 + func (i *IssueComment) IsTopLevel() bool { 169 169 + return i.ReplyTo == nil 170 170 + } 171 171 + 172 172 + func IssueCommentFromRecord(did, rkey string, record tangled.RepoIssueComment) (*IssueComment, error) { 173 173 + created, err := time.Parse(time.RFC3339, record.CreatedAt) 174 174 + if err != nil { 175 175 + created = time.Now() 176 176 + } 177 177 + 178 178 + ownerDid := did 179 179 + 180 180 + if _, err = syntax.ParseATURI(record.Issue); err != nil { 181 181 + return nil, err 182 182 + } 183 183 + 184 184 + comment := IssueComment{ 185 185 + Did: ownerDid, 186 186 + Rkey: rkey, 187 187 + Body: record.Body, 188 188 + IssueAt: record.Issue, 189 189 + ReplyTo: record.ReplyTo, 190 190 + Created: created, 191 191 + } 192 192 + 193 193 + return &comment, nil 194 194 + }

+14

appview/models/language.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "github.com/bluesky-social/indigo/atproto/syntax" 5 5 + ) 6 6 + 7 7 + type RepoLanguage struct { 8 8 + Id int64 9 9 + RepoAt syntax.ATURI 10 10 + Ref string 11 11 + IsDefaultRef bool 12 12 + Language string 13 13 + Bytes int64 14 14 + }

+20 -190

appview/db/profile.go

··· 10 10 "time" 11 11 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 13 - "tangled.org/core/api/tangled" 14 13 "tangled.org/core/appview/models" 15 14 ) 16 15 17 17 - type RepoEvent struct { 18 18 - Repo *models.Repo 19 19 - Source *models.Repo 20 20 - } 21 21 - 22 22 - type ProfileTimeline struct { 23 23 - ByMonth []ByMonth 24 24 - } 25 25 - 26 26 - func (p *ProfileTimeline) IsEmpty() bool { 27 27 - if p == nil { 28 28 - return true 29 29 - } 30 30 - 31 31 - for _, m := range p.ByMonth { 32 32 - if !m.IsEmpty() { 33 33 - return false 34 34 - } 35 35 - } 36 36 - 37 37 - return true 38 38 - } 39 39 - 40 40 - type ByMonth struct { 41 41 - RepoEvents []RepoEvent 42 42 - IssueEvents IssueEvents 43 43 - PullEvents PullEvents 44 44 - } 45 45 - 46 46 - func (b ByMonth) IsEmpty() bool { 47 47 - return len(b.RepoEvents) == 0 && 48 48 - len(b.IssueEvents.Items) == 0 && 49 49 - len(b.PullEvents.Items) == 0 50 50 - } 51 51 - 52 52 - type IssueEvents struct { 53 53 - Items []*models.Issue 54 54 - } 55 55 - 56 56 - type IssueEventStats struct { 57 57 - Open int 58 58 - Closed int 59 59 - } 60 60 - 61 61 - func (i IssueEvents) Stats() IssueEventStats { 62 62 - var open, closed int 63 63 - for _, issue := range i.Items { 64 64 - if issue.Open { 65 65 - open += 1 66 66 - } else { 67 67 - closed += 1 68 68 - } 69 69 - } 70 70 - 71 71 - return IssueEventStats{ 72 72 - Open: open, 73 73 - Closed: closed, 74 74 - } 75 75 - } 76 76 - 77 77 - type PullEvents struct { 78 78 - Items []*models.Pull 79 79 - } 80 80 - 81 81 - func (p PullEvents) Stats() PullEventStats { 82 82 - var open, merged, closed int 83 83 - for _, pull := range p.Items { 84 84 - switch pull.State { 85 85 - case models.PullOpen: 86 86 - open += 1 87 87 - case models.PullMerged: 88 88 - merged += 1 89 89 - case models.PullClosed: 90 90 - closed += 1 91 91 - } 92 92 - } 93 93 - 94 94 - return PullEventStats{ 95 95 - Open: open, 96 96 - Merged: merged, 97 97 - Closed: closed, 98 98 - } 99 99 - } 100 100 - 101 101 - type PullEventStats struct { 102 102 - Closed int 103 103 - Open int 104 104 - Merged int 105 105 - } 106 106 - 107 16 const TimeframeMonths = 7 108 17 109 109 - func MakeProfileTimeline(e Execer, forDid string) (*ProfileTimeline, error) { 110 110 - timeline := ProfileTimeline{ 111 111 - ByMonth: make([]ByMonth, TimeframeMonths), 18 18 + func MakeProfileTimeline(e Execer, forDid string) (*models.ProfileTimeline, error) { 19 19 + timeline := models.ProfileTimeline{ 20 20 + ByMonth: make([]models.ByMonth, TimeframeMonths), 112 21 } 113 22 currentMonth := time.Now().Month() 114 23 timeframe := fmt.Sprintf("-%d months", TimeframeMonths) ··· 181 90 idx := currentMonth - repoMonth 182 91 183 92 items := &timeline.ByMonth[idx].RepoEvents 184 184 - *items = append(*items, RepoEvent{ 93 93 + *items = append(*items, models.RepoEvent{ 185 94 Repo: &repo, 186 95 Source: sourceRepo, 187 96 }) ··· 190 99 return &timeline, nil 191 100 } 192 101 193 193 - type Profile struct { 194 194 - // ids 195 195 - ID int 196 196 - Did string 197 197 - 198 198 - // data 199 199 - Description string 200 200 - IncludeBluesky bool 201 201 - Location string 202 202 - Links [5]string 203 203 - Stats [2]VanityStat 204 204 - PinnedRepos [6]syntax.ATURI 205 205 - } 206 206 - 207 207 - func (p Profile) IsLinksEmpty() bool { 208 208 - for _, l := range p.Links { 209 209 - if l != "" { 210 210 - return false 211 211 - } 212 212 - } 213 213 - return true 214 214 - } 215 215 - 216 216 - func (p Profile) IsStatsEmpty() bool { 217 217 - for _, s := range p.Stats { 218 218 - if s.Kind != "" { 219 219 - return false 220 220 - } 221 221 - } 222 222 - return true 223 223 - } 224 224 - 225 225 - func (p Profile) IsPinnedReposEmpty() bool { 226 226 - for _, r := range p.PinnedRepos { 227 227 - if r != "" { 228 228 - return false 229 229 - } 230 230 - } 231 231 - return true 232 232 - } 233 233 - 234 234 - type VanityStatKind string 235 235 - 236 236 - const ( 237 237 - VanityStatMergedPRCount VanityStatKind = "merged-pull-request-count" 238 238 - VanityStatClosedPRCount VanityStatKind = "closed-pull-request-count" 239 239 - VanityStatOpenPRCount VanityStatKind = "open-pull-request-count" 240 240 - VanityStatOpenIssueCount VanityStatKind = "open-issue-count" 241 241 - VanityStatClosedIssueCount VanityStatKind = "closed-issue-count" 242 242 - VanityStatRepositoryCount VanityStatKind = "repository-count" 243 243 - ) 244 244 - 245 245 - func (v VanityStatKind) String() string { 246 246 - switch v { 247 247 - case VanityStatMergedPRCount: 248 248 - return "Merged PRs" 249 249 - case VanityStatClosedPRCount: 250 250 - return "Closed PRs" 251 251 - case VanityStatOpenPRCount: 252 252 - return "Open PRs" 253 253 - case VanityStatOpenIssueCount: 254 254 - return "Open Issues" 255 255 - case VanityStatClosedIssueCount: 256 256 - return "Closed Issues" 257 257 - case VanityStatRepositoryCount: 258 258 - return "Repositories" 259 259 - } 260 260 - return "" 261 261 - } 262 262 - 263 263 - type VanityStat struct { 264 264 - Kind VanityStatKind 265 265 - Value uint64 266 266 - } 267 267 - 268 268 - func (p *Profile) ProfileAt() syntax.ATURI { 269 269 - return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", p.Did, tangled.ActorProfileNSID, "self")) 270 270 - } 271 271 - 272 272 - func UpsertProfile(tx *sql.Tx, profile *Profile) error { 102 102 + func UpsertProfile(tx *sql.Tx, profile *models.Profile) error { 273 103 defer tx.Rollback() 274 104 275 105 // update links ··· 367 197 return tx.Commit() 368 198 } 369 199 370 370 - func GetProfiles(e Execer, filters ...filter) (map[string]*Profile, error) { 200 200 + func GetProfiles(e Execer, filters ...filter) (map[string]*models.Profile, error) { 371 201 var conditions []string 372 202 var args []any 373 203 for _, filter := range filters { ··· 397 227 return nil, err 398 228 } 399 229 400 400 - profileMap := make(map[string]*Profile) 230 230 + profileMap := make(map[string]*models.Profile) 401 231 for rows.Next() { 402 402 - var profile Profile 232 232 + var profile models.Profile 403 233 var includeBluesky int 404 234 405 235 err = rows.Scan(&profile.ID, &profile.Did, &profile.Description, &includeBluesky, &profile.Location) ··· 470 300 return profileMap, nil 471 301 } 472 302 473 473 - func GetProfile(e Execer, did string) (*Profile, error) { 474 474 - var profile Profile 303 303 + func GetProfile(e Execer, did string) (*models.Profile, error) { 304 304 + var profile models.Profile 475 305 profile.Did = did 476 306 477 307 includeBluesky := 0 ··· 480 310 did, 481 311 ).Scan(&profile.Description, &includeBluesky, &profile.Location) 482 312 if err == sql.ErrNoRows { 483 483 - profile := Profile{} 313 313 + profile := models.Profile{} 484 314 profile.Did = did 485 315 return &profile, nil 486 316 } ··· 540 370 return &profile, nil 541 371 } 542 372 543 543 - func GetVanityStat(e Execer, did string, stat VanityStatKind) (uint64, error) { 373 373 + func GetVanityStat(e Execer, did string, stat models.VanityStatKind) (uint64, error) { 544 374 query := "" 545 375 var args []any 546 376 switch stat { 547 547 - case VanityStatMergedPRCount: 377 377 + case models.VanityStatMergedPRCount: 548 378 query = `select count(id) from pulls where owner_did = ? and state = ?` 549 379 args = append(args, did, models.PullMerged) 550 550 - case VanityStatClosedPRCount: 380 380 + case models.VanityStatClosedPRCount: 551 381 query = `select count(id) from pulls where owner_did = ? and state = ?` 552 382 args = append(args, did, models.PullClosed) 553 553 - case VanityStatOpenPRCount: 383 383 + case models.VanityStatOpenPRCount: 554 384 query = `select count(id) from pulls where owner_did = ? and state = ?` 555 385 args = append(args, did, models.PullOpen) 556 556 - case VanityStatOpenIssueCount: 386 386 + case models.VanityStatOpenIssueCount: 557 387 query = `select count(id) from issues where did = ? and open = 1` 558 388 args = append(args, did) 559 559 - case VanityStatClosedIssueCount: 389 389 + case models.VanityStatClosedIssueCount: 560 390 query = `select count(id) from issues where did = ? and open = 0` 561 391 args = append(args, did) 562 562 - case VanityStatRepositoryCount: 392 392 + case models.VanityStatRepositoryCount: 563 393 query = `select count(id) from repos where did = ?` 564 394 args = append(args, did) 565 395 } ··· 573 403 return result, nil 574 404 } 575 405 576 576 - func ValidateProfile(e Execer, profile *Profile) error { 406 406 + func ValidateProfile(e Execer, profile *models.Profile) error { 577 407 // ensure description is not too long 578 408 if len(profile.Description) > 256 { 579 409 return fmt.Errorf("Entered bio is too long.") ··· 621 451 return nil 622 452 } 623 453 624 624 - func validateLinks(profile *Profile) error { 454 454 + func validateLinks(profile *models.Profile) error { 625 455 for i, link := range profile.Links { 626 456 if link == "" { 627 457 continue

+177

appview/models/profile.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 Profile struct { 11 11 + // ids 12 12 + ID int 13 13 + Did string 14 14 + 15 15 + // data 16 16 + Description string 17 17 + IncludeBluesky bool 18 18 + Location string 19 19 + Links [5]string 20 20 + Stats [2]VanityStat 21 21 + PinnedRepos [6]syntax.ATURI 22 22 + } 23 23 + 24 24 + func (p Profile) IsLinksEmpty() bool { 25 25 + for _, l := range p.Links { 26 26 + if l != "" { 27 27 + return false 28 28 + } 29 29 + } 30 30 + return true 31 31 + } 32 32 + 33 33 + func (p Profile) IsStatsEmpty() bool { 34 34 + for _, s := range p.Stats { 35 35 + if s.Kind != "" { 36 36 + return false 37 37 + } 38 38 + } 39 39 + return true 40 40 + } 41 41 + 42 42 + func (p Profile) IsPinnedReposEmpty() bool { 43 43 + for _, r := range p.PinnedRepos { 44 44 + if r != "" { 45 45 + return false 46 46 + } 47 47 + } 48 48 + return true 49 49 + } 50 50 + 51 51 + type VanityStatKind string 52 52 + 53 53 + const ( 54 54 + VanityStatMergedPRCount VanityStatKind = "merged-pull-request-count" 55 55 + VanityStatClosedPRCount VanityStatKind = "closed-pull-request-count" 56 56 + VanityStatOpenPRCount VanityStatKind = "open-pull-request-count" 57 57 + VanityStatOpenIssueCount VanityStatKind = "open-issue-count" 58 58 + VanityStatClosedIssueCount VanityStatKind = "closed-issue-count" 59 59 + VanityStatRepositoryCount VanityStatKind = "repository-count" 60 60 + ) 61 61 + 62 62 + func (v VanityStatKind) String() string { 63 63 + switch v { 64 64 + case VanityStatMergedPRCount: 65 65 + return "Merged PRs" 66 66 + case VanityStatClosedPRCount: 67 67 + return "Closed PRs" 68 68 + case VanityStatOpenPRCount: 69 69 + return "Open PRs" 70 70 + case VanityStatOpenIssueCount: 71 71 + return "Open Issues" 72 72 + case VanityStatClosedIssueCount: 73 73 + return "Closed Issues" 74 74 + case VanityStatRepositoryCount: 75 75 + return "Repositories" 76 76 + } 77 77 + return "" 78 78 + } 79 79 + 80 80 + type VanityStat struct { 81 81 + Kind VanityStatKind 82 82 + Value uint64 83 83 + } 84 84 + 85 85 + func (p *Profile) ProfileAt() syntax.ATURI { 86 86 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", p.Did, tangled.ActorProfileNSID, "self")) 87 87 + } 88 88 + 89 89 + type RepoEvent struct { 90 90 + Repo *Repo 91 91 + Source *Repo 92 92 + } 93 93 + 94 94 + type ProfileTimeline struct { 95 95 + ByMonth []ByMonth 96 96 + } 97 97 + 98 98 + func (p *ProfileTimeline) IsEmpty() bool { 99 99 + if p == nil { 100 100 + return true 101 101 + } 102 102 + 103 103 + for _, m := range p.ByMonth { 104 104 + if !m.IsEmpty() { 105 105 + return false 106 106 + } 107 107 + } 108 108 + 109 109 + return true 110 110 + } 111 111 + 112 112 + type ByMonth struct { 113 113 + RepoEvents []RepoEvent 114 114 + IssueEvents IssueEvents 115 115 + PullEvents PullEvents 116 116 + } 117 117 + 118 118 + func (b ByMonth) IsEmpty() bool { 119 119 + return len(b.RepoEvents) == 0 && 120 120 + len(b.IssueEvents.Items) == 0 && 121 121 + len(b.PullEvents.Items) == 0 122 122 + } 123 123 + 124 124 + type IssueEvents struct { 125 125 + Items []*Issue 126 126 + } 127 127 + 128 128 + type IssueEventStats struct { 129 129 + Open int 130 130 + Closed int 131 131 + } 132 132 + 133 133 + func (i IssueEvents) Stats() IssueEventStats { 134 134 + var open, closed int 135 135 + for _, issue := range i.Items { 136 136 + if issue.Open { 137 137 + open += 1 138 138 + } else { 139 139 + closed += 1 140 140 + } 141 141 + } 142 142 + 143 143 + return IssueEventStats{ 144 144 + Open: open, 145 145 + Closed: closed, 146 146 + } 147 147 + } 148 148 + 149 149 + type PullEvents struct { 150 150 + Items []*Pull 151 151 + } 152 152 + 153 153 + func (p PullEvents) Stats() PullEventStats { 154 154 + var open, merged, closed int 155 155 + for _, pull := range p.Items { 156 156 + switch pull.State { 157 157 + case PullOpen: 158 158 + open += 1 159 159 + case PullMerged: 160 160 + merged += 1 161 161 + case PullClosed: 162 162 + closed += 1 163 163 + } 164 164 + } 165 165 + 166 166 + return PullEventStats{ 167 167 + Open: open, 168 168 + Merged: merged, 169 169 + Closed: closed, 170 170 + } 171 171 + } 172 172 + 173 173 + type PullEventStats struct { 174 174 + Closed int 175 175 + Open int 176 176 + Merged int 177 177 + }

+17 -139

appview/db/pipeline.go

··· 6 6 "strings" 7 7 "time" 8 8 9 9 - "github.com/bluesky-social/indigo/atproto/syntax" 10 10 - "github.com/go-git/go-git/v5/plumbing" 11 11 - spindle "tangled.org/core/spindle/models" 12 12 - "tangled.org/core/workflow" 9 9 + "tangled.org/core/appview/models" 13 10 ) 14 11 15 15 - type Pipeline struct { 16 16 - Id int 17 17 - Rkey string 18 18 - Knot string 19 19 - RepoOwner syntax.DID 20 20 - RepoName string 21 21 - TriggerId int 22 22 - Sha string 23 23 - Created time.Time 24 24 - 25 25 - // populate when querying for reverse mappings 26 26 - Trigger *Trigger 27 27 - Statuses map[string]WorkflowStatus 28 28 - } 29 29 - 30 30 - type WorkflowStatus struct { 31 31 - Data []PipelineStatus 32 32 - } 33 33 - 34 34 - func (w WorkflowStatus) Latest() PipelineStatus { 35 35 - return w.Data[len(w.Data)-1] 36 36 - } 37 37 - 38 38 - // time taken by this workflow to reach an "end state" 39 39 - func (w WorkflowStatus) TimeTaken() time.Duration { 40 40 - var start, end *time.Time 41 41 - for _, s := range w.Data { 42 42 - if s.Status.IsStart() { 43 43 - start = &s.Created 44 44 - } 45 45 - if s.Status.IsFinish() { 46 46 - end = &s.Created 47 47 - } 48 48 - } 49 49 - 50 50 - if start != nil && end != nil && end.After(*start) { 51 51 - return end.Sub(*start) 52 52 - } 53 53 - 54 54 - return 0 55 55 - } 56 56 - 57 57 - func (p Pipeline) Counts() map[string]int { 58 58 - m := make(map[string]int) 59 59 - for _, w := range p.Statuses { 60 60 - m[w.Latest().Status.String()] += 1 61 61 - } 62 62 - return m 63 63 - } 64 64 - 65 65 - func (p Pipeline) TimeTaken() time.Duration { 66 66 - var s time.Duration 67 67 - for _, w := range p.Statuses { 68 68 - s += w.TimeTaken() 69 69 - } 70 70 - return s 71 71 - } 72 72 - 73 73 - func (p Pipeline) Workflows() []string { 74 74 - var ws []string 75 75 - for v := range p.Statuses { 76 76 - ws = append(ws, v) 77 77 - } 78 78 - slices.Sort(ws) 79 79 - return ws 80 80 - } 81 81 - 82 82 - // if we know that a spindle has picked up this pipeline, then it is Responding 83 83 - func (p Pipeline) IsResponding() bool { 84 84 - return len(p.Statuses) != 0 85 85 - } 86 86 - 87 87 - type Trigger struct { 88 88 - Id int 89 89 - Kind workflow.TriggerKind 90 90 - 91 91 - // push trigger fields 92 92 - PushRef *string 93 93 - PushNewSha *string 94 94 - PushOldSha *string 95 95 - 96 96 - // pull request trigger fields 97 97 - PRSourceBranch *string 98 98 - PRTargetBranch *string 99 99 - PRSourceSha *string 100 100 - PRAction *string 101 101 - } 102 102 - 103 103 - func (t *Trigger) IsPush() bool { 104 104 - return t != nil && t.Kind == workflow.TriggerKindPush 105 105 - } 106 106 - 107 107 - func (t *Trigger) IsPullRequest() bool { 108 108 - return t != nil && t.Kind == workflow.TriggerKindPullRequest 109 109 - } 110 110 - 111 111 - func (t *Trigger) TargetRef() string { 112 112 - if t.IsPush() { 113 113 - return plumbing.ReferenceName(*t.PushRef).Short() 114 114 - } else if t.IsPullRequest() { 115 115 - return *t.PRTargetBranch 116 116 - } 117 117 - 118 118 - return "" 119 119 - } 120 120 - 121 121 - type PipelineStatus struct { 122 122 - ID int 123 123 - Spindle string 124 124 - Rkey string 125 125 - PipelineKnot string 126 126 - PipelineRkey string 127 127 - Created time.Time 128 128 - Workflow string 129 129 - Status spindle.StatusKind 130 130 - Error *string 131 131 - ExitCode int 132 132 - } 133 133 - 134 134 - func GetPipelines(e Execer, filters ...filter) ([]Pipeline, error) { 135 135 - var pipelines []Pipeline 12 12 + func GetPipelines(e Execer, filters ...filter) ([]models.Pipeline, error) { 13 13 + var pipelines []models.Pipeline 136 14 137 15 var conditions []string 138 16 var args []any ··· 156 34 defer rows.Close() 157 35 158 36 for rows.Next() { 159 159 - var pipeline Pipeline 37 37 + var pipeline models.Pipeline 160 38 var createdAt string 161 39 err = rows.Scan( 162 40 &pipeline.Id, ··· 185 63 return pipelines, nil 186 64 } 187 65 188 188 - func AddPipeline(e Execer, pipeline Pipeline) error { 66 66 + func AddPipeline(e Execer, pipeline models.Pipeline) error { 189 67 args := []any{ 190 68 pipeline.Rkey, 191 69 pipeline.Knot, ··· 216 94 return err 217 95 } 218 96 219 219 - func AddTrigger(e Execer, trigger Trigger) (int64, error) { 97 97 + func AddTrigger(e Execer, trigger models.Trigger) (int64, error) { 220 98 args := []any{ 221 99 trigger.Kind, 222 100 trigger.PushRef, ··· 252 130 return res.LastInsertId() 253 131 } 254 132 255 255 - func AddPipelineStatus(e Execer, status PipelineStatus) error { 133 133 + func AddPipelineStatus(e Execer, status models.PipelineStatus) error { 256 134 args := []any{ 257 135 status.Spindle, 258 136 status.Rkey, ··· 290 168 291 169 // this is a mega query, but the most useful one: 292 170 // get N pipelines, for each one get the latest status of its N workflows 293 293 - func GetPipelineStatuses(e Execer, filters ...filter) ([]Pipeline, error) { 171 171 + func GetPipelineStatuses(e Execer, filters ...filter) ([]models.Pipeline, error) { 294 172 var conditions []string 295 173 var args []any 296 174 for _, filter := range filters { ··· 335 213 } 336 214 defer rows.Close() 337 215 338 338 - pipelines := make(map[string]Pipeline) 216 216 + pipelines := make(map[string]models.Pipeline) 339 217 for rows.Next() { 340 340 - var p Pipeline 341 341 - var t Trigger 218 218 + var p models.Pipeline 219 219 + var t models.Trigger 342 220 var created string 343 221 344 222 err := rows.Scan( ··· 370 248 371 249 t.Id = p.TriggerId 372 250 p.Trigger = &t 373 373 - p.Statuses = make(map[string]WorkflowStatus) 251 251 + p.Statuses = make(map[string]models.WorkflowStatus) 374 252 375 253 k := fmt.Sprintf("%s/%s", p.Knot, p.Rkey) 376 254 pipelines[k] = p ··· 409 287 defer rows.Close() 410 288 411 289 for rows.Next() { 412 412 - var ps PipelineStatus 290 290 + var ps models.PipelineStatus 413 291 var created string 414 292 415 293 err := rows.Scan( ··· 442 320 } 443 321 statuses, _ := pipeline.Statuses[ps.Workflow] 444 322 if !ok { 445 445 - pipeline.Statuses[ps.Workflow] = WorkflowStatus{} 323 323 + pipeline.Statuses[ps.Workflow] = models.WorkflowStatus{} 446 324 } 447 325 448 326 // append ··· 453 331 pipelines[key] = pipeline 454 332 } 455 333 456 456 - var all []Pipeline 334 334 + var all []models.Pipeline 457 335 for _, p := range pipelines { 458 336 for _, s := range p.Statuses { 459 459 - slices.SortFunc(s.Data, func(a, b PipelineStatus) int { 337 337 + slices.SortFunc(s.Data, func(a, b models.PipelineStatus) int { 460 338 if a.Created.After(b.Created) { 461 339 return 1 462 340 } ··· 476 354 } 477 355 478 356 // sort pipelines by date 479 479 - slices.SortFunc(all, func(a, b Pipeline) int { 357 357 + slices.SortFunc(all, func(a, b models.Pipeline) int { 480 358 if a.Created.After(b.Created) { 481 359 return -1 482 360 }

+130

appview/models/pipeline.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "slices" 5 5 + "time" 6 6 + 7 7 + "github.com/bluesky-social/indigo/atproto/syntax" 8 8 + "github.com/go-git/go-git/v5/plumbing" 9 9 + spindle "tangled.org/core/spindle/models" 10 10 + "tangled.org/core/workflow" 11 11 + ) 12 12 + 13 13 + type Pipeline struct { 14 14 + Id int 15 15 + Rkey string 16 16 + Knot string 17 17 + RepoOwner syntax.DID 18 18 + RepoName string 19 19 + TriggerId int 20 20 + Sha string 21 21 + Created time.Time 22 22 + 23 23 + // populate when querying for reverse mappings 24 24 + Trigger *Trigger 25 25 + Statuses map[string]WorkflowStatus 26 26 + } 27 27 + 28 28 + type WorkflowStatus struct { 29 29 + Data []PipelineStatus 30 30 + } 31 31 + 32 32 + func (w WorkflowStatus) Latest() PipelineStatus { 33 33 + return w.Data[len(w.Data)-1] 34 34 + } 35 35 + 36 36 + // time taken by this workflow to reach an "end state" 37 37 + func (w WorkflowStatus) TimeTaken() time.Duration { 38 38 + var start, end *time.Time 39 39 + for _, s := range w.Data { 40 40 + if s.Status.IsStart() { 41 41 + start = &s.Created 42 42 + } 43 43 + if s.Status.IsFinish() { 44 44 + end = &s.Created 45 45 + } 46 46 + } 47 47 + 48 48 + if start != nil && end != nil && end.After(*start) { 49 49 + return end.Sub(*start) 50 50 + } 51 51 + 52 52 + return 0 53 53 + } 54 54 + 55 55 + func (p Pipeline) Counts() map[string]int { 56 56 + m := make(map[string]int) 57 57 + for _, w := range p.Statuses { 58 58 + m[w.Latest().Status.String()] += 1 59 59 + } 60 60 + return m 61 61 + } 62 62 + 63 63 + func (p Pipeline) TimeTaken() time.Duration { 64 64 + var s time.Duration 65 65 + for _, w := range p.Statuses { 66 66 + s += w.TimeTaken() 67 67 + } 68 68 + return s 69 69 + } 70 70 + 71 71 + func (p Pipeline) Workflows() []string { 72 72 + var ws []string 73 73 + for v := range p.Statuses { 74 74 + ws = append(ws, v) 75 75 + } 76 76 + slices.Sort(ws) 77 77 + return ws 78 78 + } 79 79 + 80 80 + // if we know that a spindle has picked up this pipeline, then it is Responding 81 81 + func (p Pipeline) IsResponding() bool { 82 82 + return len(p.Statuses) != 0 83 83 + } 84 84 + 85 85 + type Trigger struct { 86 86 + Id int 87 87 + Kind workflow.TriggerKind 88 88 + 89 89 + // push trigger fields 90 90 + PushRef *string 91 91 + PushNewSha *string 92 92 + PushOldSha *string 93 93 + 94 94 + // pull request trigger fields 95 95 + PRSourceBranch *string 96 96 + PRTargetBranch *string 97 97 + PRSourceSha *string 98 98 + PRAction *string 99 99 + } 100 100 + 101 101 + func (t *Trigger) IsPush() bool { 102 102 + return t != nil && t.Kind == workflow.TriggerKindPush 103 103 + } 104 104 + 105 105 + func (t *Trigger) IsPullRequest() bool { 106 106 + return t != nil && t.Kind == workflow.TriggerKindPullRequest 107 107 + } 108 108 + 109 109 + func (t *Trigger) TargetRef() string { 110 110 + if t.IsPush() { 111 111 + return plumbing.ReferenceName(*t.PushRef).Short() 112 112 + } else if t.IsPullRequest() { 113 113 + return *t.PRTargetBranch 114 114 + } 115 115 + 116 116 + return "" 117 117 + } 118 118 + 119 119 + type PipelineStatus struct { 120 120 + ID int 121 121 + Spindle string 122 122 + Rkey string 123 123 + PipelineKnot string 124 124 + PipelineRkey string 125 125 + Created time.Time 126 126 + Workflow string 127 127 + Status spindle.StatusKind 128 128 + Error *string 129 129 + ExitCode int 130 130 + }

+25

appview/models/pubkey.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "encoding/json" 5 5 + "time" 6 6 + ) 7 7 + 8 8 + type PublicKey struct { 9 9 + Did string `json:"did"` 10 10 + Key string `json:"key"` 11 11 + Name string `json:"name"` 12 12 + Rkey string `json:"rkey"` 13 13 + Created *time.Time 14 14 + } 15 15 + 16 16 + func (p PublicKey) MarshalJSON() ([]byte, error) { 17 17 + type Alias PublicKey 18 18 + return json.Marshal(&struct { 19 19 + Created string `json:"created"` 20 20 + *Alias 21 21 + }{ 22 22 + Created: p.Created.Format(time.RFC3339), 23 23 + Alias: (*Alias)(&p), 24 24 + }) 25 25 + }

+14

appview/models/punchcard.go

··· 1 1 + package models 2 2 + 3 3 + import "time" 4 4 + 5 5 + type Punch struct { 6 6 + Did string 7 7 + Date time.Time 8 8 + Count int 9 9 + } 10 10 + 11 11 + type Punchcard struct { 12 12 + Total int 13 13 + Punches []Punch 14 14 + }

+44

appview/models/registration.go

··· 1 1 + package models 2 2 + 3 3 + import "time" 4 4 + 5 5 + // Registration represents a knot registration. Knot would've been a better 6 6 + // name but we're stuck with this for historical reasons. 7 7 + type Registration struct { 8 8 + Id int64 9 9 + Domain string 10 10 + ByDid string 11 11 + Created *time.Time 12 12 + Registered *time.Time 13 13 + NeedsUpgrade bool 14 14 + } 15 15 + 16 16 + func (r *Registration) Status() Status { 17 17 + if r.NeedsUpgrade { 18 18 + return NeedsUpgrade 19 19 + } else if r.Registered != nil { 20 20 + return Registered 21 21 + } else { 22 22 + return Pending 23 23 + } 24 24 + } 25 25 + 26 26 + func (r *Registration) IsRegistered() bool { 27 27 + return r.Status() == Registered 28 28 + } 29 29 + 30 30 + func (r *Registration) IsNeedsUpgrade() bool { 31 31 + return r.Status() == NeedsUpgrade 32 32 + } 33 33 + 34 34 + func (r *Registration) IsPending() bool { 35 35 + return r.Status() == Pending 36 36 + } 37 37 + 38 38 + type Status uint32 39 39 + 40 40 + const ( 41 41 + Registered Status = iota 42 42 + Pending 43 43 + NeedsUpgrade 44 44 + )

+10

appview/models/signup.go

··· 1 1 + package models 2 2 + 3 3 + import "time" 4 4 + 5 5 + type InflightSignup struct { 6 6 + Id int64 7 7 + Email string 8 8 + InviteCode string 9 9 + Created time.Time 10 10 + }

+25

appview/models/spindle.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "time" 5 5 + 6 6 + "github.com/bluesky-social/indigo/atproto/syntax" 7 7 + ) 8 8 + 9 9 + type Spindle struct { 10 10 + Id int 11 11 + Owner syntax.DID 12 12 + Instance string 13 13 + Verified *time.Time 14 14 + Created time.Time 15 15 + NeedsUpgrade bool 16 16 + } 17 17 + 18 18 + type SpindleMember struct { 19 19 + Id int 20 20 + Did syntax.DID // owner of the record 21 21 + Rkey string // rkey of the record 22 22 + Instance string 23 23 + Subject syntax.DID // the member being added 24 24 + Created time.Time 25 25 + }

+17

appview/models/star.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "time" 5 5 + 6 6 + "github.com/bluesky-social/indigo/atproto/syntax" 7 7 + ) 8 8 + 9 9 + type Star struct { 10 10 + StarredByDid string 11 11 + RepoAt syntax.ATURI 12 12 + Created time.Time 13 13 + Rkey string 14 14 + 15 15 + // optionally, populate this when querying for reverse mappings 16 16 + Repo *Repo 17 17 + }

+95

appview/models/string.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "bytes" 5 5 + "fmt" 6 6 + "io" 7 7 + "strings" 8 8 + "time" 9 9 + 10 10 + "github.com/bluesky-social/indigo/atproto/syntax" 11 11 + "tangled.org/core/api/tangled" 12 12 + ) 13 13 + 14 14 + type String struct { 15 15 + Did syntax.DID 16 16 + Rkey string 17 17 + 18 18 + Filename string 19 19 + Description string 20 20 + Contents string 21 21 + Created time.Time 22 22 + Edited *time.Time 23 23 + } 24 24 + 25 25 + func (s *String) StringAt() syntax.ATURI { 26 26 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", s.Did, tangled.StringNSID, s.Rkey)) 27 27 + } 28 28 + 29 29 + func (s *String) AsRecord() tangled.String { 30 30 + return tangled.String{ 31 31 + Filename: s.Filename, 32 32 + Description: s.Description, 33 33 + Contents: s.Contents, 34 34 + CreatedAt: s.Created.Format(time.RFC3339), 35 35 + } 36 36 + } 37 37 + 38 38 + func StringFromRecord(did, rkey string, record tangled.String) String { 39 39 + created, err := time.Parse(record.CreatedAt, time.RFC3339) 40 40 + if err != nil { 41 41 + created = time.Now() 42 42 + } 43 43 + return String{ 44 44 + Did: syntax.DID(did), 45 45 + Rkey: rkey, 46 46 + Filename: record.Filename, 47 47 + Description: record.Description, 48 48 + Contents: record.Contents, 49 49 + Created: created, 50 50 + } 51 51 + } 52 52 + 53 53 + type StringStats struct { 54 54 + LineCount uint64 55 55 + ByteCount uint64 56 56 + } 57 57 + 58 58 + func (s String) Stats() StringStats { 59 59 + lineCount, err := countLines(strings.NewReader(s.Contents)) 60 60 + if err != nil { 61 61 + // non-fatal 62 62 + // TODO: log this? 63 63 + } 64 64 + 65 65 + return StringStats{ 66 66 + LineCount: uint64(lineCount), 67 67 + ByteCount: uint64(len(s.Contents)), 68 68 + } 69 69 + } 70 70 + 71 71 + func countLines(r io.Reader) (int, error) { 72 72 + buf := make([]byte, 32*1024) 73 73 + bufLen := 0 74 74 + count := 0 75 75 + nl := []byte{'\n'} 76 76 + 77 77 + for { 78 78 + c, err := r.Read(buf) 79 79 + if c > 0 { 80 80 + bufLen += c 81 81 + } 82 82 + count += bytes.Count(buf[:c], nl) 83 83 + 84 84 + switch { 85 85 + case err == io.EOF: 86 86 + /* handle last line not having a newline at the end */ 87 87 + if bufLen >= 1 && buf[(bufLen-1)%(32*1024)] != '\n' { 88 88 + count++ 89 89 + } 90 90 + return count, nil 91 91 + case err != nil: 92 92 + return 0, err 93 93 + } 94 94 + } 95 95 + }

+27

appview/validator/string.go

··· 1 1 + package validator 2 2 + 3 3 + import ( 4 4 + "errors" 5 5 + "fmt" 6 6 + "unicode/utf8" 7 7 + 8 8 + "tangled.org/core/appview/models" 9 9 + ) 10 10 + 11 11 + func (v *Validator) ValidateString(s *models.String) error { 12 12 + var err error 13 13 + 14 14 + if utf8.RuneCountInString(s.Filename) > 140 { 15 15 + err = errors.Join(err, fmt.Errorf("filename too long")) 16 16 + } 17 17 + 18 18 + if utf8.RuneCountInString(s.Description) > 280 { 19 19 + err = errors.Join(err, fmt.Errorf("description too long")) 20 20 + } 21 21 + 22 22 + if len(s.Contents) == 0 { 23 23 + err = errors.Join(err, fmt.Errorf("contents is empty")) 24 24 + } 25 25 + 26 26 + return err 27 27 + }

+23

appview/models/timeline.go

··· 1 1 + package models 2 2 + 3 3 + import "time" 4 4 + 5 5 + type TimelineEvent struct { 6 6 + *Repo 7 7 + *Follow 8 8 + *Star 9 9 + 10 10 + EventAt time.Time 11 11 + 12 12 + // optional: populate only if Repo is a fork 13 13 + Source *Repo 14 14 + 15 15 + // optional: populate only if event is Follow 16 16 + *Profile 17 17 + *FollowStats 18 18 + *FollowStatus 19 19 + 20 20 + // optional: populate only if event is Repo 21 21 + IsStarred bool 22 22 + StarCount int64 23 23 + }

+1 -1

appview/db/label.go

··· 349 349 defs[l.AtUri().String()] = &l 350 350 } 351 351 352 352 - return &models.LabelApplicationCtx{defs}, nil 352 352 + return &models.LabelApplicationCtx{Defs: defs}, nil 353 353 }

+36 -6

appview/pages/templates/repo/settings/general.html

··· 46 46 47 47 {{ define "defaultLabelSettings" }} 48 48 <div class="flex flex-col gap-2"> 49 49 - <h2 class="text-sm pb-2 uppercase font-bold">Default Labels</h2> 50 50 - <p class="text-gray-500 dark:text-gray-400"> 51 51 - Manage your issues and pulls by creating labels to categorize them. Only 52 52 - repository owners may configure labels. You may choose to subscribe to 53 53 - default labels, or create entirely custom labels. 54 54 - </p> 49 49 + <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-center"> 50 50 + <div class="col-span-1 md:col-span-2"> 51 51 + <h2 class="text-sm pb-2 uppercase font-bold">Default Labels</h2> 52 52 + <p class="text-gray-500 dark:text-gray-400"> 53 53 + Manage your issues and pulls by creating labels to categorize them. Only 54 54 + repository owners may configure labels. You may choose to subscribe to 55 55 + default labels, or create entirely custom labels. 56 56 + <p> 57 57 + </div> 58 58 + <form class="col-span-1 md:col-span-1 md:justify-self-end"> 59 59 + {{ $title := "Unubscribe from all labels" }} 60 60 + {{ $icon := "x" }} 61 61 + {{ $text := "unsubscribe all" }} 62 62 + {{ $action := "unsubscribe" }} 63 63 + {{ if $.ShouldSubscribeAll }} 64 64 + {{ $title = "Subscribe to all labels" }} 65 65 + {{ $icon = "check-check" }} 66 66 + {{ $text = "subscribe all" }} 67 67 + {{ $action = "subscribe" }} 68 68 + {{ end }} 69 69 + {{ range .DefaultLabels }} 70 70 + <input type="hidden" name="label" value="{{ .AtUri.String }}"> 71 71 + {{ end }} 72 72 + <button 73 73 + type="submit" 74 74 + title="{{$title}}" 75 75 + class="btn flex items-center gap-2 group" 76 76 + hx-swap="none" 77 77 + hx-post="/{{ $.RepoInfo.FullName }}/settings/label/{{$action}}" 78 78 + {{ if not .RepoInfo.Roles.IsOwner }}disabled{{ end }}> 79 79 + {{ i $icon "size-4" }} 80 80 + {{ $text }} 81 81 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 82 82 + </button> 83 83 + </form> 84 84 + </div> 55 85 <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 w-full"> 56 86 {{ range .DefaultLabels }} 57 87 <div id="label-{{.Id}}" class="flex items-center justify-between p-2 pl-4">

+10 -33

appview/pages/templates/timeline/fragments/timeline.html

··· 82 82 {{ $event := index . 1 }} 83 83 {{ $follow := $event.Follow }} 84 84 {{ $profile := $event.Profile }} 85 85 - {{ $stat := $event.FollowStats }} 85 85 + {{ $followStats := $event.FollowStats }} 86 86 + {{ $followStatus := $event.FollowStatus }} 86 87 87 88 {{ $userHandle := resolve $follow.UserDid }} 88 89 {{ $subjectHandle := resolve $follow.SubjectDid }} ··· 92 93 {{ template "user/fragments/picHandleLink" $subjectHandle }} 93 94 <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $follow.FollowedAt }}</span> 94 95 </div> 95 95 - <div class="py-4 px-6 drop-shadow-sm rounded bg-white dark:bg-gray-800 flex flex-col md:flex-row md:items-center gap-4"> 96 96 - <div class="flex items-center gap-4 flex-1"> 97 97 - <div class="flex-shrink-0 max-h-full w-24 h-24"> 98 98 - <img alt="" class="object-cover rounded-full p-2" src="{{ fullAvatar $subjectHandle }}" /> 99 99 - </div> 100 100 - 101 101 - <div class="flex-1 min-h-0 justify-around flex flex-col"> 102 102 - <a href="/{{ $subjectHandle }}"> 103 103 - <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ $subjectHandle | truncateAt30 }}</span> 104 104 - </a> 105 105 - {{ with $profile }} 106 106 - {{ with .Description }} 107 107 - <p class="text-sm pb-2 md:pb-2">{{.}}</p> 108 108 - {{ end }} 109 109 - {{ end }} 110 110 - {{ with $stat }} 111 111 - <div class="text-sm flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full"> 112 112 - <span class="flex-shrink-0">{{ i "users" "size-4" }}</span> 113 113 - <span id="followers"><a href="/{{ $subjectHandle }}?tab=followers">{{ .Followers }} followers</a></span> 114 114 - <span class="select-none after:content-['·']"></span> 115 115 - <span id="following"><a href="/{{ $subjectHandle }}?tab=following">{{ .Following }} following</a></span> 116 116 - </div> 117 117 - {{ end }} 118 118 - </div> 119 119 - </div> 120 120 - 121 121 - {{ if and $root.LoggedInUser (ne $event.FollowStatus.String "IsSelf") }} 122 122 - <div class="flex-shrink-0 w-fit ml-auto"> 123 123 - {{ template "user/fragments/follow" (dict "UserDid" $follow.SubjectDid "FollowStatus" $event.FollowStatus) }} 124 124 - </div> 125 125 - {{ end }} 126 126 - </div> 96 96 + {{ template "user/fragments/followCard" 97 97 + (dict 98 98 + "LoggedInUser" $root.LoggedInUser 99 99 + "UserDid" $follow.SubjectDid 100 100 + "Profile" $profile 101 101 + "FollowStatus" $followStatus 102 102 + "FollowersCount" $followStats.Followers 103 103 + "FollowingCount" $followStats.Following) }} 127 104 {{ end }}

+8 -1

appview/pages/templates/user/followers.html

··· 10 10 <p class="text-sm font-bold p-2 dark:text-white">ALL FOLLOWERS</p> 11 11 <div id="followers" class="grid grid-cols-1 gap-4 mb-6"> 12 12 {{ range .Followers }} 13 13 - {{ template "user/fragments/followCard" . }} 13 13 + {{ template "user/fragments/followCard" 14 14 + (dict 15 15 + "LoggedInUser" $.LoggedInUser 16 16 + "UserDid" .UserDid 17 17 + "Profile" .Profile 18 18 + "FollowStatus" .FollowStatus 19 19 + "FollowersCount" .FollowersCount 20 20 + "FollowingCount" .FollowingCount) }} 14 21 {{ else }} 15 22 <p class="px-6 dark:text-white">This user does not have any followers yet.</p> 16 23 {{ end }}

+8 -1

appview/pages/templates/user/following.html

··· 10 10 <p class="text-sm font-bold p-2 dark:text-white">ALL FOLLOWING</p> 11 11 <div id="following" class="grid grid-cols-1 gap-4 mb-6"> 12 12 {{ range .Following }} 13 13 - {{ template "user/fragments/followCard" . }} 13 13 + {{ template "user/fragments/followCard" 14 14 + (dict 15 15 + "LoggedInUser" $.LoggedInUser 16 16 + "UserDid" .UserDid 17 17 + "Profile" .Profile 18 18 + "FollowStatus" .FollowStatus 19 19 + "FollowersCount" .FollowersCount 20 20 + "FollowingCount" .FollowingCount) }} 14 21 {{ else }} 15 22 <p class="px-6 dark:text-white">This user does not follow anyone yet.</p> 16 23 {{ end }}

+58 -3

appview/posthog/notifier.go appview/notify/posthog/notifier.go

··· 1 1 - package posthog_service 1 1 + package posthog 2 2 3 3 import ( 4 4 "context" ··· 98 98 } 99 99 } 100 100 101 101 + func (n *posthogNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) { 102 102 + err := n.client.Enqueue(posthog.Capture{ 103 103 + DistinctId: pull.OwnerDid, 104 104 + Event: "pull_closed", 105 105 + Properties: posthog.Properties{ 106 106 + "repo_at": pull.RepoAt, 107 107 + "pull_id": pull.PullId, 108 108 + }, 109 109 + }) 110 110 + if err != nil { 111 111 + log.Println("failed to enqueue posthog event:", err) 112 112 + } 113 113 + } 114 114 + 101 115 func (n *posthogNotifier) NewFollow(ctx context.Context, follow *models.Follow) { 102 116 err := n.client.Enqueue(posthog.Capture{ 103 117 DistinctId: follow.UserDid, ··· 152 166 } 153 167 } 154 168 155 155 - func (n *posthogNotifier) CreateString(ctx context.Context, string models.String) { 169 169 + func (n *posthogNotifier) NewString(ctx context.Context, string *models.String) { 156 170 err := n.client.Enqueue(posthog.Capture{ 157 171 DistinctId: string.Did.String(), 158 158 - Event: "create_string", 172 172 + Event: "new_string", 159 173 Properties: posthog.Properties{"rkey": string.Rkey}, 160 174 }) 161 175 if err != nil { 162 176 log.Println("failed to enqueue posthog event:", err) 163 177 } 164 178 } 179 179 + 180 180 + func (n *posthogNotifier) NewIssueComment(ctx context.Context, comment *models.IssueComment) { 181 181 + err := n.client.Enqueue(posthog.Capture{ 182 182 + DistinctId: comment.Did, 183 183 + Event: "new_issue_comment", 184 184 + Properties: posthog.Properties{ 185 185 + "issue_at": comment.IssueAt, 186 186 + }, 187 187 + }) 188 188 + if err != nil { 189 189 + log.Println("failed to enqueue posthog event:", err) 190 190 + } 191 191 + } 192 192 + 193 193 + func (n *posthogNotifier) NewIssueClosed(ctx context.Context, issue *models.Issue) { 194 194 + err := n.client.Enqueue(posthog.Capture{ 195 195 + DistinctId: issue.Did, 196 196 + Event: "issue_closed", 197 197 + Properties: posthog.Properties{ 198 198 + "repo_at": issue.RepoAt.String(), 199 199 + "issue_id": issue.IssueId, 200 200 + }, 201 201 + }) 202 202 + if err != nil { 203 203 + log.Println("failed to enqueue posthog event:", err) 204 204 + } 205 205 + } 206 206 + 207 207 + func (n *posthogNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) { 208 208 + err := n.client.Enqueue(posthog.Capture{ 209 209 + DistinctId: pull.OwnerDid, 210 210 + Event: "pull_merged", 211 211 + Properties: posthog.Properties{ 212 212 + "repo_at": pull.RepoAt, 213 213 + "pull_id": pull.PullId, 214 214 + }, 215 215 + }) 216 216 + if err != nil { 217 217 + log.Println("failed to enqueue posthog event:", err) 218 218 + } 219 219 + }

+36 -6

appview/db/repos.go

··· 10 10 "time" 11 11 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 13 + securejoin "github.com/cyphar/filepath-securejoin" 14 14 + "tangled.org/core/api/tangled" 13 15 "tangled.org/core/appview/models" 14 16 ) 15 17 18 18 + type Repo struct { 19 19 + Id int64 20 20 + Did string 21 21 + Name string 22 22 + Knot string 23 23 + Rkey string 24 24 + Created time.Time 25 25 + Description string 26 26 + Spindle string 27 27 + 28 28 + // optionally, populate this when querying for reverse mappings 29 29 + RepoStats *models.RepoStats 30 30 + 31 31 + // optional 32 32 + Source string 33 33 + } 34 34 + 35 35 + func (r Repo) RepoAt() syntax.ATURI { 36 36 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", r.Did, tangled.RepoNSID, r.Rkey)) 37 37 + } 38 38 + 39 39 + func (r Repo) DidSlashRepo() string { 40 40 + p, _ := securejoin.SecureJoin(r.Did, r.Name) 41 41 + return p 42 42 + } 43 43 + 16 44 func GetRepos(e Execer, limit int, filters ...filter) ([]models.Repo, error) { 17 45 repoMap := make(map[syntax.ATURI]*models.Repo) 18 46 ··· 35 63 36 64 repoQuery := fmt.Sprintf( 37 65 `select 66 66 + id, 38 67 did, 39 68 name, 40 69 knot, ··· 63 92 var description, source, spindle sql.NullString 64 93 65 94 err := rows.Scan( 95 95 + &repo.Id, 66 96 &repo.Did, 67 97 &repo.Name, 68 98 &repo.Knot, ··· 327 357 var repo models.Repo 328 358 var nullableDescription sql.NullString 329 359 330 330 - row := e.QueryRow(`select did, name, knot, created, rkey, description from repos where at_uri = ?`, atUri) 360 360 + row := e.QueryRow(`select id, did, name, knot, created, rkey, description from repos where at_uri = ?`, atUri) 331 361 332 362 var createdAt string 333 333 - if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.Rkey, &nullableDescription); err != nil { 363 363 + if err := row.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.Rkey, &nullableDescription); err != nil { 334 364 return nil, err 335 365 } 336 366 createdAtTime, _ := time.Parse(time.RFC3339, createdAt) ··· 386 416 var repos []models.Repo 387 417 388 418 rows, err := e.Query( 389 389 - `select distinct r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source 419 419 + `select distinct r.id, r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source 390 420 from repos r 391 421 left join collaborators c on r.at_uri = c.repo_at 392 422 where (r.did = ? or c.subject_did = ?) ··· 406 436 var nullableDescription sql.NullString 407 437 var nullableSource sql.NullString 408 438 409 409 - err := rows.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 439 439 + err := rows.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 410 440 if err != nil { 411 441 return nil, err 412 442 } ··· 443 473 var nullableSource sql.NullString 444 474 445 475 row := e.QueryRow( 446 446 - `select did, name, knot, rkey, description, created, source 476 476 + `select id, did, name, knot, rkey, description, created, source 447 477 from repos 448 478 where did = ? and name = ? and source is not null and source != ''`, 449 479 did, name, 450 480 ) 451 481 452 452 - err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 482 482 + err := row.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource) 453 483 if err != nil { 454 484 return nil, err 455 485 }

+12

appview/notify/merged_notifier.go

··· 72 72 } 73 73 } 74 74 75 75 + func (m *mergedNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) { 76 76 + for _, notifier := range m.notifiers { 77 77 + notifier.NewPullMerged(ctx, pull) 78 78 + } 79 79 + } 80 80 + 81 81 + func (m *mergedNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) { 82 82 + for _, notifier := range m.notifiers { 83 83 + notifier.NewPullClosed(ctx, pull) 84 84 + } 85 85 + } 86 86 + 75 87 func (m *mergedNotifier) UpdateProfile(ctx context.Context, profile *models.Profile) { 76 88 for _, notifier := range m.notifiers { 77 89 notifier.UpdateProfile(ctx, profile)

+4 -11

appview/pages/templates/errors/500.html

··· 5 5 <div class="bg-white dark:bg-gray-800 rounded-lg drop-shadow-sm p-8 max-w-lg mx-auto"> 6 6 <div class="mb-6"> 7 7 <div class="w-16 h-16 mx-auto mb-4 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center"> 8 8 - {{ i "alert-triangle" "w-8 h-8 text-red-500 dark:text-red-400" }} 8 8 + {{ i "triangle-alert" "w-8 h-8 text-red-500 dark:text-red-400" }} 9 9 </div> 10 10 </div> 11 11 ··· 14 14 500 &mdash; internal server error 15 15 </h1> 16 16 <p class="text-gray-600 dark:text-gray-300"> 17 17 - Something went wrong on our end. We've been notified and are working to fix the issue. 18 18 - </p> 19 19 - <div class="bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded p-3 text-sm text-yellow-800 dark:text-yellow-200"> 20 20 - <div class="flex items-center gap-2"> 21 21 - {{ i "info" "w-4 h-4" }} 22 22 - <span class="font-medium">we're on it!</span> 23 23 - </div> 24 24 - <p class="mt-1">Our team has been automatically notified about this error.</p> 25 25 - </div> 17 17 + We encountered an error while processing your request. Please try again later. 18 18 + </p> 26 19 <div class="flex flex-col sm:flex-row gap-3 justify-center items-center mt-6"> 27 20 <button onclick="location.reload()" class="btn-create gap-2"> 28 21 {{ i "refresh-cw" "w-4 h-4" }} 29 22 try again 30 23 </button> 31 24 <a href="/" class="btn no-underline hover:no-underline gap-2"> 32 32 - {{ i "home" "w-4 h-4" }} 25 25 + {{ i "arrow-left" "w-4 h-4" }} 33 26 back to home 34 27 </a> 35 28 </div>

+173

appview/pages/templates/user/settings/notifications.html

··· 1 1 + {{ define "title" }}{{ .Tab }} settings{{ end }} 2 2 + 3 3 + {{ define "content" }} 4 4 + <div class="p-6"> 5 5 + <p class="text-xl font-bold dark:text-white">Settings</p> 6 6 + </div> 7 7 + <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 8 8 + <section class="w-full grid grid-cols-1 md:grid-cols-4 gap-6"> 9 9 + <div class="col-span-1"> 10 10 + {{ template "user/settings/fragments/sidebar" . }} 11 11 + </div> 12 12 + <div class="col-span-1 md:col-span-3 flex flex-col gap-6"> 13 13 + {{ template "notificationSettings" . }} 14 14 + </div> 15 15 + </section> 16 16 + </div> 17 17 + {{ end }} 18 18 + 19 19 + {{ define "notificationSettings" }} 20 20 + <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-center"> 21 21 + <div class="col-span-1 md:col-span-2"> 22 22 + <h2 class="text-sm pb-2 uppercase font-bold">Notification Preferences</h2> 23 23 + <p class="text-gray-500 dark:text-gray-400"> 24 24 + Choose which notifications you want to receive when activity happens on your repositories and profile. 25 25 + </p> 26 26 + </div> 27 27 + </div> 28 28 + 29 29 + <form hx-put="/settings/notifications" hx-swap="none" class="flex flex-col gap-6"> 30 30 + 31 31 + <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 w-full"> 32 32 + <div class="flex items-center justify-between p-2"> 33 33 + <div class="flex items-center gap-2"> 34 34 + <div class="flex flex-col gap-1"> 35 35 + <span class="font-bold">Repository starred</span> 36 36 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 37 37 + <span>When someone stars your repository.</span> 38 38 + </div> 39 39 + </div> 40 40 + </div> 41 41 + <label class="flex items-center gap-2"> 42 42 + <input type="checkbox" name="repo_starred" {{if .Preferences.RepoStarred}}checked{{end}}> 43 43 + </label> 44 44 + </div> 45 45 + 46 46 + <div class="flex items-center justify-between p-2"> 47 47 + <div class="flex items-center gap-2"> 48 48 + <div class="flex flex-col gap-1"> 49 49 + <span class="font-bold">New issues</span> 50 50 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 51 51 + <span>When someone creates an issue on your repository.</span> 52 52 + </div> 53 53 + </div> 54 54 + </div> 55 55 + <label class="flex items-center gap-2"> 56 56 + <input type="checkbox" name="issue_created" {{if .Preferences.IssueCreated}}checked{{end}}> 57 57 + </label> 58 58 + </div> 59 59 + 60 60 + <div class="flex items-center justify-between p-2"> 61 61 + <div class="flex items-center gap-2"> 62 62 + <div class="flex flex-col gap-1"> 63 63 + <span class="font-bold">Issue comments</span> 64 64 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 65 65 + <span>When someone comments on an issue you're involved with.</span> 66 66 + </div> 67 67 + </div> 68 68 + </div> 69 69 + <label class="flex items-center gap-2"> 70 70 + <input type="checkbox" name="issue_commented" {{if .Preferences.IssueCommented}}checked{{end}}> 71 71 + </label> 72 72 + </div> 73 73 + 74 74 + <div class="flex items-center justify-between p-2"> 75 75 + <div class="flex items-center gap-2"> 76 76 + <div class="flex flex-col gap-1"> 77 77 + <span class="font-bold">Issue closed</span> 78 78 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 79 79 + <span>When an issue on your repository is closed.</span> 80 80 + </div> 81 81 + </div> 82 82 + </div> 83 83 + <label class="flex items-center gap-2"> 84 84 + <input type="checkbox" name="issue_closed" {{if .Preferences.IssueClosed}}checked{{end}}> 85 85 + </label> 86 86 + </div> 87 87 + 88 88 + <div class="flex items-center justify-between p-2"> 89 89 + <div class="flex items-center gap-2"> 90 90 + <div class="flex flex-col gap-1"> 91 91 + <span class="font-bold">New pull requests</span> 92 92 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 93 93 + <span>When someone creates a pull request on your repository.</span> 94 94 + </div> 95 95 + </div> 96 96 + </div> 97 97 + <label class="flex items-center gap-2"> 98 98 + <input type="checkbox" name="pull_created" {{if .Preferences.PullCreated}}checked{{end}}> 99 99 + </label> 100 100 + </div> 101 101 + 102 102 + <div class="flex items-center justify-between p-2"> 103 103 + <div class="flex items-center gap-2"> 104 104 + <div class="flex flex-col gap-1"> 105 105 + <span class="font-bold">Pull request comments</span> 106 106 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 107 107 + <span>When someone comments on a pull request you're involved with.</span> 108 108 + </div> 109 109 + </div> 110 110 + </div> 111 111 + <label class="flex items-center gap-2"> 112 112 + <input type="checkbox" name="pull_commented" {{if .Preferences.PullCommented}}checked{{end}}> 113 113 + </label> 114 114 + </div> 115 115 + 116 116 + <div class="flex items-center justify-between p-2"> 117 117 + <div class="flex items-center gap-2"> 118 118 + <div class="flex flex-col gap-1"> 119 119 + <span class="font-bold">Pull request merged</span> 120 120 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 121 121 + <span>When your pull request is merged.</span> 122 122 + </div> 123 123 + </div> 124 124 + </div> 125 125 + <label class="flex items-center gap-2"> 126 126 + <input type="checkbox" name="pull_merged" {{if .Preferences.PullMerged}}checked{{end}}> 127 127 + </label> 128 128 + </div> 129 129 + 130 130 + <div class="flex items-center justify-between p-2"> 131 131 + <div class="flex items-center gap-2"> 132 132 + <div class="flex flex-col gap-1"> 133 133 + <span class="font-bold">New followers</span> 134 134 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 135 135 + <span>When someone follows you.</span> 136 136 + </div> 137 137 + </div> 138 138 + </div> 139 139 + <label class="flex items-center gap-2"> 140 140 + <input type="checkbox" name="followed" {{if .Preferences.Followed}}checked{{end}}> 141 141 + </label> 142 142 + </div> 143 143 + 144 144 + <div class="flex items-center justify-between p-2"> 145 145 + <div class="flex items-center gap-2"> 146 146 + <div class="flex flex-col gap-1"> 147 147 + <span class="font-bold">Email notifications</span> 148 148 + <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 149 149 + <span>Receive notifications via email in addition to in-app notifications.</span> 150 150 + </div> 151 151 + </div> 152 152 + </div> 153 153 + <label class="flex items-center gap-2"> 154 154 + <input type="checkbox" name="email_notifications" {{if .Preferences.EmailNotifications}}checked{{end}}> 155 155 + </label> 156 156 + </div> 157 157 + </div> 158 158 + 159 159 + <div class="flex justify-end pt-2"> 160 160 + <button 161 161 + type="submit" 162 162 + class="btn-create flex items-center gap-2 group" 163 163 + > 164 164 + {{ i "save" "w-4 h-4" }} 165 165 + save 166 166 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 167 167 + </button> 168 168 + </div> 169 169 + <div id="settings-notifications-success"></div> 170 170 + 171 171 + <div id="settings-notifications-error" class="error"></div> 172 172 + </form> 173 173 + {{ end }}

+2 -2

appview/pages/templates/strings/put.html

··· 3 3 {{ define "content" }} 4 4 <div class="px-6 py-2 mb-4"> 5 5 {{ if eq .Action "new" }} 6 6 - <p class="text-xl font-bold dark:text-white">Create a new string</p> 7 7 - <p class="">Store and share code snippets with ease.</p> 6 6 + <p class="text-xl font-bold dark:text-white mb-1">Create a new string</p> 7 7 + <p class="text-gray-600 dark:text-gray-400 mb-1">Store and share code snippets with ease.</p> 8 8 {{ else }} 9 9 <p class="text-xl font-bold dark:text-white">Edit string</p> 10 10 {{ end }}

+4 -1

appview/validator/validator.go

··· 4 4 "tangled.org/core/appview/db" 5 5 "tangled.org/core/appview/pages/markup" 6 6 "tangled.org/core/idresolver" 7 7 + "tangled.org/core/rbac" 7 8 ) 8 9 9 10 type Validator struct { 10 11 db *db.DB 11 12 sanitizer markup.Sanitizer 12 13 resolver *idresolver.Resolver 14 14 + enforcer *rbac.Enforcer 13 15 } 14 16 15 15 - func New(db *db.DB, res *idresolver.Resolver) *Validator { 17 17 + func New(db *db.DB, res *idresolver.Resolver, enforcer *rbac.Enforcer) *Validator { 16 18 return &Validator{ 17 19 db: db, 18 20 sanitizer: markup.NewSanitizer(), 19 21 resolver: res, 22 22 + enforcer: enforcer, 20 23 } 21 24 }

+160 -144

appview/pages/templates/repo/new.html

··· 1 1 {{ define "title" }}new repo{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <div class="px-6 py-2 mb-4"> 5 5 - <h1 class="text-xl font-bold dark:text-white mb-1">Create a new repository</h1> 6 6 - <p class="text-gray-600 dark:text-gray-400 mb-1"> 7 7 - Repositories contain a project's files and version history. 8 8 - </p> 4 4 + <div class="grid grid-cols-12"> 5 5 + <div class="col-span-full md:col-start-3 md:col-span-8 px-6 py-2 mb-4"> 6 6 + <h1 class="text-xl font-bold dark:text-white mb-1">Create a new repository</h1> 7 7 + <p class="text-gray-600 dark:text-gray-400 mb-1"> 8 8 + Repositories contain a project's files and version history. All 9 9 + repositories are publicly accessible. 10 10 + </p> 11 11 + </div> 12 12 + {{ template "newRepoPanel" . }} 9 13 </div> 14 14 + {{ end }} 15 15 + 16 16 + {{ define "newRepoPanel" }} 17 17 + <div class="col-span-full md:col-start-3 md:col-span-8 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10"> 18 18 + {{ template "newRepoForm" . }} 19 19 + </div> 20 20 + {{ end }} 10 21 11 11 - <div class="bg-white dark:bg-gray-800 drop-shadow-sm rounded"> 22 22 + {{ define "newRepoForm" }} 12 23 <form hx-post="/repo/new" hx-swap="none" hx-indicator="#spinner"> 24 24 + {{ template "step-1" . }} 25 25 + {{ template "step-2" . }} 13 26 14 14 - <div class="p-6"> 15 15 - <!-- Step 1: General --> 16 16 - <div class="flex gap-4"> 17 17 - <div class="flex flex-col items-center w-10 flex-shrink-0"> 18 18 - <div class="w-6 h-6 bg-gray-900 dark:bg-gray-100 text-white dark:text-gray-900 rounded-full flex items-center justify-center text-sm font-medium mt-1"> 19 19 - 1 20 20 - </div> 21 21 - <div class="w-px bg-gray-300 dark:bg-gray-600 h-80 mt-1"></div> 22 22 - </div> 23 23 - <div class="flex-1"> 24 24 - <div class="mb-6"> 25 25 - <div class="text-lg font-semibold dark:text-white mb-1">General</div> 26 26 - <div class="text-sm text-gray-500 dark:text-gray-400">Basic repository information.</div> 27 27 - </div> 28 28 - 29 29 - <div class="space-y-2"> 30 30 - <!-- Repository Name with Owner --> 31 31 - <div> 32 32 - <label class="block text-sm font-bold uppercase dark:text-white mb-1"> 33 33 - Repository name 34 34 - </label> 35 35 - <div class="flex flex-col md:flex-row md:items-center gap-2 md:gap-0"> 36 36 - {{ if .LoggedInUser.Handle }} 37 37 - <div class="flex items-center px-2 py-2 gap-1 text-sm text-gray-700 dark:text-gray-300 md:border md:border-r-0 md:border-gray-300 md:dark:border-gray-600 md:rounded-l md:bg-gray-50 md:dark:bg-gray-700"> 38 38 - {{ template "user/fragments/picHandle" .LoggedInUser.Handle }} 39 39 - <span class="md:hidden pr-2 py-2 text-gray-500 dark:text-gray-400">/</span> 40 40 - </div> 41 41 - <span class="hidden md:inline pr-2 py-2 text-gray-500 dark:text-gray-400 border-t border-b border-gray-300 dark:border-gray-600 bg-gray-50 dark:bg-gray-700">/</span> 42 42 - {{ end }} 43 43 - <input 44 44 - type="text" 45 45 - id="name" 46 46 - name="name" 47 47 - required 48 48 - class="w-full max-w-md dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded md:rounded-r md:rounded-l-none px-3 py-2" 49 49 - placeholder="repository-name" 50 50 - /> 51 51 - </div> 52 52 - <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> 53 53 - Choose a unique, descriptive name for your repository. Use letters, numbers, and hyphens. 54 54 - </p> 55 55 - </div> 56 56 - 57 57 - <!-- Description --> 58 58 - <div> 59 59 - <label for="description" class="block text-sm font-bold uppercase dark:text-white mb-1"> 60 60 - Description 61 61 - </label> 62 62 - <input 63 63 - type="text" 64 64 - id="description" 65 65 - name="description" 66 66 - class="w-full max-w-md dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2" 67 67 - placeholder="A brief description of your project..." 68 68 - /> 69 69 - <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> 70 70 - Optional. A short description to help others understand what your project does. 71 71 - </p> 72 72 - </div> 73 73 - </div> 74 74 - </div> 27 27 + <div class="mt-8 flex justify-end"> 28 28 + <button type="submit" class="btn-create flex items-center gap-2"> 29 29 + {{ i "book-plus" "w-4 h-4" }} 30 30 + create repo 31 31 + <span id="spinner" class="group"> 32 32 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 33 33 + </span> 34 34 + </button> 35 35 + </div> 36 36 + <div id="repo" class="error mt-2"></div> 37 37 + 38 38 + </form> 39 39 + {{ end }} 40 40 + 41 41 + {{ define "step-1" }} 42 42 + <div class="flex gap-4 relative border-l border-gray-200 dark:border-gray-700 pl-6"> 43 43 + <div class="absolute -left-3 -top-0"> 44 44 + {{ template "numberCircle" 1 }} 45 45 + </div> 46 46 + 47 47 + <!-- Content column --> 48 48 + <div class="flex-1 pb-12"> 49 49 + <h2 class="text-lg font-semibold dark:text-white">General</h2> 50 50 + <div class="text-sm text-gray-500 dark:text-gray-400 mb-4">Basic repository information.</div> 51 51 + 52 52 + <div class="space-y-2"> 53 53 + {{ template "name" . }} 54 54 + {{ template "description" . }} 75 55 </div> 56 56 + </div> 57 57 + </div> 58 58 + {{ end }} 76 59 77 77 - <!-- Step 2: Configuration --> 78 78 - <div class="flex gap-4"> 79 79 - <div class="flex flex-col items-center w-10 flex-shrink-0"> 80 80 - <div class="w-6 h-6 bg-gray-900 dark:bg-gray-100 text-white dark:text-gray-900 rounded-full flex items-center justify-center text-sm font-medium mt-1"> 81 81 - 2 82 82 - </div> 83 83 - </div> 84 84 - <div class="flex-1"> 85 85 - <div class="mb-6"> 86 86 - <div class="text-lg font-semibold dark:text-white mb-1">Configuration</div> 87 87 - <div class="text-sm text-gray-500 dark:text-gray-400">Repository settings and hosting.</div> 88 88 - </div> 89 89 - 90 90 - <div class="space-y-2"> 91 91 - <!-- Default Branch --> 92 92 - <div> 93 93 - <label for="branch" class="block text-sm font-bold uppercase dark:text-white mb-1"> 94 94 - Default branch 95 95 - </label> 96 96 - <input 97 97 - type="text" 98 98 - id="branch" 99 99 - name="branch" 100 100 - value="main" 101 101 - required 102 102 - class="w-full max-w-md dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2" 103 103 - /> 104 104 - <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> 105 105 - The primary branch where development happens. Common choices are "main" or "master". 106 106 - </p> 107 107 - </div> 108 108 - 109 109 - <!-- Knot Selection --> 110 110 - <div> 111 111 - <label class="block text-sm font-bold uppercase dark:text-white mb-1"> 112 112 - Select a knot 113 113 - </label> 114 114 - <div class="w-full max-w-md dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded p-3 space-y-2"> 115 115 - {{ range .Knots }} 116 116 - <div class="flex items-center"> 117 117 - <input 118 118 - type="radio" 119 119 - name="domain" 120 120 - value="{{ . }}" 121 121 - class="mr-2" 122 122 - id="domain-{{ . }}" 123 123 - required 124 124 - /> 125 125 - <label for="domain-{{ . }}" class="dark:text-white lowercase">{{ . }}</label> 126 126 - </div> 127 127 - {{ else }} 128 128 - <p class="dark:text-white">no knots available.</p> 129 129 - {{ end }} 130 130 - </div> 131 131 - <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> 132 132 - A knot hosts repository data and handles Git operations. 133 133 - You can also <a href="/knots" class="underline">register your own knot</a>. 134 134 - </p> 135 135 - </div> 136 136 - </div> 137 137 - </div> 60 60 + {{ define "step-2" }} 61 61 + <div class="flex gap-4 relative border-l border-gray-200 dark:border-gray-700 pl-6"> 62 62 + <div class="absolute -left-3 -top-0"> 63 63 + {{ template "numberCircle" 2 }} 64 64 + </div> 65 65 + 66 66 + <div class="flex-1"> 67 67 + <h2 class="text-lg font-semibold dark:text-white">Configuration</h2> 68 68 + <div class="text-sm text-gray-500 dark:text-gray-400 mb-4">Repository settings and hosting.</div> 69 69 + 70 70 + <div class="space-y-2"> 71 71 + {{ template "defaultBranch" . }} 72 72 + {{ template "knot" . }} 138 73 </div> 139 74 </div> 75 75 + </div> 76 76 + {{ end }} 140 77 141 141 - <!-- Create Repository Button --> 142 142 - <div class="p-6 border-t border-gray-200 dark:border-gray-700"> 143 143 - <div class="flex items-center justify-between"> 144 144 - <div class="text-sm text-gray-500 dark:text-gray-400"> 145 145 - All repositories are publicly accessible. 146 146 - </div> 147 147 - <button type="submit" class="btn-create flex items-center gap-2"> 148 148 - {{ i "book-plus" "w-4 h-4" }} 149 149 - create repo 150 150 - <span id="spinner" class="group"> 151 151 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 152 152 - </span> 153 153 - </button> 78 78 + {{ define "name" }} 79 79 + <!-- Repository Name with Owner --> 80 80 + <div> 81 81 + <label class="block text-sm font-bold uppercase dark:text-white mb-1"> 82 82 + Repository name 83 83 + </label> 84 84 + <div class="flex flex-col md:flex-row md:items-center gap-2 md:gap-0 w-full"> 85 85 + <div class="shrink-0 hidden md:flex items-center px-2 py-2 gap-1 text-sm text-gray-700 dark:text-gray-300 md:border md:border-r-0 md:border-gray-300 md:dark:border-gray-600 md:rounded-l md:bg-gray-50 md:dark:bg-gray-700"> 86 86 + {{ template "user/fragments/picHandle" .LoggedInUser.Did }} 154 87 </div> 155 155 - <div id="repo" class="error mt-2"></div> 88 88 + <input 89 89 + type="text" 90 90 + id="name" 91 91 + name="name" 92 92 + required 93 93 + class="flex-1 dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded md:rounded-r md:rounded-l-none px-3 py-2" 94 94 + placeholder="repository-name" 95 95 + /> 156 96 </div> 97 97 + <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> 98 98 + Choose a unique, descriptive name for your repository. Use letters, numbers, and hyphens. 99 99 + </p> 100 100 + </div> 101 101 + {{ end }} 157 102 158 158 - </form> 159 159 - </div> 103 103 + {{ define "description" }} 104 104 + <!-- Description --> 105 105 + <div> 106 106 + <label for="description" class="block text-sm font-bold uppercase dark:text-white mb-1"> 107 107 + Description 108 108 + </label> 109 109 + <input 110 110 + type="text" 111 111 + id="description" 112 112 + name="description" 113 113 + class="w-full w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2" 114 114 + placeholder="A brief description of your project..." 115 115 + /> 116 116 + <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> 117 117 + Optional. A short description to help others understand what your project does. 118 118 + </p> 119 119 + </div> 120 120 + {{ end }} 121 121 + 122 122 + {{ define "defaultBranch" }} 123 123 + <!-- Default Branch --> 124 124 + <div> 125 125 + <label for="branch" class="block text-sm font-bold uppercase dark:text-white mb-1"> 126 126 + Default branch 127 127 + </label> 128 128 + <input 129 129 + type="text" 130 130 + id="branch" 131 131 + name="branch" 132 132 + value="main" 133 133 + required 134 134 + class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2" 135 135 + /> 136 136 + <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> 137 137 + The primary branch where development happens. Common choices are "main" or "master". 138 138 + </p> 139 139 + </div> 140 140 + {{ end }} 141 141 + 142 142 + {{ define "knot" }} 143 143 + <!-- Knot Selection --> 144 144 + <div> 145 145 + <label class="block text-sm font-bold uppercase dark:text-white mb-1"> 146 146 + Select a knot 147 147 + </label> 148 148 + <div class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded p-3 space-y-2"> 149 149 + {{ range .Knots }} 150 150 + <div class="flex items-center"> 151 151 + <input 152 152 + type="radio" 153 153 + name="domain" 154 154 + value="{{ . }}" 155 155 + class="mr-2" 156 156 + id="domain-{{ . }}" 157 157 + required 158 158 + /> 159 159 + <label for="domain-{{ . }}" class="dark:text-white lowercase">{{ . }}</label> 160 160 + </div> 161 161 + {{ else }} 162 162 + <p class="dark:text-white">no knots available.</p> 163 163 + {{ end }} 164 164 + </div> 165 165 + <p class="text-sm text-gray-500 dark:text-gray-400 mt-1"> 166 166 + A knot hosts repository data and handles Git operations. 167 167 + You can also <a href="/knots" class="underline">register your own knot</a>. 168 168 + </p> 169 169 + </div> 170 170 + {{ end }} 171 171 + 172 172 + {{ define "numberCircle" }} 173 173 + <div class="w-6 h-6 bg-gray-200 dark:bg-gray-600 rounded-full flex items-center justify-center text-sm font-medium mt-1"> 174 174 + {{.}} 175 175 + </div> 160 176 {{ end }}

+1 -1

knotserver/xrpc/repo_blob.go

··· 44 44 45 45 contents, err := gr.RawContent(treePath) 46 46 if err != nil { 47 47 - x.Logger.Error("file content", "error", err.Error()) 47 47 + x.Logger.Error("file content", "error", err.Error(), "treePath", treePath) 48 48 writeError(w, xrpcerr.NewXrpcError( 49 49 xrpcerr.WithTag("FileNotFound"), 50 50 xrpcerr.WithMessage("file not found at the specified path"),

+15 -17

appview/pages/markup/format.go

··· 1 1 package markup 2 2 3 3 - import "strings" 3 3 + import ( 4 4 + "regexp" 5 5 + ) 4 6 5 7 type Format string 6 8 ··· 10 12 ) 11 13 12 14 var FileTypes map[Format][]string = map[Format][]string{ 13 13 - FormatMarkdown: []string{".md", ".markdown", ".mdown", ".mkdn", ".mkd"}, 15 15 + FormatMarkdown: {".md", ".markdown", ".mdown", ".mkdn", ".mkd"}, 16 16 + } 17 17 + 18 18 + var FileTypePatterns = map[Format]*regexp.Regexp{ 19 19 + FormatMarkdown: regexp.MustCompile(`(?i)\.(md|markdown|mdown|mkdn|mkd)$`), 14 20 } 15 21 16 16 - // ReadmeFilenames contains the list of common README filenames to search for, 17 17 - // in order of preference. Only includes well-supported formats. 18 18 - var ReadmeFilenames = []string{ 19 19 - "README.md", "readme.md", 20 20 - "README", 21 21 - "readme", 22 22 - "README.markdown", 23 23 - "readme.markdown", 24 24 - "README.txt", 25 25 - "readme.txt", 22 22 + var ReadmePattern = regexp.MustCompile(`(?i)^readme(\.(md|markdown|txt))?$`) 23 23 + 24 24 + func IsReadmeFile(filename string) bool { 25 25 + return ReadmePattern.MatchString(filename) 26 26 } 27 27 28 28 func GetFormat(filename string) Format { 29 29 - for format, extensions := range FileTypes { 30 30 - for _, extension := range extensions { 31 31 - if strings.HasSuffix(filename, extension) { 32 32 - return format 33 33 - } 29 29 + for format, pattern := range FileTypePatterns { 30 30 + if pattern.MatchString(filename) { 31 31 + return format 34 32 } 35 33 } 36 34 // default format

+6

appview/pages/templates/repo/tree.html

··· 88 88 </div> 89 89 </main> 90 90 {{end}} 91 91 + 92 92 + {{ define "repoAfter" }} 93 93 + {{- if or .HTMLReadme .Readme -}} 94 94 + {{ template "repo/fragments/readme" . }} 95 95 + {{- end -}} 96 96 + {{ end }}

+224

appview/pages/templates/brand/brand.html

··· 1 1 + {{ define "title" }}brand{{ end }} 2 2 + 3 3 + {{ define "content" }} 4 4 + <div class="grid grid-cols-10"> 5 5 + <header class="col-span-full md:col-span-10 px-6 py-2 mb-4"> 6 6 + <h1 class="text-2xl font-bold dark:text-white mb-1">Brand</h1> 7 7 + <p class="text-gray-600 dark:text-gray-400 mb-1"> 8 8 + Assets and guidelines for using Tangled's logo and brand elements. 9 9 + </p> 10 10 + </header> 11 11 + 12 12 + <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10"> 13 13 + <div class="space-y-16"> 14 14 + 15 15 + <!-- Introduction Section --> 16 16 + <section> 17 17 + <p class="text-gray-600 dark:text-gray-400 mb-2"> 18 18 + Tangled's logo and mascot is <strong>Dolly</strong>, the first ever <em>cloned</em> mammal. Please 19 19 + follow the below guidelines when using Dolly and the logotype. 20 20 + </p> 21 21 + <p class="text-gray-600 dark:text-gray-400 mb-2"> 22 22 + All assets are served as SVGs, and can be downloaded by right-clicking and clicking "Save image as". 23 23 + </p> 24 24 + </section> 25 25 + 26 26 + <!-- Black Logotype Section --> 27 27 + <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center"> 28 28 + <div class="order-2 lg:order-1"> 29 29 + <div class="border border-gray-200 dark:border-gray-700 p-8 sm:p-16 bg-gray-50 dark:bg-gray-100 rounded"> 30 30 + <img src="https://assets.tangled.network/tangled_logotype_black_on_trans.svg" 31 31 + alt="Tangled logo - black version" 32 32 + class="w-full max-w-sm mx-auto" /> 33 33 + </div> 34 34 + </div> 35 35 + <div class="order-1 lg:order-2"> 36 36 + <h2 class="text-xl font-semibold dark:text-white mb-3">Black logotype</h2> 37 37 + <p class="text-gray-600 dark:text-gray-400 mb-4">For use on light-colored backgrounds.</p> 38 38 + <p class="text-gray-700 dark:text-gray-300"> 39 39 + This is the preferred version of the logotype, featuring dark text and elements, ideal for light 40 40 + backgrounds and designs. 41 41 + </p> 42 42 + </div> 43 43 + </section> 44 44 + 45 45 + <!-- White Logotype Section --> 46 46 + <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center"> 47 47 + <div class="order-2 lg:order-1"> 48 48 + <div class="bg-black p-8 sm:p-16 rounded"> 49 49 + <img src="https://assets.tangled.network/tangled_logotype_white_on_trans.svg" 50 50 + alt="Tangled logo - white version" 51 51 + class="w-full max-w-sm mx-auto" /> 52 52 + </div> 53 53 + </div> 54 54 + <div class="order-1 lg:order-2"> 55 55 + <h2 class="text-xl font-semibold dark:text-white mb-3">White logotype</h2> 56 56 + <p class="text-gray-600 dark:text-gray-400 mb-4">For use on dark-colored backgrounds.</p> 57 57 + <p class="text-gray-700 dark:text-gray-300"> 58 58 + This version features white text and elements, ideal for dark backgrounds 59 59 + and inverted designs. 60 60 + </p> 61 61 + </div> 62 62 + </section> 63 63 + 64 64 + <!-- Mark Only Section --> 65 65 + <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center"> 66 66 + <div class="order-2 lg:order-1"> 67 67 + <div class="grid grid-cols-2 gap-2"> 68 68 + <!-- Black mark on light background --> 69 69 + <div class="border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-100 p-8 sm:p-12 rounded"> 70 70 + <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg" 71 71 + alt="Dolly face - black version" 72 72 + class="w-full max-w-16 mx-auto" /> 73 73 + </div> 74 74 + <!-- White mark on dark background --> 75 75 + <div class="bg-black p-8 sm:p-12 rounded"> 76 76 + <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg" 77 77 + alt="Dolly face - white version" 78 78 + class="w-full max-w-16 mx-auto" /> 79 79 + </div> 80 80 + </div> 81 81 + </div> 82 82 + <div class="order-1 lg:order-2"> 83 83 + <h2 class="text-xl font-semibold dark:text-white mb-3">Mark only</h2> 84 84 + <p class="text-gray-600 dark:text-gray-400 mb-4"> 85 85 + When a smaller 1:1 logo or icon is needed, Dolly's face may be used on its own. 86 86 + </p> 87 87 + <p class="text-gray-700 dark:text-gray-300 mb-4"> 88 88 + <strong class="font-semibold">Note</strong>: for situations where the background 89 89 + is unknown, use the black version for ideal contrast in most environments. 90 90 + </p> 91 91 + </div> 92 92 + </section> 93 93 + 94 94 + <!-- Colored Backgrounds Section --> 95 95 + <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center"> 96 96 + <div class="order-2 lg:order-1"> 97 97 + <div class="grid grid-cols-2 gap-2"> 98 98 + <!-- Pastel Green background --> 99 99 + <div class="bg-green-500 p-8 sm:p-12 rounded"> 100 100 + <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg" 101 101 + alt="Tangled logo on pastel green background" 102 102 + class="w-full max-w-16 mx-auto" /> 103 103 + </div> 104 104 + <!-- Pastel Blue background --> 105 105 + <div class="bg-blue-500 p-8 sm:p-12 rounded"> 106 106 + <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg" 107 107 + alt="Tangled logo on pastel blue background" 108 108 + class="w-full max-w-16 mx-auto" /> 109 109 + </div> 110 110 + <!-- Pastel Yellow background --> 111 111 + <div class="bg-yellow-500 p-8 sm:p-12 rounded"> 112 112 + <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg" 113 113 + alt="Tangled logo on pastel yellow background" 114 114 + class="w-full max-w-16 mx-auto" /> 115 115 + </div> 116 116 + <!-- Pastel Red background --> 117 117 + <div class="bg-red-500 p-8 sm:p-12 rounded"> 118 118 + <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg" 119 119 + alt="Tangled logo on pastel red background" 120 120 + class="w-full max-w-16 mx-auto" /> 121 121 + </div> 122 122 + </div> 123 123 + </div> 124 124 + <div class="order-1 lg:order-2"> 125 125 + <h2 class="text-xl font-semibold dark:text-white mb-3">Colored backgrounds</h2> 126 126 + <p class="text-gray-600 dark:text-gray-400 mb-4"> 127 127 + White logo mark on colored backgrounds. 128 128 + </p> 129 129 + <p class="text-gray-700 dark:text-gray-300 mb-4"> 130 130 + The white logo mark provides contrast on colored backgrounds. 131 131 + Perfect for more fun design contexts. 132 132 + </p> 133 133 + </div> 134 134 + </section> 135 135 + 136 136 + <!-- Black Logo on Pastel Backgrounds Section --> 137 137 + <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center"> 138 138 + <div class="order-2 lg:order-1"> 139 139 + <div class="grid grid-cols-2 gap-2"> 140 140 + <!-- Pastel Green background --> 141 141 + <div class="bg-green-200 p-8 sm:p-12 rounded"> 142 142 + <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg" 143 143 + alt="Tangled logo on pastel green background" 144 144 + class="w-full max-w-16 mx-auto" /> 145 145 + </div> 146 146 + <!-- Pastel Blue background --> 147 147 + <div class="bg-blue-200 p-8 sm:p-12 rounded"> 148 148 + <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg" 149 149 + alt="Tangled logo on pastel blue background" 150 150 + class="w-full max-w-16 mx-auto" /> 151 151 + </div> 152 152 + <!-- Pastel Yellow background --> 153 153 + <div class="bg-yellow-200 p-8 sm:p-12 rounded"> 154 154 + <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg" 155 155 + alt="Tangled logo on pastel yellow background" 156 156 + class="w-full max-w-16 mx-auto" /> 157 157 + </div> 158 158 + <!-- Pastel Pink background --> 159 159 + <div class="bg-pink-200 p-8 sm:p-12 rounded"> 160 160 + <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg" 161 161 + alt="Tangled logo on pastel pink background" 162 162 + class="w-full max-w-16 mx-auto" /> 163 163 + </div> 164 164 + </div> 165 165 + </div> 166 166 + <div class="order-1 lg:order-2"> 167 167 + <h2 class="text-xl font-semibold dark:text-white mb-3">Lighter backgrounds</h2> 168 168 + <p class="text-gray-600 dark:text-gray-400 mb-4"> 169 169 + Dark logo mark on lighter, pastel backgrounds. 170 170 + </p> 171 171 + <p class="text-gray-700 dark:text-gray-300 mb-4"> 172 172 + The dark logo mark works beautifully on pastel backgrounds, 173 173 + providing crisp contrast. 174 174 + </p> 175 175 + </div> 176 176 + </section> 177 177 + 178 178 + <!-- Recoloring Section --> 179 179 + <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center"> 180 180 + <div class="order-2 lg:order-1"> 181 181 + <div class="bg-yellow-100 border border-yellow-200 p-8 sm:p-16 rounded"> 182 182 + <img src="https://assets.tangled.network/tangled_logotype_black_on_trans.svg" 183 183 + alt="Recolored Tangled logotype in gray/sand color" 184 184 + class="w-full max-w-sm mx-auto opacity-60 sepia contrast-75 saturate-50" /> 185 185 + </div> 186 186 + </div> 187 187 + <div class="order-1 lg:order-2"> 188 188 + <h2 class="text-xl font-semibold dark:text-white mb-3">Recoloring</h2> 189 189 + <p class="text-gray-600 dark:text-gray-400 mb-4"> 190 190 + Custom coloring of the logotype is permitted. 191 191 + </p> 192 192 + <p class="text-gray-700 dark:text-gray-300 mb-4"> 193 193 + Recoloring the logotype is allowed as long as readability is maintained. 194 194 + </p> 195 195 + <p class="text-gray-700 dark:text-gray-300 text-sm"> 196 196 + <strong>Example:</strong> Gray/sand colored logotype on a light yellow/tan background. 197 197 + </p> 198 198 + </div> 199 199 + </section> 200 200 + 201 201 + <!-- Silhouette Section --> 202 202 + <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center"> 203 203 + <div class="order-2 lg:order-1"> 204 204 + <div class="border border-gray-200 dark:border-gray-700 p-8 sm:p-16 bg-gray-50 dark:bg-gray-100 rounded"> 205 205 + <img src="https://assets.tangled.network/tangled_dolly_silhouette.svg" 206 206 + alt="Dolly silhouette" 207 207 + class="w-full max-w-32 mx-auto" /> 208 208 + </div> 209 209 + </div> 210 210 + <div class="order-1 lg:order-2"> 211 211 + <h2 class="text-xl font-semibold dark:text-white mb-3">Dolly silhouette</h2> 212 212 + <p class="text-gray-600 dark:text-gray-400 mb-4">A minimalist version of Dolly.</p> 213 213 + <p class="text-gray-700 dark:text-gray-300"> 214 214 + The silhouette can be used where a subtle brand presence is needed, 215 215 + or as a background element. Works on any background color with proper contrast. 216 216 + For example, we use this as the site's favicon. 217 217 + </p> 218 218 + </div> 219 219 + </section> 220 220 + 221 221 + </div> 222 222 + </main> 223 223 + </div> 224 224 + {{ end }}

+1 -1

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

··· 1 1 {{ define "user/fragments/followCard" }} 2 2 {{ $userIdent := resolve .UserDid }} 3 3 - <div class="flex flex-col divide-y divide-gray-200 dark:divide-gray-700 border border-gray-200 dark:border-gray-700 rounded-sm"> 3 3 + <div class="flex flex-col divide-y divide-gray-200 dark:divide-gray-700 rounded-sm"> 4 4 <div class="py-4 px-6 drop-shadow-sm rounded bg-white dark:bg-gray-800 flex items-center gap-4"> 5 5 <div class="flex-shrink-0 max-h-full w-24 h-24"> 6 6 <img class="object-cover rounded-full p-2" src="{{ fullAvatar $userIdent }}" />

+4 -2

appview/config/config.go

··· 72 72 } 73 73 74 74 type Cloudflare struct { 75 75 - ApiToken string `env:"API_TOKEN"` 76 76 - ZoneId string `env:"ZONE_ID"` 75 75 + ApiToken string `env:"API_TOKEN"` 76 76 + ZoneId string `env:"ZONE_ID"` 77 77 + TurnstileSiteKey string `env:"TURNSTILE_SITE_KEY"` 78 78 + TurnstileSecretKey string `env:"TURNSTILE_SECRET_KEY"` 77 79 } 78 80 79 81 func (cfg RedisConfig) ToURL() string {

+13 -9

appview/db/email.go

··· 71 71 return did, nil 72 72 } 73 73 74 74 - func GetEmailToDid(e Execer, ems []string, isVerifiedFilter bool) (map[string]string, error) { 75 75 - if len(ems) == 0 { 74 74 + func GetEmailToDid(e Execer, emails []string, isVerifiedFilter bool) (map[string]string, error) { 75 75 + if len(emails) == 0 { 76 76 return make(map[string]string), nil 77 77 } 78 78 ··· 81 81 verifiedFilter = 1 82 82 } 83 83 84 84 + assoc := make(map[string]string) 85 85 + 84 86 // Create placeholders for the IN clause 85 85 - placeholders := make([]string, len(ems)) 86 86 - args := make([]any, len(ems)+1) 87 87 + placeholders := make([]string, 0, len(emails)) 88 88 + args := make([]any, 1, len(emails)+1) 87 89 88 90 args[0] = verifiedFilter 89 89 - for i, em := range ems { 90 90 - placeholders[i] = "?" 91 91 - args[i+1] = em 91 91 + for _, email := range emails { 92 92 + if strings.HasPrefix(email, "did:") { 93 93 + assoc[email] = email 94 94 + continue 95 95 + } 96 96 + placeholders = append(placeholders, "?") 97 97 + args = append(args, email) 92 98 } 93 99 94 100 query := ` ··· 105 111 } 106 112 defer rows.Close() 107 113 108 108 - assoc := make(map[string]string) 109 109 - 110 114 for rows.Next() { 111 115 var email, did string 112 116 if err := rows.Scan(&email, &did); err != nil {

+8 -48

appview/notify/db/db.go

··· 30 30 31 31 func (n *databaseNotifier) NewStar(ctx context.Context, star *models.Star) { 32 32 var err error 33 33 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(star.RepoAt))) 33 33 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(star.RepoAt))) 34 34 if err != nil { 35 35 log.Printf("NewStar: failed to get repos: %v", err) 36 36 return 37 37 } 38 38 - if len(repos) == 0 { 39 39 - log.Printf("NewStar: no repo found for %s", star.RepoAt) 40 40 - return 41 41 - } 42 42 - repo := repos[0] 43 38 44 39 // don't notify yourself 45 40 if repo.Did == star.StarredByDid { ··· 76 71 } 77 72 78 73 func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue) { 79 79 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt))) 74 74 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt))) 80 75 if err != nil { 81 76 log.Printf("NewIssue: failed to get repos: %v", err) 82 77 return 83 78 } 84 84 - if len(repos) == 0 { 85 85 - log.Printf("NewIssue: no repo found for %s", issue.RepoAt) 86 86 - return 87 87 - } 88 88 - repo := repos[0] 89 79 90 80 if repo.Did == issue.Did { 91 81 return ··· 129 119 } 130 120 issue := issues[0] 131 121 132 132 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt))) 122 122 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt))) 133 123 if err != nil { 134 124 log.Printf("NewIssueComment: failed to get repos: %v", err) 135 125 return 136 126 } 137 137 - if len(repos) == 0 { 138 138 - log.Printf("NewIssueComment: no repo found for %s", issue.RepoAt) 139 139 - return 140 140 - } 141 141 - repo := repos[0] 142 127 143 128 recipients := make(map[string]bool) 144 129 ··· 211 196 } 212 197 213 198 func (n *databaseNotifier) NewPull(ctx context.Context, pull *models.Pull) { 214 214 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt))) 199 199 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt))) 215 200 if err != nil { 216 201 log.Printf("NewPull: failed to get repos: %v", err) 217 202 return 218 203 } 219 219 - if len(repos) == 0 { 220 220 - log.Printf("NewPull: no repo found for %s", pull.RepoAt) 221 221 - return 222 222 - } 223 223 - repo := repos[0] 224 204 225 205 if repo.Did == pull.OwnerDid { 226 206 return ··· 266 246 } 267 247 pull := pulls[0] 268 248 269 269 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", comment.RepoAt)) 249 249 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", comment.RepoAt)) 270 250 if err != nil { 271 251 log.Printf("NewPullComment: failed to get repos: %v", err) 272 252 return 273 253 } 274 274 - if len(repos) == 0 { 275 275 - log.Printf("NewPullComment: no repo found for %s", comment.RepoAt) 276 276 - return 277 277 - } 278 278 - repo := repos[0] 279 254 280 255 recipients := make(map[string]bool) 281 256 ··· 335 310 336 311 func (n *databaseNotifier) NewIssueClosed(ctx context.Context, issue *models.Issue) { 337 312 // Get repo details 338 338 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt))) 313 313 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt))) 339 314 if err != nil { 340 315 log.Printf("NewIssueClosed: failed to get repos: %v", err) 341 316 return 342 317 } 343 343 - if len(repos) == 0 { 344 344 - log.Printf("NewIssueClosed: no repo found for %s", issue.RepoAt) 345 345 - return 346 346 - } 347 347 - repo := repos[0] 348 318 349 319 // Don't notify yourself 350 320 if repo.Did == issue.Did { ··· 380 350 381 351 func (n *databaseNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) { 382 352 // Get repo details 383 383 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt))) 353 353 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt))) 384 354 if err != nil { 385 355 log.Printf("NewPullMerged: failed to get repos: %v", err) 386 356 return 387 357 } 388 388 - if len(repos) == 0 { 389 389 - log.Printf("NewPullMerged: no repo found for %s", pull.RepoAt) 390 390 - return 391 391 - } 392 392 - repo := repos[0] 393 358 394 359 // Don't notify yourself 395 360 if repo.Did == pull.OwnerDid { ··· 425 390 426 391 func (n *databaseNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) { 427 392 // Get repo details 428 428 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt))) 393 393 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt))) 429 394 if err != nil { 430 395 log.Printf("NewPullClosed: failed to get repos: %v", err) 431 396 return 432 397 } 433 433 - if len(repos) == 0 { 434 434 - log.Printf("NewPullClosed: no repo found for %s", pull.RepoAt) 435 435 - return 436 436 - } 437 437 - repo := repos[0] 438 398 439 399 // Don't notify yourself 440 400 if repo.Did == pull.OwnerDid {

+18 -13

appview/db/notifications.go

··· 3 3 import ( 4 4 "context" 5 5 "database/sql" 6 6 + "errors" 6 7 "fmt" 8 8 + "strings" 7 9 "time" 8 10 9 11 "tangled.org/core/appview/models" ··· 248 250 return GetNotificationsPaginated(e, pagination.FirstPage(), filters...) 249 251 } 250 252 251 251 - func (d *DB) GetUnreadNotificationCount(ctx context.Context, userDID string) (int, error) { 252 252 - recipientFilter := FilterEq("recipient_did", userDID) 253 253 - readFilter := FilterEq("read", 0) 253 253 + func CountNotifications(e Execer, filters ...filter) (int64, error) { 254 254 + var conditions []string 255 255 + var args []any 256 256 + for _, filter := range filters { 257 257 + conditions = append(conditions, filter.Condition()) 258 258 + args = append(args, filter.Arg()...) 259 259 + } 254 260 255 255 - query := fmt.Sprintf(` 256 256 - SELECT COUNT(*) 257 257 - FROM notifications 258 258 - WHERE %s AND %s 259 259 - `, recipientFilter.Condition(), readFilter.Condition()) 261 261 + whereClause := "" 262 262 + if conditions != nil { 263 263 + whereClause = " where " + strings.Join(conditions, " and ") 264 264 + } 260 265 261 261 - args := append(recipientFilter.Arg(), readFilter.Arg()...) 266 266 + query := fmt.Sprintf(`select count(1) from notifications %s`, whereClause) 267 267 + var count int64 268 268 + err := e.QueryRow(query, args...).Scan(&count) 262 269 263 263 - var count int 264 264 - err := d.DB.QueryRowContext(ctx, query, args...).Scan(&count) 265 265 - if err != nil { 266 266 - return 0, fmt.Errorf("failed to get unread count: %w", err) 270 270 + if !errors.Is(err, sql.ErrNoRows) && err != nil { 271 271 + return 0, err 267 272 } 268 273 269 274 return count, nil

+48 -15

appview/pages/templates/notifications/list.html

··· 11 11 </div> 12 12 </div> 13 13 14 14 - {{if .Notifications}} 15 15 - <div class="flex flex-col gap-2" id="notifications-list"> 16 16 - {{range .Notifications}} 17 17 - {{template "notifications/fragments/item" .}} 18 18 - {{end}} 19 19 - </div> 14 14 + {{if .Notifications}} 15 15 + <div class="flex flex-col gap-2" id="notifications-list"> 16 16 + {{range .Notifications}} 17 17 + {{template "notifications/fragments/item" .}} 18 18 + {{end}} 19 19 + </div> 20 20 21 21 - {{else}} 22 22 - <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 23 23 - <div class="text-center py-12"> 24 24 - <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600"> 25 25 - {{ i "bell-off" "w-16 h-16" }} 26 26 - </div> 27 27 - <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3> 28 28 - <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p> 21 21 + {{else}} 22 22 + <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 23 23 + <div class="text-center py-12"> 24 24 + <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600"> 25 25 + {{ i "bell-off" "w-16 h-16" }} 29 26 </div> 27 27 + <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3> 28 28 + <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p> 30 29 </div> 31 31 - {{end}} 30 30 + </div> 31 31 + {{end}} 32 32 + 33 33 + {{ template "pagination" . }} 34 34 + {{ end }} 35 35 + 36 36 + {{ define "pagination" }} 37 37 + <div class="flex justify-end mt-4 gap-2"> 38 38 + {{ if gt .Page.Offset 0 }} 39 39 + {{ $prev := .Page.Previous }} 40 40 + <a 41 41 + class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700" 42 42 + hx-boost="true" 43 43 + href = "/notifications?offset={{ $prev.Offset }}&limit={{ $prev.Limit }}" 44 44 + > 45 45 + {{ i "chevron-left" "w-4 h-4" }} 46 46 + previous 47 47 + </a> 48 48 + {{ else }} 49 49 + <div></div> 50 50 + {{ end }} 51 51 + 52 52 + {{ $next := .Page.Next }} 53 53 + {{ if lt $next.Offset .Total }} 54 54 + {{ $next := .Page.Next }} 55 55 + <a 56 56 + class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700" 57 57 + hx-boost="true" 58 58 + href = "/notifications?offset={{ $next.Offset }}&limit={{ $next.Limit }}" 59 59 + > 60 60 + next 61 61 + {{ i "chevron-right" "w-4 h-4" }} 62 62 + </a> 63 63 + {{ end }} 64 64 + </div> 32 65 {{ end }}

+27 -208

appview/pages/templates/notifications/fragments/item.html

··· 1 1 {{define "notifications/fragments/item"}} 2 2 - <div 3 3 - class=" 4 4 - w-full mx-auto rounded drop-shadow-sm dark:text-white bg-white dark:bg-gray-800 px-2 md:px-6 py-4 transition-colors 5 5 - {{if not .Read}}bg-blue-50 dark:bg-blue-900/20 border border-blue-500 dark:border-sky-800{{end}} 6 6 - flex gap-2 items-center 7 7 - " 8 8 - > 2 2 + <a href="{{ template "notificationUrl" . }}" class="block no-underline hover:no-underline"> 3 3 + <div 4 4 + class=" 5 5 + w-full mx-auto rounded drop-shadow-sm dark:text-white bg-white dark:bg-gray-800 px-2 md:px-6 py-4 transition-colors 6 6 + {{if not .Read}}bg-blue-50 dark:bg-blue-800/20 border border-blue-500 dark:border-sky-800{{end}} 7 7 + flex gap-2 items-center 8 8 + "> 9 9 + {{ template "notificationIcon" . }} 10 10 + <div class="flex-1 w-full flex flex-col gap-1"> 11 11 + <span>{{ template "notificationHeader" . }}</span> 12 12 + <span class="text-sm text-gray-500 dark:text-gray-400">{{ template "notificationSummary" . }}</span> 13 13 + </div> 9 14 10 10 - {{ template "notificationIcon" . }} 11 11 - <div class="flex-1 w-full flex flex-col gap-1"> 12 12 - <span>{{ template "notificationHeader" . }}</span> 13 13 - <span class="text-sm text-gray-500 dark:text-gray-400">{{ template "notificationSummary" . }}</span> 14 15 </div> 15 15 - 16 16 - </div> 16 16 + </a> 17 17 {{end}} 18 18 19 19 {{ define "notificationIcon" }} ··· 64 64 {{ end }} 65 65 {{ end }} 66 66 67 67 - {{define "issueNotification"}} 68 68 - {{$url := printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}} 69 69 - <a 70 70 - href="{{$url}}" 71 71 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 72 72 - > 73 73 - <div class="flex items-center justify-between"> 74 74 - <div class="min-w-0 flex-1"> 75 75 - <!-- First line: icon + actor action --> 76 76 - <div class="flex items-center gap-2 text-gray-900 dark:text-white"> 77 77 - {{if eq .Type "issue_created"}} 78 78 - <span class="text-green-600 dark:text-green-500"> 79 79 - {{ i "circle-dot" "w-4 h-4" }} 80 80 - </span> 81 81 - {{else if eq .Type "issue_commented"}} 82 82 - <span class="text-gray-500 dark:text-gray-400"> 83 83 - {{ i "message-circle" "w-4 h-4" }} 84 84 - </span> 85 85 - {{else if eq .Type "issue_closed"}} 86 86 - <span class="text-gray-500 dark:text-gray-400"> 87 87 - {{ i "ban" "w-4 h-4" }} 88 88 - </span> 89 89 - {{end}} 90 90 - {{template "user/fragments/picHandle" .ActorDid}} 91 91 - {{if eq .Type "issue_created"}} 92 92 - <span class="text-gray-500 dark:text-gray-400">opened issue</span> 93 93 - {{else if eq .Type "issue_commented"}} 94 94 - <span class="text-gray-500 dark:text-gray-400">commented on issue</span> 95 95 - {{else if eq .Type "issue_closed"}} 96 96 - <span class="text-gray-500 dark:text-gray-400">closed issue</span> 97 97 - {{end}} 98 98 - {{if not .Read}} 99 99 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 100 100 - {{end}} 101 101 - </div> 102 102 - 103 103 - <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1"> 104 104 - <span class="text-gray-500 dark:text-gray-400">#{{.Issue.IssueId}}</span> 105 105 - <span class="text-gray-900 dark:text-white truncate">{{.Issue.Title}}</span> 106 106 - <span>on</span> 107 107 - <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span> 108 108 - </div> 109 109 - </div> 110 110 - 111 111 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 112 112 - {{ template "repo/fragments/time" .Created }} 113 113 - </div> 114 114 - </div> 115 115 - </a> 116 116 - {{end}} 117 117 - 118 118 - {{define "pullNotification"}} 119 119 - {{$url := printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}} 120 120 - <a 121 121 - href="{{$url}}" 122 122 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 123 123 - > 124 124 - <div class="flex items-center justify-between"> 125 125 - <div class="min-w-0 flex-1"> 126 126 - <div class="flex items-center gap-2 text-gray-900 dark:text-white"> 127 127 - {{if eq .Type "pull_created"}} 128 128 - <span class="text-green-600 dark:text-green-500"> 129 129 - {{ i "git-pull-request-create" "w-4 h-4" }} 130 130 - </span> 131 131 - {{else if eq .Type "pull_commented"}} 132 132 - <span class="text-gray-500 dark:text-gray-400"> 133 133 - {{ i "message-circle" "w-4 h-4" }} 134 134 - </span> 135 135 - {{else if eq .Type "pull_merged"}} 136 136 - <span class="text-purple-600 dark:text-purple-500"> 137 137 - {{ i "git-merge" "w-4 h-4" }} 138 138 - </span> 139 139 - {{else if eq .Type "pull_closed"}} 140 140 - <span class="text-red-600 dark:text-red-500"> 141 141 - {{ i "git-pull-request-closed" "w-4 h-4" }} 142 142 - </span> 143 143 - {{end}} 144 144 - {{template "user/fragments/picHandle" (resolve .ActorDid)}} 145 145 - {{if eq .Type "pull_created"}} 146 146 - <span class="text-gray-500 dark:text-gray-400">opened pull request</span> 147 147 - {{else if eq .Type "pull_commented"}} 148 148 - <span class="text-gray-500 dark:text-gray-400">commented on pull request</span> 149 149 - {{else if eq .Type "pull_merged"}} 150 150 - <span class="text-gray-500 dark:text-gray-400">merged pull request</span> 151 151 - {{else if eq .Type "pull_closed"}} 152 152 - <span class="text-gray-500 dark:text-gray-400">closed pull request</span> 153 153 - {{end}} 154 154 - {{if not .Read}} 155 155 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 156 156 - {{end}} 157 157 - </div> 158 158 - 159 159 - <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1"> 160 160 - <span class="text-gray-500 dark:text-gray-400">#{{.Pull.PullId}}</span> 161 161 - <span class="text-gray-900 dark:text-white truncate">{{.Pull.Title}}</span> 162 162 - <span>on</span> 163 163 - <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span> 164 164 - </div> 165 165 - </div> 166 166 - 167 167 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 168 168 - {{ template "repo/fragments/time" .Created }} 169 169 - </div> 170 170 - </div> 171 171 - </a> 172 172 - {{end}} 173 173 - 174 174 - {{define "repoNotification"}} 175 175 - {{$url := printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}} 176 176 - <a 177 177 - href="{{$url}}" 178 178 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 179 179 - > 180 180 - <div class="flex items-center justify-between"> 181 181 - <div class="flex items-center gap-2 min-w-0 flex-1"> 182 182 - <span class="text-yellow-500 dark:text-yellow-400"> 183 183 - {{ i "star" "w-4 h-4" }} 184 184 - </span> 185 185 - 186 186 - <div class="min-w-0 flex-1"> 187 187 - <!-- Single line for stars: actor action subject --> 188 188 - <div class="flex items-center gap-1 text-gray-900 dark:text-white"> 189 189 - {{template "user/fragments/picHandle" (resolve .ActorDid)}} 190 190 - <span class="text-gray-500 dark:text-gray-400">starred</span> 191 191 - <span class="font-medium">{{resolve .Repo.Did}}/{{.Repo.Name}}</span> 192 192 - {{if not .Read}} 193 193 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 194 194 - {{end}} 195 195 - </div> 196 196 - </div> 197 197 - </div> 198 198 - 199 199 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 200 200 - {{ template "repo/fragments/time" .Created }} 201 201 - </div> 202 202 - </div> 203 203 - </a> 204 204 - {{end}} 205 205 - 206 206 - {{define "followNotification"}} 207 207 - {{$url := printf "/%s" (resolve .ActorDid)}} 208 208 - <a 209 209 - href="{{$url}}" 210 210 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 211 211 - > 212 212 - <div class="flex items-center justify-between"> 213 213 - <div class="flex items-center gap-2 min-w-0 flex-1"> 214 214 - <span class="text-blue-600 dark:text-blue-400"> 215 215 - {{ i "user-plus" "w-4 h-4" }} 216 216 - </span> 217 217 - 218 218 - <div class="min-w-0 flex-1"> 219 219 - <div class="flex items-center gap-1 text-gray-900 dark:text-white"> 220 220 - {{template "user/fragments/picHandle" (resolve .ActorDid)}} 221 221 - <span class="text-gray-500 dark:text-gray-400">followed you</span> 222 222 - {{if not .Read}} 223 223 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 224 224 - {{end}} 225 225 - </div> 226 226 - </div> 227 227 - </div> 228 228 - 229 229 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 230 230 - {{ template "repo/fragments/time" .Created }} 231 231 - </div> 232 232 - </div> 233 233 - </a> 234 234 - {{end}} 235 235 - 236 236 - {{define "genericNotification"}} 237 237 - <a 238 238 - href="#" 239 239 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 240 240 - > 241 241 - <div class="flex items-center justify-between"> 242 242 - <div class="flex items-center gap-2 min-w-0 flex-1"> 243 243 - <span class="{{if not .Read}}text-blue-600 dark:text-blue-400{{else}}text-gray-500 dark:text-gray-400{{end}}"> 244 244 - {{ i "bell" "w-4 h-4" }} 245 245 - </span> 246 246 - 247 247 - <div class="min-w-0 flex-1"> 248 248 - <div class="flex items-center gap-1 text-gray-900 dark:text-white"> 249 249 - <span>New notification</span> 250 250 - {{if not .Read}} 251 251 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 252 252 - {{end}} 253 253 - </div> 254 254 - </div> 255 255 - </div> 67 67 + {{ define "notificationUrl" }} 68 68 + {{ $url := "" }} 69 69 + {{ if eq .Type "repo_starred" }} 70 70 + {{$url = printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}} 71 71 + {{ else if .Issue }} 72 72 + {{$url = printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}} 73 73 + {{ else if .Pull }} 74 74 + {{$url = printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}} 75 75 + {{ else if eq .Type "followed" }} 76 76 + {{$url = printf "/%s" (resolve .ActorDid)}} 77 77 + {{ else }} 78 78 + {{ end }} 256 79 257 257 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 258 258 - {{ template "repo/fragments/time" .Created }} 259 259 - </div> 260 260 - </div> 261 261 - </a> 262 262 - {{end}} 80 80 + {{ $url }} 81 81 + {{ end }}

+1

appview/pages/templates/user/login.html

··· 8 8 <meta property="og:url" content="https://tangled.org/login" /> 9 9 <meta property="og:description" content="login to for tangled" /> 10 10 <script src="/static/htmx.min.js"></script> 11 11 + <link rel="manifest" href="/pwa-manifest.json" /> 11 12 <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" /> 12 13 <title>login &middot; tangled</title> 13 14 </head>

+1

appview/pages/templates/user/signup.html

··· 8 8 <meta property="og:url" content="https://tangled.org/signup" /> 9 9 <meta property="og:description" content="sign up for tangled" /> 10 10 <script src="/static/htmx.min.js"></script> 11 11 + <link rel="manifest" href="/pwa-manifest.json" /> 11 12 <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" /> 12 13 <title>sign up &middot; tangled</title> 13 14

+5

appview/models/repo.go

··· 86 86 RepoAt syntax.ATURI 87 87 LabelAt syntax.ATURI 88 88 } 89 89 + 90 90 + type RepoGroup struct { 91 91 + Repo *Repo 92 92 + Issues []Issue 93 93 + }

+63

appview/pages/templates/repo/issues/fragments/globalIssueListing.html

··· 1 1 + {{ define "repo/issues/fragments/globalIssueListing" }} 2 2 + <div class="flex flex-col gap-2"> 3 3 + {{ range .Issues }} 4 4 + <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 5 5 + <div class="pb-2 mb-3"> 6 6 + <div class="flex items-center gap-3 mb-2"> 7 7 + <a 8 8 + href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}" 9 9 + class="text-blue-600 dark:text-blue-400 font-medium hover:underline text-sm" 10 10 + > 11 11 + {{ resolve .Repo.Did }}/{{ .Repo.Name }} 12 12 + </a> 13 13 + </div> 14 14 + <a 15 15 + href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" 16 16 + class="no-underline hover:underline" 17 17 + > 18 18 + {{ .Title | description }} 19 19 + <span class="text-gray-500">#{{ .IssueId }}</span> 20 20 + </a> 21 21 + </div> 22 22 + <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 23 23 + {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 24 24 + {{ $icon := "ban" }} 25 25 + {{ $state := "closed" }} 26 26 + {{ if .Open }} 27 27 + {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 28 28 + {{ $icon = "circle-dot" }} 29 29 + {{ $state = "open" }} 30 30 + {{ end }} 31 31 + 32 32 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 33 33 + {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 34 34 + <span class="text-white dark:text-white">{{ $state }}</span> 35 35 + </span> 36 36 + 37 37 + <span class="ml-1"> 38 38 + {{ template "user/fragments/picHandleLink" .Did }} 39 39 + </span> 40 40 + 41 41 + <span class="before:content-['·']"> 42 42 + {{ template "repo/fragments/time" .Created }} 43 43 + </span> 44 44 + 45 45 + <span class="before:content-['·']"> 46 46 + {{ $s := "s" }} 47 47 + {{ if eq (len .Comments) 1 }} 48 48 + {{ $s = "" }} 49 49 + {{ end }} 50 50 + <a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a> 51 51 + </span> 52 52 + 53 53 + {{ $state := .Labels }} 54 54 + {{ range $k, $d := $.LabelDefs }} 55 55 + {{ range $v, $s := $state.GetValSet $d.AtUri.String }} 56 56 + {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 57 57 + {{ end }} 58 58 + {{ end }} 59 59 + </div> 60 60 + </div> 61 61 + {{ end }} 62 62 + </div> 63 63 + {{ end }}

+55

appview/pages/templates/repo/issues/fragments/issueListing.html

··· 1 1 + {{ define "repo/issues/fragments/issueListing" }} 2 2 + <div class="flex flex-col gap-2"> 3 3 + {{ range .Issues }} 4 4 + <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 5 5 + <div class="pb-2"> 6 6 + <a 7 7 + href="/{{ $.RepoPrefix }}/issues/{{ .IssueId }}" 8 8 + class="no-underline hover:underline" 9 9 + > 10 10 + {{ .Title | description }} 11 11 + <span class="text-gray-500">#{{ .IssueId }}</span> 12 12 + </a> 13 13 + </div> 14 14 + <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 15 15 + {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 16 16 + {{ $icon := "ban" }} 17 17 + {{ $state := "closed" }} 18 18 + {{ if .Open }} 19 19 + {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 20 20 + {{ $icon = "circle-dot" }} 21 21 + {{ $state = "open" }} 22 22 + {{ end }} 23 23 + 24 24 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 25 25 + {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 26 26 + <span class="text-white dark:text-white">{{ $state }}</span> 27 27 + </span> 28 28 + 29 29 + <span class="ml-1"> 30 30 + {{ template "user/fragments/picHandleLink" .Did }} 31 31 + </span> 32 32 + 33 33 + <span class="before:content-['·']"> 34 34 + {{ template "repo/fragments/time" .Created }} 35 35 + </span> 36 36 + 37 37 + <span class="before:content-['·']"> 38 38 + {{ $s := "s" }} 39 39 + {{ if eq (len .Comments) 1 }} 40 40 + {{ $s = "" }} 41 41 + {{ end }} 42 42 + <a href="/{{ $.RepoPrefix }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a> 43 43 + </span> 44 44 + 45 45 + {{ $state := .Labels }} 46 46 + {{ range $k, $d := $.LabelDefs }} 47 47 + {{ range $v, $s := $state.GetValSet $d.AtUri.String }} 48 48 + {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 49 49 + {{ end }} 50 50 + {{ end }} 51 51 + </div> 52 52 + </div> 53 53 + {{ end }} 54 54 + </div> 55 55 + {{ end }}

+1

appview/pages/templates/timeline/timeline.html

··· 13 13 {{ template "timeline/fragments/hero" . }} 14 14 {{ end }} 15 15 16 16 + {{ template "timeline/fragments/goodfirstissues" . }} 16 17 {{ template "timeline/fragments/trending" . }} 17 18 {{ template "timeline/fragments/timeline" . }} 18 19 {{ end }}

+2 -5

appview/pages/templates/timeline/fragments/goodfirstissues.html

··· 6 6 <div class="text-purple-500 dark:text-purple-400">Oct 2025</div> 7 7 <p> 8 8 Make your first contribution to an open-source project this October. 9 9 - </p> 10 10 - <p> 11 11 - <em>good-first-issue</em> is a collection of issues on open-source projects 12 12 - that are easy ways for new contributors to give back to the projects 13 13 - they love. 9 9 + <em>good-first-issue</em> helps new contributors find easy ways to 10 10 + start contributing to open-source projects. 14 11 </p> 15 12 <span class="flex items-center gap-2 text-purple-500 dark:text-purple-400"> 16 13 Browse issues {{ i "arrow-right" "size-4" }}

+3 -4

appview/pages/templates/goodfirstissues/index.html

··· 37 37 {{ else }} 38 38 {{ range .RepoGroups }} 39 39 <div class="mb-4 gap-1 flex flex-col drop-shadow-sm rounded bg-white dark:bg-gray-800"> 40 40 - <div class="flex px-6 pt-4 flex-row gap-1 items-center justify-between"> 40 40 + <div class="flex px-6 pt-4 flex-row gap-1 items-center justify-between flex-wrap"> 41 41 <div class="font-medium dark:text-white flex items-center justify-between"> 42 42 <div class="flex items-center min-w-0 flex-1 mr-2"> 43 43 {{ if .Repo.Source }} ··· 103 103 <div class="flex-shrink-0 flex items-center gap-2 text-gray-500 dark:text-gray-400"> 104 104 <span> 105 105 <div class="inline-flex items-center gap-1"> 106 106 - {{ i "message-square" "w-3 h-3 md:hidden" }} 106 106 + {{ i "message-square" "w-3 h-3" }} 107 107 {{ len .Comments }} 108 108 - <span class="hidden md:inline">comment{{ if ne (len .Comments) 1 }}s{{ end }}</span> 109 108 </div> 110 109 </span> 111 110 <span class="before:content-['·'] before:select-none"></span> 112 111 <span class="text-sm"> 113 113 - {{ template "repo/fragments/time" .Created }} 112 112 + {{ template "repo/fragments/shortTimeAgo" .Created }} 114 113 </span> 115 114 <div class="hidden md:inline-flex md:gap-1"> 116 115 {{ $labelState := .Labels }}

+13 -1

appview/state/gfi.go

··· 47 47 repoUris = append(repoUris, rl.RepoAt.String()) 48 48 } 49 49 50 50 - allIssues, err := db.GetIssues( 50 50 + allIssues, err := db.GetIssuesPaginated( 51 51 s.db, 52 52 + pagination.Page{ 53 53 + Limit: 500, 54 54 + }, 52 55 db.FilterIn("repo_at", repoUris), 53 56 db.FilterEq("open", 1), 54 57 ) ··· 83 86 } 84 87 85 88 sort.Slice(sortedGroups, func(i, j int) bool { 89 89 + iIsTangled := sortedGroups[i].Repo.Did == consts.TangledDid 90 90 + jIsTangled := sortedGroups[j].Repo.Did == consts.TangledDid 91 91 + 92 92 + // If one is tangled and the other isn't, non-tangled comes first 93 93 + if iIsTangled != jIsTangled { 94 94 + return jIsTangled // true if j is tangled (i should come first) 95 95 + } 96 96 + 97 97 + // Both tangled or both not tangled: sort by name 86 98 return sortedGroups[i].Repo.Name < sortedGroups[j].Repo.Name 87 99 }) 88 100

+1 -1

cmd/genjwks/main.go

··· 1 1 - // adapted from https://tangled.sh/icyphox.sh/atproto-oauth 1 1 + // adapted from https://tangled.org/anirudh.fi/atproto-oauth 2 2 3 3 package main 4 4

+147

appview/oauth/store.go

··· 1 1 + package oauth 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "encoding/json" 6 6 + "fmt" 7 7 + "time" 8 8 + 9 9 + "github.com/bluesky-social/indigo/atproto/auth/oauth" 10 10 + "github.com/bluesky-social/indigo/atproto/syntax" 11 11 + "github.com/redis/go-redis/v9" 12 12 + ) 13 13 + 14 14 + // redis-backed implementation of ClientAuthStore. 15 15 + type RedisStore struct { 16 16 + client *redis.Client 17 17 + SessionTTL time.Duration 18 18 + AuthRequestTTL time.Duration 19 19 + } 20 20 + 21 21 + var _ oauth.ClientAuthStore = &RedisStore{} 22 22 + 23 23 + func NewRedisStore(redisURL string) (*RedisStore, error) { 24 24 + opts, err := redis.ParseURL(redisURL) 25 25 + if err != nil { 26 26 + return nil, fmt.Errorf("failed to parse redis URL: %w", err) 27 27 + } 28 28 + 29 29 + client := redis.NewClient(opts) 30 30 + 31 31 + // test the connection 32 32 + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) 33 33 + defer cancel() 34 34 + 35 35 + if err := client.Ping(ctx).Err(); err != nil { 36 36 + return nil, fmt.Errorf("failed to connect to redis: %w", err) 37 37 + } 38 38 + 39 39 + return &RedisStore{ 40 40 + client: client, 41 41 + SessionTTL: 30 * 24 * time.Hour, // 30 days 42 42 + AuthRequestTTL: 10 * time.Minute, // 10 minutes 43 43 + }, nil 44 44 + } 45 45 + 46 46 + func (r *RedisStore) Close() error { 47 47 + return r.client.Close() 48 48 + } 49 49 + 50 50 + func sessionKey(did syntax.DID, sessionID string) string { 51 51 + return fmt.Sprintf("oauth:session:%s:%s", did, sessionID) 52 52 + } 53 53 + 54 54 + func authRequestKey(state string) string { 55 55 + return fmt.Sprintf("oauth:auth_request:%s", state) 56 56 + } 57 57 + 58 58 + func (r *RedisStore) GetSession(ctx context.Context, did syntax.DID, sessionID string) (*oauth.ClientSessionData, error) { 59 59 + key := sessionKey(did, sessionID) 60 60 + data, err := r.client.Get(ctx, key).Bytes() 61 61 + if err == redis.Nil { 62 62 + return nil, fmt.Errorf("session not found: %s", did) 63 63 + } 64 64 + if err != nil { 65 65 + return nil, fmt.Errorf("failed to get session: %w", err) 66 66 + } 67 67 + 68 68 + var sess oauth.ClientSessionData 69 69 + if err := json.Unmarshal(data, &sess); err != nil { 70 70 + return nil, fmt.Errorf("failed to unmarshal session: %w", err) 71 71 + } 72 72 + 73 73 + return &sess, nil 74 74 + } 75 75 + 76 76 + func (r *RedisStore) SaveSession(ctx context.Context, sess oauth.ClientSessionData) error { 77 77 + key := sessionKey(sess.AccountDID, sess.SessionID) 78 78 + 79 79 + data, err := json.Marshal(sess) 80 80 + if err != nil { 81 81 + return fmt.Errorf("failed to marshal session: %w", err) 82 82 + } 83 83 + 84 84 + if err := r.client.Set(ctx, key, data, r.SessionTTL).Err(); err != nil { 85 85 + return fmt.Errorf("failed to save session: %w", err) 86 86 + } 87 87 + 88 88 + return nil 89 89 + } 90 90 + 91 91 + func (r *RedisStore) DeleteSession(ctx context.Context, did syntax.DID, sessionID string) error { 92 92 + key := sessionKey(did, sessionID) 93 93 + if err := r.client.Del(ctx, key).Err(); err != nil { 94 94 + return fmt.Errorf("failed to delete session: %w", err) 95 95 + } 96 96 + return nil 97 97 + } 98 98 + 99 99 + func (r *RedisStore) GetAuthRequestInfo(ctx context.Context, state string) (*oauth.AuthRequestData, error) { 100 100 + key := authRequestKey(state) 101 101 + data, err := r.client.Get(ctx, key).Bytes() 102 102 + if err == redis.Nil { 103 103 + return nil, fmt.Errorf("request info not found: %s", state) 104 104 + } 105 105 + if err != nil { 106 106 + return nil, fmt.Errorf("failed to get auth request: %w", err) 107 107 + } 108 108 + 109 109 + var req oauth.AuthRequestData 110 110 + if err := json.Unmarshal(data, &req); err != nil { 111 111 + return nil, fmt.Errorf("failed to unmarshal auth request: %w", err) 112 112 + } 113 113 + 114 114 + return &req, nil 115 115 + } 116 116 + 117 117 + func (r *RedisStore) SaveAuthRequestInfo(ctx context.Context, info oauth.AuthRequestData) error { 118 118 + key := authRequestKey(info.State) 119 119 + 120 120 + // check if already exists (to match MemStore behavior) 121 121 + exists, err := r.client.Exists(ctx, key).Result() 122 122 + if err != nil { 123 123 + return fmt.Errorf("failed to check auth request existence: %w", err) 124 124 + } 125 125 + if exists > 0 { 126 126 + return fmt.Errorf("auth request already saved for state %s", info.State) 127 127 + } 128 128 + 129 129 + data, err := json.Marshal(info) 130 130 + if err != nil { 131 131 + return fmt.Errorf("failed to marshal auth request: %w", err) 132 132 + } 133 133 + 134 134 + if err := r.client.Set(ctx, key, data, r.AuthRequestTTL).Err(); err != nil { 135 135 + return fmt.Errorf("failed to save auth request: %w", err) 136 136 + } 137 137 + 138 138 + return nil 139 139 + } 140 140 + 141 141 + func (r *RedisStore) DeleteAuthRequestInfo(ctx context.Context, state string) error { 142 142 + key := authRequestKey(state) 143 143 + if err := r.client.Del(ctx, key).Err(); err != nil { 144 144 + return fmt.Errorf("failed to delete auth request: %w", err) 145 145 + } 146 146 + return nil 147 147 + }

+2 -2

appview/settings/settings.go

··· 470 470 } 471 471 472 472 // store in pds too 473 473 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 473 473 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 474 474 Collection: tangled.PublicKeyNSID, 475 475 Repo: did, 476 476 Rkey: rkey, ··· 527 527 528 528 if rkey != "" { 529 529 // remove from pds too 530 530 - _, err := client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 530 530 + _, err := comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 531 531 Collection: tangled.PublicKeyNSID, 532 532 Repo: did, 533 533 Rkey: rkey,

+5 -5

appview/spindles/spindles.go

··· 189 189 return 190 190 } 191 191 192 192 - ex, _ := client.RepoGetRecord(r.Context(), "", tangled.SpindleNSID, user.Did, instance) 192 192 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.SpindleNSID, user.Did, instance) 193 193 var exCid *string 194 194 if ex != nil { 195 195 exCid = ex.Cid 196 196 } 197 197 198 198 // re-announce by registering under same rkey 199 199 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 199 199 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 200 200 Collection: tangled.SpindleNSID, 201 201 Repo: user.Did, 202 202 Rkey: instance, ··· 332 332 return 333 333 } 334 334 335 335 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 335 335 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 336 336 Collection: tangled.SpindleNSID, 337 337 Repo: user.Did, 338 338 Rkey: instance, ··· 542 542 return 543 543 } 544 544 545 545 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 545 545 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 546 546 Collection: tangled.SpindleMemberNSID, 547 547 Repo: user.Did, 548 548 Rkey: rkey, ··· 683 683 } 684 684 685 685 // remove from pds 686 686 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 686 686 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 687 687 Collection: tangled.SpindleMemberNSID, 688 688 Repo: user.Did, 689 689 Rkey: members[0].Rkey,

+2 -2

appview/state/follow.go

··· 43 43 case http.MethodPost: 44 44 createdAt := time.Now().Format(time.RFC3339) 45 45 rkey := tid.TID() 46 46 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 46 46 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 47 47 Collection: tangled.GraphFollowNSID, 48 48 Repo: currentUser.Did, 49 49 Rkey: rkey, ··· 88 88 return 89 89 } 90 90 91 91 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 91 91 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 92 92 Collection: tangled.GraphFollowNSID, 93 93 Repo: currentUser.Did, 94 94 Rkey: follow.Rkey,

+2 -2

appview/state/profile.go

··· 634 634 vanityStats = append(vanityStats, string(v.Kind)) 635 635 } 636 636 637 637 - ex, _ := client.RepoGetRecord(r.Context(), "", tangled.ActorProfileNSID, user.Did, "self") 637 637 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self") 638 638 var cid *string 639 639 if ex != nil { 640 640 cid = ex.Cid 641 641 } 642 642 643 643 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 643 643 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 644 644 Collection: tangled.ActorProfileNSID, 645 645 Repo: user.Did, 646 646 Rkey: "self",

+2 -2

appview/state/star.go

··· 40 40 case http.MethodPost: 41 41 createdAt := time.Now().Format(time.RFC3339) 42 42 rkey := tid.TID() 43 43 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 43 43 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 44 44 Collection: tangled.FeedStarNSID, 45 45 Repo: currentUser.Did, 46 46 Rkey: rkey, ··· 92 92 return 93 93 } 94 94 95 95 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 95 95 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 96 96 Collection: tangled.FeedStarNSID, 97 97 Repo: currentUser.Did, 98 98 Rkey: star.Rkey,

-99

appview/xrpcclient/xrpc.go

··· 1 1 package xrpcclient 2 2 3 3 import ( 4 4 - "bytes" 5 5 - "context" 6 4 "errors" 7 7 - "io" 8 5 "net/http" 9 6 10 10 - "github.com/bluesky-social/indigo/api/atproto" 11 11 - "github.com/bluesky-social/indigo/xrpc" 12 7 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 13 13 - oauth "tangled.org/anirudh.fi/atproto-oauth" 14 8 ) 15 9 16 10 var ( ··· 20 14 ErrXrpcInvalid = errors.New("invalid xrpc request") 21 15 ) 22 16 23 23 - type Client struct { 24 24 - *oauth.XrpcClient 25 25 - authArgs *oauth.XrpcAuthedRequestArgs 26 26 - } 27 27 - 28 28 - func NewClient(client *oauth.XrpcClient, authArgs *oauth.XrpcAuthedRequestArgs) *Client { 29 29 - return &Client{ 30 30 - XrpcClient: client, 31 31 - authArgs: authArgs, 32 32 - } 33 33 - } 34 34 - 35 35 - func (c *Client) RepoPutRecord(ctx context.Context, input *atproto.RepoPutRecord_Input) (*atproto.RepoPutRecord_Output, error) { 36 36 - var out atproto.RepoPutRecord_Output 37 37 - if err := c.Do(ctx, c.authArgs, xrpc.Procedure, "application/json", "com.atproto.repo.putRecord", nil, input, &out); err != nil { 38 38 - return nil, err 39 39 - } 40 40 - 41 41 - return &out, nil 42 42 - } 43 43 - 44 44 - func (c *Client) RepoApplyWrites(ctx context.Context, input *atproto.RepoApplyWrites_Input) (*atproto.RepoApplyWrites_Output, error) { 45 45 - var out atproto.RepoApplyWrites_Output 46 46 - if err := c.Do(ctx, c.authArgs, xrpc.Procedure, "application/json", "com.atproto.repo.applyWrites", nil, input, &out); err != nil { 47 47 - return nil, err 48 48 - } 49 49 - 50 50 - return &out, nil 51 51 - } 52 52 - 53 53 - func (c *Client) RepoGetRecord(ctx context.Context, cid string, collection string, repo string, rkey string) (*atproto.RepoGetRecord_Output, error) { 54 54 - var out atproto.RepoGetRecord_Output 55 55 - 56 56 - params := map[string]interface{}{ 57 57 - "cid": cid, 58 58 - "collection": collection, 59 59 - "repo": repo, 60 60 - "rkey": rkey, 61 61 - } 62 62 - if err := c.Do(ctx, c.authArgs, xrpc.Query, "", "com.atproto.repo.getRecord", params, nil, &out); err != nil { 63 63 - return nil, err 64 64 - } 65 65 - 66 66 - return &out, nil 67 67 - } 68 68 - 69 69 - func (c *Client) RepoUploadBlob(ctx context.Context, input io.Reader) (*atproto.RepoUploadBlob_Output, error) { 70 70 - var out atproto.RepoUploadBlob_Output 71 71 - if err := c.Do(ctx, c.authArgs, xrpc.Procedure, "*/*", "com.atproto.repo.uploadBlob", nil, input, &out); err != nil { 72 72 - return nil, err 73 73 - } 74 74 - 75 75 - return &out, nil 76 76 - } 77 77 - 78 78 - func (c *Client) SyncGetBlob(ctx context.Context, cid string, did string) ([]byte, error) { 79 79 - buf := new(bytes.Buffer) 80 80 - 81 81 - params := map[string]interface{}{ 82 82 - "cid": cid, 83 83 - "did": did, 84 84 - } 85 85 - if err := c.Do(ctx, c.authArgs, xrpc.Query, "", "com.atproto.sync.getBlob", params, nil, buf); err != nil { 86 86 - return nil, err 87 87 - } 88 88 - 89 89 - return buf.Bytes(), nil 90 90 - } 91 91 - 92 92 - func (c *Client) RepoDeleteRecord(ctx context.Context, input *atproto.RepoDeleteRecord_Input) (*atproto.RepoDeleteRecord_Output, error) { 93 93 - var out atproto.RepoDeleteRecord_Output 94 94 - if err := c.Do(ctx, c.authArgs, xrpc.Procedure, "application/json", "com.atproto.repo.deleteRecord", nil, input, &out); err != nil { 95 95 - return nil, err 96 96 - } 97 97 - 98 98 - return &out, nil 99 99 - } 100 100 - 101 101 - func (c *Client) ServerGetServiceAuth(ctx context.Context, aud string, exp int64, lxm string) (*atproto.ServerGetServiceAuth_Output, error) { 102 102 - var out atproto.ServerGetServiceAuth_Output 103 103 - 104 104 - params := map[string]interface{}{ 105 105 - "aud": aud, 106 106 - "exp": exp, 107 107 - "lxm": lxm, 108 108 - } 109 109 - if err := c.Do(ctx, c.authArgs, xrpc.Query, "", "com.atproto.server.getServiceAuth", params, nil, &out); err != nil { 110 110 - return nil, err 111 111 - } 112 112 - 113 113 - return &out, nil 114 114 - } 115 115 - 116 17 // produces a more manageable error 117 18 func HandleXrpcErr(err error) error { 118 19 if err == nil {

+1 -1

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

··· 1 1 {{ define "repo/fragments/labelPanel" }} 2 2 - <div id="label-panel" class="flex flex-col gap-6 px-6 md:px-0"> 2 2 + <div id="label-panel" class="flex flex-col gap-6 px-2 md:px-0"> 3 3 {{ template "basicLabels" . }} 4 4 {{ template "kvLabels" . }} 5 5 </div>

+7 -2

appview/pages/templates/repo/issues/fragments/newComment.html

··· 138 138 </div> 139 139 </form> 140 140 {{ else }} 141 141 - <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-fit"> 142 142 - <a href="/login" class="underline">login</a> to join the discussion 141 141 + <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm p-6 relative flex gap-2 items-center"> 142 142 + <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 143 143 + sign up 144 144 + </a> 145 145 + <span class="text-gray-500 dark:text-gray-400">or</span> 146 146 + <a href="/login" class="underline">login</a> 147 147 + to add to the discussion 143 148 </div> 144 149 {{ end }} 145 150 {{ end }}

+4 -2

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

··· 66 66 <div class="flex items-center gap-2 mt-2"> 67 67 {{ template "repo/fragments/reactionsPopUp" . }} 68 68 {{ range $kind := . }} 69 69 + {{ $reactionData := index $.Reactions $kind }} 69 70 {{ 70 71 template "repo/fragments/reaction" 71 72 (dict 72 73 "Kind" $kind 73 73 - "Count" (index $.Reactions $kind) 74 74 + "Count" $reactionData.Count 74 75 "IsReacted" (index $.UserReacted $kind) 75 75 - "ThreadAt" $.Pull.PullAt) 76 76 + "ThreadAt" $.Pull.PullAt 77 77 + "Users" $reactionData.Users) 76 78 }} 77 79 {{ end }} 78 80 </div>

+6 -1

appview/pages/markup/markdown.go

··· 5 5 "bytes" 6 6 "fmt" 7 7 "io" 8 8 + "io/fs" 8 9 "net/url" 9 10 "path" 10 11 "strings" ··· 20 21 "github.com/yuin/goldmark/renderer/html" 21 22 "github.com/yuin/goldmark/text" 22 23 "github.com/yuin/goldmark/util" 24 24 + callout "gitlab.com/staticnoise/goldmark-callout" 23 25 htmlparse "golang.org/x/net/html" 24 26 25 27 "tangled.org/core/api/tangled" ··· 45 47 IsDev bool 46 48 RendererType RendererType 47 49 Sanitizer Sanitizer 50 50 + Files fs.FS 48 51 } 49 52 50 53 func (rctx *RenderContext) RenderMarkdown(source string) string { ··· 62 65 extension.WithFootnoteIDPrefix([]byte("footnote")), 63 66 ), 64 67 treeblood.MathML(), 68 68 + callout.CalloutExtention, 65 69 ), 66 70 goldmark.WithParserOptions( 67 71 parser.WithAutoHeadingID(), ··· 140 144 func visitNode(ctx *RenderContext, node *htmlparse.Node) { 141 145 switch node.Type { 142 146 case htmlparse.ElementNode: 143 143 - if node.Data == "img" || node.Data == "source" { 147 147 + switch node.Data { 148 148 + case "img", "source": 144 149 for i, attr := range node.Attr { 145 150 if attr.Key != "src" { 146 151 continue

+71 -12

input.css

··· 134 134 } 135 135 136 136 .prose hr { 137 137 - @apply my-2; 137 137 + @apply my-2; 138 138 } 139 139 140 140 .prose li:has(input) { 141 141 - @apply list-none; 141 141 + @apply list-none; 142 142 } 143 143 144 144 .prose ul:has(input) { 145 145 - @apply pl-2; 145 145 + @apply pl-2; 146 146 } 147 147 148 148 .prose .heading .anchor { 149 149 - @apply no-underline mx-2 opacity-0; 149 149 + @apply no-underline mx-2 opacity-0; 150 150 } 151 151 152 152 .prose .heading:hover .anchor { 153 153 - @apply opacity-70; 153 153 + @apply opacity-70; 154 154 } 155 155 156 156 .prose .heading .anchor:hover { 157 157 - @apply opacity-70; 157 157 + @apply opacity-70; 158 158 } 159 159 160 160 .prose a.footnote-backref { 161 161 - @apply no-underline; 161 161 + @apply no-underline; 162 162 } 163 163 164 164 .prose li { 165 165 - @apply my-0 py-0; 165 165 + @apply my-0 py-0; 166 166 } 167 167 168 168 - .prose ul, .prose ol { 169 169 - @apply my-1 py-0; 168 168 + .prose ul, 169 169 + .prose ol { 170 170 + @apply my-1 py-0; 170 171 } 171 172 172 173 .prose img { ··· 176 177 } 177 178 178 179 .prose input { 179 179 - @apply inline-block my-0 mb-1 mx-1; 180 180 + @apply inline-block my-0 mb-1 mx-1; 180 181 } 181 182 182 183 .prose input[type="checkbox"] { 183 184 @apply disabled:accent-blue-500 checked:accent-blue-500 disabled:checked:accent-blue-500; 184 185 } 186 186 + 187 187 + /* Base callout */ 188 188 + details[data-callout] { 189 189 + @apply border-l-4 pl-3 py-2 text-gray-800 dark:text-gray-200 my-4; 190 190 + } 191 191 + 192 192 + details[data-callout] > summary { 193 193 + @apply font-bold cursor-pointer mb-1; 194 194 + } 195 195 + 196 196 + details[data-callout] > .callout-content { 197 197 + @apply text-sm leading-snug; 198 198 + } 199 199 + 200 200 + /* Note (blue) */ 201 201 + details[data-callout="note" i] { 202 202 + @apply border-blue-400 dark:border-blue-500; 203 203 + } 204 204 + details[data-callout="note" i] > summary { 205 205 + @apply text-blue-700 dark:text-blue-400; 206 206 + } 207 207 + 208 208 + /* Important (purple) */ 209 209 + details[data-callout="important" i] { 210 210 + @apply border-purple-400 dark:border-purple-500; 211 211 + } 212 212 + details[data-callout="important" i] > summary { 213 213 + @apply text-purple-700 dark:text-purple-400; 214 214 + } 215 215 + 216 216 + /* Warning (yellow) */ 217 217 + details[data-callout="warning" i] { 218 218 + @apply border-yellow-400 dark:border-yellow-500; 219 219 + } 220 220 + details[data-callout="warning" i] > summary { 221 221 + @apply text-yellow-700 dark:text-yellow-400; 222 222 + } 223 223 + 224 224 + /* Caution (red) */ 225 225 + details[data-callout="caution" i] { 226 226 + @apply border-red-400 dark:border-red-500; 227 227 + } 228 228 + details[data-callout="caution" i] > summary { 229 229 + @apply text-red-700 dark:text-red-400; 230 230 + } 231 231 + 232 232 + /* Tip (green) */ 233 233 + details[data-callout="tip" i] { 234 234 + @apply border-green-400 dark:border-green-500; 235 235 + } 236 236 + details[data-callout="tip" i] > summary { 237 237 + @apply text-green-700 dark:text-green-400; 238 238 + } 239 239 + 240 240 + /* Optional: hide the disclosure arrow like GitHub */ 241 241 + details[data-callout] > summary::-webkit-details-marker { 242 242 + display: none; 243 243 + } 185 244 } 186 245 @layer utilities { 187 246 .error { ··· 228 287 } 229 288 /* LineHighlight */ 230 289 .chroma .hl { 231 231 - @apply bg-amber-400/30 dark:bg-amber-500/20; 290 290 + @apply bg-amber-400/30 dark:bg-amber-500/20; 232 291 } 233 292 234 293 /* LineNumbersTable */

+3 -3

appview/pages/funcmap.go

··· 283 283 }, 284 284 285 285 "tinyAvatar": func(handle string) string { 286 286 - return p.avatarUri(handle, "tiny") 286 286 + return p.AvatarUrl(handle, "tiny") 287 287 }, 288 288 "fullAvatar": func(handle string) string { 289 289 - return p.avatarUri(handle, "") 289 289 + return p.AvatarUrl(handle, "") 290 290 }, 291 291 "langColor": enry.GetColor, 292 292 "layoutSide": func() string { ··· 310 310 } 311 311 } 312 312 313 313 - func (p *Pages) avatarUri(handle, size string) string { 313 313 + func (p *Pages) AvatarUrl(handle, size string) string { 314 314 handle = strings.TrimPrefix(handle, "@") 315 315 316 316 secret := p.avatar.SharedSecret

+44

appview/pages/templates/fragments/dolly/silhouette.svg

··· 1 1 + <svg 2 2 + version="1.1" 3 3 + id="svg1" 4 4 + width="32" 5 5 + height="32" 6 6 + viewBox="0 0 25 25" 7 7 + sodipodi:docname="tangled_dolly_silhouette.png" 8 8 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 9 9 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 10 10 + xmlns="http://www.w3.org/2000/svg" 11 11 + xmlns:svg="http://www.w3.org/2000/svg"> 12 12 + <title>Dolly</title> 13 13 + <defs 14 14 + id="defs1" /> 15 15 + <sodipodi:namedview 16 16 + id="namedview1" 17 17 + pagecolor="#ffffff" 18 18 + bordercolor="#000000" 19 19 + borderopacity="0.25" 20 20 + inkscape:showpageshadow="2" 21 21 + inkscape:pageopacity="0.0" 22 22 + inkscape:pagecheckerboard="true" 23 23 + inkscape:deskcolor="#d1d1d1"> 24 24 + <inkscape:page 25 25 + x="0" 26 26 + y="0" 27 27 + width="25" 28 28 + height="25" 29 29 + id="page2" 30 30 + margin="0" 31 31 + bleed="0" /> 32 32 + </sodipodi:namedview> 33 33 + <g 34 34 + inkscape:groupmode="layer" 35 35 + inkscape:label="Image" 36 36 + id="g1"> 37 37 + <path 38 38 + class="dolly" 39 39 + fill="currentColor" 40 40 + style="stroke-width:1.12248" 41 41 + d="m 16.208435,23.914069 c -0.06147,-0.02273 -0.147027,-0.03034 -0.190158,-0.01691 -0.197279,0.06145 -1.31068,-0.230493 -1.388819,-0.364153 -0.01956,-0.03344 -0.163274,-0.134049 -0.319377,-0.223561 -0.550395,-0.315603 -1.010951,-0.696643 -1.428383,-1.181771 -0.264598,-0.307509 -0.597257,-0.785384 -0.597257,-0.857979 0,-0.0216 -0.02841,-0.06243 -0.06313,-0.0907 -0.04977,-0.04053 -0.160873,0.0436 -0.52488,0.397463 -0.479803,0.466432 -0.78924,0.689475 -1.355603,0.977118 -0.183693,0.0933 -0.323426,0.179989 -0.310516,0.192658 0.02801,0.02748 -0.7656391,0.270031 -1.209129,0.369517 -0.5378332,0.120647 -1.6341809,0.08626 -1.9721503,-0.06186 C 6.7977157,23.031391 6.56735,22.957551 6.3371134,22.889782 4.9717169,22.487902 3.7511914,21.481518 3.1172396,20.234838 2.6890391,19.392772 2.5582276,18.827446 2.5610489,17.831154 2.5639589,16.802192 2.7366641,16.125844 3.2142117,15.273187 3.3040457,15.112788 3.3713143,14.976533 3.3636956,14.9704 3.3560756,14.9643 3.2459634,14.90305 3.1189994,14.834381 1.7582586,14.098312 0.77760984,12.777439 0.44909837,11.23818 0.33531456,10.705039 0.33670119,9.7067968 0.45195381,9.1778795 0.72259241,7.9359287 1.3827188,6.8888436 2.4297498,6.0407205 2.6856126,5.8334648 3.2975489,5.4910878 3.6885849,5.3364049 L 4.0584319,5.190106 4.2333984,4.860432 C 4.8393906,3.7186139 5.8908314,2.7968028 7.1056396,2.3423025 7.7690673,2.0940921 8.2290216,2.0150935 9.01853,2.0137575 c 0.9625627,-0.00163 1.629181,0.1532762 2.485864,0.5776514 l 0.271744,0.1346134 0.42911,-0.3607688 c 1.082666,-0.9102346 2.185531,-1.3136811 3.578383,-1.3090327 0.916696,0.00306 1.573918,0.1517893 2.356121,0.5331927 1.465948,0.7148 2.54506,2.0625628 2.865177,3.57848 l 0.07653,0.362429 0.515095,0.2556611 c 1.022872,0.5076874 1.756122,1.1690944 2.288361,2.0641468 0.401896,0.6758594 0.537303,1.0442682 0.675505,1.8378683 0.288575,1.6570823 -0.266229,3.3548023 -1.490464,4.5608743 -0.371074,0.36557 -0.840205,0.718265 -1.203442,0.904754 -0.144112,0.07398 -0.271303,0.15826 -0.282647,0.187269 -0.01134,0.02901 0.02121,0.142764 0.07234,0.25279 0.184248,0.396467 0.451371,1.331823 0.619371,2.168779 0.463493,2.30908 -0.754646,4.693707 -2.92278,5.721632 -0.479538,0.227352 -0.717629,0.309322 -1.144194,0.39393 -0.321869,0.06383 -1.850573,0.09139 -2.000174,0.03604 z M 12.25443,18.636956 c 0.739923,-0.24652 1.382521,-0.718922 1.874623,-1.37812 0.0752,-0.100718 0.213883,-0.275851 0.308198,-0.389167 0.09432,-0.113318 0.210136,-0.271056 0.257381,-0.350531 0.416347,-0.700389 0.680936,-1.176102 0.766454,-1.378041 0.05594,-0.132087 0.114653,-0.239607 0.130477,-0.238929 0.01583,6.79e-4 0.08126,0.08531 0.145412,0.188069 0.178029,0.285173 0.614305,0.658998 0.868158,0.743878 0.259802,0.08686 0.656158,0.09598 0.911369,0.02095 0.213812,-0.06285 0.507296,-0.298016 0.645179,-0.516947 0.155165,-0.246374 0.327989,-0.989595 0.327989,-1.410501 0,-1.26718 -0.610975,-3.143405 -1.237774,-3.801045 -0.198483,-0.2082486 -0.208557,-0.2319396 -0.208557,-0.4904655 0,-0.2517771 -0.08774,-0.5704927 -0.258476,-0.938956 C 16.694963,8.50313 16.375697,8.1377479 16.135846,7.9543702 L 15.932296,7.7987471 15.683004,7.9356529 C 15.131767,8.2383821 14.435638,8.1945733 13.943459,7.8261812 L 13.782862,7.7059758 13.686773,7.8908012 C 13.338849,8.5600578 12.487087,8.8811064 11.743178,8.6233891 11.487199,8.5347109 11.358897,8.4505994 11.063189,8.1776138 L 10.69871,7.8411436 10.453484,8.0579255 C 10.318608,8.1771557 10.113778,8.3156283 9.9983037,8.3656417 9.7041488,8.4930449 9.1808299,8.5227884 8.8979004,8.4281886 8.7754792,8.3872574 8.6687415,8.3537661 8.6607053,8.3537661 c -0.03426,0 -0.3092864,0.3066098 -0.3791974,0.42275 -0.041935,0.069664 -0.1040482,0.1266636 -0.1380294,0.1266636 -0.1316419,0 -0.4197402,0.1843928 -0.6257041,0.4004735 -0.1923125,0.2017571 -0.6853701,0.9036038 -0.8926582,1.2706578 -0.042662,0.07554 -0.1803555,0.353687 -0.3059848,0.618091 -0.1256293,0.264406 -0.3270073,0.686768 -0.4475067,0.938581 -0.1204992,0.251816 -0.2469926,0.519654 -0.2810961,0.595199 -0.2592829,0.574347 -0.285919,1.391094 -0.057822,1.77304 0.1690683,0.283105 0.4224039,0.480895 0.7285507,0.568809 0.487122,0.139885 0.9109638,-0.004 1.6013422,-0.543768 l 0.4560939,-0.356568 0.0036,0.172041 c 0.01635,0.781837 0.1831084,1.813183 0.4016641,2.484154 0.1160449,0.356262 0.3781448,0.83968 0.5614081,1.035462 0.2171883,0.232025 0.7140951,0.577268 1.0100284,0.701749 0.121485,0.0511 0.351032,0.110795 0.510105,0.132647 0.396966,0.05452 1.2105,0.02265 1.448934,-0.05679 z" 42 42 + id="path1" /> 43 43 + </g> 44 44 + </svg>

+9 -1

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

··· 2 2 {{ $title := or .Title .RepoInfo.FullName }} 3 3 {{ $description := or .Description .RepoInfo.Description }} 4 4 {{ $url := or .Url (printf "https://tangled.org/%s" .RepoInfo.FullName) }} 5 5 - 5 5 + {{ $imageUrl := printf "https://tangled.org/%s/opengraph" .RepoInfo.FullName }} 6 6 7 7 <meta property="og:title" content="{{ unescapeHtml $title }}" /> 8 8 <meta property="og:type" content="object" /> 9 9 <meta property="og:url" content="{{ $url }}" /> 10 10 <meta property="og:description" content="{{ $description }}" /> 11 11 + <meta property="og:image" content="{{ $imageUrl }}" /> 12 12 + <meta property="og:image:width" content="1200" /> 13 13 + <meta property="og:image:height" content="600" /> 14 14 + 15 15 + <meta name="twitter:card" content="summary_large_image" /> 16 16 + <meta name="twitter:title" content="{{ unescapeHtml $title }}" /> 17 17 + <meta name="twitter:description" content="{{ $description }}" /> 18 18 + <meta name="twitter:image" content="{{ $imageUrl }}" /> 11 19 {{ end }}

+1 -1

knotserver/xrpc/merge_check.go

··· 51 51 return 52 52 } 53 53 54 54 - err = gr.MergeCheck([]byte(data.Patch), data.Branch) 54 54 + err = gr.MergeCheck(data.Patch, data.Branch) 55 55 56 56 response := tangled.RepoMergeCheck_Output{ 57 57 Is_conflicted: false,

+30

api/tangled/repodeleteBranch.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.deleteBranch 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoDeleteBranchNSID = "sh.tangled.repo.deleteBranch" 15 15 + ) 16 16 + 17 17 + // RepoDeleteBranch_Input is the input argument to a sh.tangled.repo.deleteBranch call. 18 18 + type RepoDeleteBranch_Input struct { 19 19 + Branch string `json:"branch" cborgen:"branch"` 20 20 + Repo string `json:"repo" cborgen:"repo"` 21 21 + } 22 22 + 23 23 + // RepoDeleteBranch calls the XRPC method "sh.tangled.repo.deleteBranch". 24 24 + func RepoDeleteBranch(ctx context.Context, c util.LexClient, input *RepoDeleteBranch_Input) error { 25 25 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.deleteBranch", nil, input, nil); err != nil { 26 26 + return err 27 27 + } 28 28 + 29 29 + return nil 30 30 + }

+5

knotserver/git/branch.go

··· 110 110 slices.Reverse(branches) 111 111 return branches, nil 112 112 } 113 113 + 114 114 + func (g *GitRepo) DeleteBranch(branch string) error { 115 115 + ref := plumbing.NewBranchReferenceName(branch) 116 116 + return g.r.Storer.RemoveReference(ref) 117 117 + }

+30

lexicons/repo/deleteBranch.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.deleteBranch", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Delete a branch on this repository", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "repo", 14 14 + "branch" 15 15 + ], 16 16 + "properties": { 17 17 + "repo": { 18 18 + "type": "string", 19 19 + "format": "at-uri" 20 20 + }, 21 21 + "branch": { 22 22 + "type": "string" 23 23 + } 24 24 + } 25 25 + } 26 26 + } 27 27 + } 28 28 + } 29 29 + } 30 30 +

+11

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

··· 33 33 <span>comment</span> 34 34 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 35 35 </button> 36 36 + {{ if .BranchDeleteStatus }} 37 37 + <button 38 38 + hx-delete="/{{ .BranchDeleteStatus.Repo.Did }}/{{ .BranchDeleteStatus.Repo.Name }}/branches" 39 39 + hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }' 40 40 + hx-swap="none" 41 41 + class="btn 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"> 42 42 + {{ i "git-branch" "w-4 h-4" }} 43 43 + <span>delete branch</span> 44 44 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 45 45 + </button> 46 46 + {{ end }} 36 47 {{ if and $isPushAllowed $isOpen $isLastRound }} 37 48 {{ $disabled := "" }} 38 49 {{ if $isConflicted }}

+2 -2

appview/pages/templates/layouts/base.html

··· 26 26 </head> 27 27 <body class="min-h-screen flex flex-col gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200"> 28 28 {{ block "topbarLayout" . }} 29 29 - <header class="w-full bg-white dark:bg-gray-800 col-span-full md:col-span-1 md:col-start-2" style="z-index: 20;"> 29 29 + <header class="w-full col-span-full md:col-span-1 md:col-start-2" style="z-index: 20;"> 30 30 31 31 {{ if .LoggedInUser }} 32 32 <div id="upgrade-banner" ··· 58 58 {{ end }} 59 59 60 60 {{ block "footerLayout" . }} 61 61 - <footer class="bg-white dark:bg-gray-800 mt-12"> 61 61 + <footer class="mt-12"> 62 62 {{ template "layouts/fragments/footer" . }} 63 63 </footer> 64 64 {{ end }}

+1 -14

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

··· 28 28 29 29 {{ end }} 30 30 31 31 - {{ define "topbarLayout" }} 32 32 - <header class="px-1 col-span-full" style="z-index: 20;"> 33 33 - {{ template "layouts/fragments/topbar" . }} 34 34 - </header> 35 35 - {{ end }} 36 36 - 37 31 {{ define "mainLayout" }} 38 38 - <div class="px-1 col-span-full flex flex-col gap-4"> 32 32 + <div class="px-1 col-span-full flex-grow flex flex-col gap-4"> 39 33 {{ block "contentLayout" . }} 40 34 {{ block "content" . }}{{ end }} 41 35 {{ end }} ··· 53 47 </div> 54 48 {{ end }} 55 49 56 56 - {{ define "footerLayout" }} 57 57 - <footer class="px-1 col-span-full mt-12"> 58 58 - {{ template "layouts/fragments/footer" . }} 59 59 - </footer> 60 60 - {{ end }} 61 61 - 62 62 - 63 50 {{ define "contentAfter" }} 64 51 {{ template "repo/fragments/interdiff" (list .RepoInfo.FullName .Interdiff .DiffOpts) }} 65 52 {{end}}

+1 -1

appview/pages/templates/layouts/fragments/topbar.html

··· 1 1 {{ define "layouts/fragments/topbar" }} 2 2 - <nav class="mx-auto space-x-4 px-6 py-2 rounded-b dark:text-white drop-shadow-sm bg-white dark:bg-gray-800"> 2 2 + <nav class="mx-auto space-x-4 px-6 py-2 dark:text-white drop-shadow-sm bg-white dark:bg-gray-800"> 3 3 <div class="flex justify-between p-0 items-center"> 4 4 <div id="left-items"> 5 5 <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline flex items-center gap-2">

cmd/gen.go cmd/cborgen/cborgen.go

+18 -18

knotserver/git.go

··· 13 13 "tangled.org/core/knotserver/git/service" 14 14 ) 15 15 16 16 - func (d *Knot) InfoRefs(w http.ResponseWriter, r *http.Request) { 16 16 + func (h *Knot) InfoRefs(w http.ResponseWriter, r *http.Request) { 17 17 did := chi.URLParam(r, "did") 18 18 name := chi.URLParam(r, "name") 19 19 repoName, err := securejoin.SecureJoin(did, name) 20 20 if err != nil { 21 21 gitError(w, "repository not found", http.StatusNotFound) 22 22 - d.l.Error("git: failed to secure join repo path", "handler", "InfoRefs", "error", err) 22 22 + h.l.Error("git: failed to secure join repo path", "handler", "InfoRefs", "error", err) 23 23 return 24 24 } 25 25 26 26 - repoPath, err := securejoin.SecureJoin(d.c.Repo.ScanPath, repoName) 26 26 + repoPath, err := securejoin.SecureJoin(h.c.Repo.ScanPath, repoName) 27 27 if err != nil { 28 28 gitError(w, "repository not found", http.StatusNotFound) 29 29 - d.l.Error("git: failed to secure join repo path", "handler", "InfoRefs", "error", err) 29 29 + h.l.Error("git: failed to secure join repo path", "handler", "InfoRefs", "error", err) 30 30 return 31 31 } 32 32 ··· 46 46 47 47 if err := cmd.InfoRefs(); err != nil { 48 48 gitError(w, err.Error(), http.StatusInternalServerError) 49 49 - d.l.Error("git: process failed", "handler", "InfoRefs", "service", serviceName, "error", err) 49 49 + h.l.Error("git: process failed", "handler", "InfoRefs", "service", serviceName, "error", err) 50 50 return 51 51 } 52 52 case "git-receive-pack": 53 53 - d.RejectPush(w, r, name) 53 53 + h.RejectPush(w, r, name) 54 54 default: 55 55 gitError(w, fmt.Sprintf("service unsupported: '%s'", serviceName), http.StatusForbidden) 56 56 } 57 57 } 58 58 59 59 - func (d *Knot) UploadPack(w http.ResponseWriter, r *http.Request) { 59 59 + func (h *Knot) UploadPack(w http.ResponseWriter, r *http.Request) { 60 60 did := chi.URLParam(r, "did") 61 61 name := chi.URLParam(r, "name") 62 62 - repo, err := securejoin.SecureJoin(d.c.Repo.ScanPath, filepath.Join(did, name)) 62 62 + repo, err := securejoin.SecureJoin(h.c.Repo.ScanPath, filepath.Join(did, name)) 63 63 if err != nil { 64 64 gitError(w, err.Error(), http.StatusInternalServerError) 65 65 - d.l.Error("git: failed to secure join repo path", "handler", "UploadPack", "error", err) 65 65 + h.l.Error("git: failed to secure join repo path", "handler", "UploadPack", "error", err) 66 66 return 67 67 } 68 68 ··· 77 77 gzipReader, err := gzip.NewReader(r.Body) 78 78 if err != nil { 79 79 gitError(w, err.Error(), http.StatusInternalServerError) 80 80 - d.l.Error("git: failed to create gzip reader", "handler", "UploadPack", "error", err) 80 80 + h.l.Error("git: failed to create gzip reader", "handler", "UploadPack", "error", err) 81 81 return 82 82 } 83 83 defer gzipReader.Close() ··· 88 88 w.Header().Set("Connection", "Keep-Alive") 89 89 w.Header().Set("Cache-Control", "no-cache, max-age=0, must-revalidate") 90 90 91 91 - d.l.Info("git: executing git-upload-pack", "handler", "UploadPack", "repo", repo) 91 91 + h.l.Info("git: executing git-upload-pack", "handler", "UploadPack", "repo", repo) 92 92 93 93 cmd := service.ServiceCommand{ 94 94 GitProtocol: r.Header.Get("Git-Protocol"), ··· 100 100 w.WriteHeader(http.StatusOK) 101 101 102 102 if err := cmd.UploadPack(); err != nil { 103 103 - d.l.Error("git: failed to execute git-upload-pack", "handler", "UploadPack", "error", err) 103 103 + h.l.Error("git: failed to execute git-upload-pack", "handler", "UploadPack", "error", err) 104 104 return 105 105 } 106 106 } 107 107 108 108 - func (d *Knot) ReceivePack(w http.ResponseWriter, r *http.Request) { 108 108 + func (h *Knot) ReceivePack(w http.ResponseWriter, r *http.Request) { 109 109 did := chi.URLParam(r, "did") 110 110 name := chi.URLParam(r, "name") 111 111 - _, err := securejoin.SecureJoin(d.c.Repo.ScanPath, filepath.Join(did, name)) 111 111 + _, err := securejoin.SecureJoin(h.c.Repo.ScanPath, filepath.Join(did, name)) 112 112 if err != nil { 113 113 gitError(w, err.Error(), http.StatusForbidden) 114 114 - d.l.Error("git: failed to secure join repo path", "handler", "ReceivePack", "error", err) 114 114 + h.l.Error("git: failed to secure join repo path", "handler", "ReceivePack", "error", err) 115 115 return 116 116 } 117 117 118 118 - d.RejectPush(w, r, name) 118 118 + h.RejectPush(w, r, name) 119 119 } 120 120 121 121 - func (d *Knot) RejectPush(w http.ResponseWriter, r *http.Request, unqualifiedRepoName string) { 121 121 + func (h *Knot) RejectPush(w http.ResponseWriter, r *http.Request, unqualifiedRepoName string) { 122 122 // A text/plain response will cause git to print each line of the body 123 123 // prefixed with "remote: ". 124 124 w.Header().Set("content-type", "text/plain; charset=UTF-8") ··· 131 131 ownerHandle := r.Header.Get("x-tangled-repo-owner-handle") 132 132 ownerHandle = strings.TrimPrefix(ownerHandle, "@") 133 133 if ownerHandle != "" && !strings.ContainsAny(ownerHandle, ":") { 134 134 - hostname := d.c.Server.Hostname 134 134 + hostname := h.c.Server.Hostname 135 135 if strings.Contains(hostname, ":") { 136 136 hostname = strings.Split(hostname, ":")[0] 137 137 }

+16 -9

knotserver/router.go

··· 12 12 "tangled.org/core/knotserver/config" 13 13 "tangled.org/core/knotserver/db" 14 14 "tangled.org/core/knotserver/xrpc" 15 15 - tlog "tangled.org/core/log" 15 15 + "tangled.org/core/log" 16 16 "tangled.org/core/notifier" 17 17 "tangled.org/core/rbac" 18 18 "tangled.org/core/xrpc/serviceauth" ··· 28 28 resolver *idresolver.Resolver 29 29 } 30 30 31 31 - func Setup(ctx context.Context, c *config.Config, db *db.DB, e *rbac.Enforcer, jc *jetstream.JetstreamClient, l *slog.Logger, n *notifier.Notifier) (http.Handler, error) { 32 32 - r := chi.NewRouter() 33 33 - 31 31 + func Setup(ctx context.Context, c *config.Config, db *db.DB, e *rbac.Enforcer, jc *jetstream.JetstreamClient, n *notifier.Notifier) (http.Handler, error) { 34 32 h := Knot{ 35 33 c: c, 36 34 db: db, 37 35 e: e, 38 38 - l: l, 36 36 + l: log.FromContext(ctx), 39 37 jc: jc, 40 38 n: n, 41 39 resolver: idresolver.DefaultResolver(), ··· 67 65 return nil, fmt.Errorf("failed to start jetstream: %w", err) 68 66 } 69 67 68 68 + return h.Router(), nil 69 69 + } 70 70 + 71 71 + func (h *Knot) Router() http.Handler { 72 72 + r := chi.NewRouter() 73 73 + 74 74 + r.Use(h.RequestLogger) 75 75 + 70 76 r.Get("/", func(w http.ResponseWriter, r *http.Request) { 71 77 w.Write([]byte("This is a knot server. More info at https://tangled.sh")) 72 78 }) ··· 86 92 // Socket that streams git oplogs 87 93 r.Get("/events", h.Events) 88 94 89 89 - return r, nil 95 95 + return r 90 96 } 91 97 92 98 func (h *Knot) XrpcRouter() http.Handler { 93 93 - logger := tlog.New("knots") 94 94 - 95 99 serviceAuth := serviceauth.NewServiceAuth(h.l, h.resolver, h.c.Server.Did().String()) 96 100 101 101 + l := log.SubLogger(h.l, "xrpc") 102 102 + 97 103 xrpc := &xrpc.Xrpc{ 98 104 Config: h.c, 99 105 Db: h.db, 100 106 Ingester: h.jc, 101 107 Enforcer: h.e, 102 102 - Logger: logger, 108 108 + Logger: l, 103 109 Notifier: h.n, 104 110 Resolver: h.resolver, 105 111 ServiceAuth: serviceAuth, 106 112 } 113 113 + 107 114 return xrpc.Router() 108 115 } 109 116

+5 -4

knotserver/server.go

··· 43 43 44 44 func Run(ctx context.Context, cmd *cli.Command) error { 45 45 logger := log.FromContext(ctx) 46 46 - iLogger := log.New("knotserver/internal") 46 46 + logger = log.SubLogger(logger, cmd.Name) 47 47 + ctx = log.IntoContext(ctx, logger) 47 48 48 49 c, err := config.Load(ctx) 49 50 if err != nil { ··· 80 81 tangled.KnotMemberNSID, 81 82 tangled.RepoPullNSID, 82 83 tangled.RepoCollaboratorNSID, 83 83 - }, nil, logger, db, true, c.Server.LogDids) 84 84 + }, nil, log.SubLogger(logger, "jetstream"), db, true, c.Server.LogDids) 84 85 if err != nil { 85 86 logger.Error("failed to setup jetstream", "error", err) 86 87 } 87 88 88 89 notifier := notifier.New() 89 90 90 90 - mux, err := Setup(ctx, c, db, e, jc, logger, &notifier) 91 91 + mux, err := Setup(ctx, c, db, e, jc, &notifier) 91 92 if err != nil { 92 93 return fmt.Errorf("failed to setup server: %w", err) 93 94 } 94 95 95 95 - imux := Internal(ctx, c, db, e, iLogger, &notifier) 96 96 + imux := Internal(ctx, c, db, e, &notifier) 96 97 97 98 logger.Info("starting internal server", "address", c.Server.InternalListenAddr) 98 99 go http.ListenAndServe(c.Server.InternalListenAddr, imux)

+36 -28

appview/db/db.go

··· 4 4 "context" 5 5 "database/sql" 6 6 "fmt" 7 7 - "log" 7 7 + "log/slog" 8 8 "reflect" 9 9 "strings" 10 10 11 11 _ "github.com/mattn/go-sqlite3" 12 12 + "tangled.org/core/log" 12 13 ) 13 14 14 15 type DB struct { 15 16 *sql.DB 17 17 + logger *slog.Logger 16 18 } 17 19 18 20 type Execer interface { ··· 26 28 PrepareContext(ctx context.Context, query string) (*sql.Stmt, error) 27 29 } 28 30 29 29 - func Make(dbPath string) (*DB, error) { 31 31 + func Make(ctx context.Context, dbPath string) (*DB, error) { 30 32 // https://github.com/mattn/go-sqlite3#connection-string 31 33 opts := []string{ 32 34 "_foreign_keys=1", ··· 35 37 "_auto_vacuum=incremental", 36 38 } 37 39 40 40 + logger := log.FromContext(ctx) 41 41 + logger = log.SubLogger(logger, "db") 42 42 + 38 43 db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&")) 39 44 if err != nil { 40 45 return nil, err 41 46 } 42 47 43 43 - ctx := context.Background() 44 44 - 45 48 conn, err := db.Conn(ctx) 46 49 if err != nil { 47 50 return nil, err ··· 574 577 } 575 578 576 579 // run migrations 577 577 - runMigration(conn, "add-description-to-repos", func(tx *sql.Tx) error { 580 580 + runMigration(conn, logger, "add-description-to-repos", func(tx *sql.Tx) error { 578 581 tx.Exec(` 579 582 alter table repos add column description text check (length(description) <= 200); 580 583 `) 581 584 return nil 582 585 }) 583 586 584 584 - runMigration(conn, "add-rkey-to-pubkeys", func(tx *sql.Tx) error { 587 587 + runMigration(conn, logger, "add-rkey-to-pubkeys", func(tx *sql.Tx) error { 585 588 // add unconstrained column 586 589 _, err := tx.Exec(` 587 590 alter table public_keys ··· 604 607 return nil 605 608 }) 606 609 607 607 - runMigration(conn, "add-rkey-to-comments", func(tx *sql.Tx) error { 610 610 + runMigration(conn, logger, "add-rkey-to-comments", func(tx *sql.Tx) error { 608 611 _, err := tx.Exec(` 609 612 alter table comments drop column comment_at; 610 613 alter table comments add column rkey text; ··· 612 615 return err 613 616 }) 614 617 615 615 - runMigration(conn, "add-deleted-and-edited-to-issue-comments", func(tx *sql.Tx) error { 618 618 + runMigration(conn, logger, "add-deleted-and-edited-to-issue-comments", func(tx *sql.Tx) error { 616 619 _, err := tx.Exec(` 617 620 alter table comments add column deleted text; -- timestamp 618 621 alter table comments add column edited text; -- timestamp ··· 620 623 return err 621 624 }) 622 625 623 623 - runMigration(conn, "add-source-info-to-pulls-and-submissions", func(tx *sql.Tx) error { 626 626 + runMigration(conn, logger, "add-source-info-to-pulls-and-submissions", func(tx *sql.Tx) error { 624 627 _, err := tx.Exec(` 625 628 alter table pulls add column source_branch text; 626 629 alter table pulls add column source_repo_at text; ··· 629 632 return err 630 633 }) 631 634 632 632 - runMigration(conn, "add-source-to-repos", func(tx *sql.Tx) error { 635 635 + runMigration(conn, logger, "add-source-to-repos", func(tx *sql.Tx) error { 633 636 _, err := tx.Exec(` 634 637 alter table repos add column source text; 635 638 `) ··· 641 644 // 642 645 // [0]: https://sqlite.org/pragma.html#pragma_foreign_keys 643 646 conn.ExecContext(ctx, "pragma foreign_keys = off;") 644 644 - runMigration(conn, "recreate-pulls-column-for-stacking-support", func(tx *sql.Tx) error { 647 647 + runMigration(conn, logger, "recreate-pulls-column-for-stacking-support", func(tx *sql.Tx) error { 645 648 _, err := tx.Exec(` 646 649 create table pulls_new ( 647 650 -- identifiers ··· 698 701 }) 699 702 conn.ExecContext(ctx, "pragma foreign_keys = on;") 700 703 701 701 - runMigration(conn, "add-spindle-to-repos", func(tx *sql.Tx) error { 704 704 + runMigration(conn, logger, "add-spindle-to-repos", func(tx *sql.Tx) error { 702 705 tx.Exec(` 703 706 alter table repos add column spindle text; 704 707 `) ··· 708 711 // drop all knot secrets, add unique constraint to knots 709 712 // 710 713 // knots will henceforth use service auth for signed requests 711 711 - runMigration(conn, "no-more-secrets", func(tx *sql.Tx) error { 714 714 + runMigration(conn, logger, "no-more-secrets", func(tx *sql.Tx) error { 712 715 _, err := tx.Exec(` 713 716 create table registrations_new ( 714 717 id integer primary key autoincrement, ··· 731 734 }) 732 735 733 736 // recreate and add rkey + created columns with default constraint 734 734 - runMigration(conn, "rework-collaborators-table", func(tx *sql.Tx) error { 737 737 + runMigration(conn, logger, "rework-collaborators-table", func(tx *sql.Tx) error { 735 738 // create new table 736 739 // - repo_at instead of repo integer 737 740 // - rkey field ··· 785 788 return err 786 789 }) 787 790 788 788 - runMigration(conn, "add-rkey-to-issues", func(tx *sql.Tx) error { 791 791 + runMigration(conn, logger, "add-rkey-to-issues", func(tx *sql.Tx) error { 789 792 _, err := tx.Exec(` 790 793 alter table issues add column rkey text not null default ''; 791 794 ··· 797 800 }) 798 801 799 802 // repurpose the read-only column to "needs-upgrade" 800 800 - runMigration(conn, "rename-registrations-read-only-to-needs-upgrade", func(tx *sql.Tx) error { 803 803 + runMigration(conn, logger, "rename-registrations-read-only-to-needs-upgrade", func(tx *sql.Tx) error { 801 804 _, err := tx.Exec(` 802 805 alter table registrations rename column read_only to needs_upgrade; 803 806 `) ··· 805 808 }) 806 809 807 810 // require all knots to upgrade after the release of total xrpc 808 808 - runMigration(conn, "migrate-knots-to-total-xrpc", func(tx *sql.Tx) error { 811 811 + runMigration(conn, logger, "migrate-knots-to-total-xrpc", func(tx *sql.Tx) error { 809 812 _, err := tx.Exec(` 810 813 update registrations set needs_upgrade = 1; 811 814 `) ··· 813 816 }) 814 817 815 818 // require all knots to upgrade after the release of total xrpc 816 816 - runMigration(conn, "migrate-spindles-to-xrpc-owner", func(tx *sql.Tx) error { 819 819 + runMigration(conn, logger, "migrate-spindles-to-xrpc-owner", func(tx *sql.Tx) error { 817 820 _, err := tx.Exec(` 818 821 alter table spindles add column needs_upgrade integer not null default 0; 819 822 `) ··· 831 834 // 832 835 // disable foreign-keys for the next migration 833 836 conn.ExecContext(ctx, "pragma foreign_keys = off;") 834 834 - runMigration(conn, "remove-issue-at-from-issues", func(tx *sql.Tx) error { 837 837 + runMigration(conn, logger, "remove-issue-at-from-issues", func(tx *sql.Tx) error { 835 838 _, err := tx.Exec(` 836 839 create table if not exists issues_new ( 837 840 -- identifiers ··· 901 904 // - new columns 902 905 // * column "reply_to" which can be any other comment 903 906 // * column "at-uri" which is a generated column 904 904 - runMigration(conn, "rework-issue-comments", func(tx *sql.Tx) error { 907 907 + runMigration(conn, logger, "rework-issue-comments", func(tx *sql.Tx) error { 905 908 _, err := tx.Exec(` 906 909 create table if not exists issue_comments ( 907 910 -- identifiers ··· 961 964 // 962 965 // disable foreign-keys for the next migration 963 966 conn.ExecContext(ctx, "pragma foreign_keys = off;") 964 964 - runMigration(conn, "add-at-uri-to-pulls", func(tx *sql.Tx) error { 967 967 + runMigration(conn, logger, "add-at-uri-to-pulls", func(tx *sql.Tx) error { 965 968 _, err := tx.Exec(` 966 969 create table if not exists pulls_new ( 967 970 -- identifiers ··· 1042 1045 // 1043 1046 // disable foreign-keys for the next migration 1044 1047 conn.ExecContext(ctx, "pragma foreign_keys = off;") 1045 1045 - runMigration(conn, "remove-repo-at-pull-id-from-pull-submissions", func(tx *sql.Tx) error { 1048 1048 + runMigration(conn, logger, "remove-repo-at-pull-id-from-pull-submissions", func(tx *sql.Tx) error { 1046 1049 _, err := tx.Exec(` 1047 1050 create table if not exists pull_submissions_new ( 1048 1051 -- identifiers ··· 1094 1097 }) 1095 1098 conn.ExecContext(ctx, "pragma foreign_keys = on;") 1096 1099 1097 1097 - return &DB{db}, nil 1100 1100 + return &DB{ 1101 1101 + db, 1102 1102 + logger, 1103 1103 + }, nil 1098 1104 } 1099 1105 1100 1106 type migrationFn = func(*sql.Tx) error 1101 1107 1102 1102 - func runMigration(c *sql.Conn, name string, migrationFn migrationFn) error { 1108 1108 + func runMigration(c *sql.Conn, logger *slog.Logger, name string, migrationFn migrationFn) error { 1109 1109 + logger = logger.With("migration", name) 1110 1110 + 1103 1111 tx, err := c.BeginTx(context.Background(), nil) 1104 1112 if err != nil { 1105 1113 return err ··· 1116 1124 // run migration 1117 1125 err = migrationFn(tx) 1118 1126 if err != nil { 1119 1119 - log.Printf("Failed to run migration %s: %v", name, err) 1127 1127 + logger.Error("failed to run migration", "err", err) 1120 1128 return err 1121 1129 } 1122 1130 1123 1131 // mark migration as complete 1124 1132 _, err = tx.Exec("insert into migrations (name) values (?)", name) 1125 1133 if err != nil { 1126 1126 - log.Printf("Failed to mark migration %s as complete: %v", name, err) 1134 1134 + logger.Error("failed to mark migration as complete", "err", err) 1127 1135 return err 1128 1136 } 1129 1137 ··· 1132 1140 return err 1133 1141 } 1134 1142 1135 1135 - log.Printf("migration %s applied successfully", name) 1143 1143 + logger.Info("migration applied successfully") 1136 1144 } else { 1137 1137 - log.Printf("skipped migration %s, already applied", name) 1145 1145 + logger.Warn("skipped migration, already applied") 1138 1146 } 1139 1147 1140 1148 return nil

+15 -12

appview/notifications/notifications.go

··· 1 1 package notifications 2 2 3 3 import ( 4 4 - "log" 4 4 + "log/slog" 5 5 "net/http" 6 6 "strconv" 7 7 ··· 14 14 ) 15 15 16 16 type Notifications struct { 17 17 - db *db.DB 18 18 - oauth *oauth.OAuth 19 19 - pages *pages.Pages 17 17 + db *db.DB 18 18 + oauth *oauth.OAuth 19 19 + pages *pages.Pages 20 20 + logger *slog.Logger 20 21 } 21 22 22 22 - func New(database *db.DB, oauthHandler *oauth.OAuth, pagesHandler *pages.Pages) *Notifications { 23 23 + func New(database *db.DB, oauthHandler *oauth.OAuth, pagesHandler *pages.Pages, logger *slog.Logger) *Notifications { 23 24 return &Notifications{ 24 24 - db: database, 25 25 - oauth: oauthHandler, 26 26 - pages: pagesHandler, 25 25 + db: database, 26 26 + oauth: oauthHandler, 27 27 + pages: pagesHandler, 28 28 + logger: logger, 27 29 } 28 30 } 29 31 ··· 44 46 } 45 47 46 48 func (n *Notifications) notificationsPage(w http.ResponseWriter, r *http.Request) { 49 49 + l := n.logger.With("handler", "notificationsPage") 47 50 user := n.oauth.GetUser(r) 48 51 49 52 page, ok := r.Context().Value("page").(pagination.Page) 50 53 if !ok { 51 51 - log.Println("failed to get page") 54 54 + l.Error("failed to get page") 52 55 page = pagination.FirstPage() 53 56 } 54 57 ··· 57 60 db.FilterEq("recipient_did", user.Did), 58 61 ) 59 62 if err != nil { 60 60 - log.Println("failed to get total notifications:", err) 63 63 + l.Error("failed to get total notifications", "err", err) 61 64 n.pages.Error500(w) 62 65 return 63 66 } ··· 68 71 db.FilterEq("recipient_did", user.Did), 69 72 ) 70 73 if err != nil { 71 71 - log.Println("failed to get notifications:", err) 74 74 + l.Error("failed to get notifications", "err", err) 72 75 n.pages.Error500(w) 73 76 return 74 77 } 75 78 76 79 err = n.db.MarkAllNotificationsRead(r.Context(), user.Did) 77 80 if err != nil { 78 78 - log.Println("failed to mark notifications as read:", err) 81 81 + l.Error("failed to mark notifications as read", "err", err) 79 82 } 80 83 81 84 unreadCount := 0

+4

appview/pulls/pulls.go

··· 6 6 "errors" 7 7 "fmt" 8 8 "log" 9 9 + "log/slog" 9 10 "net/http" 10 11 "slices" 11 12 "sort" ··· 46 47 config *config.Config 47 48 notifier notify.Notifier 48 49 enforcer *rbac.Enforcer 50 50 + logger *slog.Logger 49 51 } 50 52 51 53 func New( ··· 57 59 config *config.Config, 58 60 notifier notify.Notifier, 59 61 enforcer *rbac.Enforcer, 62 62 + logger *slog.Logger, 60 63 ) *Pulls { 61 64 return &Pulls{ 62 65 oauth: oauth, ··· 67 70 config: config, 68 71 notifier: notifier, 69 72 enforcer: enforcer, 73 73 + logger: logger, 70 74 } 71 75 } 72 76

+14 -11

appview/repo/index.go

··· 3 3 import ( 4 4 "errors" 5 5 "fmt" 6 6 - "log" 6 6 + "log/slog" 7 7 "net/http" 8 8 "net/url" 9 9 "slices" ··· 31 31 ) 32 32 33 33 func (rp *Repo) RepoIndex(w http.ResponseWriter, r *http.Request) { 34 34 + l := rp.logger.With("handler", "RepoIndex") 35 35 + 34 36 ref := chi.URLParam(r, "ref") 35 37 ref, _ = url.PathUnescape(ref) 36 38 37 39 f, err := rp.repoResolver.Resolve(r) 38 40 if err != nil { 39 39 - log.Println("failed to fully resolve repo", err) 41 41 + l.Error("failed to fully resolve repo", "err", err) 40 42 return 41 43 } 42 44 ··· 56 58 result, err := rp.buildIndexResponse(r.Context(), xrpcc, f, ref) 57 59 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 58 60 if errors.Is(xrpcerr, xrpcclient.ErrXrpcUnsupported) { 59 59 - log.Println("failed to call XRPC repo.index", err) 61 61 + l.Error("failed to call XRPC repo.index", "err", err) 60 62 rp.pages.RepoIndexPage(w, pages.RepoIndexParams{ 61 63 LoggedInUser: user, 62 64 NeedsKnotUpgrade: true, ··· 66 68 } 67 69 68 70 rp.pages.Error503(w) 69 69 - log.Println("failed to build index response", err) 71 71 + l.Error("failed to build index response", "err", err) 70 72 return 71 73 } 72 74 ··· 119 121 emails := uniqueEmails(commitsTrunc) 120 122 emailToDidMap, err := db.GetEmailToDid(rp.db, emails, true) 121 123 if err != nil { 122 122 - log.Println("failed to get email to did map", err) 124 124 + l.Error("failed to get email to did map", "err", err) 123 125 } 124 126 125 127 vc, err := commitverify.GetVerifiedObjectCommits(rp.db, emailToDidMap, commitsTrunc) 126 128 if err != nil { 127 127 - log.Println(err) 129 129 + l.Error("failed to GetVerifiedObjectCommits", "err", err) 128 130 } 129 131 130 132 // TODO: a bit dirty 131 131 - languageInfo, err := rp.getLanguageInfo(r.Context(), f, xrpcc, result.Ref, ref == "") 133 133 + languageInfo, err := rp.getLanguageInfo(r.Context(), l, f, xrpcc, result.Ref, ref == "") 132 134 if err != nil { 133 133 - log.Printf("failed to compute language percentages: %s", err) 135 135 + l.Warn("failed to compute language percentages", "err", err) 134 136 // non-fatal 135 137 } 136 138 ··· 140 142 } 141 143 pipelines, err := getPipelineStatuses(rp.db, repoInfo, shas) 142 144 if err != nil { 143 143 - log.Printf("failed to fetch pipeline statuses: %s", err) 145 145 + l.Error("failed to fetch pipeline statuses", "err", err) 144 146 // non-fatal 145 147 } 146 148 ··· 162 164 163 165 func (rp *Repo) getLanguageInfo( 164 166 ctx context.Context, 167 167 + l *slog.Logger, 165 168 f *reporesolver.ResolvedRepo, 166 169 xrpcc *indigoxrpc.Client, 167 170 currentRef string, ··· 180 183 ls, err := tangled.RepoLanguages(ctx, xrpcc, currentRef, repo) 181 184 if err != nil { 182 185 if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 183 183 - log.Println("failed to call XRPC repo.languages", xrpcerr) 186 186 + l.Error("failed to call XRPC repo.languages", "err", xrpcerr) 184 187 return nil, xrpcerr 185 188 } 186 189 return nil, err ··· 210 213 err = db.UpdateRepoLanguages(tx, f.RepoAt(), currentRef, langs) 211 214 if err != nil { 212 215 // non-fatal 213 213 - log.Println("failed to cache lang results", err) 216 216 + l.Error("failed to cache lang results", "err", err) 214 217 } 215 218 216 219 err = tx.Commit()

+3 -1

appview/state/spindlestream.go

··· 22 22 ) 23 23 24 24 func Spindlestream(ctx context.Context, c *config.Config, d *db.DB, enforcer *rbac.Enforcer) (*ec.Consumer, error) { 25 25 + logger := log.FromContext(ctx) 26 26 + logger = log.SubLogger(logger, "spindlestream") 27 27 + 25 28 spindles, err := db.GetSpindles( 26 29 d, 27 30 db.FilterIsNot("verified", "null"), ··· 36 39 srcs[src] = struct{}{} 37 40 } 38 41 39 39 - logger := log.New("spindlestream") 40 42 cache := cache.New(c.Redis.Addr) 41 43 cursorStore := cursor.NewRedisCursorStore(cache) 42 44

+27

go.sum

··· 19 19 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= 20 20 github.com/avast/retry-go/v4 v4.6.1 h1:VkOLRubHdisGrHnTu89g08aQEWEgRU7LVEop3GbIcMk= 21 21 github.com/avast/retry-go/v4 v4.6.1/go.mod h1:V6oF8njAwxJ5gRo1Q7Cxab24xs5NCWZBeaHHBklR8mA= 22 22 + github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= 23 23 + github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= 22 24 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= 23 25 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= 24 26 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= ··· 48 50 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 49 51 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= 50 52 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= 53 53 + github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= 54 54 + github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= 55 55 + github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= 56 56 + github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= 57 57 + github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig= 58 58 + github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw= 59 59 + github.com/charmbracelet/x/ansi v0.8.0 h1:9GTq3xq9caJW8ZrBTe0LIe2fvfLR/bYXKTx2llXn7xE= 60 60 + github.com/charmbracelet/x/ansi v0.8.0/go.mod h1:wdYl/ONOLHLIVmQaxbIYEC/cRKOQyjTkowiI4blgS9Q= 61 61 + github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd h1:vy0GVL4jeHEwG5YOXDmi86oYw2yuYUGqz6a8sLwg0X8= 62 62 + github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= 63 63 + github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= 64 64 + github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= 51 65 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= 52 66 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= 53 67 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= ··· 120 134 github.com/go-git/go-git-fixtures/v5 v5.0.0-20241203230421-0753e18f8f03/go.mod h1:hMKrMnUE4W0SJ7bFyM00dyz/HoknZoptGWzrj6M+dEM= 121 135 github.com/go-jose/go-jose/v3 v3.0.4 h1:Wp5HA7bLQcKnf6YYao/4kpRpVMp/yf6+pJKV8WFSaNY= 122 136 github.com/go-jose/go-jose/v3 v3.0.4/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ= 137 137 + github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= 138 138 + github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= 123 139 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= 124 140 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= 125 141 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= ··· 276 292 github.com/lestrrat-go/jwx/v2 v2.1.6/go.mod h1:Y722kU5r/8mV7fYDifjug0r8FK8mZdw0K0GpJw/l8pU= 277 293 github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= 278 294 github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= 295 295 + github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= 296 296 + github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= 279 297 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= 280 298 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= 281 299 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= 282 300 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= 301 301 + github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= 302 302 + github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= 283 303 github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM= 284 304 github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= 285 305 github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk= ··· 300 320 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= 301 321 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= 302 322 github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= 323 323 + github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= 324 324 + github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= 303 325 github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE= 304 326 github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= 305 327 github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= ··· 377 399 github.com/redis/go-redis/v9 v9.7.3/go.mod h1:bGUrSggJ9X9GUmZpZNEOQKaANxSGgOEBRltRTZHSvrA= 378 400 github.com/resend/resend-go/v2 v2.15.0 h1:B6oMEPf8IEQwn2Ovx/9yymkESLDSeNfLFaNMw+mzHhE= 379 401 github.com/resend/resend-go/v2 v2.15.0/go.mod h1:3YCb8c8+pLiqhtRFXTyFwlLvfjQtluxOr9HEh2BwCkQ= 402 402 + github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= 403 403 + github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= 404 404 + github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= 380 405 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= 381 406 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= 382 407 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= ··· 434 459 github.com/wyatt915/goldmark-treeblood v0.0.0-20250825231212-5dcbdb2f4b57/go.mod h1:BxSCWByWSRSuembL3cDG1IBUbkBoO/oW/6tF19aA4hs= 435 460 github.com/wyatt915/treeblood v0.1.15 h1:3KZ3o2LpcKZAzOLqMoW9qeUzKEaKArKpbcPpTkNfQC8= 436 461 github.com/wyatt915/treeblood v0.1.15/go.mod h1:i7+yhhmzdDP17/97pIsOSffw74EK/xk+qJ0029cSXUY= 462 462 + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= 463 463 + github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= 437 464 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 438 465 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= 439 466 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=

+1 -1

jetstream/jetstream.go

··· 114 114 115 115 sched := sequential.NewScheduler(j.ident, logger, j.withDidFilter(processFunc)) 116 116 117 117 - client, err := client.NewClient(j.cfg, log.New("jetstream"), sched) 117 117 + client, err := client.NewClient(j.cfg, logger, sched) 118 118 if err != nil { 119 119 return fmt.Errorf("failed to create jetstream client: %w", err) 120 120 }

+5 -4

xrpc/serviceauth/service_auth.go

··· 9 9 10 10 "github.com/bluesky-social/indigo/atproto/auth" 11 11 "tangled.org/core/idresolver" 12 12 + "tangled.org/core/log" 12 13 xrpcerr "tangled.org/core/xrpc/errors" 13 14 ) 14 15 ··· 22 23 23 24 func NewServiceAuth(logger *slog.Logger, resolver *idresolver.Resolver, audienceDid string) *ServiceAuth { 24 25 return &ServiceAuth{ 25 25 - logger: logger, 26 26 + logger: log.SubLogger(logger, "serviceauth"), 26 27 resolver: resolver, 27 28 audienceDid: audienceDid, 28 29 } ··· 30 31 31 32 func (sa *ServiceAuth) VerifyServiceAuth(next http.Handler) http.Handler { 32 33 return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 33 33 - l := sa.logger.With("url", r.URL) 34 34 - 35 34 token := r.Header.Get("Authorization") 36 35 token = strings.TrimPrefix(token, "Bearer ") 37 36 ··· 42 41 43 42 did, err := s.Validate(r.Context(), token, nil) 44 43 if err != nil { 45 45 - l.Error("signature verification failed", "err", err) 44 44 + sa.logger.Error("signature verification failed", "err", err) 46 45 writeError(w, xrpcerr.AuthError(err), http.StatusForbidden) 47 46 return 48 47 } 49 48 49 49 + sa.logger.Debug("valid signature", ActorDid, did) 50 50 + 50 51 r = r.WithContext( 51 52 context.WithValue(r.Context(), ActorDid, did), 52 53 )

+35

spindle/middleware.go

··· 1 1 + package spindle 2 2 + 3 3 + import ( 4 4 + "log/slog" 5 5 + "net/http" 6 6 + "time" 7 7 + ) 8 8 + 9 9 + func (s *Spindle) RequestLogger(next http.Handler) http.Handler { 10 10 + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 11 11 + start := time.Now() 12 12 + 13 13 + next.ServeHTTP(w, r) 14 14 + 15 15 + // Build query params as slog.Attrs for the group 16 16 + queryParams := r.URL.Query() 17 17 + queryAttrs := make([]any, 0, len(queryParams)) 18 18 + for key, values := range queryParams { 19 19 + if len(values) == 1 { 20 20 + queryAttrs = append(queryAttrs, slog.String(key, values[0])) 21 21 + } else { 22 22 + queryAttrs = append(queryAttrs, slog.Any(key, values)) 23 23 + } 24 24 + } 25 25 + 26 26 + s.l.LogAttrs(r.Context(), slog.LevelInfo, "", 27 27 + slog.Group("request", 28 28 + slog.String("method", r.Method), 29 29 + slog.String("path", r.URL.Path), 30 30 + slog.Group("query", queryAttrs...), 31 31 + slog.Duration("duration", time.Since(start)), 32 32 + ), 33 33 + ) 34 34 + }) 35 35 + }

+6 -6

spindle/server.go

··· 108 108 tangled.RepoNSID, 109 109 tangled.RepoCollaboratorNSID, 110 110 } 111 111 - jc, err := jetstream.NewJetstreamClient(cfg.Server.JetstreamEndpoint, "spindle", collections, nil, logger, d, true, true) 111 111 + jc, err := jetstream.NewJetstreamClient(cfg.Server.JetstreamEndpoint, "spindle", collections, nil, log.SubLogger(logger, "jetstream"), d, true, true) 112 112 if err != nil { 113 113 return fmt.Errorf("failed to setup jetstream client: %w", err) 114 114 } ··· 171 171 // spindle.processPipeline, which in turn enqueues the pipeline 172 172 // job in the above registered queue. 173 173 ccfg := eventconsumer.NewConsumerConfig() 174 174 - ccfg.Logger = logger 174 174 + ccfg.Logger = log.SubLogger(logger, "eventconsumer") 175 175 ccfg.Dev = cfg.Server.Dev 176 176 ccfg.ProcessFunc = spindle.processPipeline 177 177 ccfg.CursorStore = cursorStore ··· 210 210 } 211 211 212 212 func (s *Spindle) XrpcRouter() http.Handler { 213 213 - logger := s.l.With("route", "xrpc") 214 214 - 215 213 serviceAuth := serviceauth.NewServiceAuth(s.l, s.res, s.cfg.Server.Did().String()) 216 214 215 215 + l := log.SubLogger(s.l, "xrpc") 216 216 + 217 217 x := xrpc.Xrpc{ 218 218 - Logger: logger, 218 218 + Logger: l, 219 219 Db: s.db, 220 220 Enforcer: s.e, 221 221 Engines: s.engs, ··· 305 305 306 306 ok := s.jq.Enqueue(queue.Job{ 307 307 Run: func() error { 308 308 - engine.StartWorkflows(s.l, s.vault, s.cfg, s.db, s.n, ctx, &models.Pipeline{ 308 308 + engine.StartWorkflows(log.SubLogger(s.l, "engine"), s.vault, s.cfg, s.db, s.n, ctx, &models.Pipeline{ 309 309 RepoOwner: tpl.TriggerMetadata.Repo.Did, 310 310 RepoName: tpl.TriggerMetadata.Repo.Repo, 311 311 Workflows: workflows,

+15 -12

appview/oauth/oauth.go

··· 3 3 import ( 4 4 "errors" 5 5 "fmt" 6 6 + "log/slog" 6 7 "net/http" 7 8 "time" 8 9 ··· 20 21 "tangled.org/core/rbac" 21 22 ) 22 23 23 23 - func New(config *config.Config, ph posthog.Client, db *db.DB, enforcer *rbac.Enforcer, res *idresolver.Resolver) (*OAuth, error) { 24 24 + type OAuth struct { 25 25 + ClientApp *oauth.ClientApp 26 26 + SessStore *sessions.CookieStore 27 27 + Config *config.Config 28 28 + JwksUri string 29 29 + Posthog posthog.Client 30 30 + Db *db.DB 31 31 + Enforcer *rbac.Enforcer 32 32 + IdResolver *idresolver.Resolver 33 33 + Logger *slog.Logger 34 34 + } 35 35 + 36 36 + func New(config *config.Config, ph posthog.Client, db *db.DB, enforcer *rbac.Enforcer, res *idresolver.Resolver, logger *slog.Logger) (*OAuth, error) { 24 37 25 38 var oauthConfig oauth.ClientConfig 26 39 var clientUri string ··· 54 67 Db: db, 55 68 Enforcer: enforcer, 56 69 IdResolver: res, 70 70 + Logger: logger, 57 71 }, nil 58 72 } 59 73 60 60 - type OAuth struct { 61 61 - ClientApp *oauth.ClientApp 62 62 - SessStore *sessions.CookieStore 63 63 - Config *config.Config 64 64 - JwksUri string 65 65 - Posthog posthog.Client 66 66 - Db *db.DB 67 67 - Enforcer *rbac.Enforcer 68 68 - IdResolver *idresolver.Resolver 69 69 - } 70 70 - 71 74 func (o *OAuth) SaveSession(w http.ResponseWriter, r *http.Request, sessData *oauth.ClientSessionData) error { 72 75 // first we save the did in the user session 73 76 userSession, err := o.SessStore.Get(r, SessionName)

+1 -1

appview/state/state.go

··· 82 82 } 83 83 84 84 pages := pages.NewPages(config, res, log.SubLogger(logger, "pages")) 85 85 - oauth, err := oauth.New(config, posthog, d, enforcer, res) 85 85 + oauth, err := oauth.New(config, posthog, d, enforcer, res, log.SubLogger(logger, "oauth")) 86 86 if err != nil { 87 87 return nil, fmt.Errorf("failed to start oauth handler: %w", err) 88 88 }

+1 -1

.tangled/workflows/test.yml

··· 1 1 when: 2 2 - event: ["push", "pull_request"] 3 3 - branch: ["master"] 3 3 + branch: master 4 4 5 5 engine: nixery 6 6