patch of appview: introduce knotstream consumer · round #1 · pull #239 · tangled.org/core

+18 -8

appview/config/config.go

···

       4
        
       	"context"

     

       5
        
       	"fmt"

     

       6
        
       	"net/url"

     

       0
        
       
     

       7
        
       

     

       8
        
       	"github.com/sethvargo/go-envconfig"

     

       9
        
       )

     
···

       24
        
       	Endpoint string `env:"ENDPOINT, default=wss://jetstream1.us-east.bsky.network/subscribe"`

     

       25
        
       }

     

       26
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       27
        
       type ResendConfig struct {

     

       28
        
       	ApiKey   string `env:"API_KEY"`

     

       29
        
       	SentFrom string `env:"SENT_FROM, default=noreply@notifs.tangled.sh"`

     
···

       65
        
       }

     

       66
        
       

     

       67
        
       type Config struct {

     

       68
       -
       	Core      CoreConfig      `env:",prefix=TANGLED_"`

     

       69
       -
       	Jetstream JetstreamConfig `env:",prefix=TANGLED_JETSTREAM_"`

     

       70
       -
       	Resend    ResendConfig    `env:",prefix=TANGLED_RESEND_"`

     

       71
       -
       	Posthog   PosthogConfig   `env:",prefix=TANGLED_POSTHOG_"`

     

       72
       -
       	Camo      CamoConfig      `env:",prefix=TANGLED_CAMO_"`

     

       73
       -
       	Avatar    AvatarConfig    `env:",prefix=TANGLED_AVATAR_"`

     

       74
       -
       	OAuth     OAuthConfig     `env:",prefix=TANGLED_OAUTH_"`

     

       75
       -
       	Redis     RedisConfig     `env:",prefix=TANGLED_REDIS_"`

     

       0
        
       
     

       76
        
       }

     

       77
        
       

     

       78
        
       func LoadConfig(ctx context.Context) (*Config, error) {

···

       4
        
       	"context"

     

       5
        
       	"fmt"

     

       6
        
       	"net/url"

     

       7
       +
       	"time"

     

       8
        
       

     

       9
        
       	"github.com/sethvargo/go-envconfig"

     

       10
        
       )

     
