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

new file mode 100644

@@ -0,0 +1,12 @@

+{

+  "name": "dscam-h-s",

+  "version": "1.2.0",

+  "lockfileVersion": 2,

+  "requires": true,

+  "packages": {

+    "node_modules/pebble-clay": {

+      "version": "1.0.4",

+      "license": "MIT"

+    }

+  }

+}

new file mode 100644

@@ -0,0 +1,24 @@

+{

+  "name": "dscam-h-s",

+  "version": "1.2.0",

+  "lockfileVersion": 2,

+  "requires": true,

+  "packages": {

+    "": {

+      "name": "dscam-h-s",

+      "version": "1.2.0",

+      "dependencies": {

+        "pebble-clay": "^1.0.4"

+      }

+    },

+    "node_modules/pebble-clay": {

+      "version": "1.0.4",

+      "license": "MIT"

+    }

+  },

+  "dependencies": {

+    "pebble-clay": {

+      "version": "1.0.4"

+    }

+  }

+}

@@ -47,13 +47,13 @@ function leftpad(str, len, pad) {

 function getOtp() {

     key = base32tohex(JSON.parse(localStorage.getItem('clay-settings')).OTP_seed)

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

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

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

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

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

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

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

-	return false;

-    }else{

+    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");

@@ -65,41 +65,41 @@ function getOtp() {

         //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)));

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

         return otp

     }

 }

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

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

     console.log('------xhr start')

     status = "";

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

         var server = JSON.parse(localStorage.getItem('clay-settings')).server

         url = server + url_path;

         var xhr = new XMLHttpRequest();

-        xhr.timeout = 120000; // time in milliseconds

+        xhr.timeout = timeout; // time in milliseconds

         xhr.open(method, url, true);

         console.log('------xhr opened')

-        xhr.onreadystatechange = function() {

+        xhr.onreadystatechange = function () {

             console.log('------xhr onreadystatechange')

             if (xhr.readyState === 4) {

                 retry = 0;

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

                 if (xhr.status == 200) {

-                  console.log('------xhr status 200 ');

-                  onload_function(xhr);

-                  return true;

-                } else if(xhr.status == 407){ //blocked by proxy (and syno Firewall too)

-                  console.log('------xhr status 407 blocked by proxy (and syno Firewall too) ');

-                  onload_function(xhr);

-                  return false;

-                } else if(xhr.status >= 400){ //wrong credentials

-                  console.log('------xhr status 401 wrong credentials ');

-                  onload_function(xhr);

-                  return false;

-                } else if(xhr.status == 0){ //timeout

-                  retry++;

+                    console.log('------xhr status 200 ');

+                    onload_function(xhr);

+                    return true;

+                } else if (xhr.status == 407) { //blocked by proxy (and syno Firewall too)

+                    console.log('------xhr status 407 blocked by proxy (and syno Firewall too) ');

+                    onload_function(xhr);

+                    return false;

+                } else if (xhr.status >= 400) { //wrong credentials

+                    console.log('------xhr status 401 wrong credentials ');

+                    onload_function(xhr);

+                    return false;

+                } else if (xhr.status == 0) { //timeout

+                    retry++;

                     if (retry < max_retry) {

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

                         //send back "timeout" to watch

@@ -111,13 +111,13 @@ function xhr_to_syno(method, url_path, onload_function, max_retry) {

                         };

                         // Send the message

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

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

                             console.log('sent');

-                        }, function() {

+                        }, function () {

                             console.log('failed');

                         });

-                        setTimeout(function() { xhr_to_syno(method, url_path, onload_function, max_retry) }, 60000 * retry);

+                        setTimeout(function () { xhr_to_syno(method, url_path, onload_function, max_retry, timeout) }, 60000 * retry);

                     } else {

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

                         //send back "timeout" to watch

@@ -129,9 +129,9 @@ function xhr_to_syno(method, url_path, onload_function, max_retry) {

                         };

                         // Send the message

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

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

                             console.log('sent');

-                        }, function() {

+                        }, function () {

                             console.log('failed');

                         });

                         return false;

@@ -145,21 +145,21 @@ function xhr_to_syno(method, url_path, onload_function, max_retry) {

                     };

                     // Send the message

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

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

                         console.log('sent');

-                    }, function() {

+                    }, function () {

                         console.log('failed');

                     });

                     return false;

                 }

             } else {

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

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

-	    }

+            }

         };

-        xhr.ontimeout = function(e) {

-            

+        xhr.ontimeout = function (e) {

+

         };

         xhr.send(null);

@@ -183,14 +183,13 @@ function authenticate() {

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

             var otp_code = getOtp()

             if (!otp_code) {

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

-		return true;

-	    }

+                return false

+            }

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

             url_path = url_path + "&otp_code=" + otp_code

         }

         var method = "GET";

-        onload_function = function(xhr) {

+        onload_function = function (xhr) {

             response = JSON.parse(xhr.responseText);

             if (response.success == true) {

                 sid = response.data.sid;

@@ -202,12 +201,12 @@ function authenticate() {

                         'auth': message,

                     };

                     // Send the message

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

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

                         console.log('sent');

-                    }, function() {

+                    }, function () {

                         console.log('failed');

                     });

-                    timed_switch_home(15*60);

+                    timed_switch_home(15 * 60);

                 } else {

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

                     message = "Auth error, no SID";

@@ -216,39 +215,40 @@ function authenticate() {

                         'auth': message,

                     };

                     // Send the message

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

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

                         console.log('sent');

-                    }, function() {

+                    }, function () {

                         console.log('failed');

                     });

                 }

             } else {

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

-		    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";

-		    }

