respect backoffs

kevin-montrose · Apr 3, 2013 · 4598575 · 4598575
1 parent dd93fe8
commit 4598575
Show file tree

Hide file tree

Showing 23 changed files with 141 additions and 114 deletions.
diff --git a/...j/project.xcworkspace/xcuserdata/kevinmontrose.xcuserdatad/UserInterfaceState.xcuserstate b/...j/project.xcworkspace/xcuserdata/kevinmontrose.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/StacMan/StacManAccessTokenMethods.m b/StacMan/StacManAccessTokenMethods.m
@@ -7,6 +7,7 @@
 //
 
 #import "StacManAccessTokenMethods.h"
+#import "Utils.h"
 
 @implementation StacManAccessTokenMethods
 __weak StacManClient* client;
@@ -36,7 +37,7 @@ -(StacManResponse*)invalidAccessTokens:(NSArray*)accessTokens filter:(NSString*)
      pageSize
      ];
 
-    return [client enqueue:url ofType:@"access_token" delegate:del];
+    return [client enqueue:url ofType:@"access_token" delegate:del backoffKey:@"aci"];
 }
 
 -(StacManResponse*)getAccessTokens:(NSArray*)accessTokens filter:(NSString*)filter page:(int)page pageSize:(int)pageSize delegate:(NSObject<StacManDelegate>*)del
@@ -53,6 +54,6 @@ -(StacManResponse*)getAccessTokens:(NSArray*)accessTokens filter:(NSString*)filt
      pageSize
      ];
 
-    return [client enqueue:url ofType:@"access_token" delegate:del];
+    return [client enqueue:url ofType:@"access_token" delegate:del backoffKey:@"acg"];
 }
 @end
diff --git a/StacMan/StacManAnswerMethods.m b/StacMan/StacManAnswerMethods.m
@@ -43,7 +43,7 @@ -(StacManResponse*)getAllOnSite:(NSString*)site filter:(NSString*)filter page:(i
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"answer" delegate:del];
+    return [client enqueue:url ofType:@"answer" delegate:del backoffKey:@"aall"];
 }
 
 -(StacManResponse*)getByIdsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSString*)filter page:(int)page pageSize:(int)pageSize fromDate:(NSDate*)fromDate toDate:(NSDate*)toDate sort:(NSString*)sort minDate:(NSDate*)minDate maxDate:(NSDate*)maxDate min:(NSNumber*)min max:(NSNumber*)max order:(NSString*)order delegate:(NSObject<StacManDelegate>*)del
@@ -67,7 +67,7 @@ -(StacManResponse*)getByIdsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSSt
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"answer" delegate:del];
+    return [client enqueue:url ofType:@"answer" delegate:del backoffKey:@"aaids"];
 }
 
 -(StacManResponse*)getCommentsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSString*)filter page:(int)page pageSize:(int)pageSize fromDate:(NSDate*)fromDate toDate:(NSDate*)toDate sort:(NSString*)sort minDate:(NSDate*)minDate maxDate:(NSDate*)maxDate min:(NSNumber*)min max:(NSNumber*)max order:(NSString*)order delegate:(NSObject<StacManDelegate>*)del
@@ -91,6 +91,6 @@ -(StacManResponse*)getCommentsOnSite:(NSString*)site ids:(NSArray*)ids filter:(N
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"comment" delegate:del];
+    return [client enqueue:url ofType:@"comment" delegate:del backoffKey:@"aacs"];
 }
 @end
diff --git a/StacMan/StacManApplicationMethods.m b/StacMan/StacManApplicationMethods.m
@@ -36,6 +36,6 @@ -(StacManResponse*)deauthenticateWithAccessTokens:(NSArray*)accessTokens filter:
      pageSize
      ];
 
-    return [client enqueue:url ofType:@"access_token" delegate:del];
+    return [client enqueue:url ofType:@"access_token" delegate:del backoffKey:@"actok"];
 }
 @end
diff --git a/StacMan/StacManBadgeMethods.m b/StacMan/StacManBadgeMethods.m
@@ -44,7 +44,7 @@ -(StacManResponse*)getAllOnSite:(NSString*)site filter:(NSString*)filter page:(i
      inname ?: @""
      ];
 
