Improve EA calling logic (#4140)

Author: mxiao-cll

.changeset/breezy-points-care.md

@@ -0,0 +1,6 @@
+---
+'@chainlink/llama-guard-adapter': patch
+'@chainlink/data-engine-adapter': patch
+---
+
+Bug fix

packages/composites/llama-guard/src/transport/ea.ts

@@ -21,7 +21,9 @@ export const getRawNav = async (source: string, sourceInput: string, requester:
     if (!data || !(data as any).result) {
       throw new AdapterError({
         statusCode: (data as any)?.statusCode || 500,
-        message: `EA request failed: ${JSON.stringify(response?.response)}`,
+        message: `EA request failed: ${JSON.stringify(response?.response?.data)} ${
+          response?.response?.status
+        } ${response?.response?.statusText}`,
       })
     }
 

packages/composites/llama-guard/test/unit/ea.test.ts

@@ -77,25 +77,33 @@ describe('ea.ts', () => {
 
       requester.request.mockResolvedValueOnce({})
       await expect(() => getRawNav('ea', '{}', requester)).rejects.toThrow(
-        'EA request failed: undefined',
+        'EA request failed: undefined undefined undefined AdapterError',
       )
 
       requester.request.mockResolvedValueOnce({ response: {} })
-      await expect(() => getRawNav('ea', '{}', requester)).rejects.toThrow('EA request failed: {}')
+      await expect(() => getRawNav('ea', '{}', requester)).rejects.toThrow(
+        'EA request failed: undefined undefined undefined AdapterError',
+      )
 
-      requester.request.mockResolvedValueOnce({ response: { data: {} } })
+      requester.request.mockResolvedValueOnce({
+        response: { data: {}, status: 404, statusText: 'fail' },
+      })
       await expect(() => getRawNav('ea', '{}', requester)).rejects.toThrow(
-        'EA request failed: {"data":{}}',
+        'EA request failed: {} 404 fail AdapterError',
       )
 
-      requester.request.mockResolvedValueOnce({ response: { data: { result: null } } })
+      requester.request.mockResolvedValueOnce({
+        response: { data: { result: null }, status: 200, statusText: 'ok' },
+      })
       await expect(() => getRawNav('ea', '{}', requester)).rejects.toThrow(
-        'EA request failed: {"data":{"result":null}}',
+        'EA request failed: {"result":null} 200 ok AdapterError',
       )
 
-      requester.request.mockResolvedValueOnce({ response: { data: { result: 0 } } })
+      requester.request.mockResolvedValueOnce({
+        response: { data: { result: 0 }, status: 200, statusText: 'ok' },
+      })
       await expect(() => getRawNav('ea', '{}', requester)).rejects.toThrow(
-        'EA request failed: {"data":{"result":0}}',
+        'EA request failed: {"result":0} 200 ok AdapterError',
       )
     })
 

packages/sources/data-engine/src/lib.ts

@@ -6,10 +6,10 @@ import { BaseEndpointTypes as CryptoV3Types } from './endpoint/cryptoV3'
 import { BaseEndpointTypes as RwaV8Types } from './endpoint/rwaV8'
 
 export const getCryptoPrice = async (feedId: string, url: string, requester: Requester) =>
-  (await callEA<CryptoV3Types['Response']>(feedId, 'crypto-v3', url, requester)).Data
+  callEA<CryptoV3Types['Response']['Data']>(feedId, 'crypto-v3', url, requester)
 
 export const getRwaPrice = async (feedId: string, url: string, requester: Requester) =>
-  (await callEA<RwaV8Types['Response']>(feedId, 'rwa-v8', url, requester)).Data
+  callEA<RwaV8Types['Response']['Data']>(feedId, 'rwa-v8', url, requester)
 
 const callEA = async <T>(feedId: string, endpoint: string, url: string, requester: Requester) => {
   const requestConfig = {
@@ -24,17 +24,18 @@ const callEA = async <T>(feedId: string, endpoint: string, url: string, requeste
   }
 
   try {
-    const response = await requester.request<T>(JSON.stringify(requestConfig), requestConfig)
+    const response = await requester.request(JSON.stringify(requestConfig), requestConfig)
 
     const data = response?.response?.data
-    if (!data || !(data as any).Data) {
+    if (!data || !(data as any).data) {
       throw new AdapterError({
         statusCode: (data as any)?.statusCode || 500,
-        message: `EA request failed: ${JSON.stringify(response?.response)}`,
+        message: `EA request failed: ${JSON.stringify(response?.response?.data)} ${
+          response?.response?.status
+        } ${response?.response?.statusText}`,
       })
     }
-
-    return data
+    return (data as any).data as T
   } catch (e) {
     if (e instanceof AdapterError) {
       e.message = `${e.message} ${JSON.stringify(e?.errorResponse) || e.name}`

packages/sources/data-engine/test/unit/lib.test.ts

@@ -5,7 +5,7 @@ describe('lib.ts', () => {
     const requester = { request: jest.fn() } as any
     const data = { bid: '1', ask: '2', price: '3', decimals: 4 }
 
-    requester.request.mockResolvedValueOnce({ response: { data: { result: null, Data: data } } })
+    requester.request.mockResolvedValueOnce({ response: { data: { result: null, data: data } } })
 
     await expect(getCryptoPrice('feed-1', 'ea-url', requester)).resolves.toEqual(data)
   })
@@ -14,7 +14,7 @@ describe('lib.ts', () => {
     const requester = { request: jest.fn() } as any
     const data = { midPrice: '1', marketStatus: 2, decimals: 3 }
 
-    requester.request.mockResolvedValueOnce({ response: { data: { result: null, Data: data } } })
+    requester.request.mockResolvedValueOnce({ response: { data: { result: null, data: data } } })
 
     await expect(getRwaPrice('feed-2', 'ea-url', requester)).resolves.toEqual(data)
   })
@@ -24,27 +24,33 @@ describe('lib.ts', () => {
 
     requester.request.mockResolvedValueOnce({})
     await expect(() => getCryptoPrice('feed-1', 'ea-url', requester)).rejects.toThrow(
-      'EA request failed: undefined',
+      'EA request failed: undefined undefined undefined AdapterError',
     )
 
     requester.request.mockResolvedValueOnce({ response: {} })
     await expect(() => getCryptoPrice('feed-1', 'ea-url', requester)).rejects.toThrow(
-      'EA request failed: {}',
+      'EA request failed: undefined undefined undefined AdapterError',
     )
 
-    requester.request.mockResolvedValueOnce({ response: { data: {} } })
+    requester.request.mockResolvedValueOnce({
+      response: { data: {}, status: 404, statusText: 'fail' },
+    })
     await expect(() => getCryptoPrice('feed-1', 'ea-url', requester)).rejects.toThrow(
-      'EA request failed: {"data":{}}',
+      'EA request failed: {} 404 fail AdapterError',
     )
 
-    requester.request.mockResolvedValueOnce({ response: { data: { result: null } } })
+    requester.request.mockResolvedValueOnce({
+      response: { data: { result: null }, status: 200, statusText: 'ok' },
+    })
     await expect(() => getCryptoPrice('feed-1', 'ea-url', requester)).rejects.toThrow(
-      'EA request failed: {"data":{"result":null}}',
+      'EA request failed: {"result":null} 200 ok AdapterError',
     )
 
-    requester.request.mockResolvedValueOnce({ response: { data: { result: { Data: null } } } })
+    requester.request.mockResolvedValueOnce({
+      response: { data: { result: { data: null } }, status: 200, statusText: 'ok' },
+    })
     await expect(() => getCryptoPrice('feed-1', 'ea-url', requester)).rejects.toThrow(
-      'EA request failed: {"data":{"result":{"Data":null}}}',
+      'EA request failed: {"result":{"data":null}} 200 ok AdapterError',
     )
   })
 })