Changeset 3144

Timestamp:

02/21/06 02:06:24 (3 years ago)

Author:

timothy

Message:

Message throttling to prevent being excess flooded off the server. Allows 5 commands per seconds.

Files:

• branches/cocoa-networking/Chat Core/MVChatConnection.h (modified) (1 diff)
• branches/cocoa-networking/Chat Core/MVChatConnection.m (modified) (2 diffs)
• branches/cocoa-networking/Chat Core/MVIRCChatConnection.h (modified) (2 diffs)
• branches/cocoa-networking/Chat Core/MVIRCChatConnection.m (modified) (21 diffs)
• branches/cocoa-networking/Chat Core/MVIRCChatRoom.m (modified) (2 diffs)

branches/cocoa-networking/Chat Core/MVChatConnection.h

@@ -220 +220 @@
-- (void) sendRawMessage:(id) raw immediately:(BOOL) now;
-- (void) sendRawMessageWithFormat:(NSString *) format, ...;
+- (void) sendRawMessageImmediatelyWithFormat:(NSString *) format, ...;
-- (void) sendRawMessageWithComponents:(id) firstComponent, ...;
+- (void) sendRawMessageImmediatelyWithComponents:(id) firstComponent, ...;
-
-#pragma mark -

branches/cocoa-networking/Chat Core/MVChatConnection.m

@@ -531 +531 @@
-}
-
+- (void) sendRawMessageImmediatelyWithFormat:(NSString *) format, ... {
+        NSParameterAssert( format != nil );
+
+        va_list ap;
+        va_start( ap, format );
+
+        NSString *command = [[NSString allocWithZone:nil] initWithFormat:format arguments:ap];
+
+        va_end( ap );
+
+        [self sendRawMessage:command immediately:YES];
+        [command release];
+}
+
-- (void) sendRawMessageWithComponents:(id) firstComponent, ... {
-        NSParameterAssert( firstComponent != nil );
@@ -555 +569 @@
-
-        [self sendRawMessage:data immediately:NO];
+        [data release];
+}
+
+- (void) sendRawMessageImmediatelyWithComponents:(id) firstComponent, ... {
+        NSParameterAssert( firstComponent != nil );
+
+        NSMutableData *data = [[NSMutableData allocWithZone:nil] initWithCapacity:512];
+        id object = firstComponent;
+
+        va_list ap;
+        va_start( ap, firstComponent );
+
+        do {
+                if( [object isKindOfClass:[NSData class]] ) {
+                        [data appendData:object];
+                } else if( [firstComponent isKindOfClass:[NSString class]] ) {
+                        NSData *stringData = [object dataUsingEncoding:[self encoding] allowLossyConversion:YES];
+                        [data appendData:stringData];
+                } else {
+                        NSData *stringData = [[object description] dataUsingEncoding:[self encoding] allowLossyConversion:YES];
+                        [data appendData:stringData];
+                }
+        } while( object = va_arg( ap, void * ) );
+
+        va_end( ap );
+
+        [self sendRawMessage:data immediately:YES];
-        [data release];
-}

branches/cocoa-networking/Chat Core/MVIRCChatConnection.h

@@ -12 +12 @@
-        NSTimer *_periodicCleanUpTimer;
-        NSThread *_connectionThread;
+        NSDate *_queueWait;
+        NSDate *_lastCommand;
+        NSMutableArray *_sendQueue;
+        NSTimer *_sendQueueTimer;
-        NSMutableDictionary *_knownUsers;
-        NSMutableSet *_fileTransfers;
@@ -47 +51 @@
-
-- (void) _periodicCleanUp;
+- (void) _startQueueTimer;
+- (void) _stopSendQueueTimer;
-@end

branches/cocoa-networking/Chat Core/MVIRCChatConnection.m

