@@ -90,68 +90,68 @@ class SocketPacket {
9090 }
9191
9292 func createMessageForEvent( event: String ) -> String {
93- var message : String
94- var jsonSendError : NSError ?
93+ var message : String
94+ var jsonSendError : NSError ?
95+
96+ if self . binary. count == 0 {
97+ self . type = SocketPacketType . EVENT
9598
96- if self . binary. count == 0 {
97- self . type = SocketPacketType . EVENT
98-
99- if self . nsp == " / " {
100- if self . id == nil {
101- message = " 2[ \" \( event) \" "
102- } else {
103- message = " 2 \( self . id!) [ \" \( event) \" "
104- }
99+ if self . nsp == " / " {
100+ if self . id == nil {
101+ message = " 2[ \" \( event) \" "
105102 } else {
106- if self . id == nil {
107- message = " 2/ \( self . nsp) ,[ \" \( event) \" "
108- } else {
109- message = " 2/ \( self . nsp) , \( self . id!) [ \" \( event) \" "
110- }
103+ message = " 2 \( self . id!) [ \" \( event) \" "
111104 }
112105 } else {
113- self . type = SocketPacketType . BINARY_EVENT
114-
115- if self . nsp == " / " {
116- if self . id == nil {
117- message = " 5 \( self . binary. count) -[ \" \( event) \" "
118- } else {
119- message = " 5 \( self . binary. count) - \( self . id!) [ \" \( event) \" "
120- }
106+ if self . id == nil {
107+ message = " 2/ \( self . nsp) ,[ \" \( event) \" "
121108 } else {
122- if self . id == nil {
123- message = " 5 \( self . binary. count) -/ \( self . nsp) ,[ \" \( event) \" "
124- } else {
125- message = " 5 \( self . binary. count) -/ \( self . nsp) , \( self . id!) [ \" \( event) \" "
126- }
109+ message = " 2/ \( self . nsp) , \( self . id!) [ \" \( event) \" "
127110 }
128111 }
112+ } else {
113+ self . type = SocketPacketType . BINARY_EVENT
129114
130- return self . completeMessage ( message)
131- }
132-
133- func createAck( ) -> String {
134- var msg : String
135-
136- if self . binary. count == 0 {
137- self . type = SocketPacketType . ACK
138-
139- if nsp == " / " {
140- msg = " 3 \( self . id!) [ "
115+ if self . nsp == " / " {
116+ if self . id == nil {
117+ message = " 5 \( self . binary. count) -[ \" \( event) \" "
141118 } else {
142- msg = " 3/ \( self . nsp ) , \( self . id!) [ "
119+ message = " 5 \( self . binary . count ) - \( self . id!) [ \" \( event ) \" "
143120 }
144121 } else {
145- self . type = SocketPacketType . BINARY_ACK
146-
147- if nsp == " / " {
148- msg = " 6 \( self . binary. count) - \( self . id!) [ "
122+ if self . id == nil {
123+ message = " 5 \( self . binary. count) -/ \( self . nsp) ,[ \" \( event) \" "
149124 } else {
150- msg = " 6 \( self . binary. count) -/ \( self . nsp) , \( self . id!) [ "
125+ message = " 5 \( self . binary. count) -/ \( self . nsp) , \( self . id!) [ \" \( event ) \" "
151126 }
152127 }
128+ }
129+
130+ return self . completeMessage ( message)
131+ }
132+
133+ func createAck( ) -> String {
134+ var msg : String
135+
136+ if self . binary. count == 0 {
137+ self . type = SocketPacketType . ACK
138+
139+ if nsp == " / " {
140+ msg = " 3 \( self . id!) [ "
141+ } else {
142+ msg = " 3/ \( self . nsp) , \( self . id!) [ "
143+ }
144+ } else {
145+ self . type = SocketPacketType . BINARY_ACK
153146
154- return self . completeMessage ( msg, ack: true )
147+ if nsp == " / " {
148+ msg = " 6 \( self . binary. count) - \( self . id!) [ "
149+ } else {
150+ msg = " 6 \( self . binary. count) -/ \( self . nsp) , \( self . id!) [ "
151+ }
152+ }
153+
154+ return self . completeMessage ( msg, ack: true )
155155 }
156156
157157 func completeMessage( var message: String , ack: Bool = false ) -> String {
0 commit comments