Merge branch 'development'

CHANGELOG.md

@@ -1,5 +1,9 @@
 #Changelog
 
+v1.5.14 (17-01-2016)
+--------------------
+- Fix QueueManager broken connection fixer
+
 v1.5.13 (16-01-2016)
 --------------------
 - Fix broken queue [#177](https://github.com/dirkgroenen/mopidy-mopify/issues/177)

dist/index.html

@@ -9,15 +9,15 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="apple-mobile-web-app-capable" content="yes">
 
-        <meta name="version" content="1.5.13">
+        <meta name="version" content="1.5.14">
 
         <link href='https://fonts.googleapis.com/css?family=Roboto+Condensed:400,300,700' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="assets/webfonts/ss-standard.css">
 
         <link href="assets/images/favicon.ico" rel="icon" type="image/x-icon" />
 
 
-        <link rel="stylesheet" type="text/css" href="assets/css/mopidy-mopify-1.5.13.css" /> 
+        <link rel="stylesheet" type="text/css" href="assets/css/mopidy-mopify-1.5.14.css" /> 
 
         <link rel="manifest" href="assets/manifest.json">
     </head>
@@ -55,7 +55,7 @@
 
         <!-- Grunt will handle this part -->
 
-        <script type="text/javascript" src="assets/mopidy-mopify-1.5.13.js"></script> 
+        <script type="text/javascript" src="assets/mopidy-mopify-1.5.14.js"></script> 
 
         <script>
           (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

mopidy_mopify/__init__.py

@@ -15,7 +15,7 @@
 
 from mopidy import config, ext
 
-__version__ = '1.5.13'
+__version__ = '1.5.14'
 __ext_name__ = 'mopify'
 __verbosemode__ = False
 

mopidy_mopify/static/debug/index.html

@@ -9,7 +9,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="apple-mobile-web-app-capable" content="yes">
 
-        <meta name="version" content="1.5.13">
+        <meta name="version" content="1.5.14">
 
         <link href='https://fonts.googleapis.com/css?family=Roboto+Condensed:400,300,700' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="assets/webfonts/ss-standard.css">

mopidy_mopify/static/debug/src/app/services/queuemanager.service.js

@@ -17,6 +17,7 @@ angular.module('mopify.services.queuemanager', ['mopify.services.settings']).fac
     // Setup websoclet
     var protocol = typeof document !== 'undefined' && document.location.protocol === 'https:' ? 'wss://' : 'ws://';
     var ws;
+    var recoveringDelay = 1000;
     /**
      * Send a request to the server's queuemanager class
      *
@@ -94,13 +95,42 @@ angular.module('mopify.services.queuemanager', ['mopify.services.settings']).fac
       var self = this;
       $timeout(function () {
         if (ws.readyState === 1) {
+          console.info('Websocket: connection ready');
           wsconnection = true;
           handleWaitlist();
         } else {
           self.checkConnectionReady();
         }
       }, 200);
     };
+    /**
+     * Start revovering the websocket
+     * @return {[type]} [description]
+     */
+    QueueManager.prototype.startRecovering = function () {
+      var that = this;
+      if (ws !== undefined) {
+        this.closeWebsocketConnection();
+      }
+      $timeout(function () {
+        that.setupWebsocket();
+      }, recoveringDelay);
+      recoveringDelay = recoveringDelay + 1000;
+    };
+    /**
+     * Formarly close the current websocket connection
+     * @return {[type]} [description]
+     */
+    QueueManager.prototype.closeWebsocketConnection = function () {
+      ws.onopen = function () {
+      };
+      ws.onclose = function () {
+      };
+      ws.onerror = function () {
+      };
+      ws.onmessage = function () {
+      };
+    };
     /**
      * Setup all the data needed for the websocket communication
      *
@@ -116,15 +146,8 @@ angular.module('mopify.services.queuemanager', ['mopify.services.settings']).fac
       // Set connection to false on close
       ws.onclose = function () {
         wsconnection = false;
-        $timeout(function () {
-          that.setupWebsocket();
-        }, 2000);
-      };
-      ws.onerror = function (evt) {
-        wsconnection = false;
-        $timeout(function () {
-          that.setupWebsocket();
-        }, 2000);
+        ws.close();
+        that.startRecovering();
       };
       // Handle incoming messages
       ws.onmessage = function (evt) {

mopidy_mopify/static/min/index.html

@@ -9,15 +9,15 @@
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="apple-mobile-web-app-capable" content="yes">
 
-        <meta name="version" content="1.5.13">
+        <meta name="version" content="1.5.14">
 
         <link href='https://fonts.googleapis.com/css?family=Roboto+Condensed:400,300,700' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="assets/webfonts/ss-standard.css">
 
         <link href="assets/images/favicon.ico" rel="icon" type="image/x-icon" />
 
 
-        <link rel="stylesheet" type="text/css" href="assets/css/mopidy-mopify-1.5.13.css" /> 
+        <link rel="stylesheet" type="text/css" href="assets/css/mopidy-mopify-1.5.14.css" /> 
 
         <link rel="manifest" href="assets/manifest.json">
     </head>
@@ -55,7 +55,7 @@
 
         <!-- Grunt will handle this part -->
 
-        <script type="text/javascript" src="assets/mopidy-mopify-1.5.13.js"></script> 
+        <script type="text/javascript" src="assets/mopidy-mopify-1.5.14.js"></script> 
 
         <script>
           (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mopidy-mopify",
   "author": "Dirk Groenen",
-  "version": "1.5.13",
+  "version": "1.5.14",
   "description": "Webclient for Mopidy",
   "repository": "https://github.com/dirkgroenen/mopidy-mopify",
   "licenses": {

src/app/services/queuemanager.service.js

@@ -17,6 +17,7 @@ angular.module("mopify.services.queuemanager", [
     // Setup websoclet
     var protocol = (typeof document !== "undefined" && document.location.protocol === "https:") ? "wss://" : "ws://";
     var ws;
+    var recoveringDelay = 1000;
 
     /**
      * Send a request to the server's queuemanager class
@@ -111,6 +112,7 @@ angular.module("mopify.services.queuemanager", [
 
         $timeout(function(){
             if(ws.readyState === 1){
+                console.info("Websocket: connection ready");
                 wsconnection = true;
                 handleWaitlist();
             }
@@ -120,6 +122,35 @@ angular.module("mopify.services.queuemanager", [
         }, 200);
     };
 
+    /**
+     * Start revovering the websocket
+     * @return {[type]} [description]
+     */
+    QueueManager.prototype.startRecovering = function(){
+        var that = this;
+
+        if(ws !== undefined){
+            this.closeWebsocketConnection();
+        }
+
+        $timeout(function(){
+            that.setupWebsocket();
+        }, recoveringDelay);
+
+        recoveringDelay = recoveringDelay + 1000;
+    };
+
+    /**
+     * Formarly close the current websocket connection
+     * @return {[type]} [description]
+     */
+    QueueManager.prototype.closeWebsocketConnection = function(){
+        ws.onopen = function(){};
+        ws.onclose = function(){};
+        ws.onerror = function(){};
+        ws.onmessage = function(){};
+    };
+
     /**
      * Setup all the data needed for the websocket communication
      *
@@ -138,18 +169,8 @@ angular.module("mopify.services.queuemanager", [
         // Set connection to false on close
         ws.onclose = function(){
             wsconnection = false;
-
-            $timeout(function(){
-                that.setupWebsocket();
-            }, 2000);
-        };
-
-        ws.onerror = function(evt) {
-            wsconnection = false;
-
-            $timeout(function(){
-                that.setupWebsocket();
-            }, 2000);
+            ws.close();
+            that.startRecovering();
         };
 
         // Handle incoming messages