add ci gzip et clang

Author: playmiel

.github/workflows/lint.yml

@@ -15,7 +15,8 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y clang-format
       - name: Check formatting
         run: |
-          files=$(git ls-files '*.h' '*.cpp' '*.ino')
+          # Exclude vendored third-party sources from formatting checks.
+          files=$(git ls-files '*.h' '*.cpp' '*.ino' | grep -v '^src/third_party/' || true)
           echo "Checking clang-format on: $files"
           diff_found=0
           for f in $files; do
@@ -33,7 +34,11 @@ jobs:
         run: pip install cpplint
       - name: Run cpplint
         run: |
-          cpplint --recursive --extensions=h,cpp src || true
+          # Keep third_party out of lint noise.
+          files=$(git ls-files src | grep -E '\\.(h|cpp)$' | grep -v '^src/third_party/' || true)
+          if [ -n "$files" ]; then
+            cpplint $files || true
+          fi
           # We don't fail hard yet; adjust policy later
   cppcheck:
     runs-on: ubuntu-latest
@@ -45,7 +50,7 @@ jobs:
         run: |
           cppcheck --enable=warning,style,performance --inline-suppr \
             --suppress=missingIncludeSystem \
-            -I src --quiet src || true
+            -I src --quiet src --exclude=src/third_party || true
   version-sync:
     runs-on: ubuntu-latest
     steps:

.github/workflows/test.yml

@@ -199,14 +199,17 @@ jobs:
           path: |
             ~/.platformio/.cache
           key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
-      - name: Run native unit tests (UrlParser)
+      - name: Run native unit tests (UrlParser + gzip)
         if: ${{ hashFiles('test/**') != '' }}
         run: |
           echo "Detected test files:" $(ls test || true)
-          pio test -e native -f test_urlparser_native -v
+          pio test -e native -f test_urlparser_native -f test_gzip_decode_native -v
       - name: Skip notice (no tests found)
         if: ${{ hashFiles('test/**') == '' }}
         run: echo "No test directory present in this ref; skipping native tests."
+      - name: Compile ESP32 (gzip enabled)
+        run: |
+          pio run -e compile_test_gzip -v
 
   python-parse-tests:
     runs-on: ubuntu-latest

platformio.ini

@@ -92,3 +92,4 @@ build_src_filter = -<*> +<UrlParser.cpp> +<GzipDecoder.cpp> +<third_party/miniz/
 build_flags = 
     -I test/test_urlparser_native
     -I src
+    -DASYNC_HTTP_ENABLE_GZIP_DECODE=1

src/AsyncHttpClient.cpp

