commit ac125af6c1ca4317f7bfa4446cfb631733dc5c5b · julien.rbrt.fr/tangled-core

go.mod

···

       30
       30
        
       	github.com/posthog/posthog-go v1.5.5

     

       31
       31
        
       	github.com/resend/resend-go/v2 v2.15.0

     

       32
       32
        
       	github.com/sethvargo/go-envconfig v1.1.0

     

       33
       33
       +
       	github.com/stretchr/testify v1.10.0

     

       33
       34
        
       	github.com/urfave/cli/v3 v3.3.3

     

       34
       35
        
       	github.com/whyrusleeping/cbor-gen v0.3.1

     

       35
       36
        
       	github.com/yuin/goldmark v1.4.13

     

       36
       37
        
       	golang.org/x/crypto v0.38.0

     

       37
       38
        
       	golang.org/x/net v0.39.0

     

       38
       39
        
       	golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da

     

       40
       40
       +
       	gopkg.in/yaml.v3 v3.0.1

     

       39
       41
        
       	tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250526154904-3906c5336421

     

       40
       42
        
       )

     

       41
       43
        
       

     
···

       50
       52
        
       	github.com/casbin/govaluate v1.3.0 // indirect

     

       51
       53
        
       	github.com/cespare/xxhash/v2 v2.3.0 // indirect

     

       52
       54
        
       	github.com/cloudflare/circl v1.6.0 // indirect

     

       55
       55
       +
       	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

     

       53
       56
        
       	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect

     

       54
       57
        
       	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect

     

       55
       58
        
       	github.com/dlclark/regexp2 v1.11.5 // indirect

     
···

       102
       105
        
       	github.com/opentracing/opentracing-go v1.2.0 // indirect

     

       103
       106
        
       	github.com/pjbgf/sha1cd v0.3.2 // indirect

     

       104
       107
        
       	github.com/pkg/errors v0.9.1 // indirect

     

       108
       108
       +
       	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect

     

       105
       109
        
       	github.com/polydawn/refmt v0.89.1-0.20221221234430-40501e09de1f // indirect

     

       106
       110
        
       	github.com/prometheus/client_golang v1.22.0 // indirect

     

       107
       111
        
       	github.com/prometheus/client_model v0.6.2 // indirect

+62

knotserver/db/events.go

