@healthcloudai/hc-safe-cdx 0.4.0 → 0.4.1

package/README.md

@@ -145,9 +145,9 @@ safeCdx.listTestProfilesByAccount(includeRegisterTestDetails?)
 safeCdx.createUploadUrl(userTestResultId, gtin, imageType?)
 safeCdx.updateCvmlStatus(imageOfCaptureId, cvmlStatus)
 safeCdx.getCvmlResults(imageOfCaptureId)
-safeCdx.getPendingResults(excludeStatus?)
+safeCdx.listPendingResults(excludeStatus?)
 safeCdx.getLastResults(excludeStatus?)
-safeCdx.getTestHistory(excludeStatus?)
+safeCdx.listTestHistory(excludeStatus?)
 safeCdx.getResultDetails(userTestResultId)
 safeCdx.getResultPdf(userTestResultId)
 safeCdx.getImageCaptureUrl(userTestResultId)
@@ -761,14 +761,14 @@ const response = await safeCdx.getCvmlResults(imageOfCaptureId);
 
 ---
 
-### `getPendingResults(...)`
+### `listPendingResults(...)`
 
 Returns pending or incomplete test results for the authenticated patient.
 
 #### Signature
 
 ```ts
-safeCdx.getPendingResults(
+safeCdx.listPendingResults(
     excludeStatus?: string
 ): Promise<APIResponse<GetPendingResultsData>>
 ```
@@ -789,11 +789,11 @@ type GetPendingResultsData =
 #### Usage
 
 ```ts
-const pending = await safeCdx.getPendingResults();
+const pending = await safeCdx.listPendingResults();
 ```
 
 ```ts
-const pending = await safeCdx.getPendingResults(
+const pending = await safeCdx.listPendingResults(
     "Invalid,Canceled"
 );
 ```
@@ -1081,14 +1081,14 @@ const lastResult = await safeCdx.getLastResults("Invalid");
 
 ---
 
-### `getTestHistory(...)`
+### `listTestHistory(...)`
 
 Returns test result history for the authenticated patient.
 
 #### Signature
 
 ```ts
-safeCdx.getTestHistory(
+safeCdx.listTestHistory(
     excludeStatus?: string
 ): Promise<APIResponse<GetTestHistoryData>>
 ```
@@ -1109,11 +1109,11 @@ type GetTestHistoryData =
 #### Usage
 
 ```ts
-const history = await safeCdx.getTestHistory();
+const history = await safeCdx.listTestHistory();
 ```
 
 ```ts
-const history = await safeCdx.getTestHistory("Invalid");
+const history = await safeCdx.listTestHistory("Invalid");
 ```
 
 #### API request sent internally
@@ -1666,9 +1666,9 @@ Safe CDX calls a **different backend service** from all other connectors. The ho
 | `uploadImage(preSignedURL, image, contentType?)` | `Promise<void>` — direct S3 upload, no envelope |
 | `updateCvmlStatus(...)` | `SafeAPIResponse<UpdateCvmlStatusResponse>` |
 | `getCvmlResults(imageOfCaptureId)` | `SafeAPIResponse<GetCvmlResultsResponse>` |
-| `getPendingResults(excludeStatus?)` | `APIResponse<GetPendingResultsData>` |
+| `listPendingResults(excludeStatus?)` | `APIResponse<GetPendingResultsData>` |
 | `getLastResults(excludeStatus?)` | `APIResponse<GetLastResultsData>` |
-| `getTestHistory(excludeStatus?)` | `APIResponse<GetTestHistoryData>` |
+| `listTestHistory(excludeStatus?)` | `APIResponse<GetTestHistoryData>` |
 | `getResultDetails(userTestResultId)` | `SafeAPIResponse<GetResultDetailsResponse>` |
 | `getResultPdf(userTestResultId)` | `APIResponse<GetResultPdfData>` |
 | `getImageCaptureUrl(userTestResultId)` | `SafeAPIResponse<GetImageCaptureUrlResponse>` |

