WIP: Push scaling

spec/PushController.spec.js

@@ -179,7 +179,7 @@ describe('PushController', () => {
     isMaster: true
    }
 
-   var pushController = new PushController(pushAdapter, Parse.applicationId, defaultConfiguration.push);
+   var pushController = new PushController();
    reconfigureServer({
      push: { adapter: pushAdapter }
    }).then(() => {
@@ -231,7 +231,7 @@ describe('PushController', () => {
     isMaster: true
    }
 
-   var pushController = new PushController(pushAdapter, Parse.applicationId, defaultConfiguration.push);
+   var pushController = new PushController();
    reconfigureServer({
      push: { adapter: pushAdapter }
    }).then(() => {
@@ -285,7 +285,7 @@ describe('PushController', () => {
    var auth = {
     isMaster: true
    }
-   var pushController = new PushController(pushAdapter, Parse.applicationId, defaultConfiguration.push);
+   var pushController = new PushController();
    reconfigureServer({
      push: { adapter: pushAdapter }
    }).then(() => {
@@ -356,7 +356,7 @@ describe('PushController', () => {
    var auth = {
     isMaster: true
    }
-   var pushController = new PushController(pushAdapter, Parse.applicationId, defaultConfiguration.push);
+   var pushController = new PushController();
    reconfigureServer({
      push: { adapter: pushAdapter }
    }).then(() => {
@@ -406,7 +406,7 @@ describe('PushController', () => {
      }
    }
 
-   var pushController = new PushController(pushAdapter, Parse.applicationId, defaultConfiguration.push);
+   var pushController = new PushController();
    reconfigureServer({
      push: { adapter: pushAdapter }
    }).then(() => {
@@ -451,7 +451,7 @@ describe('PushController', () => {
      }
    }
 
-   var pushController = new PushController(pushAdapter, Parse.applicationId, defaultConfiguration.push);
+   var pushController = new PushController();
    reconfigureServer({
      push: { adapter: pushAdapter }
    }).then(() => {

src/Config.js

@@ -60,6 +60,7 @@ export class Config {
     this.pushController = cacheInfo.pushController;
     this.pushControllerQueue = cacheInfo.pushControllerQueue;
     this.pushWorker = cacheInfo.pushWorker;
+    this.hasPushSupport = cacheInfo.hasPushSupport;
     this.loggerController = cacheInfo.loggerController;
     this.userController = cacheInfo.userController;
     this.authDataManager = cacheInfo.authDataManager;

src/Controllers/PushController.js

@@ -11,22 +11,10 @@ import { pushStatusHandler }  from '../StatusHandler';
 import { isPushIncrementing,
          validatePushType } from '../Push/utils';
 
-export class PushController extends AdaptableController {
-  constructor(adapter, appId, options) {
-    super(adapter, appId, options);
-  }
-
-  get pushIsAvailable() {
-    return !!this.adapter;
-  }
+export class PushController {
 
   sendPush(body = {}, where = {}, config, auth, onPushStatusSaved = () => {}) {
-    var pushAdapter = this.adapter;
-    if (!this.pushIsAvailable) {
-      throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
-                            'Push adapter is not available');
-    }
-    if (!this.options) {
+    if (!config.hasPushSupport) {
       throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED,
                             'Missing push configuration');
     }
@@ -102,10 +90,6 @@ export class PushController extends AdaptableController {
     }
     return expirationTime.valueOf();
   }
-
-  expectedAdapterType() {
-    return PushAdapter;
-  }
 }
 
 export default PushController;

src/ParseServer.js

@@ -171,15 +171,17 @@ class ParseServer {
 
     const pushQueueOptions = (push || {}).queueOptions || {};
 
-    if (push.queueOptions) {
+    if ((push || {}).queueOptions) {
       delete push.queueOptions;
     }
     // Pass the push options too as it works with the default
-    const pushControllerAdapter = loadAdapter(push && push.adapter, ParsePushAdapter, push || {});
+    const pushAdapter = loadAdapter(push && push.adapter, ParsePushAdapter, push || {});
     // We pass the options and the base class for the adatper,
     // Note that passing an instance would work too
-    const pushController = new PushController(pushControllerAdapter, appId, push);
+    const pushController = new PushController();
 
+    const hasPushSupport = pushAdapter && push;
+
     const {
       batchSize,
       channel,
@@ -190,7 +192,7 @@ class ParseServer {
     const pushControllerQueue = new PushQueue(pushQueueOptions);    
     let pushWorker;
     if (!disablePushWorker) {
-      pushWorker = new PushWorker(pushControllerAdapter, pushQueueOptions);
+      pushWorker = new PushWorker(pushAdapter, pushQueueOptions);
     }
 
     const emailControllerAdapter = loadAdapter(emailAdapter);
@@ -247,7 +249,8 @@ class ParseServer {
       schemaCacheTTL,
       enableSingleSchemaCache,
       pushWorker,
-      pushControllerQueue
+      pushControllerQueue,
+      hasPushSupport
     });
 
     // To maintain compatibility. TODO: Remove in some version that breaks backwards compatability

src/Routers/FeaturesRouter.js

@@ -29,9 +29,9 @@ export class FeaturesRouter extends PromiseRouter {
           from: true,
         },
         push: {
-          immediatePush: req.config.pushController.pushIsAvailable,
+          immediatePush: req.config.hasPushSupport,
           scheduledPush: false,
-          storedPushData: req.config.pushController.pushIsAvailable,
+          storedPushData: req.config.hasPushSupport,
           pushAudiences: false,
         },
         schemas: {