capture weak reference to self when handling messages on device

Author: lhoward

Examples/OCADevice/DeviceApp.swift

@@ -146,44 +146,12 @@ public enum DeviceApp {
     }
 
     try await withThrowingTaskGroup(of: Void.self) { taskGroup in
-      taskGroup.addTask {
-        print("Starting OCP.1 IPv4 stream endpoint \(streamEndpoint)...")
-        try await streamEndpoint.run()
-      }
-      taskGroup.addTask {
-        print("Starting OCP.1 IPv6 stream endpoint \(stream6Endpoint)...")
-        try await stream6Endpoint.run()
-      }
-      #if os(Linux) || canImport(FlyingSocks)
-      taskGroup.addTask {
-        print("Starting OCP.1 IPv4 datagram endpoint \(datagramEndpoint)...")
-        try await datagramEndpoint.run()
-      }
-      taskGroup.addTask {
-        print("Starting OCP.1 IPv6 datagram endpoint \(datagram6Endpoint)...")
-        try await datagram6Endpoint.run()
-      }
-      if let domainSocketStreamEndpoint {
-        taskGroup.addTask {
-          print("Starting OCP.1 domain socket stream endpoint \(domainSocketStreamEndpoint)...")
-          try await domainSocketStreamEndpoint.run()
-        }
-      }
-      #endif
-      #if os(Linux)
       if let domainSocketDatagramEndpoint {
         taskGroup.addTask {
           print("Starting OCP.1 domain socket datagram endpoint \(domainSocketDatagramEndpoint)...")
           try await domainSocketDatagramEndpoint.run()
         }
       }
-      #endif
-      #if canImport(FlyingSocks)
-      taskGroup.addTask {
-        print("Starting OCP.1 WebSocket endpoint \(webSocketEndpoint)...")
-        try await webSocketEndpoint.run()
-      }
-      #endif
       try await taskGroup.next()
     }
   }

Sources/SwiftOCADevice/OCP.1/Ocp1ControllerInternal.swift

@@ -156,9 +156,9 @@ extension Ocp1ControllerInternal {
       endpoint.traceMessage(message, controller: self, direction: .rx)
     }
 
-    let responses = try await messageList.messages.asyncMap { @Sendable message in
+    let responses = try await messageList.messages.asyncMap { @Sendable [weak self] message in
       // note for stream connections this will only throw for invalidMessageType
-      try await _handle(for: endpoint, message: message)
+      try await self?._handle(for: endpoint, message: message)
     }
 
     if messageList.responseRequired {
@@ -180,8 +180,8 @@ extension Ocp1ControllerInternal {
     await withTaskGroup(of: Void.self) { group in
       do {
         for try await messageList in messages {
-          group.addTask {
-            try? await self.handle(for: endpoint, messageList: messageList)
+          group.addTask { [weak self] in
+            try? await self?.handle(for: endpoint, messageList: messageList)
           }
         }
       } catch Ocp1Error.notConnected {