Squashed 'app/packages/meteor-integration/' changes from 8535ff5..b1136d9

b1136d9 in progress for subscription test cases
4ecff7f updated meteor-integration

git-subtree-dir: app/packages/meteor-integration
git-subtree-split: b1136d93ed179db04561fc0dd4c59a3ac5fdd03f

Author: cdmbase

.babelrc

@@ -5,21 +5,26 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { _ } from 'meteor/underscore';
 import { print } from 'graphql-tag/printer';
-import { Client } from 'subscriptions-transport-ws';
+import { SubscriptionClient, addGraphQLSubscriptions } from 'subscriptions-transport-ws';
 
 const defaultNetworkInterfaceConfig = {
   path: '/graphql', // default graphql server endpoint
   opts: {}, // additional fetch options like `credentials` or `headers`
   useMeteorAccounts: true, // if true, send an eventual Meteor login token to identify the current user with every request
   batchingInterface: true, // use a BatchingNetworkInterface by default instead of a NetworkInterface
   batchInterval: 10, // default batch interval
+  useSubscription: true, // enable subscription by default
 };
 
-const getDefaultWsClient = () => new Client('ws://localhost:8080');
+const getDefaultWsClient = () => new SubscriptionClient('ws://localhost:8080', {
+  reconnect: true,
+  // connectionParams: {
+  //   // Pass any arguments you want for initialization
+  // },
+});
 
 export const createMeteorNetworkInterface = (givenConfig) => {
   const config = _.extend(defaultNetworkInterfaceConfig, givenConfig);
-  const wsClient = givenConfig && givenConfig.wsClient ? givenConfig.wsClient : getDefaultWsClient();
   // absoluteUrl adds a '/', so let's remove it first
   let path = config.path;
   if (path[0] === '/') {
@@ -30,17 +35,17 @@ export const createMeteorNetworkInterface = (givenConfig) => {
   const interfaceToUse = config.batchingInterface ? createBatchingNetworkInterface : createNetworkInterface;
 
   // default interface options
-  let interfaceOptions = {
+  const interfaceOptions = {
     uri: Meteor.absoluteUrl(path),
   };
 
   // if a BatchingNetworkInterface is used with a correct batch interval, add it to the options
-  if(config.batchingInterface && config.batchInterval) {
+  if (config.batchingInterface && config.batchInterval) {
     interfaceOptions.batchInterval = config.batchInterval;
   }
 
   // if 'fetch' has been configured to be called with specific opts, add it to the options
-  if(!_.isEmpty(config.opts)) {
+  if (!_.isEmpty(config.opts)) {
     interfaceOptions.opts = config.opts;
   }
 
@@ -49,7 +54,6 @@ export const createMeteorNetworkInterface = (givenConfig) => {
   if (config.useMeteorAccounts) {
     networkInterface.use([{
       applyMiddleware(request, next) {
-
         // cookie login token created by meteorhacks:fast-render and caught during server-side rendering by rr:react-router-ssr
         const { loginToken: cookieLoginToken } = config;
         // Meteor accounts-base login token stored in local storage, only exists client-side
@@ -82,31 +86,16 @@ export const createMeteorNetworkInterface = (givenConfig) => {
   }
 
   if (config.useSubscription) {
-    return _.extend(networkInterface, {
-      subscribe: (request, handler) => wsClient.subscribe({
-        query: print(request.query),
-        variables: request.variables,
-      }, handler),
-      unsubscribe: (id) => {
-        wsClient.unsubscribe(id);
-      },
-    });
+    const wsClient = givenConfig && givenConfig.wsClient ? givenConfig.wsClient : getDefaultWsClient();
+    return addGraphQLSubscriptions(networkInterface, wsClient);
   }
+  
   return networkInterface;
 };
 
 export const meteorClientConfig = (networkInterfaceConfig) => {
-  const networkInterface = createMeteorNetworkInterface(networkInterfaceConfig);
-  let { initialState } = networkInterface;
-  if(initialState){
-    // Temporary workaround for bug in AC@0.5.0: https://github.com/apollostack/apollo-client/issues/845
-    delete initialState.apollo.queries;
-    delete initialState.apollo.mutations;
-  }
-
   return {
-    networkInterface,
-    initialState,
+    networkInterface: createMeteorNetworkInterface(networkInterfaceConfig),
     ssrMode: Meteor.isServer,
 
     // Default to using Mongo _id, must use _id for queries.

main-client.js

@@ -16,14 +16,14 @@ export { createMeteorNetworkInterface, meteorClientConfig } from './main-client'
 const defaultConfig = {
   path: '/graphql',
   maxAccountsCacheSizeInMB: 1,
-  graphiql : Meteor.isDevelopment,
-  graphiqlPath : '/graphiql',
-  graphiqlOptions : {
-    passHeader : "'Authorization': localStorage['Meteor.loginToken']"
+  graphiql: Meteor.isDevelopment,
+  graphiqlPath: '/graphiql',
+  graphiqlOptions: {
+    passHeader: "'Authorization': localStorage['Meteor.loginToken']"
   },
   useSubscription: true,
   subscriptionPort: 8080,
-  configServer: (graphQLServer) => {},
+  configServer: (graphQLServer) => { },
 };
 
 const defaultOptions = {
@@ -51,7 +51,7 @@ export const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
   // GraphQL endpoint
   graphQLServer.use(config.path, bodyParser.json(), graphqlExpress(async (req) => {
     let options,
-        user = null;
+      user = null;
 
     if (_.isFunction(givenOptions))
       options = givenOptions(req);
@@ -75,7 +75,7 @@ export const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
 
       // Get the user from the database
       user = await Meteor.users.findOne(
-        {"services.resume.loginTokens.hashedToken": hashedToken}
+        { "services.resume.loginTokens.hashedToken": hashedToken }
       );
 
       if (user) {
@@ -95,11 +95,9 @@ export const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
 
   // Start GraphiQL if enabled
   if (config.graphiql) {
-    graphQLServer.use(config.graphiqlPath, graphiqlExpress(_.extend(config.graphiqlOptions, {endpointURL : config.path})));
+    graphQLServer.use(config.graphiqlPath, graphiqlExpress(_.extend(config.graphiqlOptions, { endpointURL: config.path })));
   }
 
-  // create http server for subscription
-  const server = createServer(graphQLServer);
 
   // This binds the specified paths to the Express server running Apollo + GraphiQL
   WebApp.connectHandlers.use(Meteor.bindEnvironment(graphQLServer));
@@ -109,13 +107,23 @@ export const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
     if (!subscriptionManager) {
       throw new Meteor.Error('SubscriptionManager which is mandatory missing.');
     }
-    new SubscriptionServer({
-      subscriptionManager,
-    }, server);
     try {
+      // create http server for subscription
+      // const server = createServer(graphQLServer);
+      // Create WebSocket listener server
+      const server = createServer((request, response) => {
+        response.writeHead(404);
+        response.end();
+      });
       server.listen(config.subscriptionPort, () => {
         console.log('Subscription manager running ' + config.subscriptionPort);
       });
+      const subscriptionServer = new SubscriptionServer({
+        subscriptionManager,
+      }, {
+          server,
+          path: '/'
+        });
     } catch (e) {
       console.log(e);
     }

main-server.js

@@ -20,13 +20,6 @@
   "homepage": "https://github.com/apollostack/meteor-integration#readme",
   "dependencies": {
     "apollo-client": "^0.8.4",
-    "babel": "^6.5.2",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^7.1.1",
-    "babel-plugin-add-module-exports": "^0.2.1",
-    "babel-preset-es2015": "^6.22.0",
-    "babel-preset-stage-2": "^6.22.0",
-    "body-parser": "^1.15.2",
     "express": "^4.14.0",
     "graphql": "^0.9.1",
     "graphql-server-express": "^0.6.0",

package.json

@@ -38,15 +38,15 @@ const personResult = {
   },
 };
 
-describe('Network interface', function() {
+describe('Network interface without subscription enabled', function() {
 
   it('should create a network interface', function() {
-    assert.ok(createMeteorNetworkInterface({batchingInterface: false}));
+    assert.ok(createMeteorNetworkInterface({batchingInterface: false, useSubscription: false}));
   });
 
 });
 
-describe('Batching network interface', function() {
+describe('Batching network interface without subscription enabled', function() {
 
   // from apollo-client/src/transport/networkInterface
   const printRequest = request => ({...request, query: print(request.query)});
@@ -60,6 +60,7 @@ describe('Batching network interface', function() {
   }) => {
     const batchedNetworkInterface = createMeteorNetworkInterface({
       batchingInterface: true,
+      useSubscription: false,
       opts
     });
 

tests/client.js

@@ -34,10 +34,10 @@ describe('Graphql Server', function() {
 
   const schema = makeExecutableSchema({ typeDefs, resolvers, });
 
-  it('should create an express graphql server accepting a test query', async function() {
+  it('should create an express graphql server accepting a test query (without subscription enabled)', async function() {
 
     // instantiate the apollo server
-    const apolloServer = createApolloServer({ schema, });
+    const apolloServer = createApolloServer({ schema,}, { useSubscription: false});
 
     // send a query to the server
     const { data: queryResult } = await HTTP.post(Meteor.absoluteUrl('/graphql'), {