commit caba3915467df869afceb62b12b2a1570c8dc17f · edavis.dev/monarch

+21 -3

cmd/monarch/census.go

···

       17
       17
        
       	cursor   *CursorService

     

       18
       18
        
       	backfill *backfill.Backfiller

     

       19
       19
        
       

     

       20
       20
       +
       	seenHosts map[string]bool

     

       21
       21
       +
       	seenLk    sync.Mutex

     

       22
       22
       +
       

     

       20
       23
        
       	storeLk sync.Mutex

     

       21
       24
        
       }

     

       22
       25
        
       

     
···

       26
       29
        
       

     

       27
       30
        
       func NewCensusService(cursorSvc *CursorService, backfillSvc *backfill.Backfiller) *CensusService {

     

       28
       31
        
       	return &CensusService{

     

       29
       29
       -
       		cursor:   cursorSvc,

     

       30
       30
       -
       		backfill: backfillSvc,

     

       32
       32
       +
       		cursor:    cursorSvc,

     

       33
       33
       +
       		backfill:  backfillSvc,

     

       34
       34
       +
       		seenHosts: make(map[string]bool),

     

       31
       35
        
       	}

     

       32
       36
        
       }

     

       33
       37
        
       

     
···

       65
       69
        
       		}

     

       66
       70
        
       

     

       67
       71
        
       		for _, host := range res.Hosts {

     

       72
       72
       +
       			// don't reprocess hosts already handled

     

       73
       73
       +
       			cs.seenLk.Lock()

     

       74
       74
       +
       			_, ok := cs.seenHosts[host.Hostname]

     

       75
       75
       +
       			cs.seenLk.Unlock()

     

       76
       76
       +
       			if ok {

     

       77
       77
       +
       				slog.Info("already processed host, skipping")

     

       78
       78
       +
       				continue

     

       79
       79
       +
       			}

     

       80
       80
       +
       

     

       68
       81
        
       			sem.Acquire(ctx, 1)

     

       69
       82
        
       			wg.Add(1) // TODO wg.Go

     

       70
       83
        
       			go func() {

     
···

       149
       162
        
       	}

     

       150
       163
        
       

     

       151
       164
        
       	slog.Info("finished listing repos", "host", host)

     

       165
       165
       +
       

     

       166
       166
       +
       	cs.seenLk.Lock()

     

       167
       167
       +
       	defer cs.seenLk.Unlock()

     

       168
       168
       +
       

     

       169
       169
       +
       	cs.seenHosts[host] = true

     

       152
       170
        
       }

     

       153
       171
        
       

     

       154
       172
        
       func (cs *CensusService) Start(ctx context.Context, cctx *cli.Context) {

     
···

       156
       174
        
       	cs.listHosts(ctx, cctx)

     

       157
       175
        
       

     

       158
       176
        
       	slog.Info("finished with initial refresh, starting ticker")

     

       159
       159
       -
       	t := time.NewTicker(time.Hour)

     

       177
       177
       +
       	t := time.NewTicker(time.Minute * 5)

     

       160
       178
        
       	defer t.Stop()

     

       161
       179
        
       

     

       162
       180
        
       	for {

+1 -6

cmd/monarch/cursors.go

···

       33
       33
        
       		select {

     

       34
       34
        
       		case <-ctx.Done():

     

       35
       35
        
       			slog.Info("stopping cursor checkpointer", "err", ctx.Err())

     

       36
       36
       -
       

     

       37
       37
       -
       			slog.Info("persisting firehose cursor before exit", "seq", cs.firehoseSeq)

     

       38
       38
       -
       			if err := cs.PersistFirehoseCursor(); err != nil {

     

       39
       39
       -
       				slog.Error("error persisting firehose cursor", "err", err)

     

       40
       40
       -
       			}

     

       41
       41
       -
       

     

       36
       36
       +
       			cs.PersistFirehoseCursor() // one final save

     

       42
       37
        
       			return

     

       43
       38
        
       		case <-t.C:

     

       44
       39
        
       		}

+44 -114

cmd/monarch/handlers.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"bytes"

     

       4
       5
        
       	"context"

     

       6
       6
       +
       	"encoding/json"

     

       5
       7
        
       	"fmt"

     

       6
       8
        
       

     

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

     

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

     

       8
       11
        
       	"github.com/ipfs/go-cid"

     

       9
       12
        
       	"gorm.io/gorm"

     

       10
       10
       -
       	"gorm.io/gorm/clause"

     

       11
       11
       -
       	"tangled.sh/edavis.dev/monarch/models"

     

       12
       13
        
       )

     

       13
       14
        
       

     

       14
       15
        
       type Action int

     
···

       22
       23
        
       	store *gorm.DB

     

       23
       24
        
       }

     

       24
       25
        
       

     

       25
       25
       -
       func NewHandlerService(store *gorm.DB) *HandlerService {

     

       26
       26
       -
       	migrations := []any{

     

       27
       27
       -
       		// app.bsky.*

     

       28
       28
       -
       		&models.ActorProfile{},

     

       29
       29
       -
       		&models.ActorProfile_Label{},

     

       30
       30
       -
       		&models.ActorStatus{},

     

       26
       26
       +
       type Record struct {

     

       27
       27
       +
       	ID         int `gorm:"primaryKey"`

     

       28
       28
       +
       	Repo       string

     

       29
       29
       +
       	Collection string

     

       30
       30
       +
       	Key        string

     

       31
       31
       +
       	Data       json.RawMessage `gorm:"type:jsonb"`

     

       32
       32
       +
       }

     

       31
       33
        
       

     

       32
       32
       -
       		&models.FeedGenerator{},

     

       33
       33
       -
       		&models.FeedGenerator_Label{},

     

       34
       34
       -
       		&models.FeedLike{},

     

       35
       35
       -
       		&models.FeedPost{},

     

       36
       36
       -
       		&models.FeedPost_Label{},

     

       37
       37
       -
       		&models.FeedPost_Lang{},

     

       38
       38
       -
       		&models.FeedPost_Tag{},

     

       39
       39
       -
       		&models.FeedPostgate{},

     

       40
       40
       -
       		&models.FeedPostgate_DetachedEmbeddingUri{},

     

       41
       41
       -
       		&models.FeedPostgate_EmbeddingRule{},

     

       42
       42
       -
       		&models.FeedRepost{},

     

       43
       43
       -
       		&models.FeedThreadgate{},

     

       44
       44
       -
       		&models.FeedThreadgate_AllowRule{},

     

       45
       45
       -
       		&models.FeedThreadgate_HiddenReply{},

     

       46
       46
       -
       

     

       47
       47
       -
       		&models.GraphBlock{},

     

       48
       48
       -
       		&models.GraphFollow{},

     

       49
       49
       -
       		&models.GraphList{},

     

       50
       50
       -
       		&models.GraphListblock{},

     

       51
       51
       -
       		&models.GraphListitem{},

     

       52
       52
       -
       		&models.GraphStarterpack{},

     

       53
       53
       -
       		&models.GraphStarterpack_Feed{},

     

       54
       54
       -
       		&models.GraphVerification{},

     

       55
       55
       -
       

     

       56
       56
       -
       		&models.LabelerService{},

     

       57
       57
       -
       		&models.LabelerService_Label{},

     

       58
       58
       -
       		&models.LabelerService_Policy{},

     

       59
       59
       -
       		&models.LabelerService_ReasonType{},

     

       60
       60
       -
       		&models.LabelerService_SubjectCollection{},

     

       61
       61
       -
       		&models.LabelerService_SubjectType{},

     

       62
       62
       -
       

     

       63
       63
       -
       		// chat.bsky.*

     

       64
       64
       -
       		&models.ActorDeclaration{},

     

       65
       65
       -
       	}

     

       66
       66
       -
       	for _, migration := range migrations {

     

       67
       67
       -
       		store.AutoMigrate(migration)

     

       68
       68
       -
       	}

     

       34
       34
       +
       func NewHandlerService(store *gorm.DB) *HandlerService {

     

       35
       35
       +
       	store.AutoMigrate(&Record{})

     

       69
       36
        
       

     

       70
       37
        
       	return &HandlerService{

     

       71
       38
        
       		store: store,

     

       72
       39
        
       	}

     

       73
       40
        
       }

     

       74
       41
        
       

     

       75
       75
       -
       type helper struct {

     

       76
       76
       -
       	db     *gorm.DB

     

       77
       77
       -
       	uri    syntax.ATURI

     

       78
       78
       -
       	record []byte

     

       79
       79
       -
       	action Action

     

       80
       80
       -
       }

     

       81
       81
       -
       

     

       82
       82
       -
       func NewHelper(db *gorm.DB, uri syntax.ATURI, record []byte, action Action) *helper {

     

       83
       83
       -
       	return &helper{db, uri, record, action}

     

       84
       84
       -
       }

     

       85
       85
       -
       

     

       86
       86
       -
       func upsertRecord[T any](maker func(syntax.ATURI, []byte) T, opts *helper) error {

     

       87
       87
       -
       	obj := maker(opts.uri, opts.record)

     

       88
       88
       -
       	switch opts.action {

     

       89
       89
       -
       	case ActionCreate:

     

       90
       90
       -
       		if err := opts.db.Omit(clause.Associations).Create(obj).Error; err != nil {

     

       91
       91
       -
       			return fmt.Errorf("error inserting %s record: %w", opts.uri.Collection(), err)

     

       92
       92
       -
       		}

     

       93
       93
       -
       	case ActionUpdate:

     

       94
       94
       -
       		if err := opts.db.Save(obj).Error; err != nil {

     

       95
       95
       -
       			return fmt.Errorf("error updating %s record: %w", opts.uri.Collection(), err)

     

       96
       96
       -
       		}

     

       97
       97
       -
       	}

     

       98
       98
       -
       	return nil

     

       42
       42
       +
       var trackedCollections = map[syntax.NSID]bool{

     

       43
       43
       +
       	syntax.NSID("app.bsky.actor.profile"):      false,

     

       44
       44
       +
       	syntax.NSID("app.bsky.feed.generator"):     true,

     

       45
       45
       +
       	syntax.NSID("app.bsky.labeler.service"):    true,

     

       46
       46
       +
       	syntax.NSID("app.bsky.graph.list"):         true,

     

       47
       47
       +
       	syntax.NSID("app.bsky.graph.verification"): true,

     

       48
       48
       +
       	syntax.NSID("app.bsky.graph.starterpack"):  true,

     

       99
       49
        
       }

     

       100
       50
        
       

     

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

     
···

       104
       54
        
       		return fmt.Errorf("error parsing at-uri: %w", err)

     

       105
       55
        
       	}

     

       106
       56
        
       

     

       107
       107
       -
       	opts := NewHelper(hs.store, uri, *rec, action)

     

       57
       57
       +
       	tracked := trackedCollections[uri.Collection()]

     

       58
       58
       +
       	if !tracked {

     

       59
       59
       +
       		return nil

     

       60
       60
       +
       	}

     

       108
       61
        
       

     

       62
       62
       +
       	var body []byte

     

       109
       63
        
       	switch uri.Collection() {

     

       110
       64
        
       	case syntax.NSID("app.bsky.actor.profile"):

     

       111
       111
       -
       		return upsertRecord(models.NewActorProfile, opts)

     

       112
       112
       -
       

     

       113
       113
       -
       	case syntax.NSID("app.bsky.actor.status"):

     

       114
       114
       -
       		return upsertRecord(models.NewActorStatus, opts)

     

       65
       65
       +
       		var out appbsky.ActorProfile

     

       66
       66
       +
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       67
       67
       +
       		body, err = json.Marshal(out)

     

       115
       68
        
       

     

       116
       69
        
       	case syntax.NSID("app.bsky.feed.generator"):

     

       117
       117
       -
       		return upsertRecord(models.NewFeedGenerator, opts)

     

       118
       118
       -
       

     

       119
       119
       -
       	case syntax.NSID("app.bsky.feed.like"):

     

       120
       120
       -
       		return upsertRecord(models.NewFeedLike, opts)

     

       121
       121
       -
       

     

       122
       122
       -
       	case syntax.NSID("app.bsky.feed.post"):

     

       123
       123
       -
       		return upsertRecord(models.NewFeedPost, opts)

     

       124
       124
       -
       

     

       125
       125
       -
       	case syntax.NSID("app.bsky.feed.postgate"):

     

       126
       126
       -
       		return upsertRecord(models.NewFeedPostgate, opts)

     

       127
       127
       -
       

     

       128
       128
       -
       	case syntax.NSID("app.bsky.feed.repost"):

     

       129
       129
       -
       		return upsertRecord(models.NewFeedRepost, opts)

     

       130
       130
       -
       

     

       131
       131
       -
       	case syntax.NSID("app.bsky.feed.threadgate"):

     

       132
       132
       -
       		return upsertRecord(models.NewFeedThreadgate, opts)

     

       133
       133
       -
       

     

       134
       134
       -
       	case syntax.NSID("app.bsky.graph.block"):

     

       135
       135
       -
       		return upsertRecord(models.NewGraphBlock, opts)

     

       136
       136
       -
       

     

       137
       137
       -
       	case syntax.NSID("app.bsky.graph.follow"):

     

       138
       138
       -
       		return upsertRecord(models.NewGraphFollow, opts)

     

       139
       139
       -
       

     

       140
       140
       -
       	case syntax.NSID("app.bsky.graph.list"):

     

       141
       141
       -
       		return upsertRecord(models.NewGraphList, opts)

     

       142
       142
       -
       

     

       143
       143
       -
       	case syntax.NSID("app.bsky.graph.listblock"):

     

       144
       144
       -
       		return upsertRecord(models.NewGraphListblock, opts)

     

       145
       145
       -
       

     

       146
       146
       -
       	case syntax.NSID("app.bsky.graph.listitem"):

     

       147
       147
       -
       		return upsertRecord(models.NewGraphListitem, opts)

     

       148
       148
       -
       

     

       149
       149
       -
       	case syntax.NSID("app.bsky.graph.starterpack"):

     

       150
       150
       -
       		return upsertRecord(models.NewGraphStarterpack, opts)

     

       151
       151
       -
       

     

       152
       152
       -
       	case syntax.NSID("app.bsky.graph.verification"):

     

       153
       153
       -
       		return upsertRecord(models.NewGraphVerification, opts)

     

       70
       70
       +
       		var out appbsky.FeedGenerator

     

       71
       71
       +
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       72
       72
       +
       		body, err = json.Marshal(out)

     

       154
       73
        
       

     

       155
       74
        
       	case syntax.NSID("app.bsky.labeler.service"):

     

       156
       156
       -
       		return upsertRecord(models.NewLabelerService, opts)

     

       75
       75
       +
       		var out appbsky.LabelerService

     

       76
       76
       +
       		out.UnmarshalCBOR(bytes.NewReader(*rec))

     

       77
       77
       +
       		body, err = json.Marshal(out)

     

       78
       78
       +
       	}

     

       157
       79
        
       

     

       158
       158
       -
       	case syntax.NSID("chat.bsky.actor.declaration"):

     

       159
       159
       -
       		return upsertRecord(models.NewActorDeclaration, opts)

     

       80
       80
       +
       	switch action {

     

       81
       81
       +
       	case ActionCreate:

     

       82
       82
       +
       		if err := hs.store.Create(&Record{

     

       83
       83
       +
       			Repo:       repo,

     

       84
       84
       +
       			Collection: string(uri.Collection()),

     

       85
       85
       +
       			Key:        string(uri.RecordKey()),

     

       86
       86
       +
       			Data:       json.RawMessage(body),

     

       87
       87
       +
       		}).Error; err != nil {

     

       88
       88
       +
       			return err

     

       89
       89
       +
       		}

     

       160
       90
        
       	}

     

       161
       91
        
       

     

       162
       92
        
       	return nil