correction and clang

Author: playmiel

.github/workflows/auto-tag.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Extract version from library.json
         id: version
         run: |
-          VERSION=$(grep -m1 '"version"' library.json | sed -E 's/.*"version" *: *"([^"]+)".*/\1/')
+          VERSION=$(jq -r '.version' library.json)
           echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
           echo "Detected version: ${VERSION}"
 

.github/workflows/release.yml

@@ -50,7 +50,7 @@ jobs:
 
     - name: Create source archive
       run: |
-        VERSION=$(grep '"version"' library.json | sed -E 's/.*"version" *: *"([^"]+)".*/\1/')
+        VERSION=$(jq -r '.version' library.json)
         ARCHIVE="ESPAsyncWebClient-${VERSION}.zip"
         zip -r "$ARCHIVE" src examples README.md LICENSE library.json library.properties
         echo "Created $ARCHIVE"
@@ -64,7 +64,7 @@ jobs:
     - name: Extract changelog for this version
       id: changelog
       run: |
-        VERSION=$(grep '"version"' library.json | sed -E 's/.*"version" *: *"([^"]+)".*/\1/')
+        VERSION=$(jq -r '.version' library.json)
         echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
 
         # Extract the section for this version from CHANGELOG.md

scripts/sync-version.sh

@@ -21,23 +21,75 @@ echo "Syncing version to ${NEW_VERSION} across all files..."
 
 # 1. library.json
 if [[ -f library.json ]]; then
-  sed -i -E "s/\"version\" *: *\"[^\"]+\"/\"version\": \"${NEW_VERSION}\"/" library.json
+  python3 - <<'PY' "${NEW_VERSION}"
+import json
+import sys
+
+new_version = sys.argv[1]
+path = "library.json"
+
+with open(path, "r", encoding="utf-8") as f:
+    data = json.load(f)
+
+if not isinstance(data, dict) or "version" not in data:
+    raise SystemExit("library.json missing top-level 'version' field")
+
+data["version"] = new_version
+
+with open(path, "w", encoding="utf-8", newline="\n") as f:
+    json.dump(data, f, indent=2, ensure_ascii=False)
+    f.write("\n")
+PY
   echo "  ✓ library.json"
 else
   echo "  ✗ library.json not found"
 fi
 
 # 2. library.properties
 if [[ -f library.properties ]]; then
-  sed -i -E "s/^version=.*/version=${NEW_VERSION}/" library.properties
+  python3 - <<'PY' "${NEW_VERSION}"
+import re
+import sys
+
+new_version = sys.argv[1]
+path = "library.properties"
+
+with open(path, "r", encoding="utf-8") as f:
+    text = f.read()
+
+updated, count = re.subn(r"^version=.*$", f"version={new_version}", text, flags=re.MULTILINE)
+if count == 0:
+    raise SystemExit("library.properties missing 'version=' line")
+
+with open(path, "w", encoding="utf-8", newline="\n") as f:
+    f.write(updated)
+PY
   echo "  ✓ library.properties"
 else
   echo "  ✗ library.properties not found"
 fi
 
 # 3. src/HttpCommon.h
 if [[ -f src/HttpCommon.h ]]; then
-  sed -i -E "s/#define ESP_ASYNC_WEB_CLIENT_VERSION \"[^\"]+\"/#define ESP_ASYNC_WEB_CLIENT_VERSION \"${NEW_VERSION}\"/" src/HttpCommon.h
+  python3 - <<'PY' "${NEW_VERSION}"
+import re
+import sys
+
+new_version = sys.argv[1]
+path = "src/HttpCommon.h"
+
+with open(path, "r", encoding="utf-8") as f:
+    text = f.read()
+
+pattern = r'#define ESP_ASYNC_WEB_CLIENT_VERSION "[^"]+"'
+replacement = f'#define ESP_ASYNC_WEB_CLIENT_VERSION "{new_version}"'
+updated, count = re.subn(pattern, replacement, text)
+if count == 0:
+    raise SystemExit("src/HttpCommon.h missing ESP_ASYNC_WEB_CLIENT_VERSION define")
+
+with open(path, "w", encoding="utf-8", newline="\n") as f:
+    f.write(updated)
+PY
   echo "  ✓ src/HttpCommon.h"
 else
   echo "  ✗ src/HttpCommon.h not found"

