Skip to content

Fix subscription panic on closing websocket connection #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shivam010 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix subscription panic on closing websocket connection #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70f83f8
saastack initial commit
Shivam010 Jan 23, 2020
794fdce
Fix subscription panic on closing websocket connection
Shivam010 Apr 17, 2020
bf5fbae
Maintain subscription sessions using both client & server side id
Shivam010 Apr 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
"net/http"

"github.com/google/uuid"
"go.appointy.com/jaal"
"go.appointy.com/jaal/introspection"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal"
"go.saastack.io/jaal/introspection"
"go.saastack.io/jaal/schemabuilder"
)

type Server struct {
Expand Down
2 changes: 1 addition & 1 deletion call.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"
"time"

"go.appointy.com/jaal/jerrors"
"go.saastack.io/jaal/jerrors"
)

// HttpCall sends an HTTP Request to the specified url and returns response in map of map
Expand Down
2 changes: 1 addition & 1 deletion call_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/assert"

"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal/schemabuilder"
)

func TestHttpCall(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"net/http"

"go.appointy.com/jaal/jerrors"
"go.saastack.io/jaal/jerrors"
)

type Decoder interface {
Expand Down
6 changes: 3 additions & 3 deletions example/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"time"

"github.com/google/uuid"
"go.appointy.com/jaal"
"go.appointy.com/jaal/introspection"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal"
"go.saastack.io/jaal/introspection"
"go.saastack.io/jaal/schemabuilder"
)

func init() {
Expand Down
11 changes: 4 additions & 7 deletions example/test-1/server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"time"

"github.com/appointy/idgen"
"go.appointy.com/jaal"
"go.appointy.com/jaal/graphql"
"go.appointy.com/jaal/introspection"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal"
"go.saastack.io/jaal/graphql"
"go.saastack.io/jaal/introspection"
"go.saastack.io/jaal/schemabuilder"
"gocloud.dev/pubsub"
_ "gocloud.dev/pubsub/mempubsub"
"golang.org/x/net/context"
Expand Down Expand Up @@ -278,9 +278,6 @@ func main() {
return
}
}
if t < 10 {
sub.Shutdown(ctx)
}
}
}()
f()
Expand Down
5 changes: 3 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.appointy.com/jaal
module go.saastack.io/jaal

go 1.13
go 1.14

require (
github.com/appointy/idgen v0.0.0-20190227121039-a884768ebb9d
Expand All @@ -15,6 +15,7 @@ require (
go.opencensus.io v0.22.0 // indirect
gocloud.dev v0.15.0
golang.org/x/net v0.0.0-20190514140710-3ec191127204
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
google.golang.org/api v0.6.0 // indirect
google.golang.org/genproto v0.0.0-20190508193815-b515fa19cec8
google.golang.org/grpc v1.21.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@ golang.org/x/tools v0.0.0-20190422233926-fe54fb35175b/go.mod h1:LCzVGOaR6xXOjkQ3
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373 h1:PPwnA7z1Pjf7XYaBP9GL1VAMZmcIWyFz7QCMSIIa3Bg=
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
google.golang.org/api v0.3.2/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
Expand Down
6 changes: 3 additions & 3 deletions graphql/clone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"go.appointy.com/jaal/graphql"
"go.appointy.com/jaal/introspection"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal/graphql"
"go.saastack.io/jaal/introspection"
"go.saastack.io/jaal/schemabuilder"
)

func TestClone(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions graphql/end_to_end_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/kylelemons/godebug/pretty"

"github.com/stretchr/testify/assert"
"go.appointy.com/jaal/graphql"
"go.appointy.com/jaal/internal"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal/graphql"
"go.saastack.io/jaal/internal"
"go.saastack.io/jaal/schemabuilder"
)

func TestInterface(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion graphql/execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"runtime"
"strings"

"go.appointy.com/jaal/jerrors"
"go.saastack.io/jaal/jerrors"
)

type Executor struct {
Expand Down
8 changes: 4 additions & 4 deletions graphql/execute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"testing"

"github.com/davecgh/go-spew/spew"
"go.appointy.com/jaal/graphql"
"go.appointy.com/jaal/internal"
"go.appointy.com/jaal/jerrors"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal/graphql"
"go.saastack.io/jaal/internal"
"go.saastack.io/jaal/jerrors"
"go.saastack.io/jaal/schemabuilder"
"google.golang.org/grpc/codes"
)

Expand Down
6 changes: 3 additions & 3 deletions graphql/lazy_execute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"go.appointy.com/jaal/graphql"
"go.appointy.com/jaal/jerrors"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal/graphql"
"go.saastack.io/jaal/jerrors"
"go.saastack.io/jaal/schemabuilder"
)

func TestLazyExecution(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion graphql/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/graphql-go/graphql/language/ast"
"github.com/graphql-go/graphql/language/parser"
"go.appointy.com/jaal/jerrors"
"go.saastack.io/jaal/jerrors"
)

