Merge branch 'feature/vertx_eventbus_3.5.x' into canary

bower.json

@@ -29,7 +29,7 @@
   "dependencies": {
     "angular": ">=1.2 <1.7",
     "sockjs-client": "~1.1.0",
-    "vertx3-eventbus-client": "~3.4.0"
+    "vertx3-eventbus-client": "~3.5.0"
   },
   "devDependencies": {
     "angular": "~1.6.2",

package.json

@@ -28,7 +28,7 @@
     "test-scopes": "grunt install-test && for f in test_scopes/*; do TEST_SCOPE=\"`basename $f`\" npm run -s test; done",
     "start-it-web-server": "babel-node test/e2e/server.js",
     "install-it-vertx-server": "cd test/e2e/vertx && ./install-vertx.sh",
-    "start-it-vertx-server": "cd test/e2e/vertx/app && ../runtime/bin/vertx run vertx3-config.js",
+    "start-it-vertx-server": "cd test/e2e/vertx/app && ../runtime/vertx/bin/vertx run vertx3-config.js",
     "start-server": "npm-run-all --silent clean compile-dist install-it-vertx-server --parallel start-it-vertx-server start-it-web-server",
     "compile-dist": "webpack",
     "compile-distmin": "BUILD_MINIFIED=1 webpack",

src/lib/adapter/EventBusAdapter.js

@@ -121,6 +121,7 @@ export default class EventBusAdapter extends BaseAdapter {
       sockjsReconnectInterval,
       sockjsOptions
     };
+    this.nativeReconnectAvailable = false,
     this.disconnectTimeoutEnabled = true;
     this.applyDefaultHeaders();
     if (initialConnectEnabled) {
@@ -157,6 +158,11 @@ export default class EventBusAdapter extends BaseAdapter {
     // Because we have rebuild an EventBus object (because it have to rebuild a SockJS object)
     // we must wrap the object. Therefore, we have to mimic the behavior of onopen and onclose each time.
     this.instance = new this.EventBus(url, this.options.sockjsOptions);
+    // Since vertx-eventbus 3.5.0 support for "native" reconnect is available
+    this.nativeReconnectAvailable = typeof this.instance.enableReconnect === 'function';
+    if (this.nativeReconnectAvailable && this.options.reconnectEnabled) {
+      this.instance.enableReconnect(true);
+    }
     this.instance.onopen = () => {
       if (this.options.debugEnabled) {
         this.$log.debug('[Vert.x EB Stub] Connected');
@@ -168,6 +174,12 @@ export default class EventBusAdapter extends BaseAdapter {
     };
     // instance onClose handler
     this.instance.onclose = () => {
+      // Since [email protected], the EventBus itself can handle reconnects
+      if (this.nativeReconnectAvailable && this.instance.reconnectTimerID) {
+        // 'reconnectTimerID' will be only set if reconnect is enabled
+        this.$log.debug('[Vert.x EB Stub] Reconnect required, but seems to be handled by EventBus itself');
+        return;
+      }
       if (this.options.debugEnabled) {
         this.$log.debug(`[Vert.x EB Stub] Reconnect in ${this.options.sockjsReconnectInterval}ms`);
       }

test/e2e/vertx/install-vertx.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-ARCHIVE="vert.x-3.2.0-full.tar.gz"
+ARCHIVE="vert.x-3.5.1-full.tar.gz"
 DIRECTORY="runtime"
 [ -e ${ARCHIVE} ] || wget https://bintray.com/artifact/download/vertx/downloads/${ARCHIVE}
 if [ ! -e ${DIRECTORY} ]; then