Merge pull request #54 from yoziru/dev

dev

Author: yoziru

AGENTS.md

@@ -22,6 +22,12 @@ cd build && ctest -j 2>&1 | grep -E "(FAILED.*\]|^[0-9]+% tests|expected equalit
 - **Protocol**: Protobuf messages (nanopb), AES-GCM encryption (mbedtls)
 - **Dependencies**: nanopb, mbedtls, googletest
 - **Generated Code**: `generated/src/*.pb.c`, `generated/include/*.pb.h`
+- **Generated Code**: Avoid manual edits; regenerate from `proto/` when needed
+
+## Protocol Notes
+- **Session info verification**: HMAC tag is required; request UUID must match the last request per domain.
+- **Response AAD**: Use response flags when building AAD (not a hardcoded encrypt-response flag).
+- **VCSEC responses**: Treat plaintext unless `AES_GCM_Response_data` is present.
 
 ## Code Style
 - **Namespace**: `TeslaBLE`
@@ -32,7 +38,6 @@ cd build && ctest -j 2>&1 | grep -E "(FAILED.*\]|^[0-9]+% tests|expected equalit
   - `_` suffix for private/protected methods (`cleanup_`, `initialize_peers_`)
   - `UPPER_CASE` for static constants
 - **Types**: Use `pb_byte_t`, `pb_size_t` for protobuf; `std::array`, `std::unique_ptr`
-- **Types**: Use `pb_byte_t`, `pb_size_t` for protobuf; `std::array`, `std::unique_ptr`
 - **Error Handling**: Return `TeslaBLE_Status_E` enum (0=OK); use `LOG_ERROR`/`LOG_DEBUG` macros
 - **Formatting**: No comments unless requested; 4-space indent; braces on same line
 - **Protobuf**: Use `*_init_default`/`*_init_zero`; encode with `pb_encode_fields`, decode with `pb_decode`

CMakeLists.txt

