Skip to content

Commit

Permalink
fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
xiazhvera committed Jun 19, 2024
1 parent abec93c commit 6a67040
Showing 1 changed file with 16 additions and 17 deletions.
33 changes: 16 additions & 17 deletions Samples/MqttClient/MqttClient/ContentView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import SwiftUI
import AwsCommonRuntimeKit


let TEST_HOST = "<endpoint>"
let TEST_PORT: UInt32 = 1883

Expand All @@ -30,20 +29,18 @@ struct ContentView: View {
.padding()
}


}


/// start client and check for connection success
func connectClient(client: Mqtt5Client, testContext: MqttTestContext) throws -> Void {
func connectClient(client: Mqtt5Client, testContext: MqttTestContext) throws {
try client.start()
if testContext.semaphoreConnectionSuccess.wait(timeout: .now() + 5) == .timedOut {
print("Connection Success Timed out after 5 seconds")
}
}

/// stop client and check for discconnection and stopped lifecycle events
func disconnectClientCleanup(client: Mqtt5Client, testContext: MqttTestContext, disconnectPacket: DisconnectPacket? = nil) throws -> Void {
func disconnectClientCleanup(client: Mqtt5Client, testContext: MqttTestContext, disconnectPacket: DisconnectPacket? = nil) throws {
try client.stop(disconnectPacket: disconnectPacket)

if testContext.semaphoreDisconnection.wait(timeout: .now() + 5) == .timedOut {
Expand All @@ -56,7 +53,7 @@ func disconnectClientCleanup(client: Mqtt5Client, testContext: MqttTestContext,
}

/// stop client and check for stopped lifecycle event
func stopClient(client: Mqtt5Client, testContext: MqttTestContext) throws -> Void {
func stopClient(client: Mqtt5Client, testContext: MqttTestContext) throws {
try client.stop()
if testContext.semaphoreStopped.wait(timeout: .now() + 5) == .timedOut {
print("Stop timed out after 5 seconds")
Expand All @@ -74,7 +71,7 @@ struct Message: Identifiable {
let text: String
}

class MqttTestContext : ObservableObject {
class MqttTestContext: ObservableObject {
@Published var messages: [Message] = [Message(id: 0, text: "Click the \"Setup Client and Start\" to start the client.")]

public var contextName: String
Expand Down Expand Up @@ -102,8 +99,7 @@ class MqttTestContext : ObservableObject {
public var publishCount = 0
public var publishTarget = 1

func printView(_ message: String)
{
func printView(_ message: String) {
let newMessage = Message(id: messages.count, text: message)
self.messages.append(newMessage)
print(message)
Expand Down Expand Up @@ -139,9 +135,13 @@ class MqttTestContext : ObservableObject {

self.onPublishReceived = onPublishReceived ?? { publishData in
if let payloadString = publishData.publishPacket.payloadAsString() {
self.printView(contextName + " Mqtt5ClientTests: onPublishReceived. Topic:\'\(publishData.publishPacket.topic)\' QoS:\(publishData.publishPacket.qos) payload:\'\(payloadString)\'")
self.printView(contextName +
" Mqtt5ClientTests: onPublishReceived." +
"Topic:\'\(publishData.publishPacket.topic)\' QoS:\(publishData.publishPacket.qos) payload:\'\(payloadString)\'")
} else {
self.printView(contextName + " Mqtt5ClientTests: onPublishReceived. Topic:\'\(publishData.publishPacket.topic)\' QoS:\(publishData.publishPacket.qos)")
self.printView(contextName +
" Mqtt5ClientTests: onPublishReceived." +
"Topic:\'\(publishData.publishPacket.topic)\' QoS:\(publishData.publishPacket.qos)")
}
self.publishPacket = publishData.publishPacket
self.semaphorePublishReceived.signal()
Expand All @@ -163,7 +163,8 @@ class MqttTestContext : ObservableObject {
self.negotiatedSettings = successData.negotiatedSettings
self.connackPacket = successData.connackPacket
Task {
async let _ = try await client!.subscribe(subscribePacket: SubscribePacket(subscription: Subscription(topicFilter: "test/topic", qos: QoS.atLeastOnce)))
async let _ = try await client!.subscribe(subscribePacket: SubscribePacket(
subscription: Subscription(topicFilter: "test/topic", qos: QoS.atLeastOnce)))
}
self.semaphoreConnectionSuccess.signal()
}
Expand Down Expand Up @@ -241,7 +242,7 @@ func library_init() {
CommonRuntimeKit.initialize()
}

var client: Mqtt5Client? = nil
var client: Mqtt5Client?

func setupClientAndStart() {
let backgroundQueue = DispatchQueue(label: "background_queue",
Expand All @@ -252,7 +253,7 @@ func setupClientAndStart() {
let inputHost = TEST_HOST
let inputPort: UInt32 = TEST_PORT

let ConnectPacket = MqttConnectOptions(keepAliveInterval:60, clientId: createClientId())
let ConnectPacket = MqttConnectOptions(keepAliveInterval: 60, clientId: createClientId())

let clientOptions = MqttClientOptions(
hostName: inputHost,
Expand All @@ -262,11 +263,9 @@ func setupClientAndStart() {
do {
client = try createClient(clientOptions: clientOptions, testContext: mqttTestContext)
try connectClient(client: client!, testContext: mqttTestContext)
}
catch {
} catch {
mqttTestContext.printView("Failed to setup client.")
}

}
}

0 comments on commit 6a67040

Please sign in to comment.