Add retry delay (XPC)

gabriel · Sep 1, 2016 · ec921f4 · ec921f4
1 parent 321b070
commit ec921f4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,9 +16,11 @@ DerivedData
 .idea/
 *.hmap
 *.xccheckout
+*.xcscmblueprint
 
 #CocoaPods
 Pods
 
 Cartfile.resolved
 Carthage
+
diff --git a/MPMessagePack.podspec b/MPMessagePack.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MPMessagePack"
-  s.version      = "1.3.9"
+  s.version      = "1.3.10"
   s.summary      = "Library for MessagePack"
   s.homepage     = "https://github.com/gabriel/MPMessagePack"
   s.license      = { :type => "MIT" }

diff --git a/XPC/MPXPCClient.h b/XPC/MPXPCClient.h
@@ -24,7 +24,7 @@
 
 - (void)sendRequest:(NSString *)method params:(NSArray *)params completion:(void (^)(NSError *error, id value))completion;
 
-- (void)sendRequest:(NSString *)method params:(NSArray *)params maxAttempts:(NSInteger)maxAttempts completion:(void (^)(NSError *error, id value))completion;
+- (void)sendRequest:(NSString *)method params:(NSArray *)params maxAttempts:(NSInteger)maxAttempts retryDelay:(NSTimeInterval)retryDelay completion:(void (^)(NSError *error, id value))completion;
 
 - (void)close;
 

diff --git a/XPC/MPXPCClient.m b/XPC/MPXPCClient.m
@@ -80,14 +80,14 @@ - (void)close {
 }
 
 - (void)sendRequest:(NSString *)method params:(NSArray *)params completion:(void (^)(NSError *error, id value))completion {
-  [self sendRequest:method params:params attempt:1 maxAttempts:2 completion:completion];
+  [self sendRequest:method params:params attempt:1 maxAttempts:2 retryDelay:0 completion:completion];
 }
 
-- (void)sendRequest:(NSString *)method params:(NSArray *)params maxAttempts:(NSInteger)maxAttempts completion:(void (^)(NSError *error, id value))completion {
-  [self sendRequest:method params:params attempt:1 maxAttempts:maxAttempts completion:completion];
+- (void)sendRequest:(NSString *)method params:(NSArray *)params maxAttempts:(NSInteger)maxAttempts retryDelay:(NSTimeInterval)retryDelay completion:(void (^)(NSError *error, id value))completion {
+  [self sendRequest:method params:params attempt:1 maxAttempts:maxAttempts retryDelay:retryDelay completion:completion];
 }
 
-- (void)sendRequest:(NSString *)method params:(NSArray *)params attempt:(NSInteger)attempt maxAttempts:(NSInteger)maxAttempts completion:(void (^)(NSError *error, id value))completion {
+- (void)sendRequest:(NSString *)method params:(NSArray *)params attempt:(NSInteger)attempt maxAttempts:(NSInteger)maxAttempts retryDelay:(NSTimeInterval)retryDelay completion:(void (^)(NSError *error, id value))completion {
   if (!_connection) {
     NSError *error = nil;
     if (![self connect:&error]) {
@@ -127,7 +127,9 @@ - (void)sendRequest:(NSString *)method params:(NSArray *)params attempt:(NSInteg
         NSString *errorMessage = [NSString stringWithCString:description encoding:NSUTF8StringEncoding];
         completion(MPMakeError(MPXPCErrorCodeInvalidConnection, @"XPC Error: %@", errorMessage), nil);
       } else {
-        [self sendRequest:method params:params attempt:attempt+1 maxAttempts:maxAttempts completion:completion];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, retryDelay * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
+          [self sendRequest:method params:params attempt:attempt+1 maxAttempts:maxAttempts retryDelay:retryDelay completion:completion];
+        });
       }
     } else if (xpc_get_type(event) == XPC_TYPE_DICTIONARY) {
       replied = YES;