commit 754f3d47a08cd1feaba75fca14afe9875166df63 · edavis.dev/monarch

+3 -1

cmd/backfiller/backend.go

···

       9
       9
        
       

     

       10
       10
        
       type Backend struct {

     

       11
       11
        
       	state *gorm.DB

     

       12
       12
       +
       	data  *gorm.DB

     

       12
       13
        
       	bf    *backfill.Backfiller

     

       13
       14
        
       

     

       14
       15
        
       	backfillComplete bool

     
···

       19
       20
        
       	reposSeq    string

     

       20
       21
        
       }

     

       21
       22
        
       

     

       22
       22
       -
       func NewBackend(state *gorm.DB) *Backend {

     

       23
       23
       +
       func NewBackend(state, data *gorm.DB) *Backend {

     

       23
       24
        
       	return &Backend{

     

       24
       25
        
       		state: state,

     

       26
       26
       +
       		data:  data,

     

       25
       27
        
       	}

     

       26
       28
        
       }

+30

cmd/backfiller/database.go

···

       1
       1
       +
       package main

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"log/slog"

     

       5
       5
       +
       

     

       6
       6
       +
       	"gorm.io/driver/sqlite"

     

       7
       7
       +
       	"gorm.io/gorm"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       type FeedGenerator struct {

     

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

     

       12
       12
       +
       	AtUri               string `gorm:"unique"`

     

       13
       13
       +
       	DisplayName         string

     

       14
       14
       +
       	Description         string

     

       15
       15
       +
       	FeedService         string

     

       16
       16
       +
       	AcceptsInteractions bool

     

       17
       17
       +
       	ContentMode         string

     

       18
       18
       +
       	CreatedAt           string

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       func NewDatabase() *gorm.DB {

     

       22
       22
       +
       	sl := slog.With("source", "database")

     

       23
       23
       +
       	db, err := gorm.Open(sqlite.Open("database.db"), &gorm.Config{})

     

       24
       24
       +
       	if err != nil {

     

       25
       25
       +
       		sl.Error("failed to connect to database", "err", err)

     

       26
       26
       +
       	}

     

       27
       27
       +
       	db.AutoMigrate(&FeedGenerator{})

     

       28
       28
       +
       

     

       29
       29
       +
       	return db

     

       30
       30
       +
       }

+26

cmd/backfiller/handlers.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       +
       	"encoding/json"

     

       5
       6
        
       	"errors"

     

       6
       7
        
       	"fmt"

     

       7
       8
        
       	"strconv"

     

       9
       9
       +
       	"strings"

     

       8
       10
        
       

     

       9
       11
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

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

     

       10
       13
        
       	"github.com/bluesky-social/indigo/backfill"

     

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

     

       12
       15
        
       )

     
···

       47
       50
        
       type handleOpDelete func(context.Context, string, string, string) error

     

       48
       51
        
       

     

       49
       52
        
       func (b *Backend) HandleCreateOp(ctx context.Context, repo, rev, path string, rec *[]byte, cid *cid.Cid) error {

     

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

     

       54
       54
       +
       		return nil

     

       55
       55
       +
       	}

     

       56
       56
       +
       

     

       57
       57
       +
       	var out appbsky.FeedGenerator

     

       58
       58
       +
       	if err := json.Unmarshal(*rec, &out); err != nil {

     

       59
       59
       +
       		return fmt.Errorf("failed to unmarshal feedgen record: %w", err)

     

       60
       60
       +
       	}

     

       61
       61
       +
       

     

       62
       62
       +
       	feedgen := &FeedGenerator{

     

       63
       63
       +
       		AtUri:               fmt.Sprintf("at://%s/%s", repo, path),

     

       64
       64
       +
       		DisplayName:         out.DisplayName,

     

       65
       65
       +
       		FeedService:         out.Did,

     

       66
       66
       +
       		CreatedAt:           out.CreatedAt,

     

       67
       67
       +
       		Description:         *out.Description,

     

       68
       68
       +
       		AcceptsInteractions: *out.AcceptsInteractions,

     

       69
       69
       +
       		ContentMode:         *out.ContentMode,

     

       70
       70
       +
       	}

     

       71
       71
       +
       

     

       72
       72
       +
       	if err := b.data.Model(&FeedGenerator{}).Create(feedgen).Error; err != nil {

     

       73
       73
       +
       		return fmt.Errorf("error adding feedgen to database: %w", err)

     

       74
       74
       +
       	}

     

       75
       75
       +
       

     

       50
       76
        
       	return nil

     

       51
       77
        
       }

     

       52
       78

+9 -6

cmd/backfiller/main.go

···

       21
       21
        
       	"gorm.io/gorm/logger"

     

       22
       22
        
       )

     

       23
       23
        
       

     

       24
       24
       -
       func NewDatabase() *gorm.DB {

     

       25
       25
       -
       	sl := slog.With("source", "database")

     

       24
       24
       +
       func NewState() *gorm.DB {

     

       25
       25
       +
       	sl := slog.With("source", "state")

     

       26
       26
        
       	newLogger := logger.New(

     

       27
       27
        
       		log.New(os.Stdout, "\r\n", log.LstdFlags),

     

       28
       28
        
       		logger.Config{

     
···

       54
       54
        
       		ParallelRecordCreates: 1, // sqlite

     

       55
       55
        
       		SyncRequestsPerSecond: 5,

     

       56
       56
        
       

     

       57
       57
       -
       		RelayHost: "https://bsky.network",

     

       57
       57
       +
       		// NSIDFilter: "app.bsky.feed.generator",

     

       58
       58
       +
       		RelayHost:  "https://bsky.network",

     

       58
       59
        
       	}

     

       59
       60
        
       

     

       60
       61
        
       	return backfill.NewBackfiller(

     
···

       100
       101
        
       	streamClosed := make(chan struct{})

     

       101
       102
        
       	streamCtx, streamCancel := context.WithCancel(context.Background())

     

       102
       103
        
       

     

       104
       104
       +
       	state := NewState()

     

       103
       105
        
       	db := NewDatabase()

     

       104
       104
       -
       	backend := NewBackend(db)

     

       106
       106
       +
       	backend := NewBackend(state, db)

     

       105
       107
        
       

     

       106
       106
       -
       	bf := NewBackfiller(db, backend.HandleCreateOp, backend.HandleUpdateOp, backend.HandleDeleteOp)

     

       108
       108
       +
       	bf := NewBackfiller(state, backend.HandleCreateOp, backend.HandleUpdateOp, backend.HandleDeleteOp)

     

       107
       109
        
       	go bf.Start()

     

       108
       110
        
       

     

       109
       109
       -
       	// attach the backfiller to the backend so pump and repo commit handler can use it

     

       111
       111
       +
       	// attach the backfiller to the backend so the curors, the pump,

     

       112
       112
       +
       	// and the commit callback can use it

     

       110
       113
        
       	backend.bf = bf

     

       111
       114
        
       

     

       112
       115
        
       	go backend.SyncCursors(streamCtx)