@@ -14 +14 @@
-#import "NSStringAdditions.h"
-#import "NSDataAdditions.h"
+
+#define JVMaximumCommandsSentAtOnce 5
-
-static const NSStringEncoding supportedEncodings[] = {
@@ -197 +199 @@
-        [_realName release];
-        [_threadWaitLock release];
+        [_periodicCleanUpTimer release];
+        [_sendQueue release];
+        [_sendQueueTimer release];
+        [_queueWait release];
+        [_lastCommand release];
-
-        _chatConnection = nil;
@@ -209 +216 @@
-        _realName = nil;
-        _threadWaitLock = nil;
+        _periodicCleanUpTimer = nil;
+        _sendQueue = nil;
+        _sendQueueTimer = nil;
+        _queueWait = nil;
+        _lastCommand = nil;
-
-        [super dealloc];
@@ -240 +252 @@
-        [old release];
-
+        old = _queueWait;
+        _queueWait = [[NSDate dateWithTimeIntervalSinceNow:120.] retain];
+        [old release];
+
-        [self _willConnect]; // call early so other code has a chance to change our info
-
@@ -254 +270 @@
-- (void) disconnectWithReason:(NSAttributedString *) reason {
-        [self cancelPendingReconnectAttempts];
+        if( _sendQueueTimer ) [self performSelector:@selector( _stopSendQueueTimer ) withObject:nil inThread:_connectionThread];
-
-        if( _status == MVChatConnectionConnectedStatus ) {
-                if( [[reason string] length] ) {
-                        NSData *msg = [[self class] _flattenedIRCDataForMessage:reason withEncoding:[self encoding] andChatFormat:[self outgoingChatFormat]];
-
-
+Immediately
+ immediately:YES
-        }
-
@@ -300 +317 @@
-
-        if( [self isConnected] )
-
+Immediately
-}
-
@@ -315 +332 @@
-- (void) setNicknamePassword:(NSString *) password {
-        if( ! [[self localUser] isIdentified] && password && [self isConnected] )
-
+Immediately
-        [super setNicknamePassword:password];
-}
@@ -377 +394 @@
-        NSParameterAssert( [raw isKindOfClass:[NSData class]] || [raw isKindOfClass:[NSString class]] );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -507 +520 @@
-        if( ! _cachedDate || ABS( [_cachedDate timeIntervalSinceNow] ) > 300. ) {
-                [self sendRawMessage:@"LIST"];
-
+
+
-                _cachedDate = [[NSDate allocWithZone:nil] init];
+                [old release];
-        }
-}
@@ -514 +529 @@
-- (void) stopFetchingChatRoomList {
-        if( _cachedDate && ABS( [_cachedDate timeIntervalSinceNow] ) < 600. )
-
+ immediately:YES
-}
-
@@ -529 +544 @@
-
-                NSData *msg = [[self class] _flattenedIRCDataForMessage:message withEncoding:[self encoding] andChatFormat:[self outgoingChatFormat]];
-
+Immediately
-        } else {
-                [[self localUser] _setStatus:MVChatUserAvailableStatus];
-
+ immediately:YES
-        }
-}
@@ -566 +581 @@
-
-        BOOL active = YES;
-
+|| [_chatConnection isConnected] 
-                active = [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate distantFuture]];
+
+        // make sure the connection has sent all the delegate calls it has scheduled
+        [[NSRunLoop currentRunLoop] runMode:NSDefaultRunLoopMode beforeDate:[NSDate dateWithTimeIntervalSinceNow:1.]];
-
-        if( [NSThread currentThread] == _connectionThread )
@@ -579 +597 @@
-
-- (void) _didDisconnect {
-        [_knownUsers removeAllObjects];
-
-        if( _status == MVChatConnectionServerDisconnectedStatus ) {
-                if( ABS( [_lastConnectAttempt timeIntervalSinceNow] ) > 300. )
@@ -636 +652 @@
-
-- (void) socketDidDisconnect:(AsyncSocket *) sock {
-
-
+
+
+
+
+
-        [old release];
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        [_periodicCleanUpTimer invalidate];
-        [_periodicCleanUpTimer release];
@@ -649 +687 @@
-
-- (void) socket:(AsyncSocket *) sock didConnectToHost:(NSString *) host port:(UInt16) port {
-
-
-
+Immediately
+Immediately
+Immediately
-
-        id old = _localUser;
@@ -801 +839 @@
-#pragma mark -
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        [_chatConnection writeData:data withTimeout:-1. tag:0];
+
+        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionGotRawMessageNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:string, @"message", [NSNumber numberWithBool:YES], @"outbound", nil]];
+
+        [string release];
+        [data release];
-}
-
@@ -914 +980 @@
-}
-
+- (void) _startQueueTimer {
+        if( _sendQueueTimer ) return;
+        _sendQueueTimer = [[NSTimer scheduledTimerWithTimeInterval:0.2 target:self selector:@selector( _sendQueue ) userInfo:nil repeats:YES] retain];
+}
+
+- (void) _stopSendQueueTimer {
+        id old = _sendQueueTimer;
+        _sendQueueTimer = nil;
+        [old invalidate];
+        [old release];
+}
+
+- (void) _sendQueue {
+        @synchronized( _sendQueue ) {
+                if( ! [_sendQueue count] ) {
+                        [self _stopSendQueueTimer];
+                        return;
+                }
+        }
+
+        if( _queueWait && [_queueWait timeIntervalSinceNow] > 0. ) return;
+
+        NSData *data = nil;
+        @synchronized( _sendQueue ) {
+                data = [[_sendQueue objectAtIndex:0] retain];
+                [_sendQueue removeObjectAtIndex:0];
+        }
+
+        [self _writeDataToServer:data];
+        [data release];
+
+        id old = _lastCommand;
+        _lastCommand = [[NSDate allocWithZone:nil] init];
+        [old release];
+}
+
-#pragma mark -
-
@@ -936 +1038 @@
-
-- (void) _handle001WithParameters:(NSArray *) parameters fromSender:(MVChatUser *) sender {
+        id old = _queueWait;
+        _queueWait = [[NSDate dateWithTimeIntervalSinceNow:0.5] retain];
+        [old release];
+
-        [self performSelectorOnMainThread:@selector( _didConnect ) withObject:nil waitUntilDone:NO];    
-        // Identify if we have a user password
-        if( [[self nicknamePassword] length] )
-
+Immediately
-        if( [parameters count] >= 1 ) {
-                NSString *nickname = [parameters objectAtIndex:0];
@@ -1036 +1142 @@
-                                                if( ! [self nicknamePassword] ) {
-                                                        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionNeedNicknamePasswordNotification object:self userInfo:nil];
-
+Immediately
-                                        } else if( [msg rangeOfString:@"Password accepted"].location != NSNotFound ) {
-                                                [[self localUser] _setIdentified:YES];
@@ -1249 +1355 @@
-                        [room _clearBannedUsers];
-
-
-
+Immediately
+Immediately
-                } else {
-                        if( [sender status] != MVChatUserAwayStatus ) [sender _setStatus:MVChatUserAvailableStatus];
@@ -1459 +1565 @@
-- (void) _handlePingWithParameters:(NSArray *) parameters fromSender:(MVChatUser *) sender {
-        if( [parameters count] >= 1 ) {
-
-
+Immediately
+Immediately
-        }
-}

branches/cocoa-networking/Chat Core/MVIRCChatRoom.m

@@ -35 +35 @@
-- (void) partWithReason:(NSAttributedString *) reason {
-        if( ! [self isJoined] ) return;
-:[NSString stringWithFormat:@"PART %@", [self name]] immediately:YES
-:[NSString stringWithFormat:@"PART %@ :%@", [self name], [reason string]] immediately:YES
+ImmediatelyWithFormat:@"PART %@", [self name]
+ImmediatelyWithFormat:@"PART %@ :%@", [self name], [reason string]
-        [self _setDateParted:[NSDate date]];
-}
@@ -221 +221 @@
-                NSData *msg = [MVIRCChatConnection _flattenedIRCDataForMessage:reason withEncoding:[self encoding] andChatFormat:[[self connection] outgoingChatFormat]];
-                NSString *prefix = [[NSString allocWithZone:nil] initWithFormat:@"KICK %@ %@ :", [self name], [user nickname]];
-
+Immediately
-                [prefix release];
-
+Immediately
-}
-
-- (void) addBanForUser:(MVChatUser *) user {
-        [super addBanForUser:user];
-
+Immediately
-}
-
-- (void) removeBanForUser:(MVChatUser *) user {
-        [super removeBanForUser:user];
-
+Immediately
-}
-@end