Added WebSocket Support

Podfile

@@ -2,8 +2,10 @@ xcodeproj 'StompKit.xcodeproj'
 
 platform :ios, '5.0'
 
+
+pod 'SocketRocket', '0.3.1-beta2'
 pod 'CocoaAsyncSocket', '7.3.2'
 
 target 'StompKitTests', :exclusive => true do
         pod 'Kiwi', '2.2'
-end
+end

README.md

@@ -50,7 +50,7 @@ STOMPClient *client = [[STOMPClient alloc] initWithHost:@"localhost"
 [client connectWithLogin:@"mylogin"
                 passcode:@"mypassword"
        completionHandler:^(STOMPFrame *_, NSError *error) {
-            if (err) {
+            if (error) {
                 NSLog(@"%@", error);
                 return;
             }
@@ -72,7 +72,7 @@ STOMPClient *client = [[STOMPClient alloc] initWithHost:@"localhost"
 [client connectWithLogin:@"mylogin"
                 passcode:@"mypassword"
        completionHandler:^(STOMPFrame *_, NSError *error) {
-            if (err) {
+            if (error) {
                 NSLog(@"%@", error);
                 return;
             }

StompKit.podspec

@@ -8,7 +8,8 @@ Pod::Spec.new do |s|
   s.source       = { :git => 'https://github.com/mobile-web-messaging/StompKit.git', :tag => "#{s.version}" }
   s.platform     = :ios, 5.0
   s.source_files = 'StompKit/*.{h,m}'
-  s.public_header_files = 'StompKit/StompKit.h'
+  s.public_header_files = 'StompKit/StompKit.h', 'StompKit/SKSocket/SKSocket.h'
   s.requires_arc = true
   s.dependency 'CocoaAsyncSocket', '7.3.4'
+  s.dependency 'SocketRocket', '0.3.1-beta2'
 end

StompKit.xcodeproj/xcshareddata/xcschemes/StompKit.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0500"
+   LastUpgradeVersion = "0620"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -49,6 +49,15 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "932BA57718056C4B00A03257"
+            BuildableName = "libStompKit.a"
+            BlueprintName = "StompKit"
+            ReferencedContainer = "container:StompKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>

StompKit/SKSocket/SKRawSocket.h

@@ -0,0 +1,18 @@
+//
+//  SKRawSocket.h
+//  StompKit
+//
+//  Created by Travis Bowers on 4/2/15.
+//  Copyright (c) 2015 Jeff Mesnil. All rights reserved.
+//
+
+#ifndef StompKit_SKRawSocket_h
+#define StompKit_SKRawSocket_h
+
+#import "SKSocket.h"
+
+@interface SKRawSocket : NSObject <SKSocket> {
+}
+@end
+
+#endif

StompKit/SKSocket/SKRawSocket.m

@@ -0,0 +1,85 @@
+//
+//  SKRawSocket.m
+//  StompKit
+//
+//  Created by Travis Bowers on 4/2/15.
+//  Copyright (c) 2015 Jeff Mesnil. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SKRawSocket.h"
+#import "GCDAsyncSocket.h"
+
+@interface SKRawSocket() <GCDAsyncSocketDelegate>
+@property (nonatomic, weak) id <SKSocketDelegate> delegate;
+@property (nonatomic, retain) GCDAsyncSocket *socket;
+@end
+
+@implementation SKRawSocket
+
+// synthesize properties
+@synthesize delegate;
+@synthesize socket;
+
+- (id)initWithDelegate:(id)aDelegate delegateQueue:(dispatch_queue_t)dq {
+    if((self = [super init])) {
+        if (aDelegate != nil) {
+            self.delegate = aDelegate;
+
+            // initialize our socket
+            self.socket = [[GCDAsyncSocket alloc] initWithDelegate:self delegateQueue:dq];
+        }
+    }
+
+    return self;
+}
+
+- (BOOL)connectToHost:(NSString*)host onPort:(uint16_t)port error:(NSError **)errPtr {
+    return [socket connectToHost:host onPort:port error:errPtr];
+}
+
+- (BOOL)isDisconnected {
+    return [socket isDisconnected];
+}
+
+- (void)writeData:(NSData *)data withTimeout:(NSTimeInterval)timeout {
+    [socket writeData:data withTimeout:timeout tag:123];
+}
+
+- (void)readDataToData:(NSData *)data withTimeout:(NSTimeInterval)timeout {
+    [socket readDataToData:data withTimeout:timeout tag:123];
+
+}
+
+- (void)disconnectAfterReadingAndWriting {
+    [socket disconnectAfterReadingAndWriting];
+}
+
+#pragma mark -
+#pragma mark GCDAsyncSocketDelegate
+
+- (void)socket:(GCDAsyncSocket *)sock didReadData:(NSData *)data withTag:(long)tag {
+    if (self.delegate != nil) {
+        [delegate socket:(SKSocket*)self didReadDataWithData:data];
+    }
+}
+
+- (void)socket:(GCDAsyncSocket *)sock didReadPartialDataOfLength:(NSUInteger)partialLength tag:(long)tag {
+    if (self.delegate != nil) {
+        [delegate socket:(SKSocket*)self didReadPartialDataOfLength:partialLength];
+    }
+}
+
+- (void)socket:(GCDAsyncSocket *)sock didConnectToHost:(NSString *)host port:(uint16_t)port {
+    if (self.delegate != nil) {
+        [delegate socket:(SKSocket*)self didConnectToHost:host port:port];
+    }
+}
+
+- (void)socketDidDisconnect:(GCDAsyncSocket *)sock withError:(NSError *)err {
+    if (self.delegate != nil) {
+        [delegate socketDidDisconnect:(SKSocket*)self withError:err];
+    }
+}
+
+@end

StompKit/SKSocket/SKSocket.h

@@ -0,0 +1,40 @@
+//
+//  SKSocket.h
+//  StompKit
+//
+//  Created by Travis Bowers on 4/2/15.
+//  Copyright (c) 2015 Jeff Mesnil. All rights reserved.
+//
+
+#ifndef StompKit_SKSocket_h
+#define StompKit_SKSocket_h
+
+#import "SKSocketUtility.h"
+
+// forward declare
+@class SKSocket;
+
+// SKSocket delegate interface
+@protocol SKSocketDelegate <NSObject>
+@optional
+- (void)socket:(SKSocket *)sock didReadDataWithData:(NSData *)data;
+- (void)socket:(SKSocket *)sock didReadDataWithString:(NSString *)data;
+- (void)socket:(SKSocket *)sock didReadPartialDataOfLength:(NSUInteger)partialLength;
+- (void)socket:(SKSocket *)sock didConnectToHost:(NSString *)host port:(uint16_t)port;
+- (void)socketDidDisconnect:(SKSocket *)sock withError:(NSError *)err;
+@end
+
+
+
+// SKSocket abstract interface
+@protocol SKSocket <NSObject>
+- (id)initWithDelegate:(id)aDelegate delegateQueue:(dispatch_queue_t)dq;
+- (BOOL)connectToHost:(NSString*)host onPort:(uint16_t)port error:(NSError **)errPtr;
+- (BOOL)isDisconnected;
+- (void)writeData:(NSData *)data withTimeout:(NSTimeInterval)timeout;
+- (void)readDataToData:(NSData *)data withTimeout:(NSTimeInterval)timeout;
+- (void)disconnectAfterReadingAndWriting;
+
+@end
+
+#endif

StompKit/SKSocket/SKSocketUtility.h

@@ -0,0 +1,14 @@
+//
+//  SKSocketUtility.h
+//  StompKit
+//
+//  Created by Travis Bowers on 4/2/15.
+//  Copyright (c) 2015 Jeff Mesnil. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface SKSocketUtility : NSObject
++ (NSData*)zeroData;
++ (NSData*)lineFeedData;
+@end

StompKit/SKSocket/SKSocketUtility.m

@@ -0,0 +1,21 @@
+//
+//  SKSocketUtility.m
+//  StompKit
+//
+//  Created by Travis Bowers on 4/2/15.
+//  Copyright (c) 2015 Jeff Mesnil. All rights reserved.
+//
+
+#import "SKSocketUtility.h"
+
+@implementation SKSocketUtility
+
++ (NSData*)zeroData {
+    return [NSData dataWithBytes:"" length:1];
+}
+
++ (NSData*)lineFeedData {
+    return [NSData dataWithBytes:"\x0A" length:1];
+}
+
+@end

StompKit/SKSocket/SKWebSocket.h

@@ -0,0 +1,16 @@
+//
+//  SKWebSocket.h
+//  StompKit
+//
+//  Created by Travis Bowers on 4/2/15.
+//  Copyright (c) 2015 Jeff Mesnil. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SKSocket.h"
+
+extern NSString *const SKWebSocketErrorDomain;
+
+@interface SKWebSocket : NSObject <SKSocket> {
+}
+@end

StompKit/SKSocket/SKWebSocket.m

@@ -0,0 +1,94 @@
+//
+//  SKWebSocket.m
+//  StompKit
+//
+//  Created by Travis Bowers on 4/2/15.
+//  Copyright (c) 2015 Jeff Mesnil. All rights reserved.
+//
+
+#import "SKWebSocket.h"
+#import "GCDAsyncSocket.h"
+#import "SRWebSocket.h"
+
+NSString *const SKWebSocketErrorDomain = @"SKWebSocketErrorDomain";
+
+@interface SKWebSocket() <SRWebSocketDelegate>
+@property (nonatomic, weak) id <SKSocketDelegate> delegate;
+@property (nonatomic, retain) SRWebSocket *socket;
+@property (nonatomic, assign) BOOL connected;
+@end
+
+@implementation SKWebSocket
+
+// synthesize properties
+@synthesize delegate;
+@synthesize socket;
+
+- (id)initWithDelegate:(id)aDelegate delegateQueue:(dispatch_queue_t)dq {
+    if((self = [super init])) {
+        if (aDelegate != nil) {
+            self.delegate = aDelegate;
+            self.connected = NO;
+        }
+    }
+
+    return self;
+}
+
+- (BOOL)connectToHost:(NSString*)host onPort:(uint16_t)port error:(NSError **)errPtr {
+    self.socket = [[SRWebSocket alloc] initWithURL:[NSURL URLWithString:host]];
+    self.socket.delegate = self;
+    [self.socket open];
+    return YES;
+}
+
+- (BOOL)isDisconnected {
+    return !self.connected;
+}
+
+- (void)writeData:(NSData *)data withTimeout:(NSTimeInterval)timeout {
+    // convert data to string and send
+    [socket send:[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]];
+}
+
+- (void)readDataToData:(NSData *)data withTimeout:(NSTimeInterval)timeout {
+    // not supported
+    //[socket readDataToData:data withTimeout:timeout tag:tag];
+}
+
+- (void)disconnectAfterReadingAndWriting {
+    [socket close];
+}
+
+#pragma mark -
+#pragma mark SRWebSocketDelegate
+- (void)webSocket:(SRWebSocket *)webSocket didReceiveMessage:(id)message {
+    [delegate socket:(SKSocket*)self didReadDataWithString:message];
+}
+
+- (void)webSocketDidOpen:(SRWebSocket *)webSocket {
+    self.connected = YES;
+    [delegate socket:(SKSocket*)self didConnectToHost:self.socket.url.absoluteString port:80];
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didFailWithError:(NSError *)error {
+    self.connected = NO;
+    [delegate socketDidDisconnect:(SKSocket*)self withError:error];
+}
+
+- (void)webSocket:(SRWebSocket *)webSocket didCloseWithCode:(NSInteger)code reason:(NSString *)reason wasClean:(BOOL)wasClean {
+    self.connected = NO;
+
+    NSError *error = nil;
+
+    if (wasClean == NO) {
+        NSDictionary *userInfo = @{NSLocalizedDescriptionKey: @"Socket did close",
+                                   NSLocalizedFailureReasonErrorKey: reason
+                                   };
+        error = [NSError errorWithDomain:SKWebSocketErrorDomain code:-57 userInfo:userInfo];
+    }
+
+    [delegate socketDidDisconnect:(SKSocket*)self withError:error];
+}
+
+@end

StompKit/StompKit.h

@@ -88,9 +88,10 @@ typedef void (^STOMPMessageHandler)(STOMPMessage *message);
 @property (nonatomic, copy) void (^errorHandler)(NSError *error);
 @property (nonatomic, assign) BOOL connected;
 
-- (id)initWithHost:(NSString *)theHost
-			  port:(NSUInteger)thePort;
+- (id)initWithHost:(NSString *)theHost;
+- (id)initWithHost:(NSString *)theHost andPort:(NSUInteger)thePort;
 
+- (void)connectWithCompletionHandler:(void (^)(STOMPFrame *connectedFrame, NSError *error))completionHandler;
 - (void)connectWithLogin:(NSString *)login
                 passcode:(NSString *)passcode
        completionHandler:(void (^)(STOMPFrame *connectedFrame, NSError *error))completionHandler;