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

@@ -19,7 +19,6 @@

       "watchface": false

     },

     "messageKeys": [

-      "auth",

       "status",

       "server",

       "username",

@@ -9,8 +9,7 @@ const uint32_t inbox_size = 64;

 const uint32_t outbox_size = 64;

-static char s_auth[60];

-static char s_api[40];

+static char s_api[60];

 static char s_api_short[22];

 static char s_username[40];

 static char s_password[40];

@@ -206,7 +205,7 @@ static void update_time() {

 void comm_is_ready() {

-  // Authenticate to get token from syno

+  // Trigger timed home mode (15 min)

   // Declare the dictionary's iterator

   DictionaryIterator *out_iter;

@@ -216,15 +215,13 @@ void comm_is_ready() {

   if(result == APP_MSG_OK) {

     // Add an item to ask for weather data

-    msg = "auth";

+    msg = "timed";

     dict_write_cstring(out_iter, status, msg);

     // Send this message

     result = app_message_outbox_send();

     if(result != APP_MSG_OK) {

       APP_LOG(APP_LOG_LEVEL_ERROR, "Error sending the outbox: %d", (int)result);

-    }else{

-      text_layer_set_text(s_text_layer, "Authenticating...");

     }

   } else {

     // The outbox cannot be used right now

@@ -259,28 +256,14 @@ static void inbox_received_callback(DictionaryIterator *iter, void *context) {

     APP_LOG(APP_LOG_LEVEL_DEBUG, "received jsready message on watch... ");

   }

-  // Read Auth returns

-  Tuple *auth_tuple = dict_find(iter, MESSAGE_KEY_auth);

-

-  if(auth_tuple) {

-    strncpy(s_auth, auth_tuple->value->cstring, 60);

-    // Display in the TextLayer

-    text_layer_set_text(s_text_layer, s_auth);

-    if(strcmp(s_auth, "Authentication failed")==0){

-      vibes_long_pulse();

-    }

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "Auth message received ... ");

-  }else{

-    APP_LOG(APP_LOG_LEVEL_DEBUG, "not auth message... ");

-  }

-

   // Read API returns

   Tuple *api_tuple = dict_find(iter, MESSAGE_KEY_status);

   if(api_tuple) {

-    strncpy(s_api, api_tuple->value->cstring, 40);

+    strncpy(s_api, api_tuple->value->cstring, 60);

     // Display in the TextLayer

     text_layer_set_text(s_text_layer, s_api);

+    // Vibrating depending of returns, not everytime

     strncpy(s_api_short, s_api, 22);

     if(strcmp(s_api_short, "Home mode is ON")==0){

       vibes_short_pulse();

@@ -5,7 +5,7 @@ const jsSHA = require('./sha');

 var messageKeys = require('message_keys');

-var sid;

+var sid="";

 var status;

 var retry;

 retry = 0;

@@ -46,11 +46,12 @@ function leftpad(str, len, pad) {

 }

 function getOtp() {

+    send_message_to_watch("Authenticating..")

     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)

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

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

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

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

         return false;

     } else {

@@ -90,66 +91,27 @@ function xhr_to_syno(method, url_path, onload_function, max_retry, timeout) {

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

+                } else if (xhr.status == 407) { // IP blocked by syno (or by syno Firewall)

+                    console.log('------xhr status 407 IP blocked by syno (or by syno Firewall) ');

                     onload_function(xhr);

                     return false;

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

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

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

+                    console.log('------xhr status wrong user or password ');

+                    onload_function(xhr);

+                    return false;

+                } else if (xhr.status == 404) { //wrong OTP

+                    console.log('------xhr status 404 wrong OTP ');

                     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

-                        message = "Time out (" + retry + "), retrying...";

-

-                        // Build message

-                        var dict = {

-                            'status': message,

-                        };

-

-                        // Send the message

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

-                            console.log('sent');

-                        }, function () {

-                            console.log('failed');

-                        });

-

-                        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

-                        message = "Time out " + retry + " times, verify settings and connectivity";

-

-                        // Build message

-                        var dict = {

-                            'status': message,

-                        };

-

-                        // Send the message

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

-                            console.log('sent');

-                        }, function () {

-                            console.log('failed');

-                        });

-                        return false;

-                    }

-                } else { //timeout ?

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

+                    //send back "timeout" to watch

+                    message = "Time out";

+                    send_message_to_watch(message)

+                } else { // why would this happen?

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

                     message = "Error (XHR" + xhr.status + ")";

-                    // Build message

-                    var dict = {

-                        'status': message,

-                    };

-

-                    // Send the message

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

-                        console.log('sent');

-                    }, function () {

-                        console.log('failed');

-                    });

