Cleanup

Author: ChrisChares

Sources/HMHomeManager+Promise.swift

@@ -2,6 +2,10 @@ import Foundation
 import PromiseKit
 import HomeKit
 
+public enum HomeKitError: Error {
+    case permissionDeined
+}
+
 extension HMHomeManager {
     public func homes() -> Promise<[HMHome]> {
         return HMHomeManagerProxy().promise
@@ -26,8 +30,6 @@ extension HMHomeManager {
     }
 }
 
-fileprivate let timeout = 5.0
-
 internal class HMHomeManagerProxy: PromiseProxy<[HMHome]>, HMHomeManagerDelegate {
 
     fileprivate let manager: HMHomeManager
@@ -37,8 +39,8 @@ internal class HMHomeManagerProxy: PromiseProxy<[HMHome]>, HMHomeManagerDelegate
         super.init()
         self.manager.delegate = self
 
-        DispatchQueue.main.asyncAfter(deadline: .now() + timeout) { [weak self] in
-            self?.fulfill([])
+        DispatchQueue.main.asyncAfter(deadline: .now() + 20.0) { [weak self] in
+            self?.reject(HomeKitError.permissionDeined)
         }
     }
 

Sources/Utils.swift

@@ -10,29 +10,30 @@ internal class PromiseProxy<T>: NSObject {
 
     override init() {
         super.init()
-        // Create the retain cycle
+        // Create a retain cycle
         self.retainCycle = self
-        // And ensure we break it
+        // And ensure we break it when the promise is resolved
         _ = promise.ensure { self.retainCycle = nil }
     }
 
     /// These functions ensure we only resolve the promise once
-    func fulfill(_ value: T) {
+    internal func fulfill(_ value: T) {
         guard self.promise.isResolved == false else { return }
         seal.fulfill(value)
     }
-    func reject(_ error: Error) {
+    internal func reject(_ error: Error) {
         guard self.promise.isResolved == false else { return }
         seal.reject(error)
     }
 
-    func cancel() {
+    /// Cancel helper
+    internal func cancel() {
         self.reject(PMKError.cancelled)
     }
 }
 
-/*
-    Commonly used intervals for scanning
+/**
+    Different ways to scan.
 */
 public enum ScanInterval {
     // Return after our first item with an optional time limit