@@ -76,7 +76,7 @@ extension SocketParsable {
76
76
return . Right( SocketPacket ( type: type, nsp: " / " ) )
77
77
}
78
78
79
- var namespace : String ?
79
+ var namespace = " / "
80
80
var placeholders = - 1
81
81
82
82
if type == . BinaryEvent || type == . BinaryAck {
@@ -119,23 +119,24 @@ extension SocketParsable {
119
119
// If first you don't succeed, try again
120
120
if case let . Right( data) = parseData ( " \( [ noPlaceholders as AnyObject ] ) " ) {
121
121
return . Right( SocketPacket ( type: type, data: data, id: Int ( idString) ?? - 1 ,
122
- nsp: namespace ?? " / " , placeholders: placeholders) )
122
+ nsp: namespace, placeholders: placeholders) )
123
123
} else {
124
124
return . Left( err)
125
125
}
126
126
case let . Right( data) :
127
127
return . Right( SocketPacket ( type: type, data: data, id: Int ( idString) ?? - 1 ,
128
- nsp: namespace ?? " / " , placeholders: placeholders) )
128
+ nsp: namespace, placeholders: placeholders) )
129
129
}
130
130
}
131
131
132
132
// Parses data for events
133
133
private func parseData( data: String ) -> Either < String , [ AnyObject ] > {
134
134
let stringData = data. dataUsingEncoding ( NSUTF8StringEncoding, allowLossyConversion: false )
135
+
135
136
do {
136
137
if let arr = try NSJSONSerialization . JSONObjectWithData ( stringData!,
137
- options: NSJSONReadingOptions . MutableContainers) as? [ AnyObject ] {
138
- return . Right( arr)
138
+ options: NSJSONReadingOptions . MutableContainers) as? [ AnyObject ] {
139
+ return . Right( arr)
139
140
} else {
140
141
return . Left( " Expected data array " )
141
142
}
0 commit comments