commit 28792f9a7cca401a1db2f67f4987290a43cfe970 · edavis.dev/monarch

+1 -1

cmd/backfiller/backfill.go

···

       11
       11
        
       		RelayHost:             "https://bsky.network",

     

       12
       12
        
       	}

     

       13
       13
        
       

     

       14
       14
       -
       	return backfill.NewBackfiller("backfiller", store, h.HandleCreate, h.HandleUpdate, h.HandleDelete, opts)

     

       14
       14
       +
       	return backfill.NewBackfiller("backfiller", store, h.HandleUpsert, h.HandleUpsert, h.HandleDelete, opts)

     

       15
       15
        
       }

+10 -17

cmd/backfiller/cursors.go

···

       4
       4
        
       	"context"

     

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"log/slog"

     

       7
       7
       -
       	"strconv"

     

       8
       7
        
       	"sync"

     

       9
       8
        
       	"time"

     

       10
       9
        
       

     
···

       21
       20
        
       	store *gorm.DB

     

       22
       21
        
       

     

       23
       22
        
       	firehoseLk  sync.Mutex

     

       24
       24
       -
       	firehoseSeq string

     

       23
       23
       +
       	firehoseSeq int64

     

       25
       24
        
       

     

       26
       25
        
       	reposLk  sync.Mutex

     

       27
       26
        
       	reposSeq string

     
···

       56
       55
        
       

     

       57
       56
        
       func (cs *CursorService) SetFirehoseCursor(seq int64) {

     

       58
       57
        
       	cs.firehoseLk.Lock()

     

       59
       59
       -
       	val := strconv.Itoa(int(seq))

     

       60
       60
       -
       	cs.firehoseSeq = val

     

       58
       58
       +
       	cs.firehoseSeq = seq

     

       61
       59
        
       	cs.firehoseLk.Unlock()

     

       62
       60
        
       }

     

       63
       61
        
       

     
