MetzNet
/
graphvent
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added State to GQLExt, TODO: add a start signal that gets sent to a node when it's loop is started so it's extensions can perform activation sequences

gql_cataclysm v0.2.8
noah metz 2023-07-30 23:59:04 -06:00
parent 0424a3970f
commit 064dc72820
2 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gql.go
Unescape Escape View File

@ -938,20 +938,21 @@ func NewGQLExtContext() *GQLExtContext {
} }
type GQLExt struct { type GQLExt struct {
tcp_listener net.Listener tcp_listener net.Listener `json:"-"`
http_server *http.Server http_server *http.Server `json:"-"`
http_done sync.WaitGroup http_done sync.WaitGroup `json:"-"`
// map of read request IDs to gql request ID // map of read request IDs to gql request ID
resolver_reads map[uuid.UUID]uuid.UUID resolver_reads map[uuid.UUID]uuid.UUID `json:"-"`
resolver_reads_lock sync.RWMutex resolver_reads_lock sync.RWMutex `json:"-"`
// map of gql request ID to active channel // map of gql request ID to active channel
resolver_chans map[uuid.UUID]chan *ReadResultSignal resolver_chans map[uuid.UUID]chan *ReadResultSignal `json:"-"`
resolver_chans_lock sync.RWMutex resolver_chans_lock sync.RWMutex `json:"-"`
tls_key []byte State string `json:"state"`
tls_cert []byte tls_key []byte `json:"tls_key"`
Listen string tls_cert []byte `json:"tls_cert"`
Listen string `json:"listen"`
} }
func (ext *GQLExt) Field(name string) interface{} { func (ext *GQLExt) Field(name string) interface{} {
@ -1018,18 +1019,8 @@ func (ext *GQLExt) Type() ExtType {
return GQLExtType return GQLExtType
} }
type GQLExtJSON struct {
Listen string `json:"listen"`
TLSKey []byte `json:"ssl_key"`
TLSCert []byte `json:"ssl_cert"`
}
func (ext *GQLExt) Serialize() ([]byte, error) { func (ext *GQLExt) Serialize() ([]byte, error) {
return json.MarshalIndent(&GQLExtJSON{ return json.MarshalIndent(ext, "", " ")
Listen: ext.Listen,
TLSKey: ext.tls_key,
TLSCert: ext.tls_cert,
}, "", " ")
} }
var ecdsa_curves = map[uint8]elliptic.Curve{ var ecdsa_curves = map[uint8]elliptic.Curve{
@ -1049,16 +1040,16 @@ var ecdh_curve_ids = map[ecdh.Curve]uint8{
} }
func LoadGQLExt(ctx *Context, data []byte) (Extension, error) { func LoadGQLExt(ctx *Context, data []byte) (Extension, error) {
var j GQLExtJSON var ext GQLExt
err := json.Unmarshal(data, &j) err := json.Unmarshal(data, &ext)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return NewGQLExt(ctx, j.Listen, j.TLSCert, j.TLSKey) return NewGQLExt(ctx, ext.Listen, ext.tls_cert, ext.tls_key, ext.State)
} }
func NewGQLExt(ctx *Context, listen string, tls_cert []byte, tls_key []byte) (*GQLExt, error) { func NewGQLExt(ctx *Context, listen string, tls_cert []byte, tls_key []byte, state string) (*GQLExt, error) {
if tls_cert == nil || tls_key == nil { if tls_cert == nil || tls_key == nil {
ssl_key, err := ecdsa.GenerateKey(ctx.ECDSA, rand.Reader) ssl_key, err := ecdsa.GenerateKey(ctx.ECDSA, rand.Reader)
if err != nil { if err != nil {

4
gql_test.go
Unescape Escape View File

@ -20,7 +20,7 @@ func TestGQL(t *testing.T) {
err := ctx.RegisterNodeType(TestNodeType, []ExtType{LockableExtType, ACLExtType}) err := ctx.RegisterNodeType(TestNodeType, []ExtType{LockableExtType, ACLExtType})
fatalErr(t, err) fatalErr(t, err)
gql_ext, err := NewGQLExt(ctx, ":0", nil, nil) gql_ext, err := NewGQLExt(ctx, ":0", nil, nil, "start")
fatalErr(t, err) fatalErr(t, err)
listener_ext := NewListenerExt(10) listener_ext := NewListenerExt(10)
policy := NewAllNodesPolicy(Actions{MakeAction("+")}) policy := NewAllNodesPolicy(Actions{MakeAction("+")})
@ -98,7 +98,7 @@ func TestGQLDB(t *testing.T) {
ctx.Log.Logf("test", "U1_ID: %s", u1.ID) ctx.Log.Logf("test", "U1_ID: %s", u1.ID)
gql_ext, err := NewGQLExt(ctx, ":0", nil, nil) gql_ext, err := NewGQLExt(ctx, ":0", nil, nil, "start")
fatalErr(t, err) fatalErr(t, err)
listener_ext := NewListenerExt(10) listener_ext := NewListenerExt(10)
gql := NewNode(ctx, nil, GQLNodeType, 10, nil, gql := NewNode(ctx, nil, GQLNodeType, 10, nil,