Dump use of HTTPClient

Use plain TCP communication to fetch & process remote resources

Fixes #178

Author: marcelstoer

src/OpenWeatherMapForecast.cpp

@@ -23,7 +23,6 @@
 
 #include <ESPWiFi.h>
 #include <WiFiClient.h>
-#include <ESPHTTPClient.h>
 #include "OpenWeatherMapForecast.h"
 
 OpenWeatherMapForecast::OpenWeatherMapForecast() {
@@ -32,49 +31,46 @@ OpenWeatherMapForecast::OpenWeatherMapForecast() {
 
 uint8_t OpenWeatherMapForecast::updateForecasts(OpenWeatherMapForecastData *data, String appId, String location, uint8_t maxForecasts) {
   this->maxForecasts = maxForecasts;
-  return doUpdate(data, buildUrl(appId, "q=" + location));
+  return doUpdate(data, buildPath(appId, "q=" + location));
 }
 
 uint8_t OpenWeatherMapForecast::updateForecastsById(OpenWeatherMapForecastData *data, String appId, String locationId, uint8_t maxForecasts) {
   this->maxForecasts = maxForecasts;
-  return doUpdate(data, buildUrl(appId, "id=" + locationId));
+  return doUpdate(data, buildPath(appId, "id=" + locationId));
 }
 
-String OpenWeatherMapForecast::buildUrl(String appId, String locationParameter) {
+String OpenWeatherMapForecast::buildPath(String appId, String locationParameter) {
   String units = metric ? "metric" : "imperial";
-  return "http://api.openweathermap.org/data/2.5/forecast?" + locationParameter + "&appid=" + appId + "&units=" + units + "&lang=" + language;
+  return "/data/2.5/forecast?" + locationParameter + "&appid=" + appId + "&units=" + units + "&lang=" + language;
 }
 
-uint8_t OpenWeatherMapForecast::doUpdate(OpenWeatherMapForecastData *data, String url) {
+uint8_t OpenWeatherMapForecast::doUpdate(OpenWeatherMapForecastData *data, String path) {
   unsigned long lostTest = 10000UL;
   unsigned long lost_do = millis();
   this->weatherItemCounter = 0;
   this->currentForecast = 0;
   this->data = data;
   JsonStreamingParser parser;
   parser.setListener(this);
-  Serial.printf("Getting url: %s\n", url.c_str());
-  HTTPClient http;
+  Serial.printf("[HTTP] Requesting resource at http://%s:%u%s\n", host.c_str(), port, path.c_str());
 
-  http.begin(url);
-  bool isBody = false;
-  char c;
-  Serial.print("[HTTP] GET...\n");
-  // start connection and send HTTP header
-  int httpCode = http.GET();
-  Serial.printf("[HTTP] GET... code: %d\n", httpCode);
-  if(httpCode > 0) {
+  WiFiClient client;
+  if(client.connect(host, port)) {
+    bool isBody = false;
+    char c;
+    Serial.println("[HTTP] connected, now GETting data");
+    client.print("GET " + path + " HTTP/1.1\r\n"
+                 "Host: " + host + "\r\n"
+                 "Connection: close\r\n\r\n");
 
-    WiFiClient * client = http.getStreamPtr();
-
-    while (client->connected() || client->available()) {
-      while (client->available()) {
+    while (client.connected() || client.available()) {
+      if (client.available()) {
         if ((millis() - lost_do) > lostTest) {
-          Serial.println("lost in client with a timeout");
-          client->stop();
+          Serial.println("[HTTP] lost in client with a timeout");
+          client.stop();
           ESP.restart();
         }
-        c = client->read();
+        c = client.read();
         if (c == '{' || c == '[') {
           isBody = true;
         }
@@ -84,8 +80,10 @@ uint8_t OpenWeatherMapForecast::doUpdate(OpenWeatherMapForecastData *data, Strin
         // give WiFi and TCP/IP libraries a chance to handle pending events
         yield();
       }
-      client->stop();
     }
+    client.stop();
+  } else {
+    Serial.println("[HTTP] failed to connect to host");
   }
   this->data = nullptr;
   return currentForecast;

src/OpenWeatherMapForecast.h

@@ -72,6 +72,8 @@ typedef struct OpenWeatherMapForecastData {
 
 class OpenWeatherMapForecast: public JsonListener {
   private:
+    const String host = "api.openweathermap.org";
+    const uint8_t port = 80;
     String currentKey;
     String currentParent;
     OpenWeatherMapForecastData *data;
@@ -84,8 +86,8 @@ class OpenWeatherMapForecast: public JsonListener {
     uint8_t allowedHoursCount = 0;
     boolean isCurrentForecastAllowed = true;
 
-    uint8_t doUpdate(OpenWeatherMapForecastData *data, String url);
-    String buildUrl(String appId, String locationParameter);
+    uint8_t doUpdate(OpenWeatherMapForecastData *data, String path);
+    String buildPath(String appId, String locationParameter);
 
   public:
     OpenWeatherMapForecast();