commit e22f3c05ea15c66f0301f40687006475d90736b9 · edavis.dev/monarch

+44 -16

cmd/backfiller/database.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"log"

     

       4
       6
        
       	"log/slog"

     

       7
       7
       +
       	"os"

     

       8
       8
       +
       	"time"

     

       5
       9
        
       

     

       6
       10
        
       	"gorm.io/driver/sqlite"

     

       7
       11
        
       	"gorm.io/gorm"

     

       12
       12
       +
       	"gorm.io/gorm/logger"

     

       8
       13
        
       )

     

       9
       14
        
       

     

       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 {

     

       15
       15
       +
       func NewDatabase(path string) *gorm.DB {

     

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

     

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

     

       17
       17
       +
       	l := logger.New(

     

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

     

       19
       19
       +
       		logger.Config{

     

       20
       20
       +
       			SlowThreshold: time.Second,

     

       21
       21
       +
       			Colorful:      false,

     

       22
       22
       +
       		},

     

       23
       23
       +
       	)

     

       24
       24
       +
       	db, err := gorm.Open(sqlite.Open(path), &gorm.Config{

     

       25
       25
       +
       		Logger: l,

     

       26
       26
       +
       	})

     

       24
       27
        
       	if err != nil {

     

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

     

       28
       28
       +
       		sl.Error("failed to open database", "err", err)

     

       26
       29
        
       	}

     

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

     

       30
       30
       +
       	db.Exec("PRAGMA journal_mode=WAL")

     

       31
       31
       +
       	return db

     

       32
       32
       +
       }

     

       28
       33
        
       

     

       29
       29
       -
       	return db

     

       34
       34
       +
       func (b *Backend) CleanlyClose() error {

     

       35
       35
       +
       	closeDb := func(db *gorm.DB) error {

     

       36
       36
       +
       		if err := db.Exec("PRAGMA wal_checkpoint(TRUNCATE)").Error; err != nil {

     

       37
       37
       +
       			return fmt.Errorf("failed checkpointing the WAL: %w", err)

     

       38
       38
       +
       		}

     

       39
       39
       +
       		rawDb, err := db.DB()

     

       40
       40
       +
       		if err != nil {

     

       41
       41
       +
       			return fmt.Errorf("failed getting underlying DB connection: %w", err)

     

       42
       42
       +
       		}

     

       43
       43
       +
       		if err := rawDb.Close(); err != nil {

     

       44
       44
       +
       			return fmt.Errorf("failed closing underlying DB connection: %w", err)

     

       45
       45
       +
       		}

     

       46
       46
       +
       		return nil

     

       47
       47
       +
       	}

     

       48
       48
       +
       

     

       49
       49
       +
       	if err := closeDb(b.state); err != nil {

     

       50
       50
       +
       		return fmt.Errorf("failed to close state database: %w", err)

     

       51
       51
       +
       	}

     

       52
       52
       +
       

     

       53
       53
       +
       	if err := closeDb(b.data); err != nil {

     

       54
       54
       +
       		return fmt.Errorf("failed to close content database: %w", err)

     

       55
       55
       +
       	}

     

       56
       56
       +
       

     

       57
       57
       +
       	return nil

     

       30
       58
        
       }

+10 -6

cmd/backfiller/handlers.go

···

       1
       1
        
       package main

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"bytes"

     

       4
       5
        
       	"context"

     

       5
       5
       -
       	"encoding/json"

     

       6
       6
        
       	"errors"

     

       7
       7
        
       	"fmt"

     

       8
       8
       +
       	"log/slog"

     

       8
       9
        
       	"strconv"

     

       9
       10
        
       	"strings"

     

       10
       11
        
       

     
···

       54
       55
        
       		return nil

     

       55
       56
        
       	}

     

       56
       57
        
       

     

       58
       58
       +
       	sl := slog.With("source", "commitHandler")

     

       59
       59
       +
       

     

       57
       60
        
       	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)

     

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

     

       62
       62
       +
       		sl.Error("failed to unmarshal record", "err", err)

     

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

     

       60
       64
        
       	}

     

       61
       65
        
       

     

       62
       66
        
       	feedgen := &FeedGenerator{

     
···

       64
       68
        
       		DisplayName:         out.DisplayName,

     

       65
       69
        
       		FeedService:         out.Did,

     

       66
       70
        
       		CreatedAt:           out.CreatedAt,

     

       67
       67
       -
       		Description:         *out.Description,

     

       68
       68
       -
       		AcceptsInteractions: *out.AcceptsInteractions,

     

       69
       69
       -
       		ContentMode:         *out.ContentMode,

     

       71
       71
       +
       		Description:         out.Description,

     

       72
       72
       +
       		ContentMode:         out.ContentMode,

     

       73
       73
       +
       		AcceptsInteractions: out.AcceptsInteractions,

     

       70
       74
        
       	}

     

       71
       75
        
       

     

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

