Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Sources/HAPTransport/CharacteristicProtocol.swift
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ public struct CharacteristicProtocol: Sendable {
let accessories = await bridge.accessoryDatabase()
let json = encodeAccessoryDatabase(accessories)
if let str = String(data: json, encoding: .utf8) {
logger.info("GET /accessories (\(accessories.count) accessories):\n\(str)")
logger.debug("GET /accessories (\(accessories.count) accessories)")
logger.trace("GET /accessories body:\n\(str)")
}
return HTTPProtocol.okResponse(body: json, contentType: HTTPProtocol.hapJSON)
}
Expand Down Expand Up @@ -234,7 +235,7 @@ public struct CharacteristicProtocol: Sendable {
return HTTPProtocol.errorResponse(status: 400, message: "Bad Request")
}

logger.info("PUT /characteristics: \(characteristics.count) characteristic(s)")
logger.debug("PUT /characteristics: \(characteristics.count) characteristic(s)")

for charDict in characteristics {
guard let aid = charDict["aid"] as? UInt64 ?? (charDict["aid"] as? Int).map(UInt64.init),
Expand All @@ -250,19 +251,19 @@ public struct CharacteristicProtocol: Sendable {
} else {
await bridge.unsubscribe(connectionID: connectionID, aid: aid, iid: iid)
}
logger.info("PUT /characteristics: aid=\(aid) iid=\(iid) ev=\(ev) (connection \(connectionID))")
logger.debug("PUT /characteristics: aid=\(aid) iid=\(iid) ev=\(ev) (connection \(connectionID))")
}

if let rawValue = charDict["value"] {
let value = decodeValue(rawValue)
if let value {
logger.info("PUT /characteristics: write aid=\(aid) iid=\(iid) value=\(value)")
logger.debug("PUT /characteristics: write aid=\(aid) iid=\(iid) value=\(value)")
try await bridge.writeCharacteristic(aid: aid, iid: iid, value: value)
} else {
logger.warning("PUT /characteristics: aid=\(aid) iid=\(iid) could not decode value: \(rawValue) (type: \(type(of: rawValue)))")
}
} else {
logger.info("PUT /characteristics: aid=\(aid) iid=\(iid) no value field (keys: \(Array(charDict.keys)))")
logger.trace("PUT /characteristics: aid=\(aid) iid=\(iid) no value field (keys: \(Array(charDict.keys)))")
}
}

Expand Down
4 changes: 2 additions & 2 deletions Sources/HAPTransport/HAPBridge.swift
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ public actor HAPBridge {
public func subscribe(connectionID: Int, aid: UInt64, iid: UInt64) {
let key = Self.handlerKey(aid: aid, iid: iid)
subscriptions[key, default: []].insert(connectionID)
logger.info("Event subscribe: connection \(connectionID) → aid=\(aid) iid=\(iid)")
logger.debug("Event subscribe: connection \(connectionID) → aid=\(aid) iid=\(iid)")
}

public func unsubscribe(connectionID: Int, aid: UInt64, iid: UInt64) {
Expand All @@ -338,7 +338,7 @@ public actor HAPBridge {
return
}

logger.info("Event notify: aid=\(aid) iid=\(iid) value=\(value) → \(subscribers.count) subscriber(s)")
logger.debug("Event notify: aid=\(aid) iid=\(iid) value=\(value) → \(subscribers.count) subscriber(s)")
let eventData = Self.buildEventPayload(aid: aid, iid: iid, value: value)
let subs = subscribers
Task { await handler(subs, eventData) }
Expand Down
Loading