General code refactoring

2 files changed, 50 insertions, 69 deletions

diff --git a/src/index.js b/src/index.js
index 869d2de..29ee2be 100644
--- a/src/index.js
+++ b/src/index.js
@@ -7,66 +7,63 @@ import http from 'http';
  */
 function connect(uuid, callback) {
     if (!isVerification(uuid)) {
-        throw new Error('\'uuid\' invalid variable.');
+        throw new Error('The variable \'uuid\' is not valid.');
     }
 
-    var query = {
-        path: `/api/2.0/json/Chat.init/${uuid}`,
-        hostname: 'iii.ru',
-        method: 'GET',
-        port: 80
-    };
-
-    var request = http.request(query, (response) => {
-        var json = null;
-        response.on('data', (raw) => {
-            json = decryptJSON(raw);
-        });
-        response.on('end', () => {
-            callback(json);
-        });
-    });
-    request.on('error', (error) => {
-        callback(error);
-    });
-    request.end();
+    var pkg = createPackage(uuid, null);
+    forward(pkg, 'init', callback);
 }
 
 /**
- * @param {String} cuid - Session ID
- * @param {String} text - Send messages
+ * @param {String} uuid - Session ID
+ * @param {String} text - The message you are sending
  * @param {Function} callback - Function handler
  * @description Sends a message to bot and returns a response.
  */
-function send(cuid, text, callback) {
-    if (!isVerification(cuid)) {
-        throw new Error('\'cuid\' invalid variable.');
+function send(uuid, text, callback) {
+    if (!isVerification(uuid)) {
+        throw new Error('The variable \'uuid\' is not valid.');
     }
 
     if (!isString(text)) {
-        throw new Error('\'text\' invalid variable.');
+        throw new TypeError('\'text\' is not a string');
     }
 
+    var pkg = createPackage(uuid, text);
+    forward(pkg, 'request', callback);
+}
+
+/**
+ * @param {String} pkg - The package to send
+ * @param {String} path - The final delivery address
+ * @param {Function} callback - Function handler
+ * @description Send the final packet to the server and return the response.
+ */
+function forward(pkg, path, callback) {
     var query = {
-        path: '/api/2.0/json/Chat.request',
+        path: `/api/2.0/json/Chat.${path}`,
         hostname: 'iii.ru',
         method: 'POST',
-        port: 80,
+        port: 80
     };
 
     var request = http.request(query, (response) => {
         var json = null;
+
         response.on('data', (raw) => {
             json = decryptJSON(raw);
         });
+
         response.on('end', () => {
-            callback(json.result);
+            callback(json);
         });
     });
+
     request.on('error', (error) => {
         callback(error);
     });
-    request.write(createPackage(cuid, text));
+
+    request.write(pkg);
     request.end();
 }
 
@@ -119,15 +116,13 @@ function mergerString(data) {
 }
 
 /**
- * @param {String} cuid - Session ID
+ * @param {String} uuid - Session ID
  * @param {String} text - Source string
  * @returns {String} Packed request
  * @description Creates a package to send.
  */
-function createPackage(cuid, text) {
-    var data = [];
-    data.push(cuid);
-    data.push(text.toString());
+function createPackage(uuid, text) {
+    var data = [uuid, text];
     var json = JSON.stringify(data);
     return encrypt(json);
 }
diff --git a/src/test.js b/src/test.js
index 1c34e5f..56fd03e 100644
--- a/src/test.js
+++ b/src/test.js
@@ -2,6 +2,7 @@ import { assert } from 'chai';
 import generator from 'uuid';
 
 import {
+    isVerification,
     decryptJSON,
     connect,
     decrypt,
@@ -14,51 +15,36 @@ describe('iii-client:', () => {
     var text = 'Hello, World!';
     var data = JSON.stringify({ text });
 
-    it('encrypt():', () => {
+    it('isVerification()', () => {
+        assert.isFalse(isVerification(text));
+        assert.isTrue(isVerification(uuid));
+    });
+
+    it('encrypt()', () => {
         assert.notEqual(text, encrypt(text));
     });
 
-    it('decrypt():', () => {
+    it('decrypt()', () => {
         var encrypted = encrypt(text);
         assert.equal(text, decrypt(encrypted));
     });
 
-    it('decryptJSON():', () => {
+    it('decryptJSON()', () => {
         var encrypted = encrypt(data);
         assert.equal(data, decrypt(encrypted).toString());
     });
 
-    it('connect():', (done) => {
-        var value = 0;
-        var test = () => {
-            connect(uuid, (request) => {
-                if (!typeof request === 'object' && value++ < 5) {
-                    test();
-                }
-                else {
-                    assert.isObject(request);
-                    done();
-                }
-            });
-        }
-
-        test();
+    it('connect()', (done) => {
+        connect(uuid, (request) => {
+            assert.isObject(request);
+            done();
+        });
     });
 
-    it('send():', (done) => {
-        var value = 0;
-        var test = () => {
-            send(uuid, text, (request) => {
-                if (!typeof request === 'object' && value++ < 5) {
-                    test();
-                }
-                else {
-                    assert.isObject(request);
-                    done();
-                }
-            });
-        }
-
-        test();
+    it('send()', (done) => {
+        send(uuid, text, (request) => {
+            assert.isObject(request);
+            done();
+        });
     });
 });
\ No newline at end of file