+                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,

                 };

                 // Send the message

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

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

                     console.log('sent');

-                }, function() {

+                }, function () {

                     console.log('failed');

                 });

             }

         };

         max_retry = 1;

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

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

     } else {

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

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

     }

+    return true

 }

@@ -264,7 +264,7 @@ function get_status() {

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

         var method = "GET";

-        onload_function = function(xhr) {

+        onload_function = function (xhr) {

             response = JSON.parse(xhr.responseText);

             if (response.success == true) {

                 status = response.data.on;

@@ -288,18 +288,18 @@ function get_status() {

             };

             // Send the message

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

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

                 console.log('sent');

-            }, function() {

+            }, function () {

                 console.log('failed');

             });

         }

         max_retry = 10;

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

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

     } else {

-        authenticate();

+        authenticate();        

         get_status();

     }

@@ -307,44 +307,45 @@ function get_status() {

 function timed_switch_home(duration) {

-  var response;

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

-  if (sid != "") {

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

-    var start_ts = epoch + 10

-    var end_ts = duration + start_ts

-    var d= new Date(end_ts*1000)

-    var end_time = d.getHours()+":"+d.getMinutes()+":"+d.getSeconds();

-    console.log('---- switching home mode for ' + duration + 'seconds, until '+end_time);

-    url_path = "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=SaveOneTimeSwitch&onetime_enable_on=true&onetime_disable_on=true&onetime_enable_time=" + start_ts + "&onetime_disable_time=" + end_ts + "&_sid=" + sid;

-    method = "GET"

-    onload_switch_function = function (xhr) {

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

-      if (response.success == true) {

-          message = "Home mode is ON until "+end_time;

-      }else{

-        message = "something happened, try again ! (S200)";

-      }

-      // Build message

-      dict = {

-        'status': message,

-      };

-

-      // Send the message Home mode is ON for 900 seconds

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

-        console.log('sent \"'+message+'\"');

-      }, function () {

-        console.log('failed');

-      });

-    }

-    max_retry = 10;

-    xhr_to_syno(method, url_path, onload_switch_function, max_retry);

+    var response;

+    console.log('---- timed switch');

+    if (sid != "") {

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

+        var start_ts = epoch + 10

+        var end_ts = duration + start_ts

+        var d = new Date(end_ts * 1000)

+        var end_time = d.toLocaleTimeString("fr-FR",{timestyle:'short'});

+        console.log('---- switching home mode for ' + duration + 'seconds, until ' + end_time);

+        url_path = "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=SaveOneTimeSwitch&onetime_enable_on=true&onetime_disable_on=true&onetime_enable_time=" + start_ts + "&onetime_disable_time=" + end_ts + "&_sid=" + sid;

+        method = "GET"

+        onload_switch_function = function (xhr) {

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

+            if (response.success == true) {

+                message = "Home mode is ON until " + end_time;

+            } else {

+                message = "something happened, try again ! (S200)";

+                console.log('---- ' + message + ' ' + xhr.responseText)

+            }

+            // Build message

+            dict = {

+                'status': message,

+            };

+            // Send the message Home mode is ON for 900 seconds

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

+                console.log('sent \"' + message + '\"');

+            }, function () {

+                console.log('failed');

+            });

+        }

+        max_retry = 10;

+        xhr_to_syno(method, url_path, onload_switch_function, max_retry, 10000);

-  } else {

-    authenticate();

-    switch_home(bool);

-  }

+

+    } else {

+        authenticate();

+        timed_switch_home(duration)

+    }

 }

@@ -364,10 +365,10 @@ function switch_home(bool) {

             default:

                 message = "something happened, try again ! (IMPOSSIBLE)";

         }

-        

+

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

         method = "GET"

-        onload_switch_function = function(xhr) {

+        onload_switch_function = function (xhr) {

             response = JSON.parse(xhr.responseText);

             if (response.success == true) {

                 switch (bool) {

@@ -389,14 +390,14 @@ function switch_home(bool) {

             };

             // Send the message

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

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

                 console.log('sent');

-            }, function() {

+            }, function () {

                 console.log('failed');

             });

         }

         max_retry = 10;

-        xhr_to_syno(method, url_path, onload_switch_function, max_retry);

+        xhr_to_syno(method, url_path, onload_switch_function, max_retry, 10000);

     } else {

@@ -407,7 +408,7 @@ function switch_home(bool) {

 }

 // Get JS readiness events

-Pebble.addEventListener('ready', function(e) {

+Pebble.addEventListener('ready', function (e) {

     console.log("---- local storage:");

     console.log("user " + JSON.parse(localStorage.getItem('clay-settings')).username);

     console.log('PebbleKit JS is ready');

@@ -416,13 +417,16 @@ Pebble.addEventListener('ready', function(e) {

 });

 // Get AppMessage events

-Pebble.addEventListener('appmessage', function(e) {

+Pebble.addEventListener('appmessage', function (e) {

     // Get the dictionary from the message

     var dict = e.payload;

     console.log(dict[0].toString());

     switch (dict[0]) {

         case 'auth':

-            authenticate();

+            if (!authenticate()){

+                console.log("---- waited 1sec:");

+                setTimeout(authenticate(),1000);

+            }

             break;

         case 'get':

             get_status();