+649 -8

api/tangled/cbor_gen.go

··· 6938 6938 } 6939 6939 6940 6940 cw := cbg.NewCborWriter(w) 6941 6941 - fieldCount := 5 6941 6941 + fieldCount := 7 6942 6942 6943 6943 if t.Body == nil { 6944 6944 + fieldCount-- 6945 6945 + } 6946 6946 + 6947 6947 + if t.Mentions == nil { 6948 6948 + fieldCount-- 6949 6949 + } 6950 6950 + 6951 6951 + if t.References == nil { 6944 6952 fieldCount-- 6945 6953 } 6946 6954 ··· 7045 7053 return err 7046 7054 } 7047 7055 7056 7056 + // t.Mentions ([]string) (slice) 7057 7057 + if t.Mentions != nil { 7058 7058 + 7059 7059 + if len("mentions") > 1000000 { 7060 7060 + return xerrors.Errorf("Value in field \"mentions\" was too long") 7061 7061 + } 7062 7062 + 7063 7063 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("mentions"))); err != nil { 7064 7064 + return err 7065 7065 + } 7066 7066 + if _, err := cw.WriteString(string("mentions")); err != nil { 7067 7067 + return err 7068 7068 + } 7069 7069 + 7070 7070 + if len(t.Mentions) > 8192 { 7071 7071 + return xerrors.Errorf("Slice value in field t.Mentions was too long") 7072 7072 + } 7073 7073 + 7074 7074 + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Mentions))); err != nil { 7075 7075 + return err 7076 7076 + } 7077 7077 + for _, v := range t.Mentions { 7078 7078 + if len(v) > 1000000 { 7079 7079 + return xerrors.Errorf("Value in field v was too long") 7080 7080 + } 7081 7081 + 7082 7082 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { 7083 7083 + return err 7084 7084 + } 7085 7085 + if _, err := cw.WriteString(string(v)); err != nil { 7086 7086 + return err 7087 7087 + } 7088 7088 + 7089 7089 + } 7090 7090 + } 7091 7091 + 7048 7092 // t.CreatedAt (string) (string) 7049 7093 if len("createdAt") > 1000000 { 7050 7094 return xerrors.Errorf("Value in field \"createdAt\" was too long") ··· 7067 7111 if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { 7068 7112 return err 7069 7113 } 7114 7114 + 7115 7115 + // t.References ([]string) (slice) 7116 7116 + if t.References != nil { 7117 7117 + 7118 7118 + if len("references") > 1000000 { 7119 7119 + return xerrors.Errorf("Value in field \"references\" was too long") 7120 7120 + } 7121 7121 + 7122 7122 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("references"))); err != nil { 7123 7123 + return err 7124 7124 + } 7125 7125 + if _, err := cw.WriteString(string("references")); err != nil { 7126 7126 + return err 7127 7127 + } 7128 7128 + 7129 7129 + if len(t.References) > 8192 { 7130 7130 + return xerrors.Errorf("Slice value in field t.References was too long") 7131 7131 + } 7132 7132 + 7133 7133 + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.References))); err != nil { 7134 7134 + return err 7135 7135 + } 7136 7136 + for _, v := range t.References { 7137 7137 + if len(v) > 1000000 { 7138 7138 + return xerrors.Errorf("Value in field v was too long") 7139 7139 + } 7140 7140 + 7141 7141 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { 7142 7142 + return err 7143 7143 + } 7144 7144 + if _, err := cw.WriteString(string(v)); err != nil { 7145 7145 + return err 7146 7146 + } 7147 7147 + 7148 7148 + } 7149 7149 + } 7070 7150 return nil 7071 7151 } 7072 7152 ··· 7095 7175 7096 7176 n := extra 7097 7177 7098 7098 - nameBuf := make([]byte, 9) 7178 7178 + nameBuf := make([]byte, 10) 7099 7179 for i := uint64(0); i < n; i++ { 7100 7180 nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) 7101 7181 if err != nil { ··· 7164 7244 } 7165 7245 7166 7246 t.Title = string(sval) 7247 7247 + } 7248 7248 + // t.Mentions ([]string) (slice) 7249 7249 + case "mentions": 7250 7250 + 7251 7251 + maj, extra, err = cr.ReadHeader() 7252 7252 + if err != nil { 7253 7253 + return err 7254 7254 + } 7255 7255 + 7256 7256 + if extra > 8192 { 7257 7257 + return fmt.Errorf("t.Mentions: array too large (%d)", extra) 7258 7258 + } 7259 7259 + 7260 7260 + if maj != cbg.MajArray { 7261 7261 + return fmt.Errorf("expected cbor array") 7262 7262 + } 7263 7263 + 7264 7264 + if extra > 0 { 7265 7265 + t.Mentions = make([]string, extra) 7266 7266 + } 7267 7267 + 7268 7268 + for i := 0; i < int(extra); i++ { 7269 7269 + { 7270 7270 + var maj byte 7271 7271 + var extra uint64 7272 7272 + var err error 7273 7273 + _ = maj 7274 7274 + _ = extra 7275 7275 + _ = err 7276 7276 + 7277 7277 + { 7278 7278 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 7279 7279 + if err != nil { 7280 7280 + return err 7281 7281 + } 7282 7282 + 7283 7283 + t.Mentions[i] = string(sval) 7284 7284 + } 7285 7285 + 7286 7286 + } 7167 7287 } 7168 7288 // t.CreatedAt (string) (string) 7169 7289 case "createdAt": ··· 7176 7296 7177 7297 t.CreatedAt = string(sval) 7178 7298 } 7299 7299 + // t.References ([]string) (slice) 7300 7300 + case "references": 7301 7301 + 7302 7302 + maj, extra, err = cr.ReadHeader() 7303 7303 + if err != nil { 7304 7304 + return err 7305 7305 + } 7306 7306 + 7307 7307 + if extra > 8192 { 7308 7308 + return fmt.Errorf("t.References: array too large (%d)", extra) 7309 7309 + } 7310 7310 + 7311 7311 + if maj != cbg.MajArray { 7312 7312 + return fmt.Errorf("expected cbor array") 7313 7313 + } 7314 7314 + 7315 7315 + if extra > 0 { 7316 7316 + t.References = make([]string, extra) 7317 7317 + } 7318 7318 + 7319 7319 + for i := 0; i < int(extra); i++ { 7320 7320 + { 7321 7321 + var maj byte 7322 7322 + var extra uint64 7323 7323 + var err error 7324 7324 + _ = maj 7325 7325 + _ = extra 7326 7326 + _ = err 7327 7327 + 7328 7328 + { 7329 7329 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 7330 7330 + if err != nil { 7331 7331 + return err 7332 7332 + } 7333 7333 + 7334 7334 + t.References[i] = string(sval) 7335 7335 + } 7336 7336 + 7337 7337 + } 7338 7338 + } 7179 7339 7180 7340 default: 7181 7341 // Field doesn't exist on this type, so ignore it ··· 7194 7354 } 7195 7355 7196 7356 cw := cbg.NewCborWriter(w) 7197 7197 - fieldCount := 5 7357 7357 + fieldCount := 7 7358 7358 + 7359 7359 + if t.Mentions == nil { 7360 7360 + fieldCount-- 7361 7361 + } 7362 7362 + 7363 7363 + if t.References == nil { 7364 7364 + fieldCount-- 7365 7365 + } 7198 7366 7199 7367 if t.ReplyTo == nil { 7200 7368 fieldCount-- ··· 7301 7469 } 7302 7470 } 7303 7471 7472 7472 + // t.Mentions ([]string) (slice) 7473 7473 + if t.Mentions != nil { 7474 7474 + 7475 7475 + if len("mentions") > 1000000 { 7476 7476 + return xerrors.Errorf("Value in field \"mentions\" was too long") 7477 7477 + } 7478 7478 + 7479 7479 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("mentions"))); err != nil { 7480 7480 + return err 7481 7481 + } 7482 7482 + if _, err := cw.WriteString(string("mentions")); err != nil { 7483 7483 + return err 7484 7484 + } 7485 7485 + 7486 7486 + if len(t.Mentions) > 8192 { 7487 7487 + return xerrors.Errorf("Slice value in field t.Mentions was too long") 7488 7488 + } 7489 7489 + 7490 7490 + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Mentions))); err != nil { 7491 7491 + return err 7492 7492 + } 7493 7493 + for _, v := range t.Mentions { 7494 7494 + if len(v) > 1000000 { 7495 7495 + return xerrors.Errorf("Value in field v was too long") 7496 7496 + } 7497 7497 + 7498 7498 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { 7499 7499 + return err 7500 7500 + } 7501 7501 + if _, err := cw.WriteString(string(v)); err != nil { 7502 7502 + return err 7503 7503 + } 7504 7504 + 7505 7505 + } 7506 7506 + } 7507 7507 + 7304 7508 // t.CreatedAt (string) (string) 7305 7509 if len("createdAt") > 1000000 { 7306 7510 return xerrors.Errorf("Value in field \"createdAt\" was too long") ··· 7323 7527 if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { 7324 7528 return err 7325 7529 } 7530 7530 + 7531 7531 + // t.References ([]string) (slice) 7532 7532 + if t.References != nil { 7533 7533 + 7534 7534 + if len("references") > 1000000 { 7535 7535 + return xerrors.Errorf("Value in field \"references\" was too long") 7536 7536 + } 7537 7537 + 7538 7538 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("references"))); err != nil { 7539 7539 + return err 7540 7540 + } 7541 7541 + if _, err := cw.WriteString(string("references")); err != nil { 7542 7542 + return err 7543 7543 + } 7544 7544 + 7545 7545 + if len(t.References) > 8192 { 7546 7546 + return xerrors.Errorf("Slice value in field t.References was too long") 7547 7547 + } 7548 7548 + 7549 7549 + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.References))); err != nil { 7550 7550 + return err 7551 7551 + } 7552 7552 + for _, v := range t.References { 7553 7553 + if len(v) > 1000000 { 7554 7554 + return xerrors.Errorf("Value in field v was too long") 7555 7555 + } 7556 7556 + 7557 7557 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { 7558 7558 + return err 7559 7559 + } 7560 7560 + if _, err := cw.WriteString(string(v)); err != nil { 7561 7561 + return err 7562 7562 + } 7563 7563 + 7564 7564 + } 7565 7565 + } 7326 7566 return nil 7327 7567 } 7328 7568 ··· 7351 7591 7352 7592 n := extra 7353 7593 7354 7354 - nameBuf := make([]byte, 9) 7594 7594 + nameBuf := make([]byte, 10) 7355 7595 for i := uint64(0); i < n; i++ { 7356 7596 nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) 7357 7597 if err != nil { ··· 7419 7659 } 7420 7660 7421 7661 t.ReplyTo = (*string)(&sval) 7662 7662 + } 7663 7663 + } 7664 7664 + // t.Mentions ([]string) (slice) 7665 7665 + case "mentions": 7666 7666 + 7667 7667 + maj, extra, err = cr.ReadHeader() 7668 7668 + if err != nil { 7669 7669 + return err 7670 7670 + } 7671 7671 + 7672 7672 + if extra > 8192 { 7673 7673 + return fmt.Errorf("t.Mentions: array too large (%d)", extra) 7674 7674 + } 7675 7675 + 7676 7676 + if maj != cbg.MajArray { 7677 7677 + return fmt.Errorf("expected cbor array") 7678 7678 + } 7679 7679 + 7680 7680 + if extra > 0 { 7681 7681 + t.Mentions = make([]string, extra) 7682 7682 + } 7683 7683 + 7684 7684 + for i := 0; i < int(extra); i++ { 7685 7685 + { 7686 7686 + var maj byte 7687 7687 + var extra uint64 7688 7688 + var err error 7689 7689 + _ = maj 7690 7690 + _ = extra 7691 7691 + _ = err 7692 7692 + 7693 7693 + { 7694 7694 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 7695 7695 + if err != nil { 7696 7696 + return err 7697 7697 + } 7698 7698 + 7699 7699 + t.Mentions[i] = string(sval) 7700 7700 + } 7701 7701 + 7422 7702 } 7423 7703 } 7424 7704 // t.CreatedAt (string) (string) ··· 7431 7711 } 7432 7712 7433 7713 t.CreatedAt = string(sval) 7714 7714 + } 7715 7715 + // t.References ([]string) (slice) 7716 7716 + case "references": 7717 7717 + 7718 7718 + maj, extra, err = cr.ReadHeader() 7719 7719 + if err != nil { 7720 7720 + return err 7721 7721 + } 7722 7722 + 7723 7723 + if extra > 8192 { 7724 7724 + return fmt.Errorf("t.References: array too large (%d)", extra) 7725 7725 + } 7726 7726 + 7727 7727 + if maj != cbg.MajArray { 7728 7728 + return fmt.Errorf("expected cbor array") 7729 7729 + } 7730 7730 + 7731 7731 + if extra > 0 { 7732 7732 + t.References = make([]string, extra) 7733 7733 + } 7734 7734 + 7735 7735 + for i := 0; i < int(extra); i++ { 7736 7736 + { 7737 7737 + var maj byte 7738 7738 + var extra uint64 7739 7739 + var err error 7740 7740 + _ = maj 7741 7741 + _ = extra 7742 7742 + _ = err 7743 7743 + 7744 7744 + { 7745 7745 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 7746 7746 + if err != nil { 7747 7747 + return err 7748 7748 + } 7749 7749 + 7750 7750 + t.References[i] = string(sval) 7751 7751 + } 7752 7752 + 7753 7753 + } 7434 7754 } 7435 7755 7436 7756 default: ··· 7614 7934 } 7615 7935 7616 7936 cw := cbg.NewCborWriter(w) 7617 7617 - fieldCount := 7 7937 7937 + fieldCount := 9 7618 7938 7619 7939 if t.Body == nil { 7940 7940 + fieldCount-- 7941 7941 + } 7942 7942 + 7943 7943 + if t.Mentions == nil { 7944 7944 + fieldCount-- 7945 7945 + } 7946 7946 + 7947 7947 + if t.References == nil { 7620 7948 fieldCount-- 7621 7949 } 7622 7950 ··· 7760 8088 return err 7761 8089 } 7762 8090 8091 8091 + // t.Mentions ([]string) (slice) 8092 8092 + if t.Mentions != nil { 8093 8093 + 8094 8094 + if len("mentions") > 1000000 { 8095 8095 + return xerrors.Errorf("Value in field \"mentions\" was too long") 8096 8096 + } 8097 8097 + 8098 8098 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("mentions"))); err != nil { 8099 8099 + return err 8100 8100 + } 8101 8101 + if _, err := cw.WriteString(string("mentions")); err != nil { 8102 8102 + return err 8103 8103 + } 8104 8104 + 8105 8105 + if len(t.Mentions) > 8192 { 8106 8106 + return xerrors.Errorf("Slice value in field t.Mentions was too long") 8107 8107 + } 8108 8108 + 8109 8109 + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Mentions))); err != nil { 8110 8110 + return err 8111 8111 + } 8112 8112 + for _, v := range t.Mentions { 8113 8113 + if len(v) > 1000000 { 8114 8114 + return xerrors.Errorf("Value in field v was too long") 8115 8115 + } 8116 8116 + 8117 8117 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { 8118 8118 + return err 8119 8119 + } 8120 8120 + if _, err := cw.WriteString(string(v)); err != nil { 8121 8121 + return err 8122 8122 + } 8123 8123 + 8124 8124 + } 8125 8125 + } 8126 8126 + 7763 8127 // t.CreatedAt (string) (string) 7764 8128 if len("createdAt") > 1000000 { 7765 8129 return xerrors.Errorf("Value in field \"createdAt\" was too long") ··· 7782 8146 if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { 7783 8147 return err 7784 8148 } 8149 8149 + 8150 8150 + // t.References ([]string) (slice) 8151 8151 + if t.References != nil { 8152 8152 + 8153 8153 + if len("references") > 1000000 { 8154 8154 + return xerrors.Errorf("Value in field \"references\" was too long") 8155 8155 + } 8156 8156 + 8157 8157 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("references"))); err != nil { 8158 8158 + return err 8159 8159 + } 8160 8160 + if _, err := cw.WriteString(string("references")); err != nil { 8161 8161 + return err 8162 8162 + } 8163 8163 + 8164 8164 + if len(t.References) > 8192 { 8165 8165 + return xerrors.Errorf("Slice value in field t.References was too long") 8166 8166 + } 8167 8167 + 8168 8168 + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.References))); err != nil { 8169 8169 + return err 8170 8170 + } 8171 8171 + for _, v := range t.References { 8172 8172 + if len(v) > 1000000 { 8173 8173 + return xerrors.Errorf("Value in field v was too long") 8174 8174 + } 8175 8175 + 8176 8176 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { 8177 8177 + return err 8178 8178 + } 8179 8179 + if _, err := cw.WriteString(string(v)); err != nil { 8180 8180 + return err 8181 8181 + } 8182 8182 + 8183 8183 + } 8184 8184 + } 7785 8185 return nil 7786 8186 } 7787 8187 ··· 7810 8210 7811 8211 n := extra 7812 8212 7813 7813 - nameBuf := make([]byte, 9) 8213 8213 + nameBuf := make([]byte, 10) 7814 8214 for i := uint64(0); i < n; i++ { 7815 8215 nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) 7816 8216 if err != nil { ··· 7919 8319 } 7920 8320 } 7921 8321 8322 8322 + } 8323 8323 + // t.Mentions ([]string) (slice) 8324 8324 + case "mentions": 8325 8325 + 8326 8326 + maj, extra, err = cr.ReadHeader() 8327 8327 + if err != nil { 8328 8328 + return err 8329 8329 + } 8330 8330 + 8331 8331 + if extra > 8192 { 8332 8332 + return fmt.Errorf("t.Mentions: array too large (%d)", extra) 8333 8333 + } 8334 8334 + 8335 8335 + if maj != cbg.MajArray { 8336 8336 + return fmt.Errorf("expected cbor array") 8337 8337 + } 8338 8338 + 8339 8339 + if extra > 0 { 8340 8340 + t.Mentions = make([]string, extra) 8341 8341 + } 8342 8342 + 8343 8343 + for i := 0; i < int(extra); i++ { 8344 8344 + { 8345 8345 + var maj byte 8346 8346 + var extra uint64 8347 8347 + var err error 8348 8348 + _ = maj 8349 8349 + _ = extra 8350 8350 + _ = err 8351 8351 + 8352 8352 + { 8353 8353 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 8354 8354 + if err != nil { 8355 8355 + return err 8356 8356 + } 8357 8357 + 8358 8358 + t.Mentions[i] = string(sval) 8359 8359 + } 8360 8360 + 8361 8361 + } 7922 8362 } 7923 8363 // t.CreatedAt (string) (string) 7924 8364 case "createdAt": ··· 7931 8371 7932 8372 t.CreatedAt = string(sval) 7933 8373 } 8374 8374 + // t.References ([]string) (slice) 8375 8375 + case "references": 8376 8376 + 8377 8377 + maj, extra, err = cr.ReadHeader() 8378 8378 + if err != nil { 8379 8379 + return err 8380 8380 + } 8381 8381 + 8382 8382 + if extra > 8192 { 8383 8383 + return fmt.Errorf("t.References: array too large (%d)", extra) 8384 8384 + } 8385 8385 + 8386 8386 + if maj != cbg.MajArray { 8387 8387 + return fmt.Errorf("expected cbor array") 8388 8388 + } 8389 8389 + 8390 8390 + if extra > 0 { 8391 8391 + t.References = make([]string, extra) 8392 8392 + } 8393 8393 + 8394 8394 + for i := 0; i < int(extra); i++ { 8395 8395 + { 8396 8396 + var maj byte 8397 8397 + var extra uint64 8398 8398 + var err error 8399 8399 + _ = maj 8400 8400 + _ = extra 8401 8401 + _ = err 8402 8402 + 8403 8403 + { 8404 8404 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 8405 8405 + if err != nil { 8406 8406 + return err 8407 8407 + } 8408 8408 + 8409 8409 + t.References[i] = string(sval) 8410 8410 + } 8411 8411 + 8412 8412 + } 8413 8413 + } 7934 8414 7935 8415 default: 7936 8416 // Field doesn't exist on this type, so ignore it ··· 7949 8429 } 7950 8430 7951 8431 cw := cbg.NewCborWriter(w) 8432 8432 + fieldCount := 6 7952 8433 7953 7953 - if _, err := cw.Write([]byte{164}); err != nil { 8434 8434 + if t.Mentions == nil { 8435 8435 + fieldCount-- 8436 8436 + } 8437 8437 + 8438 8438 + if t.References == nil { 8439 8439 + fieldCount-- 8440 8440 + } 8441 8441 + 8442 8442 + if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil { 7954 8443 return err 7955 8444 } 7956 8445 ··· 8019 8508 return err 8020 8509 } 8021 8510 8511 8511 + // t.Mentions ([]string) (slice) 8512 8512 + if t.Mentions != nil { 8513 8513 + 8514 8514 + if len("mentions") > 1000000 { 8515 8515 + return xerrors.Errorf("Value in field \"mentions\" was too long") 8516 8516 + } 8517 8517 + 8518 8518 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("mentions"))); err != nil { 8519 8519 + return err 8520 8520 + } 8521 8521 + if _, err := cw.WriteString(string("mentions")); err != nil { 8522 8522 + return err 8523 8523 + } 8524 8524 + 8525 8525 + if len(t.Mentions) > 8192 { 8526 8526 + return xerrors.Errorf("Slice value in field t.Mentions was too long") 8527 8527 + } 8528 8528 + 8529 8529 + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.Mentions))); err != nil { 8530 8530 + return err 8531 8531 + } 8532 8532 + for _, v := range t.Mentions { 8533 8533 + if len(v) > 1000000 { 8534 8534 + return xerrors.Errorf("Value in field v was too long") 8535 8535 + } 8536 8536 + 8537 8537 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { 8538 8538 + return err 8539 8539 + } 8540 8540 + if _, err := cw.WriteString(string(v)); err != nil { 8541 8541 + return err 8542 8542 + } 8543 8543 + 8544 8544 + } 8545 8545 + } 8546 8546 + 8022 8547 // t.CreatedAt (string) (string) 8023 8548 if len("createdAt") > 1000000 { 8024 8549 return xerrors.Errorf("Value in field \"createdAt\" was too long") ··· 8040 8565 } 8041 8566 if _, err := cw.WriteString(string(t.CreatedAt)); err != nil { 8042 8567 return err 8568 8568 + } 8569 8569 + 8570 8570 + // t.References ([]string) (slice) 8571 8571 + if t.References != nil { 8572 8572 + 8573 8573 + if len("references") > 1000000 { 8574 8574 + return xerrors.Errorf("Value in field \"references\" was too long") 8575 8575 + } 8576 8576 + 8577 8577 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("references"))); err != nil { 8578 8578 + return err 8579 8579 + } 8580 8580 + if _, err := cw.WriteString(string("references")); err != nil { 8581 8581 + return err 8582 8582 + } 8583 8583 + 8584 8584 + if len(t.References) > 8192 { 8585 8585 + return xerrors.Errorf("Slice value in field t.References was too long") 8586 8586 + } 8587 8587 + 8588 8588 + if err := cw.WriteMajorTypeHeader(cbg.MajArray, uint64(len(t.References))); err != nil { 8589 8589 + return err 8590 8590 + } 8591 8591 + for _, v := range t.References { 8592 8592 + if len(v) > 1000000 { 8593 8593 + return xerrors.Errorf("Value in field v was too long") 8594 8594 + } 8595 8595 + 8596 8596 + if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(v))); err != nil { 8597 8597 + return err 8598 8598 + } 8599 8599 + if _, err := cw.WriteString(string(v)); err != nil { 8600 8600 + return err 8601 8601 + } 8602 8602 + 8603 8603 + } 8043 8604 } 8044 8605 return nil 8045 8606 } ··· 8069 8630 8070 8631 n := extra 8071 8632 8072 8072 - nameBuf := make([]byte, 9) 8633 8633 + nameBuf := make([]byte, 10) 8073 8634 for i := uint64(0); i < n; i++ { 8074 8635 nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000) 8075 8636 if err != nil { ··· 8118 8679 8119 8680 t.LexiconTypeID = string(sval) 8120 8681 } 8682 8682 + // t.Mentions ([]string) (slice) 8683 8683 + case "mentions": 8684 8684 + 8685 8685 + maj, extra, err = cr.ReadHeader() 8686 8686 + if err != nil { 8687 8687 + return err 8688 8688 + } 8689 8689 + 8690 8690 + if extra > 8192 { 8691 8691 + return fmt.Errorf("t.Mentions: array too large (%d)", extra) 8692 8692 + } 8693 8693 + 8694 8694 + if maj != cbg.MajArray { 8695 8695 + return fmt.Errorf("expected cbor array") 8696 8696 + } 8697 8697 + 8698 8698 + if extra > 0 { 8699 8699 + t.Mentions = make([]string, extra) 8700 8700 + } 8701 8701 + 8702 8702 + for i := 0; i < int(extra); i++ { 8703 8703 + { 8704 8704 + var maj byte 8705 8705 + var extra uint64 8706 8706 + var err error 8707 8707 + _ = maj 8708 8708 + _ = extra 8709 8709 + _ = err 8710 8710 + 8711 8711 + { 8712 8712 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 8713 8713 + if err != nil { 8714 8714 + return err 8715 8715 + } 8716 8716 + 8717 8717 + t.Mentions[i] = string(sval) 8718 8718 + } 8719 8719 + 8720 8720 + } 8721 8721 + } 8121 8722 // t.CreatedAt (string) (string) 8122 8723 case "createdAt": 8123 8724 ··· 8128 8729 } 8129 8730 8130 8731 t.CreatedAt = string(sval) 8732 8732 + } 8733 8733 + // t.References ([]string) (slice) 8734 8734 + case "references": 8735 8735 + 8736 8736 + maj, extra, err = cr.ReadHeader() 8737 8737 + if err != nil { 8738 8738 + return err 8739 8739 + } 8740 8740 + 8741 8741 + if extra > 8192 { 8742 8742 + return fmt.Errorf("t.References: array too large (%d)", extra) 8743 8743 + } 8744 8744 + 8745 8745 + if maj != cbg.MajArray { 8746 8746 + return fmt.Errorf("expected cbor array") 8747 8747 + } 8748 8748 + 8749 8749 + if extra > 0 { 8750 8750 + t.References = make([]string, extra) 8751 8751 + } 8752 8752 + 8753 8753 + for i := 0; i < int(extra); i++ { 8754 8754 + { 8755 8755 + var maj byte 8756 8756 + var extra uint64 8757 8757 + var err error 8758 8758 + _ = maj 8759 8759 + _ = extra 8760 8760 + _ = err 8761 8761 + 8762 8762 + { 8763 8763 + sval, err := cbg.ReadStringWithMax(cr, 1000000) 8764 8764 + if err != nil { 8765 8765 + return err 8766 8766 + } 8767 8767 + 8768 8768 + t.References[i] = string(sval) 8769 8769 + } 8770 8770 + 8771 8771 + } 8131 8772 } 8132 8773 8133 8774 default:

+7 -5

api/tangled/issuecomment.go

··· 17 17 } // 18 18 // RECORDTYPE: RepoIssueComment 19 19 type RepoIssueComment struct { 20 20 - LexiconTypeID string `json:"$type,const=sh.tangled.repo.issue.comment" cborgen:"$type,const=sh.tangled.repo.issue.comment"` 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 - ReplyTo *string `json:"replyTo,omitempty" cborgen:"replyTo,omitempty"` 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.repo.issue.comment" cborgen:"$type,const=sh.tangled.repo.issue.comment"` 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 + Mentions []string `json:"mentions,omitempty" cborgen:"mentions,omitempty"` 25 25 + References []string `json:"references,omitempty" cborgen:"references,omitempty"` 26 26 + ReplyTo *string `json:"replyTo,omitempty" cborgen:"replyTo,omitempty"` 25 27 }

+34

api/tangled/pipelinecancelPipeline.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.pipeline.cancelPipeline 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 + PipelineCancelPipelineNSID = "sh.tangled.pipeline.cancelPipeline" 15 15 + ) 16 16 + 17 17 + // PipelineCancelPipeline_Input is the input argument to a sh.tangled.pipeline.cancelPipeline call. 18 18 + type PipelineCancelPipeline_Input struct { 19 19 + // pipeline: pipeline at-uri 20 20 + Pipeline string `json:"pipeline" cborgen:"pipeline"` 21 21 + // repo: repo at-uri, spindle can't resolve repo from pipeline at-uri yet 22 22 + Repo string `json:"repo" cborgen:"repo"` 23 23 + // workflow: workflow name 24 24 + Workflow string `json:"workflow" cborgen:"workflow"` 25 25 + } 26 26 + 27 27 + // PipelineCancelPipeline calls the XRPC method "sh.tangled.pipeline.cancelPipeline". 28 28 + func PipelineCancelPipeline(ctx context.Context, c util.LexClient, input *PipelineCancelPipeline_Input) error { 29 29 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.pipeline.cancelPipeline", nil, input, nil); err != nil { 30 30 + return err 31 31 + } 32 32 + 33 33 + return nil 34 34 + }

+6 -4

api/tangled/pullcomment.go

··· 17 17 } // 18 18 // RECORDTYPE: RepoPullComment 19 19 type RepoPullComment struct { 20 20 - LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull.comment" cborgen:"$type,const=sh.tangled.repo.pull.comment"` 21 21 - Body string `json:"body" cborgen:"body"` 22 22 - CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 - Pull string `json:"pull" cborgen:"pull"` 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull.comment" cborgen:"$type,const=sh.tangled.repo.pull.comment"` 21 21 + Body string `json:"body" cborgen:"body"` 22 22 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 + Mentions []string `json:"mentions,omitempty" cborgen:"mentions,omitempty"` 24 24 + Pull string `json:"pull" cborgen:"pull"` 25 25 + References []string `json:"references,omitempty" cborgen:"references,omitempty"` 24 26 }

+7 -5

api/tangled/repoissue.go

··· 17 17 } // 18 18 // RECORDTYPE: RepoIssue 19 19 type RepoIssue struct { 20 20 - LexiconTypeID string `json:"$type,const=sh.tangled.repo.issue" cborgen:"$type,const=sh.tangled.repo.issue"` 21 21 - Body *string `json:"body,omitempty" cborgen:"body,omitempty"` 22 22 - CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 - Repo string `json:"repo" cborgen:"repo"` 24 24 - Title string `json:"title" cborgen:"title"` 20 20 + LexiconTypeID string `json:"$type,const=sh.tangled.repo.issue" cborgen:"$type,const=sh.tangled.repo.issue"` 21 21 + Body *string `json:"body,omitempty" cborgen:"body,omitempty"` 22 22 + CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 + Mentions []string `json:"mentions,omitempty" cborgen:"mentions,omitempty"` 24 24 + References []string `json:"references,omitempty" cborgen:"references,omitempty"` 25 25 + Repo string `json:"repo" cborgen:"repo"` 26 26 + Title string `json:"title" cborgen:"title"` 25 27 }

+2

api/tangled/repopull.go

··· 20 20 LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull" cborgen:"$type,const=sh.tangled.repo.pull"` 21 21 Body *string `json:"body,omitempty" cborgen:"body,omitempty"` 22 22 CreatedAt string `json:"createdAt" cborgen:"createdAt"` 23 23 + Mentions []string `json:"mentions,omitempty" cborgen:"mentions,omitempty"` 23 24 Patch string `json:"patch" cborgen:"patch"` 25 25 + References []string `json:"references,omitempty" cborgen:"references,omitempty"` 24 26 Source *RepoPull_Source `json:"source,omitempty" cborgen:"source,omitempty"` 25 27 Target *RepoPull_Target `json:"target" cborgen:"target"` 26 28 Title string `json:"title" cborgen:"title"`

+6 -45

appview/commitverify/verify.go

··· 3 3 import ( 4 4 "log" 5 5 6 6 - "github.com/go-git/go-git/v5/plumbing/object" 7 6 "tangled.org/core/appview/db" 8 7 "tangled.org/core/appview/models" 9 8 "tangled.org/core/crypto" ··· 35 34 return "" 36 35 } 37 36 38 38 - func GetVerifiedObjectCommits(e db.Execer, emailToDid map[string]string, commits []*object.Commit) (VerifiedCommits, error) { 39 39 - ndCommits := []types.NiceDiff{} 40 40 - for _, commit := range commits { 41 41 - ndCommits = append(ndCommits, ObjectCommitToNiceDiff(commit)) 42 42 - } 43 43 - return GetVerifiedCommits(e, emailToDid, ndCommits) 44 44 - } 45 45 - 46 46 - func GetVerifiedCommits(e db.Execer, emailToDid map[string]string, ndCommits []types.NiceDiff) (VerifiedCommits, error) { 37 37 + func GetVerifiedCommits(e db.Execer, emailToDid map[string]string, ndCommits []types.Commit) (VerifiedCommits, error) { 47 38 vcs := VerifiedCommits{} 48 39 49 40 didPubkeyCache := make(map[string][]models.PublicKey) 50 41 51 42 for _, commit := range ndCommits { 52 52 - c := commit.Commit 53 53 - 54 54 - committerEmail := c.Committer.Email 43 43 + committerEmail := commit.Committer.Email 55 44 if did, exists := emailToDid[committerEmail]; exists { 56 45 // check if we've already fetched public keys for this did 57 46 pubKeys, ok := didPubkeyCache[did] ··· 67 56 } 68 57 69 58 // try to verify with any associated pubkeys 59 59 + payload := commit.Payload() 60 60 + signature := commit.PGPSignature 70 61 for _, pk := range pubKeys { 71 71 - if _, ok := crypto.VerifyCommitSignature(pk.Key, commit); ok { 62 62 + if _, ok := crypto.VerifySignature([]byte(pk.Key), []byte(signature), []byte(payload)); ok { 72 63 73 64 fp, err := crypto.SSHFingerprint(pk.Key) 74 65 if err != nil { 75 66 log.Println("error computing ssh fingerprint:", err) 76 67 } 77 68 78 78 - vc := verifiedCommit{fingerprint: fp, hash: c.This} 69 69 + vc := verifiedCommit{fingerprint: fp, hash: commit.This} 79 70 vcs[vc] = struct{}{} 80 71 break 81 72 } ··· 86 77 87 78 return vcs, nil 88 79 } 89 89 - 90 90 - // ObjectCommitToNiceDiff is a compatibility function to convert a 91 91 - // commit object into a NiceDiff structure. 92 92 - func ObjectCommitToNiceDiff(c *object.Commit) types.NiceDiff { 93 93 - var niceDiff types.NiceDiff 94 94 - 95 95 - // set commit information 96 96 - niceDiff.Commit.Message = c.Message 97 97 - niceDiff.Commit.Author = c.Author 98 98 - niceDiff.Commit.This = c.Hash.String() 99 99 - niceDiff.Commit.Committer = c.Committer 100 100 - niceDiff.Commit.Tree = c.TreeHash.String() 101 101 - niceDiff.Commit.PGPSignature = c.PGPSignature 102 102 - 103 103 - changeId, ok := c.ExtraHeaders["change-id"] 104 104 - if ok { 105 105 - niceDiff.Commit.ChangedId = string(changeId) 106 106 - } 107 107 - 108 108 - // set parent hash if available 109 109 - if len(c.ParentHashes) > 0 { 110 110 - niceDiff.Commit.Parent = c.ParentHashes[0].String() 111 111 - } 112 112 - 113 113 - // XXX: Stats and Diff fields are typically populated 114 114 - // after fetching the actual diff information, which isn't 115 115 - // directly available in the commit object itself. 116 116 - 117 117 - return niceDiff 118 118 - }

+3 -2

appview/db/artifact.go

··· 8 8 "github.com/go-git/go-git/v5/plumbing" 9 9 "github.com/ipfs/go-cid" 10 10 "tangled.org/core/appview/models" 11 11 + "tangled.org/core/orm" 11 12 ) 12 13 13 14 func AddArtifact(e Execer, artifact models.Artifact) error { ··· 37 38 return err 38 39 } 39 40 40 40 - func GetArtifact(e Execer, filters ...filter) ([]models.Artifact, error) { 41 41 + func GetArtifact(e Execer, filters ...orm.Filter) ([]models.Artifact, error) { 41 42 var artifacts []models.Artifact 42 43 43 44 var conditions []string ··· 109 110 return artifacts, nil 110 111 } 111 112 112 112 - func DeleteArtifact(e Execer, filters ...filter) error { 113 113 + func DeleteArtifact(e Execer, filters ...orm.Filter) error { 113 114 var conditions []string 114 115 var args []any 115 116 for _, filter := range filters {

+4 -3

appview/db/collaborators.go

··· 6 6 "time" 7 7 8 8 "tangled.org/core/appview/models" 9 9 + "tangled.org/core/orm" 9 10 ) 10 11 11 12 func AddCollaborator(e Execer, c models.Collaborator) error { ··· 16 17 return err 17 18 } 18 19 19 19 - func DeleteCollaborator(e Execer, filters ...filter) error { 20 20 + func DeleteCollaborator(e Execer, filters ...orm.Filter) error { 20 21 var conditions []string 21 22 var args []any 22 23 for _, filter := range filters { ··· 58 59 return nil, nil 59 60 } 60 61 61 61 - return GetRepos(e, 0, FilterIn("at_uri", repoAts)) 62 62 + return GetRepos(e, 0, orm.FilterIn("at_uri", repoAts)) 62 63 } 63 64 64 64 - func GetCollaborators(e Execer, filters ...filter) ([]models.Collaborator, error) { 65 65 + func GetCollaborators(e Execer, filters ...orm.Filter) ([]models.Collaborator, error) { 65 66 var collaborators []models.Collaborator 66 67 var conditions []string 67 68 var args []any

+33 -137

appview/db/db.go

··· 3 3 import ( 4 4 "context" 5 5 "database/sql" 6 6 - "fmt" 7 6 "log/slog" 8 8 - "reflect" 9 7 "strings" 10 8 11 9 _ "github.com/mattn/go-sqlite3" 12 10 "tangled.org/core/log" 11 11 + "tangled.org/core/orm" 13 12 ) 14 13 15 14 type DB struct { ··· 561 560 email_notifications integer not null default 0 562 561 ); 563 562 563 563 + create table if not exists reference_links ( 564 564 + id integer primary key autoincrement, 565 565 + from_at text not null, 566 566 + to_at text not null, 567 567 + unique (from_at, to_at) 568 568 + ); 569 569 + 564 570 create table if not exists migrations ( 565 571 id integer primary key autoincrement, 566 572 name text unique ··· 569 575 -- indexes for better performance 570 576 create index if not exists idx_notifications_recipient_created on notifications(recipient_did, created desc); 571 577 create index if not exists idx_notifications_recipient_read on notifications(recipient_did, read); 578 578 + create index if not exists idx_references_from_at on reference_links(from_at); 579 579 + create index if not exists idx_references_to_at on reference_links(to_at); 572 580 `) 573 581 if err != nil { 574 582 return nil, err 575 583 } 576 584 577 585 // run migrations 578 578 - runMigration(conn, logger, "add-description-to-repos", func(tx *sql.Tx) error { 586 586 + orm.RunMigration(conn, logger, "add-description-to-repos", func(tx *sql.Tx) error { 579 587 tx.Exec(` 580 588 alter table repos add column description text check (length(description) <= 200); 581 589 `) 582 590 return nil 583 591 }) 584 592 585 585 - runMigration(conn, logger, "add-rkey-to-pubkeys", func(tx *sql.Tx) error { 593 593 + orm.RunMigration(conn, logger, "add-rkey-to-pubkeys", func(tx *sql.Tx) error { 586 594 // add unconstrained column 587 595 _, err := tx.Exec(` 588 596 alter table public_keys ··· 605 613 return nil 606 614 }) 607 615 608 608 - runMigration(conn, logger, "add-rkey-to-comments", func(tx *sql.Tx) error { 616 616 + orm.RunMigration(conn, logger, "add-rkey-to-comments", func(tx *sql.Tx) error { 609 617 _, err := tx.Exec(` 610 618 alter table comments drop column comment_at; 611 619 alter table comments add column rkey text; ··· 613 621 return err 614 622 }) 615 623 616 616 - runMigration(conn, logger, "add-deleted-and-edited-to-issue-comments", func(tx *sql.Tx) error { 624 624 + orm.RunMigration(conn, logger, "add-deleted-and-edited-to-issue-comments", func(tx *sql.Tx) error { 617 625 _, err := tx.Exec(` 618 626 alter table comments add column deleted text; -- timestamp 619 627 alter table comments add column edited text; -- timestamp ··· 621 629 return err 622 630 }) 623 631 624 624 - runMigration(conn, logger, "add-source-info-to-pulls-and-submissions", func(tx *sql.Tx) error { 632 632 + orm.RunMigration(conn, logger, "add-source-info-to-pulls-and-submissions", func(tx *sql.Tx) error { 625 633 _, err := tx.Exec(` 626 634 alter table pulls add column source_branch text; 627 635 alter table pulls add column source_repo_at text; ··· 630 638 return err 631 639 }) 632 640 633 633 - runMigration(conn, logger, "add-source-to-repos", func(tx *sql.Tx) error { 641 641 + orm.RunMigration(conn, logger, "add-source-to-repos", func(tx *sql.Tx) error { 634 642 _, err := tx.Exec(` 635 643 alter table repos add column source text; 636 644 `) ··· 642 650 // 643 651 // [0]: https://sqlite.org/pragma.html#pragma_foreign_keys 644 652 conn.ExecContext(ctx, "pragma foreign_keys = off;") 645 645 - runMigration(conn, logger, "recreate-pulls-column-for-stacking-support", func(tx *sql.Tx) error { 653 653 + orm.RunMigration(conn, logger, "recreate-pulls-column-for-stacking-support", func(tx *sql.Tx) error { 646 654 _, err := tx.Exec(` 647 655 create table pulls_new ( 648 656 -- identifiers ··· 699 707 }) 700 708 conn.ExecContext(ctx, "pragma foreign_keys = on;") 701 709 702 702 - runMigration(conn, logger, "add-spindle-to-repos", func(tx *sql.Tx) error { 710 710 + orm.RunMigration(conn, logger, "add-spindle-to-repos", func(tx *sql.Tx) error { 703 711 tx.Exec(` 704 712 alter table repos add column spindle text; 705 713 `) ··· 709 717 // drop all knot secrets, add unique constraint to knots 710 718 // 711 719 // knots will henceforth use service auth for signed requests 712 712 - runMigration(conn, logger, "no-more-secrets", func(tx *sql.Tx) error { 720 720 + orm.RunMigration(conn, logger, "no-more-secrets", func(tx *sql.Tx) error { 713 721 _, err := tx.Exec(` 714 722 create table registrations_new ( 715 723 id integer primary key autoincrement, ··· 732 740 }) 733 741 734 742 // recreate and add rkey + created columns with default constraint 735 735 - runMigration(conn, logger, "rework-collaborators-table", func(tx *sql.Tx) error { 743 743 + orm.RunMigration(conn, logger, "rework-collaborators-table", func(tx *sql.Tx) error { 736 744 // create new table 737 745 // - repo_at instead of repo integer 738 746 // - rkey field ··· 786 794 return err 787 795 }) 788 796 789 789 - runMigration(conn, logger, "add-rkey-to-issues", func(tx *sql.Tx) error { 797 797 + orm.RunMigration(conn, logger, "add-rkey-to-issues", func(tx *sql.Tx) error { 790 798 _, err := tx.Exec(` 791 799 alter table issues add column rkey text not null default ''; 792 800 ··· 798 806 }) 799 807 800 808 // repurpose the read-only column to "needs-upgrade" 801 801 - runMigration(conn, logger, "rename-registrations-read-only-to-needs-upgrade", func(tx *sql.Tx) error { 809 809 + orm.RunMigration(conn, logger, "rename-registrations-read-only-to-needs-upgrade", func(tx *sql.Tx) error { 802 810 _, err := tx.Exec(` 803 811 alter table registrations rename column read_only to needs_upgrade; 804 812 `) ··· 806 814 }) 807 815 808 816 // require all knots to upgrade after the release of total xrpc 809 809 - runMigration(conn, logger, "migrate-knots-to-total-xrpc", func(tx *sql.Tx) error { 817 817 + orm.RunMigration(conn, logger, "migrate-knots-to-total-xrpc", func(tx *sql.Tx) error { 810 818 _, err := tx.Exec(` 811 819 update registrations set needs_upgrade = 1; 812 820 `) ··· 814 822 }) 815 823 816 824 // require all knots to upgrade after the release of total xrpc 817 817 - runMigration(conn, logger, "migrate-spindles-to-xrpc-owner", func(tx *sql.Tx) error { 825 825 + orm.RunMigration(conn, logger, "migrate-spindles-to-xrpc-owner", func(tx *sql.Tx) error { 818 826 _, err := tx.Exec(` 819 827 alter table spindles add column needs_upgrade integer not null default 0; 820 828 `) ··· 832 840 // 833 841 // disable foreign-keys for the next migration 834 842 conn.ExecContext(ctx, "pragma foreign_keys = off;") 835 835 - runMigration(conn, logger, "remove-issue-at-from-issues", func(tx *sql.Tx) error { 843 843 + orm.RunMigration(conn, logger, "remove-issue-at-from-issues", func(tx *sql.Tx) error { 836 844 _, err := tx.Exec(` 837 845 create table if not exists issues_new ( 838 846 -- identifiers ··· 902 910 // - new columns 903 911 // * column "reply_to" which can be any other comment 904 912 // * column "at-uri" which is a generated column 905 905 - runMigration(conn, logger, "rework-issue-comments", func(tx *sql.Tx) error { 913 913 + orm.RunMigration(conn, logger, "rework-issue-comments", func(tx *sql.Tx) error { 906 914 _, err := tx.Exec(` 907 915 create table if not exists issue_comments ( 908 916 -- identifiers ··· 962 970 // 963 971 // disable foreign-keys for the next migration 964 972 conn.ExecContext(ctx, "pragma foreign_keys = off;") 965 965 - runMigration(conn, logger, "add-at-uri-to-pulls", func(tx *sql.Tx) error { 973 973 + orm.RunMigration(conn, logger, "add-at-uri-to-pulls", func(tx *sql.Tx) error { 966 974 _, err := tx.Exec(` 967 975 create table if not exists pulls_new ( 968 976 -- identifiers ··· 1043 1051 // 1044 1052 // disable foreign-keys for the next migration 1045 1053 conn.ExecContext(ctx, "pragma foreign_keys = off;") 1046 1046 - runMigration(conn, logger, "remove-repo-at-pull-id-from-pull-submissions", func(tx *sql.Tx) error { 1054 1054 + orm.RunMigration(conn, logger, "remove-repo-at-pull-id-from-pull-submissions", func(tx *sql.Tx) error { 1047 1055 _, err := tx.Exec(` 1048 1056 create table if not exists pull_submissions_new ( 1049 1057 -- identifiers ··· 1097 1105 1098 1106 // knots may report the combined patch for a comparison, we can store that on the appview side 1099 1107 // (but not on the pds record), because calculating the combined patch requires a git index 1100 1100 - runMigration(conn, logger, "add-combined-column-submissions", func(tx *sql.Tx) error { 1108 1108 + orm.RunMigration(conn, logger, "add-combined-column-submissions", func(tx *sql.Tx) error { 1101 1109 _, err := tx.Exec(` 1102 1110 alter table pull_submissions add column combined text; 1103 1111 `) 1104 1112 return err 1105 1113 }) 1106 1114 1107 1107 - runMigration(conn, logger, "add-pronouns-profile", func(tx *sql.Tx) error { 1115 1115 + orm.RunMigration(conn, logger, "add-pronouns-profile", func(tx *sql.Tx) error { 1108 1116 _, err := tx.Exec(` 1109 1117 alter table profile add column pronouns text; 1110 1118 `) 1111 1119 return err 1112 1120 }) 1113 1121 1114 1114 - runMigration(conn, logger, "add-meta-column-repos", func(tx *sql.Tx) error { 1122 1122 + orm.RunMigration(conn, logger, "add-meta-column-repos", func(tx *sql.Tx) error { 1115 1123 _, err := tx.Exec(` 1116 1124 alter table repos add column website text; 1117 1125 alter table repos add column topics text; ··· 1119 1127 return err 1120 1128 }) 1121 1129 1122 1122 - runMigration(conn, logger, "add-usermentioned-preference", func(tx *sql.Tx) error { 1130 1130 + orm.RunMigration(conn, logger, "add-usermentioned-preference", func(tx *sql.Tx) error { 1123 1131 _, err := tx.Exec(` 1124 1132 alter table notification_preferences add column user_mentioned integer not null default 1; 1125 1133 `) ··· 1127 1135 }) 1128 1136 1129 1137 // remove the foreign key constraints from stars. 1130 1130 - runMigration(conn, logger, "generalize-stars-subject", func(tx *sql.Tx) error { 1138 1138 + orm.RunMigration(conn, logger, "generalize-stars-subject", func(tx *sql.Tx) error { 1131 1139 _, err := tx.Exec(` 1132 1140 create table stars_new ( 1133 1141 id integer primary key autoincrement, ··· 1171 1179 }, nil 1172 1180 } 1173 1181 1174 1174 - type migrationFn = func(*sql.Tx) error 1175 1175 - 1176 1176 - func runMigration(c *sql.Conn, logger *slog.Logger, name string, migrationFn migrationFn) error { 1177 1177 - logger = logger.With("migration", name) 1178 1178 - 1179 1179 - tx, err := c.BeginTx(context.Background(), nil) 1180 1180 - if err != nil { 1181 1181 - return err 1182 1182 - } 1183 1183 - defer tx.Rollback() 1184 1184 - 1185 1185 - var exists bool 1186 1186 - err = tx.QueryRow("select exists (select 1 from migrations where name = ?)", name).Scan(&exists) 1187 1187 - if err != nil { 1188 1188 - return err 1189 1189 - } 1190 1190 - 1191 1191 - if !exists { 1192 1192 - // run migration 1193 1193 - err = migrationFn(tx) 1194 1194 - if err != nil { 1195 1195 - logger.Error("failed to run migration", "err", err) 1196 1196 - return err 1197 1197 - } 1198 1198 - 1199 1199 - // mark migration as complete 1200 1200 - _, err = tx.Exec("insert into migrations (name) values (?)", name) 1201 1201 - if err != nil { 1202 1202 - logger.Error("failed to mark migration as complete", "err", err) 1203 1203 - return err 1204 1204 - } 1205 1205 - 1206 1206 - // commit the transaction 1207 1207 - if err := tx.Commit(); err != nil { 1208 1208 - return err 1209 1209 - } 1210 1210 - 1211 1211 - logger.Info("migration applied successfully") 1212 1212 - } else { 1213 1213 - logger.Warn("skipped migration, already applied") 1214 1214 - } 1215 1215 - 1216 1216 - return nil 1217 1217 - } 1218 1218 - 1219 1182 func (d *DB) Close() error { 1220 1183 return d.DB.Close() 1221 1184 } 1222 1222 - 1223 1223 - type filter struct { 1224 1224 - key string 1225 1225 - arg any 1226 1226 - cmp string 1227 1227 - } 1228 1228 - 1229 1229 - func newFilter(key, cmp string, arg any) filter { 1230 1230 - return filter{ 1231 1231 - key: key, 1232 1232 - arg: arg, 1233 1233 - cmp: cmp, 1234 1234 - } 1235 1235 - } 1236 1236 - 1237 1237 - func FilterEq(key string, arg any) filter { return newFilter(key, "=", arg) } 1238 1238 - func FilterNotEq(key string, arg any) filter { return newFilter(key, "<>", arg) } 1239 1239 - func FilterGte(key string, arg any) filter { return newFilter(key, ">=", arg) } 1240 1240 - func FilterLte(key string, arg any) filter { return newFilter(key, "<=", arg) } 1241 1241 - func FilterIs(key string, arg any) filter { return newFilter(key, "is", arg) } 1242 1242 - func FilterIsNot(key string, arg any) filter { return newFilter(key, "is not", arg) } 1243 1243 - func FilterIn(key string, arg any) filter { return newFilter(key, "in", arg) } 1244 1244 - func FilterLike(key string, arg any) filter { return newFilter(key, "like", arg) } 1245 1245 - func FilterNotLike(key string, arg any) filter { return newFilter(key, "not like", arg) } 1246 1246 - func FilterContains(key string, arg any) filter { 1247 1247 - return newFilter(key, "like", fmt.Sprintf("%%%v%%", arg)) 1248 1248 - } 1249 1249 - 1250 1250 - func (f filter) Condition() string { 1251 1251 - rv := reflect.ValueOf(f.arg) 1252 1252 - kind := rv.Kind() 1253 1253 - 1254 1254 - // if we have `FilterIn(k, [1, 2, 3])`, compile it down to `k in (?, ?, ?)` 1255 1255 - if (kind == reflect.Slice && rv.Type().Elem().Kind() != reflect.Uint8) || kind == reflect.Array { 1256 1256 - if rv.Len() == 0 { 1257 1257 - // always false 1258 1258 - return "1 = 0" 1259 1259 - } 1260 1260 - 1261 1261 - placeholders := make([]string, rv.Len()) 1262 1262 - for i := range placeholders { 1263 1263 - placeholders[i] = "?" 1264 1264 - } 1265 1265 - 1266 1266 - return fmt.Sprintf("%s %s (%s)", f.key, f.cmp, strings.Join(placeholders, ", ")) 1267 1267 - } 1268 1268 - 1269 1269 - return fmt.Sprintf("%s %s ?", f.key, f.cmp) 1270 1270 - } 1271 1271 - 1272 1272 - func (f filter) Arg() []any { 1273 1273 - rv := reflect.ValueOf(f.arg) 1274 1274 - kind := rv.Kind() 1275 1275 - if (kind == reflect.Slice && rv.Type().Elem().Kind() != reflect.Uint8) || kind == reflect.Array { 1276 1276 - if rv.Len() == 0 { 1277 1277 - return nil 1278 1278 - } 1279 1279 - 1280 1280 - out := make([]any, rv.Len()) 1281 1281 - for i := range rv.Len() { 1282 1282 - out[i] = rv.Index(i).Interface() 1283 1283 - } 1284 1284 - return out 1285 1285 - } 1286 1286 - 1287 1287 - return []any{f.arg} 1288 1288 - }

+6 -3

appview/db/follow.go

··· 7 7 "time" 8 8 9 9 "tangled.org/core/appview/models" 10 10 + "tangled.org/core/orm" 10 11 ) 11 12 12 13 func AddFollow(e Execer, follow *models.Follow) error { ··· 134 135 return result, nil 135 136 } 136 137 137 137 - func GetFollows(e Execer, limit int, filters ...filter) ([]models.Follow, error) { 138 138 + func GetFollows(e Execer, limit int, filters ...orm.Filter) ([]models.Follow, error) { 138 139 var follows []models.Follow 139 140 140 141 var conditions []string ··· 166 167 if err != nil { 167 168 return nil, err 168 169 } 170 170 + defer rows.Close() 171 171 + 169 172 for rows.Next() { 170 173 var follow models.Follow 171 174 var followedAt string ··· 191 194 } 192 195 193 196 func GetFollowers(e Execer, did string) ([]models.Follow, error) { 194 194 - return GetFollows(e, 0, FilterEq("subject_did", did)) 197 197 + return GetFollows(e, 0, orm.FilterEq("subject_did", did)) 195 198 } 196 199 197 200 func GetFollowing(e Execer, did string) ([]models.Follow, error) { 198 198 - return GetFollows(e, 0, FilterEq("user_did", did)) 201 201 + return GetFollows(e, 0, orm.FilterEq("user_did", did)) 199 202 } 200 203 201 204 func getFollowStatuses(e Execer, userDid string, subjectDids []string) (map[string]models.FollowStatus, error) {

+93 -36

appview/db/issues.go

··· 10 10 "time" 11 11 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 13 + "tangled.org/core/api/tangled" 13 14 "tangled.org/core/appview/models" 14 15 "tangled.org/core/appview/pagination" 16 16 + "tangled.org/core/orm" 15 17 ) 16 18 17 19 func PutIssue(tx *sql.Tx, issue *models.Issue) error { ··· 26 28 27 29 issues, err := GetIssues( 28 30 tx, 29 29 - FilterEq("did", issue.Did), 30 30 - FilterEq("rkey", issue.Rkey), 31 31 + orm.FilterEq("did", issue.Did), 32 32 + orm.FilterEq("rkey", issue.Rkey), 31 33 ) 32 34 switch { 33 35 case err != nil: ··· 69 71 returning rowid, issue_id 70 72 `, issue.RepoAt, issue.Did, issue.Rkey, newIssueId, issue.Title, issue.Body) 71 73 72 72 - return row.Scan(&issue.Id, &issue.IssueId) 74 74 + err = row.Scan(&issue.Id, &issue.IssueId) 75 75 + if err != nil { 76 76 + return fmt.Errorf("scan row: %w", err) 77 77 + } 78 78 + 79 79 + if err := putReferences(tx, issue.AtUri(), issue.References); err != nil { 80 80 + return fmt.Errorf("put reference_links: %w", err) 81 81 + } 82 82 + return nil 73 83 } 74 84 75 85 func updateIssue(tx *sql.Tx, issue *models.Issue) error { ··· 79 89 set title = ?, body = ?, edited = ? 80 90 where did = ? and rkey = ? 81 91 `, issue.Title, issue.Body, time.Now().Format(time.RFC3339), issue.Did, issue.Rkey) 82 82 - return err 92 92 + if err != nil { 93 93 + return err 94 94 + } 95 95 + 96 96 + if err := putReferences(tx, issue.AtUri(), issue.References); err != nil { 97 97 + return fmt.Errorf("put reference_links: %w", err) 98 98 + } 99 99 + return nil 83 100 } 84 101 85 85 - func GetIssuesPaginated(e Execer, page pagination.Page, filters ...filter) ([]models.Issue, error) { 102 102 + func GetIssuesPaginated(e Execer, page pagination.Page, filters ...orm.Filter) ([]models.Issue, error) { 86 103 issueMap := make(map[string]*models.Issue) // at-uri -> issue 87 104 88 105 var conditions []string ··· 98 115 whereClause = " where " + strings.Join(conditions, " and ") 99 116 } 100 117 101 101 - pLower := FilterGte("row_num", page.Offset+1) 102 102 - pUpper := FilterLte("row_num", page.Offset+page.Limit) 118 118 + pLower := orm.FilterGte("row_num", page.Offset+1) 119 119 + pUpper := orm.FilterLte("row_num", page.Offset+page.Limit) 103 120 104 121 pageClause := "" 105 122 if page.Limit > 0 { ··· 189 206 repoAts = append(repoAts, string(issue.RepoAt)) 190 207 } 191 208 192 192 - repos, err := GetRepos(e, 0, FilterIn("at_uri", repoAts)) 209 209 + repos, err := GetRepos(e, 0, orm.FilterIn("at_uri", repoAts)) 193 210 if err != nil { 194 211 return nil, fmt.Errorf("failed to build repo mappings: %w", err) 195 212 } ··· 212 229 // collect comments 213 230 issueAts := slices.Collect(maps.Keys(issueMap)) 214 231 215 215 - comments, err := GetIssueComments(e, FilterIn("issue_at", issueAts)) 232 232 + comments, err := GetIssueComments(e, orm.FilterIn("issue_at", issueAts)) 216 233 if err != nil { 217 234 return nil, fmt.Errorf("failed to query comments: %w", err) 218 235 } ··· 224 241 } 225 242 226 243 // collect allLabels for each issue 227 227 - allLabels, err := GetLabels(e, FilterIn("subject", issueAts)) 244 244 + allLabels, err := GetLabels(e, orm.FilterIn("subject", issueAts)) 228 245 if err != nil { 229 246 return nil, fmt.Errorf("failed to query labels: %w", err) 230 247 } ··· 234 251 } 235 252 } 236 253 254 254 + // collect references for each issue 255 255 + allReferencs, err := GetReferencesAll(e, orm.FilterIn("from_at", issueAts)) 256 256 + if err != nil { 257 257 + return nil, fmt.Errorf("failed to query reference_links: %w", err) 258 258 + } 259 259 + for issueAt, references := range allReferencs { 260 260 + if issue, ok := issueMap[issueAt.String()]; ok { 261 261 + issue.References = references 262 262 + } 263 263 + } 264 264 + 237 265 var issues []models.Issue 238 266 for _, i := range issueMap { 239 267 issues = append(issues, *i) ··· 250 278 issues, err := GetIssuesPaginated( 251 279 e, 252 280 pagination.Page{}, 253 253 - FilterEq("repo_at", repoAt), 254 254 - FilterEq("issue_id", issueId), 281 281 + orm.FilterEq("repo_at", repoAt), 282 282 + orm.FilterEq("issue_id", issueId), 255 283 ) 256 284 if err != nil { 257 285 return nil, err ··· 263 291 return &issues[0], nil 264 292 } 265 293 266 266 - func GetIssues(e Execer, filters ...filter) ([]models.Issue, error) { 294 294 + func GetIssues(e Execer, filters ...orm.Filter) ([]models.Issue, error) { 267 295 return GetIssuesPaginated(e, pagination.Page{}, filters...) 268 296 } 269 297 ··· 271 299 func GetIssueIDs(e Execer, opts models.IssueSearchOptions) ([]int64, error) { 272 300 var ids []int64 273 301 274 274 - var filters []filter 302 302 + var filters []orm.Filter 275 303 openValue := 0 276 304 if opts.IsOpen { 277 305 openValue = 1 278 306 } 279 279 - filters = append(filters, FilterEq("open", openValue)) 307 307 + filters = append(filters, orm.FilterEq("open", openValue)) 280 308 if opts.RepoAt != "" { 281 281 - filters = append(filters, FilterEq("repo_at", opts.RepoAt)) 309 309 + filters = append(filters, orm.FilterEq("repo_at", opts.RepoAt)) 282 310 } 283 311 284 312 var conditions []string ··· 323 351 return ids, nil 324 352 } 325 353 326 326 - func AddIssueComment(e Execer, c models.IssueComment) (int64, error) { 327 327 - result, err := e.Exec( 354 354 + func AddIssueComment(tx *sql.Tx, c models.IssueComment) (int64, error) { 355 355 + result, err := tx.Exec( 328 356 `insert into issue_comments ( 329 357 did, 330 358 rkey, ··· 363 391 return 0, err 364 392 } 365 393 394 394 + if err := putReferences(tx, c.AtUri(), c.References); err != nil { 395 395 + return 0, fmt.Errorf("put reference_links: %w", err) 396 396 + } 397 397 + 366 398 return id, nil 367 399 } 368 400 369 369 - func DeleteIssueComments(e Execer, filters ...filter) error { 401 401 + func DeleteIssueComments(e Execer, filters ...orm.Filter) error { 370 402 var conditions []string 371 403 var args []any 372 404 for _, filter := range filters { ··· 385 417 return err 386 418 } 387 419 388 388 - func GetIssueComments(e Execer, filters ...filter) ([]models.IssueComment, error) { 389 389 - var comments []models.IssueComment 420 420 + func GetIssueComments(e Execer, filters ...orm.Filter) ([]models.IssueComment, error) { 421 421 + commentMap := make(map[string]*models.IssueComment) 390 422 391 423 var conditions []string 392 424 var args []any ··· 420 452 if err != nil { 421 453 return nil, err 422 454 } 455 455 + defer rows.Close() 423 456 424 457 for rows.Next() { 425 458 var comment models.IssueComment ··· 465 498 comment.ReplyTo = &replyTo.V 466 499 } 467 500 468 468 - comments = append(comments, comment) 501 501 + atUri := comment.AtUri().String() 502 502 + commentMap[atUri] = &comment 469 503 } 470 504 471 505 if err = rows.Err(); err != nil { 472 506 return nil, err 473 507 } 474 508 509 509 + // collect references for each comments 510 510 + commentAts := slices.Collect(maps.Keys(commentMap)) 511 511 + allReferencs, err := GetReferencesAll(e, orm.FilterIn("from_at", commentAts)) 512 512 + if err != nil { 513 513 + return nil, fmt.Errorf("failed to query reference_links: %w", err) 514 514 + } 515 515 + for commentAt, references := range allReferencs { 516 516 + if comment, ok := commentMap[commentAt.String()]; ok { 517 517 + comment.References = references 518 518 + } 519 519 + } 520 520 + 521 521 + var comments []models.IssueComment 522 522 + for _, c := range commentMap { 523 523 + comments = append(comments, *c) 524 524 + } 525 525 + 526 526 + sort.Slice(comments, func(i, j int) bool { 527 527 + return comments[i].Created.After(comments[j].Created) 528 528 + }) 529 529 + 475 530 return comments, nil 476 531 } 477 532 478 478 - func DeleteIssues(e Execer, filters ...filter) error { 479 479 - var conditions []string 480 480 - var args []any 481 481 - for _, filter := range filters { 482 482 - conditions = append(conditions, filter.Condition()) 483 483 - args = append(args, filter.Arg()...) 533 533 + func DeleteIssues(tx *sql.Tx, did, rkey string) error { 534 534 + _, err := tx.Exec( 535 535 + `delete from issues 536 536 + where did = ? and rkey = ?`, 537 537 + did, 538 538 + rkey, 539 539 + ) 540 540 + if err != nil { 541 541 + return fmt.Errorf("delete issue: %w", err) 484 542 } 485 543 486 486 - whereClause := "" 487 487 - if conditions != nil { 488 488 - whereClause = " where " + strings.Join(conditions, " and ") 544 544 + uri := syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", did, tangled.RepoIssueNSID, rkey)) 545 545 + err = deleteReferences(tx, uri) 546 546 + if err != nil { 547 547 + return fmt.Errorf("delete reference_links: %w", err) 489 548 } 490 549 491 491 - query := fmt.Sprintf(`delete from issues %s`, whereClause) 492 492 - _, err := e.Exec(query, args...) 493 493 - return err 550 550 + return nil 494 551 } 495 552 496 496 - func CloseIssues(e Execer, filters ...filter) error { 553 553 + func CloseIssues(e Execer, filters ...orm.Filter) error { 497 554 var conditions []string 498 555 var args []any 499 556 for _, filter := range filters { ··· 511 568 return err 512 569 } 513 570 514 514 - func ReopenIssues(e Execer, filters ...filter) error { 571 571 + func ReopenIssues(e Execer, filters ...orm.Filter) error { 515 572 var conditions []string 516 573 var args []any 517 574 for _, filter := range filters {

+8 -7

appview/db/label.go

··· 10 10 11 11 "github.com/bluesky-social/indigo/atproto/syntax" 12 12 "tangled.org/core/appview/models" 13 13 + "tangled.org/core/orm" 13 14 ) 14 15 15 16 // no updating type for now ··· 59 60 return id, nil 60 61 } 61 62 62 62 - func DeleteLabelDefinition(e Execer, filters ...filter) error { 63 63 + func DeleteLabelDefinition(e Execer, filters ...orm.Filter) error { 63 64 var conditions []string 64 65 var args []any 65 66 for _, filter := range filters { ··· 75 76 return err 76 77 } 77 78 78 78 - func GetLabelDefinitions(e Execer, filters ...filter) ([]models.LabelDefinition, error) { 79 79 + func GetLabelDefinitions(e Execer, filters ...orm.Filter) ([]models.LabelDefinition, error) { 79 80 var labelDefinitions []models.LabelDefinition 80 81 var conditions []string 81 82 var args []any ··· 167 168 } 168 169 169 170 // helper to get exactly one label def 170 170 - func GetLabelDefinition(e Execer, filters ...filter) (*models.LabelDefinition, error) { 171 171 + func GetLabelDefinition(e Execer, filters ...orm.Filter) (*models.LabelDefinition, error) { 171 172 labels, err := GetLabelDefinitions(e, filters...) 172 173 if err != nil { 173 174 return nil, err ··· 227 228 return id, nil 228 229 } 229 230 230 230 - func GetLabelOps(e Execer, filters ...filter) ([]models.LabelOp, error) { 231 231 + func GetLabelOps(e Execer, filters ...orm.Filter) ([]models.LabelOp, error) { 231 232 var labelOps []models.LabelOp 232 233 var conditions []string 233 234 var args []any ··· 302 303 } 303 304 304 305 // get labels for a given list of subject URIs 305 305 - func GetLabels(e Execer, filters ...filter) (map[syntax.ATURI]models.LabelState, error) { 306 306 + func GetLabels(e Execer, filters ...orm.Filter) (map[syntax.ATURI]models.LabelState, error) { 306 307 ops, err := GetLabelOps(e, filters...) 307 308 if err != nil { 308 309 return nil, err ··· 322 323 } 323 324 labelAts := slices.Collect(maps.Keys(labelAtSet)) 324 325 325 325 - actx, err := NewLabelApplicationCtx(e, FilterIn("at_uri", labelAts)) 326 326 + actx, err := NewLabelApplicationCtx(e, orm.FilterIn("at_uri", labelAts)) 326 327 if err != nil { 327 328 return nil, err 328 329 } ··· 338 339 return results, nil 339 340 } 340 341 341 341 - func NewLabelApplicationCtx(e Execer, filters ...filter) (*models.LabelApplicationCtx, error) { 342 342 + func NewLabelApplicationCtx(e Execer, filters ...orm.Filter) (*models.LabelApplicationCtx, error) { 342 343 labels, err := GetLabelDefinitions(e, filters...) 343 344 if err != nil { 344 345 return nil, err

+6 -5

appview/db/language.go

··· 7 7 8 8 "github.com/bluesky-social/indigo/atproto/syntax" 9 9 "tangled.org/core/appview/models" 10 10 + "tangled.org/core/orm" 10 11 ) 11 12 12 12 - func GetRepoLanguages(e Execer, filters ...filter) ([]models.RepoLanguage, error) { 13 13 + func GetRepoLanguages(e Execer, filters ...orm.Filter) ([]models.RepoLanguage, error) { 13 14 var conditions []string 14 15 var args []any 15 16 for _, filter := range filters { ··· 27 28 whereClause, 28 29 ) 29 30 rows, err := e.Query(query, args...) 30 30 - 31 31 if err != nil { 32 32 return nil, fmt.Errorf("failed to execute query: %w ", err) 33 33 } 34 34 + defer rows.Close() 34 35 35 36 var langs []models.RepoLanguage 36 37 for rows.Next() { ··· 85 86 return nil 86 87 } 87 88 88 88 - func DeleteRepoLanguages(e Execer, filters ...filter) error { 89 89 + func DeleteRepoLanguages(e Execer, filters ...orm.Filter) error { 89 90 var conditions []string 90 91 var args []any 91 92 for _, filter := range filters { ··· 107 108 func UpdateRepoLanguages(tx *sql.Tx, repoAt syntax.ATURI, ref string, langs []models.RepoLanguage) error { 108 109 err := DeleteRepoLanguages( 109 110 tx, 110 110 - FilterEq("repo_at", repoAt), 111 111 - FilterEq("ref", ref), 111 111 + orm.FilterEq("repo_at", repoAt), 112 112 + orm.FilterEq("ref", ref), 112 113 ) 113 114 if err != nil { 114 115 return fmt.Errorf("failed to delete existing languages: %w", err)

+14 -13

appview/db/notifications.go

··· 11 11 "github.com/bluesky-social/indigo/atproto/syntax" 12 12 "tangled.org/core/appview/models" 13 13 "tangled.org/core/appview/pagination" 14 14 + "tangled.org/core/orm" 14 15 ) 15 16 16 17 func CreateNotification(e Execer, notification *models.Notification) error { ··· 44 45 } 45 46 46 47 // GetNotificationsPaginated retrieves notifications with filters and pagination 47 47 - func GetNotificationsPaginated(e Execer, page pagination.Page, filters ...filter) ([]*models.Notification, error) { 48 48 + func GetNotificationsPaginated(e Execer, page pagination.Page, filters ...orm.Filter) ([]*models.Notification, error) { 48 49 var conditions []string 49 50 var args []any 50 51 ··· 113 114 } 114 115 115 116 // GetNotificationsWithEntities retrieves notifications with their related entities 116 116 - func GetNotificationsWithEntities(e Execer, page pagination.Page, filters ...filter) ([]*models.NotificationWithEntity, error) { 117 117 + func GetNotificationsWithEntities(e Execer, page pagination.Page, filters ...orm.Filter) ([]*models.NotificationWithEntity, error) { 117 118 var conditions []string 118 119 var args []any 119 120 ··· 256 257 } 257 258 258 259 // GetNotifications retrieves notifications with filters 259 259 - func GetNotifications(e Execer, filters ...filter) ([]*models.Notification, error) { 260 260 + func GetNotifications(e Execer, filters ...orm.Filter) ([]*models.Notification, error) { 260 261 return GetNotificationsPaginated(e, pagination.FirstPage(), filters...) 261 262 } 262 263 263 263 - func CountNotifications(e Execer, filters ...filter) (int64, error) { 264 264 + func CountNotifications(e Execer, filters ...orm.Filter) (int64, error) { 264 265 var conditions []string 265 266 var args []any 266 267 for _, filter := range filters { ··· 285 286 } 286 287 287 288 func MarkNotificationRead(e Execer, notificationID int64, userDID string) error { 288 288 - idFilter := FilterEq("id", notificationID) 289 289 - recipientFilter := FilterEq("recipient_did", userDID) 289 289 + idFilter := orm.FilterEq("id", notificationID) 290 290 + recipientFilter := orm.FilterEq("recipient_did", userDID) 290 291 291 292 query := fmt.Sprintf(` 292 293 UPDATE notifications ··· 314 315 } 315 316 316 317 func MarkAllNotificationsRead(e Execer, userDID string) error { 317 317 - recipientFilter := FilterEq("recipient_did", userDID) 318 318 - readFilter := FilterEq("read", 0) 318 318 + recipientFilter := orm.FilterEq("recipient_did", userDID) 319 319 + readFilter := orm.FilterEq("read", 0) 319 320 320 321 query := fmt.Sprintf(` 321 322 UPDATE notifications ··· 334 335 } 335 336 336 337 func DeleteNotification(e Execer, notificationID int64, userDID string) error { 337 337 - idFilter := FilterEq("id", notificationID) 338 338 - recipientFilter := FilterEq("recipient_did", userDID) 338 338 + idFilter := orm.FilterEq("id", notificationID) 339 339 + recipientFilter := orm.FilterEq("recipient_did", userDID) 339 340 340 341 query := fmt.Sprintf(` 341 342 DELETE FROM notifications ··· 362 363 } 363 364 364 365 func GetNotificationPreference(e Execer, userDid string) (*models.NotificationPreferences, error) { 365 365 - prefs, err := GetNotificationPreferences(e, FilterEq("user_did", userDid)) 366 366 + prefs, err := GetNotificationPreferences(e, orm.FilterEq("user_did", userDid)) 366 367 if err != nil { 367 368 return nil, err 368 369 } ··· 375 376 return p, nil 376 377 } 377 378 378 378 - func GetNotificationPreferences(e Execer, filters ...filter) (map[syntax.DID]*models.NotificationPreferences, error) { 379 379 + func GetNotificationPreferences(e Execer, filters ...orm.Filter) (map[syntax.DID]*models.NotificationPreferences, error) { 379 380 prefsMap := make(map[syntax.DID]*models.NotificationPreferences) 380 381 381 382 var conditions []string ··· 483 484 484 485 func (d *DB) ClearOldNotifications(ctx context.Context, olderThan time.Duration) error { 485 486 cutoff := time.Now().Add(-olderThan) 486 486 - createdFilter := FilterLte("created", cutoff) 487 487 + createdFilter := orm.FilterLte("created", cutoff) 487 488 488 489 query := fmt.Sprintf(` 489 490 DELETE FROM notifications

+12 -11

appview/db/pipeline.go

··· 6 6 "strings" 7 7 "time" 8 8 9 9 + "github.com/bluesky-social/indigo/atproto/syntax" 9 10 "tangled.org/core/appview/models" 11 11 + "tangled.org/core/orm" 10 12 ) 11 13 12 12 - func GetPipelines(e Execer, filters ...filter) ([]models.Pipeline, error) { 14 14 + func GetPipelines(e Execer, filters ...orm.Filter) ([]models.Pipeline, error) { 13 15 var pipelines []models.Pipeline 14 16 15 17 var conditions []string ··· 168 170 169 171 // this is a mega query, but the most useful one: 170 172 // get N pipelines, for each one get the latest status of its N workflows 171 171 - func GetPipelineStatuses(e Execer, limit int, filters ...filter) ([]models.Pipeline, error) { 173 173 + func GetPipelineStatuses(e Execer, limit int, filters ...orm.Filter) ([]models.Pipeline, error) { 172 174 var conditions []string 173 175 var args []any 174 176 for _, filter := range filters { 175 175 - filter.key = "p." + filter.key // the table is aliased in the query to `p` 177 177 + filter.Key = "p." + filter.Key // the table is aliased in the query to `p` 176 178 conditions = append(conditions, filter.Condition()) 177 179 args = append(args, filter.Arg()...) 178 180 } ··· 215 217 } 216 218 defer rows.Close() 217 219 218 218 - pipelines := make(map[string]models.Pipeline) 220 220 + pipelines := make(map[syntax.ATURI]models.Pipeline) 219 221 for rows.Next() { 220 222 var p models.Pipeline 221 223 var t models.Trigger ··· 252 254 p.Trigger = &t 253 255 p.Statuses = make(map[string]models.WorkflowStatus) 254 256 255 255 - k := fmt.Sprintf("%s/%s", p.Knot, p.Rkey) 256 256 - pipelines[k] = p 257 257 + pipelines[p.AtUri()] = p 257 258 } 258 259 259 260 // get all statuses ··· 264 265 conditions = nil 265 266 args = nil 266 267 for _, p := range pipelines { 267 267 - knotFilter := FilterEq("pipeline_knot", p.Knot) 268 268 - rkeyFilter := FilterEq("pipeline_rkey", p.Rkey) 268 268 + knotFilter := orm.FilterEq("pipeline_knot", p.Knot) 269 269 + rkeyFilter := orm.FilterEq("pipeline_rkey", p.Rkey) 269 270 conditions = append(conditions, fmt.Sprintf("(%s and %s)", knotFilter.Condition(), rkeyFilter.Condition())) 270 271 args = append(args, p.Knot) 271 272 args = append(args, p.Rkey) ··· 313 314 return nil, fmt.Errorf("invalid status created timestamp %q: %w", created, err) 314 315 } 315 316 316 316 - key := fmt.Sprintf("%s/%s", ps.PipelineKnot, ps.PipelineRkey) 317 317 + pipelineAt := ps.PipelineAt() 317 318 318 319 // extract 319 319 - pipeline, ok := pipelines[key] 320 320 + pipeline, ok := pipelines[pipelineAt] 320 321 if !ok { 321 322 continue 322 323 } ··· 330 331 331 332 // reassign 332 333 pipeline.Statuses[ps.Workflow] = statuses 333 333 - pipelines[key] = pipeline 334 334 + pipelines[pipelineAt] = pipeline 334 335 } 335 336 336 337 var all []models.Pipeline

+11 -5

appview/db/profile.go

··· 11 11 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 13 "tangled.org/core/appview/models" 14 14 + "tangled.org/core/orm" 14 15 ) 15 16 16 17 const TimeframeMonths = 7 ··· 44 45 45 46 issues, err := GetIssues( 46 47 e, 47 47 - FilterEq("did", forDid), 48 48 - FilterGte("created", time.Now().AddDate(0, -TimeframeMonths, 0)), 48 48 + orm.FilterEq("did", forDid), 49 49 + orm.FilterGte("created", time.Now().AddDate(0, -TimeframeMonths, 0)), 49 50 ) 50 51 if err != nil { 51 52 return nil, fmt.Errorf("error getting issues by owner did: %w", err) ··· 65 66 *items = append(*items, &issue) 66 67 } 67 68 68 68 - repos, err := GetRepos(e, 0, FilterEq("did", forDid)) 69 69 + repos, err := GetRepos(e, 0, orm.FilterEq("did", forDid)) 69 70 if err != nil { 70 71 return nil, fmt.Errorf("error getting all repos by did: %w", err) 71 72 } ··· 199 200 return tx.Commit() 200 201 } 201 202 202 202 - func GetProfiles(e Execer, filters ...filter) (map[string]*models.Profile, error) { 203 203 + func GetProfiles(e Execer, filters ...orm.Filter) (map[string]*models.Profile, error) { 203 204 var conditions []string 204 205 var args []any 205 206 for _, filter := range filters { ··· 229 230 if err != nil { 230 231 return nil, err 231 232 } 233 233 + defer rows.Close() 232 234 233 235 profileMap := make(map[string]*models.Profile) 234 236 for rows.Next() { ··· 269 271 if err != nil { 270 272 return nil, err 271 273 } 274 274 + defer rows.Close() 275 275 + 272 276 idxs := make(map[string]int) 273 277 for did := range profileMap { 274 278 idxs[did] = 0 ··· 289 293 if err != nil { 290 294 return nil, err 291 295 } 296 296 + defer rows.Close() 297 297 + 292 298 idxs = make(map[string]int) 293 299 for did := range profileMap { 294 300 idxs[did] = 0 ··· 441 447 } 442 448 443 449 // ensure all pinned repos are either own repos or collaborating repos 444 444 - repos, err := GetRepos(e, 0, FilterEq("did", profile.Did)) 450 450 + repos, err := GetRepos(e, 0, orm.FilterEq("did", profile.Did)) 445 451 if err != nil { 446 452 log.Printf("getting repos for %s: %s", profile.Did, err) 447 453 }

+69 -24

appview/db/pulls.go

··· 13 13 14 14 "github.com/bluesky-social/indigo/atproto/syntax" 15 15 "tangled.org/core/appview/models" 16 16 + "tangled.org/core/orm" 16 17 ) 17 18 18 19 func NewPull(tx *sql.Tx, pull *models.Pull) error { ··· 93 94 insert into pull_submissions (pull_at, round_number, patch, combined, source_rev) 94 95 values (?, ?, ?, ?, ?) 95 96 `, pull.AtUri(), 0, pull.Submissions[0].Patch, pull.Submissions[0].Combined, pull.Submissions[0].SourceRev) 96 96 - return err 97 97 + if err != nil { 98 98 + return err 99 99 + } 100 100 + 101 101 + if err := putReferences(tx, pull.AtUri(), pull.References); err != nil { 102 102 + return fmt.Errorf("put reference_links: %w", err) 103 103 + } 104 104 + 105 105 + return nil 97 106 } 98 107 99 108 func GetPullAt(e Execer, repoAt syntax.ATURI, pullId int) (syntax.ATURI, error) { ··· 110 119 return pullId - 1, err 111 120 } 112 121 113 113 - func GetPullsWithLimit(e Execer, limit int, filters ...filter) ([]*models.Pull, error) { 122 122 + func GetPullsWithLimit(e Execer, limit int, filters ...orm.Filter) ([]*models.Pull, error) { 114 123 pulls := make(map[syntax.ATURI]*models.Pull) 115 124 116 125 var conditions []string ··· 221 230 for _, p := range pulls { 222 231 pullAts = append(pullAts, p.AtUri()) 223 232 } 224 224 - submissionsMap, err := GetPullSubmissions(e, FilterIn("pull_at", pullAts)) 233 233 + submissionsMap, err := GetPullSubmissions(e, orm.FilterIn("pull_at", pullAts)) 225 234 if err != nil { 226 235 return nil, fmt.Errorf("failed to get submissions: %w", err) 227 236 } ··· 233 242 } 234 243 235 244 // collect allLabels for each issue 236 236 - allLabels, err := GetLabels(e, FilterIn("subject", pullAts)) 245 245 + allLabels, err := GetLabels(e, orm.FilterIn("subject", pullAts)) 237 246 if err != nil { 238 247 return nil, fmt.Errorf("failed to query labels: %w", err) 239 248 } ··· 250 259 sourceAts = append(sourceAts, *p.PullSource.RepoAt) 251 260 } 252 261 } 253 253 - sourceRepos, err := GetRepos(e, 0, FilterIn("at_uri", sourceAts)) 262 262 + sourceRepos, err := GetRepos(e, 0, orm.FilterIn("at_uri", sourceAts)) 254 263 if err != nil && !errors.Is(err, sql.ErrNoRows) { 255 264 return nil, fmt.Errorf("failed to get source repos: %w", err) 256 265 } ··· 266 275 } 267 276 } 268 277 278 278 + allReferences, err := GetReferencesAll(e, orm.FilterIn("from_at", pullAts)) 279 279 + if err != nil { 280 280 + return nil, fmt.Errorf("failed to query reference_links: %w", err) 281 281 + } 282 282 + for pullAt, references := range allReferences { 283 283 + if pull, ok := pulls[pullAt]; ok { 284 284 + pull.References = references 285 285 + } 286 286 + } 287 287 + 269 288 orderedByPullId := []*models.Pull{} 270 289 for _, p := range pulls { 271 290 orderedByPullId = append(orderedByPullId, p) ··· 277 296 return orderedByPullId, nil 278 297 } 279 298 280 280 - func GetPulls(e Execer, filters ...filter) ([]*models.Pull, error) { 299 299 + func GetPulls(e Execer, filters ...orm.Filter) ([]*models.Pull, error) { 281 300 return GetPullsWithLimit(e, 0, filters...) 282 301 } 283 302 284 303 func GetPullIDs(e Execer, opts models.PullSearchOptions) ([]int64, error) { 285 304 var ids []int64 286 305 287 287 - var filters []filter 288 288 - filters = append(filters, FilterEq("state", opts.State)) 306 306 + var filters []orm.Filter 307 307 + filters = append(filters, orm.FilterEq("state", opts.State)) 289 308 if opts.RepoAt != "" { 290 290 - filters = append(filters, FilterEq("repo_at", opts.RepoAt)) 309 309 + filters = append(filters, orm.FilterEq("repo_at", opts.RepoAt)) 291 310 } 292 311 293 312 var conditions []string ··· 343 362 } 344 363 345 364 func GetPull(e Execer, repoAt syntax.ATURI, pullId int) (*models.Pull, error) { 346 346 - pulls, err := GetPullsWithLimit(e, 1, FilterEq("repo_at", repoAt), FilterEq("pull_id", pullId)) 365 365 + pulls, err := GetPullsWithLimit(e, 1, orm.FilterEq("repo_at", repoAt), orm.FilterEq("pull_id", pullId)) 347 366 if err != nil { 348 367 return nil, err 349 368 } ··· 355 374 } 356 375 357 376 // mapping from pull -> pull submissions 358 358 - func GetPullSubmissions(e Execer, filters ...filter) (map[syntax.ATURI][]*models.PullSubmission, error) { 377 377 + func GetPullSubmissions(e Execer, filters ...orm.Filter) (map[syntax.ATURI][]*models.PullSubmission, error) { 359 378 var conditions []string 360 379 var args []any 361 380 for _, filter := range filters { ··· 430 449 431 450 // Get comments for all submissions using GetPullComments 432 451 submissionIds := slices.Collect(maps.Keys(submissionMap)) 433 433 - comments, err := GetPullComments(e, FilterIn("submission_id", submissionIds)) 452 452 + comments, err := GetPullComments(e, orm.FilterIn("submission_id", submissionIds)) 434 453 if err != nil { 435 435 - return nil, err 454 454 + return nil, fmt.Errorf("failed to get pull comments: %w", err) 436 455 } 437 456 for _, comment := range comments { 438 457 if submission, ok := submissionMap[comment.SubmissionId]; ok { ··· 456 475 return m, nil 457 476 } 458 477 459 459 - func GetPullComments(e Execer, filters ...filter) ([]models.PullComment, error) { 478 478 + func GetPullComments(e Execer, filters ...orm.Filter) ([]models.PullComment, error) { 460 479 var conditions []string 461 480 var args []any 462 481 for _, filter := range filters { ··· 492 511 } 493 512 defer rows.Close() 494 513 495 495 - var comments []models.PullComment 514 514 + commentMap := make(map[string]*models.PullComment) 496 515 for rows.Next() { 497 516 var comment models.PullComment 498 517 var createdAt string ··· 514 533 comment.Created = t 515 534 } 516 535 517 517 - comments = append(comments, comment) 536 536 + atUri := comment.AtUri().String() 537 537 + commentMap[atUri] = &comment 518 538 } 519 539 520 540 if err := rows.Err(); err != nil { 521 541 return nil, err 522 542 } 523 543 544 544 + // collect references for each comments 545 545 + commentAts := slices.Collect(maps.Keys(commentMap)) 546 546 + allReferencs, err := GetReferencesAll(e, orm.FilterIn("from_at", commentAts)) 547 547 + if err != nil { 548 548 + return nil, fmt.Errorf("failed to query reference_links: %w", err) 549 549 + } 550 550 + for commentAt, references := range allReferencs { 551 551 + if comment, ok := commentMap[commentAt.String()]; ok { 552 552 + comment.References = references 553 553 + } 554 554 + } 555 555 + 556 556 + var comments []models.PullComment 557 557 + for _, c := range commentMap { 558 558 + comments = append(comments, *c) 559 559 + } 560 560 + 561 561 + sort.Slice(comments, func(i, j int) bool { 562 562 + return comments[i].Created.Before(comments[j].Created) 563 563 + }) 564 564 + 524 565 return comments, nil 525 566 } 526 567 ··· 600 641 return pulls, nil 601 642 } 602 643 603 603 - func NewPullComment(e Execer, comment *models.PullComment) (int64, error) { 644 644 + func NewPullComment(tx *sql.Tx, comment *models.PullComment) (int64, error) { 604 645 query := `insert into pull_comments (owner_did, repo_at, submission_id, comment_at, pull_id, body) values (?, ?, ?, ?, ?, ?)` 605 605 - res, err := e.Exec( 646 646 + res, err := tx.Exec( 606 647 query, 607 648 comment.OwnerDid, 608 649 comment.RepoAt, ··· 618 659 i, err := res.LastInsertId() 619 660 if err != nil { 620 661 return 0, err 662 662 + } 663 663 + 664 664 + if err := putReferences(tx, comment.AtUri(), comment.References); err != nil { 665 665 + return 0, fmt.Errorf("put reference_links: %w", err) 621 666 } 622 667 623 668 return i, nil ··· 664 709 return err 665 710 } 666 711 667 667 - func SetPullParentChangeId(e Execer, parentChangeId string, filters ...filter) error { 712 712 + func SetPullParentChangeId(e Execer, parentChangeId string, filters ...orm.Filter) error { 668 713 var conditions []string 669 714 var args []any 670 715 ··· 688 733 689 734 // Only used when stacking to update contents in the event of a rebase (the interdiff should be empty). 690 735 // otherwise submissions are immutable 691 691 - func UpdatePull(e Execer, newPatch, sourceRev string, filters ...filter) error { 736 736 + func UpdatePull(e Execer, newPatch, sourceRev string, filters ...orm.Filter) error { 692 737 var conditions []string 693 738 var args []any 694 739 ··· 746 791 func GetStack(e Execer, stackId string) (models.Stack, error) { 747 792 unorderedPulls, err := GetPulls( 748 793 e, 749 749 - FilterEq("stack_id", stackId), 750 750 - FilterNotEq("state", models.PullDeleted), 794 794 + orm.FilterEq("stack_id", stackId), 795 795 + orm.FilterNotEq("state", models.PullDeleted), 751 796 ) 752 797 if err != nil { 753 798 return nil, err ··· 791 836 func GetAbandonedPulls(e Execer, stackId string) ([]*models.Pull, error) { 792 837 pulls, err := GetPulls( 793 838 e, 794 794 - FilterEq("stack_id", stackId), 795 795 - FilterEq("state", models.PullDeleted), 839 839 + orm.FilterEq("stack_id", stackId), 840 840 + orm.FilterEq("state", models.PullDeleted), 796 841 ) 797 842 if err != nil { 798 843 return nil, err

+2 -1

appview/db/punchcard.go

··· 7 7 "time" 8 8 9 9 "tangled.org/core/appview/models" 10 10 + "tangled.org/core/orm" 10 11 ) 11 12 12 13 // this adds to the existing count ··· 20 21 return err 21 22 } 22 23 23 23 - func MakePunchcard(e Execer, filters ...filter) (*models.Punchcard, error) { 24 24 + func MakePunchcard(e Execer, filters ...orm.Filter) (*models.Punchcard, error) { 24 25 punchcard := &models.Punchcard{} 25 26 now := time.Now() 26 27 startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC)

+463

appview/db/reference.go

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + "fmt" 6 6 + "strings" 7 7 + 8 8 + "github.com/bluesky-social/indigo/atproto/syntax" 9 9 + "tangled.org/core/api/tangled" 10 10 + "tangled.org/core/appview/models" 11 11 + "tangled.org/core/orm" 12 12 + ) 13 13 + 14 14 + // ValidateReferenceLinks resolves refLinks to Issue/PR/IssueComment/PullComment ATURIs. 15 15 + // It will ignore missing refLinks. 16 16 + func ValidateReferenceLinks(e Execer, refLinks []models.ReferenceLink) ([]syntax.ATURI, error) { 17 17 + var ( 18 18 + issueRefs []models.ReferenceLink 19 19 + pullRefs []models.ReferenceLink 20 20 + ) 21 21 + for _, ref := range refLinks { 22 22 + switch ref.Kind { 23 23 + case models.RefKindIssue: 24 24 + issueRefs = append(issueRefs, ref) 25 25 + case models.RefKindPull: 26 26 + pullRefs = append(pullRefs, ref) 27 27 + } 28 28 + } 29 29 + issueUris, err := findIssueReferences(e, issueRefs) 30 30 + if err != nil { 31 31 + return nil, fmt.Errorf("find issue references: %w", err) 32 32 + } 33 33 + pullUris, err := findPullReferences(e, pullRefs) 34 34 + if err != nil { 35 35 + return nil, fmt.Errorf("find pull references: %w", err) 36 36 + } 37 37 + 38 38 + return append(issueUris, pullUris...), nil 39 39 + } 40 40 + 41 41 + func findIssueReferences(e Execer, refLinks []models.ReferenceLink) ([]syntax.ATURI, error) { 42 42 + if len(refLinks) == 0 { 43 43 + return nil, nil 44 44 + } 45 45 + vals := make([]string, len(refLinks)) 46 46 + args := make([]any, 0, len(refLinks)*4) 47 47 + for i, ref := range refLinks { 48 48 + vals[i] = "(?, ?, ?, ?)" 49 49 + args = append(args, ref.Handle, ref.Repo, ref.SubjectId, ref.CommentId) 50 50 + } 51 51 + query := fmt.Sprintf( 52 52 + `with input(owner_did, name, issue_id, comment_id) as ( 53 53 + values %s 54 54 + ) 55 55 + select 56 56 + i.did, i.rkey, 57 57 + c.did, c.rkey 58 58 + from input inp 59 59 + join repos r 60 60 + on r.did = inp.owner_did 61 61 + and r.name = inp.name 62 62 + join issues i 63 63 + on i.repo_at = r.at_uri 64 64 + and i.issue_id = inp.issue_id 65 65 + left join issue_comments c 66 66 + on inp.comment_id is not null 67 67 + and c.issue_at = i.at_uri 68 68 + and c.id = inp.comment_id 69 69 + `, 70 70 + strings.Join(vals, ","), 71 71 + ) 72 72 + rows, err := e.Query(query, args...) 73 73 + if err != nil { 74 74 + return nil, err 75 75 + } 76 76 + defer rows.Close() 77 77 + 78 78 + var uris []syntax.ATURI 79 79 + 80 80 + for rows.Next() { 81 81 + // Scan rows 82 82 + var issueOwner, issueRkey string 83 83 + var commentOwner, commentRkey sql.NullString 84 84 + var uri syntax.ATURI 85 85 + if err := rows.Scan(&issueOwner, &issueRkey, &commentOwner, &commentRkey); err != nil { 86 86 + return nil, err 87 87 + } 88 88 + if commentOwner.Valid && commentRkey.Valid { 89 89 + uri = syntax.ATURI(fmt.Sprintf( 90 90 + "at://%s/%s/%s", 91 91 + commentOwner.String, 92 92 + tangled.RepoIssueCommentNSID, 93 93 + commentRkey.String, 94 94 + )) 95 95 + } else { 96 96 + uri = syntax.ATURI(fmt.Sprintf( 97 97 + "at://%s/%s/%s", 98 98 + issueOwner, 99 99 + tangled.RepoIssueNSID, 100 100 + issueRkey, 101 101 + )) 102 102 + } 103 103 + uris = append(uris, uri) 104 104 + } 105 105 + if err := rows.Err(); err != nil { 106 106 + return nil, fmt.Errorf("iterate rows: %w", err) 107 107 + } 108 108 + 109 109 + return uris, nil 110 110 + } 111 111 + 112 112 + func findPullReferences(e Execer, refLinks []models.ReferenceLink) ([]syntax.ATURI, error) { 113 113 + if len(refLinks) == 0 { 114 114 + return nil, nil 115 115 + } 116 116 + vals := make([]string, len(refLinks)) 117 117 + args := make([]any, 0, len(refLinks)*4) 118 118 + for i, ref := range refLinks { 119 119 + vals[i] = "(?, ?, ?, ?)" 120 120 + args = append(args, ref.Handle, ref.Repo, ref.SubjectId, ref.CommentId) 121 121 + } 122 122 + query := fmt.Sprintf( 123 123 + `with input(owner_did, name, pull_id, comment_id) as ( 124 124 + values %s 125 125 + ) 126 126 + select 127 127 + p.owner_did, p.rkey, 128 128 + c.comment_at 129 129 + from input inp 130 130 + join repos r 131 131 + on r.did = inp.owner_did 132 132 + and r.name = inp.name 133 133 + join pulls p 134 134 + on p.repo_at = r.at_uri 135 135 + and p.pull_id = inp.pull_id 136 136 + left join pull_comments c 137 137 + on inp.comment_id is not null 138 138 + and c.repo_at = r.at_uri and c.pull_id = p.pull_id 139 139 + and c.id = inp.comment_id 140 140 + `, 141 141 + strings.Join(vals, ","), 142 142 + ) 143 143 + rows, err := e.Query(query, args...) 144 144 + if err != nil { 145 145 + return nil, err 146 146 + } 147 147 + defer rows.Close() 148 148 + 149 149 + var uris []syntax.ATURI 150 150 + 151 151 + for rows.Next() { 152 152 + // Scan rows 153 153 + var pullOwner, pullRkey string 154 154 + var commentUri sql.NullString 155 155 + var uri syntax.ATURI 156 156 + if err := rows.Scan(&pullOwner, &pullRkey, &commentUri); err != nil { 157 157 + return nil, err 158 158 + } 159 159 + if commentUri.Valid { 160 160 + // no-op 161 161 + uri = syntax.ATURI(commentUri.String) 162 162 + } else { 163 163 + uri = syntax.ATURI(fmt.Sprintf( 164 164 + "at://%s/%s/%s", 165 165 + pullOwner, 166 166 + tangled.RepoPullNSID, 167 167 + pullRkey, 168 168 + )) 169 169 + } 170 170 + uris = append(uris, uri) 171 171 + } 172 172 + return uris, nil 173 173 + } 174 174 + 175 175 + func putReferences(tx *sql.Tx, fromAt syntax.ATURI, references []syntax.ATURI) error { 176 176 + err := deleteReferences(tx, fromAt) 177 177 + if err != nil { 178 178 + return fmt.Errorf("delete old reference_links: %w", err) 179 179 + } 180 180 + if len(references) == 0 { 181 181 + return nil 182 182 + } 183 183 + 184 184 + values := make([]string, 0, len(references)) 185 185 + args := make([]any, 0, len(references)*2) 186 186 + for _, ref := range references { 187 187 + values = append(values, "(?, ?)") 188 188 + args = append(args, fromAt, ref) 189 189 + } 190 190 + _, err = tx.Exec( 191 191 + fmt.Sprintf( 192 192 + `insert into reference_links (from_at, to_at) 193 193 + values %s`, 194 194 + strings.Join(values, ","), 195 195 + ), 196 196 + args..., 197 197 + ) 198 198 + if err != nil { 199 199 + return fmt.Errorf("insert new reference_links: %w", err) 200 200 + } 201 201 + return nil 202 202 + } 203 203 + 204 204 + func deleteReferences(tx *sql.Tx, fromAt syntax.ATURI) error { 205 205 + _, err := tx.Exec(`delete from reference_links where from_at = ?`, fromAt) 206 206 + return err 207 207 + } 208 208 + 209 209 + func GetReferencesAll(e Execer, filters ...orm.Filter) (map[syntax.ATURI][]syntax.ATURI, error) { 210 210 + var ( 211 211 + conditions []string 212 212 + args []any 213 213 + ) 214 214 + for _, filter := range filters { 215 215 + conditions = append(conditions, filter.Condition()) 216 216 + args = append(args, filter.Arg()...) 217 217 + } 218 218 + 219 219 + whereClause := "" 220 220 + if conditions != nil { 221 221 + whereClause = " where " + strings.Join(conditions, " and ") 222 222 + } 223 223 + 224 224 + rows, err := e.Query( 225 225 + fmt.Sprintf( 226 226 + `select from_at, to_at from reference_links %s`, 227 227 + whereClause, 228 228 + ), 229 229 + args..., 230 230 + ) 231 231 + if err != nil { 232 232 + return nil, fmt.Errorf("query reference_links: %w", err) 233 233 + } 234 234 + defer rows.Close() 235 235 + 236 236 + result := make(map[syntax.ATURI][]syntax.ATURI) 237 237 + 238 238 + for rows.Next() { 239 239 + var from, to syntax.ATURI 240 240 + if err := rows.Scan(&from, &to); err != nil { 241 241 + return nil, fmt.Errorf("scan row: %w", err) 242 242 + } 243 243 + 244 244 + result[from] = append(result[from], to) 245 245 + } 246 246 + if err := rows.Err(); err != nil { 247 247 + return nil, fmt.Errorf("iterate rows: %w", err) 248 248 + } 249 249 + 250 250 + return result, nil 251 251 + } 252 252 + 253 253 + func GetBacklinks(e Execer, target syntax.ATURI) ([]models.RichReferenceLink, error) { 254 254 + rows, err := e.Query( 255 255 + `select from_at from reference_links 256 256 + where to_at = ?`, 257 257 + target, 258 258 + ) 259 259 + if err != nil { 260 260 + return nil, fmt.Errorf("query backlinks: %w", err) 261 261 + } 262 262 + defer rows.Close() 263 263 + 264 264 + var ( 265 265 + backlinks []models.RichReferenceLink 266 266 + backlinksMap = make(map[string][]syntax.ATURI) 267 267 + ) 268 268 + for rows.Next() { 269 269 + var from syntax.ATURI 270 270 + if err := rows.Scan(&from); err != nil { 271 271 + return nil, fmt.Errorf("scan row: %w", err) 272 272 + } 273 273 + nsid := from.Collection().String() 274 274 + backlinksMap[nsid] = append(backlinksMap[nsid], from) 275 275 + } 276 276 + if err := rows.Err(); err != nil { 277 277 + return nil, fmt.Errorf("iterate rows: %w", err) 278 278 + } 279 279 + 280 280 + var ls []models.RichReferenceLink 281 281 + ls, err = getIssueBacklinks(e, backlinksMap[tangled.RepoIssueNSID]) 282 282 + if err != nil { 283 283 + return nil, fmt.Errorf("get issue backlinks: %w", err) 284 284 + } 285 285 + backlinks = append(backlinks, ls...) 286 286 + ls, err = getIssueCommentBacklinks(e, backlinksMap[tangled.RepoIssueCommentNSID]) 287 287 + if err != nil { 288 288 + return nil, fmt.Errorf("get issue_comment backlinks: %w", err) 289 289 + } 290 290 + backlinks = append(backlinks, ls...) 291 291 + ls, err = getPullBacklinks(e, backlinksMap[tangled.RepoPullNSID]) 292 292 + if err != nil { 293 293 + return nil, fmt.Errorf("get pull backlinks: %w", err) 294 294 + } 295 295 + backlinks = append(backlinks, ls...) 296 296 + ls, err = getPullCommentBacklinks(e, backlinksMap[tangled.RepoPullCommentNSID]) 297 297 + if err != nil { 298 298 + return nil, fmt.Errorf("get pull_comment backlinks: %w", err) 299 299 + } 300 300 + backlinks = append(backlinks, ls...) 301 301 + 302 302 + return backlinks, nil 303 303 + } 304 304 + 305 305 + func getIssueBacklinks(e Execer, aturis []syntax.ATURI) ([]models.RichReferenceLink, error) { 306 306 + if len(aturis) == 0 { 307 307 + return nil, nil 308 308 + } 309 309 + vals := make([]string, len(aturis)) 310 310 + args := make([]any, 0, len(aturis)*2) 311 311 + for i, aturi := range aturis { 312 312 + vals[i] = "(?, ?)" 313 313 + did := aturi.Authority().String() 314 314 + rkey := aturi.RecordKey().String() 315 315 + args = append(args, did, rkey) 316 316 + } 317 317 + rows, err := e.Query( 318 318 + fmt.Sprintf( 319 319 + `select r.did, r.name, i.issue_id, i.title, i.open 320 320 + from issues i 321 321 + join repos r 322 322 + on r.at_uri = i.repo_at 323 323 + where (i.did, i.rkey) in (%s)`, 324 324 + strings.Join(vals, ","), 325 325 + ), 326 326 + args..., 327 327 + ) 328 328 + if err != nil { 329 329 + return nil, err 330 330 + } 331 331 + defer rows.Close() 332 332 + var refLinks []models.RichReferenceLink 333 333 + for rows.Next() { 334 334 + var l models.RichReferenceLink 335 335 + l.Kind = models.RefKindIssue 336 336 + if err := rows.Scan(&l.Handle, &l.Repo, &l.SubjectId, &l.Title, &l.State); err != nil { 337 337 + return nil, err 338 338 + } 339 339 + refLinks = append(refLinks, l) 340 340 + } 341 341 + if err := rows.Err(); err != nil { 342 342 + return nil, fmt.Errorf("iterate rows: %w", err) 343 343 + } 344 344 + return refLinks, nil 345 345 + } 346 346 + 347 347 + func getIssueCommentBacklinks(e Execer, aturis []syntax.ATURI) ([]models.RichReferenceLink, error) { 348 348 + if len(aturis) == 0 { 349 349 + return nil, nil 350 350 + } 351 351 + filter := orm.FilterIn("c.at_uri", aturis) 352 352 + rows, err := e.Query( 353 353 + fmt.Sprintf( 354 354 + `select r.did, r.name, i.issue_id, c.id, i.title, i.open 355 355 + from issue_comments c 356 356 + join issues i 357 357 + on i.at_uri = c.issue_at 358 358 + join repos r 359 359 + on r.at_uri = i.repo_at 360 360 + where %s`, 361 361 + filter.Condition(), 362 362 + ), 363 363 + filter.Arg()..., 364 364 + ) 365 365 + if err != nil { 366 366 + return nil, err 367 367 + } 368 368 + defer rows.Close() 369 369 + var refLinks []models.RichReferenceLink 370 370 + for rows.Next() { 371 371 + var l models.RichReferenceLink 372 372 + l.Kind = models.RefKindIssue 373 373 + l.CommentId = new(int) 374 374 + if err := rows.Scan(&l.Handle, &l.Repo, &l.SubjectId, l.CommentId, &l.Title, &l.State); err != nil { 375 375 + return nil, err 376 376 + } 377 377 + refLinks = append(refLinks, l) 378 378 + } 379 379 + if err := rows.Err(); err != nil { 380 380 + return nil, fmt.Errorf("iterate rows: %w", err) 381 381 + } 382 382 + return refLinks, nil 383 383 + } 384 384 + 385 385 + func getPullBacklinks(e Execer, aturis []syntax.ATURI) ([]models.RichReferenceLink, error) { 386 386 + if len(aturis) == 0 { 387 387 + return nil, nil 388 388 + } 389 389 + vals := make([]string, len(aturis)) 390 390 + args := make([]any, 0, len(aturis)*2) 391 391 + for i, aturi := range aturis { 392 392 + vals[i] = "(?, ?)" 393 393 + did := aturi.Authority().String() 394 394 + rkey := aturi.RecordKey().String() 395 395 + args = append(args, did, rkey) 396 396 + } 397 397 + rows, err := e.Query( 398 398 + fmt.Sprintf( 399 399 + `select r.did, r.name, p.pull_id, p.title, p.state 400 400 + from pulls p 401 401 + join repos r 402 402 + on r.at_uri = p.repo_at 403 403 + where (p.owner_did, p.rkey) in (%s)`, 404 404 + strings.Join(vals, ","), 405 405 + ), 406 406 + args..., 407 407 + ) 408 408 + if err != nil { 409 409 + return nil, err 410 410 + } 411 411 + defer rows.Close() 412 412 + var refLinks []models.RichReferenceLink 413 413 + for rows.Next() { 414 414 + var l models.RichReferenceLink 415 415 + l.Kind = models.RefKindPull 416 416 + if err := rows.Scan(&l.Handle, &l.Repo, &l.SubjectId, &l.Title, &l.State); err != nil { 417 417 + return nil, err 418 418 + } 419 419 + refLinks = append(refLinks, l) 420 420 + } 421 421 + if err := rows.Err(); err != nil { 422 422 + return nil, fmt.Errorf("iterate rows: %w", err) 423 423 + } 424 424 + return refLinks, nil 425 425 + } 426 426 + 427 427 + func getPullCommentBacklinks(e Execer, aturis []syntax.ATURI) ([]models.RichReferenceLink, error) { 428 428 + if len(aturis) == 0 { 429 429 + return nil, nil 430 430 + } 431 431 + filter := orm.FilterIn("c.comment_at", aturis) 432 432 + rows, err := e.Query( 433 433 + fmt.Sprintf( 434 434 + `select r.did, r.name, p.pull_id, c.id, p.title, p.state 435 435 + from repos r 436 436 + join pulls p 437 437 + on r.at_uri = p.repo_at 438 438 + join pull_comments c 439 439 + on r.at_uri = c.repo_at and p.pull_id = c.pull_id 440 440 + where %s`, 441 441 + filter.Condition(), 442 442 + ), 443 443 + filter.Arg()..., 444 444 + ) 445 445 + if err != nil { 446 446 + return nil, err 447 447 + } 448 448 + defer rows.Close() 449 449 + var refLinks []models.RichReferenceLink 450 450 + for rows.Next() { 451 451 + var l models.RichReferenceLink 452 452 + l.Kind = models.RefKindPull 453 453 + l.CommentId = new(int) 454 454 + if err := rows.Scan(&l.Handle, &l.Repo, &l.SubjectId, l.CommentId, &l.Title, &l.State); err != nil { 455 455 + return nil, err 456 456 + } 457 457 + refLinks = append(refLinks, l) 458 458 + } 459 459 + if err := rows.Err(); err != nil { 460 460 + return nil, fmt.Errorf("iterate rows: %w", err) 461 461 + } 462 462 + return refLinks, nil 463 463 + }

+5 -3

appview/db/registration.go

··· 7 7 "time" 8 8 9 9 "tangled.org/core/appview/models" 10 10 + "tangled.org/core/orm" 10 11 ) 11 12 12 12 - func GetRegistrations(e Execer, filters ...filter) ([]models.Registration, error) { 13 13 + func GetRegistrations(e Execer, filters ...orm.Filter) ([]models.Registration, error) { 13 14 var registrations []models.Registration 14 15 15 16 var conditions []string ··· 37 38 if err != nil { 38 39 return nil, err 39 40 } 41 41 + defer rows.Close() 40 42 41 43 for rows.Next() { 42 44 var createdAt string ··· 69 71 return registrations, nil 70 72 } 71 73 72 72 - func MarkRegistered(e Execer, filters ...filter) error { 74 74 + func MarkRegistered(e Execer, filters ...orm.Filter) error { 73 75 var conditions []string 74 76 var args []any 75 77 for _, filter := range filters { ··· 94 96 return err 95 97 } 96 98 97 97 - func DeleteKnot(e Execer, filters ...filter) error { 99 99 + func DeleteKnot(e Execer, filters ...orm.Filter) error { 98 100 var conditions []string 99 101 var args []any 100 102 for _, filter := range filters {

+18 -6

appview/db/repos.go

··· 11 11 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 13 "tangled.org/core/appview/models" 14 14 + "tangled.org/core/orm" 14 15 ) 15 16 16 16 - func GetRepos(e Execer, limit int, filters ...filter) ([]models.Repo, error) { 17 17 + func GetRepos(e Execer, limit int, filters ...orm.Filter) ([]models.Repo, error) { 17 18 repoMap := make(map[syntax.ATURI]*models.Repo) 18 19 19 20 var conditions []string ··· 55 56 limitClause, 56 57 ) 57 58 rows, err := e.Query(repoQuery, args...) 58 58 - 59 59 if err != nil { 60 60 return nil, fmt.Errorf("failed to execute repo query: %w ", err) 61 61 } 62 62 + defer rows.Close() 62 63 63 64 for rows.Next() { 64 65 var repo models.Repo ··· 127 128 if err != nil { 128 129 return nil, fmt.Errorf("failed to execute labels query: %w ", err) 129 130 } 131 131 + defer rows.Close() 132 132 + 130 133 for rows.Next() { 131 134 var repoat, labelat string 132 135 if err := rows.Scan(&repoat, &labelat); err != nil { ··· 155 158 from repo_languages 156 159 where repo_at in (%s) 157 160 and is_default_ref = 1 161 161 + and language <> '' 158 162 ) 159 163 where rn = 1 160 164 `, ··· 164 168 if err != nil { 165 169 return nil, fmt.Errorf("failed to execute lang query: %w ", err) 166 170 } 171 171 + defer rows.Close() 172 172 + 167 173 for rows.Next() { 168 174 var repoat, lang string 169 175 if err := rows.Scan(&repoat, &lang); err != nil { ··· 190 196 if err != nil { 191 197 return nil, fmt.Errorf("failed to execute star-count query: %w ", err) 192 198 } 199 199 + defer rows.Close() 200 200 + 193 201 for rows.Next() { 194 202 var repoat string 195 203 var count int ··· 219 227 if err != nil { 220 228 return nil, fmt.Errorf("failed to execute issue-count query: %w ", err) 221 229 } 230 230 + defer rows.Close() 231 231 + 222 232 for rows.Next() { 223 233 var repoat string 224 234 var open, closed int ··· 260 270 if err != nil { 261 271 return nil, fmt.Errorf("failed to execute pulls-count query: %w ", err) 262 272 } 273 273 + defer rows.Close() 274 274 + 263 275 for rows.Next() { 264 276 var repoat string 265 277 var open, merged, closed, deleted int ··· 294 306 } 295 307 296 308 // helper to get exactly one repo 297 297 - func GetRepo(e Execer, filters ...filter) (*models.Repo, error) { 309 309 + func GetRepo(e Execer, filters ...orm.Filter) (*models.Repo, error) { 298 310 repos, err := GetRepos(e, 0, filters...) 299 311 if err != nil { 300 312 return nil, err ··· 311 323 return &repos[0], nil 312 324 } 313 325 314 314 - func CountRepos(e Execer, filters ...filter) (int64, error) { 326 326 + func CountRepos(e Execer, filters ...orm.Filter) (int64, error) { 315 327 var conditions []string 316 328 var args []any 317 329 for _, filter := range filters { ··· 542 554 return err 543 555 } 544 556 545 545 - func UnsubscribeLabel(e Execer, filters ...filter) error { 557 557 + func UnsubscribeLabel(e Execer, filters ...orm.Filter) error { 546 558 var conditions []string 547 559 var args []any 548 560 for _, filter := range filters { ··· 560 572 return err 561 573 } 562 574 563 563 - func GetRepoLabels(e Execer, filters ...filter) ([]models.RepoLabel, error) { 575 575 + func GetRepoLabels(e Execer, filters ...orm.Filter) ([]models.RepoLabel, error) { 564 576 var conditions []string 565 577 var args []any 566 578 for _, filter := range filters {

+6 -5

appview/db/spindle.go

··· 7 7 "time" 8 8 9 9 "tangled.org/core/appview/models" 10 10 + "tangled.org/core/orm" 10 11 ) 11 12 12 12 - func GetSpindles(e Execer, filters ...filter) ([]models.Spindle, error) { 13 13 + func GetSpindles(e Execer, filters ...orm.Filter) ([]models.Spindle, error) { 13 14 var spindles []models.Spindle 14 15 15 16 var conditions []string ··· 91 92 return err 92 93 } 93 94 94 94 - func VerifySpindle(e Execer, filters ...filter) (int64, error) { 95 95 + func VerifySpindle(e Execer, filters ...orm.Filter) (int64, error) { 95 96 var conditions []string 96 97 var args []any 97 98 for _, filter := range filters { ··· 114 115 return res.RowsAffected() 115 116 } 116 117 117 117 - func DeleteSpindle(e Execer, filters ...filter) error { 118 118 + func DeleteSpindle(e Execer, filters ...orm.Filter) error { 118 119 var conditions []string 119 120 var args []any 120 121 for _, filter := range filters { ··· 144 145 return err 145 146 } 146 147 147 147 - func RemoveSpindleMember(e Execer, filters ...filter) error { 148 148 + func RemoveSpindleMember(e Execer, filters ...orm.Filter) error { 148 149 var conditions []string 149 150 var args []any 150 151 for _, filter := range filters { ··· 163 164 return err 164 165 } 165 166 166 166 - func GetSpindleMembers(e Execer, filters ...filter) ([]models.SpindleMember, error) { 167 167 + func GetSpindleMembers(e Execer, filters ...orm.Filter) ([]models.SpindleMember, error) { 167 168 var members []models.SpindleMember 168 169 169 170 var conditions []string

+6 -4

appview/db/star.go

··· 11 11 12 12 "github.com/bluesky-social/indigo/atproto/syntax" 13 13 "tangled.org/core/appview/models" 14 14 + "tangled.org/core/orm" 14 15 ) 15 16 16 17 func AddStar(e Execer, star *models.Star) error { ··· 133 134 134 135 // GetRepoStars return a list of stars each holding target repository. 135 136 // If there isn't known repo with starred at-uri, those stars will be ignored. 136 136 - func GetRepoStars(e Execer, limit int, filters ...filter) ([]models.RepoStar, error) { 137 137 + func GetRepoStars(e Execer, limit int, filters ...orm.Filter) ([]models.RepoStar, error) { 137 138 var conditions []string 138 139 var args []any 139 140 for _, filter := range filters { ··· 164 165 if err != nil { 165 166 return nil, err 166 167 } 168 168 + defer rows.Close() 167 169 168 170 starMap := make(map[string][]models.Star) 169 171 for rows.Next() { ··· 195 197 return nil, nil 196 198 } 197 199 198 198 - repos, err := GetRepos(e, 0, FilterIn("at_uri", args)) 200 200 + repos, err := GetRepos(e, 0, orm.FilterIn("at_uri", args)) 199 201 if err != nil { 200 202 return nil, err 201 203 } ··· 225 227 return repoStars, nil 226 228 } 227 229 228 228 - func CountStars(e Execer, filters ...filter) (int64, error) { 230 230 + func CountStars(e Execer, filters ...orm.Filter) (int64, error) { 229 231 var conditions []string 230 232 var args []any 231 233 for _, filter := range filters { ··· 298 300 } 299 301 300 302 // get full repo data 301 301 - repos, err := GetRepos(e, 0, FilterIn("at_uri", repoUris)) 303 303 + repos, err := GetRepos(e, 0, orm.FilterIn("at_uri", repoUris)) 302 304 if err != nil { 303 305 return nil, err 304 306 }

+4 -3

appview/db/strings.go

··· 8 8 "time" 9 9 10 10 "tangled.org/core/appview/models" 11 11 + "tangled.org/core/orm" 11 12 ) 12 13 13 14 func AddString(e Execer, s models.String) error { ··· 44 45 return err 45 46 } 46 47 47 47 - func GetStrings(e Execer, limit int, filters ...filter) ([]models.String, error) { 48 48 + func GetStrings(e Execer, limit int, filters ...orm.Filter) ([]models.String, error) { 48 49 var all []models.String 49 50 50 51 var conditions []string ··· 127 128 return all, nil 128 129 } 129 130 130 130 - func CountStrings(e Execer, filters ...filter) (int64, error) { 131 131 + func CountStrings(e Execer, filters ...orm.Filter) (int64, error) { 131 132 var conditions []string 132 133 var args []any 133 134 for _, filter := range filters { ··· 151 152 return count, nil 152 153 } 153 154 154 154 - func DeleteString(e Execer, filters ...filter) error { 155 155 + func DeleteString(e Execer, filters ...orm.Filter) error { 155 156 var conditions []string 156 157 var args []any 157 158 for _, filter := range filters {

+9 -8

appview/db/timeline.go

··· 5 5 6 6 "github.com/bluesky-social/indigo/atproto/syntax" 7 7 "tangled.org/core/appview/models" 8 8 + "tangled.org/core/orm" 8 9 ) 9 10 10 11 // TODO: this gathers heterogenous events from different sources and aggregates ··· 84 85 } 85 86 86 87 func getTimelineRepos(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) { 87 87 - filters := make([]filter, 0) 88 88 + filters := make([]orm.Filter, 0) 88 89 if userIsFollowing != nil { 89 89 - filters = append(filters, FilterIn("did", userIsFollowing)) 90 90 + filters = append(filters, orm.FilterIn("did", userIsFollowing)) 90 91 } 91 92 92 93 repos, err := GetRepos(e, limit, filters...) ··· 104 105 105 106 var origRepos []models.Repo 106 107 if args != nil { 107 107 - origRepos, err = GetRepos(e, 0, FilterIn("at_uri", args)) 108 108 + origRepos, err = GetRepos(e, 0, orm.FilterIn("at_uri", args)) 108 109 } 109 110 if err != nil { 110 111 return nil, err ··· 144 145 } 145 146 146 147 func getTimelineStars(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) { 147 147 - filters := make([]filter, 0) 148 148 + filters := make([]orm.Filter, 0) 148 149 if userIsFollowing != nil { 149 149 - filters = append(filters, FilterIn("did", userIsFollowing)) 150 150 + filters = append(filters, orm.FilterIn("did", userIsFollowing)) 150 151 } 151 152 152 153 stars, err := GetRepoStars(e, limit, filters...) ··· 180 181 } 181 182 182 183 func getTimelineFollows(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) { 183 183 - filters := make([]filter, 0) 184 184 + filters := make([]orm.Filter, 0) 184 185 if userIsFollowing != nil { 185 185 - filters = append(filters, FilterIn("user_did", userIsFollowing)) 186 186 + filters = append(filters, orm.FilterIn("user_did", userIsFollowing)) 186 187 } 187 188 188 189 follows, err := GetFollows(e, limit, filters...) ··· 199 200 return nil, nil 200 201 } 201 202 202 202 - profiles, err := GetProfiles(e, FilterIn("did", subjects)) 203 203 + profiles, err := GetProfiles(e, orm.FilterIn("did", subjects)) 203 204 if err != nil { 204 205 return nil, err 205 206 }

+47 -29

appview/ingester.go

··· 21 21 "tangled.org/core/appview/serververify" 22 22 "tangled.org/core/appview/validator" 23 23 "tangled.org/core/idresolver" 24 24 + "tangled.org/core/orm" 24 25 "tangled.org/core/rbac" 25 26 ) 26 27 ··· 253 254 254 255 err = db.AddArtifact(i.Db, artifact) 255 256 case jmodels.CommitOperationDelete: 256 256 - err = db.DeleteArtifact(i.Db, db.FilterEq("did", did), db.FilterEq("rkey", e.Commit.RKey)) 257 257 + err = db.DeleteArtifact(i.Db, orm.FilterEq("did", did), orm.FilterEq("rkey", e.Commit.RKey)) 257 258 } 258 259 259 260 if err != nil { ··· 350 351 351 352 err = db.UpsertProfile(tx, &profile) 352 353 case jmodels.CommitOperationDelete: 353 353 - err = db.DeleteArtifact(i.Db, db.FilterEq("did", did), db.FilterEq("rkey", e.Commit.RKey)) 354 354 + err = db.DeleteArtifact(i.Db, orm.FilterEq("did", did), orm.FilterEq("rkey", e.Commit.RKey)) 354 355 } 355 356 356 357 if err != nil { ··· 424 425 // get record from db first 425 426 members, err := db.GetSpindleMembers( 426 427 ddb, 427 427 - db.FilterEq("did", did), 428 428 - db.FilterEq("rkey", rkey), 428 428 + orm.FilterEq("did", did), 429 429 + orm.FilterEq("rkey", rkey), 429 430 ) 430 431 if err != nil || len(members) != 1 { 431 432 return fmt.Errorf("failed to get member: %w, len(members) = %d", err, len(members)) ··· 440 441 // remove record by rkey && update enforcer 441 442 if err = db.RemoveSpindleMember( 442 443 tx, 443 443 - db.FilterEq("did", did), 444 444 - db.FilterEq("rkey", rkey), 444 444 + orm.FilterEq("did", did), 445 445 + orm.FilterEq("rkey", rkey), 445 446 ); err != nil { 446 447 return fmt.Errorf("failed to remove from db: %w", err) 447 448 } ··· 523 524 // get record from db first 524 525 spindles, err := db.GetSpindles( 525 526 ddb, 526 526 - db.FilterEq("owner", did), 527 527 - db.FilterEq("instance", instance), 527 527 + orm.FilterEq("owner", did), 528 528 + orm.FilterEq("instance", instance), 528 529 ) 529 530 if err != nil || len(spindles) != 1 { 530 531 return fmt.Errorf("failed to get spindles: %w, len(spindles) = %d", err, len(spindles)) ··· 543 544 // remove spindle members first 544 545 err = db.RemoveSpindleMember( 545 546 tx, 546 546 - db.FilterEq("owner", did), 547 547 - db.FilterEq("instance", instance), 547 547 + orm.FilterEq("owner", did), 548 548 + orm.FilterEq("instance", instance), 548 549 ) 549 550 if err != nil { 550 551 return err ··· 552 553 553 554 err = db.DeleteSpindle( 554 555 tx, 555 555 - db.FilterEq("owner", did), 556 556 - db.FilterEq("instance", instance), 556 556 + orm.FilterEq("owner", did), 557 557 + orm.FilterEq("instance", instance), 557 558 ) 558 559 if err != nil { 559 560 return err ··· 621 622 case jmodels.CommitOperationDelete: 622 623 if err := db.DeleteString( 623 624 ddb, 624 624 - db.FilterEq("did", did), 625 625 - db.FilterEq("rkey", rkey), 625 625 + orm.FilterEq("did", did), 626 626 + orm.FilterEq("rkey", rkey), 626 627 ); err != nil { 627 628 l.Error("failed to delete", "err", err) 628 629 return fmt.Errorf("failed to delete string record: %w", err) ··· 740 741 // get record from db first 741 742 registrations, err := db.GetRegistrations( 742 743 ddb, 743 743 - db.FilterEq("domain", domain), 744 744 - db.FilterEq("did", did), 744 744 + orm.FilterEq("domain", domain), 745 745 + orm.FilterEq("did", did), 745 746 ) 746 747 if err != nil { 747 748 return fmt.Errorf("failed to get registration: %w", err) ··· 762 763 763 764 err = db.DeleteKnot( 764 765 tx, 765 765 - db.FilterEq("did", did), 766 766 - db.FilterEq("domain", domain), 766 766 + orm.FilterEq("did", did), 767 767 + orm.FilterEq("domain", domain), 767 768 ) 768 769 if err != nil { 769 770 return err ··· 841 842 return nil 842 843 843 844 case jmodels.CommitOperationDelete: 845 845 + tx, err := ddb.BeginTx(ctx, nil) 846 846 + if err != nil { 847 847 + l.Error("failed to begin transaction", "err", err) 848 848 + return err 849 849 + } 850 850 + defer tx.Rollback() 851 851 + 844 852 if err := db.DeleteIssues( 845 845 - ddb, 846 846 - db.FilterEq("did", did), 847 847 - db.FilterEq("rkey", rkey), 853 853 + tx, 854 854 + did, 855 855 + rkey, 848 856 ); err != nil { 849 857 l.Error("failed to delete", "err", err) 850 858 return fmt.Errorf("failed to delete issue record: %w", err) 859 859 + } 860 860 + if err := tx.Commit(); err != nil { 861 861 + l.Error("failed to commit txn", "err", err) 862 862 + return err 851 863 } 852 864 853 865 return nil ··· 888 900 return fmt.Errorf("failed to validate comment: %w", err) 889 901 } 890 902 891 891 - _, err = db.AddIssueComment(ddb, *comment) 903 903 + tx, err := ddb.Begin() 904 904 + if err != nil { 905 905 + return fmt.Errorf("failed to start transaction: %w", err) 906 906 + } 907 907 + defer tx.Rollback() 908 908 + 909 909 + _, err = db.AddIssueComment(tx, *comment) 892 910 if err != nil { 893 911 return fmt.Errorf("failed to create issue comment: %w", err) 894 912 } 895 913 896 896 - return nil 914 914 + return tx.Commit() 897 915 898 916 case jmodels.CommitOperationDelete: 899 917 if err := db.DeleteIssueComments( 900 918 ddb, 901 901 - db.FilterEq("did", did), 902 902 - db.FilterEq("rkey", rkey), 919 919 + orm.FilterEq("did", did), 920 920 + orm.FilterEq("rkey", rkey), 903 921 ); err != nil { 904 922 return fmt.Errorf("failed to delete issue comment record: %w", err) 905 923 } ··· 952 970 case jmodels.CommitOperationDelete: 953 971 if err := db.DeleteLabelDefinition( 954 972 ddb, 955 955 - db.FilterEq("did", did), 956 956 - db.FilterEq("rkey", rkey), 973 973 + orm.FilterEq("did", did), 974 974 + orm.FilterEq("rkey", rkey), 957 975 ); err != nil { 958 976 return fmt.Errorf("failed to delete labeldef record: %w", err) 959 977 } ··· 993 1011 var repo *models.Repo 994 1012 switch collection { 995 1013 case tangled.RepoIssueNSID: 996 996 - i, err := db.GetIssues(ddb, db.FilterEq("at_uri", subject)) 1014 1014 + i, err := db.GetIssues(ddb, orm.FilterEq("at_uri", subject)) 997 1015 if err != nil || len(i) != 1 { 998 1016 return fmt.Errorf("failed to find subject: %w || subject count %d", err, len(i)) 999 1017 } ··· 1002 1020 return fmt.Errorf("unsupport label subject: %s", collection) 1003 1021 } 1004 1022 1005 1005 - actx, err := db.NewLabelApplicationCtx(ddb, db.FilterIn("at_uri", repo.Labels)) 1023 1023 + actx, err := db.NewLabelApplicationCtx(ddb, orm.FilterIn("at_uri", repo.Labels)) 1006 1024 if err != nil { 1007 1025 return fmt.Errorf("failed to build label application ctx: %w", err) 1008 1026 }

+111 -73

appview/issues/issues.go

··· 19 19 "tangled.org/core/appview/config" 20 20 "tangled.org/core/appview/db" 21 21 issues_indexer "tangled.org/core/appview/indexer/issues" 22 22 + "tangled.org/core/appview/mentions" 22 23 "tangled.org/core/appview/models" 23 24 "tangled.org/core/appview/notify" 24 25 "tangled.org/core/appview/oauth" 25 26 "tangled.org/core/appview/pages" 26 26 - "tangled.org/core/appview/pages/markup" 27 27 "tangled.org/core/appview/pages/repoinfo" 28 28 "tangled.org/core/appview/pagination" 29 29 "tangled.org/core/appview/reporesolver" 30 30 "tangled.org/core/appview/validator" 31 31 "tangled.org/core/idresolver" 32 32 + "tangled.org/core/orm" 32 33 "tangled.org/core/rbac" 33 34 "tangled.org/core/tid" 34 35 ) 35 36 36 37 type Issues struct { 37 37 - oauth *oauth.OAuth 38 38 - repoResolver *reporesolver.RepoResolver 39 39 - enforcer *rbac.Enforcer 40 40 - pages *pages.Pages 41 41 - idResolver *idresolver.Resolver 42 42 - db *db.DB 43 43 - config *config.Config 44 44 - notifier notify.Notifier 45 45 - logger *slog.Logger 46 46 - validator *validator.Validator 47 47 - indexer *issues_indexer.Indexer 38 38 + oauth *oauth.OAuth 39 39 + repoResolver *reporesolver.RepoResolver 40 40 + enforcer *rbac.Enforcer 41 41 + pages *pages.Pages 42 42 + idResolver *idresolver.Resolver 43 43 + mentionsResolver *mentions.Resolver 44 44 + db *db.DB 45 45 + config *config.Config 46 46 + notifier notify.Notifier 47 47 + logger *slog.Logger 48 48 + validator *validator.Validator 49 49 + indexer *issues_indexer.Indexer 48 50 } 49 51 50 52 func New( ··· 53 55 enforcer *rbac.Enforcer, 54 56 pages *pages.Pages, 55 57 idResolver *idresolver.Resolver, 58 58 + mentionsResolver *mentions.Resolver, 56 59 db *db.DB, 57 60 config *config.Config, 58 61 notifier notify.Notifier, ··· 61 64 logger *slog.Logger, 62 65 ) *Issues { 63 66 return &Issues{ 64 64 - oauth: oauth, 65 65 - repoResolver: repoResolver, 66 66 - enforcer: enforcer, 67 67 - pages: pages, 68 68 - idResolver: idResolver, 69 69 - db: db, 70 70 - config: config, 71 71 - notifier: notifier, 72 72 - logger: logger, 73 73 - validator: validator, 74 74 - indexer: indexer, 67 67 + oauth: oauth, 68 68 + repoResolver: repoResolver, 69 69 + enforcer: enforcer, 70 70 + pages: pages, 71 71 + idResolver: idResolver, 72 72 + mentionsResolver: mentionsResolver, 73 73 + db: db, 74 74 + config: config, 75 75 + notifier: notifier, 76 76 + logger: logger, 77 77 + validator: validator, 78 78 + indexer: indexer, 75 79 } 76 80 } 77 81 ··· 101 105 userReactions = db.GetReactionStatusMap(rp.db, user.Did, issue.AtUri()) 102 106 } 103 107 108 108 + backlinks, err := db.GetBacklinks(rp.db, issue.AtUri()) 109 109 + if err != nil { 110 110 + l.Error("failed to fetch backlinks", "err", err) 111 111 + rp.pages.Error503(w) 112 112 + return 113 113 + } 114 114 + 104 115 labelDefs, err := db.GetLabelDefinitions( 105 116 rp.db, 106 106 - db.FilterIn("at_uri", f.Labels), 107 107 - db.FilterContains("scope", tangled.RepoIssueNSID), 117 117 + orm.FilterIn("at_uri", f.Labels), 118 118 + orm.FilterContains("scope", tangled.RepoIssueNSID), 108 119 ) 109 120 if err != nil { 110 121 l.Error("failed to fetch labels", "err", err) ··· 122 133 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 123 134 Issue: issue, 124 135 CommentList: issue.CommentList(), 136 136 + Backlinks: backlinks, 125 137 OrderedReactionKinds: models.OrderedReactionKinds, 126 138 Reactions: reactionMap, 127 139 UserReacted: userReactions, ··· 152 164 newIssue := issue 153 165 newIssue.Title = r.FormValue("title") 154 166 newIssue.Body = r.FormValue("body") 167 167 + newIssue.Mentions, newIssue.References = rp.mentionsResolver.Resolve(r.Context(), newIssue.Body) 155 168 156 169 if err := rp.validator.ValidateIssue(newIssue); err != nil { 157 170 l.Error("validation error", "err", err) ··· 235 248 } 236 249 l = l.With("did", issue.Did, "rkey", issue.Rkey) 237 250 251 251 + tx, err := rp.db.Begin() 252 252 + if err != nil { 253 253 + l.Error("failed to start transaction", "err", err) 254 254 + rp.pages.Notice(w, "issue-comment", "Failed to create comment, try again later.") 255 255 + return 256 256 + } 257 257 + defer tx.Rollback() 258 258 + 238 259 // delete from PDS 239 260 client, err := rp.oauth.AuthorizedClient(r) 240 261 if err != nil { ··· 255 276 } 256 277 257 278 // delete from db 258 258 - if err := db.DeleteIssues(rp.db, db.FilterEq("id", issue.Id)); err != nil { 279 279 + if err := db.DeleteIssues(tx, issue.Did, issue.Rkey); err != nil { 259 280 l.Error("failed to delete issue", "err", err) 260 281 rp.pages.Notice(w, noticeId, "Failed to delete issue.") 261 282 return 262 283 } 284 284 + tx.Commit() 263 285 264 286 rp.notifier.DeleteIssue(r.Context(), issue) 265 287 ··· 293 315 if isIssueOwner || isRepoOwner || isCollaborator { 294 316 err = db.CloseIssues( 295 317 rp.db, 296 296 - db.FilterEq("id", issue.Id), 318 318 + orm.FilterEq("id", issue.Id), 297 319 ) 298 320 if err != nil { 299 321 l.Error("failed to close issue", "err", err) ··· 340 362 if isCollaborator || isRepoOwner || isIssueOwner { 341 363 err := db.ReopenIssues( 342 364 rp.db, 343 343 - db.FilterEq("id", issue.Id), 365 365 + orm.FilterEq("id", issue.Id), 344 366 ) 345 367 if err != nil { 346 368 l.Error("failed to reopen issue", "err", err) ··· 391 413 replyTo = &replyToUri 392 414 } 393 415 416 416 + mentions, references := rp.mentionsResolver.Resolve(r.Context(), body) 417 417 + 394 418 comment := models.IssueComment{ 395 395 - Did: user.Did, 396 396 - Rkey: tid.TID(), 397 397 - IssueAt: issue.AtUri().String(), 398 398 - ReplyTo: replyTo, 399 399 - Body: body, 400 400 - Created: time.Now(), 419 419 + Did: user.Did, 420 420 + Rkey: tid.TID(), 421 421 + IssueAt: issue.AtUri().String(), 422 422 + ReplyTo: replyTo, 423 423 + Body: body, 424 424 + Created: time.Now(), 425 425 + Mentions: mentions, 426 426 + References: references, 401 427 } 402 428 if err = rp.validator.ValidateIssueComment(&comment); err != nil { 403 429 l.Error("failed to validate comment", "err", err) ··· 434 460 } 435 461 }() 436 462 437 437 - commentId, err := db.AddIssueComment(rp.db, comment) 463 463 + tx, err := rp.db.Begin() 464 464 + if err != nil { 465 465 + l.Error("failed to start transaction", "err", err) 466 466 + rp.pages.Notice(w, "issue-comment", "Failed to create comment, try again later.") 467 467 + return 468 468 + } 469 469 + defer tx.Rollback() 470 470 + 471 471 + commentId, err := db.AddIssueComment(tx, comment) 438 472 if err != nil { 439 473 l.Error("failed to create comment", "err", err) 440 474 rp.pages.Notice(w, "issue-comment", "Failed to create comment.") 441 475 return 442 476 } 477 477 + err = tx.Commit() 478 478 + if err != nil { 479 479 + l.Error("failed to commit transaction", "err", err) 480 480 + rp.pages.Notice(w, "issue-comment", "Failed to create comment, try again later.") 481 481 + return 482 482 + } 443 483 444 484 // reset atUri to make rollback a no-op 445 485 atUri = "" ··· 447 487 // notify about the new comment 448 488 comment.Id = commentId 449 489 450 450 - rawMentions := markup.FindUserMentions(comment.Body) 451 451 - idents := rp.idResolver.ResolveIdents(r.Context(), rawMentions) 452 452 - l.Debug("parsed mentions", "raw", rawMentions, "idents", idents) 453 453 - var mentions []syntax.DID 454 454 - for _, ident := range idents { 455 455 - if ident != nil && !ident.Handle.IsInvalidHandle() { 456 456 - mentions = append(mentions, ident.DID) 457 457 - } 458 458 - } 459 490 rp.notifier.NewIssueComment(r.Context(), &comment, mentions) 460 491 461 492 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) ··· 476 507 commentId := chi.URLParam(r, "commentId") 477 508 comments, err := db.GetIssueComments( 478 509 rp.db, 479 479 - db.FilterEq("id", commentId), 510 510 + orm.FilterEq("id", commentId), 480 511 ) 481 512 if err != nil { 482 513 l.Error("failed to fetch comment", "id", commentId) ··· 512 543 commentId := chi.URLParam(r, "commentId") 513 544 comments, err := db.GetIssueComments( 514 545 rp.db, 515 515 - db.FilterEq("id", commentId), 546 546 + orm.FilterEq("id", commentId), 516 547 ) 517 548 if err != nil { 518 549 l.Error("failed to fetch comment", "id", commentId) ··· 554 585 newComment := comment 555 586 newComment.Body = newBody 556 587 newComment.Edited = &now 588 588 + newComment.Mentions, newComment.References = rp.mentionsResolver.Resolve(r.Context(), newBody) 589 589 + 557 590 record := newComment.AsRecord() 558 591 559 559 - _, err = db.AddIssueComment(rp.db, newComment) 592 592 + tx, err := rp.db.Begin() 593 593 + if err != nil { 594 594 + l.Error("failed to start transaction", "err", err) 595 595 + rp.pages.Notice(w, "repo-notice", "Failed to update description, try again later.") 596 596 + return 597 597 + } 598 598 + defer tx.Rollback() 599 599 + 600 600 + _, err = db.AddIssueComment(tx, newComment) 560 601 if err != nil { 561 602 l.Error("failed to perferom update-description query", "err", err) 562 603 rp.pages.Notice(w, "repo-notice", "Failed to update description, try again later.") 563 604 return 564 605 } 606 606 + tx.Commit() 565 607 566 608 // rkey is optional, it was introduced later 567 609 if newComment.Rkey != "" { ··· 611 653 commentId := chi.URLParam(r, "commentId") 612 654 comments, err := db.GetIssueComments( 613 655 rp.db, 614 614 - db.FilterEq("id", commentId), 656 656 + orm.FilterEq("id", commentId), 615 657 ) 616 658 if err != nil { 617 659 l.Error("failed to fetch comment", "id", commentId) ··· 647 689 commentId := chi.URLParam(r, "commentId") 648 690 comments, err := db.GetIssueComments( 649 691 rp.db, 650 650 - db.FilterEq("id", commentId), 692 692 + orm.FilterEq("id", commentId), 651 693 ) 652 694 if err != nil { 653 695 l.Error("failed to fetch comment", "id", commentId) ··· 683 725 commentId := chi.URLParam(r, "commentId") 684 726 comments, err := db.GetIssueComments( 685 727 rp.db, 686 686 - db.FilterEq("id", commentId), 728 728 + orm.FilterEq("id", commentId), 687 729 ) 688 730 if err != nil { 689 731 l.Error("failed to fetch comment", "id", commentId) ··· 710 752 711 753 // optimistic deletion 712 754 deleted := time.Now() 713 713 - err = db.DeleteIssueComments(rp.db, db.FilterEq("id", comment.Id)) 755 755 + err = db.DeleteIssueComments(rp.db, orm.FilterEq("id", comment.Id)) 714 756 if err != nil { 715 757 l.Error("failed to delete comment", "err", err) 716 758 rp.pages.Notice(w, fmt.Sprintf("comment-%s-status", commentId), "failed to delete comment") ··· 799 841 800 842 issues, err = db.GetIssues( 801 843 rp.db, 802 802 - db.FilterIn("id", res.Hits), 844 844 + orm.FilterIn("id", res.Hits), 803 845 ) 804 846 if err != nil { 805 847 l.Error("failed to get issues", "err", err) ··· 815 857 issues, err = db.GetIssuesPaginated( 816 858 rp.db, 817 859 page, 818 818 - db.FilterEq("repo_at", f.RepoAt()), 819 819 - db.FilterEq("open", openInt), 860 860 + orm.FilterEq("repo_at", f.RepoAt()), 861 861 + orm.FilterEq("open", openInt), 820 862 ) 821 863 if err != nil { 822 864 l.Error("failed to get issues", "err", err) ··· 827 869 828 870 labelDefs, err := db.GetLabelDefinitions( 829 871 rp.db, 830 830 - db.FilterIn("at_uri", f.Labels), 831 831 - db.FilterContains("scope", tangled.RepoIssueNSID), 872 872 + orm.FilterIn("at_uri", f.Labels), 873 873 + orm.FilterContains("scope", tangled.RepoIssueNSID), 832 874 ) 833 875 if err != nil { 834 876 l.Error("failed to fetch labels", "err", err) ··· 870 912 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 871 913 }) 872 914 case http.MethodPost: 915 915 + body := r.FormValue("body") 916 916 + mentions, references := rp.mentionsResolver.Resolve(r.Context(), body) 917 917 + 873 918 issue := &models.Issue{ 874 874 - RepoAt: f.RepoAt(), 875 875 - Rkey: tid.TID(), 876 876 - Title: r.FormValue("title"), 877 877 - Body: r.FormValue("body"), 878 878 - Open: true, 879 879 - Did: user.Did, 880 880 - Created: time.Now(), 881 881 - Repo: f, 919 919 + RepoAt: f.RepoAt(), 920 920 + Rkey: tid.TID(), 921 921 + Title: r.FormValue("title"), 922 922 + Body: body, 923 923 + Open: true, 924 924 + Did: user.Did, 925 925 + Created: time.Now(), 926 926 + Mentions: mentions, 927 927 + References: references, 928 928 + Repo: f, 882 929 } 883 930 884 931 if err := rp.validator.ValidateIssue(issue); err != nil { ··· 946 993 // everything is successful, do not rollback the atproto record 947 994 atUri = "" 948 995 949 949 - rawMentions := markup.FindUserMentions(issue.Body) 950 950 - idents := rp.idResolver.ResolveIdents(r.Context(), rawMentions) 951 951 - l.Debug("parsed mentions", "raw", rawMentions, "idents", idents) 952 952 - var mentions []syntax.DID 953 953 - for _, ident := range idents { 954 954 - if ident != nil && !ident.Handle.IsInvalidHandle() { 955 955 - mentions = append(mentions, ident.DID) 956 956 - } 957 957 - } 958 996 rp.notifier.NewIssue(r.Context(), issue, mentions) 959 997 960 998 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f)

+19 -18

appview/knots/knots.go

··· 21 21 "tangled.org/core/appview/xrpcclient" 22 22 "tangled.org/core/eventconsumer" 23 23 "tangled.org/core/idresolver" 24 24 + "tangled.org/core/orm" 24 25 "tangled.org/core/rbac" 25 26 "tangled.org/core/tid" 26 27 ··· 72 73 user := k.OAuth.GetUser(r) 73 74 registrations, err := db.GetRegistrations( 74 75 k.Db, 75 75 - db.FilterEq("did", user.Did), 76 76 + orm.FilterEq("did", user.Did), 76 77 ) 77 78 if err != nil { 78 79 k.Logger.Error("failed to fetch knot registrations", "err", err) ··· 102 103 103 104 registrations, err := db.GetRegistrations( 104 105 k.Db, 105 105 - db.FilterEq("did", user.Did), 106 106 - db.FilterEq("domain", domain), 106 106 + orm.FilterEq("did", user.Did), 107 107 + orm.FilterEq("domain", domain), 107 108 ) 108 109 if err != nil { 109 110 l.Error("failed to get registrations", "err", err) ··· 127 128 repos, err := db.GetRepos( 128 129 k.Db, 129 130 0, 130 130 - db.FilterEq("knot", domain), 131 131 + orm.FilterEq("knot", domain), 131 132 ) 132 133 if err != nil { 133 134 l.Error("failed to get knot repos", "err", err) ··· 293 294 // get record from db first 294 295 registrations, err := db.GetRegistrations( 295 296 k.Db, 296 296 - db.FilterEq("did", user.Did), 297 297 - db.FilterEq("domain", domain), 297 297 + orm.FilterEq("did", user.Did), 298 298 + orm.FilterEq("domain", domain), 298 299 ) 299 300 if err != nil { 300 301 l.Error("failed to get registration", "err", err) ··· 321 322 322 323 err = db.DeleteKnot( 323 324 tx, 324 324 - db.FilterEq("did", user.Did), 325 325 - db.FilterEq("domain", domain), 325 325 + orm.FilterEq("did", user.Did), 326 326 + orm.FilterEq("domain", domain), 326 327 ) 327 328 if err != nil { 328 329 l.Error("failed to delete registration", "err", err) ··· 402 403 // get record from db first 403 404 registrations, err := db.GetRegistrations( 404 405 k.Db, 405 405 - db.FilterEq("did", user.Did), 406 406 - db.FilterEq("domain", domain), 406 406 + orm.FilterEq("did", user.Did), 407 407 + orm.FilterEq("domain", domain), 407 408 ) 408 409 if err != nil { 409 410 l.Error("failed to get registration", "err", err) ··· 493 494 // Get updated registration to show 494 495 registrations, err = db.GetRegistrations( 495 496 k.Db, 496 496 - db.FilterEq("did", user.Did), 497 497 - db.FilterEq("domain", domain), 497 497 + orm.FilterEq("did", user.Did), 498 498 + orm.FilterEq("domain", domain), 498 499 ) 499 500 if err != nil { 500 501 l.Error("failed to get registration", "err", err) ··· 529 530 530 531 registrations, err := db.GetRegistrations( 531 532 k.Db, 532 532 - db.FilterEq("did", user.Did), 533 533 - db.FilterEq("domain", domain), 534 534 - db.FilterIsNot("registered", "null"), 533 533 + orm.FilterEq("did", user.Did), 534 534 + orm.FilterEq("domain", domain), 535 535 + orm.FilterIsNot("registered", "null"), 535 536 ) 536 537 if err != nil { 537 538 l.Error("failed to get registration", "err", err) ··· 637 638 638 639 registrations, err := db.GetRegistrations( 639 640 k.Db, 640 640 - db.FilterEq("did", user.Did), 641 641 - db.FilterEq("domain", domain), 642 642 - db.FilterIsNot("registered", "null"), 641 641 + orm.FilterEq("did", user.Did), 642 642 + orm.FilterEq("domain", domain), 643 643 + orm.FilterIsNot("registered", "null"), 643 644 ) 644 645 if err != nil { 645 646 l.Error("failed to get registration", "err", err)

+5 -4

appview/labels/labels.go

··· 16 16 "tangled.org/core/appview/oauth" 17 17 "tangled.org/core/appview/pages" 18 18 "tangled.org/core/appview/validator" 19 19 + "tangled.org/core/orm" 19 20 "tangled.org/core/rbac" 20 21 "tangled.org/core/tid" 21 22 ··· 88 89 repoAt := r.Form.Get("repo") 89 90 subjectUri := r.Form.Get("subject") 90 91 91 91 - repo, err := db.GetRepo(l.db, db.FilterEq("at_uri", repoAt)) 92 92 + repo, err := db.GetRepo(l.db, orm.FilterEq("at_uri", repoAt)) 92 93 if err != nil { 93 94 fail("Failed to get repository.", err) 94 95 return 95 96 } 96 97 97 98 // find all the labels that this repo subscribes to 98 98 - repoLabels, err := db.GetRepoLabels(l.db, db.FilterEq("repo_at", repoAt)) 99 99 + repoLabels, err := db.GetRepoLabels(l.db, orm.FilterEq("repo_at", repoAt)) 99 100 if err != nil { 100 101 fail("Failed to get labels for this repository.", err) 101 102 return ··· 106 107 labelAts = append(labelAts, rl.LabelAt.String()) 107 108 } 108 109 109 109 - actx, err := db.NewLabelApplicationCtx(l.db, db.FilterIn("at_uri", labelAts)) 110 110 + actx, err := db.NewLabelApplicationCtx(l.db, orm.FilterIn("at_uri", labelAts)) 110 111 if err != nil { 111 112 fail("Invalid form data.", err) 112 113 return 113 114 } 114 115 115 116 // calculate the start state by applying already known labels 116 116 - existingOps, err := db.GetLabelOps(l.db, db.FilterEq("subject", subjectUri)) 117 117 + existingOps, err := db.GetLabelOps(l.db, orm.FilterEq("subject", subjectUri)) 117 118 if err != nil { 118 119 fail("Invalid form data.", err) 119 120 return

+67

appview/mentions/resolver.go

··· 1 1 + package mentions 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "log/slog" 6 6 + 7 7 + "github.com/bluesky-social/indigo/atproto/syntax" 8 8 + "tangled.org/core/appview/config" 9 9 + "tangled.org/core/appview/db" 10 10 + "tangled.org/core/appview/models" 11 11 + "tangled.org/core/appview/pages/markup" 12 12 + "tangled.org/core/idresolver" 13 13 + ) 14 14 + 15 15 + type Resolver struct { 16 16 + config *config.Config 17 17 + idResolver *idresolver.Resolver 18 18 + execer db.Execer 19 19 + logger *slog.Logger 20 20 + } 21 21 + 22 22 + func New( 23 23 + config *config.Config, 24 24 + idResolver *idresolver.Resolver, 25 25 + execer db.Execer, 26 26 + logger *slog.Logger, 27 27 + ) *Resolver { 28 28 + return &Resolver{ 29 29 + config, 30 30 + idResolver, 31 31 + execer, 32 32 + logger, 33 33 + } 34 34 + } 35 35 + 36 36 + func (r *Resolver) Resolve(ctx context.Context, source string) ([]syntax.DID, []syntax.ATURI) { 37 37 + l := r.logger.With("method", "Resolve") 38 38 + 39 39 + rawMentions, rawRefs := markup.FindReferences(r.config.Core.AppviewHost, source) 40 40 + l.Debug("found possible references", "mentions", rawMentions, "refs", rawRefs) 41 41 + 42 42 + idents := r.idResolver.ResolveIdents(ctx, rawMentions) 43 43 + var mentions []syntax.DID 44 44 + for _, ident := range idents { 45 45 + if ident != nil && !ident.Handle.IsInvalidHandle() { 46 46 + mentions = append(mentions, ident.DID) 47 47 + } 48 48 + } 49 49 + l.Debug("found mentions", "mentions", mentions) 50 50 + 51 51 + var resolvedRefs []models.ReferenceLink 52 52 + for _, rawRef := range rawRefs { 53 53 + ident, err := r.idResolver.ResolveIdent(ctx, rawRef.Handle) 54 54 + if err != nil || ident == nil || ident.Handle.IsInvalidHandle() { 55 55 + continue 56 56 + } 57 57 + rawRef.Handle = string(ident.DID) 58 58 + resolvedRefs = append(resolvedRefs, rawRef) 59 59 + } 60 60 + aturiRefs, err := db.ValidateReferenceLinks(r.execer, resolvedRefs) 61 61 + if err != nil { 62 62 + l.Error("failed running query", "err", err) 63 63 + } 64 64 + l.Debug("found references", "refs", aturiRefs) 65 65 + 66 66 + return mentions, aturiRefs 67 67 + }

+3 -2

appview/middleware/middleware.go

··· 18 18 "tangled.org/core/appview/pagination" 19 19 "tangled.org/core/appview/reporesolver" 20 20 "tangled.org/core/idresolver" 21 21 + "tangled.org/core/orm" 21 22 "tangled.org/core/rbac" 22 23 ) 23 24 ··· 217 218 218 219 repo, err := db.GetRepo( 219 220 mw.db, 220 220 - db.FilterEq("did", id.DID.String()), 221 221 - db.FilterEq("name", repoName), 221 221 + orm.FilterEq("did", id.DID.String()), 222 222 + orm.FilterEq("name", repoName), 222 223 ) 223 224 if err != nil { 224 225 log.Println("failed to resolve repo", "err", err)

+70 -34

appview/models/issue.go

··· 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 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 + Mentions []syntax.DID 25 25 + References []syntax.ATURI 24 26 25 27 // optionally, populate this when querying for reverse mappings 26 28 // like comment counts, parent repo etc. ··· 34 36 } 35 37 36 38 func (i *Issue) AsRecord() tangled.RepoIssue { 39 39 + mentions := make([]string, len(i.Mentions)) 40 40 + for i, did := range i.Mentions { 41 41 + mentions[i] = string(did) 42 42 + } 43 43 + references := make([]string, len(i.References)) 44 44 + for i, uri := range i.References { 45 45 + references[i] = string(uri) 46 46 + } 37 47 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), 48 48 + Repo: i.RepoAt.String(), 49 49 + Title: i.Title, 50 50 + Body: &i.Body, 51 51 + Mentions: mentions, 52 52 + References: references, 53 53 + CreatedAt: i.Created.Format(time.RFC3339), 42 54 } 43 55 } 44 56 ··· 161 173 } 162 174 163 175 type IssueComment struct { 164 164 - Id int64 165 165 - Did string 166 166 - Rkey string 167 167 - IssueAt string 168 168 - ReplyTo *string 169 169 - Body string 170 170 - Created time.Time 171 171 - Edited *time.Time 172 172 - Deleted *time.Time 176 176 + Id int64 177 177 + Did string 178 178 + Rkey string 179 179 + IssueAt string 180 180 + ReplyTo *string 181 181 + Body string 182 182 + Created time.Time 183 183 + Edited *time.Time 184 184 + Deleted *time.Time 185 185 + Mentions []syntax.DID 186 186 + References []syntax.ATURI 173 187 } 174 188 175 189 func (i *IssueComment) AtUri() syntax.ATURI { ··· 177 191 } 178 192 179 193 func (i *IssueComment) AsRecord() tangled.RepoIssueComment { 194 194 + mentions := make([]string, len(i.Mentions)) 195 195 + for i, did := range i.Mentions { 196 196 + mentions[i] = string(did) 197 197 + } 198 198 + references := make([]string, len(i.References)) 199 199 + for i, uri := range i.References { 200 200 + references[i] = string(uri) 201 201 + } 180 202 return tangled.RepoIssueComment{ 181 181 - Body: i.Body, 182 182 - Issue: i.IssueAt, 183 183 - CreatedAt: i.Created.Format(time.RFC3339), 184 184 - ReplyTo: i.ReplyTo, 203 203 + Body: i.Body, 204 204 + Issue: i.IssueAt, 205 205 + CreatedAt: i.Created.Format(time.RFC3339), 206 206 + ReplyTo: i.ReplyTo, 207 207 + Mentions: mentions, 208 208 + References: references, 185 209 } 186 210 } 187 211 ··· 205 229 return nil, err 206 230 } 207 231 232 232 + i := record 233 233 + mentions := make([]syntax.DID, len(record.Mentions)) 234 234 + for i, did := range record.Mentions { 235 235 + mentions[i] = syntax.DID(did) 236 236 + } 237 237 + references := make([]syntax.ATURI, len(record.References)) 238 238 + for i, uri := range i.References { 239 239 + references[i] = syntax.ATURI(uri) 240 240 + } 241 241 + 208 242 comment := IssueComment{ 209 209 - Did: ownerDid, 210 210 - Rkey: rkey, 211 211 - Body: record.Body, 212 212 - IssueAt: record.Issue, 213 213 - ReplyTo: record.ReplyTo, 214 214 - Created: created, 243 243 + Did: ownerDid, 244 244 + Rkey: rkey, 245 245 + Body: record.Body, 246 246 + IssueAt: record.Issue, 247 247 + ReplyTo: record.ReplyTo, 248 248 + Created: created, 249 249 + Mentions: mentions, 250 250 + References: references, 215 251 } 216 252 217 253 return &comment, nil

+10

appview/models/pipeline.go

··· 1 1 package models 2 2 3 3 import ( 4 4 + "fmt" 4 5 "slices" 5 6 "time" 6 7 7 8 "github.com/bluesky-social/indigo/atproto/syntax" 8 9 "github.com/go-git/go-git/v5/plumbing" 10 10 + "tangled.org/core/api/tangled" 9 11 spindle "tangled.org/core/spindle/models" 10 12 "tangled.org/core/workflow" 11 13 ) ··· 23 25 // populate when querying for reverse mappings 24 26 Trigger *Trigger 25 27 Statuses map[string]WorkflowStatus 28 28 + } 29 29 + 30 30 + func (p *Pipeline) AtUri() syntax.ATURI { 31 31 + return syntax.ATURI(fmt.Sprintf("at://did:web:%s/%s/%s", p.Knot, tangled.PipelineNSID, p.Rkey)) 26 32 } 27 33 28 34 type WorkflowStatus struct { ··· 128 134 Error *string 129 135 ExitCode int 130 136 } 137 137 + 138 138 + func (ps *PipelineStatus) PipelineAt() syntax.ATURI { 139 139 + return syntax.ATURI(fmt.Sprintf("at://did:web:%s/%s/%s", ps.PipelineKnot, tangled.PipelineNSID, ps.PipelineRkey)) 140 140 + }

+3 -1

appview/models/profile.go

··· 111 111 } 112 112 113 113 type ByMonth struct { 114 114 + Commits int 114 115 RepoEvents []RepoEvent 115 116 IssueEvents IssueEvents 116 117 PullEvents PullEvents ··· 119 120 func (b ByMonth) IsEmpty() bool { 120 121 return len(b.RepoEvents) == 0 && 121 122 len(b.IssueEvents.Items) == 0 && 122 122 - len(b.PullEvents.Items) == 0 123 123 + len(b.PullEvents.Items) == 0 && 124 124 + b.Commits == 0 123 125 } 124 126 125 127 type IssueEvents struct {

+41 -3

appview/models/pull.go

··· 66 66 TargetBranch string 67 67 State PullState 68 68 Submissions []*PullSubmission 69 69 + Mentions []syntax.DID 70 70 + References []syntax.ATURI 69 71 70 72 // stacking 71 73 StackId string // nullable string ··· 92 94 source.Repo = &s 93 95 } 94 96 } 97 97 + mentions := make([]string, len(p.Mentions)) 98 98 + for i, did := range p.Mentions { 99 99 + mentions[i] = string(did) 100 100 + } 101 101 + references := make([]string, len(p.References)) 102 102 + for i, uri := range p.References { 103 103 + references[i] = string(uri) 104 104 + } 95 105 96 106 record := tangled.RepoPull{ 97 97 - Title: p.Title, 98 98 - Body: &p.Body, 99 99 - CreatedAt: p.Created.Format(time.RFC3339), 107 107 + Title: p.Title, 108 108 + Body: &p.Body, 109 109 + Mentions: mentions, 110 110 + References: references, 111 111 + CreatedAt: p.Created.Format(time.RFC3339), 100 112 Target: &tangled.RepoPull_Target{ 101 113 Repo: p.RepoAt.String(), 102 114 Branch: p.TargetBranch, ··· 146 158 147 159 // content 148 160 Body string 161 161 + 162 162 + // meta 163 163 + Mentions []syntax.DID 164 164 + References []syntax.ATURI 149 165 150 166 // meta 151 167 Created time.Time 152 168 } 169 169 + 170 170 + func (p *PullComment) AtUri() syntax.ATURI { 171 171 + return syntax.ATURI(p.CommentAt) 172 172 + } 173 173 + 174 174 + // func (p *PullComment) AsRecord() tangled.RepoPullComment { 175 175 + // mentions := make([]string, len(p.Mentions)) 176 176 + // for i, did := range p.Mentions { 177 177 + // mentions[i] = string(did) 178 178 + // } 179 179 + // references := make([]string, len(p.References)) 180 180 + // for i, uri := range p.References { 181 181 + // references[i] = string(uri) 182 182 + // } 183 183 + // return tangled.RepoPullComment{ 184 184 + // Pull: p.PullAt, 185 185 + // Body: p.Body, 186 186 + // Mentions: mentions, 187 187 + // References: references, 188 188 + // CreatedAt: p.Created.Format(time.RFC3339), 189 189 + // } 190 190 + // } 153 191 154 192 func (p *Pull) LastRoundNumber() int { 155 193 return len(p.Submissions) - 1

+49

appview/models/reference.go

··· 1 1 + package models 2 2 + 3 3 + import "fmt" 4 4 + 5 5 + type RefKind int 6 6 + 7 7 + const ( 8 8 + RefKindIssue RefKind = iota 9 9 + RefKindPull 10 10 + ) 11 11 + 12 12 + func (k RefKind) String() string { 13 13 + if k == RefKindIssue { 14 14 + return "issues" 15 15 + } else { 16 16 + return "pulls" 17 17 + } 18 18 + } 19 19 + 20 20 + // /@alice.com/cool-proj/issues/123 21 21 + // /@alice.com/cool-proj/issues/123#comment-321 22 22 + type ReferenceLink struct { 23 23 + Handle string 24 24 + Repo string 25 25 + Kind RefKind 26 26 + SubjectId int 27 27 + CommentId *int 28 28 + } 29 29 + 30 30 + func (l ReferenceLink) String() string { 31 31 + comment := "" 32 32 + if l.CommentId != nil { 33 33 + comment = fmt.Sprintf("#comment-%d", *l.CommentId) 34 34 + } 35 35 + return fmt.Sprintf("/%s/%s/%s/%d%s", 36 36 + l.Handle, 37 37 + l.Repo, 38 38 + l.Kind.String(), 39 39 + l.SubjectId, 40 40 + comment, 41 41 + ) 42 42 + } 43 43 + 44 44 + type RichReferenceLink struct { 45 45 + ReferenceLink 46 46 + Title string 47 47 + // reusing PullState for both issue & PR 48 48 + State PullState 49 49 + }

+5 -4

appview/notifications/notifications.go

··· 11 11 "tangled.org/core/appview/oauth" 12 12 "tangled.org/core/appview/pages" 13 13 "tangled.org/core/appview/pagination" 14 14 + "tangled.org/core/orm" 14 15 ) 15 16 16 17 type Notifications struct { ··· 53 54 54 55 total, err := db.CountNotifications( 55 56 n.db, 56 56 - db.FilterEq("recipient_did", user.Did), 57 57 + orm.FilterEq("recipient_did", user.Did), 57 58 ) 58 59 if err != nil { 59 60 l.Error("failed to get total notifications", "err", err) ··· 64 65 notifications, err := db.GetNotificationsWithEntities( 65 66 n.db, 66 67 page, 67 67 - db.FilterEq("recipient_did", user.Did), 68 68 + orm.FilterEq("recipient_did", user.Did), 68 69 ) 69 70 if err != nil { 70 71 l.Error("failed to get notifications", "err", err) ··· 96 97 97 98 count, err := db.CountNotifications( 98 99 n.db, 99 99 - db.FilterEq("recipient_did", user.Did), 100 100 - db.FilterEq("read", 0), 100 100 + orm.FilterEq("recipient_did", user.Did), 101 101 + orm.FilterEq("read", 0), 101 102 ) 102 103 if err != nil { 103 104 http.Error(w, "Failed to get unread count", http.StatusInternalServerError)

+77 -66

appview/notify/db/db.go

··· 3 3 import ( 4 4 "context" 5 5 "log" 6 6 - "maps" 7 6 "slices" 8 7 9 8 "github.com/bluesky-social/indigo/atproto/syntax" ··· 12 11 "tangled.org/core/appview/models" 13 12 "tangled.org/core/appview/notify" 14 13 "tangled.org/core/idresolver" 14 14 + "tangled.org/core/orm" 15 15 + "tangled.org/core/sets" 15 16 ) 16 17 17 18 const ( 18 18 - maxMentions = 5 19 19 + maxMentions = 8 19 20 ) 20 21 21 22 type databaseNotifier struct { ··· 42 43 return 43 44 } 44 45 var err error 45 45 - repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(star.RepoAt))) 46 46 + repo, err := db.GetRepo(n.db, orm.FilterEq("at_uri", string(star.RepoAt))) 46 47 if err != nil { 47 48 log.Printf("NewStar: failed to get repos: %v", err) 48 49 return 49 50 } 50 51 51 52 actorDid := syntax.DID(star.Did) 52 52 - recipients := []syntax.DID{syntax.DID(repo.Did)} 53 53 + recipients := sets.Singleton(syntax.DID(repo.Did)) 53 54 eventType := models.NotificationTypeRepoStarred 54 55 entityType := "repo" 55 56 entityId := star.RepoAt.String() ··· 74 75 } 75 76 76 77 func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) { 77 77 - 78 78 - // build the recipients list 79 79 - // - owner of the repo 80 80 - // - collaborators in the repo 81 81 - var recipients []syntax.DID 82 82 - recipients = append(recipients, syntax.DID(issue.Repo.Did)) 83 83 - collaborators, err := db.GetCollaborators(n.db, db.FilterEq("repo_at", issue.Repo.RepoAt())) 78 78 + collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", issue.Repo.RepoAt())) 84 79 if err != nil { 85 80 log.Printf("failed to fetch collaborators: %v", err) 86 81 return 87 82 } 83 83 + 84 84 + // build the recipients list 85 85 + // - owner of the repo 86 86 + // - collaborators in the repo 87 87 + // - remove users already mentioned 88 88 + recipients := sets.Singleton(syntax.DID(issue.Repo.Did)) 88 89 for _, c := range collaborators { 89 89 - recipients = append(recipients, c.SubjectDid) 90 90 + recipients.Insert(c.SubjectDid) 91 91 + } 92 92 + for _, m := range mentions { 93 93 + recipients.Remove(m) 90 94 } 91 95 92 96 actorDid := syntax.DID(issue.Did) ··· 108 112 ) 109 113 n.notifyEvent( 110 114 actorDid, 111 111 - mentions, 115 115 + sets.Collect(slices.Values(mentions)), 112 116 models.NotificationTypeUserMentioned, 113 117 entityType, 114 118 entityId, ··· 119 123 } 120 124 121 125 func (n *databaseNotifier) NewIssueComment(ctx context.Context, comment *models.IssueComment, mentions []syntax.DID) { 122 122 - issues, err := db.GetIssues(n.db, db.FilterEq("at_uri", comment.IssueAt)) 126 126 + issues, err := db.GetIssues(n.db, orm.FilterEq("at_uri", comment.IssueAt)) 123 127 if err != nil { 124 128 log.Printf("NewIssueComment: failed to get issues: %v", err) 125 129 return ··· 130 134 } 131 135 issue := issues[0] 132 136 133 133 - var recipients []syntax.DID 134 134 - recipients = append(recipients, syntax.DID(issue.Repo.Did)) 137 137 + // built the recipients list: 138 138 + // - the owner of the repo 139 139 + // - | if the comment is a reply -> everybody on that thread 140 140 + // | if the comment is a top level -> just the issue owner 141 141 + // - remove mentioned users from the recipients list 142 142 + recipients := sets.Singleton(syntax.DID(issue.Repo.Did)) 135 143 136 144 if comment.IsReply() { 137 145 // if this comment is a reply, then notify everybody in that thread 138 146 parentAtUri := *comment.ReplyTo 139 139 - allThreads := issue.CommentList() 140 147 141 148 // find the parent thread, and add all DIDs from here to the recipient list 142 142 - for _, t := range allThreads { 149 149 + for _, t := range issue.CommentList() { 143 150 if t.Self.AtUri().String() == parentAtUri { 144 144 - recipients = append(recipients, t.Participants()...) 151 151 + for _, p := range t.Participants() { 152 152 + recipients.Insert(p) 153 153 + } 145 154 } 146 155 } 147 156 } else { 148 157 // not a reply, notify just the issue author 149 149 - recipients = append(recipients, syntax.DID(issue.Did)) 158 158 + recipients.Insert(syntax.DID(issue.Did)) 159 159 + } 160 160 + 161 161 + for _, m := range mentions { 162 162 + recipients.Remove(m) 150 163 } 151 164 152 165 actorDid := syntax.DID(comment.Did) ··· 168 181 ) 169 182 n.notifyEvent( 170 183 actorDid, 171 171 - mentions, 184 184 + sets.Collect(slices.Values(mentions)), 172 185 models.NotificationTypeUserMentioned, 173 186 entityType, 174 187 entityId, ··· 184 197 185 198 func (n *databaseNotifier) NewFollow(ctx context.Context, follow *models.Follow) { 186 199 actorDid := syntax.DID(follow.UserDid) 187 187 - recipients := []syntax.DID{syntax.DID(follow.SubjectDid)} 200 200 + recipients := sets.Singleton(syntax.DID(follow.SubjectDid)) 188 201 eventType := models.NotificationTypeFollowed 189 202 entityType := "follow" 190 203 entityId := follow.UserDid ··· 207 220 } 208 221 209 222 func (n *databaseNotifier) NewPull(ctx context.Context, pull *models.Pull) { 210 210 - repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt))) 223 223 + repo, err := db.GetRepo(n.db, orm.FilterEq("at_uri", string(pull.RepoAt))) 211 224 if err != nil { 212 225 log.Printf("NewPull: failed to get repos: %v", err) 213 226 return 214 227 } 215 215 - 216 216 - // build the recipients list 217 217 - // - owner of the repo 218 218 - // - collaborators in the repo 219 219 - var recipients []syntax.DID 220 220 - recipients = append(recipients, syntax.DID(repo.Did)) 221 221 - collaborators, err := db.GetCollaborators(n.db, db.FilterEq("repo_at", repo.RepoAt())) 228 228 + collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", repo.RepoAt())) 222 229 if err != nil { 223 230 log.Printf("failed to fetch collaborators: %v", err) 224 231 return 225 232 } 233 233 + 234 234 + // build the recipients list 235 235 + // - owner of the repo 236 236 + // - collaborators in the repo 237 237 + recipients := sets.Singleton(syntax.DID(repo.Did)) 226 238 for _, c := range collaborators { 227 227 - recipients = append(recipients, c.SubjectDid) 239 239 + recipients.Insert(c.SubjectDid) 228 240 } 229 241 230 242 actorDid := syntax.DID(pull.OwnerDid) ··· 258 270 return 259 271 } 260 272 261 261 - repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", comment.RepoAt)) 273 273 + repo, err := db.GetRepo(n.db, orm.FilterEq("at_uri", comment.RepoAt)) 262 274 if err != nil { 263 275 log.Printf("NewPullComment: failed to get repos: %v", err) 264 276 return ··· 267 279 // build up the recipients list: 268 280 // - repo owner 269 281 // - all pull participants 270 270 - var recipients []syntax.DID 271 271 - recipients = append(recipients, syntax.DID(repo.Did)) 282 282 + // - remove those already mentioned 283 283 + recipients := sets.Singleton(syntax.DID(repo.Did)) 272 284 for _, p := range pull.Participants() { 273 273 - recipients = append(recipients, syntax.DID(p)) 285 285 + recipients.Insert(syntax.DID(p)) 286 286 + } 287 287 + for _, m := range mentions { 288 288 + recipients.Remove(m) 274 289 } 275 290 276 291 actorDid := syntax.DID(comment.OwnerDid) ··· 294 309 ) 295 310 n.notifyEvent( 296 311 actorDid, 297 297 - mentions, 312 312 + sets.Collect(slices.Values(mentions)), 298 313 models.NotificationTypeUserMentioned, 299 314 entityType, 300 315 entityId, ··· 321 336 } 322 337 323 338 func (n *databaseNotifier) NewIssueState(ctx context.Context, actor syntax.DID, issue *models.Issue) { 324 324 - // build up the recipients list: 325 325 - // - repo owner 326 326 - // - repo collaborators 327 327 - // - all issue participants 328 328 - var recipients []syntax.DID 329 329 - recipients = append(recipients, syntax.DID(issue.Repo.Did)) 330 330 - collaborators, err := db.GetCollaborators(n.db, db.FilterEq("repo_at", issue.Repo.RepoAt())) 339 339 + collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", issue.Repo.RepoAt())) 331 340 if err != nil { 332 341 log.Printf("failed to fetch collaborators: %v", err) 333 342 return 334 343 } 344 344 + 345 345 + // build up the recipients list: 346 346 + // - repo owner 347 347 + // - repo collaborators 348 348 + // - all issue participants 349 349 + recipients := sets.Singleton(syntax.DID(issue.Repo.Did)) 335 350 for _, c := range collaborators { 336 336 - recipients = append(recipients, c.SubjectDid) 351 351 + recipients.Insert(c.SubjectDid) 337 352 } 338 353 for _, p := range issue.Participants() { 339 339 - recipients = append(recipients, syntax.DID(p)) 354 354 + recipients.Insert(syntax.DID(p)) 340 355 } 341 356 342 357 entityType := "pull" ··· 366 381 367 382 func (n *databaseNotifier) NewPullState(ctx context.Context, actor syntax.DID, pull *models.Pull) { 368 383 // Get repo details 369 369 - repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt))) 384 384 + repo, err := db.GetRepo(n.db, orm.FilterEq("at_uri", string(pull.RepoAt))) 370 385 if err != nil { 371 386 log.Printf("NewPullState: failed to get repos: %v", err) 372 387 return 373 388 } 374 389 375 375 - // build up the recipients list: 376 376 - // - repo owner 377 377 - // - all pull participants 378 378 - var recipients []syntax.DID 379 379 - recipients = append(recipients, syntax.DID(repo.Did)) 380 380 - collaborators, err := db.GetCollaborators(n.db, db.FilterEq("repo_at", repo.RepoAt())) 390 390 + collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", repo.RepoAt())) 381 391 if err != nil { 382 392 log.Printf("failed to fetch collaborators: %v", err) 383 393 return 384 394 } 395 395 + 396 396 + // build up the recipients list: 397 397 + // - repo owner 398 398 + // - all pull participants 399 399 + recipients := sets.Singleton(syntax.DID(repo.Did)) 385 400 for _, c := range collaborators { 386 386 - recipients = append(recipients, c.SubjectDid) 401 401 + recipients.Insert(c.SubjectDid) 387 402 } 388 403 for _, p := range pull.Participants() { 389 389 - recipients = append(recipients, syntax.DID(p)) 404 404 + recipients.Insert(syntax.DID(p)) 390 405 } 391 406 392 407 entityType := "pull" ··· 422 437 423 438 func (n *databaseNotifier) notifyEvent( 424 439 actorDid syntax.DID, 425 425 - recipients []syntax.DID, 440 440 + recipients sets.Set[syntax.DID], 426 441 eventType models.NotificationType, 427 442 entityType string, 428 443 entityId string, ··· 430 445 issueId *int64, 431 446 pullId *int64, 432 447 ) { 433 433 - if eventType == models.NotificationTypeUserMentioned && len(recipients) > maxMentions { 434 434 - recipients = recipients[:maxMentions] 448 448 + // if the user is attempting to mention >maxMentions users, this is probably spam, do not mention anybody 449 449 + if eventType == models.NotificationTypeUserMentioned && recipients.Len() > maxMentions { 450 450 + return 435 451 } 436 436 - recipientSet := make(map[syntax.DID]struct{}) 437 437 - for _, did := range recipients { 438 438 - // everybody except actor themselves 439 439 - if did != actorDid { 440 440 - recipientSet[did] = struct{}{} 441 441 - } 442 442 - } 452 452 + 453 453 + recipients.Remove(actorDid) 443 454 444 455 prefMap, err := db.GetNotificationPreferences( 445 456 n.db, 446 446 - db.FilterIn("user_did", slices.Collect(maps.Keys(recipientSet))), 457 457 + orm.FilterIn("user_did", slices.Collect(recipients.All())), 447 458 ) 448 459 if err != nil { 449 460 // failed to get prefs for users ··· 459 470 defer tx.Rollback() 460 471 461 472 // filter based on preferences 462 462 - for recipientDid := range recipientSet { 473 473 + for recipientDid := range recipients.All() { 463 474 prefs, ok := prefMap[recipientDid] 464 475 if !ok { 465 476 prefs = models.DefaultNotificationPreferences(recipientDid)

-1

appview/notify/merged_notifier.go

··· 39 39 v.Call(in) 40 40 }(n) 41 41 } 42 42 - wg.Wait() 43 42 } 44 43 45 44 func (m *mergedNotifier) NewRepo(ctx context.Context, repo *models.Repo) {

+3 -2

appview/oauth/handler.go

··· 16 16 "tangled.org/core/api/tangled" 17 17 "tangled.org/core/appview/db" 18 18 "tangled.org/core/consts" 19 19 + "tangled.org/core/orm" 19 20 "tangled.org/core/tid" 20 21 ) 21 22 ··· 97 98 // and create an sh.tangled.spindle.member record with that 98 99 spindleMembers, err := db.GetSpindleMembers( 99 100 o.Db, 100 100 - db.FilterEq("instance", "spindle.tangled.sh"), 101 101 - db.FilterEq("subject", did), 101 101 + orm.FilterEq("instance", "spindle.tangled.sh"), 102 102 + orm.FilterEq("subject", did), 102 103 ) 103 104 if err != nil { 104 105 l.Error("failed to get spindle members", "err", err)

+7 -2

appview/pages/funcmap.go

··· 25 25 "github.com/dustin/go-humanize" 26 26 "github.com/go-enry/go-enry/v2" 27 27 "github.com/yuin/goldmark" 28 28 + emoji "github.com/yuin/goldmark-emoji" 28 29 "tangled.org/core/appview/filetree" 29 30 "tangled.org/core/appview/models" 30 31 "tangled.org/core/appview/pages/markup" ··· 162 163 } 163 164 return pairs, nil 164 165 }, 165 165 - "append": func(s []string, values ...string) []string { 166 166 + "append": func(s []any, values ...any) []any { 166 167 s = append(s, values...) 167 168 return s 168 169 }, ··· 261 262 }, 262 263 "description": func(text string) template.HTML { 263 264 p.rctx.RendererType = markup.RendererTypeDefault 264 264 - htmlString := p.rctx.RenderMarkdownWith(text, goldmark.New()) 265 265 + htmlString := p.rctx.RenderMarkdownWith(text, goldmark.New( 266 266 + goldmark.WithExtensions( 267 267 + emoji.Emoji, 268 268 + ), 269 269 + )) 265 270 sanitized := p.rctx.SanitizeDescription(htmlString) 266 271 return template.HTML(sanitized) 267 272 },

+13 -3

appview/pages/markup/extension/atlink.go

··· 35 35 return KindAt 36 36 } 37 37 38 38 - var atRegexp = regexp.MustCompile(`(^|\s|\()(@)([a-zA-Z0-9.-]+)(\b)`) 38 38 + var atRegexp = regexp.MustCompile(`(^|\s|\()(@)([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\b)`) 39 39 + var markdownLinkRegexp = regexp.MustCompile(`(?ms)\[.*\]\(.*\)`) 39 40 40 41 type atParser struct{} 41 42 ··· 55 56 if m == nil { 56 57 return nil 57 58 } 59 59 + 60 60 + // Check for all links in the markdown to see if the handle found is inside one 61 61 + linksIndexes := markdownLinkRegexp.FindAllIndex(block.Source(), -1) 62 62 + for _, linkMatch := range linksIndexes { 63 63 + if linkMatch[0] < segment.Start && segment.Start < linkMatch[1] { 64 64 + return nil 65 65 + } 66 66 + } 67 67 + 58 68 atSegment := text.NewSegment(segment.Start, segment.Start+m[1]) 59 69 block.Advance(m[1]) 60 70 node := &AtNode{} ··· 87 97 88 98 func (r *atHtmlRenderer) renderAt(w util.BufWriter, source []byte, n ast.Node, entering bool) (ast.WalkStatus, error) { 89 99 if entering { 90 90 - w.WriteString(`<a href="/@`) 100 100 + w.WriteString(`<a href="/`) 91 101 w.WriteString(n.(*AtNode).Handle) 92 92 - w.WriteString(`" class="mention font-bold">`) 102 102 + w.WriteString(`" class="mention">`) 93 103 } else { 94 104 w.WriteString("</a>") 95 105 }

+2 -26

appview/pages/markup/markdown.go

··· 12 12 13 13 chromahtml "github.com/alecthomas/chroma/v2/formatters/html" 14 14 "github.com/alecthomas/chroma/v2/styles" 15 15 - treeblood "github.com/wyatt915/goldmark-treeblood" 16 15 "github.com/yuin/goldmark" 16 16 + "github.com/yuin/goldmark-emoji" 17 17 highlighting "github.com/yuin/goldmark-highlighting/v2" 18 18 "github.com/yuin/goldmark/ast" 19 19 "github.com/yuin/goldmark/extension" ··· 65 65 extension.NewFootnote( 66 66 extension.WithFootnoteIDPrefix([]byte("footnote")), 67 67 ), 68 68 - treeblood.MathML(), 69 68 callout.CalloutExtention, 70 69 textension.AtExt, 70 70 + emoji.Emoji, 71 71 ), 72 72 goldmark.WithParserOptions( 73 73 parser.WithAutoHeadingID(), ··· 302 302 } 303 303 304 304 return path.Join(rctx.CurrentDir, dst) 305 305 - } 306 306 - 307 307 - // FindUserMentions returns Set of user handles from given markup soruce. 308 308 - // It doesn't guarntee unique DIDs 309 309 - func FindUserMentions(source string) []string { 310 310 - var ( 311 311 - mentions []string 312 312 - mentionsSet = make(map[string]struct{}) 313 313 - md = NewMarkdown() 314 314 - sourceBytes = []byte(source) 315 315 - root = md.Parser().Parse(text.NewReader(sourceBytes)) 316 316 - ) 317 317 - ast.Walk(root, func(n ast.Node, entering bool) (ast.WalkStatus, error) { 318 318 - if entering && n.Kind() == textension.KindAt { 319 319 - handle := n.(*textension.AtNode).Handle 320 320 - mentionsSet[handle] = struct{}{} 321 321 - return ast.WalkSkipChildren, nil 322 322 - } 323 323 - return ast.WalkContinue, nil 324 324 - }) 325 325 - for handle := range mentionsSet { 326 326 - mentions = append(mentions, handle) 327 327 - } 328 328 - return mentions 329 305 } 330 306 331 307 func isAbsoluteUrl(link string) bool {

+121

appview/pages/markup/markdown_test.go

··· 1 1 + package markup 2 2 + 3 3 + import ( 4 4 + "bytes" 5 5 + "testing" 6 6 + ) 7 7 + 8 8 + func TestAtExtension_Rendering(t *testing.T) { 9 9 + tests := []struct { 10 10 + name string 11 11 + markdown string 12 12 + expected string 13 13 + }{ 14 14 + { 15 15 + name: "renders simple at mention", 16 16 + markdown: "Hello @user.tngl.sh!", 17 17 + expected: `<p>Hello <a href="/user.tngl.sh" class="mention">@user.tngl.sh</a>!</p>`, 18 18 + }, 19 19 + { 20 20 + name: "renders multiple at mentions", 21 21 + markdown: "Hi @alice.tngl.sh and @bob.example.com", 22 22 + expected: `<p>Hi <a href="/alice.tngl.sh" class="mention">@alice.tngl.sh</a> and <a href="/bob.example.com" class="mention">@bob.example.com</a></p>`, 23 23 + }, 24 24 + { 25 25 + name: "renders at mention in parentheses", 26 26 + markdown: "Check this out (@user.tngl.sh)", 27 27 + expected: `<p>Check this out (<a href="/user.tngl.sh" class="mention">@user.tngl.sh</a>)</p>`, 28 28 + }, 29 29 + { 30 30 + name: "does not render email", 31 31 + markdown: "Contact me at test@example.com", 32 32 + expected: `<p>Contact me at <a href="mailto:test@example.com">test@example.com</a></p>`, 33 33 + }, 34 34 + { 35 35 + name: "renders at mention with hyphen", 36 36 + markdown: "Follow @user-name.tngl.sh", 37 37 + expected: `<p>Follow <a href="/user-name.tngl.sh" class="mention">@user-name.tngl.sh</a></p>`, 38 38 + }, 39 39 + { 40 40 + name: "renders at mention with numbers", 41 41 + markdown: "@user123.test456.social", 42 42 + expected: `<p><a href="/user123.test456.social" class="mention">@user123.test456.social</a></p>`, 43 43 + }, 44 44 + { 45 45 + name: "at mention at start of line", 46 46 + markdown: "@user.tngl.sh is cool", 47 47 + expected: `<p><a href="/user.tngl.sh" class="mention">@user.tngl.sh</a> is cool</p>`, 48 48 + }, 49 49 + } 50 50 + 51 51 + for _, tt := range tests { 52 52 + t.Run(tt.name, func(t *testing.T) { 53 53 + md := NewMarkdown() 54 54 + 55 55 + var buf bytes.Buffer 56 56 + if err := md.Convert([]byte(tt.markdown), &buf); err != nil { 57 57 + t.Fatalf("failed to convert markdown: %v", err) 58 58 + } 59 59 + 60 60 + result := buf.String() 61 61 + if result != tt.expected+"\n" { 62 62 + t.Errorf("expected:\n%s\ngot:\n%s", tt.expected, result) 63 63 + } 64 64 + }) 65 65 + } 66 66 + } 67 67 + 68 68 + func TestAtExtension_WithOtherMarkdown(t *testing.T) { 69 69 + tests := []struct { 70 70 + name string 71 71 + markdown string 72 72 + contains string 73 73 + }{ 74 74 + { 75 75 + name: "at mention with bold", 76 76 + markdown: "**Hello @user.tngl.sh**", 77 77 + contains: `<strong>Hello <a href="/user.tngl.sh" class="mention">@user.tngl.sh</a></strong>`, 78 78 + }, 79 79 + { 80 80 + name: "at mention with italic", 81 81 + markdown: "*Check @user.tngl.sh*", 82 82 + contains: `<em>Check <a href="/user.tngl.sh" class="mention">@user.tngl.sh</a></em>`, 83 83 + }, 84 84 + { 85 85 + name: "at mention in list", 86 86 + markdown: "- Item 1\n- @user.tngl.sh\n- Item 3", 87 87 + contains: `<a href="/user.tngl.sh" class="mention">@user.tngl.sh</a>`, 88 88 + }, 89 89 + { 90 90 + name: "at mention in link", 91 91 + markdown: "[@regnault.dev](https://regnault.dev)", 92 92 + contains: `<a href="https://regnault.dev">@regnault.dev</a>`, 93 93 + }, 94 94 + { 95 95 + name: "at mention in link again", 96 96 + markdown: "[check out @regnault.dev](https://regnault.dev)", 97 97 + contains: `<a href="https://regnault.dev">check out @regnault.dev</a>`, 98 98 + }, 99 99 + { 100 100 + name: "at mention in link again, multiline", 101 101 + markdown: "[\ncheck out @regnault.dev](https://regnault.dev)", 102 102 + contains: "<a href=\"https://regnault.dev\">\ncheck out @regnault.dev</a>", 103 103 + }, 104 104 + } 105 105 + 106 106 + for _, tt := range tests { 107 107 + t.Run(tt.name, func(t *testing.T) { 108 108 + md := NewMarkdown() 109 109 + 110 110 + var buf bytes.Buffer 111 111 + if err := md.Convert([]byte(tt.markdown), &buf); err != nil { 112 112 + t.Fatalf("failed to convert markdown: %v", err) 113 113 + } 114 114 + 115 115 + result := buf.String() 116 116 + if !bytes.Contains([]byte(result), []byte(tt.contains)) { 117 117 + t.Errorf("expected output to contain:\n%s\ngot:\n%s", tt.contains, result) 118 118 + } 119 119 + }) 120 120 + } 121 121 + }

+124

appview/pages/markup/reference_link.go

··· 1 1 + package markup 2 2 + 3 3 + import ( 4 4 + "maps" 5 5 + "net/url" 6 6 + "path" 7 7 + "slices" 8 8 + "strconv" 9 9 + "strings" 10 10 + 11 11 + "github.com/yuin/goldmark/ast" 12 12 + "github.com/yuin/goldmark/text" 13 13 + "tangled.org/core/appview/models" 14 14 + textension "tangled.org/core/appview/pages/markup/extension" 15 15 + ) 16 16 + 17 17 + // FindReferences collects all links referencing tangled-related objects 18 18 + // like issues, PRs, comments or even @-mentions 19 19 + // This funciton doesn't actually check for the existence of records in the DB 20 20 + // or the PDS; it merely returns a list of what are presumed to be references. 21 21 + func FindReferences(baseUrl string, source string) ([]string, []models.ReferenceLink) { 22 22 + var ( 23 23 + refLinkSet = make(map[models.ReferenceLink]struct{}) 24 24 + mentionsSet = make(map[string]struct{}) 25 25 + md = NewMarkdown() 26 26 + sourceBytes = []byte(source) 27 27 + root = md.Parser().Parse(text.NewReader(sourceBytes)) 28 28 + ) 29 29 + // trim url scheme. the SSL shouldn't matter 30 30 + baseUrl = strings.TrimPrefix(baseUrl, "https://") 31 31 + baseUrl = strings.TrimPrefix(baseUrl, "http://") 32 32 + 33 33 + ast.Walk(root, func(n ast.Node, entering bool) (ast.WalkStatus, error) { 34 34 + if !entering { 35 35 + return ast.WalkContinue, nil 36 36 + } 37 37 + switch n.Kind() { 38 38 + case textension.KindAt: 39 39 + handle := n.(*textension.AtNode).Handle 40 40 + mentionsSet[handle] = struct{}{} 41 41 + return ast.WalkSkipChildren, nil 42 42 + case ast.KindLink: 43 43 + dest := string(n.(*ast.Link).Destination) 44 44 + ref := parseTangledLink(baseUrl, dest) 45 45 + if ref != nil { 46 46 + refLinkSet[*ref] = struct{}{} 47 47 + } 48 48 + return ast.WalkSkipChildren, nil 49 49 + case ast.KindAutoLink: 50 50 + an := n.(*ast.AutoLink) 51 51 + if an.AutoLinkType == ast.AutoLinkURL { 52 52 + dest := string(an.URL(sourceBytes)) 53 53 + ref := parseTangledLink(baseUrl, dest) 54 54 + if ref != nil { 55 55 + refLinkSet[*ref] = struct{}{} 56 56 + } 57 57 + } 58 58 + return ast.WalkSkipChildren, nil 59 59 + } 60 60 + return ast.WalkContinue, nil 61 61 + }) 62 62 + mentions := slices.Collect(maps.Keys(mentionsSet)) 63 63 + references := slices.Collect(maps.Keys(refLinkSet)) 64 64 + return mentions, references 65 65 + } 66 66 + 67 67 + func parseTangledLink(baseHost string, urlStr string) *models.ReferenceLink { 68 68 + u, err := url.Parse(urlStr) 69 69 + if err != nil { 70 70 + return nil 71 71 + } 72 72 + 73 73 + if u.Host != "" && !strings.EqualFold(u.Host, baseHost) { 74 74 + return nil 75 75 + } 76 76 + 77 77 + p := path.Clean(u.Path) 78 78 + parts := strings.FieldsFunc(p, func(r rune) bool { return r == '/' }) 79 79 + if len(parts) < 4 { 80 80 + // need at least: handle / repo / kind / id 81 81 + return nil 82 82 + } 83 83 + 84 84 + var ( 85 85 + handle = parts[0] 86 86 + repo = parts[1] 87 87 + kindSeg = parts[2] 88 88 + subjectSeg = parts[3] 89 89 + ) 90 90 + 91 91 + handle = strings.TrimPrefix(handle, "@") 92 92 + 93 93 + var kind models.RefKind 94 94 + switch kindSeg { 95 95 + case "issues": 96 96 + kind = models.RefKindIssue 97 97 + case "pulls": 98 98 + kind = models.RefKindPull 99 99 + default: 100 100 + return nil 101 101 + } 102 102 + 103 103 + subjectId, err := strconv.Atoi(subjectSeg) 104 104 + if err != nil { 105 105 + return nil 106 106 + } 107 107 + var commentId *int 108 108 + if u.Fragment != "" { 109 109 + if strings.HasPrefix(u.Fragment, "comment-") { 110 110 + commentIdStr := u.Fragment[len("comment-"):] 111 111 + if id, err := strconv.Atoi(commentIdStr); err == nil { 112 112 + commentId = &id 113 113 + } 114 114 + } 115 115 + } 116 116 + 117 117 + return &models.ReferenceLink{ 118 118 + Handle: handle, 119 119 + Repo: repo, 120 120 + Kind: kind, 121 121 + SubjectId: subjectId, 122 122 + CommentId: commentId, 123 123 + } 124 124 + }

+42

appview/pages/markup/reference_link_test.go

··· 1 1 + package markup_test 2 2 + 3 3 + import ( 4 4 + "testing" 5 5 + 6 6 + "github.com/stretchr/testify/assert" 7 7 + "tangled.org/core/appview/models" 8 8 + "tangled.org/core/appview/pages/markup" 9 9 + ) 10 10 + 11 11 + func TestMarkupParsing(t *testing.T) { 12 12 + tests := []struct { 13 13 + name string 14 14 + source string 15 15 + wantHandles []string 16 16 + wantRefLinks []models.ReferenceLink 17 17 + }{ 18 18 + { 19 19 + name: "normal link", 20 20 + source: `[link](http://127.0.0.1:3000/alice.pds.tngl.boltless.dev/coolproj/issues/1)`, 21 21 + wantHandles: make([]string, 0), 22 22 + wantRefLinks: []models.ReferenceLink{ 23 23 + {Handle: "alice.pds.tngl.boltless.dev", Repo: "coolproj", Kind: models.RefKindIssue, SubjectId: 1, CommentId: nil}, 24 24 + }, 25 25 + }, 26 26 + { 27 27 + name: "commonmark style autolink", 28 28 + source: `<http://127.0.0.1:3000/alice.pds.tngl.boltless.dev/coolproj/issues/1>`, 29 29 + wantHandles: make([]string, 0), 30 30 + wantRefLinks: []models.ReferenceLink{ 31 31 + {Handle: "alice.pds.tngl.boltless.dev", Repo: "coolproj", Kind: models.RefKindIssue, SubjectId: 1, CommentId: nil}, 32 32 + }, 33 33 + }, 34 34 + } 35 35 + for _, tt := range tests { 36 36 + t.Run(tt.name, func(t *testing.T) { 37 37 + handles, refLinks := markup.FindReferences("http://127.0.0.1:3000", tt.source) 38 38 + assert.ElementsMatch(t, tt.wantHandles, handles) 39 39 + assert.ElementsMatch(t, tt.wantRefLinks, refLinks) 40 40 + }) 41 41 + } 42 42 + }

+4 -3

appview/pages/pages.go

··· 31 31 "github.com/bluesky-social/indigo/atproto/identity" 32 32 "github.com/bluesky-social/indigo/atproto/syntax" 33 33 "github.com/go-git/go-git/v5/plumbing" 34 34 - "github.com/go-git/go-git/v5/plumbing/object" 35 34 ) 36 35 37 36 //go:embed templates/* static legal ··· 641 640 } 642 641 643 642 func (p *Pages) StarBtnFragment(w io.Writer, params StarBtnFragmentParams) error { 644 644 - return p.executePlain("fragments/starBtn", w, params) 643 643 + return p.executePlain("fragments/starBtn-oob", w, params) 645 644 } 646 645 647 646 type RepoIndexParams struct { ··· 649 648 RepoInfo repoinfo.RepoInfo 650 649 Active string 651 650 TagMap map[string][]string 652 652 - CommitsTrunc []*object.Commit 651 651 + CommitsTrunc []types.Commit 653 652 TagsTrunc []*types.TagReference 654 653 BranchesTrunc []types.Branch 655 654 // ForkInfo *types.ForkInfo ··· 934 933 Active string 935 934 Issue *models.Issue 936 935 CommentList []models.CommentListItem 936 936 + Backlinks []models.RichReferenceLink 937 937 LabelDefs map[string]*models.LabelDefinition 938 938 939 939 OrderedReactionKinds []models.ReactionKind ··· 1087 1087 Pull *models.Pull 1088 1088 Stack models.Stack 1089 1089 AbandonedPulls []*models.Pull 1090 1090 + Backlinks []models.RichReferenceLink 1090 1091 BranchDeleteStatus *models.BranchDeleteStatus 1091 1092 MergeCheck types.MergeCheckResponse 1092 1093 ResubmitCheck ResubmitResult

+1 -1

appview/pages/templates/banner.html

··· 30 30 <div class="mx-6"> 31 31 These services may not be fully accessible until upgraded. 32 32 <a class="underline text-red-800 dark:text-red-200" 33 33 - href="https://tangled.org/@tangled.org/core/tree/master/docs/migrations.md"> 33 33 + href="https://docs.tangled.org/migrating-knots-spindles.html#migrating-knots-spindles"> 34 34 Click to read the upgrade guide</a>. 35 35 </div> 36 36 </details>

+5

appview/pages/templates/fragments/starBtn-oob.html

··· 1 1 + {{ define "fragments/starBtn-oob" }} 2 2 + <div hx-swap-oob='outerHTML:#starBtn[data-star-subject-at="{{ .SubjectAt }}"]'> 3 3 + {{ template "fragments/starBtn" . }} 4 4 + </div> 5 5 + {{ end }}

+1 -3

appview/pages/templates/fragments/starBtn.html

··· 1 1 {{ define "fragments/starBtn" }} 2 2 + {{/* NOTE: this fragment is always replaced with hx-swap-oob */}} 2 3 <button 3 4 id="starBtn" 4 5 class="btn disabled:opacity-50 disabled:cursor-not-allowed flex gap-2 items-center group" ··· 10 11 {{ end }} 11 12 12 13 hx-trigger="click" 13 13 - hx-target="this" 14 14 - hx-swap="outerHTML" 15 15 - hx-swap-oob='outerHTML:#starBtn[data-star-subject-at="{{ .SubjectAt }}"]' 16 14 hx-disabled-elt="#starBtn" 17 15 > 18 16 {{ if .IsStarred }}

+22

appview/pages/templates/fragments/tinyAvatarList.html

··· 1 1 + {{ define "fragments/tinyAvatarList" }} 2 2 + {{ $all := .all }} 3 3 + {{ $classes := .classes }} 4 4 + {{ $ps := take $all 5 }} 5 5 + <div class="inline-flex items-center -space-x-3"> 6 6 + {{ $c := "z-50 z-40 z-30 z-20 z-10" }} 7 7 + {{ range $i, $p := $ps }} 8 8 + <img 9 9 + src="{{ tinyAvatar . }}" 10 10 + alt="" 11 11 + class="rounded-full size-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0 {{ $classes }}" 12 12 + /> 13 13 + {{ end }} 14 14 + 15 15 + {{ if gt (len $all) 5 }} 16 16 + <span class="pl-4 text-gray-500 dark:text-gray-400 text-sm"> 17 17 + +{{ sub (len $all) 5 }} 18 18 + </span> 19 19 + {{ end }} 20 20 + </div> 21 21 + {{ end }} 22 22 +

+1 -1

appview/pages/templates/knots/index.html

··· 105 105 {{ define "docsButton" }} 106 106 <a 107 107 class="btn flex items-center gap-2" 108 108 - href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md"> 108 108 + href="https://docs.tangled.org/knot-self-hosting-guide.html#knot-self-hosting-guide"> 109 109 {{ i "book" "size-4" }} 110 110 docs 111 111 </a>

+2 -2

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

··· 26 26 <div class="flex flex-col gap-1"> 27 27 <div class="{{ $headerStyle }}">resources</div> 28 28 <a href="https://blog.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a> 29 29 - <a href="https://tangled.org/@tangled.org/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a> 29 29 + <a href="https://docs.tangled.org" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a> 30 30 <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a> 31 31 <a href="https://tangled.org/brand" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a> 32 32 </div> ··· 73 73 <div class="flex flex-col gap-1"> 74 74 <div class="{{ $headerStyle }}">resources</div> 75 75 <a href="https://blog.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a> 76 76 - <a href="https://tangled.org/@tangled.org/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a> 76 76 + <a href="https://docs.tangled.org" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a> 77 77 <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a> 78 78 <a href="https://tangled.org/brand" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a> 79 79 </div>

+34 -9

appview/pages/templates/repo/commit.html

··· 25 25 </div> 26 26 27 27 <div class="flex flex-wrap items-center space-x-2"> 28 28 - <p class="flex flex-wrap items-center gap-2 text-sm text-gray-500 dark:text-gray-300"> 29 29 - {{ $did := index $.EmailToDid $commit.Author.Email }} 30 30 - 31 31 - {{ if $did }} 32 32 - {{ template "user/fragments/picHandleLink" $did }} 33 33 - {{ else }} 34 34 - <a href="mailto:{{ $commit.Author.Email }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ $commit.Author.Name }}</a> 35 35 - {{ end }} 28 28 + <p class="flex flex-wrap items-center gap-1 text-sm text-gray-500 dark:text-gray-300"> 29 29 + {{ template "attribution" . }} 36 30 37 31 <span class="px-1 select-none before:content-['\00B7']"></span> 38 38 - {{ template "repo/fragments/time" $commit.Author.When }} 32 32 + {{ template "repo/fragments/time" $commit.Committer.When }} 39 33 <span class="px-1 select-none before:content-['\00B7']"></span> 40 34 41 35 <a href="/{{ $repo }}/commit/{{ $commit.This }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ slice $commit.This 0 8 }}</a> ··· 78 72 79 73 </section> 80 74 {{end}} 75 75 + 76 76 + {{ define "attribution" }} 77 77 + {{ $commit := .Diff.Commit }} 78 78 + {{ $showCommitter := true }} 79 79 + {{ if eq $commit.Author.Email $commit.Committer.Email }} 80 80 + {{ $showCommitter = false }} 81 81 + {{ end }} 82 82 + 83 83 + {{ if $showCommitter }} 84 84 + authored by {{ template "attributedUser" (list $commit.Author.Email $commit.Author.Name $.EmailToDid) }} 85 85 + {{ range $commit.CoAuthors }} 86 86 + {{ template "attributedUser" (list .Email .Name $.EmailToDid) }} 87 87 + {{ end }} 88 88 + and committed by {{ template "attributedUser" (list $commit.Committer.Email $commit.Committer.Name $.EmailToDid) }} 89 89 + {{ else }} 90 90 + {{ template "attributedUser" (list $commit.Author.Email $commit.Author.Name $.EmailToDid )}} 91 91 + {{ end }} 92 92 + {{ end }} 93 93 + 94 94 + {{ define "attributedUser" }} 95 95 + {{ $email := index . 0 }} 96 96 + {{ $name := index . 1 }} 97 97 + {{ $map := index . 2 }} 98 98 + {{ $did := index $map $email }} 99 99 + 100 100 + {{ if $did }} 101 101 + {{ template "user/fragments/picHandleLink" $did }} 102 102 + {{ else }} 103 103 + <a href="mailto:{{ $email }}" class="no-underline hover:underline text-gray-500 dark:text-gray-300">{{ $name }}</a> 104 104 + {{ end }} 105 105 + {{ end }} 81 106 82 107 {{ define "topbarLayout" }} 83 108 <header class="col-span-full" style="z-index: 20;">

+1 -1

appview/pages/templates/repo/empty.html

··· 26 26 {{ else if (and .LoggedInUser (eq .LoggedInUser.Did .RepoInfo.OwnerDid)) }} 27 27 {{ $knot := .RepoInfo.Knot }} 28 28 {{ if eq $knot "knot1.tangled.sh" }} 29 29 - {{ $knot = "tangled.sh" }} 29 29 + {{ $knot = "tangled.org" }} 30 30 {{ end }} 31 31 <div class="w-full flex place-content-center"> 32 32 <div class="py-6 w-fit flex flex-col gap-4">

+49

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

··· 1 1 + {{ define "repo/fragments/backlinks" }} 2 2 + {{ if .Backlinks }} 3 3 + <div id="at-uri-panel" class="px-2 md:px-0"> 4 4 + <div> 5 5 + <span class="text-sm py-1 font-bold text-gray-500 dark:text-gray-400">Referenced by</span> 6 6 + </div> 7 7 + <ul> 8 8 + {{ range .Backlinks }} 9 9 + <li> 10 10 + {{ $repoOwner := resolve .Handle }} 11 11 + {{ $repoName := .Repo }} 12 12 + {{ $repoUrl := printf "%s/%s" $repoOwner $repoName }} 13 13 + <div class="flex flex-col"> 14 14 + <div class="flex gap-2 items-center"> 15 15 + {{ if .State.IsClosed }} 16 16 + <span class="text-gray-500 dark:text-gray-400"> 17 17 + {{ i "ban" "size-3" }} 18 18 + </span> 19 19 + {{ else if eq .Kind.String "issues" }} 20 20 + <span class="text-green-600 dark:text-green-500"> 21 21 + {{ i "circle-dot" "size-3" }} 22 22 + </span> 23 23 + {{ else if .State.IsOpen }} 24 24 + <span class="text-green-600 dark:text-green-500"> 25 25 + {{ i "git-pull-request" "size-3" }} 26 26 + </span> 27 27 + {{ else if .State.IsMerged }} 28 28 + <span class="text-purple-600 dark:text-purple-500"> 29 29 + {{ i "git-merge" "size-3" }} 30 30 + </span> 31 31 + {{ else }} 32 32 + <span class="text-gray-600 dark:text-gray-300"> 33 33 + {{ i "git-pull-request-closed" "size-3" }} 34 34 + </span> 35 35 + {{ end }} 36 36 + <a href="{{ . }}" class="line-clamp-1 text-sm"><span class="text-gray-500 dark:text-gray-400">#{{ .SubjectId }}</span> {{ .Title }}</a> 37 37 + </div> 38 38 + {{ if not (eq $.RepoInfo.FullName $repoUrl) }} 39 39 + <div> 40 40 + <span>on <a href="/{{ $repoUrl }}">{{ $repoUrl }}</a></span> 41 41 + </div> 42 42 + {{ end }} 43 43 + </div> 44 44 + </li> 45 45 + {{ end }} 46 46 + </ul> 47 47 + </div> 48 48 + {{ end }} 49 49 + {{ end }}

+15 -1

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

··· 170 170 {{ $fieldName := $def.AtUri }} 171 171 {{ $valueType := $def.ValueType }} 172 172 {{ $value := .value }} 173 173 + 173 174 {{ if $valueType.IsDidFormat }} 174 175 {{ $value = trimPrefix (resolve .value) "@" }} 176 176 + <actor-typeahead> 177 177 + <input 178 178 + autocapitalize="none" 179 179 + autocorrect="off" 180 180 + autocomplete="off" 181 181 + placeholder="user.tngl.sh" 182 182 + value="{{$value}}" 183 183 + name="{{$fieldName}}" 184 184 + type="text" 185 185 + class="p-1 w-full text-sm" 186 186 + /> 187 187 + </actor-typeahead> 188 188 + {{ else }} 189 189 + <input class="p-1 w-full" type="text" name="{{$fieldName}}" value="{{$value}}"> 175 190 {{ end }} 176 176 - <input class="p-1 w-full" type="text" name="{{$fieldName}}" value="{{$value}}"> 177 191 {{ end }} 178 192 179 193 {{ define "nullTypeInput" }}

+1 -16

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

··· 6 6 <span class="font-bold text-gray-500 dark:text-gray-400 capitalize">Participants</span> 7 7 <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 ml-1">{{ len $all }}</span> 8 8 </div> 9 9 - <div class="flex items-center -space-x-3 mt-2"> 10 10 - {{ $c := "z-50 z-40 z-30 z-20 z-10" }} 11 11 - {{ range $i, $p := $ps }} 12 12 - <img 13 13 - src="{{ tinyAvatar . }}" 14 14 - alt="" 15 15 - class="rounded-full h-8 w-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0" 16 16 - /> 17 17 - {{ end }} 18 18 - 19 19 - {{ if gt (len $all) 5 }} 20 20 - <span class="pl-4 text-gray-500 dark:text-gray-400 text-sm"> 21 21 - +{{ sub (len $all) 5 }} 22 22 - </span> 23 23 - {{ end }} 24 24 - </div> 9 9 + {{ template "fragments/tinyAvatarList" (dict "all" $all "classes" "w-8 h-8") }} 25 10 </div> 26 11 {{ end }}

+31 -9

appview/pages/templates/repo/index.html

··· 14 14 {{ end }} 15 15 <div class="flex items-center justify-between pb-5"> 16 16 {{ block "branchSelector" . }}{{ end }} 17 17 - <div class="flex md:hidden items-center gap-2"> 17 17 + <div class="flex md:hidden items-center gap-3"> 18 18 <a href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}" class="inline-flex items-center text-sm gap-1 font-bold"> 19 19 {{ i "git-commit-horizontal" "w-4" "h-4" }} {{ .TotalCommits }} 20 20 </a> ··· 47 47 <div class="px-4 py-2 border-b border-gray-200 dark:border-gray-600 flex items-center gap-4 flex-wrap"> 48 48 {{ range $value := .Languages }} 49 49 <div 50 50 - class="flex flex-grow items-center gap-2 text-xs align-items-center justify-center" 50 50 + class="flex items-center gap-2 text-xs align-items-center justify-center" 51 51 > 52 52 {{ template "repo/fragments/colorBall" (dict "color" (langColor $value.Name)) }} 53 53 <div>{{ or $value.Name "Other" }} ··· 66 66 67 67 {{ define "branchSelector" }} 68 68 <div class="flex gap-2 items-center justify-between w-full"> 69 69 - <div class="flex gap-2 items-center"> 69 69 + <div class="flex gap-2 items-stretch"> 70 70 <select 71 71 onchange="window.location.href = '/{{ .RepoInfo.FullName }}/tree/' + encodeURIComponent(this.value)" 72 72 class="p-1 border max-w-32 border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700" ··· 228 228 <span 229 229 class="mx-1 before:content-['·'] before:select-none" 230 230 ></span> 231 231 - <span> 232 232 - {{ $did := index $.EmailToDid .Author.Email }} 233 233 - <a href="{{ if $did }}/{{ resolve $did }}{{ else }}mailto:{{ .Author.Email }}{{ end }}" 234 234 - class="text-gray-500 dark:text-gray-400 no-underline hover:underline" 235 235 - >{{ if $did }}{{ template "user/fragments/picHandleLink" $did }}{{ else }}{{ .Author.Name }}{{ end }}</a> 236 236 - </span> 231 231 + {{ template "attribution" (list . $.EmailToDid) }} 237 232 <div class="inline-block px-1 select-none after:content-['·']"></div> 238 233 {{ template "repo/fragments/time" .Committer.When }} 239 234 ··· 259 254 {{ end }} 260 255 </div> 261 256 </div> 257 257 + {{ end }} 258 258 + 259 259 + {{ define "attribution" }} 260 260 + {{ $commit := index . 0 }} 261 261 + {{ $map := index . 1 }} 262 262 + <span class="flex items-center"> 263 263 + {{ $author := index $map $commit.Author.Email }} 264 264 + {{ $coauthors := $commit.CoAuthors }} 265 265 + {{ $all := list }} 266 266 + 267 267 + {{ if $author }} 268 268 + {{ $all = append $all $author }} 269 269 + {{ end }} 270 270 + {{ range $coauthors }} 271 271 + {{ $co := index $map .Email }} 272 272 + {{ if $co }} 273 273 + {{ $all = append $all $co }} 274 274 + {{ end }} 275 275 + {{ end }} 276 276 + 277 277 + {{ template "fragments/tinyAvatarList" (dict "all" $all "classes" "size-6") }} 278 278 + <a href="{{ if $author }}/{{ $author }}{{ else }}mailto:{{ $commit.Author.Email }}{{ end }}" 279 279 + class="no-underline hover:underline"> 280 280 + {{ if $author }}{{ resolve $author }}{{ else }}{{ $commit.Author.Name }}{{ end }} 281 281 + {{ if $coauthors }} +{{ length $coauthors }}{{ end }} 282 282 + </a> 283 283 + </span> 262 284 {{ end }} 263 285 264 286 {{ define "branchList" }}

+2 -2

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

··· 19 19 {{ end }} 20 20 21 21 {{ define "timestamp" }} 22 22 - <a href="#{{ .Comment.Id }}" 22 22 + <a href="#comment-{{ .Comment.Id }}" 23 23 class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-400 hover:underline no-underline" 24 24 - id="{{ .Comment.Id }}"> 24 24 + id="comment-{{ .Comment.Id }}"> 25 25 {{ if .Comment.Deleted }} 26 26 {{ template "repo/fragments/shortTimeAgo" .Comment.Deleted }} 27 27 {{ else if .Comment.Edited }}

+3

appview/pages/templates/repo/issues/issue.html

··· 20 20 "Subject" $.Issue.AtUri 21 21 "State" $.Issue.Labels) }} 22 22 {{ template "repo/fragments/participants" $.Issue.Participants }} 23 23 + {{ template "repo/fragments/backlinks" 24 24 + (dict "RepoInfo" $.RepoInfo 25 25 + "Backlinks" $.Backlinks) }} 23 26 {{ template "repo/fragments/externalLinkPanel" $.Issue.AtUri }} 24 27 </div> 25 28 </div>

+40 -23

appview/pages/templates/repo/log.html

··· 17 17 <div class="hidden md:flex md:flex-col divide-y divide-gray-200 dark:divide-gray-700"> 18 18 {{ $grid := "grid grid-cols-14 gap-4" }} 19 19 <div class="{{ $grid }}"> 20 20 - <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-2">Author</div> 20 20 + <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-3">Author</div> 21 21 <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-3">Commit</div> 22 22 <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-6">Message</div> 23 23 - <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-1"></div> 24 23 <div class="py-2 text-sm text-left text-gray-700 dark:text-gray-300 uppercase font-bold col-span-2 justify-self-end">Date</div> 25 24 </div> 26 25 {{ range $index, $commit := .Commits }} 27 26 {{ $messageParts := splitN $commit.Message "\n\n" 2 }} 28 27 <div class="{{ $grid }} py-3"> 29 29 - <div class="align-top truncate col-span-2"> 30 30 - {{ $did := index $.EmailToDid $commit.Author.Email }} 31 31 - {{ if $did }} 32 32 - {{ template "user/fragments/picHandleLink" $did }} 33 33 - {{ else }} 34 34 - <a href="mailto:{{ $commit.Author.Email }}" class="text-gray-700 dark:text-gray-300 no-underline hover:underline">{{ $commit.Author.Name }}</a> 35 35 - {{ end }} 28 28 + <div class="align-top col-span-3"> 29 29 + {{ template "attribution" (list $commit $.EmailToDid) }} 36 30 </div> 37 31 <div class="align-top font-mono flex items-start col-span-3"> 38 32 {{ $verified := $.VerifiedCommits.IsVerified $commit.Hash.String }} ··· 61 55 <div class="align-top col-span-6"> 62 56 <div> 63 57 <a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" class="dark:text-white no-underline hover:underline">{{ index $messageParts 0 }}</a> 58 58 + 64 59 {{ if gt (len $messageParts) 1 }} 65 60 <button class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 dark:bg-gray-700 dark:hover:bg-gray-600 rounded" hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')">{{ i "ellipsis" "w-3 h-3" }}</button> 66 61 {{ end }} ··· 72 67 </span> 73 68 {{ end }} 74 69 {{ end }} 70 70 + 71 71 + <!-- ci status --> 72 72 + <span class="text-xs"> 73 73 + {{ $pipeline := index $.Pipelines .Hash.String }} 74 74 + {{ if and $pipeline (gt (len $pipeline.Statuses) 0) }} 75 75 + {{ template "repo/pipelines/fragments/pipelineSymbolLong" (dict "Pipeline" $pipeline "RepoInfo" $.RepoInfo) }} 76 76 + {{ end }} 77 77 + </span> 75 78 </div> 76 79 77 80 {{ if gt (len $messageParts) 1 }} 78 81 <p class="hidden mt-1 text-sm text-gray-600 dark:text-gray-400">{{ nl2br (index $messageParts 1) }}</p> 79 82 {{ end }} 80 80 - </div> 81 81 - <div class="align-top col-span-1"> 82 82 - <!-- ci status --> 83 83 - {{ $pipeline := index $.Pipelines .Hash.String }} 84 84 - {{ if and $pipeline (gt (len $pipeline.Statuses) 0) }} 85 85 - {{ template "repo/pipelines/fragments/pipelineSymbolLong" (dict "Pipeline" $pipeline "RepoInfo" $.RepoInfo) }} 86 86 - {{ end }} 87 83 </div> 88 84 <div class="align-top justify-self-end text-gray-500 dark:text-gray-400 col-span-2">{{ template "repo/fragments/shortTimeAgo" $commit.Committer.When }}</div> 89 85 </div> ··· 152 148 </a> 153 149 </span> 154 150 <span class="mx-2 before:content-['·'] before:select-none"></span> 155 155 - <span> 156 156 - {{ $did := index $.EmailToDid $commit.Author.Email }} 157 157 - <a href="{{ if $did }}/{{ $did }}{{ else }}mailto:{{ $commit.Author.Email }}{{ end }}" 158 158 - class="text-gray-500 dark:text-gray-400 no-underline hover:underline"> 159 159 - {{ if $did }}{{ template "user/fragments/picHandleLink" $did }}{{ else }}{{ $commit.Author.Name }}{{ end }} 160 160 - </a> 161 161 - </span> 151 151 + {{ template "attribution" (list $commit $.EmailToDid) }} 162 152 <div class="inline-block px-1 select-none after:content-['·']"></div> 163 153 <span>{{ template "repo/fragments/shortTime" $commit.Committer.When }}</span> 164 154 ··· 176 166 </div> 177 167 </section> 178 168 169 169 + {{ end }} 170 170 + 171 171 + {{ define "attribution" }} 172 172 + {{ $commit := index . 0 }} 173 173 + {{ $map := index . 1 }} 174 174 + <span class="flex items-center gap-1"> 175 175 + {{ $author := index $map $commit.Author.Email }} 176 176 + {{ $coauthors := $commit.CoAuthors }} 177 177 + {{ $all := list }} 178 178 + 179 179 + {{ if $author }} 180 180 + {{ $all = append $all $author }} 181 181 + {{ end }} 182 182 + {{ range $coauthors }} 183 183 + {{ $co := index $map .Email }} 184 184 + {{ if $co }} 185 185 + {{ $all = append $all $co }} 186 186 + {{ end }} 187 187 + {{ end }} 188 188 + 189 189 + {{ template "fragments/tinyAvatarList" (dict "all" $all "classes" "size-6") }} 190 190 + <a href="{{ if $author }}/{{ $author }}{{ else }}mailto:{{ $commit.Author.Email }}{{ end }}" 191 191 + class="no-underline hover:underline"> 192 192 + {{ if $author }}{{ resolve $author }}{{ else }}{{ $commit.Author.Name }}{{ end }} 193 193 + {{ if $coauthors }} +{{ length $coauthors }}{{ end }} 194 194 + </a> 195 195 + </span> 179 196 {{ end }} 180 197 181 198 {{ define "repoAfter" }}

+1 -1

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

··· 23 23 </p> 24 24 <p> 25 25 <span class="{{ $bullet }}">2</span>Configure your CI/CD 26 26 - <a href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/pipeline.md" class="underline">pipeline</a>. 26 26 + <a href="https://docs.tangled.org/spindles.html#pipelines" class="underline">pipeline</a>. 27 27 </p> 28 28 <p><span class="{{ $bullet }}">3</span>Trigger a workflow with a push or a pull-request!</p> 29 29 </div>

+14

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

··· 12 12 {{ block "sidebar" . }} {{ end }} 13 13 </div> 14 14 <div class="col-span-1 md:col-span-3"> 15 15 + <!-- TODO(boltless): explictly check for pipeline cancel permission --> 16 16 + {{ if $.RepoInfo.Roles.IsOwner }} 17 17 + <div class="flex justify-between mb-2"> 18 18 + <div id="workflow-error" class="text-red-500 dark:text-red-400"></div> 19 19 + <button 20 20 + class="btn" 21 21 + hx-post="/{{ $.RepoInfo.FullName }}/pipelines/{{ .Pipeline.Id }}/workflow/{{ .Workflow }}/cancel" 22 22 + hx-swap="none" 23 23 + {{ if (index .Pipeline.Statuses .Workflow).Latest.Status.IsFinish -}} 24 24 + disabled 25 25 + {{- end }} 26 26 + >Cancel</button> 27 27 + </div> 28 28 + {{ end }} 15 29 {{ block "logs" . }} {{ end }} 16 30 </div> 17 31 </section>

+3

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

··· 21 21 "Subject" $.Pull.AtUri 22 22 "State" $.Pull.Labels) }} 23 23 {{ template "repo/fragments/participants" $.Pull.Participants }} 24 24 + {{ template "repo/fragments/backlinks" 25 25 + (dict "RepoInfo" $.RepoInfo 26 26 + "Backlinks" $.Backlinks) }} 24 27 {{ template "repo/fragments/externalLinkPanel" $.Pull.AtUri }} 25 28 </div> 26 29 </div>

+1 -1

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

··· 22 22 <p class="text-gray-500 dark:text-gray-400"> 23 23 Choose a spindle to execute your workflows on. Only repository owners 24 24 can configure spindles. Spindles can be selfhosted, 25 25 - <a class="text-gray-500 dark:text-gray-400 underline" href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md"> 25 25 + <a class="text-gray-500 dark:text-gray-400 underline" href="https://docs.tangled.org/spindles.html#self-hosting-guide"> 26 26 click to learn more. 27 27 </a> 28 28 </p>

+1 -1

appview/pages/templates/spindles/index.html

··· 102 102 {{ define "docsButton" }} 103 103 <a 104 104 class="btn flex items-center gap-2" 105 105 - href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md"> 105 105 + href="https://docs.tangled.org/spindles.html#self-hosting-guide"> 106 106 {{ i "book" "size-4" }} 107 107 docs 108 108 </a>

+1 -1

appview/pages/templates/strings/string.html

··· 17 17 <span class="select-none">/</span> 18 18 <a href="/strings/{{ $ownerId }}/{{ .String.Rkey }}" class="font-bold">{{ .String.Filename }}</a> 19 19 </div> 20 20 - <div class="flex gap-2 text-base"> 20 20 + <div class="flex gap-2 items-stretch text-base"> 21 21 {{ if and .LoggedInUser (eq .LoggedInUser.Did .String.Did) }} 22 22 <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group" 23 23 hx-boost="true"

+3 -1

appview/pages/templates/user/followers.html

··· 19 19 "FollowersCount" .FollowersCount 20 20 "FollowingCount" .FollowingCount) }} 21 21 {{ else }} 22 22 - <p class="px-6 dark:text-white">This user does not have any followers yet.</p> 22 22 + <div class="text-base text-gray-500 flex items-center justify-center italic p-12 border border-gray-200 dark:border-gray-700 rounded"> 23 23 + <span>This user does not have any followers yet.</span> 24 24 + </div> 23 25 {{ end }} 24 26 </div> 25 27 {{ end }}

+3 -1

appview/pages/templates/user/following.html

··· 19 19 "FollowersCount" .FollowersCount 20 20 "FollowingCount" .FollowingCount) }} 21 21 {{ else }} 22 22 - <p class="px-6 dark:text-white">This user does not follow anyone yet.</p> 22 22 + <div class="text-base text-gray-500 flex items-center justify-center italic p-12 border border-gray-200 dark:border-gray-700 rounded"> 23 23 + <span>This user does not follow anyone yet.</span> 24 24 + </div> 23 25 {{ end }} 24 26 </div> 25 27 {{ end }}

+2 -2

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

··· 6 6 <img class="object-cover rounded-full p-2" src="{{ fullAvatar $userIdent }}" alt="{{ $userIdent }}" /> 7 7 </div> 8 8 9 9 - <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-2 w-full"> 9 9 + <div class="flex flex-col md:flex-row md:items-center md:justify-between gap-2 w-full min-w-0"> 10 10 <div class="flex-1 min-h-0 justify-around flex flex-col"> 11 11 <a href="/{{ $userIdent }}"> 12 12 <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ $userIdent | truncateAt30 }}</span> 13 13 </a> 14 14 {{ with .Profile }} 15 15 - <p class="text-sm pb-2 md:pb-2">{{.Description}}</p> 15 15 + <p class="text-sm pb-2 md:pb-2 break-words">{{.Description}}</p> 16 16 {{ end }} 17 17 <div class="text-sm flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full"> 18 18 <span class="flex-shrink-0">{{ i "users" "size-4" }}</span>

+20 -2

appview/pages/templates/user/overview.html

··· 16 16 <p class="text-sm font-bold px-2 pb-4 dark:text-white">ACTIVITY</p> 17 17 <div class="flex flex-col gap-4 relative"> 18 18 {{ if .ProfileTimeline.IsEmpty }} 19 19 - <p class="dark:text-white">This user does not have any activity yet.</p> 19 19 + <div class="text-base text-gray-500 flex items-center justify-center italic p-12 border border-gray-200 dark:border-gray-700 rounded"> 20 20 + <span class="flex items-center gap-2"> 21 21 + This user does not have any activity yet. 22 22 + </span> 23 23 + </div> 20 24 {{ end }} 21 25 22 26 {{ with .ProfileTimeline }} ··· 33 37 </p> 34 38 35 39 <div class="flex flex-col gap-1"> 40 40 + {{ block "commits" .Commits }} {{ end }} 36 41 {{ block "repoEvents" .RepoEvents }} {{ end }} 37 42 {{ block "issueEvents" .IssueEvents }} {{ end }} 38 43 {{ block "pullEvents" .PullEvents }} {{ end }} ··· 43 48 {{ end }} 44 49 {{ end }} 45 50 </div> 51 51 + {{ end }} 52 52 + 53 53 + {{ define "commits" }} 54 54 + {{ if . }} 55 55 + <div class="flex flex-wrap items-center gap-1"> 56 56 + {{ i "git-commit-horizontal" "size-5" }} 57 57 + created {{ . }} commits 58 58 + </div> 59 59 + {{ end }} 46 60 {{ end }} 47 61 48 62 {{ define "repoEvents" }} ··· 244 258 {{ template "user/fragments/repoCard" (list $ . false) }} 245 259 </div> 246 260 {{ else }} 247 247 - <p class="dark:text-white">This user does not have any pinned repos.</p> 261 261 + <div class="text-base text-gray-500 flex items-center justify-center italic p-12 border border-gray-200 dark:border-gray-700 rounded"> 262 262 + <span class="flex items-center gap-2"> 263 263 + This user does not have any pinned repos. 264 264 + </span> 265 265 + </div> 248 266 {{ end }} 249 267 </div> 250 268 </div>

+3 -1

appview/pages/templates/user/repos.html

··· 13 13 {{ template "user/fragments/repoCard" (list $ . false) }} 14 14 </div> 15 15 {{ else }} 16 16 - <p class="px-6 dark:text-white">This user does not have any repos yet.</p> 16 16 + <div class="text-base text-gray-500 flex items-center justify-center italic p-12 border border-gray-200 dark:border-gray-700 rounded"> 17 17 + <span>This user does not have any repos yet.</span> 18 18 + </div> 17 19 {{ end }} 18 20 </div> 19 21 {{ end }}

+9 -6

appview/pages/templates/user/signup.html

··· 43 43 page to complete your registration. 44 44 </span> 45 45 <div class="w-full mt-4 text-center"> 46 46 - <div class="cf-turnstile" data-sitekey="{{ .CloudflareSiteKey }}"></div> 46 46 + <div class="cf-turnstile" data-sitekey="{{ .CloudflareSiteKey }}" data-size="flexible"></div> 47 47 </div> 48 48 <button class="btn text-base w-full my-2 mt-6" type="submit" id="signup-button" tabindex="7" > 49 49 <span>join now</span> 50 50 </button> 51 51 + <p class="text-sm text-gray-500"> 52 52 + Already have an AT Protocol account? <a href="/login" class="underline">Login to Tangled</a>. 53 53 + </p> 54 54 + 55 55 + <p id="signup-msg" class="error w-full"></p> 56 56 + <p class="text-sm text-gray-500 pt-4"> 57 57 + By signing up, you agree to our <a href="/terms" class="underline">Terms of Service</a> and <a href="/privacy" class="underline">Privacy Policy</a>. 58 58 + </p> 51 59 </form> 52 52 - <p class="text-sm text-gray-500"> 53 53 - Already have an AT Protocol account? <a href="/login" class="underline">Login to Tangled</a>. 54 54 - </p> 55 55 - 56 56 - <p id="signup-msg" class="error w-full"></p> 57 60 </main> 58 61 </body> 59 62 </html>

+3 -1

appview/pages/templates/user/starred.html

··· 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> 16 16 + <div class="text-base text-gray-500 flex items-center justify-center italic p-12 border border-gray-200 dark:border-gray-700 rounded"> 17 17 + <span>This user does not have any starred repos yet.</span> 18 18 + </div> 17 19 {{ end }} 18 20 </div> 19 21 {{ end }}

+3 -1

appview/pages/templates/user/strings.html

··· 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> 16 16 + <div class="text-base text-gray-500 flex items-center justify-center italic p-12 border border-gray-200 dark:border-gray-700 rounded"> 17 17 + <span>This user does not have any strings yet.</span> 18 18 + </div> 17 19 {{ end }} 18 20 </div> 19 21 {{ end }}

+98 -12

appview/pipelines/pipelines.go

··· 4 4 "bytes" 5 5 "context" 6 6 "encoding/json" 7 7 + "fmt" 7 8 "log/slog" 8 9 "net/http" 9 10 "strings" 10 11 "time" 11 12 13 13 + "tangled.org/core/api/tangled" 12 14 "tangled.org/core/appview/config" 13 15 "tangled.org/core/appview/db" 16 16 + "tangled.org/core/appview/middleware" 17 17 + "tangled.org/core/appview/models" 14 18 "tangled.org/core/appview/oauth" 15 19 "tangled.org/core/appview/pages" 16 20 "tangled.org/core/appview/reporesolver" 17 21 "tangled.org/core/eventconsumer" 18 22 "tangled.org/core/idresolver" 23 23 + "tangled.org/core/orm" 19 24 "tangled.org/core/rbac" 20 25 spindlemodel "tangled.org/core/spindle/models" 21 26 ··· 35 40 logger *slog.Logger 36 41 } 37 42 38 38 - func (p *Pipelines) Router() http.Handler { 43 43 + func (p *Pipelines) Router(mw *middleware.Middleware) http.Handler { 39 44 r := chi.NewRouter() 40 45 r.Get("/", p.Index) 41 46 r.Get("/{pipeline}/workflow/{workflow}", p.Workflow) 42 47 r.Get("/{pipeline}/workflow/{workflow}/logs", p.Logs) 48 48 + r. 49 49 + With(mw.RepoPermissionMiddleware("repo:owner")). 50 50 + Post("/{pipeline}/workflow/{workflow}/cancel", p.Cancel) 43 51 44 52 return r 45 53 } ··· 81 89 ps, err := db.GetPipelineStatuses( 82 90 p.db, 83 91 30, 84 84 - db.FilterEq("repo_owner", f.Did), 85 85 - db.FilterEq("repo_name", f.Name), 86 86 - db.FilterEq("knot", f.Knot), 92 92 + orm.FilterEq("repo_owner", f.Did), 93 93 + orm.FilterEq("repo_name", f.Name), 94 94 + orm.FilterEq("knot", f.Knot), 87 95 ) 88 96 if err != nil { 89 97 l.Error("failed to query db", "err", err) ··· 122 130 ps, err := db.GetPipelineStatuses( 123 131 p.db, 124 132 1, 125 125 - db.FilterEq("repo_owner", f.Did), 126 126 - db.FilterEq("repo_name", f.Name), 127 127 - db.FilterEq("knot", f.Knot), 128 128 - db.FilterEq("id", pipelineId), 133 133 + orm.FilterEq("repo_owner", f.Did), 134 134 + orm.FilterEq("repo_name", f.Name), 135 135 + orm.FilterEq("knot", f.Knot), 136 136 + orm.FilterEq("id", pipelineId), 129 137 ) 130 138 if err != nil { 131 139 l.Error("failed to query db", "err", err) ··· 189 197 ps, err := db.GetPipelineStatuses( 190 198 p.db, 191 199 1, 192 192 - db.FilterEq("repo_owner", f.Did), 193 193 - db.FilterEq("repo_name", f.Name), 194 194 - db.FilterEq("knot", f.Knot), 195 195 - db.FilterEq("id", pipelineId), 200 200 + orm.FilterEq("repo_owner", f.Did), 201 201 + orm.FilterEq("repo_name", f.Name), 202 202 + orm.FilterEq("knot", f.Knot), 203 203 + orm.FilterEq("id", pipelineId), 196 204 ) 197 205 if err != nil || len(ps) != 1 { 198 206 l.Error("pipeline query failed", "err", err, "count", len(ps)) ··· 313 321 } 314 322 } 315 323 } 324 324 + } 325 325 + 326 326 + func (p *Pipelines) Cancel(w http.ResponseWriter, r *http.Request) { 327 327 + l := p.logger.With("handler", "Cancel") 328 328 + 329 329 + var ( 330 330 + pipelineId = chi.URLParam(r, "pipeline") 331 331 + workflow = chi.URLParam(r, "workflow") 332 332 + ) 333 333 + if pipelineId == "" || workflow == "" { 334 334 + http.Error(w, "missing pipeline ID or workflow", http.StatusBadRequest) 335 335 + return 336 336 + } 337 337 + 338 338 + f, err := p.repoResolver.Resolve(r) 339 339 + if err != nil { 340 340 + l.Error("failed to get repo and knot", "err", err) 341 341 + http.Error(w, "bad repo/knot", http.StatusBadRequest) 342 342 + return 343 343 + } 344 344 + 345 345 + pipeline, err := func() (models.Pipeline, error) { 346 346 + ps, err := db.GetPipelineStatuses( 347 347 + p.db, 348 348 + 1, 349 349 + orm.FilterEq("repo_owner", f.Did), 350 350 + orm.FilterEq("repo_name", f.Name), 351 351 + orm.FilterEq("knot", f.Knot), 352 352 + orm.FilterEq("id", pipelineId), 353 353 + ) 354 354 + if err != nil { 355 355 + return models.Pipeline{}, err 356 356 + } 357 357 + if len(ps) != 1 { 358 358 + return models.Pipeline{}, fmt.Errorf("wrong pipeline count %d", len(ps)) 359 359 + } 360 360 + return ps[0], nil 361 361 + }() 362 362 + if err != nil { 363 363 + l.Error("pipeline query failed", "err", err) 364 364 + http.Error(w, "pipeline not found", http.StatusNotFound) 365 365 + } 366 366 + var ( 367 367 + spindle = f.Spindle 368 368 + knot = f.Knot 369 369 + rkey = pipeline.Rkey 370 370 + ) 371 371 + 372 372 + if spindle == "" || knot == "" || rkey == "" { 373 373 + http.Error(w, "invalid repo info", http.StatusBadRequest) 374 374 + return 375 375 + } 376 376 + 377 377 + spindleClient, err := p.oauth.ServiceClient( 378 378 + r, 379 379 + oauth.WithService(f.Spindle), 380 380 + oauth.WithLxm(tangled.PipelineCancelPipelineNSID), 381 381 + oauth.WithDev(p.config.Core.Dev), 382 382 + oauth.WithTimeout(time.Second*30), // workflow cleanup usually takes time 383 383 + ) 384 384 + 385 385 + err = tangled.PipelineCancelPipeline( 386 386 + r.Context(), 387 387 + spindleClient, 388 388 + &tangled.PipelineCancelPipeline_Input{ 389 389 + Repo: string(f.RepoAt()), 390 390 + Pipeline: pipeline.AtUri().String(), 391 391 + Workflow: workflow, 392 392 + }, 393 393 + ) 394 394 + err = fmt.Errorf("boo! new error") 395 395 + errorId := "workflow-error" 396 396 + if err != nil { 397 397 + l.Error("failed to cancel workflow", "err", err) 398 398 + p.pages.Notice(w, errorId, "Failed to cancel workflow") 399 399 + return 400 400 + } 401 401 + l.Debug("canceled pipeline", "uri", pipeline.AtUri()) 316 402 } 317 403 318 404 // either a message or an error

+2 -1

appview/pulls/opengraph.go

··· 13 13 "tangled.org/core/appview/db" 14 14 "tangled.org/core/appview/models" 15 15 "tangled.org/core/appview/ogcard" 16 16 + "tangled.org/core/orm" 16 17 "tangled.org/core/patchutil" 17 18 "tangled.org/core/types" 18 19 ) ··· 276 277 } 277 278 278 279 // Get comment count from database 279 279 - comments, err := db.GetPullComments(s.db, db.FilterEq("pull_id", pull.ID)) 280 280 + comments, err := db.GetPullComments(s.db, orm.FilterEq("pull_id", pull.ID)) 280 281 if err != nil { 281 282 log.Printf("failed to get pull comments: %v", err) 282 283 }

+77 -53

appview/pulls/pulls.go

··· 1 1 package pulls 2 2 3 3 import ( 4 4 + "context" 4 5 "database/sql" 5 6 "encoding/json" 6 7 "errors" ··· 18 19 "tangled.org/core/appview/config" 19 20 "tangled.org/core/appview/db" 20 21 pulls_indexer "tangled.org/core/appview/indexer/pulls" 22 22 + "tangled.org/core/appview/mentions" 21 23 "tangled.org/core/appview/models" 22 24 "tangled.org/core/appview/notify" 23 25 "tangled.org/core/appview/oauth" ··· 28 30 "tangled.org/core/appview/validator" 29 31 "tangled.org/core/appview/xrpcclient" 30 32 "tangled.org/core/idresolver" 33 33 + "tangled.org/core/orm" 31 34 "tangled.org/core/patchutil" 32 35 "tangled.org/core/rbac" 33 36 "tangled.org/core/tid" ··· 42 45 ) 43 46 44 47 type Pulls struct { 45 45 - oauth *oauth.OAuth 46 46 - repoResolver *reporesolver.RepoResolver 47 47 - pages *pages.Pages 48 48 - idResolver *idresolver.Resolver 49 49 - db *db.DB 50 50 - config *config.Config 51 51 - notifier notify.Notifier 52 52 - enforcer *rbac.Enforcer 53 53 - logger *slog.Logger 54 54 - validator *validator.Validator 55 55 - indexer *pulls_indexer.Indexer 48 48 + oauth *oauth.OAuth 49 49 + repoResolver *reporesolver.RepoResolver 50 50 + pages *pages.Pages 51 51 + idResolver *idresolver.Resolver 52 52 + mentionsResolver *mentions.Resolver 53 53 + db *db.DB 54 54 + config *config.Config 55 55 + notifier notify.Notifier 56 56 + enforcer *rbac.Enforcer 57 57 + logger *slog.Logger 58 58 + validator *validator.Validator 59 59 + indexer *pulls_indexer.Indexer 56 60 } 57 61 58 62 func New( ··· 60 64 repoResolver *reporesolver.RepoResolver, 61 65 pages *pages.Pages, 62 66 resolver *idresolver.Resolver, 67 67 + mentionsResolver *mentions.Resolver, 63 68 db *db.DB, 64 69 config *config.Config, 65 70 notifier notify.Notifier, ··· 69 74 logger *slog.Logger, 70 75 ) *Pulls { 71 76 return &Pulls{ 72 72 - oauth: oauth, 73 73 - repoResolver: repoResolver, 74 74 - pages: pages, 75 75 - idResolver: resolver, 76 76 - db: db, 77 77 - config: config, 78 78 - notifier: notifier, 79 79 - enforcer: enforcer, 80 80 - logger: logger, 81 81 - validator: validator, 82 82 - indexer: indexer, 77 77 + oauth: oauth, 78 78 + repoResolver: repoResolver, 79 79 + pages: pages, 80 80 + idResolver: resolver, 81 81 + mentionsResolver: mentionsResolver, 82 82 + db: db, 83 83 + config: config, 84 84 + notifier: notifier, 85 85 + enforcer: enforcer, 86 86 + logger: logger, 87 87 + validator: validator, 88 88 + indexer: indexer, 83 89 } 84 90 } 85 91 ··· 151 157 return 152 158 } 153 159 160 160 + backlinks, err := db.GetBacklinks(s.db, pull.AtUri()) 161 161 + if err != nil { 162 162 + log.Println("failed to get pull backlinks", err) 163 163 + s.pages.Notice(w, "pull-error", "Failed to get pull. Try again later.") 164 164 + return 165 165 + } 166 166 + 154 167 // can be nil if this pull is not stacked 155 168 stack, _ := r.Context().Value("stack").(models.Stack) 156 169 abandonedPulls, _ := r.Context().Value("abandonedPulls").([]*models.Pull) ··· 178 191 ps, err := db.GetPipelineStatuses( 179 192 s.db, 180 193 len(shas), 181 181 - db.FilterEq("repo_owner", f.Did), 182 182 - db.FilterEq("repo_name", f.Name), 183 183 - db.FilterEq("knot", f.Knot), 184 184 - db.FilterIn("sha", shas), 194 194 + orm.FilterEq("repo_owner", f.Did), 195 195 + orm.FilterEq("repo_name", f.Name), 196 196 + orm.FilterEq("knot", f.Knot), 197 197 + orm.FilterIn("sha", shas), 185 198 ) 186 199 if err != nil { 187 200 log.Printf("failed to fetch pipeline statuses: %s", err) ··· 205 218 206 219 labelDefs, err := db.GetLabelDefinitions( 207 220 s.db, 208 208 - db.FilterIn("at_uri", f.Labels), 209 209 - db.FilterContains("scope", tangled.RepoPullNSID), 221 221 + orm.FilterIn("at_uri", f.Labels), 222 222 + orm.FilterContains("scope", tangled.RepoPullNSID), 210 223 ) 211 224 if err != nil { 212 225 log.Println("failed to fetch labels", err) ··· 225 238 Pull: pull, 226 239 Stack: stack, 227 240 AbandonedPulls: abandonedPulls, 241 241 + Backlinks: backlinks, 228 242 BranchDeleteStatus: branchDeleteStatus, 229 243 MergeCheck: mergeCheckResponse, 230 244 ResubmitCheck: resubmitResult, ··· 584 598 585 599 pulls, err := db.GetPulls( 586 600 s.db, 587 587 - db.FilterIn("id", ids), 601 601 + orm.FilterIn("id", ids), 588 602 ) 589 603 if err != nil { 590 604 log.Println("failed to get pulls", err) ··· 635 649 ps, err := db.GetPipelineStatuses( 636 650 s.db, 637 651 len(shas), 638 638 - db.FilterEq("repo_owner", f.Did), 639 639 - db.FilterEq("repo_name", f.Name), 640 640 - db.FilterEq("knot", f.Knot), 641 641 - db.FilterIn("sha", shas), 652 652 + orm.FilterEq("repo_owner", f.Did), 653 653 + orm.FilterEq("repo_name", f.Name), 654 654 + orm.FilterEq("knot", f.Knot), 655 655 + orm.FilterIn("sha", shas), 642 656 ) 643 657 if err != nil { 644 658 log.Printf("failed to fetch pipeline statuses: %s", err) ··· 651 665 652 666 labelDefs, err := db.GetLabelDefinitions( 653 667 s.db, 654 654 - db.FilterIn("at_uri", f.Labels), 655 655 - db.FilterContains("scope", tangled.RepoPullNSID), 668 668 + orm.FilterIn("at_uri", f.Labels), 669 669 + orm.FilterContains("scope", tangled.RepoPullNSID), 656 670 ) 657 671 if err != nil { 658 672 log.Println("failed to fetch labels", err) ··· 678 692 } 679 693 680 694 func (s *Pulls) PullComment(w http.ResponseWriter, r *http.Request) { 681 681 - l := s.logger.With("handler", "PullComment") 682 695 user := s.oauth.GetUser(r) 683 696 f, err := s.repoResolver.Resolve(r) 684 697 if err != nil { ··· 716 729 s.pages.Notice(w, "pull", "Comment body is required") 717 730 return 718 731 } 732 732 + 733 733 + mentions, references := s.mentionsResolver.Resolve(r.Context(), body) 719 734 720 735 // Start a transaction 721 736 tx, err := s.db.BeginTx(r.Context(), nil) ··· 759 774 Body: body, 760 775 CommentAt: atResp.Uri, 761 776 SubmissionId: pull.Submissions[roundNumber].ID, 777 777 + Mentions: mentions, 778 778 + References: references, 762 779 } 763 780 764 781 // Create the pull comment in the database with the commentAt field ··· 776 793 return 777 794 } 778 795 779 779 - rawMentions := markup.FindUserMentions(comment.Body) 780 780 - idents := s.idResolver.ResolveIdents(r.Context(), rawMentions) 781 781 - l.Debug("parsed mentions", "raw", rawMentions, "idents", idents) 782 782 - var mentions []syntax.DID 783 783 - for _, ident := range idents { 784 784 - if ident != nil && !ident.Handle.IsInvalidHandle() { 785 785 - mentions = append(mentions, ident.DID) 786 786 - } 787 787 - } 788 796 s.notifier.NewPullComment(r.Context(), comment, mentions) 789 797 790 798 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, f) ··· 1198 1206 } 1199 1207 } 1200 1208 1209 1209 + mentions, references := s.mentionsResolver.Resolve(r.Context(), body) 1210 1210 + 1201 1211 rkey := tid.TID() 1202 1212 initialSubmission := models.PullSubmission{ 1203 1213 Patch: patch, ··· 1211 1221 OwnerDid: user.Did, 1212 1222 RepoAt: repo.RepoAt(), 1213 1223 Rkey: rkey, 1224 1224 + Mentions: mentions, 1225 1225 + References: references, 1214 1226 Submissions: []*models.PullSubmission{ 1215 1227 &initialSubmission, 1216 1228 }, ··· 1299 1311 1300 1312 // build a stack out of this patch 1301 1313 stackId := uuid.New() 1302 1302 - stack, err := newStack(repo, user, targetBranch, patch, pullSource, stackId.String()) 1314 1314 + stack, err := s.newStack(r.Context(), repo, user, targetBranch, patch, pullSource, stackId.String()) 1303 1315 if err != nil { 1304 1316 log.Println("failed to create stack", err) 1305 1317 s.pages.Notice(w, "pull", fmt.Sprintf("Failed to create stack: %v", err)) ··· 1354 1366 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.") 1355 1367 return 1356 1368 } 1369 1369 + 1357 1370 } 1358 1371 1359 1372 if err = tx.Commit(); err != nil { ··· 1362 1375 return 1363 1376 } 1364 1377 1378 1378 + // notify about each pull 1379 1379 + // 1380 1380 + // this is performed after tx.Commit, because it could result in a locked DB otherwise 1381 1381 + for _, p := range stack { 1382 1382 + s.notifier.NewPull(r.Context(), p) 1383 1383 + } 1384 1384 + 1365 1385 ownerSlashRepo := reporesolver.GetBaseRepoPath(r, repo) 1366 1386 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls", ownerSlashRepo)) 1367 1387 } ··· 1487 1507 // fork repo 1488 1508 repo, err := db.GetRepo( 1489 1509 s.db, 1490 1490 - db.FilterEq("did", forkOwnerDid), 1491 1491 - db.FilterEq("name", forkName), 1510 1510 + orm.FilterEq("did", forkOwnerDid), 1511 1511 + orm.FilterEq("name", forkName), 1492 1512 ) 1493 1513 if err != nil { 1494 1514 log.Println("failed to get repo", "did", forkOwnerDid, "name", forkName, "err", err) ··· 1913 1933 targetBranch := pull.TargetBranch 1914 1934 1915 1935 origStack, _ := r.Context().Value("stack").(models.Stack) 1916 1916 - newStack, err := newStack(repo, user, targetBranch, patch, pull.PullSource, stackId) 1936 1936 + newStack, err := s.newStack(r.Context(), repo, user, targetBranch, patch, pull.PullSource, stackId) 1917 1937 if err != nil { 1918 1938 log.Println("failed to create resubmitted stack", err) 1919 1939 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.") ··· 2055 2075 tx, 2056 2076 p.ParentChangeId, 2057 2077 // these should be enough filters to be unique per-stack 2058 2058 - db.FilterEq("repo_at", p.RepoAt.String()), 2059 2059 - db.FilterEq("owner_did", p.OwnerDid), 2060 2060 - db.FilterEq("change_id", p.ChangeId), 2078 2078 + orm.FilterEq("repo_at", p.RepoAt.String()), 2079 2079 + orm.FilterEq("owner_did", p.OwnerDid), 2080 2080 + orm.FilterEq("change_id", p.ChangeId), 2061 2081 ) 2062 2082 2063 2083 if err != nil { ··· 2361 2381 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", ownerSlashRepo, pull.PullId)) 2362 2382 } 2363 2383 2364 2364 - func newStack(repo *models.Repo, user *oauth.User, targetBranch, patch string, pullSource *models.PullSource, stackId string) (models.Stack, error) { 2384 2384 + func (s *Pulls) newStack(ctx context.Context, repo *models.Repo, user *oauth.User, targetBranch, patch string, pullSource *models.PullSource, stackId string) (models.Stack, error) { 2365 2385 formatPatches, err := patchutil.ExtractPatches(patch) 2366 2386 if err != nil { 2367 2387 return nil, fmt.Errorf("Failed to extract patches: %v", err) ··· 2386 2406 body := fp.Body 2387 2407 rkey := tid.TID() 2388 2408 2409 2409 + mentions, references := s.mentionsResolver.Resolve(ctx, body) 2410 2410 + 2389 2411 initialSubmission := models.PullSubmission{ 2390 2412 Patch: fp.Raw, 2391 2413 SourceRev: fp.SHA, ··· 2398 2420 OwnerDid: user.Did, 2399 2421 RepoAt: repo.RepoAt(), 2400 2422 Rkey: rkey, 2423 2423 + Mentions: mentions, 2424 2424 + References: references, 2401 2425 Submissions: []*models.PullSubmission{ 2402 2426 &initialSubmission, 2403 2427 },

+10 -9

appview/repo/artifact.go

··· 15 15 "tangled.org/core/appview/models" 16 16 "tangled.org/core/appview/pages" 17 17 "tangled.org/core/appview/xrpcclient" 18 18 + "tangled.org/core/orm" 18 19 "tangled.org/core/tid" 19 20 "tangled.org/core/types" 20 21 ··· 155 156 156 157 artifacts, err := db.GetArtifact( 157 158 rp.db, 158 158 - db.FilterEq("repo_at", f.RepoAt()), 159 159 - db.FilterEq("tag", tag.Tag.Hash[:]), 160 160 - db.FilterEq("name", filename), 159 159 + orm.FilterEq("repo_at", f.RepoAt()), 160 160 + orm.FilterEq("tag", tag.Tag.Hash[:]), 161 161 + orm.FilterEq("name", filename), 161 162 ) 162 163 if err != nil { 163 164 log.Println("failed to get artifacts", err) ··· 234 235 235 236 artifacts, err := db.GetArtifact( 236 237 rp.db, 237 237 - db.FilterEq("repo_at", f.RepoAt()), 238 238 - db.FilterEq("tag", tag[:]), 239 239 - db.FilterEq("name", filename), 238 238 + orm.FilterEq("repo_at", f.RepoAt()), 239 239 + orm.FilterEq("tag", tag[:]), 240 240 + orm.FilterEq("name", filename), 240 241 ) 241 242 if err != nil { 242 243 log.Println("failed to get artifacts", err) ··· 276 277 defer tx.Rollback() 277 278 278 279 err = db.DeleteArtifact(tx, 279 279 - db.FilterEq("repo_at", f.RepoAt()), 280 280 - db.FilterEq("tag", artifact.Tag[:]), 281 281 - db.FilterEq("name", filename), 280 280 + orm.FilterEq("repo_at", f.RepoAt()), 281 281 + orm.FilterEq("tag", artifact.Tag[:]), 282 282 + orm.FilterEq("name", filename), 282 283 ) 283 284 if err != nil { 284 285 log.Println("failed to remove artifact record from db", err)

+3 -2

appview/repo/feed.go

··· 11 11 "tangled.org/core/appview/db" 12 12 "tangled.org/core/appview/models" 13 13 "tangled.org/core/appview/pagination" 14 14 + "tangled.org/core/orm" 14 15 15 16 "github.com/bluesky-social/indigo/atproto/identity" 16 17 "github.com/bluesky-social/indigo/atproto/syntax" ··· 20 21 func (rp *Repo) getRepoFeed(ctx context.Context, repo *models.Repo, ownerSlashRepo string) (*feeds.Feed, error) { 21 22 const feedLimitPerType = 100 22 23 23 23 - pulls, err := db.GetPullsWithLimit(rp.db, feedLimitPerType, db.FilterEq("repo_at", repo.RepoAt())) 24 24 + pulls, err := db.GetPullsWithLimit(rp.db, feedLimitPerType, orm.FilterEq("repo_at", repo.RepoAt())) 24 25 if err != nil { 25 26 return nil, err 26 27 } ··· 28 29 issues, err := db.GetIssuesPaginated( 29 30 rp.db, 30 31 pagination.Page{Limit: feedLimitPerType}, 31 31 - db.FilterEq("repo_at", repo.RepoAt()), 32 32 + orm.FilterEq("repo_at", repo.RepoAt()), 32 33 ) 33 34 if err != nil { 34 35 return nil, err

+4 -3

appview/repo/index.go

··· 23 23 "tangled.org/core/appview/models" 24 24 "tangled.org/core/appview/pages" 25 25 "tangled.org/core/appview/xrpcclient" 26 26 + "tangled.org/core/orm" 26 27 "tangled.org/core/types" 27 28 28 29 "github.com/go-chi/chi/v5" ··· 122 123 l.Error("failed to get email to did map", "err", err) 123 124 } 124 125 125 125 - vc, err := commitverify.GetVerifiedObjectCommits(rp.db, emailToDidMap, commitsTrunc) 126 126 + vc, err := commitverify.GetVerifiedCommits(rp.db, emailToDidMap, commitsTrunc) 126 127 if err != nil { 127 128 l.Error("failed to GetVerifiedObjectCommits", "err", err) 128 129 } ··· 171 172 // first attempt to fetch from db 172 173 langs, err := db.GetRepoLanguages( 173 174 rp.db, 174 174 - db.FilterEq("repo_at", repo.RepoAt()), 175 175 - db.FilterEq("ref", currentRef), 175 175 + orm.FilterEq("repo_at", repo.RepoAt()), 176 176 + orm.FilterEq("ref", currentRef), 176 177 ) 177 178 178 179 if err != nil || langs == nil {

+2 -2

appview/repo/log.go

··· 116 116 l.Error("failed to fetch email to did mapping", "err", err) 117 117 } 118 118 119 119 - vc, err := commitverify.GetVerifiedObjectCommits(rp.db, emailToDidMap, xrpcResp.Commits) 119 119 + vc, err := commitverify.GetVerifiedCommits(rp.db, emailToDidMap, xrpcResp.Commits) 120 120 if err != nil { 121 121 l.Error("failed to GetVerifiedObjectCommits", "err", err) 122 122 } ··· 192 192 l.Error("failed to get email to did mapping", "err", err) 193 193 } 194 194 195 195 - vc, err := commitverify.GetVerifiedCommits(rp.db, emailToDidMap, []types.NiceDiff{*result.Diff}) 195 195 + vc, err := commitverify.GetVerifiedCommits(rp.db, emailToDidMap, []types.Commit{result.Diff.Commit}) 196 196 if err != nil { 197 197 l.Error("failed to GetVerifiedCommits", "err", err) 198 198 }

+3 -2

appview/repo/opengraph.go

··· 16 16 "tangled.org/core/appview/db" 17 17 "tangled.org/core/appview/models" 18 18 "tangled.org/core/appview/ogcard" 19 19 + "tangled.org/core/orm" 19 20 "tangled.org/core/types" 20 21 ) 21 22 ··· 338 339 var languageStats []types.RepoLanguageDetails 339 340 langs, err := db.GetRepoLanguages( 340 341 rp.db, 341 341 - db.FilterEq("repo_at", f.RepoAt()), 342 342 - db.FilterEq("is_default_ref", 1), 342 342 + orm.FilterEq("repo_at", f.RepoAt()), 343 343 + orm.FilterEq("is_default_ref", 1), 343 344 ) 344 345 if err != nil { 345 346 log.Printf("failed to get language stats from db: %v", err)

+17 -16

appview/repo/repo.go

··· 24 24 xrpcclient "tangled.org/core/appview/xrpcclient" 25 25 "tangled.org/core/eventconsumer" 26 26 "tangled.org/core/idresolver" 27 27 + "tangled.org/core/orm" 27 28 "tangled.org/core/rbac" 28 29 "tangled.org/core/tid" 29 30 "tangled.org/core/xrpc/serviceauth" ··· 345 346 // get form values 346 347 labelId := r.FormValue("label-id") 347 348 348 348 - label, err := db.GetLabelDefinition(rp.db, db.FilterEq("id", labelId)) 349 349 + label, err := db.GetLabelDefinition(rp.db, orm.FilterEq("id", labelId)) 349 350 if err != nil { 350 351 fail("Failed to find label definition.", err) 351 352 return ··· 409 410 410 411 err = db.UnsubscribeLabel( 411 412 tx, 412 412 - db.FilterEq("repo_at", f.RepoAt()), 413 413 - db.FilterEq("label_at", removedAt), 413 413 + orm.FilterEq("repo_at", f.RepoAt()), 414 414 + orm.FilterEq("label_at", removedAt), 414 415 ) 415 416 if err != nil { 416 417 fail("Failed to unsubscribe label.", err) 417 418 return 418 419 } 419 420 420 420 - err = db.DeleteLabelDefinition(tx, db.FilterEq("id", label.Id)) 421 421 + err = db.DeleteLabelDefinition(tx, orm.FilterEq("id", label.Id)) 421 422 if err != nil { 422 423 fail("Failed to delete label definition.", err) 423 424 return ··· 456 457 } 457 458 458 459 labelAts := r.Form["label"] 459 459 - _, err = db.GetLabelDefinitions(rp.db, db.FilterIn("at_uri", labelAts)) 460 460 + _, err = db.GetLabelDefinitions(rp.db, orm.FilterIn("at_uri", labelAts)) 460 461 if err != nil { 461 462 fail("Failed to subscribe to label.", err) 462 463 return ··· 542 543 } 543 544 544 545 labelAts := r.Form["label"] 545 545 - _, err = db.GetLabelDefinitions(rp.db, db.FilterIn("at_uri", labelAts)) 546 546 + _, err = db.GetLabelDefinitions(rp.db, orm.FilterIn("at_uri", labelAts)) 546 547 if err != nil { 547 548 fail("Failed to unsubscribe to label.", err) 548 549 return ··· 582 583 583 584 err = db.UnsubscribeLabel( 584 585 rp.db, 585 585 - db.FilterEq("repo_at", f.RepoAt()), 586 586 - db.FilterIn("label_at", labelAts), 586 586 + orm.FilterEq("repo_at", f.RepoAt()), 587 587 + orm.FilterIn("label_at", labelAts), 587 588 ) 588 589 if err != nil { 589 590 fail("Failed to unsubscribe label.", err) ··· 612 613 613 614 labelDefs, err := db.GetLabelDefinitions( 614 615 rp.db, 615 615 - db.FilterIn("at_uri", f.Labels), 616 616 - db.FilterContains("scope", subject.Collection().String()), 616 616 + orm.FilterIn("at_uri", f.Labels), 617 617 + orm.FilterContains("scope", subject.Collection().String()), 617 618 ) 618 619 if err != nil { 619 620 l.Error("failed to fetch label defs", "err", err) ··· 625 626 defs[l.AtUri().String()] = &l 626 627 } 627 628 628 628 - states, err := db.GetLabels(rp.db, db.FilterEq("subject", subject)) 629 629 + states, err := db.GetLabels(rp.db, orm.FilterEq("subject", subject)) 629 630 if err != nil { 630 631 l.Error("failed to build label state", "err", err) 631 632 return ··· 660 661 661 662 labelDefs, err := db.GetLabelDefinitions( 662 663 rp.db, 663 663 - db.FilterIn("at_uri", f.Labels), 664 664 - db.FilterContains("scope", subject.Collection().String()), 664 664 + orm.FilterIn("at_uri", f.Labels), 665 665 + orm.FilterContains("scope", subject.Collection().String()), 665 666 ) 666 667 if err != nil { 667 668 l.Error("failed to fetch labels", "err", err) ··· 673 674 defs[l.AtUri().String()] = &l 674 675 } 675 676 676 676 - states, err := db.GetLabels(rp.db, db.FilterEq("subject", subject)) 677 677 + states, err := db.GetLabels(rp.db, orm.FilterEq("subject", subject)) 677 678 if err != nil { 678 679 l.Error("failed to build label state", "err", err) 679 680 return ··· 1036 1037 // in the user's account. 1037 1038 existingRepo, err := db.GetRepo( 1038 1039 rp.db, 1039 1039 - db.FilterEq("did", user.Did), 1040 1040 - db.FilterEq("name", forkName), 1040 1040 + orm.FilterEq("did", user.Did), 1041 1041 + orm.FilterEq("name", forkName), 1041 1042 ) 1042 1043 if err != nil { 1043 1044 if !errors.Is(err, sql.ErrNoRows) {

+16 -17

appview/repo/repo_util.go

··· 1 1 package repo 2 2 3 3 import ( 4 4 + "maps" 4 5 "slices" 5 6 "sort" 6 7 "strings" 7 8 8 9 "tangled.org/core/appview/db" 9 10 "tangled.org/core/appview/models" 11 11 + "tangled.org/core/orm" 10 12 "tangled.org/core/types" 11 11 - 12 12 - "github.com/go-git/go-git/v5/plumbing/object" 13 13 ) 14 14 15 15 func sortFiles(files []types.NiceTree) { ··· 42 42 }) 43 43 } 44 44 45 45 - func uniqueEmails(commits []*object.Commit) []string { 45 45 + func uniqueEmails(commits []types.Commit) []string { 46 46 emails := make(map[string]struct{}) 47 47 for _, commit := range commits { 48 48 - if commit.Author.Email != "" { 49 49 - emails[commit.Author.Email] = struct{}{} 50 50 - } 51 51 - if commit.Committer.Email != "" { 52 52 - emails[commit.Committer.Email] = struct{}{} 48 48 + emails[commit.Author.Email] = struct{}{} 49 49 + emails[commit.Committer.Email] = struct{}{} 50 50 + for _, c := range commit.CoAuthors() { 51 51 + emails[c.Email] = struct{}{} 53 52 } 54 53 } 55 55 - var uniqueEmails []string 56 56 - for email := range emails { 57 57 - uniqueEmails = append(uniqueEmails, email) 58 58 - } 59 59 - return uniqueEmails 54 54 + 55 55 + // delete empty emails if any, from the set 56 56 + delete(emails, "") 57 57 + 58 58 + return slices.Collect(maps.Keys(emails)) 60 59 } 61 60 62 61 func balanceIndexItems(commitCount, branchCount, tagCount, fileCount int) (commitsTrunc int, branchesTrunc int, tagsTrunc int) { ··· 104 103 ps, err := db.GetPipelineStatuses( 105 104 d, 106 105 len(shas), 107 107 - db.FilterEq("repo_owner", repo.Did), 108 108 - db.FilterEq("repo_name", repo.Name), 109 109 - db.FilterEq("knot", repo.Knot), 110 110 - db.FilterIn("sha", shas), 106 106 + orm.FilterEq("repo_owner", repo.Did), 107 107 + orm.FilterEq("repo_name", repo.Name), 108 108 + orm.FilterEq("knot", repo.Knot), 109 109 + orm.FilterIn("sha", shas), 111 110 ) 112 111 if err != nil { 113 112 return nil, err

+3 -2

appview/repo/settings.go

··· 14 14 "tangled.org/core/appview/oauth" 15 15 "tangled.org/core/appview/pages" 16 16 xrpcclient "tangled.org/core/appview/xrpcclient" 17 17 + "tangled.org/core/orm" 17 18 "tangled.org/core/types" 18 19 19 20 comatproto "github.com/bluesky-social/indigo/api/atproto" ··· 210 211 return 211 212 } 212 213 213 213 - defaultLabels, err := db.GetLabelDefinitions(rp.db, db.FilterIn("at_uri", rp.config.Label.DefaultLabelDefs)) 214 214 + defaultLabels, err := db.GetLabelDefinitions(rp.db, orm.FilterIn("at_uri", rp.config.Label.DefaultLabelDefs)) 214 215 if err != nil { 215 216 l.Error("failed to fetch labels", "err", err) 216 217 rp.pages.Error503(w) 217 218 return 218 219 } 219 220 220 220 - labels, err := db.GetLabelDefinitions(rp.db, db.FilterIn("at_uri", f.Labels)) 221 221 + labels, err := db.GetLabelDefinitions(rp.db, orm.FilterIn("at_uri", f.Labels)) 221 222 if err != nil { 222 223 l.Error("failed to fetch labels", "err", err) 223 224 rp.pages.Error503(w)

+2 -1

appview/repo/tags.go

··· 10 10 "tangled.org/core/appview/models" 11 11 "tangled.org/core/appview/pages" 12 12 xrpcclient "tangled.org/core/appview/xrpcclient" 13 13 + "tangled.org/core/orm" 13 14 "tangled.org/core/types" 14 15 15 16 indigoxrpc "github.com/bluesky-social/indigo/xrpc" ··· 44 45 rp.pages.Error503(w) 45 46 return 46 47 } 47 47 - artifacts, err := db.GetArtifact(rp.db, db.FilterEq("repo_at", f.RepoAt())) 48 48 + artifacts, err := db.GetArtifact(rp.db, orm.FilterEq("repo_at", f.RepoAt())) 48 49 if err != nil { 49 50 l.Error("failed grab artifacts", "err", err) 50 51 return

+5 -4

appview/serververify/verify.go

··· 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/orm" 12 13 "tangled.org/core/rbac" 13 14 ) 14 15 ··· 76 77 // mark this spindle as verified in the db 77 78 rowId, err := db.VerifySpindle( 78 79 tx, 79 79 - db.FilterEq("owner", owner), 80 80 - db.FilterEq("instance", instance), 80 80 + orm.FilterEq("owner", owner), 81 81 + orm.FilterEq("instance", instance), 81 82 ) 82 83 if err != nil { 83 84 return 0, fmt.Errorf("failed to write to DB: %w", err) ··· 115 116 // mark as registered 116 117 err = db.MarkRegistered( 117 118 tx, 118 118 - db.FilterEq("did", owner), 119 119 - db.FilterEq("domain", domain), 119 119 + orm.FilterEq("did", owner), 120 120 + orm.FilterEq("domain", domain), 120 121 ) 121 122 if err != nil { 122 123 return fmt.Errorf("failed to register domain: %w", err)

+25 -24

appview/spindles/spindles.go

··· 20 20 "tangled.org/core/appview/serververify" 21 21 "tangled.org/core/appview/xrpcclient" 22 22 "tangled.org/core/idresolver" 23 23 + "tangled.org/core/orm" 23 24 "tangled.org/core/rbac" 24 25 "tangled.org/core/tid" 25 26 ··· 71 72 user := s.OAuth.GetUser(r) 72 73 all, err := db.GetSpindles( 73 74 s.Db, 74 74 - db.FilterEq("owner", user.Did), 75 75 + orm.FilterEq("owner", user.Did), 75 76 ) 76 77 if err != nil { 77 78 s.Logger.Error("failed to fetch spindles", "err", err) ··· 101 102 102 103 spindles, err := db.GetSpindles( 103 104 s.Db, 104 104 - db.FilterEq("instance", instance), 105 105 - db.FilterEq("owner", user.Did), 106 106 - db.FilterIsNot("verified", "null"), 105 105 + orm.FilterEq("instance", instance), 106 106 + orm.FilterEq("owner", user.Did), 107 107 + orm.FilterIsNot("verified", "null"), 107 108 ) 108 109 if err != nil || len(spindles) != 1 { 109 110 l.Error("failed to get spindle", "err", err, "len(spindles)", len(spindles)) ··· 123 124 repos, err := db.GetRepos( 124 125 s.Db, 125 126 0, 126 126 - db.FilterEq("spindle", instance), 127 127 + orm.FilterEq("spindle", instance), 127 128 ) 128 129 if err != nil { 129 130 l.Error("failed to get spindle repos", "err", err) ··· 290 291 291 292 spindles, err := db.GetSpindles( 292 293 s.Db, 293 293 - db.FilterEq("owner", user.Did), 294 294 - db.FilterEq("instance", instance), 294 294 + orm.FilterEq("owner", user.Did), 295 295 + orm.FilterEq("instance", instance), 295 296 ) 296 297 if err != nil || len(spindles) != 1 { 297 298 l.Error("failed to retrieve instance", "err", err, "len(spindles)", len(spindles)) ··· 319 320 // remove spindle members first 320 321 err = db.RemoveSpindleMember( 321 322 tx, 322 322 - db.FilterEq("did", user.Did), 323 323 - db.FilterEq("instance", instance), 323 323 + orm.FilterEq("did", user.Did), 324 324 + orm.FilterEq("instance", instance), 324 325 ) 325 326 if err != nil { 326 327 l.Error("failed to remove spindle members", "err", err) ··· 330 331 331 332 err = db.DeleteSpindle( 332 333 tx, 333 333 - db.FilterEq("owner", user.Did), 334 334 - db.FilterEq("instance", instance), 334 334 + orm.FilterEq("owner", user.Did), 335 335 + orm.FilterEq("instance", instance), 335 336 ) 336 337 if err != nil { 337 338 l.Error("failed to delete spindle", "err", err) ··· 410 411 411 412 spindles, err := db.GetSpindles( 412 413 s.Db, 413 413 - db.FilterEq("owner", user.Did), 414 414 - db.FilterEq("instance", instance), 414 414 + orm.FilterEq("owner", user.Did), 415 415 + orm.FilterEq("instance", instance), 415 416 ) 416 417 if err != nil || len(spindles) != 1 { 417 418 l.Error("failed to retrieve instance", "err", err, "len(spindles)", len(spindles)) ··· 453 454 454 455 verifiedSpindle, err := db.GetSpindles( 455 456 s.Db, 456 456 - db.FilterEq("id", rowId), 457 457 + orm.FilterEq("id", rowId), 457 458 ) 458 459 if err != nil || len(verifiedSpindle) != 1 { 459 460 l.Error("failed get new spindle", "err", err) ··· 486 487 487 488 spindles, err := db.GetSpindles( 488 489 s.Db, 489 489 - db.FilterEq("owner", user.Did), 490 490 - db.FilterEq("instance", instance), 490 490 + orm.FilterEq("owner", user.Did), 491 491 + orm.FilterEq("instance", instance), 491 492 ) 492 493 if err != nil || len(spindles) != 1 { 493 494 l.Error("failed to retrieve instance", "err", err, "len(spindles)", len(spindles)) ··· 622 623 623 624 spindles, err := db.GetSpindles( 624 625 s.Db, 625 625 - db.FilterEq("owner", user.Did), 626 626 - db.FilterEq("instance", instance), 626 626 + orm.FilterEq("owner", user.Did), 627 627 + orm.FilterEq("instance", instance), 627 628 ) 628 629 if err != nil || len(spindles) != 1 { 629 630 l.Error("failed to retrieve instance", "err", err, "len(spindles)", len(spindles)) ··· 672 673 // get the record from the DB first: 673 674 members, err := db.GetSpindleMembers( 674 675 s.Db, 675 675 - db.FilterEq("did", user.Did), 676 676 - db.FilterEq("instance", instance), 677 677 - db.FilterEq("subject", memberId.DID), 676 676 + orm.FilterEq("did", user.Did), 677 677 + orm.FilterEq("instance", instance), 678 678 + orm.FilterEq("subject", memberId.DID), 678 679 ) 679 680 if err != nil || len(members) != 1 { 680 681 l.Error("failed to get member", "err", err) ··· 685 686 // remove from db 686 687 if err = db.RemoveSpindleMember( 687 688 tx, 688 688 - db.FilterEq("did", user.Did), 689 689 - db.FilterEq("instance", instance), 690 690 - db.FilterEq("subject", memberId.DID), 689 689 + orm.FilterEq("did", user.Did), 690 690 + orm.FilterEq("instance", instance), 691 691 + orm.FilterEq("subject", memberId.DID), 691 692 ); err != nil { 692 693 l.Error("failed to remove spindle member", "err", err) 693 694 fail()

+6 -5

appview/state/gfi.go

··· 11 11 "tangled.org/core/appview/pages" 12 12 "tangled.org/core/appview/pagination" 13 13 "tangled.org/core/consts" 14 14 + "tangled.org/core/orm" 14 15 ) 15 16 16 17 func (s *State) GoodFirstIssues(w http.ResponseWriter, r *http.Request) { ··· 20 21 21 22 goodFirstIssueLabel := s.config.Label.GoodFirstIssue 22 23 23 23 - gfiLabelDef, err := db.GetLabelDefinition(s.db, db.FilterEq("at_uri", goodFirstIssueLabel)) 24 24 + gfiLabelDef, err := db.GetLabelDefinition(s.db, orm.FilterEq("at_uri", goodFirstIssueLabel)) 24 25 if err != nil { 25 26 log.Println("failed to get gfi label def", err) 26 27 s.pages.Error500(w) 27 28 return 28 29 } 29 30 30 30 - repoLabels, err := db.GetRepoLabels(s.db, db.FilterEq("label_at", goodFirstIssueLabel)) 31 31 + repoLabels, err := db.GetRepoLabels(s.db, orm.FilterEq("label_at", goodFirstIssueLabel)) 31 32 if err != nil { 32 33 log.Println("failed to get repo labels", err) 33 34 s.pages.Error503(w) ··· 55 56 pagination.Page{ 56 57 Limit: 500, 57 58 }, 58 58 - db.FilterIn("repo_at", repoUris), 59 59 - db.FilterEq("open", 1), 59 59 + orm.FilterIn("repo_at", repoUris), 60 60 + orm.FilterEq("open", 1), 60 61 ) 61 62 if err != nil { 62 63 log.Println("failed to get issues", err) ··· 132 133 } 133 134 134 135 if len(uriList) > 0 { 135 135 - allLabelDefs, err = db.GetLabelDefinitions(s.db, db.FilterIn("at_uri", uriList)) 136 136 + allLabelDefs, err = db.GetLabelDefinitions(s.db, orm.FilterIn("at_uri", uriList)) 136 137 if err != nil { 137 138 log.Println("failed to fetch labels", err) 138 139 }

+17

appview/state/git_http.go

··· 25 25 26 26 } 27 27 28 28 + func (s *State) UploadArchive(w http.ResponseWriter, r *http.Request) { 29 29 + user, ok := r.Context().Value("resolvedId").(identity.Identity) 30 30 + if !ok { 31 31 + http.Error(w, "failed to resolve user", http.StatusInternalServerError) 32 32 + return 33 33 + } 34 34 + repo := r.Context().Value("repo").(*models.Repo) 35 35 + 36 36 + scheme := "https" 37 37 + if s.config.Core.Dev { 38 38 + scheme = "http" 39 39 + } 40 40 + 41 41 + targetURL := fmt.Sprintf("%s://%s/%s/%s/git-upload-archive?%s", scheme, repo.Knot, user.DID, repo.Name, r.URL.RawQuery) 42 42 + s.proxyRequest(w, r, targetURL) 43 43 + } 44 44 + 28 45 func (s *State) UploadPack(w http.ResponseWriter, r *http.Request) { 29 46 user, ok := r.Context().Value("resolvedId").(identity.Identity) 30 47 if !ok {

+4 -89

appview/state/knotstream.go

··· 16 16 ec "tangled.org/core/eventconsumer" 17 17 "tangled.org/core/eventconsumer/cursor" 18 18 "tangled.org/core/log" 19 19 + "tangled.org/core/orm" 19 20 "tangled.org/core/rbac" 20 20 - "tangled.org/core/workflow" 21 21 22 22 - "github.com/bluesky-social/indigo/atproto/syntax" 23 22 "github.com/go-git/go-git/v5/plumbing" 24 23 "github.com/posthog/posthog-go" 25 24 ) ··· 30 29 31 30 knots, err := db.GetRegistrations( 32 31 d, 33 33 - db.FilterIsNot("registered", "null"), 32 32 + orm.FilterIsNot("registered", "null"), 34 33 ) 35 34 if err != nil { 36 35 return nil, err ··· 66 65 switch msg.Nsid { 67 66 case tangled.GitRefUpdateNSID: 68 67 return ingestRefUpdate(d, enforcer, posthog, dev, source, msg) 69 69 - case tangled.PipelineNSID: 70 70 - return ingestPipeline(d, source, msg) 71 68 } 72 69 73 70 return nil ··· 143 140 repos, err := db.GetRepos( 144 141 d, 145 142 0, 146 146 - db.FilterEq("did", record.RepoDid), 147 147 - db.FilterEq("name", record.RepoName), 143 143 + orm.FilterEq("did", record.RepoDid), 144 144 + orm.FilterEq("name", record.RepoName), 148 145 ) 149 146 if err != nil { 150 147 return fmt.Errorf("failed to look for repo in DB (%s/%s): %w", record.RepoDid, record.RepoName, err) ··· 189 186 190 187 return tx.Commit() 191 188 } 192 192 - 193 193 - func ingestPipeline(d *db.DB, source ec.Source, msg ec.Message) error { 194 194 - var record tangled.Pipeline 195 195 - err := json.Unmarshal(msg.EventJson, &record) 196 196 - if err != nil { 197 197 - return err 198 198 - } 199 199 - 200 200 - if record.TriggerMetadata == nil { 201 201 - return fmt.Errorf("empty trigger metadata: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 202 202 - } 203 203 - 204 204 - if record.TriggerMetadata.Repo == nil { 205 205 - return fmt.Errorf("empty repo: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 206 206 - } 207 207 - 208 208 - // does this repo have a spindle configured? 209 209 - repos, err := db.GetRepos( 210 210 - d, 211 211 - 0, 212 212 - db.FilterEq("did", record.TriggerMetadata.Repo.Did), 213 213 - db.FilterEq("name", record.TriggerMetadata.Repo.Repo), 214 214 - ) 215 215 - if err != nil { 216 216 - return fmt.Errorf("failed to look for repo in DB: nsid %s, rkey %s, %w", msg.Nsid, msg.Rkey, err) 217 217 - } 218 218 - if len(repos) != 1 { 219 219 - return fmt.Errorf("incorrect number of repos returned: %d (expected 1)", len(repos)) 220 220 - } 221 221 - if repos[0].Spindle == "" { 222 222 - return fmt.Errorf("repo does not have a spindle configured yet: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 223 223 - } 224 224 - 225 225 - // trigger info 226 226 - var trigger models.Trigger 227 227 - var sha string 228 228 - trigger.Kind = workflow.TriggerKind(record.TriggerMetadata.Kind) 229 229 - switch trigger.Kind { 230 230 - case workflow.TriggerKindPush: 231 231 - trigger.PushRef = &record.TriggerMetadata.Push.Ref 232 232 - trigger.PushNewSha = &record.TriggerMetadata.Push.NewSha 233 233 - trigger.PushOldSha = &record.TriggerMetadata.Push.OldSha 234 234 - sha = *trigger.PushNewSha 235 235 - case workflow.TriggerKindPullRequest: 236 236 - trigger.PRSourceBranch = &record.TriggerMetadata.PullRequest.SourceBranch 237 237 - trigger.PRTargetBranch = &record.TriggerMetadata.PullRequest.TargetBranch 238 238 - trigger.PRSourceSha = &record.TriggerMetadata.PullRequest.SourceSha 239 239 - trigger.PRAction = &record.TriggerMetadata.PullRequest.Action 240 240 - sha = *trigger.PRSourceSha 241 241 - } 242 242 - 243 243 - tx, err := d.Begin() 244 244 - if err != nil { 245 245 - return fmt.Errorf("failed to start txn: %w", err) 246 246 - } 247 247 - 248 248 - triggerId, err := db.AddTrigger(tx, trigger) 249 249 - if err != nil { 250 250 - return fmt.Errorf("failed to add trigger entry: %w", err) 251 251 - } 252 252 - 253 253 - pipeline := models.Pipeline{ 254 254 - Rkey: msg.Rkey, 255 255 - Knot: source.Key(), 256 256 - RepoOwner: syntax.DID(record.TriggerMetadata.Repo.Did), 257 257 - RepoName: record.TriggerMetadata.Repo.Repo, 258 258 - TriggerId: int(triggerId), 259 259 - Sha: sha, 260 260 - } 261 261 - 262 262 - err = db.AddPipeline(tx, pipeline) 263 263 - if err != nil { 264 264 - return fmt.Errorf("failed to add pipeline: %w", err) 265 265 - } 266 266 - 267 267 - err = tx.Commit() 268 268 - if err != nil { 269 269 - return fmt.Errorf("failed to commit txn: %w", err) 270 270 - } 271 271 - 272 272 - return nil 273 273 - }

+22 -12

appview/state/profile.go

··· 19 19 "tangled.org/core/appview/db" 20 20 "tangled.org/core/appview/models" 21 21 "tangled.org/core/appview/pages" 22 22 + "tangled.org/core/orm" 22 23 ) 23 24 24 25 func (s *State) Profile(w http.ResponseWriter, r *http.Request) { ··· 56 57 return nil, fmt.Errorf("failed to get profile: %w", err) 57 58 } 58 59 59 59 - repoCount, err := db.CountRepos(s.db, db.FilterEq("did", did)) 60 60 + repoCount, err := db.CountRepos(s.db, orm.FilterEq("did", did)) 60 61 if err != nil { 61 62 return nil, fmt.Errorf("failed to get repo count: %w", err) 62 63 } 63 64 64 64 - stringCount, err := db.CountStrings(s.db, db.FilterEq("did", did)) 65 65 + stringCount, err := db.CountStrings(s.db, orm.FilterEq("did", did)) 65 66 if err != nil { 66 67 return nil, fmt.Errorf("failed to get string count: %w", err) 67 68 } 68 69 69 69 - starredCount, err := db.CountStars(s.db, db.FilterEq("did", did)) 70 70 + starredCount, err := db.CountStars(s.db, orm.FilterEq("did", did)) 70 71 if err != nil { 71 72 return nil, fmt.Errorf("failed to get starred repo count: %w", err) 72 73 } ··· 86 87 startOfYear := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, time.UTC) 87 88 punchcard, err := db.MakePunchcard( 88 89 s.db, 89 89 - db.FilterEq("did", did), 90 90 - db.FilterGte("date", startOfYear.Format(time.DateOnly)), 91 91 - db.FilterLte("date", now.Format(time.DateOnly)), 90 90 + orm.FilterEq("did", did), 91 91 + orm.FilterGte("date", startOfYear.Format(time.DateOnly)), 92 92 + orm.FilterLte("date", now.Format(time.DateOnly)), 92 93 ) 93 94 if err != nil { 94 95 return nil, fmt.Errorf("failed to get punchcard for %s: %w", did, err) ··· 123 124 repos, err := db.GetRepos( 124 125 s.db, 125 126 0, 126 126 - db.FilterEq("did", profile.UserDid), 127 127 + orm.FilterEq("did", profile.UserDid), 127 128 ) 128 129 if err != nil { 129 130 l.Error("failed to fetch repos", "err", err) ··· 161 162 l.Error("failed to create timeline", "err", err) 162 163 } 163 164 165 165 + // populate commit counts in the timeline, using the punchcard 166 166 + currentMonth := time.Now().Month() 167 167 + for _, p := range profile.Punchcard.Punches { 168 168 + idx := currentMonth - p.Date.Month() 169 169 + if int(idx) < len(timeline.ByMonth) { 170 170 + timeline.ByMonth[idx].Commits += p.Count 171 171 + } 172 172 + } 173 173 + 164 174 s.pages.ProfileOverview(w, pages.ProfileOverviewParams{ 165 175 LoggedInUser: s.oauth.GetUser(r), 166 176 Card: profile, ··· 184 194 repos, err := db.GetRepos( 185 195 s.db, 186 196 0, 187 187 - db.FilterEq("did", profile.UserDid), 197 197 + orm.FilterEq("did", profile.UserDid), 188 198 ) 189 199 if err != nil { 190 200 l.Error("failed to get repos", "err", err) ··· 210 220 } 211 221 l = l.With("profileDid", profile.UserDid) 212 222 213 213 - stars, err := db.GetRepoStars(s.db, 0, db.FilterEq("did", profile.UserDid)) 223 223 + stars, err := db.GetRepoStars(s.db, 0, orm.FilterEq("did", profile.UserDid)) 214 224 if err != nil { 215 225 l.Error("failed to get stars", "err", err) 216 226 s.pages.Error500(w) ··· 239 249 } 240 250 l = l.With("profileDid", profile.UserDid) 241 251 242 242 - strings, err := db.GetStrings(s.db, 0, db.FilterEq("did", profile.UserDid)) 252 252 + strings, err := db.GetStrings(s.db, 0, orm.FilterEq("did", profile.UserDid)) 243 253 if err != nil { 244 254 l.Error("failed to get strings", "err", err) 245 255 s.pages.Error500(w) ··· 291 301 followDids = append(followDids, extractDid(follow)) 292 302 } 293 303 294 294 - profiles, err := db.GetProfiles(s.db, db.FilterIn("did", followDids)) 304 304 + profiles, err := db.GetProfiles(s.db, orm.FilterIn("did", followDids)) 295 305 if err != nil { 296 306 l.Error("failed to get profiles", "followDids", followDids, "err", err) 297 307 return &params, err ··· 694 704 log.Printf("getting profile data for %s: %s", user.Did, err) 695 705 } 696 706 697 697 - repos, err := db.GetRepos(s.db, 0, db.FilterEq("did", user.Did)) 707 707 + repos, err := db.GetRepos(s.db, 0, orm.FilterEq("did", user.Did)) 698 708 if err != nil { 699 709 log.Printf("getting repos for %s: %s", user.Did, err) 700 710 }

+6 -3

appview/state/router.go

··· 96 96 r.Mount("/", s.RepoRouter(mw)) 97 97 r.Mount("/issues", s.IssuesRouter(mw)) 98 98 r.Mount("/pulls", s.PullsRouter(mw)) 99 99 - r.Mount("/pipelines", s.PipelinesRouter()) 99 99 + r.Mount("/pipelines", s.PipelinesRouter(mw)) 100 100 r.Mount("/labels", s.LabelsRouter()) 101 101 102 102 // These routes get proxied to the knot 103 103 r.Get("/info/refs", s.InfoRefs) 104 104 + r.Post("/git-upload-archive", s.UploadArchive) 104 105 r.Post("/git-upload-pack", s.UploadPack) 105 106 r.Post("/git-receive-pack", s.ReceivePack) 106 107 ··· 266 267 s.enforcer, 267 268 s.pages, 268 269 s.idResolver, 270 270 + s.mentionsResolver, 269 271 s.db, 270 272 s.config, 271 273 s.notifier, ··· 282 284 s.repoResolver, 283 285 s.pages, 284 286 s.idResolver, 287 287 + s.mentionsResolver, 285 288 s.db, 286 289 s.config, 287 290 s.notifier, ··· 310 313 return repo.Router(mw) 311 314 } 312 315 313 313 - func (s *State) PipelinesRouter() http.Handler { 316 316 + func (s *State) PipelinesRouter(mw *middleware.Middleware) http.Handler { 314 317 pipes := pipelines.New( 315 318 s.oauth, 316 319 s.repoResolver, ··· 322 325 s.enforcer, 323 326 log.SubLogger(s.logger, "pipelines"), 324 327 ) 325 325 - return pipes.Router() 328 328 + return pipes.Router(mw) 326 329 } 327 330 328 331 func (s *State) LabelsRouter() http.Handler {

+91 -1

appview/state/spindlestream.go

··· 17 17 ec "tangled.org/core/eventconsumer" 18 18 "tangled.org/core/eventconsumer/cursor" 19 19 "tangled.org/core/log" 20 20 + "tangled.org/core/orm" 20 21 "tangled.org/core/rbac" 21 22 spindle "tangled.org/core/spindle/models" 23 23 + "tangled.org/core/workflow" 22 24 ) 23 25 24 26 func Spindlestream(ctx context.Context, c *config.Config, d *db.DB, enforcer *rbac.Enforcer) (*ec.Consumer, error) { ··· 27 29 28 30 spindles, err := db.GetSpindles( 29 31 d, 30 30 - db.FilterIsNot("verified", "null"), 32 32 + orm.FilterIsNot("verified", "null"), 31 33 ) 32 34 if err != nil { 33 35 return nil, err ··· 61 63 func spindleIngester(ctx context.Context, logger *slog.Logger, d *db.DB) ec.ProcessFunc { 62 64 return func(ctx context.Context, source ec.Source, msg ec.Message) error { 63 65 switch msg.Nsid { 66 66 + case tangled.PipelineNSID: 67 67 + return ingestPipeline(logger, d, source, msg) 64 68 case tangled.PipelineStatusNSID: 65 69 return ingestPipelineStatus(ctx, logger, d, source, msg) 66 70 } 67 71 68 72 return nil 69 73 } 74 74 + } 75 75 + 76 76 + func ingestPipeline(l *slog.Logger, d *db.DB, source ec.Source, msg ec.Message) error { 77 77 + var record tangled.Pipeline 78 78 + err := json.Unmarshal(msg.EventJson, &record) 79 79 + if err != nil { 80 80 + return err 81 81 + } 82 82 + 83 83 + if record.TriggerMetadata == nil { 84 84 + return fmt.Errorf("empty trigger metadata: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 85 85 + } 86 86 + 87 87 + if record.TriggerMetadata.Repo == nil { 88 88 + return fmt.Errorf("empty repo: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 89 89 + } 90 90 + 91 91 + // does this repo have a spindle configured? 92 92 + repos, err := db.GetRepos( 93 93 + d, 94 94 + 0, 95 95 + orm.FilterEq("did", record.TriggerMetadata.Repo.Did), 96 96 + orm.FilterEq("name", record.TriggerMetadata.Repo.Repo), 97 97 + ) 98 98 + if err != nil { 99 99 + return fmt.Errorf("failed to look for repo in DB: nsid %s, rkey %s, %w", msg.Nsid, msg.Rkey, err) 100 100 + } 101 101 + if len(repos) != 1 { 102 102 + return fmt.Errorf("incorrect number of repos returned: %d (expected 1)", len(repos)) 103 103 + } 104 104 + if repos[0].Spindle == "" { 105 105 + return fmt.Errorf("repo does not have a spindle configured yet: nsid %s, rkey %s", msg.Nsid, msg.Rkey) 106 106 + } 107 107 + 108 108 + // trigger info 109 109 + var trigger models.Trigger 110 110 + var sha string 111 111 + trigger.Kind = workflow.TriggerKind(record.TriggerMetadata.Kind) 112 112 + switch trigger.Kind { 113 113 + case workflow.TriggerKindPush: 114 114 + trigger.PushRef = &record.TriggerMetadata.Push.Ref 115 115 + trigger.PushNewSha = &record.TriggerMetadata.Push.NewSha 116 116 + trigger.PushOldSha = &record.TriggerMetadata.Push.OldSha 117 117 + sha = *trigger.PushNewSha 118 118 + case workflow.TriggerKindPullRequest: 119 119 + trigger.PRSourceBranch = &record.TriggerMetadata.PullRequest.SourceBranch 120 120 + trigger.PRTargetBranch = &record.TriggerMetadata.PullRequest.TargetBranch 121 121 + trigger.PRSourceSha = &record.TriggerMetadata.PullRequest.SourceSha 122 122 + trigger.PRAction = &record.TriggerMetadata.PullRequest.Action 123 123 + sha = *trigger.PRSourceSha 124 124 + } 125 125 + 126 126 + tx, err := d.Begin() 127 127 + if err != nil { 128 128 + return fmt.Errorf("failed to start txn: %w", err) 129 129 + } 130 130 + 131 131 + triggerId, err := db.AddTrigger(tx, trigger) 132 132 + if err != nil { 133 133 + return fmt.Errorf("failed to add trigger entry: %w", err) 134 134 + } 135 135 + 136 136 + // TODO: we shouldn't even use knot to identify pipelines 137 137 + knot := record.TriggerMetadata.Repo.Knot 138 138 + pipeline := models.Pipeline{ 139 139 + Rkey: msg.Rkey, 140 140 + Knot: knot, 141 141 + RepoOwner: syntax.DID(record.TriggerMetadata.Repo.Did), 142 142 + RepoName: record.TriggerMetadata.Repo.Repo, 143 143 + TriggerId: int(triggerId), 144 144 + Sha: sha, 145 145 + } 146 146 + 147 147 + err = db.AddPipeline(tx, pipeline) 148 148 + if err != nil { 149 149 + return fmt.Errorf("failed to add pipeline: %w", err) 150 150 + } 151 151 + 152 152 + err = tx.Commit() 153 153 + if err != nil { 154 154 + return fmt.Errorf("failed to commit txn: %w", err) 155 155 + } 156 156 + 157 157 + l.Info("added pipeline", "pipeline", pipeline) 158 158 + 159 159 + return nil 70 160 } 71 161 72 162 func ingestPipelineStatus(ctx context.Context, logger *slog.Logger, d *db.DB, source ec.Source, msg ec.Message) error {

+29 -23

appview/state/state.go

··· 15 15 "tangled.org/core/appview/config" 16 16 "tangled.org/core/appview/db" 17 17 "tangled.org/core/appview/indexer" 18 18 + "tangled.org/core/appview/mentions" 18 19 "tangled.org/core/appview/models" 19 20 "tangled.org/core/appview/notify" 20 21 dbnotify "tangled.org/core/appview/notify/db" ··· 29 30 "tangled.org/core/jetstream" 30 31 "tangled.org/core/log" 31 32 tlog "tangled.org/core/log" 33 33 + "tangled.org/core/orm" 32 34 "tangled.org/core/rbac" 33 35 "tangled.org/core/tid" 34 36 ··· 42 44 ) 43 45 44 46 type State struct { 45 45 - db *db.DB 46 46 - notifier notify.Notifier 47 47 - indexer *indexer.Indexer 48 48 - oauth *oauth.OAuth 49 49 - enforcer *rbac.Enforcer 50 50 - pages *pages.Pages 51 51 - idResolver *idresolver.Resolver 52 52 - posthog posthog.Client 53 53 - jc *jetstream.JetstreamClient 54 54 - config *config.Config 55 55 - repoResolver *reporesolver.RepoResolver 56 56 - knotstream *eventconsumer.Consumer 57 57 - spindlestream *eventconsumer.Consumer 58 58 - logger *slog.Logger 59 59 - validator *validator.Validator 47 47 + db *db.DB 48 48 + notifier notify.Notifier 49 49 + indexer *indexer.Indexer 50 50 + oauth *oauth.OAuth 51 51 + enforcer *rbac.Enforcer 52 52 + pages *pages.Pages 53 53 + idResolver *idresolver.Resolver 54 54 + mentionsResolver *mentions.Resolver 55 55 + posthog posthog.Client 56 56 + jc *jetstream.JetstreamClient 57 57 + config *config.Config 58 58 + repoResolver *reporesolver.RepoResolver 59 59 + knotstream *eventconsumer.Consumer 60 60 + spindlestream *eventconsumer.Consumer 61 61 + logger *slog.Logger 62 62 + validator *validator.Validator 60 63 } 61 64 62 65 func Make(ctx context.Context, config *config.Config) (*State, error) { ··· 98 101 99 102 repoResolver := reporesolver.New(config, enforcer, d) 100 103 104 104 + mentionsResolver := mentions.New(config, res, d, log.SubLogger(logger, "mentionsResolver")) 105 105 + 101 106 wrapper := db.DbWrapper{Execer: d} 102 107 jc, err := jetstream.NewJetstreamClient( 103 108 config.Jetstream.Endpoint, ··· 178 183 enforcer, 179 184 pages, 180 185 res, 186 186 + mentionsResolver, 181 187 posthog, 182 188 jc, 183 189 config, ··· 294 300 return 295 301 } 296 302 297 297 - gfiLabel, err := db.GetLabelDefinition(s.db, db.FilterEq("at_uri", s.config.Label.GoodFirstIssue)) 303 303 + gfiLabel, err := db.GetLabelDefinition(s.db, orm.FilterEq("at_uri", s.config.Label.GoodFirstIssue)) 298 304 if err != nil { 299 305 // non-fatal 300 306 } ··· 318 324 319 325 regs, err := db.GetRegistrations( 320 326 s.db, 321 321 - db.FilterEq("did", user.Did), 322 322 - db.FilterEq("needs_upgrade", 1), 327 327 + orm.FilterEq("did", user.Did), 328 328 + orm.FilterEq("needs_upgrade", 1), 323 329 ) 324 330 if err != nil { 325 331 l.Error("non-fatal: failed to get registrations", "err", err) ··· 327 333 328 334 spindles, err := db.GetSpindles( 329 335 s.db, 330 330 - db.FilterEq("owner", user.Did), 331 331 - db.FilterEq("needs_upgrade", 1), 336 336 + orm.FilterEq("owner", user.Did), 337 337 + orm.FilterEq("needs_upgrade", 1), 332 338 ) 333 339 if err != nil { 334 340 l.Error("non-fatal: failed to get spindles", "err", err) ··· 499 505 // Check for existing repos 500 506 existingRepo, err := db.GetRepo( 501 507 s.db, 502 502 - db.FilterEq("did", user.Did), 503 503 - db.FilterEq("name", repoName), 508 508 + orm.FilterEq("did", user.Did), 509 509 + orm.FilterEq("name", repoName), 504 510 ) 505 511 if err == nil && existingRepo != nil { 506 512 l.Info("repo exists") ··· 660 666 } 661 667 662 668 func BackfillDefaultDefs(e db.Execer, r *idresolver.Resolver, defaults []string) error { 663 663 - defaultLabels, err := db.GetLabelDefinitions(e, db.FilterIn("at_uri", defaults)) 669 669 + defaultLabels, err := db.GetLabelDefinitions(e, orm.FilterIn("at_uri", defaults)) 664 670 if err != nil { 665 671 return err 666 672 }

+7 -6

appview/strings/strings.go

··· 17 17 "tangled.org/core/appview/pages" 18 18 "tangled.org/core/appview/pages/markup" 19 19 "tangled.org/core/idresolver" 20 20 + "tangled.org/core/orm" 20 21 "tangled.org/core/tid" 21 22 22 23 "github.com/bluesky-social/indigo/api/atproto" ··· 108 109 strings, err := db.GetStrings( 109 110 s.Db, 110 111 0, 111 111 - db.FilterEq("did", id.DID), 112 112 - db.FilterEq("rkey", rkey), 112 112 + orm.FilterEq("did", id.DID), 113 113 + orm.FilterEq("rkey", rkey), 113 114 ) 114 115 if err != nil { 115 116 l.Error("failed to fetch string", "err", err) ··· 199 200 all, err := db.GetStrings( 200 201 s.Db, 201 202 0, 202 202 - db.FilterEq("did", id.DID), 203 203 - db.FilterEq("rkey", rkey), 203 203 + orm.FilterEq("did", id.DID), 204 204 + orm.FilterEq("rkey", rkey), 204 205 ) 205 206 if err != nil { 206 207 l.Error("failed to fetch string", "err", err) ··· 408 409 409 410 if err := db.DeleteString( 410 411 s.Db, 411 411 - db.FilterEq("did", user.Did), 412 412 - db.FilterEq("rkey", rkey), 412 412 + orm.FilterEq("did", user.Did), 413 413 + orm.FilterEq("rkey", rkey), 413 414 ); err != nil { 414 415 fail("Failed to delete string.", err) 415 416 return

+2 -1

appview/validator/issue.go

··· 6 6 7 7 "tangled.org/core/appview/db" 8 8 "tangled.org/core/appview/models" 9 9 + "tangled.org/core/orm" 9 10 ) 10 11 11 12 func (v *Validator) ValidateIssueComment(comment *models.IssueComment) error { 12 13 // if comments have parents, only ingest ones that are 1 level deep 13 14 if comment.ReplyTo != nil { 14 14 - parents, err := db.GetIssueComments(v.db, db.FilterEq("at_uri", *comment.ReplyTo)) 15 15 + parents, err := db.GetIssueComments(v.db, orm.FilterEq("at_uri", *comment.ReplyTo)) 15 16 if err != nil { 16 17 return fmt.Errorf("failed to fetch parent comment: %w", err) 17 18 }

+1 -34

crypto/verify.go

··· 5 5 "crypto/sha256" 6 6 "encoding/base64" 7 7 "fmt" 8 8 - "strings" 9 8 10 9 "github.com/hiddeco/sshsig" 11 10 "golang.org/x/crypto/ssh" 12 12 - "tangled.org/core/types" 13 11 ) 14 12 15 13 func VerifySignature(pubKey, signature, payload []byte) (error, bool) { ··· 28 26 // multiple algorithms but sha-512 is most secure, and git's ssh signing defaults 29 27 // to sha-512 for all key types anyway. 30 28 err = sshsig.Verify(buf, sig, pub, sshsig.HashSHA512, "git") 31 31 - return err, err == nil 32 32 - } 33 29 34 34 - // VerifyCommitSignature reconstructs the payload used to sign a commit. This is 35 35 - // essentially the git cat-file output but without the gpgsig header. 36 36 - // 37 37 - // Caveats: signature verification will fail on commits with more than one parent, 38 38 - // i.e. merge commits, because types.NiceDiff doesn't carry more than one Parent field 39 39 - // and we are unable to reconstruct the payload correctly. 40 40 - // 41 41 - // Ideally this should directly operate on an *object.Commit. 42 42 - func VerifyCommitSignature(pubKey string, commit types.NiceDiff) (error, bool) { 43 43 - signature := commit.Commit.PGPSignature 44 44 - 45 45 - author := bytes.NewBuffer([]byte{}) 46 46 - committer := bytes.NewBuffer([]byte{}) 47 47 - commit.Commit.Author.Encode(author) 48 48 - commit.Commit.Committer.Encode(committer) 49 49 - 50 50 - payload := strings.Builder{} 51 51 - 52 52 - fmt.Fprintf(&payload, "tree %s\n", commit.Commit.Tree) 53 53 - if commit.Commit.Parent != "" { 54 54 - fmt.Fprintf(&payload, "parent %s\n", commit.Commit.Parent) 55 55 - } 56 56 - fmt.Fprintf(&payload, "author %s\n", author.String()) 57 57 - fmt.Fprintf(&payload, "committer %s\n", committer.String()) 58 58 - if commit.Commit.ChangedId != "" { 59 59 - fmt.Fprintf(&payload, "change-id %s\n", commit.Commit.ChangedId) 60 60 - } 61 61 - fmt.Fprintf(&payload, "\n%s", commit.Commit.Message) 62 62 - 63 63 - return VerifySignature([]byte(pubKey), []byte(signature), []byte(payload.String())) 30 30 + return err, err == nil 64 31 } 65 32 66 33 // SSHFingerprint computes the fingerprint of the supplied ssh pubkey.

+1529

docs/DOCS.md

··· 1 1 + --- 2 2 + title: Tangled docs 3 3 + author: The Tangled Contributors 4 4 + date: 21 Sun, Dec 2025 5 5 + --- 6 6 + 7 7 + # Introduction 8 8 + 9 9 + Tangled is a decentralized code hosting and collaboration 10 10 + platform. Every component of Tangled is open-source and 11 11 + self-hostable. [tangled.org](https://tangled.org) also 12 12 + provides hosting and CI services that are free to use. 13 13 + 14 14 + There are several models for decentralized code 15 15 + collaboration platforms, ranging from ActivityPub’s 16 16 + (Forgejo) federated model, to Radicle’s entirely P2P model. 17 17 + Our approach attempts to be the best of both worlds by 18 18 + adopting the AT Protocol—a protocol for building decentralized 19 19 + social applications with a central identity 20 20 + 21 21 + Our approach to this is the idea of “knots”. Knots are 22 22 + lightweight, headless servers that enable users to host Git 23 23 + repositories with ease. Knots are designed for either single 24 24 + or multi-tenant use which is perfect for self-hosting on a 25 25 + Raspberry Pi at home, or larger “community” servers. By 26 26 + default, Tangled provides managed knots where you can host 27 27 + your repositories for free. 28 28 + 29 29 + The appview at tangled.org acts as a consolidated "view" 30 30 + into the whole network, allowing users to access, clone and 31 31 + contribute to repositories hosted across different knots 32 32 + seamlessly. 33 33 + 34 34 + # Quick start guide 35 35 + 36 36 + ## Login or sign up 37 37 + 38 38 + You can [login](https://tangled.org) by using your AT Protocol 39 39 + account. If you are unclear on what that means, simply head 40 40 + to the [signup](https://tangled.org/signup) page and create 41 41 + an account. By doing so, you will be choosing Tangled as 42 42 + your account provider (you will be granted a handle of the 43 43 + form `user.tngl.sh`). 44 44 + 45 45 + In the AT Protocol network, users are free to choose their account 46 46 + provider (known as a "Personal Data Service", or PDS), and 47 47 + login to applications that support AT accounts. 48 48 + 49 49 + You can think of it as "one account for all of the atmosphere"! 50 50 + 51 51 + If you already have an AT account (you may have one if you 52 52 + signed up to Bluesky, for example), you can login with the 53 53 + same handle on Tangled (so just use `user.bsky.social` on 54 54 + the login page). 55 55 + 56 56 + ## Add an SSH key 57 57 + 58 58 + Once you are logged in, you can start creating repositories 59 59 + and pushing code. Tangled supports pushing git repositories 60 60 + over SSH. 61 61 + 62 62 + First, you'll need to generate an SSH key if you don't 63 63 + already have one: 64 64 + 65 65 + ```bash 66 66 + ssh-keygen -t ed25519 -C "foo@bar.com" 67 67 + ``` 68 68 + 69 69 + When prompted, save the key to the default location 70 70 + (`~/.ssh/id_ed25519`) and optionally set a passphrase. 71 71 + 72 72 + Copy your public key to your clipboard: 73 73 + 74 74 + ```bash 75 75 + # on X11 76 76 + cat ~/.ssh/id_ed25519.pub | xclip -sel c 77 77 + 78 78 + # on wayland 79 79 + cat ~/.ssh/id_ed25519.pub | wl-copy 80 80 + 81 81 + # on macos 82 82 + cat ~/.ssh/id_ed25519.pub | pbcopy 83 83 + ``` 84 84 + 85 85 + Now, navigate to 'Settings' -> 'Keys' and hit 'Add Key', 86 86 + paste your public key, give it a descriptive name, and hit 87 87 + save. 88 88 + 89 89 + ## Create a repository 90 90 + 91 91 + Once your SSH key is added, create your first repository: 92 92 + 93 93 + 1. Hit the green `+` icon on the topbar, and select 94 94 + repository 95 95 + 2. Enter a repository name 96 96 + 3. Add a description 97 97 + 4. Choose a knotserver to host this repository on 98 98 + 5. Hit create 99 99 + 100 100 + Knots are self-hostable, lightweight Git servers that can 101 101 + host your repository. Unlike traditional code forges, your 102 102 + code can live on any server. Read the [Knots](TODO) section 103 103 + for more. 104 104 + 105 105 + ## Configure SSH 106 106 + 107 107 + To ensure Git uses the correct SSH key and connects smoothly 108 108 + to Tangled, add this configuration to your `~/.ssh/config` 109 109 + file: 110 110 + 111 111 + ``` 112 112 + Host tangled.org 113 113 + Hostname tangled.org 114 114 + User git 115 115 + IdentityFile ~/.ssh/id_ed25519 116 116 + AddressFamily inet 117 117 + ``` 118 118 + 119 119 + This tells SSH to use your specific key when connecting to 120 120 + Tangled and prevents authentication issues if you have 121 121 + multiple SSH keys. 122 122 + 123 123 + Note that this configuration only works for knotservers that 124 124 + are hosted by tangled.org. If you use a custom knot, refer 125 125 + to the [Knots](TODO) section. 126 126 + 127 127 + ## Push your first repository 128 128 + 129 129 + Initialize a new Git repository: 130 130 + 131 131 + ```bash 132 132 + mkdir my-project 133 133 + cd my-project 134 134 + 135 135 + git init 136 136 + echo "# My Project" > README.md 137 137 + ``` 138 138 + 139 139 + Add some content and push! 140 140 + 141 141 + ```bash 142 142 + git add README.md 143 143 + git commit -m "Initial commit" 144 144 + git remote add origin git@tangled.org:user.tngl.sh/my-project 145 145 + git push -u origin main 146 146 + ``` 147 147 + 148 148 + That's it! Your code is now hosted on Tangled. 149 149 + 150 150 + ## Migrating an existing repository 151 151 + 152 152 + Moving your repositories from GitHub, GitLab, Bitbucket, or 153 153 + any other Git forge to Tangled is straightforward. You'll 154 154 + simply change your repository's remote URL. At the moment, 155 155 + Tangled does not have any tooling to migrate data such as 156 156 + GitHub issues or pull requests. 157 157 + 158 158 + First, create a new repository on tangled.org as described 159 159 + in the [Quick Start Guide](#create-a-repository). 160 160 + 161 161 + Navigate to your existing local repository: 162 162 + 163 163 + ```bash 164 164 + cd /path/to/your/existing/repo 165 165 + ``` 166 166 + 167 167 + You can inspect your existing Git remote like so: 168 168 + 169 169 + ```bash 170 170 + git remote -v 171 171 + ``` 172 172 + 173 173 + You'll see something like: 174 174 + 175 175 + ``` 176 176 + origin git@github.com:username/my-project (fetch) 177 177 + origin git@github.com:username/my-project (push) 178 178 + ``` 179 179 + 180 180 + Update the remote URL to point to tangled: 181 181 + 182 182 + ```bash 183 183 + git remote set-url origin git@tangled.org:user.tngl.sh/my-project 184 184 + ``` 185 185 + 186 186 + Verify the change: 187 187 + 188 188 + ```bash 189 189 + git remote -v 190 190 + ``` 191 191 + 192 192 + You should now see: 193 193 + 194 194 + ``` 195 195 + origin git@tangled.org:user.tngl.sh/my-project (fetch) 196 196 + origin git@tangled.org:user.tngl.sh/my-project (push) 197 197 + ``` 198 198 + 199 199 + Push all your branches and tags to Tangled: 200 200 + 201 201 + ```bash 202 202 + git push -u origin --all 203 203 + git push -u origin --tags 204 204 + ``` 205 205 + 206 206 + Your repository is now migrated to Tangled! All commit 207 207 + history, branches, and tags have been preserved. 208 208 + 209 209 + ## Mirroring a repository to Tangled 210 210 + 211 211 + If you want to maintain your repository on multiple forges 212 212 + simultaneously, for example, keeping your primary repository 213 213 + on GitHub while mirroring to Tangled for backup or 214 214 + redundancy, you can do so by adding multiple remotes. 215 215 + 216 216 + You can configure your local repository to push to both 217 217 + Tangled and, say, GitHub. You may already have the following 218 218 + setup: 219 219 + 220 220 + ``` 221 221 + $ git remote -v 222 222 + origin git@github.com:username/my-project (fetch) 223 223 + origin git@github.com:username/my-project (push) 224 224 + ``` 225 225 + 226 226 + Now add Tangled as an additional push URL to the same 227 227 + remote: 228 228 + 229 229 + ```bash 230 230 + git remote set-url --add --push origin git@tangled.org:user.tngl.sh/my-project 231 231 + ``` 232 232 + 233 233 + You also need to re-add the original URL as a push 234 234 + destination (Git replaces the push URL when you use `--add` 235 235 + the first time): 236 236 + 237 237 + ```bash 238 238 + git remote set-url --add --push origin git@github.com:username/my-project 239 239 + ``` 240 240 + 241 241 + Verify your configuration: 242 242 + 243 243 + ``` 244 244 + $ git remote -v 245 245 + origin git@github.com:username/repo (fetch) 246 246 + origin git@tangled.org:username/my-project (push) 247 247 + origin git@github.com:username/repo (push) 248 248 + ``` 249 249 + 250 250 + Notice that there's one fetch URL (the primary remote) and 251 251 + two push URLs. Now, whenever you push, Git will 252 252 + automatically push to both remotes: 253 253 + 254 254 + ```bash 255 255 + git push origin main 256 256 + ``` 257 257 + 258 258 + This single command pushes your `main` branch to both GitHub 259 259 + and Tangled simultaneously. 260 260 + 261 261 + To push all branches and tags: 262 262 + 263 263 + ```bash 264 264 + git push origin --all 265 265 + git push origin --tags 266 266 + ``` 267 267 + 268 268 + If you prefer more control over which remote you push to, 269 269 + you can maintain separate remotes: 270 270 + 271 271 + ```bash 272 272 + git remote add github git@github.com:username/my-project 273 273 + git remote add tangled git@tangled.org:username/my-project 274 274 + ``` 275 275 + 276 276 + Then push to each explicitly: 277 277 + 278 278 + ```bash 279 279 + git push github main 280 280 + git push tangled main 281 281 + ``` 282 282 + 283 283 + # Knot self-hosting guide 284 284 + 285 285 + So you want to run your own knot server? Great! Here are a few prerequisites: 286 286 + 287 287 + 1. A server of some kind (a VPS, a Raspberry Pi, etc.). Preferably running a Linux distribution of some kind. 288 288 + 2. A (sub)domain name. People generally use `knot.example.com`. 289 289 + 3. A valid SSL certificate for your domain. 290 290 + 291 291 + ## NixOS 292 292 + 293 293 + Refer to the [knot 294 294 + module](https://tangled.org/tangled.org/core/blob/master/nix/modules/knot.nix) 295 295 + for a full list of options. Sample configurations: 296 296 + 297 297 + - [The test VM](https://tangled.org/tangled.org/core/blob/master/nix/vm.nix#L85) 298 298 + - [@pyrox.dev/nix](https://tangled.org/pyrox.dev/nix/blob/d19571cc1b5fe01035e1e6951ec8cf8a476b4dee/hosts/marvin/services/tangled.nix#L15-25) 299 299 + 300 300 + ## Docker 301 301 + 302 302 + Refer to 303 303 + [@tangled.org/knot-docker](https://tangled.org/@tangled.org/knot-docker). 304 304 + Note that this is community maintained. 305 305 + 306 306 + ## Manual setup 307 307 + 308 308 + First, clone this repository: 309 309 + 310 310 + ``` 311 311 + git clone https://tangled.org/@tangled.org/core 312 312 + ``` 313 313 + 314 314 + Then, build the `knot` CLI. This is the knot administration 315 315 + and operation tool. For the purpose of this guide, we're 316 316 + only concerned with these subcommands: 317 317 + 318 318 + * `knot server`: the main knot server process, typically 319 319 + run as a supervised service 320 320 + * `knot guard`: handles role-based access control for git 321 321 + over SSH (you'll never have to run this yourself) 322 322 + * `knot keys`: fetches SSH keys associated with your knot; 323 323 + we'll use this to generate the SSH 324 324 + `AuthorizedKeysCommand` 325 325 + 326 326 + ``` 327 327 + cd core 328 328 + export CGO_ENABLED=1 329 329 + go build -o knot ./cmd/knot 330 330 + ``` 331 331 + 332 332 + Next, move the `knot` binary to a location owned by `root` -- 333 333 + `/usr/local/bin/` is a good choice. Make sure the binary itself is also owned by `root`: 334 334 + 335 335 + ``` 336 336 + sudo mv knot /usr/local/bin/knot 337 337 + sudo chown root:root /usr/local/bin/knot 338 338 + ``` 339 339 + 340 340 + This is necessary because SSH `AuthorizedKeysCommand` requires [really 341 341 + specific permissions](https://stackoverflow.com/a/27638306). The 342 342 + `AuthorizedKeysCommand` specifies a command that is run by `sshd` to 343 343 + retrieve a user's public SSH keys dynamically for authentication. Let's 344 344 + set that up. 345 345 + 346 346 + ``` 347 347 + sudo tee /etc/ssh/sshd_config.d/authorized_keys_command.conf <<EOF 348 348 + Match User git 349 349 + AuthorizedKeysCommand /usr/local/bin/knot keys -o authorized-keys 350 350 + AuthorizedKeysCommandUser nobody 351 351 + EOF 352 352 + ``` 353 353 + 354 354 + Then, reload `sshd`: 355 355 + 356 356 + ``` 357 357 + sudo systemctl reload ssh 358 358 + ``` 359 359 + 360 360 + Next, create the `git` user. We'll use the `git` user's home directory 361 361 + to store repositories: 362 362 + 363 363 + ``` 364 364 + sudo adduser git 365 365 + ``` 366 366 + 367 367 + Create `/home/git/.knot.env` with the following, updating the values as 368 368 + necessary. The `KNOT_SERVER_OWNER` should be set to your 369 369 + DID, you can find your DID in the [Settings](https://tangled.sh/settings) page. 370 370 + 371 371 + ``` 372 372 + KNOT_REPO_SCAN_PATH=/home/git 373 373 + KNOT_SERVER_HOSTNAME=knot.example.com 374 374 + APPVIEW_ENDPOINT=https://tangled.org 375 375 + KNOT_SERVER_OWNER=did:plc:foobar 376 376 + KNOT_SERVER_INTERNAL_LISTEN_ADDR=127.0.0.1:5444 377 377 + KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555 378 378 + ``` 379 379 + 380 380 + If you run a Linux distribution that uses systemd, you can use the provided 381 381 + service file to run the server. Copy 382 382 + [`knotserver.service`](/systemd/knotserver.service) 383 383 + to `/etc/systemd/system/`. Then, run: 384 384 + 385 385 + ``` 386 386 + systemctl enable knotserver 387 387 + systemctl start knotserver 388 388 + ``` 389 389 + 390 390 + The last step is to configure a reverse proxy like Nginx or Caddy to front your 391 391 + knot. Here's an example configuration for Nginx: 392 392 + 393 393 + ``` 394 394 + server { 395 395 + listen 80; 396 396 + listen [::]:80; 397 397 + server_name knot.example.com; 398 398 + 399 399 + location / { 400 400 + proxy_pass http://localhost:5555; 401 401 + proxy_set_header Host $host; 402 402 + proxy_set_header X-Real-IP $remote_addr; 403 403 + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 404 404 + proxy_set_header X-Forwarded-Proto $scheme; 405 405 + } 406 406 + 407 407 + # wss endpoint for git events 408 408 + location /events { 409 409 + proxy_set_header X-Forwarded-For $remote_addr; 410 410 + proxy_set_header Host $http_host; 411 411 + proxy_set_header Upgrade websocket; 412 412 + proxy_set_header Connection Upgrade; 413 413 + proxy_pass http://localhost:5555; 414 414 + } 415 415 + # additional config for SSL/TLS go here. 416 416 + } 417 417 + 418 418 + ``` 419 419 + 420 420 + Remember to use Let's Encrypt or similar to procure a certificate for your 421 421 + knot domain. 422 422 + 423 423 + You should now have a running knot server! You can finalize 424 424 + your registration by hitting the `verify` button on the 425 425 + [/settings/knots](https://tangled.org/settings/knots) page. This simply creates 426 426 + a record on your PDS to announce the existence of the knot. 427 427 + 428 428 + ### Custom paths 429 429 + 430 430 + (This section applies to manual setup only. Docker users should edit the mounts 431 431 + in `docker-compose.yml` instead.) 432 432 + 433 433 + Right now, the database and repositories of your knot lives in `/home/git`. You 434 434 + can move these paths if you'd like to store them in another folder. Be careful 435 435 + when adjusting these paths: 436 436 + 437 437 + * Stop your knot when moving data (e.g. `systemctl stop knotserver`) to prevent 438 438 + any possible side effects. Remember to restart it once you're done. 439 439 + * Make backups before moving in case something goes wrong. 440 440 + * Make sure the `git` user can read and write from the new paths. 441 441 + 442 442 + #### Database 443 443 + 444 444 + As an example, let's say the current database is at `/home/git/knotserver.db`, 445 445 + and we want to move it to `/home/git/database/knotserver.db`. 446 446 + 447 447 + Copy the current database to the new location. Make sure to copy the `.db-shm` 448 448 + and `.db-wal` files if they exist. 449 449 + 450 450 + ``` 451 451 + mkdir /home/git/database 452 452 + cp /home/git/knotserver.db* /home/git/database 453 453 + ``` 454 454 + 455 455 + In the environment (e.g. `/home/git/.knot.env`), set `KNOT_SERVER_DB_PATH` to 456 456 + the new file path (_not_ the directory): 457 457 + 458 458 + ``` 459 459 + KNOT_SERVER_DB_PATH=/home/git/database/knotserver.db 460 460 + ``` 461 461 + 462 462 + #### Repositories 463 463 + 464 464 + As an example, let's say the repositories are currently in `/home/git`, and we 465 465 + want to move them into `/home/git/repositories`. 466 466 + 467 467 + Create the new folder, then move the existing repositories (if there are any): 468 468 + 469 469 + ``` 470 470 + mkdir /home/git/repositories 471 471 + # move all DIDs into the new folder; these will vary for you! 472 472 + mv /home/git/did:plc:wshs7t2adsemcrrd4snkeqli /home/git/repositories 473 473 + ``` 474 474 + 475 475 + In the environment (e.g. `/home/git/.knot.env`), update `KNOT_REPO_SCAN_PATH` 476 476 + to the new directory: 477 477 + 478 478 + ``` 479 479 + KNOT_REPO_SCAN_PATH=/home/git/repositories 480 480 + ``` 481 481 + 482 482 + Similarly, update your `sshd` `AuthorizedKeysCommand` to use the updated 483 483 + repository path: 484 484 + 485 485 + ``` 486 486 + sudo tee /etc/ssh/sshd_config.d/authorized_keys_command.conf <<EOF 487 487 + Match User git 488 488 + AuthorizedKeysCommand /usr/local/bin/knot keys -o authorized-keys -git-dir /home/git/repositories 489 489 + AuthorizedKeysCommandUser nobody 490 490 + EOF 491 491 + ``` 492 492 + 493 493 + Make sure to restart your SSH server! 494 494 + 495 495 + #### MOTD (message of the day) 496 496 + 497 497 + To configure the MOTD used ("Welcome to this knot!" by default), edit the 498 498 + `/home/git/motd` file: 499 499 + 500 500 + ``` 501 501 + printf "Hi from this knot!\n" > /home/git/motd 502 502 + ``` 503 503 + 504 504 + Note that you should add a newline at the end if setting a non-empty message 505 505 + since the knot won't do this for you. 506 506 + 507 507 + # Spindles 508 508 + 509 509 + ## Pipelines 510 510 + 511 511 + Spindle workflows allow you to write CI/CD pipelines in a 512 512 + simple format. They're located in the `.tangled/workflows` 513 513 + directory at the root of your repository, and are defined 514 514 + using YAML. 515 515 + 516 516 + The fields are: 517 517 + 518 518 + - [Trigger](#trigger): A **required** field that defines 519 519 + when a workflow should be triggered. 520 520 + - [Engine](#engine): A **required** field that defines which 521 521 + engine a workflow should run on. 522 522 + - [Clone options](#clone-options): An **optional** field 523 523 + that defines how the repository should be cloned. 524 524 + - [Dependencies](#dependencies): An **optional** field that 525 525 + allows you to list dependencies you may need. 526 526 + - [Environment](#environment): An **optional** field that 527 527 + allows you to define environment variables. 528 528 + - [Steps](#steps): An **optional** field that allows you to 529 529 + define what steps should run in the workflow. 530 530 + 531 531 + ### Trigger 532 532 + 533 533 + The first thing to add to a workflow is the trigger, which 534 534 + defines when a workflow runs. This is defined using a `when` 535 535 + field, which takes in a list of conditions. Each condition 536 536 + has the following fields: 537 537 + 538 538 + - `event`: This is a **required** field that defines when 539 539 + your workflow should run. It's a list that can take one or 540 540 + more of the following values: 541 541 + - `push`: The workflow should run every time a commit is 542 542 + pushed to the repository. 543 543 + - `pull_request`: The workflow should run every time a 544 544 + pull request is made or updated. 545 545 + - `manual`: The workflow can be triggered manually. 546 546 + - `branch`: Defines which branches the workflow should run 547 547 + for. If used with the `push` event, commits to the 548 548 + branch(es) listed here will trigger the workflow. If used 549 549 + with the `pull_request` event, updates to pull requests 550 550 + targeting the branch(es) listed here will trigger the 551 551 + workflow. This field has no effect with the `manual` 552 552 + event. Supports glob patterns using `*` and `**` (e.g., 553 553 + `main`, `develop`, `release-*`). Either `branch` or `tag` 554 554 + (or both) must be specified for `push` events. 555 555 + - `tag`: Defines which tags the workflow should run for. 556 556 + Only used with the `push` event - when tags matching the 557 557 + pattern(s) listed here are pushed, the workflow will 558 558 + trigger. This field has no effect with `pull_request` or 559 559 + `manual` events. Supports glob patterns using `*` and `**` 560 560 + (e.g., `v*`, `v1.*`, `release-**`). Either `branch` or 561 561 + `tag` (or both) must be specified for `push` events. 562 562 + 563 563 + For example, if you'd like to define a workflow that runs 564 564 + when commits are pushed to the `main` and `develop` 565 565 + branches, or when pull requests that target the `main` 566 566 + branch are updated, or manually, you can do so with: 567 567 + 568 568 + ```yaml 569 569 + when: 570 570 + - event: ["push", "manual"] 571 571 + branch: ["main", "develop"] 572 572 + - event: ["pull_request"] 573 573 + branch: ["main"] 574 574 + ``` 575 575 + 576 576 + You can also trigger workflows on tag pushes. For instance, 577 577 + to run a deployment workflow when tags matching `v*` are 578 578 + pushed: 579 579 + 580 580 + ```yaml 581 581 + when: 582 582 + - event: ["push"] 583 583 + tag: ["v*"] 584 584 + ``` 585 585 + 586 586 + You can even combine branch and tag patterns in a single 587 587 + constraint (the workflow triggers if either matches): 588 588 + 589 589 + ```yaml 590 590 + when: 591 591 + - event: ["push"] 592 592 + branch: ["main", "release-*"] 593 593 + tag: ["v*", "stable"] 594 594 + ``` 595 595 + 596 596 + ### Engine 597 597 + 598 598 + Next is the engine on which the workflow should run, defined 599 599 + using the **required** `engine` field. The currently 600 600 + supported engines are: 601 601 + 602 602 + - `nixery`: This uses an instance of 603 603 + [Nixery](https://nixery.dev) to run steps, which allows 604 604 + you to add [dependencies](#dependencies) from 605 605 + Nixpkgs (https://github.com/NixOS/nixpkgs). You can 606 606 + search for packages on https://search.nixos.org, and 607 607 + there's a pretty good chance the package(s) you're looking 608 608 + for will be there. 609 609 + 610 610 + Example: 611 611 + 612 612 + ```yaml 613 613 + engine: "nixery" 614 614 + ``` 615 615 + 616 616 + ### Clone options 617 617 + 618 618 + When a workflow starts, the first step is to clone the 619 619 + repository. You can customize this behavior using the 620 620 + **optional** `clone` field. It has the following fields: 621 621 + 622 622 + - `skip`: Setting this to `true` will skip cloning the 623 623 + repository. This can be useful if your workflow is doing 624 624 + something that doesn't require anything from the 625 625 + repository itself. This is `false` by default. 626 626 + - `depth`: This sets the number of commits, or the "clone 627 627 + depth", to fetch from the repository. For example, if you 628 628 + set this to 2, the last 2 commits will be fetched. By 629 629 + default, the depth is set to 1, meaning only the most 630 630 + recent commit will be fetched, which is the commit that 631 631 + triggered the workflow. 632 632 + - `submodules`: If you use Git submodules 633 633 + (https://git-scm.com/book/en/v2/Git-Tools-Submodules) 634 634 + in your repository, setting this field to `true` will 635 635 + recursively fetch all submodules. This is `false` by 636 636 + default. 637 637 + 638 638 + The default settings are: 639 639 + 640 640 + ```yaml 641 641 + clone: 642 642 + skip: false 643 643 + depth: 1 644 644 + submodules: false 645 645 + ``` 646 646 + 647 647 + ### Dependencies 648 648 + 649 649 + Usually when you're running a workflow, you'll need 650 650 + additional dependencies. The `dependencies` field lets you 651 651 + define which dependencies to get, and from where. It's a 652 652 + key-value map, with the key being the registry to fetch 653 653 + dependencies from, and the value being the list of 654 654 + dependencies to fetch. 655 655 + 656 656 + Say you want to fetch Node.js and Go from `nixpkgs`, and a 657 657 + package called `my_pkg` you've made from your own registry 658 658 + at your repository at 659 659 + `https://tangled.org/@example.com/my_pkg`. You can define 660 660 + those dependencies like so: 661 661 + 662 662 + ```yaml 663 663 + dependencies: 664 664 + # nixpkgs 665 665 + nixpkgs: 666 666 + - nodejs 667 667 + - go 668 668 + # custom registry 669 669 + git+https://tangled.org/@example.com/my_pkg: 670 670 + - my_pkg 671 671 + ``` 672 672 + 673 673 + Now these dependencies are available to use in your 674 674 + workflow! 675 675 + 676 676 + ### Environment 677 677 + 678 678 + The `environment` field allows you define environment 679 679 + variables that will be available throughout the entire 680 680 + workflow. **Do not put secrets here, these environment 681 681 + variables are visible to anyone viewing the repository. You 682 682 + can add secrets for pipelines in your repository's 683 683 + settings.** 684 684 + 685 685 + Example: 686 686 + 687 687 + ```yaml 688 688 + environment: 689 689 + GOOS: "linux" 690 690 + GOARCH: "arm64" 691 691 + NODE_ENV: "production" 692 692 + MY_ENV_VAR: "MY_ENV_VALUE" 693 693 + ``` 694 694 + 695 695 + ### Steps 696 696 + 697 697 + The `steps` field allows you to define what steps should run 698 698 + in the workflow. It's a list of step objects, each with the 699 699 + following fields: 700 700 + 701 701 + - `name`: This field allows you to give your step a name. 702 702 + This name is visible in your workflow runs, and is used to 703 703 + describe what the step is doing. 704 704 + - `command`: This field allows you to define a command to 705 705 + run in that step. The step is run in a Bash shell, and the 706 706 + logs from the command will be visible in the pipelines 707 707 + page on the Tangled website. The 708 708 + [dependencies](#dependencies) you added will be available 709 709 + to use here. 710 710 + - `environment`: Similar to the global 711 711 + [environment](#environment) config, this **optional** 712 712 + field is a key-value map that allows you to set 713 713 + environment variables for the step. **Do not put secrets 714 714 + here, these environment variables are visible to anyone 715 715 + viewing the repository. You can add secrets for pipelines 716 716 + in your repository's settings.** 717 717 + 718 718 + Example: 719 719 + 720 720 + ```yaml 721 721 + steps: 722 722 + - name: "Build backend" 723 723 + command: "go build" 724 724 + environment: 725 725 + GOOS: "darwin" 726 726 + GOARCH: "arm64" 727 727 + - name: "Build frontend" 728 728 + command: "npm run build" 729 729 + environment: 730 730 + NODE_ENV: "production" 731 731 + ``` 732 732 + 733 733 + ### Complete workflow 734 734 + 735 735 + ```yaml 736 736 + # .tangled/workflows/build.yml 737 737 + 738 738 + when: 739 739 + - event: ["push", "manual"] 740 740 + branch: ["main", "develop"] 741 741 + - event: ["pull_request"] 742 742 + branch: ["main"] 743 743 + 744 744 + engine: "nixery" 745 745 + 746 746 + # using the default values 747 747 + clone: 748 748 + skip: false 749 749 + depth: 1 750 750 + submodules: false 751 751 + 752 752 + dependencies: 753 753 + # nixpkgs 754 754 + nixpkgs: 755 755 + - nodejs 756 756 + - go 757 757 + # custom registry 758 758 + git+https://tangled.org/@example.com/my_pkg: 759 759 + - my_pkg 760 760 + 761 761 + environment: 762 762 + GOOS: "linux" 763 763 + GOARCH: "arm64" 764 764 + NODE_ENV: "production" 765 765 + MY_ENV_VAR: "MY_ENV_VALUE" 766 766 + 767 767 + steps: 768 768 + - name: "Build backend" 769 769 + command: "go build" 770 770 + environment: 771 771 + GOOS: "darwin" 772 772 + GOARCH: "arm64" 773 773 + - name: "Build frontend" 774 774 + command: "npm run build" 775 775 + environment: 776 776 + NODE_ENV: "production" 777 777 + ``` 778 778 + 779 779 + If you want another example of a workflow, you can look at 780 780 + the one [Tangled uses to build the 781 781 + project](https://tangled.org/@tangled.org/core/blob/master/.tangled/workflows/build.yml). 782 782 + 783 783 + ## Self-hosting guide 784 784 + 785 785 + ### Prerequisites 786 786 + 787 787 + * Go 788 788 + * Docker (the only supported backend currently) 789 789 + 790 790 + ### Configuration 791 791 + 792 792 + Spindle is configured using environment variables. The following environment variables are available: 793 793 + 794 794 + * `SPINDLE_SERVER_LISTEN_ADDR`: The address the server listens on (default: `"0.0.0.0:6555"`). 795 795 + * `SPINDLE_SERVER_DB_PATH`: The path to the SQLite database file (default: `"spindle.db"`). 796 796 + * `SPINDLE_SERVER_HOSTNAME`: The hostname of the server (required). 797 797 + * `SPINDLE_SERVER_JETSTREAM_ENDPOINT`: The endpoint of the Jetstream server (default: `"wss://jetstream1.us-west.bsky.network/subscribe"`). 798 798 + * `SPINDLE_SERVER_DEV`: A boolean indicating whether the server is running in development mode (default: `false`). 799 799 + * `SPINDLE_SERVER_OWNER`: The DID of the owner (required). 800 800 + * `SPINDLE_PIPELINES_NIXERY`: The Nixery URL (default: `"nixery.tangled.sh"`). 801 801 + * `SPINDLE_PIPELINES_WORKFLOW_TIMEOUT`: The default workflow timeout (default: `"5m"`). 802 802 + * `SPINDLE_PIPELINES_LOG_DIR`: The directory to store workflow logs (default: `"/var/log/spindle"`). 803 803 + 804 804 + ### Running spindle 805 805 + 806 806 + 1. **Set the environment variables.** For example: 807 807 + 808 808 + ```shell 809 809 + export SPINDLE_SERVER_HOSTNAME="your-hostname" 810 810 + export SPINDLE_SERVER_OWNER="your-did" 811 811 + ``` 812 812 + 813 813 + 2. **Build the Spindle binary.** 814 814 + 815 815 + ```shell 816 816 + cd core 817 817 + go mod download 818 818 + go build -o cmd/spindle/spindle cmd/spindle/main.go 819 819 + ``` 820 820 + 821 821 + 3. **Create the log directory.** 822 822 + 823 823 + ```shell 824 824 + sudo mkdir -p /var/log/spindle 825 825 + sudo chown $USER:$USER -R /var/log/spindle 826 826 + ``` 827 827 + 828 828 + 4. **Run the Spindle binary.** 829 829 + 830 830 + ```shell 831 831 + ./cmd/spindle/spindle 832 832 + ``` 833 833 + 834 834 + Spindle will now start, connect to the Jetstream server, and begin processing pipelines. 835 835 + 836 836 + ## Architecture 837 837 + 838 838 + Spindle is a small CI runner service. Here's a high-level overview of how it operates: 839 839 + 840 840 + * Listens for [`sh.tangled.spindle.member`](/lexicons/spindle/member.json) and 841 841 + [`sh.tangled.repo`](/lexicons/repo.json) records on the Jetstream. 842 842 + * When a new repo record comes through (typically when you add a spindle to a 843 843 + repo from the settings), spindle then resolves the underlying knot and 844 844 + subscribes to repo events (see: 845 845 + [`sh.tangled.pipeline`](/lexicons/pipeline.json)). 846 846 + * The spindle engine then handles execution of the pipeline, with results and 847 847 + logs beamed on the spindle event stream over WebSocket 848 848 + 849 849 + ### The engine 850 850 + 851 851 + At present, the only supported backend is Docker (and Podman, if Docker 852 852 + compatibility is enabled, so that `/run/docker.sock` is created). spindle 853 853 + executes each step in the pipeline in a fresh container, with state persisted 854 854 + across steps within the `/tangled/workspace` directory. 855 855 + 856 856 + The base image for the container is constructed on the fly using 857 857 + [Nixery](https://nixery.dev), which is handy for caching layers for frequently 858 858 + used packages. 859 859 + 860 860 + The pipeline manifest is [specified here](https://docs.tangled.org/spindles.html#pipelines). 861 861 + 862 862 + ## Secrets with openbao 863 863 + 864 864 + This document covers setting up spindle to use OpenBao for secrets 865 865 + management via OpenBao Proxy instead of the default SQLite backend. 866 866 + 867 867 + ### Overview 868 868 + 869 869 + Spindle now uses OpenBao Proxy for secrets management. The proxy handles 870 870 + authentication automatically using AppRole credentials, while spindle 871 871 + connects to the local proxy instead of directly to the OpenBao server. 872 872 + 873 873 + This approach provides better security, automatic token renewal, and 874 874 + simplified application code. 875 875 + 876 876 + ### Installation 877 877 + 878 878 + Install OpenBao from Nixpkgs: 879 879 + 880 880 + ```bash 881 881 + nix shell nixpkgs#openbao # for a local server 882 882 + ``` 883 883 + 884 884 + ### Setup 885 885 + 886 886 + The setup process can is documented for both local development and production. 887 887 + 888 888 + #### Local development 889 889 + 890 890 + Start OpenBao in dev mode: 891 891 + 892 892 + ```bash 893 893 + bao server -dev -dev-root-token-id="root" -dev-listen-address=127.0.0.1:8201 894 894 + ``` 895 895 + 896 896 + This starts OpenBao on `http://localhost:8201` with a root token. 897 897 + 898 898 + Set up environment for bao CLI: 899 899 + 900 900 + ```bash 901 901 + export BAO_ADDR=http://localhost:8200 902 902 + export BAO_TOKEN=root 903 903 + ``` 904 904 + 905 905 + #### Production 906 906 + 907 907 + You would typically use a systemd service with a 908 908 + configuration file. Refer to 909 909 + [@tangled.org/infra](https://tangled.org/@tangled.org/infra) 910 910 + for how this can be achieved using Nix. 911 911 + 912 912 + Then, initialize the bao server: 913 913 + 914 914 + ```bash 915 915 + bao operator init -key-shares=1 -key-threshold=1 916 916 + ``` 917 917 + 918 918 + This will print out an unseal key and a root key. Save them 919 919 + somewhere (like a password manager). Then unseal the vault 920 920 + to begin setting it up: 921 921 + 922 922 + ```bash 923 923 + bao operator unseal <unseal_key> 924 924 + ``` 925 925 + 926 926 + All steps below remain the same across both dev and 927 927 + production setups. 928 928 + 929 929 + #### Configure openbao server 930 930 + 931 931 + Create the spindle KV mount: 932 932 + 933 933 + ```bash 934 934 + bao secrets enable -path=spindle -version=2 kv 935 935 + ``` 936 936 + 937 937 + Set up AppRole authentication and policy: 938 938 + 939 939 + Create a policy file `spindle-policy.hcl`: 940 940 + 941 941 + ```hcl 942 942 + # Full access to spindle KV v2 data 943 943 + path "spindle/data/*" { 944 944 + capabilities = ["create", "read", "update", "delete"] 945 945 + } 946 946 + 947 947 + # Access to metadata for listing and management 948 948 + path "spindle/metadata/*" { 949 949 + capabilities = ["list", "read", "delete", "update"] 950 950 + } 951 951 + 952 952 + # Allow listing at root level 953 953 + path "spindle/" { 954 954 + capabilities = ["list"] 955 955 + } 956 956 + 957 957 + # Required for connection testing and health checks 958 958 + path "auth/token/lookup-self" { 959 959 + capabilities = ["read"] 960 960 + } 961 961 + ``` 962 962 + 963 963 + Apply the policy and create an AppRole: 964 964 + 965 965 + ```bash 966 966 + bao policy write spindle-policy spindle-policy.hcl 967 967 + bao auth enable approle 968 968 + bao write auth/approle/role/spindle \ 969 969 + token_policies="spindle-policy" \ 970 970 + token_ttl=1h \ 971 971 + token_max_ttl=4h \ 972 972 + bind_secret_id=true \ 973 973 + secret_id_ttl=0 \ 974 974 + secret_id_num_uses=0 975 975 + ``` 976 976 + 977 977 + Get the credentials: 978 978 + 979 979 + ```bash 980 980 + # Get role ID (static) 981 981 + ROLE_ID=$(bao read -field=role_id auth/approle/role/spindle/role-id) 982 982 + 983 983 + # Generate secret ID 984 984 + SECRET_ID=$(bao write -f -field=secret_id auth/approle/role/spindle/secret-id) 985 985 + 986 986 + echo "Role ID: $ROLE_ID" 987 987 + echo "Secret ID: $SECRET_ID" 988 988 + ``` 989 989 + 990 990 + #### Create proxy configuration 991 991 + 992 992 + Create the credential files: 993 993 + 994 994 + ```bash 995 995 + # Create directory for OpenBao files 996 996 + mkdir -p /tmp/openbao 997 997 + 998 998 + # Save credentials 999 999 + echo "$ROLE_ID" > /tmp/openbao/role-id 1000 1000 + echo "$SECRET_ID" > /tmp/openbao/secret-id 1001 1001 + chmod 600 /tmp/openbao/role-id /tmp/openbao/secret-id 1002 1002 + ``` 1003 1003 + 1004 1004 + Create a proxy configuration file `/tmp/openbao/proxy.hcl`: 1005 1005 + 1006 1006 + ```hcl 1007 1007 + # OpenBao server connection 1008 1008 + vault { 1009 1009 + address = "http://localhost:8200" 1010 1010 + } 1011 1011 + 1012 1012 + # Auto-Auth using AppRole 1013 1013 + auto_auth { 1014 1014 + method "approle" { 1015 1015 + mount_path = "auth/approle" 1016 1016 + config = { 1017 1017 + role_id_file_path = "/tmp/openbao/role-id" 1018 1018 + secret_id_file_path = "/tmp/openbao/secret-id" 1019 1019 + } 1020 1020 + } 1021 1021 + 1022 1022 + # Optional: write token to file for debugging 1023 1023 + sink "file" { 1024 1024 + config = { 1025 1025 + path = "/tmp/openbao/token" 1026 1026 + mode = 0640 1027 1027 + } 1028 1028 + } 1029 1029 + } 1030 1030 + 1031 1031 + # Proxy listener for spindle 1032 1032 + listener "tcp" { 1033 1033 + address = "127.0.0.1:8201" 1034 1034 + tls_disable = true 1035 1035 + } 1036 1036 + 1037 1037 + # Enable API proxy with auto-auth token 1038 1038 + api_proxy { 1039 1039 + use_auto_auth_token = true 1040 1040 + } 1041 1041 + 1042 1042 + # Enable response caching 1043 1043 + cache { 1044 1044 + use_auto_auth_token = true 1045 1045 + } 1046 1046 + 1047 1047 + # Logging 1048 1048 + log_level = "info" 1049 1049 + ``` 1050 1050 + 1051 1051 + #### Start the proxy 1052 1052 + 1053 1053 + Start OpenBao Proxy: 1054 1054 + 1055 1055 + ```bash 1056 1056 + bao proxy -config=/tmp/openbao/proxy.hcl 1057 1057 + ``` 1058 1058 + 1059 1059 + The proxy will authenticate with OpenBao and start listening on 1060 1060 + `127.0.0.1:8201`. 1061 1061 + 1062 1062 + #### Configure spindle 1063 1063 + 1064 1064 + Set these environment variables for spindle: 1065 1065 + 1066 1066 + ```bash 1067 1067 + export SPINDLE_SERVER_SECRETS_PROVIDER=openbao 1068 1068 + export SPINDLE_SERVER_SECRETS_OPENBAO_PROXY_ADDR=http://127.0.0.1:8201 1069 1069 + export SPINDLE_SERVER_SECRETS_OPENBAO_MOUNT=spindle 1070 1070 + ``` 1071 1071 + 1072 1072 + On startup, spindle will now connect to the local proxy, 1073 1073 + which handles all authentication automatically. 1074 1074 + 1075 1075 + ### Production setup for proxy 1076 1076 + 1077 1077 + For production, you'll want to run the proxy as a service: 1078 1078 + 1079 1079 + Place your production configuration in 1080 1080 + `/etc/openbao/proxy.hcl` with proper TLS settings for the 1081 1081 + vault connection. 1082 1082 + 1083 1083 + ### Verifying setup 1084 1084 + 1085 1085 + Test the proxy directly: 1086 1086 + 1087 1087 + ```bash 1088 1088 + # Check proxy health 1089 1089 + curl -H "X-Vault-Request: true" http://127.0.0.1:8201/v1/sys/health 1090 1090 + 1091 1091 + # Test token lookup through proxy 1092 1092 + curl -H "X-Vault-Request: true" http://127.0.0.1:8201/v1/auth/token/lookup-self 1093 1093 + ``` 1094 1094 + 1095 1095 + Test OpenBao operations through the server: 1096 1096 + 1097 1097 + ```bash 1098 1098 + # List all secrets 1099 1099 + bao kv list spindle/ 1100 1100 + 1101 1101 + # Add a test secret via the spindle API, then check it exists 1102 1102 + bao kv list spindle/repos/ 1103 1103 + 1104 1104 + # Get a specific secret 1105 1105 + bao kv get spindle/repos/your_repo_path/SECRET_NAME 1106 1106 + ``` 1107 1107 + 1108 1108 + ### How it works 1109 1109 + 1110 1110 + - Spindle connects to OpenBao Proxy on localhost (typically 1111 1111 + port 8200 or 8201) 1112 1112 + - The proxy authenticates with OpenBao using AppRole 1113 1113 + credentials 1114 1114 + - All spindle requests go through the proxy, which injects 1115 1115 + authentication tokens 1116 1116 + - Secrets are stored at 1117 1117 + `spindle/repos/{sanitized_repo_path}/{secret_key}` 1118 1118 + - Repository paths like `did:plc:alice/myrepo` become 1119 1119 + `did_plc_alice_myrepo` 1120 1120 + - The proxy handles all token renewal automatically 1121 1121 + - Spindle no longer manages tokens or authentication 1122 1122 + directly 1123 1123 + 1124 1124 + ### Troubleshooting 1125 1125 + 1126 1126 + **Connection refused**: Check that the OpenBao Proxy is 1127 1127 + running and listening on the configured address. 1128 1128 + 1129 1129 + **403 errors**: Verify the AppRole credentials are correct 1130 1130 + and the policy has the necessary permissions. 1131 1131 + 1132 1132 + **404 route errors**: The spindle KV mount probably doesn't 1133 1133 + exist—run the mount creation step again. 1134 1134 + 1135 1135 + **Proxy authentication failures**: Check the proxy logs and 1136 1136 + verify the role-id and secret-id files are readable and 1137 1137 + contain valid credentials. 1138 1138 + 1139 1139 + **Secret not found after writing**: This can indicate policy 1140 1140 + permission issues. Verify the policy includes both 1141 1141 + `spindle/data/*` and `spindle/metadata/*` paths with 1142 1142 + appropriate capabilities. 1143 1143 + 1144 1144 + Check proxy logs: 1145 1145 + 1146 1146 + ```bash 1147 1147 + # If running as systemd service 1148 1148 + journalctl -u openbao-proxy -f 1149 1149 + 1150 1150 + # If running directly, check the console output 1151 1151 + ``` 1152 1152 + 1153 1153 + Test AppRole authentication manually: 1154 1154 + 1155 1155 + ```bash 1156 1156 + bao write auth/approle/login \ 1157 1157 + role_id="$(cat /tmp/openbao/role-id)" \ 1158 1158 + secret_id="$(cat /tmp/openbao/secret-id)" 1159 1159 + ``` 1160 1160 + 1161 1161 + # Migrating knots and spindles 1162 1162 + 1163 1163 + Sometimes, non-backwards compatible changes are made to the 1164 1164 + knot/spindle XRPC APIs. If you host a knot or a spindle, you 1165 1165 + will need to follow this guide to upgrade. Typically, this 1166 1166 + only requires you to deploy the newest version. 1167 1167 + 1168 1168 + This document is laid out in reverse-chronological order. 1169 1169 + Newer migration guides are listed first, and older guides 1170 1170 + are further down the page. 1171 1171 + 1172 1172 + ## Upgrading from v1.8.x 1173 1173 + 1174 1174 + After v1.8.2, the HTTP API for knots and spindles has been 1175 1175 + deprecated and replaced with XRPC. Repositories on outdated 1176 1176 + knots will not be viewable from the appview. Upgrading is 1177 1177 + straightforward however. 1178 1178 + 1179 1179 + For knots: 1180 1180 + 1181 1181 + - Upgrade to the latest tag (v1.9.0 or above) 1182 1182 + - Head to the [knot dashboard](https://tangled.org/settings/knots) and 1183 1183 + hit the "retry" button to verify your knot 1184 1184 + 1185 1185 + For spindles: 1186 1186 + 1187 1187 + - Upgrade to the latest tag (v1.9.0 or above) 1188 1188 + - Head to the [spindle 1189 1189 + dashboard](https://tangled.org/settings/spindles) and hit the 1190 1190 + "retry" button to verify your spindle 1191 1191 + 1192 1192 + ## Upgrading from v1.7.x 1193 1193 + 1194 1194 + After v1.7.0, knot secrets have been deprecated. You no 1195 1195 + longer need a secret from the appview to run a knot. All 1196 1196 + authorized commands to knots are managed via [Inter-Service 1197 1197 + Authentication](https://atproto.com/specs/xrpc#inter-service-authentication-jwt). 1198 1198 + Knots will be read-only until upgraded. 1199 1199 + 1200 1200 + Upgrading is quite easy, in essence: 1201 1201 + 1202 1202 + - `KNOT_SERVER_SECRET` is no more, you can remove this 1203 1203 + environment variable entirely 1204 1204 + - `KNOT_SERVER_OWNER` is now required on boot, set this to 1205 1205 + your DID. You can find your DID in the 1206 1206 + [settings](https://tangled.org/settings) page. 1207 1207 + - Restart your knot once you have replaced the environment 1208 1208 + variable 1209 1209 + - Head to the [knot dashboard](https://tangled.org/settings/knots) and 1210 1210 + hit the "retry" button to verify your knot. This simply 1211 1211 + writes a `sh.tangled.knot` record to your PDS. 1212 1212 + 1213 1213 + If you use the nix module, simply bump the flake to the 1214 1214 + latest revision, and change your config block like so: 1215 1215 + 1216 1216 + ```diff 1217 1217 + services.tangled.knot = { 1218 1218 + enable = true; 1219 1219 + server = { 1220 1220 + - secretFile = /path/to/secret; 1221 1221 + + owner = "did:plc:foo"; 1222 1222 + }; 1223 1223 + }; 1224 1224 + ``` 1225 1225 + 1226 1226 + # Hacking on Tangled 1227 1227 + 1228 1228 + We highly recommend [installing 1229 1229 + Nix](https://nixos.org/download/) (the package manager) 1230 1230 + before working on the codebase. The Nix flake provides a lot 1231 1231 + of helpers to get started and most importantly, builds and 1232 1232 + dev shells are entirely deterministic. 1233 1233 + 1234 1234 + To set up your dev environment: 1235 1235 + 1236 1236 + ```bash 1237 1237 + nix develop 1238 1238 + ``` 1239 1239 + 1240 1240 + Non-Nix users can look at the `devShell` attribute in the 1241 1241 + `flake.nix` file to determine necessary dependencies. 1242 1242 + 1243 1243 + ## Running the appview 1244 1244 + 1245 1245 + The Nix flake also exposes a few `app` attributes (run `nix 1246 1246 + flake show` to see a full list of what the flake provides), 1247 1247 + one of the apps runs the appview with the `air` 1248 1248 + live-reloader: 1249 1249 + 1250 1250 + ```bash 1251 1251 + TANGLED_DEV=true nix run .#watch-appview 1252 1252 + 1253 1253 + # TANGLED_DB_PATH might be of interest to point to 1254 1254 + # different sqlite DBs 1255 1255 + 1256 1256 + # in a separate shell, you can live-reload tailwind 1257 1257 + nix run .#watch-tailwind 1258 1258 + ``` 1259 1259 + 1260 1260 + To authenticate with the appview, you will need Redis and 1261 1261 + OAuth JWKs to be set up: 1262 1262 + 1263 1263 + ``` 1264 1264 + # OAuth JWKs should already be set up by the Nix devshell: 1265 1265 + echo $TANGLED_OAUTH_CLIENT_SECRET 1266 1266 + z42ty4RT1ovnTopY8B8ekz9NuziF2CuMkZ7rbRFpAR9jBqMc 1267 1267 + 1268 1268 + echo $TANGLED_OAUTH_CLIENT_KID 1269 1269 + 1761667908 1270 1270 + 1271 1271 + # if not, you can set it up yourself: 1272 1272 + goat key generate -t P-256 1273 1273 + Key Type: P-256 / secp256r1 / ES256 private key 1274 1274 + Secret Key (Multibase Syntax): save this securely (eg, add to password manager) 1275 1275 + z42tuPDKRfM2mz2Kv953ARen2jmrPA8S9LX9tRq4RVcUMwwL 1276 1276 + Public Key (DID Key Syntax): share or publish this (eg, in DID document) 1277 1277 + did:key:zDnaeUBxtG6Xuv3ATJE4GaWeyXM3jyamJsZw3bSPpxx4bNXDR 1278 1278 + 1279 1279 + # the secret key from above 1280 1280 + export TANGLED_OAUTH_CLIENT_SECRET="z42tuP..." 1281 1281 + 1282 1282 + # Run Redis in a new shell to store OAuth sessions 1283 1283 + redis-server 1284 1284 + ``` 1285 1285 + 1286 1286 + ## Running knots and spindles 1287 1287 + 1288 1288 + An end-to-end knot setup requires setting up a machine with 1289 1289 + `sshd`, `AuthorizedKeysCommand`, and a Git user, which is 1290 1290 + quite cumbersome. So the Nix flake provides a 1291 1291 + `nixosConfiguration` to do so. 1292 1292 + 1293 1293 + <details> 1294 1294 + <summary><strong>macOS users will have to set up a Nix Builder first</strong></summary> 1295 1295 + 1296 1296 + In order to build Tangled's dev VM on macOS, you will 1297 1297 + first need to set up a Linux Nix builder. The recommended 1298 1298 + way to do so is to run a [`darwin.linux-builder` 1299 1299 + VM](https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder) 1300 1300 + and to register it in `nix.conf` as a builder for Linux 1301 1301 + with the same architecture as your Mac (`linux-aarch64` if 1302 1302 + you are using Apple Silicon). 1303 1303 + 1304 1304 + > IMPORTANT: You must build `darwin.linux-builder` somewhere other than inside 1305 1305 + > the Tangled repo so that it doesn't conflict with the other VM. For example, 1306 1306 + > you can do 1307 1307 + > 1308 1308 + > ```shell 1309 1309 + > cd $(mktemp -d buildervm.XXXXX) && nix run nixpkgs#darwin.linux-builder 1310 1310 + > ``` 1311 1311 + > 1312 1312 + > to store the builder VM in a temporary dir. 1313 1313 + > 1314 1314 + > You should read and follow [all the other intructions][darwin builder vm] to 1315 1315 + > avoid subtle problems. 1316 1316 + 1317 1317 + Alternatively, you can use any other method to set up a 1318 1318 + Linux machine with Nix installed that you can `sudo ssh` 1319 1319 + into (in other words, root user on your Mac has to be able 1320 1320 + to ssh into the Linux machine without entering a password) 1321 1321 + and that has the same architecture as your Mac. See 1322 1322 + [remote builder 1323 1323 + instructions](https://nix.dev/manual/nix/2.28/advanced-topics/distributed-builds.html#requirements) 1324 1324 + for how to register such a builder in `nix.conf`. 1325 1325 + 1326 1326 + > WARNING: If you'd like to use 1327 1327 + > [`nixos-lima`](https://github.com/nixos-lima/nixos-lima) or 1328 1328 + > [Orbstack](https://orbstack.dev/), note that setting them up so that `sudo 1329 1329 + > ssh` works can be tricky. It seems to be [possible with 1330 1330 + > Orbstack](https://github.com/orgs/orbstack/discussions/1669). 1331 1331 + 1332 1332 + </details> 1333 1333 + 1334 1334 + To begin, grab your DID from http://localhost:3000/settings. 1335 1335 + Then, set `TANGLED_VM_KNOT_OWNER` and 1336 1336 + `TANGLED_VM_SPINDLE_OWNER` to your DID. You can now start a 1337 1337 + lightweight NixOS VM like so: 1338 1338 + 1339 1339 + ```bash 1340 1340 + nix run --impure .#vm 1341 1341 + 1342 1342 + # type `poweroff` at the shell to exit the VM 1343 1343 + ``` 1344 1344 + 1345 1345 + This starts a knot on port 6444, a spindle on port 6555 1346 1346 + with `ssh` exposed on port 2222. 1347 1347 + 1348 1348 + Once the services are running, head to 1349 1349 + http://localhost:3000/settings/knots and hit "Verify". It should 1350 1350 + verify the ownership of the services instantly if everything 1351 1351 + went smoothly. 1352 1352 + 1353 1353 + You can push repositories to this VM with this ssh config 1354 1354 + block on your main machine: 1355 1355 + 1356 1356 + ```bash 1357 1357 + Host nixos-shell 1358 1358 + Hostname localhost 1359 1359 + Port 2222 1360 1360 + User git 1361 1361 + IdentityFile ~/.ssh/my_tangled_key 1362 1362 + ``` 1363 1363 + 1364 1364 + Set up a remote called `local-dev` on a git repo: 1365 1365 + 1366 1366 + ```bash 1367 1367 + git remote add local-dev git@nixos-shell:user/repo 1368 1368 + git push local-dev main 1369 1369 + ``` 1370 1370 + 1371 1371 + The above VM should already be running a spindle on 1372 1372 + `localhost:6555`. Head to http://localhost:3000/settings/spindles and 1373 1373 + hit "Verify". You can then configure each repository to use 1374 1374 + this spindle and run CI jobs. 1375 1375 + 1376 1376 + Of interest when debugging spindles: 1377 1377 + 1378 1378 + ``` 1379 1379 + # Service logs from journald: 1380 1380 + journalctl -xeu spindle 1381 1381 + 1382 1382 + # CI job logs from disk: 1383 1383 + ls /var/log/spindle 1384 1384 + 1385 1385 + # Debugging spindle database: 1386 1386 + sqlite3 /var/lib/spindle/spindle.db 1387 1387 + 1388 1388 + # litecli has a nicer REPL interface: 1389 1389 + litecli /var/lib/spindle/spindle.db 1390 1390 + ``` 1391 1391 + 1392 1392 + If for any reason you wish to disable either one of the 1393 1393 + services in the VM, modify [nix/vm.nix](/nix/vm.nix) and set 1394 1394 + `services.tangled.spindle.enable` (or 1395 1395 + `services.tangled.knot.enable`) to `false`. 1396 1396 + 1397 1397 + # Contribution guide 1398 1398 + 1399 1399 + ## Commit guidelines 1400 1400 + 1401 1401 + We follow a commit style similar to the Go project. Please keep commits: 1402 1402 + 1403 1403 + * **atomic**: each commit should represent one logical change 1404 1404 + * **descriptive**: the commit message should clearly describe what the 1405 1405 + change does and why it's needed 1406 1406 + 1407 1407 + ### Message format 1408 1408 + 1409 1409 + ``` 1410 1410 + <service/top-level directory>/<affected package/directory>: <short summary of change> 1411 1411 + 1412 1412 + Optional longer description can go here, if necessary. Explain what the 1413 1413 + change does and why, especially if not obvious. Reference relevant 1414 1414 + issues or PRs when applicable. These can be links for now since we don't 1415 1415 + auto-link issues/PRs yet. 1416 1416 + ``` 1417 1417 + 1418 1418 + Here are some examples: 1419 1419 + 1420 1420 + ``` 1421 1421 + appview/state: fix token expiry check in middleware 1422 1422 + 1423 1423 + The previous check did not account for clock drift, leading to premature 1424 1424 + token invalidation. 1425 1425 + ``` 1426 1426 + 1427 1427 + ``` 1428 1428 + knotserver/git/service: improve error checking in upload-pack 1429 1429 + ``` 1430 1430 + 1431 1431 + 1432 1432 + ### General notes 1433 1433 + 1434 1434 + - PRs get merged "as-is" (fast-forward)—like applying a patch-series 1435 1435 + using `git am`. At present, there is no squashing—so please author 1436 1436 + your commits as they would appear on `master`, following the above 1437 1437 + guidelines. 1438 1438 + - If there is a lot of nesting, for example "appview: 1439 1439 + pages/templates/repo/fragments: ...", these can be truncated down to 1440 1440 + just "appview: repo/fragments: ...". If the change affects a lot of 1441 1441 + subdirectories, you may abbreviate to just the top-level names, e.g. 1442 1442 + "appview: ..." or "knotserver: ...". 1443 1443 + - Keep commits lowercased with no trailing period. 1444 1444 + - Use the imperative mood in the summary line (e.g., "fix bug" not 1445 1445 + "fixed bug" or "fixes bug"). 1446 1446 + - Try to keep the summary line under 72 characters, but we aren't too 1447 1447 + fussed about this. 1448 1448 + - Follow the same formatting for PR titles if filled manually. 1449 1449 + - Don't include unrelated changes in the same commit. 1450 1450 + - Avoid noisy commit messages like "wip" or "final fix"—rewrite history 1451 1451 + before submitting if necessary. 1452 1452 + 1453 1453 + ## Code formatting 1454 1454 + 1455 1455 + We use a variety of tools to format our code, and multiplex them with 1456 1456 + [`treefmt`](https://treefmt.com). All you need to do to format your changes 1457 1457 + is run `nix run .#fmt` (or just `treefmt` if you're in the devshell). 1458 1458 + 1459 1459 + ## Proposals for bigger changes 1460 1460 + 1461 1461 + Small fixes like typos, minor bugs, or trivial refactors can be 1462 1462 + submitted directly as PRs. 1463 1463 + 1464 1464 + For larger changes—especially those introducing new features, significant 1465 1465 + refactoring, or altering system behavior—please open a proposal first. This 1466 1466 + helps us evaluate the scope, design, and potential impact before implementation. 1467 1467 + 1468 1468 + Create a new issue titled: 1469 1469 + 1470 1470 + ``` 1471 1471 + proposal: <affected scope>: <summary of change> 1472 1472 + ``` 1473 1473 + 1474 1474 + In the description, explain: 1475 1475 + 1476 1476 + - What the change is 1477 1477 + - Why it's needed 1478 1478 + - How you plan to implement it (roughly) 1479 1479 + - Any open questions or tradeoffs 1480 1480 + 1481 1481 + We'll use the issue thread to discuss and refine the idea before moving 1482 1482 + forward. 1483 1483 + 1484 1484 + ## Developer Certificate of Origin (DCO) 1485 1485 + 1486 1486 + We require all contributors to certify that they have the right to 1487 1487 + submit the code they're contributing. To do this, we follow the 1488 1488 + [Developer Certificate of Origin 1489 1489 + (DCO)](https://developercertificate.org/). 1490 1490 + 1491 1491 + By signing your commits, you're stating that the contribution is your 1492 1492 + own work, or that you have the right to submit it under the project's 1493 1493 + license. This helps us keep things clean and legally sound. 1494 1494 + 1495 1495 + To sign your commit, just add the `-s` flag when committing: 1496 1496 + 1497 1497 + ```sh 1498 1498 + git commit -s -m "your commit message" 1499 1499 + ``` 1500 1500 + 1501 1501 + This appends a line like: 1502 1502 + 1503 1503 + ``` 1504 1504 + Signed-off-by: Your Name <your.email@example.com> 1505 1505 + ``` 1506 1506 + 1507 1507 + We won't merge commits if they aren't signed off. If you forget, you can 1508 1508 + amend the last commit like this: 1509 1509 + 1510 1510 + ```sh 1511 1511 + git commit --amend -s 1512 1512 + ``` 1513 1513 + 1514 1514 + If you're submitting a PR with multiple commits, make sure each one is 1515 1515 + signed. 1516 1516 + 1517 1517 + For [jj](https://jj-vcs.github.io/jj/latest/) users, you can run the following command 1518 1518 + to make it sign off commits in the tangled repo: 1519 1519 + 1520 1520 + ```shell 1521 1521 + # Safety check, should say "No matching config key..." 1522 1522 + jj config list templates.commit_trailers 1523 1523 + # The command below may need to be adjusted if the command above returned something. 1524 1524 + jj config set --repo templates.commit_trailers "format_signed_off_by_trailer(self)" 1525 1525 + ``` 1526 1526 + 1527 1527 + Refer to the [jujutsu 1528 1528 + documentation](https://jj-vcs.github.io/jj/latest/config/#commit-trailers) 1529 1529 + for more information.

-136

docs/contributing.md

··· 1 1 - # tangled contributing guide 2 2 - 3 3 - ## commit guidelines 4 4 - 5 5 - We follow a commit style similar to the Go project. Please keep commits: 6 6 - 7 7 - * **atomic**: each commit should represent one logical change 8 8 - * **descriptive**: the commit message should clearly describe what the 9 9 - change does and why it's needed 10 10 - 11 11 - ### message format 12 12 - 13 13 - ``` 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 18 18 - change does and why, especially if not obvious. Reference relevant 19 19 - issues or PRs when applicable. These can be links for now since we don't 20 20 - auto-link issues/PRs yet. 21 21 - ``` 22 22 - 23 23 - Here are some examples: 24 24 - 25 25 - ``` 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 34 34 - ``` 35 35 - 36 36 - 37 37 - ### general notes 38 38 - 39 39 - - PRs get merged "as-is" (fast-forward) -- like applying a patch-series 40 40 - using `git am`. At present, there is no squashing -- so please author 41 41 - your commits as they would appear on `master`, following the above 42 42 - guidelines. 43 43 - - If there is a lot of nesting, for example "appview: 44 44 - pages/templates/repo/fragments: ...", these can be truncated down to 45 45 - just "appview: repo/fragments: ...". If the change affects a lot of 46 46 - subdirectories, you may abbreviate to just the top-level names, e.g. 47 47 - "appview: ..." or "knotserver: ...". 48 48 - - Keep commits lowercased with no trailing period. 49 49 - - Use the imperative mood in the summary line (e.g., "fix bug" not 50 50 - "fixed bug" or "fixes bug"). 51 51 - - Try to keep the summary line under 72 characters, but we aren't too 52 52 - fussed about this. 53 53 - - Follow the same formatting for PR titles if filled manually. 54 54 - - Don't include unrelated changes in the same commit. 55 55 - - Avoid noisy commit messages like "wip" or "final fix"—rewrite history 56 56 - before submitting if necessary. 57 57 - 58 58 - ## code formatting 59 59 - 60 60 - We use a variety of tools to format our code, and multiplex them with 61 61 - [`treefmt`](https://treefmt.com): all you need to do to format your changes 62 62 - is run `nix run .#fmt` (or just `treefmt` if you're in the devshell). 63 63 - 64 64 - ## proposals for bigger changes 65 65 - 66 66 - Small fixes like typos, minor bugs, or trivial refactors can be 67 67 - submitted directly as PRs. 68 68 - 69 69 - For larger changes—especially those introducing new features, significant 70 70 - refactoring, or altering system behavior—please open a proposal first. This 71 71 - helps us evaluate the scope, design, and potential impact before implementation. 72 72 - 73 73 - ### proposal format 74 74 - 75 75 - Create a new issue titled: 76 76 - 77 77 - ``` 78 78 - proposal: <affected scope>: <summary of change> 79 79 - ``` 80 80 - 81 81 - In the description, explain: 82 82 - 83 83 - - What the change is 84 84 - - Why it's needed 85 85 - - How you plan to implement it (roughly) 86 86 - - Any open questions or tradeoffs 87 87 - 88 88 - We'll use the issue thread to discuss and refine the idea before moving 89 89 - forward. 90 90 - 91 91 - ## developer certificate of origin (DCO) 92 92 - 93 93 - We require all contributors to certify that they have the right to 94 94 - submit the code they're contributing. To do this, we follow the 95 95 - [Developer Certificate of Origin 96 96 - (DCO)](https://developercertificate.org/). 97 97 - 98 98 - By signing your commits, you're stating that the contribution is your 99 99 - own work, or that you have the right to submit it under the project's 100 100 - license. This helps us keep things clean and legally sound. 101 101 - 102 102 - To sign your commit, just add the `-s` flag when committing: 103 103 - 104 104 - ```sh 105 105 - git commit -s -m "your commit message" 106 106 - ``` 107 107 - 108 108 - This appends a line like: 109 109 - 110 110 - ``` 111 111 - Signed-off-by: Your Name <your.email@example.com> 112 112 - ``` 113 113 - 114 114 - We won't merge commits if they aren't signed off. If you forget, you can 115 115 - amend the last commit like this: 116 116 - 117 117 - ```sh 118 118 - git commit --amend -s 119 119 - ``` 120 120 - 121 121 - If you're submitting a PR with multiple commits, make sure each one is 122 122 - signed. 123 123 - 124 124 - For [jj](https://jj-vcs.github.io/jj/latest/) users, you can run the following command 125 125 - to make it sign off commits in the tangled repo: 126 126 - 127 127 - ```shell 128 128 - # Safety check, should say "No matching config key..." 129 129 - jj config list templates.commit_trailers 130 130 - # The command below may need to be adjusted if the command above returned something. 131 131 - jj config set --repo templates.commit_trailers "format_signed_off_by_trailer(self)" 132 132 - ``` 133 133 - 134 134 - Refer to the [jj 135 135 - documentation](https://jj-vcs.github.io/jj/latest/config/#commit-trailers) 136 136 - for more information.

-172

docs/hacking.md

··· 1 1 - # hacking on tangled 2 2 - 3 3 - We highly recommend [installing 4 4 - nix](https://nixos.org/download/) (the package manager) 5 5 - before working on the codebase. The nix flake provides a lot 6 6 - of helpers to get started and most importantly, builds and 7 7 - dev shells are entirely deterministic. 8 8 - 9 9 - To set up your dev environment: 10 10 - 11 11 - ```bash 12 12 - nix develop 13 13 - ``` 14 14 - 15 15 - Non-nix users can look at the `devShell` attribute in the 16 16 - `flake.nix` file to determine necessary dependencies. 17 17 - 18 18 - ## running the appview 19 19 - 20 20 - The nix flake also exposes a few `app` attributes (run `nix 21 21 - flake show` to see a full list of what the flake provides), 22 22 - one of the apps runs the appview with the `air` 23 23 - live-reloader: 24 24 - 25 25 - ```bash 26 26 - TANGLED_DEV=true nix run .#watch-appview 27 27 - 28 28 - # TANGLED_DB_PATH might be of interest to point to 29 29 - # different sqlite DBs 30 30 - 31 31 - # in a separate shell, you can live-reload tailwind 32 32 - nix run .#watch-tailwind 33 33 - ``` 34 34 - 35 35 - To authenticate with the appview, you will need redis and 36 36 - OAUTH JWKs to be setup: 37 37 - 38 38 - ``` 39 39 - # oauth jwks should already be setup by the nix devshell: 40 40 - echo $TANGLED_OAUTH_CLIENT_SECRET 41 41 - z42ty4RT1ovnTopY8B8ekz9NuziF2CuMkZ7rbRFpAR9jBqMc 42 42 - 43 43 - echo $TANGLED_OAUTH_CLIENT_KID 44 44 - 1761667908 45 45 - 46 46 - # if not, you can set it up yourself: 47 47 - goat key generate -t P-256 48 48 - Key Type: P-256 / secp256r1 / ES256 private key 49 49 - Secret Key (Multibase Syntax): save this securely (eg, add to password manager) 50 50 - z42tuPDKRfM2mz2Kv953ARen2jmrPA8S9LX9tRq4RVcUMwwL 51 51 - Public Key (DID Key Syntax): share or publish this (eg, in DID document) 52 52 - did:key:zDnaeUBxtG6Xuv3ATJE4GaWeyXM3jyamJsZw3bSPpxx4bNXDR 53 53 - 54 54 - # the secret key from above 55 55 - export TANGLED_OAUTH_CLIENT_SECRET="z42tuP..." 56 56 - 57 57 - # run redis in at a new shell to store oauth sessions 58 58 - redis-server 59 59 - ``` 60 60 - 61 61 - ## running knots and spindles 62 62 - 63 63 - An end-to-end knot setup requires setting up a machine with 64 64 - `sshd`, `AuthorizedKeysCommand`, and git user, which is 65 65 - quite cumbersome. So the nix flake provides a 66 66 - `nixosConfiguration` to do so. 67 67 - 68 68 - <details> 69 69 - <summary><strong>MacOS users will have to setup a Nix Builder first</strong></summary> 70 70 - 71 71 - In order to build Tangled's dev VM on macOS, you will 72 72 - first need to set up a Linux Nix builder. The recommended 73 73 - way to do so is to run a [`darwin.linux-builder` 74 74 - VM](https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder) 75 75 - and to register it in `nix.conf` as a builder for Linux 76 76 - with the same architecture as your Mac (`linux-aarch64` if 77 77 - you are using Apple Silicon). 78 78 - 79 79 - > IMPORTANT: You must build `darwin.linux-builder` somewhere other than inside 80 80 - > the tangled repo so that it doesn't conflict with the other VM. For example, 81 81 - > you can do 82 82 - > 83 83 - > ```shell 84 84 - > cd $(mktemp -d buildervm.XXXXX) && nix run nixpkgs#darwin.linux-builder 85 85 - > ``` 86 86 - > 87 87 - > to store the builder VM in a temporary dir. 88 88 - > 89 89 - > You should read and follow [all the other intructions][darwin builder vm] to 90 90 - > avoid subtle problems. 91 91 - 92 92 - Alternatively, you can use any other method to set up a 93 93 - Linux machine with `nix` installed that you can `sudo ssh` 94 94 - into (in other words, root user on your Mac has to be able 95 95 - to ssh into the Linux machine without entering a password) 96 96 - and that has the same architecture as your Mac. See 97 97 - [remote builder 98 98 - instructions](https://nix.dev/manual/nix/2.28/advanced-topics/distributed-builds.html#requirements) 99 99 - for how to register such a builder in `nix.conf`. 100 100 - 101 101 - > WARNING: If you'd like to use 102 102 - > [`nixos-lima`](https://github.com/nixos-lima/nixos-lima) or 103 103 - > [Orbstack](https://orbstack.dev/), note that setting them up so that `sudo 104 104 - > ssh` works can be tricky. It seems to be [possible with 105 105 - > Orbstack](https://github.com/orgs/orbstack/discussions/1669). 106 106 - 107 107 - </details> 108 108 - 109 109 - To begin, grab your DID from http://localhost:3000/settings. 110 110 - Then, set `TANGLED_VM_KNOT_OWNER` and 111 111 - `TANGLED_VM_SPINDLE_OWNER` to your DID. You can now start a 112 112 - lightweight NixOS VM like so: 113 113 - 114 114 - ```bash 115 115 - nix run --impure .#vm 116 116 - 117 117 - # type `poweroff` at the shell to exit the VM 118 118 - ``` 119 119 - 120 120 - This starts a knot on port 6444, a spindle on port 6555 121 121 - with `ssh` exposed on port 2222. 122 122 - 123 123 - Once the services are running, head to 124 124 - http://localhost:3000/settings/knots and hit verify. It should 125 125 - verify the ownership of the services instantly if everything 126 126 - went smoothly. 127 127 - 128 128 - You can push repositories to this VM with this ssh config 129 129 - block on your main machine: 130 130 - 131 131 - ```bash 132 132 - Host nixos-shell 133 133 - Hostname localhost 134 134 - Port 2222 135 135 - User git 136 136 - IdentityFile ~/.ssh/my_tangled_key 137 137 - ``` 138 138 - 139 139 - Set up a remote called `local-dev` on a git repo: 140 140 - 141 141 - ```bash 142 142 - git remote add local-dev git@nixos-shell:user/repo 143 143 - git push local-dev main 144 144 - ``` 145 145 - 146 146 - ### running a spindle 147 147 - 148 148 - The above VM should already be running a spindle on 149 149 - `localhost:6555`. Head to http://localhost:3000/settings/spindles and 150 150 - hit verify. You can then configure each repository to use 151 151 - this spindle and run CI jobs. 152 152 - 153 153 - Of interest when debugging spindles: 154 154 - 155 155 - ``` 156 156 - # service logs from journald: 157 157 - journalctl -xeu spindle 158 158 - 159 159 - # CI job logs from disk: 160 160 - ls /var/log/spindle 161 161 - 162 162 - # debugging spindle db: 163 163 - sqlite3 /var/lib/spindle/spindle.db 164 164 - 165 165 - # litecli has a nicer REPL interface: 166 166 - litecli /var/lib/spindle/spindle.db 167 167 - ``` 168 168 - 169 169 - If for any reason you wish to disable either one of the 170 170 - services in the VM, modify [nix/vm.nix](/nix/vm.nix) and set 171 171 - `services.tangled.spindle.enable` (or 172 172 - `services.tangled.knot.enable`) to `false`.

+93

docs/highlight.theme

··· 1 1 + { 2 2 + "text-color": null, 3 3 + "background-color": null, 4 4 + "line-number-color": null, 5 5 + "line-number-background-color": null, 6 6 + "text-styles": { 7 7 + "Annotation": { 8 8 + "text-color": null, 9 9 + "background-color": null, 10 10 + "bold": false, 11 11 + "italic": true, 12 12 + "underline": false 13 13 + }, 14 14 + "ControlFlow": { 15 15 + "text-color": null, 16 16 + "background-color": null, 17 17 + "bold": true, 18 18 + "italic": false, 19 19 + "underline": false 20 20 + }, 21 21 + "Error": { 22 22 + "text-color": null, 23 23 + "background-color": null, 24 24 + "bold": true, 25 25 + "italic": false, 26 26 + "underline": false 27 27 + }, 28 28 + "Alert": { 29 29 + "text-color": null, 30 30 + "background-color": null, 31 31 + "bold": true, 32 32 + "italic": false, 33 33 + "underline": false 34 34 + }, 35 35 + "Preprocessor": { 36 36 + "text-color": null, 37 37 + "background-color": null, 38 38 + "bold": true, 39 39 + "italic": false, 40 40 + "underline": false 41 41 + }, 42 42 + "Information": { 43 43 + "text-color": null, 44 44 + "background-color": null, 45 45 + "bold": false, 46 46 + "italic": true, 47 47 + "underline": false 48 48 + }, 49 49 + "Warning": { 50 50 + "text-color": null, 51 51 + "background-color": null, 52 52 + "bold": false, 53 53 + "italic": true, 54 54 + "underline": false 55 55 + }, 56 56 + "Documentation": { 57 57 + "text-color": null, 58 58 + "background-color": null, 59 59 + "bold": false, 60 60 + "italic": true, 61 61 + "underline": false 62 62 + }, 63 63 + "DataType": { 64 64 + "text-color": "#8f4e8b", 65 65 + "background-color": null, 66 66 + "bold": false, 67 67 + "italic": false, 68 68 + "underline": false 69 69 + }, 70 70 + "Comment": { 71 71 + "text-color": null, 72 72 + "background-color": null, 73 73 + "bold": false, 74 74 + "italic": true, 75 75 + "underline": false 76 76 + }, 77 77 + "CommentVar": { 78 78 + "text-color": null, 79 79 + "background-color": null, 80 80 + "bold": false, 81 81 + "italic": true, 82 82 + "underline": false 83 83 + }, 84 84 + "Keyword": { 85 85 + "text-color": null, 86 86 + "background-color": null, 87 87 + "bold": true, 88 88 + "italic": false, 89 89 + "underline": false 90 90 + } 91 91 + } 92 92 + } 93 93 +

-214

docs/knot-hosting.md

··· 1 1 - # knot self-hosting guide 2 2 - 3 3 - So you want to run your own knot server? Great! Here are a few prerequisites: 4 4 - 5 5 - 1. A server of some kind (a VPS, a Raspberry Pi, etc.). Preferably running a Linux distribution of some kind. 6 6 - 2. A (sub)domain name. People generally use `knot.example.com`. 7 7 - 3. A valid SSL certificate for your domain. 8 8 - 9 9 - There's a couple of ways to get started: 10 10 - * NixOS: refer to 11 11 - [flake.nix](https://tangled.sh/@tangled.sh/core/blob/master/flake.nix) 12 12 - * Docker: Documented at 13 13 - [@tangled.sh/knot-docker](https://tangled.sh/@tangled.sh/knot-docker) 14 14 - (community maintained: support is not guaranteed!) 15 15 - * Manual: Documented below. 16 16 - 17 17 - ## manual setup 18 18 - 19 19 - First, clone this repository: 20 20 - 21 21 - ``` 22 22 - git clone https://tangled.org/@tangled.org/core 23 23 - ``` 24 24 - 25 25 - Then, build the `knot` CLI. This is the knot administration and operation tool. 26 26 - For the purpose of this guide, we're only concerned with these subcommands: 27 27 - 28 28 - * `knot server`: the main knot server process, typically run as a 29 29 - supervised service 30 30 - * `knot guard`: handles role-based access control for git over SSH 31 31 - (you'll never have to run this yourself) 32 32 - * `knot keys`: fetches SSH keys associated with your knot; we'll use 33 33 - this to generate the SSH `AuthorizedKeysCommand` 34 34 - 35 35 - ``` 36 36 - cd core 37 37 - export CGO_ENABLED=1 38 38 - go build -o knot ./cmd/knot 39 39 - ``` 40 40 - 41 41 - Next, move the `knot` binary to a location owned by `root` -- 42 42 - `/usr/local/bin/` is a good choice. Make sure the binary itself is also owned by `root`: 43 43 - 44 44 - ``` 45 45 - sudo mv knot /usr/local/bin/knot 46 46 - sudo chown root:root /usr/local/bin/knot 47 47 - ``` 48 48 - 49 49 - This is necessary because SSH `AuthorizedKeysCommand` requires [really 50 50 - specific permissions](https://stackoverflow.com/a/27638306). The 51 51 - `AuthorizedKeysCommand` specifies a command that is run by `sshd` to 52 52 - retrieve a user's public SSH keys dynamically for authentication. Let's 53 53 - set that up. 54 54 - 55 55 - ``` 56 56 - sudo tee /etc/ssh/sshd_config.d/authorized_keys_command.conf <<EOF 57 57 - Match User git 58 58 - AuthorizedKeysCommand /usr/local/bin/knot keys -o authorized-keys 59 59 - AuthorizedKeysCommandUser nobody 60 60 - EOF 61 61 - ``` 62 62 - 63 63 - Then, reload `sshd`: 64 64 - 65 65 - ``` 66 66 - sudo systemctl reload ssh 67 67 - ``` 68 68 - 69 69 - Next, create the `git` user. We'll use the `git` user's home directory 70 70 - to store repositories: 71 71 - 72 72 - ``` 73 73 - sudo adduser git 74 74 - ``` 75 75 - 76 76 - Create `/home/git/.knot.env` with the following, updating the values as 77 77 - necessary. The `KNOT_SERVER_OWNER` should be set to your 78 78 - DID, you can find your DID in the [Settings](https://tangled.sh/settings) page. 79 79 - 80 80 - ``` 81 81 - KNOT_REPO_SCAN_PATH=/home/git 82 82 - KNOT_SERVER_HOSTNAME=knot.example.com 83 83 - APPVIEW_ENDPOINT=https://tangled.sh 84 84 - KNOT_SERVER_OWNER=did:plc:foobar 85 85 - KNOT_SERVER_INTERNAL_LISTEN_ADDR=127.0.0.1:5444 86 86 - KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555 87 87 - ``` 88 88 - 89 89 - If you run a Linux distribution that uses systemd, you can use the provided 90 90 - service file to run the server. Copy 91 91 - [`knotserver.service`](/systemd/knotserver.service) 92 92 - to `/etc/systemd/system/`. Then, run: 93 93 - 94 94 - ``` 95 95 - systemctl enable knotserver 96 96 - systemctl start knotserver 97 97 - ``` 98 98 - 99 99 - The last step is to configure a reverse proxy like Nginx or Caddy to front your 100 100 - knot. Here's an example configuration for Nginx: 101 101 - 102 102 - ``` 103 103 - server { 104 104 - listen 80; 105 105 - listen [::]:80; 106 106 - server_name knot.example.com; 107 107 - 108 108 - location / { 109 109 - proxy_pass http://localhost:5555; 110 110 - proxy_set_header Host $host; 111 111 - proxy_set_header X-Real-IP $remote_addr; 112 112 - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 113 113 - proxy_set_header X-Forwarded-Proto $scheme; 114 114 - } 115 115 - 116 116 - # wss endpoint for git events 117 117 - location /events { 118 118 - proxy_set_header X-Forwarded-For $remote_addr; 119 119 - proxy_set_header Host $http_host; 120 120 - proxy_set_header Upgrade websocket; 121 121 - proxy_set_header Connection Upgrade; 122 122 - proxy_pass http://localhost:5555; 123 123 - } 124 124 - # additional config for SSL/TLS go here. 125 125 - } 126 126 - 127 127 - ``` 128 128 - 129 129 - Remember to use Let's Encrypt or similar to procure a certificate for your 130 130 - knot domain. 131 131 - 132 132 - You should now have a running knot server! You can finalize 133 133 - your registration by hitting the `verify` button on the 134 134 - [/settings/knots](https://tangled.org/settings/knots) page. This simply creates 135 135 - a record on your PDS to announce the existence of the knot. 136 136 - 137 137 - ### custom paths 138 138 - 139 139 - (This section applies to manual setup only. Docker users should edit the mounts 140 140 - in `docker-compose.yml` instead.) 141 141 - 142 142 - Right now, the database and repositories of your knot lives in `/home/git`. You 143 143 - can move these paths if you'd like to store them in another folder. Be careful 144 144 - when adjusting these paths: 145 145 - 146 146 - * Stop your knot when moving data (e.g. `systemctl stop knotserver`) to prevent 147 147 - any possible side effects. Remember to restart it once you're done. 148 148 - * Make backups before moving in case something goes wrong. 149 149 - * Make sure the `git` user can read and write from the new paths. 150 150 - 151 151 - #### database 152 152 - 153 153 - As an example, let's say the current database is at `/home/git/knotserver.db`, 154 154 - and we want to move it to `/home/git/database/knotserver.db`. 155 155 - 156 156 - Copy the current database to the new location. Make sure to copy the `.db-shm` 157 157 - and `.db-wal` files if they exist. 158 158 - 159 159 - ``` 160 160 - mkdir /home/git/database 161 161 - cp /home/git/knotserver.db* /home/git/database 162 162 - ``` 163 163 - 164 164 - In the environment (e.g. `/home/git/.knot.env`), set `KNOT_SERVER_DB_PATH` to 165 165 - the new file path (_not_ the directory): 166 166 - 167 167 - ``` 168 168 - KNOT_SERVER_DB_PATH=/home/git/database/knotserver.db 169 169 - ``` 170 170 - 171 171 - #### repositories 172 172 - 173 173 - As an example, let's say the repositories are currently in `/home/git`, and we 174 174 - want to move them into `/home/git/repositories`. 175 175 - 176 176 - Create the new folder, then move the existing repositories (if there are any): 177 177 - 178 178 - ``` 179 179 - mkdir /home/git/repositories 180 180 - # move all DIDs into the new folder; these will vary for you! 181 181 - mv /home/git/did:plc:wshs7t2adsemcrrd4snkeqli /home/git/repositories 182 182 - ``` 183 183 - 184 184 - In the environment (e.g. `/home/git/.knot.env`), update `KNOT_REPO_SCAN_PATH` 185 185 - to the new directory: 186 186 - 187 187 - ``` 188 188 - KNOT_REPO_SCAN_PATH=/home/git/repositories 189 189 - ``` 190 190 - 191 191 - Similarly, update your `sshd` `AuthorizedKeysCommand` to use the updated 192 192 - repository path: 193 193 - 194 194 - ``` 195 195 - sudo tee /etc/ssh/sshd_config.d/authorized_keys_command.conf <<EOF 196 196 - Match User git 197 197 - AuthorizedKeysCommand /usr/local/bin/knot keys -o authorized-keys -git-dir /home/git/repositories 198 198 - AuthorizedKeysCommandUser nobody 199 199 - EOF 200 200 - ``` 201 201 - 202 202 - Make sure to restart your SSH server! 203 203 - 204 204 - #### MOTD (message of the day) 205 205 - 206 206 - To configure the MOTD used ("Welcome to this knot!" by default), edit the 207 207 - `/home/git/motd` file: 208 208 - 209 209 - ``` 210 210 - printf "Hi from this knot!\n" > /home/git/motd 211 211 - ``` 212 212 - 213 213 - Note that you should add a newline at the end if setting a non-empty message 214 214 - since the knot won't do this for you.

-59

docs/migrations.md

··· 1 1 - # Migrations 2 2 - 3 3 - This document is laid out in reverse-chronological order. 4 4 - Newer migration guides are listed first, and older guides 5 5 - are further down the page. 6 6 - 7 7 - ## Upgrading from v1.8.x 8 8 - 9 9 - After v1.8.2, the HTTP API for knot and spindles have been 10 10 - deprecated and replaced with XRPC. Repositories on outdated 11 11 - knots will not be viewable from the appview. Upgrading is 12 12 - straightforward however. 13 13 - 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.org/settings/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.org/settings/spindles) and hit the 25 25 - "retry" button to verify your spindle 26 26 - 27 27 - ## Upgrading from v1.7.x 28 28 - 29 29 - After v1.7.0, knot secrets have been deprecated. You no 30 30 - longer need a secret from the appview to run a knot. All 31 31 - authorized commands to knots are managed via [Inter-Service 32 32 - Authentication](https://atproto.com/specs/xrpc#inter-service-authentication-jwt). 33 33 - Knots will be read-only until upgraded. 34 34 - 35 35 - Upgrading is quite easy, in essence: 36 36 - 37 37 - - `KNOT_SERVER_SECRET` is no more, you can remove this 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.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.org/settings/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 - 48 48 - If you use the nix module, simply bump the flake to the 49 49 - latest revision, and change your config block like so: 50 50 - 51 51 - ```diff 52 52 - services.tangled.knot = { 53 53 - enable = true; 54 54 - server = { 55 55 - - secretFile = /path/to/secret; 56 56 - + owner = "did:plc:foo"; 57 57 - }; 58 58 - }; 59 59 - ```

-25

docs/spindle/architecture.md

··· 1 1 - # spindle architecture 2 2 - 3 3 - Spindle is a small CI runner service. Here's a high level overview of how it operates: 4 4 - 5 5 - * listens for [`sh.tangled.spindle.member`](/lexicons/spindle/member.json) and 6 6 - [`sh.tangled.repo`](/lexicons/repo.json) records on the Jetstream. 7 7 - * when a new repo record comes through (typically when you add a spindle to a 8 8 - repo from the settings), spindle then resolves the underlying knot and 9 9 - subscribes to repo events (see: 10 10 - [`sh.tangled.pipeline`](/lexicons/pipeline.json)). 11 11 - * the spindle engine then handles execution of the pipeline, with results and 12 12 - logs beamed on the spindle event stream over wss 13 13 - 14 14 - ### the engine 15 15 - 16 16 - At present, the only supported backend is Docker (and Podman, if Docker 17 17 - compatibility is enabled, so that `/run/docker.sock` is created). Spindle 18 18 - executes each step in the pipeline in a fresh container, with state persisted 19 19 - across steps within the `/tangled/workspace` directory. 20 20 - 21 21 - The base image for the container is constructed on the fly using 22 22 - [Nixery](https://nixery.dev), which is handy for caching layers for frequently 23 23 - used packages. 24 24 - 25 25 - The pipeline manifest is [specified here](/docs/spindle/pipeline.md).

-52

docs/spindle/hosting.md

··· 1 1 - # spindle self-hosting guide 2 2 - 3 3 - ## prerequisites 4 4 - 5 5 - * Go 6 6 - * Docker (the only supported backend currently) 7 7 - 8 8 - ## configuration 9 9 - 10 10 - Spindle is configured using environment variables. The following environment variables are available: 11 11 - 12 12 - * `SPINDLE_SERVER_LISTEN_ADDR`: The address the server listens on (default: `"0.0.0.0:6555"`). 13 13 - * `SPINDLE_SERVER_DB_PATH`: The path to the SQLite database file (default: `"spindle.db"`). 14 14 - * `SPINDLE_SERVER_HOSTNAME`: The hostname of the server (required). 15 15 - * `SPINDLE_SERVER_JETSTREAM_ENDPOINT`: The endpoint of the Jetstream server (default: `"wss://jetstream1.us-west.bsky.network/subscribe"`). 16 16 - * `SPINDLE_SERVER_DEV`: A boolean indicating whether the server is running in development mode (default: `false`). 17 17 - * `SPINDLE_SERVER_OWNER`: The DID of the owner (required). 18 18 - * `SPINDLE_PIPELINES_NIXERY`: The Nixery URL (default: `"nixery.tangled.sh"`). 19 19 - * `SPINDLE_PIPELINES_WORKFLOW_TIMEOUT`: The default workflow timeout (default: `"5m"`). 20 20 - * `SPINDLE_PIPELINES_LOG_DIR`: The directory to store workflow logs (default: `"/var/log/spindle"`). 21 21 - 22 22 - ## running spindle 23 23 - 24 24 - 1. **Set the environment variables.** For example: 25 25 - 26 26 - ```shell 27 27 - export SPINDLE_SERVER_HOSTNAME="your-hostname" 28 28 - export SPINDLE_SERVER_OWNER="your-did" 29 29 - ``` 30 30 - 31 31 - 2. **Build the Spindle binary.** 32 32 - 33 33 - ```shell 34 34 - cd core 35 35 - go mod download 36 36 - go build -o cmd/spindle/spindle cmd/spindle/main.go 37 37 - ``` 38 38 - 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.** 47 47 - 48 48 - ```shell 49 49 - ./cmd/spindle/spindle 50 50 - ``` 51 51 - 52 52 - Spindle will now start, connect to the Jetstream server, and begin processing pipelines.

-285

docs/spindle/openbao.md

··· 1 1 - # spindle secrets with openbao 2 2 - 3 3 - This document covers setting up Spindle to use OpenBao for secrets 4 4 - management via OpenBao Proxy instead of the default SQLite backend. 5 5 - 6 6 - ## overview 7 7 - 8 8 - Spindle now uses OpenBao Proxy for secrets management. The proxy handles 9 9 - authentication automatically using AppRole credentials, while Spindle 10 10 - connects to the local proxy instead of directly to the OpenBao server. 11 11 - 12 12 - This approach provides better security, automatic token renewal, and 13 13 - simplified application code. 14 14 - 15 15 - ## installation 16 16 - 17 17 - Install OpenBao from nixpkgs: 18 18 - 19 19 - ```bash 20 20 - nix shell nixpkgs#openbao # for a local server 21 21 - ``` 22 22 - 23 23 - ## setup 24 24 - 25 25 - The setup process can is documented for both local development and production. 26 26 - 27 27 - ### local development 28 28 - 29 29 - Start OpenBao in dev mode: 30 30 - 31 31 - ```bash 32 32 - bao server -dev -dev-root-token-id="root" -dev-listen-address=127.0.0.1:8201 33 33 - ``` 34 34 - 35 35 - This starts OpenBao on `http://localhost:8201` with a root token. 36 36 - 37 37 - Set up environment for bao CLI: 38 38 - 39 39 - ```bash 40 40 - export BAO_ADDR=http://localhost:8200 41 41 - export BAO_TOKEN=root 42 42 - ``` 43 43 - 44 44 - ### production 45 45 - 46 46 - You would typically use a systemd service with a configuration file. Refer to 47 47 - [@tangled.org/infra](https://tangled.org/@tangled.org/infra) for how this can be 48 48 - achieved using Nix. 49 49 - 50 50 - Then, initialize the bao server: 51 51 - ```bash 52 52 - bao operator init -key-shares=1 -key-threshold=1 53 53 - ``` 54 54 - 55 55 - This will print out an unseal key and a root key. Save them somewhere (like a password manager). Then unseal the vault to begin setting it up: 56 56 - ```bash 57 57 - bao operator unseal <unseal_key> 58 58 - ``` 59 59 - 60 60 - All steps below remain the same across both dev and production setups. 61 61 - 62 62 - ### configure openbao server 63 63 - 64 64 - Create the spindle KV mount: 65 65 - 66 66 - ```bash 67 67 - bao secrets enable -path=spindle -version=2 kv 68 68 - ``` 69 69 - 70 70 - Set up AppRole authentication and policy: 71 71 - 72 72 - Create a policy file `spindle-policy.hcl`: 73 73 - 74 74 - ```hcl 75 75 - # Full access to spindle KV v2 data 76 76 - path "spindle/data/*" { 77 77 - capabilities = ["create", "read", "update", "delete"] 78 78 - } 79 79 - 80 80 - # Access to metadata for listing and management 81 81 - path "spindle/metadata/*" { 82 82 - capabilities = ["list", "read", "delete", "update"] 83 83 - } 84 84 - 85 85 - # Allow listing at root level 86 86 - path "spindle/" { 87 87 - capabilities = ["list"] 88 88 - } 89 89 - 90 90 - # Required for connection testing and health checks 91 91 - path "auth/token/lookup-self" { 92 92 - capabilities = ["read"] 93 93 - } 94 94 - ``` 95 95 - 96 96 - Apply the policy and create an AppRole: 97 97 - 98 98 - ```bash 99 99 - bao policy write spindle-policy spindle-policy.hcl 100 100 - bao auth enable approle 101 101 - bao write auth/approle/role/spindle \ 102 102 - token_policies="spindle-policy" \ 103 103 - token_ttl=1h \ 104 104 - token_max_ttl=4h \ 105 105 - bind_secret_id=true \ 106 106 - secret_id_ttl=0 \ 107 107 - secret_id_num_uses=0 108 108 - ``` 109 109 - 110 110 - Get the credentials: 111 111 - 112 112 - ```bash 113 113 - # Get role ID (static) 114 114 - ROLE_ID=$(bao read -field=role_id auth/approle/role/spindle/role-id) 115 115 - 116 116 - # Generate secret ID 117 117 - SECRET_ID=$(bao write -f -field=secret_id auth/approle/role/spindle/secret-id) 118 118 - 119 119 - echo "Role ID: $ROLE_ID" 120 120 - echo "Secret ID: $SECRET_ID" 121 121 - ``` 122 122 - 123 123 - ### create proxy configuration 124 124 - 125 125 - Create the credential files: 126 126 - 127 127 - ```bash 128 128 - # Create directory for OpenBao files 129 129 - mkdir -p /tmp/openbao 130 130 - 131 131 - # Save credentials 132 132 - echo "$ROLE_ID" > /tmp/openbao/role-id 133 133 - echo "$SECRET_ID" > /tmp/openbao/secret-id 134 134 - chmod 600 /tmp/openbao/role-id /tmp/openbao/secret-id 135 135 - ``` 136 136 - 137 137 - Create a proxy configuration file `/tmp/openbao/proxy.hcl`: 138 138 - 139 139 - ```hcl 140 140 - # OpenBao server connection 141 141 - vault { 142 142 - address = "http://localhost:8200" 143 143 - } 144 144 - 145 145 - # Auto-Auth using AppRole 146 146 - auto_auth { 147 147 - method "approle" { 148 148 - mount_path = "auth/approle" 149 149 - config = { 150 150 - role_id_file_path = "/tmp/openbao/role-id" 151 151 - secret_id_file_path = "/tmp/openbao/secret-id" 152 152 - } 153 153 - } 154 154 - 155 155 - # Optional: write token to file for debugging 156 156 - sink "file" { 157 157 - config = { 158 158 - path = "/tmp/openbao/token" 159 159 - mode = 0640 160 160 - } 161 161 - } 162 162 - } 163 163 - 164 164 - # Proxy listener for Spindle 165 165 - listener "tcp" { 166 166 - address = "127.0.0.1:8201" 167 167 - tls_disable = true 168 168 - } 169 169 - 170 170 - # Enable API proxy with auto-auth token 171 171 - api_proxy { 172 172 - use_auto_auth_token = true 173 173 - } 174 174 - 175 175 - # Enable response caching 176 176 - cache { 177 177 - use_auto_auth_token = true 178 178 - } 179 179 - 180 180 - # Logging 181 181 - log_level = "info" 182 182 - ``` 183 183 - 184 184 - ### start the proxy 185 185 - 186 186 - Start OpenBao Proxy: 187 187 - 188 188 - ```bash 189 189 - bao proxy -config=/tmp/openbao/proxy.hcl 190 190 - ``` 191 191 - 192 192 - The proxy will authenticate with OpenBao and start listening on 193 193 - `127.0.0.1:8201`. 194 194 - 195 195 - ### configure spindle 196 196 - 197 197 - Set these environment variables for Spindle: 198 198 - 199 199 - ```bash 200 200 - export SPINDLE_SERVER_SECRETS_PROVIDER=openbao 201 201 - export SPINDLE_SERVER_SECRETS_OPENBAO_PROXY_ADDR=http://127.0.0.1:8201 202 202 - export SPINDLE_SERVER_SECRETS_OPENBAO_MOUNT=spindle 203 203 - ``` 204 204 - 205 205 - Start Spindle: 206 206 - 207 207 - Spindle will now connect to the local proxy, which handles all 208 208 - authentication automatically. 209 209 - 210 210 - ## production setup for proxy 211 211 - 212 212 - For production, you'll want to run the proxy as a service: 213 213 - 214 214 - Place your production configuration in `/etc/openbao/proxy.hcl` with 215 215 - proper TLS settings for the vault connection. 216 216 - 217 217 - ## verifying setup 218 218 - 219 219 - Test the proxy directly: 220 220 - 221 221 - ```bash 222 222 - # Check proxy health 223 223 - curl -H "X-Vault-Request: true" http://127.0.0.1:8201/v1/sys/health 224 224 - 225 225 - # Test token lookup through proxy 226 226 - curl -H "X-Vault-Request: true" http://127.0.0.1:8201/v1/auth/token/lookup-self 227 227 - ``` 228 228 - 229 229 - Test OpenBao operations through the server: 230 230 - 231 231 - ```bash 232 232 - # List all secrets 233 233 - bao kv list spindle/ 234 234 - 235 235 - # Add a test secret via Spindle API, then check it exists 236 236 - bao kv list spindle/repos/ 237 237 - 238 238 - # Get a specific secret 239 239 - bao kv get spindle/repos/your_repo_path/SECRET_NAME 240 240 - ``` 241 241 - 242 242 - ## how it works 243 243 - 244 244 - - Spindle connects to OpenBao Proxy on localhost (typically port 8200 or 8201) 245 245 - - The proxy authenticates with OpenBao using AppRole credentials 246 246 - - All Spindle requests go through the proxy, which injects authentication tokens 247 247 - - Secrets are stored at `spindle/repos/{sanitized_repo_path}/{secret_key}` 248 248 - - Repository paths like `did:plc:alice/myrepo` become `did_plc_alice_myrepo` 249 249 - - The proxy handles all token renewal automatically 250 250 - - Spindle no longer manages tokens or authentication directly 251 251 - 252 252 - ## troubleshooting 253 253 - 254 254 - **Connection refused**: Check that the OpenBao Proxy is running and 255 255 - listening on the configured address. 256 256 - 257 257 - **403 errors**: Verify the AppRole credentials are correct and the policy 258 258 - has the necessary permissions. 259 259 - 260 260 - **404 route errors**: The spindle KV mount probably doesn't exist - run 261 261 - the mount creation step again. 262 262 - 263 263 - **Proxy authentication failures**: Check the proxy logs and verify the 264 264 - role-id and secret-id files are readable and contain valid credentials. 265 265 - 266 266 - **Secret not found after writing**: This can indicate policy permission 267 267 - issues. Verify the policy includes both `spindle/data/*` and 268 268 - `spindle/metadata/*` paths with appropriate capabilities. 269 269 - 270 270 - Check proxy logs: 271 271 - 272 272 - ```bash 273 273 - # If running as systemd service 274 274 - journalctl -u openbao-proxy -f 275 275 - 276 276 - # If running directly, check the console output 277 277 - ``` 278 278 - 279 279 - Test AppRole authentication manually: 280 280 - 281 281 - ```bash 282 282 - bao write auth/approle/login \ 283 283 - role_id="$(cat /tmp/openbao/role-id)" \ 284 284 - secret_id="$(cat /tmp/openbao/secret-id)" 285 285 - ```

-183

docs/spindle/pipeline.md

··· 1 1 - # spindle pipelines 2 2 - 3 3 - Spindle workflows allow you to write CI/CD pipelines in a simple format. They're located in the `.tangled/workflows` directory at the root of your repository, and are defined using YAML. 4 4 - 5 5 - The fields are: 6 6 - 7 7 - - [Trigger](#trigger): A **required** field that defines when a workflow should be triggered. 8 8 - - [Engine](#engine): A **required** field that defines which engine a workflow should run on. 9 9 - - [Clone options](#clone-options): An **optional** field that defines how the repository should be cloned. 10 10 - - [Dependencies](#dependencies): An **optional** field that allows you to list dependencies you may need. 11 11 - - [Environment](#environment): An **optional** field that allows you to define environment variables. 12 12 - - [Steps](#steps): An **optional** field that allows you to define what steps should run in the workflow. 13 13 - 14 14 - ## Trigger 15 15 - 16 16 - The first thing to add to a workflow is the trigger, which defines when a workflow runs. This is defined using a `when` field, which takes in a list of conditions. Each condition has the following fields: 17 17 - 18 18 - - `event`: This is a **required** field that defines when your workflow should run. It's a list that can take one or more of the following values: 19 19 - - `push`: The workflow should run every time a commit is pushed to the repository. 20 20 - - `pull_request`: The workflow should run every time a pull request is made or updated. 21 21 - - `manual`: The workflow can be triggered manually. 22 22 - - `branch`: Defines which branches the workflow should run for. If used with the `push` event, commits to the branch(es) listed here will trigger the workflow. If used with the `pull_request` event, updates to pull requests targeting the branch(es) listed here will trigger the workflow. This field has no effect with the `manual` event. Supports glob patterns using `*` and `**` (e.g., `main`, `develop`, `release-*`). Either `branch` or `tag` (or both) must be specified for `push` events. 23 23 - - `tag`: Defines which tags the workflow should run for. Only used with the `push` event - when tags matching the pattern(s) listed here are pushed, the workflow will trigger. This field has no effect with `pull_request` or `manual` events. Supports glob patterns using `*` and `**` (e.g., `v*`, `v1.*`, `release-**`). Either `branch` or `tag` (or both) must be specified for `push` events. 24 24 - 25 25 - For example, if you'd like to define a workflow that runs when commits are pushed to the `main` and `develop` branches, or when pull requests that target the `main` branch are updated, or manually, you can do so with: 26 26 - 27 27 - ```yaml 28 28 - when: 29 29 - - event: ["push", "manual"] 30 30 - branch: ["main", "develop"] 31 31 - - event: ["pull_request"] 32 32 - branch: ["main"] 33 33 - ``` 34 34 - 35 35 - You can also trigger workflows on tag pushes. For instance, to run a deployment workflow when tags matching `v*` are pushed: 36 36 - 37 37 - ```yaml 38 38 - when: 39 39 - - event: ["push"] 40 40 - tag: ["v*"] 41 41 - ``` 42 42 - 43 43 - You can even combine branch and tag patterns in a single constraint (the workflow triggers if either matches): 44 44 - 45 45 - ```yaml 46 46 - when: 47 47 - - event: ["push"] 48 48 - branch: ["main", "release-*"] 49 49 - tag: ["v*", "stable"] 50 50 - ``` 51 51 - 52 52 - ## Engine 53 53 - 54 54 - Next is the engine on which the workflow should run, defined using the **required** `engine` field. The currently supported engines are: 55 55 - 56 56 - - `nixery`: This uses an instance of [Nixery](https://nixery.dev) to run steps, which allows you to add [dependencies](#dependencies) from [Nixpkgs](https://github.com/NixOS/nixpkgs). You can search for packages on https://search.nixos.org, and there's a pretty good chance the package(s) you're looking for will be there. 57 57 - 58 58 - Example: 59 59 - 60 60 - ```yaml 61 61 - engine: "nixery" 62 62 - ``` 63 63 - 64 64 - ## Clone options 65 65 - 66 66 - When a workflow starts, the first step is to clone the repository. You can customize this behavior using the **optional** `clone` field. It has the following fields: 67 67 - 68 68 - - `skip`: Setting this to `true` will skip cloning the repository. This can be useful if your workflow is doing something that doesn't require anything from the repository itself. This is `false` by default. 69 69 - - `depth`: This sets the number of commits, or the "clone depth", to fetch from the repository. For example, if you set this to 2, the last 2 commits will be fetched. By default, the depth is set to 1, meaning only the most recent commit will be fetched, which is the commit that triggered the workflow. 70 70 - - `submodules`: If you use [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) in your repository, setting this field to `true` will recursively fetch all submodules. This is `false` by default. 71 71 - 72 72 - The default settings are: 73 73 - 74 74 - ```yaml 75 75 - clone: 76 76 - skip: false 77 77 - depth: 1 78 78 - submodules: false 79 79 - ``` 80 80 - 81 81 - ## Dependencies 82 82 - 83 83 - Usually when you're running a workflow, you'll need additional dependencies. The `dependencies` field lets you define which dependencies to get, and from where. It's a key-value map, with the key being the registry to fetch dependencies from, and the value being the list of dependencies to fetch. 84 84 - 85 85 - Say you want to fetch Node.js and Go from `nixpkgs`, and a package called `my_pkg` you've made from your own registry at your repository at `https://tangled.sh/@example.com/my_pkg`. You can define those dependencies like so: 86 86 - 87 87 - ```yaml 88 88 - dependencies: 89 89 - # nixpkgs 90 90 - nixpkgs: 91 91 - - nodejs 92 92 - - go 93 93 - # custom registry 94 94 - git+https://tangled.org/@example.com/my_pkg: 95 95 - - my_pkg 96 96 - ``` 97 97 - 98 98 - Now these dependencies are available to use in your workflow! 99 99 - 100 100 - ## Environment 101 101 - 102 102 - The `environment` field allows you define environment variables that will be available throughout the entire workflow. **Do not put secrets here, these environment variables are visible to anyone viewing the repository. You can add secrets for pipelines in your repository's settings.** 103 103 - 104 104 - Example: 105 105 - 106 106 - ```yaml 107 107 - environment: 108 108 - GOOS: "linux" 109 109 - GOARCH: "arm64" 110 110 - NODE_ENV: "production" 111 111 - MY_ENV_VAR: "MY_ENV_VALUE" 112 112 - ``` 113 113 - 114 114 - ## Steps 115 115 - 116 116 - The `steps` field allows you to define what steps should run in the workflow. It's a list of step objects, each with the following fields: 117 117 - 118 118 - - `name`: This field allows you to give your step a name. This name is visible in your workflow runs, and is used to describe what the step is doing. 119 119 - - `command`: This field allows you to define a command to run in that step. The step is run in a Bash shell, and the logs from the command will be visible in the pipelines page on the Tangled website. The [dependencies](#dependencies) you added will be available to use here. 120 120 - - `environment`: Similar to the global [environment](#environment) config, this **optional** field is a key-value map that allows you to set environment variables for the step. **Do not put secrets here, these environment variables are visible to anyone viewing the repository. You can add secrets for pipelines in your repository's settings.** 121 121 - 122 122 - Example: 123 123 - 124 124 - ```yaml 125 125 - steps: 126 126 - - name: "Build backend" 127 127 - command: "go build" 128 128 - environment: 129 129 - GOOS: "darwin" 130 130 - GOARCH: "arm64" 131 131 - - name: "Build frontend" 132 132 - command: "npm run build" 133 133 - environment: 134 134 - NODE_ENV: "production" 135 135 - ``` 136 136 - 137 137 - ## Complete workflow 138 138 - 139 139 - ```yaml 140 140 - # .tangled/workflows/build.yml 141 141 - 142 142 - when: 143 143 - - event: ["push", "manual"] 144 144 - branch: ["main", "develop"] 145 145 - - event: ["pull_request"] 146 146 - branch: ["main"] 147 147 - 148 148 - engine: "nixery" 149 149 - 150 150 - # using the default values 151 151 - clone: 152 152 - skip: false 153 153 - depth: 1 154 154 - submodules: false 155 155 - 156 156 - dependencies: 157 157 - # nixpkgs 158 158 - nixpkgs: 159 159 - - nodejs 160 160 - - go 161 161 - # custom registry 162 162 - git+https://tangled.org/@example.com/my_pkg: 163 163 - - my_pkg 164 164 - 165 165 - environment: 166 166 - GOOS: "linux" 167 167 - GOARCH: "arm64" 168 168 - NODE_ENV: "production" 169 169 - MY_ENV_VAR: "MY_ENV_VALUE" 170 170 - 171 171 - steps: 172 172 - - name: "Build backend" 173 173 - command: "go build" 174 174 - environment: 175 175 - GOOS: "darwin" 176 176 - GOARCH: "arm64" 177 177 - - name: "Build frontend" 178 178 - command: "npm run build" 179 179 - environment: 180 180 - NODE_ENV: "production" 181 181 - ``` 182 182 - 183 183 - If you want another example of a workflow, you can look at the one [Tangled uses to build the project](https://tangled.sh/@tangled.sh/core/blob/master/.tangled/workflows/build.yml).

+101

docs/styles.css

··· 1 1 + svg { 2 2 + width: 16px; 3 3 + height: 16px; 4 4 + } 5 5 + 6 6 + :root { 7 7 + --syntax-alert: #d20f39; 8 8 + --syntax-annotation: #fe640b; 9 9 + --syntax-attribute: #df8e1d; 10 10 + --syntax-basen: #40a02b; 11 11 + --syntax-builtin: #1e66f5; 12 12 + --syntax-controlflow: #8839ef; 13 13 + --syntax-char: #04a5e5; 14 14 + --syntax-constant: #fe640b; 15 15 + --syntax-comment: #9ca0b0; 16 16 + --syntax-commentvar: #7c7f93; 17 17 + --syntax-documentation: #9ca0b0; 18 18 + --syntax-datatype: #df8e1d; 19 19 + --syntax-decval: #40a02b; 20 20 + --syntax-error: #d20f39; 21 21 + --syntax-extension: #4c4f69; 22 22 + --syntax-float: #40a02b; 23 23 + --syntax-function: #1e66f5; 24 24 + --syntax-import: #40a02b; 25 25 + --syntax-information: #04a5e5; 26 26 + --syntax-keyword: #8839ef; 27 27 + --syntax-operator: #179299; 28 28 + --syntax-other: #8839ef; 29 29 + --syntax-preprocessor: #ea76cb; 30 30 + --syntax-specialchar: #04a5e5; 31 31 + --syntax-specialstring: #ea76cb; 32 32 + --syntax-string: #40a02b; 33 33 + --syntax-variable: #8839ef; 34 34 + --syntax-verbatimstring: #40a02b; 35 35 + --syntax-warning: #df8e1d; 36 36 + } 37 37 + 38 38 + @media (prefers-color-scheme: dark) { 39 39 + :root { 40 40 + --syntax-alert: #f38ba8; 41 41 + --syntax-annotation: #fab387; 42 42 + --syntax-attribute: #f9e2af; 43 43 + --syntax-basen: #a6e3a1; 44 44 + --syntax-builtin: #89b4fa; 45 45 + --syntax-controlflow: #cba6f7; 46 46 + --syntax-char: #89dceb; 47 47 + --syntax-constant: #fab387; 48 48 + --syntax-comment: #6c7086; 49 49 + --syntax-commentvar: #585b70; 50 50 + --syntax-documentation: #6c7086; 51 51 + --syntax-datatype: #f9e2af; 52 52 + --syntax-decval: #a6e3a1; 53 53 + --syntax-error: #f38ba8; 54 54 + --syntax-extension: #cdd6f4; 55 55 + --syntax-float: #a6e3a1; 56 56 + --syntax-function: #89b4fa; 57 57 + --syntax-import: #a6e3a1; 58 58 + --syntax-information: #89dceb; 59 59 + --syntax-keyword: #cba6f7; 60 60 + --syntax-operator: #94e2d5; 61 61 + --syntax-other: #cba6f7; 62 62 + --syntax-preprocessor: #f5c2e7; 63 63 + --syntax-specialchar: #89dceb; 64 64 + --syntax-specialstring: #f5c2e7; 65 65 + --syntax-string: #a6e3a1; 66 66 + --syntax-variable: #cba6f7; 67 67 + --syntax-verbatimstring: #a6e3a1; 68 68 + --syntax-warning: #f9e2af; 69 69 + } 70 70 + } 71 71 + 72 72 + /* pandoc syntax highlighting classes */ 73 73 + code span.al { color: var(--syntax-alert); font-weight: bold; } /* alert */ 74 74 + code span.an { color: var(--syntax-annotation); font-weight: bold; font-style: italic; } /* annotation */ 75 75 + code span.at { color: var(--syntax-attribute); } /* attribute */ 76 76 + code span.bn { color: var(--syntax-basen); } /* basen */ 77 77 + code span.bu { color: var(--syntax-builtin); } /* builtin */ 78 78 + code span.cf { color: var(--syntax-controlflow); font-weight: bold; } /* controlflow */ 79 79 + code span.ch { color: var(--syntax-char); } /* char */ 80 80 + code span.cn { color: var(--syntax-constant); } /* constant */ 81 81 + code span.co { color: var(--syntax-comment); font-style: italic; } /* comment */ 82 82 + code span.cv { color: var(--syntax-commentvar); font-weight: bold; font-style: italic; } /* commentvar */ 83 83 + code span.do { color: var(--syntax-documentation); font-style: italic; } /* documentation */ 84 84 + code span.dt { color: var(--syntax-datatype); } /* datatype */ 85 85 + code span.dv { color: var(--syntax-decval); } /* decval */ 86 86 + code span.er { color: var(--syntax-error); font-weight: bold; } /* error */ 87 87 + code span.ex { color: var(--syntax-extension); } /* extension */ 88 88 + code span.fl { color: var(--syntax-float); } /* float */ 89 89 + code span.fu { color: var(--syntax-function); } /* function */ 90 90 + code span.im { color: var(--syntax-import); font-weight: bold; } /* import */ 91 91 + code span.in { color: var(--syntax-information); font-weight: bold; font-style: italic; } /* information */ 92 92 + code span.kw { color: var(--syntax-keyword); font-weight: bold; } /* keyword */ 93 93 + code span.op { color: var(--syntax-operator); } /* operator */ 94 94 + code span.ot { color: var(--syntax-other); } /* other */ 95 95 + code span.pp { color: var(--syntax-preprocessor); } /* preprocessor */ 96 96 + code span.sc { color: var(--syntax-specialchar); } /* specialchar */ 97 97 + code span.ss { color: var(--syntax-specialstring); } /* specialstring */ 98 98 + code span.st { color: var(--syntax-string); } /* string */ 99 99 + code span.va { color: var(--syntax-variable); } /* variable */ 100 100 + code span.vs { color: var(--syntax-verbatimstring); } /* verbatimstring */ 101 101 + code span.wa { color: var(--syntax-warning); font-weight: bold; font-style: italic; } /* warning */

+117

docs/template.html

··· 1 1 + <!DOCTYPE html> 2 2 + <html xmlns="http://www.w3.org/1999/xhtml" lang="$lang$" xml:lang="$lang$"$if(dir)$ dir="$dir$"$endif$> 3 3 + <head> 4 4 + <meta charset="utf-8" /> 5 5 + <meta name="generator" content="pandoc" /> 6 6 + <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> 7 7 + $for(author-meta)$ 8 8 + <meta name="author" content="$author-meta$" /> 9 9 + $endfor$ 10 10 + 11 11 + $if(date-meta)$ 12 12 + <meta name="dcterms.date" content="$date-meta$" /> 13 13 + $endif$ 14 14 + 15 15 + $if(keywords)$ 16 16 + <meta name="keywords" content="$for(keywords)$$keywords$$sep$, $endfor$" /> 17 17 + $endif$ 18 18 + 19 19 + $if(description-meta)$ 20 20 + <meta name="description" content="$description-meta$" /> 21 21 + $endif$ 22 22 + 23 23 + <title>$pagetitle$</title> 24 24 + 25 25 + <style> 26 26 + $styles.css()$ 27 27 + </style> 28 28 + 29 29 + $for(css)$ 30 30 + <link rel="stylesheet" href="$css$" /> 31 31 + $endfor$ 32 32 + 33 33 + $for(header-includes)$ 34 34 + $header-includes$ 35 35 + $endfor$ 36 36 + 37 37 + <link rel="preload" href="/static/fonts/InterVariable.woff2" as="font" type="font/woff2" crossorigin /> 38 38 + 39 39 + </head> 40 40 + <body class="bg-white dark:bg-gray-900 min-h-screen flex flex-col min-h-screen"> 41 41 + $for(include-before)$ 42 42 + $include-before$ 43 43 + $endfor$ 44 44 + 45 45 + $if(toc)$ 46 46 + <!-- mobile topbar toc --> 47 47 + <details id="mobile-$idprefix$TOC" role="doc-toc" class="md:hidden bg-gray-50 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 z-50 space-y-4 group px-6 py-4"> 48 48 + <summary class="cursor-pointer list-none text-sm font-semibold select-none flex gap-2 justify-between items-center dark:text-white"> 49 49 + $if(toc-title)$$toc-title$$else$Table of Contents$endif$ 50 50 + <span class="group-open:hidden inline">${ menu.svg() }</span> 51 51 + <span class="hidden group-open:inline">${ x.svg() }</span> 52 52 + </summary> 53 53 + ${ table-of-contents:toc.html() } 54 54 + </details> 55 55 + <!-- desktop sidebar toc --> 56 56 + <nav id="$idprefix$TOC" role="doc-toc" class="hidden md:block fixed left-0 top-0 w-80 h-screen bg-gray-50 dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 overflow-y-auto p-4 z-50"> 57 57 + $if(toc-title)$ 58 58 + <h2 id="$idprefix$toc-title" class="text-lg font-semibold mb-4 text-gray-900">$toc-title$</h2> 59 59 + $endif$ 60 60 + ${ table-of-contents:toc.html() } 61 61 + </nav> 62 62 + $endif$ 63 63 + 64 64 + <div class="$if(toc)$md:ml-80$endif$ flex-1 flex flex-col"> 65 65 + <main class="max-w-4xl w-full mx-auto p-6 flex-1"> 66 66 + $if(top)$ 67 67 + $-- only print title block if this is NOT the top page 68 68 + $else$ 69 69 + $if(title)$ 70 70 + <header id="title-block-header" class="mb-8 pb-8 border-b border-gray-200 dark:border-gray-700"> 71 71 + <h1 class="text-4xl font-bold mb-2 text-black dark:text-white">$title$</h1> 72 72 + $if(subtitle)$ 73 73 + <p class="text-xl text-gray-500 dark:text-gray-400 mb-2">$subtitle$</p> 74 74 + $endif$ 75 75 + $for(author)$ 76 76 + <p class="text-sm text-gray-500 dark:text-gray-400">$author$</p> 77 77 + $endfor$ 78 78 + $if(date)$ 79 79 + <p class="text-sm text-gray-500 dark:text-gray-400">Updated on $date$</p> 80 80 + $endif$ 81 81 + $if(abstract)$ 82 82 + <div class="mt-6 p-4 bg-gray-50 rounded-lg"> 83 83 + <div class="text-sm font-semibold text-gray-700 uppercase mb-2">$abstract-title$</div> 84 84 + <div class="text-gray-700">$abstract$</div> 85 85 + </div> 86 86 + $endif$ 87 87 + $endif$ 88 88 + </header> 89 89 + $endif$ 90 90 + <article class="prose dark:prose-invert max-w-none"> 91 91 + $body$ 92 92 + </article> 93 93 + </main> 94 94 + <nav id="sitenav" class="border-t border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-800 "> 95 95 + <div class="max-w-4xl mx-auto px-8 py-4"> 96 96 + <div class="flex justify-between gap-4"> 97 97 + <span class="flex-1"> 98 98 + $if(previous.url)$ 99 99 + <span class="text-xs text-gray-500 dark:text-gray-400 uppercase block mb-1">Previous</span> 100 100 + <a href="$previous.url$" accesskey="p" rel="previous">$previous.title$</a> 101 101 + $endif$ 102 102 + </span> 103 103 + <span class="flex-1 text-right"> 104 104 + $if(next.url)$ 105 105 + <span class="text-xs text-gray-500 dark:text-gray-400 uppercase block mb-1">Next</span> 106 106 + <a href="$next.url$" accesskey="n" rel="next">$next.title$</a> 107 107 + $endif$ 108 108 + </span> 109 109 + </div> 110 110 + </div> 111 111 + </nav> 112 112 + </div> 113 113 + $for(include-after)$ 114 114 + $include-after$ 115 115 + $endfor$ 116 116 + </body> 117 117 + </html>

+4

docs/toc.html

··· 1 1 + <div class="[&_ul]:space-y-6 [&_ul]:pl-0 [&_ul]:font-bold [&_ul_ul]:pl-4 [&_ul_ul]:font-normal [&_ul_ul]:space-y-2 [&_li]:space-y-2"> 2 2 + $table-of-contents$ 3 3 + </div> 4 4 +

+9 -9

flake.lock

··· 35 35 "systems": "systems" 36 36 }, 37 37 "locked": { 38 38 - "lastModified": 1694529238, 39 39 - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", 38 38 + "lastModified": 1731533236, 39 39 + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", 40 40 "owner": "numtide", 41 41 "repo": "flake-utils", 42 42 - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", 42 42 + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", 43 43 "type": "github" 44 44 }, 45 45 "original": { ··· 56 56 ] 57 57 }, 58 58 "locked": { 59 59 - "lastModified": 1754078208, 60 60 - "narHash": "sha256-YVoIFDCDpYuU3riaDEJ3xiGdPOtsx4sR5eTzHTytPV8=", 59 59 + "lastModified": 1763982521, 60 60 + "narHash": "sha256-ur4QIAHwgFc0vXiaxn5No/FuZicxBr2p0gmT54xZkUQ=", 61 61 "owner": "nix-community", 62 62 "repo": "gomod2nix", 63 63 - "rev": "7f963246a71626c7fc70b431a315c4388a0c95cf", 63 63 + "rev": "02e63a239d6eabd595db56852535992c898eba72", 64 64 "type": "github" 65 65 }, 66 66 "original": { ··· 150 150 }, 151 151 "nixpkgs": { 152 152 "locked": { 153 153 - "lastModified": 1751984180, 154 154 - "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", 153 153 + "lastModified": 1766070988, 154 154 + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", 155 155 "owner": "nixos", 156 156 "repo": "nixpkgs", 157 157 - "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", 157 157 + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", 158 158 "type": "github" 159 159 }, 160 160 "original": {

+34 -4

flake.nix

··· 80 80 }).buildGoApplication; 81 81 modules = ./nix/gomod2nix.toml; 82 82 sqlite-lib = self.callPackage ./nix/pkgs/sqlite-lib.nix { 83 83 - inherit (pkgs) gcc; 84 83 inherit sqlite-lib-src; 85 84 }; 86 85 lexgen = self.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;}; ··· 89 88 inherit htmx-src htmx-ws-src lucide-src inter-fonts-src ibm-plex-mono-src actor-typeahead-src; 90 89 }; 91 90 appview = self.callPackage ./nix/pkgs/appview.nix {}; 91 91 + docs = self.callPackage ./nix/pkgs/docs.nix { 92 92 + inherit inter-fonts-src ibm-plex-mono-src lucide-src; 93 93 + }; 92 94 spindle = self.callPackage ./nix/pkgs/spindle.nix {}; 93 95 knot-unwrapped = self.callPackage ./nix/pkgs/knot-unwrapped.nix {}; 94 96 knot = self.callPackage ./nix/pkgs/knot.nix {}; 97 97 + did-method-plc = self.callPackage ./nix/pkgs/did-method-plc.nix {}; 98 98 + bluesky-jetstream = self.callPackage ./nix/pkgs/bluesky-jetstream.nix {}; 99 99 + bluesky-relay = self.callPackage ./nix/pkgs/bluesky-relay.nix {}; 100 100 + tap = self.callPackage ./nix/pkgs/tap.nix {}; 95 101 }); 96 102 in { 97 103 overlays.default = final: prev: { 98 98 - inherit (mkPackageSet final) lexgen goat sqlite-lib spindle knot-unwrapped knot appview; 104 104 + inherit (mkPackageSet final) lexgen goat sqlite-lib spindle knot-unwrapped knot appview docs did-method-plc bluesky-jetstream bluesky-relay tap; 99 105 }; 100 106 101 107 packages = forAllSystems (system: let ··· 104 110 staticPackages = mkPackageSet pkgs.pkgsStatic; 105 111 crossPackages = mkPackageSet pkgs.pkgsCross.gnu64.pkgsStatic; 106 112 in { 107 107 - inherit (packages) appview appview-static-files lexgen goat spindle knot knot-unwrapped sqlite-lib; 113 113 + inherit (packages) appview appview-static-files lexgen goat spindle knot knot-unwrapped sqlite-lib docs did-method-plc bluesky-jetstream bluesky-relay tap; 108 114 109 115 pkgsStatic-appview = staticPackages.appview; 110 116 pkgsStatic-knot = staticPackages.knot; ··· 156 162 nativeBuildInputs = [ 157 163 pkgs.go 158 164 pkgs.air 159 159 - pkgs.tilt 160 165 pkgs.gopls 161 166 pkgs.httpie 162 167 pkgs.litecli ··· 304 309 imports = [./nix/modules/spindle.nix]; 305 310 306 311 services.tangled.spindle.package = lib.mkDefault self.packages.${pkgs.stdenv.hostPlatform.system}.spindle; 312 312 + services.tangled.spindle.tap-package = lib.mkDefault self.packages.${pkgs.system}.tap; 313 313 + }; 314 314 + nixosModules.did-method-plc = { 315 315 + lib, 316 316 + pkgs, 317 317 + ... 318 318 + }: { 319 319 + imports = [./nix/modules/did-method-plc.nix]; 320 320 + services.did-method-plc.package = lib.mkDefault self.packages.${pkgs.system}.did-method-plc; 321 321 + }; 322 322 + nixosModules.bluesky-relay = { 323 323 + lib, 324 324 + pkgs, 325 325 + ... 326 326 + }: { 327 327 + imports = [./nix/modules/bluesky-relay.nix]; 328 328 + services.bluesky-relay.package = lib.mkDefault self.packages.${pkgs.system}.bluesky-relay; 329 329 + }; 330 330 + nixosModules.bluesky-jetstream = { 331 331 + lib, 332 332 + pkgs, 333 333 + ... 334 334 + }: { 335 335 + imports = [./nix/modules/bluesky-jetstream.nix]; 336 336 + services.bluesky-jetstream.package = lib.mkDefault self.packages.${pkgs.system}.bluesky-jetstream; 307 337 }; 308 338 }; 309 339 }

+4 -4

go.mod

··· 1 1 module tangled.org/core 2 2 3 3 - go 1.24.4 3 3 + go 1.25.0 4 4 5 5 require ( 6 6 github.com/Blank-Xu/sql-adapter v1.1.1 ··· 29 29 github.com/gorilla/feeds v1.2.0 30 30 github.com/gorilla/sessions v1.4.0 31 31 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 32 32 + github.com/hashicorp/go-version v1.8.0 32 33 github.com/hiddeco/sshsig v0.2.0 33 34 github.com/hpcloud/tail v1.0.0 34 35 github.com/ipfs/go-cid v0.5.0 ··· 44 45 github.com/stretchr/testify v1.10.0 45 46 github.com/urfave/cli/v3 v3.3.3 46 47 github.com/whyrusleeping/cbor-gen v0.3.1 47 47 - github.com/wyatt915/goldmark-treeblood v0.0.1 48 48 github.com/yuin/goldmark v1.7.13 49 49 + github.com/yuin/goldmark-emoji v1.0.6 49 50 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc 50 51 gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab 51 52 golang.org/x/crypto v0.40.0 52 53 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b 53 54 golang.org/x/image v0.31.0 54 55 golang.org/x/net v0.42.0 55 55 - golang.org/x/sync v0.17.0 56 56 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da 57 57 gopkg.in/yaml.v3 v3.0.1 58 58 ) ··· 190 190 github.com/vmihailenco/go-tinylfu v0.2.2 // indirect 191 191 github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect 192 192 github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect 193 193 - github.com/wyatt915/treeblood v0.1.16 // indirect 194 193 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect 195 194 gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect 196 195 gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect ··· 205 204 go.uber.org/atomic v1.11.0 // indirect 206 205 go.uber.org/multierr v1.11.0 // indirect 207 206 go.uber.org/zap v1.27.0 // indirect 207 207 + golang.org/x/sync v0.17.0 // indirect 208 208 golang.org/x/sys v0.34.0 // indirect 209 209 golang.org/x/text v0.29.0 // indirect 210 210 golang.org/x/time v0.12.0 // indirect

+4 -4

go.sum

··· 264 264 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4= 265 265 github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw= 266 266 github.com/hashicorp/go-sockaddr v1.0.7/go.mod h1:FZQbEYa1pxkQ7WLpyXJ6cbjpT8q0YgQaK/JakXqGyWw= 267 267 + github.com/hashicorp/go-version v1.8.0 h1:KAkNb1HAiZd1ukkxDFGmokVZe1Xy9HG6NUp+bPle2i4= 268 268 + github.com/hashicorp/go-version v1.8.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= 267 269 github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= 268 270 github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= 269 271 github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= ··· 495 497 github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw= 496 498 github.com/whyrusleeping/cbor-gen v0.3.1 h1:82ioxmhEYut7LBVGhGq8xoRkXPLElVuh5mV67AFfdv0= 497 499 github.com/whyrusleeping/cbor-gen v0.3.1/go.mod h1:pM99HXyEbSQHcosHc0iW7YFmwnscr+t9Te4ibko05so= 498 498 - github.com/wyatt915/goldmark-treeblood v0.0.1 h1:6vLJcjFrHgE4ASu2ga4hqIQmbvQLU37v53jlHZ3pqDs= 499 499 - github.com/wyatt915/goldmark-treeblood v0.0.1/go.mod h1:SmcJp5EBaV17rroNlgNQFydYwy0+fv85CUr/ZaCz208= 500 500 - github.com/wyatt915/treeblood v0.1.16 h1:byxNbWZhnPDxdTp7W5kQhCeaY8RBVmojTFz1tEHgg8Y= 501 501 - github.com/wyatt915/treeblood v0.1.16/go.mod h1:i7+yhhmzdDP17/97pIsOSffw74EK/xk+qJ0029cSXUY= 502 500 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= 503 501 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= 504 502 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= ··· 509 507 github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 510 508 github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA= 511 509 github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= 510 510 + github.com/yuin/goldmark-emoji v1.0.6 h1:QWfF2FYaXwL74tfGOW5izeiZepUDroDJfWubQI9HTHs= 511 511 + github.com/yuin/goldmark-emoji v1.0.6/go.mod h1:ukxJDKFpdFb5x0a5HqbdlcKtebh086iJpI31LTKmWuA= 512 512 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ= 513 513 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I= 514 514 gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab h1:gK9tS6QJw5F0SIhYJnGG2P83kuabOdmWBbSmZhJkz2A=

+4 -4

hook/hook.go

··· 48 48 }, 49 49 Commands: []*cli.Command{ 50 50 { 51 51 - Name: "post-recieve", 52 52 - Usage: "sends a post-recieve hook to the knot (waits for stdin)", 53 53 - Action: postRecieve, 51 51 + Name: "post-receive", 52 52 + Usage: "sends a post-receive hook to the knot (waits for stdin)", 53 53 + Action: postReceive, 54 54 }, 55 55 }, 56 56 } 57 57 } 58 58 59 59 - func postRecieve(ctx context.Context, cmd *cli.Command) error { 59 59 + func postReceive(ctx context.Context, cmd *cli.Command) error { 60 60 gitDir := cmd.String("git-dir") 61 61 userDid := cmd.String("user-did") 62 62 userHandle := cmd.String("user-handle")

+1 -1

hook/setup.go

··· 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 141 141 + %s hook -git-dir "$GIT_DIR" -user-did "$GIT_USER_DID" -user-handle "$GIT_USER_HANDLE" -internal-api "%s" "${push_options[@]}" post-receive 142 142 `, executablePath, config.internalApi) 143 143 144 144 return os.WriteFile(hookPath, []byte(hookContent), 0755)

+1 -1

input.css

··· 162 162 } 163 163 164 164 .prose a.mention { 165 165 - @apply no-underline hover:underline; 165 165 + @apply no-underline hover:underline font-bold; 166 166 } 167 167 168 168 .prose li {

+15 -4

jetstream/jetstream.go

··· 72 72 // existing instances of the closure when j.WantedDids is mutated 73 73 return func(ctx context.Context, evt *models.Event) error { 74 74 75 75 + j.mu.RLock() 75 76 // empty filter => all dids allowed 76 76 - if len(j.wantedDids) == 0 { 77 77 - return processFunc(ctx, evt) 77 77 + matches := len(j.wantedDids) == 0 78 78 + if !matches { 79 79 + if _, ok := j.wantedDids[evt.Did]; ok { 80 80 + matches = true 81 81 + } 78 82 } 83 83 + j.mu.RUnlock() 79 84 80 80 - if _, ok := j.wantedDids[evt.Did]; ok { 85 85 + if matches { 81 86 return processFunc(ctx, evt) 82 87 } else { 83 88 return nil ··· 122 127 123 128 go func() { 124 129 if j.waitForDid { 125 125 - for len(j.wantedDids) == 0 { 130 130 + for { 131 131 + j.mu.RLock() 132 132 + hasDid := len(j.wantedDids) != 0 133 133 + j.mu.RUnlock() 134 134 + if hasDid { 135 135 + break 136 136 + } 126 137 time.Sleep(time.Second) 127 138 } 128 139 }

+81

knotserver/db/db.go

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "log/slog" 7 7 + "strings" 8 8 + 9 9 + _ "github.com/mattn/go-sqlite3" 10 10 + "tangled.org/core/log" 11 11 + ) 12 12 + 13 13 + type DB struct { 14 14 + db *sql.DB 15 15 + logger *slog.Logger 16 16 + } 17 17 + 18 18 + func Setup(ctx context.Context, dbPath string) (*DB, error) { 19 19 + // https://github.com/mattn/go-sqlite3#connection-string 20 20 + opts := []string{ 21 21 + "_foreign_keys=1", 22 22 + "_journal_mode=WAL", 23 23 + "_synchronous=NORMAL", 24 24 + "_auto_vacuum=incremental", 25 25 + } 26 26 + 27 27 + logger := log.FromContext(ctx) 28 28 + logger = log.SubLogger(logger, "db") 29 29 + 30 30 + db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&")) 31 31 + if err != nil { 32 32 + return nil, err 33 33 + } 34 34 + 35 35 + conn, err := db.Conn(ctx) 36 36 + if err != nil { 37 37 + return nil, err 38 38 + } 39 39 + defer conn.Close() 40 40 + 41 41 + _, err = conn.ExecContext(ctx, ` 42 42 + create table if not exists known_dids ( 43 43 + did text primary key 44 44 + ); 45 45 + 46 46 + create table if not exists public_keys ( 47 47 + id integer primary key autoincrement, 48 48 + did text not null, 49 49 + key text not null, 50 50 + created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 51 51 + unique(did, key), 52 52 + foreign key (did) references known_dids(did) on delete cascade 53 53 + ); 54 54 + 55 55 + create table if not exists _jetstream ( 56 56 + id integer primary key autoincrement, 57 57 + last_time_us integer not null 58 58 + ); 59 59 + 60 60 + create table if not exists events ( 61 61 + rkey text not null, 62 62 + nsid text not null, 63 63 + event text not null, -- json 64 64 + created integer not null default (strftime('%s', 'now')), 65 65 + primary key (rkey, nsid) 66 66 + ); 67 67 + 68 68 + create table if not exists migrations ( 69 69 + id integer primary key autoincrement, 70 70 + name text unique 71 71 + ); 72 72 + `) 73 73 + if err != nil { 74 74 + return nil, err 75 75 + } 76 76 + 77 77 + return &DB{ 78 78 + db: db, 79 79 + logger: logger, 80 80 + }, nil 81 81 + }

-64

knotserver/db/init.go

··· 1 1 - package db 2 2 - 3 3 - import ( 4 4 - "database/sql" 5 5 - "strings" 6 6 - 7 7 - _ "github.com/mattn/go-sqlite3" 8 8 - ) 9 9 - 10 10 - type DB struct { 11 11 - db *sql.DB 12 12 - } 13 13 - 14 14 - func Setup(dbPath string) (*DB, error) { 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, "&")) 24 24 - if err != nil { 25 25 - return nil, err 26 26 - } 27 27 - 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. 31 31 - 32 32 - _, err = db.Exec(` 33 33 - create table if not exists known_dids ( 34 34 - did text primary key 35 35 - ); 36 36 - 37 37 - create table if not exists public_keys ( 38 38 - id integer primary key autoincrement, 39 39 - did text not null, 40 40 - key text not null, 41 41 - created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 42 42 - unique(did, key), 43 43 - foreign key (did) references known_dids(did) on delete cascade 44 44 - ); 45 45 - 46 46 - create table if not exists _jetstream ( 47 47 - id integer primary key autoincrement, 48 48 - last_time_us integer not null 49 49 - ); 50 50 - 51 51 - create table if not exists events ( 52 52 - rkey text not null, 53 53 - nsid text not null, 54 54 - event text not null, -- json 55 55 - created integer not null default (strftime('%s', 'now')), 56 56 - primary key (rkey, nsid) 57 57 - ); 58 58 - `) 59 59 - if err != nil { 60 60 - return nil, err 61 61 - } 62 62 - 63 63 - return &DB{db: db}, nil 64 64 - }

+1 -17

knotserver/git/diff.go

··· 77 77 nd.Diff = append(nd.Diff, ndiff) 78 78 } 79 79 80 80 - nd.Stat.FilesChanged = len(diffs) 81 81 - nd.Commit.This = c.Hash.String() 82 82 - nd.Commit.PGPSignature = c.PGPSignature 83 83 - nd.Commit.Committer = c.Committer 84 84 - nd.Commit.Tree = c.TreeHash.String() 85 85 - 86 86 - if parent.Hash.IsZero() { 87 87 - nd.Commit.Parent = "" 88 88 - } else { 89 89 - nd.Commit.Parent = parent.Hash.String() 90 90 - } 91 91 - nd.Commit.Author = c.Author 92 92 - nd.Commit.Message = c.Message 93 93 - 94 94 - if v, ok := c.ExtraHeaders["change-id"]; ok { 95 95 - nd.Commit.ChangedId = string(v) 96 96 - } 80 80 + nd.Commit.FromGoGitCommit(c) 97 81 98 82 return &nd, nil 99 83 }

+13 -1

knotserver/git/service/service.go

··· 95 95 return c.RunService(cmd) 96 96 } 97 97 98 98 + func (c *ServiceCommand) UploadArchive() error { 99 99 + cmd := exec.Command("git", []string{ 100 100 + "upload-archive", 101 101 + ".", 102 102 + }...) 103 103 + 104 104 + cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true} 105 105 + cmd.Env = append(cmd.Env, fmt.Sprintf("GIT_PROTOCOL=%s", c.GitProtocol)) 106 106 + cmd.Dir = c.Dir 107 107 + 108 108 + return c.RunService(cmd) 109 109 + } 110 110 + 98 111 func (c *ServiceCommand) UploadPack() error { 99 112 cmd := exec.Command("git", []string{ 100 100 - "-c", "uploadpack.allowFilter=true", 101 113 "upload-pack", 102 114 "--stateless-rpc", 103 115 ".",

+47

knotserver/git.go

··· 56 56 } 57 57 } 58 58 59 59 + func (h *Knot) UploadArchive(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(h.c.Repo.ScanPath, filepath.Join(did, name)) 63 63 + if err != nil { 64 64 + gitError(w, err.Error(), http.StatusInternalServerError) 65 65 + h.l.Error("git: failed to secure join repo path", "handler", "UploadPack", "error", err) 66 66 + return 67 67 + } 68 68 + 69 69 + const expectedContentType = "application/x-git-upload-archive-request" 70 70 + contentType := r.Header.Get("Content-Type") 71 71 + if contentType != expectedContentType { 72 72 + gitError(w, fmt.Sprintf("Expected Content-Type: '%s', but received '%s'.", expectedContentType, contentType), http.StatusUnsupportedMediaType) 73 73 + } 74 74 + 75 75 + var bodyReader io.ReadCloser = r.Body 76 76 + if r.Header.Get("Content-Encoding") == "gzip" { 77 77 + gzipReader, err := gzip.NewReader(r.Body) 78 78 + if err != nil { 79 79 + gitError(w, err.Error(), http.StatusInternalServerError) 80 80 + h.l.Error("git: failed to create gzip reader", "handler", "UploadArchive", "error", err) 81 81 + return 82 82 + } 83 83 + defer gzipReader.Close() 84 84 + bodyReader = gzipReader 85 85 + } 86 86 + 87 87 + w.Header().Set("Content-Type", "application/x-git-upload-archive-result") 88 88 + 89 89 + h.l.Info("git: executing git-upload-archive", "handler", "UploadArchive", "repo", repo) 90 90 + 91 91 + cmd := service.ServiceCommand{ 92 92 + GitProtocol: r.Header.Get("Git-Protocol"), 93 93 + Dir: repo, 94 94 + Stdout: w, 95 95 + Stdin: bodyReader, 96 96 + } 97 97 + 98 98 + w.WriteHeader(http.StatusOK) 99 99 + 100 100 + if err := cmd.UploadArchive(); err != nil { 101 101 + h.l.Error("git: failed to execute git-upload-pack", "handler", "UploadPack", "error", err) 102 102 + return 103 103 + } 104 104 + } 105 105 + 59 106 func (h *Knot) UploadPack(w http.ResponseWriter, r *http.Request) { 60 107 did := chi.URLParam(r, "did") 61 108 name := chi.URLParam(r, "name")

-136

knotserver/ingester.go

··· 7 7 "io" 8 8 "net/http" 9 9 "net/url" 10 10 - "path/filepath" 11 10 "strings" 12 11 13 12 comatproto "github.com/bluesky-social/indigo/api/atproto" ··· 17 16 securejoin "github.com/cyphar/filepath-securejoin" 18 17 "tangled.org/core/api/tangled" 19 18 "tangled.org/core/knotserver/db" 20 20 - "tangled.org/core/knotserver/git" 21 19 "tangled.org/core/log" 22 20 "tangled.org/core/rbac" 23 23 - "tangled.org/core/workflow" 24 21 ) 25 22 26 23 func (h *Knot) processPublicKey(ctx context.Context, event *models.Event) error { ··· 85 82 return nil 86 83 } 87 84 88 88 - func (h *Knot) processPull(ctx context.Context, event *models.Event) error { 89 89 - raw := json.RawMessage(event.Commit.Record) 90 90 - did := event.Did 91 91 - 92 92 - var record tangled.RepoPull 93 93 - if err := json.Unmarshal(raw, &record); err != nil { 94 94 - return fmt.Errorf("failed to unmarshal record: %w", err) 95 95 - } 96 96 - 97 97 - l := log.FromContext(ctx) 98 98 - l = l.With("handler", "processPull") 99 99 - l = l.With("did", did) 100 100 - 101 101 - if record.Target == nil { 102 102 - return fmt.Errorf("ignoring pull record: target repo is nil") 103 103 - } 104 104 - 105 105 - l = l.With("target_repo", record.Target.Repo) 106 106 - l = l.With("target_branch", record.Target.Branch) 107 107 - 108 108 - if record.Source == nil { 109 109 - return fmt.Errorf("ignoring pull record: not a branch-based pull request") 110 110 - } 111 111 - 112 112 - if record.Source.Repo != nil { 113 113 - return fmt.Errorf("ignoring pull record: fork based pull") 114 114 - } 115 115 - 116 116 - repoAt, err := syntax.ParseATURI(record.Target.Repo) 117 117 - if err != nil { 118 118 - return fmt.Errorf("failed to parse ATURI: %w", err) 119 119 - } 120 120 - 121 121 - // resolve this aturi to extract the repo record 122 122 - ident, err := h.resolver.ResolveIdent(ctx, repoAt.Authority().String()) 123 123 - if err != nil || ident.Handle.IsInvalidHandle() { 124 124 - return fmt.Errorf("failed to resolve handle: %w", err) 125 125 - } 126 126 - 127 127 - xrpcc := xrpc.Client{ 128 128 - Host: ident.PDSEndpoint(), 129 129 - } 130 130 - 131 131 - resp, err := comatproto.RepoGetRecord(ctx, &xrpcc, "", tangled.RepoNSID, repoAt.Authority().String(), repoAt.RecordKey().String()) 132 132 - if err != nil { 133 133 - return fmt.Errorf("failed to resolver repo: %w", err) 134 134 - } 135 135 - 136 136 - repo := resp.Value.Val.(*tangled.Repo) 137 137 - 138 138 - if repo.Knot != h.c.Server.Hostname { 139 139 - return fmt.Errorf("rejected pull record: not this knot, %s != %s", repo.Knot, h.c.Server.Hostname) 140 140 - } 141 141 - 142 142 - didSlashRepo, err := securejoin.SecureJoin(ident.DID.String(), repo.Name) 143 143 - if err != nil { 144 144 - return fmt.Errorf("failed to construct relative repo path: %w", err) 145 145 - } 146 146 - 147 147 - repoPath, err := securejoin.SecureJoin(h.c.Repo.ScanPath, didSlashRepo) 148 148 - if err != nil { 149 149 - return fmt.Errorf("failed to construct absolute repo path: %w", err) 150 150 - } 151 151 - 152 152 - gr, err := git.Open(repoPath, record.Source.Sha) 153 153 - if err != nil { 154 154 - return fmt.Errorf("failed to open git repository: %w", err) 155 155 - } 156 156 - 157 157 - workflowDir, err := gr.FileTree(ctx, workflow.WorkflowDir) 158 158 - if err != nil { 159 159 - return fmt.Errorf("failed to open workflow directory: %w", err) 160 160 - } 161 161 - 162 162 - var pipeline workflow.RawPipeline 163 163 - for _, e := range workflowDir { 164 164 - if !e.IsFile() { 165 165 - continue 166 166 - } 167 167 - 168 168 - fpath := filepath.Join(workflow.WorkflowDir, e.Name) 169 169 - contents, err := gr.RawContent(fpath) 170 170 - if err != nil { 171 171 - continue 172 172 - } 173 173 - 174 174 - pipeline = append(pipeline, workflow.RawWorkflow{ 175 175 - Name: e.Name, 176 176 - Contents: contents, 177 177 - }) 178 178 - } 179 179 - 180 180 - trigger := tangled.Pipeline_PullRequestTriggerData{ 181 181 - Action: "create", 182 182 - SourceBranch: record.Source.Branch, 183 183 - SourceSha: record.Source.Sha, 184 184 - TargetBranch: record.Target.Branch, 185 185 - } 186 186 - 187 187 - compiler := workflow.Compiler{ 188 188 - Trigger: tangled.Pipeline_TriggerMetadata{ 189 189 - Kind: string(workflow.TriggerKindPullRequest), 190 190 - PullRequest: &trigger, 191 191 - Repo: &tangled.Pipeline_TriggerRepo{ 192 192 - Did: ident.DID.String(), 193 193 - Knot: repo.Knot, 194 194 - Repo: repo.Name, 195 195 - }, 196 196 - }, 197 197 - } 198 198 - 199 199 - cp := compiler.Compile(compiler.Parse(pipeline)) 200 200 - eventJson, err := json.Marshal(cp) 201 201 - if err != nil { 202 202 - return fmt.Errorf("failed to marshal pipeline event: %w", err) 203 203 - } 204 204 - 205 205 - // do not run empty pipelines 206 206 - if cp.Workflows == nil { 207 207 - return nil 208 208 - } 209 209 - 210 210 - ev := db.Event{ 211 211 - Rkey: TID(), 212 212 - Nsid: tangled.PipelineNSID, 213 213 - EventJson: string(eventJson), 214 214 - } 215 215 - 216 216 - return h.db.InsertEvent(ev, h.n) 217 217 - } 218 218 - 219 85 // duplicated from add collaborator 220 86 func (h *Knot) processCollaborator(ctx context.Context, event *models.Event) error { 221 87 raw := json.RawMessage(event.Commit.Record) ··· 338 204 err = h.processPublicKey(ctx, event) 339 205 case tangled.KnotMemberNSID: 340 206 err = h.processKnotMember(ctx, event) 341 341 - case tangled.RepoPullNSID: 342 342 - err = h.processPull(ctx, event) 343 207 case tangled.RepoCollaboratorNSID: 344 208 err = h.processCollaborator(ctx, event) 345 209 }

+1 -109

knotserver/internal.go

··· 23 23 "tangled.org/core/log" 24 24 "tangled.org/core/notifier" 25 25 "tangled.org/core/rbac" 26 26 - "tangled.org/core/workflow" 27 26 ) 28 27 29 28 type InternalHandle struct { ··· 176 175 } 177 176 178 177 for _, line := range lines { 178 178 + // TODO: pass pushOptions to refUpdate 179 179 err := h.insertRefUpdate(line, gitUserDid, repoDid, repoName) 180 180 if err != nil { 181 181 l.Error("failed to insert op", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir) ··· 185 185 err = h.emitCompareLink(&resp.Messages, line, repoDid, repoName) 186 186 if err != nil { 187 187 l.Error("failed to reply with compare link", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir) 188 188 - // non-fatal 189 189 - } 190 190 - 191 191 - err = h.triggerPipeline(&resp.Messages, line, gitUserDid, repoDid, repoName, pushOptions) 192 192 - if err != nil { 193 193 - l.Error("failed to trigger pipeline", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir) 194 188 // non-fatal 195 189 } 196 190 } ··· 241 235 } 242 236 243 237 return errors.Join(errs, h.db.InsertEvent(event, h.n)) 244 244 - } 245 245 - 246 246 - func (h *InternalHandle) triggerPipeline( 247 247 - clientMsgs *[]string, 248 248 - line git.PostReceiveLine, 249 249 - gitUserDid string, 250 250 - repoDid string, 251 251 - repoName string, 252 252 - pushOptions PushOptions, 253 253 - ) error { 254 254 - if pushOptions.skipCi { 255 255 - return nil 256 256 - } 257 257 - 258 258 - didSlashRepo, err := securejoin.SecureJoin(repoDid, repoName) 259 259 - if err != nil { 260 260 - return err 261 261 - } 262 262 - 263 263 - repoPath, err := securejoin.SecureJoin(h.c.Repo.ScanPath, didSlashRepo) 264 264 - if err != nil { 265 265 - return err 266 266 - } 267 267 - 268 268 - gr, err := git.Open(repoPath, line.Ref) 269 269 - if err != nil { 270 270 - return err 271 271 - } 272 272 - 273 273 - workflowDir, err := gr.FileTree(context.Background(), workflow.WorkflowDir) 274 274 - if err != nil { 275 275 - return err 276 276 - } 277 277 - 278 278 - var pipeline workflow.RawPipeline 279 279 - for _, e := range workflowDir { 280 280 - if !e.IsFile() { 281 281 - continue 282 282 - } 283 283 - 284 284 - fpath := filepath.Join(workflow.WorkflowDir, e.Name) 285 285 - contents, err := gr.RawContent(fpath) 286 286 - if err != nil { 287 287 - continue 288 288 - } 289 289 - 290 290 - pipeline = append(pipeline, workflow.RawWorkflow{ 291 291 - Name: e.Name, 292 292 - Contents: contents, 293 293 - }) 294 294 - } 295 295 - 296 296 - trigger := tangled.Pipeline_PushTriggerData{ 297 297 - Ref: line.Ref, 298 298 - OldSha: line.OldSha.String(), 299 299 - NewSha: line.NewSha.String(), 300 300 - } 301 301 - 302 302 - compiler := workflow.Compiler{ 303 303 - Trigger: tangled.Pipeline_TriggerMetadata{ 304 304 - Kind: string(workflow.TriggerKindPush), 305 305 - Push: &trigger, 306 306 - Repo: &tangled.Pipeline_TriggerRepo{ 307 307 - Did: repoDid, 308 308 - Knot: h.c.Server.Hostname, 309 309 - Repo: repoName, 310 310 - }, 311 311 - }, 312 312 - } 313 313 - 314 314 - cp := compiler.Compile(compiler.Parse(pipeline)) 315 315 - eventJson, err := json.Marshal(cp) 316 316 - if err != nil { 317 317 - return err 318 318 - } 319 319 - 320 320 - for _, e := range compiler.Diagnostics.Errors { 321 321 - *clientMsgs = append(*clientMsgs, e.String()) 322 322 - } 323 323 - 324 324 - if pushOptions.verboseCi { 325 325 - if compiler.Diagnostics.IsEmpty() { 326 326 - *clientMsgs = append(*clientMsgs, "success: pipeline compiled with no diagnostics") 327 327 - } 328 328 - 329 329 - for _, w := range compiler.Diagnostics.Warnings { 330 330 - *clientMsgs = append(*clientMsgs, w.String()) 331 331 - } 332 332 - } 333 333 - 334 334 - // do not run empty pipelines 335 335 - if cp.Workflows == nil { 336 336 - return nil 337 337 - } 338 338 - 339 339 - event := db.Event{ 340 340 - Rkey: TID(), 341 341 - Nsid: tangled.PipelineNSID, 342 342 - EventJson: string(eventJson), 343 343 - } 344 344 - 345 345 - return h.db.InsertEvent(event, h.n) 346 238 } 347 239 348 240 func (h *InternalHandle) emitCompareLink(

+1

knotserver/router.go

··· 82 82 r.Route("/{name}", func(r chi.Router) { 83 83 // routes for git operations 84 84 r.Get("/info/refs", h.InfoRefs) 85 85 + r.Post("/git-upload-archive", h.UploadArchive) 85 86 r.Post("/git-upload-pack", h.UploadPack) 86 87 r.Post("/git-receive-pack", h.ReceivePack) 87 88 })

+1 -2

knotserver/server.go

··· 64 64 logger.Info("running in dev mode, signature verification is disabled") 65 65 } 66 66 67 67 - db, err := db.Setup(c.Server.DBPath) 67 67 + db, err := db.Setup(ctx, c.Server.DBPath) 68 68 if err != nil { 69 69 return fmt.Errorf("failed to load db: %w", err) 70 70 } ··· 79 79 jc, err := jetstream.NewJetstreamClient(c.Server.JetstreamEndpoint, "knotserver", []string{ 80 80 tangled.PublicKeyNSID, 81 81 tangled.KnotMemberNSID, 82 82 - tangled.RepoPullNSID, 83 82 tangled.RepoCollaboratorNSID, 84 83 }, nil, log.SubLogger(logger, "jetstream"), db, true, c.Server.LogDids) 85 84 if err != nil {

+6 -1

knotserver/xrpc/repo_log.go

··· 62 62 return 63 63 } 64 64 65 65 + tcommits := make([]types.Commit, len(commits)) 66 66 + for i, c := range commits { 67 67 + tcommits[i].FromGoGitCommit(c) 68 68 + } 69 69 + 65 70 // Create response using existing types.RepoLogResponse 66 71 response := types.RepoLogResponse{ 67 67 - Commits: commits, 72 72 + Commits: tcommits, 68 73 Ref: ref, 69 74 Page: (offset / limit) + 1, 70 75 PerPage: limit,

+14

lexicons/issue/comment.json

··· 29 29 "replyTo": { 30 30 "type": "string", 31 31 "format": "at-uri" 32 32 + }, 33 33 + "mentions": { 34 34 + "type": "array", 35 35 + "items": { 36 36 + "type": "string", 37 37 + "format": "did" 38 38 + } 39 39 + }, 40 40 + "references": { 41 41 + "type": "array", 42 42 + "items": { 43 43 + "type": "string", 44 44 + "format": "at-uri" 45 45 + } 32 46 } 33 47 } 34 48 }

+14

lexicons/issue/issue.json

··· 24 24 "createdAt": { 25 25 "type": "string", 26 26 "format": "datetime" 27 27 + }, 28 28 + "mentions": { 29 29 + "type": "array", 30 30 + "items": { 31 31 + "type": "string", 32 32 + "format": "did" 33 33 + } 34 34 + }, 35 35 + "references": { 36 36 + "type": "array", 37 37 + "items": { 38 38 + "type": "string", 39 39 + "format": "at-uri" 40 40 + } 27 41 } 28 42 } 29 43 }

+33

lexicons/pipeline/cancelPipeline.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.pipeline.cancelPipeline", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Cancel a running pipeline", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": ["repo", "pipeline", "workflow"], 13 13 + "properties": { 14 14 + "repo": { 15 15 + "type": "string", 16 16 + "format": "at-uri", 17 17 + "description": "repo at-uri, spindle can't resolve repo from pipeline at-uri yet" 18 18 + }, 19 19 + "pipeline": { 20 20 + "type": "string", 21 21 + "format": "at-uri", 22 22 + "description": "pipeline at-uri" 23 23 + }, 24 24 + "workflow": { 25 25 + "type": "string", 26 26 + "description": "workflow name" 27 27 + } 28 28 + } 29 29 + } 30 30 + } 31 31 + } 32 32 + } 33 33 + }

+14

lexicons/pulls/comment.json

··· 25 25 "createdAt": { 26 26 "type": "string", 27 27 "format": "datetime" 28 28 + }, 29 29 + "mentions": { 30 30 + "type": "array", 31 31 + "items": { 32 32 + "type": "string", 33 33 + "format": "did" 34 34 + } 35 35 + }, 36 36 + "references": { 37 37 + "type": "array", 38 38 + "items": { 39 39 + "type": "string", 40 40 + "format": "at-uri" 41 41 + } 28 42 } 29 43 } 30 44 }

+14

lexicons/pulls/pull.json

··· 36 36 "createdAt": { 37 37 "type": "string", 38 38 "format": "datetime" 39 39 + }, 40 40 + "mentions": { 41 41 + "type": "array", 42 42 + "items": { 43 43 + "type": "string", 44 44 + "format": "did" 45 45 + } 46 46 + }, 47 47 + "references": { 48 48 + "type": "array", 49 49 + "items": { 50 50 + "type": "string", 51 51 + "format": "at-uri" 52 52 + } 39 53 } 40 54 } 41 55 }

+6 -30

nix/gomod2nix.toml

··· 165 165 [mod."github.com/davecgh/go-spew"] 166 166 version = "v1.1.2-0.20180830191138-d8f796af33cc" 167 167 hash = "sha256-fV9oI51xjHdOmEx6+dlq7Ku2Ag+m/bmbzPo6A4Y74qc=" 168 168 - [mod."github.com/decred/dcrd/dcrec/secp256k1/v4"] 169 169 - version = "v4.4.0" 170 170 - hash = "sha256-qrhEIwhDll3cxoVpMbm1NQ9/HTI42S7ms8Buzlo5HCg=" 171 168 [mod."github.com/dgraph-io/ristretto"] 172 169 version = "v0.2.0" 173 170 hash = "sha256-bnpxX+oO/Qf7IJevA0gsbloVoqRx+5bh7RQ9d9eLNYw=" ··· 307 304 [mod."github.com/hashicorp/go-sockaddr"] 308 305 version = "v1.0.7" 309 306 hash = "sha256-p6eDOrGzN1jMmT/F/f/VJMq0cKNFhUcEuVVwTE6vSrs=" 307 307 + [mod."github.com/hashicorp/go-version"] 308 308 + version = "v1.8.0" 309 309 + hash = "sha256-KXtqERmYrWdpqPCViWcHbe6jnuH7k16bvBIcuJuevj8=" 310 310 [mod."github.com/hashicorp/golang-lru"] 311 311 version = "v1.0.2" 312 312 hash = "sha256-yy+5botc6T5wXgOe2mfNXJP3wr+MkVlUZ2JBkmmrA48=" ··· 373 373 [mod."github.com/klauspost/cpuid/v2"] 374 374 version = "v2.3.0" 375 375 hash = "sha256-50JhbQyT67BK38HIdJihPtjV7orYp96HknI2VP7A9Yc=" 376 376 - [mod."github.com/lestrrat-go/blackmagic"] 377 377 - version = "v1.0.4" 378 378 - hash = "sha256-HmWOpwoPDNMwLdOi7onNn3Sb+ZsAa3Ai3gVBbXmQ0e8=" 379 379 - [mod."github.com/lestrrat-go/httpcc"] 380 380 - version = "v1.0.1" 381 381 - hash = "sha256-SMRSwJpqDIs/xL0l2e8vP0W65qtCHX2wigcOeqPJmos=" 382 382 - [mod."github.com/lestrrat-go/httprc"] 383 383 - version = "v1.0.6" 384 384 - hash = "sha256-mfZzePEhrmyyu/avEBd2MsDXyto8dq5+fyu5lA8GUWM=" 385 385 - [mod."github.com/lestrrat-go/iter"] 386 386 - version = "v1.0.2" 387 387 - hash = "sha256-30tErRf7Qu/NOAt1YURXY/XJSA6sCr6hYQfO8QqHrtw=" 388 388 - [mod."github.com/lestrrat-go/jwx/v2"] 389 389 - version = "v2.1.6" 390 390 - hash = "sha256-0LszXRZIba+X8AOrs3T4uanAUafBdlVB8/MpUNEFpbc=" 391 391 - [mod."github.com/lestrrat-go/option"] 392 392 - version = "v1.0.1" 393 393 - hash = "sha256-jVcIYYVsxElIS/l2akEw32vdEPR8+anR6oeT1FoYULI=" 394 376 [mod."github.com/lucasb-eyer/go-colorful"] 395 377 version = "v1.2.0" 396 378 hash = "sha256-Gg9dDJFCTaHrKHRR1SrJgZ8fWieJkybljybkI9x0gyE=" ··· 511 493 [mod."github.com/ryanuber/go-glob"] 512 494 version = "v1.0.0" 513 495 hash = "sha256-YkMl1utwUhi3E0sHK23ISpAsPyj4+KeXyXKoFYGXGVY=" 514 514 - [mod."github.com/segmentio/asm"] 515 515 - version = "v1.2.0" 516 516 - hash = "sha256-zbNuKxNrUDUc6IlmRQNuJQzVe5Ol/mqp7srDg9IMMqs=" 517 496 [mod."github.com/sergi/go-diff"] 518 497 version = "v1.1.0" 519 498 hash = "sha256-8NJMabldpf40uwQN20T6QXx5KORDibCBJL02KD661xY=" ··· 548 527 [mod."github.com/whyrusleeping/cbor-gen"] 549 528 version = "v0.3.1" 550 529 hash = "sha256-PAd8M2Z8t6rVRBII+Rg8Bz+QaJIwbW64bfyqsv31kgc=" 551 551 - [mod."github.com/wyatt915/goldmark-treeblood"] 552 552 - version = "v0.0.1" 553 553 - hash = "sha256-hAVFaktO02MiiqZFffr8ZlvFEfwxw4Y84OZ2t7e5G7g=" 554 554 - [mod."github.com/wyatt915/treeblood"] 555 555 - version = "v0.1.16" 556 556 - hash = "sha256-T68sa+iVx0qY7dDjXEAJvRWQEGXYIpUsf9tcWwO1tIw=" 557 530 [mod."github.com/xo/terminfo"] 558 531 version = "v0.0.0-20220910002029-abceb7e1c41e" 559 532 hash = "sha256-GyCDxxMQhXA3Pi/TsWXpA8cX5akEoZV7CFx4RO3rARU=" 560 533 [mod."github.com/yuin/goldmark"] 561 534 version = "v1.7.13" 562 535 hash = "sha256-vBCxZrPYPc8x/nvAAv3Au59dCCyfS80Vw3/a9EXK7TE=" 536 536 + [mod."github.com/yuin/goldmark-emoji"] 537 537 + version = "v1.0.6" 538 538 + hash = "sha256-+d6bZzOPE+JSFsZbQNZMCWE+n3jgcQnkPETVk47mxSY=" 563 539 [mod."github.com/yuin/goldmark-highlighting/v2"] 564 540 version = "v2.0.0-20230729083705-37449abec8cc" 565 541 hash = "sha256-HpiwU7jIeDUAg2zOpTIiviQir8dpRPuXYh2nqFFccpg="

+64

nix/modules/bluesky-jetstream.nix

··· 1 1 + { 2 2 + config, 3 3 + pkgs, 4 4 + lib, 5 5 + ... 6 6 + }: let 7 7 + cfg = config.services.bluesky-jetstream; 8 8 + in 9 9 + with lib; { 10 10 + options.services.bluesky-jetstream = { 11 11 + enable = mkEnableOption "jetstream server"; 12 12 + package = mkPackageOption pkgs "bluesky-jetstream" {}; 13 13 + 14 14 + # dataDir = mkOption { 15 15 + # type = types.str; 16 16 + # default = "/var/lib/jetstream"; 17 17 + # description = "directory to store data (pebbleDB)"; 18 18 + # }; 19 19 + livenessTtl = mkOption { 20 20 + type = types.int; 21 21 + default = 15; 22 22 + description = "time to restart when no event detected (seconds)"; 23 23 + }; 24 24 + websocketUrl = mkOption { 25 25 + type = types.str; 26 26 + default = "wss://bsky.network/xrpc/com.atproto.sync.subscribeRepos"; 27 27 + description = "full websocket path to the ATProto SubscribeRepos XRPC endpoint"; 28 28 + }; 29 29 + }; 30 30 + config = mkIf cfg.enable { 31 31 + systemd.services.bluesky-jetstream = { 32 32 + description = "bluesky jetstream"; 33 33 + after = ["network.target" "pds.service"]; 34 34 + wantedBy = ["multi-user.target"]; 35 35 + 36 36 + serviceConfig = { 37 37 + User = "jetstream"; 38 38 + Group = "jetstream"; 39 39 + StateDirectory = "jetstream"; 40 40 + StateDirectoryMode = "0755"; 41 41 + # preStart = '' 42 42 + # mkdir -p "${cfg.dataDir}" 43 43 + # chown -R jetstream:jetstream "${cfg.dataDir}" 44 44 + # ''; 45 45 + # WorkingDirectory = cfg.dataDir; 46 46 + Environment = [ 47 47 + "JETSTREAM_DATA_DIR=/var/lib/jetstream/data" 48 48 + "JETSTREAM_LIVENESS_TTL=${toString cfg.livenessTtl}s" 49 49 + "JETSTREAM_WS_URL=${cfg.websocketUrl}" 50 50 + ]; 51 51 + ExecStart = getExe cfg.package; 52 52 + Restart = "always"; 53 53 + RestartSec = 5; 54 54 + }; 55 55 + }; 56 56 + users = { 57 57 + users.jetstream = { 58 58 + group = "jetstream"; 59 59 + isSystemUser = true; 60 60 + }; 61 61 + groups.jetstream = {}; 62 62 + }; 63 63 + }; 64 64 + }

+48

nix/modules/bluesky-relay.nix

··· 1 1 + { 2 2 + config, 3 3 + pkgs, 4 4 + lib, 5 5 + ... 6 6 + }: let 7 7 + cfg = config.services.bluesky-relay; 8 8 + in 9 9 + with lib; { 10 10 + options.services.bluesky-relay = { 11 11 + enable = mkEnableOption "relay server"; 12 12 + package = mkPackageOption pkgs "bluesky-relay" {}; 13 13 + }; 14 14 + config = mkIf cfg.enable { 15 15 + systemd.services.bluesky-relay = { 16 16 + description = "bluesky relay"; 17 17 + after = ["network.target" "pds.service"]; 18 18 + wantedBy = ["multi-user.target"]; 19 19 + 20 20 + serviceConfig = { 21 21 + User = "relay"; 22 22 + Group = "relay"; 23 23 + StateDirectory = "relay"; 24 24 + StateDirectoryMode = "0755"; 25 25 + Environment = [ 26 26 + "RELAY_ADMIN_PASSWORD=password" 27 27 + "RELAY_PLC_HOST=https://plc.tngl.boltless.dev" 28 28 + "DATABASE_URL=sqlite:///var/lib/relay/relay.sqlite" 29 29 + "RELAY_IP_BIND=:2470" 30 30 + "RELAY_PERSIST_DIR=/var/lib/relay" 31 31 + "RELAY_DISABLE_REQUEST_CRAWL=0" 32 32 + "RELAY_INITIAL_SEQ_NUMBER=1" 33 33 + "RELAY_ALLOW_INSECURE_HOSTS=1" 34 34 + ]; 35 35 + ExecStart = "${getExe cfg.package} serve"; 36 36 + Restart = "always"; 37 37 + RestartSec = 5; 38 38 + }; 39 39 + }; 40 40 + users = { 41 41 + users.relay = { 42 42 + group = "relay"; 43 43 + isSystemUser = true; 44 44 + }; 45 45 + groups.relay = {}; 46 46 + }; 47 47 + }; 48 48 + }

+76

nix/modules/did-method-plc.nix

··· 1 1 + { 2 2 + config, 3 3 + pkgs, 4 4 + lib, 5 5 + ... 6 6 + }: let 7 7 + cfg = config.services.did-method-plc; 8 8 + in 9 9 + with lib; { 10 10 + options.services.did-method-plc = { 11 11 + enable = mkEnableOption "did-method-plc server"; 12 12 + package = mkPackageOption pkgs "did-method-plc" {}; 13 13 + }; 14 14 + config = mkIf cfg.enable { 15 15 + services.postgresql = { 16 16 + enable = true; 17 17 + package = pkgs.postgresql_14; 18 18 + ensureDatabases = ["plc"]; 19 19 + ensureUsers = [ 20 20 + { 21 21 + name = "pg"; 22 22 + # ensurePermissions."DATABASE plc" = "ALL PRIVILEGES"; 23 23 + } 24 24 + ]; 25 25 + authentication = '' 26 26 + local all all trust 27 27 + host all all 127.0.0.1/32 trust 28 28 + ''; 29 29 + }; 30 30 + systemd.services.did-method-plc = { 31 31 + description = "did-method-plc"; 32 32 + 33 33 + after = ["postgresql.service"]; 34 34 + wants = ["postgresql.service"]; 35 35 + wantedBy = ["multi-user.target"]; 36 36 + 37 37 + environment = let 38 38 + db_creds_json = builtins.toJSON { 39 39 + username = "pg"; 40 40 + password = ""; 41 41 + host = "127.0.0.1"; 42 42 + port = 5432; 43 43 + }; 44 44 + in { 45 45 + # TODO: inherit from config 46 46 + DEBUG_MODE = "1"; 47 47 + LOG_ENABLED = "true"; 48 48 + LOG_LEVEL = "debug"; 49 49 + LOG_DESTINATION = "1"; 50 50 + ENABLE_MIGRATIONS = "true"; 51 51 + DB_CREDS_JSON = db_creds_json; 52 52 + DB_MIGRATE_CREDS_JSON = db_creds_json; 53 53 + PLC_VERSION = "0.0.1"; 54 54 + PORT = "8080"; 55 55 + }; 56 56 + 57 57 + serviceConfig = { 58 58 + ExecStart = getExe cfg.package; 59 59 + User = "plc"; 60 60 + Group = "plc"; 61 61 + StateDirectory = "plc"; 62 62 + StateDirectoryMode = "0755"; 63 63 + Restart = "always"; 64 64 + 65 65 + # Hardening 66 66 + }; 67 67 + }; 68 68 + users = { 69 69 + users.plc = { 70 70 + group = "plc"; 71 71 + isSystemUser = true; 72 72 + }; 73 73 + groups.plc = {}; 74 74 + }; 75 75 + }; 76 76 + }

+2

nix/modules/knot.nix

··· 195 195 Match User ${cfg.gitUser} 196 196 AuthorizedKeysCommand /etc/ssh/keyfetch_wrapper 197 197 AuthorizedKeysCommandUser nobody 198 198 + ChallengeResponseAuthentication no 199 199 + PasswordAuthentication no 198 200 ''; 199 201 }; 200 202

+46 -12

nix/modules/spindle.nix

··· 1 1 { 2 2 config, 3 3 + pkgs, 3 4 lib, 4 5 ... 5 6 }: let ··· 17 18 type = types.package; 18 19 description = "Package to use for the spindle"; 19 20 }; 21 21 + tap-package = mkOption { 22 22 + type = types.package; 23 23 + description = "Package to use for the spindle"; 24 24 + }; 25 25 + 26 26 + atpRelayUrl = mkOption { 27 27 + type = types.str; 28 28 + default = "https://relay1.us-east.bsky.network"; 29 29 + description = "atproto relay"; 30 30 + }; 20 31 21 32 server = { 22 33 listenAddr = mkOption { ··· 25 36 description = "Address to listen on"; 26 37 }; 27 38 28 28 - dbPath = mkOption { 39 39 + stateDir = mkOption { 29 40 type = types.path; 30 30 - default = "/var/lib/spindle/spindle.db"; 31 31 - description = "Path to the database file"; 41 41 + default = "/var/lib/spindle"; 42 42 + description = "Tangled spindle data directory"; 32 43 }; 33 44 34 45 hostname = mkOption { ··· 41 52 type = types.str; 42 53 default = "https://plc.directory"; 43 54 description = "atproto PLC directory"; 44 44 - }; 45 45 - 46 46 - jetstreamEndpoint = mkOption { 47 47 - type = types.str; 48 48 - default = "wss://jetstream1.us-west.bsky.network/subscribe"; 49 49 - description = "Jetstream endpoint to subscribe to"; 50 55 }; 51 56 52 57 dev = mkOption { ··· 114 119 config = mkIf cfg.enable { 115 120 virtualisation.docker.enable = true; 116 121 122 122 + systemd.services.spindle-tap = { 123 123 + description = "spindle tap service"; 124 124 + after = ["network.target" "docker.service"]; 125 125 + wantedBy = ["multi-user.target"]; 126 126 + serviceConfig = { 127 127 + LogsDirectory = "spindle-tap"; 128 128 + StateDirectory = "spindle-tap"; 129 129 + Environment = [ 130 130 + "TAP_BIND=:2480" 131 131 + "TAP_PLC_URL=${cfg.server.plcUrl}" 132 132 + "TAP_RELAY_URL=${cfg.atpRelayUrl}" 133 133 + "TAP_DATABASE_URL=sqlite:///var/lib/spindle-tap/tap.db" 134 134 + "TAP_RETRY_TIMEOUT=3s" 135 135 + "TAP_COLLECTION_FILTERS=${concatStringsSep "," [ 136 136 + "sh.tangled.repo" 137 137 + "sh.tangled.repo.collaborator" 138 138 + "sh.tangled.spindle.member" 139 139 + "sh.tangled.repo.pull" 140 140 + ]}" 141 141 + # temporary hack to listen for repo.pull from non-tangled users 142 142 + "TAP_SIGNAL_COLLECTION=sh.tangled.repo.pull" 143 143 + ]; 144 144 + ExecStart = "${getExe cfg.tap-package} run"; 145 145 + }; 146 146 + }; 147 147 + 117 148 systemd.services.spindle = { 118 149 description = "spindle service"; 119 119 - after = ["network.target" "docker.service"]; 150 150 + after = ["network.target" "docker.service" "spindle-tap.service"]; 120 151 wantedBy = ["multi-user.target"]; 152 152 + path = [ 153 153 + pkgs.git 154 154 + ]; 121 155 serviceConfig = { 122 156 LogsDirectory = "spindle"; 123 157 StateDirectory = "spindle"; 124 158 Environment = [ 125 159 "SPINDLE_SERVER_LISTEN_ADDR=${cfg.server.listenAddr}" 126 126 - "SPINDLE_SERVER_DB_PATH=${cfg.server.dbPath}" 160 160 + "SPINDLE_SERVER_DATA_DIR=${cfg.server.stateDir}" 127 161 "SPINDLE_SERVER_HOSTNAME=${cfg.server.hostname}" 128 162 "SPINDLE_SERVER_PLC_URL=${cfg.server.plcUrl}" 129 129 - "SPINDLE_SERVER_JETSTREAM_ENDPOINT=${cfg.server.jetstreamEndpoint}" 130 163 "SPINDLE_SERVER_DEV=${lib.boolToString cfg.server.dev}" 131 164 "SPINDLE_SERVER_OWNER=${cfg.server.owner}" 132 165 "SPINDLE_SERVER_MAX_JOB_COUNT=${toString cfg.server.maxJobCount}" ··· 134 167 "SPINDLE_SERVER_SECRETS_PROVIDER=${cfg.server.secrets.provider}" 135 168 "SPINDLE_SERVER_SECRETS_OPENBAO_PROXY_ADDR=${cfg.server.secrets.openbao.proxyAddr}" 136 169 "SPINDLE_SERVER_SECRETS_OPENBAO_MOUNT=${cfg.server.secrets.openbao.mount}" 170 170 + "SPINDLE_SERVER_TAP_URL=http://localhost:2480" 137 171 "SPINDLE_NIXERY_PIPELINES_NIXERY=${cfg.pipelines.nixery}" 138 172 "SPINDLE_NIXERY_PIPELINES_WORKFLOW_TIMEOUT=${cfg.pipelines.workflowTimeout}" 139 173 ];

+20

nix/pkgs/bluesky-jetstream.nix

··· 1 1 + { 2 2 + buildGoModule, 3 3 + fetchFromGitHub, 4 4 + }: 5 5 + buildGoModule { 6 6 + pname = "bluesky-jetstream"; 7 7 + version = "0.1.0"; 8 8 + src = fetchFromGitHub { 9 9 + owner = "bluesky-social"; 10 10 + repo = "jetstream"; 11 11 + rev = "7d7efa58d7f14101a80ccc4f1085953948b7d5de"; 12 12 + sha256 = "sha256-1e9SL/8gaDPMA4YZed51ffzgpkptbMd0VTbTTDbPTFw="; 13 13 + }; 14 14 + subPackages = ["cmd/jetstream"]; 15 15 + vendorHash = "sha256-/21XJQH6fo9uPzlABUAbdBwt1O90odmppH6gXu2wkiQ="; 16 16 + doCheck = false; 17 17 + meta = { 18 18 + mainProgram = "jetstream"; 19 19 + }; 20 20 + }

+20

nix/pkgs/bluesky-relay.nix

··· 1 1 + { 2 2 + buildGoModule, 3 3 + fetchFromGitHub, 4 4 + }: 5 5 + buildGoModule { 6 6 + pname = "bluesky-relay"; 7 7 + version = "0.1.0"; 8 8 + src = fetchFromGitHub { 9 9 + owner = "boltlessengineer"; 10 10 + repo = "indigo"; 11 11 + rev = "7fe70a304d795b998f354d2b7b2050b909709c99"; 12 12 + sha256 = "sha256-+h34x67cqH5t30+8rua53/ucvbn3BanrmH0Og3moHok="; 13 13 + }; 14 14 + subPackages = ["cmd/relay"]; 15 15 + vendorHash = "sha256-UOedwNYnM8Jx6B7Y9tFcZX8IeUBESAFAPTRYk7n0yo8="; 16 16 + doCheck = false; 17 17 + meta = { 18 18 + mainProgram = "relay"; 19 19 + }; 20 20 + }

+65

nix/pkgs/did-method-plc.nix

··· 1 1 + # inspired by https://github.com/NixOS/nixpkgs/blob/333bfb7c258fab089a834555ea1c435674c459b4/pkgs/by-name/ga/gatsby-cli/package.nix 2 2 + { 3 3 + lib, 4 4 + stdenv, 5 5 + fetchFromGitHub, 6 6 + fetchYarnDeps, 7 7 + yarnConfigHook, 8 8 + yarnBuildHook, 9 9 + nodejs, 10 10 + makeBinaryWrapper, 11 11 + }: 12 12 + stdenv.mkDerivation (finalAttrs: { 13 13 + pname = "did-method-plc"; 14 14 + version = "0.0.1"; 15 15 + 16 16 + src = fetchFromGitHub { 17 17 + owner = "did-method-plc"; 18 18 + repo = "did-method-plc"; 19 19 + rev = "158ba5535ac3da4fd4309954bde41deab0b45972"; 20 20 + sha256 = "sha256-O5smubbrnTDMCvL6iRyMXkddr5G7YHxkQRVMRULHanQ="; 21 21 + }; 22 22 + postPatch = '' 23 23 + # remove dd-trace dependency 24 24 + sed -i '3d' packages/server/service/index.js 25 25 + ''; 26 26 + 27 27 + yarnOfflineCache = fetchYarnDeps { 28 28 + yarnLock = finalAttrs.src + "/yarn.lock"; 29 29 + hash = "sha256-g8GzaAbWSnWwbQjJMV2DL5/ZlWCCX0sRkjjvX3tqU4Y="; 30 30 + }; 31 31 + 32 32 + nativeBuildInputs = [ 33 33 + yarnConfigHook 34 34 + yarnBuildHook 35 35 + nodejs 36 36 + makeBinaryWrapper 37 37 + ]; 38 38 + yarnBuildScript = "lerna"; 39 39 + yarnBuildFlags = [ 40 40 + "run" 41 41 + "build" 42 42 + "--scope" 43 43 + "@did-plc/server" 44 44 + "--include-dependencies" 45 45 + ]; 46 46 + 47 47 + installPhase = '' 48 48 + runHook preInstall 49 49 + 50 50 + mkdir -p $out/lib/node_modules/ 51 51 + mv packages/ $out/lib/packages/ 52 52 + mv node_modules/* $out/lib/node_modules/ 53 53 + 54 54 + makeWrapper ${lib.getExe nodejs} $out/bin/plc \ 55 55 + --add-flags $out/lib/packages/server/service/index.js \ 56 56 + --add-flags --enable-source-maps \ 57 57 + --set NODE_PATH $out/lib/node_modules 58 58 + 59 59 + runHook postInstall 60 60 + ''; 61 61 + 62 62 + meta = { 63 63 + mainProgram = "plc"; 64 64 + }; 65 65 + })

+41

nix/pkgs/docs.nix

··· 1 1 + { 2 2 + pandoc, 3 3 + tailwindcss, 4 4 + runCommandLocal, 5 5 + inter-fonts-src, 6 6 + ibm-plex-mono-src, 7 7 + lucide-src, 8 8 + src, 9 9 + }: 10 10 + runCommandLocal "docs" {} '' 11 11 + mkdir -p working 12 12 + 13 13 + # copy templates, themes, styles, filters to working directory 14 14 + cp ${src}/docs/*.html working/ 15 15 + cp ${src}/docs/*.theme working/ 16 16 + cp ${src}/docs/*.css working/ 17 17 + 18 18 + # icons 19 19 + cp -rf ${lucide-src}/*.svg working/ 20 20 + 21 21 + # content 22 22 + ${pandoc}/bin/pandoc ${src}/docs/DOCS.md \ 23 23 + -o $out/ \ 24 24 + -t chunkedhtml \ 25 25 + --variable toc \ 26 26 + --toc-depth=2 \ 27 27 + --css=stylesheet.css \ 28 28 + --chunk-template="%i.html" \ 29 29 + --highlight-style=working/highlight.theme \ 30 30 + --template=working/template.html 31 31 + 32 32 + # fonts 33 33 + mkdir -p $out/static/fonts 34 34 + cp -f ${inter-fonts-src}/web/InterVariable*.woff2 $out/static/fonts/ 35 35 + cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 $out/static/fonts/ 36 36 + cp -f ${inter-fonts-src}/InterVariable*.ttf $out/static/fonts/ 37 37 + cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono*.woff2 $out/static/fonts/ 38 38 + 39 39 + # styles 40 40 + cd ${src} && ${tailwindcss}/bin/tailwindcss -i input.css -o $out/stylesheet.css 41 41 + ''

+7 -5

nix/pkgs/sqlite-lib.nix

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

+20

nix/pkgs/tap.nix

··· 1 1 + { 2 2 + buildGoModule, 3 3 + fetchFromGitHub, 4 4 + }: 5 5 + buildGoModule { 6 6 + pname = "tap"; 7 7 + version = "0.1.0"; 8 8 + src = fetchFromGitHub { 9 9 + owner = "bluesky-social"; 10 10 + repo = "indigo"; 11 11 + rev = "498ecb9693e8ae050f73234c86f340f51ad896a9"; 12 12 + sha256 = "sha256-KASCdwkg/hlKBt7RTW3e3R5J3hqJkphoarFbaMgtN1k="; 13 13 + }; 14 14 + subPackages = ["cmd/tap"]; 15 15 + vendorHash = "sha256-UOedwNYnM8Jx6B7Y9tFcZX8IeUBESAFAPTRYk7n0yo8="; 16 16 + doCheck = false; 17 17 + meta = { 18 18 + mainProgram = "tap"; 19 19 + }; 20 20 + }

+9 -3

nix/vm.nix

··· 8 8 var = builtins.getEnv name; 9 9 in 10 10 if var == "" 11 11 - then throw "\$${name} must be defined, see docs/hacking.md for more details" 11 11 + then throw "\$${name} must be defined, see https://docs.tangled.org/hacking-on-tangled.html#hacking-on-tangled for more details" 12 12 else var; 13 13 envVarOr = name: default: let 14 14 var = builtins.getEnv name; ··· 19 19 20 20 plcUrl = envVarOr "TANGLED_VM_PLC_URL" "https://plc.directory"; 21 21 jetstream = envVarOr "TANGLED_VM_JETSTREAM_ENDPOINT" "wss://jetstream1.us-west.bsky.network/subscribe"; 22 22 + relayUrl = envVarOr "TANGLED_VM_RELAY_URL" "https://relay1.us-east.bsky.network"; 22 23 in 23 24 nixpkgs.lib.nixosSystem { 24 25 inherit system; ··· 57 58 host.port = 6555; 58 59 guest.port = 6555; 59 60 } 61 61 + { 62 62 + from = "host"; 63 63 + host.port = 6556; 64 64 + guest.port = 2480; 65 65 + } 60 66 ]; 61 67 sharedDirectories = { 62 68 # We can't use the 9p mounts directly for most of these ··· 95 101 }; 96 102 services.tangled.spindle = { 97 103 enable = true; 104 104 + atpRelayUrl = relayUrl; 98 105 server = { 99 106 owner = envVar "TANGLED_VM_SPINDLE_OWNER"; 100 107 hostname = envVarOr "TANGLED_VM_SPINDLE_HOST" "localhost:6555"; 101 108 plcUrl = plcUrl; 102 102 - jetstreamEndpoint = jetstream; 103 109 listenAddr = "0.0.0.0:6555"; 104 110 dev = true; 105 111 queueSize = 100; ··· 134 140 }; 135 141 in { 136 142 knot = mkDataSyncScripts "/mnt/knot-data" config.services.tangled.knot.stateDir; 137 137 - spindle = mkDataSyncScripts "/mnt/spindle-data" (builtins.dirOf config.services.tangled.spindle.server.dbPath); 143 143 + spindle = mkDataSyncScripts "/mnt/spindle-data" config.services.tangled.spindle.server.stateDir; 138 144 }; 139 145 }) 140 146 ];

+132

orm/orm.go

··· 1 1 + package orm 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "fmt" 7 7 + "log/slog" 8 8 + "reflect" 9 9 + "strings" 10 10 + ) 11 11 + 12 12 + type migrationFn = func(*sql.Tx) error 13 13 + 14 14 + func RunMigration(c *sql.Conn, logger *slog.Logger, name string, migrationFn migrationFn) error { 15 15 + logger = logger.With("migration", name) 16 16 + 17 17 + tx, err := c.BeginTx(context.Background(), nil) 18 18 + if err != nil { 19 19 + return err 20 20 + } 21 21 + defer tx.Rollback() 22 22 + 23 23 + _, err = tx.Exec(` 24 24 + create table if not exists migrations ( 25 25 + id integer primary key autoincrement, 26 26 + name text unique 27 27 + ); 28 28 + `) 29 29 + if err != nil { 30 30 + return fmt.Errorf("creating migrations table: %w", err) 31 31 + } 32 32 + 33 33 + var exists bool 34 34 + err = tx.QueryRow("select exists (select 1 from migrations where name = ?)", name).Scan(&exists) 35 35 + if err != nil { 36 36 + return err 37 37 + } 38 38 + 39 39 + if !exists { 40 40 + // run migration 41 41 + err = migrationFn(tx) 42 42 + if err != nil { 43 43 + logger.Error("failed to run migration", "err", err) 44 44 + return err 45 45 + } 46 46 + 47 47 + // mark migration as complete 48 48 + _, err = tx.Exec("insert into migrations (name) values (?)", name) 49 49 + if err != nil { 50 50 + logger.Error("failed to mark migration as complete", "err", err) 51 51 + return err 52 52 + } 53 53 + 54 54 + // commit the transaction 55 55 + if err := tx.Commit(); err != nil { 56 56 + return err 57 57 + } 58 58 + 59 59 + logger.Info("migration applied successfully") 60 60 + } else { 61 61 + logger.Warn("skipped migration, already applied") 62 62 + } 63 63 + 64 64 + return nil 65 65 + } 66 66 + 67 67 + type Filter struct { 68 68 + Key string 69 69 + arg any 70 70 + Cmp string 71 71 + } 72 72 + 73 73 + func newFilter(key, cmp string, arg any) Filter { 74 74 + return Filter{ 75 75 + Key: key, 76 76 + arg: arg, 77 77 + Cmp: cmp, 78 78 + } 79 79 + } 80 80 + 81 81 + func FilterEq(key string, arg any) Filter { return newFilter(key, "=", arg) } 82 82 + func FilterNotEq(key string, arg any) Filter { return newFilter(key, "<>", arg) } 83 83 + func FilterGte(key string, arg any) Filter { return newFilter(key, ">=", arg) } 84 84 + func FilterLte(key string, arg any) Filter { return newFilter(key, "<=", arg) } 85 85 + func FilterIs(key string, arg any) Filter { return newFilter(key, "is", arg) } 86 86 + func FilterIsNot(key string, arg any) Filter { return newFilter(key, "is not", arg) } 87 87 + func FilterIn(key string, arg any) Filter { return newFilter(key, "in", arg) } 88 88 + func FilterLike(key string, arg any) Filter { return newFilter(key, "like", arg) } 89 89 + func FilterNotLike(key string, arg any) Filter { return newFilter(key, "not like", arg) } 90 90 + func FilterContains(key string, arg any) Filter { 91 91 + return newFilter(key, "like", fmt.Sprintf("%%%v%%", arg)) 92 92 + } 93 93 + 94 94 + func (f Filter) Condition() string { 95 95 + rv := reflect.ValueOf(f.arg) 96 96 + kind := rv.Kind() 97 97 + 98 98 + // if we have `FilterIn(k, [1, 2, 3])`, compile it down to `k in (?, ?, ?)` 99 99 + if (kind == reflect.Slice && rv.Type().Elem().Kind() != reflect.Uint8) || kind == reflect.Array { 100 100 + if rv.Len() == 0 { 101 101 + // always false 102 102 + return "1 = 0" 103 103 + } 104 104 + 105 105 + placeholders := make([]string, rv.Len()) 106 106 + for i := range placeholders { 107 107 + placeholders[i] = "?" 108 108 + } 109 109 + 110 110 + return fmt.Sprintf("%s %s (%s)", f.Key, f.Cmp, strings.Join(placeholders, ", ")) 111 111 + } 112 112 + 113 113 + return fmt.Sprintf("%s %s ?", f.Key, f.Cmp) 114 114 + } 115 115 + 116 116 + func (f Filter) Arg() []any { 117 117 + rv := reflect.ValueOf(f.arg) 118 118 + kind := rv.Kind() 119 119 + if (kind == reflect.Slice && rv.Type().Elem().Kind() != reflect.Uint8) || kind == reflect.Array { 120 120 + if rv.Len() == 0 { 121 121 + return nil 122 122 + } 123 123 + 124 124 + out := make([]any, rv.Len()) 125 125 + for i := range rv.Len() { 126 126 + out[i] = rv.Index(i).Interface() 127 127 + } 128 128 + return out 129 129 + } 130 130 + 131 131 + return []any{f.arg} 132 132 + }

-1

patchutil/patchutil.go

··· 296 296 } 297 297 298 298 nd := types.NiceDiff{} 299 299 - nd.Commit.Parent = targetBranch 300 299 301 300 for _, d := range diffs { 302 301 ndiff := types.Diff{}

+52

rbac2/bytesadapter/adapter.go

··· 1 1 + package bytesadapter 2 2 + 3 3 + import ( 4 4 + "bufio" 5 5 + "bytes" 6 6 + "errors" 7 7 + "strings" 8 8 + 9 9 + "github.com/casbin/casbin/v2/model" 10 10 + "github.com/casbin/casbin/v2/persist" 11 11 + ) 12 12 + 13 13 + var ( 14 14 + errNotImplemented = errors.New("not implemented") 15 15 + ) 16 16 + 17 17 + type Adapter struct { 18 18 + b []byte 19 19 + } 20 20 + 21 21 + var _ persist.Adapter = &Adapter{} 22 22 + 23 23 + func NewAdapter(b []byte) *Adapter { 24 24 + return &Adapter{b} 25 25 + } 26 26 + 27 27 + func (a *Adapter) LoadPolicy(model model.Model) error { 28 28 + scanner := bufio.NewScanner(bytes.NewReader(a.b)) 29 29 + for scanner.Scan() { 30 30 + line := strings.TrimSpace(scanner.Text()) 31 31 + if err := persist.LoadPolicyLine(line, model); err != nil { 32 32 + return err 33 33 + } 34 34 + } 35 35 + return scanner.Err() 36 36 + } 37 37 + 38 38 + func (a *Adapter) AddPolicy(sec string, ptype string, rule []string) error { 39 39 + return errNotImplemented 40 40 + } 41 41 + 42 42 + func (a *Adapter) RemoveFilteredPolicy(sec string, ptype string, fieldIndex int, fieldValues ...string) error { 43 43 + return errNotImplemented 44 44 + } 45 45 + 46 46 + func (a *Adapter) RemovePolicy(sec string, ptype string, rule []string) error { 47 47 + return errNotImplemented 48 48 + } 49 49 + 50 50 + func (a *Adapter) SavePolicy(model model.Model) error { 51 51 + return errNotImplemented 52 52 + }

+139

rbac2/rbac2.go

··· 1 1 + package rbac2 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + _ "embed" 6 6 + "fmt" 7 7 + 8 8 + adapter "github.com/Blank-Xu/sql-adapter" 9 9 + "github.com/bluesky-social/indigo/atproto/syntax" 10 10 + "github.com/casbin/casbin/v2" 11 11 + "github.com/casbin/casbin/v2/model" 12 12 + "github.com/casbin/casbin/v2/util" 13 13 + "tangled.org/core/rbac2/bytesadapter" 14 14 + ) 15 15 + 16 16 + const ( 17 17 + Model = ` 18 18 + [request_definition] 19 19 + r = sub, dom, obj, act 20 20 + 21 21 + [policy_definition] 22 22 + p = sub, dom, obj, act 23 23 + 24 24 + [role_definition] 25 25 + g = _, _, _ 26 26 + 27 27 + [policy_effect] 28 28 + e = some(where (p.eft == allow)) 29 29 + 30 30 + [matchers] 31 31 + m = g(r.sub, p.sub, r.dom) && keyMatch4(r.dom, p.dom) && r.obj == p.obj && r.act == p.act 32 32 + ` 33 33 + ) 34 34 + 35 35 + type Enforcer struct { 36 36 + e *casbin.Enforcer 37 37 + } 38 38 + 39 39 + //go:embed tangled_policy.csv 40 40 + var tangledPolicy []byte 41 41 + 42 42 + func NewEnforcer(path string) (*Enforcer, error) { 43 43 + db, err := sql.Open("sqlite3", path+"?_foreign_keys=1") 44 44 + if err != nil { 45 45 + return nil, err 46 46 + } 47 47 + return NewEnforcerWithDB(db) 48 48 + } 49 49 + 50 50 + func NewEnforcerWithDB(db *sql.DB) (*Enforcer, error) { 51 51 + m, err := model.NewModelFromString(Model) 52 52 + if err != nil { 53 53 + return nil, err 54 54 + } 55 55 + 56 56 + a, err := adapter.NewAdapter(db, "sqlite3", "acl") 57 57 + if err != nil { 58 58 + return nil, err 59 59 + } 60 60 + 61 61 + // // PATCH: create unique index to make `AddPoliciesEx` work 62 62 + // _, err = db.Exec(fmt.Sprintf( 63 63 + // `create unique index if not exists uq_%[1]s on %[1]s (p_type,v0,v1,v2,v3,v4,v5);`, 64 64 + // tableName, 65 65 + // )) 66 66 + // if err != nil { 67 67 + // return nil, err 68 68 + // } 69 69 + 70 70 + e, _ := casbin.NewEnforcer() // NewEnforcer() without param won't return error 71 71 + // e.EnableLog(true) 72 72 + 73 73 + // NOTE: casbin clears the model on init, so we should intialize with temporary adapter first 74 74 + // and then override the adapter to sql-adapter. 75 75 + // `e.SetModel(m)` after init doesn't work for some reason 76 76 + if err := e.InitWithModelAndAdapter(m, bytesadapter.NewAdapter(tangledPolicy)); err != nil { 77 77 + return nil, err 78 78 + } 79 79 + 80 80 + // load dynamic policy from db 81 81 + e.EnableAutoSave(false) 82 82 + if err := a.LoadPolicy(e.GetModel()); err != nil { 83 83 + return nil, err 84 84 + } 85 85 + e.AddNamedDomainMatchingFunc("g", "keyMatch4", util.KeyMatch4) 86 86 + e.BuildRoleLinks() 87 87 + e.SetAdapter(a) 88 88 + e.EnableAutoSave(true) 89 89 + 90 90 + return &Enforcer{e}, nil 91 91 + } 92 92 + 93 93 + // CaptureModel returns copy of current model. Used for testing 94 94 + func (e *Enforcer) CaptureModel() model.Model { 95 95 + return e.e.GetModel().Copy() 96 96 + } 97 97 + 98 98 + func (e *Enforcer) hasImplicitRoleForUser(name string, role string, domain ...string) (bool, error) { 99 99 + roles, err := e.e.GetImplicitRolesForUser(name, domain...) 100 100 + if err != nil { 101 101 + return false, err 102 102 + } 103 103 + for _, r := range roles { 104 104 + if r == role { 105 105 + return true, nil 106 106 + } 107 107 + } 108 108 + return false, nil 109 109 + } 110 110 + 111 111 + // setRoleForUser sets single user role for specified domain. 112 112 + // All existing users with that role will be removed. 113 113 + func (e *Enforcer) setRoleForUser(name string, role string, domain ...string) error { 114 114 + currentUsers, err := e.e.GetUsersForRole(role, domain...) 115 115 + if err != nil { 116 116 + return err 117 117 + } 118 118 + 119 119 + for _, oldUser := range currentUsers { 120 120 + _, err = e.e.DeleteRoleForUser(oldUser, role, domain...) 121 121 + if err != nil { 122 122 + return err 123 123 + } 124 124 + } 125 125 + 126 126 + _, err = e.e.AddRoleForUser(name, role, domain...) 127 127 + return err 128 128 + } 129 129 + 130 130 + // validateAtUri enforeces AT-URI to have valid did as authority and match collection NSID. 131 131 + func validateAtUri(uri syntax.ATURI, expected string) error { 132 132 + if !uri.Authority().IsDID() { 133 133 + return fmt.Errorf("expected at-uri with did") 134 134 + } 135 135 + if expected != "" && uri.Collection().String() != expected { 136 136 + return fmt.Errorf("incorrect repo at-uri collection nsid '%s' (expected '%s')", uri.Collection(), expected) 137 137 + } 138 138 + return nil 139 139 + }

+150

rbac2/rbac2_test.go

··· 1 1 + package rbac2_test 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + "testing" 6 6 + 7 7 + "github.com/bluesky-social/indigo/atproto/syntax" 8 8 + _ "github.com/mattn/go-sqlite3" 9 9 + "github.com/stretchr/testify/assert" 10 10 + "tangled.org/core/rbac2" 11 11 + ) 12 12 + 13 13 + func setup(t *testing.T) *rbac2.Enforcer { 14 14 + enforcer, err := rbac2.NewEnforcer(":memory:") 15 15 + assert.NoError(t, err) 16 16 + 17 17 + return enforcer 18 18 + } 19 19 + 20 20 + func TestNewEnforcer(t *testing.T) { 21 21 + db, err := sql.Open("sqlite3", "/tmp/test/test.db?_foreign_keys=1") 22 22 + assert.NoError(t, err) 23 23 + 24 24 + enforcer1, err := rbac2.NewEnforcerWithDB(db) 25 25 + assert.NoError(t, err) 26 26 + enforcer1.AddRepo(syntax.ATURI("at://did:plc:foo/sh.tangled.repo/reporkey")) 27 27 + model1 := enforcer1.CaptureModel() 28 28 + 29 29 + enforcer2, err := rbac2.NewEnforcerWithDB(db) 30 30 + assert.NoError(t, err) 31 31 + model2 := enforcer2.CaptureModel() 32 32 + 33 33 + // model1.GetLogger().EnableLog(true) 34 34 + // model1.PrintModel() 35 35 + // model1.PrintPolicy() 36 36 + // model1.GetLogger().EnableLog(false) 37 37 + 38 38 + model2.GetLogger().EnableLog(true) 39 39 + model2.PrintModel() 40 40 + model2.PrintPolicy() 41 41 + model2.GetLogger().EnableLog(false) 42 42 + 43 43 + assert.Equal(t, model1, model2) 44 44 + } 45 45 + 46 46 + func TestRepoOwnerPermissions(t *testing.T) { 47 47 + var ( 48 48 + e = setup(t) 49 49 + ok bool 50 50 + err error 51 51 + fooRepo = syntax.ATURI("at://did:plc:foo/sh.tangled.repo/reporkey") 52 52 + fooUser = syntax.DID("did:plc:foo") 53 53 + ) 54 54 + 55 55 + assert.NoError(t, e.AddRepo(fooRepo)) 56 56 + 57 57 + ok, err = e.IsRepoOwner(fooUser, fooRepo) 58 58 + assert.NoError(t, err) 59 59 + assert.True(t, ok, "repo author should be repo owner") 60 60 + 61 61 + ok, err = e.IsRepoWriteAllowed(fooUser, fooRepo) 62 62 + assert.NoError(t, err) 63 63 + assert.True(t, ok, "repo owner should be able to modify the repo itself") 64 64 + 65 65 + ok, err = e.IsRepoCollaborator(fooUser, fooRepo) 66 66 + assert.NoError(t, err) 67 67 + assert.True(t, ok, "repo owner should inherit role role:collaborator") 68 68 + 69 69 + ok, err = e.IsRepoSettingsWriteAllowed(fooUser, fooRepo) 70 70 + assert.NoError(t, err) 71 71 + assert.True(t, ok, "repo owner should inherit collaborator permissions") 72 72 + } 73 73 + 74 74 + func TestRepoCollaboratorPermissions(t *testing.T) { 75 75 + var ( 76 76 + e = setup(t) 77 77 + ok bool 78 78 + err error 79 79 + fooRepo = syntax.ATURI("at://did:plc:foo/sh.tangled.repo/reporkey") 80 80 + barUser = syntax.DID("did:plc:bar") 81 81 + ) 82 82 + 83 83 + assert.NoError(t, e.AddRepo(fooRepo)) 84 84 + assert.NoError(t, e.AddRepoCollaborator(barUser, fooRepo)) 85 85 + 86 86 + ok, err = e.IsRepoCollaborator(barUser, fooRepo) 87 87 + assert.NoError(t, err) 88 88 + assert.True(t, ok, "should set repo collaborator") 89 89 + 90 90 + ok, err = e.IsRepoSettingsWriteAllowed(barUser, fooRepo) 91 91 + assert.NoError(t, err) 92 92 + assert.True(t, ok, "repo collaborator should be able to edit repo settings") 93 93 + 94 94 + ok, err = e.IsRepoWriteAllowed(barUser, fooRepo) 95 95 + assert.NoError(t, err) 96 96 + assert.False(t, ok, "repo collaborator shouldn't be able to modify the repo itself") 97 97 + } 98 98 + 99 99 + func TestGetByRole(t *testing.T) { 100 100 + var ( 101 101 + e = setup(t) 102 102 + err error 103 103 + fooRepo = syntax.ATURI("at://did:plc:foo/sh.tangled.repo/reporkey") 104 104 + owner = syntax.DID("did:plc:foo") 105 105 + collaborator1 = syntax.DID("did:plc:bar") 106 106 + collaborator2 = syntax.DID("did:plc:baz") 107 107 + ) 108 108 + 109 109 + assert.NoError(t, e.AddRepo(fooRepo)) 110 110 + assert.NoError(t, e.AddRepoCollaborator(collaborator1, fooRepo)) 111 111 + assert.NoError(t, e.AddRepoCollaborator(collaborator2, fooRepo)) 112 112 + 113 113 + collaborators, err := e.GetRepoCollaborators(fooRepo) 114 114 + assert.NoError(t, err) 115 115 + assert.ElementsMatch(t, []syntax.DID{ 116 116 + owner, 117 117 + collaborator1, 118 118 + collaborator2, 119 119 + }, collaborators) 120 120 + } 121 121 + 122 122 + func TestSpindleOwnerPermissions(t *testing.T) { 123 123 + var ( 124 124 + e = setup(t) 125 125 + ok bool 126 126 + err error 127 127 + spindle = syntax.DID("did:web:spindle.example.com") 128 128 + owner = syntax.DID("did:plc:foo") 129 129 + member = syntax.DID("did:plc:bar") 130 130 + ) 131 131 + 132 132 + assert.NoError(t, e.SetSpindleOwner(owner, spindle)) 133 133 + assert.NoError(t, e.AddSpindleMember(member, spindle)) 134 134 + 135 135 + ok, err = e.IsSpindleMember(owner, spindle) 136 136 + assert.NoError(t, err) 137 137 + assert.True(t, ok, "spindle owner is spindle member") 138 138 + 139 139 + ok, err = e.IsSpindleMember(member, spindle) 140 140 + assert.NoError(t, err) 141 141 + assert.True(t, ok, "spindle member is spindle member") 142 142 + 143 143 + ok, err = e.IsSpindleMemberInviteAllowed(owner, spindle) 144 144 + assert.NoError(t, err) 145 145 + assert.True(t, ok, "spindle owner can invite members") 146 146 + 147 147 + ok, err = e.IsSpindleMemberInviteAllowed(member, spindle) 148 148 + assert.NoError(t, err) 149 149 + assert.False(t, ok, "spindle member cannot invite members") 150 150 + }

+91

rbac2/repo.go

··· 1 1 + package rbac2 2 2 + 3 3 + import ( 4 4 + "slices" 5 5 + "strings" 6 6 + 7 7 + "github.com/bluesky-social/indigo/atproto/syntax" 8 8 + "tangled.org/core/api/tangled" 9 9 + ) 10 10 + 11 11 + // AddRepo adds new repo with its owner to rbac enforcer 12 12 + func (e *Enforcer) AddRepo(repo syntax.ATURI) error { 13 13 + if err := validateAtUri(repo, tangled.RepoNSID); err != nil { 14 14 + return err 15 15 + } 16 16 + user := repo.Authority() 17 17 + 18 18 + return e.setRoleForUser(user.String(), "repo:owner", repo.String()) 19 19 + } 20 20 + 21 21 + // DeleteRepo deletes all policies related to the repo 22 22 + func (e *Enforcer) DeleteRepo(repo syntax.ATURI) error { 23 23 + if err := validateAtUri(repo, tangled.RepoNSID); err != nil { 24 24 + return err 25 25 + } 26 26 + 27 27 + _, err := e.e.DeleteDomains(repo.String()) 28 28 + return err 29 29 + } 30 30 + 31 31 + // AddRepoCollaborator adds new collaborator to the repo 32 32 + func (e *Enforcer) AddRepoCollaborator(user syntax.DID, repo syntax.ATURI) error { 33 33 + if err := validateAtUri(repo, tangled.RepoNSID); err != nil { 34 34 + return err 35 35 + } 36 36 + 37 37 + _, err := e.e.AddRoleForUser(user.String(), "repo:collaborator", repo.String()) 38 38 + return err 39 39 + } 40 40 + 41 41 + // RemoveRepoCollaborator removes the collaborator from the repo. 42 42 + // This won't remove inherited roles like repository owner. 43 43 + func (e *Enforcer) RemoveRepoCollaborator(user syntax.DID, repo syntax.ATURI) error { 44 44 + if err := validateAtUri(repo, tangled.RepoNSID); err != nil { 45 45 + return err 46 46 + } 47 47 + 48 48 + _, err := e.e.DeleteRoleForUser(user.String(), "repo:collaborator", repo.String()) 49 49 + return err 50 50 + } 51 51 + 52 52 + func (e *Enforcer) GetRepoCollaborators(repo syntax.ATURI) ([]syntax.DID, error) { 53 53 + var collaborators []syntax.DID 54 54 + members, err := e.e.GetImplicitUsersForRole("repo:collaborator", repo.String()) 55 55 + if err != nil { 56 56 + return nil, err 57 57 + } 58 58 + for _, m := range members { 59 59 + if !strings.HasPrefix(m, "did:") { // skip non-user subjects like 'repo:owner' 60 60 + continue 61 61 + } 62 62 + collaborators = append(collaborators, syntax.DID(m)) 63 63 + } 64 64 + 65 65 + slices.Sort(collaborators) 66 66 + return slices.Compact(collaborators), nil 67 67 + } 68 68 + 69 69 + func (e *Enforcer) IsRepoOwner(user syntax.DID, repo syntax.ATURI) (bool, error) { 70 70 + return e.e.HasRoleForUser(user.String(), "repo:owner", repo.String()) 71 71 + } 72 72 + 73 73 + func (e *Enforcer) IsRepoCollaborator(user syntax.DID, repo syntax.ATURI) (bool, error) { 74 74 + return e.hasImplicitRoleForUser(user.String(), "repo:collaborator", repo.String()) 75 75 + } 76 76 + 77 77 + func (e *Enforcer) IsRepoWriteAllowed(user syntax.DID, repo syntax.ATURI) (bool, error) { 78 78 + return e.e.Enforce(user.String(), repo.String(), "/", "write") 79 79 + } 80 80 + 81 81 + func (e *Enforcer) IsRepoSettingsWriteAllowed(user syntax.DID, repo syntax.ATURI) (bool, error) { 82 82 + return e.e.Enforce(user.String(), repo.String(), "/settings", "write") 83 83 + } 84 84 + 85 85 + func (e *Enforcer) IsRepoCollaboratorInviteAllowed(user syntax.DID, repo syntax.ATURI) (bool, error) { 86 86 + return e.e.Enforce(user.String(), repo.String(), "/collaborator", "write") 87 87 + } 88 88 + 89 89 + func (e *Enforcer) IsRepoGitPushAllowed(user syntax.DID, repo syntax.ATURI) (bool, error) { 90 90 + return e.e.Enforce(user.String(), repo.String(), "/git", "write") 91 91 + }

+29

rbac2/spindle.go

··· 1 1 + package rbac2 2 2 + 3 3 + import "github.com/bluesky-social/indigo/atproto/syntax" 4 4 + 5 5 + func (e *Enforcer) SetSpindleOwner(user syntax.DID, spindle syntax.DID) error { 6 6 + return e.setRoleForUser(user.String(), "server:owner", intoSpindle(spindle)) 7 7 + } 8 8 + 9 9 + func (e *Enforcer) IsSpindleMember(user syntax.DID, spindle syntax.DID) (bool, error) { 10 10 + return e.hasImplicitRoleForUser(user.String(), "server:member", intoSpindle(spindle)) 11 11 + } 12 12 + 13 13 + func (e *Enforcer) AddSpindleMember(user syntax.DID, spindle syntax.DID) error { 14 14 + _, err := e.e.AddRoleForUser(user.String(), "server:member", intoSpindle(spindle)) 15 15 + return err 16 16 + } 17 17 + 18 18 + func (e *Enforcer) RemoveSpindleMember(user syntax.DID, spindle syntax.DID) error { 19 19 + _, err := e.e.DeleteRoleForUser(user.String(), "server:member", intoSpindle(spindle)) 20 20 + return err 21 21 + } 22 22 + 23 23 + func (e *Enforcer) IsSpindleMemberInviteAllowed(user syntax.DID, spindle syntax.DID) (bool, error) { 24 24 + return e.e.Enforce(user.String(), intoSpindle(spindle), "/member", "write") 25 25 + } 26 26 + 27 27 + func intoSpindle(did syntax.DID) string { 28 28 + return "/spindle/" + did.String() 29 29 + }

+19

rbac2/tangled_policy.csv

··· 1 1 + #, policies 2 2 + #, sub, dom, obj, act 3 3 + p, repo:owner, at://{did}/sh.tangled.repo/{rkey}, /, write 4 4 + p, repo:owner, at://{did}/sh.tangled.repo/{rkey}, /collaborator, write 5 5 + p, repo:collaborator, at://{did}/sh.tangled.repo/{rkey}, /settings, write 6 6 + p, repo:collaborator, at://{did}/sh.tangled.repo/{rkey}, /git, write 7 7 + 8 8 + p, server:owner, /knot/{did}, /member, write 9 9 + p, server:member, /knot/{did}, /git, write 10 10 + 11 11 + p, server:owner, /spindle/{did}, /member, write 12 12 + 13 13 + 14 14 + #, group policies 15 15 + #, sub, role, dom 16 16 + g, repo:owner, repo:collaborator, at://{did}/sh.tangled.repo/{rkey} 17 17 + 18 18 + g, server:owner, server:member, /knot/{did} 19 19 + g, server:owner, server:member, /spindle/{did}

+3 -3

readme.md

··· 10 10 11 11 ## docs 12 12 13 13 - * [knot hosting guide](/docs/knot-hosting.md) 14 14 - * [contributing guide](/docs/contributing.md) **please read before opening a PR!** 15 15 - * [hacking on tangled](/docs/hacking.md) 13 13 + - [knot hosting guide](https://docs.tangled.org/knot-self-hosting-guide.html#knot-self-hosting-guide) 14 14 + - [contributing guide](https://docs.tangled.org/contribution-guide.html#contribution-guide) **please read before opening a PR!** 15 15 + - [hacking on tangled](https://docs.tangled.org/hacking-on-tangled.html#hacking-on-tangled) 16 16 17 17 ## security 18 18

+31

sets/gen.go

··· 1 1 + package sets 2 2 + 3 3 + import ( 4 4 + "math/rand" 5 5 + "reflect" 6 6 + "testing/quick" 7 7 + ) 8 8 + 9 9 + func (_ Set[T]) Generate(rand *rand.Rand, size int) reflect.Value { 10 10 + s := New[T]() 11 11 + 12 12 + var zero T 13 13 + itemType := reflect.TypeOf(zero) 14 14 + 15 15 + for { 16 16 + if s.Len() >= size { 17 17 + break 18 18 + } 19 19 + 20 20 + item, ok := quick.Value(itemType, rand) 21 21 + if !ok { 22 22 + continue 23 23 + } 24 24 + 25 25 + if val, ok := item.Interface().(T); ok { 26 26 + s.Insert(val) 27 27 + } 28 28 + } 29 29 + 30 30 + return reflect.ValueOf(s) 31 31 + }

+35

sets/readme.txt

··· 1 1 + sets 2 2 + ---- 3 3 + set datastructure for go with generics and iterators. the 4 4 + api is supposed to mimic rust's std::collections::HashSet api. 5 5 + 6 6 + s1 := sets.Collect(slices.Values([]int{1, 2, 3, 4})) 7 7 + s2 := sets.Collect(slices.Values([]int{1, 2, 3, 4, 5, 6})) 8 8 + 9 9 + union := sets.Collect(s1.Union(s2)) 10 10 + intersect := sets.Collect(s1.Intersection(s2)) 11 11 + diff := sets.Collect(s1.Difference(s2)) 12 12 + symdiff := sets.Collect(s1.SymmetricDifference(s2)) 13 13 + 14 14 + s1.Len() // 4 15 15 + s1.Contains(1) // true 16 16 + s1.IsEmpty() // false 17 17 + s1.IsSubset(s2) // true 18 18 + s1.IsSuperset(s2) // false 19 19 + s1.IsDisjoint(s2) // false 20 20 + 21 21 + if exists := s1.Insert(1); exists { 22 22 + // already existed in set 23 23 + } 24 24 + 25 25 + if existed := s1.Remove(1); existed { 26 26 + // existed in set, now removed 27 27 + } 28 28 + 29 29 + 30 30 + testing 31 31 + ------- 32 32 + includes property-based tests using the wonderful 33 33 + testing/quick module! 34 34 + 35 35 + go test -v

+174

sets/set.go

··· 1 1 + package sets 2 2 + 3 3 + import ( 4 4 + "iter" 5 5 + "maps" 6 6 + ) 7 7 + 8 8 + type Set[T comparable] struct { 9 9 + data map[T]struct{} 10 10 + } 11 11 + 12 12 + func New[T comparable]() Set[T] { 13 13 + return Set[T]{ 14 14 + data: make(map[T]struct{}), 15 15 + } 16 16 + } 17 17 + 18 18 + func (s *Set[T]) Insert(item T) bool { 19 19 + _, exists := s.data[item] 20 20 + s.data[item] = struct{}{} 21 21 + return !exists 22 22 + } 23 23 + 24 24 + func Singleton[T comparable](item T) Set[T] { 25 25 + n := New[T]() 26 26 + _ = n.Insert(item) 27 27 + return n 28 28 + } 29 29 + 30 30 + func (s *Set[T]) Remove(item T) bool { 31 31 + _, exists := s.data[item] 32 32 + if exists { 33 33 + delete(s.data, item) 34 34 + } 35 35 + return exists 36 36 + } 37 37 + 38 38 + func (s Set[T]) Contains(item T) bool { 39 39 + _, exists := s.data[item] 40 40 + return exists 41 41 + } 42 42 + 43 43 + func (s Set[T]) Len() int { 44 44 + return len(s.data) 45 45 + } 46 46 + 47 47 + func (s Set[T]) IsEmpty() bool { 48 48 + return len(s.data) == 0 49 49 + } 50 50 + 51 51 + func (s *Set[T]) Clear() { 52 52 + s.data = make(map[T]struct{}) 53 53 + } 54 54 + 55 55 + func (s Set[T]) All() iter.Seq[T] { 56 56 + return func(yield func(T) bool) { 57 57 + for item := range s.data { 58 58 + if !yield(item) { 59 59 + return 60 60 + } 61 61 + } 62 62 + } 63 63 + } 64 64 + 65 65 + func (s Set[T]) Clone() Set[T] { 66 66 + return Set[T]{ 67 67 + data: maps.Clone(s.data), 68 68 + } 69 69 + } 70 70 + 71 71 + func (s Set[T]) Union(other Set[T]) iter.Seq[T] { 72 72 + if s.Len() >= other.Len() { 73 73 + return chain(s.All(), other.Difference(s)) 74 74 + } else { 75 75 + return chain(other.All(), s.Difference(other)) 76 76 + } 77 77 + } 78 78 + 79 79 + func chain[T any](seqs ...iter.Seq[T]) iter.Seq[T] { 80 80 + return func(yield func(T) bool) { 81 81 + for _, seq := range seqs { 82 82 + for item := range seq { 83 83 + if !yield(item) { 84 84 + return 85 85 + } 86 86 + } 87 87 + } 88 88 + } 89 89 + } 90 90 + 91 91 + func (s Set[T]) Intersection(other Set[T]) iter.Seq[T] { 92 92 + return func(yield func(T) bool) { 93 93 + for item := range s.data { 94 94 + if other.Contains(item) { 95 95 + if !yield(item) { 96 96 + return 97 97 + } 98 98 + } 99 99 + } 100 100 + } 101 101 + } 102 102 + 103 103 + func (s Set[T]) Difference(other Set[T]) iter.Seq[T] { 104 104 + return func(yield func(T) bool) { 105 105 + for item := range s.data { 106 106 + if !other.Contains(item) { 107 107 + if !yield(item) { 108 108 + return 109 109 + } 110 110 + } 111 111 + } 112 112 + } 113 113 + } 114 114 + 115 115 + func (s Set[T]) SymmetricDifference(other Set[T]) iter.Seq[T] { 116 116 + return func(yield func(T) bool) { 117 117 + for item := range s.data { 118 118 + if !other.Contains(item) { 119 119 + if !yield(item) { 120 120 + return 121 121 + } 122 122 + } 123 123 + } 124 124 + for item := range other.data { 125 125 + if !s.Contains(item) { 126 126 + if !yield(item) { 127 127 + return 128 128 + } 129 129 + } 130 130 + } 131 131 + } 132 132 + } 133 133 + 134 134 + func (s Set[T]) IsSubset(other Set[T]) bool { 135 135 + for item := range s.data { 136 136 + if !other.Contains(item) { 137 137 + return false 138 138 + } 139 139 + } 140 140 + return true 141 141 + } 142 142 + 143 143 + func (s Set[T]) IsSuperset(other Set[T]) bool { 144 144 + return other.IsSubset(s) 145 145 + } 146 146 + 147 147 + func (s Set[T]) IsDisjoint(other Set[T]) bool { 148 148 + for item := range s.data { 149 149 + if other.Contains(item) { 150 150 + return false 151 151 + } 152 152 + } 153 153 + return true 154 154 + } 155 155 + 156 156 + func (s Set[T]) Equal(other Set[T]) bool { 157 157 + if s.Len() != other.Len() { 158 158 + return false 159 159 + } 160 160 + for item := range s.data { 161 161 + if !other.Contains(item) { 162 162 + return false 163 163 + } 164 164 + } 165 165 + return true 166 166 + } 167 167 + 168 168 + func Collect[T comparable](seq iter.Seq[T]) Set[T] { 169 169 + result := New[T]() 170 170 + for item := range seq { 171 171 + result.Insert(item) 172 172 + } 173 173 + return result 174 174 + }

+411

sets/set_test.go

··· 1 1 + package sets 2 2 + 3 3 + import ( 4 4 + "slices" 5 5 + "testing" 6 6 + "testing/quick" 7 7 + ) 8 8 + 9 9 + func TestNew(t *testing.T) { 10 10 + s := New[int]() 11 11 + if s.Len() != 0 { 12 12 + t.Errorf("New set should be empty, got length %d", s.Len()) 13 13 + } 14 14 + if !s.IsEmpty() { 15 15 + t.Error("New set should be empty") 16 16 + } 17 17 + } 18 18 + 19 19 + func TestFromSlice(t *testing.T) { 20 20 + s := Collect(slices.Values([]int{1, 2, 3, 2, 1})) 21 21 + if s.Len() != 3 { 22 22 + t.Errorf("Expected length 3, got %d", s.Len()) 23 23 + } 24 24 + if !s.Contains(1) || !s.Contains(2) || !s.Contains(3) { 25 25 + t.Error("Set should contain all unique elements from slice") 26 26 + } 27 27 + } 28 28 + 29 29 + func TestInsert(t *testing.T) { 30 30 + s := New[string]() 31 31 + 32 32 + if !s.Insert("hello") { 33 33 + t.Error("First insert should return true") 34 34 + } 35 35 + if s.Insert("hello") { 36 36 + t.Error("Duplicate insert should return false") 37 37 + } 38 38 + if s.Len() != 1 { 39 39 + t.Errorf("Expected length 1, got %d", s.Len()) 40 40 + } 41 41 + } 42 42 + 43 43 + func TestRemove(t *testing.T) { 44 44 + s := Collect(slices.Values([]int{1, 2, 3})) 45 45 + 46 46 + if !s.Remove(2) { 47 47 + t.Error("Remove existing element should return true") 48 48 + } 49 49 + if s.Remove(2) { 50 50 + t.Error("Remove non-existing element should return false") 51 51 + } 52 52 + if s.Contains(2) { 53 53 + t.Error("Element should be removed") 54 54 + } 55 55 + if s.Len() != 2 { 56 56 + t.Errorf("Expected length 2, got %d", s.Len()) 57 57 + } 58 58 + } 59 59 + 60 60 + func TestContains(t *testing.T) { 61 61 + s := Collect(slices.Values([]int{1, 2, 3})) 62 62 + 63 63 + if !s.Contains(1) { 64 64 + t.Error("Should contain 1") 65 65 + } 66 66 + if s.Contains(4) { 67 67 + t.Error("Should not contain 4") 68 68 + } 69 69 + } 70 70 + 71 71 + func TestClear(t *testing.T) { 72 72 + s := Collect(slices.Values([]int{1, 2, 3})) 73 73 + s.Clear() 74 74 + 75 75 + if !s.IsEmpty() { 76 76 + t.Error("Set should be empty after clear") 77 77 + } 78 78 + if s.Len() != 0 { 79 79 + t.Errorf("Expected length 0, got %d", s.Len()) 80 80 + } 81 81 + } 82 82 + 83 83 + func TestIterator(t *testing.T) { 84 84 + s := Collect(slices.Values([]int{1, 2, 3})) 85 85 + var items []int 86 86 + 87 87 + for item := range s.All() { 88 88 + items = append(items, item) 89 89 + } 90 90 + 91 91 + slices.Sort(items) 92 92 + expected := []int{1, 2, 3} 93 93 + if !slices.Equal(items, expected) { 94 94 + t.Errorf("Expected %v, got %v", expected, items) 95 95 + } 96 96 + } 97 97 + 98 98 + func TestClone(t *testing.T) { 99 99 + s1 := Collect(slices.Values([]int{1, 2, 3})) 100 100 + s2 := s1.Clone() 101 101 + 102 102 + if !s1.Equal(s2) { 103 103 + t.Error("Cloned set should be equal to original") 104 104 + } 105 105 + 106 106 + s2.Insert(4) 107 107 + if s1.Contains(4) { 108 108 + t.Error("Modifying clone should not affect original") 109 109 + } 110 110 + } 111 111 + 112 112 + func TestUnion(t *testing.T) { 113 113 + s1 := Collect(slices.Values([]int{1, 2})) 114 114 + s2 := Collect(slices.Values([]int{2, 3})) 115 115 + 116 116 + result := Collect(s1.Union(s2)) 117 117 + expected := Collect(slices.Values([]int{1, 2, 3})) 118 118 + 119 119 + if !result.Equal(expected) { 120 120 + t.Errorf("Expected %v, got %v", expected, result) 121 121 + } 122 122 + } 123 123 + 124 124 + func TestIntersection(t *testing.T) { 125 125 + s1 := Collect(slices.Values([]int{1, 2, 3})) 126 126 + s2 := Collect(slices.Values([]int{2, 3, 4})) 127 127 + 128 128 + expected := Collect(slices.Values([]int{2, 3})) 129 129 + result := Collect(s1.Intersection(s2)) 130 130 + 131 131 + if !result.Equal(expected) { 132 132 + t.Errorf("Expected %v, got %v", expected, result) 133 133 + } 134 134 + } 135 135 + 136 136 + func TestDifference(t *testing.T) { 137 137 + s1 := Collect(slices.Values([]int{1, 2, 3})) 138 138 + s2 := Collect(slices.Values([]int{2, 3, 4})) 139 139 + 140 140 + expected := Collect(slices.Values([]int{1})) 141 141 + result := Collect(s1.Difference(s2)) 142 142 + 143 143 + if !result.Equal(expected) { 144 144 + t.Errorf("Expected %v, got %v", expected, result) 145 145 + } 146 146 + } 147 147 + 148 148 + func TestSymmetricDifference(t *testing.T) { 149 149 + s1 := Collect(slices.Values([]int{1, 2, 3})) 150 150 + s2 := Collect(slices.Values([]int{2, 3, 4})) 151 151 + 152 152 + expected := Collect(slices.Values([]int{1, 4})) 153 153 + result := Collect(s1.SymmetricDifference(s2)) 154 154 + 155 155 + if !result.Equal(expected) { 156 156 + t.Errorf("Expected %v, got %v", expected, result) 157 157 + } 158 158 + } 159 159 + 160 160 + func TestSymmetricDifferenceCommutativeProperty(t *testing.T) { 161 161 + s1 := Collect(slices.Values([]int{1, 2, 3})) 162 162 + s2 := Collect(slices.Values([]int{2, 3, 4})) 163 163 + 164 164 + result1 := Collect(s1.SymmetricDifference(s2)) 165 165 + result2 := Collect(s2.SymmetricDifference(s1)) 166 166 + 167 167 + if !result1.Equal(result2) { 168 168 + t.Errorf("Expected %v, got %v", result1, result2) 169 169 + } 170 170 + } 171 171 + 172 172 + func TestIsSubset(t *testing.T) { 173 173 + s1 := Collect(slices.Values([]int{1, 2})) 174 174 + s2 := Collect(slices.Values([]int{1, 2, 3})) 175 175 + 176 176 + if !s1.IsSubset(s2) { 177 177 + t.Error("s1 should be subset of s2") 178 178 + } 179 179 + if s2.IsSubset(s1) { 180 180 + t.Error("s2 should not be subset of s1") 181 181 + } 182 182 + } 183 183 + 184 184 + func TestIsSuperset(t *testing.T) { 185 185 + s1 := Collect(slices.Values([]int{1, 2, 3})) 186 186 + s2 := Collect(slices.Values([]int{1, 2})) 187 187 + 188 188 + if !s1.IsSuperset(s2) { 189 189 + t.Error("s1 should be superset of s2") 190 190 + } 191 191 + if s2.IsSuperset(s1) { 192 192 + t.Error("s2 should not be superset of s1") 193 193 + } 194 194 + } 195 195 + 196 196 + func TestIsDisjoint(t *testing.T) { 197 197 + s1 := Collect(slices.Values([]int{1, 2})) 198 198 + s2 := Collect(slices.Values([]int{3, 4})) 199 199 + s3 := Collect(slices.Values([]int{2, 3})) 200 200 + 201 201 + if !s1.IsDisjoint(s2) { 202 202 + t.Error("s1 and s2 should be disjoint") 203 203 + } 204 204 + if s1.IsDisjoint(s3) { 205 205 + t.Error("s1 and s3 should not be disjoint") 206 206 + } 207 207 + } 208 208 + 209 209 + func TestEqual(t *testing.T) { 210 210 + s1 := Collect(slices.Values([]int{1, 2, 3})) 211 211 + s2 := Collect(slices.Values([]int{3, 2, 1})) 212 212 + s3 := Collect(slices.Values([]int{1, 2})) 213 213 + 214 214 + if !s1.Equal(s2) { 215 215 + t.Error("s1 and s2 should be equal") 216 216 + } 217 217 + if s1.Equal(s3) { 218 218 + t.Error("s1 and s3 should not be equal") 219 219 + } 220 220 + } 221 221 + 222 222 + func TestCollect(t *testing.T) { 223 223 + s1 := Collect(slices.Values([]int{1, 2})) 224 224 + s2 := Collect(slices.Values([]int{2, 3})) 225 225 + 226 226 + unionSet := Collect(s1.Union(s2)) 227 227 + if unionSet.Len() != 3 { 228 228 + t.Errorf("Expected union set length 3, got %d", unionSet.Len()) 229 229 + } 230 230 + if !unionSet.Contains(1) || !unionSet.Contains(2) || !unionSet.Contains(3) { 231 231 + t.Error("Union set should contain 1, 2, and 3") 232 232 + } 233 233 + 234 234 + diffSet := Collect(s1.Difference(s2)) 235 235 + if diffSet.Len() != 1 { 236 236 + t.Errorf("Expected difference set length 1, got %d", diffSet.Len()) 237 237 + } 238 238 + if !diffSet.Contains(1) { 239 239 + t.Error("Difference set should contain 1") 240 240 + } 241 241 + } 242 242 + 243 243 + func TestPropertySingleonLen(t *testing.T) { 244 244 + f := func(item int) bool { 245 245 + single := Singleton(item) 246 246 + return single.Len() == 1 247 247 + } 248 248 + 249 249 + if err := quick.Check(f, nil); err != nil { 250 250 + t.Error(err) 251 251 + } 252 252 + } 253 253 + 254 254 + func TestPropertyInsertIdempotent(t *testing.T) { 255 255 + f := func(s Set[int], item int) bool { 256 256 + clone := s.Clone() 257 257 + 258 258 + clone.Insert(item) 259 259 + firstLen := clone.Len() 260 260 + 261 261 + clone.Insert(item) 262 262 + secondLen := clone.Len() 263 263 + 264 264 + return firstLen == secondLen 265 265 + } 266 266 + 267 267 + if err := quick.Check(f, nil); err != nil { 268 268 + t.Error(err) 269 269 + } 270 270 + } 271 271 + 272 272 + func TestPropertyUnionCommutative(t *testing.T) { 273 273 + f := func(s1 Set[int], s2 Set[int]) bool { 274 274 + union1 := Collect(s1.Union(s2)) 275 275 + union2 := Collect(s2.Union(s1)) 276 276 + return union1.Equal(union2) 277 277 + } 278 278 + 279 279 + if err := quick.Check(f, nil); err != nil { 280 280 + t.Error(err) 281 281 + } 282 282 + } 283 283 + 284 284 + func TestPropertyIntersectionCommutative(t *testing.T) { 285 285 + f := func(s1 Set[int], s2 Set[int]) bool { 286 286 + inter1 := Collect(s1.Intersection(s2)) 287 287 + inter2 := Collect(s2.Intersection(s1)) 288 288 + return inter1.Equal(inter2) 289 289 + } 290 290 + 291 291 + if err := quick.Check(f, nil); err != nil { 292 292 + t.Error(err) 293 293 + } 294 294 + } 295 295 + 296 296 + func TestPropertyCloneEquals(t *testing.T) { 297 297 + f := func(s Set[int]) bool { 298 298 + clone := s.Clone() 299 299 + return s.Equal(clone) 300 300 + } 301 301 + 302 302 + if err := quick.Check(f, nil); err != nil { 303 303 + t.Error(err) 304 304 + } 305 305 + } 306 306 + 307 307 + func TestPropertyIntersectionIsSubset(t *testing.T) { 308 308 + f := func(s1 Set[int], s2 Set[int]) bool { 309 309 + inter := Collect(s1.Intersection(s2)) 310 310 + return inter.IsSubset(s1) && inter.IsSubset(s2) 311 311 + } 312 312 + 313 313 + if err := quick.Check(f, nil); err != nil { 314 314 + t.Error(err) 315 315 + } 316 316 + } 317 317 + 318 318 + func TestPropertyUnionIsSuperset(t *testing.T) { 319 319 + f := func(s1 Set[int], s2 Set[int]) bool { 320 320 + union := Collect(s1.Union(s2)) 321 321 + return union.IsSuperset(s1) && union.IsSuperset(s2) 322 322 + } 323 323 + 324 324 + if err := quick.Check(f, nil); err != nil { 325 325 + t.Error(err) 326 326 + } 327 327 + } 328 328 + 329 329 + func TestPropertyDifferenceDisjoint(t *testing.T) { 330 330 + f := func(s1 Set[int], s2 Set[int]) bool { 331 331 + diff := Collect(s1.Difference(s2)) 332 332 + return diff.IsDisjoint(s2) 333 333 + } 334 334 + 335 335 + if err := quick.Check(f, nil); err != nil { 336 336 + t.Error(err) 337 337 + } 338 338 + } 339 339 + 340 340 + func TestPropertySymmetricDifferenceCommutative(t *testing.T) { 341 341 + f := func(s1 Set[int], s2 Set[int]) bool { 342 342 + symDiff1 := Collect(s1.SymmetricDifference(s2)) 343 343 + symDiff2 := Collect(s2.SymmetricDifference(s1)) 344 344 + return symDiff1.Equal(symDiff2) 345 345 + } 346 346 + 347 347 + if err := quick.Check(f, nil); err != nil { 348 348 + t.Error(err) 349 349 + } 350 350 + } 351 351 + 352 352 + func TestPropertyRemoveWorks(t *testing.T) { 353 353 + f := func(s Set[int], item int) bool { 354 354 + clone := s.Clone() 355 355 + clone.Insert(item) 356 356 + clone.Remove(item) 357 357 + return !clone.Contains(item) 358 358 + } 359 359 + 360 360 + if err := quick.Check(f, nil); err != nil { 361 361 + t.Error(err) 362 362 + } 363 363 + } 364 364 + 365 365 + func TestPropertyClearEmpty(t *testing.T) { 366 366 + f := func(s Set[int]) bool { 367 367 + s.Clear() 368 368 + return s.IsEmpty() && s.Len() == 0 369 369 + } 370 370 + 371 371 + if err := quick.Check(f, nil); err != nil { 372 372 + t.Error(err) 373 373 + } 374 374 + } 375 375 + 376 376 + func TestPropertyIsSubsetReflexive(t *testing.T) { 377 377 + f := func(s Set[int]) bool { 378 378 + return s.IsSubset(s) 379 379 + } 380 380 + 381 381 + if err := quick.Check(f, nil); err != nil { 382 382 + t.Error(err) 383 383 + } 384 384 + } 385 385 + 386 386 + func TestPropertyDeMorganUnion(t *testing.T) { 387 387 + f := func(s1 Set[int], s2 Set[int], universe Set[int]) bool { 388 388 + // create a universe that contains both sets 389 389 + u := universe.Clone() 390 390 + for item := range s1.All() { 391 391 + u.Insert(item) 392 392 + } 393 393 + for item := range s2.All() { 394 394 + u.Insert(item) 395 395 + } 396 396 + 397 397 + // (A u B)' = A' n B' 398 398 + union := Collect(s1.Union(s2)) 399 399 + complementUnion := Collect(u.Difference(union)) 400 400 + 401 401 + complementS1 := Collect(u.Difference(s1)) 402 402 + complementS2 := Collect(u.Difference(s2)) 403 403 + intersectionComplements := Collect(complementS1.Intersection(complementS2)) 404 404 + 405 405 + return complementUnion.Equal(intersectionComplements) 406 406 + } 407 407 + 408 408 + if err := quick.Check(f, nil); err != nil { 409 409 + t.Error(err) 410 410 + } 411 411 + }

+20 -11

spindle/config/config.go

··· 3 3 import ( 4 4 "context" 5 5 "fmt" 6 6 + "path/filepath" 6 7 7 8 "github.com/bluesky-social/indigo/atproto/syntax" 8 9 "github.com/sethvargo/go-envconfig" 9 10 ) 10 11 11 12 type Server struct { 12 12 - ListenAddr string `env:"LISTEN_ADDR, default=0.0.0.0:6555"` 13 13 - DBPath string `env:"DB_PATH, default=spindle.db"` 14 14 - Hostname string `env:"HOSTNAME, required"` 15 15 - JetstreamEndpoint string `env:"JETSTREAM_ENDPOINT, default=wss://jetstream1.us-west.bsky.network/subscribe"` 16 16 - PlcUrl string `env:"PLC_URL, default=https://plc.directory"` 17 17 - Dev bool `env:"DEV, default=false"` 18 18 - Owner string `env:"OWNER, required"` 19 19 - Secrets Secrets `env:",prefix=SECRETS_"` 20 20 - LogDir string `env:"LOG_DIR, default=/var/log/spindle"` 21 21 - QueueSize int `env:"QUEUE_SIZE, default=100"` 22 22 - MaxJobCount int `env:"MAX_JOB_COUNT, default=2"` // max number of jobs that run at a time 13 13 + ListenAddr string `env:"LISTEN_ADDR, default=0.0.0.0:6555"` 14 14 + Hostname string `env:"HOSTNAME, required"` 15 15 + TapUrl string `env:"TAP_URL, required"` 16 16 + PlcUrl string `env:"PLC_URL, default=https://plc.directory"` 17 17 + Dev bool `env:"DEV, default=false"` 18 18 + Owner syntax.DID `env:"OWNER, required"` 19 19 + Secrets Secrets `env:",prefix=SECRETS_"` 20 20 + LogDir string `env:"LOG_DIR, default=/var/log/spindle"` 21 21 + DataDir string `env:"DATA_DIR, default=/var/lib/spindle"` 22 22 + QueueSize int `env:"QUEUE_SIZE, default=100"` 23 23 + MaxJobCount int `env:"MAX_JOB_COUNT, default=2"` // max number of jobs that run at a time 23 24 } 24 25 25 26 func (s Server) Did() syntax.DID { 26 27 return syntax.DID(fmt.Sprintf("did:web:%s", s.Hostname)) 28 28 + } 29 29 + 30 30 + func (s Server) RepoDir() string { 31 31 + return filepath.Join(s.DataDir, "repos") 32 32 + } 33 33 + 34 34 + func (s Server) DBPath() string { 35 35 + return filepath.Join(s.DataDir, "spindle.db") 27 36 } 28 37 29 38 type Secrets struct {

+73 -18

spindle/db/db.go

··· 1 1 package db 2 2 3 3 import ( 4 4 + "context" 4 5 "database/sql" 5 6 "strings" 6 7 8 8 + "github.com/bluesky-social/indigo/atproto/syntax" 7 9 _ "github.com/mattn/go-sqlite3" 10 10 + "tangled.org/core/log" 11 11 + "tangled.org/core/orm" 8 12 ) 9 13 10 14 type DB struct { 11 15 *sql.DB 12 16 } 13 17 14 14 - func Make(dbPath string) (*DB, error) { 18 18 + func Make(ctx context.Context, dbPath string) (*DB, error) { 15 19 // https://github.com/mattn/go-sqlite3#connection-string 16 20 opts := []string{ 17 21 "_foreign_keys=1", ··· 20 24 "_auto_vacuum=incremental", 21 25 } 22 26 27 27 + logger := log.FromContext(ctx) 28 28 + logger = log.SubLogger(logger, "db") 29 29 + 23 30 db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&")) 24 31 if err != nil { 25 32 return nil, err 26 33 } 27 34 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. 35 35 + conn, err := db.Conn(ctx) 36 36 + if err != nil { 37 37 + return nil, err 38 38 + } 39 39 + defer conn.Close() 31 40 32 41 _, err = db.Exec(` 33 42 create table if not exists _jetstream ( ··· 49 58 unique(owner, name) 50 59 ); 51 60 61 61 + create table if not exists repo_collaborators ( 62 62 + -- identifiers 63 63 + id integer primary key autoincrement, 64 64 + did text not null, 65 65 + rkey text not null, 66 66 + at_uri text generated always as ('at://' || did || '/' || 'sh.tangled.repo.collaborator' || '/' || rkey) stored, 67 67 + 68 68 + repo text not null, 69 69 + subject text not null, 70 70 + 71 71 + addedAt text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 72 72 + unique(did, rkey) 73 73 + ); 74 74 + 52 75 create table if not exists spindle_members ( 53 76 -- identifiers for the record 54 77 id integer primary key autoincrement, ··· 76 99 return nil, err 77 100 } 78 101 102 102 + // run migrations 103 103 + 104 104 + // NOTE: this won't migrate existing records 105 105 + // they will be fetched again with tap instead 106 106 + orm.RunMigration(conn, logger, "add-rkey-to-repos", func(tx *sql.Tx) error { 107 107 + // archive legacy repos (just in case) 108 108 + _, err = tx.Exec(`alter table repos rename to repos_old`) 109 109 + if err != nil { 110 110 + return err 111 111 + } 112 112 + 113 113 + _, err := tx.Exec(` 114 114 + create table repos ( 115 115 + -- identifiers 116 116 + id integer primary key autoincrement, 117 117 + did text not null, 118 118 + rkey text not null, 119 119 + at_uri text generated always as ('at://' || did || '/' || 'sh.tangled.repo' || '/' || rkey) stored, 120 120 + 121 121 + name text not null, 122 122 + knot text not null, 123 123 + 124 124 + addedAt text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 125 125 + unique(did, rkey) 126 126 + ); 127 127 + `) 128 128 + if err != nil { 129 129 + return err 130 130 + } 131 131 + 132 132 + return nil 133 133 + }) 134 134 + 79 135 return &DB{db}, nil 80 136 } 81 137 82 82 - func (d *DB) SaveLastTimeUs(lastTimeUs int64) error { 83 83 - _, err := d.Exec(` 84 84 - insert into _jetstream (id, last_time_us) 85 85 - values (1, ?) 86 86 - on conflict(id) do update set last_time_us = excluded.last_time_us 87 87 - `, lastTimeUs) 88 88 - return err 89 89 - } 90 90 - 91 91 - func (d *DB) GetLastTimeUs() (int64, error) { 92 92 - var lastTimeUs int64 93 93 - row := d.QueryRow(`select last_time_us from _jetstream where id = 1;`) 94 94 - err := row.Scan(&lastTimeUs) 95 95 - return lastTimeUs, err 138 138 + func (d *DB) IsKnownDid(did syntax.DID) (bool, error) { 139 139 + // is spindle member / repo collaborator 140 140 + var exists bool 141 141 + err := d.QueryRow( 142 142 + `select exists ( 143 143 + select 1 from repo_collaborators where subject = ? 144 144 + union all 145 145 + select 1 from spindle_members where did = ? 146 146 + )`, 147 147 + did, 148 148 + did, 149 149 + ).Scan(&exists) 150 150 + return exists, err 96 151 }

+10 -8

spindle/db/events.go

··· 18 18 EventJson string `json:"event"` 19 19 } 20 20 21 21 - func (d *DB) InsertEvent(event Event, notifier *notifier.Notifier) error { 21 21 + func (d *DB) insertEvent(event Event, notifier *notifier.Notifier) error { 22 22 _, err := d.Exec( 23 23 `insert into events (rkey, nsid, event, created) values (?, ?, ?, ?)`, 24 24 event.Rkey, ··· 70 70 return evts, nil 71 71 } 72 72 73 73 - func (d *DB) CreateStatusEvent(rkey string, s tangled.PipelineStatus, n *notifier.Notifier) error { 74 74 - eventJson, err := json.Marshal(s) 73 73 + func (d *DB) CreatePipelineEvent(rkey string, pipeline tangled.Pipeline, n *notifier.Notifier) error { 74 74 + eventJson, err := json.Marshal(pipeline) 75 75 if err != nil { 76 76 return err 77 77 } 78 78 - 79 78 event := Event{ 80 79 Rkey: rkey, 81 81 - Nsid: tangled.PipelineStatusNSID, 80 80 + Nsid: tangled.PipelineNSID, 82 81 Created: time.Now().UnixNano(), 83 82 EventJson: string(eventJson), 84 83 } 85 85 - 86 86 - return d.InsertEvent(event, n) 84 84 + return d.insertEvent(event, n) 87 85 } 88 86 89 87 func (d *DB) createStatusEvent( ··· 116 114 EventJson: string(eventJson), 117 115 } 118 116 119 119 - return d.InsertEvent(event, n) 117 117 + return d.insertEvent(event, n) 120 118 121 119 } 122 120 ··· 164 162 165 163 func (d *DB) StatusFailed(workflowId models.WorkflowId, workflowError string, exitCode int64, n *notifier.Notifier) error { 166 164 return d.createStatusEvent(workflowId, models.StatusKindFailed, &workflowError, &exitCode, n) 165 165 + } 166 166 + 167 167 + func (d *DB) StatusCancelled(workflowId models.WorkflowId, workflowError string, exitCode int64, n *notifier.Notifier) error { 168 168 + return d.createStatusEvent(workflowId, models.StatusKindCancelled, &workflowError, &exitCode, n) 167 169 } 168 170 169 171 func (d *DB) StatusSuccess(workflowId models.WorkflowId, n *notifier.Notifier) error {

-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 - }

+120 -11

spindle/db/repos.go

··· 1 1 package db 2 2 3 3 + import "github.com/bluesky-social/indigo/atproto/syntax" 4 4 + 3 5 type Repo struct { 4 4 - Knot string 5 5 - Owner string 6 6 - Name string 6 6 + Did syntax.DID 7 7 + Rkey syntax.RecordKey 8 8 + Name string 9 9 + Knot string 10 10 + } 11 11 + 12 12 + type RepoCollaborator struct { 13 13 + Did syntax.DID 14 14 + Rkey syntax.RecordKey 15 15 + Repo syntax.ATURI 16 16 + Subject syntax.DID 7 17 } 8 18 9 9 - func (d *DB) AddRepo(knot, owner, name string) error { 10 10 - _, err := d.Exec(`insert or ignore into repos (knot, owner, name) values (?, ?, ?)`, knot, owner, name) 19 19 + func (d *DB) PutRepo(repo *Repo) error { 20 20 + _, err := d.Exec( 21 21 + `insert or ignore into repos (did, rkey, name, knot) 22 22 + values (?, ?, ?, ?) 23 23 + on conflict(did, rkey) do update set 24 24 + name = excluded.name, 25 25 + knot = excluded.knot`, 26 26 + repo.Did, 27 27 + repo.Rkey, 28 28 + repo.Name, 29 29 + repo.Knot, 30 30 + ) 31 31 + return err 32 32 + } 33 33 + 34 34 + func (d *DB) DeleteRepo(did syntax.DID, rkey syntax.RecordKey) error { 35 35 + _, err := d.Exec( 36 36 + `delete from repos where did = ? and rkey = ?`, 37 37 + did, 38 38 + rkey, 39 39 + ) 11 40 return err 12 41 } 13 42 ··· 16 45 if err != nil { 17 46 return nil, err 18 47 } 48 48 + defer rows.Close() 19 49 20 50 var knots []string 21 51 for rows.Next() { ··· 33 63 return knots, nil 34 64 } 35 65 36 36 - func (d *DB) GetRepo(knot, owner, name string) (*Repo, error) { 66 66 + func (d *DB) GetRepo(repoAt syntax.ATURI) (*Repo, error) { 37 67 var repo Repo 68 68 + err := d.DB.QueryRow( 69 69 + `select 70 70 + did, 71 71 + rkey, 72 72 + name, 73 73 + knot 74 74 + from repos where at_uri = ?`, 75 75 + repoAt, 76 76 + ).Scan( 77 77 + &repo.Did, 78 78 + &repo.Rkey, 79 79 + &repo.Name, 80 80 + &repo.Knot, 81 81 + ) 82 82 + if err != nil { 83 83 + return nil, err 84 84 + } 85 85 + return &repo, nil 86 86 + } 38 87 39 39 - query := "select knot, owner, name from repos where knot = ? and owner = ? and name = ?" 40 40 - err := d.DB.QueryRow(query, knot, owner, name). 41 41 - Scan(&repo.Knot, &repo.Owner, &repo.Name) 88 88 + func (d *DB) GetRepoWithName(did syntax.DID, name string) (*Repo, error) { 89 89 + var repo Repo 90 90 + err := d.DB.QueryRow( 91 91 + `select 92 92 + did, 93 93 + rkey, 94 94 + name, 95 95 + knot 96 96 + from repos where did = ? and name = ?`, 97 97 + did, 98 98 + name, 99 99 + ).Scan( 100 100 + &repo.Did, 101 101 + &repo.Rkey, 102 102 + &repo.Name, 103 103 + &repo.Knot, 104 104 + ) 105 105 + if err != nil { 106 106 + return nil, err 107 107 + } 108 108 + return &repo, nil 109 109 + } 110 110 + 111 111 + func (d *DB) PutRepoCollaborator(collaborator *RepoCollaborator) error { 112 112 + _, err := d.Exec( 113 113 + `insert into repo_collaborators (did, rkey, repo, subject) 114 114 + values (?, ?, ?, ?) 115 115 + on conflict(did, rkey) do update set 116 116 + repo = excluded.repo, 117 117 + subject = excluded.subject`, 118 118 + collaborator.Did, 119 119 + collaborator.Rkey, 120 120 + collaborator.Repo, 121 121 + collaborator.Subject, 122 122 + ) 123 123 + return err 124 124 + } 125 125 + 126 126 + func (d *DB) RemoveRepoCollaborator(did syntax.DID, rkey syntax.RecordKey) error { 127 127 + _, err := d.Exec( 128 128 + `delete from repo_collaborators where did = ? and rkey = ?`, 129 129 + did, 130 130 + rkey, 131 131 + ) 132 132 + return err 133 133 + } 42 134 135 135 + func (d *DB) GetRepoCollaborator(did syntax.DID, rkey syntax.RecordKey) (*RepoCollaborator, error) { 136 136 + var collaborator RepoCollaborator 137 137 + err := d.DB.QueryRow( 138 138 + `select 139 139 + did, 140 140 + rkey, 141 141 + repo, 142 142 + subject 143 143 + from repo_collaborators 144 144 + where did = ? and rkey = ?`, 145 145 + did, 146 146 + rkey, 147 147 + ).Scan( 148 148 + &collaborator.Did, 149 149 + &collaborator.Rkey, 150 150 + &collaborator.Repo, 151 151 + &collaborator.Subject, 152 152 + ) 43 153 if err != nil { 44 154 return nil, err 45 155 } 46 46 - 47 47 - return &repo, nil 156 156 + return &collaborator, nil 48 157 }

+22 -21

spindle/engine/engine.go

··· 3 3 import ( 4 4 "context" 5 5 "errors" 6 6 - "fmt" 7 6 "log/slog" 7 7 + "sync" 8 8 9 9 securejoin "github.com/cyphar/filepath-securejoin" 10 10 - "golang.org/x/sync/errgroup" 11 10 "tangled.org/core/notifier" 12 11 "tangled.org/core/spindle/config" 13 12 "tangled.org/core/spindle/db" ··· 31 30 } 32 31 } 33 32 34 34 - eg, ctx := errgroup.WithContext(ctx) 33 33 + var wg sync.WaitGroup 35 34 for eng, wfs := range pipeline.Workflows { 36 35 workflowTimeout := eng.WorkflowTimeout() 37 36 l.Info("using workflow timeout", "timeout", workflowTimeout) 38 37 39 38 for _, w := range wfs { 40 40 - eg.Go(func() error { 39 39 + wg.Add(1) 40 40 + go func() { 41 41 + defer wg.Done() 42 42 + 41 43 wid := models.WorkflowId{ 42 44 PipelineId: pipelineId, 43 45 Name: w.Name, ··· 45 47 46 48 err := db.StatusRunning(wid, n) 47 49 if err != nil { 48 48 - return err 50 50 + l.Error("failed to set workflow status to running", "wid", wid, "err", err) 51 51 + return 49 52 } 50 53 51 54 err = eng.SetupWorkflow(ctx, wid, &w) ··· 61 64 62 65 dbErr := db.StatusFailed(wid, err.Error(), -1, n) 63 66 if dbErr != nil { 64 64 - return dbErr 67 67 + l.Error("failed to set workflow status to failed", "wid", wid, "err", dbErr) 65 68 } 66 66 - return err 69 69 + return 67 70 } 68 71 defer eng.DestroyWorkflow(ctx, wid) 69 72 70 70 - wfLogger, err := models.NewWorkflowLogger(cfg.Server.LogDir, wid) 73 73 + secretValues := make([]string, len(allSecrets)) 74 74 + for i, s := range allSecrets { 75 75 + secretValues[i] = s.Value 76 76 + } 77 77 + wfLogger, err := models.NewWorkflowLogger(cfg.Server.LogDir, wid, secretValues) 71 78 if err != nil { 72 79 l.Warn("failed to setup step logger; logs will not be persisted", "error", err) 73 80 wfLogger = nil ··· 99 106 if errors.Is(err, ErrTimedOut) { 100 107 dbErr := db.StatusTimeout(wid, n) 101 108 if dbErr != nil { 102 102 - return dbErr 109 109 + l.Error("failed to set workflow status to timeout", "wid", wid, "err", dbErr) 103 110 } 104 111 } else { 105 112 dbErr := db.StatusFailed(wid, err.Error(), -1, n) 106 113 if dbErr != nil { 107 107 - return dbErr 114 114 + l.Error("failed to set workflow status to failed", "wid", wid, "err", dbErr) 108 115 } 109 116 } 110 110 - 111 111 - return fmt.Errorf("starting steps image: %w", err) 117 117 + return 112 118 } 113 119 } 114 120 115 121 err = db.StatusSuccess(wid, n) 116 122 if err != nil { 117 117 - return err 123 123 + l.Error("failed to set workflow status to success", "wid", wid, "err", err) 118 124 } 119 119 - 120 120 - return nil 121 121 - }) 125 125 + }() 122 126 } 123 127 } 124 128 125 125 - if err := eg.Wait(); err != nil { 126 126 - l.Error("failed to run one or more workflows", "err", err) 127 127 - } else { 128 128 - l.Info("successfully ran full pipeline") 129 129 - } 129 129 + wg.Wait() 130 130 + l.Info("all workflows completed") 130 131 }

+29 -16

spindle/engines/nixery/engine.go

··· 179 179 return err 180 180 } 181 181 e.registerCleanup(wid, func(ctx context.Context) error { 182 182 - return e.docker.NetworkRemove(ctx, networkName(wid)) 182 182 + if err := e.docker.NetworkRemove(ctx, networkName(wid)); err != nil { 183 183 + return fmt.Errorf("removing network: %w", err) 184 184 + } 185 185 + return nil 183 186 }) 184 187 185 188 addl := wf.Data.(addlFields) ··· 229 232 return fmt.Errorf("creating container: %w", err) 230 233 } 231 234 e.registerCleanup(wid, func(ctx context.Context) error { 232 232 - err = e.docker.ContainerStop(ctx, resp.ID, container.StopOptions{}) 233 233 - if err != nil { 234 234 - return err 235 235 + if err := e.docker.ContainerStop(ctx, resp.ID, container.StopOptions{}); err != nil { 236 236 + return fmt.Errorf("stopping container: %w", err) 235 237 } 236 238 237 237 - return e.docker.ContainerRemove(ctx, resp.ID, container.RemoveOptions{ 239 239 + err := e.docker.ContainerRemove(ctx, resp.ID, container.RemoveOptions{ 238 240 RemoveVolumes: true, 239 241 RemoveLinks: false, 240 242 Force: false, 241 243 }) 244 244 + if err != nil { 245 245 + return fmt.Errorf("removing container: %w", err) 246 246 + } 247 247 + return nil 242 248 }) 243 249 244 244 - err = e.docker.ContainerStart(ctx, resp.ID, container.StartOptions{}) 245 245 - if err != nil { 250 250 + if err := e.docker.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil { 246 251 return fmt.Errorf("starting container: %w", err) 247 252 } 248 253 ··· 294 299 workflowEnvs.AddEnv(s.Key, s.Value) 295 300 } 296 301 297 297 - step := w.Steps[idx].(Step) 302 302 + step := w.Steps[idx] 298 303 299 304 select { 300 305 case <-ctx.Done(): ··· 303 308 } 304 309 305 310 envs := append(EnvVars(nil), workflowEnvs...) 306 306 - for k, v := range step.environment { 307 307 - envs.AddEnv(k, v) 311 311 + if nixStep, ok := step.(Step); ok { 312 312 + for k, v := range nixStep.environment { 313 313 + envs.AddEnv(k, v) 314 314 + } 308 315 } 309 316 envs.AddEnv("HOME", homeDir) 310 317 ··· 392 399 } 393 400 394 401 func (e *Engine) DestroyWorkflow(ctx context.Context, wid models.WorkflowId) error { 395 395 - e.cleanupMu.Lock() 396 396 - key := wid.String() 397 397 - 398 398 - fns := e.cleanup[key] 399 399 - delete(e.cleanup, key) 400 400 - e.cleanupMu.Unlock() 402 402 + fns := e.drainCleanups(wid) 401 403 402 404 for _, fn := range fns { 403 405 if err := fn(ctx); err != nil { ··· 413 415 414 416 key := wid.String() 415 417 e.cleanup[key] = append(e.cleanup[key], fn) 418 418 + } 419 419 + 420 420 + func (e *Engine) drainCleanups(wid models.WorkflowId) []cleanupFunc { 421 421 + e.cleanupMu.Lock() 422 422 + key := wid.String() 423 423 + 424 424 + fns := e.cleanup[key] 425 425 + delete(e.cleanup, key) 426 426 + e.cleanupMu.Unlock() 427 427 + 428 428 + return fns 416 429 } 417 430 418 431 func networkName(wid models.WorkflowId) string {

+73

spindle/git/git.go

··· 1 1 + package git 2 2 + 3 3 + import ( 4 4 + "bytes" 5 5 + "context" 6 6 + "fmt" 7 7 + "os" 8 8 + "os/exec" 9 9 + "strings" 10 10 + 11 11 + "github.com/hashicorp/go-version" 12 12 + ) 13 13 + 14 14 + func Version() (*version.Version, error) { 15 15 + var buf bytes.Buffer 16 16 + cmd := exec.Command("git", "version") 17 17 + cmd.Stdout = &buf 18 18 + cmd.Stderr = os.Stderr 19 19 + err := cmd.Run() 20 20 + if err != nil { 21 21 + return nil, err 22 22 + } 23 23 + fields := strings.Fields(buf.String()) 24 24 + if len(fields) < 3 { 25 25 + return nil, fmt.Errorf("invalid git version: %s", buf.String()) 26 26 + } 27 27 + 28 28 + // version string is like: "git version 2.29.3" or "git version 2.29.3.windows.1" 29 29 + versionString := fields[2] 30 30 + if pos := strings.Index(versionString, "windows"); pos >= 1 { 31 31 + versionString = versionString[:pos-1] 32 32 + } 33 33 + return version.NewVersion(versionString) 34 34 + } 35 35 + 36 36 + const WorkflowDir = `/.tangled/workflows` 37 37 + 38 38 + func SparseSyncGitRepo(ctx context.Context, cloneUri, path, rev string) error { 39 39 + exist, err := isDir(path) 40 40 + if err != nil { 41 41 + return err 42 42 + } 43 43 + if rev == "" { 44 44 + rev = "HEAD" 45 45 + } 46 46 + if !exist { 47 47 + if err := exec.Command("git", "clone", "--no-checkout", "--depth=1", "--filter=tree:0", "--revision="+rev, cloneUri, path).Run(); err != nil { 48 48 + return fmt.Errorf("git clone: %w", err) 49 49 + } 50 50 + if err := exec.Command("git", "-C", path, "sparse-checkout", "set", "--no-cone", WorkflowDir).Run(); err != nil { 51 51 + return fmt.Errorf("git sparse-checkout set: %w", err) 52 52 + } 53 53 + } else { 54 54 + if err := exec.Command("git", "-C", path, "fetch", "--depth=1", "--filter=tree:0", "origin", rev).Run(); err != nil { 55 55 + return fmt.Errorf("git pull: %w", err) 56 56 + } 57 57 + } 58 58 + if err := exec.Command("git", "-C", path, "checkout", rev).Run(); err != nil { 59 59 + return fmt.Errorf("git checkout: %w", err) 60 60 + } 61 61 + return nil 62 62 + } 63 63 + 64 64 + func isDir(path string) (bool, error) { 65 65 + info, err := os.Stat(path) 66 66 + if err == nil && info.IsDir() { 67 67 + return true, nil 68 68 + } 69 69 + if os.IsNotExist(err) { 70 70 + return false, nil 71 71 + } 72 72 + return false, err 73 73 + }

-300

spindle/ingester.go

··· 1 1 - package spindle 2 2 - 3 3 - import ( 4 4 - "context" 5 5 - "encoding/json" 6 6 - "errors" 7 7 - "fmt" 8 8 - "time" 9 9 - 10 10 - "tangled.org/core/api/tangled" 11 11 - "tangled.org/core/eventconsumer" 12 12 - "tangled.org/core/rbac" 13 13 - "tangled.org/core/spindle/db" 14 14 - 15 15 - comatproto "github.com/bluesky-social/indigo/api/atproto" 16 16 - "github.com/bluesky-social/indigo/atproto/identity" 17 17 - "github.com/bluesky-social/indigo/atproto/syntax" 18 18 - "github.com/bluesky-social/indigo/xrpc" 19 19 - "github.com/bluesky-social/jetstream/pkg/models" 20 20 - securejoin "github.com/cyphar/filepath-securejoin" 21 21 - ) 22 22 - 23 23 - type Ingester func(ctx context.Context, e *models.Event) error 24 24 - 25 25 - func (s *Spindle) ingest() Ingester { 26 26 - return func(ctx context.Context, e *models.Event) error { 27 27 - var err error 28 28 - defer func() { 29 29 - eventTime := e.TimeUS 30 30 - lastTimeUs := eventTime + 1 31 31 - if err := s.db.SaveLastTimeUs(lastTimeUs); err != nil { 32 32 - err = fmt.Errorf("(deferred) failed to save last time us: %w", err) 33 33 - } 34 34 - }() 35 35 - 36 36 - if e.Kind != models.EventKindCommit { 37 37 - return nil 38 38 - } 39 39 - 40 40 - switch e.Commit.Collection { 41 41 - case tangled.SpindleMemberNSID: 42 42 - err = s.ingestMember(ctx, e) 43 43 - case tangled.RepoNSID: 44 44 - err = s.ingestRepo(ctx, e) 45 45 - case tangled.RepoCollaboratorNSID: 46 46 - err = s.ingestCollaborator(ctx, e) 47 47 - } 48 48 - 49 49 - if err != nil { 50 50 - s.l.Debug("failed to process message", "nsid", e.Commit.Collection, "err", err) 51 51 - } 52 52 - 53 53 - return nil 54 54 - } 55 55 - } 56 56 - 57 57 - func (s *Spindle) ingestMember(_ context.Context, e *models.Event) error { 58 58 - var err error 59 59 - did := e.Did 60 60 - rkey := e.Commit.RKey 61 61 - 62 62 - l := s.l.With("component", "ingester", "record", tangled.SpindleMemberNSID) 63 63 - 64 64 - switch e.Commit.Operation { 65 65 - case models.CommitOperationCreate, models.CommitOperationUpdate: 66 66 - raw := e.Commit.Record 67 67 - record := tangled.SpindleMember{} 68 68 - err = json.Unmarshal(raw, &record) 69 69 - if err != nil { 70 70 - l.Error("invalid record", "error", err) 71 71 - return err 72 72 - } 73 73 - 74 74 - domain := s.cfg.Server.Hostname 75 75 - recordInstance := record.Instance 76 76 - 77 77 - if recordInstance != domain { 78 78 - l.Error("domain mismatch", "domain", recordInstance, "expected", domain) 79 79 - return fmt.Errorf("domain mismatch: %s != %s", record.Instance, domain) 80 80 - } 81 81 - 82 82 - ok, err := s.e.IsSpindleInviteAllowed(did, rbacDomain) 83 83 - if err != nil || !ok { 84 84 - l.Error("failed to add member", "did", did, "error", err) 85 85 - return fmt.Errorf("failed to enforce permissions: %w", err) 86 86 - } 87 87 - 88 88 - if err := db.AddSpindleMember(s.db, db.SpindleMember{ 89 89 - Did: syntax.DID(did), 90 90 - Rkey: rkey, 91 91 - Instance: recordInstance, 92 92 - Subject: syntax.DID(record.Subject), 93 93 - Created: time.Now(), 94 94 - }); err != nil { 95 95 - l.Error("failed to add member", "error", err) 96 96 - return fmt.Errorf("failed to add member: %w", err) 97 97 - } 98 98 - 99 99 - if err := s.e.AddSpindleMember(rbacDomain, record.Subject); err != nil { 100 100 - l.Error("failed to add member", "error", err) 101 101 - return fmt.Errorf("failed to add member: %w", err) 102 102 - } 103 103 - l.Info("added member from firehose", "member", record.Subject) 104 104 - 105 105 - if err := s.db.AddDid(record.Subject); err != nil { 106 106 - l.Error("failed to add did", "error", err) 107 107 - return fmt.Errorf("failed to add did: %w", err) 108 108 - } 109 109 - s.jc.AddDid(record.Subject) 110 110 - 111 111 - return nil 112 112 - 113 113 - case models.CommitOperationDelete: 114 114 - record, err := db.GetSpindleMember(s.db, did, rkey) 115 115 - if err != nil { 116 116 - l.Error("failed to find member", "error", err) 117 117 - return fmt.Errorf("failed to find member: %w", err) 118 118 - } 119 119 - 120 120 - if err := db.RemoveSpindleMember(s.db, did, rkey); err != nil { 121 121 - l.Error("failed to remove member", "error", err) 122 122 - return fmt.Errorf("failed to remove member: %w", err) 123 123 - } 124 124 - 125 125 - if err := s.e.RemoveSpindleMember(rbacDomain, record.Subject.String()); err != nil { 126 126 - l.Error("failed to add member", "error", err) 127 127 - return fmt.Errorf("failed to add member: %w", err) 128 128 - } 129 129 - l.Info("added member from firehose", "member", record.Subject) 130 130 - 131 131 - if err := s.db.RemoveDid(record.Subject.String()); err != nil { 132 132 - l.Error("failed to add did", "error", err) 133 133 - return fmt.Errorf("failed to add did: %w", err) 134 134 - } 135 135 - s.jc.RemoveDid(record.Subject.String()) 136 136 - 137 137 - } 138 138 - return nil 139 139 - } 140 140 - 141 141 - func (s *Spindle) ingestRepo(ctx context.Context, e *models.Event) error { 142 142 - var err error 143 143 - did := e.Did 144 144 - 145 145 - l := s.l.With("component", "ingester", "record", tangled.RepoNSID) 146 146 - 147 147 - l.Info("ingesting repo record", "did", did) 148 148 - 149 149 - switch e.Commit.Operation { 150 150 - case models.CommitOperationCreate, models.CommitOperationUpdate: 151 151 - raw := e.Commit.Record 152 152 - record := tangled.Repo{} 153 153 - err = json.Unmarshal(raw, &record) 154 154 - if err != nil { 155 155 - l.Error("invalid record", "error", err) 156 156 - return err 157 157 - } 158 158 - 159 159 - domain := s.cfg.Server.Hostname 160 160 - 161 161 - // no spindle configured for this repo 162 162 - if record.Spindle == nil { 163 163 - l.Info("no spindle configured", "name", record.Name) 164 164 - return nil 165 165 - } 166 166 - 167 167 - // this repo did not want this spindle 168 168 - if *record.Spindle != domain { 169 169 - l.Info("different spindle configured", "name", record.Name, "spindle", *record.Spindle, "domain", domain) 170 170 - return nil 171 171 - } 172 172 - 173 173 - // add this repo to the watch list 174 174 - if err := s.db.AddRepo(record.Knot, did, record.Name); err != nil { 175 175 - l.Error("failed to add repo", "error", err) 176 176 - return fmt.Errorf("failed to add repo: %w", err) 177 177 - } 178 178 - 179 179 - didSlashRepo, err := securejoin.SecureJoin(did, record.Name) 180 180 - if err != nil { 181 181 - return err 182 182 - } 183 183 - 184 184 - // add repo to rbac 185 185 - if err := s.e.AddRepo(did, rbac.ThisServer, didSlashRepo); err != nil { 186 186 - l.Error("failed to add repo to enforcer", "error", err) 187 187 - return fmt.Errorf("failed to add repo: %w", err) 188 188 - } 189 189 - 190 190 - // add collaborators to rbac 191 191 - owner, err := s.res.ResolveIdent(ctx, did) 192 192 - if err != nil || owner.Handle.IsInvalidHandle() { 193 193 - return err 194 194 - } 195 195 - if err := s.fetchAndAddCollaborators(ctx, owner, didSlashRepo); err != nil { 196 196 - return err 197 197 - } 198 198 - 199 199 - // add this knot to the event consumer 200 200 - src := eventconsumer.NewKnotSource(record.Knot) 201 201 - s.ks.AddSource(context.Background(), src) 202 202 - 203 203 - return nil 204 204 - 205 205 - } 206 206 - return nil 207 207 - } 208 208 - 209 209 - func (s *Spindle) ingestCollaborator(ctx context.Context, e *models.Event) error { 210 210 - var err error 211 211 - 212 212 - l := s.l.With("component", "ingester", "record", tangled.RepoCollaboratorNSID, "did", e.Did) 213 213 - 214 214 - l.Info("ingesting collaborator record") 215 215 - 216 216 - switch e.Commit.Operation { 217 217 - case models.CommitOperationCreate, models.CommitOperationUpdate: 218 218 - raw := e.Commit.Record 219 219 - record := tangled.RepoCollaborator{} 220 220 - err = json.Unmarshal(raw, &record) 221 221 - if err != nil { 222 222 - l.Error("invalid record", "error", err) 223 223 - return err 224 224 - } 225 225 - 226 226 - subjectId, err := s.res.ResolveIdent(ctx, record.Subject) 227 227 - if err != nil || subjectId.Handle.IsInvalidHandle() { 228 228 - return err 229 229 - } 230 230 - 231 231 - repoAt, err := syntax.ParseATURI(record.Repo) 232 232 - if err != nil { 233 233 - l.Info("rejecting record, invalid repoAt", "repoAt", record.Repo) 234 234 - return nil 235 235 - } 236 236 - 237 237 - // TODO: get rid of this entirely 238 238 - // resolve this aturi to extract the repo record 239 239 - owner, err := s.res.ResolveIdent(ctx, repoAt.Authority().String()) 240 240 - if err != nil || owner.Handle.IsInvalidHandle() { 241 241 - return fmt.Errorf("failed to resolve handle: %w", err) 242 242 - } 243 243 - 244 244 - xrpcc := xrpc.Client{ 245 245 - Host: owner.PDSEndpoint(), 246 246 - } 247 247 - 248 248 - resp, err := comatproto.RepoGetRecord(ctx, &xrpcc, "", tangled.RepoNSID, repoAt.Authority().String(), repoAt.RecordKey().String()) 249 249 - if err != nil { 250 250 - return err 251 251 - } 252 252 - 253 253 - repo := resp.Value.Val.(*tangled.Repo) 254 254 - didSlashRepo, _ := securejoin.SecureJoin(owner.DID.String(), repo.Name) 255 255 - 256 256 - // check perms for this user 257 257 - if ok, err := s.e.IsCollaboratorInviteAllowed(owner.DID.String(), rbac.ThisServer, didSlashRepo); !ok || err != nil { 258 258 - return fmt.Errorf("insufficient permissions: %w", err) 259 259 - } 260 260 - 261 261 - // add collaborator to rbac 262 262 - if err := s.e.AddCollaborator(record.Subject, rbac.ThisServer, didSlashRepo); err != nil { 263 263 - l.Error("failed to add repo to enforcer", "error", err) 264 264 - return fmt.Errorf("failed to add repo: %w", err) 265 265 - } 266 266 - 267 267 - return nil 268 268 - } 269 269 - return nil 270 270 - } 271 271 - 272 272 - func (s *Spindle) fetchAndAddCollaborators(ctx context.Context, owner *identity.Identity, didSlashRepo string) error { 273 273 - l := s.l.With("component", "ingester", "handler", "fetchAndAddCollaborators") 274 274 - 275 275 - l.Info("fetching and adding existing collaborators") 276 276 - 277 277 - xrpcc := xrpc.Client{ 278 278 - Host: owner.PDSEndpoint(), 279 279 - } 280 280 - 281 281 - resp, err := comatproto.RepoListRecords(ctx, &xrpcc, tangled.RepoCollaboratorNSID, "", 50, owner.DID.String(), false) 282 282 - if err != nil { 283 283 - return err 284 284 - } 285 285 - 286 286 - var errs error 287 287 - for _, r := range resp.Records { 288 288 - if r == nil { 289 289 - continue 290 290 - } 291 291 - record := r.Value.Val.(*tangled.RepoCollaborator) 292 292 - 293 293 - if err := s.e.AddCollaborator(record.Subject, rbac.ThisServer, didSlashRepo); err != nil { 294 294 - l.Error("failed to add repo to enforcer", "error", err) 295 295 - errors.Join(errs, fmt.Errorf("failed to add repo: %w", err)) 296 296 - } 297 297 - } 298 298 - 299 299 - return errs 300 300 - }

+6 -1

spindle/models/logger.go

··· 12 12 type WorkflowLogger struct { 13 13 file *os.File 14 14 encoder *json.Encoder 15 15 + mask *SecretMask 15 16 } 16 17 17 17 - func NewWorkflowLogger(baseDir string, wid WorkflowId) (*WorkflowLogger, error) { 18 18 + func NewWorkflowLogger(baseDir string, wid WorkflowId, secretValues []string) (*WorkflowLogger, error) { 18 19 path := LogFilePath(baseDir, wid) 19 20 20 21 file, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644) ··· 25 26 return &WorkflowLogger{ 26 27 file: file, 27 28 encoder: json.NewEncoder(file), 29 29 + mask: NewSecretMask(secretValues), 28 30 }, nil 29 31 } 30 32 ··· 62 64 63 65 func (w *dataWriter) Write(p []byte) (int, error) { 64 66 line := strings.TrimRight(string(p), "\r\n") 67 67 + if w.logger.mask != nil { 68 68 + line = w.logger.mask.Mask(line) 69 69 + } 65 70 entry := NewDataLogLine(w.idx, line, w.stream) 66 71 if err := w.logger.encoder.Encode(entry); err != nil { 67 72 return 0, err

+1 -1

spindle/models/pipeline_env.go

··· 20 20 // Standard CI environment variable 21 21 env["CI"] = "true" 22 22 23 23 - env["TANGLED_PIPELINE_ID"] = pipelineId.Rkey 23 23 + env["TANGLED_PIPELINE_ID"] = pipelineId.AtUri().String() 24 24 25 25 // Repo info 26 26 if tr.Repo != nil {

+51

spindle/models/secret_mask.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "encoding/base64" 5 5 + "strings" 6 6 + ) 7 7 + 8 8 + // SecretMask replaces secret values in strings with "***". 9 9 + type SecretMask struct { 10 10 + replacer *strings.Replacer 11 11 + } 12 12 + 13 13 + // NewSecretMask creates a mask for the given secret values. 14 14 + // Also registers base64-encoded variants of each secret. 15 15 + func NewSecretMask(values []string) *SecretMask { 16 16 + var pairs []string 17 17 + 18 18 + for _, value := range values { 19 19 + if value == "" { 20 20 + continue 21 21 + } 22 22 + 23 23 + pairs = append(pairs, value, "***") 24 24 + 25 25 + b64 := base64.StdEncoding.EncodeToString([]byte(value)) 26 26 + if b64 != value { 27 27 + pairs = append(pairs, b64, "***") 28 28 + } 29 29 + 30 30 + b64NoPad := strings.TrimRight(b64, "=") 31 31 + if b64NoPad != b64 && b64NoPad != value { 32 32 + pairs = append(pairs, b64NoPad, "***") 33 33 + } 34 34 + } 35 35 + 36 36 + if len(pairs) == 0 { 37 37 + return nil 38 38 + } 39 39 + 40 40 + return &SecretMask{ 41 41 + replacer: strings.NewReplacer(pairs...), 42 42 + } 43 43 + } 44 44 + 45 45 + // Mask replaces all registered secret values with "***". 46 46 + func (m *SecretMask) Mask(input string) string { 47 47 + if m == nil || m.replacer == nil { 48 48 + return input 49 49 + } 50 50 + return m.replacer.Replace(input) 51 51 + }

+135

spindle/models/secret_mask_test.go

··· 1 1 + package models 2 2 + 3 3 + import ( 4 4 + "encoding/base64" 5 5 + "testing" 6 6 + ) 7 7 + 8 8 + func TestSecretMask_BasicMasking(t *testing.T) { 9 9 + mask := NewSecretMask([]string{"mysecret123"}) 10 10 + 11 11 + input := "The password is mysecret123 in this log" 12 12 + expected := "The password is *** in this log" 13 13 + 14 14 + result := mask.Mask(input) 15 15 + if result != expected { 16 16 + t.Errorf("expected %q, got %q", expected, result) 17 17 + } 18 18 + } 19 19 + 20 20 + func TestSecretMask_Base64Encoded(t *testing.T) { 21 21 + secret := "mysecret123" 22 22 + mask := NewSecretMask([]string{secret}) 23 23 + 24 24 + b64 := base64.StdEncoding.EncodeToString([]byte(secret)) 25 25 + input := "Encoded: " + b64 26 26 + expected := "Encoded: ***" 27 27 + 28 28 + result := mask.Mask(input) 29 29 + if result != expected { 30 30 + t.Errorf("expected %q, got %q", expected, result) 31 31 + } 32 32 + } 33 33 + 34 34 + func TestSecretMask_Base64NoPadding(t *testing.T) { 35 35 + // "test" encodes to "dGVzdA==" with padding 36 36 + secret := "test" 37 37 + mask := NewSecretMask([]string{secret}) 38 38 + 39 39 + b64NoPad := "dGVzdA" // base64 without padding 40 40 + input := "Token: " + b64NoPad 41 41 + expected := "Token: ***" 42 42 + 43 43 + result := mask.Mask(input) 44 44 + if result != expected { 45 45 + t.Errorf("expected %q, got %q", expected, result) 46 46 + } 47 47 + } 48 48 + 49 49 + func TestSecretMask_MultipleSecrets(t *testing.T) { 50 50 + mask := NewSecretMask([]string{"password1", "apikey123"}) 51 51 + 52 52 + input := "Using password1 and apikey123 for auth" 53 53 + expected := "Using *** and *** for auth" 54 54 + 55 55 + result := mask.Mask(input) 56 56 + if result != expected { 57 57 + t.Errorf("expected %q, got %q", expected, result) 58 58 + } 59 59 + } 60 60 + 61 61 + func TestSecretMask_MultipleOccurrences(t *testing.T) { 62 62 + mask := NewSecretMask([]string{"secret"}) 63 63 + 64 64 + input := "secret appears twice: secret" 65 65 + expected := "*** appears twice: ***" 66 66 + 67 67 + result := mask.Mask(input) 68 68 + if result != expected { 69 69 + t.Errorf("expected %q, got %q", expected, result) 70 70 + } 71 71 + } 72 72 + 73 73 + func TestSecretMask_ShortValues(t *testing.T) { 74 74 + mask := NewSecretMask([]string{"abc", "xy", ""}) 75 75 + 76 76 + if mask == nil { 77 77 + t.Fatal("expected non-nil mask") 78 78 + } 79 79 + 80 80 + input := "abc xy test" 81 81 + expected := "*** *** test" 82 82 + result := mask.Mask(input) 83 83 + if result != expected { 84 84 + t.Errorf("expected %q, got %q", expected, result) 85 85 + } 86 86 + } 87 87 + 88 88 + func TestSecretMask_NilMask(t *testing.T) { 89 89 + var mask *SecretMask 90 90 + 91 91 + input := "some input text" 92 92 + result := mask.Mask(input) 93 93 + if result != input { 94 94 + t.Errorf("expected %q, got %q", input, result) 95 95 + } 96 96 + } 97 97 + 98 98 + func TestSecretMask_EmptyInput(t *testing.T) { 99 99 + mask := NewSecretMask([]string{"secret"}) 100 100 + 101 101 + result := mask.Mask("") 102 102 + if result != "" { 103 103 + t.Errorf("expected empty string, got %q", result) 104 104 + } 105 105 + } 106 106 + 107 107 + func TestSecretMask_NoMatch(t *testing.T) { 108 108 + mask := NewSecretMask([]string{"secretvalue"}) 109 109 + 110 110 + input := "nothing to mask here" 111 111 + result := mask.Mask(input) 112 112 + if result != input { 113 113 + t.Errorf("expected %q, got %q", input, result) 114 114 + } 115 115 + } 116 116 + 117 117 + func TestSecretMask_EmptySecretsList(t *testing.T) { 118 118 + mask := NewSecretMask([]string{}) 119 119 + 120 120 + if mask != nil { 121 121 + t.Error("expected nil mask for empty secrets list") 122 122 + } 123 123 + } 124 124 + 125 125 + func TestSecretMask_EmptySecretsFiltered(t *testing.T) { 126 126 + mask := NewSecretMask([]string{"ab", "validpassword", "", "xyz"}) 127 127 + 128 128 + input := "Using validpassword here" 129 129 + expected := "Using *** here" 130 130 + 131 131 + result := mask.Mask(input) 132 132 + if result != expected { 133 133 + t.Errorf("expected %q, got %q", expected, result) 134 134 + } 135 135 + }

+1 -1

spindle/motd

··· 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 23 23 + This is a spindle server. More info at https://docs.tangled.org/spindles.html#spindles 24 24 25 25 Most API routes are under /xrpc/

+223 -150

spindle/server.go

··· 4 4 "context" 5 5 _ "embed" 6 6 "encoding/json" 7 7 + "errors" 7 8 "fmt" 8 9 "log/slog" 9 10 "maps" 10 11 "net/http" 12 12 + "path/filepath" 11 13 14 14 + "github.com/bluesky-social/indigo/atproto/syntax" 12 15 "github.com/go-chi/chi/v5" 16 16 + "github.com/go-git/go-git/v5/plumbing/object" 17 17 + "github.com/hashicorp/go-version" 13 18 "tangled.org/core/api/tangled" 14 19 "tangled.org/core/eventconsumer" 15 20 "tangled.org/core/eventconsumer/cursor" 16 21 "tangled.org/core/idresolver" 17 17 - "tangled.org/core/jetstream" 22 22 + kgit "tangled.org/core/knotserver/git" 18 23 "tangled.org/core/log" 19 24 "tangled.org/core/notifier" 20 20 - "tangled.org/core/rbac" 25 25 + "tangled.org/core/rbac2" 21 26 "tangled.org/core/spindle/config" 22 27 "tangled.org/core/spindle/db" 23 28 "tangled.org/core/spindle/engine" 24 29 "tangled.org/core/spindle/engines/nixery" 30 30 + "tangled.org/core/spindle/git" 25 31 "tangled.org/core/spindle/models" 26 32 "tangled.org/core/spindle/queue" 27 33 "tangled.org/core/spindle/secrets" 28 34 "tangled.org/core/spindle/xrpc" 35 35 + "tangled.org/core/tap" 36 36 + "tangled.org/core/tid" 37 37 + "tangled.org/core/workflow" 29 38 "tangled.org/core/xrpc/serviceauth" 30 39 ) 31 40 32 41 //go:embed motd 33 42 var motd []byte 34 34 - 35 35 - const ( 36 36 - rbacDomain = "thisserver" 37 37 - ) 38 43 39 44 type Spindle struct { 40 40 - jc *jetstream.JetstreamClient 45 45 + tap *tap.Client 41 46 db *db.DB 42 42 - e *rbac.Enforcer 47 47 + e *rbac2.Enforcer 43 48 l *slog.Logger 44 49 n *notifier.Notifier 45 50 engs map[string]models.Engine ··· 54 59 func New(ctx context.Context, cfg *config.Config, engines map[string]models.Engine) (*Spindle, error) { 55 60 logger := log.FromContext(ctx) 56 61 57 57 - d, err := db.Make(cfg.Server.DBPath) 62 62 + if err := ensureGitVersion(); err != nil { 63 63 + return nil, fmt.Errorf("ensuring git version: %w", err) 64 64 + } 65 65 + 66 66 + d, err := db.Make(ctx, cfg.Server.DBPath()) 58 67 if err != nil { 59 68 return nil, fmt.Errorf("failed to setup db: %w", err) 60 69 } 61 70 62 62 - e, err := rbac.NewEnforcer(cfg.Server.DBPath) 71 71 + e, err := rbac2.NewEnforcer(cfg.Server.DBPath()) 63 72 if err != nil { 64 73 return nil, fmt.Errorf("failed to setup rbac enforcer: %w", err) 65 74 } 66 66 - e.E.EnableAutoSave(true) 67 75 68 76 n := notifier.New() 69 77 ··· 83 91 } 84 92 logger.Info("using openbao secrets provider", "proxy_address", cfg.Server.Secrets.OpenBao.ProxyAddr, "mount", cfg.Server.Secrets.OpenBao.Mount) 85 93 case "sqlite", "": 86 86 - vault, err = secrets.NewSQLiteManager(cfg.Server.DBPath, secrets.WithTableName("secrets")) 94 94 + vault, err = secrets.NewSQLiteManager(cfg.Server.DBPath(), secrets.WithTableName("secrets")) 87 95 if err != nil { 88 96 return nil, fmt.Errorf("failed to setup sqlite secrets provider: %w", err) 89 97 } 90 90 - logger.Info("using sqlite secrets provider", "path", cfg.Server.DBPath) 98 98 + logger.Info("using sqlite secrets provider", "path", cfg.Server.DBPath()) 91 99 default: 92 100 return nil, fmt.Errorf("unknown secrets provider: %s", cfg.Server.Secrets.Provider) 93 101 } ··· 95 103 jq := queue.NewQueue(cfg.Server.QueueSize, cfg.Server.MaxJobCount) 96 104 logger.Info("initialized queue", "queueSize", cfg.Server.QueueSize, "numWorkers", cfg.Server.MaxJobCount) 97 105 98 98 - collections := []string{ 99 99 - tangled.SpindleMemberNSID, 100 100 - tangled.RepoNSID, 101 101 - tangled.RepoCollaboratorNSID, 102 102 - } 103 103 - jc, err := jetstream.NewJetstreamClient(cfg.Server.JetstreamEndpoint, "spindle", collections, nil, log.SubLogger(logger, "jetstream"), d, true, true) 104 104 - if err != nil { 105 105 - return nil, fmt.Errorf("failed to setup jetstream client: %w", err) 106 106 - } 107 107 - jc.AddDid(cfg.Server.Owner) 108 108 - 109 109 - // Check if the spindle knows about any Dids; 110 110 - dids, err := d.GetAllDids() 111 111 - if err != nil { 112 112 - return nil, fmt.Errorf("failed to get all dids: %w", err) 113 113 - } 114 114 - for _, d := range dids { 115 115 - jc.AddDid(d) 116 116 - } 106 106 + tap := tap.NewClient(cfg.Server.TapUrl, "") 117 107 118 108 resolver := idresolver.DefaultResolver(cfg.Server.PlcUrl) 119 109 120 110 spindle := &Spindle{ 121 121 - jc: jc, 111 111 + tap: &tap, 122 112 e: e, 123 113 db: d, 124 114 l: logger, ··· 130 120 vault: vault, 131 121 } 132 122 133 133 - err = e.AddSpindle(rbacDomain) 134 134 - if err != nil { 135 135 - return nil, fmt.Errorf("failed to set rbac domain: %w", err) 136 136 - } 137 137 - err = spindle.configureOwner() 123 123 + err = e.SetSpindleOwner(spindle.cfg.Server.Owner, spindle.cfg.Server.Did()) 138 124 if err != nil { 139 125 return nil, err 140 126 } 141 127 logger.Info("owner set", "did", cfg.Server.Owner) 142 128 143 143 - cursorStore, err := cursor.NewSQLiteStore(cfg.Server.DBPath) 129 129 + cursorStore, err := cursor.NewSQLiteStore(cfg.Server.DBPath()) 144 130 if err != nil { 145 131 return nil, fmt.Errorf("failed to setup sqlite3 cursor store: %w", err) 146 132 } 147 133 148 148 - err = jc.StartJetstream(ctx, spindle.ingest()) 149 149 - if err != nil { 150 150 - return nil, fmt.Errorf("failed to start jetstream consumer: %w", err) 151 151 - } 152 152 - 153 153 - // for each incoming sh.tangled.pipeline, we execute 154 154 - // spindle.processPipeline, which in turn enqueues the pipeline 155 155 - // job in the above registered queue. 134 134 + // spindle listen to knot stream for sh.tangled.git.refUpdate 135 135 + // which will sync the local workflow files in spindle and enqueues the 136 136 + // pipeline job for on-push workflows 156 137 ccfg := eventconsumer.NewConsumerConfig() 157 138 ccfg.Logger = log.SubLogger(logger, "eventconsumer") 158 139 ccfg.Dev = cfg.Server.Dev 159 159 - ccfg.ProcessFunc = spindle.processPipeline 140 140 + ccfg.ProcessFunc = spindle.processKnotStream 160 141 ccfg.CursorStore = cursorStore 161 142 knownKnots, err := d.Knots() 162 143 if err != nil { ··· 197 178 } 198 179 199 180 // Enforcer returns the RBAC enforcer instance. 200 200 - func (s *Spindle) Enforcer() *rbac.Enforcer { 181 181 + func (s *Spindle) Enforcer() *rbac2.Enforcer { 201 182 return s.e 202 183 } 203 184 ··· 217 198 s.ks.Start(ctx) 218 199 }() 219 200 201 201 + // ensure server owner is tracked 202 202 + if err := s.tap.AddRepos(ctx, []syntax.DID{s.cfg.Server.Owner}); err != nil { 203 203 + return err 204 204 + } 205 205 + 206 206 + go func() { 207 207 + s.l.Info("starting tap stream consumer") 208 208 + s.tap.Connect(ctx, &tap.SimpleIndexer{ 209 209 + EventHandler: s.processEvent, 210 210 + }) 211 211 + }() 212 212 + 220 213 s.l.Info("starting spindle server", "address", s.cfg.Server.ListenAddr) 221 214 return http.ListenAndServe(s.cfg.Server.ListenAddr, s.Router()) 222 215 } ··· 268 261 Config: s.cfg, 269 262 Resolver: s.res, 270 263 Vault: s.vault, 264 264 + Notifier: s.Notifier(), 271 265 ServiceAuth: serviceAuth, 272 266 } 273 267 274 268 return x.Router() 275 269 } 276 270 277 277 - func (s *Spindle) processPipeline(ctx context.Context, src eventconsumer.Source, msg eventconsumer.Message) error { 278 278 - if msg.Nsid == tangled.PipelineNSID { 279 279 - tpl := tangled.Pipeline{} 280 280 - err := json.Unmarshal(msg.EventJson, &tpl) 281 281 - if err != nil { 282 282 - fmt.Println("error unmarshalling", err) 271 271 + func (s *Spindle) processKnotStream(ctx context.Context, src eventconsumer.Source, msg eventconsumer.Message) error { 272 272 + l := log.FromContext(ctx).With("handler", "processKnotStream") 273 273 + l = l.With("src", src.Key(), "msg.Nsid", msg.Nsid, "msg.Rkey", msg.Rkey) 274 274 + if msg.Nsid == tangled.GitRefUpdateNSID { 275 275 + event := tangled.GitRefUpdate{} 276 276 + if err := json.Unmarshal(msg.EventJson, &event); err != nil { 277 277 + l.Error("error unmarshalling", "err", err) 283 278 return err 284 279 } 280 280 + l = l.With("repoDid", event.RepoDid, "repoName", event.RepoName) 285 281 286 286 - if tpl.TriggerMetadata == nil { 287 287 - return fmt.Errorf("no trigger metadata found") 282 282 + // resolve repo name to rkey 283 283 + // TODO: git.refUpdate should respond with rkey instead of repo name 284 284 + repo, err := s.db.GetRepoWithName(syntax.DID(event.RepoDid), event.RepoName) 285 285 + if err != nil { 286 286 + return fmt.Errorf("get repo with did and name (%s/%s): %w", event.RepoDid, event.RepoName, err) 288 287 } 289 288 290 290 - if tpl.TriggerMetadata.Repo == nil { 291 291 - return fmt.Errorf("no repo data found") 289 289 + // NOTE: we are blindly trusting the knot that it will return only repos it own 290 290 + repoCloneUri := s.newRepoCloneUrl(src.Key(), event.RepoDid, event.RepoName) 291 291 + repoPath := s.newRepoPath(repo.Did, repo.Rkey) 292 292 + if err := git.SparseSyncGitRepo(ctx, repoCloneUri, repoPath, event.NewSha); err != nil { 293 293 + return fmt.Errorf("sync git repo: %w", err) 292 294 } 295 295 + l.Info("synced git repo") 293 296 294 294 - if src.Key() != tpl.TriggerMetadata.Repo.Knot { 295 295 - return fmt.Errorf("repo knot does not match event source: %s != %s", src.Key(), tpl.TriggerMetadata.Repo.Knot) 297 297 + compiler := workflow.Compiler{ 298 298 + Trigger: tangled.Pipeline_TriggerMetadata{ 299 299 + Kind: string(workflow.TriggerKindPush), 300 300 + Push: &tangled.Pipeline_PushTriggerData{ 301 301 + Ref: event.Ref, 302 302 + OldSha: event.OldSha, 303 303 + NewSha: event.NewSha, 304 304 + }, 305 305 + Repo: &tangled.Pipeline_TriggerRepo{ 306 306 + Did: repo.Did.String(), 307 307 + Knot: repo.Knot, 308 308 + Repo: repo.Name, 309 309 + }, 310 310 + }, 296 311 } 297 312 298 298 - // filter by repos 299 299 - _, err = s.db.GetRepo( 300 300 - tpl.TriggerMetadata.Repo.Knot, 301 301 - tpl.TriggerMetadata.Repo.Did, 302 302 - tpl.TriggerMetadata.Repo.Repo, 303 303 - ) 313 313 + // load workflow definitions from rev (without spindle context) 314 314 + rawPipeline, err := s.loadPipeline(ctx, repoCloneUri, repoPath, event.NewSha) 304 315 if err != nil { 305 305 - return err 316 316 + return fmt.Errorf("loading pipeline: %w", err) 317 317 + } 318 318 + if len(rawPipeline) == 0 { 319 319 + l.Info("no workflow definition find for the repo. skipping the event") 320 320 + return nil 321 321 + } 322 322 + tpl := compiler.Compile(compiler.Parse(rawPipeline)) 323 323 + // TODO: pass compile error to workflow log 324 324 + for _, w := range compiler.Diagnostics.Errors { 325 325 + l.Error(w.String()) 326 326 + } 327 327 + for _, w := range compiler.Diagnostics.Warnings { 328 328 + l.Warn(w.String()) 306 329 } 307 330 308 331 pipelineId := models.PipelineId{ 309 309 - Knot: src.Key(), 310 310 - Rkey: msg.Rkey, 332 332 + Knot: tpl.TriggerMetadata.Repo.Knot, 333 333 + Rkey: tid.TID(), 311 334 } 335 335 + if err := s.db.CreatePipelineEvent(pipelineId.Rkey, tpl, s.n); err != nil { 336 336 + l.Error("failed to create pipeline event", "err", err) 337 337 + return nil 338 338 + } 339 339 + err = s.processPipeline(ctx, tpl, pipelineId) 340 340 + if err != nil { 341 341 + return err 342 342 + } 343 343 + } 312 344 313 313 - workflows := make(map[models.Engine][]models.Workflow) 345 345 + return nil 346 346 + } 347 347 + 348 348 + func (s *Spindle) loadPipeline(ctx context.Context, repoUri, repoPath, rev string) (workflow.RawPipeline, error) { 349 349 + if err := git.SparseSyncGitRepo(ctx, repoUri, repoPath, rev); err != nil { 350 350 + return nil, fmt.Errorf("syncing git repo: %w", err) 351 351 + } 352 352 + gr, err := kgit.Open(repoPath, rev) 353 353 + if err != nil { 354 354 + return nil, fmt.Errorf("opening git repo: %w", err) 355 355 + } 356 356 + 357 357 + workflowDir, err := gr.FileTree(ctx, workflow.WorkflowDir) 358 358 + if errors.Is(err, object.ErrDirectoryNotFound) { 359 359 + // return empty RawPipeline when directory doesn't exist 360 360 + return nil, nil 361 361 + } else if err != nil { 362 362 + return nil, fmt.Errorf("loading file tree: %w", err) 363 363 + } 314 364 315 315 - // Build pipeline environment variables once for all workflows 316 316 - pipelineEnv := models.PipelineEnvVars(tpl.TriggerMetadata, pipelineId, s.cfg.Server.Dev) 365 365 + var rawPipeline workflow.RawPipeline 366 366 + for _, e := range workflowDir { 367 367 + if !e.IsFile() { 368 368 + continue 369 369 + } 317 370 318 318 - for _, w := range tpl.Workflows { 319 319 - if w != nil { 320 320 - if _, ok := s.engs[w.Engine]; !ok { 321 321 - err = s.db.StatusFailed(models.WorkflowId{ 322 322 - PipelineId: pipelineId, 323 323 - Name: w.Name, 324 324 - }, fmt.Sprintf("unknown engine %#v", w.Engine), -1, s.n) 325 325 - if err != nil { 326 326 - return err 327 327 - } 371 371 + fpath := filepath.Join(workflow.WorkflowDir, e.Name) 372 372 + contents, err := gr.RawContent(fpath) 373 373 + if err != nil { 374 374 + return nil, fmt.Errorf("reading raw content of '%s': %w", fpath, err) 375 375 + } 328 376 329 329 - continue 330 330 - } 377 377 + rawPipeline = append(rawPipeline, workflow.RawWorkflow{ 378 378 + Name: e.Name, 379 379 + Contents: contents, 380 380 + }) 381 381 + } 331 382 332 332 - eng := s.engs[w.Engine] 383 383 + return rawPipeline, nil 384 384 + } 333 385 334 334 - if _, ok := workflows[eng]; !ok { 335 335 - workflows[eng] = []models.Workflow{} 336 336 - } 386 386 + func (s *Spindle) processPipeline(ctx context.Context, tpl tangled.Pipeline, pipelineId models.PipelineId) error { 387 387 + // Build pipeline environment variables once for all workflows 388 388 + pipelineEnv := models.PipelineEnvVars(tpl.TriggerMetadata, pipelineId, s.cfg.Server.Dev) 337 389 338 338 - ewf, err := s.engs[w.Engine].InitWorkflow(*w, tpl) 339 339 - if err != nil { 340 340 - return err 341 341 - } 390 390 + // filter & init workflows 391 391 + workflows := make(map[models.Engine][]models.Workflow) 392 392 + for _, w := range tpl.Workflows { 393 393 + if w == nil { 394 394 + continue 395 395 + } 396 396 + if _, ok := s.engs[w.Engine]; !ok { 397 397 + err := s.db.StatusFailed(models.WorkflowId{ 398 398 + PipelineId: pipelineId, 399 399 + Name: w.Name, 400 400 + }, fmt.Sprintf("unknown engine %#v", w.Engine), -1, s.n) 401 401 + if err != nil { 402 402 + return fmt.Errorf("db.StatusFailed: %w", err) 403 403 + } 342 404 343 343 - // inject TANGLED_* env vars after InitWorkflow 344 344 - // This prevents user-defined env vars from overriding them 345 345 - if ewf.Environment == nil { 346 346 - ewf.Environment = make(map[string]string) 347 347 - } 348 348 - maps.Copy(ewf.Environment, pipelineEnv) 405 405 + continue 406 406 + } 349 407 350 350 - workflows[eng] = append(workflows[eng], *ewf) 408 408 + eng := s.engs[w.Engine] 351 409 352 352 - err = s.db.StatusPending(models.WorkflowId{ 353 353 - PipelineId: pipelineId, 354 354 - Name: w.Name, 355 355 - }, s.n) 356 356 - if err != nil { 357 357 - return err 358 358 - } 359 359 - } 410 410 + if _, ok := workflows[eng]; !ok { 411 411 + workflows[eng] = []models.Workflow{} 360 412 } 361 413 362 362 - ok := s.jq.Enqueue(queue.Job{ 363 363 - Run: func() error { 364 364 - engine.StartWorkflows(log.SubLogger(s.l, "engine"), s.vault, s.cfg, s.db, s.n, ctx, &models.Pipeline{ 365 365 - RepoOwner: tpl.TriggerMetadata.Repo.Did, 366 366 - RepoName: tpl.TriggerMetadata.Repo.Repo, 367 367 - Workflows: workflows, 368 368 - }, pipelineId) 369 369 - return nil 370 370 - }, 371 371 - OnFail: func(jobError error) { 372 372 - s.l.Error("pipeline run failed", "error", jobError) 373 373 - }, 374 374 - }) 375 375 - if ok { 376 376 - s.l.Info("pipeline enqueued successfully", "id", msg.Rkey) 377 377 - } else { 378 378 - s.l.Error("failed to enqueue pipeline: queue is full") 414 414 + ewf, err := s.engs[w.Engine].InitWorkflow(*w, tpl) 415 415 + if err != nil { 416 416 + return fmt.Errorf("init workflow: %w", err) 379 417 } 418 418 + 419 419 + // inject TANGLED_* env vars after InitWorkflow 420 420 + // This prevents user-defined env vars from overriding them 421 421 + if ewf.Environment == nil { 422 422 + ewf.Environment = make(map[string]string) 423 423 + } 424 424 + maps.Copy(ewf.Environment, pipelineEnv) 425 425 + 426 426 + workflows[eng] = append(workflows[eng], *ewf) 380 427 } 381 428 429 429 + // enqueue pipeline 430 430 + ok := s.jq.Enqueue(queue.Job{ 431 431 + Run: func() error { 432 432 + engine.StartWorkflows(log.SubLogger(s.l, "engine"), s.vault, s.cfg, s.db, s.n, ctx, &models.Pipeline{ 433 433 + RepoOwner: tpl.TriggerMetadata.Repo.Did, 434 434 + RepoName: tpl.TriggerMetadata.Repo.Repo, 435 435 + Workflows: workflows, 436 436 + }, pipelineId) 437 437 + return nil 438 438 + }, 439 439 + OnFail: func(jobError error) { 440 440 + s.l.Error("pipeline run failed", "error", jobError) 441 441 + }, 442 442 + }) 443 443 + if !ok { 444 444 + return fmt.Errorf("failed to enqueue pipeline: queue is full") 445 445 + } 446 446 + s.l.Info("pipeline enqueued successfully", "id", pipelineId) 447 447 + 448 448 + // emit StatusPending for all workflows here (after successful enqueue) 449 449 + for _, ewfs := range workflows { 450 450 + for _, ewf := range ewfs { 451 451 + err := s.db.StatusPending(models.WorkflowId{ 452 452 + PipelineId: pipelineId, 453 453 + Name: ewf.Name, 454 454 + }, s.n) 455 455 + if err != nil { 456 456 + return fmt.Errorf("db.StatusPending: %w", err) 457 457 + } 458 458 + } 459 459 + } 382 460 return nil 383 461 } 384 462 385 385 - func (s *Spindle) configureOwner() error { 386 386 - cfgOwner := s.cfg.Server.Owner 463 463 + // newRepoPath creates a path to store repository by its did and rkey. 464 464 + // The path format would be: `/data/repos/did:plc:foo/sh.tangled.repo/repo-rkey 465 465 + func (s *Spindle) newRepoPath(did syntax.DID, rkey syntax.RecordKey) string { 466 466 + return filepath.Join(s.cfg.Server.RepoDir(), did.String(), tangled.RepoNSID, rkey.String()) 467 467 + } 387 468 388 388 - existing, err := s.e.GetSpindleUsersByRole("server:owner", rbacDomain) 389 389 - if err != nil { 390 390 - return err 469 469 + func (s *Spindle) newRepoCloneUrl(knot, did, name string) string { 470 470 + scheme := "https://" 471 471 + if s.cfg.Server.Dev { 472 472 + scheme = "http://" 391 473 } 392 392 - 393 393 - switch len(existing) { 394 394 - case 0: 395 395 - // no owner configured, continue 396 396 - case 1: 397 397 - // find existing owner 398 398 - existingOwner := existing[0] 474 474 + return fmt.Sprintf("%s%s/%s/%s", scheme, knot, did, name) 475 475 + } 399 476 400 400 - // no ownership change, this is okay 401 401 - if existingOwner == s.cfg.Server.Owner { 402 402 - break 403 403 - } 477 477 + const RequiredVersion = "2.49.0" 404 478 405 405 - // remove existing owner 406 406 - err = s.e.RemoveSpindleOwner(rbacDomain, existingOwner) 407 407 - if err != nil { 408 408 - return nil 409 409 - } 410 410 - default: 411 411 - return fmt.Errorf("more than one owner in DB, try deleting %q and starting over", s.cfg.Server.DBPath) 479 479 + func ensureGitVersion() error { 480 480 + v, err := git.Version() 481 481 + if err != nil { 482 482 + return fmt.Errorf("fetching git version: %w", err) 483 483 + } 484 484 + if v.LessThan(version.Must(version.NewVersion(RequiredVersion))) { 485 485 + return fmt.Errorf("installed git version %q is not supported, Spindle requires git version >= %q", v, RequiredVersion) 412 486 } 413 413 - 414 414 - return s.e.AddSpindleOwner(rbacDomain, cfgOwner) 487 487 + return nil 415 488 }

+391

spindle/tap.go

··· 1 1 + package spindle 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/syntax" 10 10 + "tangled.org/core/api/tangled" 11 11 + "tangled.org/core/eventconsumer" 12 12 + "tangled.org/core/spindle/db" 13 13 + "tangled.org/core/spindle/git" 14 14 + "tangled.org/core/spindle/models" 15 15 + "tangled.org/core/tap" 16 16 + "tangled.org/core/tid" 17 17 + "tangled.org/core/workflow" 18 18 + ) 19 19 + 20 20 + func (s *Spindle) processEvent(ctx context.Context, evt tap.Event) error { 21 21 + l := s.l.With("component", "tapIndexer") 22 22 + 23 23 + var err error 24 24 + switch evt.Type { 25 25 + case tap.EvtRecord: 26 26 + switch evt.Record.Collection.String() { 27 27 + case tangled.SpindleMemberNSID: 28 28 + err = s.processMember(ctx, evt) 29 29 + case tangled.RepoNSID: 30 30 + err = s.processRepo(ctx, evt) 31 31 + case tangled.RepoCollaboratorNSID: 32 32 + err = s.processCollaborator(ctx, evt) 33 33 + case tangled.RepoPullNSID: 34 34 + err = s.processPull(ctx, evt) 35 35 + } 36 36 + case tap.EvtIdentity: 37 37 + // no-op 38 38 + } 39 39 + 40 40 + if err != nil { 41 41 + l.Error("failed to process message. will retry later", "event.ID", evt.ID, "err", err) 42 42 + return err 43 43 + } 44 44 + return nil 45 45 + } 46 46 + 47 47 + // NOTE: make sure to return nil if we don't need to retry (e.g. forbidden, unrelated) 48 48 + 49 49 + func (s *Spindle) processMember(ctx context.Context, evt tap.Event) error { 50 50 + l := s.l.With("component", "tapIndexer", "record", evt.Record.AtUri()) 51 51 + 52 52 + l.Info("processing spindle.member record") 53 53 + 54 54 + // only listen to members 55 55 + if ok, err := s.e.IsSpindleMemberInviteAllowed(evt.Record.Did, s.cfg.Server.Did()); !ok || err != nil { 56 56 + l.Warn("forbidden request: member invite not allowed", "did", evt.Record.Did, "error", err) 57 57 + return nil 58 58 + } 59 59 + 60 60 + switch evt.Record.Action { 61 61 + case tap.RecordCreateAction, tap.RecordUpdateAction: 62 62 + record := tangled.SpindleMember{} 63 63 + if err := json.Unmarshal(evt.Record.Record, &record); err != nil { 64 64 + return fmt.Errorf("parsing record: %w", err) 65 65 + } 66 66 + 67 67 + domain := s.cfg.Server.Hostname 68 68 + if record.Instance != domain { 69 69 + l.Info("domain mismatch", "domain", record.Instance, "expected", domain) 70 70 + return nil 71 71 + } 72 72 + 73 73 + created, err := time.Parse(record.CreatedAt, time.RFC3339) 74 74 + if err != nil { 75 75 + created = time.Now() 76 76 + } 77 77 + if err := db.AddSpindleMember(s.db, db.SpindleMember{ 78 78 + Did: evt.Record.Did, 79 79 + Rkey: evt.Record.Rkey.String(), 80 80 + Instance: record.Instance, 81 81 + Subject: syntax.DID(record.Subject), 82 82 + Created: created, 83 83 + }); err != nil { 84 84 + l.Error("failed to add member", "error", err) 85 85 + return fmt.Errorf("adding member to db: %w", err) 86 86 + } 87 87 + if err := s.e.AddSpindleMember(syntax.DID(record.Subject), s.cfg.Server.Did()); err != nil { 88 88 + return fmt.Errorf("adding member to rbac: %w", err) 89 89 + } 90 90 + if err := s.tap.AddRepos(ctx, []syntax.DID{syntax.DID(record.Subject)}); err != nil { 91 91 + return fmt.Errorf("adding did to tap", err) 92 92 + } 93 93 + 94 94 + l.Info("added member", "member", record.Subject) 95 95 + return nil 96 96 + 97 97 + case tap.RecordDeleteAction: 98 98 + var ( 99 99 + did = evt.Record.Did.String() 100 100 + rkey = evt.Record.Rkey.String() 101 101 + ) 102 102 + member, err := db.GetSpindleMember(s.db, did, rkey) 103 103 + if err != nil { 104 104 + return fmt.Errorf("finding member: %w", err) 105 105 + } 106 106 + 107 107 + if err := db.RemoveSpindleMember(s.db, did, rkey); err != nil { 108 108 + return fmt.Errorf("removing member from db: %w", err) 109 109 + } 110 110 + if err := s.e.RemoveSpindleMember(member.Subject, s.cfg.Server.Did()); err != nil { 111 111 + return fmt.Errorf("removing member from rbac: %w", err) 112 112 + } 113 113 + if err := s.tapSafeRemoveDid(ctx, member.Subject); err != nil { 114 114 + return fmt.Errorf("removing did from tap: %w", err) 115 115 + } 116 116 + 117 117 + l.Info("removed member", "member", member.Subject) 118 118 + return nil 119 119 + } 120 120 + return nil 121 121 + } 122 122 + 123 123 + func (s *Spindle) processCollaborator(ctx context.Context, evt tap.Event) error { 124 124 + l := s.l.With("component", "tapIndexer", "record", evt.Record.AtUri()) 125 125 + 126 126 + l.Info("processing repo.collaborator record") 127 127 + 128 128 + // only listen to members 129 129 + if ok, err := s.e.IsSpindleMember(evt.Record.Did, s.cfg.Server.Did()); !ok || err != nil { 130 130 + l.Warn("forbidden request: not spindle member", "did", evt.Record.Did, "err", err) 131 131 + return nil 132 132 + } 133 133 + 134 134 + switch evt.Record.Action { 135 135 + case tap.RecordCreateAction, tap.RecordUpdateAction: 136 136 + record := tangled.RepoCollaborator{} 137 137 + if err := json.Unmarshal(evt.Record.Record, &record); err != nil { 138 138 + l.Error("invalid record", "err", err) 139 139 + return fmt.Errorf("parsing record: %w", err) 140 140 + } 141 141 + 142 142 + // retry later if target repo is not ingested yet 143 143 + if _, err := s.db.GetRepo(syntax.ATURI(record.Repo)); err != nil { 144 144 + l.Warn("target repo is not ingested yet", "repo", record.Repo, "err", err) 145 145 + return fmt.Errorf("target repo is unknown") 146 146 + } 147 147 + 148 148 + // check perms for this user 149 149 + if ok, err := s.e.IsRepoCollaboratorInviteAllowed(evt.Record.Did, syntax.ATURI(record.Repo)); !ok || err != nil { 150 150 + l.Warn("forbidden request collaborator invite not allowed", "did", evt.Record.Did, "err", err) 151 151 + return nil 152 152 + } 153 153 + 154 154 + if err := s.db.PutRepoCollaborator(&db.RepoCollaborator{ 155 155 + Did: evt.Record.Did, 156 156 + Rkey: evt.Record.Rkey, 157 157 + Repo: syntax.ATURI(record.Repo), 158 158 + Subject: syntax.DID(record.Subject), 159 159 + }); err != nil { 160 160 + return fmt.Errorf("adding collaborator to db: %w", err) 161 161 + } 162 162 + if err := s.e.AddRepoCollaborator(syntax.DID(record.Subject), syntax.ATURI(record.Repo)); err != nil { 163 163 + return fmt.Errorf("adding collaborator to rbac: %w", err) 164 164 + } 165 165 + if err := s.tap.AddRepos(ctx, []syntax.DID{syntax.DID(record.Subject)}); err != nil { 166 166 + return fmt.Errorf("adding did to tap: %w", err) 167 167 + } 168 168 + 169 169 + l.Info("add repo collaborator", "subejct", record.Subject, "repo", record.Repo) 170 170 + return nil 171 171 + 172 172 + case tap.RecordDeleteAction: 173 173 + // get existing collaborator 174 174 + collaborator, err := s.db.GetRepoCollaborator(evt.Record.Did, evt.Record.Rkey) 175 175 + if err != nil { 176 176 + return fmt.Errorf("failed to get existing collaborator info: %w", err) 177 177 + } 178 178 + 179 179 + // check perms for this user 180 180 + if ok, err := s.e.IsRepoCollaboratorInviteAllowed(evt.Record.Did, collaborator.Repo); !ok || err != nil { 181 181 + l.Warn("forbidden request collaborator invite not allowed", "did", evt.Record.Did, "err", err) 182 182 + return nil 183 183 + } 184 184 + 185 185 + if err := s.db.RemoveRepoCollaborator(collaborator.Subject, collaborator.Rkey); err != nil { 186 186 + return fmt.Errorf("removing collaborator from db: %w", err) 187 187 + } 188 188 + if err := s.e.RemoveRepoCollaborator(collaborator.Subject, collaborator.Repo); err != nil { 189 189 + return fmt.Errorf("removing collaborator from rbac: %w", err) 190 190 + } 191 191 + if err := s.tapSafeRemoveDid(ctx, collaborator.Subject); err != nil { 192 192 + return fmt.Errorf("removing did from tap: %w", err) 193 193 + } 194 194 + 195 195 + l.Info("removed repo collaborator", "subejct", collaborator.Subject, "repo", collaborator.Repo) 196 196 + return nil 197 197 + } 198 198 + return nil 199 199 + } 200 200 + 201 201 + func (s *Spindle) processRepo(ctx context.Context, evt tap.Event) error { 202 202 + l := s.l.With("component", "tapIndexer", "record", evt.Record.AtUri()) 203 203 + 204 204 + l.Info("processing repo record") 205 205 + 206 206 + // only listen to members 207 207 + if ok, err := s.e.IsSpindleMember(evt.Record.Did, s.cfg.Server.Did()); !ok || err != nil { 208 208 + l.Warn("forbidden request: not spindle member", "did", evt.Record.Did, "err", err) 209 209 + return nil 210 210 + } 211 211 + 212 212 + switch evt.Record.Action { 213 213 + case tap.RecordCreateAction, tap.RecordUpdateAction: 214 214 + record := tangled.Repo{} 215 215 + if err := json.Unmarshal(evt.Record.Record, &record); err != nil { 216 216 + return fmt.Errorf("parsing record: %w", err) 217 217 + } 218 218 + 219 219 + domain := s.cfg.Server.Hostname 220 220 + if record.Spindle == nil || *record.Spindle != domain { 221 221 + if record.Spindle == nil { 222 222 + l.Info("spindle isn't configured", "name", record.Name) 223 223 + } else { 224 224 + l.Info("different spindle configured", "name", record.Name, "spindle", *record.Spindle, "domain", domain) 225 225 + } 226 226 + if err := s.db.DeleteRepo(evt.Record.Did, evt.Record.Rkey); err != nil { 227 227 + return fmt.Errorf("deleting repo from db: %w", err) 228 228 + } 229 229 + return nil 230 230 + } 231 231 + 232 232 + repo := &db.Repo{ 233 233 + Did: evt.Record.Did, 234 234 + Rkey: evt.Record.Rkey, 235 235 + Name: record.Name, 236 236 + Knot: record.Knot, 237 237 + } 238 238 + 239 239 + if err := s.db.PutRepo(repo); err != nil { 240 240 + return fmt.Errorf("adding repo to db: %w", err) 241 241 + } 242 242 + 243 243 + if err := s.e.AddRepo(evt.Record.AtUri()); err != nil { 244 244 + return fmt.Errorf("adding repo to rbac") 245 245 + } 246 246 + 247 247 + // add this knot to the event consumer 248 248 + src := eventconsumer.NewKnotSource(record.Knot) 249 249 + s.ks.AddSource(context.Background(), src) 250 250 + 251 251 + // setup sparse sync 252 252 + repoCloneUri := s.newRepoCloneUrl(repo.Knot, repo.Did.String(), repo.Name) 253 253 + repoPath := s.newRepoPath(repo.Did, repo.Rkey) 254 254 + if err := git.SparseSyncGitRepo(ctx, repoCloneUri, repoPath, ""); err != nil { 255 255 + return fmt.Errorf("setting up sparse-clone git repo: %w", err) 256 256 + } 257 257 + 258 258 + l.Info("added repo", "repo", evt.Record.AtUri()) 259 259 + return nil 260 260 + 261 261 + case tap.RecordDeleteAction: 262 262 + // check perms for this user 263 263 + if ok, err := s.e.IsRepoOwner(evt.Record.Did, evt.Record.AtUri()); !ok || err != nil { 264 264 + l.Warn("forbidden request: not repo owner", "did", evt.Record.Did, "err", err) 265 265 + return nil 266 266 + } 267 267 + 268 268 + if err := s.db.DeleteRepo(evt.Record.Did, evt.Record.Rkey); err != nil { 269 269 + return fmt.Errorf("deleting repo from db: %w", err) 270 270 + } 271 271 + 272 272 + if err := s.e.DeleteRepo(evt.Record.AtUri()); err != nil { 273 273 + return fmt.Errorf("deleting repo from rbac: %w", err) 274 274 + } 275 275 + 276 276 + l.Info("deleted repo", "repo", evt.Record.AtUri()) 277 277 + return nil 278 278 + } 279 279 + return nil 280 280 + } 281 281 + 282 282 + func (s *Spindle) processPull(ctx context.Context, evt tap.Event) error { 283 283 + l := s.l.With("component", "tapIndexer", "record", evt.Record.AtUri()) 284 284 + 285 285 + l.Info("processing pull record") 286 286 + 287 287 + // only listen to live events 288 288 + if !evt.Record.Live { 289 289 + l.Info("skipping backfill event", "event", evt.Record.AtUri()) 290 290 + return nil 291 291 + } 292 292 + 293 293 + switch evt.Record.Action { 294 294 + case tap.RecordCreateAction, tap.RecordUpdateAction: 295 295 + record := tangled.RepoPull{} 296 296 + if err := json.Unmarshal(evt.Record.Record, &record); err != nil { 297 297 + l.Error("invalid record", "err", err) 298 298 + return fmt.Errorf("parsing record: %w", err) 299 299 + } 300 300 + 301 301 + // ignore legacy records 302 302 + if record.Target == nil { 303 303 + l.Info("ignoring pull record: target repo is nil") 304 304 + return nil 305 305 + } 306 306 + 307 307 + // ignore patch-based and fork-based PRs 308 308 + if record.Source == nil || record.Source.Repo != nil { 309 309 + l.Info("ignoring pull record: not a branch-based pull request") 310 310 + return nil 311 311 + } 312 312 + 313 313 + // skip if target repo is unknown 314 314 + repo, err := s.db.GetRepo(syntax.ATURI(record.Target.Repo)) 315 315 + if err != nil { 316 316 + l.Warn("target repo is not ingested yet", "repo", record.Target.Repo, "err", err) 317 317 + return fmt.Errorf("target repo is unknown") 318 318 + } 319 319 + 320 320 + compiler := workflow.Compiler{ 321 321 + Trigger: tangled.Pipeline_TriggerMetadata{ 322 322 + Kind: string(workflow.TriggerKindPullRequest), 323 323 + PullRequest: &tangled.Pipeline_PullRequestTriggerData{ 324 324 + Action: "create", 325 325 + SourceBranch: record.Source.Branch, 326 326 + SourceSha: record.Source.Sha, 327 327 + TargetBranch: record.Target.Branch, 328 328 + }, 329 329 + Repo: &tangled.Pipeline_TriggerRepo{ 330 330 + Did: repo.Did.String(), 331 331 + Knot: repo.Knot, 332 332 + Repo: repo.Name, 333 333 + }, 334 334 + }, 335 335 + } 336 336 + 337 337 + repoUri := s.newRepoCloneUrl(repo.Knot, repo.Did.String(), repo.Name) 338 338 + repoPath := s.newRepoPath(repo.Did, repo.Rkey) 339 339 + 340 340 + // load workflow definitions from rev (without spindle context) 341 341 + rawPipeline, err := s.loadPipeline(ctx, repoUri, repoPath, record.Source.Sha) 342 342 + if err != nil { 343 343 + // don't retry 344 344 + l.Error("failed loading pipeline", "err", err) 345 345 + return nil 346 346 + } 347 347 + if len(rawPipeline) == 0 { 348 348 + l.Info("no workflow definition find for the repo. skipping the event") 349 349 + return nil 350 350 + } 351 351 + tpl := compiler.Compile(compiler.Parse(rawPipeline)) 352 352 + // TODO: pass compile error to workflow log 353 353 + for _, w := range compiler.Diagnostics.Errors { 354 354 + l.Error(w.String()) 355 355 + } 356 356 + for _, w := range compiler.Diagnostics.Warnings { 357 357 + l.Warn(w.String()) 358 358 + } 359 359 + 360 360 + pipelineId := models.PipelineId{ 361 361 + Knot: tpl.TriggerMetadata.Repo.Knot, 362 362 + Rkey: tid.TID(), 363 363 + } 364 364 + if err := s.db.CreatePipelineEvent(pipelineId.Rkey, tpl, s.n); err != nil { 365 365 + l.Error("failed to create pipeline event", "err", err) 366 366 + return nil 367 367 + } 368 368 + err = s.processPipeline(ctx, tpl, pipelineId) 369 369 + if err != nil { 370 370 + // don't retry 371 371 + l.Error("failed processing pipeline", "err", err) 372 372 + return nil 373 373 + } 374 374 + case tap.RecordDeleteAction: 375 375 + // no-op 376 376 + } 377 377 + return nil 378 378 + } 379 379 + 380 380 + func (s *Spindle) tapSafeRemoveDid(ctx context.Context, did syntax.DID) error { 381 381 + known, err := s.db.IsKnownDid(syntax.DID(did)) 382 382 + if err != nil { 383 383 + return fmt.Errorf("ensuring did known state: %w", err) 384 384 + } 385 385 + if !known { 386 386 + if err := s.tap.RemoveRepos(ctx, []syntax.DID{did}); err != nil { 387 387 + return fmt.Errorf("removing did from tap: %w", err) 388 388 + } 389 389 + } 390 390 + return nil 391 391 + }

+1 -2

spindle/xrpc/add_secret.go

··· 11 11 "github.com/bluesky-social/indigo/xrpc" 12 12 securejoin "github.com/cyphar/filepath-securejoin" 13 13 "tangled.org/core/api/tangled" 14 14 - "tangled.org/core/rbac" 15 14 "tangled.org/core/spindle/secrets" 16 15 xrpcerr "tangled.org/core/xrpc/errors" 17 16 ) ··· 68 67 return 69 68 } 70 69 71 71 - if ok, err := x.Enforcer.IsSettingsAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { 70 70 + if ok, err := x.Enforcer.IsRepoSettingsWriteAllowed(actorDid, repoAt); !ok || err != nil { 72 71 l.Error("insufficent permissions", "did", actorDid.String()) 73 72 writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) 74 73 return

+1 -2

spindle/xrpc/list_secrets.go

··· 11 11 "github.com/bluesky-social/indigo/xrpc" 12 12 securejoin "github.com/cyphar/filepath-securejoin" 13 13 "tangled.org/core/api/tangled" 14 14 - "tangled.org/core/rbac" 15 14 "tangled.org/core/spindle/secrets" 16 15 xrpcerr "tangled.org/core/xrpc/errors" 17 16 ) ··· 63 62 return 64 63 } 65 64 66 66 - if ok, err := x.Enforcer.IsSettingsAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { 65 65 + if ok, err := x.Enforcer.IsRepoSettingsWriteAllowed(actorDid, repoAt); !ok || err != nil { 67 66 l.Error("insufficent permissions", "did", actorDid.String()) 68 67 writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) 69 68 return

+1 -1

spindle/xrpc/owner.go

··· 9 9 ) 10 10 11 11 func (x *Xrpc) Owner(w http.ResponseWriter, r *http.Request) { 12 12 - owner := x.Config.Server.Owner 12 12 + owner := x.Config.Server.Owner.String() 13 13 if owner == "" { 14 14 writeError(w, xrpcerr.OwnerNotFoundError, http.StatusInternalServerError) 15 15 return

+72

spindle/xrpc/pipeline_cancelPipeline.go

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "encoding/json" 5 5 + "fmt" 6 6 + "net/http" 7 7 + "strings" 8 8 + 9 9 + "github.com/bluesky-social/indigo/atproto/syntax" 10 10 + "tangled.org/core/api/tangled" 11 11 + "tangled.org/core/spindle/models" 12 12 + xrpcerr "tangled.org/core/xrpc/errors" 13 13 + ) 14 14 + 15 15 + func (x *Xrpc) CancelPipeline(w http.ResponseWriter, r *http.Request) { 16 16 + l := x.Logger 17 17 + fail := func(e xrpcerr.XrpcError) { 18 18 + l.Error("failed", "kind", e.Tag, "error", e.Message) 19 19 + writeError(w, e, http.StatusBadRequest) 20 20 + } 21 21 + l.Debug("cancel pipeline") 22 22 + 23 23 + actorDid, ok := r.Context().Value(ActorDid).(syntax.DID) 24 24 + if !ok { 25 25 + fail(xrpcerr.MissingActorDidError) 26 26 + return 27 27 + } 28 28 + 29 29 + var input tangled.PipelineCancelPipeline_Input 30 30 + if err := json.NewDecoder(r.Body).Decode(&input); err != nil { 31 31 + fail(xrpcerr.GenericError(err)) 32 32 + return 33 33 + } 34 34 + 35 35 + aturi := syntax.ATURI(input.Pipeline) 36 36 + wid := models.WorkflowId{ 37 37 + PipelineId: models.PipelineId{ 38 38 + Knot: strings.TrimPrefix(aturi.Authority().String(), "did:web:"), 39 39 + Rkey: aturi.RecordKey().String(), 40 40 + }, 41 41 + Name: input.Workflow, 42 42 + } 43 43 + l.Debug("cancel pipeline", "wid", wid) 44 44 + 45 45 + // unfortunately we have to resolve repo-at here 46 46 + repoAt, err := syntax.ParseATURI(input.Repo) 47 47 + if err != nil { 48 48 + fail(xrpcerr.InvalidRepoError(input.Repo)) 49 49 + return 50 50 + } 51 51 + 52 52 + isRepoOwner, err := x.Enforcer.IsRepoOwner(actorDid, repoAt) 53 53 + if err != nil || !isRepoOwner { 54 54 + fail(xrpcerr.AccessControlError(actorDid.String())) 55 55 + return 56 56 + } 57 57 + for _, engine := range x.Engines { 58 58 + l.Debug("destorying workflow", "wid", wid) 59 59 + err = engine.DestroyWorkflow(r.Context(), wid) 60 60 + if err != nil { 61 61 + fail(xrpcerr.GenericError(fmt.Errorf("dailed to destroy workflow: %w", err))) 62 62 + return 63 63 + } 64 64 + err = x.Db.StatusCancelled(wid, "User canceled the workflow", -1, x.Notifier) 65 65 + if err != nil { 66 66 + fail(xrpcerr.GenericError(fmt.Errorf("dailed to emit status failed: %w", err))) 67 67 + return 68 68 + } 69 69 + } 70 70 + 71 71 + w.WriteHeader(http.StatusOK) 72 72 + }

+1 -2

spindle/xrpc/remove_secret.go

··· 10 10 "github.com/bluesky-social/indigo/xrpc" 11 11 securejoin "github.com/cyphar/filepath-securejoin" 12 12 "tangled.org/core/api/tangled" 13 13 - "tangled.org/core/rbac" 14 13 "tangled.org/core/spindle/secrets" 15 14 xrpcerr "tangled.org/core/xrpc/errors" 16 15 ) ··· 62 61 return 63 62 } 64 63 65 65 - if ok, err := x.Enforcer.IsSettingsAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { 64 64 + if ok, err := x.Enforcer.IsRepoSettingsWriteAllowed(actorDid, repoAt); !ok || err != nil { 66 65 l.Error("insufficent permissions", "did", actorDid.String()) 67 66 writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) 68 67 return

+5 -2

spindle/xrpc/xrpc.go

··· 10 10 11 11 "tangled.org/core/api/tangled" 12 12 "tangled.org/core/idresolver" 13 13 - "tangled.org/core/rbac" 13 13 + "tangled.org/core/notifier" 14 14 + "tangled.org/core/rbac2" 14 15 "tangled.org/core/spindle/config" 15 16 "tangled.org/core/spindle/db" 16 17 "tangled.org/core/spindle/models" ··· 24 25 type Xrpc struct { 25 26 Logger *slog.Logger 26 27 Db *db.DB 27 27 - Enforcer *rbac.Enforcer 28 28 + Enforcer *rbac2.Enforcer 28 29 Engines map[string]models.Engine 29 30 Config *config.Config 30 31 Resolver *idresolver.Resolver 31 32 Vault secrets.Manager 33 33 + Notifier *notifier.Notifier 32 34 ServiceAuth *serviceauth.ServiceAuth 33 35 } 34 36 ··· 41 43 r.Post("/"+tangled.RepoAddSecretNSID, x.AddSecret) 42 44 r.Post("/"+tangled.RepoRemoveSecretNSID, x.RemoveSecret) 43 45 r.Get("/"+tangled.RepoListSecretsNSID, x.ListSecrets) 46 46 + r.Post("/"+tangled.PipelineCancelPipelineNSID, x.CancelPipeline) 44 47 }) 45 48 46 49 // service query endpoints (no auth required)

+1 -1

tailwind.config.js

··· 2 2 const colors = require("tailwindcss/colors"); 3 3 4 4 module.exports = { 5 5 - content: ["./appview/pages/templates/**/*.html", "./appview/pages/chroma.go"], 5 5 + content: ["./appview/pages/templates/**/*.html", "./appview/pages/chroma.go", "./docs/*.html"], 6 6 darkMode: "media", 7 7 theme: { 8 8 container: {

+24

tap/simpleIndexer.go

··· 1 1 + package tap 2 2 + 3 3 + import "context" 4 4 + 5 5 + type SimpleIndexer struct { 6 6 + EventHandler func(ctx context.Context, evt Event) error 7 7 + ErrorHandler func(ctx context.Context, err error) 8 8 + } 9 9 + 10 10 + var _ Handler = (*SimpleIndexer)(nil) 11 11 + 12 12 + func (i *SimpleIndexer) OnEvent(ctx context.Context, evt Event) error { 13 13 + if i.EventHandler == nil { 14 14 + return nil 15 15 + } 16 16 + return i.EventHandler(ctx, evt) 17 17 + } 18 18 + 19 19 + func (i *SimpleIndexer) OnError(ctx context.Context, err error) { 20 20 + if i.ErrorHandler == nil { 21 21 + return 22 22 + } 23 23 + i.ErrorHandler(ctx, err) 24 24 + }

+169

tap/tap.go

··· 1 1 + /// heavily inspired by <https://github.com/bluesky-social/atproto/blob/c7f5a868837d3e9b3289f988fee2267789327b06/packages/tap/README.md> 2 2 + 3 3 + package tap 4 4 + 5 5 + import ( 6 6 + "bytes" 7 7 + "context" 8 8 + "encoding/json" 9 9 + "fmt" 10 10 + "net/http" 11 11 + "net/url" 12 12 + 13 13 + "github.com/bluesky-social/indigo/atproto/syntax" 14 14 + "github.com/gorilla/websocket" 15 15 + "tangled.org/core/log" 16 16 + ) 17 17 + 18 18 + // type WebsocketOptions struct { 19 19 + // maxReconnectSeconds int 20 20 + // heartbeatIntervalMs int 21 21 + // // onReconnectError 22 22 + // } 23 23 + 24 24 + type Handler interface { 25 25 + OnEvent(ctx context.Context, evt Event) error 26 26 + OnError(ctx context.Context, err error) 27 27 + } 28 28 + 29 29 + type Client struct { 30 30 + Url string 31 31 + AdminPassword string 32 32 + HTTPClient *http.Client 33 33 + } 34 34 + 35 35 + func NewClient(url, adminPassword string) Client { 36 36 + return Client{ 37 37 + Url: url, 38 38 + AdminPassword: adminPassword, 39 39 + HTTPClient: &http.Client{}, 40 40 + } 41 41 + } 42 42 + 43 43 + func (c *Client) AddRepos(ctx context.Context, dids []syntax.DID) error { 44 44 + body, err := json.Marshal(map[string][]syntax.DID{"dids": dids}) 45 45 + if err != nil { 46 46 + return err 47 47 + } 48 48 + req, err := http.NewRequestWithContext(ctx, "POST", c.Url+"/repos/add", bytes.NewReader(body)) 49 49 + if err != nil { 50 50 + return err 51 51 + } 52 52 + req.SetBasicAuth("admin", c.AdminPassword) 53 53 + req.Header.Set("Content-Type", "application/json") 54 54 + 55 55 + resp, err := c.HTTPClient.Do(req) 56 56 + if err != nil { 57 57 + return err 58 58 + } 59 59 + defer resp.Body.Close() 60 60 + if resp.StatusCode != http.StatusOK { 61 61 + return fmt.Errorf("tap: /repos/add failed with status %d", resp.StatusCode) 62 62 + } 63 63 + return nil 64 64 + } 65 65 + 66 66 + func (c *Client) RemoveRepos(ctx context.Context, dids []syntax.DID) error { 67 67 + body, err := json.Marshal(map[string][]syntax.DID{"dids": dids}) 68 68 + if err != nil { 69 69 + return err 70 70 + } 71 71 + req, err := http.NewRequestWithContext(ctx, "POST", c.Url+"/repos/remove", bytes.NewReader(body)) 72 72 + if err != nil { 73 73 + return err 74 74 + } 75 75 + req.SetBasicAuth("admin", c.AdminPassword) 76 76 + req.Header.Set("Content-Type", "application/json") 77 77 + 78 78 + resp, err := c.HTTPClient.Do(req) 79 79 + if err != nil { 80 80 + return err 81 81 + } 82 82 + defer resp.Body.Close() 83 83 + if resp.StatusCode != http.StatusOK { 84 84 + return fmt.Errorf("tap: /repos/remove failed with status %d", resp.StatusCode) 85 85 + } 86 86 + return nil 87 87 + } 88 88 + 89 89 + func (c *Client) Connect(ctx context.Context, handler Handler) error { 90 90 + l := log.FromContext(ctx) 91 91 + 92 92 + u, err := url.Parse(c.Url) 93 93 + if err != nil { 94 94 + return err 95 95 + } 96 96 + if u.Scheme == "https" { 97 97 + u.Scheme = "wss" 98 98 + } else { 99 99 + u.Scheme = "ws" 100 100 + } 101 101 + u.Path = "/channel" 102 102 + 103 103 + // TODO: set auth on dial 104 104 + 105 105 + url := u.String() 106 106 + 107 107 + // var backoff int 108 108 + // for { 109 109 + // select { 110 110 + // case <-ctx.Done(): 111 111 + // return ctx.Err() 112 112 + // default: 113 113 + // } 114 114 + // 115 115 + // header := http.Header{ 116 116 + // "Authorization": []string{""}, 117 117 + // } 118 118 + // conn, res, err := websocket.DefaultDialer.DialContext(ctx, url, header) 119 119 + // if err != nil { 120 120 + // l.Warn("dialing failed", "url", url, "err", err, "backoff", backoff) 121 121 + // time.Sleep(time.Duration(5+backoff) * time.Second) 122 122 + // backoff++ 123 123 + // 124 124 + // continue 125 125 + // } else { 126 126 + // backoff = 0 127 127 + // } 128 128 + // 129 129 + // l.Info("event subscription response", "code", res.StatusCode) 130 130 + // } 131 131 + 132 132 + // TODO: keep websocket connection alive 133 133 + conn, _, err := websocket.DefaultDialer.DialContext(ctx, url, nil) 134 134 + if err != nil { 135 135 + return err 136 136 + } 137 137 + defer conn.Close() 138 138 + 139 139 + for { 140 140 + select { 141 141 + case <-ctx.Done(): 142 142 + return ctx.Err() 143 143 + default: 144 144 + } 145 145 + _, message, err := conn.ReadMessage() 146 146 + if err != nil { 147 147 + return err 148 148 + } 149 149 + 150 150 + var ev Event 151 151 + if err := json.Unmarshal(message, &ev); err != nil { 152 152 + handler.OnError(ctx, fmt.Errorf("failed to parse message: %w", err)) 153 153 + continue 154 154 + } 155 155 + if err := handler.OnEvent(ctx, ev); err != nil { 156 156 + handler.OnError(ctx, fmt.Errorf("failed to process event %d: %w", ev.ID, err)) 157 157 + continue 158 158 + } 159 159 + 160 160 + ack := map[string]any{ 161 161 + "type": "ack", 162 162 + "id": ev.ID, 163 163 + } 164 164 + if err := conn.WriteJSON(ack); err != nil { 165 165 + l.Warn("failed to send ack", "err", err) 166 166 + continue 167 167 + } 168 168 + } 169 169 + }

+62

tap/types.go

··· 1 1 + package tap 2 2 + 3 3 + import ( 4 4 + "encoding/json" 5 5 + "fmt" 6 6 + 7 7 + "github.com/bluesky-social/indigo/atproto/syntax" 8 8 + ) 9 9 + 10 10 + type EventType string 11 11 + 12 12 + const ( 13 13 + EvtRecord EventType = "record" 14 14 + EvtIdentity EventType = "identity" 15 15 + ) 16 16 + 17 17 + type Event struct { 18 18 + ID int64 `json:"id"` 19 19 + Type EventType `json:"type"` 20 20 + Record *RecordEventData `json:"record,omitempty"` 21 21 + Identity *IdentityEventData `json:"identity,omitempty"` 22 22 + } 23 23 + 24 24 + type RecordEventData struct { 25 25 + Live bool `json:"live"` 26 26 + Did syntax.DID `json:"did"` 27 27 + Rev string `json:"rev"` 28 28 + Collection syntax.NSID `json:"collection"` 29 29 + Rkey syntax.RecordKey `json:"rkey"` 30 30 + Action RecordAction `json:"action"` 31 31 + Record json.RawMessage `json:"record,omitempty"` 32 32 + CID *syntax.CID `json:"cid,omitempty"` 33 33 + } 34 34 + 35 35 + func (r *RecordEventData) AtUri() syntax.ATURI { 36 36 + return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", r.Did, r.Collection, r.Rkey)) 37 37 + } 38 38 + 39 39 + type RecordAction string 40 40 + 41 41 + const ( 42 42 + RecordCreateAction RecordAction = "create" 43 43 + RecordUpdateAction RecordAction = "update" 44 44 + RecordDeleteAction RecordAction = "delete" 45 45 + ) 46 46 + 47 47 + type IdentityEventData struct { 48 48 + DID syntax.DID `json:"did"` 49 49 + Handle string `json:"handle"` 50 50 + IsActive bool `json:"is_active"` 51 51 + Status RepoStatus `json:"status"` 52 52 + } 53 53 + 54 54 + type RepoStatus string 55 55 + 56 56 + const ( 57 57 + RepoStatusActive RepoStatus = "active" 58 58 + RepoStatusTakendown RepoStatus = "takendown" 59 59 + RepoStatusSuspended RepoStatus = "suspended" 60 60 + RepoStatusDeactivated RepoStatus = "deactivated" 61 61 + RepoStatusDeleted RepoStatus = "deleted" 62 62 + )

+199

types/commit.go

··· 1 1 + package types 2 2 + 3 3 + import ( 4 4 + "bytes" 5 5 + "encoding/json" 6 6 + "fmt" 7 7 + "maps" 8 8 + "regexp" 9 9 + "strings" 10 10 + 11 11 + "github.com/go-git/go-git/v5/plumbing" 12 12 + "github.com/go-git/go-git/v5/plumbing/object" 13 13 + ) 14 14 + 15 15 + type Commit struct { 16 16 + // hash of the commit object. 17 17 + Hash plumbing.Hash `json:"hash,omitempty"` 18 18 + 19 19 + // author is the original author of the commit. 20 20 + Author object.Signature `json:"author"` 21 21 + 22 22 + // committer is the one performing the commit, might be different from author. 23 23 + Committer object.Signature `json:"committer"` 24 24 + 25 25 + // message is the commit message, contains arbitrary text. 26 26 + Message string `json:"message"` 27 27 + 28 28 + // treehash is the hash of the root tree of the commit. 29 29 + Tree string `json:"tree"` 30 30 + 31 31 + // parents are the hashes of the parent commits of the commit. 32 32 + ParentHashes []plumbing.Hash `json:"parent_hashes,omitempty"` 33 33 + 34 34 + // pgpsignature is the pgp signature of the commit. 35 35 + PGPSignature string `json:"pgp_signature,omitempty"` 36 36 + 37 37 + // mergetag is the embedded tag object when a merge commit is created by 38 38 + // merging a signed tag. 39 39 + MergeTag string `json:"merge_tag,omitempty"` 40 40 + 41 41 + // changeid is a unique identifier for the change (e.g., gerrit change-id). 42 42 + ChangeId string `json:"change_id,omitempty"` 43 43 + 44 44 + // extraheaders contains additional headers not captured by other fields. 45 45 + ExtraHeaders map[string][]byte `json:"extra_headers,omitempty"` 46 46 + 47 47 + // deprecated: kept for backwards compatibility with old json format. 48 48 + This string `json:"this,omitempty"` 49 49 + 50 50 + // deprecated: kept for backwards compatibility with old json format. 51 51 + Parent string `json:"parent,omitempty"` 52 52 + } 53 53 + 54 54 + // types.Commit is an unify two commit structs: 55 55 + // - git.object.Commit from 56 56 + // - types.NiceDiff.commit 57 57 + // 58 58 + // to do this in backwards compatible fashion, we define the base struct 59 59 + // to use the same fields as NiceDiff.Commit, and then we also unmarshal 60 60 + // the struct fields from go-git structs, this custom unmarshal makes sense 61 61 + // of both representations and unifies them to have maximal data in either 62 62 + // form. 63 63 + func (c *Commit) UnmarshalJSON(data []byte) error { 64 64 + type Alias Commit 65 65 + 66 66 + aux := &struct { 67 67 + *object.Commit 68 68 + *Alias 69 69 + }{ 70 70 + Alias: (*Alias)(c), 71 71 + } 72 72 + 73 73 + if err := json.Unmarshal(data, aux); err != nil { 74 74 + return err 75 75 + } 76 76 + 77 77 + c.FromGoGitCommit(aux.Commit) 78 78 + 79 79 + return nil 80 80 + } 81 81 + 82 82 + // fill in as much of Commit as possible from the given go-git commit 83 83 + func (c *Commit) FromGoGitCommit(gc *object.Commit) { 84 84 + if gc == nil { 85 85 + return 86 86 + } 87 87 + 88 88 + if c.Hash.IsZero() { 89 89 + c.Hash = gc.Hash 90 90 + } 91 91 + if c.This == "" { 92 92 + c.This = gc.Hash.String() 93 93 + } 94 94 + if isEmptySignature(c.Author) { 95 95 + c.Author = gc.Author 96 96 + } 97 97 + if isEmptySignature(c.Committer) { 98 98 + c.Committer = gc.Committer 99 99 + } 100 100 + if c.Message == "" { 101 101 + c.Message = gc.Message 102 102 + } 103 103 + if c.Tree == "" { 104 104 + c.Tree = gc.TreeHash.String() 105 105 + } 106 106 + if c.PGPSignature == "" { 107 107 + c.PGPSignature = gc.PGPSignature 108 108 + } 109 109 + if c.MergeTag == "" { 110 110 + c.MergeTag = gc.MergeTag 111 111 + } 112 112 + 113 113 + if len(c.ParentHashes) == 0 { 114 114 + c.ParentHashes = gc.ParentHashes 115 115 + } 116 116 + if c.Parent == "" && len(gc.ParentHashes) > 0 { 117 117 + c.Parent = gc.ParentHashes[0].String() 118 118 + } 119 119 + 120 120 + if len(c.ExtraHeaders) == 0 { 121 121 + c.ExtraHeaders = make(map[string][]byte) 122 122 + maps.Copy(c.ExtraHeaders, gc.ExtraHeaders) 123 123 + } 124 124 + 125 125 + if c.ChangeId == "" { 126 126 + if v, ok := gc.ExtraHeaders["change-id"]; ok { 127 127 + c.ChangeId = string(v) 128 128 + } 129 129 + } 130 130 + } 131 131 + 132 132 + func isEmptySignature(s object.Signature) bool { 133 133 + return s.Email == "" && s.Name == "" && s.When.IsZero() 134 134 + } 135 135 + 136 136 + // produce a verifiable payload from this commit's metadata 137 137 + func (c *Commit) Payload() string { 138 138 + author := bytes.NewBuffer([]byte{}) 139 139 + c.Author.Encode(author) 140 140 + 141 141 + committer := bytes.NewBuffer([]byte{}) 142 142 + c.Committer.Encode(committer) 143 143 + 144 144 + payload := strings.Builder{} 145 145 + 146 146 + fmt.Fprintf(&payload, "tree %s\n", c.Tree) 147 147 + 148 148 + if len(c.ParentHashes) > 0 { 149 149 + for _, p := range c.ParentHashes { 150 150 + fmt.Fprintf(&payload, "parent %s\n", p.String()) 151 151 + } 152 152 + } else { 153 153 + // present for backwards compatibility 154 154 + fmt.Fprintf(&payload, "parent %s\n", c.Parent) 155 155 + } 156 156 + 157 157 + fmt.Fprintf(&payload, "author %s\n", author.String()) 158 158 + fmt.Fprintf(&payload, "committer %s\n", committer.String()) 159 159 + 160 160 + if c.ChangeId != "" { 161 161 + fmt.Fprintf(&payload, "change-id %s\n", c.ChangeId) 162 162 + } else if v, ok := c.ExtraHeaders["change-id"]; ok { 163 163 + fmt.Fprintf(&payload, "change-id %s\n", string(v)) 164 164 + } 165 165 + 166 166 + fmt.Fprintf(&payload, "\n%s", c.Message) 167 167 + 168 168 + return payload.String() 169 169 + } 170 170 + 171 171 + var ( 172 172 + coAuthorRegex = regexp.MustCompile(`(?im)^Co-authored-by:\s*(.+?)\s*<([^>]+)>`) 173 173 + ) 174 174 + 175 175 + func (commit Commit) CoAuthors() []object.Signature { 176 176 + var coAuthors []object.Signature 177 177 + seen := make(map[string]bool) 178 178 + matches := coAuthorRegex.FindAllStringSubmatch(commit.Message, -1) 179 179 + 180 180 + for _, match := range matches { 181 181 + if len(match) >= 3 { 182 182 + name := strings.TrimSpace(match[1]) 183 183 + email := strings.TrimSpace(match[2]) 184 184 + 185 185 + if seen[email] { 186 186 + continue 187 187 + } 188 188 + seen[email] = true 189 189 + 190 190 + coAuthors = append(coAuthors, object.Signature{ 191 191 + Name: name, 192 192 + Email: email, 193 193 + When: commit.Committer.When, 194 194 + }) 195 195 + } 196 196 + } 197 197 + 198 198 + return coAuthors 199 199 + }

+2 -12

types/diff.go

··· 2 2 3 3 import ( 4 4 "github.com/bluekeyes/go-gitdiff/gitdiff" 5 5 - "github.com/go-git/go-git/v5/plumbing/object" 6 5 ) 7 6 8 7 type DiffOpts struct { ··· 43 42 44 43 // A nicer git diff representation. 45 44 type NiceDiff struct { 46 46 - Commit struct { 47 47 - Message string `json:"message"` 48 48 - Author object.Signature `json:"author"` 49 49 - This string `json:"this"` 50 50 - Parent string `json:"parent"` 51 51 - PGPSignature string `json:"pgp_signature"` 52 52 - Committer object.Signature `json:"committer"` 53 53 - Tree string `json:"tree"` 54 54 - ChangedId string `json:"change_id"` 55 55 - } `json:"commit"` 56 56 - Stat struct { 45 45 + Commit Commit `json:"commit"` 46 46 + Stat struct { 57 47 FilesChanged int `json:"files_changed"` 58 48 Insertions int `json:"insertions"` 59 49 Deletions int `json:"deletions"`

+17 -17

types/repo.go

··· 8 8 ) 9 9 10 10 type RepoIndexResponse struct { 11 11 - IsEmpty bool `json:"is_empty"` 12 12 - Ref string `json:"ref,omitempty"` 13 13 - Readme string `json:"readme,omitempty"` 14 14 - ReadmeFileName string `json:"readme_file_name,omitempty"` 15 15 - Commits []*object.Commit `json:"commits,omitempty"` 16 16 - Description string `json:"description,omitempty"` 17 17 - Files []NiceTree `json:"files,omitempty"` 18 18 - Branches []Branch `json:"branches,omitempty"` 19 19 - Tags []*TagReference `json:"tags,omitempty"` 20 20 - TotalCommits int `json:"total_commits,omitempty"` 11 11 + IsEmpty bool `json:"is_empty"` 12 12 + Ref string `json:"ref,omitempty"` 13 13 + Readme string `json:"readme,omitempty"` 14 14 + ReadmeFileName string `json:"readme_file_name,omitempty"` 15 15 + Commits []Commit `json:"commits,omitempty"` 16 16 + Description string `json:"description,omitempty"` 17 17 + Files []NiceTree `json:"files,omitempty"` 18 18 + Branches []Branch `json:"branches,omitempty"` 19 19 + Tags []*TagReference `json:"tags,omitempty"` 20 20 + TotalCommits int `json:"total_commits,omitempty"` 21 21 } 22 22 23 23 type RepoLogResponse struct { 24 24 - Commits []*object.Commit `json:"commits,omitempty"` 25 25 - Ref string `json:"ref,omitempty"` 26 26 - Description string `json:"description,omitempty"` 27 27 - Log bool `json:"log,omitempty"` 28 28 - Total int `json:"total,omitempty"` 29 29 - Page int `json:"page,omitempty"` 30 30 - PerPage int `json:"per_page,omitempty"` 24 24 + Commits []Commit `json:"commits,omitempty"` 25 25 + Ref string `json:"ref,omitempty"` 26 26 + Description string `json:"description,omitempty"` 27 27 + Log bool `json:"log,omitempty"` 28 28 + Total int `json:"total,omitempty"` 29 29 + Page int `json:"page,omitempty"` 30 30 + PerPage int `json:"per_page,omitempty"` 31 31 } 32 32 33 33 type RepoCommitResponse struct {