Begin generalizing Aphlict server to prepare for clustering/sensible config file

Summary:
Ref T10697. Currently, `aphlict` takes a ton of command line flags to configure exactly one admin server and exactly one client server.

I want to replace this with a config file. Additionally, I plan to support:

  - arbitrary numbers of listening client ports;
  - arbitrary numbers of listening admin ports;
  - SSL on any port.

For now, just transform the arguments to look like they're a config file. In the future, I'll load from a config file instead.

This greater generality will allow you to do stuff like run separate HTTP and HTTPS admin ports if you really want. I don't think there's a ton of use for this, but it tends to make the code cleaner anyway and there may be some weird cross-datacneter cases for it. Certainly, we undershot with the initial design and lots of users want to terminate SSL in nginx and run only HTTP on this server.

(Some sort-of-plausible use cases are running separate HTTP and HTTPS client servers, if your Phabricator install supports both, or running multiple HTTPS servers with different certificates if you have a bizarre VPN.)

Test Plan: Started Aphlict, connected to it, sent myself test notifications, viewed status page, reviewed logfile.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T10697

Differential Revision: https://secure.phabricator.com/D15700

support/aphlict/server/aphlict_server.js

@@ -99,8 +99,29 @@ var ssl_config = {
 if (ssl_config.enabled) {
   ssl_config.key = fs.readFileSync(config['ssl-key']);
   ssl_config.cert = fs.readFileSync(config['ssl-cert']);
+} else {
+  ssl_config.key = null;
+  ssl_config.cert = null;
 }
 
+var servers = [];
+
+servers.push({
+  type: 'client',
+  port: config['client-port'],
+  listen: config['client-host'],
+  'ssl.key': ssl_config.key,
+  'ssl.certificate': ssl_config.cert
+});
+
+servers.push({
+  type: 'admin',
+  port: config['admin-port'],
+  listen: config['admin-host'],
+  'ssl.key': null,
+  'ssl.cert': null
+});
+
 // If we're just doing a configuration test, exit here before starting any
 // servers.
 if (config.test) {
@@ -109,27 +130,49 @@ if (config.test) {
   return;
 }
 
-var server;
+var aphlict_servers = [];
-if (ssl_config.enabled) {
+var aphlict_clients = [];
-  server = https.createServer({
+var aphlict_admins = [];
-    key: ssl_config.key,
+
-    cert: ssl_config.cert
+var ii;
-  }, function(req, res) {
+for (ii = 0; ii < servers.length; ii++) {
-    res.writeHead(501);
+  var server = servers[ii];
-    res.end('HTTP/501 Use Websockets\n');
+  var is_client = (server.type == 'client');
-  });
+
-} else {
+  var http_server;
-  server = http.createServer(function() {});
+  if (server['ssl.key']) {
+    var https_config = {
+      key: server['ssl.key'],
+      cert: server['ssl.cert']
+    };
+
+    http_server = https.createServer(https_config);
+  } else {
+    http_server = http.createServer();
+  }
+
+  var aphlict_server;
+  if (is_client) {
+    aphlict_server = new JX.AphlictClientServer(http_server);
+  } else {
+    aphlict_server = new JX.AphlictAdminServer(http_server);
+  }
+
+  aphlict_server.setLogger(debug);
+  aphlict_server.listen(server.port, server.listen);
+
+  aphlict_servers.push(aphlict_server);
+
+  if (is_client) {
+    aphlict_clients.push(aphlict_server);
+  } else {
+    aphlict_admins.push(aphlict_server);
+  }
 }
 
-var client_server = new JX.AphlictClientServer(server);
+for (ii = 0; ii < aphlict_admins.length; ii++) {
-var admin_server = new JX.AphlictAdminServer();
+  var admin_server = aphlict_admins[ii];
-
+  admin_server.setClientServers(aphlict_clients);
-client_server.setLogger(debug);
+}
-admin_server.setLogger(debug);
-admin_server.setClientServer(client_server);
-
-client_server.listen(config['client-port'], config['client-host']);
-admin_server.listen(config['admin-port'], config['admin-host']);
 
 debug.log('Started Server (PID %d)', process.pid);

support/aphlict/server/lib/AphlictAdminServer.js

@@ -9,15 +9,19 @@ var url = require('url');
 
 JX.install('AphlictAdminServer', {
 
-  construct: function() {
+  construct: function(server) {
-    this.setLogger(new JX.AphlictLog());
-
     this._startTime = new Date().getTime();
     this._messagesIn = 0;
     this._messagesOut = 0;
 
-    var handler = this._handler.bind(this);
+    server.on('request', JX.bind(this, this._onrequest));
-    this._server = http.createServer(handler);
+    this._server = server;
+    this._clientServers = [];
+  },
+
+  properties: {
+    clientServers: null,
+    logger: null,
   },
 
   members: {
@@ -26,15 +30,32 @@ JX.install('AphlictAdminServer', {
     _server: null,
     _startTime: null,
 
-    getListenerList: function(instance) {
+    getListenerLists: function(instance) {
-      return this.getClientServer().getListenerList(instance);
+      var clients = this.getClientServers();
+
+      var lists = [];
+      for (var ii = 0; ii < clients.length; ii++) {
+        lists.push(clients[ii].getListenerList(instance));
+      }
+      return lists;
+    },
+
+    log: function() {
+      var logger = this.getLogger();
+      if (!logger) {
+        return;
+      }
+
+      logger.log.apply(logger, arguments);
+
+      return this;
     },
 
     listen: function() {
       return this._server.listen.apply(this._server, arguments);
     },
 
-    _handler: function(request, response) {
+    _onrequest: function(request, response) {
       var self = this;
       var u = url.parse(request.url, true);
       var instance = u.query.instance || '/';
@@ -52,7 +73,7 @@ JX.install('AphlictAdminServer', {
             try {
               var msg = JSON.parse(body);
 
-              self.getLogger().log(
+              self.log(
                 'Received notification (' + instance + '): ' +
                 JSON.stringify(msg));
               ++self._messagesIn;
@@ -61,14 +82,14 @@ JX.install('AphlictAdminServer', {
                 self._transmit(instance, msg);
                 response.writeHead(200, {'Content-Type': 'text/plain'});
               } catch (err) {
-                self.getLogger().log(
+                self.log(
                   '<%s> Internal Server Error! %s',
                   request.socket.remoteAddress,
                   err);
                 response.writeHead(500, 'Internal Server Error');
               }
             } catch (err) {
-              self.getLogger().log(
+              self.log(
                 '<%s> Bad Request! %s',
                 request.socket.remoteAddress,
                 err);
@@ -82,61 +103,77 @@ JX.install('AphlictAdminServer', {
           response.end();
         }
       } else if (u.pathname == '/status/') {
-        var status = {
+        this._handleStatusRequest(request, response, instance);
-          'instance': instance,
-          'uptime': (new Date().getTime() - this._startTime),
-          'clients.active': this.getListenerList(instance)
-            .getActiveListenerCount(),
-          'clients.total': this.getListenerList(instance)
-            .getTotalListenerCount(),
-          'messages.in': this._messagesIn,
-          'messages.out': this._messagesOut,
-          'version': 7
-        };
-
-        response.writeHead(200, {'Content-Type': 'application/json'});
-        response.write(JSON.stringify(status));
-        response.end();
       } else {
         response.writeHead(404, 'Not Found');
         response.end();
       }
     },
 
+    _handleStatusRequest: function(request, response, instance) {
+      var active_count = 0;
+      var total_count = 0;
+
+      var lists = this.getListenerLists(instance);
+      for (var ii = 0; ii < lists.length; ii++) {
+        var list = lists[ii];
+        active_count += list.getActiveListenerCount();
+        total_count += list.getTotalListenerCount();
+      }
+
+      var server_status = {
+        'instance': instance,
+        'uptime': (new Date().getTime() - this._startTime),
+        'clients.active': active_count,
+        'clients.total': total_count,
+        'messages.in': this._messagesIn,
+        'messages.out': this._messagesOut,
+        'version': 7
+      };
+
+      response.writeHead(200, {'Content-Type': 'application/json'});
+      response.write(JSON.stringify(server_status));
+      response.end();
+    },
+
     /**
      * Transmits a message to all subscribed listeners.
      */
     _transmit: function(instance, message) {
-      var listeners = this.getListenerList(instance)
+      var lists = this.getListenerLists(instance);
-        .getListeners()
-        .filter(function(client) {
-          return client.isSubscribedToAny(message.subscribers);
-        });
 
-      for (var i = 0; i < listeners.length; i++) {
+      for (var ii = 0; ii < lists.length; ii++) {
-        var listener = listeners[i];
+        var list = lists[ii];
+        var listeners = list.getListeners();
+        this._transmitToListeners(list, listeners, message);
+      }
+    },
+
+    _transmitToListeners: function(list, listeners, message) {
+      for (var ii = 0; ii < listeners.length; ii++) {
+        var listener = listeners[ii];
+
+        if (!listener.isSubscribedToAny(message.subscribers)) {
+          continue;
+        }
 
         try {
           listener.writeMessage(message);
 
           ++this._messagesOut;
-          this.getLogger().log(
+          this.log(
             '<%s> Wrote Message',
             listener.getDescription());
         } catch (error) {
-          this.getListenerList(instance).removeListener(listener);
+          list.removeListener(listener);
-          this.getLogger().log(
+
+          this.log(
             '<%s> Write Error: %s',
             listener.getDescription(),
             error);
         }
       }
-    },
+    }
-  },
-
-  properties: {
-    clientServer: null,
-    logger: null,
   }
 
 });

support/aphlict/server/lib/AphlictClientServer.js

@@ -12,11 +12,16 @@ var WebSocket = require('ws');
 JX.install('AphlictClientServer', {
 
   construct: function(server) {
-    this.setLogger(new JX.AphlictLog());
+    server.on('request', JX.bind(this, this._onrequest));
+
     this._server = server;
     this._lists = {};
   },
 
+  properties: {
+    logger: null,
+  },
+
   members: {
     _server: null,
     _lists: null,
@@ -28,6 +33,25 @@ JX.install('AphlictClientServer', {
       return this._lists[path];
     },
 
+    log: function() {
+      var logger = this.getLogger();
+      if (!logger) {
+        return;
+      }
+
+      logger.log.apply(logger, arguments);
+
+      return this;
+    },
+
+    _onrequest: function(request, response) {
+      // The websocket code upgrades connections before they get here, so
+      // this only handles normal HTTP connections. We just fail them with
+      // a 501 response.
+      response.writeHead(501);
+      response.end('HTTP/501 Use Websockets\n');
+    },
+
     listen: function() {
       var self = this;
       var server = this._server.listen.apply(this._server, arguments);
@@ -38,7 +62,7 @@ JX.install('AphlictClientServer', {
         var listener = self.getListenerList(path).addListener(ws);
 
         function log() {
-          self.getLogger().log(
+          self.log(
             util.format('<%s>', listener.getDescription()) +
             ' ' +
             util.format.apply(null, arguments));
@@ -97,10 +121,6 @@ JX.install('AphlictClientServer', {
 
     },
 
-  },
-
-  properties: {
-    logger: null,
   }
 
 });