Added JSBluetooth.devices

Author: colemancda

Sources/JavaScriptKit/Extensions/CodingKey.swift

@@ -0,0 +1,29 @@
+//
+//  CodingKey.swift
+//  
+//
+//  Created by Alsey Coleman Miller on 5/30/20.
+//
+
+internal extension Sequence where Element == CodingKey {
+    
+    /// KVC path string for current coding path.
+    var path: String {
+        return reduce("", { $0 + "\($0.isEmpty ? "" : ".")" + $1.stringValue })
+    }
+}
+
+internal extension CodingKey {
+    
+    static var sanitizedName: String {
+        
+        let rawName = String(reflecting: self)
+        var elements = rawName.split(separator: ".")
+        guard elements.count > 2
+            else { return rawName }
+        elements.removeFirst()
+        // FIXME: Needs Foundation for String extensions
+        //elements.removeAll { $0.contains("(unknown context") }
+        return elements.reduce("", { $0 + ($0.isEmpty ? "" : ".") + $1 })
+    }
+}

Sources/JavaScriptKit/JS Types/JSBluetooth.swift

@@ -24,6 +24,9 @@ public final class JSBluetooth: JSType {
 
     // MARK: - Accessors
 
+    /**
+     Returns a Promise that resolved to a Boolean indicating whether the user-agent has the ability to support Bluetooth. Some user-agents let the user configure an option that affects what is returned by this value. If this option is set, that is the value returned by this method.
+     */
     public var isAvailable: JSPromise<Bool> {
         guard let function = jsObject.getAvailability.function
             else { fatalError("Invalid function \(#function)") }
@@ -33,38 +36,77 @@ public final class JSBluetooth: JSType {
         return promise
     }
 
+    /**
+     Returns a `Promise` that resolved to an array of `BluetoothDevice` which the origin already obtained permission for via a call to `Bluetooth.requestDevice()`.
+     */
+    public var devices: JSPromise<[JSBluetoothDevice]> {
+        guard let function = jsObject.getDevices.function
+            else { fatalError("Invalid function \(#function)") }
+        let result = function.apply(this: jsObject)
+        guard let promise = result.object.flatMap({ JSPromise<[JSBluetoothDevice]>($0) })
+            else { fatalError("Invalid object \(result)") }
+        return promise
+    }
+    
     // MARK: - Methods
 
     /// Returns a Promise to a BluetoothDevice object with the specified options.
     /// If there is no chooser UI, this method returns the first device matching the criteria.
     ///
     /// - Returns: A Promise to a `BluetoothDevice` object.
-    public func requestDevice(//filters: [] = [],
-                              //services: [] = [],
-                              acceptAllDevices: Bool = true) -> JSPromise<JSBluetoothDevice> {
-        
-        enum Option: String {
-            case filters
-            case optionalServices
-            case acceptAllDevices
-        }
+    public func requestDevice() -> JSPromise<JSBluetoothDevice> {
+        let options = RequestDeviceOptions(filters: nil, optionalServices: nil, acceptAllDevices: true)
+        return requestDevice(options: options)
+    }
+    
+    /// Returns a Promise to a BluetoothDevice object with the specified options.
+    /// If there is no chooser UI, this method returns the first device matching the criteria.
+    ///
+    /// - Returns: A Promise to a `BluetoothDevice` object.
+    internal func requestDevice(options: RequestDeviceOptions) -> JSPromise<JSBluetoothDevice> {
 
         // Bluetooth.requestDevice([options])
         // .then(function(bluetoothDevice) { ... })
 
         guard let function = jsObject.requestDevice.function
             else { fatalError("Invalid function \(#function)") }
-        
-        // FIXME: Improve, support all options
-        let options = JSObject()
-        options[Option.acceptAllDevices.rawValue] = acceptAllDevices.jsValue()
-        options[Option.optionalServices.rawValue] = ["device_information"].jsValue()
-        
         let result = function.apply(this: jsObject, arguments: options)
-        
         guard let promise = result.object.flatMap({ JSPromise<JSBluetoothDevice>($0) })
             else { fatalError("Invalid object \(result)") }
-        
         return promise
     }
 }
+
+// MARK: - Supporting Types
+
+public extension JSBluetooth {
+    
+    struct ScanFilter: Equatable, Hashable, Codable {
+                
+        public var services: [String]?
+        
+        public var name: String?
+        
+        public var namePrefix: String?
+        
+        public init(services: [String]? = nil,
+                    name: String? = nil,
+                    namePrefix: String? = nil) {
+            self.services = services
+            self.name = name
+            self.namePrefix = namePrefix
+        }
+    }
+}
+
+internal extension JSBluetooth {
+    
+    struct RequestDeviceOptions: Encodable, JSValueConvertible {
+        
+        var filters: [ScanFilter]?
+        
+        var optionalServices: [String]?
+        
+        var acceptAllDevices: Bool?
+    }
+}

Sources/JavaScriptKit/JSDecoder.swift

@@ -3,7 +3,11 @@ public struct JSDecoder {
 
     // MARK: - Properties
 
-    public var userInfo: [CodingUserInfoKey: Any] = [:]
+    /// Any contextual information set by the user for encoding.
+    public var userInfo = [CodingUserInfoKey : Any]()
+    
+    /// Logging handler
+    public var log: ((String) -> ())?
 
     // MARK: - Initialization
 

Sources/JavaScriptKit/JSValueConstructible.swift

@@ -85,3 +85,10 @@ extension UInt64: JSValueConstructible {
         value.number.map(Self.init)
     }
 }
+
+extension Array: JSValueConstructible where Element: JSValueConstructible {
+    
+    public static func construct(from value: JSValue) -> Self? {
+        return value.array?.compactMap { Element.construct(from: $0) }
+    }
+}

Sources/JavaScriptKit/JSValueConvertible.swift

@@ -83,13 +83,7 @@ extension Dictionary: JSValueConvertible where Value == JSValueConvertible, Key
     }
 }
 
-extension Array where Element: JSValueConvertible {
-    public func jsValue() -> JSValue {
-        Swift.Array<JSValueConvertible>.jsValue(self)()
-    }
-}
-
-extension Array: JSValueConvertible where Element == JSValueConvertible {
+extension Array: JSValueConvertible where Element: JSValueConvertible {
     public func jsValue() -> JSValue {
         return .object(JSArray(self).jsObject)
     }
@@ -192,3 +186,15 @@ extension Array where Element: JSValueConvertible {
         Swift.Array<JSValueConvertible>.withRawJSValues(self)(body)
     }
 }
+
+extension JSValueConvertible where Self: Encodable {
+    
+    func jsValue() -> JSValue {
+        let encoder = JSEncoder()
+        do { return try encoder.encode(self) }
+        catch {
+            JSConsole.error(error)
+            return .undefined
+        }
+    }
+}