···

       1
       1
       +
       package db

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       

     

       6
       6
       +
       	"tangled.sh/tangled.sh/core/knotserver/notifier"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       type Event struct {

     

       10
       10
       +
       	Rkey      string `json:"rkey"`

     

       11
       11
       +
       	Nsid      string `json:"nsid"`

     

       12
       12
       +
       	EventJson string `json:"event"`

     

       13
       13
       +
       }

     

       14
       14
       +
       

     

       15
       15
       +
       func (d *DB) InsertEvent(event Event, notifier *notifier.Notifier) error {

     

       16
       16
       +
       	_, err := d.db.Exec(

     

       17
       17
       +
       		`insert into events (rkey, nsid, event) values (?, ?, ?)`,

     

       18
       18
       +
       		event.Rkey,

     

       19
       19
       +
       		event.Nsid,

     

       20
       20
       +
       		event.EventJson,

     

       21
       21
       +
       	)

     

       22
       22
       +
       

     

       23
       23
       +
       	notifier.NotifyAll()

     

       24
       24
       +
       

     

       25
       25
       +
       	return err

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       func (d *DB) GetEvents(cursor string) ([]Event, error) {

     

       29
       29
       +
       	whereClause := ""

     

       30
       30
       +
       	args := []any{}

     

       31
       31
       +
       	if cursor != "" {

     

       32
       32
       +
       		whereClause = "where rkey > ?"

     

       33
       33
       +
       		args = append(args, cursor)

     

       34
       34
       +
       	}

     

       35
       35
       +
       

     

       36
       36
       +
       	query := fmt.Sprintf(`

     

       37
       37
       +
       		select rkey, nsid, event

     

       38
       38
       +
       		from events

     

       39
       39
       +
       		%s

     

       40
       40
       +
       		order by rkey asc

     

       41
       41
       +
       		limit 100

     

       42
       42
       +
       	`, whereClause)

     

       43
       43
       +
       

     

       44
       44
       +
       	rows, err := d.db.Query(query, args...)

     

       45
       45
       +
       	if err != nil {

     

       46
       46
       +
       		return nil, err

     

       47
       47
       +
       	}

     

       48
       48
       +
       	defer rows.Close()

     

       49
       49
       +
       

     

       50
       50
       +
       	var evts []Event

     

       51
       51
       +
       	for rows.Next() {

     

       52
       52
       +
       		var ev Event

     

       53
       53
       +
       		rows.Scan(&ev.Rkey, &ev.Nsid, &ev.EventJson)

     

       54
       54
       +
       		evts = append(evts, ev)

     

       55
       55
       +
       	}

     

       56
       56
       +
       

     

       57
       57
       +
       	if err := rows.Err(); err != nil {

     

       58
       58
       +
       		return nil, err

     

       59
       59
       +
       	}

     

       60
       60
       +
       

     

       61
       61
       +
       	return evts, nil

     

       62
       62
       +
       }

+5 -7

knotserver/db/init.go

···

       44
       44
        
       			last_time_us integer not null

     

       45
       45
        
       		);

     

       46
       46
        
       

     

       47
       47
       -
       		create table if not exists oplog (

     

       48
       48
       -
       			tid     text primary key,

     

       49
       49
       -
       			did     text not null,

     

       50
       50
       -
       			repo    text not null,

     

       51
       51
       -
       			old_sha text not null,

     

       52
       52
       -
       			new_sha text not null,

     

       53
       53
       -
       			ref     text not null

     

       47
       47
       +
       		create table if not exists events (

     

       48
       48
       +
       			rkey text not null,

     

       49
       49
       +
       			nsid text not null,

     

       50
       50
       +
       			event text not null, -- json

     

       51
       51
       +
       			primary key (rkey, nsid)

     

       54
       52
        
       		);

     

       55
       53
        
       	`)

     

       56
       54
        
       	if err != nil {

-70

knotserver/db/oplog.go

···

       1
       1
       -
       package db

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"fmt"

     

       5
       5
       -
       

     

       6
       6
       -
       	"tangled.sh/tangled.sh/core/knotserver/notifier"

     

       7
       7
       -
       )

     

       8
       8
       -
       

     

       9
       9
       -
       type Op struct {

     

       10
       10
       -
       	Tid    string // time based ID, easy to enumerate & monotonic

     

       11
       11
       -
       	Did    string // did of pusher

     

       12
       12
       -
       	Repo   string // <did/repo> fully qualified repo

     

       13
       13
       -
       	OldSha string // old sha of reference being updated

     

       14
       14
       -
       	NewSha string // new sha of reference being updated

     

       15
       15
       -
       	Ref    string // the reference being updated

     

       16
       16
       -
       }

     

       17
       17
       -
       

     

       18
       18
       -
       func (d *DB) InsertOp(op Op, notifier *notifier.Notifier) error {

     

       19
       19
       -
       	_, err := d.db.Exec(

     

       20
       20
       -
       		`insert into oplog (tid, did, repo, old_sha, new_sha, ref) values (?, ?, ?, ?, ?, ?)`,

     

       21
       21
       -
       		op.Tid,

     

       22
       22
       -
       		op.Did,

     

       23
       23
       -
       		op.Repo,

     

       24
       24
       -
       		op.OldSha,

     

       25
       25
       -
       		op.NewSha,

     

       26
       26
       -
       		op.Ref,

     

       27
       27
       -
       	)

     

       28
       28
       -
       	if err != nil {

     

       29
       29
       -
       		return err

     

       30
       30
       -
       	}

     

       31
       31
       -
       

     

       32
       32
       -
       	notifier.NotifyAll()

     

       33
       33
       -
       	return nil

     

       34
       34
       -
       }

     

       35
       35
       -
       

     

       36
       36
       -
       func (d *DB) GetOps(cursor string) ([]Op, error) {

     

       37
       37
       -
       	whereClause := ""

     

       38
       38
       -
       	args := []any{}

     

       39
       39
       -
       	if cursor != "" {

     

       40
       40
       -
       		whereClause = "where tid > ?"

     

       41
       41
       -
       		args = append(args, cursor)

     

       42
       42
       -
       	}

     

       43
       43
       -
       

     

       44
       44
       -
       	query := fmt.Sprintf(`

     

       45
       45
       -
       		select tid, did, repo, old_sha, new_sha, ref

     

       46
       46
       -
       		from oplog

     

       47
       47
       -
       		%s

     

       48
       48
       -
       		order by tid asc

     

       49
       49
       -
       		limit 100

     

       50
       50
       -
       	`, whereClause)

     

       51
       51
       -
       

     

       52
       52
       -
       	rows, err := d.db.Query(query, args...)

     

       53
       53
       -
       	if err != nil {

     

       54
       54
       -
       		return nil, err

     

       55
       55
       -
       	}

     

       56
       56
       -
       	defer rows.Close()

     

       57
       57
       -
       

     

       58
       58
       -
       	var ops []Op

     

       59
       59
       -
       	for rows.Next() {

     

       60
       60
       -
       		var op Op

     

       61
       61
       -
       		rows.Scan(&op.Tid, &op.Did, &op.Repo, &op.OldSha, &op.NewSha, &op.Ref)

     

       62
       62
       -
       		ops = append(ops, op)

     

       63
       63
       -
       	}

     

       64
       64
       -
       

     

       65
       65
       -
       	if err := rows.Err(); err != nil {

     

       66
       66
       -
       		return nil, err

     

       67
       67
       -
       	}

     

       68
       68
       -
       

     

       69
       69
       -
       	return ops, nil

     

       70
       70
       -
       }

+26 -7

knotserver/events.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       +
       	"encoding/json"

     

       5
       6
        
       	"net/http"

     

       6
       7
        
       	"time"

     

       7
       8
        
       

     
···

       13
       14
        
       	WriteBufferSize: 1024,

     

       14
       15
        
       }

     

       15
       16
        
       

     

       16
       16
       -
       func (h *Handle) OpLog(w http.ResponseWriter, r *http.Request) {

     

       17
       17
       +
       func (h *Handle) Events(w http.ResponseWriter, r *http.Request) {

     

       17
       18
        
       	l := h.l.With("handler", "OpLog")

     

       18
       19
        
       	l.Info("received new connection")

     

       19
       20
        
       

     
···

       74
       75
        
       }

     

       75
       76
        
       

     

       76
       77
        
       func (h *Handle) streamOps(conn *websocket.Conn, cursor *string) error {

     

       77
       77
       -
       	ops, err := h.db.GetOps(*cursor)

     

       78
       78
       +
       	events, err := h.db.GetEvents(*cursor)

     

       78
       79
        
       	if err != nil {

     

       79
       79
       -
       		h.l.Debug("err", "err", err)

     

       80
       80
       +
       		h.l.Error("failed to fetch events from db", "err", err, "cursor", cursor)

     

       80
       81
        
       		return err

     

       81
       82
        
       	}

     

       82
       82
       -
       	h.l.Debug("ops", "ops", ops)

     

       83
       83
       +
       	h.l.Debug("ops", "ops", events)

     

       83
       84
        
       

     

       84
       84
       -
       	for _, op := range ops {

     

       85
       85
       -
       		if err := conn.WriteJSON(op); err != nil {

     

       85
       85
       +
       	for _, event := range events {

     

       86
       86
       +
       		// first extract the inner json into a map

     

       87
       87
       +
       		var eventJson map[string]any

     

       88
       88
       +
       		err := json.Unmarshal([]byte(event.EventJson), &eventJson)

     

       89
       89
       +
       		if err != nil {

     

       90
       90
       +
       			h.l.Error("failed to unmarshal event", "err", err)

     

       91
       91
       +
       			return err

     

       92
       92
       +
       		}

     

       93
       93
       +
       

     

       94
       94
       +
       		jsonMsg, err := json.Marshal(map[string]any{

     

       95
       95
       +
       			"rkey":  event.Rkey,

     

       96
       96
       +
       			"nsid":  event.Nsid,

     

       97
       97
       +
       			"event": eventJson,

     

       98
       98
       +
       		})

     

       99
       99
       +
       		if err != nil {

     

       100
       100
       +
       			h.l.Error("failed to marshal record", "err", err)

     

       101
       101
       +
       			return err

     

       102
       102
       +
       		}

     

       103
       103
       +
       

     

       104
       104
       +
       		if err := conn.WriteMessage(websocket.TextMessage, jsonMsg); err != nil {

     

       86
       105
        
       			h.l.Debug("err", "err", err)

     

       87
       106
        
       			return err

     

       88
       107
        
       		}

     

       89
       89
       -
       		*cursor = op.Tid

     

       108
       108
       +
       		*cursor = event.Rkey

     

       90
       109
        
       	}

     

       91
       110
        
       

     

       92
       111
        
       	return nil

+1 -1

knotserver/handler.go

···

       149
       149
        
       	})

     

       150
       150
        
       

     

       151
       151
        
       	// Socket that streams git oplogs

     

       152
       152
       -
       	r.Get("/oplog", h.OpLog)

     

       152
       152
       +
       	r.Get("/events", h.Events)

     

       153
       153
        
       

     

       154
       154
        
       	// Initialize the knot with an owner and public key.

     

       155
       155
        
       	r.With(h.VerifySignature).Post("/init", h.Init)

+33 -12

knotserver/internal.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       +
       	"encoding/json"

     

       5
       6
        
       	"log/slog"

     

       6
       7
        
       	"net/http"

     

       7
       8
        
       	"path/filepath"

     

       8
       9
        
       

     

       9
       10
        
       	"github.com/go-chi/chi/v5"

     

       10
       11
        
       	"github.com/go-chi/chi/v5/middleware"

     

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

     

       11
       13
        
       	"tangled.sh/tangled.sh/core/knotserver/config"

     

       12
       14
        
       	"tangled.sh/tangled.sh/core/knotserver/db"

     

       13
       15
        
       	"tangled.sh/tangled.sh/core/knotserver/git"

     
···

       67
       69
        
       		l.Error("failed to calculate relative git dir", "scanPath", h.c.Repo.ScanPath, "gitAbsoluteDir", gitAbsoluteDir)

     

       68
       70
        
       		return

     

       69
       71
        
       	}

     

       72
       72
       +
       

     

       73
       73
       +
       	parts := strings.SplitN(gitRelativeDir, "/", 2)

     

       74
       74
       +
       	if len(parts) != 2 {

     

       75
       75
       +
       		l.Error("invalid git dir", "gitRelativeDir", gitRelativeDir)

     

       76
       76
       +
       		return

     

       77
       77
       +
       	}

     

       78
       78
       +
       	repoDid := parts[0]

     

       79
       79
       +
       	repoName := parts[1]

     

       80
       80
       +
       

     

       70
       81
        
       	gitUserDid := r.Header.Get("X-Git-User-Did")

     

       71
       82
        
       

     

       72
       83
        
       	lines, err := git.ParsePostReceive(r.Body)

     
···

       76
       87
        
       	}

     

       77
       88
        
       

     

       78
       89
        
       	for _, line := range lines {

     

       79
       79
       -
       		err := h.updateOpLog(line, gitUserDid, gitRelativeDir)

     

       90
       90
       +
       		err := h.insertRefUpdate(line, gitUserDid, repoDid, repoName)

     

       80
       91
        
       		if err != nil {

     

       81
       92
        
       			l.Error("failed to insert op", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir)

     

       93
       93
       +
       			// non-fatal

     

       82
       94
        
       		}

     

       83
       95
        
       	}

     

       96
       96
       +
       }

     

       84
       97
        
       

     

       85
       85
       -
       	return

     

       86
       86
       -
       }

     

       98
       98
       +
       func (h *InternalHandle) insertRefUpdate(line git.PostReceiveLine, gitUserDid, repoDid, repoName string) error {

     

       99
       99
       +
       	refUpdate := tangled.GitRefUpdate{

     

       100
       100
       +
       		OldSha:       line.OldSha,

     

       101
       101
       +
       		NewSha:       line.NewSha,

     

       102
       102
       +
       		Ref:          line.Ref,

     

       103
       103
       +
       		CommitterDid: gitUserDid,

     

       104
       104
       +
       		RepoDid:      repoDid,

     

       105
       105
       +
       		RepoName:     repoName,

     

       106
       106
       +
       	}

     

       107
       107
       +
       	eventJson, err := json.Marshal(refUpdate)

     

       108
       108
       +
       	if err != nil {

     

       109
       109
       +
       		return err

     

       110
       110
       +
       	}

     

       87
       111
        
       

     

       88
       88
       -
       func (h *InternalHandle) updateOpLog(line git.PostReceiveLine, did, repo string) error {

     

       89
       89
       -
       	op := db.Op{

     

       90
       90
       -
       		Tid:    TID(),

     

       91
       91
       -
       		Did:    did,

     

       92
       92
       -
       		Repo:   repo,

     

       93
       93
       -
       		OldSha: line.OldSha,

     

       94
       94
       -
       		NewSha: line.NewSha,

     

       95
       95
       -
       		Ref:    line.Ref,

     

       112
       112
       +
       	event := db.Event{

     

       113
       113
       +
       		Rkey:      TID(),

     

       114
       114
       +
       		Nsid:      tangled.GitRefUpdateNSID,

     

       115
       115
       +
       		EventJson: string(eventJson),

     

       96
       116
        
       	}

     

       97
       97
       -
       	return h.db.InsertOp(op, h.n)

     

       117
       117
       +
       

     

       118
       118
       +
       	return h.db.InsertEvent(event, h.n)

     

       98
       119
        
       }

     

       99
       120
        
       

     

       100
       121
        
       func Internal(ctx context.Context, c *config.Config, db *db.DB, e *rbac.Enforcer, l *slog.Logger, n *notifier.Notifier) http.Handler {