back round 0 view raw

spindle: move MOTD to embedded file #373

merged

opened by

oppi.li 4 months ago targeting master from push-vynsusnqpmus

Signed-off-by: oppiliappan me@oppi.li

options

unified split

Changed files

+91 -47

spindle

config

config.go

motd

server.go

+17 -6

spindle/config/config.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       +
       	"fmt"

     

       5
       6
        
       

     

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

     

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

     

       7
       9
        
       )

     

       8
       10
        
       

     

       9
       11
        
       type Server struct {

     

       10
       10
       -
       	ListenAddr        string `env:"LISTEN_ADDR, default=0.0.0.0:6555"`

     

       11
       11
       -
       	DBPath            string `env:"DB_PATH, default=spindle.db"`

     

       12
       12
       -
       	Hostname          string `env:"HOSTNAME, required"`

     

       13
       13
       -
       	JetstreamEndpoint string `env:"JETSTREAM_ENDPOINT, default=wss://jetstream1.us-west.bsky.network/subscribe"`

     

       14
       14
       -
       	Dev               bool   `env:"DEV, default=false"`

     

       15
       15
       -
       	Owner             string `env:"OWNER, required"`

     

       12
       12
       +
       	ListenAddr        string  `env:"LISTEN_ADDR, default=0.0.0.0:6555"`

     

       13
       13
       +
       	DBPath            string  `env:"DB_PATH, default=spindle.db"`

     

       14
       14
       +
       	Hostname          string  `env:"HOSTNAME, required"`

     

       15
       15
       +
       	JetstreamEndpoint string  `env:"JETSTREAM_ENDPOINT, default=wss://jetstream1.us-west.bsky.network/subscribe"`

     

       16
       16
       +
       	Dev               bool    `env:"DEV, default=false"`

     

       17
       17
       +
       	Owner             string  `env:"OWNER, required"`

     

       18
       18
       +
       	Secrets           Secrets `env:",prefix=SECRETS_"`

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       func (s Server) Did() syntax.DID {

     

       22
       22
       +
       	return syntax.DID(fmt.Sprintf("did:web:%s", s.Hostname))

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       type Secrets struct {

     

       26
       26
       +
       	Provider string `env:"PROVIDER, default=sqlite"`

     

       16
       27
        
       }

     

       17
       28
        
       

     

       18
       29
        
       type Pipelines struct {

+25

spindle/motd

···

       1
       1
       +
                           ****

     

       2
       2
       +
                      ***        ***

     

       3
       3
       +
                   *** **   ******   **

     

       4
       4
       +
                  **    *           *****

     

       5
       5
       +
                 *      **              **

     

       6
       6
       +
                *   *    *  ***************

     

       7
       7
       +
               **   **    *#             **

     

       8
       8
       +
               *     **    **    ***      **

     

       9
       9
       +
               *  *   **    **    *   ******

     

       10
       10
       +
               *  **   **   *    **   *   *

     

       11
       11
       +
               **  **    ***    **   **   *

     

       12
       12
       +
                **  **    *    **    *   *

     

       13
       13
       +
                 **   ****    **    *   *

     

       14
       14
       +
                  **  ***    **   **  **

     

       15
       15
       +
                    ***    **    *****

     

       16
       16
       +
                       ********************

     

       17
       17
       +
                                           **

     

       18
       18
       +
                                            *

     

       19
       19
       +
                             #**************

     

       20
       20
       +
                             **

     

       21
       21
       +
                               ********

     

       22
       22
       +
       

     

       23
       23
       +
       This is a spindle server. More info at https://tangled.sh/@tangled.sh/core/tree/master/docs/spindle

     

       24
       24
       +
       

     

       25
       25
       +
       Most API routes are under /xrpc/

+49 -41

spindle/server.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       +
       	_ "embed"

     

       5
       6
        
       	"encoding/json"

     

       6
       7
        
       	"fmt"

     

       7
       8
        
       	"log/slog"

     
···

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

     

       12
       13
        
       	"tangled.sh/tangled.sh/core/eventconsumer"

     

       13
       14
        
       	"tangled.sh/tangled.sh/core/eventconsumer/cursor"

     

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

     

       14
       16
        
       	"tangled.sh/tangled.sh/core/jetstream"

     

       15
       17
        
       	"tangled.sh/tangled.sh/core/log"

     

       16
       18
        
       	"tangled.sh/tangled.sh/core/notifier"

     
···

       20
       22
        
       	"tangled.sh/tangled.sh/core/spindle/engine"

     

       21
       23
        
       	"tangled.sh/tangled.sh/core/spindle/models"

     

       22
       24
        
       	"tangled.sh/tangled.sh/core/spindle/queue"

     

       25
       25
       +
       	"tangled.sh/tangled.sh/core/spindle/secrets"

     

       26
       26
       +
       	"tangled.sh/tangled.sh/core/spindle/xrpc"

     

       23
       27
        
       )

     

       24
       28
        
       

     

       29
       29
       +
       //go:embed motd

     

       30
       30
       +
       var motd []byte

     

       31
       31
       +
       

     

       25
       32
        
       const (

     

       26
       33
        
       	rbacDomain = "thisserver"

     

       27
       34
        
       )

     

       28
       35
        
       

     

       29
       36
        
       type Spindle struct {

     

       30
       30
       -
       	jc  *jetstream.JetstreamClient

     

       31
       31
       -
       	db  *db.DB

     

       32
       32
       -
       	e   *rbac.Enforcer

     

       33
       33
       -
       	l   *slog.Logger

     

       34
       34
       -
       	n   *notifier.Notifier

     

       35
       35
       -
       	eng *engine.Engine

     

       36
       36
       -
       	jq  *queue.Queue

     

       37
       37
       -
       	cfg *config.Config

     

       38
       38
       -
       	ks  *eventconsumer.Consumer

     

       37
       37
       +
       	jc    *jetstream.JetstreamClient

     

       38
       38
       +
       	db    *db.DB

     

       39
       39
       +
       	e     *rbac.Enforcer

     

       40
       40
       +
       	l     *slog.Logger

     

       41
       41
       +
       	n     *notifier.Notifier

     

       42
       42
       +
       	eng   *engine.Engine

     

       43
       43
       +
       	jq    *queue.Queue

     

       44
       44
       +
       	cfg   *config.Config

     

       45
       45
       +
       	ks    *eventconsumer.Consumer

     

       46
       46
       +
       	res   *idresolver.Resolver

     

       47
       47
       +
       	vault secrets.Manager

     

       39
       48
        
       }

     

       40
       49
        
       

     

       41
       50
        
       func Run(ctx context.Context) error {

     
···

       76
       85
        
       	}

     

       77
       86
        
       	jc.AddDid(cfg.Server.Owner)

     

       78
       87
        
       

     

       88
       88
       +
       	resolver := idresolver.DefaultResolver()

     

       89
       89
       +
       

     

       79
       90
        
       	spindle := Spindle{

     

       80
       80
       -
       		jc:  jc,

     

       81
       81
       -
       		e:   e,

     

       82
       82
       -
       		db:  d,

     

       83
       83
       -
       		l:   logger,

     

       84
       84
       -
       		n:   &n,

     

       85
       85
       -
       		eng: eng,

     

       86
       86
       -
       		jq:  jq,

     

       87
       87
       -
       		cfg: cfg,

     

       91
       91
       +
       		jc:    jc,

     

       92
       92
       +
       		e:     e,

     

       93
       93
       +
       		db:    d,

     

       94
       94
       +
       		l:     logger,

     

       95
       95
       +
       		n:     &n,

     

       96
       96
       +
       		eng:   eng,

     

       97
       97
       +
       		jq:    jq,

     

       98
       98
       +
       		cfg:   cfg,

     

       99
       99
       +
       		res:   resolver,

     

       100
       100
       +
       		vault: vault,

     

       88
       101
        
       	}

     

       89
       102
        
       

     

       90
       103
        
       	err = e.AddSpindle(rbacDomain)

     
···

       144
       157
        
       	mux := chi.NewRouter()

     

       145
       158
        
       

     

       146
       159
        
       	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {

     

       147
       147
       -
       		w.Write([]byte(

     

       148
       148
       -
       			`                   ****

     

       149
       149
       -
                      ***        ***

     

       150
       150
       -
                   *** **   ******   **

     

       151
       151
       -
                  **    *           *****

     

       152
       152
       -
                 *      **              **

     

       153
       153
       -
                *   *    *  ***************

     

       154
       154
       -
               **   **    *#             **

     

       155
       155
       -
               *     **    **    ***      **

     

       156
       156
       -
               *  *   **    **    *   ******

     

       157
       157
       -
               *  **   **   *    **   *   *

     

       158
       158
       -
               **  **    ***    **   **   *

     

       159
       159
       -
                **  **    *    **    *   *

     

       160
       160
       -
                 **   ****    **    *   *

     

       161
       161
       -
                  **  ***    **   **  **

     

       162
       162
       -
                    ***    **    *****

     

       163
       163
       -
                       ********************

     

       164
       164
       -
                                           **

     

       165
       165
       -
                                            *

     

       166
       166
       -
                             #**************

     

       167
       167
       -
                             **

     

       168
       168
       -
                               ********

     

       169
       169
       -
       

     

       170
       170
       -
       This is a spindle server. More info at https://tangled.sh/@tangled.sh/core/tree/master/docs/spindle`))

     

       160
       160
       +
       		w.Write(motd)

     

       171
       161
        
       	})

     

       172
       162
        
       	mux.HandleFunc("/events", s.Events)

     

       173
       163
        
       	mux.HandleFunc("/owner", func(w http.ResponseWriter, r *http.Request) {

     

       174
       164
        
       		w.Write([]byte(s.cfg.Server.Owner))

     

       175
       165
        
       	})

     

       176
       166
        
       	mux.HandleFunc("/logs/{knot}/{rkey}/{name}", s.Logs)

     

       167
       167
       +
       

     

       168
       168
       +
       	mux.Mount("/xrpc", s.XrpcRouter())

     

       177
       169
        
       	return mux

     

       178
       170
        
       }

     

       179
       171
        
       

     

       172
       172
       +
       func (s *Spindle) XrpcRouter() http.Handler {

     

       173
       173
       +
       	logger := s.l.With("route", "xrpc")

     

       174
       174
       +
       

     

       175
       175
       +
       	x := xrpc.Xrpc{

     

       176
       176
       +
       		Logger:   logger,

     

       177
       177
       +
       		Db:       s.db,

     

       178
       178
       +
       		Enforcer: s.e,

     

       179
       179
       +
       		Engine:   s.eng,

     

       180
       180
       +
       		Config:   s.cfg,

     

       181
       181
       +
       		Resolver: s.res,

     

       182
       182
       +
       		Vault:    s.vault,

     

       183
       183
       +
       	}

     

       184
       184
       +
       

     

       185
       185
       +
       	return x.Router()

     

       186
       186
       +
       }

     

       187
       187
       +
       

     

       180
       188
        
       func (s *Spindle) processPipeline(ctx context.Context, src eventconsumer.Source, msg eventconsumer.Message) error {

     

       181
       189
        
       	if msg.Nsid == tangled.PipelineNSID {

     

       182
       190
        
       		tpl := tangled.Pipeline{}