Propagate error message from libviv

p00ya · Sep 20, 2020 · eb054c9 · eb054c9
1 parent 5b1443c
commit eb054c9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/viv/manager.cpp b/viv/manager.cpp
@@ -92,7 +92,7 @@ Manager::NotifyValue(uint8_t const *value, size_t length) {
   if (command.ReadPacket(packet) < 0) {
     delegate_->DidError(
         kVLManagerErrorBadPayload,
-        command.name() + ": invalid value notification");
+        command.name() + ": error in response");
     return;
   }
 

diff --git a/viv/manager_objc_bridge.mm b/viv/manager_objc_bridge.mm
@@ -24,6 +24,31 @@
 
 const NSErrorDomain VLOManagerErrorDomain = @"VLOManagerErrorDomain";
 
+static NSString *const VLOUserInfoMessageKey = @"message";
+
+/// Wrapper for errors from libviv, with custom description.
+@interface VLOError : NSError
+- (instancetype)initWithCode:(VLManagerErrorCode)code
+                     message:(NSString *)message;
+
+@end
+
+@implementation VLOError
+
+- (instancetype)initWithCode:(VLManagerErrorCode)code
+                     message:(NSString *)message {
+  self = [super initWithDomain:VLOManagerErrorDomain
+                          code:code
+                      userInfo:@{VLOUserInfoMessageKey : message}];
+  return self;
+}
+
+- (NSString *)localizedDescription {
+  return self.userInfo[VLOUserInfoMessageKey];
+}
+
+@end
+
 namespace {
 
 /// Implementation of the C++ delegate interface that forwards to the
@@ -56,9 +81,8 @@ int WriteValue(uint8_t const *value, size_t length) override {
   void
   DidError(VLManagerErrorCode code, std::string const &&msg) const override {
     if ([delegate_ respondsToSelector:@selector(didError:)]) {
-      NSError *error = [NSError errorWithDomain:VLOManagerErrorDomain
-                                           code:code
-                                       userInfo:@{}];
+      NSString *message = [NSString stringWithUTF8String:msg.c_str()];
+      VLOError *error = [[VLOError alloc] initWithCode:code message:message];
       [delegate_ didError:error];
     }
   }