From 519426ba7d25b5dd4f1fd329623418e0ba236a5a Mon Sep 17 00:00:00 2001 From: Derrick Hammer Date: Thu, 11 Jan 2024 23:13:10 -0500 Subject: [PATCH] feat: bare bones s5 support, and more dynamic loading of subsystems --- api/api.go | 14 +++++- api/registry.go | 12 +++-- api/s5.go | 25 ++++++++++ cmd/portal/portal.go | 57 +++++++++++++++++++++-- config/config.go | 38 +++++++++++++++ go.mod | 20 +++++++- go.sum | 103 +++++++++++++++++++++++++++++++++++++++-- interfaces/api.go | 7 ++- interfaces/portal.go | 1 + interfaces/protocol.go | 1 + protocols/protocols.go | 5 +- protocols/registry.go | 16 +++++-- protocols/s5.go | 70 ++++++++++++++++++++++++++++ 13 files changed, 344 insertions(+), 25 deletions(-) create mode 100644 api/s5.go create mode 100644 config/config.go diff --git a/api/api.go b/api/api.go index e573a7e..89d6bc8 100644 --- a/api/api.go +++ b/api/api.go @@ -1,7 +1,19 @@ package api -import "git.lumeweb.com/LumeWeb/portal/interfaces" +import ( + "git.lumeweb.com/LumeWeb/portal/interfaces" + "github.com/julienschmidt/httprouter" +) func Init(router interfaces.APIRegistry) error { + router.Register("s5", NewS5()) return nil } + +func registerProtocolSubdomain(portal interfaces.Portal, mux *httprouter.Router, name string) { + + router := portal.ApiRegistry().Router() + domain := portal.Config().GetString("domain") + + (*router)[domain+"."+name] = mux +} diff --git a/api/registry.go b/api/registry.go index 6368e7f..cf96285 100644 --- a/api/registry.go +++ b/api/registry.go @@ -22,12 +22,11 @@ func NewRegistry() interfaces.APIRegistry { } } -func (r *APIRegistryImpl) Register(name string, APIRegistry interfaces.API) error { +func (r *APIRegistryImpl) Register(name string, APIRegistry interfaces.API) { if _, exists := r.apis[name]; exists { - return errors.New("api already registered") + panic("api already registered") } r.apis[name] = APIRegistry - return nil } func (r *APIRegistryImpl) Get(name string) (interfaces.API, error) { @@ -40,3 +39,10 @@ func (r *APIRegistryImpl) Get(name string) (interfaces.API, error) { func (r *APIRegistryImpl) Router() *router.ProtocolRouter { return r.router } +func (r *APIRegistryImpl) All() map[string]interfaces.API { + aMap := make(map[string]interfaces.API) + for key, value := range r.apis { + aMap[key] = value + } + return aMap +} diff --git a/api/s5.go b/api/s5.go new file mode 100644 index 0000000..c8f32ab --- /dev/null +++ b/api/s5.go @@ -0,0 +1,25 @@ +package api + +import ( + "git.lumeweb.com/LumeWeb/portal/interfaces" + "git.lumeweb.com/LumeWeb/portal/protocols" +) + +var ( + _ interfaces.API = (*S5API)(nil) +) + +type S5API struct { +} + +func NewS5() *S5API { + return &S5API{} +} + +func (s S5API) Initialize(portal interfaces.Portal, protocol interfaces.Protocol) error { + + s5protocol := protocol.(*protocols.S5Protocol) + registerProtocolSubdomain(portal, s5protocol.Node().Services().HTTP().GetHandler(), "s5") + + return nil +} diff --git a/cmd/portal/portal.go b/cmd/portal/portal.go index 4bf30df..5bcb034 100644 --- a/cmd/portal/portal.go +++ b/cmd/portal/portal.go @@ -15,15 +15,17 @@ var ( ) type PortalImpl struct { - apiRegistry interfaces.APIRegistry - logger *zap.Logger + apiRegistry interfaces.APIRegistry + protocolRegistry protocols.ProtocolRegistry + logger *zap.Logger } func NewPortal() interfaces.Portal { logger, _ := zap.NewDevelopment() return &PortalImpl{ - apiRegistry: api.NewRegistry(), - logger: logger, + apiRegistry: api.NewRegistry(), + protocolRegistry: protocols.NewProtocolRegistry(), + logger: logger, } } @@ -37,6 +39,11 @@ func (p *PortalImpl) Initialize() error { return nil } func (p *PortalImpl) Run() { + for _, initFunc := range p.getStartFuncs() { + if err := initFunc(); err != nil { + p.logger.Fatal("Failed to start", zap.Error(err)) + } + } p.logger.Fatal("HTTP server stopped", zap.Error(http.ListenAndServe(":8080", p.apiRegistry.Router()))) } @@ -51,13 +58,53 @@ func (p *PortalImpl) Logger() *zap.Logger { func (p *PortalImpl) Db() *gorm.DB { return nil } +func (p *PortalImpl) ApiRegistry() interfaces.APIRegistry { + return p.apiRegistry +} func (p *PortalImpl) getInitFuncs() []func() error { return []func() error{ + func() error { + return protocols.Init(p.protocolRegistry) + }, func() error { return api.Init(p.apiRegistry) }, func() error { - return protocols.Init(p.Config()) + for _, _func := range p.protocolRegistry.All() { + err := _func.Initialize(p.Config(), p.Logger()) + if err != nil { + return err + } + } + + return nil + }, func() error { + for protoName, _func := range p.apiRegistry.All() { + proto, err := p.protocolRegistry.Get(protoName) + if err != nil { + return err + } + err = _func.Initialize(p, proto) + if err != nil { + return err + } + } + + return nil + }, + } +} +func (p *PortalImpl) getStartFuncs() []func() error { + return []func() error{ + func() error { + for _, _func := range p.protocolRegistry.All() { + err := _func.Start() + if err != nil { + return err + } + } + + return nil }, } } diff --git a/config/config.go b/config/config.go new file mode 100644 index 0000000..c952a86 --- /dev/null +++ b/config/config.go @@ -0,0 +1,38 @@ +package config + +import ( + "errors" + "fmt" + "github.com/spf13/viper" + "go.uber.org/zap" +) + +var ( + ConfigFilePaths = []string{ + "/etc/lumeweb/portal/", + "$HOME/.lumeweb/portal/", + ".", + } +) + +func Init(logger *zap.Logger) { + viper.SetConfigName("config") + viper.SetConfigType("yaml") + + for _, path := range ConfigFilePaths { + viper.AddConfigPath(path) + } + + viper.SetEnvPrefix("LUME_WEB_PORTAL") + viper.AutomaticEnv() + + err := viper.ReadInConfig() + if err != nil { + if errors.As(err, &viper.ConfigFileNotFoundError{}) { + // Config file not found, this is not an error. + fmt.Println("Config file not found, using default settings.") + } else { + logger.Fatal("Fatal error config file", zap.Error(err)) + } + } +} diff --git a/go.mod b/go.mod index e174f99..52c72f9 100644 --- a/go.mod +++ b/go.mod @@ -9,12 +9,21 @@ require ( ) require ( + git.lumeweb.com/LumeWeb/libs5-go v0.0.0-20240110162546-7b17c1898b95 // indirect + github.com/emirpasic/gods v1.18.1 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/go-resty/resty/v2 v2.11.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/julienschmidt/httprouter v1.3.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/mr-tron/base58 v1.2.0 // indirect + github.com/multiformats/go-base32 v0.1.0 // indirect + github.com/multiformats/go-base36 v0.2.0 // indirect + github.com/multiformats/go-multibase v0.2.0 // indirect + github.com/olebedev/emitter v0.0.0-20230411050614-349169dec2ba // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect @@ -23,10 +32,17 @@ require ( github.com/spf13/cast v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect - go.uber.org/multierr v1.10.0 // indirect + github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect + github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect + go.etcd.io/bbolt v1.3.8 // indirect + go.sia.tech/jape v0.11.1 // indirect + go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/sys v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect + golang.org/x/tools v0.17.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + nhooyr.io/websocket v1.8.10 // indirect ) diff --git a/go.sum b/go.sum index c083dba..abbfdf9 100644 --- a/go.sum +++ b/go.sum @@ -1,22 +1,51 @@ +git.lumeweb.com/LumeWeb/libs5-go v0.0.0-20240110162546-7b17c1898b95 h1:RDaLN5iU7pzHNSBq6ZaSjW3gxGbJdJYH+2PVN45x2pw= +git.lumeweb.com/LumeWeb/libs5-go v0.0.0-20240110162546-7b17c1898b95/go.mod h1:CMtoCT4WlAWzJtNer2MEW170i14jeKhSjxbYQ5DIGqw= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= +github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/go-resty/resty/v2 v2.11.0 h1:i7jMfNOJYMp69lq7qozJP+bjgzfAzeOhuGlyDrqxT/8= +github.com/go-resty/resty/v2 v2.11.0/go.mod h1:iiP/OpA0CkcL3IGt1O0+/SIItFUbkkyw5BGXiVdTu+A= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mr-tron/base58 v1.1.0 h1:Y51FGVJ91WBqCEabAi5OPUz38eAx8DakuAm5svLcsfQ= +github.com/mr-tron/base58 v1.1.0/go.mod h1:xcD2VGqlgYjBdcBLw+TuYLr8afG+Hj8g2eTVqeSzSU8= +github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= +github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= +github.com/multiformats/go-base32 v0.0.3 h1:tw5+NhuwaOjJCC5Pp82QuXbrmLzWg7uxlMFp8Nq/kkI= +github.com/multiformats/go-base32 v0.0.3/go.mod h1:pLiuGC8y0QR3Ue4Zug5UzK9LjgbkL8NSQj0zQ5Nz/AA= +github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE= +github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI= +github.com/multiformats/go-base36 v0.1.0 h1:JR6TyF7JjGd3m6FbLU2cOxhC0Li8z8dLNGQ89tUg4F4= +github.com/multiformats/go-base36 v0.1.0/go.mod h1:kFGE83c6s80PklsHO9sRn2NCoffoRdUUOENyW/Vv6sM= +github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0= +github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4= +github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g= +github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk= +github.com/olebedev/emitter v0.0.0-20230411050614-349169dec2ba h1:/Q5vvLs180BFH7u+Nakdrr1B9O9RAxVaIurFQy0c8QQ= +github.com/olebedev/emitter v0.0.0-20230411050614-349169dec2ba/go.mod h1:eT2/Pcsim3XBjbvldGiJBvvgiqZkAFyiOJJsDKXs/ts= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -39,29 +68,97 @@ github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMV github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= +github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8= +github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok= +github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g= +github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +go.etcd.io/bbolt v1.3.8 h1:xs88BrvEv273UsB79e0hcVrlUWmS0a8upikMFhSyAtA= +go.etcd.io/bbolt v1.3.8/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= +go.sia.tech/jape v0.11.1 h1:M7IP+byXL7xOqzxcHUQuXW+q3sYMkYzmMlMw+q8ZZw0= +go.sia.tech/jape v0.11.1/go.mod h1:4QqmBB+t3W7cNplXPj++ZqpoUb2PeiS66RLpXmEGap4= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= -go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= -go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= +golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= +golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls= gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= +nhooyr.io/websocket v1.7.1 h1:W8X03PI0a2fiKb3Srck2gpmWr8UwJqDGndXw8bb93yM= +nhooyr.io/websocket v1.7.1/go.mod h1:FyTYp9aYEPchTiPpXj2mOOnHJ49S35YStWZCjotwizg= +nhooyr.io/websocket v1.8.10 h1:mv4p+MnGrLDcPlBoWsvPP7XCzTYMXP9F9eIGoKbgx7Q= +nhooyr.io/websocket v1.8.10/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= diff --git a/interfaces/api.go b/interfaces/api.go index b842e78..e47ae67 100644 --- a/interfaces/api.go +++ b/interfaces/api.go @@ -2,16 +2,15 @@ package interfaces import ( "git.lumeweb.com/LumeWeb/portal/api/router" - "github.com/spf13/viper" - "go.uber.org/zap" ) type API interface { - Initialize(config *viper.Viper, logger *zap.Logger) error + Initialize(portal Portal, protocol Protocol) error } type APIRegistry interface { - Register(name string, APIRegistry API) error + All() map[string]API + Register(name string, APIRegistry API) Get(name string) (API, error) Router() *router.ProtocolRouter } diff --git a/interfaces/portal.go b/interfaces/portal.go index 9838aa1..2eb9da7 100644 --- a/interfaces/portal.go +++ b/interfaces/portal.go @@ -12,4 +12,5 @@ type Portal interface { Config() *viper.Viper Logger() *zap.Logger Db() *gorm.DB + ApiRegistry() APIRegistry } diff --git a/interfaces/protocol.go b/interfaces/protocol.go index 8cca422..9d10e6d 100644 --- a/interfaces/protocol.go +++ b/interfaces/protocol.go @@ -7,4 +7,5 @@ import ( type Protocol interface { Initialize(config *viper.Viper, logger *zap.Logger) error + Start() error } diff --git a/protocols/protocols.go b/protocols/protocols.go index 5285dd5..bc58dc1 100644 --- a/protocols/protocols.go +++ b/protocols/protocols.go @@ -1,7 +1,6 @@ package protocols -import "github.com/spf13/viper" - -func Init(config *viper.Viper) error { +func Init(registry ProtocolRegistry) error { + registry.Register("s5", NewS5Protocol()) return nil } diff --git a/protocols/registry.go b/protocols/registry.go index 5ee34e8..8edd60c 100644 --- a/protocols/registry.go +++ b/protocols/registry.go @@ -10,8 +10,9 @@ var ( ) type ProtocolRegistry interface { - Register(name string, protocol interfaces.Protocol) error + Register(name string, protocol interfaces.Protocol) Get(name string) (interfaces.Protocol, error) + All() map[string]interfaces.Protocol } type ProtocolRegistryImpl struct { @@ -24,12 +25,11 @@ func NewProtocolRegistry() ProtocolRegistry { } } -func (r *ProtocolRegistryImpl) Register(name string, protocol interfaces.Protocol) error { +func (r *ProtocolRegistryImpl) Register(name string, protocol interfaces.Protocol) { if _, exists := r.protocols[name]; exists { - return errors.New("protocol already registered") + panic("protocol already registered") } r.protocols[name] = protocol - return nil } func (r *ProtocolRegistryImpl) Get(name string) (interfaces.Protocol, error) { @@ -39,3 +39,11 @@ func (r *ProtocolRegistryImpl) Get(name string) (interfaces.Protocol, error) { } return protocol, nil } + +func (r *ProtocolRegistryImpl) All() map[string]interfaces.Protocol { + pMap := make(map[string]interfaces.Protocol) + for key, value := range r.protocols { + pMap[key] = value + } + return pMap +} diff --git a/protocols/s5.go b/protocols/s5.go index 9606f9a..b28f81b 100644 --- a/protocols/s5.go +++ b/protocols/s5.go @@ -1 +1,71 @@ package protocols + +import ( + "crypto/ed25519" + s5config "git.lumeweb.com/LumeWeb/libs5-go/config" + s5ed "git.lumeweb.com/LumeWeb/libs5-go/ed25519" + s5interfaces "git.lumeweb.com/LumeWeb/libs5-go/interfaces" + s5node "git.lumeweb.com/LumeWeb/libs5-go/node" + "git.lumeweb.com/LumeWeb/portal/interfaces" + "github.com/spf13/viper" + bolt "go.etcd.io/bbolt" + "go.uber.org/zap" +) + +var ( + _ interfaces.Protocol = (*S5Protocol)(nil) +) + +type S5Protocol struct { + node s5interfaces.Node +} + +func NewS5Protocol() *S5Protocol { + return &S5Protocol{} +} + +func (s *S5Protocol) Initialize(config *viper.Viper, logger *zap.Logger) error { + cfg := &s5config.NodeConfig{ + P2P: s5config.P2PConfig{ + Network: "", + Peers: s5config.PeersConfig{Initial: []string{}}, + }, + KeyPair: nil, + DB: nil, + Logger: logger, + HTTP: s5config.HTTPConfig{}, + } + + pconfig := config.Sub("s5") + + if pconfig != nil { + err := pconfig.Unmarshal(cfg) + if err != nil { + return err + } + } + + _, p, err := ed25519.GenerateKey(nil) + if err != nil { + panic(err) + } + + cfg.KeyPair = s5ed.New(p) + + db, err := bolt.Open("test.db", 0600, nil) + if err != nil { + panic(err) + } + + cfg.DB = db + + s.node = s5node.NewNode(cfg) + + return nil +} +func (s *S5Protocol) Start() error { + return s.node.Start() +} +func (s *S5Protocol) Node() s5interfaces.Node { + return s.node +}