added initial esp8266 implementation

Author: svdgraaf

src/common/AWSClient2.cpp

@@ -18,9 +18,9 @@
 static const char* CANONICAL_FORM_POST_LINE = "POST\n/\n\n";
 static const int CANONICAL_FORM_POST_LINE_LEN = 8;
 static const char* HTTPS_REQUEST_POST_LINE =
-        "POST https://%s.%s.%s/ HTTP/1.1\n";
+        "POST https://%s/ HTTP/1.1\n";
 static const int HTTPS_REQUEST_POST_LINE_LEN = 28;
-static const char* HTTP_REQUEST_POST_LINE = "POST http://%s.%s.%s/ HTTP/1.1\n";
+static const char* HTTP_REQUEST_POST_LINE = "POST http://%s/ HTTP/1.1\n";
 static const int HTTP_REQUEST_POST_LINE_LEN = 27;
 static const char* TO_SIGN_TEMPLATE =
         "AWS4-HMAC-SHA256\n%sT%sZ\n%s/%s/%s/aws4_request\n%s";
@@ -62,6 +62,11 @@ void AWSClient2::setAWSEndpoint(const char * awsEndpoint) {
     this->awsEndpoint = new char[len]();
     strcpy(this->awsEndpoint, awsEndpoint);
 }
