From 342878f787720c0988c8f92261b46ed56ab4bf24 Mon Sep 17 00:00:00 2001
From: Jhen <developer@jhen.me>
Date: Tue, 19 Jul 2016 00:02:04 +0800
Subject: [PATCH] Split options to another file

---
 bin/getOptions.js | 12 ++++++++++++
 bin/server.js     | 17 ++++++-----------
 package.json      |  1 +
 3 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 bin/getOptions.js

diff --git a/bin/getOptions.js b/bin/getOptions.js
new file mode 100644
index 0000000..21e7e79
--- /dev/null
+++ b/bin/getOptions.js
@@ -0,0 +1,12 @@
+module.exports = function getOptions(argv) {
+  return {
+    host: argv.hostname || process.env.npm_package_remotedev_hostname || null,
+    port: Number(argv.port || process.env.npm_package_remotedev_port) || 8000,
+    protocol: argv.protocol || process.env.npm_package_remotedev_protocol || 'http',
+    protocolOptions: !(argv.protocol === 'https') ? null : {
+      key: argv.key || process.env.npm_package_remotedev_key || null,
+      cert: argv.cert || process.env.npm_package_remotedev_cert || null,
+      passphrase: argv.passphrase || process.env.npm_package_remotedev_passphrase || null
+    }
+  };
+}
diff --git a/bin/server.js b/bin/server.js
index cff255f..596c6e7 100644
--- a/bin/server.js
+++ b/bin/server.js
@@ -1,16 +1,11 @@
+var assign = require('object-assign');
+var getOptions = require('./getOptions');
+
 module.exports = function(argv) {
   var SocketCluster = require('socketcluster').SocketCluster;
-
-  return new SocketCluster({
-    host: argv.hostname || process.env.npm_package_remotedev_hostname || null,
-    port: Number(argv.port || process.env.npm_package_remotedev_port) || 8000,
+  var options = assign(getOptions(argv), {
     workerController: __dirname + '/worker.js',
-    allowClientPublish: false,
-    protocol: argv.protocol || process.env.npm_package_remotedev_protocol || 'http',
-    protocolOptions: !(argv.protocol === 'https') ? null : {
-      key: argv.key || process.env.npm_package_remotedev_key || null,
-      cert: argv.cert || process.env.npm_package_remotedev_cert || null,
-      passphrase: argv.passphrase || process.env.npm_package_remotedev_passphrase || null
-    }
+    allowClientPublish: false
   });
+  return new SocketCluster(options);
 };
diff --git a/package.json b/package.json
index be767ff..36d7fb5 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
     "ejs": "^2.4.1",
     "express": "^4.13.3",
     "minimist": "^1.2.0",
+    "object-assign": "^4.1.0",
     "socketcluster": "^4.3.1"
   }
 }