bluetooth: show better error messages for services, characteristics and descriptors

third_party/WebKit/Source/modules/bluetooth/BluetoothError.cpp

 // Copyright 2014 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.
 
 #include "modules/bluetooth/BluetoothError.h"
 
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 
 namespace blink {
 
-DOMException* BluetoothError::take(ScriptPromiseResolver*,
-                                   mojom::blink::WebBluetoothResult error) {
+// static
+DOMException* BluetoothError::CreateDOMException(
+    mojom::blink::WebBluetoothResult error,
+    String detailedMessage) {
   switch (error) {
     case mojom::blink::WebBluetoothResult::SUCCESS:
       ASSERT_NOT_REACHED();
       return DOMException::create(UnknownError);
-#define MAP_ERROR(enumeration, name, message)         \
-  case mojom::blink::WebBluetoothResult::enumeration: \
-    return DOMException::create(name, message)
+#define MAP_ERROR(enumeration, name, message)             \
+  case mojom::blink::WebBluetoothResult::enumeration:     \
+    if (detailedMessage.isEmpty()) {                      \
+      return DOMException::create(name, message);         \
+    } else {                                              \
+      return DOMException::create(name, detailedMessage); \

[dcheng, 2017/02/09 19:16:41]

FWIW, I'm not an owner of this code, but I'd prefer that we just have a separate
exception helper for exceptions with a detailed exception.

With this, I really can't tell when I'm supposed to provide a detailed message
or not, since it's completely runtime controlled. It's also a bunch of code for
code paths that will literally never be taken.

[perja, 2017/02/10 13:28:16]

Done.

+    }
 
       // InvalidModificationErrors:
       MAP_ERROR(GATT_INVALID_ATTRIBUTE_LENGTH, InvalidModificationError,
                 "GATT Error: invalid attribute length.");
 
       // InvalidStateErrors:
       MAP_ERROR(SERVICE_NO_LONGER_EXISTS, InvalidStateError,
                 "GATT Service no longer exists.");
       MAP_ERROR(CHARACTERISTIC_NO_LONGER_EXISTS, InvalidStateError,
                 "GATT Characteristic no longer exists.");
       MAP_ERROR(DESCRIPTOR_NO_LONGER_EXISTS, InvalidStateError,
                 "GATT Descriptor no longer exists.");
+      MAP_ERROR(INVALID_CHARACTERISTIC, InvalidStateError,
+                "Characteristic is no longer valid. Remember to retrieve the "
+                "characteristic again after reconnecting.");
+      MAP_ERROR(INVALID_DESCRIPTOR, InvalidStateError,
+                "Descriptor is no longer valid. Remember to retrieve the "
+                "Descriptor again after reconnecting.");
 
       // NetworkErrors:
       MAP_ERROR(CONNECT_ALREADY_IN_PROGRESS, NetworkError,
                 "Connection already in progress.");
       MAP_ERROR(CONNECT_ATTRIBUTE_LENGTH_INVALID, NetworkError,
                 "Write operation exceeds the maximum length of the attribute.");
       MAP_ERROR(CONNECT_AUTH_CANCELED, NetworkError,
                 "Authentication canceled.");
       MAP_ERROR(CONNECT_AUTH_FAILED, NetworkError, "Authentication failed.");
       MAP_ERROR(CONNECT_AUTH_REJECTED, NetworkError,
@@ skipping 18 matching lines @@
                 "Unsupported device.");
       MAP_ERROR(CONNECT_WRITE_NOT_PERMITTED, NetworkError,
                 "GATT write operation is not permitted.");
       MAP_ERROR(DEVICE_NO_LONGER_IN_RANGE, NetworkError,
                 "Bluetooth Device is no longer in range.");
       MAP_ERROR(GATT_NOT_PAIRED, NetworkError, "GATT Error: Not paired.");
       MAP_ERROR(GATT_OPERATION_IN_PROGRESS, NetworkError,
                 "GATT operation already in progress.");
       MAP_ERROR(UNTRANSLATED_CONNECT_ERROR_CODE, NetworkError,
                 "Unknown ConnectErrorCode.");
+      MAP_ERROR(GATT_SERVER_NOT_CONNECTED, NetworkError,
+                "GATT Server is disconnected. Cannot perform GATT operations.");
+      MAP_ERROR(GATT_SERVER_DISCONNECTED, NetworkError,
+                "GATT Server disconnected while performing a GATT operation.");
 
       // NotFoundErrors:
       MAP_ERROR(WEB_BLUETOOTH_NOT_SUPPORTED, NotFoundError,
                 "Web Bluetooth is not supported on this platform. For a list "
                 "of supported platforms see: https://goo.gl/J6ASzs");
       MAP_ERROR(NO_BLUETOOTH_ADAPTER, NotFoundError,
                 "Bluetooth adapter not available.");
       MAP_ERROR(CHOSEN_DEVICE_VANISHED, NotFoundError,
                 "User selected a device that doesn't exist anymore.");
       MAP_ERROR(CHOOSER_CANCELLED, NotFoundError,
@@ skipping 63 matching lines @@
                 "No window to show the requestDevice() dialog.");
 
 #undef MAP_ERROR
   }
 
   ASSERT_NOT_REACHED();
   return DOMException::create(UnknownError);
 }
 
 }  // namespace blink