-    return [client enqueue:url ofType:@"badge" delegate:del];
+    return [client enqueue:url ofType:@"badge" delegate:del backoffKey:@"ball"];
 }
 
 -(StacManResponse*)getByIdsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSString*)filter page:(int)page pageSize:(int)pageSize fromDate:(NSDate*)fromDate toDate:(NSDate*)toDate sort:(NSString*)sort minRank:(NSString*)minRank maxRank:(NSString*)maxRank minName:(NSString*)minName maxName:(NSString*)maxName minType:(NSString*)minType maxType:(NSString*)maxType order:(NSString*)order inname:(NSString*)inname delegate:(NSObject<StacManDelegate>*)del
@@ -69,7 +69,7 @@ -(StacManResponse*)getByIdsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSSt
      inname ?: @""
      ];
 
-    return [client enqueue:url ofType:@"badge" delegate:del];
+    return [client enqueue:url ofType:@"badge" delegate:del backoffKey:@"bids"];
 }
 
 -(StacManResponse*)getNamedOnSite:(NSString*)site filter:(NSString*)filter page:(int)page pageSize:(int)pageSize fromDate:(NSDate*)fromDate toDate:(NSDate*)toDate sort:(NSString*)sort minRank:(NSString*)minRank maxRank:(NSString*)maxRank minName:(NSString*)minName maxName:(NSString*)maxName minType:(NSString*)minType maxType:(NSString*)maxType order:(NSString*)order inname:(NSString*)inname delegate:(NSObject<StacManDelegate>*)del
@@ -93,7 +93,7 @@ -(StacManResponse*)getNamedOnSite:(NSString*)site filter:(NSString*)filter page:
      inname ?: @""
      ];
 
-    return [client enqueue:url ofType:@"badge" delegate:del];
+    return [client enqueue:url ofType:@"badge" delegate:del backoffKey:@"bnamed"];
 }
 
 //getRecent(String site, String filter, Integer page, Integer pagesize, Date fromdate, Date todate)
@@ -113,7 +113,7 @@ -(StacManResponse*)getRecentOnSite:(NSString*)site filter:(NSString*)filter page
      ConvertDate(toDate) ?: @""
      ];
 
-    return [client enqueue:url ofType:@"badge" delegate:del];
+    return [client enqueue:url ofType:@"badge" delegate:del backoffKey:@"brecent"];
 }
 
 //getRecentByIds(String site, Integer[] ids, String filter, Integer page, Integer pagesize, Date fromdate, Date todate) {
@@ -134,7 +134,7 @@ -(StacManResponse*)getRecentByIdsOnSite:(NSString*)site ids:(NSArray*)ids filter
      ConvertDate(toDate) ?: @""
      ];
 
-    return [client enqueue:url ofType:@"badge" delegate:del];
+    return [client enqueue:url ofType:@"badge" delegate:del backoffKey:@"brecentids"];
 }
 
 //getTagBased(String site, String filter, Integer page, Integer pagesize, Date fromdate, Date todate, BadgeSort sort, BadgeRank minrank, BadgeRank maxrank, String minname, String maxname, Order order, String inname)
@@ -159,6 +159,6 @@ -(StacManResponse*)getTagBasedOnSite:(NSString*)site filter:(NSString*)filter pa
      inname ?: @""
      ];
 
-    return [client enqueue:url ofType:@"badge" delegate:del];
+    return [client enqueue:url ofType:@"badge" delegate:del backoffKey:@"btags"];
 }
 @end
diff --git a/StacMan/StacManClient.h b/StacMan/StacManClient.h
@@ -78,5 +78,5 @@
 @property (readonly) NSOperationQueue* queue;
 
 -(id)initWithKey:(NSString*)key;
--(StacManResponse*)enqueue:(NSString*)url ofType:(NSString*)type delegate:(NSObject<StacManDelegate>*)delegate;
+-(StacManResponse*)enqueue:(NSString*)url ofType:(NSString*)type delegate:(NSObject<StacManDelegate>*)delegate backoffKey:(NSString*)key;
 @end
