From 37537de21317f49dd3d0a983d3a674d3343be7a7 Mon Sep 17 00:00:00 2001 From: Erik Date: Thu, 12 Mar 2015 16:34:08 -0400 Subject: [PATCH] change visibility of socketioclient members --- SwiftIO/SocketEngine.swift | 10 +++++----- SwiftIO/SocketIOClient.swift | 22 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/SwiftIO/SocketEngine.swift b/SwiftIO/SocketEngine.swift index f7555f3..f3fd854 100644 --- a/SwiftIO/SocketEngine.swift +++ b/SwiftIO/SocketEngine.swift @@ -42,7 +42,7 @@ private enum PacketType: String { case NOOP = "6" } -class SocketEngine: NSObject, WebSocketDelegate { +public class SocketEngine: NSObject, WebSocketDelegate { unowned let client:SocketIOClient private let workQueue = NSOperationQueue() private let emitQueue = dispatch_queue_create( @@ -560,13 +560,13 @@ class SocketEngine: NSObject, WebSocketDelegate { } } - func websocketDidConnect(socket:WebSocket) { + public func websocketDidConnect(socket:WebSocket) { self.websocketConnected = true self.probing = true self.probeWebSocket() } - func websocketDidDisconnect(socket:WebSocket, error:NSError?) { + public func websocketDidDisconnect(socket:WebSocket, error:NSError?) { self.websocketConnected = false self.probing = false @@ -581,11 +581,11 @@ class SocketEngine: NSObject, WebSocketDelegate { } } - func websocketDidReceiveMessage(socket:WebSocket, text:String) { + public func websocketDidReceiveMessage(socket:WebSocket, text:String) { self.parseEngineMessage(text) } - func websocketDidReceiveData(socket:WebSocket, data:NSData) { + public func websocketDidReceiveData(socket:WebSocket, data:NSData) { self.parseEngineData(data) } } \ No newline at end of file diff --git a/SwiftIO/SocketIOClient.swift b/SwiftIO/SocketIOClient.swift index 6be1253..3aef518 100644 --- a/SwiftIO/SocketIOClient.swift +++ b/SwiftIO/SocketIOClient.swift @@ -44,15 +44,15 @@ public class SocketIOClient: NSObject { private var paramConnect = false private var _secure = false private var reconnectTimer:NSTimer? - var closed = false - var connected = false - var connecting = false - var engine:SocketEngine? - var nsp:String? - var reconnects = true - var reconnecting = false - var reconnectWait = 10 - var secure:Bool { + public var closed = false + public var connected = false + public var connecting = false + public var engine:SocketEngine? + public var nsp:String? + public var reconnects = true + public var reconnecting = false + public var reconnectWait = 10 + public var secure:Bool { return self._secure } var sid:String? @@ -640,11 +640,11 @@ public class SocketIOClient: NSObject { **/ // Check for message with binary placeholders - self.parseBinaryMessage(message: stringMessage) + self.parseBinaryMessage(stringMessage) } // Tries to parse a message that contains binary - private func parseBinaryMessage(#message:String) { + private func parseBinaryMessage(message:String) { // println(message) var mutMessage = RegexMutable(message)