COMPARR-4315: refactoring and srvHost (#295)

* refactor: user driver's srvHost

* build: bump versions of dependencies

Author: alenakhineika

.eslintrc

@@ -7,5 +7,15 @@
     "ecmaVersion": 2018,
     "sourceType": "module"
   },
-  "extends": ["mongodb-js/node"]
+  "extends": ["mongodb-js/node"],
+  "rules": {
+    "space-before-function-paren": [
+      "error",
+      {
+        "anonymous": "always",
+        "named": "never",
+        "asyncArrow": "never"
+      }
+    ]
+  }
 }

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,8 +1,9 @@
 ---
 name: Bug Report
 about: Create a report to help us improve
-title: Bug Report: 
+title: Bug Report
 ---
+
 <!--- Please note this repository's Issue Tracker is not being watched.
 Issues are instead being tracked in our public Jira project:
 https://jira.mongodb.org/projects/COMPASS/summary
@@ -12,25 +13,31 @@ https://jira.mongodb.org/projects/COMPASS/summary
 ## Bug Report
 
 #### Current Behavior
+
 <!--- A clear and concise description of the behavior -->
 
 #### Code/Gist
+
 <!--- Any code, gist links, or repo links you have available that would be helpful for debugging -->
 
+#### Expected Behavior/Code
 
-#### Expected behavior/code
 <!--- A clear and concise description of what you expected to happen (or code). -->
 
 #### Environment
+
 <!--
 - node.js / npm versions: [e.g. node v10.3.0 / npm 6.7.1]
 - OS: [e.g. OSX 10.13.4, Windows 10]
 -->
+
 - node.js / npm versions:
-- OS: 
+- OS:
 
 #### Possible Solution
+
 <!--- Only if you have suggestions on a fix for the bug -->
 
-#### Additional context/Screenshots
-<!--- Add any other context about the problem here. If applicable, add screenshots to help explain. -->>
+#### Additional Context/Screenshots
+
+<!--- Add any other context about the problem here. If applicable, add screenshots to help explain. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,7 +1,7 @@
 ---
 name: Feature Request
 about: Suggest an idea for this project
-title: Feature Request: 
+title: Feature Request
 ---
 
 <!--- Please note this repository's Issue Tracker is not being watched.
@@ -14,10 +14,13 @@ https://jira.mongodb.org/projects/COMPASS/summary
 ## Feature Request
 
 ## Detailed Description
+
 <!--- Provide a detailed description of the change or addition you are proposing -->
 
 ## Context
+
 <!--- Why is this change important to you? How would you use it? -->
 
 ## Possible Implementation
-<!--- Optional: suggest an idea for implementing addition or change -->>
+
+<!--- Optional: suggest an idea for implementing addition or change -->

.github/ISSUE_TEMPLATE/question.md

@@ -1,12 +1,15 @@
 ---
-name: Bug Report
+name: Question
 about: Create a report to help us improve
-title: Question:
+title: Question
 ---
+
 <!--- Provide a general summary of the issue in the Title above -->
 
 ## Question
+
 <!--- Provide your detailed question here -->
 
 ## Additional context
+
 <!--- Optional: supply any additional context on what you are trying to do -->

.vscode/settings.json

@@ -0,0 +1,9 @@
+{
+  "editor.formatOnSave": true,
+  "editor.tabSize": 2,
+  "editor.insertSpaces": true,
+  "files.trimTrailingWhitespace": true,
+  "files.insertFinalNewline": true,
+  "prettier.singleQuote": true,
+  "prettier.arrowParens": "always"
+}

lib/connect.js

@@ -16,7 +16,7 @@ const createSSHTunnel = require('./ssh-tunnel');
 
 const debug = require('debug')('mongodb-connection-model:connect');
 