···

       25
        
       	Endpoint string `env:"ENDPOINT, default=wss://jetstream1.us-east.bsky.network/subscribe"`

     

       26
        
       }

     

       27
        
       

     

       28
       +
       type KnotstreamConfig struct {

     

       29
       +
       	RetryInterval     time.Duration `env:"RETRY_INTERVAL, default=60s"`

     

       30
       +
       	MaxRetryInterval  time.Duration `env:"MAX_RETRY_INTERVAL, default=120m"`

     

       31
       +
       	ConnectionTimeout time.Duration `env:"CONNECTION_TIMEOUT, default=5s"`

     

       32
       +
       	WorkerCount       int           `env:"WORKER_COUNT, default=64"`

     

       33
       +
       	QueueSize         int           `env:"QUEUE_SIZE, default=100"`

     

       34
       +
       }

     

       35
       +
       

     

       36
        
       type ResendConfig struct {

     

       37
        
       	ApiKey   string `env:"API_KEY"`

     

       38
        
       	SentFrom string `env:"SENT_FROM, default=noreply@notifs.tangled.sh"`

     
···

       74
        
       }

     

       75
        
       

     

       76
        
       type Config struct {

     

       77
       +
       	Core       CoreConfig       `env:",prefix=TANGLED_"`

     

       78
       +
       	Jetstream  JetstreamConfig  `env:",prefix=TANGLED_JETSTREAM_"`

     

       79
       +
       	Knotstream KnotstreamConfig `env:",prefix=TANGLED_KNOTSTREAM_"`

     

       80
       +
       	Resend     ResendConfig     `env:",prefix=TANGLED_RESEND_"`

     

       81
       +
       	Posthog    PosthogConfig    `env:",prefix=TANGLED_POSTHOG_"`

     

       82
       +
       	Camo       CamoConfig       `env:",prefix=TANGLED_CAMO_"`

     

       83
       +
       	Avatar     AvatarConfig     `env:",prefix=TANGLED_AVATAR_"`

     

       84
       +
       	OAuth      OAuthConfig      `env:",prefix=TANGLED_OAUTH_"`

     

       85
       +
       	Redis      RedisConfig      `env:",prefix=TANGLED_REDIS_"`

     

       86
        
       }

     

       87
        
       

     

       88
        
       func LoadConfig(ctx context.Context) (*Config, error) {

+89

appview/state/knotstream.go

···

       1
       +
       package state

     

       2
       +
       

     

       3
       +
       import (

     

       4
       +
       	"encoding/json"

     

       5
       +
       	"fmt"

     

       6
       +
       	"slices"

     

       7
       +
       	"time"

     

       8
       +
       

     

       9
       +
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       10
       +
       	"tangled.sh/tangled.sh/core/appview/cache"

     

       11
       +
       	"tangled.sh/tangled.sh/core/appview/config"

     

       12
       +
       	"tangled.sh/tangled.sh/core/appview/db"

     

       13
       +
       	kc "tangled.sh/tangled.sh/core/knotclient"

     

       14
       +
       	"tangled.sh/tangled.sh/core/log"

     

       15
       +
       	"tangled.sh/tangled.sh/core/rbac"

     

       16
       +
       )

     

       17
       +
       

     

       18
       +
       func KnotstreamConsumer(c *config.Config, d *db.DB, enforcer *rbac.Enforcer) (*kc.EventConsumer, error) {

     

       19
       +
       	knots, err := db.GetCompletedRegistrations(d)

     

       20
       +
       	if err != nil {

     

       21
       +
       		return nil, err

     

       22
       +
       	}

     

       23
       +
       

     

       24
       +
       	srcs := make(map[kc.EventSource]struct{})

     

       25
       +
       	for _, k := range knots {

     

       26
       +
       		s := kc.EventSource{k}

     

       27
       +
       		srcs[s] = struct{}{}

     

       28
       +
       	}

     

       29
       +
       

     

       30
       +
       	logger := log.New("knotstream")

     

       31
       +
       	cache := cache.New(c.Redis.Addr)

     

       32
       +
       	cursorStore := kc.NewRedisCursorStore(cache)

     

       33
       +
       

     

       34
       +
       	cfg := kc.ConsumerConfig{

     

       35
       +
       		Sources:           srcs,

     

       36
       +
       		ProcessFunc:       knotstreamIngester(d, enforcer),

     

       37
       +
       		RetryInterval:     c.Knotstream.RetryInterval,

     

       38
       +
       		MaxRetryInterval:  c.Knotstream.MaxRetryInterval,

     

       39
       +
       		ConnectionTimeout: c.Knotstream.ConnectionTimeout,

     

       40
       +
       		WorkerCount:       c.Knotstream.WorkerCount,

     

       41
       +
       		QueueSize:         c.Knotstream.QueueSize,

     

       42
       +
       		Logger:            logger,

     

       43
       +
       		Dev:               c.Core.Dev,

     

       44
       +
       		CursorStore:       &cursorStore,

     

       45
       +
       	}

     

       46
       +
       

     

       47
       +
       	return kc.NewEventConsumer(cfg), nil

     

       48
       +
       }

     

       49
       +
       

     

       50
       +
       func knotstreamIngester(d *db.DB, enforcer *rbac.Enforcer) kc.ProcessFunc {

     

       51
       +
       	return func(source kc.EventSource, msg kc.Message) error {

     

       52
       +
       		switch msg.Nsid {

     

       53
       +
       		case tangled.GitRefUpdateNSID:

     

       54
       +
       			return ingestRefUpdate(d, enforcer, source, msg)

     

       55
       +
       		case tangled.PipelineNSID:

     

       56
       +
       			// TODO

     

       57
       +
       		}

     

       58
       +
       

     

       59
       +
       		return nil

     

       60
       +
       	}

     

       61
       +
       }

     

       62
       +
       

     

       63
       +
       func ingestRefUpdate(d *db.DB, enforcer *rbac.Enforcer, source kc.EventSource, msg kc.Message) error {

     

       64
       +
       	var record tangled.GitRefUpdate

     

       65
       +
       	err := json.Unmarshal(msg.EventJson, &record)

     

       66
       +
       	if err != nil {

     

       67
       +
       		return err

     

       68
       +
       	}

     

       69
       +
       

     

       70
       +
       	knownKnots, err := enforcer.GetDomainsForUser(record.CommitterDid)

     

       71
       +
       	if err != nil {

     

       72
       +
       		return err

     

       73
       +
       	}

     

       74
       +
       

     

       75
       +
       	if !slices.Contains(knownKnots, source.Knot) {

     

       76
       +
       		return fmt.Errorf("%s does not belong to %s, something is fishy", record.CommitterDid, source.Knot)

     

       77
       +
       	}

     

       78
       +
       

     

       79
       +
       	punch := db.Punch{

     

       80
       +
       		Did:   record.CommitterDid,

     

       81
       +
       		Date:  time.Now(),

     

       82
       +
       		Count: 1,

     

       83
       +
       	}

     

       84
       +
       	if err := db.AddPunch(d, punch); err != nil {

     

       85
       +
       		return err

     

       86
       +
       	}

     

       87
       +
       

     

       88
       +
       	return nil

     

       89
       +
       }

+11

appview/state/state.go

···

       45
        
       	jc           *jetstream.JetstreamClient

     

       46
        
       	config       *config.Config

     

       47
        
       	repoResolver *reporesolver.RepoResolver

     

       0
        
       
     

       48
        
       }

     

       49
        
       

     

       50
        
       func Make(config *config.Config) (*State, error) {

     
···

       108
        
       		return nil, fmt.Errorf("failed to start jetstream watcher: %w", err)

     

       109
        
       	}

     

       110
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       111
        
       	state := &State{

     

       112
        
       		d,

     

       113
        
       		oauth,

     
···

       120
        
       		jc,

     

       121
        
       		config,

     

       122
        
       		repoResolver,

     

       0
        
       
     

       123
        
       	}

     

       124
        
       

     

       125
        
       	return state, nil

     