scripts/verify-release.sh

@@ -10,8 +10,7 @@ pass() { echo "[OK] $1"; }
 if [[ ! -f library.json ]]; then fail "library.json missing"; fi
 if [[ ! -f library.properties ]]; then fail "library.properties missing"; fi
 
-# Extract the first occurrence of a JSON key named "version" (top-level package version)
-VERSION_JSON=$(grep -m1 '"version"' library.json | sed -E 's/.*"version" *: *"([^"]+)".*/\1/')
+VERSION_JSON=$(jq -r '.version' library.json)
 VERSION_PROP=$(grep '^version=' library.properties | cut -d'=' -f2)
 
 [[ -n "${VERSION_JSON}" ]] || fail "Could not extract version from library.json"

src/AsyncCookieJar.cpp

@@ -132,7 +132,7 @@ bool AsyncCookieJar::isIpLiteral(const String& host) const {
 }
 
 bool AsyncCookieJar::normalizeCookieDomain(String& domain, const String& host, bool domainAttributeProvided,
-                                      bool* outHostOnly) const {
+                                           bool* outHostOnly) const {
     if (outHostOnly)
         *outHostOnly = true;
     String hostLower = host;
@@ -219,7 +219,7 @@ bool AsyncCookieJar::pathMatches(const String& cookiePath, const String& request
 }
 
 bool AsyncCookieJar::cookieMatchesRequest(const StoredCookie& cookie, const AsyncHttpRequest* request,
-                                     int64_t nowSeconds) const {
+                                          int64_t nowSeconds) const {
     if (!request)
         return false;
     if (isCookieExpired(cookie, nowSeconds))

src/AsyncHttpClient.cpp

@@ -1040,7 +1040,7 @@ void AsyncHttpClient::cleanup(RequestContext* context) {
     }
     // Guard against recursion: cleanup → tryDequeue → executeRequest → triggerError → cleanup → tryDequeue
     // The outer tryDequeue's while-loop will handle remaining pending requests.
-    if (!_inTryDequeue)
+    if (!_inTryDequeue.load(std::memory_order_acquire))
         tryDequeue();
 }
 
@@ -1103,9 +1103,8 @@ void AsyncHttpClient::loop() {
 }
 
 void AsyncHttpClient::tryDequeue() {
-    if (_inTryDequeue)
+    if (_inTryDequeue.exchange(true, std::memory_order_acq_rel))
         return; // prevent recursion via executeRequest → triggerError → cleanup → tryDequeue
-    _inTryDequeue = true;
     while (true) {
         lock();
         bool canStart = (_maxParallel == 0 || _activeRequests.size() < _maxParallel);
@@ -1119,7 +1118,7 @@ void AsyncHttpClient::tryDequeue() {
         unlock();
         executeRequest(ctx);
     }
-    _inTryDequeue = false;
+    _inTryDequeue.store(false, std::memory_order_release);
 }
 
 void AsyncHttpClient::sendStreamData(RequestContext* context) {

src/AsyncHttpClient.h

@@ -200,7 +200,7 @@ class AsyncHttpClient {
     AsyncHttpTLSConfig _defaultTlsConfig;
     bool _keepAliveEnabled = false;
     uint32_t _keepAliveIdleMs = 5000;
-    bool _inTryDequeue = false; // reentrancy guard to prevent cleanup → tryDequeue recursion
+    std::atomic_bool _inTryDequeue{false}; // cross-task reentrancy guard
     std::unique_ptr<AsyncCookieJar> _cookieJar;
     std::unique_ptr<ConnectionPool> _connectionPool;
     std::unique_ptr<RedirectHandler> _redirectHandler;