+                    send_message_to_watch(message)

                     return false;

                 }

             } else {

@@ -169,20 +131,23 @@ function xhr_to_syno(method, url_path, onload_function, max_retry, timeout) {

 }

-

-function authenticate() {

+function authenticate(action_callback) {    

+    send_message_to_watch("Authenticating.")

     var response;

-    sid = "";

+    sid = ""; //re-use sid from another session (7 days before expiry)

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

     if (JSON.parse(localStorage.getItem('clay-settings')).username && JSON.parse(localStorage.getItem('clay-settings')).password) {

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

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

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

-        console.log('-- password:' + password.substring(0, 1) + '...');

         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 () {

+                    send_message_to_watch("Authenticating...");

+                    home_mode_handler(action_callback);

+                    }

+                    ,4000);

                 return false

             }

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

@@ -195,31 +160,13 @@ function authenticate() {

                 sid = response.data.sid;

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

                 if (sid != "") {

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

-                    });

-                    timed_switch_home(15 * 60);

+                    message = "Authenticated";

+                    send_message_to_watch(message)

+                    home_mode_handler(action_callback);

                 } else {

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

                     message = "Auth error, no SID";

-                    // Build message

-                    var dict = {

-                        'auth': message,

-                    };

-                    // Send the message

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

-                        console.log('sent');

-                    }, function () {

-                        console.log('failed');

-                    });

+                    send_message_to_watch(message)

                 }

             } else {

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

@@ -229,20 +176,15 @@ function authenticate() {

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

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

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

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

+                    console.log('------Authentication failed because of IP Blocked');

+                    message = "Authentication failed, IP is blocked";

                 }

-                // Build message

-                var dict = {

-                    'auth': message,

-                };

-                // Send the message

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

-                    console.log('sent');

-                }, function () {

-                    console.log('failed');

-                });

+                send_message_to_watch(message)

             }

-        };

-        max_retry = 1;

+        };        

+        send_message_to_watch("Authenticating....");

+        max_retry = 0;

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

     } else {

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

@@ -253,7 +195,6 @@ function authenticate() {

 }

-

 function get_status() {

     var response;

@@ -282,131 +223,93 @@ function get_status() {

             } else {

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

             }

-            // Build message

-            var dict = {

-                'status': message,

-            };

-

-            // Send the message

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

-                console.log('sent');

-            }, function () {

-                console.log('failed');

-            });

+            send_message_to_watch(message)

         }

         max_retry = 10;

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

     } else {

-        authenticate();        

-        get_status();

+        authenticate("get");

     }

 }

-

-function timed_switch_home(duration) {

+function home_mode_handler(action) {

     var response;

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

+    var duration = 15 * 60

     if (sid != "") {

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

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

-        timed_switch_home(duration)

-    }

-

-}

-

-function switch_home(bool) {

-    var response;

-    if (sid != "") {

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

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

-        var start_ts = epoch + 10

-        switch (bool) {

-            case true:

+        var start_ts = epoch + 10;

+        method = "GET";

+        max_retry = 0;

+        

+        switch (action) {

+            case "home_on":

+                send_message_to_watch("Setting Home Mode to ON")

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

                 break;

-            case false:

+            case "home_off":

+                send_message_to_watch("Setting Home Mode to OFF")

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

                 break;

+            case "timed":

+                send_message_to_watch("Temporary setting Home Mode to ON")

+                var end_ts = duration + start_ts

+                var d = new Date(end_ts * 1000)

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

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

+                break;

             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) {

             response = JSON.parse(xhr.responseText);

+            console.log(response.success);

             if (response.success == true) {

-                switch (bool) {

-                    case true:

+                switch (action) {

+                    case "home_on":

                         message = "Home mode is ON (camera is off)";

                         break;

-                    case false:

+                    case "home_off":

                         message = "Home mode is OFF (camera is on)";

                         break;

+                    case "timed":

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

+                        break;

                     default:

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

                 }

             } else {

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

             }

-            // Build message

-            dict = {

-                'status': message,

-            };

-

-            // Send the message

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

-                console.log('sent');

-            }, function () {

-                console.log('failed');

-            });

+            send_message_to_watch(message)

         }

-        max_retry = 10;

+        max_retry = 0;

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

     } else {

-        authenticate();

-        switch_home(bool);

+        authenticate(action);

     }

 }

+function send_message_to_watch(message){

+    // Build message

+    var dict = {

+        'status': message,

+    };

+    console.log('DSCam Home-Switch: -- message to sent to watch:'+JSON.stringify(dict));

+    // Send the message

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

+        console.log('DSCam Home-Switch: -- message sent to watch');

+    }, function () {

+        console.log('DSCam Home-Switch: -- Failed to message sent to watch');

+    });

+}

 // Get JS readiness events

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

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

@@ -414,28 +317,25 @@ Pebble.addEventListener('ready', function (e) {

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

     // Update Watch on this

     Pebble.sendAppMessage({ 'JSReady': 1 });

+    send_message_to_watch("Welcome !")

 });

 // Get AppMessage events

 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':

-            if (!authenticate()){

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

-                setTimeout(authenticate(),1000);

-            }

-            break;

         case 'get':

             get_status();

             break;

+        case 'timed':

+            home_mode_handler("timed"); 

+            break;

         case 'home_on':

-            switch_home(true);

+            home_mode_handler("home_on");

             break;

         case 'home_off':

-            switch_home(false);

+            home_mode_handler("home_off");

             break;

         default:

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