@@ -1,8 +1,8 @@

 argv = ['/home/louis/.pebble-sdk/SDKs/current/sdk-core/pebble/waf', 'configure']

-environ = {'LC_NUMERIC': 'fr_FR.UTF-8', 'LESSOPEN': '| /usr/bin/lesspipe %s', 'SSH_CLIENT': '172.27.96.1 62789 22', 'LOGNAME': 'louis', 'USER': 'louis', 'PATH': '/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin:/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/bin:/home/louis/.local/bin:/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin', 'LC_PAPER': 'fr_FR.UTF-8', 'HOME': '/home/louis', 'LANG': 'en_US.UTF-8', 'TERM': 'xterm', 'SHELL': '/bin/bash', 'LC_MEASUREMENT': 'fr_FR.UTF-8', 'NOCLIMB': '1', 'XDG_RUNTIME_DIR': '/run/user/1000', 'LC_ADDRESS': 'fr_FR.UTF-8', 'SHLVL': '2', 'NO_GCE_CHECK': 'False', 'PEBBLE_TOOLCHAIN_PATH': '/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin', 'XDG_SESSION_ID': '21', 'DBUS_SESSION_BUS_ADDRESS': 'unix:path=/run/user/1000/bus', '_': '/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/.env/bin/python', 'LC_IDENTIFICATION': 'fr_FR.UTF-8', 'LS_COLORS': 'rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:', 'LESSCLOSE': '/usr/bin/lesspipe %s %s', 'SSH_TTY': '/dev/pts/2', 'OLDPWD': '/home/louis', 'PYTHONHOME': '/home/louis/.pebble-sdk/SDKs/current/sdk-core/../.env', 'LC_TELEPHONE': 'fr_FR.UTF-8', 'NODE_PATH': '/home/louis/.pebble-sdk/SDKs/current/sdk-core/../node_modules', 'LC_MONETARY': 'fr_FR.UTF-8', 'PWD': '/home/louis/pebble-dev/repos/synocam_home_switch', 'LC_NAME': 'fr_FR.UTF-8', 'MAIL': '/var/mail/louis', 'LC_TIME': 'fr_FR.UTF-8', 'SSH_CONNECTION': '172.27.96.1 62789 172.27.97.47 22', 'PHONESIM_PATH': '/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/.env//bin/pypkjs', 'XDG_DATA_DIRS': '/usr/local/share:/usr/share:/var/lib/snapd/desktop'}

-files = ['/home/louis/pebble-dev/repos/synocam_home_switch/wscript']