diff --git a/StacMan/StacManClient.m b/StacMan/StacManClient.m
@@ -39,6 +39,8 @@ @implementation StacManClient
 dispatch_semaphore_t globalBlock;
 dispatch_source_t timer;
 
+NSMutableDictionary* backoffs;
+
 -(id)initWithKey:(NSString*)key;
 {
     self = [super init];
@@ -69,18 +71,17 @@ -(id)initWithKey:(NSString*)key;
         _suggestedEdits = [[StacManSuggestedEditMethods alloc] initWithClient:self];
         _tags = [[StacManTagMethods alloc] initWithClient:self];
 
+        _queue = [[NSOperationQueue alloc] init];
+        [_queue setMaxConcurrentOperationCount:30];
 
-        globalBlock = dispatch_semaphore_create(30);
-//        resetTimer = [NSTimer timerWithTimeInterval:5.0 target:self selector:@selector(resetGlobalBlock:) userInfo:nil repeats:YES];
+        backoffs = [NSMutableDictionary dictionaryWithCapacity:10];
 
+        globalBlock = dispatch_semaphore_create(30);
         timer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
 
         dispatch_source_set_timer(timer, dispatch_walltime(NULL, 0), 5.0, 0);
         dispatch_source_set_event_handler(timer, ^{ [self resetGlobalBlock]; });
         dispatch_resume(timer);
-
-        _queue = [[NSOperationQueue alloc] init];
-        [_queue setMaxConcurrentOperationCount:30];
     }
 
     return self;
@@ -106,7 +107,7 @@ -(void)resetGlobalBlock
     }
 }
 
--(StacManResponse*)enqueue:(NSString*)str ofType:(NSString*)type delegate:(NSObject<StacManDelegate>*)del
+-(StacManResponse*)enqueue:(NSString*)str ofType:(NSString*)type delegate:(NSObject<StacManDelegate>*)del backoffKey:(NSString*)backoff
 {
     NSURL* url = [NSURL URLWithString:str];
 
@@ -121,6 +122,17 @@ -(StacManResponse*)enqueue:(NSString*)str ofType:(NSString*)type delegate:(NSObj
      {
          dispatch_semaphore_wait(blockOn, DISPATCH_TIME_FOREVER);
 
+         NSNumber* waitFor;
+         @synchronized(backoffs)
+         {
+             waitFor = [backoffs valueForKey:backoff];
+         }
+
+         if(waitFor)
+         {
+             sleep([waitFor intValue]);
+         }
+
          NSError* error = nil;
          NSData* json = [NSData dataWithContentsOfURL:url options:0 error:&error];
 
@@ -132,11 +144,24 @@ -(StacManResponse*)enqueue:(NSString*)str ofType:(NSString*)type delegate:(NSObj
          {
              StacManWrapper* wrapper = [[StacManWrapper alloc] initWithJson:json type:type];
 
+             if(wrapper.backoff > 0)
+             {
+                 [self enforceBackoff: backoff forSeconds:wrapper.backoff];
+             }
+
              [ret fulfil:wrapper success:YES error:nil];
          }
      }
      ];
 
     return ret;
 }
+
+-(void)enforceBackoff:(NSString*)key forSeconds:(int)forSeconds
+{
+    @synchronized(backoffs)
+    {
+        [backoffs setValue:[NSNumber numberWithInt:forSeconds] forKey:key];
+    }
+}
 @end
diff --git a/StacMan/StacManCommentMethods.m b/StacMan/StacManCommentMethods.m
@@ -43,7 +43,7 @@ -(StacManResponse*)getAllOnSite:(NSString*)site filter:(NSString*)filter page:(i
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"comment" delegate:del];
+    return [client enqueue:url ofType:@"comment" delegate:del backoffKey:@"calls"];
 }
 
 -(StacManResponse*)getByIdsSite:(NSString*)site ids:(NSArray*)ids filter:(NSString*)filter page:(int)page pageSize:(int)pageSize fromDate:(NSDate*)fromDate toDate:(NSDate*)toDate sort:(NSString*)sort minDate:(NSDate*)minDate maxDate:(NSDate*)maxDate min:(NSNumber*)min max:(NSNumber*)max order:(NSString*)order delegate:(NSObject<StacManDelegate>*)del
