tedious 6.4.0 → 6.6.2

package/lib/connection.js

@@ -1,67 +1,64 @@
 "use strict";
 
-const crypto = require('crypto');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
 
-const os = require('os'); // $FlowFixMe
+var _crypto = _interopRequireDefault(require("crypto"));
 
+var _os = _interopRequireDefault(require("os"));
 
-const constants = require('constants');
+var _constants = _interopRequireDefault(require("constants"));
 
-const _require = require('tls'),
-      createSecureContext = _require.createSecureContext;
+var _tls = require("tls");
 
-const _require2 = require('@azure/ms-rest-nodeauth'),
-      loginWithUsernamePassword = _require2.loginWithUsernamePassword,
-      loginWithVmMSI = _require2.loginWithVmMSI,
-      loginWithAppServiceMSI = _require2.loginWithAppServiceMSI;
+var _msRestNodeauth = require("@azure/ms-rest-nodeauth");
 
-const BulkLoad = require('./bulk-load');
+var _bulkLoad = _interopRequireDefault(require("./bulk-load"));
 
-const Debug = require('./debug');
+var _debug = _interopRequireDefault(require("./debug"));
 
-const EventEmitter = require('events').EventEmitter;
+var _events = require("events");
 
-const InstanceLookup = require('./instance-lookup').InstanceLookup;
+var _instanceLookup = require("./instance-lookup");
 
-const TransientErrorLookup = require('./transient-error-lookup.js').TransientErrorLookup;
+var _transientErrorLookup = require("./transient-error-lookup");
 
-const TYPE = require('./packet').TYPE;
+var _packet = require("./packet");
 
-const PreloginPayload = require('./prelogin-payload');
+var _preloginPayload = _interopRequireDefault(require("./prelogin-payload"));
 
-const Login7Payload = require('./login7-payload');
+var _login7Payload = _interopRequireDefault(require("./login7-payload"));
 
-const NTLMResponsePayload = require('./ntlm-payload');
+var _ntlmPayload = _interopRequireDefault(require("./ntlm-payload"));
 
-const Request = require('./request');
+var _request = _interopRequireDefault(require("./request"));
 
-const RpcRequestPayload = require('./rpcrequest-payload');
+var _rpcrequestPayload = _interopRequireDefault(require("./rpcrequest-payload"));
 
-const SqlBatchPayload = require('./sqlbatch-payload');
+var _sqlbatchPayload = _interopRequireDefault(require("./sqlbatch-payload"));
 
-const MessageIO = require('./message-io');
+var _messageIo = _interopRequireDefault(require("./message-io"));
 
-const TokenStreamParser = require('./token/token-stream-parser').Parser;
+var _tokenStreamParser = require("./token/token-stream-parser");
 
-const Transaction = require('./transaction').Transaction;
+var _transaction = require("./transaction");
 
-const ISOLATION_LEVEL = require('./transaction').ISOLATION_LEVEL;
+var _errors = require("./errors");
 
-const ConnectionError = require('./errors').ConnectionError;
+var _connector = require("./connector");
 
-const RequestError = require('./errors').RequestError;
+var _library = require("./library");
 
-const Connector = require('./connector').Connector;
+var _tdsVersions = require("./tds-versions");
 
-const libraryName = require('./library').name;
+var _ntlm = require("./ntlm");
 
-const versions = require('./tds-versions').versions;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const _require3 = require('./ntlm'),
-      createNTLMRequest = _require3.createNTLMRequest; // A rather basic state machine for managing a connection.
+// A rather basic state machine for managing a connection.
 // Implements something approximating s3.2.1.
-
-
 const KEEP_ALIVE_INITIAL_DELAY = 30 * 1000;
 const DEFAULT_CONNECT_TIMEOUT = 15 * 1000;
 const DEFAULT_CLIENT_REQUEST_TIMEOUT = 15 * 1000;
@@ -74,8 +71,13 @@ const DEFAULT_PORT = 1433;
 const DEFAULT_TDS_VERSION = '7_4';
 const DEFAULT_LANGUAGE = 'us_english';
 const DEFAULT_DATEFORMAT = 'mdy';
+const CLEANUP_TYPE = {
+  NORMAL: 0,
+  REDIRECT: 1,
+  RETRY: 2
+};
 
