Skip to content

Fix: /homekit/accessories returns null when characteristic metadata contains NaN or Infinity #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DarkStarDS9 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: /homekit/accessories returns null when characteristic metadata contains NaN or Infinity #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 2 deletions Casa/HomeKitServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,12 @@ enum JSONValue: Encodable {
func encodedData() -> Data {
let encoder = JSONEncoder()
encoder.outputFormatting = [.prettyPrinted, .sortedKeys]
return (try? encoder.encode(self)) ?? Data("null".utf8)
do {
return try encoder.encode(self)
} catch {
print("[Casa] JSON encoding failed: \(error)")
return Data("null".utf8)
}
}
}

Expand Down Expand Up @@ -954,7 +959,9 @@ enum HomeKitPayload {
if CFGetTypeID(number) == CFBooleanGetTypeID() {
return .bool(number.boolValue)
}
return .number(number.doubleValue)
let d = number.doubleValue
if d.isNaN || d.isInfinite { return .null }
return .number(d)
case let string as String:
return .string(string)
case let date as Date:
Expand Down