More refactoring.

Author: wvanbergen

lib/connection.js

@@ -3,7 +3,7 @@ import EventEmitter from 'node:events'
 
 import { SSLError, ConnectionError,ClientStateError, AuthenticationError } from './errors.js'
 import { Query } from './query.js'
-import { FrontendMessage } from './frontend_message.js'
+import { StartupMessage, SSLRequestMessage } from './frontend_message.js'
 import { ParseMessageFromBuffer } from './backend_message.js'
 import { AuthenticationMethods } from './authentication.js';
 import { startTLS } from './starttls.js';
@@ -52,7 +52,7 @@ class Connection extends EventEmitter {
         this.connection.setKeepAlive(true);
       }
       if (this.connectionOptions.ssl) {
-        this.writeMessage(new FrontendMessage.SSLRequest);
+        this.writeMessage(new SSLRequestMessage);
         this.connection.once('data', function(buffer) {
           var conn, err, sslOptions;
           if ('S' === buffer.toString('utf-8')) {
@@ -110,7 +110,7 @@ class Connection extends EventEmitter {
       this._onError(error);
     }
     if (this.connection.connected) {
-      this.writeMessage(new FrontendMessage.Terminate());
+      this.writeMessage(new TerminateMessage());
     }
     return this.connection.end();
   }
@@ -184,7 +184,7 @@ class Connection extends EventEmitter {
             });
         case AuthenticationMethods.CLEARTEXT_PASSWORD:
         case AuthenticationMethods.MD5_PASSWORD:
-          this.writeMessage(new FrontendMessage.Password(this.connectionOptions.password, msg.method, {
+          this.writeMessage(new PasswordMessage(this.connectionOptions.password, msg.method, {
             salt: msg.salt,
             user: this.connectionOptions.user
           }));
@@ -195,7 +195,7 @@ class Connection extends EventEmitter {
     }
 
     this.connection.on('data', this._onData.bind(this));
-    this.writeMessage(new FrontendMessage.Startup(this.connectionOptions.user, this.connectionOptions.database));
+    this.writeMessage(new StartupMessage(this.connectionOptions.user, this.connectionOptions.database));
 
     this.once('ErrorResponse', authenticationFailureHandler);
     this.once('Authentication', authenticationHandler);
@@ -312,24 +312,23 @@ class Connection extends EventEmitter {
   }
 
   _onData(buffer) {
-    var bufferedData, message, size;
+
     if (this.incomingData.length === 0) {
       this.incomingData = buffer;
     } else {
-      bufferedData = Buffer.alloc(this.incomingData.length + buffer.length);
+      const bufferedData = Buffer.alloc(this.incomingData.length + buffer.length);
       this.incomingData.copy(bufferedData);
       buffer.copy(bufferedData, this.incomingData.length);
       this.incomingData = bufferedData;
     }
     while (this.incomingData.length >= 5) {
-      size = this.incomingData.readUInt32BE(1);
+      const size = this.incomingData.readUInt32BE(1);
       if (size + 1 <= this.incomingData.length) {
-        message = ParseMessageFromBuffer(this.incomingData.slice(0, size + 1));
-        console.debug(typeof message.constructor.name);
+        const msg = ParseMessageFromBuffer(this.incomingData.slice(0, size + 1));
         if (this.debug) {
-          console.debug('<=', message);
+          console.debug('<=', msg);
         }
-        this.emit(message.constructor.name, message);
+        this.emit(msg.constructor.name, msg);
         this.incomingData = this.incomingData.slice(size + 1);
       } else {
         break;
@@ -371,7 +370,7 @@ class Connection extends EventEmitter {
 
   writeMessage(msg, callback) {
     if (this.debug) {
-      console.log('=>', msg);
+      console.debug('=>', msg);
     }
     return this.connection.write(msg.toBuffer(), callback);
   };

lib/connection.test.js

@@ -4,29 +4,6 @@ import net from 'net'
 
 import * as Vertica from './vertica'
 
-class Connection {
-    constructor() {
-        this.busy = false
-        this.connected = false
-        this._socket = null
-    }
-
-    static create(connectionOptions, callback) {
-        const connection = new Connection()
-        connection._socket = net.createConnection(connectionOptions, () => {
-            console.log("connect")
-            connection.connected = true
-            callback(null, connection)
-        })   
-
-        connection._socket.on('error', (err) => {
-            callback(err, null)
-        })
-
-        return connection
-    }
-}
-
 describe.runIf(fs.existsSync('./test/connection.json'))('Vertica.connect', () => {
     const connectionInfo = JSON.parse(fs.readFileSync('./test/connection.json'))