-class Connection extends EventEmitter {
+class Connection extends _events.EventEmitter {
   constructor(config) {
     super();
 
@@ -103,8 +105,8 @@ class Connection extends EventEmitter {
         throw new TypeError('The "config.authentication.type" property must be of type string.');
       }
 
-      if (type !== 'default' && type !== 'ntlm' && type !== 'azure-active-directory-password' && type !== 'azure-active-directory-access-token' && type !== 'azure-active-directory-msi-vm' && type !== 'azure-active-directory-msi-app-service') {
-        throw new TypeError('The "type" property must one of "default", "ntlm", "azure-active-directory-password", "azure-active-directory-access-token", "azure-active-directory-msi-vm" or "azure-active-directory-msi-app-service".');
+      if (type !== 'default' && type !== 'ntlm' && type !== 'azure-active-directory-password' && type !== 'azure-active-directory-access-token' && type !== 'azure-active-directory-msi-vm' && type !== 'azure-active-directory-msi-app-service' && type !== 'azure-active-directory-service-principal-secret') {
+        throw new TypeError('The "type" property must one of "default", "ntlm", "azure-active-directory-password", "azure-active-directory-access-token", "azure-active-directory-msi-vm" or "azure-active-directory-msi-app-service" or "azure-active-directory-service-principal-secret".');
       }
 
       if (typeof options !== 'object' || options === null) {
@@ -196,6 +198,27 @@ class Connection extends EventEmitter {
             msiSecret: options.msiSecret
           }
         };
+      } else if (type === 'azure-active-directory-service-principal-secret') {
+        if (typeof options.clientId !== 'string') {
+          throw new TypeError('The "config.authentication.options.clientId" property must be of type string.');
+        }
+
+        if (typeof options.clientSecret !== 'string') {
+          throw new TypeError('The "config.authentication.options.clientSecret" property must be of type string.');
+        }
+
+        if (typeof options.tenantId !== 'string') {
+          throw new TypeError('The "config.authentication.options.tenantId" property must be of type string.');
+        }
+
+        authentication = {
+          type: 'azure-active-directory-service-principal-secret',
+          options: {
+            clientId: options.clientId,
+            clientSecret: options.clientSecret,
+            tenantId: options.tenantId
+          }
+        };
       } else {
         if (options.userName !== undefined && typeof options.userName !== 'string') {
           throw new TypeError('The "config.authentication.options.userName" property must be of type string.');
@@ -234,7 +257,7 @@ class Connection extends EventEmitter {
         columnNameReplacer: undefined,
         connectionRetryInterval: DEFAULT_CONNECT_RETRY_INTERVAL,
         connectTimeout: DEFAULT_CONNECT_TIMEOUT,
-        connectionIsolationLevel: ISOLATION_LEVEL.READ_COMMITTED,
+        connectionIsolationLevel: _transaction.ISOLATION_LEVEL.READ_COMMITTED,
         cryptoCredentialsDetails: {},
         database: undefined,
         datefirst: DEFAULT_DATEFIRST,
@@ -258,7 +281,7 @@ class Connection extends EventEmitter {
         encrypt: false,
         fallbackToDefaultDb: false,
         instanceName: undefined,
-        isolationLevel: ISOLATION_LEVEL.READ_COMMITTED,
+        isolationLevel: _transaction.ISOLATION_LEVEL.READ_COMMITTED,
         language: DEFAULT_LANGUAGE,
         localAddress: undefined,
         maxRetriesOnTransientErrors: 3,
@@ -688,35 +711,30 @@ class Connection extends EventEmitter {
       // As BEAST is a browser specific exploit, we can just disable this option here.
       credentialsDetails = Object.create(credentialsDetails, {
         secureOptions: {
-          value: constants.SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
+          value: _constants.default.SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
         }
       });
     }
 
-    this.secureContext = createSecureContext(credentialsDetails);
-    this.createDebug();
-    this.createTokenStreamParser();
+    this.secureContext = (0, _tls.createSecureContext)(credentialsDetails);
+    this.debug = this.createDebug();
+    this.tokenStreamParser = this.createTokenStreamParser();
     this.inTransaction = false;
-    this.transactionDescriptors = [Buffer.from([0, 0, 0, 0, 0, 0, 0, 0])];
-    this.transitionTo(this.STATE.CONNECTING);
-
-    if (this.config.options.tdsVersion < '7_2') {
-      // 'beginTransaction', 'commitTransaction' and 'rollbackTransaction'
-      // events are utilized to maintain inTransaction property state which in
-      // turn is used in managing transactions. These events are only fired for
-      // TDS version 7.2 and beyond. The properties below are used to emulate
-      // equivalent behavior for TDS versions before 7.2.
-      this.transactionDepth = 0;
-      this.isSqlBatch = false;
-    }
-
+    this.transactionDescriptors = [Buffer.from([0, 0, 0, 0, 0, 0, 0, 0])]; // 'beginTransaction', 'commitTransaction' and 'rollbackTransaction'
+    // events are utilized to maintain inTransaction property state which in
+    // turn is used in managing transactions. These events are only fired for
+    // TDS version 7.2 and beyond. The properties below are used to emulate
+    // equivalent behavior for TDS versions before 7.2.
+
+    this.transactionDepth = 0;
+    this.isSqlBatch = false;
+    this.closed = false;
+    this.loggedIn = false;
+    this.messageBuffer = Buffer.alloc(0);
     this.curTransientRetryCount = 0;
-    this.transientErrorLookup = new TransientErrorLookup();
-    this.cleanupTypeEnum = {
-      NORMAL: 0,
-      REDIRECT: 1,
-      RETRY: 2
-    };
+    this.transientErrorLookup = new _transientErrorLookup.TransientErrorLookup();
+    this.state = this.STATE.CONNECTING;
+    this.state.enter.call(this);
   }
 
   close() {
@@ -728,16 +746,16 @@ class Connection extends EventEmitter {
     this.createConnectTimer();
   }
 
-  cleanupConnection(cleanupTypeEnum) {
+  cleanupConnection(cleanupType) {
     if (!this.closed) {
       this.clearConnectTimer();
       this.clearRequestTimer();
       this.clearRetryTimer();
       this.closeConnection();
 
-      if (cleanupTypeEnum === this.cleanupTypeEnum.REDIRECT) {
+      if (cleanupType === CLEANUP_TYPE.REDIRECT) {
         this.emit('rerouting');
-      } else if (cleanupTypeEnum !== this.cleanupTypeEnum.RETRY) {
+      } else if (cleanupType !== CLEANUP_TYPE.RETRY) {
         process.nextTick(() => {
           this.emit('end');
         });
@@ -746,7 +764,7 @@ class Connection extends EventEmitter {
       const request = this.request;
 
       if (request) {
-        const err = RequestError('Connection closed before request completed.', 'ECLOSE');
+        const err = (0, _errors.RequestError)('Connection closed before request completed.', 'ECLOSE');
         request.callback(err);
         this.request = undefined;
       }
@@ -758,18 +776,19 @@ class Connection extends EventEmitter {
   }
 
   createDebug() {
-    this.debug = new Debug(this.config.options.debug);
-    this.debug.on('debug', message => {
+    const debug = new _debug.default(this.config.options.debug);
+    debug.on('debug', message => {
       this.emit('debug', message);
     });
+    return debug;
   }
 
   createTokenStreamParser() {
-    this.tokenStreamParser = new TokenStreamParser(this.debug, undefined, this.config.options);
-    this.tokenStreamParser.on('infoMessage', token => {
+    const tokenStreamParser = new _tokenStreamParser.Parser(this.debug, undefined, this.config.options);
+    tokenStreamParser.on('infoMessage', token => {
       this.emit('infoMessage', token);
     });
-    this.tokenStreamParser.on('sspichallenge', token => {
+    tokenStreamParser.on('sspichallenge', token => {
       if (token.ntlmpacket) {
         this.ntlmpacket = token.ntlmpacket;
         this.ntlmpacketBuffer = token.ntlmpacketBuffer;
@@ -777,7 +796,7 @@ class Connection extends EventEmitter {
 
       this.emit('sspichallenge', token);
     });
-    this.tokenStreamParser.on('errorMessage', token => {
+    tokenStreamParser.on('errorMessage', token => {
       this.emit('errorMessage', token);
 
       if (this.loggedIn) {
@@ -785,7 +804,7 @@ class Connection extends EventEmitter {
 
         if (request) {
           if (!request.canceled) {
-            const error = new RequestError(token.message, 'EREQUEST');
+            const error = new _errors.RequestError(token.message, 'EREQUEST');
             error.number = token.number;
             error.state = token.state;
             error.class = token.class;
@@ -796,7 +815,7 @@ class Connection extends EventEmitter {
           }
         }
       } else {
-        const error = ConnectionError(token.message, 'ELOGIN');
+        const error = (0, _errors.ConnectionError)(token.message, 'ELOGIN');
         const isLoginErrorTransient = this.transientErrorLookup.isTransientError(token.number);
 
         if (isLoginErrorTransient && this.curTransientRetryCount !== this.config.options.maxRetriesOnTransientErrors) {
@@ -806,32 +825,32 @@ class Connection extends EventEmitter {
         this.loginError = error;
       }
     });
-    this.tokenStreamParser.on('databaseChange', token => {
+    tokenStreamParser.on('databaseChange', token => {
       this.emit('databaseChange', token.newValue);
     });
-    this.tokenStreamParser.on('languageChange', token => {
+    tokenStreamParser.on('languageChange', token => {
       this.emit('languageChange', token.newValue);
     });
-    this.tokenStreamParser.on('charsetChange', token => {
+    tokenStreamParser.on('charsetChange', token => {
       this.emit('charsetChange', token.newValue);
     });
-    this.tokenStreamParser.on('fedAuthInfo', token => {
+    tokenStreamParser.on('fedAuthInfo', token => {
       this.dispatchEvent('fedAuthInfo', token);
     });
-    this.tokenStreamParser.on('featureExtAck', token => {
+    tokenStreamParser.on('featureExtAck', token => {
       this.dispatchEvent('featureExtAck', token);
     });
-    this.tokenStreamParser.on('loginack', token => {
+    tokenStreamParser.on('loginack', token => {
       if (!token.tdsVersion) {
         // unsupported TDS version
-        this.loginError = ConnectionError('Server responded with unknown TDS version.', 'ETDS');
+        this.loginError = (0, _errors.ConnectionError)('Server responded with unknown TDS version.', 'ETDS');
         this.loggedIn = false;
         return;
       }
 
       if (!token.interface) {
         // unsupported interface
-        this.loginError = ConnectionError('Server responded with unsupported interface.', 'EINTERFACENOTSUPP');
+        this.loginError = (0, _errors.ConnectionError)('Server responded with unsupported interface.', 'EINTERFACENOTSUPP');
         this.loggedIn = false;
         return;
       } // use negotiated version
@@ -840,43 +859,41 @@ class Connection extends EventEmitter {
       this.config.options.tdsVersion = token.tdsVersion;
       this.loggedIn = true;
     });
-    this.tokenStreamParser.on('routingChange', token => {
+    tokenStreamParser.on('routingChange', token => {
       this.routingData = token.newValue;
       this.dispatchEvent('routingChange');
     });
-    this.tokenStreamParser.on('packetSizeChange', token => {
+    tokenStreamParser.on('packetSizeChange', token => {
       this.messageIo.packetSize(token.newValue);
     }); // A new top-level transaction was started. This is not fired
     // for nested transactions.
 
-    this.tokenStreamParser.on('beginTransaction', token => {
+    tokenStreamParser.on('beginTransaction', token => {
       this.transactionDescriptors.push(token.newValue);
       this.inTransaction = true;
     }); // A top-level transaction was committed. This is not fired
     // for nested transactions.
 
-    this.tokenStreamParser.on('commitTransaction', () => {
+    tokenStreamParser.on('commitTransaction', () => {
       this.transactionDescriptors.length = 1;
       this.inTransaction = false;
     }); // A top-level transaction was rolled back. This is not fired
     // for nested transactions. This is also fired if a batch
     // aborting error happened that caused a rollback.
 
-    this.tokenStreamParser.on('rollbackTransaction', () => {
+    tokenStreamParser.on('rollbackTransaction', () => {
       this.transactionDescriptors.length = 1; // An outermost transaction was rolled back. Reset the transaction counter
 
       this.inTransaction = false;
       this.emit('rollbackTransaction');
     });
-    this.tokenStreamParser.on('columnMetadata', token => {
+    tokenStreamParser.on('columnMetadata', token => {
       const request = this.request;
 
       if (request) {
         if (!request.canceled) {
-          let columns;
-
           if (this.config.options.useColumnNames) {
-            columns = {};
+            const columns = {};
 
             for (let j = 0, len = token.columns.length; j < len; j++) {
               const col = token.columns[j];
@@ -885,18 +902,18 @@ class Connection extends EventEmitter {
                 columns[col.colName] = col;
               }
             }
+
+            request.emit('columnMetadata', columns);
           } else {
-            columns = token.columns;
+            request.emit('columnMetadata', token.columns);
           }
-
-          request.emit('columnMetadata', columns);
         }
       } else {
         this.emit('error', new Error("Received 'columnMetadata' when no sqlRequest is in progress"));
         this.close();
       }
     });
-    this.tokenStreamParser.on('order', token => {
+    tokenStreamParser.on('order', token => {
       const request = this.request;
 
       if (request) {
@@ -908,7 +925,7 @@ class Connection extends EventEmitter {
         this.close();
       }
     });
-    this.tokenStreamParser.on('row', token => {
+    tokenStreamParser.on('row', token => {
       const request = this.request;
 
       if (request) {
@@ -930,7 +947,7 @@ class Connection extends EventEmitter {
         this.close();
       }
     });
-    this.tokenStreamParser.on('returnStatus', token => {
+    tokenStreamParser.on('returnStatus', token => {
       const request = this.request;
 
       if (request) {
@@ -940,16 +957,16 @@ class Connection extends EventEmitter {
         }
       }
     });
-    this.tokenStreamParser.on('returnValue', token => {
+    tokenStreamParser.on('returnValue', token => {
       const request = this.request;
 
       if (request) {
         if (!request.canceled) {
-          this.request.emit('returnValue', token.paramName, token.value, token.metadata);
+          request.emit('returnValue', token.paramName, token.value, token.metadata);
         }
       }
     });
-    this.tokenStreamParser.on('doneProc', token => {
+    tokenStreamParser.on('doneProc', token => {
       const request = this.request;
 
       if (request) {
@@ -967,7 +984,7 @@ class Connection extends EventEmitter {
         }
       }
     });
-    this.tokenStreamParser.on('doneInProc', token => {
+    tokenStreamParser.on('doneInProc', token => {
       const request = this.request;
 
       if (request) {
@@ -984,7 +1001,7 @@ class Connection extends EventEmitter {
         }
       }
     });
-    this.tokenStreamParser.on('done', token => {
+    tokenStreamParser.on('done', token => {
       const request = this.request;
 
       if (request) {
@@ -997,12 +1014,12 @@ class Connection extends EventEmitter {
           // We assume this is the indication that an in-flight request was canceled.
           if (token.sqlError && !request.error) {
             this.clearCancelTimer();
-            request.error = RequestError('Canceled.', 'ECANCEL');
+            request.error = (0, _errors.RequestError)('Canceled.', 'ECANCEL');
           }
         } else {
           if (token.sqlError && !request.error) {
             // check if the DONE_ERROR flags was set, but an ERROR token was not sent.
-            request.error = RequestError('An unknown error has occurred.', 'UNKNOWN');
+            request.error = (0, _errors.RequestError)('An unknown error has occurred.', 'UNKNOWN');
           }
 
           request.emit('done', token.rowCount, token.more, request.rst);
@@ -1017,31 +1034,28 @@ class Connection extends EventEmitter {
         }
       }
     });
-    this.tokenStreamParser.on('endOfMessage', () => {
+    tokenStreamParser.on('endOfMessage', () => {
       // EOM pseudo token received
       if (this.state === this.STATE.SENT_CLIENT_REQUEST) {
         this.dispatchEvent('endOfMessageMarkerReceived');
       }
     });
-    this.tokenStreamParser.on('resetConnection', () => {
+    tokenStreamParser.on('resetConnection', () => {
       this.emit('resetConnection');
     });
-    this.tokenStreamParser.on('tokenStreamError', error => {
-      this.emit('error', error);
-      this.close();
-    });
-    this.tokenStreamParser.on('drain', () => {
+    tokenStreamParser.on('drain', () => {
       // Bridge the release of backpressure from the token stream parser
       // transform to the packet stream transform.
       this.messageIo.resume();
     });
+    return tokenStreamParser;
   }
 
   connect() {
     if (this.config.options.port) {
       return this.connectOnPort(this.config.options.port, this.config.options.multiSubnetFailover);
     } else {
-      return new InstanceLookup().instanceLookup({
+      return new _instanceLookup.InstanceLookup().instanceLookup({
         server: this.config.server,
         instanceName: this.config.options.instanceName,
         timeout: this.config.options.connectTimeout
@@ -1051,7 +1065,7 @@ class Connection extends EventEmitter {
         }
 
         if (message) {
-          this.emit('connect', ConnectionError(message, 'EINSTLOOKUP'));
+          this.emit('connect', (0, _errors.ConnectionError)(message, 'EINSTLOOKUP'));
         } else {
           this.connectOnPort(port, this.config.options.multiSubnetFailover);
         }
@@ -1065,7 +1079,7 @@ class Connection extends EventEmitter {
       port: this.routingData ? this.routingData.port : port,
       localAddress: this.config.options.localAddress
     };
-    new Connector(connectOpts, multiSubnetFailover).execute((err, socket) => {
+    new _connector.Connector(connectOpts, multiSubnetFailover).execute((err, socket) => {
       if (err) {
         return this.socketError(err);
       }
@@ -1075,17 +1089,17 @@ class Connection extends EventEmitter {
         return;
       }
 
-      this.socket = socket;
-      this.socket.on('error', error => {
+      socket.on('error', error => {
         this.socketError(error);
       });
-      this.socket.on('close', () => {
+      socket.on('close', () => {
         this.socketClose();
       });
-      this.socket.on('end', () => {
+      socket.on('end', () => {
         this.socketEnd();
       });
-      this.messageIo = new MessageIO(this.socket, this.config.options.packetSize, this.debug);
+      socket.setKeepAlive(true, KEEP_ALIVE_INITIAL_DELAY);
+      this.messageIo = new _messageIo.default(socket, this.config.options.packetSize, this.debug);
       this.messageIo.on('data', data => {
         this.dispatchEvent('data', data);
       });
@@ -1095,6 +1109,7 @@ class Connection extends EventEmitter {
       this.messageIo.on('secure', cleartext => {
         this.emit('secure', cleartext);
       });
+      this.socket = socket;
       this.socketConnect();
     });
   }
@@ -1145,7 +1160,7 @@ class Connection extends EventEmitter {
   connectTimeout() {
     const message = `Failed to connect to ${this.config.server}${this.config.options.port ? `:${this.config.options.port}` : `\\${this.config.options.instanceName}`} in ${this.config.options.connectTimeout}ms`;
     this.debug.log(message);
-    this.emit('connect', ConnectionError(message, 'ETIMEOUT'));
+    this.emit('connect', (0, _errors.ConnectionError)(message, 'ETIMEOUT'));
     this.connectTimer = undefined;
     this.dispatchEvent('connectTimeout');
   }
@@ -1153,7 +1168,7 @@ class Connection extends EventEmitter {
   cancelTimeout() {
     const message = `Failed to cancel request in ${this.config.options.cancelTimeout}ms`;
     this.debug.log(message);
-    this.dispatchEvent('socketError', ConnectionError(message, 'ETIMEOUT'));
+    this.dispatchEvent('socketError', (0, _errors.ConnectionError)(message, 'ETIMEOUT'));
   }
 
   requestTimeout() {
@@ -1162,7 +1177,7 @@ class Connection extends EventEmitter {
     request.cancel();
     const timeout = request.timeout !== undefined ? request.timeout : this.config.options.requestTimeout;
     const message = 'Timeout: Request failed to complete in ' + timeout + 'ms';
-    request.error = RequestError(message, 'ETIMEOUT');
+    request.error = (0, _errors.RequestError)(message, 'ETIMEOUT');
   }
 
   retryTimeout() {
@@ -1215,9 +1230,21 @@ class Connection extends EventEmitter {
     }
   }
 
+  getEventHandler(eventName) {
+    const handler = this.state.events[eventName];
+
+    if (!handler) {
+      throw new Error(`No event '${eventName}' in state '${this.state.name}'`);
+    }
+
+    return handler;
+  }
+
   dispatchEvent(eventName, ...args) {
-    if (this.state.events[eventName]) {
-      this.state.events[eventName].apply(this, args);
+    const handler = this.state.events[eventName];
+
+    if (handler) {
+      handler.apply(this, args);
     } else {
       this.emit('error', new Error(`No event '${eventName}' in state '${this.state.name}'`));
       this.close();
@@ -1228,18 +1255,17 @@ class Connection extends EventEmitter {
     if (this.state === this.STATE.CONNECTING || this.state === this.STATE.SENT_TLSSSLNEGOTIATION) {
       const message = `Failed to connect to ${this.config.server}:${this.config.options.port} - ${error.message}`;
       this.debug.log(message);
-      this.emit('connect', ConnectionError(message, 'ESOCKET'));
+      this.emit('connect', (0, _errors.ConnectionError)(message, 'ESOCKET'));
     } else {
       const message = `Connection lost - ${error.message}`;
       this.debug.log(message);
-      this.emit('error', ConnectionError(message, 'ESOCKET'));
+      this.emit('error', (0, _errors.ConnectionError)(message, 'ESOCKET'));
     }
 
     this.dispatchEvent('socketError', error);
   }
 
   socketConnect() {
-    this.socket.setKeepAlive(true, KEEP_ALIVE_INITIAL_DELAY);
     this.closed = false;
     this.debug.log('connected to ' + this.config.server + ':' + this.config.options.port);
     this.dispatchEvent('socketConnect');
@@ -1262,7 +1288,7 @@ class Connection extends EventEmitter {
       this.debug.log('Rerouting to ' + this.routingData.server + ':' + this.routingData.port);
       this.dispatchEvent('reconnect');
     } else if (this.state === this.STATE.TRANSIENT_FAILURE_RETRY) {
-      const server = this.routingData ? this.routingData.server : this.server;
+      const server = this.routingData ? this.routingData.server : this.config.server;
       const port = this.routingData ? this.routingData.port : this.config.options.port;
       this.debug.log('Retry after transient failure connecting to ' + server + ':' + port);
       this.dispatchEvent('retry');
@@ -1272,10 +1298,10 @@ class Connection extends EventEmitter {
   }
 
   sendPreLogin() {
-    const payload = new PreloginPayload({
+    const payload = new _preloginPayload.default({
       encrypt: this.config.options.encrypt
     });
-    this.messageIo.sendMessage(TYPE.PRELOGIN, payload.data);
+    this.messageIo.sendMessage(_packet.TYPE.PRELOGIN, payload.data);
     this.debug.payload(function () {
       return payload.toString('  ');
     });
@@ -1290,8 +1316,8 @@ class Connection extends EventEmitter {
   }
 
   sendLogin7Packet() {
-    const payload = new Login7Payload({
-      tdsVersion: versions[this.config.options.tdsVersion],
+    const payload = new _login7Payload.default({
+      tdsVersion: _tdsVersions.versions[this.config.options.tdsVersion],
       packetSize: this.config.options.packetSize,
       clientProgVer: 0,
       clientPid: process.pid,
@@ -1320,6 +1346,7 @@ class Connection extends EventEmitter {
 
       case 'azure-active-directory-msi-vm':
       case 'azure-active-directory-msi-app-service':
+      case 'azure-active-directory-service-principal-secret':
         payload.fedAuth = {
           type: 'ADAL',
           echo: this.fedAuthRequired,
@@ -1328,7 +1355,7 @@ class Connection extends EventEmitter {
         break;
 
       case 'ntlm':
-        payload.sspi = createNTLMRequest({
+        payload.sspi = (0, _ntlm.createNTLMRequest)({
           domain: authentication.options.domain
         });
         break;
@@ -1338,17 +1365,17 @@ class Connection extends EventEmitter {
         payload.password = authentication.options.password;
     }
 
-    payload.hostname = os.hostname();
+    payload.hostname = _os.default.hostname();
     payload.serverName = this.routingData ? this.routingData.server : this.config.server;
     payload.appName = this.config.options.appName || 'Tedious';
-    payload.libraryName = libraryName;
+    payload.libraryName = _library.name;
     payload.language = this.config.options.language;
     payload.database = this.config.options.database;
     payload.clientId = Buffer.from([1, 2, 3, 4, 5, 6]);
     payload.readOnlyIntent = this.config.options.readOnlyIntent;
     payload.initDbFatal = !this.config.options.fallbackToDefaultDb;
     this.routingData = undefined;
-    this.messageIo.sendMessage(TYPE.LOGIN7, payload.toBuffer());
+    this.messageIo.sendMessage(_packet.TYPE.LOGIN7, payload.toBuffer());
     this.debug.payload(function () {
       return payload.toString('  ');
     });
@@ -1361,7 +1388,7 @@ class Connection extends EventEmitter {
     offset = data.writeUInt32LE(accessTokenLen + 4, offset);
     offset = data.writeUInt32LE(accessTokenLen, offset);
     data.write(token, offset, 'ucs2');
-    this.messageIo.sendMessage(TYPE.FEDAUTH_TOKEN, data); // sent the fedAuth token message, the rest is similar to standard login 7
+    this.messageIo.sendMessage(_packet.TYPE.FEDAUTH_TOKEN, data); // sent the fedAuth token message, the rest is similar to standard login 7
 
     this.transitionTo(this.STATE.SENT_LOGIN7_WITH_STANDARD_LOGIN);
   } // Returns false to apply backpressure.
@@ -1394,9 +1421,9 @@ class Connection extends EventEmitter {
   }
 
   sendInitialSql() {
-    const payload = new SqlBatchPayload(this.getInitialSql(), this.currentTransactionDescriptor(), this.config.options);
+    const payload = new _sqlbatchPayload.default(this.getInitialSql(), this.currentTransactionDescriptor(), this.config.options);
     payload.getData(data => {
-      return this.messageIo.sendMessage(TYPE.SQL_BATCH, data);
+      return this.messageIo.sendMessage(_packet.TYPE.SQL_BATCH, data);
     });
   }
 
@@ -1498,7 +1525,7 @@ class Connection extends EventEmitter {
   }
 
   execSqlBatch(request) {
-    this.makeRequest(request, TYPE.SQL_BATCH, new SqlBatchPayload(request.sqlTextOrProcedure, this.currentTransactionDescriptor(), this.config.options));
+    this.makeRequest(request, _packet.TYPE.SQL_BATCH, new _sqlbatchPayload.default(request.sqlTextOrProcedure, this.currentTransactionDescriptor(), this.config.options));
   }
 
   execSql(request) {
@@ -1513,7 +1540,7 @@ class Connection extends EventEmitter {
       return;
     }
 
-    this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+    this.makeRequest(request, _packet.TYPE.RPC_REQUEST, new _rpcrequestPayload.default(request, this.currentTransactionDescriptor(), this.config.options));
   }
   /**
    @function newBulkLoad
@@ -1524,25 +1551,29 @@ class Connection extends EventEmitter {
    @param {boolean} [options.keepNulls=false] - Honors null value passed, ignores the default values set on table.
    @param {boolean} [options.tableLock=false] - Places a bulk update(BU) lock on table while performing bulk load. Uses row locks by default.
    @param {callback} callback - Function to call after BulkLoad executes.
-  */
+   */
+
 
+  newBulkLoad(table, callbackOrOptions, callback) {
+    let options;
 
-  newBulkLoad(table, options, callback) {
     if (callback === undefined) {
-      callback = options;
+      callback = callbackOrOptions;
       options = {};
+    } else {
+      options = callbackOrOptions;
     }
 
     if (typeof options !== 'object') {
       throw new TypeError('"options" argument must be an object');
     }
 
-    return new BulkLoad(table, this.config.options, options, callback);
+    return new _bulkLoad.default(table, this.config.options, options, callback);
   }
 
   execBulkLoad(bulkLoad) {
     bulkLoad.executionStarted = true;
-    const request = new Request(bulkLoad.getBulkInsertSql(), error => {
+    const request = new _request.default(bulkLoad.getBulkInsertSql(), error => {
       if (error) {
         if (error.code === 'UNKNOWN') {
           error.message += ' This is likely because the schema of the BulkLoad does not match the schema of the table you are attempting to insert into.';
@@ -1553,7 +1584,7 @@ class Connection extends EventEmitter {
         return;
       }
 
-      this.makeRequest(bulkLoad, TYPE.BULK_LOAD, undefined);
+      this.makeRequest(bulkLoad, _packet.TYPE.BULK_LOAD);
     });
     bulkLoad.once('cancel', () => {
       request.cancel();
@@ -1563,12 +1594,12 @@ class Connection extends EventEmitter {
 
   prepare(request) {
     request.transformIntoPrepareRpc();
-    this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+    this.makeRequest(request, _packet.TYPE.RPC_REQUEST, new _rpcrequestPayload.default(request, this.currentTransactionDescriptor(), this.config.options));
   }
 
   unprepare(request) {
     request.transformIntoUnprepareRpc();
-    this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+    this.makeRequest(request, _packet.TYPE.RPC_REQUEST, new _rpcrequestPayload.default(request, this.currentTransactionDescriptor(), this.config.options));
   }
 
   execute(request, parameters) {
@@ -1583,7 +1614,7 @@ class Connection extends EventEmitter {
       return;
     }
 
-    this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+    this.makeRequest(request, _packet.TYPE.RPC_REQUEST, new _rpcrequestPayload.default(request, this.currentTransactionDescriptor(), this.config.options));
   }
 
   callProcedure(request) {
@@ -1598,81 +1629,80 @@ class Connection extends EventEmitter {
       return;
     }
 
-    this.makeRequest(request, TYPE.RPC_REQUEST, new RpcRequestPayload(request, this.currentTransactionDescriptor(), this.config.options));
+    this.makeRequest(request, _packet.TYPE.RPC_REQUEST, new _rpcrequestPayload.default(request, this.currentTransactionDescriptor(), this.config.options));
   }
 
-  beginTransaction(callback, name, isolationLevel) {
-    isolationLevel || (isolationLevel = this.config.options.isolationLevel);
-    const transaction = new Transaction(name || '', isolationLevel);
+  beginTransaction(callback, name = '', isolationLevel = this.config.options.isolationLevel) {
+    const transaction = new _transaction.Transaction(name, isolationLevel);
 
     if (this.config.options.tdsVersion < '7_2') {
-      return this.execSqlBatch(new Request('SET TRANSACTION ISOLATION LEVEL ' + transaction.isolationLevelToTSQL() + ';BEGIN TRAN ' + transaction.name, (...args) => {
+      return this.execSqlBatch(new _request.default('SET TRANSACTION ISOLATION LEVEL ' + transaction.isolationLevelToTSQL() + ';BEGIN TRAN ' + transaction.name, err => {
         this.transactionDepth++;
 
         if (this.transactionDepth === 1) {
           this.inTransaction = true;
         }
 
-        callback(...args);
+        callback(err);
       }));
     }
 
-    const request = new Request(undefined, err => {
+    const request = new _request.default(undefined, err => {
       return callback(err, this.currentTransactionDescriptor());
     });
-    return this.makeRequest(request, TYPE.TRANSACTION_MANAGER, transaction.beginPayload(this.currentTransactionDescriptor()));
+    return this.makeRequest(request, _packet.TYPE.TRANSACTION_MANAGER, transaction.beginPayload(this.currentTransactionDescriptor()));
   }
 
-  commitTransaction(callback, name) {
-    const transaction = new Transaction(name || '');
+  commitTransaction(callback, name = '') {
+    const transaction = new _transaction.Transaction(name);
 
     if (this.config.options.tdsVersion < '7_2') {
-      return this.execSqlBatch(new Request('COMMIT TRAN ' + transaction.name, (...args) => {
+      return this.execSqlBatch(new _request.default('COMMIT TRAN ' + transaction.name, err => {
         this.transactionDepth--;
 
         if (this.transactionDepth === 0) {
           this.inTransaction = false;
         }
 
-        callback(...args);
+        callback(err);
       }));
     }
 
-    const request = new Request(undefined, callback);
-    return this.makeRequest(request, TYPE.TRANSACTION_MANAGER, transaction.commitPayload(this.currentTransactionDescriptor()));
+    const request = new _request.default(undefined, callback);
+    return this.makeRequest(request, _packet.TYPE.TRANSACTION_MANAGER, transaction.commitPayload(this.currentTransactionDescriptor()));
   }
 
-  rollbackTransaction(callback, name) {
-    const transaction = new Transaction(name || '');
+  rollbackTransaction(callback, name = '') {
+    const transaction = new _transaction.Transaction(name);
 
     if (this.config.options.tdsVersion < '7_2') {
-      return this.execSqlBatch(new Request('ROLLBACK TRAN ' + transaction.name, (...args) => {
+      return this.execSqlBatch(new _request.default('ROLLBACK TRAN ' + transaction.name, err => {
         this.transactionDepth--;
 
         if (this.transactionDepth === 0) {
           this.inTransaction = false;
         }
 
-        callback(...args);
+        callback(err);
       }));
     }
 
-    const request = new Request(undefined, callback);
-    return this.makeRequest(request, TYPE.TRANSACTION_MANAGER, transaction.rollbackPayload(this.currentTransactionDescriptor()));
+    const request = new _request.default(undefined, callback);
+    return this.makeRequest(request, _packet.TYPE.TRANSACTION_MANAGER, transaction.rollbackPayload(this.currentTransactionDescriptor()));
   }
 
   saveTransaction(callback, name) {
-    const transaction = new Transaction(name);
+    const transaction = new _transaction.Transaction(name);
 
     if (this.config.options.tdsVersion < '7_2') {
-      return this.execSqlBatch(new Request('SAVE TRAN ' + transaction.name, (...args) => {
+      return this.execSqlBatch(new _request.default('SAVE TRAN ' + transaction.name, err => {
         this.transactionDepth++;
-        callback(...args);
+        callback(err);
       }));
     }
 
-    const request = new Request(undefined, callback);
-    return this.makeRequest(request, TYPE.TRANSACTION_MANAGER, transaction.savePayload(this.currentTransactionDescriptor()));
+    const request = new _request.default(undefined, callback);
+    return this.makeRequest(request, _packet.TYPE.TRANSACTION_MANAGER, transaction.savePayload(this.currentTransactionDescriptor()));
   }
 
   transaction(cb, isolationLevel) {
@@ -1681,7 +1711,8 @@ class Connection extends EventEmitter {
     }
 
     const useSavepoint = this.inTransaction;
-    const name = '_tedious_' + crypto.randomBytes(10).toString('hex');
+
+    const name = '_tedious_' + _crypto.default.randomBytes(10).toString('hex');
 
     const txDone = (err, done, ...args) => {
       if (err) {
@@ -1712,7 +1743,7 @@ class Connection extends EventEmitter {
         }
 
         if (isolationLevel) {
-          return this.execSqlBatch(new Request('SET transaction isolation level ' + this.getIsolationLevelText(isolationLevel), err => {
+          return this.execSqlBatch(new _request.default('SET transaction isolation level ' + this.getIsolationLevelText(isolationLevel), err => {
             return cb(err, txDone);
           }));
         } else {
@@ -1734,25 +1765,25 @@ class Connection extends EventEmitter {
     if (this.state !== this.STATE.LOGGED_IN) {
       const message = 'Requests can only be made in the ' + this.STATE.LOGGED_IN.name + ' state, not the ' + this.state.name + ' state';
       this.debug.log(message);
-      request.callback(RequestError(message, 'EINVALIDSTATE'));
+      request.callback((0, _errors.RequestError)(message, 'EINVALIDSTATE'));
     } else if (request.canceled) {
       process.nextTick(() => {
-        request.callback(RequestError('Canceled.', 'ECANCEL'));
+        request.callback((0, _errors.RequestError)('Canceled.', 'ECANCEL'));
       });
     } else {
-      if (packetType === TYPE.SQL_BATCH) {
+      if (packetType === _packet.TYPE.SQL_BATCH) {
         this.isSqlBatch = true;
       } else {
         this.isSqlBatch = false;
       }
 
       this.request = request;
-      this.request.connection = this;
-      this.request.rowCount = 0;
-      this.request.rows = [];
-      this.request.rst = [];
+      request.connection = this;
+      request.rowCount = 0;
+      request.rows = [];
+      request.rst = [];
       let message;
-      this.request.once('cancel', () => {
+      request.once('cancel', () => {
         if (!this.isRequestActive(request)) {
           // Cancel was called on a request that is no longer active on this connection
           return;
@@ -1761,9 +1792,8 @@ class Connection extends EventEmitter {
 
         if (this.state === this.STATE.BUILDING_CLIENT_REQUEST) {
           // The request was cancelled before buffering finished
-          const sqlRequest = this.request;
           this.request = undefined;
-          sqlRequest.callback(RequestError('Canceled.', 'ECANCEL'));
+          request.callback((0, _errors.RequestError)('Canceled.', 'ECANCEL'));
           this.transitionTo(this.STATE.LOGGED_IN);
         } else if (message.writable) {
           // - if the message is still writable, we'll set the ignore bit
@@ -1773,7 +1803,7 @@ class Connection extends EventEmitter {
         } else {
           // - but if the message has been ended (and thus has been fully sent off),
           //   we need to send an `ATTENTION` message to the server
-          this.messageIo.sendMessage(TYPE.ATTENTION);
+          this.messageIo.sendMessage(_packet.TYPE.ATTENTION);
           this.transitionTo(this.STATE.SENT_ATTENTION);
         }
 
@@ -1781,7 +1811,7 @@ class Connection extends EventEmitter {
         this.createCancelTimer();
       });
 
-      if (request instanceof BulkLoad) {
+      if (request instanceof _bulkLoad.default) {
         message = request.getMessageStream(); // If the bulkload was not put into streaming mode by the user,
         // we end the rowToPacketTransform here for them.
         //
@@ -1842,7 +1872,7 @@ class Connection extends EventEmitter {
   }
 
   reset(callback) {
-    const request = new Request(this.getInitialSql(), err => {
+    const request = new _request.default(this.getInitialSql(), err => {
       if (this.config.options.tdsVersion < '7_2') {
         this.inTransaction = false;
       }
@@ -1859,16 +1889,16 @@ class Connection extends EventEmitter {
 
   getIsolationLevelText(isolationLevel) {
     switch (isolationLevel) {
-      case ISOLATION_LEVEL.READ_UNCOMMITTED:
+      case _transaction.ISOLATION_LEVEL.READ_UNCOMMITTED:
         return 'read uncommitted';
 
-      case ISOLATION_LEVEL.REPEATABLE_READ:
+      case _transaction.ISOLATION_LEVEL.REPEATABLE_READ:
         return 'repeatable read';
 
-      case ISOLATION_LEVEL.SERIALIZABLE:
+      case _transaction.ISOLATION_LEVEL.SERIALIZABLE:
         return 'serializable';
 
-      case ISOLATION_LEVEL.SNAPSHOT:
+      case _transaction.ISOLATION_LEVEL.SNAPSHOT:
         return 'snapshot';
 
       default:
@@ -1878,6 +1908,8 @@ class Connection extends EventEmitter {
 
 }
 
+var _default = Connection;
+exports.default = _default;
 module.exports = Connection;
 Connection.prototype.STATE = {
   CONNECTING: {
@@ -1910,11 +1942,21 @@ Connection.prototype.STATE = {
       connectTimeout: function connectTimeout() {
         this.transitionTo(this.STATE.FINAL);
       },
-      data: function data(_data) {
-        this.addToMessageBuffer(_data);
-      },
+      data: function (_data) {
+        function data(_x) {
+          return _data.apply(this, arguments);
+        }
+
+        data.toString = function () {
+          return _data.toString();
+        };
+
+        return data;
+      }(function (data) {
+        this.addToMessageBuffer(data);
+      }),
       message: function message() {
-        const preloginPayload = new PreloginPayload(this.messageBuffer);
+        const preloginPayload = new _preloginPayload.default(this.messageBuffer);
         this.debug.payload(function () {
           return preloginPayload.toString('  ');
         });
@@ -1925,7 +1967,7 @@ Connection.prototype.STATE = {
 
         if (preloginPayload.encryptionString === 'ON' || preloginPayload.encryptionString === 'REQ') {
           if (!this.config.options.encrypt) {
-            this.emit('connect', ConnectionError("Server requires encryption, set 'encrypt' config option to true.", 'EENCRYPT'));
+            this.emit('connect', (0, _errors.ConnectionError)("Server requires encryption, set 'encrypt' config option to true.", 'EENCRYPT'));
             return this.close();
           }
 
@@ -1947,7 +1989,7 @@ Connection.prototype.STATE = {
   REROUTING: {
     name: 'ReRouting',
     enter: function enter() {
-      this.cleanupConnection(this.cleanupTypeEnum.REDIRECT);
+      this.cleanupConnection(CLEANUP_TYPE.REDIRECT);
     },
     events: {
       message: function message() {},
@@ -1966,7 +2008,7 @@ Connection.prototype.STATE = {
     name: 'TRANSIENT_FAILURE_RETRY',
     enter: function enter() {
       this.curTransientRetryCount++;
-      this.cleanupConnection(this.cleanupTypeEnum.RETRY);
+      this.cleanupConnection(CLEANUP_TYPE.RETRY);
     },
     events: {
       message: function message() {},
@@ -1990,15 +2032,25 @@ Connection.prototype.STATE = {
       connectTimeout: function connectTimeout() {
         this.transitionTo(this.STATE.FINAL);
       },
-      data: function data(_data2) {
-        this.messageIo.tlsHandshakeData(_data2);
-      },
+      data: function (_data2) {
+        function data(_x2) {
+          return _data2.apply(this, arguments);
+        }
+
+        data.toString = function () {
+          return _data2.toString();
+        };
+
+        return data;
+      }(function (data) {
+        this.messageIo.tlsHandshakeData(data);
+      }),
       message: function message() {
         if (this.messageIo.tlsNegotiationComplete) {
           this.sendLogin7Packet();
           const authentication = this.config.authentication;
 
-          if (authentication.type === 'azure-active-directory-password' || authentication.type === 'azure-active-directory-msi-vm' || authentication.type === 'azure-active-directory-msi-app-service') {
+          if (authentication.type === 'azure-active-directory-password' || authentication.type === 'azure-active-directory-msi-vm' || authentication.type === 'azure-active-directory-msi-app-service' || authentication.type === 'azure-active-directory-service-principal-secret') {
             this.transitionTo(this.STATE.SENT_LOGIN7_WITH_FEDAUTH);
           } else if (authentication.type === 'ntlm') {
             this.transitionTo(this.STATE.SENT_LOGIN7_WITH_NTLM);
@@ -2018,28 +2070,38 @@ Connection.prototype.STATE = {
       connectTimeout: function connectTimeout() {
         this.transitionTo(this.STATE.FINAL);
       },
-      data: function data(_data3) {
-        this.sendDataToTokenStreamParser(_data3);
-      },
+      data: function (_data3) {
+        function data(_x3) {
+          return _data3.apply(this, arguments);
+        }
+
+        data.toString = function () {
+          return _data3.toString();
+        };
+
+        return data;
+      }(function (data) {
+        this.sendDataToTokenStreamParser(data);
+      }),
       routingChange: function routingChange() {
         this.transitionTo(this.STATE.REROUTING);
       },
       featureExtAck: function featureExtAck(token) {
         const authentication = this.config.authentication;
 
-        if (authentication.type === 'azure-active-directory-password' || authentication.type === 'azure-active-directory-access-token' || authentication.type === 'azure-active-directory-msi-vm' || authentication.type === 'azure-active-directory-msi-app-service') {
+        if (authentication.type === 'azure-active-directory-password' || authentication.type === 'azure-active-directory-access-token' || authentication.type === 'azure-active-directory-msi-vm' || authentication.type === 'azure-active-directory-msi-app-service' || authentication.type === 'azure-active-directory-service-principal-secret') {
           if (token.fedAuth === undefined) {
-            this.loginError = ConnectionError('Did not receive Active Directory authentication acknowledgement');
+            this.loginError = (0, _errors.ConnectionError)('Did not receive Active Directory authentication acknowledgement');
             this.loggedIn = false;
           } else if (token.fedAuth.length !== 0) {
-            this.loginError = ConnectionError(`Active Directory authentication acknowledgment for ${authentication.type} authentication method includes extra data`);
+            this.loginError = (0, _errors.ConnectionError)(`Active Directory authentication acknowledgment for ${authentication.type} authentication method includes extra data`);
             this.loggedIn = false;
           }
         } else if (token.fedAuth === undefined) {
-          this.loginError = ConnectionError('Received acknowledgement for unknown feature');
+          this.loginError = (0, _errors.ConnectionError)('Received acknowledgement for unknown feature');
           this.loggedIn = false;
         } else {
-          this.loginError = ConnectionError('Did not request Active Directory authentication, but received the acknowledgment');
+          this.loginError = (0, _errors.ConnectionError)('Did not request Active Directory authentication, but received the acknowledgment');
           this.loggedIn = false;
         }
       },
@@ -2055,7 +2117,7 @@ Connection.prototype.STATE = {
             this.transitionTo(this.STATE.FINAL);
           }
         } else {
-          this.emit('connect', ConnectionError('Login failed.', 'ELOGIN'));
+          this.emit('connect', (0, _errors.ConnectionError)('Login failed.', 'ELOGIN'));
           this.transitionTo(this.STATE.FINAL);
         }
       }
@@ -2070,24 +2132,29 @@ Connection.prototype.STATE = {
       connectTimeout: function connectTimeout() {
         this.transitionTo(this.STATE.FINAL);
       },
-      data: function data(_data4) {
-        this.sendDataToTokenStreamParser(_data4);
-      },
+      data: function (_data4) {
+        function data(_x4) {
+          return _data4.apply(this, arguments);
+        }
+
+        data.toString = function () {
+          return _data4.toString();
+        };
+
+        return data;
+      }(function (data) {
+        this.sendDataToTokenStreamParser(data);
+      }),
       message: function message() {
         if (this.ntlmpacket) {
           const authentication = this.config.authentication;
-          const payload = new NTLMResponsePayload({
+          const payload = new _ntlmPayload.default({
             domain: authentication.options.domain,
             userName: authentication.options.userName,
             password: authentication.options.password,
-            database: this.config.options.database,
-            appName: this.config.options.appName,
-            packetSize: this.config.options.packetSize,
-            tdsVersion: this.config.options.tdsVersion,
-            ntlmpacket: this.ntlmpacket,
-            additional: this.additional
+            ntlmpacket: this.ntlmpacket
           });
-          this.messageIo.sendMessage(TYPE.NTLMAUTH_PKT, payload.data);
+          this.messageIo.sendMessage(_packet.TYPE.NTLMAUTH_PKT, payload.data);
           this.debug.payload(function () {
             return payload.toString('  ');
           });
@@ -2103,7 +2170,7 @@ Connection.prototype.STATE = {
             this.transitionTo(this.STATE.FINAL);
           }
         } else {
-          this.emit('connect', ConnectionError('Login failed.', 'ELOGIN'));
+          this.emit('connect', (0, _errors.ConnectionError)('Login failed.', 'ELOGIN'));
           this.transitionTo(this.STATE.FINAL);
         }
       }
@@ -2118,9 +2185,19 @@ Connection.prototype.STATE = {
       connectTimeout: function connectTimeout() {
         this.transitionTo(this.STATE.FINAL);
       },
-      data: function data(_data5) {
-        this.sendDataToTokenStreamParser(_data5);
-      },
+      data: function (_data5) {
+        function data(_x5) {
+          return _data5.apply(this, arguments);
+        }
+
+        data.toString = function () {
+          return _data5.toString();
+        };
+
+        return data;
+      }(function (data) {
+        this.sendDataToTokenStreamParser(data);
+      }),
       routingChange: function routingChange() {
         this.transitionTo(this.STATE.REROUTING);
       },
@@ -2128,7 +2205,9 @@ Connection.prototype.STATE = {
         this.fedAuthInfoToken = token;
       },
       message: function message() {
-        if (this.fedAuthInfoToken && this.fedAuthInfoToken.stsurl && this.fedAuthInfoToken.spn) {
+        const fedAuthInfoToken = this.fedAuthInfoToken;
+
+        if (fedAuthInfoToken && fedAuthInfoToken.stsurl && fedAuthInfoToken.spn) {
           const authentication = this.config.authentication;
 
           const getToken = callback => {
@@ -2143,29 +2222,32 @@ Connection.prototype.STATE = {
             };
 
             if (authentication.type === 'azure-active-directory-password') {
-              loginWithUsernamePassword(authentication.options.userName, authentication.options.password, {
+              (0, _msRestNodeauth.loginWithUsernamePassword)(authentication.options.userName, authentication.options.password, {
                 clientId: '7f98cb04-cd1e-40df-9140-3bf7e2cea4db',
-                tokenAudience: this.fedAuthInfoToken.spn
+                tokenAudience: fedAuthInfoToken.spn
               }, getTokenFromCredentials);
             } else if (authentication.type === 'azure-active-directory-msi-vm') {
-              loginWithVmMSI({
+              (0, _msRestNodeauth.loginWithVmMSI)({
                 clientId: authentication.options.clientId,
                 msiEndpoint: authentication.options.msiEndpoint,
-                resource: this.fedAuthInfoToken.spn
+                resource: fedAuthInfoToken.spn
               }, getTokenFromCredentials);
             } else if (authentication.type === 'azure-active-directory-msi-app-service') {
-              loginWithAppServiceMSI({
-                clientId: authentication.options.clientId,
+              (0, _msRestNodeauth.loginWithAppServiceMSI)({
                 msiEndpoint: authentication.options.msiEndpoint,
                 msiSecret: authentication.options.msiSecret,
-                resource: this.fedAuthInfoToken.spn
+                resource: fedAuthInfoToken.spn
+              }, getTokenFromCredentials);
+            } else if (authentication.type === 'azure-active-directory-service-principal-secret') {
+              (0, _msRestNodeauth.loginWithServicePrincipalSecret)(authentication.options.clientId, authentication.options.clientSecret, authentication.options.tenantId, {
+                tokenAudience: fedAuthInfoToken.spn
               }, getTokenFromCredentials);
             }
           };
 
           getToken((err, token) => {
             if (err) {
-              this.loginError = ConnectionError('Security token could not be authenticated or authorized.', 'EFEDAUTH');
+              this.loginError = (0, _errors.ConnectionError)('Security token could not be authenticated or authorized.', 'EFEDAUTH');
               this.emit('connect', this.loginError);
               this.transitionTo(this.STATE.FINAL);
               return;
@@ -2182,7 +2264,7 @@ Connection.prototype.STATE = {
             this.transitionTo(this.STATE.FINAL);
           }
         } else {
-          this.emit('connect', ConnectionError('Login failed.', 'ELOGIN'));
+          this.emit('connect', (0, _errors.ConnectionError)('Login failed.', 'ELOGIN'));
           this.transitionTo(this.STATE.FINAL);
         }
       }
@@ -2200,9 +2282,19 @@ Connection.prototype.STATE = {
       connectTimeout: function connectTimeout() {
         this.transitionTo(this.STATE.FINAL);
       },
-      data: function data(_data6) {
-        this.sendDataToTokenStreamParser(_data6);
-      },
+      data: function (_data6) {
+        function data(_x6) {
+          return _data6.apply(this, arguments);
+        }
+
+        data.toString = function () {
+          return _data6.toString();
+        };
+
+        return data;
+      }(function (data) {
+        this.sendDataToTokenStreamParser(data);
+      }),
       message: function message() {
         this.transitionTo(this.STATE.LOGGED_IN);
         this.processedInitialSql();
@@ -2244,17 +2336,27 @@ Connection.prototype.STATE = {
         this.transitionTo(this.STATE.FINAL);
         sqlRequest.callback(err);
       },
-      data: function data(_data7) {
+      data: function (_data7) {
+        function data(_x7) {
+          return _data7.apply(this, arguments);
+        }
+
+        data.toString = function () {
+          return _data7.toString();
+        };
+
+        return data;
+      }(function (data) {
         this.clearRequestTimer(); // request timer is stopped on first data package
 
-        const ret = this.sendDataToTokenStreamParser(_data7);
+        const ret = this.sendDataToTokenStreamParser(data);
 
         if (ret === false) {
           // Bridge backpressure from the token stream parser transform to the
           // packet stream transform.
           this.messageIo.pause();
         }
-      },
+      }),
       message: function message() {
         // We have to channel the 'message' (EOM) event through the token stream
         // parser transform, to keep it in line with the flow of the tokens, when
@@ -2286,9 +2388,19 @@ Connection.prototype.STATE = {
         this.transitionTo(this.STATE.FINAL);
         sqlRequest.callback(err);
       },
-      data: function data(_data8) {
-        this.sendDataToTokenStreamParser(_data8);
-      },
+      data: function (_data8) {
+        function data(_x8) {
+          return _data8.apply(this, arguments);
+        }
+
+        data.toString = function () {
+          return _data8.toString();
+        };
+
+        return data;
+      }(function (data) {
+        this.sendDataToTokenStreamParser(data);
+      }),
       attention: function attention() {
         this.attentionReceived = true;
       },
@@ -2301,10 +2413,10 @@ Connection.prototype.STATE = {
           this.request = undefined;
           this.transitionTo(this.STATE.LOGGED_IN);
 
-          if (sqlRequest.error && sqlRequest.error instanceof RequestError && sqlRequest.error.code === 'ETIMEOUT') {
+          if (sqlRequest.error && sqlRequest.error instanceof _errors.RequestError && sqlRequest.error.code === 'ETIMEOUT') {
             sqlRequest.callback(sqlRequest.error);
           } else {
-            sqlRequest.callback(RequestError('Canceled.', 'ECANCEL'));
+            sqlRequest.callback((0, _errors.RequestError)('Canceled.', 'ECANCEL'));
           }
         }
       }
@@ -2313,7 +2425,7 @@ Connection.prototype.STATE = {
   FINAL: {
     name: 'Final',
     enter: function enter() {
-      this.cleanupConnection(this.cleanupTypeEnum.NORMAL);
+      this.cleanupConnection(CLEANUP_TYPE.NORMAL);
     },
     events: {
       loginFailed: function loginFailed() {// Do nothing. The connection was probably closed by the client code.