···

       68
       66
        
       }

     

       69
       67
        
       

     

       70
       68
        
       func (cs *CursorService) Flush() error {

     

       71
       71
       -
       	flusher := func(lk *sync.Mutex, key, value string) error {

     

       72
       72
       -
       		lk.Lock()

     

       73
       73
       -
       		if err := cs.store.Model(&cursorRecord{}).Where("key = ?", key).Update("val", value).Error; err != nil {

     

       74
       74
       -
       			return fmt.Errorf("error updating cursor record: %+v: %w", cursorRecord{Key: key, Val: value}, err)

     

       75
       75
       -
       		}

     

       76
       76
       -
       		lk.Unlock()

     

       77
       77
       -
       		return nil

     

       69
       69
       +
       	cs.firehoseLk.Lock()

     

       70
       70
       +
       	if err := cs.store.Model(&cursorRecord{}).Where("key = ?", "firehose").Update("val", cs.firehoseSeq).Error; err != nil {

     

       71
       71
       +
       		return fmt.Errorf("error updating cursor record: %w", err)

     

       78
       72
        
       	}

     

       73
       73
       +
       	cs.firehoseLk.Unlock()

     

       79
       74
        
       

     

       80
       80
       -
       	if err := flusher(&cs.firehoseLk, "firehose", cs.firehoseSeq); err != nil {

     

       81
       81
       -
       		return err

     

       75
       75
       +
       	cs.reposLk.Lock()

     

       76
       76
       +
       	if err := cs.store.Model(&cursorRecord{}).Where("key = ?", "repos").Update("val", cs.reposSeq).Error; err != nil {

     

       77
       77
       +
       		return fmt.Errorf("error updating cursor record: %w", err)

     

       82
       78
        
       	}

     

       83
       83
       -
       

     

       84
       84
       -
       	if err := flusher(&cs.reposLk, "repos", cs.reposSeq); err != nil {

     

       85
       85
       -
       		return err

     

       86
       86
       -
       	}

     

       79
       79
       +
       	cs.reposLk.Unlock()

     

       87
       80
        
       

     

       88
       81
        
       	return nil

     

       89
       82
        
       }

+25 -22

cmd/backfiller/handlers.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"bytes"

     

       5
       4
        
       	"context"

     

       6
       5
        
       	"fmt"

     

       7
       7
       -
       	"strings"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       8
       8
        
       

     

       9
       9
       -
       	appbsky "github.com/bluesky-social/indigo/api/bsky"

     

       10
       9
        
       	"github.com/ipfs/go-cid"

     

       11
       10
        
       	"gorm.io/gorm"

     

       12
       11
        
       )

     
···

       16
       15
        
       }

     

       17
       16
        
       

     

       18
       17
        
       func NewHandlerService(store *gorm.DB) *HandlerService {

     

       18
       18
       +
       	store.AutoMigrate(&Account{})

     

       19
       19
        
       	store.AutoMigrate(&Profile{})

     

       20
       20
       -
       	store.AutoMigrate(&Feedgen{})

     

       21
       21
       -
       	// TODO the rest

     

       20
       20
       +
       	store.AutoMigrate(&List{})

     

       21
       21
       +
       	store.AutoMigrate(&Labeler{})

     

       22
       22
       +
       	store.AutoMigrate(&FeedGenerator{})

     

       23
       23
       +
       	store.AutoMigrate(&Post{})

     

       24
       24
       +
       	store.AutoMigrate(&Like{})

     

       25
       25
       +
       	store.AutoMigrate(&StarterPack{})

     

       26
       26
       +
       	store.AutoMigrate(&Verification{})

     

       27
       27
       +
       	store.AutoMigrate(&Lexicon{})

     

       22
       28
        
       

     

       23
       29
        
       	return &HandlerService{

     

       24
       30
        
       		store: store,

     

       25
       31
        
       	}

     

       26
       32
        
       }

     

       27
       33
        
       

     

       28
       28
       -
       func (hs *HandlerService) HandleCreate(ctx context.Context, repo string, rev string, path string, rec *[]byte, cid *cid.Cid) error {

     

       29
       29
       -
       	if !strings.HasPrefix(path, "app.bsky.feed.generator/") {

     

       30
       30
       -
       		return nil

     

       34
       34
       +
       // handles both creates and updates

     

       35
       35
       +
       func (hs *HandlerService) HandleUpsert(ctx context.Context, repo string, rev string, path string, rec *[]byte, cid *cid.Cid) error {

     

       36
       36
       +
       	uri, err := syntax.ParseATURI(fmt.Sprintf("at://%s/%s", repo, path))

     

       37
       37
       +
       	if err != nil {

     

       38
       38
       +
       		return err

     

       31
       39
        
       	}

     

       32
       40
        
       

     

       33
       33
       -
       	var out appbsky.FeedGenerator

     

       34
       34
       -
       	if err := out.UnmarshalCBOR(bytes.NewReader(*rec)); err != nil {

     

       35
       35
       -
       		return fmt.Errorf("error unmarshalling record: %w", err)

     

       36
       36
       -
       	}

     

       41
       41
       +
       	switch uri.Collection() {

     

       42
       42
       +
       	case syntax.NSID("app.bsky.actor.profile"):

     

       43
       43
       +
       		profile := NewProfile(*rec)

     

       44
       44
       +
       		profile.AtUri = string(uri)

     

       45
       45
       +
       		hs.store.Create(profile)

     

       37
       46
        
       

     

       38
       38
       -
       	feedgen := Feedgen{

     

       39
       39
       -
       		DisplayName: out.DisplayName,

     

       47
       47
       +
       	case syntax.NSID("app.bsky.feed.generator"):

     

       48
       48
       +
       		feedgen := NewFeedGenerator(*rec)

     

       49
       49
       +
       		feedgen.AtUri = string(uri)

     

       50
       50
       +
       		hs.store.Create(feedgen)

     

       40
       51
        
       	}

     

       41
       52
        
       

     

       42
       42
       -
       	if err := hs.store.Create(&feedgen).Error; err != nil {

     

       43
       43
       -
       		return fmt.Errorf("error saving feedgen: %w", err)

     

       44
       44
       -
       	}

     

       45
       45
       -
       

     

       46
       46
       -
       	return nil

     

       47
       47
       -
       }

     

       48
       48
       -
       

     

       49
       49
       -
       func (hs *HandlerService) HandleUpdate(ctx context.Context, repo string, rev string, path string, rec *[]byte, cid *cid.Cid) error {

     

       50
       53
        
       	return nil

     

       51
       54
        
       }

     

       52
       55

+3 -10

cmd/backfiller/main.go

···

       86
       86
        
       		return nil

     

       87
       87
        
       	}

     

       88
       88
        
       

     

       89
       89
       -
       	if err := closeDatabase(app.state); err != nil {

     

       90
       90
       -
       		return err

     

       91
       91
       -
       	}

     

       89
       89
       +
       	app.backfill.Stop(ctx)

     

       92
       90
        
       

     

       93
       93
       -
       	if err := closeDatabase(app.content); err != nil {

     

       94
       94
       -
       		return err

     

       95
       95
       -
       	}

     

       96
       96
       -
       

     

       97
       97
       -
       	if err := app.backfill.Stop(ctx); err != nil {

     

       98
       98
       -
       		return err

     

       99
       99
       -
       	}

     

       91
       91
       +
       	closeDatabase(app.state)

     

       92
       92
       +
       	closeDatabase(app.content)

     

       100
       93
        
       

     

       101
       94
        
       	return nil

     

       102
       95
        
       }

+69 -2

cmd/backfiller/models.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"bytes"

     

       5
       5
       +
       	"log/slog"

     

       6
       6
       +
       

     

       7
       7
       +
       	appbsky "github.com/bluesky-social/indigo/api/bsky"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       3
       10
        
       type Account struct{}

     

       4
       4
       -
       type Profile struct{}

     

       11
       11
       +
       

     

       12
       12
       +
       // func NewAccount

     

       13
       13
       +
       

     

       14
       14
       +
       type Profile struct {

     

       15
       15
       +
       	ID          uint `gorm:"primaryKey"`

     

       16
       16
       +
       	AtUri       string

     

       17
       17
       +
       	DisplayName *string

     

       18
       18
       +
       }

     

       19
       19
       +
       

     

       20
       20
       +
       func NewProfile(rec []byte) *Profile {

     

       21
       21
       +
       	var out appbsky.ActorProfile

     

       22
       22
       +
       	if err := out.UnmarshalCBOR(bytes.NewReader(rec)); err != nil {

     

       23
       23
       +
       		slog.Error("could not unmarshal profile CBOR", "err", err)

     

       24
       24
       +
       		return nil

     

       25
       25
       +
       	}

     

       26
       26
       +
       	return &Profile{

     

       27
       27
       +
       		DisplayName: out.DisplayName,

     

       28
       28
       +
       	}

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       5
       31
        
       type List struct{}

     

       32
       32
       +
       

     

       33
       33
       +
       // func NewList

     

       34
       34
       +
       

     

       6
       35
        
       type Labeler struct{}

     

       7
       7
       -
       type Feedgen struct {

     

       36
       36
       +
       

     

       37
       37
       +
       // func NewFeedGenerator

     

       38
       38
       +
       

     

       39
       39
       +
       type FeedGenerator struct {

     

       8
       40
        
       	ID          uint `gorm:"primaryKey"`

     

       41
       41
       +
       	AtUri       string

     

       9
       42
        
       	DisplayName string

     

       10
       43
        
       }

     

       44
       44
       +
       

     

       45
       45
       +
       func NewFeedGenerator(rec []byte) *FeedGenerator {

     

       46
       46
       +
       	var out appbsky.FeedGenerator

     

       47
       47
       +
       	if err := out.UnmarshalCBOR(bytes.NewReader(rec)); err != nil {

     

       48
       48
       +
       		slog.Error("could not unmarshal feedgen CBOR", "err", err)

     

       49
       49
       +
       		return nil

     

       50
       50
       +
       	}

     

       51
       51
       +
       	return &FeedGenerator{

     

       52
       52
       +
       		DisplayName: out.DisplayName,

     

       53
       53
       +
       	}

     

       54
       54
       +
       }

     

       55
       55
       +
       

     

       56
       56
       +
       type Post struct {

     

       57
       57
       +
       	ID    uint `gorm:"primaryKey"`

     

       58
       58
       +
       	AtUri string

     

       59
       59
       +
       	Text  string

     

       60
       60
       +
       }

     

       61
       61
       +
       

     

       62
       62
       +
       func NewPost(rec []byte) *Post {

     

       63
       63
       +
       	return nil

     

       64
       64
       +
       }

     

       65
       65
       +
       

     

       66
       66
       +
       type Like struct{}

     

       67
       67
       +
       

     

       68
       68
       +
       // func NewLike

     

       69
       69
       +
       

     

       11
       70
        
       type StarterPack struct{}

     

       71
       71
       +
       

     

       72
       72
       +
       // func NewStarterPack

     

       73
       73
       +
       

     

       12
       74
        
       type Verification struct{}

     

       75
       75
       +
       

     

       76
       76
       +
       // func NewVerification

     

       77
       77
       +
       

     

       13
       78
        
       type Lexicon struct{}

     

       79
       79
       +
       

     

       80
       80
       +
       // func NewLexicon