bluetooth: Add DeviceChanged logging in Device service.

chrome/browser/resources/bluetooth_internals/bluetooth_internals.js

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * Javascript for bluetooth_internals.html, served from
  *     chrome://bluetooth-internals/.
  */
 
-/**
- * The implementation of AdapterClient in
- *     device/bluetooth/public/interfaces/adapter.mojom.
- */
-var AdapterClient = function() {};
-AdapterClient.prototype = {
-  /**
-   * Prints added device to console.
-   * @param {!bluetoothDevice.DeviceInfo} device
-   */
-  deviceAdded: function(device) { console.log('Device added', device); },
-
-  /**
-   * Prints removed device to console.
-   * @param {!bluetoothDevice.DeviceInfo} device
-   */
-  deviceRemoved: function(device) { console.log('Device removed', device); }
-};
-
 (function() {
   var adapter, adapterClient, bluetoothAdapter, bluetoothDevice, connection;
 
+  // Dictionary for address->Device cache.
+  var devices = {};
+
+  // Data model for a cached device.
+  function Device() {};
+  Device.prototype = { info: null };
+
+  /**
+   * The implementation of AdapterClient in
+   *     device/bluetooth/public/interfaces/adapter.mojom.
+   */
+  var AdapterClient = function() {};
+  AdapterClient.prototype = {
+    /**
+     * Logs added device to console and caches the device info.
+     * @param {!bluetoothDevice.DeviceInfo} device
+     */
+    deviceAdded: function(device) {

[scheib, 2016/10/19 23:49:24]

function(deviceInfo) - so that we don't confuse this return as a Device.

[mbrunson, 2016/10/20 00:33:51]

Done.

+      console.log('Device added', device);
+      devices[device.address] = new Device();
+      devices[device.address].info = device;
+    },
+
+    /**
+     * Logs removed device to console and removes the cached device.
+     * @param {!bluetoothDevice.DeviceInfo} device
+     */
+    deviceRemoved: function(device) {
+      console.log('Device removed', device);
+      delete devices[device.address];
+    },
+
+    /**
+     * Logs received advertising packet to console. caches the last valid

[ortuno, 2016/10/19 23:19:19]

nit: s/caches/Caches/

[mbrunson, 2016/10/20 00:33:51]

This whole comment needs to be fixed. Done.

+     *     RSSI, and refreshes the device list.
+     * @param {!bluetoothDevice.AdvertisingPacket} advertisingPacket the
+     *     advertising packet received from the device.
+     */
+    deviceChanged: function(deviceInfo) {
+      console.log(new Date(), deviceInfo);
+
+      if (deviceInfo.rssi) {

[scheib, 2016/10/19 23:49:24]

Shouldn't this cache all the deviceInfo, always?

[mbrunson, 2016/10/20 00:33:51]

I think it's fine if the data model has the updated RSSI, but I want the UI to
display the last valid RSSI for debugging purposes.

The last DeviceInfo received from deviceChanged when the chooser dialog closes
always lacks the RSSI value which overwrites whatever was there with null. I
need to update the logic for the UI so this doesn't happen but that will be in a
different set of patches.

+        devices[deviceInfo.address].info.rssi = deviceInfo.rssi;
+      }
+    }
+  };
+
   /**
    * TODO(crbug.com/652361): Move to shared location.
    * Helper to convert callback-based define() API to a promise-based API.
    * @param {!Array<string>} moduleNames
    * @return {!Promise}
    */
   function importModules(moduleNames) {
     return new Promise(function(resolve, reject) {
       define(moduleNames, function(var_args) {
         resolve(Array.prototype.slice.call(arguments, 0));
@@ skipping 13 matching lines @@
       'device/bluetooth/public/interfaces/device.mojom',
       'mojo/public/js/connection',
     ]).then(function([frameInterfaces, ...modules]) {
       console.log('Loaded modules');
 
       // Destructure here to assign global variables.
       [bluetoothAdapter, bluetoothDevice, connection] = modules;
 
       // Hook up the instance properties.
       AdapterClient.prototype.__proto__ =
-          bluetoothAdapter.AdapterClient.stubClass.prototype;
+        bluetoothAdapter.AdapterClient.stubClass.prototype;
 
       var adapterFactory = connection.bindHandleToProxy(
-          frameInterfaces.getInterface(bluetoothAdapter.AdapterFactory.name),
-          bluetoothAdapter.AdapterFactory);
+        frameInterfaces.getInterface(bluetoothAdapter.AdapterFactory.name),
+        bluetoothAdapter.AdapterFactory);
 
       // Get an Adapter service.
       return adapterFactory.getAdapter();
     }).then(function(response) {
       if (!response.adapter) {
         throw new Error('Bluetooth Not Supported on this platform.');
       }
 
       adapter = connection.bindHandleToProxy(response.adapter,
-                                             bluetoothAdapter.Adapter);
+        bluetoothAdapter.Adapter);
 
       // Create a message pipe and bind one end to client
       // implementation and the other to the Adapter service.
       adapterClient = new AdapterClient();
       adapter.setClient(connection.bindStubDerivedImpl(adapterClient));
     });
   }
 
-  /**
-   * Prints device info from the device service.
-   * @param {!bluetoothDevice.DeviceInfo} deviceInfo the device for which to
-   *     get the information.
-   * @return {!Promise} resolves if device service is retrieved, rejects
-   *     otherwise.
-   */
-  function logDevice(deviceInfo) {
-    return adapter.getDevice(deviceInfo.address).then(function(response) {
-        var deviceHandle = response.device;
-        if (!deviceHandle) {
-          throw new Error(deviceInfo.name_for_display + ' cannot be found.');
-        }
-
-        var device = connection.bindHandleToProxy(
-              deviceHandle, bluetoothDevice.Device);
-        return device.getInfo();
-      }).then(function(response) {
-        console.log(deviceInfo.name_for_display, response.info);
-      });
-  }
-
   document.addEventListener('DOMContentLoaded', function() {
     initializeProxies()
       .then(function() { return adapter.getInfo(); })
       .then(function(response) { console.log('adapter', response.info); })
       .then(function() { return adapter.getDevices(); })
       .then(function(response) {
-        var devices = response.devices;
-        console.log('devices', devices.length);
+        console.log('devices', response.devices.length);
 
-        return Promise.all(devices.map(logDevice));
+        response.devices.forEach(function(deviceInfo) {
+          devices[deviceInfo.address] = new Device();
+          devices[deviceInfo.address].info = deviceInfo;
+          console.log(deviceInfo.name_for_display, deviceInfo);
+        });
       })
       .catch(function(error) { console.error(error); });
   });
 })();