Replace AdvertisingData with AdvertisingEvent

components/script/dom/bluetoothdevice.rs

@@ -2,17 +2,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use bluetooth_traits::{BluetoothCharacteristicMsg, BluetoothDescriptorMsg, BluetoothServiceMsg};
+use bluetooth_traits::{BluetoothCharacteristicMsg, BluetoothDescriptorMsg};
+use bluetooth_traits::{BluetoothRequest, BluetoothResponse, BluetoothServiceMsg};
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::BluetoothDeviceBinding;
 use dom::bindings::codegen::Bindings::BluetoothDeviceBinding::BluetoothDeviceMethods;
 use dom::bindings::codegen::Bindings::BluetoothRemoteGATTServerBinding::BluetoothRemoteGATTServerMethods;
 use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
+use dom::bindings::error::Error;
 use dom::bindings::js::{MutJS, MutNullableJS, Root};
 use dom::bindings::reflector::{DomObject, reflect_dom_object};
 use dom::bindings::str::DOMString;
-use dom::bluetooth::Bluetooth;
-use dom::bluetoothadvertisingdata::BluetoothAdvertisingData;
+use dom::bluetooth::{AsyncBluetoothListener, Bluetooth, response_async};
 use dom::bluetoothcharacteristicproperties::BluetoothCharacteristicProperties;
 use dom::bluetoothremotegattcharacteristic::BluetoothRemoteGATTCharacteristic;
 use dom::bluetoothremotegattdescriptor::BluetoothRemoteGATTDescriptor;
@@ -20,8 +21,12 @@ use dom::bluetoothremotegattserver::BluetoothRemoteGATTServer;
 use dom::bluetoothremotegattservice::BluetoothRemoteGATTService;
 use dom::eventtarget::EventTarget;
 use dom::globalscope::GlobalScope;
+use dom::promise::Promise;
+use ipc_channel::ipc::IpcSender;
+use js::jsapi::JSContext;
+use std::cell::Cell;
 use std::collections::HashMap;
-
+use std::rc::Rc;
 
 // https://webbluetoothcg.github.io/web-bluetooth/#bluetoothdevice
 #[dom_struct]
@@ -29,42 +34,39 @@ pub struct BluetoothDevice {
     eventtarget: EventTarget,
     id: DOMString,
     name: Option<DOMString>,
-    ad_data: MutJS<BluetoothAdvertisingData>,
     gatt: MutNullableJS<BluetoothRemoteGATTServer>,
     context: MutJS<Bluetooth>,
     attribute_instance_map: (DOMRefCell<HashMap<String, MutJS<BluetoothRemoteGATTService>>>,
                              DOMRefCell<HashMap<String, MutJS<BluetoothRemoteGATTCharacteristic>>>,
                              DOMRefCell<HashMap<String, MutJS<BluetoothRemoteGATTDescriptor>>>),
+    watching_advertisements: Cell<bool>,
 }
 
 impl BluetoothDevice {
     pub fn new_inherited(id: DOMString,
                          name: Option<DOMString>,
-                         ad_data: &BluetoothAdvertisingData,
                          context: &Bluetooth)
                          -> BluetoothDevice {
         BluetoothDevice {
             eventtarget: EventTarget::new_inherited(),
             id: id,
             name: name,
-            ad_data: MutJS::new(ad_data),
             gatt: Default::default(),
             context: MutJS::new(context),
             attribute_instance_map: (DOMRefCell::new(HashMap::new()),
                                      DOMRefCell::new(HashMap::new()),
                                      DOMRefCell::new(HashMap::new())),
+            watching_advertisements: Cell::new(false),
         }
     }
 
     pub fn new(global: &GlobalScope,
                id: DOMString,
                name: Option<DOMString>,
-               adData: &BluetoothAdvertisingData,
                context: &Bluetooth)
                -> Root<BluetoothDevice> {
         reflect_dom_object(box BluetoothDevice::new_inherited(id,
                                                               name,
-                                                              adData,
                                                               context),
                            global,
                            BluetoothDeviceBinding::Wrap)
@@ -133,6 +135,10 @@ impl BluetoothDevice {
         descriptor_map.insert(descriptor.instance_id.clone(), MutJS::new(&bt_descriptor));
         return bt_descriptor;
     }
+
+    fn get_bluetooth_thread(&self) -> IpcSender<BluetoothRequest> {
+        self.global().as_window().bluetooth_thread()
+    }
 }
 
 impl BluetoothDeviceMethods for BluetoothDevice {
@@ -146,11 +152,6 @@ impl BluetoothDeviceMethods for BluetoothDevice {
         self.name.clone()
     }
 
-    // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-addata
-    fn AdData(&self) -> Root<BluetoothAdvertisingData> {
-        self.ad_data.get()
-    }
-
     // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-gatt
     fn Gatt(&self) -> Root<BluetoothRemoteGATTServer> {
         // TODO: Step 1 - 2: Implement the Permission API.
@@ -159,6 +160,46 @@ impl BluetoothDeviceMethods for BluetoothDevice {
         })
     }
 
+    #[allow(unrooted_must_root)]
+    // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-watchadvertisements
+    fn WatchAdvertisements(&self) -> Rc<Promise> {
+        let p = Promise::new(&self.global());
+        let sender = response_async(&p, self);
+        // TODO: Step 1.
+        // Note: Steps 2 - 3 are implemented in components/bluetooth/lib.rs in watch_advertisements function
+        // and in handle_response function.
+        self.get_bluetooth_thread().send(
+            BluetoothRequest::WatchAdvertisements(String::from(self.Id()), sender)).unwrap();
+        return p;
+    }
+
+    // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-unwatchadvertisements
+    fn UnwatchAdvertisements(&self) -> () {
+        // Step 1.
+        self.watching_advertisements.set(false)
+        // TODO: Step 2.
+    }
+
+    // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-watchingadvertisements
+    fn WatchingAdvertisements(&self) -> bool {
+        self.watching_advertisements.get()
+    }
+
     // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdeviceeventhandlers-ongattserverdisconnected
     event_handler!(gattserverdisconnected, GetOngattserverdisconnected, SetOngattserverdisconnected);
 }
+
+impl AsyncBluetoothListener for BluetoothDevice {
+    fn handle_response(&self, response: BluetoothResponse, promise_cx: *mut JSContext, promise: &Rc<Promise>) {
+        match response {
+            // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-unwatchadvertisements
+            BluetoothResponse::WatchAdvertisements(_result) => {
+                // Step 3.1.
+                self.watching_advertisements.set(true);
+                // Step 3.2.
+                promise.resolve_native(promise_cx, &());
+            },
+            _ => promise.reject_error(promise_cx, Error::Type("Something went wrong...".to_owned())),
+        }
+    }
+}