-const needToLoadSSLFiles = model =>
+const needToLoadSSLFiles = (model) =>
   !includes(['NONE', 'UNVALIDATED'], model.sslType);
 
 const loadOptions = (model, done) => {
@@ -29,17 +29,17 @@ const loadOptions = (model, done) => {
   const tasks = {};
   const opts = clone(model.driverOptions, true);
 
-  Object.keys(opts).map(key => {
+  Object.keys(opts).map((key) => {
     if (key.indexOf('ssl') === -1) {
       return;
     }
 
     if (Array.isArray(opts[key])) {
-      opts[key].forEach(value => {
+      opts[key].forEach((value) => {
         if (typeof value === 'string') {
-          tasks[key] = cb =>
+          tasks[key] = (cb) =>
             async.parallel(
-              opts[key].map(k => fs.readFile.bind(null, k)),
+              opts[key].map((k) => fs.readFile.bind(null, k)),
               cb
             );
         }
@@ -62,7 +62,7 @@ const loadOptions = (model, done) => {
       return done(err);
     }
 
-    Object.keys(res).map(key => {
+    Object.keys(res).map((key) => {
       opts[key] = res[key];
     });
 
@@ -92,7 +92,7 @@ const validateURL = (model, done) => {
   });
 };
 
-const getStatusStateString = evt => {
+const getStatusStateString = (evt) => {
   if (!evt) {
     return 'UNKNOWN';
   }
@@ -147,7 +147,7 @@ const getTasks = (model, setupListeners) => {
       }
     };
 
-    ctx.skip = reason => {
+    ctx.skip = (reason) => {
       state.emit('status', { message, skipped: true, reason });
 
       if (cb) {
@@ -169,7 +169,7 @@ const getTasks = (model, setupListeners) => {
    * TODO (imlucas) dns.lookup() model.hostname and model.sshTunnelHostname to check for typos
    */
   assign(tasks, {
-    'Load SSL files': cb => {
+    'Load SSL files': (cb) => {
       const ctx = status('Load SSL files', cb);
 
       if (!needToLoadSSLFiles(model)) {
@@ -183,7 +183,7 @@ const getTasks = (model, setupListeners) => {
   });
 
   assign(tasks, {
-    'Create SSH Tunnel': cb => {
+    'Create SSH Tunnel': (cb) => {
       const ctx = status('Create SSH Tunnel', cb);
 
       if (model.sshTunnel === 'NONE') {
@@ -195,7 +195,7 @@ const getTasks = (model, setupListeners) => {
   });
 
   assign(tasks, {
-    'Connect to MongoDB': cb => {
+    'Connect to MongoDB': (cb) => {
       const ctx = status('Connect to MongoDB');
 
       // @note: Durran:
@@ -285,7 +285,7 @@ const connect = (model, setupListeners, done) => {
   }
 
   if (!isFunction(done)) {
-    done = err => {
+    done = (err) => {
       if (err) {
         throw err;
       }
@@ -297,13 +297,13 @@ const connect = (model, setupListeners, done) => {
     'mongodb-connection-model:connect:status'
   );
 
-  tasks.state.on('status', evt => {
+  tasks.state.on('status', (evt) => {
     logTaskStatus('%s [%s]', evt.message, getStatusStateString(evt));
   });
 
   logTaskStatus('Connecting...');
 
-  async.series(tasks, err => {
+  async.series(tasks, (err) => {
     if (err) {
       logTaskStatus('Error connecting:', err);
 

lib/connection-collection.js

@@ -15,7 +15,9 @@ try {
   const electron = require('electron');
 
   appName = electron.remote ? electron.remote.app.getName() : undefined;
-  basepath = electron.remote ? electron.remote.app.getPath('userData') : undefined;
+  basepath = electron.remote
+    ? electron.remote.app.getPath('userData')
+    : undefined;
 } catch (e) {
   /* eslint no-console: 0 */
   console.log('Could not load electron', e.message);
@@ -40,15 +42,15 @@ module.exports = Collection.extend(storageMixin, {
   indexes: ['name'],
   maxLength: 10,
   _prune() {
-    const recentConnections = this.filter(model => !model.isFavorite);
+    const recentConnections = this.filter((model) => !model.isFavorite);
 
     if (recentConnections.length > this.maxLength) {
       // if there is no space anymore, remove the oldest recent connection first.
       const toRemove = this.remove(
         recentConnections.slice(0, recentConnections.length - this.maxLength)
       );
 
-      each(toRemove, model => model.destroy());
+      each(toRemove, (model) => model.destroy());
     }
   },
   add(models, options) {

lib/extended-model.js

@@ -13,7 +13,9 @@ try {
   const electron = require('electron');
 
   appName = electron.remote ? electron.remote.app.getName() : undefined;
-  basepath = electron.remote ? electron.remote.app.getPath('userData') : undefined;
+  basepath = electron.remote
+    ? electron.remote.app.getPath('userData')
+    : undefined;
 } catch (e) {
   /* eslint no-console: 0 */
   console.log('Could not load electron', e.message);
@@ -83,12 +85,13 @@ const ExtendedConnection = Connection.extend(storageMixin, {
  *
  * @returns {Function} callback
  */
-ExtendedConnection.from = (url, callback) => Connection.from(url, (error, c) => {
-  if (error) {
-    return callback(error);
-  }
+ExtendedConnection.from = (url, callback) =>
+  Connection.from(url, (error, c) => {
+    if (error) {
+      return callback(error);
+    }
 
-  callback(null, new ExtendedConnection(c.getAttributes({ props: true })));
-});
+    callback(null, new ExtendedConnection(c.getAttributes({ props: true })));
+  });
 
 module.exports = ExtendedConnection;

lib/local-port-generator.js

@@ -11,7 +11,10 @@
 module.exports = () => {
   const startPort = 29170;
   const endPort = 29899;
-  const randomPort = (Math.random() * (endPort - startPort + 1) + startPort).toString();
+  const randomPort = (
+    Math.random() * (endPort - startPort + 1) +
+    startPort
+  ).toString();
 
   return parseInt(randomPort, 10);
 };