lint: use typed-error idioms in fallback error handling

Rhys Sullivan committed 4 months ago

Commit 1a8357b1 parent afa2c9a2 files · +16 −15Browse files

Unified · Split

2 files

packages/plugins/mcp/src/sdk/connection.ts +10 −8
packages/plugins/mcp/src/sdk/plugin.test.ts +6 −7

packages/plugins/mcp/src/sdk/connection.ts+10−8

   // error), which used to misclassify an expired token as a generic
   // connection failure. Propagate it as-is instead.
   return connectStreamableHttp.pipe(
-    Effect.catch((error) => {
+    Effect.catch((failure) => {
-      if (Predicate.isTagged(error, "McpOAuthReauthorizationRequired")) return Effect.fail(error);
+      if (Predicate.isTagged(failure, "McpOAuthReauthorizationRequired")) {
-      if (error.httpStatus === 401 || error.httpStatus === 403) return Effect.fail(error);
+        return Effect.fail(failure);
+      }
+      if (failure.httpStatus === 401 || failure.httpStatus === 403) return Effect.fail(failure);
       // When the fallback ALSO fails, the streamable-http failure is the
       // interesting one: most modern servers don't serve legacy SSE at all
       // (GET → 405), so reporting only "Failed connecting via sse" points
       return connectSse.pipe(
         Effect.catch(
           (
-            sseError,
+            sseFailure,
           ): Effect.Effect<never, McpConnectionError | McpOAuthReauthorizationRequired> => {
-            if (Predicate.isTagged(sseError, "McpOAuthReauthorizationRequired")) {
+            if (Predicate.isTagged(sseFailure, "McpOAuthReauthorizationRequired")) {
-              return Effect.fail(sseError);
+              return Effect.fail(sseFailure);
             }
             return Effect.fail(
               new McpConnectionError({
                 transport: "streamable-http",
-                message: `${error.message}; SSE fallback also failed: ${sseError.message}`,
+                message: `${failure.message}; SSE fallback also failed: ${sseFailure.message}`,
-                ...(error.httpStatus === undefined ? {} : { httpStatus: error.httpStatus }),
+                ...(failure.httpStatus === undefined ? {} : { httpStatus: failure.httpStatus }),
               }),
             );
           },

packages/plugins/mcp/src/sdk/plugin.test.ts+6−7

           ),
         );
-        const error = yield* createMcpConnector({
+        const failure = yield* createMcpConnector({
           transport: "remote",
           endpoint: "https://internal.example/mcp",
           httpClientLayer,
         }).pipe(Effect.flip);
-        if (!Predicate.isTagged(error, "McpConnectionError")) {
+        expect(Predicate.isTagged(failure, "McpConnectionError")).toBe(true);
-          throw new TypeError(`expected McpConnectionError, got ${error._tag}`);
+        if (!Predicate.isTagged(failure, "McpConnectionError")) return;
-        }
+        expect(failure.message).toContain("streamable-http");
-        expect(error.message).toContain("streamable-http");
+        expect(failure.message).toContain("SSE fallback also failed");
-        expect(error.message).toContain("SSE fallback also failed");
+        expect(failure.httpStatus).toBe(500);
-        expect(error.httpStatus).toBe(500);
       }),
   );