Use new error codes from package:vm_service (#2141)

Author: elliette

dwds/lib/src/debugging/debugger.dart

@@ -158,7 +158,7 @@ class Debugger extends Domain {
     if (stackComputer == null) {
       throw RPCError(
         'getStack',
-        RPCError.kInternalError,
+        RPCErrorKind.kInternalError.code,
         'Cannot compute stack when application is not paused',
       );
     }
@@ -323,7 +323,7 @@ class Debugger extends Domain {
     if (jsId == null) {
       throw RPCError(
         'removeBreakpoint',
-        RPCError.kInternalError,
+        RPCErrorKind.kInternalError.code,
         'invalid JS breakpoint id $jsId',
       );
     }
@@ -715,7 +715,7 @@ Future<T> sendCommandAndValidateResult<T>(
   if (result == null) {
     throw RPCError(
       method,
-      RPCError.kInternalError,
+      RPCErrorKind.kInternalError.code,
       '$resultField not found in result from sendCommand',
       params,
     );

dwds/lib/src/debugging/inspector.dart

@@ -448,7 +448,7 @@ class AppInspector implements AppInspectorInterface {
     if (result == null) {
       throw RPCError(
         'getMemoryUsage',
-        RPCError.kInternalError,
+        RPCErrorKind.kInternalError.code,
         'Null result from chrome Devtools.',
       );
     }
@@ -461,7 +461,7 @@ class AppInspector implements AppInspectorInterface {
     if (usage == null) {
       throw RPCError(
         'getMemoryUsage',
-        RPCError.kInternalError,
+        RPCErrorKind.kInternalError.code,
         'Failed to parse memory usage result.',
       );
     }

dwds/lib/src/dwds_vm_client.dart

@@ -142,7 +142,7 @@ class DwdsVmClient {
       if (ddsUri == null) {
         return RPCError(
           request['method'] as String,
-          RPCError.kInvalidParams,
+          RPCErrorKind.kInvalidParams.code,
           "'Missing parameter: 'uri'",
         ).toMap();
       }
@@ -229,7 +229,7 @@ Future<Map<String, dynamic>> _hotRestart(
     // triggered in the middle of a full reload.
     return {
       'error': {
-        'code': RPCError.kInternalError,
+        'code': RPCErrorKind.kInternalError.code,
         'message': e.message,
       }
     };
@@ -249,7 +249,7 @@ Future<Map<String, dynamic>> _hotRestart(
     final message = exception.error?['message'];
     // This corresponds to `Execution context was destroyed` which can
     // occur during a hot restart that must fall back to a full reload.
-    if (code != RPCError.kServerError) {
+    if (code != RPCErrorKind.kServerError.code) {
       return {
         'error': {
           'code': code,
@@ -262,7 +262,7 @@ Future<Map<String, dynamic>> _hotRestart(
     // Exceptions thrown by the injected client during hot restart.
     return {
       'error': {
-        'code': RPCError.kInternalError,
+        'code': RPCErrorKind.kInternalError.code,
         'message': '$exception',
       }
     };

dwds/lib/src/services/chrome_proxy_service.dart

@@ -563,7 +563,7 @@ ${globalLoadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
         }
         throw RPCError(
           'evaluateInFrame',
-          RPCError.kInvalidRequest,
+          RPCErrorKind.kInvalidRequest.code,
           'Expression evaluation is not supported for this configuration.',
         );
       },
@@ -602,7 +602,7 @@ ${globalLoadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
         }
         throw RPCError(
           'evaluateInFrame',
-          RPCError.kInvalidRequest,
+          RPCErrorKind.kInvalidRequest.code,
           'Expression evaluation is not supported for this configuration.',
         );
       },
@@ -811,7 +811,7 @@ ${globalLoadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
         default:
           throw RPCError(
             'streamListen',
-            RPCError.kInvalidParams,
+            RPCErrorKind.kInvalidParams.code,
             'The stream `$streamId` is not supported on web devices',
           );
       }
@@ -861,7 +861,7 @@ ${globalLoadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
     return Future.error(
       RPCError(
         'reloadSources',
-        RPCError.kMethodNotFound,
+        RPCErrorKind.kMethodNotFound.code,
         'Hot reload not supported on web devices',
       ),
     );
@@ -905,10 +905,11 @@ ${globalLoadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
       final errorMessage = e.message;
       if (errorMessage != null &&
           errorMessage.contains('Can only perform operation while paused')) {
-        // TODO(https://github.com/dart-lang/sdk/issues/52636): Use error code
-        // from package:vm_service.
-        const kIsolateMustBePausedCode = 106;
-        throw RPCError('resume', kIsolateMustBePausedCode, errorMessage);
+        throw RPCError(
+          'resume',
+          RPCErrorKind.kIsolateMustBePaused.code,
+          errorMessage,
+        );
       }
       rethrow;
     }
@@ -1267,7 +1268,7 @@ ${globalLoadStrategy.loadModuleSnippet}("dart_sdk").developer.invokeExtension(
   static RPCError _rpcNotSupported(String method) {
     return RPCError(
       method,
-      RPCError.kMethodNotFound,
+      RPCErrorKind.kMethodNotFound.code,
       '$method: Not supported on web devices',
     );
   }

dwds/lib/src/utilities/domain.dart

@@ -136,5 +136,5 @@ abstract class Domain {
 }
 
 Never throwInvalidParam(String method, String message) {
-  throw RPCError(method, RPCError.kInvalidParams, message);
+  throw RPCError(method, RPCErrorKind.kInvalidParams.code, message);
 }

dwds/pubspec.yaml

@@ -33,7 +33,7 @@ dependencies:
   stack_trace: ^1.10.0
   sse: ^4.1.2
   uuid: ^3.0.6
-  vm_service: ">=10.1.2 <12.0.0"
+  vm_service: ^11.7.1
   web_socket_channel: ^2.2.0
   webkit_inspection_protocol: ^1.0.1
 

dwds/test/chrome_proxy_service_test.dart

@@ -2382,7 +2382,8 @@ void main() {
           () => service.streamListen('aCustomStreamId'),
           throwsA(
             predicate(
-              (e) => (e is RPCError) && e.code == RPCError.kInvalidParams,
+              (e) =>
+                  (e is RPCError) && e.code == RPCErrorKind.kInvalidParams.code,
             ),
           ),
         );