perf(request): Send another request if the last request had maximum events per api call

Author: Alexis Oyama

Leanplum-SDK/Classes/Constants.h

@@ -55,7 +55,7 @@
 #define HEARTBEAT_INTERVAL 15 * 60 // 15 minutes
 
 #define MAX_STORED_OCCURRENCES_PER_MESSAGE 100
-#define MAX_ACTIONS_PER_API_CALL 10000
+#define MAX_EVENTS_PER_API_CALL 10000
 
 #define DEFAULT_PRIORITY 1000
 

Leanplum-SDK/Classes/LPRequestStorage.m

@@ -97,8 +97,8 @@ - (void)migrateRequests
  */
 - (void)saveRequests:(NSMutableArray *)requests
 {
-    if (requests.count > MAX_ACTIONS_PER_API_CALL) {
-        NSRange range = NSMakeRange(0, requests.count - MAX_ACTIONS_PER_API_CALL);
+    if (requests.count > MAX_EVENTS_PER_API_CALL) {
+        NSRange range = NSMakeRange(0, requests.count - MAX_EVENTS_PER_API_CALL);
         [requests removeObjectsInRange:range];
     }
 

Leanplum-SDK/Classes/LeanplumRequest.m

@@ -301,18 +301,22 @@ - (void)sendNow:(BOOL)async
     }
 
     [self sendEventually];
+    [self sendRequests:async];
+}
 
+- (void)sendRequests:(BOOL)async
+{
     void (^operationBlock)() = ^void() {
         [LeanplumRequest generateUUID];
 
         // Simulate pop all requests.
-        NSArray *requestsToSend = [LPEventDataManager eventsWithLimit:MAX_ACTIONS_PER_API_CALL];
+        NSArray *requestsToSend = [LPEventDataManager eventsWithLimit:MAX_EVENTS_PER_API_CALL];
         lastSentTime = [NSDate timeIntervalSinceReferenceDate];
 
         if (requestsToSend.count == 0) {
             return;
         }
-
+        
         NSString *requestData = [LPJSON stringFromJSON:@{LP_PARAM_DATA:requestsToSend}];
         LPConstantsState *constants = [LPConstantsState sharedState];
         NSMutableDictionary *multiRequestArgs = [NSMutableDictionary dictionaryWithObjectsAndKeys:
@@ -324,12 +328,12 @@ - (void)sendNow:(BOOL)async
         [self attachApiKeys:multiRequestArgs];
         int timeout = async ? constants.networkTimeoutSeconds : constants.syncNetworkTimeoutSeconds;
         id<LPNetworkOperationProtocol> op = [engine operationWithPath:constants.apiServlet
-                                                             params:multiRequestArgs
-                                                         httpMethod:_httpMethod
-                                                                ssl:constants.apiSSL
-                                                     timeoutSeconds:timeout];
+                                                               params:multiRequestArgs
+                                                           httpMethod:_httpMethod
+                                                                  ssl:constants.apiSSL
+                                                       timeoutSeconds:timeout];
         __block BOOL finished = NO;
-
+        
         // Schedule timeout.
         [LPTimerBlocks scheduledTimerWithTimeInterval:timeout block:^() {
             if (finished) {
@@ -345,14 +349,14 @@ - (void)sendNow:(BOOL)async
             }
             LP_END_TRY
         } repeats:NO];
-
+        
         [op addCompletionHandler:^(id<LPNetworkOperationProtocol> operation, id json) {
             if (finished) {
                 return;
             }
             finished = YES;
             LP_TRY
-
+            
             // Handle errors that don't return an HTTP error code.
             NSUInteger numResponses = [LPResponse numResponsesInDictionary:json];
             for (NSUInteger i = 0; i < numResponses; i++) {
@@ -377,6 +381,11 @@ - (void)sendNow:(BOOL)async
 
             // Delete events on success.
             [LPEventDataManager deleteEventsWithLimit:requestsToSend.count];
+            
+            // Send another request if the last request had maximum events per api call.
+            if (requestsToSend.count == MAX_EVENTS_PER_API_CALL) {
+                [self sendRequests:async];
+            }
             LP_END_TRY
             if (_response != nil) {
                 _response(operation, json);
@@ -423,7 +432,7 @@ - (void)sendNow:(BOOL)async
             }
             LP_END_TRY
         }];
-
+        
         // Execute synchronously. Don't block for more than 'timeout' seconds.
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             [engine runSynchronously:op];
@@ -459,7 +468,7 @@ - (void)sendEventually
         NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
         NSString *uuid = [userDefaults objectForKey:LEANPLUM_DEFAULTS_UUID_KEY];
         NSInteger count = [LPEventDataManager count];
-        if (!uuid || count % MAX_ACTIONS_PER_API_CALL == 0) {
+        if (!uuid || count % MAX_EVENTS_PER_API_CALL == 0) {
             uuid = [LeanplumRequest generateUUID];
         }