type Query struct {
Expand Down
2 changes: 1 addition & 1 deletion graphql/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

. "go.appointy.com/jaal/graphql"
. "go.saastack.io/jaal/graphql"
)

func TestParseSupported(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions graphql/union_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"testing"

"github.com/kylelemons/godebug/pretty"
"go.appointy.com/jaal/graphql"
"go.appointy.com/jaal/internal"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal/graphql"
"go.saastack.io/jaal/internal"
"go.saastack.io/jaal/schemabuilder"
)

type GatewayType int
Expand Down
2 changes: 1 addition & 1 deletion gtypes/global.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/golang/protobuf/ptypes/empty"
"github.com/iancoleman/strcase"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal/schemabuilder"
"google.golang.org/genproto/protobuf/field_mask"
)

Expand Down
4 changes: 2 additions & 2 deletions http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"errors"
"net/http"

"go.appointy.com/jaal/graphql"
"go.appointy.com/jaal/jerrors"
"go.saastack.io/jaal/graphql"
"go.saastack.io/jaal/jerrors"
)

type HandlerOption func(*handlerOptions)
Expand Down
4 changes: 2 additions & 2 deletions http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"

"github.com/kylelemons/godebug/pretty"
"go.appointy.com/jaal"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal"
"go.saastack.io/jaal/schemabuilder"
)

func testHTTPRequest(req *http.Request) *httptest.ResponseRecorder {
Expand Down
4 changes: 2 additions & 2 deletions introspection/introspection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"sort"

"go.appointy.com/jaal/graphql"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal/graphql"
"go.saastack.io/jaal/schemabuilder"
)

type introspection struct {
Expand Down
6 changes: 3 additions & 3 deletions introspection/introspection_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"strings"
"testing"

"go.appointy.com/jaal/graphql"
"go.saastack.io/jaal/graphql"

"github.com/stretchr/testify/require"
"go.appointy.com/jaal/introspection"
"go.appointy.com/jaal/schemabuilder"
"go.saastack.io/jaal/introspection"
"go.saastack.io/jaal/schemabuilder"
)

type User struct {
Expand Down
2 changes: 1 addition & 1 deletion middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package jaal

import "context"

import "go.appointy.com/jaal/graphql"
import "go.saastack.io/jaal/graphql"

type HandlerFunc func(context.Context, graphql.Type, *graphql.Query) (interface{}, error)

Expand Down
2 changes: 1 addition & 1 deletion schema/schema.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package graphql;

import "google/protobuf/descriptor.proto";

option go_package="go.appointy.com/jaal/schema";
option go_package="go.saastack.io/jaal/schema";

extend google.protobuf.MethodOptions {
// schema is used to tag an rpc as query or mutation.
Expand Down
2 changes: 1 addition & 1 deletion schemabuilder/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/golang/protobuf/ptypes/duration"
"github.com/golang/protobuf/ptypes/timestamp"
"go.appointy.com/jaal/graphql"
"go.saastack.io/jaal/graphql"
)

// schemaBuilder is a struct for holding all the graph information for types as
Expand Down
2 changes: 1 addition & 1 deletion schemabuilder/function.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"reflect"

"go.appointy.com/jaal/graphql"
"go.saastack.io/jaal/graphql"
)

// buildFunction takes the reflect type of an object and a method attached to that object to build a GraphQL Field
Expand Down
2 changes: 1 addition & 1 deletion schemabuilder/input.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/golang/protobuf/ptypes/duration"
"github.com/golang/protobuf/ptypes/timestamp"
"go.appointy.com/jaal/graphql"
"go.saastack.io/jaal/graphql"
)

// argField is a representation of an input parameter field for a function. It
Expand Down
2 changes: 1 addition & 1 deletion schemabuilder/input_object.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"reflect"

"go.appointy.com/jaal/graphql"
"go.saastack.io/jaal/graphql"
)

// makeInputObjectParser constructs an argParser for the passed in args struct i.e. the input struct which contains all the objects to be given as input. For eg:
Expand Down
2 changes: 1 addition & 1 deletion schemabuilder/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"
"sort"

"go.appointy.com/jaal/graphql"
"go.saastack.io/jaal/graphql"
)

// buildStruct is a function for building the graphql.Type for a passed in struct type.
Expand Down
2 changes: 1 addition & 1 deletion schemabuilder/reflect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"unicode"

"go.appointy.com/jaal/graphql"
"go.saastack.io/jaal/graphql"
)

// graphQLFieldInfo contains basic struct field information related to GraphQL.
Expand Down
2 changes: 1 addition & 1 deletion schemabuilder/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"reflect"

"go.appointy.com/jaal/graphql"
"go.saastack.io/jaal/graphql"
)

// Schema is a struct that can be used to build out a GraphQL schema. Functions
Expand Down
Loading