Version 1.12.1 alexa-client-sdk

Changes in this update:

**Bug Fixes**

* Fixed a bug where the same URL was being requested twice when streaming iHeartRadio. Now, a single request is sent.
* Corrected pause/resume handling in `ProgressTimer` so that extra `ProgressReportDelayElapsed` events are not sent to AVS.

**Known Issues**

* Music playback history isn't being displayed in the Alexa app for certain account and device types.
* On GCC 8+, issues related to `-Wclass-memaccess` will trigger warnings. However, this won't cause the build to fail and these warnings can be ignored.
* Android error ("libDefaultClient.so" not found) can be resolved by upgrading to ADB version 1.0.40
* When network connection is lost, lost connection status is not returned via local TTS.
* `ACL` may encounter issues if audio attachments are received but not consumed.
* `SpeechSynthesizerState` currently uses `GAINING_FOCUS` and `LOSING_FOCUS` as a workaround for handling intermediate state. These states may be removed in a future release.
* The Alexa app doesn't always indicate when a device is successfully connected via Bluetooth.
* Connecting a product to streaming media via Bluetooth will sometimes stop media playback within the source application. Resuming playback through the source application or toggling next/previous will correct playback.
* When a source device is streaming silence via Bluetooth, the Alexa app indicates that audio content is streaming.
* The Bluetooth agent assumes that the Bluetooth adapter is always connected to a power source. Disconnecting from a power source during operation is not yet supported.
* On some products, interrupted Bluetooth playback may not resume if other content is locally streamed.
* `make integration` is currently not available for Android. In order to run integration tests on Android, you'll need to manually upload the test binary file along with any input file. At that point, the adb can be used to run the integration tests.
* On Raspberry Pi running Android Things with HDMI output audio, beginning of speech is truncated when Alexa responds to user text-to-speech (TTS).
* When the sample app is restarted and the network connection is lost, the Reminder TTS message does not play. Instead, the default alarm tone will play twice.

Author: aumatsui

ACL/src/Transport/DownchannelHandler.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -13,8 +13,8 @@
  * permissions and limitations under the License.
  */
 
+#include <AVSCommon/Utils/HTTP/HttpResponseCode.h>
 #include <AVSCommon/Utils/HTTP2/HTTP2MimeResponseDecoder.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpResponseCodes.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
 #include "ACL/Transport/DownchannelHandler.h"
