Skip to content

Commit 1334b97

Browse files
committed
tweak SocketPacket.PacketType
1 parent 2a322ff commit 1334b97

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

SwiftIO/SocketPacket.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ class SocketPacket {
4343
case BINARY_EVENT = 5
4444
case BINARY_ACK = 6
4545

46-
init(str:String) {
47-
if let int = str.toInt() {
48-
self = PacketType(rawValue: int)!
46+
init?(str:String) {
47+
if let int = str.toInt(), let raw = PacketType(rawValue: int) {
48+
self = raw
4949
} else {
50-
self = PacketType(rawValue: 4)!
50+
return nil
5151
}
5252
}
5353
}

SwiftIO/SocketParser.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,14 @@ class SocketParser {
185185
return nsp == "" && socket.nsp != "/"
186186
}
187187

188-
let p = parseString(stringMessage) as SocketPacket!
188+
let p:SocketPacket
189+
190+
if let pack = parseString(stringMessage) {
191+
p = pack
192+
} else {
193+
socket.didError("Error parsing packet")
194+
return
195+
}
189196

190197
if p.type == SocketPacket.PacketType.EVENT {
191198
if checkNSP(p.nsp) {

0 commit comments

Comments
 (0)