Use HTTPClient (#115)

Author: CelliesProjects

src/OpenStreetMap-esp32.cpp

@@ -250,7 +250,7 @@ void OpenStreetMap::makeJobList(const tileList &requiredTiles, std::vector<TileJ
 
 void OpenStreetMap::runJobs(const std::vector<TileJob> &jobs)
 {
-    log_i("submitting %i jobs", (int)jobs.size());
+    log_d("submitting %i jobs", (int)jobs.size());
 
     pendingJobs.store(jobs.size());
     for (const TileJob &job : jobs)
@@ -380,9 +380,46 @@ bool OpenStreetMap::fillBuffer(WiFiClient *stream, MemoryBuffer &buffer, size_t
     return true;
 }
 
-std::unique_ptr<MemoryBuffer> OpenStreetMap::urlToBuffer(const char *url, String &result, ReusableTileFetcher &fetcher)
+std::unique_ptr<MemoryBuffer> OpenStreetMap::urlToBuffer(const char *url, String &result)
 {
-    auto buffer = fetcher.fetchToBuffer(url, result);
+    HTTPClientRAII http;
+    if (!http.begin(url))
+    {
+        result = "Failed to initialize HTTP client";
+        return nullptr;
+    }
+
+    const int httpCode = http.GET();
+    if (httpCode != HTTP_CODE_OK)
+    {
+        result = "HTTP Error: " + String(httpCode);
+        return nullptr;
+    }
+
+    const size_t contentSize = http.getSize();
+    if (contentSize < 1)
+    {
+        result = "Empty or chunked response";
+        return nullptr;
+    }
+
+    WiFiClient *stream = http.getStreamPtr();
+    if (!stream)
+    {
+        result = "Failed to get HTTP stream";
+        return nullptr;
+    }
+
+    auto buffer = std::make_unique<MemoryBuffer>(contentSize);
+    if (!buffer->isAllocated())
+    {
+        result = "Failed to allocate buffer";
+        return nullptr;
+    }
+
+    if (!fillBuffer(stream, *buffer, contentSize, result))
+        return nullptr;
+
     return buffer;
 }
 
@@ -392,7 +429,7 @@ void OpenStreetMap::PNGDraw(PNGDRAW *pDraw)
     getPNGCurrentCore()->getLineAsRGB565(pDraw, destRow, PNG_RGB565_BIG_ENDIAN, 0xffffffff);
 }
 
-bool OpenStreetMap::fetchTile(ReusableTileFetcher &fetcher, CachedTile &tile, uint32_t x, uint32_t y, uint8_t zoom, String &result)
+bool OpenStreetMap::fetchTile(CachedTile &tile, uint32_t x, uint32_t y, uint8_t zoom, String &result)
 {
     String url = currentProvider->urlTemplate;
     url.replace("{x}", String(x));
@@ -401,7 +438,7 @@ bool OpenStreetMap::fetchTile(ReusableTileFetcher &fetcher, CachedTile &tile, ui
     if (currentProvider->requiresApiKey && strstr(url.c_str(), "{apiKey}"))
         url.replace("{apiKey}", currentProvider->apiKey);
 
-    const std::unique_ptr<MemoryBuffer> buffer = urlToBuffer(url.c_str(), result, fetcher);
+    const std::unique_ptr<MemoryBuffer> buffer = urlToBuffer(url.c_str(), result);
     if (!buffer)
         return false;
 
@@ -439,7 +476,6 @@ bool OpenStreetMap::fetchTile(ReusableTileFetcher &fetcher, CachedTile &tile, ui
 void OpenStreetMap::tileFetcherTask(void *param)
 {
     OpenStreetMap *osm = static_cast<OpenStreetMap *>(param);
-    ReusableTileFetcher fetcher;
     while (true)
     {
         TileJob job;
@@ -450,7 +486,7 @@ void OpenStreetMap::tileFetcherTask(void *param)
             break;
 
         String result;
-        if (!osm->fetchTile(fetcher, *job.tile, job.x, job.y, job.z, result))
+        if (!osm->fetchTile(*job.tile, job.x, job.y, job.z, result))
         {
             const size_t tileByteCount = osm->currentProvider->tileSize * osm->currentProvider->tileSize * 2;
             memset(job.tile->buffer, 0, tileByteCount);

src/OpenStreetMap-esp32.hpp

@@ -37,11 +37,10 @@
 #include "TileJob.hpp"
 #include "MemoryBuffer.hpp"
 #include "HTTPClientRAII.hpp"
-#include "ReusableTileFetcher.hpp"
 #include "fonts/DejaVu9-modded.h"
 
 constexpr uint16_t OSM_BGCOLOR = lgfx::color565(32, 32, 128);
-constexpr uint16_t OSM_TILE_TIMEOUT_MS = 500;
+constexpr uint16_t OSM_TILE_TIMEOUT_MS = 1000;
 constexpr UBaseType_t OSM_TASK_PRIORITY = 1;
 constexpr uint32_t OSM_TASK_STACKSIZE = 5120;
 constexpr uint32_t OSM_JOB_QUEUE_SIZE = 50;
@@ -109,8 +108,8 @@ class OpenStreetMap
     void runJobs(const std::vector<TileJob> &jobs);
     CachedTile *findUnusedTile(const tileList &requiredTiles, uint8_t zoom);
     CachedTile *isTileCached(uint32_t x, uint32_t y, uint8_t z);
-    bool fetchTile(ReusableTileFetcher &fetcher, CachedTile &tile, uint32_t x, uint32_t y, uint8_t zoom, String &result);
-    std::unique_ptr<MemoryBuffer> urlToBuffer(const char *url, String &result, ReusableTileFetcher &fetcher);
+    std::unique_ptr<MemoryBuffer> urlToBuffer(const char *url, String &result);
+    bool fetchTile(CachedTile &tile, uint32_t x, uint32_t y, uint8_t zoom, String &result);
     bool fillBuffer(WiFiClient *stream, MemoryBuffer &buffer, size_t contentSize, String &result);
     bool composeMap(LGFX_Sprite &mapSprite, TileBufferList &tilePointers);
     static void tileFetcherTask(void *param);

src/ReusableTileFetcher.cpp

@@ -1,3 +1,26 @@
+/*
+    Copyright (c) 2025 Cellie https://github.com/CelliesProjects/OpenStreetMap-esp32
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+    SPDX-License-Identifier: MIT
+    */
+
 #include "ReusableTileFetcher.hpp"
 
 ReusableTileFetcher::ReusableTileFetcher() {}
@@ -16,12 +39,7 @@ std::unique_ptr<MemoryBuffer> ReusableTileFetcher::fetchToBuffer(const String &u
     if (!ensureConnection(host, port, result))
         return nullptr;
 
-    if (!sendHttpRequest(host, path))
-    {
-        result = "Failed to send HTTP GET request";
-        return nullptr;
-    }
-
+    sendHttpRequest(host, path);
     size_t contentLength = 0;
     if (!readHttpHeaders(contentLength, result))
         return nullptr;
@@ -42,12 +60,8 @@ std::unique_ptr<MemoryBuffer> ReusableTileFetcher::fetchToBuffer(const String &u
 bool ReusableTileFetcher::parseUrl(const String &url, String &host, String &path, uint16_t &port)
 {
     port = 80;
-
     if (url.startsWith("https://"))
-    {
-        // Not supported in this fetcher (requires WiFiClientSecure)
         return false;
-    }
 
     if (!url.startsWith("http://"))
         return false;
@@ -78,14 +92,13 @@ bool ReusableTileFetcher::ensureConnection(const String &host, uint16_t port, St
     return true;
 }
 
-bool ReusableTileFetcher::sendHttpRequest(const String &host, const String &path)
+void ReusableTileFetcher::sendHttpRequest(const String &host, const String &path)
 {
     client.print(String("GET ") + path + " HTTP/1.1\r\n");
     client.print(String("Host: ") + host + "\r\n");
     client.print("User-Agent: OpenStreetMap-esp32/1.0 (+https://github.com/CelliesProjects/OpenStreetMap-esp32)\r\n");
     client.print("Connection: keep-alive\r\n");
     client.print("\r\n");
-    return true;
 }
 
 bool ReusableTileFetcher::readHttpHeaders(size_t &contentLength, String &result)
@@ -100,9 +113,8 @@ bool ReusableTileFetcher::readHttpHeaders(size_t &contentLength, String &result)
             break; // End of headers
 
         if (line.startsWith("Content-Length:"))
-        {
             contentLength = line.substring(15).toInt();
-        }
+
         else if (line.startsWith("HTTP/1.1"))
         {
             if (!line.startsWith("HTTP/1.1 200"))
@@ -143,9 +155,7 @@ bool ReusableTileFetcher::readBody(MemoryBuffer &buffer, size_t contentLength, S
             return false;
         }
         else
-        {
-            delay(1);
-        }
+            taskYIELD();
     }
 
     if (remaining > 0)

src/ReusableTileFetcher.hpp

@@ -1,15 +1,38 @@
+/*
+    Copyright (c) 2025 Cellie https://github.com/CelliesProjects/OpenStreetMap-esp32
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE.
+    SPDX-License-Identifier: MIT
+    */
+
 #pragma once
 
 #include <WiFiClient.h>
 #include <memory>
-#include "MemoryBuffer.hpp" // your existing class
+#include "MemoryBuffer.hpp"
 
-class ReusableTileFetcher {
+class ReusableTileFetcher
+{
 public:
     ReusableTileFetcher();
     ~ReusableTileFetcher();
 
-    // Not copyable/movable
     ReusableTileFetcher(const ReusableTileFetcher &) = delete;
     ReusableTileFetcher &operator=(const ReusableTileFetcher &) = delete;
 
@@ -22,7 +45,7 @@ class ReusableTileFetcher {
 
     bool parseUrl(const String &url, String &host, String &path, uint16_t &port);
     bool ensureConnection(const String &host, uint16_t port, String &result);
-    bool sendHttpRequest(const String &host, const String &path);
+    void sendHttpRequest(const String &host, const String &path);
     bool readHttpHeaders(size_t &contentLength, String &result);
     bool readBody(MemoryBuffer &buffer, size_t contentLength, String &result);
 };