apply reviewer suggestions

stephenarosaj · stephenarosaj · commit 7d32f25e2fec · 2026-04-07T15:18:37.000-07:00
diff --git a/packages/data-connect/src/core/query/QueryManager.ts b/packages/data-connect/src/core/query/QueryManager.ts
@@ -37,7 +37,12 @@ import {
   DataConnectResponse
 } from '../../network';
 import { decoderImpl, encoderImpl } from '../../util/encoder';
-import { Code, DataConnectError } from '../error';
+import {
+  Code,
+  DataConnectError,
+  DataConnectOperationError,
+  DataConnectOperationFailureResponse
+} from '../error';
 
 import {
   OnCompleteSubscription,
@@ -450,24 +455,30 @@ export class QueryManager {
     queryRef: QueryRef<Data, Variables>
   ): Promise<void> {
     if (response.errors && response.errors.length > 0) {
-      const error = new DataConnectError(
-        Code.OTHER,
+      const stringified = JSON.stringify(
+        response.errors.map(e => {
+          if (e && typeof e === 'object') {
+            return {
+              message: (e as unknown as { message: string }).message,
+              code: (e as unknown as { code?: unknown }).code
+            };
+          }
+          return e;
+        })
+      );
+      const failureResponse: DataConnectOperationFailureResponse = {
+        errors: response.errors as [],
+        data: response.data as Record<string, unknown>
+      };
+      const error = new DataConnectOperationError(
         'DataConnect error received from subscribe notification: ' +
-          JSON.stringify(
-            response.errors.map(e => {
-              if (e && typeof e === 'object') {
-                return {
-                  message: (e as unknown as { message: string }).message,
-                  code: (e as unknown as { code?: unknown }).code
-                };
-              }
-              return e;
-            })
-          )
+          stringified,
+        failureResponse
       );
       this.publishErrorToSubscribers(key, error);
       return;
     }
+
     const fetchTime = Date.now().toString();
     const queryResult: QueryResult<Data, Variables> = {
       ref: queryRef,
diff --git a/packages/data-connect/src/network/stream/websocket.ts b/packages/data-connect/src/network/stream/websocket.ts
@@ -232,7 +232,7 @@ export class WebSocketTransport extends AbstractDataConnectStreamTransport {
    */
   private handleError(error?: unknown): void {
     logError(`DataConnect WebSocket error, closing stream: ${error}`);
-    let reason = String(error);
+    let reason = error ? String(error) : 'Unknown Error';
     if (error instanceof DataConnectError) {
       reason = error.message;
     }
@@ -299,7 +299,9 @@ export class WebSocketTransport extends AbstractDataConnectStreamTransport {
     } catch (err) {
       throw new DataConnectError(
         Code.OTHER,
-        'Could not parse WebSocket message'
+        `Could not parse WebSocket message: ${
+          err instanceof Error ? err.message : String(err)
+        }`
       );
     }
     if (typeof webSocketMessage !== 'object' || webSocketMessage === null) {