···

       357
        
       		return

     

       358
        
       	}

     

       359
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       360
        
       	w.Write([]byte("check success"))

     

       361
        
       }

     

       362

···

       45
        
       	jc           *jetstream.JetstreamClient

     

       46
        
       	config       *config.Config

     

       47
        
       	repoResolver *reporesolver.RepoResolver

     

       48
       +
       	knotstream   *knotclient.EventConsumer

     

       49
        
       }

     

       50
        
       

     

       51
        
       func Make(config *config.Config) (*State, error) {

     
···

       109
        
       		return nil, fmt.Errorf("failed to start jetstream watcher: %w", err)

     

       110
        
       	}

     

       111
        
       

     

       112
       +
       	knotstream, err := KnotstreamConsumer(config, d, enforcer)

     

       113
       +
       	if err != nil {

     

       114
       +
       		return nil, fmt.Errorf("failed to start knotstream consumer: %w", err)

     

       115
       +
       	}

     

       116
       +
       	knotstream.Start(context.Background())

     

       117
       +
       

     

       118
        
       	state := &State{

     

       119
        
       		d,

     

       120
        
       		oauth,

     
···

       127
        
       		jc,

     

       128
        
       		config,

     

       129
        
       		repoResolver,

     

       130
       +
       		knotstream,

     

       131
        
       	}

     

       132
        
       

     

       133
        
       	return state, nil

     
···

       365
        
       		return

     

       366
        
       	}

     

       367
        
       

     

       368
       +
       	// add this knot to knotstream

     

       369
       +
       	go s.knotstream.AddSource(context.Background(), knotclient.EventSource{domain})

     

       370
       +
       

     

       371
        
       	w.Write([]byte("check success"))

     

       372
        
       }

     

       373

+1 -1

flake.nix

···

       54
        
           inherit (gitignore.lib) gitignoreSource;

     

       55
        
         in {

     

       56
        
           overlays.default = final: prev: let

     

       57
       -
             goModHash = "sha256-ZckpIPqFk7/XBiEJUbmrAzdjAxV62hv896xqAXF2aZs=";

     

       58
        
             appviewDeps = {

     

       59
        
               inherit htmx-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource;

     

       60
        
             };

···

       54
        
           inherit (gitignore.lib) gitignoreSource;

     

       55
        
         in {

     

       56
        
           overlays.default = final: prev: let

     

       57
       +
             goModHash = "sha256-QPyeKKr7YMblwicQNemu3OamXwg7fVie6/IY10vQCl4=";

     

       58
        
             appviewDeps = {

     

       59
        
               inherit htmx-src lucide-src inter-fonts-src ibm-plex-mono-src goModHash gitignoreSource;

     

       60
        
             };