Set retry interval for socket connection

2 files changed, 44 insertions, 42 deletions

diff --git a/js/bitcoin_pos.js b/js/bitcoin_pos.js
index 396a371e..9a2ac153 100644
--- a/js/bitcoin_pos.js
+++ b/js/bitcoin_pos.js
@@ -1,4 +1,5 @@
 $(function() {
+  var websocket = null;
   var address = getParameterByName('address');
   var exchange = 0;
 
@@ -9,6 +10,7 @@ $(function() {
   $('div.container-fluid').css('width', Math.min(screen.width, 600) + 'px');
   $('#address').html(address);
   setupQR();
+  setInterval(setupSocket, 5000);
 
   $.getJSON('ticker.json', function (data) {
     exchange = 1000 / data.out;
@@ -16,13 +18,13 @@ $(function() {
     exchange = Math.ceil(exchange * 100) / 100;
     $('#exchange').val(exchange.toFixed(2));
     updateTotal();
-    setupSocket();
   });
 
   $('#amount').keyup(updateTotal);
   $('#amount').focus();
   $('#amount').focus(function() {
     $('#received').hide();
+    $('#payment').fadeIn('slow');
     $(this).val('');
     updateTotal();
   });
@@ -31,55 +33,57 @@ $(function() {
     var amount = parseFloat($('#amount').val());
     var total = amount / exchange;
     total = Math.ceil(total * 10000) / 10000;
-    if (!$.isNumeric(total) || total == 0) {
-      $('#payment').fadeOut('slow');
-    } else {
-      $('#payment').fadeIn('slow');
-      $('#total').html(total.toString());
-      displayQR('bitcoin:' + address + '?amount=' + total.toString());
+
+    if (!$.isNumeric(total)) {
+      total = '';
     }
+
+    $('#total').html(total.toString());
+    displayQR('bitcoin:' + address + '?amount=' + total.toString());
   }
 
   function setupSocket() {
-    var websocket = new ReconnectingWebSocket("ws://api.blockchain.info:8335/inv");
+    if (!websocket || websocket.readystate != 1) {
+      websocket = new WebSocket("ws://api.blockchain.info:8335/inv");
 
-    websocket.onopen = function() { 
-      websocket.send('{"op":"addr_sub", "addr":"' + address + '"}');
-    }
+      websocket.onopen = function() { 
+        websocket.send('{"op":"addr_sub", "addr":"' + address + '"}');
+      }
 
-    websocket.onmessage = function(e) { 
-      var results = eval('(' + e.data + ')');
-      var from_address = '';
-      var total = 0;
-      var received = 0;
-      
-      $.each(results.x.out, function(i, v) {
-        if (v.addr == address) {
-          received += v.value / 100000000;
-        }
-      });
+      websocket.onmessage = function(e) { 
+        var results = eval('(' + e.data + ')');
+        var from_address = '';
+        var total = 0;
+        var received = 0;
+        
+        $.each(results.x.out, function(i, v) {
+          if (v.addr == address) {
+            received += v.value / 100000000;
+          }
+        });
+
+        $.each(results.x.inputs, function(i, v) {
+          from_address = v.prev_out.addr
+          if (v.prev_out.addr == address) {
+            input -= v.prev_out.value / 100000000;
+          }
+        });
 
-      $.each(results.x.inputs, function(i, v) {
-        from_address = v.prev_out.addr
-        if (v.prev_out.addr == address) {
-          input -= v.prev_out.value / 100000000;
+        if (total <= received) {
+          $('#amount').blur();
+          $('#payment').hide();
+          $('#received').fadeIn('slow');
         }
-      });
 
-      if (total <= received) {
-        $('#amount').blur();
-        $('#payment').hide();
-        $('#received').fadeIn('slow');
+        $.get('record_transaction.php',
+          { 
+            address: from_address,
+            date: moment().format("YYYY-MM-DD HH:mm:ss"),
+            received: received,
+            exchange: exchange
+          }
+        );
       }
-
-      $.get('record_transaction.php',
-        { 
-          address: from_address,
-          date: moment().format("YYYY-MM-DD HH:mm:ss"),
-          received: received,
-          exchange: exchange
-        }
-      );
     }
   }
 });
diff --git a/js/reconnecting-websocket.min.js b/js/reconnecting-websocket.min.js
deleted file mode 100644
index cf29747e..00000000
--- a/js/reconnecting-websocket.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// https://github.com/joewalnes/reconnecting-websocket/
-function ReconnectingWebSocket(a){function f(g){c=new WebSocket(a);if(b.debug||ReconnectingWebSocket.debugAll){console.debug("ReconnectingWebSocket","attempt-connect",a)}var h=c;var i=setTimeout(function(){if(b.debug||ReconnectingWebSocket.debugAll){console.debug("ReconnectingWebSocket","connection-timeout",a)}e=true;h.close();e=false},b.timeoutInterval);c.onopen=function(c){clearTimeout(i);if(b.debug||ReconnectingWebSocket.debugAll){console.debug("ReconnectingWebSocket","onopen",a)}b.readyState=WebSocket.OPEN;g=false;b.onopen(c)};c.onclose=function(h){clearTimeout(i);c=null;if(d){b.readyState=WebSocket.CLOSED;b.onclose(h)}else{b.readyState=WebSocket.CONNECTING;if(!g&&!e){if(b.debug||ReconnectingWebSocket.debugAll){console.debug("ReconnectingWebSocket","onclose",a)}b.onclose(h)}setTimeout(function(){f(true)},b.reconnectInterval)}};c.onmessage=function(c){if(b.debug||ReconnectingWebSocket.debugAll){console.debug("ReconnectingWebSocket","onmessage",a,c.data)}b.onmessage(c)};c.onerror=function(c){if(b.debug||ReconnectingWebSocket.debugAll){console.debug("ReconnectingWebSocket","onerror",a,c)}b.onerror(c)}}this.debug=false;this.reconnectInterval=1e3;this.timeoutInterval=2e3;var b=this;var c;var d=false;var e=false;this.url=a;this.readyState=WebSocket.CONNECTING;this.URL=a;this.onopen=function(a){};this.onclose=function(a){};this.onmessage=function(a){};this.onerror=function(a){};f(a);this.send=function(d){if(c){if(b.debug||ReconnectingWebSocket.debugAll){console.debug("ReconnectingWebSocket","send",a,d)}return c.send(d)}else{throw"INVALID_STATE_ERR : Pausing to reconnect websocket"}};this.close=function(){if(c){d=true;c.close()}};this.refresh=function(){if(c){c.close()}}}ReconnectingWebSocket.debugAll=false