commit 32c670bb983ecab05760f1835dde23cec77ad4a2 · julien.rbrt.fr/tangled-core

+2 -2

appview/db/pubkeys.go

···

       23
       23
        
       

     

       24
       24
        
       func DeletePublicKeyByRkey(e Execer, did, rkey string) error {

     

       25
       25
        
       	_, err := e.Exec(`

     

       26
       26
       -
       		delete or ignore from public_keys 

     

       27
       27
       -
       		where did = ? and name = ? and rkey = ?`,

     

       26
       26
       +
       		delete from public_keys 

     

       27
       27
       +
       		where did = ? and rkey = ?`,

     

       28
       28
        
       		did, rkey)

     

       29
       29
        
       	return err

     

       30
       30
        
       }

+133

appview/ingester.go

···

       1
       1
       +
       package appview

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"encoding/json"

     

       6
       6
       +
       	"fmt"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       

     

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

     

       10
       10
       +
       	"github.com/bluesky-social/jetstream/pkg/models"

     

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

     

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

     

       13
       13
       +
       )

     

       14
       14
       +
       

     

       15
       15
       +
       type Ingester func(ctx context.Context, e *models.Event) error

     

       16
       16
       +
       

     

       17
       17
       +
       func Ingest(d db.DbWrapper) Ingester {

     

       18
       18
       +
       	return func(ctx context.Context, e *models.Event) error {

     

       19
       19
       +
       		var err error

     

       20
       20
       +
       		defer func() {

     

       21
       21
       +
       			eventTime := e.TimeUS

     

       22
       22
       +
       			lastTimeUs := eventTime + 1

     

       23
       23
       +
       			if err := d.SaveLastTimeUs(lastTimeUs); err != nil {

     

       24
       24
       +
       				err = fmt.Errorf("(deferred) failed to save last time us: %w", err)

     

       25
       25
       +
       			}

     

       26
       26
       +
       		}()

     

       27
       27
       +
       

     

       28
       28
       +
       		if e.Kind != models.EventKindCommit {

     

       29
       29
       +
       			return nil

     

       30
       30
       +
       		}

     

       31
       31
       +
       

     

       32
       32
       +
       		switch e.Commit.Collection {

     

       33
       33
       +
       		case tangled.GraphFollowNSID:

     

       34
       34
       +
       			ingestFollow(&d, e)

     

       35
       35
       +
       		case tangled.FeedStarNSID:

     

       36
       36
       +
       			ingestStar(&d, e)

     

       37
       37
       +
       		case tangled.PublicKeyNSID:

     

       38
       38
       +
       			ingestPublicKey(&d, e)

     

       39
       39
       +
       		}

     

       40
       40
       +
       

     

       41
       41
       +
       		return err

     

       42
       42
       +
       	}

     

       43
       43
       +
       }

     

       44
       44
       +
       

     

       45
       45
       +
       func ingestStar(d *db.DbWrapper, e *models.Event) error {

     

       46
       46
       +
       	var err error

     

       47
       47
       +
       	did := e.Did

     

       48
       48
       +
       

     

       49
       49
       +
       	switch e.Commit.Operation {

     

       50
       50
       +
       	case models.CommitOperationCreate, models.CommitOperationUpdate:

     

       51
       51
       +
       		var subjectUri syntax.ATURI

     

       52
       52
       +
       

     

       53
       53
       +
       		raw := json.RawMessage(e.Commit.Record)

     

       54
       54
       +
       		record := tangled.FeedStar{}

     

       55
       55
       +
       		err := json.Unmarshal(raw, &record)

     

       56
       56
       +
       		if err != nil {

     

       57
       57
       +
       			log.Println("invalid record")

     

       58
       58
       +
       			return err

     

       59
       59
       +
       		}

     

       60
       60
       +
       

     

       61
       61
       +
       		subjectUri, err = syntax.ParseATURI(record.Subject)

     

       62
       62
       +
       		if err != nil {

     

       63
       63
       +
       			log.Println("invalid record")

     

       64
       64
       +
       			return err

     

       65
       65
       +
       		}

     

       66
       66
       +
       		err = db.AddStar(d, did, subjectUri, e.Commit.RKey)

     

       67
       67
       +
       	case models.CommitOperationDelete:

     

       68
       68
       +
       		err = db.DeleteStarByRkey(d, did, e.Commit.RKey)

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	if err != nil {

     

       72
       72
       +
       		return fmt.Errorf("failed to %s star record: %w", e.Commit.Operation, err)

     

       73
       73
       +
       	}

     

       74
       74
       +
       

     

       75
       75
       +
       	return nil

     

       76
       76
       +
       }

     

       77
       77
       +
       

     

       78
       78
       +
       func ingestFollow(d *db.DbWrapper, e *models.Event) error {

     

       79
       79
       +
       	var err error

     

       80
       80
       +
       	did := e.Did

     

       81
       81
       +
       

     

       82
       82
       +
       	switch e.Commit.Operation {

     

       83
       83
       +
       	case models.CommitOperationCreate, models.CommitOperationUpdate:

     

       84
       84
       +
       		raw := json.RawMessage(e.Commit.Record)

     

       85
       85
       +
       		record := tangled.GraphFollow{}

     

       86
       86
       +
       		err = json.Unmarshal(raw, &record)

     

       87
       87
       +
       		if err != nil {

     

       88
       88
       +
       			log.Println("invalid record")

     

       89
       89
       +
       			return err

     

       90
       90
       +
       		}

     

       91
       91
       +
       

     

       92
       92
       +
       		subjectDid := record.Subject

     

       93
       93
       +
       		err = db.AddFollow(d, did, subjectDid, e.Commit.RKey)

     

       94
       94
       +
       	case models.CommitOperationDelete:

     

       95
       95
       +
       		err = db.DeleteFollowByRkey(d, did, e.Commit.RKey)

     

       96
       96
       +
       	}

     

       97
       97
       +
       

     

       98
       98
       +
       	if err != nil {

     

       99
       99
       +
       		return fmt.Errorf("failed to %s follow record: %w", e.Commit.Operation, err)

     

       100
       100
       +
       	}

     

       101
       101
       +
       

     

       102
       102
       +
       	return nil

     

       103
       103
       +
       }

     

       104
       104
       +
       

     

       105
       105
       +
       func ingestPublicKey(d *db.DbWrapper, e *models.Event) error {

     

       106
       106
       +
       	did := e.Did

     

       107
       107
       +
       	var err error

     

       108
       108
       +
       

     

       109
       109
       +
       	switch e.Commit.Operation {

     

       110
       110
       +
       	case models.CommitOperationCreate, models.CommitOperationUpdate:

     

       111
       111
       +
       		log.Println("processing add of pubkey")

     

       112
       112
       +
       		raw := json.RawMessage(e.Commit.Record)

     

       113
       113
       +
       		record := tangled.PublicKey{}

     

       114
       114
       +
       		err = json.Unmarshal(raw, &record)

     

       115
       115
       +
       		if err != nil {

     

       116
       116
       +
       			log.Printf("invalid record: %s", err)

     

       117
       117
       +
       			return err

     

       118
       118
       +
       		}

     

       119
       119
       +
       

     

       120
       120
       +
       		name := record.Name

     

       121
       121
       +
       		key := record.Key

     

       122
       122
       +
       		err = db.AddPublicKey(d, did, name, key, e.Commit.RKey)

     

       123
       123
       +
       	case models.CommitOperationDelete:

     

       124
       124
       +
       		log.Println("processing delete of pubkey")

     

       125
       125
       +
       		err = db.DeletePublicKeyByRkey(d, did, e.Commit.RKey)

     

       126
       126
       +
       	}

     

       127
       127
       +
       

     

       128
       128
       +
       	if err != nil {

     

       129
       129
       +
       		return fmt.Errorf("failed to %s pubkey record: %w", e.Commit.Operation, err)

     

       130
       130
       +
       	}

     

       131
       131
       +
       

     

       132
       132
       +
       	return nil

     

       133
       133
       +
       }

-70

appview/state/jetstream.go

···

       1
       1
       -
       package state

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"encoding/json"

     

       6
       6
       -
       	"fmt"

     

       7
       7
       -
       	"log"

     

       8
       8
       -
       

     

       9
       9
       -
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       10
       10
       -
       	"github.com/bluesky-social/jetstream/pkg/models"

     

       11
       11
       -
       	tangled "tangled.sh/tangled.sh/core/api/tangled"

     

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

     

       13
       13
       -
       )

     

       14
       14
       -
       

     

       15
       15
       -
       type Ingester func(ctx context.Context, e *models.Event) error

     

       16
       16
       -
       

     

       17
       17
       -
       func jetstreamIngester(d db.DbWrapper) Ingester {

     

       18
       18
       -
       	return func(ctx context.Context, e *models.Event) error {

     

       19
       19
       -
       		var err error

     

       20
       20
       -
       		defer func() {

     

       21
       21
       -
       			eventTime := e.TimeUS

     

       22
       22
       -
       			lastTimeUs := eventTime + 1

     

       23
       23
       -
       			if err := d.SaveLastTimeUs(lastTimeUs); err != nil {

     

       24
       24
       -
       				err = fmt.Errorf("(deferred) failed to save last time us: %w", err)

     

       25
       25
       -
       			}

     

       26
       26
       -
       		}()

     

       27
       27
       -
       

     

       28
       28
       -
       		if e.Kind != models.EventKindCommit {

     

       29
       29
       -
       			return nil

     

       30
       30
       -
       		}

     

       31
       31
       -
       

     

       32
       32
       -
       		did := e.Did

     

       33
       33
       -
       		raw := json.RawMessage(e.Commit.Record)

     

       34
       34
       -
       

     

       35
       35
       -
       		switch e.Commit.Collection {

     

       36
       36
       -
       		case tangled.GraphFollowNSID:

     

       37
       37
       -
       			record := tangled.GraphFollow{}

     

       38
       38
       -
       			err := json.Unmarshal(raw, &record)

     

       39
       39
       -
       			if err != nil {

     

       40
       40
       -
       				log.Println("invalid record")

     

       41
       41
       -
       				return err

     

       42
       42
       -
       			}

     

       43
       43
       -
       			err = db.AddFollow(d, did, record.Subject, e.Commit.RKey)

     

       44
       44
       -
       			if err != nil {

     

       45
       45
       -
       				return fmt.Errorf("failed to add follow to db: %w", err)

     

       46
       46
       -
       			}

     

       47
       47
       -
       		case tangled.FeedStarNSID:

     

       48
       48
       -
       			record := tangled.FeedStar{}

     

       49
       49
       -
       			err := json.Unmarshal(raw, &record)

     

       50
       50
       -
       			if err != nil {

     

       51
       51
       -
       				log.Println("invalid record")

     

       52
       52
       -
       				return err

     

       53
       53
       -
       			}

     

       54
       54
       -
       

     

       55
       55
       -
       			subjectUri, err := syntax.ParseATURI(record.Subject)

     

       56
       56
       -
       

     

       57
       57
       -
       			if err != nil {

     

       58
       58
       -
       				log.Println("invalid record")

     

       59
       59
       -
       				return err

     

       60
       60
       -
       			}

     

       61
       61
       -
       

     

       62
       62
       -
       			err = db.AddStar(d, did, subjectUri, e.Commit.RKey)

     

       63
       63
       -
       			if err != nil {

     

       64
       64
       -
       				return fmt.Errorf("failed to add follow to db: %w", err)

     

       65
       65
       -
       			}

     

       66
       66
       -
       		}

     

       67
       67
       -
       

     

       68
       68
       -
       		return err

     

       69
       69
       -
       	}

     

       70
       70
       -
       }

+2 -2

appview/state/state.go

···

       63
       63
        
       	jc, err := jetstream.NewJetstreamClient(

     

       64
       64
        
       		config.JetstreamEndpoint,

     

       65
       65
        
       		"appview",

     

       66
       66
       -
       		[]string{tangled.GraphFollowNSID, tangled.FeedStarNSID},

     

       66
       66
       +
       		[]string{tangled.GraphFollowNSID, tangled.FeedStarNSID, tangled.PublicKeyNSID},

     

       67
       67
        
       		nil,

     

       68
       68
        
       		slog.Default(),

     

       69
       69
        
       		wrapper,

     
···

       72
       72
        
       	if err != nil {

     

       73
       73
        
       		return nil, fmt.Errorf("failed to create jetstream client: %w", err)

     

       74
       74
        
       	}

     

       75
       75
       -
       	err = jc.StartJetstream(context.Background(), jetstreamIngester(wrapper))

     

       75
       75
       +
       	err = jc.StartJetstream(context.Background(), appview.Ingest(wrapper))

     

       76
       76
        
       	if err != nil {

     

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

     

       78
       78
        
       	}

flake.nix

···

       173
       173
        
                 TANGLED_DEV=true ${pkgs.air}/bin/air -c /dev/null \

     

       174
       174
        
                 -build.cmd "${pkgs.tailwindcss}/bin/tailwindcss -i input.css -o ./appview/pages/static/tw.css && ${pkgs.go}/bin/go build -o ./out/${name}.out ./cmd/${name}/main.go" \

     

       175
       175
        
                 -build.bin "./out/${name}.out" \

     

       176
       176
       +
                 -build.stop_on_error "true" \

     

       176
       177
        
                 -build.include_ext "go"

     

       177
       178
        
               '';

     

       178
       179
        
             tailwind-watcher =