package/dist/index.cjs

@@ -69,7 +69,7 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
    * Resolves the SafeCDX test profile associated with a GTIN barcode.
    */
   async getTestProfileByGTIN(gtin) {
-    const resolvedGtin = this.requireValue(gtin, "GTIN");
+    const resolvedGtin = this.requireValue(gtin, "GTIN", "gtin");
     return this.execute(
       "getTestProfileByGTIN",
       () => this.http.get(
@@ -88,7 +88,7 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
     const request = {
       Data: { IncludeRegisterTestDetails: includeRegisterTestDetails }
     };
-    return this.executeSafe(
+    return this.execute(
       "listTestProfilesByAccount",
       () => this.http.post(
         this.url("test/profiles/by-account"),
@@ -105,9 +105,9 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
    * Requests a pre-signed URL used to upload a test image.
    */
   async createUploadUrl(userTestResultId, gtin, imageType = "jpg") {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
-    const resolvedGtin = this.requireValue(gtin, "GTIN");
-    const resolvedImageType = this.requireValue(imageType, "Image type");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
+    const resolvedGtin = this.requireValue(gtin, "GTIN", "gtin");
+    const resolvedImageType = this.requireValue(imageType, "Image type", "imageType");
     const request = {
       Data: {
         Gtin: resolvedGtin,
@@ -133,10 +133,10 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
    * The pre-signed URL embeds credentials; no Authorization header is needed.
    */
   async uploadImage(preSignedURL, image, contentType = "image/jpeg") {
-    const resolvedPreSignedURL = this.requireValue(preSignedURL, "Pre-signed URL");
-    const resolvedContentType = this.requireValue(contentType, "Content type");
+    const resolvedPreSignedURL = this.requireValue(preSignedURL, "Pre-signed URL", "preSignedURL");
+    const resolvedContentType = this.requireValue(contentType, "Content type", "contentType");
     if (image == null) {
-      throw new import_hc_http.ValidationError({ message: "Image is required.", code: "INVALID_INPUT" });
+      throw new import_hc_http.ValidationError({ message: "Image is required.", code: "INVALID_INPUT", param: "image" });
     }
     const response = await fetch(resolvedPreSignedURL, {
       method: "PUT",
@@ -150,10 +150,8 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
       } catch {
         body = void 0;
       }
-      throw new import_hc_http.APIError({
-        message: `uploadImage: image upload failed with HTTP ${response.status}.`,
-        code: response.status >= 500 ? "SERVER_ERROR" : "UNKNOWN_ERROR",
-        statusCode: response.status,
+      throw (0, import_hc_http.errorFromHttpStatus)(response.status, {
+        operationName: "uploadImage",
         backendMessage: body,
         details: { status: response.status, body }
       });
@@ -167,15 +165,15 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
    * Updates the CVML processing status for an image capture.
    */
   async updateCvmlStatus(imageOfCaptureId, cvmlStatus) {
-    const resolvedImageOfCaptureId = this.requireValue(imageOfCaptureId, "Image capture ID");
-    const resolvedCvmlStatus = this.requireValue(cvmlStatus, "CVML status");
+    const resolvedImageOfCaptureId = this.requireValue(imageOfCaptureId, "Image capture ID", "imageOfCaptureId");
+    const resolvedCvmlStatus = this.requireValue(cvmlStatus, "CVML status", "cvmlStatus");
     const request = {
       Data: {
         ImageOfCaptureId: resolvedImageOfCaptureId,
         CvmlStatus: resolvedCvmlStatus
       }
     };
-    return this.executeSafe(
+    return this.execute(
       "updateCvmlStatus",
       () => this.http.post(this.url("cvml/status"), request, this.getAuthHeaders())
     );
@@ -185,8 +183,8 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
    * Returns the CVML analysis results for an image capture.
    */
   async getCvmlResults(imageOfCaptureId) {
-    const resolvedImageOfCaptureId = this.requireValue(imageOfCaptureId, "Image capture ID");
-    return this.executeSafe(
+    const resolvedImageOfCaptureId = this.requireValue(imageOfCaptureId, "Image capture ID", "imageOfCaptureId");
+    return this.execute(
       "getCvmlResults",
       () => this.http.get(
         this.url("cvml/results", { imageOfCaptureId: resolvedImageOfCaptureId }),
@@ -202,7 +200,7 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
     const request = {
       Data: { ExcludeStatus: excludeStatus }
     };
-    return this.executeSafe(
+    return this.execute(
       "listPendingResults",
       () => this.http.post(this.url("test/result/pending"), request, this.getAuthHeaders())
     );
@@ -212,7 +210,7 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
     const request = {
       Data: { ExcludeStatus: excludeStatus }
     };
-    return this.executeSafe(
+    return this.execute(
       "getLastResults",
       () => this.http.post(this.url("test/result/last"), request, this.getAuthHeaders())
     );
@@ -222,7 +220,7 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
     const request = {
       Data: { ExcludeStatus: excludeStatus }
     };
-    return this.executeSafe(
+    return this.execute(
       "listTestHistory",
       () => this.http.post(this.url("test/result/history"), request, this.getAuthHeaders())
     );
@@ -232,22 +230,22 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
    * Returns full details for a single test result.
    */
   async getResultDetails(userTestResultId) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId }
     };
-    return this.executeSafe(
+    return this.execute(
       "getResultDetails",
       () => this.http.post(this.url("test/result/details"), request, this.getAuthHeaders())
     );
   }
   /** POST test/result/pdf — returns the PDF report for a test result. */
   async getResultPdf(userTestResultId) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId }
     };
-    return this.executeSafe(
+    return this.execute(
       "getResultPdf",
       () => this.http.post(this.url("test/result/pdf"), request, this.getAuthHeaders())
     );
@@ -257,11 +255,11 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
    * Returns a URL to capture an image for the given test result.
    */
   async getImageCaptureUrl(userTestResultId) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId }
     };
-    return this.executeSafe(
+    return this.execute(
       "getImageCaptureUrl",
       () => this.http.post(this.url("test/result/image/capture"), request, this.getAuthHeaders())
     );
@@ -271,18 +269,18 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
   // -------------------------------------------------------------------------
   /** POST test/resume */
   async resumeFlow(userTestResultId, resumed = true) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId, Resumed: resumed }
     };
-    return this.executeSafe(
+    return this.execute(
       "resumeFlow",
       () => this.http.post(this.url("test/resume"), request, this.getAuthHeaders())
     );
   }
   /** POST test/answers */
   async submitAnswers(submission) {
-    const resolvedId = this.requireValue(submission == null ? void 0 : submission.UserTestResultId, "User test result ID");
+    const resolvedId = this.requireValue(submission == null ? void 0 : submission.UserTestResultId, "User test result ID", "UserTestResultId");
     if (!(submission == null ? void 0 : submission.Result) || submission.Result.length === 0) {
       throw new import_hc_http.ValidationError({
         message: "At least one answer result is required.",
@@ -293,14 +291,14 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
     const request = {
       Data: { ...submission, UserTestResultId: resolvedId }
     };
-    return this.executeSafe(
+    return this.execute(
       "submitAnswers",
       () => this.http.post(this.url("test/answers"), request, this.getAuthHeaders())
     );
   }
   /** POST test/finalize */
   async finalizeTest(userTestResultId) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId }
     };
@@ -312,38 +310,6 @@ var HCSafeCDXClient = class extends import_hc_http.HCBaseConnector {
   // -------------------------------------------------------------------------
   // Private Helpers
   // -------------------------------------------------------------------------
-  async executeSafe(operation, request) {
-    var _a;
-    let response;
-    try {
-      response = await request();
-    } catch (err) {
-      if (err instanceof import_hc_http.APIError) throw err;
-      if (err instanceof Error) {
-        throw new import_hc_http.APIError({ message: `${operation}: ${err.message}`, code: "UNKNOWN_ERROR", details: err });
-      }
-      throw new import_hc_http.APIError({ message: `${operation}: unexpected runtime failure`, code: "UNKNOWN_ERROR", details: err });
-    }
-    if (response == null) {
-      throw new import_hc_http.APIError({ message: `${operation}: empty response received`, code: "EMPTY_RESPONSE", details: response });
-    }
-    if (!this.isSafeApiResponse(response)) {
-      throw new import_hc_http.APIError({ message: `${operation}: invalid SafeCDX response structure`, code: "INVALID_RESPONSE", details: response });
-    }
-    if (!response.success) {
-      throw new import_hc_http.HCServiceError(
-        operation,
-        (_a = response.message) != null ? _a : "Backend returned success: false",
-        response
-      );
-    }
-    return response;
-  }
-  isSafeApiResponse(value) {
-    if (!value || typeof value !== "object") return false;
-    const r = value;
-    return "success" in r && typeof r.success === "boolean" && "data" in r && "message" in r && "code" in r && typeof r.code === "number";
-  }
   getAuthHeaders() {
     return { ...this.getHeaders(), ...this.auth.getAuthHeader() };
   }

package/dist/index.d.cts

@@ -444,7 +444,7 @@ declare class HCSafeCDXClient extends HCBaseConnector {
      * Returns test profiles configured for the authenticated patient's account.
      * TenantId is resolved by the backend from the authenticated patient context.
      */
-    listTestProfilesByAccount(includeRegisterTestDetails?: boolean): Promise<SafeAPIResponse<TestProfileByAccountItem[]>>;
+    listTestProfilesByAccount(includeRegisterTestDetails?: boolean): Promise<APIResponse<SafeAPIResponse<TestProfileByAccountItem[]>>>;
     /**
      * POST upload/url
      * Requests a pre-signed URL used to upload a test image.
@@ -470,31 +470,29 @@ declare class HCSafeCDXClient extends HCBaseConnector {
      */
     getCvmlResults(imageOfCaptureId: string): Promise<GetCvmlResultsResponse>;
     /** POST test/result/pending — returns pending test results excluding the given statuses. */
-    listPendingResults(excludeStatus?: string): Promise<SafeAPIResponse<TestResultSummary[]>>;
+    listPendingResults(excludeStatus?: string): Promise<APIResponse<SafeAPIResponse<TestResultSummary[]>>>;
     /** POST test/result/last — returns the most recent test result. */
-    getLastResults(excludeStatus?: string): Promise<SafeAPIResponse<TestResultDetails>>;
+    getLastResults(excludeStatus?: string): Promise<APIResponse<SafeAPIResponse<TestResultDetails>>>;
     /** POST test/result/history — returns all test results excluding the given statuses. */
-    listTestHistory(excludeStatus?: string): Promise<SafeAPIResponse<TestResultSummary[]>>;
+    listTestHistory(excludeStatus?: string): Promise<APIResponse<SafeAPIResponse<TestResultSummary[]>>>;
     /**
      * POST test/result/details
      * Returns full details for a single test result.
      */
     getResultDetails(userTestResultId: string): Promise<GetResultDetailsResponse>;
     /** POST test/result/pdf — returns the PDF report for a test result. */
-    getResultPdf(userTestResultId: string): Promise<SafeAPIResponse<string>>;
+    getResultPdf(userTestResultId: string): Promise<APIResponse<SafeAPIResponse<string>>>;
     /**
      * POST test/result/image/capture
      * Returns a URL to capture an image for the given test result.
      */
     getImageCaptureUrl(userTestResultId: string): Promise<GetImageCaptureUrlResponse>;
     /** POST test/resume */
-    resumeFlow(userTestResultId: string, resumed?: boolean): Promise<SafeAPIResponse<ResumeFlowResult>>;
+    resumeFlow(userTestResultId: string, resumed?: boolean): Promise<APIResponse<SafeAPIResponse<ResumeFlowResult>>>;
     /** POST test/answers */
-    submitAnswers(submission: SubmitAnswersRequest): Promise<SafeAPIResponse<EntityReferenceData>>;
+    submitAnswers(submission: SubmitAnswersRequest): Promise<APIResponse<SafeAPIResponse<EntityReferenceData>>>;
     /** POST test/finalize */
     finalizeTest(userTestResultId: string): Promise<APIResponse<unknown>>;
-    protected executeSafe<T>(operation: string, request: () => Promise<SafeAPIResponse<T>>): Promise<SafeAPIResponse<T>>;
-    private isSafeApiResponse;
     private getAuthHeaders;
     private url;
 }

package/dist/index.d.ts

@@ -444,7 +444,7 @@ declare class HCSafeCDXClient extends HCBaseConnector {
      * Returns test profiles configured for the authenticated patient's account.
      * TenantId is resolved by the backend from the authenticated patient context.
      */
-    listTestProfilesByAccount(includeRegisterTestDetails?: boolean): Promise<SafeAPIResponse<TestProfileByAccountItem[]>>;
+    listTestProfilesByAccount(includeRegisterTestDetails?: boolean): Promise<APIResponse<SafeAPIResponse<TestProfileByAccountItem[]>>>;
     /**
      * POST upload/url
      * Requests a pre-signed URL used to upload a test image.
@@ -470,31 +470,29 @@ declare class HCSafeCDXClient extends HCBaseConnector {
      */
     getCvmlResults(imageOfCaptureId: string): Promise<GetCvmlResultsResponse>;
     /** POST test/result/pending — returns pending test results excluding the given statuses. */
-    listPendingResults(excludeStatus?: string): Promise<SafeAPIResponse<TestResultSummary[]>>;
+    listPendingResults(excludeStatus?: string): Promise<APIResponse<SafeAPIResponse<TestResultSummary[]>>>;
     /** POST test/result/last — returns the most recent test result. */
-    getLastResults(excludeStatus?: string): Promise<SafeAPIResponse<TestResultDetails>>;
+    getLastResults(excludeStatus?: string): Promise<APIResponse<SafeAPIResponse<TestResultDetails>>>;
     /** POST test/result/history — returns all test results excluding the given statuses. */
-    listTestHistory(excludeStatus?: string): Promise<SafeAPIResponse<TestResultSummary[]>>;
+    listTestHistory(excludeStatus?: string): Promise<APIResponse<SafeAPIResponse<TestResultSummary[]>>>;
     /**
      * POST test/result/details
      * Returns full details for a single test result.
      */
     getResultDetails(userTestResultId: string): Promise<GetResultDetailsResponse>;
     /** POST test/result/pdf — returns the PDF report for a test result. */
-    getResultPdf(userTestResultId: string): Promise<SafeAPIResponse<string>>;
+    getResultPdf(userTestResultId: string): Promise<APIResponse<SafeAPIResponse<string>>>;
     /**
      * POST test/result/image/capture
      * Returns a URL to capture an image for the given test result.
      */
     getImageCaptureUrl(userTestResultId: string): Promise<GetImageCaptureUrlResponse>;
     /** POST test/resume */
-    resumeFlow(userTestResultId: string, resumed?: boolean): Promise<SafeAPIResponse<ResumeFlowResult>>;
+    resumeFlow(userTestResultId: string, resumed?: boolean): Promise<APIResponse<SafeAPIResponse<ResumeFlowResult>>>;
     /** POST test/answers */
-    submitAnswers(submission: SubmitAnswersRequest): Promise<SafeAPIResponse<EntityReferenceData>>;
+    submitAnswers(submission: SubmitAnswersRequest): Promise<APIResponse<SafeAPIResponse<EntityReferenceData>>>;
     /** POST test/finalize */
     finalizeTest(userTestResultId: string): Promise<APIResponse<unknown>>;
-    protected executeSafe<T>(operation: string, request: () => Promise<SafeAPIResponse<T>>): Promise<SafeAPIResponse<T>>;
-    private isSafeApiResponse;
     private getAuthHeaders;
     private url;
 }

package/dist/index.js

@@ -1,5 +1,5 @@
 // src/client.ts
-import { HCBaseConnector, APIError, ConfigError, HCServiceError, ValidationError } from "@healthcloudai/hc-http";
+import { HCBaseConnector, ConfigError, ValidationError, errorFromHttpStatus } from "@healthcloudai/hc-http";
 var ENV_HOST = {
   dev: "dev-api-hcs.healthcloud-services.com",
   uat: "uat-api-hcs.healthcloud-services.com",
@@ -38,7 +38,7 @@ var HCSafeCDXClient = class extends HCBaseConnector {
    * Resolves the SafeCDX test profile associated with a GTIN barcode.
    */
   async getTestProfileByGTIN(gtin) {
-    const resolvedGtin = this.requireValue(gtin, "GTIN");
+    const resolvedGtin = this.requireValue(gtin, "GTIN", "gtin");
     return this.execute(
       "getTestProfileByGTIN",
       () => this.http.get(
@@ -57,7 +57,7 @@ var HCSafeCDXClient = class extends HCBaseConnector {
     const request = {
       Data: { IncludeRegisterTestDetails: includeRegisterTestDetails }
     };
-    return this.executeSafe(
+    return this.execute(
       "listTestProfilesByAccount",
       () => this.http.post(
         this.url("test/profiles/by-account"),
@@ -74,9 +74,9 @@ var HCSafeCDXClient = class extends HCBaseConnector {
    * Requests a pre-signed URL used to upload a test image.
    */
   async createUploadUrl(userTestResultId, gtin, imageType = "jpg") {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
-    const resolvedGtin = this.requireValue(gtin, "GTIN");
-    const resolvedImageType = this.requireValue(imageType, "Image type");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
+    const resolvedGtin = this.requireValue(gtin, "GTIN", "gtin");
+    const resolvedImageType = this.requireValue(imageType, "Image type", "imageType");
     const request = {
       Data: {
         Gtin: resolvedGtin,
@@ -102,10 +102,10 @@ var HCSafeCDXClient = class extends HCBaseConnector {
    * The pre-signed URL embeds credentials; no Authorization header is needed.
    */
   async uploadImage(preSignedURL, image, contentType = "image/jpeg") {
-    const resolvedPreSignedURL = this.requireValue(preSignedURL, "Pre-signed URL");
-    const resolvedContentType = this.requireValue(contentType, "Content type");
+    const resolvedPreSignedURL = this.requireValue(preSignedURL, "Pre-signed URL", "preSignedURL");
+    const resolvedContentType = this.requireValue(contentType, "Content type", "contentType");
     if (image == null) {
-      throw new ValidationError({ message: "Image is required.", code: "INVALID_INPUT" });
+      throw new ValidationError({ message: "Image is required.", code: "INVALID_INPUT", param: "image" });
     }
     const response = await fetch(resolvedPreSignedURL, {
       method: "PUT",
@@ -119,10 +119,8 @@ var HCSafeCDXClient = class extends HCBaseConnector {
       } catch {
         body = void 0;
       }
-      throw new APIError({
-        message: `uploadImage: image upload failed with HTTP ${response.status}.`,
-        code: response.status >= 500 ? "SERVER_ERROR" : "UNKNOWN_ERROR",
-        statusCode: response.status,
+      throw errorFromHttpStatus(response.status, {
+        operationName: "uploadImage",
         backendMessage: body,
         details: { status: response.status, body }
       });
@@ -136,15 +134,15 @@ var HCSafeCDXClient = class extends HCBaseConnector {
    * Updates the CVML processing status for an image capture.
    */
   async updateCvmlStatus(imageOfCaptureId, cvmlStatus) {
-    const resolvedImageOfCaptureId = this.requireValue(imageOfCaptureId, "Image capture ID");
-    const resolvedCvmlStatus = this.requireValue(cvmlStatus, "CVML status");
+    const resolvedImageOfCaptureId = this.requireValue(imageOfCaptureId, "Image capture ID", "imageOfCaptureId");
+    const resolvedCvmlStatus = this.requireValue(cvmlStatus, "CVML status", "cvmlStatus");
     const request = {
       Data: {
         ImageOfCaptureId: resolvedImageOfCaptureId,
         CvmlStatus: resolvedCvmlStatus
       }
     };
-    return this.executeSafe(
+    return this.execute(
       "updateCvmlStatus",
       () => this.http.post(this.url("cvml/status"), request, this.getAuthHeaders())
     );
@@ -154,8 +152,8 @@ var HCSafeCDXClient = class extends HCBaseConnector {
    * Returns the CVML analysis results for an image capture.
    */
   async getCvmlResults(imageOfCaptureId) {
-    const resolvedImageOfCaptureId = this.requireValue(imageOfCaptureId, "Image capture ID");
-    return this.executeSafe(
+    const resolvedImageOfCaptureId = this.requireValue(imageOfCaptureId, "Image capture ID", "imageOfCaptureId");
+    return this.execute(
       "getCvmlResults",
       () => this.http.get(
         this.url("cvml/results", { imageOfCaptureId: resolvedImageOfCaptureId }),
@@ -171,7 +169,7 @@ var HCSafeCDXClient = class extends HCBaseConnector {
     const request = {
       Data: { ExcludeStatus: excludeStatus }
     };
-    return this.executeSafe(
+    return this.execute(
       "listPendingResults",
       () => this.http.post(this.url("test/result/pending"), request, this.getAuthHeaders())
     );
@@ -181,7 +179,7 @@ var HCSafeCDXClient = class extends HCBaseConnector {
     const request = {
       Data: { ExcludeStatus: excludeStatus }
     };
-    return this.executeSafe(
+    return this.execute(
       "getLastResults",
       () => this.http.post(this.url("test/result/last"), request, this.getAuthHeaders())
     );
@@ -191,7 +189,7 @@ var HCSafeCDXClient = class extends HCBaseConnector {
     const request = {
       Data: { ExcludeStatus: excludeStatus }
     };
-    return this.executeSafe(
+    return this.execute(
       "listTestHistory",
       () => this.http.post(this.url("test/result/history"), request, this.getAuthHeaders())
     );
@@ -201,22 +199,22 @@ var HCSafeCDXClient = class extends HCBaseConnector {
    * Returns full details for a single test result.
    */
   async getResultDetails(userTestResultId) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId }
     };
-    return this.executeSafe(
+    return this.execute(
       "getResultDetails",
       () => this.http.post(this.url("test/result/details"), request, this.getAuthHeaders())
     );
   }
   /** POST test/result/pdf — returns the PDF report for a test result. */
   async getResultPdf(userTestResultId) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId }
     };
-    return this.executeSafe(
+    return this.execute(
       "getResultPdf",
       () => this.http.post(this.url("test/result/pdf"), request, this.getAuthHeaders())
     );
@@ -226,11 +224,11 @@ var HCSafeCDXClient = class extends HCBaseConnector {
    * Returns a URL to capture an image for the given test result.
    */
   async getImageCaptureUrl(userTestResultId) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId }
     };
-    return this.executeSafe(
+    return this.execute(
       "getImageCaptureUrl",
       () => this.http.post(this.url("test/result/image/capture"), request, this.getAuthHeaders())
     );
@@ -240,18 +238,18 @@ var HCSafeCDXClient = class extends HCBaseConnector {
   // -------------------------------------------------------------------------
   /** POST test/resume */
   async resumeFlow(userTestResultId, resumed = true) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId, Resumed: resumed }
     };
-    return this.executeSafe(
+    return this.execute(
       "resumeFlow",
       () => this.http.post(this.url("test/resume"), request, this.getAuthHeaders())
     );
   }
   /** POST test/answers */
   async submitAnswers(submission) {
-    const resolvedId = this.requireValue(submission == null ? void 0 : submission.UserTestResultId, "User test result ID");
+    const resolvedId = this.requireValue(submission == null ? void 0 : submission.UserTestResultId, "User test result ID", "UserTestResultId");
     if (!(submission == null ? void 0 : submission.Result) || submission.Result.length === 0) {
       throw new ValidationError({
         message: "At least one answer result is required.",
@@ -262,14 +260,14 @@ var HCSafeCDXClient = class extends HCBaseConnector {
     const request = {
       Data: { ...submission, UserTestResultId: resolvedId }
     };
-    return this.executeSafe(
+    return this.execute(
       "submitAnswers",
       () => this.http.post(this.url("test/answers"), request, this.getAuthHeaders())
     );
   }
   /** POST test/finalize */
   async finalizeTest(userTestResultId) {
-    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID");
+    const resolvedUserTestResultId = this.requireValue(userTestResultId, "User test result ID", "userTestResultId");
     const request = {
       Data: { UserTestResultId: resolvedUserTestResultId }
     };
@@ -281,38 +279,6 @@ var HCSafeCDXClient = class extends HCBaseConnector {
   // -------------------------------------------------------------------------
   // Private Helpers
   // -------------------------------------------------------------------------
-  async executeSafe(operation, request) {
-    var _a;
-    let response;
-    try {
-      response = await request();
-    } catch (err) {
-      if (err instanceof APIError) throw err;
-      if (err instanceof Error) {
-        throw new APIError({ message: `${operation}: ${err.message}`, code: "UNKNOWN_ERROR", details: err });
-      }
-      throw new APIError({ message: `${operation}: unexpected runtime failure`, code: "UNKNOWN_ERROR", details: err });
-    }
-    if (response == null) {
-      throw new APIError({ message: `${operation}: empty response received`, code: "EMPTY_RESPONSE", details: response });
-    }
-    if (!this.isSafeApiResponse(response)) {
-      throw new APIError({ message: `${operation}: invalid SafeCDX response structure`, code: "INVALID_RESPONSE", details: response });
-    }
-    if (!response.success) {
-      throw new HCServiceError(
-        operation,
-        (_a = response.message) != null ? _a : "Backend returned success: false",
-        response
-      );
-    }
-    return response;
-  }
-  isSafeApiResponse(value) {
-    if (!value || typeof value !== "object") return false;
-    const r = value;
-    return "success" in r && typeof r.success === "boolean" && "data" in r && "message" in r && "code" in r && typeof r.code === "number";
-  }
   getAuthHeaders() {
     return { ...this.getHeaders(), ...this.auth.getAuthHeader() };
   }
@@ -323,17 +289,17 @@ var HCSafeCDXClient = class extends HCBaseConnector {
 
 // src/errors.ts
 import {
-  APIError as APIError2,
+  APIError,
   ConfigError as ConfigError2,
-  HCServiceError as HCServiceError2,
+  HCServiceError,
   NetworkError,
   ValidationError as ValidationError2
 } from "@healthcloudai/hc-http";
 export {
-  APIError2 as APIError,
+  APIError,
   ConfigError2 as ConfigError,
   HCSafeCDXClient,
-  HCServiceError2 as HCServiceError,
+  HCServiceError,
   NetworkError,
   ValidationError2 as ValidationError
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@healthcloudai/hc-safe-cdx",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Healthcheck Safe CDX connector.",
   "author": "Healthcheck Systems Inc",
   "license": "MIT",
@@ -33,8 +33,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@healthcloudai/hc-http": "^0.2.0",
-    "@healthcloudai/hc-login-connector": "^0.3.0"
+    "@healthcloudai/hc-http": "^0.2.1",
+    "@healthcloudai/hc-login-connector": "^0.3.1"
   },
   "peerDependencies": {
     "react-native": ">=0.70.0"