+void AWSClient2::setAWSDomain(const char * awsDomain) {
+    int len = strlen(awsDomain) + 1;
+    this->awsDomain = new char[len]();
+    strcpy(this->awsDomain, awsDomain);
+}
 void AWSClient2::setAWSSecretKey(const char * awsSecKey) {
     int len = strlen(awsSecKey) + 1;
     this->awsSecKey = new char[len]();
@@ -120,6 +125,16 @@ void AWSClient2::initSignedHeaders() {
     headerLens[headersCreated++] = len;
 }
 
+char* AWSClient2::createHostString(void) {
+  if(awsDomain[0] != '\0') {
+    return awsDomain;
+  } else {
+    char* host = new char[200]();
+    sprintf(host, "%s.%s.%s", awsService, awsRegion, awsEndpoint);
+    return host;
+  }
+}
+
 char* AWSClient2::createStringToSign(void) {
     SHA256* sha256 = new SHA256();
     char* hashed;
@@ -251,8 +266,8 @@ char* AWSClient2::headersToRequest() {
             httpS ? HTTPS_REQUEST_POST_LINE : HTTP_REQUEST_POST_LINE;
 
     /* Calculate length of httpRequest string. */
-    int httpRequestLen = postLineLen + strlen(awsService) + strlen(awsRegion)
-            + strlen(awsEndpoint);
+    char* host = createHostString();
+    int httpRequestLen = postLineLen + strlen(host);
     for (int i = 0; i < headersCreated; i++) {
         /* +1 for newline. */
         httpRequestLen += *(headerLens + i) + 1;
@@ -263,8 +278,7 @@ char* AWSClient2::headersToRequest() {
     /* Create and write to the httpRequest string. */
     char* httpRequest = new char[httpRequestLen + 1]();
     int httpRequestWritten = 0;
-    httpRequestWritten += sprintf(httpRequest + httpRequestWritten, postLine,
-            awsService, awsRegion, awsEndpoint);
+    httpRequestWritten += sprintf(httpRequest + httpRequestWritten, postLine, host);
     for (int i = 0; i < headersCreated; i++) {
         httpRequestWritten += sprintf(httpRequest + httpRequestWritten, "%s\n",
                 *(headers + i));
@@ -280,7 +294,7 @@ char* AWSClient2::createRequest(MinimalString &reqPayload) {
     if (awsRegion == 0 || awsEndpoint == 0 || awsSecKey == 0 || awsKeyID == 0
             || httpClient == 0 || dateTimeProvider == 0)
         return 0;
-        
+
     createRequestInit(reqPayload);
     char* request = headersToRequest();
     createRequestCleanup();

src/common/AWSClient2.h

@@ -12,13 +12,13 @@
 #include "AWSFoundationalTypes.h"
 
 /* Total number of headers. */
-static const int HEADER_COUNT = 7;
+static const int HEADER_COUNT2 = 7;
 /* Size of the awsDate string. */
-static const int AWS_DATE_LEN = 8;
+static const int AWS_DATE_LEN2 = 8;
 /* Size of the awsTime string. */
-static const int AWS_TIME_LEN = 6;
+static const int AWS_TIME_LEN2 = 6;
 /* Size of sha hashes and signatures in hexidecimal. */
-static const int HASH_HEX_LEN = 64;
+static const int HASH_HEX_LEN2 = 64;
 
 /* Base class for an AWS Service Client. Creates http and https request in raw
  * http format or as a curl command. */
@@ -27,20 +27,22 @@ class AWSClient2 {
     char* awsRegion;
     /* Endpoint, eg. "amazonaws.com" in "kinesis.us-east-1.amazonaws.com". */
     char* awsEndpoint;
+    /* Subdomain, eg. "A2MBBEONHC7LUH" in "A2MBBEONHC9LUG.iot.us-east-1.amazonaws.com". */
+    char* awsDomain;
     /* The user's AWS Secret Key for accessing the AWS Resource. */
     char* awsSecKey;
     /* The user's AWS Access Key ID for accessing the AWS Resource. */
     char* awsKeyID;
     /* GMT date in yyyyMMdd format. */
-    char awsDate[AWS_DATE_LEN + 1];
+    char awsDate[AWS_DATE_LEN2 + 1];
     /* GMT time in HHmmss format. */
-    char awsTime[AWS_TIME_LEN + 1];
+    char awsTime[AWS_TIME_LEN2 + 1];
     /* Number of headers created. */
     int headersCreated;
     /* Array of the created http headers. */
-    char* headers[HEADER_COUNT];
+    char* headers[HEADER_COUNT2];
     /* Array of string lengths of the headers in the "headers" array. */
-    int headerLens[HEADER_COUNT];
+    int headerLens[HEADER_COUNT2];
     /* The payload of the httprequest to be created */
     MinimalString payload;
 
@@ -76,6 +78,8 @@ class AWSClient2 {
     const char* awsService;
     /* Content type of payload, eg. "application/x-amz-json-1.1". */
     const char* contentType;
+    // /* Generates the host based on subdomain, service, etc */
+    // char* createHostString(void);
     /* Creates a raw http request, given the payload and current GMT date in
      * yyyyMMddHHmmss format. Should be exposed to user by extending class.
      * Returns 0 if client is unititialized. */
@@ -88,8 +92,11 @@ class AWSClient2 {
 public:
     /* Setters for values used by createRequest and createCurlRequest. Must
      * be set or create[Curl]Request will return null. */
+    /* Generates the host based on subdomain, service, etc */
+    char* createHostString(void);
     void setAWSRegion(const char * awsRegion);
     void setAWSEndpoint(const char * awsEndpoint);
+    void setAWSDomain(const char * awsDomain);
     void setAWSSecretKey(const char * awsSecKey);
     void setAWSKeyID(const char * awsKeyID);
     void setHttpClient(IHttpClient* httpClient);

src/common/AmazonIOTClient.cpp

@@ -0,0 +1,59 @@
+#include "AmazonIOTClient.h"
+#include "AWSFoundationalTypes.h"
+#include <stdlib.h>
+#include "Utils.h"
+
+static const char* SERVICE = "iotdata";
+static const char* FORM_TYPE = "application/json";
+static const char* PAYLOAD_TEMPLATE = "%s";
+// int PAYLOAD_TEMPLATE_LENGTH = 2;
+int IOT_EXTRACTED_TIMESTAMP_BUFFER_LENGTH = 17;
+int IOT_FORMATTED_TIMESTAMP_BUFFER_LENGTH = 15;
+
+AmazonIOTClient::AmazonIOTClient() : AWSClient2() {
+    awsService = SERVICE;
+    httpS = true;
+}
+
+char* AmazonIOTClient::update_shadow(MinimalString url, MinimalString shadow, ActionError& actionError) {
+
+    actionError = NONE_ACTIONERROR;
+    contentType = FORM_TYPE;
+
+    // char* request = createRequest(shadow, url);
+    // publishOutput.setResponse(request);
+
+    // char* request = createRequest(url, shadow);
+    char* request = createRequest(shadow);
+    return request;
+
+    // char* response = sendData(request);
+    // delete[] request;
+    //
+    // if (response == NULL) {
+    //     actionError = CONNECTION_ACTIONERROR;
+    //     return 999;
+    // }
+    //
+    // int httpStatusCode = findHttpStatusCode(response);
+    //
+    // if (httpStatusCode == 200) {
+    //   return 1;
+    // }
+    //
+    // if (httpStatusCode == 403) {
+    //     char* ts = strstr(response, "earlier than ");
+    //     int pos = ts - response;
+    //
+    //     char* newts = new char[IOT_EXTRACTED_TIMESTAMP_BUFFER_LENGTH]();
+    //     strncpy(newts, response + pos + 31, IOT_EXTRACTED_TIMESTAMP_BUFFER_LENGTH - 1);
+    //     newts[16] = '\0';
+    //
+    //     char* time = new char[IOT_FORMATTED_TIMESTAMP_BUFFER_LENGTH]();
+    //     sprintf(time, "%.8s%.6s", newts, newts + 9);
+    //     dateTimeProvider->sync(time);
+    //     return 0;
+    // }
+    //
+    // return httpStatusCode;
+}

src/common/AmazonIOTClient.h

@@ -0,0 +1,22 @@
+#ifndef AMAZONIOTCLIENT_H_
+#define AMAZONIOTCLIENT_H_
+#include "AWSClient2.h"
+
+
+// class Shadow {
+//     MinimalString shadow;
+//     void reset();
+// public:
+//     void setShadow(shadow) const;
+// };
+
+
+
+class AmazonIOTClient : public AWSClient2 {
+public:
+    AmazonIOTClient();
+
+    char* update_shadow(MinimalString url, MinimalString shadow, ActionError& actionError);
+};
+
+#endif /* AMAZONSNSCLIENT_H_ */

src/common/AmazonKinesisClient.cpp

@@ -2354,4 +2354,3 @@ KinesisErrorCheckingOnlyOutput AmazonKinesisClient::splitShard(SplitShardInput s
     }
     return kinesisErrorCheckingOnlyOutput;
 }
-

src/common/ESP8266AWSImplementations.h

@@ -0,0 +1 @@
+/Users/svdgraaf/Documents/Arduino/Libraries/aws-sdk-arduino/src/esp8266/ESP8266AWSImplementations.h

src/common/ESP8266AWSImplentations.cpp

@@ -0,0 +1 @@
+/Users/svdgraaf/Documents/Arduino/Libraries/aws-sdk-arduino/src/esp8266/ESP8266AWSImplentations.cpp

src/esp8266/ESP8266AWSImplementations.h

@@ -0,0 +1,38 @@
+#ifndef AWSESP2866IMPLEMENTATIONS_H_
+#define AWSESP2866IMPLEMENTATIONS_H_
+#include "DeviceIndependentInterfaces.h"
+/* application.h is Esp8266's standard library. Define TCPClient. */
+//#include <application.h>
+#include <ESP8266WiFi.h>
+
+/* HttpClient implementation to be used on the Esp8266 Core device. */
+class Esp8266HttpClient: public IHttpClient {
+    WiFiClientSecure client;
+    //TCPClient client;
+public:
+    Esp8266HttpClient();
+    /* Send http request and return the response. */
+    char* send(const char *request, const char* serverUrl, int port);
+    /* Returns false. Client uses raw http/https. */
+    bool usesCurl(void);
+};
+
+class Esp8266DateTimeProvider: public IDateTimeProvider {
+    /* The time as a cstring in yyyyMMddHHmmss format. Is written to within and
+     * returned by getDateTime(). */
+    WiFiClient client2;
+    //char dateTime[15];
+public:
+    char dateTime[15];
+    Esp8266DateTimeProvider();
+    /* Retrieve the current GMT date and time in yyyyMMddHHmmss format. */
+    const char* getDateTime(void);
+    /* Returns false because Esp8266 has it's own mechanism for syncing that does
+     * not require an argument. */
+    bool syncTakesArg(void);
+    /* Synchronizes Esp8266's date and time with Esp8266's servers. The dateTime
+     * argument is ignored. */
+    void sync(const char* dateTime);
+};
+
+#endif /* AWSESP2866IMPLEMENTATIONS_H_ */