@@ -63,51 +63,51 @@ extension SocketParsable {
63
63
64
64
/// Parses a messsage from the engine. Returning either a string error or a complete SocketPacket
65
65
func parseString( message: String ) -> Either < String , SocketPacket > {
66
- var parser = SocketStringReader ( message: message)
66
+ var reader = SocketStringReader ( message: message)
67
67
68
- guard let type = SocketPacket . PacketType ( rawValue: Int ( parser . read ( 1 ) ) ?? - 1 ) else {
68
+ guard let type = SocketPacket . PacketType ( rawValue: Int ( reader . read ( 1 ) ) ?? - 1 ) else {
69
69
return . Left( " Invalid packet type " )
70
70
}
71
71
72
- if !parser . hasNext {
72
+ if !reader . hasNext {
73
73
return . Right( SocketPacket ( type: type, nsp: " / " ) )
74
74
}
75
75
76
76
var namespace = " / "
77
77
var placeholders = - 1
78
78
79
79
if type == . BinaryEvent || type == . BinaryAck {
80
- if let holders = Int ( parser . readUntilStringOccurence ( " - " ) ) {
80
+ if let holders = Int ( reader . readUntilStringOccurence ( " - " ) ) {
81
81
placeholders = holders
82
82
} else {
83
83
return . Left( " Invalid packet " )
84
84
}
85
85
}
86
86
87
- if parser . currentCharacter == " / " {
88
- namespace = parser . readUntilStringOccurence ( " , " ) ?? parser . readUntilEnd ( )
87
+ if reader . currentCharacter == " / " {
88
+ namespace = reader . readUntilStringOccurence ( " , " ) ?? reader . readUntilEnd ( )
89
89
}
90
90
91
- if !parser . hasNext {
91
+ if !reader . hasNext {
92
92
return . Right( SocketPacket ( type: type, nsp: namespace, placeholders: placeholders) )
93
93
}
94
94
95
95
var idString = " "
96
96
97
97
if type == . Error {
98
- parser . advanceIndexBy ( - 1 )
98
+ reader . advanceIndexBy ( - 1 )
99
99
} else {
100
- while parser . hasNext {
101
- if let int = Int ( parser . read ( 1 ) ) {
100
+ while reader . hasNext {
101
+ if let int = Int ( reader . read ( 1 ) ) {
102
102
idString += String ( int)
103
103
} else {
104
- parser . advanceIndexBy ( - 2 )
104
+ reader . advanceIndexBy ( - 2 )
105
105
break
106
106
}
107
107
}
108
108
}
109
109
110
- let d = message [ parser . currentIndex. advancedBy ( 1 ) ..< message. endIndex]
110
+ let d = message [ reader . currentIndex. advancedBy ( 1 ) ..< message. endIndex]
111
111
112
112
switch parseData ( d) {
113
113
case let . Left( err) :
0 commit comments