switch to atproto/syntax TID generator

repo/repo.go

···
 	"io"
 
 	"github.com/bluesky-social/indigo/atproto/repo"
+	"github.com/bluesky-social/indigo/atproto/syntax"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/bluesky-social/indigo/mst"
 	"github.com/bluesky-social/indigo/util"
···
 	mst *mst.MerkleSearchTree
 
 	dirty bool
+
+	clk *syntax.TIDClock
 }
 
 // Returns a copy of commit without the Sig field. Helpful when verifying signature.
···
 
 func NewRepo(ctx context.Context, did string, bs cbor.IpldBlockstore) *Repo {
 	cst := util.CborStore(bs)
+	clk := syntax.NewTIDClock(0)
 
 	t := mst.NewEmptyMST(cst)
 	sc := SignedCommit{
···
 		mst:   t,
 		sc:    sc,
 		dirty: true,
+		clk:   &clk,
 	}
 }
 
 func OpenRepo(ctx context.Context, bs cbor.IpldBlockstore, root cid.Cid) (*Repo, error) {
 	cst := util.CborStore(bs)
+	clk := syntax.NewTIDClock(0)
 
 	var sc SignedCommit
 	if err := cst.Get(ctx, root, &sc); err != nil {
···
 		bs:      bs,
 		cst:     cst,
 		repoCid: root,
+		clk:     &clk,
 	}, nil
 }
 
···
 		return cid.Undef, "", err
 	}
 
-	tid := NextTID()
+	tid := r.clk.Next().String()
 
 	nmst, err := t.Add(ctx, nsid+"/"+tid, k, -1)
 	if err != nil {
···
 		Did:     r.RepoDid(),
 		Version: ATP_REPO_VERSION,
 		Data:    rcid,
-		Rev:     NextTID(),
+		Rev:     r.clk.Next().String(),
 	}
 
 	sb, err := ncom.BytesForSigning()

repo/tid.go

···
-package repo
-
-import (
-	"math/rand"
-	"sync"
-	"time"
-)
-
-const alpha = "234567abcdefghijklmnopqrstuvwxyz"
-
-func s32encode(i uint64) string {
-	var s string
-	for i > 0 {
-		c := i & 0x1f
-		i = i >> 5
-		s = alpha[c:c+1] + s
-	}
-	return s
-}
-
-func init() {
-	clockId = uint64(rand.Int() & 0x1f)
-}
-
-var lastTime uint64
-var clockId uint64
-var ltLock sync.Mutex
-
-func NextTID() string {
-	t := uint64(time.Now().UnixMicro())
-
-	ltLock.Lock()
-	if lastTime >= t {
-		t = lastTime + 1
-	}
-
-	lastTime = t
-	ltLock.Unlock()
-
-	return s32encode(uint64(t)) + s32encode(clockId)
-}

repomgr/repomgr.go

···
 
 	atproto "github.com/bluesky-social/indigo/api/atproto"
 	bsky "github.com/bluesky-social/indigo/api/bsky"
+	"github.com/bluesky-social/indigo/atproto/syntax"
 	"github.com/bluesky-social/indigo/carstore"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
 	"github.com/bluesky-social/indigo/models"
···
 	if _, ok := cs.(*carstore.NonArchivalCarstore); ok {
 		noArchive = true
 	}
+
+	clk := syntax.NewTIDClock(0)
 
 	return &RepoManager{
 		cs:        cs,
···
 		kmgr:      kmgr,
 		log:       slog.Default().With("system", "repomgr"),
 		noArchive: noArchive,
+		clk:       &clk,
 	}
 }
 
···
 
 	log       *slog.Logger
 	noArchive bool
+
+	clk *syntax.TIDClock
 }
 
 type ActorInfo struct {
···
 	return nil
 }
 
-func rkeyForCollection(collection string) string {
-	return repo.NextTID()
-}
-
 func (rm *RepoManager) BatchWrite(ctx context.Context, user models.Uid, writes []*atproto.RepoApplyWrites_Input_Writes_Elem) error {
 	ctx, span := otel.Tracer("repoman").Start(ctx, "BatchWrite")
 	defer span.End()
···
 			if c.Rkey != nil {
 				rkey = *c.Rkey
 			} else {
-				rkey = rkeyForCollection(c.Collection)
+				rkey = rm.clk.Next().String()
 			}
 
 			nsid := c.Collection + "/" + rkey