fix(ihev2): move error to axios, chunk instead of for

Refs: #1667
Signed-off-by: Jonah Kaye <[email protected]>

packages/core/src/external/carequality/ihe-gateway-v2/ihe-gateway-v2-async.ts

@@ -116,8 +116,7 @@ export class IHEGatewayV2Async extends IHEGatewayV2 {
  MAX_DOCUMENT_RETRIEVAL_REQUESTS_PER_INVOCATION
  );
 
- for (let i = 0; i < requestChunks.length; i++) {
- const chunk = requestChunks[i];
+ for (const [i, chunk] of requestChunks.entries()) {
  const params = { patientId, cxId, requestId, drRequestsGatewayV2: chunk };
 
  if (i > 0) {

packages/core/src/external/carequality/ihe-gateway-v2/saml/saml-client.ts

@@ -2,22 +2,26 @@ import https from "https";
 import { constants } from "crypto";
 import axios from "axios";
 import * as AWS from "aws-sdk";
+import dayjs from "dayjs";
+import duration from "dayjs/plugin/duration";
 import { SamlCertsAndKeys } from "./security/types";
 import { Config } from "../../../../util/config";
 import { out } from "../../../../util/log";
 import { MetriportError } from "../../../../util/error/metriport-error";
 import { createMtomContentTypeAndPayload } from "../outbound/xca/mtom/builder";
 import { executeWithNetworkRetries } from "@metriport/shared";
-
 import {
  parseMtomResponse,
  getBoundaryFromMtomResponse,
  MtomAttachments,
  convertSoapResponseToMtomResponse,
 } from "../outbound/xca/mtom/parser";
 
+dayjs.extend(duration);
+
 const { log } = out("Saml Client");
-const timeout = 120000;
+const httpTimeout = dayjs.duration({ seconds: 120 }).asMilliseconds();
+const initialDelay = dayjs.duration({ seconds: 3 }).asMilliseconds();
 const maxPayloadSize = Infinity;
 let rejectUnauthorized = true;
 let trustedStore: string | undefined = undefined;
@@ -85,7 +89,7 @@ export async function sendSignedXml({
  const response = await executeWithNetworkRetries(
  async () => {
  return axios.post(url, signedXml, {
- timeout: timeout,
+ timeout: httpTimeout,
  headers: {
  "Content-Type": "application/soap+xml;charset=UTF-8",
  Accept: "application/soap+xml",
@@ -95,7 +99,7 @@ export async function sendSignedXml({
  });
  },
  {
- initialDelay: 3000,
+ initialDelay: initialDelay,
  maxAttempts: 3,
  //TODO: This introduces retry on timeout without needing to specify the http Code: https://github.com/metriport/metriport/pull/2285. Remove once PR is merged
  httpCodesToRetry: ["ECONNREFUSED", "ECONNRESET", "ETIMEDOUT"],
@@ -130,7 +134,7 @@ export async function sendSignedXmlMtom({
  const response = await executeWithNetworkRetries(
  async () => {
  return axios.post(url, payload, {
- timeout: timeout,
+ timeout: httpTimeout,
  headers: {
  "Accept-Encoding": "gzip, deflate",
  "Content-Type": contentType,
@@ -143,7 +147,7 @@ export async function sendSignedXmlMtom({
  });
  },
  {
- initialDelay: 3000,
+ initialDelay: initialDelay,
  maxAttempts: 4,
  //TODO: This introduces retry on timeout without needing to specify the http Code: https://github.com/metriport/metriport/pull/2285. Remove once PR is merged
  httpCodesToRetry: [

packages/shared/src/net/error.ts

@@ -3,8 +3,9 @@ import { AxiosError } from "axios";
 // https://nodejs.org/docs/latest-v18.x/api/errors.html#common-system-errors
 export type NodeNetworkError = "ECONNREFUSED" | "ECONNRESET";
 
-export type NodeResponseError = "ERR_BAD_RESPONSE";
+export type AxiosNetworkError =
+ | typeof AxiosError.ETIMEDOUT
+ | typeof AxiosError.ECONNABORTED
+ | typeof AxiosError.ERR_BAD_RESPONSE;
 
-export type AxiosNetworkError = typeof AxiosError.ETIMEDOUT | typeof AxiosError.ECONNABORTED;
-
-export type NetworkError = NodeNetworkError | AxiosNetworkError | NodeResponseError;
+export type NetworkError = NodeNetworkError | AxiosNetworkError;