Merge pull request #267 from alandtse/1.4.0

Update to 1.4.0

custom_components/alexa_media/__init__.py

@@ -112,16 +112,15 @@ def setup_platform_callback(hass, config, login, callback_data):
                           request_configuration and configuration_callback
     """
     _LOGGER.debug(("Status: %s got captcha: %s securitycode: %s"
-                   " Claimsoption: %s VerificationCode: %s"),
+                   " Claimsoption: %s AuthSelectOption: %s "
+                   " VerificationCode: %s"),
                   login.status,
                   callback_data.get('captcha'),
                   callback_data.get('securitycode'),
                   callback_data.get('claimsoption'),
+                  callback_data.get('authselectoption'),
                   callback_data.get('verificationcode'))
-    login.login(captcha=callback_data.get('captcha'),
-                securitycode=callback_data.get('securitycode'),
-                claimsoption=callback_data.get('claimsoption'),
-                verificationcode=callback_data.get('verificationcode'))
+    login.login(data=callback_data)
     test_login_status(hass, config, login,
                       setup_platform_callback)
 
@@ -136,14 +135,24 @@ def configuration_callback(callback_data):
                      login, callback_data)
     status = login.status
     email = login.email
+    # links = ""
+    footer = ""
+    if 'error_message' in status and status['error_message']:
+        footer = ('\n<b>NOTE: Actual Amazon error message in red below. '
+                  'Remember password will be provided automatically'
+                  ' and Amazon error message normally appears first!</b>')
+    # if login.links:
+    #     links = '\n\nGo to link with link# (e.g. link0)\n' + login.links
     # Get Captcha
     if (status and 'captcha_image_url' in status and
             status['captcha_image_url'] is not None):
         config_id = configurator.request_config(
             "Alexa Media Player - Captcha - {}".format(email),
             configuration_callback,
             description=('Please enter the text for the captcha.'
-                         ' Please enter anything if the image is missing.'
+                         ' Please hit confirm to reload image.'
+                         # + links
+                         + footer
                         ),
             description_image=status['captcha_image_url'],
             submit_caption="Confirm",
@@ -154,7 +163,9 @@ def configuration_callback(callback_data):
         config_id = configurator.request_config(
             "Alexa Media Player - 2FA - {}".format(email),
             configuration_callback,
-            description=('Please enter your Two-Factor Security code.'),
+            description=('Please enter your Two-Factor Security code.'
+                         # + links
+                         + footer),
             submit_caption="Confirm",
             fields=[{'id': 'securitycode', 'name': 'Security Code'}]
         )
@@ -166,20 +177,38 @@ def configuration_callback(callback_data):
                 "Alexa Media Player - Verification Method - {}".format(email),
                 configuration_callback,
                 description=('Please select the verification method. '
-                             '(e.g., sms or email).<br />{}').format(
-                                 options
-                            ),
+                             '(e.g., sms or email).\n{}'.format(options)
+                             # + links
+                             + footer),
                 submit_caption="Confirm",
                 fields=[{'id': 'claimsoption', 'name': 'Option'}]
             )
         else:
             configuration_callback({})
+    elif (status and 'authselect_required' in status and
+          status['authselect_required']):  # Get picker method
+        options = status['authselect_message']
+        if options:
+            config_id = configurator.request_config(
+                "Alexa Media Player - OTP Method - {}".format(email),
+                configuration_callback,
+                description=('Please select the OTP method. '
+                             '(e.g., 0, 1).<br />{}'.format(options)
+                             # + links
+                             + footer),
+                submit_caption="Confirm",
+                fields=[{'id': 'authselectoption', 'name': 'Option'}]
+            )
+        else:
+            configuration_callback({})
     elif (status and 'verificationcode_required' in status and
           status['verificationcode_required']):  # Get picker method
         config_id = configurator.request_config(
             "Alexa Media Player - Verification Code - {}".format(email),
             configuration_callback,
-            description=('Please enter received verification code.'),
+            description=('Please enter received verification code.'
+                         # + links
+                         + footer),
             submit_caption="Confirm",
             fields=[{'id': 'verificationcode', 'name': 'Verification Code'}]
         )
@@ -218,6 +247,9 @@ def test_login_status(hass, config, login,
     elif ('claimspicker_required' in login.status and
           login.status['claimspicker_required']):
         _LOGGER.debug("Creating configurator to select verification option")
+    elif ('authselect_required' in login.status and
+          login.status['authselect_required']):
+        _LOGGER.debug("Creating configurator to select OTA option")
     elif ('verificationcode_required' in login.status and
           login.status['verificationcode_required']):
         _LOGGER.debug("Creating configurator to enter verification code")
@@ -263,6 +295,7 @@ def update_devices():
         devices = AlexaAPI.get_devices(login_obj)
         bluetooth = AlexaAPI.get_bluetooth(login_obj)
         preferences = AlexaAPI.get_device_preferences(login_obj)
+        dnd = AlexaAPI.get_dnd_state(login_obj)
         _LOGGER.debug("%s: Found %s devices, %s bluetooth",
                       hide_email(email),
                       len(devices) if devices is not None else '',
@@ -320,6 +353,14 @@ def update_devices():
                     _LOGGER.debug("Locale %s found for %s",
                                   device['locale'],
                                   hide_serial(device['serialNumber']))
+
+            for dev in dnd['doNotDisturbDeviceStatusList']:
+                if dev['deviceSerialNumber'] == device['serialNumber']:
+                    device['dnd'] = dev['enabled']
+                    _LOGGER.debug("DND %s found for %s",
+                                  device['dnd'],
+                                  hide_serial(device['serialNumber']))
+
             (hass.data[DATA_ALEXAMEDIA]
              ['accounts']
              [email]
@@ -455,15 +496,21 @@ def ws_handler(message_obj):
             serial = None
             if command == 'PUSH_ACTIVITY':
                 #  Last_Alexa Updated
-                serial = (json_payload
-                          ['key']
-                          ['entryId']).split('#')[2]
-                last_called = {
-                    'serialNumber': serial,
-                    'timestamp': json_payload['timestamp']
-                }
+                if (json_payload
+                        ['key']
+                        ['entryId']).find('#') != -1:
+                    serial = (json_payload
+                              ['key']
+                              ['entryId']).split('#')[2]
+                    last_called = {
+                        'serialNumber': serial,
+                        'timestamp': json_payload['timestamp']
+                    }
                 if (serial and serial in existing_serials):
                     update_last_called(login_obj, last_called)
+                hass.bus.fire(('{}_{}'.format(DOMAIN,
+                                              hide_email(email)))[0:32],
+                              {'push_activity': json_payload})
             elif command == 'PUSH_AUDIO_PLAYER_STATE':
                 # Player update
                 serial = (json_payload['dopplerId']['deviceSerialNumber'])
@@ -500,6 +547,15 @@ def ws_handler(message_obj):
                     hass.bus.fire(('{}_{}'.format(DOMAIN,
                                                   hide_email(email)))[0:32],
                                   {'bluetooth_change': bluetooth_state})
+            elif command == 'PUSH_MEDIA_QUEUE_CHANGE':
+                # Player availability update
+                serial = (json_payload['dopplerId']['deviceSerialNumber'])
+                if (serial and serial in existing_serials):
+                    _LOGGER.debug("Updating media_player queue %s",
+                                  json_payload)
+                    hass.bus.fire(('{}_{}'.format(DOMAIN,
+                                                  hide_email(email)))[0:32],
+                                  {'queue_state': json_payload})
             if (serial and serial not in existing_serials
                     and serial not in (hass.data[DATA_ALEXAMEDIA]
                                        ['accounts']

custom_components/alexa_media/alarm_control_panel.py

@@ -15,6 +15,7 @@
 from homeassistant.const import (STATE_ALARM_ARMED_AWAY,
                                  STATE_ALARM_ARMED_HOME, STATE_ALARM_DISARMED)
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.event import call_later
 
 from . import DATA_ALEXAMEDIA
 from . import DOMAIN as ALEXA_DOMAIN
@@ -36,7 +37,7 @@ def setup_platform(hass, config, add_devices_callback,
                                               # type: AlexaAlarmControlPanel
         if not (alexa_client and alexa_client.unique_id):
             _LOGGER.debug("%s: Skipping creation of uninitialized device: %s",
-                          account,
+                          hide_email(account),
                           alexa_client)
             continue
         devices.append(alexa_client)
@@ -83,14 +84,15 @@ def __init__(self, login, hass):
         self._should_poll = False
         self._attrs = {}
 
-        data = self.alexa_api.get_guard_details(self._login)
         try:
+            from simplejson import JSONDecodeError
+            data = self.alexa_api.get_guard_details(self._login)
             guard_dict = (data['locationDetails']
                           ['locationDetails']['Default_Location']
                           ['amazonBridgeDetails']['amazonBridgeDetails']
                           ['LambdaBridge_AAA/OnGuardSmartHomeBridgeService']
                           ['applianceDetails']['applianceDetails'])
-        except KeyError:
+        except (KeyError, TypeError, JSONDecodeError):
             guard_dict = {}
         for key, value in guard_dict.items():
             if value['modelName'] == "REDROCK_GUARD_PANEL":
@@ -116,7 +118,9 @@ def _handle_event(self, event):
 
         Used instead of polling.
         """
