Implement fallback websocket protocol

Author: apottere

src/main/java/graphql/servlet/GraphQLObjectMapper.java

@@ -69,6 +69,10 @@ public GraphQLRequest readGraphQLRequest(InputStream inputStream) throws IOExcep
         return getGraphQLRequestMapper().readValue(inputStream);
     }
 
+    public GraphQLRequest readGraphQLRequest(String text) throws IOException {
+        return getGraphQLRequestMapper().readValue(text);
+    }
+
     public List<GraphQLRequest> readBatchedGraphQLRequest(InputStream inputStream) throws IOException {
         MappingIterator<GraphQLRequest> iterator = getGraphQLRequestMapper().readValues(inputStream);
         List<GraphQLRequest> requests = new ArrayList<>();

src/main/java/graphql/servlet/GraphQLWebsocketServlet.java

@@ -33,6 +33,7 @@ public class GraphQLWebsocketServlet extends Endpoint {
 
     private static final String HANDSHAKE_REQUEST_KEY = HandshakeRequest.class.getName();
     private static final String PROTOCOL_HANDLER_REQUEST_KEY = SubscriptionProtocolHandler.class.getName();
+    private static final CloseReason ERROR_CLOSE_REASON = new CloseReason(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Internal Server Error");
 
     private static final List<SubscriptionProtocolFactory> subscriptionProtocolFactories = Collections.singletonList(new ApolloSubscriptionProtocolFactory());
     private static final SubscriptionProtocolFactory fallbackSubscriptionProtocolFactory = new FallbackSubscriptionProtocolFactory();
@@ -45,7 +46,15 @@ public class GraphQLWebsocketServlet extends Endpoint {
     }
 
     private final Map<Session, WsSessionSubscriptions> sessionSubscriptionCache = new HashMap<>();
-    private final CloseReason ERROR_CLOSE_REASON = new CloseReason(CloseReason.CloseCodes.UNEXPECTED_CONDITION, "Internal Server Error");
+    private final GraphQLQueryInvoker queryInvoker;
+    private final GraphQLInvocationInputFactory invocationInputFactory;
+    private final GraphQLObjectMapper graphQLObjectMapper;
+
+    public GraphQLWebsocketServlet(GraphQLQueryInvoker queryInvoker, GraphQLInvocationInputFactory invocationInputFactory, GraphQLObjectMapper graphQLObjectMapper) {
+        this.queryInvoker = queryInvoker;
+        this.invocationInputFactory = invocationInputFactory;
+        this.graphQLObjectMapper = graphQLObjectMapper;
+    }
 
     @Override
     public void onOpen(Session session, EndpointConfig endpointConfig) {
@@ -61,11 +70,7 @@ public void onOpen(Session session, EndpointConfig endpointConfig) {
             @Override
             public void onMessage(String text) {
                 try {
-//                    subscriptionProtocolHandler.onMessage(request, text, );
-//                    query(getGraphQLRequestMapper().readValue(text), invocationInputFactory.create(request), (executionResult) -> {
-//                        Object data = executionResult.getData();
-//                                session.getBasicRemote().sendText();
-//                    });
+                    subscriptionProtocolHandler.onMessage(request, session, text);
                 } catch (Throwable t) {
                     log.error("Error executing websocket query for session: {}", session.getId(), t);
                     closeUnexpectedly(session, t);
@@ -106,7 +111,7 @@ public void modifyHandshake(ServerEndpointConfig sec, HandshakeRequest request,
         }
 
         SubscriptionProtocolFactory subscriptionProtocolFactory = getSubscriptionProtocolFactory(accept);
-        sec.getUserProperties().put(PROTOCOL_HANDLER_REQUEST_KEY, subscriptionProtocolFactory);
+        sec.getUserProperties().put(PROTOCOL_HANDLER_REQUEST_KEY, subscriptionProtocolFactory.createHandler(invocationInputFactory, queryInvoker, graphQLObjectMapper));
 
         if(request.getHeaders().get(HandshakeResponse.SEC_WEBSOCKET_ACCEPT) != null) {
             response.getHeaders().put(HandshakeResponse.SEC_WEBSOCKET_ACCEPT, allSubscriptionProtocols);

src/main/java/graphql/servlet/internal/ApolloSubscriptionProtocolFactory.java

@@ -1,5 +1,9 @@
 package graphql.servlet.internal;
 
+import graphql.servlet.GraphQLInvocationInputFactory;
+import graphql.servlet.GraphQLObjectMapper;
+import graphql.servlet.GraphQLQueryInvoker;
+
 /**
  * @author Andrew Potter
  */
@@ -9,7 +13,7 @@ public ApolloSubscriptionProtocolFactory() {
     }
 
     @Override
-    public SubscriptionProtocolHandler createHandler() {
+    public SubscriptionProtocolHandler createHandler(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQLObjectMapper) {
         return new ApolloSubscriptionProtocolHandler();
     }
 }

src/main/java/graphql/servlet/internal/ApolloSubscriptionProtocolHandler.java

@@ -1,14 +1,14 @@
 package graphql.servlet.internal;
 
+import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
-import java.util.function.Function;
 
 /**
  * @author Andrew Potter
  */
 public class ApolloSubscriptionProtocolHandler implements SubscriptionProtocolHandler {
     @Override
-    public void onMessage(HandshakeRequest request, String text, Function query) {
+    public void onMessage(HandshakeRequest request, Session session, String text) {
 
     }
 }

src/main/java/graphql/servlet/internal/FallbackSubscriptionProtocolFactory.java

@@ -1,5 +1,9 @@
 package graphql.servlet.internal;
 
+import graphql.servlet.GraphQLInvocationInputFactory;
+import graphql.servlet.GraphQLObjectMapper;
+import graphql.servlet.GraphQLQueryInvoker;
+
 /**
  * @author Andrew Potter
  */
@@ -9,7 +13,7 @@ public FallbackSubscriptionProtocolFactory() {
     }
 
     @Override
-    public SubscriptionProtocolHandler createHandler() {
-        return new FallbackSubscriptionProtocolHandler();
+    public SubscriptionProtocolHandler createHandler(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQLObjectMapper) {
+        return new FallbackSubscriptionProtocolHandler(queryInvoker, invocationInputFactory, graphQLObjectMapper);
     }
 }

src/main/java/graphql/servlet/internal/FallbackSubscriptionProtocolHandler.java

@@ -1,14 +1,31 @@
 package graphql.servlet.internal;
 
+import graphql.servlet.GraphQLInvocationInputFactory;
+import graphql.servlet.GraphQLObjectMapper;
+import graphql.servlet.GraphQLQueryInvoker;
+
+import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
-import java.util.function.Function;
 
 /**
  * @author Andrew Potter
  */
 public class FallbackSubscriptionProtocolHandler implements SubscriptionProtocolHandler {
-    @Override
-    public void onMessage(HandshakeRequest request, String text, Function query) {
 
+    private final GraphQLQueryInvoker queryInvoker;
+    private final GraphQLInvocationInputFactory invocationInputFactory;
+    private final GraphQLObjectMapper graphQLObjectMapper;
+
+    public FallbackSubscriptionProtocolHandler(GraphQLQueryInvoker queryInvoker, GraphQLInvocationInputFactory invocationInputFactory, GraphQLObjectMapper graphQLObjectMapper) {
+        this.queryInvoker = queryInvoker;
+        this.invocationInputFactory = invocationInputFactory;
+        this.graphQLObjectMapper = graphQLObjectMapper;
+    }
+
+    @Override
+    public void onMessage(HandshakeRequest request, Session session, String text) throws Exception {
+        session.getBasicRemote().sendText(graphQLObjectMapper.serializeResultAsJson(
+            queryInvoker.query(invocationInputFactory.create(graphQLObjectMapper.readGraphQLRequest(text), request))
+        ));
     }
 }

src/main/java/graphql/servlet/internal/SubscriptionProtocolFactory.java

@@ -1,5 +1,9 @@
 package graphql.servlet.internal;
 
+import graphql.servlet.GraphQLInvocationInputFactory;
+import graphql.servlet.GraphQLObjectMapper;
+import graphql.servlet.GraphQLQueryInvoker;
+
 /**
  * @author Andrew Potter
  */
@@ -14,5 +18,5 @@ public String getProtocol() {
         return protocol;
     }
 
-    public abstract SubscriptionProtocolHandler createHandler();
+    public abstract SubscriptionProtocolHandler createHandler(GraphQLInvocationInputFactory invocationInputFactory, GraphQLQueryInvoker queryInvoker, GraphQLObjectMapper graphQLObjectMapper);
 }

src/main/java/graphql/servlet/internal/SubscriptionProtocolHandler.java

@@ -1,11 +1,11 @@
 package graphql.servlet.internal;
 
+import javax.websocket.Session;
 import javax.websocket.server.HandshakeRequest;
-import java.util.function.Function;
 
 /**
  * @author Andrew Potter
  */
 public interface SubscriptionProtocolHandler {
-    void onMessage(HandshakeRequest request, String text, Function query);
+    void onMessage(HandshakeRequest request, Session session, String text) throws Exception;
 }