@@ -24,6 +24,7 @@
 namespace alexaClientSDK {
 namespace acl {
 
+using namespace avsCommon::utils::http;
 using namespace avsCommon::utils::http2;
 
 /// Downchannel URL
@@ -105,18 +106,23 @@ void DownchannelHandler::onActivity() {
 
 bool DownchannelHandler::onReceiveResponseCode(long responseCode) {
     ACSDK_DEBUG5(LX(__func__).d("responseCode", responseCode));
-    switch (responseCode) {
+    switch (intToHTTPResponseCode(responseCode)) {
         case HTTPResponseCode::HTTP_RESPONSE_CODE_UNDEFINED:
         case HTTPResponseCode::SUCCESS_NO_CONTENT:
-        case HTTPResponseCode::REDIRECTION_START_CODE:
-        case HTTPResponseCode::REDIRECTION_END_CODE:
-        case HTTPResponseCode::BAD_REQUEST:
-        case HTTPResponseCode::SERVER_INTERNAL_ERROR:
+        case HTTPResponseCode::SUCCESS_END_CODE:
+        case HTTPResponseCode::REDIRECTION_MULTIPLE_CHOICES:
+        case HTTPResponseCode::REDIRECTION_MOVED_PERMANENTLY:
+        case HTTPResponseCode::REDIRECTION_FOUND:
+        case HTTPResponseCode::REDIRECTION_SEE_ANOTHER:
+        case HTTPResponseCode::REDIRECTION_TEMPORARY_REDIRECT:
+        case HTTPResponseCode::REDIRECTION_PERMANENT_REDIRECT:
+        case HTTPResponseCode::CLIENT_ERROR_BAD_REQUEST:
+        case HTTPResponseCode::SERVER_ERROR_INTERNAL:
             break;
         case HTTPResponseCode::SUCCESS_OK:
             m_context->onDownchannelConnected();
             break;
-        case HTTPResponseCode::FORBIDDEN:
+        case HTTPResponseCode::CLIENT_ERROR_FORBIDDEN:
             m_context->onForbidden(m_authToken);
             break;
     }

ACL/src/Transport/HTTP2Transport.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2016-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 #include <functional>
 #include <random>
 
+#include <AVSCommon/Utils/HTTP/HttpResponseCode.h>
 #include <AVSCommon/Utils/HTTP2/HTTP2MimeRequestEncoder.h>
 #include <AVSCommon/Utils/HTTP2/HTTP2MimeResponseDecoder.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpResponseCodes.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 #include <AVSCommon/Utils/Timing/TimeUtils.h>
 #include <ACL/Transport/PostConnectInterface.h>
@@ -428,7 +428,7 @@ void HTTP2Transport::onForbidden(const std::string& authToken) {
 }
 
 std::shared_ptr<HTTP2RequestInterface> HTTP2Transport::createAndSendRequest(const HTTP2RequestConfig& cfg) {
-    ACSDK_DEBUG5(LX(__func__).d("type", cfg.getRequestType()).d("url", cfg.getUrl()));
+    ACSDK_DEBUG5(LX(__func__).d("type", cfg.getRequestType()).sensitive("url", cfg.getUrl()));
     return m_http2Connection->createAndSendRequest(cfg);
 }
 

ACL/src/Transport/MessageRequestHandler.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 #include <functional>
 #include <unordered_map>
 
+#include <AVSCommon/Utils/HTTP/HttpResponseCode.h>
 #include <AVSCommon/Utils/HTTP2/HTTP2MimeRequestEncoder.h>
 #include <AVSCommon/Utils/HTTP2/HTTP2MimeResponseDecoder.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpResponseCodes.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
 
 #include "ACL/Transport/HTTP2Transport.h"
@@ -31,6 +31,7 @@ namespace acl {
 
 using namespace avsCommon::avs::attachment;
 using namespace avsCommon::sdkInterfaces;
+using namespace avsCommon::utils::http;
 using namespace avsCommon::utils::http2;
 
 /// URL to send events to
@@ -246,7 +247,7 @@ bool MessageRequestHandler::onReceiveResponseCode(long responseCode) {
 
     reportMessageRequestAcknowledged();
 
-    if (HTTPResponseCode::FORBIDDEN == responseCode) {
+    if (HTTPResponseCode::CLIENT_ERROR_FORBIDDEN == intToHTTPResponseCode(responseCode)) {
         m_context->onForbidden(m_authToken);
     }
 
@@ -264,7 +265,7 @@ void MessageRequestHandler::onResponseFinished(HTTP2ResponseFinishedStatus statu
     reportMessageRequestAcknowledged();
     reportMessageRequestFinished();
 
-    if (m_responseCode != HTTPResponseCode::SUCCESS_OK && !nonMimeBody.empty()) {
+    if ((intToHTTPResponseCode(m_responseCode) != HTTPResponseCode::SUCCESS_OK) && !nonMimeBody.empty()) {
         m_messageRequest->exceptionReceived(nonMimeBody);
     }
 
@@ -289,9 +290,9 @@ void MessageRequestHandler::onResponseFinished(HTTP2ResponseFinishedStatus statu
         {HTTPResponseCode::HTTP_RESPONSE_CODE_UNDEFINED, MessageRequestObserverInterface::Status::INTERNAL_ERROR},
         {HTTPResponseCode::SUCCESS_OK, MessageRequestObserverInterface::Status::SUCCESS},
         {HTTPResponseCode::SUCCESS_NO_CONTENT, MessageRequestObserverInterface::Status::SUCCESS_NO_CONTENT},
-        {HTTPResponseCode::BAD_REQUEST, MessageRequestObserverInterface::Status::BAD_REQUEST},
-        {HTTPResponseCode::FORBIDDEN, MessageRequestObserverInterface::Status::INVALID_AUTH},
-        {HTTPResponseCode::SERVER_INTERNAL_ERROR, MessageRequestObserverInterface::Status::SERVER_INTERNAL_ERROR_V2}};
+        {HTTPResponseCode::CLIENT_ERROR_BAD_REQUEST, MessageRequestObserverInterface::Status::BAD_REQUEST},
+        {HTTPResponseCode::CLIENT_ERROR_FORBIDDEN, MessageRequestObserverInterface::Status::INVALID_AUTH},
+        {HTTPResponseCode::SERVER_ERROR_INTERNAL, MessageRequestObserverInterface::Status::SERVER_INTERNAL_ERROR_V2}};
 
     auto result = MessageRequestObserverInterface::Status::INTERNAL_ERROR;
 

ACL/src/Transport/PingHandler.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -13,15 +13,16 @@
  * permissions and limitations under the License.
  */
 
+#include <AVSCommon/Utils/HTTP/HttpResponseCode.h>
 #include <AVSCommon/Utils/Logger/Logger.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpResponseCodes.h>
 
 #include "ACL/Transport/HTTP2Transport.h"
 #include "ACL/Transport/PingHandler.h"
 
 namespace alexaClientSDK {
 namespace acl {
 
+using namespace avsCommon::utils::http;
 using namespace avsCommon::utils::http2;
 
 /// URL to send pings to
@@ -90,7 +91,8 @@ void PingHandler::reportPingAcknowledged() {
     ACSDK_DEBUG5(LX(__func__));
     if (!m_wasPingAcknowledgedReported) {
         m_wasPingAcknowledgedReported = true;
-        m_context->onPingRequestAcknowledged(HTTPResponseCode::SUCCESS_NO_CONTENT == m_responseCode);
+        m_context->onPingRequestAcknowledged(
+            HTTPResponseCode::SUCCESS_NO_CONTENT == intToHTTPResponseCode(m_responseCode));
     }
 }
 
@@ -107,7 +109,7 @@ HTTP2SendDataResult PingHandler::onSendData(char* bytes, size_t size) {
 bool PingHandler::onReceiveResponseCode(long responseCode) {
     ACSDK_DEBUG5(LX(__func__).d("responseCode", responseCode));
 
-    if (HTTPResponseCode::FORBIDDEN == responseCode) {
+    if (HTTPResponseCode::CLIENT_ERROR_FORBIDDEN == intToHTTPResponseCode(responseCode)) {
         m_context->onForbidden(m_authToken);
     }
 

ACL/test/Transport/Common/MockHTTP2Connection.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -21,6 +21,8 @@ namespace utils {
 namespace http2 {
 namespace test {
 
+using namespace avsCommon::utils::http;
+    
 MockHTTP2Connection::MockHTTP2Connection(std::string dURL, std::string pingURL) :
         m_downchannelURL{dURL},
         m_pingURL{pingURL},
@@ -50,7 +52,7 @@ std::shared_ptr<HTTP2RequestInterface> MockHTTP2Connection::createAndSendRequest
         std::lock_guard<std::mutex> lock(m_postRequestMutex);
         m_postRequestQueue.push_back(request);
         if (m_postResponseCode != HTTPResponseCode::HTTP_RESPONSE_CODE_UNDEFINED) {
-            request->getSink()->onReceiveResponseCode(m_postResponseCode);
+            request->getSink()->onReceiveResponseCode(responseCodeToInt(m_postResponseCode));
         }
         if (m_postRequestQueue.size() > m_maxPostRequestsEnqueued) {
             m_maxPostRequestsEnqueued = m_postRequestQueue.size();
@@ -120,7 +122,8 @@ std::shared_ptr<MockHTTP2Request> MockHTTP2Connection::waitForPostRequest(const
     auto request = m_postRequestQueue.back();
 
     // Need to send 200 to MIME decoder in order for it parse the message.
-    request->getMimeDecoder()->onReceiveResponseCode(SUCCESS_OK);
+    request->getMimeDecoder()->onReceiveResponseCode(
+        static_cast<std::underlying_type<HTTPResponseCode>::type>(HTTPResponseCode::SUCCESS_OK));
 
     // Feed the header lines to the MIME decoder.
     for (auto headerLine : request->getSource()->getRequestHeaderLines()) {

ACL/test/Transport/HTTP2TransportTest.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@
 #include <AVSCommon/AVS/Attachment/AttachmentManager.h>
 #include <AVSCommon/AVS/Attachment/AttachmentUtils.h>
 #include <AVSCommon/Utils/PromiseFuturePair.h>
+#include <AVSCommon/Utils/HTTP/HttpResponseCode.h>
 #include <AVSCommon/Utils/HTTP2/HTTP2RequestConfig.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpResponseCodes.h>
 
 #include "MockAuthDelegate.h"
 #include "MockHTTP2Connection.h"
@@ -49,6 +49,7 @@ using namespace avsCommon::avs;
 using namespace avsCommon::avs::attachment;
 using namespace avsCommon::sdkInterfaces;
 using namespace avsCommon::utils;
+using namespace avsCommon::utils::http;
 using namespace avsCommon::utils::http2;
 using namespace avsCommon::utils::http2::test;
 using namespace ::testing;
@@ -478,7 +479,7 @@ TEST_F(HTTP2TransportTest, retryOnDownchannelConnectionFailure) {
 
     // The Mock HTTP2Request replies to any downchannel request with a 500.
     ASSERT_TRUE(m_mockHttp2Connection->respondToDownchannelRequests(
-        static_cast<long>(SERVER_INTERNAL_ERROR), false, RESPONSE_TIMEOUT));
+        static_cast<long>(HTTPResponseCode::SERVER_ERROR_INTERNAL), false, RESPONSE_TIMEOUT));
 
     // Wait for a long time (up to 10 second), terminating the wait when the mock of HTTP2Connection receives a second
     // attempt to create a downchannel request.
@@ -738,7 +739,7 @@ TEST_F(HTTP2TransportTest, onSendCompletedNotification) {
                 HTTP2ResponseFinishedStatus::TIMEOUT,
                 MessageRequestObserverInterface::Status::TIMEDOUT)},
             {std::make_tuple(
-                HTTPResponseCode::BAD_REQUEST,
+                HTTPResponseCode::CLIENT_ERROR_BAD_REQUEST,
                 static_cast<HTTP2ResponseFinishedStatus>(-1),
                 MessageRequestObserverInterface::Status::INTERNAL_ERROR)},
             {std::make_tuple(
@@ -762,15 +763,15 @@ TEST_F(HTTP2TransportTest, onSendCompletedNotification) {
                 HTTP2ResponseFinishedStatus::COMPLETE,
                 MessageRequestObserverInterface::Status::SERVER_OTHER_ERROR)},
             {std::make_tuple(
-                HTTPResponseCode::BAD_REQUEST,
+                HTTPResponseCode::CLIENT_ERROR_BAD_REQUEST,
                 HTTP2ResponseFinishedStatus::COMPLETE,
                 MessageRequestObserverInterface::Status::BAD_REQUEST)},
             {std::make_tuple(
-                HTTPResponseCode::FORBIDDEN,
+                HTTPResponseCode::CLIENT_ERROR_FORBIDDEN,
                 HTTP2ResponseFinishedStatus::COMPLETE,
                 MessageRequestObserverInterface::Status::INVALID_AUTH)},
             {std::make_tuple(
-                HTTPResponseCode::SERVER_INTERNAL_ERROR,
+                HTTPResponseCode::SERVER_ERROR_INTERNAL,
                 HTTP2ResponseFinishedStatus::COMPLETE,
                 MessageRequestObserverInterface::Status::SERVER_INTERNAL_ERROR_V2)},
             {std::make_tuple(
@@ -837,7 +838,7 @@ TEST_F(HTTP2TransportTest, onExceptionReceivedNon200Content) {
 
     auto request = m_mockHttp2Connection->waitForPostRequest(RESPONSE_TIMEOUT);
     ASSERT_NE(request, nullptr);
-    request->getSink()->onReceiveResponseCode(HTTPResponseCode::SERVER_INTERNAL_ERROR);
+    request->getSink()->onReceiveResponseCode(HTTPResponseCode::SERVER_ERROR_INTERNAL);
     request->getSink()->onReceiveData(NON_MIME_PAYLOAD.c_str(), NON_MIME_PAYLOAD.size());
     request->getSink()->onResponseFinished(HTTP2ResponseFinishedStatus::COMPLETE);
 
@@ -1078,7 +1079,7 @@ TEST_F(HTTP2TransportTest, tearDownPingFailure) {
         auto pingRequest = m_mockHttp2Connection->waitForPingRequest(RESPONSE_TIMEOUT);
         ASSERT_TRUE(pingRequest);
         m_mockHttp2Connection->dequePingRequest();
-        pingRequest->getSink()->onReceiveResponseCode(HTTPResponseCode::BAD_REQUEST);
+        pingRequest->getSink()->onReceiveResponseCode(HTTPResponseCode::CLIENT_ERROR_BAD_REQUEST);
         pingRequest->getSink()->onResponseFinished(HTTP2ResponseFinishedStatus::COMPLETE);
     });
 

ACL/test/Transport/MockHTTP2Connection.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -28,8 +28,8 @@
 
 #include <ACL/Transport/MessageConsumerInterface.h>
 #include <AVSCommon/Utils/PromiseFuturePair.h>
+#include <AVSCommon/Utils/HTTP/HttpResponseCode.h>
 #include <AVSCommon/Utils/HTTP2/HTTP2ConnectionInterface.h>
-#include <AVSCommon/Utils/LibcurlUtils/HttpResponseCodes.h>
 
 #include "MockHTTP2Request.h"
 
@@ -133,7 +133,7 @@ class MockHTTP2Connection : public HTTP2ConnectionInterface {
      * @param responseCode The HTTP response code to reply to the request. If set to @c
      * HTTPResponseCode::HTTP_RESPONSE_CODE_UNDEFINED, a response code will not be sent.
      */
-    void setResponseToPOSTRequests(HTTPResponseCode responseCode);
+    void setResponseToPOSTRequests(http::HTTPResponseCode responseCode);
 
     /**
      * Retrieve the first HTTP2 request made on the downchannel.
@@ -253,7 +253,7 @@ class MockHTTP2Connection : public HTTP2ConnectionInterface {
     PromiseFuturePair<void> m_receivedPauseOnSend;
 
     /// The response code to be replied for every POST request received.
-    HTTPResponseCode m_postResponseCode;
+    http::HTTPResponseCode m_postResponseCode;
 
     /// The maximum number of POST requests in the queue at any given time.
     std::size_t m_maxPostRequestsEnqueued;

AVSCommon/SDKInterfaces/include/AVSCommon/SDKInterfaces/CapabilitiesObserverInterface.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
@@ -113,7 +113,7 @@ inline std::ostream& operator<<(std::ostream& stream, const CapabilitiesObserver
         case CapabilitiesObserverInterface::Error::SERVER_INTERNAL_ERROR:
             return stream << "SERVER_INTERNAL_ERROR";
         case CapabilitiesObserverInterface::Error::BAD_REQUEST:
-            return stream << "BAD_REQUEST";
+            return stream << "CLIENT_ERROR_BAD_REQUEST";
     }
     return stream << "Unknown CapabilitiesObserverInterface::Error!: " << error;
 }