Binary files a/build/synocam_home_switch.pbw and b/build/synocam_home_switch.pbw differ

@@ -50,18 +50,24 @@ function getOtp() {

         //console.log('-- seed:' + JSON.parse(localStorage.getItem('clay-settings')).OTP_seed)

         //console.log('-- key:' + key)

     var epoch = Math.round(new Date().getTime() / 1000.0);

-    var time = leftpad(dec2hex(Math.floor(epoch / 30)), 16, '0');

-    // updated for jsSHA v2.0.0 - http://caligatio.github.io/jsSHA/

-    var shaObj = new jsSHA("SHA-1", "HEX");

-    shaObj.setHMACKey(key, "HEX");

-    shaObj.update(time);

-    var hmac = shaObj.getHMAC("HEX");

-    //console.log('-- hmac:' + hmac)

-    var offset = hex2dec(hmac.substring(hmac.length - 1));

-    //console.log('--offset:' + offset)

-    var otp = (hex2dec(hmac.substring(offset * 2, offset * 2 + 8)) & hex2dec('7fffffff')) + '';

-    otp = (otp).substring(otp.length - 6, otp.length);

-    return otp

+    if ((30-(epoch % 30))<10){

+        console.log('------- waiting for new TOTP,'+ epoch);

+	return false;

+    }else{

+        var time = leftpad(dec2hex(Math.floor(epoch / 30)), 16, '0');

+        // updated for jsSHA v2.0.0 - http://caligatio.github.io/jsSHA/

+        var shaObj = new jsSHA("SHA-1", "HEX");

+        shaObj.setHMACKey(key, "HEX");

+        shaObj.update(time);

+        var hmac = shaObj.getHMAC("HEX");

+        //console.log('-- hmac:' + hmac)

+        var offset = hex2dec(hmac.substring(hmac.length - 1));

+        //console.log('--offset:' + offset)

+        var otp = (hex2dec(hmac.substring(offset * 2, offset * 2 + 8)) & hex2dec('7fffffff')) + '';

+        otp = (otp).substring(otp.length - 6, otp.length);

+        console.log('------- TOTP ' + otp + ' is expiring in ' + (30-(epoch % 30)));

+        return otp

+    }

 }

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

@@ -146,7 +152,10 @@ function xhr_to_syno(method, url_path, onload_function, max_retry) {

                     });

                     return false;

                 }

-            }

+            } else {

+                console.log('------xhr readyState ' + xhr.readyState );

+

+	    }

         };

         xhr.ontimeout = function(e) {

@@ -173,6 +182,10 @@ function authenticate() {

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

         if (JSON.parse(localStorage.getItem('clay-settings')).OTP_enabled) {

             var otp_code = getOtp()

+            if (!otp_code) {

+                setTimeout(function(){authenticate()},1000);

+		return true;

+	    }

             console.log('-- otp_code is :' + otp_code)

             url_path = url_path + "&otp_code=" + otp_code

         }

@@ -211,7 +224,13 @@ function authenticate() {

                 }

             } else {

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

-                message = "Authentication failed";

+		    if (response.error.code==400){

+		        console.log('------Authentication failed because of wrong creds');

+                        message = "Authentication failed, check your credentials";

+		    }else if(response.error.code==404){

+			console.log('------Authentication failed because of wrong TOTP');

+                        message = "Authentication failed, check your TOTP seed";

+		    }

                 // Build message

                 var dict = {

                     'auth': message,

@@ -224,7 +243,7 @@ function authenticate() {

                 });

             }

         };

-        max_retry = 10;

+        max_retry = 1;

         xhr_to_syno(method, url_path, onload_function, max_retry);

     } else {

         console.log("--- failed to get settings");

@@ -331,7 +350,6 @@ function timed_switch_home(duration) {

 function switch_home(bool) {

     var response;

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

     if (sid != "") {

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

         var epoch = Math.round(new Date().getTime() / 1000.0);

@@ -419,4 +437,4 @@ Pebble.addEventListener('appmessage', function(e) {

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

     }

-});

\ No newline at end of file

+});