+16 -33

cmd/backfiller/main.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       -
       	"log"

     

       6
       5
        
       	"log/slog"

     

       7
       6
        
       	"net/http"

     

       8
       7
        
       	"os"

     
···

       16
       15
        
       	"github.com/bluesky-social/indigo/events/schedulers/parallel"

     

       17
       16
        
       

     

       18
       17
        
       	"github.com/gorilla/websocket"

     

       19
       19
       -
       	"gorm.io/driver/sqlite"

     

       20
       18
        
       	"gorm.io/gorm"

     

       21
       21
       -
       	"gorm.io/gorm/logger"

     

       22
       19
        
       )

     

       23
       20
        
       

     

       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{

     

       29
       29
       -
       			SlowThreshold: 1 * time.Second,

     

       30
       30
       -
       			Colorful:      false,

     

       31
       31
       -
       		},

     

       32
       32
       -
       	)

     

       33
       33
       -
       	db, err := gorm.Open(sqlite.Open("state.db"), &gorm.Config{

     

       34
       34
       -
       		Logger: newLogger,

     

       35
       35
       -
       	})

     

       36
       36
       -
       	if err != nil {

     

       37
       37
       -
       		sl.Error("failed to connect to database", "err", err)

     

       38
       38
       -
       	}

     

       39
       39
       -
       	db.AutoMigrate(&backfill.GormDBJob{})

     

       40
       40
       -
       	db.AutoMigrate(&cursorRecord{})

     

       41
       41
       -
       

     

       42
       42
       -
       	return db

     

       43
       43
       -
       }

     

       44
       44
       -
       

     

       45
       21
        
       func NewBackfiller(

     

       46
       22
        
       	db *gorm.DB, create handleOpCreateUpdate, update handleOpCreateUpdate, delete handleOpDelete,

     

       47
       23
        
       ) *backfill.Backfiller {

     
···

       55
       31
        
       		SyncRequestsPerSecond: 5,

     

       56
       32
        
       

     

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

     

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

     

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

     

       59
       35
        
       	}

     

       60
       36
        
       

     

       61
       37
        
       	return backfill.NewBackfiller(

     
···

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

     

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

     

       103
       79
        
       

     

       104
       104
       -
       	state := NewState()

     

       105
       105
       -
       	db := NewDatabase()

     

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

     

       80
       80
       +
       	stateDb := NewDatabase("state.db")

     

       81
       81
       +
       	stateDb.AutoMigrate(&backfill.GormDBJob{})

     

       82
       82
       +
       	stateDb.AutoMigrate(&cursorRecord{})

     

       83
       83
       +
       

     

       84
       84
       +
       	contentDb := NewDatabase("database.db")

     

       85
       85
       +
       	contentDb.AutoMigrate(&FeedGenerator{})

     

       107
       86
        
       

     

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

     

       87
       87
       +
       	backend := NewBackend(stateDb, contentDb)

     

       88
       88
       +
       

     

       89
       89
       +
       	bf := NewBackfiller(stateDb, backend.HandleCreateOp, backend.HandleUpdateOp, backend.HandleDeleteOp)

     

       109
       90
        
       	go bf.Start()

     

       110
       91
        
       

     

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

     
···

       156
       137
        
       		defer cancel()

     

       157
       138
        
       		bf.Stop(endctx)

     

       158
       139
        
       

     

       159
       159
       -
       		if err := backend.FlushCursors(); err != nil {

     

       160
       160
       -
       			sl.Error("final flush cursor failed", "err", err)

     

       161
       161
       -
       		}

     

       162
       162
       -
       

     

       163
       140
        
       		close(quit)

     

       164
       141
        
       	}()

     

       165
       142
        
       

     

       166
       143
        
       	<-quit

     

       167
       144
        
       

     

       145
       145
       +
       	sl.Info("flushing cursors")

     

       168
       146
        
       	if err := backend.FlushCursors(); err != nil {

     

       169
       147
        
       		sl.Error("failed to flush cursors on close", "err", err)

     

       148
       148
       +
       	}

     

       149
       149
       +
       

     

       150
       150
       +
       	sl.Info("closing databases")

     

       151
       151
       +
       	if err := backend.CleanlyClose(); err != nil {

     

       152
       152
       +
       		sl.Error("failed to close databases", "err", err)

     

       170
       153
        
       	}

     

       171
       154
        
       }

+12

cmd/backfiller/models.go

···

       1
       1
       +
       package main

     

       2
       2
       +
       

     

       3
       3
       +
       type FeedGenerator struct {

     

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

     

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

     

       6
       6
       +
       	DisplayName         string

     

       7
       7
       +
       	FeedService         string

     

       8
       8
       +
       	Description         *string

     

       9
       9
       +
       	ContentMode         *string

     

       10
       10
       +
       	AcceptsInteractions *bool

     

       11
       11
       +
       	CreatedAt           string

     

       12
       12
       +
       }