@@ -7,96 +7,118 @@ var messageKeys = require('message_keys');

 var sid;

 var status;

 var retry;

-retry=0;

+retry = 1;

-function authenticate() {

-  var response;

-  sid="";

-  console.log('---- authenticate');

-  console.log('-- '+localStorage.getItem('username'));

-  //console.log('-- '+localStorage.getItem('password'));

-  console.log('-- '+localStorage.getItem('server'));

-  if (localStorage.getItem('username')  && localStorage.getItem('password') && localStorage.getItem('server') ){

-    var username=localStorage.getItem('username');

-    var password=localStorage.getItem('password');

-    var server=localStorage.getItem('server');

-    var url = server + "/webapi/auth.cgi?api=SYNO.API.Auth&method=Login&version=2&account="+username+"&passwd="+password+"&session=SurveillanceStation&format=sid";

+function xhr_to_syno(method, url_path, onload_function, max_retry) {

+  status = "";

+  if (localStorage.getItem('username') && localStorage.getItem('password') && localStorage.getItem('server')) {

+    var username = localStorage.getItem('username');

+    var password = localStorage.getItem('password');

+    var server = localStorage.getItem('server');

+    url = server + url_path;

     var xhr = new XMLHttpRequest();

     xhr.timeout = 3000; // time in milliseconds

-    xhr.open("GET", url,true);

-    

+    xhr.open(method, url, true);

+

     xhr.onload = function () {

       if (xhr.readyState === 4) {

-        retry=0;

-        console.log('------authentication request returned');

-        if(xhr.status == 200) {

-          response = JSON.parse(xhr.responseText);

-          if (response.success == true){

-            sid = response.data.sid;

-          }else{

-  	    console.log('------Authentication failed : '+ response.toString());

-          }

-        }else {

-          console.log('------Request returned error code ' + xhr.status);

-        }

-    

-        if (sid != ""){

-          auth = "";

-          message = "Welcome to Syno Cam Switch ! ready & authenticated";

-               

-          // Build message

-          var dict = {

-            'auth': message,

-          };

-        

-          // Send the message

-          Pebble.sendAppMessage(dict, function(e) {

-            console.log('sent');

-          }, function() {

-            console.log('failed');

-          });

-         

-        }else{

-          console.log('------Unexpected error : authentication is OK but no SID retrieved');

+        retry = 1;

+        console.log('------xhr request returned');

+        if (xhr.status == 200) {

+          onload_function(xhr);

+          return true;

+        } else {

+          console.log('------xhr request returned error code ' + xhr.status);

+          return false;

         }

       }

-    };

+    }

-    xhr.ontimeout = function (e){

+    xhr.ontimeout = function (e) {

       retry++;

-      if (retry<=1){

-        console.log('------Authentication timed out retrying another time ');

-        authenticate();

-      }else{

-        console.log('------Authentication timed out a second time');

+      if (retry < max_retry) {

+        console.log('------xhr timed out retrying another time ');

+        xhr_to_syno(method, url_path, onload_function, max_retry);

+      } else {

+        console.log('------xhr timed out ' + retry + ' time');

         //send back "timeout" to watch

-        auth="";

-        message ="Authentication timed out, verify settings and connectivity";

+        message = "Call to server timed out, verify settings and connectivity";

         // Build message

         var dict = {

-          'auth': message,

+          'status': message,

         };

         // Send the message

-        Pebble.sendAppMessage(dict, function(e) {

+        Pebble.sendAppMessage(dict, function (e) {

           console.log('sent');

-        }, function() {

+        }, function () {

           console.log('failed');

         });

+        return false;

+      }

+    }

+

+  } else {

+    Pebble.showSimpleNotificationOnPebble("DSCam H-S", "You need to set your Synology account and server.");

+  }

+

+}

+

+

+function authenticate() {

+  var response;

+  sid = "";

+  console.log('---- authenticate');

+  if (localStorage.getItem('username') && localStorage.getItem('password') && localStorage.getItem('server')) {

+    var username = localStorage.getItem('username');

+    var password = localStorage.getItem('password');

+    var url_path = "/webapi/auth.cgi?api=SYNO.API.Auth&method=Login&version=2&account=" + username + "&passwd=" + password + "&session=SurveillanceStation&format=sid";

+    var method = "GET";

+    onload_function = function (xhr) {

+      response = JSON.parse(xhr.responseText);

+      if (response.success == true) {

+        sid = response.data.sid;

+        console.log('------Authentication succeeded');

+      } else {

+        console.log('------Authentication failed : ' + response.toString());

       }

     };

-      

-    xhr.send();

-  }else{

+    max_retry = 1;

+    if (xhr_to_syno(method, url_path, onload_function, max_retry) == true) {

+      if (sid != "") {

+        auth = "";

+        message = "Welcome to Syno Cam Switch ! ready & authenticated";

+

+        // Build message

+        var dict = {

+          'auth': message,

+        };

+

+        // Send the message

+        Pebble.sendAppMessage(dict, function (e) {

+          console.log('sent');

+        }, function () {

+          console.log('failed');

+        });

+      } else {

+        console.log('------Unexpected error : authentication is OK but no SID retrieved');

+      }

+    } else {

+      console.log('------Unexpected error : authentication is OK but no SID retrieved');

+    }

+  } else {

     Pebble.showSimpleNotificationOnPebble("DSCam H-S", "You need to set your Synology account and server.");

   }

+

+

 }

+

 function get_status() {

   var response;

-  

+

   if (sid != ""){

     status = "";

     console.log('---- get_status');

@@ -117,7 +139,7 @@ function get_status() {

           if(xhr.status == 200) {

             response = JSON.parse(xhr.responseText);

             if (response.success == true){

-              status=response.data.on;   

+              status = response.data.on;

               var message;

               switch (status) {

                 case true:

@@ -128,12 +150,12 @@ function get_status() {

                   break;

                 default:

                   message = "home mode is unknown !";

-              }      

+              }

               // Build message

               var dict = {

                 'status': message,

               };

-            

+

               // Send the message

               Pebble.sendAppMessage(dict, function(e) {

                 console.log('sent');

@@ -156,12 +178,12 @@ function get_status() {

           console.log('------Get-Status timed out a second time');

           //send back "timeout" to watch

           message ="Get-Status timed out, verify settings and connectivity";

-  

+

           // Build message

           var dict = {

             'status': message,

           };

-  

+

           // Send the message

           Pebble.sendAppMessage(dict, function(e) {

             console.log('sent');

@@ -173,12 +195,12 @@ function get_status() {

       xhr.send();

-      

+

     }else{

       Pebble.showSimpleNotificationOnPebble("DSCam H-S", "You need to set your Synology account and server.");

     }

   }

-      

+

 }

@@ -193,26 +215,26 @@ function switch_home(bool) {

       var password=localStorage.getItem('password');

       var server=localStorage.getItem('server');

       var xhr = new XMLHttpRequest();

-      

+

       url = server + "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=GetInfo&_sid="+sid;

-      

+

       xhr.open("GET", url,false);

       xhr.send();

-  

+

       if(xhr.status == 200) {

         response = JSON.parse(xhr.responseText);

         if (response.success == true){

-          status=response.data.on;   

+          status = response.data.on;

           console.log('------ status:'+status);

           var message;

           var dict;

           if ( status != bool){

             console.log('---- switching home mode to '+ bool);

             url = server + "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=Switch&on="+bool+"&_sid="+sid;

-            

+

             xhr.open("GET", url,false);

             xhr.send();

-        

+

             if(xhr.status == 200) {

               response = JSON.parse(xhr.responseText);

               if (response.success == true){

@@ -226,12 +248,12 @@ function switch_home(bool) {

                     break;

                   default:

                     message = "something happened, try again !";

-                }      

+                }

                 // Build message

                 dict = {

                   'status': message,

                 };

-              

+

                 // Send the message

                 Pebble.sendAppMessage(dict, function(e) {

                   console.log('sent');

@@ -253,18 +275,18 @@ function switch_home(bool) {

                 break;

               default:

                 message = "something happened, try again !";

-            }       

+            }

             // Build message

             dict = {

               'status': message,

             };

-  

+

             // Send the message

             Pebble.sendAppMessage(dict, function(e) {

               console.log('sent');

             }, function() {

               console.log('failed');

-            }); 

+            });

           }

         }

       }else {

@@ -305,6 +327,5 @@ Pebble.addEventListener('appmessage', function(e) {

     default:

       console.log('Sorry. I don\'t understand your request :'+ dict[0]);

   }

-  

-});

+});