@@ -696,7 +696,7 @@ void AsyncHttpClient::handleData(RequestContext* context, char* data, size_t len
                 size_t outLen = 0;
                 size_t consumed = 0;
                 GzipDecoder::Result r = context->gzipDecoder.write(reinterpret_cast<const uint8_t*>(wire + offset),
-                                                                  wireLen - offset, &consumed, &outPtr, &outLen, true);
+                                                                   wireLen - offset, &consumed, &outPtr, &outLen, true);
                 if (outLen > 0) {
                     if (!emitBodyBytes(reinterpret_cast<const char*>(outPtr), outLen))
                         return false;

src/AsyncHttpClient.h

@@ -179,10 +179,9 @@ class AsyncHttpClient {
         RequestContext()
             : request(nullptr), response(nullptr), transport(nullptr), headersComplete(false), responseProcessed(false),
               expectedContentLength(0), receivedContentLength(0), receivedBodyLength(0), chunked(false),
-              chunkedComplete(false),
-              currentChunkRemaining(0), awaitingFinalChunkTerminator(false), id(0), trailerLineCount(0),
-              redirectCount(0), notifiedEndCallback(false), connectStartMs(0), connectTimeoutMs(0), headersSent(false),
-              streamingBodyInProgress(false), requestKeepAlive(false), serverRequestedClose(false),
+              chunkedComplete(false), currentChunkRemaining(0), awaitingFinalChunkTerminator(false), id(0),
+              trailerLineCount(0), redirectCount(0), notifiedEndCallback(false), connectStartMs(0), connectTimeoutMs(0),
+              headersSent(false), streamingBodyInProgress(false), requestKeepAlive(false), serverRequestedClose(false),
               usingPooledConnection(false)
 #if ASYNC_HTTP_ENABLE_GZIP_DECODE
               ,

src/GzipDecoder.cpp

@@ -1,5 +1,60 @@
 #include "GzipDecoder.h"
 
+#if !ASYNC_HTTP_ENABLE_GZIP_DECODE
+
+#include <string.h>
+
+GzipDecoder::GzipDecoder()
+    : _state(State::kError), _headerStage(HeaderStage::kFixed10), _error("Gzip decode disabled"), _fixedLen(0),
+      _flags(0), _extraLenRead(0), _extraRemaining(0), _needName(false), _needComment(false), _needHcrc(false),
+      _trailerLen(0), _dict(nullptr), _dictOfs(0), _decomp(nullptr) {
+    memset(_fixed, 0, sizeof(_fixed));
+    memset(_extraLenBytes, 0, sizeof(_extraLenBytes));
+    memset(_trailer, 0, sizeof(_trailer));
+}
+
+GzipDecoder::~GzipDecoder() {}
+
+void GzipDecoder::reset() {}
+
+bool GzipDecoder::begin() {
+    return false;
+}
+
+GzipDecoder::Result GzipDecoder::write(const uint8_t* in, size_t inLen, size_t* inConsumed, const uint8_t** outPtr,
+                                       size_t* outLen, bool hasMoreInput) {
+    (void)in;
+    (void)inLen;
+    (void)hasMoreInput;
+    if (inConsumed)
+        *inConsumed = 0;
+    if (outPtr)
+        *outPtr = nullptr;
+    if (outLen)
+        *outLen = 0;
+    _error = "Gzip decode disabled (build with -DASYNC_HTTP_ENABLE_GZIP_DECODE=1)";
+    return Result::kError;
+}
+
+GzipDecoder::Result GzipDecoder::finish(const uint8_t** outPtr, size_t* outLen) {
+    if (outPtr)
+        *outPtr = nullptr;
+    if (outLen)
+        *outLen = 0;
+    _error = "Gzip decode disabled (build with -DASYNC_HTTP_ENABLE_GZIP_DECODE=1)";
+    return Result::kError;
+}
+
+bool GzipDecoder::isDone() const {
+    return false;
+}
+
+const char* GzipDecoder::lastError() const {
+    return _error ? _error : "";
+}
+
+#else
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -18,9 +73,10 @@ static constexpr uint8_t kGzipFlagExtra = 0x04;
 static constexpr uint8_t kGzipFlagName = 0x08;
 static constexpr uint8_t kGzipFlagComment = 0x10;
 
-GzipDecoder::GzipDecoder() : _state(State::kHeader), _headerStage(HeaderStage::kFixed10), _error(nullptr), _fixedLen(0),
-                             _flags(0), _extraLenRead(0), _extraRemaining(0), _needName(false), _needComment(false),
-                             _needHcrc(false), _trailerLen(0), _dict(nullptr), _dictOfs(0), _decomp(nullptr) {
+GzipDecoder::GzipDecoder()
+    : _state(State::kHeader), _headerStage(HeaderStage::kFixed10), _error(nullptr), _fixedLen(0), _flags(0),
+      _extraLenRead(0), _extraRemaining(0), _needName(false), _needComment(false), _needHcrc(false), _trailerLen(0),
+      _dict(nullptr), _dictOfs(0), _decomp(nullptr) {
     memset(_fixed, 0, sizeof(_fixed));
     memset(_extraLenBytes, 0, sizeof(_extraLenBytes));
     memset(_trailer, 0, sizeof(_trailer));
@@ -352,3 +408,5 @@ GzipDecoder::Result GzipDecoder::finish(const uint8_t** outPtr, size_t* outLen)
 
     return r;
 }
+
+#endif // ASYNC_HTTP_ENABLE_GZIP_DECODE

src/GzipDecoder.h

@@ -78,4 +78,3 @@ class GzipDecoder {
 };
 
 #endif // GZIP_DECODER_H
-

src/third_party/miniz/miniz_tinfl.c

@@ -24,6 +24,12 @@
  *
  **************************************************************************/
 
+#ifndef ASYNC_HTTP_ENABLE_GZIP_DECODE
+#define ASYNC_HTTP_ENABLE_GZIP_DECODE 0
+#endif
+
+#if ASYNC_HTTP_ENABLE_GZIP_DECODE
+
 #include "miniz.h"
 
 #ifndef MINIZ_NO_INFLATE_APIS
@@ -768,3 +774,5 @@ extern "C"
 #endif
 
 #endif /*#ifndef MINIZ_NO_INFLATE_APIS*/
+
+#endif // ASYNC_HTTP_ENABLE_GZIP_DECODE

test/test_gzip_decode_native/test_main.cpp

@@ -26,8 +26,7 @@ static std::string decodeGzipInChunks(const std::vector<uint8_t>& gz, size_t chu
             const uint8_t* outPtr = nullptr;
             size_t outLen = 0;
             size_t consumed = 0;
-            GzipDecoder::Result r =
-                dec.write(gz.data() + offset + inner, n - inner, &consumed, &outPtr, &outLen, true);
+            GzipDecoder::Result r = dec.write(gz.data() + offset + inner, n - inner, &consumed, &outPtr, &outLen, true);
             if (outLen > 0) {
                 out.append(reinterpret_cast<const char*>(outPtr), outLen);
             }