-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor to resource specific routes
- Loading branch information
Showing
8 changed files
with
229 additions
and
221 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| // | ||
| // Routes+Accessories.swift | ||
| // Prefab | ||
| // | ||
| // Created by kelly on 2/25/24. | ||
| // | ||
|
|
||
| import Foundation | ||
| import HomeKit | ||
| import Hummingbird | ||
| import OSLog | ||
|
|
||
| extension Server { | ||
| func getAccessories(_ request: HBRequest) throws -> String { | ||
| let homeName = try getRequiredParam(param: "home", request: request) | ||
| let roomName = try getRequiredParam(param: "room", request: request) | ||
| let home = homeBase.homes.first(where: {$0.name == homeName.removingPercentEncoding}) | ||
| if (home == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
| let room = home?.rooms.first(where: {$0.name == roomName.removingPercentEncoding}) | ||
| if (room == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
|
|
||
| let accessories = room?.accessories.map{ (hmAccessory: HMAccessory) -> Accessory in Accessory(home: home!.name, room: room!.name, name: hmAccessory.name)} | ||
| let jsonEncoder = JSONEncoder() | ||
| let jsonData = try jsonEncoder.encode(accessories) | ||
| let json = String(data: jsonData, encoding: String.Encoding.utf8) | ||
|
|
||
| return json! | ||
| } | ||
|
|
||
|
|
||
| func getAccessory(_ request: HBRequest) throws -> String { | ||
| let homeName = try getRequiredParam(param: "home", request: request) | ||
| let roomName = try getRequiredParam(param: "room", request: request) | ||
| let accessoryName = try getRequiredParam(param: "accessory", request: request) | ||
|
|
||
| let home = homeBase.homes.first(where: {$0.name == homeName.removingPercentEncoding}) | ||
| if (home == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
| let room = home?.rooms.first(where: {$0.name == roomName.removingPercentEncoding}) | ||
| if (room == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
| let hkAccessory = room?.accessories.first(where: { (hmAccessory: HMAccessory) -> Bool in hmAccessory.name == accessoryName.removingPercentEncoding}) | ||
| if (hkAccessory == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
|
|
||
| let group = DispatchGroup() | ||
| for service in hkAccessory!.services { | ||
| for char in service.characteristics { | ||
| group.enter() | ||
| // Error handling for read | ||
| char.readValue{ (error: Error?) -> Void in group.leave() } | ||
| } | ||
| } | ||
| group.wait() | ||
|
|
||
| let accessory = Accessory( | ||
| home: home!.name, room: room!.name, name: hkAccessory!.name, category: hkAccessory!.category.categoryType, isReachable: hkAccessory!.isReachable, supportsIdentify: hkAccessory!.supportsIdentify, isBridged: hkAccessory!.isBridged, services: hkAccessory!.services.map{ (service: HMService) -> Service in Service(uniqueIdentifier: service.uniqueIdentifier, name: service.name, type: service.serviceType, isPrimary: service.isPrimaryService, isUserInteractive: service.isUserInteractive, associatedType: service.associatedServiceType, characteristics: service.characteristics.map{ (char: HMCharacteristic) -> Characteristic in Characteristic(uniqueIdentifier: char.uniqueIdentifier, description: char.localizedDescription, properties: char.properties, type: char.characteristicType, metadata: CharacteristicMetadata(manufacturerDescription: char.metadata?.manufacturerDescription, validValues: char.metadata?.validValues?.map{ (number: NSNumber) -> String in return number.stringValue}, minimumValue: char.metadata?.minimumValue?.stringValue, maximumValue: char.metadata?.maximumValue?.stringValue, stepValue: char.metadata?.stepValue?.stringValue, maxLength: char.metadata?.maxLength?.stringValue, format: char.metadata?.format, units: char.metadata?.units), value: "\(char.value ?? "")" )}) }, firmwareVersion: hkAccessory!.firmwareVersion, manufacturer: hkAccessory!.manufacturer, model: hkAccessory!.model ) | ||
|
|
||
| let jsonEncoder = JSONEncoder() | ||
| let jsonData = try jsonEncoder.encode(accessory) | ||
| let json = String(data: jsonData, encoding: String.Encoding.utf8) | ||
|
|
||
| return json! | ||
| } | ||
|
|
||
|
|
||
|
|
||
| func updateAccessory(_ request: HBRequest) throws -> String { | ||
| var updateAccessoryInput: UpdateAccessoryInput | ||
| do { | ||
| updateAccessoryInput = try JSONDecoder().decode(UpdateAccessoryInput.self, from: request.body.buffer!) | ||
| } catch { | ||
| throw HBHTTPError( | ||
| .badRequest, | ||
| message: "Invalid update object." | ||
| ) | ||
| } | ||
|
|
||
| let homeName = try getRequiredParam(param: "home", request: request) | ||
| let roomName = try getRequiredParam(param: "room", request: request) | ||
| let accessoryName = try getRequiredParam(param: "accessory", request: request) | ||
|
|
||
| let home = homeBase.homes.first(where: {$0.name == homeName.removingPercentEncoding}) | ||
| if (home == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
| let room = home?.rooms.first(where: {$0.name == roomName.removingPercentEncoding}) | ||
| if (room == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
| let hkAccessory = room?.accessories.first(where: { (hmAccessory: HMAccessory) -> Bool in hmAccessory.name == accessoryName.removingPercentEncoding}) | ||
| if (hkAccessory == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
|
|
||
| let hkService = hkAccessory?.services.first(where: { (hmService: HMService) -> Bool in hmService.uniqueIdentifier.uuidString == updateAccessoryInput.serviceId}) | ||
| if (hkAccessory == nil) { | ||
| Logger().debug("Service not found \(updateAccessoryInput.serviceId)") | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
|
|
||
| let hkChar = hkService?.characteristics.first(where: { (hmChar: HMCharacteristic) -> Bool in hmChar.uniqueIdentifier.uuidString == updateAccessoryInput.characteristicId}) | ||
| if (hkAccessory == nil) { | ||
| Logger().debug("Characteristic not found \(updateAccessoryInput.characteristicId)") | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
|
|
||
|
|
||
| Logger().debug("Writing \(updateAccessoryInput.value) to \(hkChar)") | ||
|
|
||
| let group = DispatchGroup() | ||
| group.enter() | ||
| hkChar?.writeValue(try GetValue(value: updateAccessoryInput.value, format: hkChar?.metadata?.format ?? ""), completionHandler: { (error: Error?) -> Void in defer {group.leave()}; Logger().error("\(String(describing: error))") }) | ||
| group.wait() | ||
|
|
||
| return "" //json! | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| // | ||
| // Routes+Homes.swift | ||
| // Prefab | ||
| // | ||
| // Created by kelly on 2/25/24. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Hummingbird | ||
|
|
||
| extension Server { | ||
| func getHomes(_ request: HBRequest) throws -> String { | ||
| let jsonEncoder = JSONEncoder() | ||
| let jsonData = try jsonEncoder.encode(homeBase.homes.map{Home(name: $0.name)}) | ||
| let json = String(data: jsonData, encoding: String.Encoding.utf8) | ||
|
|
||
| return json ?? "[]" | ||
| } | ||
|
|
||
| func getHome(_ request: HBRequest) throws -> String { | ||
| let homeName = try getRequiredParam(param: "home", request: request) | ||
| let home = homeBase.homes.first(where: {$0.name == homeName.removingPercentEncoding}) | ||
| if (home == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
| let jsonEncoder = JSONEncoder() | ||
| let jsonData = try jsonEncoder.encode(Home(name: home!.name)) | ||
| let json = String(data: jsonData, encoding: String.Encoding.utf8) | ||
|
|
||
| return json! | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // | ||
| // Routes+Rooms.swift | ||
| // Prefab | ||
| // | ||
| // Created by kelly on 2/25/24. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Hummingbird | ||
|
|
||
| extension Server { | ||
| func getRooms(_ request: HBRequest) throws -> String { | ||
| let homeName = try getRequiredParam(param: "home", request: request) | ||
| let home = homeBase.homes.first(where: {$0.name == homeName.removingPercentEncoding}) | ||
| if (home == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
| let rooms = home?.rooms.map{Room(home: home!.name, name: $0.name)} | ||
| let jsonEncoder = JSONEncoder() | ||
| let jsonData = try jsonEncoder.encode(rooms) | ||
| let json = String(data: jsonData, encoding: String.Encoding.utf8) | ||
|
|
||
| return json! | ||
| } | ||
|
|
||
| func getRoom(_ request: HBRequest) throws -> String { | ||
| let homeName = try getRequiredParam(param: "home", request: request) | ||
| let roomName = try getRequiredParam(param: "room", request: request) | ||
| let home = homeBase.homes.first(where: {$0.name == homeName.removingPercentEncoding}) | ||
| if (home == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
| let room = home?.rooms.first(where: {$0.name == roomName.removingPercentEncoding}) | ||
| if (room == nil) { | ||
| throw HBHTTPError(.notFound) | ||
| } | ||
| let jsonEncoder = JSONEncoder() | ||
| let jsonData = try jsonEncoder.encode(Room(home: home!.name, name: room!.name)) | ||
| let json = String(data: jsonData, encoding: String.Encoding.utf8) | ||
|
|
||
| return json! | ||
| } | ||
| } |
Oops, something went wrong.