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

last fix

graph-rework-2
noah metz 2023-07-03 19:46:01 -06:00
parent a23dfd2b81
commit ce831af290
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gql_graph.go
Unescape Escape View File

@ -699,22 +699,18 @@ func GQLTypeSignalInput() *graphql.InputObject {
} }
func GQLSubscribeSignal(p graphql.ResolveParams) (interface{}, error) { func GQLSubscribeSignal(p graphql.ResolveParams) (interface{}, error) {
return GQLSubscribeFn(p, func(signal GraphSignal, p graphql.ResolveParams)(interface{}, error) { return GQLSubscribeFn(p, false, func(ctx *GraphContext, server *GQLThread, signal GraphSignal, p graphql.ResolveParams)(interface{}, error) {
if signal == nil {
return nil, nil
}
return signal, nil return signal, nil
}) })
} }
func GQLSubscribeSelf(p graphql.ResolveParams) (interface{}, error) { func GQLSubscribeSelf(p graphql.ResolveParams) (interface{}, error) {
server := p.Context.Value("gql_server").(*GQLThread) return GQLSubscribeFn(p, true, func(ctx *GraphContext, server *GQLThread, signal GraphSignal, p graphql.ResolveParams)(interface{}, error) {
return GQLSubscribeFn(p, func(signal GraphSignal, p graphql.ResolveParams)(interface{}, error) {
return server, nil return server, nil
}) })
} }
func GQLSubscribeFn(p graphql.ResolveParams, fn func(GraphSignal, graphql.ResolveParams)(interface{}, error))(interface{}, error) { func GQLSubscribeFn(p graphql.ResolveParams, send_nil bool, fn func(*GraphContext, *GQLThread, GraphSignal, graphql.ResolveParams)(interface{}, error))(interface{}, error) {
server, ok := p.Context.Value("gql_server").(*GQLThread) server, ok := p.Context.Value("gql_server").(*GQLThread)
if ok == false { if ok == false {
return nil, fmt.Errorf("Failed to get gql_server from context and cast to GQLServer") return nil, fmt.Errorf("Failed to get gql_server from context and cast to GQLServer")
@ -729,13 +725,15 @@ func GQLSubscribeFn(p graphql.ResolveParams, fn func(GraphSignal, graphql.Resolv
go func(c chan interface{}, server *GQLThread) { go func(c chan interface{}, server *GQLThread) {
ctx.Log.Logf("gqlws", "GQL_SUBSCRIBE_THREAD_START") ctx.Log.Logf("gqlws", "GQL_SUBSCRIBE_THREAD_START")
sig_c := server.UpdateChannel(1) sig_c := server.UpdateChannel(1)
sig_c <- nil if send_nil == true {
sig_c <- nil
}
for { for {
val, ok := <- sig_c val, ok := <- sig_c
if ok == false { if ok == false {
return return
} }
ret, err := fn(val, p) ret, err := fn(ctx, server, val, p)
if err != nil { if err != nil {
ctx.Log.Logf("gqlws", "type convertor error %s", err) ctx.Log.Logf("gqlws", "type convertor error %s", err)
return return