0.0.22: LiveMysql Constructor callback now waits for Zongji ready

Fixes #10

Author: numtel

lib/LiveMysql.js

@@ -3,6 +3,9 @@
 var ZongJi = require('zongji');
 var mysql = require('mysql');
 
+// Maximum duration to wait for Zongji to initialize before timeout error (ms)
+var ZONGJI_INIT_TIMEOUT = 1500;
+
 var LiveMysqlSelect = require('./LiveMysqlSelect');
 
 function LiveMysql(settings, callback){
@@ -63,8 +66,24 @@ function LiveMysql(settings, callback){
 
     });
 
+    // Wait for Zongji to be ready before executing callback
+    var zongjiInitTime = Date.now();
+    var zongjiReady = function() {
+      if(zongji.ready === true) {
+        // Call the callback if it exists and do not keep waiting
+        callback && callback();
+      } else {
+        // Wait for Zongji to be ready
+        if(Date.now() - zongjiInitTime > ZONGJI_INIT_TIMEOUT) {
+          // Zongji initialization has exceeded timeout, callback error
+          callback && callback(new Error('ZONGJI_INIT_TIMEOUT_OCCURED'));
+        } else {
+          setTimeout(zongjiReady, 40);
+        }
+      }
+    };
     zongji.start(self.zongjiSettings);
-    if(callback) return callback();
+    zongjiReady();
   });
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mysql-live-select",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "description": "Live updating MySQL SELECT statements",
   "main": "lib/LiveMysql.js",
   "repository": "https://github.com/numtel/mysql-live-select",

test/index.js

@@ -242,6 +242,13 @@ module.exports = {
       });
     });
   },
+  immediate_disconnection: function(test){
+    var myTest = new LiveMysql(settings, function(error){
+      myTest.end();
+      test.ok(typeof error === 'undefined');
+      test.done();
+    });
+  },
   error_invalid_connection: function(test){
     var myTest = new LiveMysql({
       host: '127.0.0.1',