Merge release v1.3.2

# Conflicts:
#	hassio-addon/config.yaml

Author: github-actions[bot]

CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
+## [1.3.2] - 2025-11-08
+- Fixed Venus 3 devices (VNSE3) working on firmware version 139
+
 ## [1.3.1] - 2025-10-26
 - Fixed forwarding direction for HMB devices. (#96)
 - Added retry logic with exponential backoff for Hame API calls to handle temporary server errors (#97)

hassio-addon/config.yaml

@@ -1,5 +1,5 @@
 name: "Hame Relay"
-version: "1.3.1"
+version: "1.3.2"
 slug: "hame_relay"
 description: "Connect B2500 storage to Home Assistant while keeping mobile app functionality"
 url: "https://github.com/tomquist/hame-relay"

release.sh

@@ -148,7 +148,17 @@ git checkout main
 git pull origin main
 
 print_info "Merging release branch into main"
-git merge "$RELEASE_BRANCH" --no-ff -m "Merge release v${VERSION}"
+if ! git merge "$RELEASE_BRANCH" --no-ff -m "Merge release v${VERSION}"; then
+    if git status --short | grep -q "^UU hassio-addon/config.yaml"; then
+        print_warning "Merge conflict detected in hassio-addon/config.yaml. Using release branch version."
+        git checkout --theirs hassio-addon/config.yaml
+        git add hassio-addon/config.yaml
+        git commit --no-edit
+    else
+        print_error "Merge failed due to conflicts. Please resolve manually."
+        exit 1
+    fi
+fi
 
 # Create and push tag
 print_info "Creating tag ${VERSION}"

src/topic.ts

@@ -368,9 +368,8 @@ class CommonHelper {
     }
 
     if (normalizedVid.startsWith("VNSE3")) {
-      // TODO: Unclear what the minimum version is for VNSE3. v114 uses hame-2025 but with the old topic encryption.
-      // For now we assume VNSE3 uses the same versioning as HMG.
-      return version >= 154.0;
+      // Venus 3 devices (VNSE3) are confirmed to work starting with firmware v139.
+      return version >= 139.0;
     }
 
     return false;