Update socket functions

enums · Jan 2, 2022 · fc50e2e · fc50e2e
1 parent 90ebcb5
commit fc50e2e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/Sources/Heze/Socket/HezeSocketClient.swift b/Sources/Heze/Socket/HezeSocketClient.swift
@@ -22,23 +22,8 @@ open class HezeSocketClient: HezeSocketHandler {
         return nil
     }
 
-    public func sendMessage(_ msg: String) {
-        socket?.sendStringMessage(string: msg, final: true) { }
-    }
-
-    public func sendBytes(_ bytes: [UInt8]) {
-        socket?.sendBinaryMessage(bytes: bytes, final: true) { }
-    }
-
-    public func close() {
+    open func close() {
         socket?.close()
     }
 
-    open override func connected() {
-
-    }
-
-    open override func closed() {
-
-    }
 }
diff --git a/Sources/Heze/Socket/HezeSocketHandler.swift b/Sources/Heze/Socket/HezeSocketHandler.swift
@@ -60,7 +60,7 @@ open class HezeSocketHandler: HezeHandler, WebSocketSessionHandler {
                 return
             }
             if let bytes = self.handleBytes(bytes, opcodeType: opcodeType, final: final, socket: socket)?.toBytes() {
-                socket.sendBinaryMessage(bytes: bytes, final: final) {
+                self.sendBytes(bytes) {
                     self.handleSession(request: req, socket: socket)
                 }
             } else {
@@ -85,11 +85,19 @@ open class HezeSocketHandler: HezeHandler, WebSocketSessionHandler {
         return nil
     }
 
-    public func connected() {
+    open func sendMessage(_ msg: String, completion: @escaping () -> Void) {
+        sendBytes([UInt8](msg.utf8), completion: completion)
+    }
+
+    open func sendBytes(_ bytes: [UInt8], completion: @escaping () -> Void) {
+        socket?.sendBinaryMessage(bytes: bytes, final: true, completion: completion)
+    }
+
+    open func connected() {
 
     }
 
-    public func closed() {
+    open func closed() {
 
     }
 }