-        self.refresh()
+        if 'push_activity' in event.data:
+            call_later(self.hass, 2, lambda _:
+                       self.refresh(no_throttle=True))
 
     @util.Throttle(MIN_TIME_BETWEEN_SCANS, MIN_TIME_BETWEEN_FORCED_SCANS)
     def refresh(self):
@@ -152,6 +156,7 @@ def refresh(self):
         else:
             self._state = STATE_ALARM_DISARMED
         _LOGGER.debug("%s: Alarm State: %s", self.account, self.state)
+        self.schedule_update_ha_state()
 
     def alarm_disarm(self, code=None):
         # pylint: disable=unexpected-keyword-arg

custom_components/alexa_media/const.py

@@ -9,7 +9,7 @@
 """
 from datetime import timedelta
 
-__version__ = '1.3.1'
+__version__ = '1.4.0'
 PROJECT_URL = "https://github.com/keatontaylor/alexa_media_player/"
 ISSUE_URL = "{}issues".format(PROJECT_URL)
 
@@ -24,7 +24,8 @@
 ALEXA_COMPONENTS = [
     'media_player',
     'notify',
-    'alarm_control_panel'
+    'alarm_control_panel',
+    'switch'
 ]
 
 CONF_ACCOUNTS = 'accounts'

custom_components/alexa_media/manifest.json

@@ -4,5 +4,5 @@
   "documentation": "https://github.com/keatontaylor/alexa_media_player/wiki",
   "dependencies": [],
   "codeowners": ["@keatontaylor", "@alandtse"],
-  "requirements": ["alexapy==0.7.0"]
+  "requirements": ["alexapy==0.7.1"]
 }