Adding helper constructors and support for Sec-WebSocket-Protocol

mikelikespie · mikelikespie · commit ce4fb2709965 · 2012-04-18T11:46:04.000-07:00
Also added some helper constructors
diff --git a/SocketRocket/SRWebSocket.h b/SocketRocket/SRWebSocket.h
@@ -36,9 +36,17 @@ extern NSString *const SRWebSocketErrorDomain;
 
 @property (nonatomic, readonly) SRReadyState readyState;
 @property (nonatomic, readonly, retain) NSURL *url;
+@property (nonatomic, readonly, copy) NSArray *protocols;
 
+// Protocols should be an array of strings that turn into Sec-WebSocket-Protocol
+- (id)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray *)protocols;
 - (id)initWithURLRequest:(NSURLRequest *)request;
 
+// Some helper constructors
+- (id)initWithURL:(NSURL *)url protocols:(NSArray *)protocols;
+- (id)initWithURL:(NSURL *)url;
+
+// SRWebSockets are intended one-time-use only.  Open should be called once and only once
 - (void)open;
 
 - (void)close;
diff --git a/SocketRocket/SRWebSocket.m b/SocketRocket/SRWebSocket.m
@@ -191,6 +191,7 @@ - (void)_SR_commonInit;
 - (void)_connectToHost:(NSString *)host port:(NSInteger)port;
 
 @property (nonatomic) SRReadyState readyState;
+@property (nonatomic, copy) NSArray *protocols;
 
 @end
 
@@ -241,6 +242,7 @@ @implementation SRWebSocket {
 @synthesize delegate = _delegate;
 @synthesize url = _url;
 @synthesize readyState = _readyState;
+@synthesize protocols = _protocols;
 
 static __strong NSData *CRLFCRLF;
 
@@ -249,14 +251,16 @@ + (void)initialize;
     CRLFCRLF = [[NSData alloc] initWithBytes:"\r\n\r\n" length:4];
 }
 
-- (id)initWithURLRequest:(NSURLRequest *)request;
+- (id)initWithURLRequest:(NSURLRequest *)request protocols:(NSArray *)protocols;
 {
     self = [super init];
     if (self) {
         assert(request.URL);
         _url = request.URL;
         NSString *scheme = [_url scheme];
         
+        self.protocols = protocols;
+
         assert([scheme isEqualToString:@"ws"] || [scheme isEqualToString:@"http"] || [scheme isEqualToString:@"wss"] || [scheme isEqualToString:@"https"]);
         _urlRequest = request;
         
@@ -270,6 +274,22 @@ - (id)initWithURLRequest:(NSURLRequest *)request;
     return self;
 }
 
+- (id)initWithURLRequest:(NSURLRequest *)request;
+{
+    return [self initWithURLRequest:request protocols:nil];
+}
+
+- (id)initWithURL:(NSURL *)url;
+{
+    return [self initWithURL:url protocols:nil];
+}
+
+- (id)initWithURL:(NSURL *)url protocols:(NSArray *)protocols;
+{
+    NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:url];    
+    return [self initWithURLRequest:request protocols:protocols];
+}
+
 - (void)_SR_commonInit;
 {
     _readyState = SR_CONNECTING;
@@ -418,6 +438,10 @@ - (void)didConnect
     
     CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Origin"), (__bridge CFStringRef)_url.SR_origin);
     
+    if (self.protocols) {
+        CFHTTPMessageSetHeaderFieldValue(request, CFSTR("Sec-WebSocket-Protocol"), (__bridge CFStringRef)[self.protocols componentsJoinedByString:@", "]);
+    }
+
     [_urlRequest.allHTTPHeaderFields enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) {
         CFHTTPMessageSetHeaderFieldValue(request, (__bridge CFStringRef)key, (__bridge CFStringRef)obj);
     }];
@@ -1413,3 +1437,4 @@ static inline int32_t validate_dispatch_data_partial_string(NSData *data) {
 
 #endif
 
+
