Add BoardEvent.RECONNECT when device reconnected

Author: shengyuan

examples/basic.html

@@ -59,6 +59,10 @@
     // test: should not emit 'disconnect' again
     board.disconnect();
   });
+
+  board.on(webduino.BoardEvent.RECONNECT, function () {
+    console.log("board reconnect");
+  });
   </script>
 </head>
 

examples/node/basic.js

@@ -58,3 +58,7 @@ board.on(webduino.BoardEvent.DISCONNECT, function () {
   // test: should not emit 'disconnect' again
   board.disconnect();
 });
+
+board.on(webduino.BoardEvent.RECONNECT, function() {
+  console.log("board reconnect");
+});

src/core/Board.js

@@ -27,7 +27,8 @@
     READY: 'ready',
     ERROR: 'error',
     BEFOREDISCONNECT: 'beforeDisconnect',
-    DISCONNECT: 'disconnect'
+    DISCONNECT: 'disconnect',
+    RECONNECT: 'reconnect'
   };
 
   /**
@@ -98,6 +99,7 @@
 
     this._initialVersionResultHandler = onInitialVersionResult.bind(this);
     this._openHandler = onOpen.bind(this);
+    this._reOpenHandler = onReOpen.bind(this);
     this._messageHandler = onMessage.bind(this);
     this._errorHandler = onError.bind(this);
     this._closeHandler = onClose.bind(this);
@@ -125,6 +127,11 @@
     this.begin();
   }
 
+  function onReOpen() {
+    this._logger.info("onReOpen", "Device re-online");
+    this.emit(BoardEvent.RECONNECT);
+  }
+
   function onMessage(data) {
     try {
       this._logger.info('onMessage', data);
@@ -556,7 +563,7 @@
   proto.sendDigitalData = function (pin, value) {
     try {
       var portNum = Math.floor(pin / 8);
-      
+
       if (value === Pin.HIGH) {
         // Set the bit
         this._digitalPort[portNum] |= (value << (pin % 8));
@@ -614,6 +621,7 @@
       trsp.on(TransportEvent.MESSAGE, this._messageHandler);
       trsp.on(TransportEvent.ERROR, this._errorHandler);
       trsp.on(TransportEvent.CLOSE, this._closeHandler);
+      trsp.on(TransportEvent.REOPEN, this._reOpenHandler);
       this._transport = trsp;
     }
   };

src/core/Transport.js

@@ -13,34 +13,40 @@
     proto;
 
   var TransportEvent = {
-
     /**
      * Fires when a transport is opened.
-     * 
+     *
      * @event TransportEvent.OPEN
      */
-    OPEN: 'open',
+    OPEN: "open",
 
     /**
      * Fires when a transport receives a message.
-     * 
+     *
      * @event TransportEvent.MESSAGE
      */
-    MESSAGE: 'message',
+    MESSAGE: "message",
 
     /**
      * Fires when a transport get an error.
-     * 
+     *
      * @event TransportEvent.ERROR
      */
-    ERROR: 'error',
+    ERROR: "error",
 
     /**
      * Fires when a transport is closed.
-     * 
+     *
      * @event TransportEvent.CLOSE
      */
-    CLOSE: 'close'
+    CLOSE: "close",
+
+    /**
+     * Fires when a transport is re-opened.
+     *
+     * @event TransportEvent.REOPEN
+     */
+    REOPEN: "reopen"
   };
 
   /**

src/transport/MqttTransport.js

@@ -97,6 +97,10 @@
 
   function detectStatusChange(self, newStatus, oldStatus) {
     if (newStatus === oldStatus) {
+      if (newStatus === STATUS.OK) {
+        // Device reconnected
+        self.emit(TransportEvent.REOPEN);
+      }
       return;
     }
 

src/transport/NodeMqttTransport.js

@@ -99,6 +99,10 @@ function onMessage(topic, message) {
 
 function detectStatusChange(self, newStatus, oldStatus) {
   if (newStatus === oldStatus) {
+    if (newStatus === STATUS.OK) {
+      // Device reconnected
+      self.emit(TransportEvent.REOPEN);
+    }
     return;
   }
 
@@ -109,10 +113,7 @@ function detectStatusChange(self, newStatus, oldStatus) {
   }
 }
 
-function onDisconnect(err) {
-  if (err && !this._options.autoReconnect) {
-    this.emit(TransportEvent.ERROR, err);
-  }
+function onDisconnect() {
   if (this._client.disconnecting || !this._options.autoReconnect) {
     this._client.removeAllListeners();
     delete this._client;