Merge pull request #4 from snakajima/push

Push support
snakajima · Jan 7, 2021 · a832b71 · a832b71
2 parents e7ba2ac + 46b67b6
commit a832b71
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/core/BonjourConnection.swift b/core/BonjourConnection.swift
@@ -10,7 +10,7 @@ import CocoaAsyncSocket
 
 public protocol BonjourConnectionDelegate : NSObjectProtocol {
     // Only recponces not processed by callback (of send or call methos) will come here
-    func on(responce: BonjourResponse, connection: BonjourConnection)
+    func connection(connection: BonjourConnection, responce res: BonjourResponse, context: String?)
 }
 
 public class BonjourConnection: NSObject, ObservableObject {
@@ -108,12 +108,13 @@ extension BonjourConnection : GCDAsyncSocketDelegate {
         do {
             let result = try BonjourParser.parse(data)
             let res = BonjourResponse(result: result)
-            if let context = res.headers["X-Context"],
+            let context = res.headers["X-Context"]
+            if let context = context,
                let callback = callbacks[context] {
                     callback(res, res.jsonBody)
                     callbacks.removeValue(forKey: context)
             } else {
-                delegate?.on(responce: res, connection: self)
+                delegate?.connection(connection: self, responce: res, context: context)
             }
             if let extraData = result.extraData {
                 print("  extra data", extraData.count)

diff --git a/sampleClient/SampleHTTPClient.swift b/sampleClient/SampleHTTPClient.swift
@@ -8,7 +8,12 @@
 import Foundation
 
 class SampleHTTPClient: NSObject, BonjourConnectionDelegate {
-    func on(responce: BonjourResponse, connection: BonjourConnection) {
-        print("res", responce)
+    func connection(connection: BonjourConnection, responce res: BonjourResponse, context: String?) {
+        if let context = context, context == "push" {
+            print("pushed", res)
+
+        } else {
+            print("unhandled response", res)
+        }
     }
 }
diff --git a/sampleServer/ContentView.swift b/sampleServer/ContentView.swift
@@ -36,6 +36,15 @@ struct ContentView: View {
                     Text("Start")
                 })
             }
+            Button(action: {
+                if let socket = myServer.clients.first {
+                    var res = BonjourResponse(context: "push")
+                    res.setBody(json: ["message":"I am pushing you"])
+                    service.send(responce: res, to: socket)
+                }
+            }, label: {
+                Text("Push")
+            })
             if let image = myServer.image {
                 Image(nsImage: NSImage(cgImage: image, size: CGSize(width: image.width, height: image.height)))
                     .resizable()