+environ = {'LC_NUMERIC': 'fr_FR.UTF-8', 'QT4_IM_MODULE': 'xim', 'GJS_DEBUG_OUTPUT': 'stderr', 'PEBBLE_TOOLCHAIN_PATH': '/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin', 'XDG_CURRENT_DESKTOP': 'ubuntu:GNOME', 'QT_IM_MODULE': 'xim', 'LOGNAME': 'louis', 'USER': 'louis', 'PATH': '/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin:/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/bin:/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/bin:/sbin:/bin:/usr/bin:/usr/local/bin:/snap/bin', 'LC_PAPER': 'fr_FR.UTF-8', 'HOME': '/home/louis', 'XRDP_SESSION': '1', 'DISPLAY': ':10.0', 'SSH_AGENT_PID': '2174', 'LANG': 'en_US.UTF-8', 'TERM': 'xterm-256color', 'SHELL': '/bin/bash', 'UID': '1000', 'SESSION_MANAGER': 'local/ubuntu-IDS:@/tmp/.ICE-unix/2087,unix/ubuntu-IDS:/tmp/.ICE-unix/2087', 'LC_MEASUREMENT': 'fr_FR.UTF-8', 'QT_ACCESSIBILITY': '1', 'GNOME_DESKTOP_SESSION_ID': 'this-is-deprecated', 'CLUTTER_IM_MODULE': 'xim', 'TEXTDOMAIN': 'im-config', 'XMODIFIERS': '@im=ibus', 'GPG_AGENT_INFO': '/run/user/1000/gnupg/S.gpg-agent:0:1', 'NOCLIMB': '1', 'SHLVL': '2', 'XRDP_SOCKET_PATH': '/var/run/xrdp/sockdir', 'XDG_RUNTIME_DIR': '/run/user/1000', 'GTK_IM_MODULE': 'ibus', 'LC_ADDRESS': 'fr_FR.UTF-8', 'SSH_AUTH_SOCK': '/run/user/1000/keyring/ssh', 'VTE_VERSION': '5202', 'IM_CONFIG_PHASE': '2', 'TEXTDOMAINDIR': '/usr/share/locale/', 'GNOME_SHELL_SESSION_MODE': 'ubuntu', 'NO_GCE_CHECK': 'False', 'PULSE_SCRIPT': '/etc/xrdp/pulse/default.pa', 'LESSOPEN': '| /bin/lesspipe %s', 'XDG_SESSION_ID': 'c3', 'DBUS_SESSION_BUS_ADDRESS': 'unix:path=/run/user/1000/bus', '_': '/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/.env/bin/python', 'GNOME_TERMINAL_SERVICE': ':1.70', 'LC_IDENTIFICATION': 'fr_FR.UTF-8', 'LESSCLOSE': '/bin/lesspipe %s %s', 'GTK_MODULES': 'gail:atk-bridge', 'OLDPWD': '/home/louis/pebble-dev/repo_remote/synocam_home_switch/build', 'PYTHONHOME': '/home/louis/.pebble-sdk/SDKs/current/sdk-core/../.env', 'LC_TELEPHONE': 'fr_FR.UTF-8', 'NODE_PATH': '/home/louis/.pebble-sdk/SDKs/current/sdk-core/../node_modules', 'LC_MONETARY': 'fr_FR.UTF-8', 'XDG_DATA_DIRS': '/usr/share/gnome:/usr/local/share:/usr/share:/var/lib/snapd/desktop', 'PWD': '/home/louis/pebble-dev/repo_remote/synocam_home_switch', 'COLORTERM': 'truecolor', 'LC_NAME': 'fr_FR.UTF-8', 'XDG_MENU_PREFIX': 'gnome-', 'LC_TIME': 'fr_FR.UTF-8', 'LS_COLORS': 'rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:', 'PHONESIM_PATH': '/home/louis/pebble-dev/pebble-sdk-4.6-rc2-linux64/.env//bin/pypkjs', 'GJS_DEBUG_TOPICS': 'JS ERROR;JS LOG', 'GNOME_TERMINAL_SCREEN': '/org/gnome/Terminal/screen/e2f7f31b_8f0d_4168_972d_1f5ac7d37cd2'}

+files = ['/home/louis/pebble-dev/repo_remote/synocam_home_switch/wscript']

 hash = -2431564940392307765

 options = {'files': '', 'jobs': 2, 'verbose': 0, 'nocache': False, 'progress_bar': 0, 'no_groups': False, 'distcheck_args': None, 'top': '', 'sandbox': False, 'destdir': '', 'keep': 0, 'zones': '', 'debug': False, 'prefix': '/usr/local/', 'timestamp': None, 'download': False, 'force': False, 'targets': '', 'out': ''}

-out_dir = '/home/louis/pebble-dev/repos/synocam_home_switch/build'

-run_dir = '/home/louis/pebble-dev/repos/synocam_home_switch'

-top_dir = '/home/louis/pebble-dev/repos/synocam_home_switch'

+out_dir = '/home/louis/pebble-dev/repo_remote/synocam_home_switch/build'

+run_dir = '/home/louis/pebble-dev/repo_remote/synocam_home_switch'

+top_dir = '/home/louis/pebble-dev/repo_remote/synocam_home_switch'

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

