Working on JSBluetooth

Author: colemancda

Sources/JavaScriptKit/JS Types/JSBluetooth.swift

@@ -30,8 +30,6 @@ public final class JSBluetooth: JSType {
                               //services: [] = [],
                               acceptAllDevices: Bool = true) -> JSPromise<JSBluetoothDevice> {
 
-        JSObjectRef.global.console.object?.log.function?("\(#file) \(String(reflecting: type(of: self))) \(#function) \(#line)")
-        
         enum Option: String {
             case filters
             case optionalServices
@@ -47,14 +45,12 @@ public final class JSBluetooth: JSType {
         // FIXME: Improve, support all options
         let options = JSObject()
         options[Option.acceptAllDevices.rawValue] = JSBoolean(acceptAllDevices).jsValue()
-        options[Option.optionalServices.rawValue] = ["device_information"].jsValue()
 
-        let result = function(options.jsValue())
-        JSObjectRef.global.console.object?.log.function?("\(#file) \(String(reflecting: type(of: self))) \(#function) \(#line)")
+        let result = function.apply(this: jsObject, arguments: options)
 
         guard let promise = result.object.flatMap({ JSPromise<JSBluetoothDevice>($0) })
             else { fatalError("Invalid object \(result)") }
-        JSObjectRef.global.console.object?.log.function?("\(#file) \(String(reflecting: type(of: self))) \(#function) \(#line)")
+        
         return promise
     }
 }

Sources/JavaScriptKit/JS Types/JSPromise.swift

@@ -91,11 +91,14 @@ public final class JSPromise<Success: JSType>: JSType {
      */
     public func then/*<T: JSType>*/(onFulfilled: @escaping (Success) -> () /* onRejected: ((Error) -> ())? */) /* -> JSPromise<T> */ {
 
+        guard let function = jsObject.then.function
+            else { fatalError("Invalid function \(jsObject.requestDevice)") }
+        
         let success = JSFunctionRef.from { (arguments) in
             if let value = arguments.first.flatMap({ Success.construct(from: $0) }) {
                 onFulfilled(value)
             }
-            return .null
+            return .undefined
         }
         /*
         let errorFunction = onRejected.flatMap { (onRejected) in
@@ -104,7 +107,7 @@ public final class JSPromise<Success: JSType>: JSType {
                 return .undefined
             }
         }*/
-        let result = jsObject.then.function?(success, JSValue.null) //, errorFunction)
+        let result = function.apply(this: jsObject, argumentList: [success.jsValue()])
     }
 
     public func `catch`(_ completion: (Error) -> ()) {