@@ -67,6 +67,6 @@ -(StacManResponse*)getByIdsSite:(NSString*)site ids:(NSArray*)ids filter:(NSStri
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"comment" delegate:del];
+    return [client enqueue:url ofType:@"comment" delegate:del backoffKey:@"cids"];
 }
 @end
diff --git a/StacMan/StacManErrorMethods.m b/StacMan/StacManErrorMethods.m
@@ -35,7 +35,7 @@ -(StacManResponse*)getAllWithFilter:(NSString*)filter page:(int)page pageSize:(i
      pageSize
     ];
 
-    return [client enqueue:url ofType:@"error" delegate:del];
+    return [client enqueue:url ofType:@"error" delegate:del backoffKey:@"ealls"];
 }
 
 -(StacManResponse*)simulateWithId:(int)_id filter:(NSString*)filter delegate:(NSObject<StacManDelegate>*)del
@@ -50,6 +50,6 @@ -(StacManResponse*)simulateWithId:(int)_id filter:(NSString*)filter delegate:(NS
      filter ?: @""
      ];
 
-    return [client enqueue:url ofType:@"error" delegate:del];
+    return [client enqueue:url ofType:@"error" delegate:del backoffKey:@"esimulate"];
 }
 @end
diff --git a/StacMan/StacManEventMethods.m b/StacMan/StacManEventMethods.m
@@ -38,6 +38,6 @@ -(StacManResponse*)getRecentOnSite:(NSString*)site accessToken:(NSString*)access
      ConvertDate(since) ?: @""
      ];
 
-    return [client enqueue:url ofType:@"event" delegate:del];
+    return [client enqueue:url ofType:@"event" delegate:del backoffKey:@"events"];
 }
 @end
diff --git a/StacMan/StacManFilterMethods.m b/StacMan/StacManFilterMethods.m
@@ -7,6 +7,7 @@
 //
 
 #import "StacManFilterMethods.h"
+#import "Utils.h"
 
 @implementation StacManFilterMethods
 __weak StacManClient* client;
@@ -34,7 +35,7 @@ -(StacManResponse*)readFilters:(NSArray*)filters filter:(NSString*)filter delega
      filter ?: @""
      ];
 
-    return [client enqueue:url ofType:@"filter" delegate:del];
+    return [client enqueue:url ofType:@"filter" delegate:del backoffKey:@"fread"];
 }
 
 -(StacManResponse*)createFilterWithIncludes:(NSArray*)includes excludes:(NSArray*)excludes base:(NSString*)base unsafe:(BOOL)unsafe filter:(NSString*)filter delegate:(NSObject<StacManDelegate>*)del
@@ -52,6 +53,6 @@ -(StacManResponse*)createFilterWithIncludes:(NSArray*)includes excludes:(NSArray
      (unsafe ? @"true" : @"false")
      ];
 
-    return [client enqueue:url ofType:@"filter" delegate:del];
+    return [client enqueue:url ofType:@"filter" delegate:del backoffKey:@"fcreate"];
 }
 @end
diff --git a/StacMan/StacManInboxMethods.m b/StacMan/StacManInboxMethods.m
@@ -37,7 +37,7 @@ -(StacManResponse*)getWithAccessToken:(NSString*)accessToken filter:(NSString*)f
      pageSize
      ];
 
-    return [client enqueue:url ofType:@"inbox_item" delegate:del];
+    return [client enqueue:url ofType:@"inbox_item" delegate:del backoffKey:@"iall"];
 }
 
 -(StacManResponse*)getUnreadWithAccessToken:(NSString*)accessToken filter:(NSString*)filter page:(int)page pageSize:(int)pageSize since:(NSDate*)since delegate:(NSObject<StacManDelegate>*)del
@@ -55,6 +55,6 @@ -(StacManResponse*)getUnreadWithAccessToken:(NSString*)accessToken filter:(NSStr
      ConvertDate(since) ?: @""
      ];
 
-    return [client enqueue:url ofType:@"inbox_item" delegate:del];
+    return [client enqueue:url ofType:@"inbox_item" delegate:del backoffKey:@"iunread"];
 }
 @end
