Merged 1.3.x_branch into master

src/__tests__/connection.test.js

@@ -0,0 +1,105 @@
+import connection from '../networking/connection';
+import packet from '../networking/packet';
+
+const Socket = require('net');
+
+test(`connect fails when error occurs during createConnection`, async () => {
+  const mock_create = (port, host, cb) => {
+    cb(new Error('mock create error'));
+  };
+  jest.spyOn(Socket, 'createConnection').mockImplementation(mock_create);
+
+  const conn = new connection('localhost', 20000);
+  await expect(conn.connect()).rejects.toThrow(Error);
+});
+
+test(`socket receive data fails when decryption fails`, async () => {
+  let cbl = {};
+  const socket = {
+    on: (name, cb) => {
+      cbl[name] = cb;
+    },
+  }
+
+  const conn = new connection('', 0, 'b', socket);
+  let reject;
+  const mock_reject = jest.fn().mockImplementation(e => reject(e));
+  conn.reject = mock_reject;
+  conn.resolve = jest.fn();
+
+  const p = new packet('a');
+  await p.encrypt();
+  p.encode_top_ui32(p.buffer.length);
+  await expect(new Promise((_, r) => {
+    reject = r;
+    cbl['data'](Buffer.from(p.buffer));
+  })).rejects.toThrow(Error);
+  expect(mock_reject.mock.calls.length).toBe(1);
+});
+
+test(`disconnect succeeds if an error is thrown`, async () => {
+  const socket = {
+    destroy: () => {
+      throw new Error('mock destroy error');
+    },
+    on: () => {
+    },
+  };
+
+  const conn = new connection('', 0, 'b', socket);
+  await conn.disconnect();
+});
+
+test(`send fails on socket error`, async () => {
+  let cbl = {};
+  const socket = {
+    on: (name, cb) => {
+      cbl[name] = cb;
+    },
+  }
+
+  const conn = new connection('', 0, 'b', socket);
+  const mock_reject = jest.fn();
+  conn.reject = mock_reject;
+  conn.resolve = jest.fn();
+
+  cbl['error']('socket error');
+  expect(mock_reject).toBeCalled();
+});
+
+test(`error is thrown when socket is closed`, async () => {
+  let cbl = {};
+  const socket = {
+    on: (name, cb) => {
+      cbl[name] = cb;
+    },
+  }
+
+  const conn = new connection('', 0, 'b', socket);
+  const mock_reject = jest.fn();
+  conn.reject = mock_reject;
+  conn.resolve = jest.fn();
+
+  cbl['close']();
+  expect(mock_reject).toBeCalled();
+});
+
+test(`send fails when write error occurs`, async () => {
+  let cbl = {};
+  const socket = {
+    on: (name, cb) => {
+      cbl[name] = cb;
+    },
+    write: (b, c, cb) => {
+      cb('mock write error');
+    },
+  };
+
+  const conn = new connection('', 0, 'b', socket);
+  try {
+    await conn.send('c', new packet('b'));
+    expect('send should fail').toBeNull();
+  } catch (err) {
+    expect(err).toBeDefined();
+  }
+});

src/networking/connection.js

@@ -43,7 +43,7 @@ export default class connection {
               });
         });
       } catch (err) {
-        return Promise.reject(`'connect()' failed: ${err}`)
+        return Promise.reject(new Error(`'connect()' failed: ${err}`));
       }
 
       this.connected = true;
@@ -60,7 +60,6 @@ export default class connection {
 
     this.socket.on('data', chunk => {
       buffer = buffer ? Buffer.concat([ buffer, chunk ]) : chunk;
-
       if (buffer.length > 4) {
         const size = buffer.readUInt32BE(0);
         if (buffer.length >= size + 4) {