Accept options object or paths in mqtt.createSecureServer

Adam Rudd · Adam Rudd · commit 646cfbd3f744 · 2013-11-23T14:36:16.000+01:00
Note: calling this as 'string string function' is
now deprecated, include a warning in future and
update docs
diff --git a/lib/mqtt.js b/lib/mqtt.js
@@ -8,8 +8,8 @@ var net = require('net')
   , MqttSecureServer = require('./server').MqttSecureServer
   , MqttClient = require('./client')
   , MqttConnection = require('./connection')
-  , tls = require("tls")
-  , fs = require("fs");
+  , tls = require('tls')
+  , fs = require('fs');
 
 var defaultPort = 1883
   , defaultHost = 'localhost';
@@ -134,14 +134,26 @@ module.exports.createServer = function(listener) {
 /**
  * createSecureServer - create a tls secured MQTT server
  *
+ * @param {Object} opts - server options
+ * - OR
  * @param {String} keyPath - path to private key
  * @param {String} certPath - path to public cert
- * @param {Function} listener - called on new client conns
+ * @param {Function} [listener] - called on new client conns
  */
-
 module.exports.createSecureServer =
-function(keyPath, certPath, listener) {
-  return new MqttSecureServer(keyPath, certPath, listener);
+function (keyPath, certPath, listener) {
+  var opts = {};
+
+  // Deprecated style
+  if ('string' === typeof keyPath && 'string' === typeof certPath) {
+    // TODO: deprecation warning?
+    opts.key = fs.readFileSync(keyPath);
+    opts.cert = fs.readFileSync(certPath);
+  } else if ('object' === typeof keyPath) {
+    opts = keyPath;
+  }
+
+  return new MqttSecureServer(opts, listener);
 };
 
 /**