diff --git a/StacMan/StacManInfoMethods.m b/StacMan/StacManInfoMethods.m
@@ -34,6 +34,6 @@ -(StacManResponse*)getOnSite:(NSString*)site filter:(NSString*)filter delegate:(
      filter ?: @""
      ];
 
-    return [client enqueue:url ofType:@"info" delegate:del];
+    return [client enqueue:url ofType:@"info" delegate:del backoffKey:@"info"];
 }
 @end
diff --git a/StacMan/StacManPostMethods.m b/StacMan/StacManPostMethods.m
@@ -43,7 +43,7 @@ -(StacManResponse*)getAllOnSite:(NSString*)site filter:(NSString*)filter page:(i
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"post" delegate:del];
+    return [client enqueue:url ofType:@"post" delegate:del backoffKey:@"palls"];
 }
 
 -(StacManResponse*)getByIdsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSString*)filter page:(int)page pageSize:(int)pageSize fromDate:(NSDate*)fromDate toDate:(NSDate*)toDate sort:(NSString*)sort minDate:(NSDate*)minDate maxDate:(NSDate*)maxDate min:(NSNumber*)min max:(NSNumber*)max order:(NSString*)order delegate:(NSObject<StacManDelegate>*)del
@@ -67,7 +67,7 @@ -(StacManResponse*)getByIdsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSSt
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"post" delegate:del];
+    return [client enqueue:url ofType:@"post" delegate:del backoffKey:@"pids"];
 }
 
 -(StacManResponse*)getCommentsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSString*)filter page:(int)page pageSize:(int)pageSize fromDate:(NSDate*)fromDate toDate:(NSDate*)toDate sort:(NSString*)sort minDate:(NSDate*)minDate maxDate:(NSDate*)maxDate min:(NSNumber*)min max:(NSNumber*)max order:(NSString*)order delegate:(NSObject<StacManDelegate>*)del
@@ -91,7 +91,7 @@ -(StacManResponse*)getCommentsOnSite:(NSString*)site ids:(NSArray*)ids filter:(N
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"comment" delegate:del];
+    return [client enqueue:url ofType:@"comment" delegate:del backoffKey:@"pcs"];
 }
 
 -(StacManResponse*)getRevisionsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSString*)filter page:(int)page pageSize:(int)pageSize fromDate:(NSDate*)fromDate toDate:(NSDate*)toDate sort:(NSString*)sort minDate:(NSDate*)minDate maxDate:(NSDate*)maxDate min:(NSNumber*)min max:(NSNumber*)max order:(NSString*)order delegate:(NSObject<StacManDelegate>*)del
@@ -115,7 +115,7 @@ -(StacManResponse*)getRevisionsOnSite:(NSString*)site ids:(NSArray*)ids filter:(
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"revision" delegate:del];
+    return [client enqueue:url ofType:@"revision" delegate:del backoffKey:@"prevs"];
 }
 
 -(StacManResponse*)getSuggestedEditsOnSite:(NSString*)site ids:(NSArray*)ids filter:(NSString*)filter page:(int)page pageSize:(int)pageSize fromDate:(NSDate*)fromDate toDate:(NSDate*)toDate sort:(NSString*)sort minDate:(NSDate*)minDate maxDate:(NSDate*)maxDate min:(NSNumber*)min max:(NSNumber*)max order:(NSString*)order delegate:(NSObject<StacManDelegate>*)del
@@ -139,6 +139,6 @@ -(StacManResponse*)getSuggestedEditsOnSite:(NSString*)site ids:(NSArray*)ids fil
      order ?: @""
      ];
 
-    return [client enqueue:url ofType:@"suggested_edit" delegate:del];
+    return [client enqueue:url ofType:@"suggested_edit" delegate:del backoffKey:@"pses"];
 }
 @end
diff --git a/StacMan/StacManPrivilegeMethods.m b/StacMan/StacManPrivilegeMethods.m
@@ -36,6 +36,6 @@ -(StacManResponse*)getAllOnSite:(NSString*)site filter:(NSString*)filter page:(i
      pageSize
      ];
 
-    return [client enqueue:url ofType:@"privilege" delegate:del];
+    return [client enqueue:url ofType:@"privilege" delegate:del backoffKey:@"privs"];
 }
 @end