[ DAP ] Handle incorrect RPCError returned by DWDS when an isolate is destroyed mid RPC.

Related issue: flutter/flutter#156793

Change-Id: I5da61e9fe5d0aebfe851777a14196af165b8b1a6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/431060
Auto-Submit: Ben Konyi <[email protected]>
Commit-Queue: Ben Konyi <[email protected]>
Reviewed-by: Derek Xu <[email protected]>

Author: bkonyi

pkg/dds/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 5.0.2
+- [DAP] Handle possible race condition when interacting with web applications
+  that can cause an `RPCError` to be thrown if the application's isolate is
+  disposed mid-RPC.
+
 # 5.0.1
 - Widen the dependency on `package:shelf_web_socket`.
 - Require Dart SDK v. 3.5.0 or higher.

pkg/dds/lib/src/dap/isolate_manager.dart

@@ -378,6 +378,13 @@ class IsolateManager {
       if (e.code == RpcErrorCodes.kIsolateMustBePaused) {
         // It's possible something else resumed the thread (such as if another
         // debugger is attached), we can just continue.
+      } else if (e.code == RpcErrorCodes.kInternalError &&
+          e.message.contains('No running isolate (inspector is not set).')) {
+        // TODO(bkonyi): remove once https://github.com/flutter/flutter/issues/156793
+        // is resolved.
+        // It's possible during these async requests that the isolate went away
+        // (for example a shutdown/restart) and we no longer care about
+        // resuming it.
       } else {
         rethrow;
       }
@@ -429,6 +436,13 @@ class IsolateManager {
         // Fallback to a regular resume if the DDS service extension isn't
         // available:
         return _resume(threadId);
+      } else if (e.code == RpcErrorCodes.kInternalError &&
+          e.message.contains('No running isolate (inspector is not set).')) {
+        // TODO(bkonyi): remove once https://github.com/flutter/flutter/issues/156793
+        // is resolved.
+        // It's possible during these async requests that the isolate went away
+        // (for example a shutdown/restart) and we no longer care about
+        // resuming it.
       } else {
         rethrow;
       }
@@ -458,6 +472,17 @@ class IsolateManager {
       // It's possible during these async requests that the isolate went away
       // (for example a shutdown/restart) and we no longer care about
       // pausing it.
+    } on vm.RPCError catch (e) {
+      if (e.code == RpcErrorCodes.kInternalError &&
+          e.message.contains('No running isolate (inspector is not set).')) {
+        // TODO(bkonyi): remove once https://github.com/flutter/flutter/issues/156793
+        // is resolved.
+        // It's possible during these async requests that the isolate went away
+        // (for example a shutdown/restart) and we no longer care about
+        // resuming it.
+      } else {
+        rethrow;
+      }
     }
   }
 
@@ -566,6 +591,17 @@ class IsolateManager {
       // It's possible during these async requests that the isolate went away
       // (for example a shutdown/restart) and we no longer care about
       // configuring it. State will be cleaned up by the IsolateExit event.
+    } on vm.RPCError catch (e) {
+      if (e.code == RpcErrorCodes.kInternalError &&
+          e.message.contains('No running isolate (inspector is not set).')) {
+        // TODO(bkonyi): remove once https://github.com/flutter/flutter/issues/156793
+        // is resolved.
+        // It's possible during these async requests that the isolate went away
+        // (for example a shutdown/restart) and we no longer care about
+        // resuming it.
+      } else {
+        rethrow;
+      }
     }
   }
 
@@ -928,6 +964,17 @@ class IsolateManager {
       // If the isolate disappeared before we sent this request, just return
       // null responses.
       return uris.map((e) => null).toList();
+    } on vm.RPCError catch (e) {
+      if (e.code == RpcErrorCodes.kInternalError &&
+          e.message.contains('No running isolate (inspector is not set).')) {
+        // TODO(bkonyi): remove once https://github.com/flutter/flutter/issues/156793
+        // is resolved.
+        // If the isolate disappeared before we sent this request, just return
+        // null responses.
+        return uris.map((e) => null).toList();
+      } else {
+        rethrow;
+      }
     }
   }
 

pkg/dds/lib/src/rpc_error_codes.dart

@@ -20,7 +20,7 @@ abstract class RpcErrorCodes {
   static const kMethodNotFound = -32601;
 
   static const kInvalidParams = -32602;
-  // static const kInternalError = -32603;
+  static const kInternalError = -32603;
 
   // static const kExtensionError = -32000;
 

pkg/dds/pubspec.yaml

@@ -1,10 +1,9 @@
 name: dds
-version: 5.0.1
+version: 5.0.2
 description: >-
   A library used to spawn the Dart Developer Service, used to communicate with
   a Dart VM Service instance.
 repository: https://github.com/dart-lang/sdk/tree/main/pkg/dds
-
 environment:
   sdk: ^3.5.0