@@ -8,6 +8,7 @@ set(TESLABLE_SRCS
     "src/crypto_context.cpp"
     "src/errors.cpp"
     "src/message_builders.cpp"
+    "src/message_processor.cpp"
     "src/peer.cpp"
     "src/tb_logging.cpp"
     "src/tb_utils.cpp"
@@ -35,6 +36,7 @@ set(TESLABLE_PUBLIC_HEADERS
     include/client.h
     include/adapters.h
     include/errors.h
+    include/message_processor.h
     include/peer.h
     include/tb_logging.h
     include/tb_utils.h

README.md

@@ -96,6 +96,7 @@ ctest --output-on-failure --verbose
 ./tests/test_message_building
 ./tests/test_message_parsing
 ./tests/test_session_management
+./tests/test_protocol_compliance
 ./tests/test_utils
 
 # Run the complete test suite
@@ -191,9 +192,25 @@ The test suite is organized into several categories:
 - **`test_message_parsing.cpp`**: Parsing of received messages
 - **`test_session_management.cpp`**: Session handling and peer management
 - **`test_utils.cpp`**: Utility functions and helper methods
+- **`test_vehicle.cpp`**: Vehicle state management and command processing
+- **`test_exponential_backoff.cpp`**: Exponential backoff retry logic
 
 Each test file contains comprehensive unit tests covering both success and failure scenarios, edge cases, and parameter validation.
 
+### State Architecture
+
+The library uses a unified state pattern for command processing with the following states:
+
+- **`IDLE`**: Initial state for new commands
+- **`AUTHENTICATING`**: Unified authentication initiation (replaces legacy domain-specific states)
+- **`AUTH_RESPONSE_WAITING`**: Unified authentication response waiting
+- **`READY`**: Command ready to be sent
+- **`WAITING_FOR_RESPONSE`**: Waiting for command response
+- **`COMPLETED`**: Command completed successfully
+- **`FAILED`**: Command failed
+
+This architecture provides a clean, maintainable approach to command lifecycle management with exponential backoff for retries.
+
 ### Dependencies
 
 - [nanopb](https://github.com/nanopb/nanopb)

examples/simple/CMakeLists.txt

@@ -3,5 +3,5 @@ project(simple)
 
 set(CMAKE_CXX_STANDARD 23)
 add_subdirectory(../../ TeslaBLE)
-add_executable(simple main.cpp log.cpp)
+add_executable(simple main.cpp)
 target_link_libraries(simple PRIVATE TeslaBLE)

examples/simple/log.cpp examples/simple/log.hexamples/simple/log.cpp renamed to examples/simple/log.h

@@ -1,23 +1,21 @@
 #include <client.h>
 #include <cstdio>
-#include <cstring>
 #include <cinttypes>
 #include <pb_decode.h>
 #include <pb_encode.h>
 #include <signatures.pb.h>
-#include <string.h>
+#include <cstring>
 #include <universal_message.pb.h>
 #include <vcsec.pb.h>
 #include <sstream>
 #include <iomanip>
 
 #include "defs.h"
 #include "errors.h"
-#include "tb_utils.h"
-#include "log.cpp"
+#include "log.h"
 
 // mock data from PROTOCOL.md examples
-static const char *MOCK_VIN = "5YJ30123456789ABC";
+static constexpr char MOCK_VIN[] = "5YJ30123456789ABC";
 static const unsigned char MOCK_PRIVATE_KEY[227] =
     "-----BEGIN EC PRIVATE "
     "KEY-----\nMHcCAQEEILRjIS9VEyG+0K71a2T/"
@@ -40,16 +38,16 @@ int main() {
    * this loads an existing private key and generates the public key
    */
   LOG_INFO("Loading private key");
-  TeslaBLE::TeslaBLEStatus status = client.load_private_key(MOCK_PRIVATE_KEY, sizeof MOCK_PRIVATE_KEY);
-  // int status = client.createPrivateKey();
-  if (status != TeslaBLE::TeslaBLEStatus::OK) {
+  int status = client.load_private_key(MOCK_PRIVATE_KEY, sizeof MOCK_PRIVATE_KEY);
+  // int status = client.create_private_key();
+  if (status != 0) {
     LOG_ERROR("Failed create private key");
   }
 
   unsigned char private_key_buffer[sizeof MOCK_PRIVATE_KEY + 1];
   size_t private_key_length;
   status = client.get_private_key(private_key_buffer, sizeof(private_key_buffer), &private_key_length);
-  if (status != TeslaBLE::TeslaBLEStatus::OK) {
+  if (status != 0) {
     LOG_ERROR("Failed to get private key");
   }
   LOG_DEBUG("Private key length: %d", private_key_length);
@@ -60,13 +58,13 @@ int main() {
   // support for wake command added to CHARGING_MANAGER_ROLE in 2024.20.x (not sure?)
   // https://github.com/teslamotors/vehicle-command/issues/232#issuecomment-2181503570
   LOG_INFO("Building whitelist message for CHARGING MANAGER");
-  TeslaBLE::TeslaBLEStatus return_code =
+  int return_code =
       client.build_white_list_message(Keys_Role_ROLE_CHARGING_MANAGER, VCSEC_KeyFormFactor_KEY_FORM_FACTOR_CLOUD_KEY,
                                       whitelist_message_buffer, &whitelist_message_length);
 
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
-    LOG_ERROR("Failed to build whitelist message: %s",
-              TeslaBLE::teslable_status_to_string(static_cast<TeslaBLE::TeslaBLEStatus>(return_code)));
+  if (return_code != 0) {
+    auto status = static_cast<TeslaBLE::TeslaBLE_Status_E>(return_code);
+    LOG_ERROR("Failed to build whitelist message: %s", TeslaBLE::teslable_status_to_string(status));
     return -1;
   }
   LOG_DEBUG("Whitelist message length: %d", whitelist_message_length);
@@ -91,26 +89,26 @@ int main() {
   UniversalMessage_RoutableMessage received_message_vcsec = UniversalMessage_RoutableMessage_init_default;
   return_code =
       client.parse_universal_message(received_bytes_vcsec, sizeof(received_bytes_vcsec), &received_message_vcsec);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
-    LOG_ERROR("Failed to parse received message VSSE: %s",
-              TeslaBLE::teslable_status_to_string(static_cast<TeslaBLE::TeslaBLEStatus>(return_code)));
+  if (return_code != 0) {
+    auto status = static_cast<TeslaBLE::TeslaBLE_Status_E>(return_code);
+    LOG_ERROR("Failed to parse received message VSSE: %s", TeslaBLE::teslable_status_to_string(status));
     return -1;
   }
   log_routable_message(&received_message_vcsec);
 
   Signatures_SessionInfo session_info_vcsec = Signatures_SessionInfo_init_default;
   return_code = client.parse_payload_session_info(&received_message_vcsec.payload.session_info, &session_info_vcsec);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
+  if (return_code != 0) {
     LOG_ERROR("Failed to parse session info VSSEC");
     return -1;
   }
   log_session_info(&session_info_vcsec);
 
   UniversalMessage_Domain domain = UniversalMessage_Domain_DOMAIN_VEHICLE_SECURITY;
-  auto session = client.get_peer(domain);
+  auto *session = client.get_peer(domain);
 
   return_code = session->update_session(&session_info_vcsec);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
+  if (return_code != 0) {
     LOG_ERROR("Failed to update session VSSEC");
     return -1;
   }
@@ -134,7 +132,7 @@ int main() {
   size_t action_message_buffer_length = 0;
   return_code = client.build_vcsec_action_message(VCSEC_RKEAction_E_RKE_ACTION_WAKE_VEHICLE, action_message_buffer,
                                                   &action_message_buffer_length);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
+  if (return_code != 0) {
     LOG_ERROR("Failed to build action message ");
     return -1;
   }
@@ -148,7 +146,7 @@ int main() {
   return_code =
       client.build_vcsec_information_request_message(VCSEC_InformationRequestType_INFORMATION_REQUEST_TYPE_GET_STATUS,
                                                      info_request_status_buffer, &info_request_status_length);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
+  if (return_code != 0) {
     LOG_ERROR("Failed to build action message ");
     return -1;
   }
@@ -175,7 +173,7 @@ int main() {
   UniversalMessage_RoutableMessage received_message = UniversalMessage_RoutableMessage_init_default;
   return_code = client.parse_universal_message(received_bytes_infotainment, sizeof(received_bytes_infotainment),
                                                &received_message);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
+  if (return_code != 0) {
     LOG_ERROR("Failed to parse received message INFOTAINMENT");
     return -1;
   }
@@ -184,15 +182,15 @@ int main() {
   LOG_INFO("Parsing session info INFOTAINMENT");
   Signatures_SessionInfo session_info = Signatures_SessionInfo_init_default;
   return_code = client.parse_payload_session_info(&received_message.payload.session_info, &session_info);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
-    printf("Failed to parse session info INFOTAINMENT");
+  if (return_code != 0) {
+    LOG_ERROR("Failed to parse session info INFOTAINMENT");
     return -1;
   }
   log_session_info(&session_info);
 
   session = client.get_peer(UniversalMessage_Domain_DOMAIN_INFOTAINMENT);
   return_code = session->update_session(&session_info);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
+  if (return_code != 0) {
     LOG_ERROR("Failed to update session INFOTAINMENT");
     return -1;
   }
@@ -223,7 +221,7 @@ int main() {
   return_code = client.build_car_server_vehicle_action_message(
       charging_amps_message_buffer, &charging_amps_message_length, CarServer_VehicleAction_setChargingAmpsAction_tag,
       &charging_amps_action);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
+  if (return_code != 0) {
     LOG_ERROR("Failed to build charging amps message");
     return -1;
   }
@@ -239,7 +237,7 @@ int main() {
   return_code = client.build_car_server_vehicle_action_message(
       charging_limit_message_buffer, &charging_limit_message_length, CarServer_VehicleAction_chargingSetLimitAction_tag,
       &charging_limit_action);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
+  if (return_code != 0) {
     LOG_ERROR("Failed to build charging limit message");
     return -1;
   }
@@ -255,7 +253,7 @@ int main() {
   hvac_action.manual_override = false;
   return_code = client.build_car_server_vehicle_action_message(
       hvac_on_message_buffer, &hvac_on_message_length, CarServer_VehicleAction_hvacAutoAction_tag, &hvac_action);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
+  if (return_code != 0) {
     LOG_ERROR("Failed to build HVAC message");
     return -1;
   }
@@ -267,8 +265,8 @@ int main() {
   size_t get_data_message_length;
   return_code = client.build_car_server_get_vehicle_data_message(get_data_message_buffer, &get_data_message_length,
                                                                  CarServer_GetVehicleData_getChargeState_tag);
-  if (return_code != TeslaBLE::TeslaBLEStatus::OK) {
-    LOG_ERROR("Failed to buildCarServerGetVehicleDataMessage");
+  if (return_code != 0) {
+    LOG_ERROR("Failed to build_car_server_get_vehicle_data_message");
     return -1;
   }
   LOG_DEBUG("HVAC length: %d", get_data_message_length);