@@ -1,15 +1,15 @@

 module.exports = [

-  { 

-    "type": "heading", 

-    "defaultValue": "DSCam Home Swtich Configuration" 

-  }, 

-  { 

-    "type": "text", 

-    "defaultValue": "Set your Synology account and server." 

+  {

+    "type": "heading",

+    "defaultValue": "DSCam Home Swtich Configuration"

+  },

+  {

+    "type": "text",

+    "defaultValue": "Set your Synology account and server."

   },

   {

   "type": "section",

-  "items": 

+    "items":

     [

       {

         "type": "heading",

@@ -19,7 +19,7 @@ module.exports = [

         "type": "input",

         "messageKey": "username",

         "label": "Your DSM Username",

-        "attributes" : 

+        "attributes":

         {

            "maxlength":40

         }

@@ -28,7 +28,7 @@ module.exports = [

         "type": "input",

         "messageKey": "password",

         "label": "Your DSM Password",

-        "attributes" : 

+        "attributes":

         {

           "type": "password",

           "maxlength":40

@@ -38,7 +38,7 @@ module.exports = [

         "type": "input",

         "messageKey": "server",

         "label": "Your DSM Server",

-        "attributes" : 

+        "attributes":

         {

           "type": "url",

           "maxlength":255

@@ -12,13 +12,11 @@ retry = 1;

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

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

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

+  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 = 3000; // time in milliseconds

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

     xhr.open(method, url, true);

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

@@ -74,9 +72,11 @@ 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');

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

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

@@ -106,6 +106,7 @@ function authenticate() {

     max_retry = 1;

     xhr_to_syno(method, url_path, onload_function, max_retry);

   } else {

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

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

   }

@@ -119,83 +120,88 @@ function get_status() {

   if (sid != ""){

     status = "";

     console.log('---- get_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 + "/webapi/entry.cgi?api=SYNO.SurveillanceStation.HomeMode&version=1&method=GetInfo&_sid="+sid;

-      var xhr = new XMLHttpRequest();

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

-

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

-

-      xhr.onload = function () {

-        if (xhr.readyState === 4) {

-          retry=0;

-          console.log('------Get-status request returned');

-          if(xhr.status == 200) {

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

-            if (response.success == true){

-              status = response.data.on;

-              var message;

-              switch (status) {

-                case true:

-                  message = "Your Home mode is ON";

-                  break;

-                case false:

-                  message = "Your Home mode is OFF";

-                  break;

-                default:

-                  message = "home mode is unknown !";

-              }

-              // Build message

-              var dict = {

-                'status': message,

-              };

-

-              // Send the message

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

-                console.log('sent');

-              }, function() {

-                console.log('failed');

-              });

+

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

+    var method = "GET";

+

+    onload_function = function (xhr) { }

+

+    max_retry = 1;

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

+

+    var xhr = new XMLHttpRequest();

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

+

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

+

+    xhr.onload = function () {

+      if (xhr.readyState === 4) {

+        retry = 0;

+        console.log('------Get-status request returned');

+        if (xhr.status == 200) {

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

+          if (response.success == true) {

+            status = response.data.on;

+            var message;

+            switch (status) {

+              case true:

+                message = "Your Home mode is ON";

+                break;

+              case false:

+                message = "Your Home mode is OFF";

+                break;

+              default:

+                message = "home mode is unknown !";

             }

-          }else {

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

+            // Build message

+            var dict = {

+              'status': message,

+            };

+

+            // Send the message

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

+              console.log('sent');

+            }, function () {

+              console.log('failed');

+            });

           }

+        } else {

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

         }

       }

+    }

-      xhr.ontimeout = function (e){

-        retry++;

-        if (retry<=1){

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

-          get_status();

-        }else{

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

-          //send back "timeout" to watch

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

+    xhr.ontimeout = function (e) {

+      retry++;

+      if (retry <= 1) {

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

+        get_status();

+      } else {

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

-          };

+        // Build message

+        var dict = {

+          'status': message,

+        };

-          // Send the message

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

-            console.log('sent');

-          }, function() {

-            console.log('failed');

-          });

-        }

+        // Send the message

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

+          console.log('sent');

+        }, function () {

+          console.log('failed');

+        });

       }

+    }

-      xhr.send();

+    xhr.send();

-    }else{

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

-    }

+

+  } else {

+    authenticate();

+    get_status();

   }

 }

@@ -207,10 +213,8 @@ function switch_home(bool) {

   if (sid != ""){

     status = "";

     console.log('---- get_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');

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

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

       var xhr = new XMLHttpRequest();

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

@@ -292,12 +296,17 @@ function switch_home(bool) {

     }else{

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

     }

-   }

+  } else {

+    authenticate();

+    switch_home(bool);

+  }

 }

 // Get JS readiness events

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

   // Update Watch on this

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