@healthcloudai/hc-safe-cdx 0.1.4 → 0.2.1

package/dist/index.js

@@ -13,10 +13,15 @@ var ENV_HOST = {
   prod: "api-hcs.healthcloud-services.com"
 };
 var ROUTE_PREFIX = "api/console/hcservice/safecdx";
-function buildUrl(host, route, query) {
-  const url = new URL(
-    `https://${host}/${ROUTE_PREFIX}/${route.replace(/^\/+/, "")}`
-  );
+function buildSafeCdxBaseUrl(environment) {
+  const host = ENV_HOST[environment];
+  if (!host) {
+    throw new SafeCDXError("Invalid Safe CDX environment.");
+  }
+  return `https://${host}/${ROUTE_PREFIX}`;
+}
+function buildUrl(baseUrl, route, query) {
+  const url = new URL(`${baseUrl}/${route.replace(/^\/+/, "")}`);
   if (query) {
     for (const [key, value] of Object.entries(query)) {
       if (value !== void 0 && value !== "") {
@@ -26,30 +31,11 @@ function buildUrl(host, route, query) {
   }
   return url.toString();
 }
-function wrapData(payload) {
-  return { Data: payload };
-}
-function assertApiResponse(envelope, route) {
-  var _a;
-  if (!envelope.IsOK) {
-    throw new SafeCDXError(
-      (_a = envelope.ErrorMessage) != null ? _a : `${route} returned IsOK=false.`,
-      envelope
-    );
-  }
-  return envelope;
-}
 var HCSafeCDXClient = class {
-  constructor(httpClient, authClient, config) {
-    var _a;
-    if (!ENV_HOST[config.environment]) {
-      throw new SafeCDXError(`Invalid environment: ${config.environment}`);
-    }
+  constructor(httpClient, loginClient) {
     this.http = httpClient;
-    this.auth = authClient;
-    this.host = ENV_HOST[config.environment];
-    this.defaultLanguage = config.defaultLanguage;
-    this.defaultImageType = (_a = config.defaultImageType) != null ? _a : "jpg";
+    this.loginClient = loginClient;
+    this.baseUrl = buildSafeCdxBaseUrl(loginClient.getEnvironment());
   }
   setApiKey(headerName, value) {
     const trimmedHeaderName = headerName == null ? void 0 : headerName.trim();
@@ -63,106 +49,66 @@ var HCSafeCDXClient = class {
     this.apiKeyHeaderName = trimmedHeaderName;
     this.apiKeyValue = trimmedValue;
   }
-  // ---------------------------------------------------------------------------
-  // Private helpers
-  // ---------------------------------------------------------------------------
-  getAuthHeaders() {
-    return {
-      ...this.auth.getAuthHeader(),
-      ...this.getApiKeyHeader()
-    };
-  }
-  getJsonHeaders() {
-    return {
-      ...this.getAuthHeaders(),
-      "Content-Type": "application/json"
-    };
-  }
-  getApiKeyHeader() {
-    if (!this.apiKeyHeaderName || !this.apiKeyValue) {
-      return {};
-    }
-    return {
-      [this.apiKeyHeaderName]: this.apiKeyValue
-    };
-  }
-  url(route, query) {
-    return buildUrl(this.host, route, query);
-  }
-  // ---------------------------------------------------------------------------
-  // Scan
-  // ---------------------------------------------------------------------------
+  // -------------------------------------------------------------------------
+  // Test Profiles
+  // -------------------------------------------------------------------------
   /**
    * GET gs1/:gtin
-   * Resolves a test profile by GTIN barcode and creates a UserTestResultId.
+   * Resolves the SafeCDX test profile associated with a GTIN barcode.
    */
-  async getTestProfileByGTIN(gtin, language) {
-    const envelope = await this.http.get(
-      this.url(`gs1/${encodeURIComponent(gtin)}`, {
-        language: language != null ? language : this.defaultLanguage
-      }),
+  async getTestProfileByGTIN(gtin) {
+    return this.http.get(
+      this.url(`gs1/${encodeURIComponent(gtin)}`),
       this.getAuthHeaders()
     );
-    return assertApiResponse(envelope, "gs1/:gtin");
-  }
-  // ---------------------------------------------------------------------------
-  // Test Profiles
-  // ---------------------------------------------------------------------------
-  /**
-   * POST test/profile
-   * Returns the full test profile for a given GTIN.
-   */
-  async getTestProfile(payload) {
-    const envelope = await this.http.post(
-      this.url("test/profile"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
-    return assertApiResponse(envelope, "test/profile");
   }
   /**
    * POST test/profiles/by-account
-   * Lists all test profiles available to the authenticated account.
+   * Lists test profiles available to the authenticated patient account.
+   *
+   * TenantId is resolved by the backend from the authenticated patient context.
    */
-  async getTestProfilesByAccount(payload = {
-    IncludeRegisterTestDetails: true
-  }) {
-    const envelope = await this.http.post(
+  async getTestProfilesByAccount(includeRegisterTestDetails = true) {
+    const request = {
+      Data: {
+        IncludeRegisterTestDetails: includeRegisterTestDetails
+      }
+    };
+    return this.http.post(
       this.url("test/profiles/by-account"),
-      wrapData(payload),
+      request,
       this.getJsonHeaders()
     );
-    return assertApiResponse(envelope, "test/profiles/by-account");
   }
-  // ---------------------------------------------------------------------------
-  // Upload
-  // ---------------------------------------------------------------------------
+  // -------------------------------------------------------------------------
+  // Image Upload
+  // -------------------------------------------------------------------------
   /**
    * POST upload/url
-   * Requests a pre-signed S3 URL for image upload.
-   * Use the returned Data.preSignedURL and Data.Metadata.UploadId in the next steps.
+   * Requests a pre-signed URL used to upload a test image.
    */
-  async createUploadUrl(userTestResultId, gtin, imageType) {
-    const payload = {
-      Gtin: gtin,
-      UserTestResultId: userTestResultId,
-      Metadata: {
-        ImageType: imageType != null ? imageType : this.defaultImageType
+  async createUploadUrl(userTestResultId, gtin, imageType = "jpg") {
+    const request = {
+      Data: {
+        Gtin: gtin,
+        UserTestResultId: userTestResultId,
+        Metadata: {
+          ImageType: imageType
+        }
       }
     };
-    const envelope = await this.http.post(
+    return this.http.post(
       this.url("upload/url"),
-      wrapData(payload),
+      request,
       this.getJsonHeaders()
     );
-    return assertApiResponse(envelope, "upload/url");
   }
   /**
-   * PUT preSignedURL — direct S3 upload, not a SafeCDX API route.
-   * preSignedURL comes from createUploadUrl() response: Data.preSignedURL.
+   * PUT preSignedURL
+   * Uploads the image directly to the pre-signed storage URL.
    *
-   * This intentionally does not use the shared HttpClient because the existing
-   * HttpClient.put() is JSON-oriented and stringifies the request body.
+   * This request does not call a SafeCDX API route and does not send
+   * authenticated Health Cloud headers.
    */
   async uploadImage(preSignedURL, image, contentType = "image/jpeg") {
     const response = await fetch(preSignedURL, {
@@ -177,185 +123,154 @@ var HCSafeCDXClient = class {
       try {
         body = (await response.text()).slice(0, 500);
       } catch {
+        body = void 0;
       }
-      throw new SafeCDXError(
-        `Image upload failed with HTTP ${response.status}.`,
-        {
-          status: response.status,
-          body
-        }
-      );
+      throw new SafeCDXError(`Image upload failed with HTTP ${response.status}.`, {
+        status: response.status,
+        body
+      });
     }
   }
-  // ---------------------------------------------------------------------------
+  // -------------------------------------------------------------------------
   // CVML
-  // ---------------------------------------------------------------------------
+  // -------------------------------------------------------------------------
   /**
    * POST cvml/status
-   * Updates the ML processing status for a captured image.
-   * NOTE: Returns raw service result — no ApiResponse wrapper on this endpoint.
+   * Returns the direct SafeCDX response without an outer APIResponse wrapper.
    */
   async updateCvmlStatus(imageOfCaptureId, cvmlStatus) {
-    const payload = {
-      ImageOfCaptureId: imageOfCaptureId,
-      CvmlStatus: cvmlStatus
+    const request = {
+      Data: {
+        ImageOfCaptureId: imageOfCaptureId,
+        CvmlStatus: cvmlStatus
+      }
     };
-    return this.http.post(
-      this.url("cvml/status"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
+    return this.http.post(this.url("cvml/status"), request, this.getJsonHeaders());
   }
   /**
    * GET cvml/results
-   * Polls ML analysis results for a captured image.
-   * NOTE: Returns raw service result — no ApiResponse wrapper on this endpoint.
+   * Returns the direct SafeCDX response without an outer APIResponse wrapper.
    */
   async getCvmlResults(imageOfCaptureId) {
-    return this.http.get(
-      this.url("cvml/results", {
-        imageOfCaptureId
-      }),
-      this.getAuthHeaders()
-    );
+    return this.http.get(this.url("cvml/results", { imageOfCaptureId }), this.getAuthHeaders());
   }
-  // ---------------------------------------------------------------------------
+  // -------------------------------------------------------------------------
   // Test Results
-  // ---------------------------------------------------------------------------
-  /**
-   * POST test/result/pending
-   * Returns test results in a pending/incomplete state.
-   */
-  async getPendingResults(payload = {
-    ExcludeStatus: "Started"
-  }) {
-    const envelope = await this.http.post(
-      this.url("test/result/pending"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
-    return assertApiResponse(envelope, "test/result/pending");
+  // -------------------------------------------------------------------------
+  /** POST test/result/pending */
+  async getPendingResults(excludeStatus = "Invalid,Canceled") {
+    const request = {
+      Data: {
+        ExcludeStatus: excludeStatus
+      }
+    };
+    return this.http.post(this.url("test/result/pending"), request, this.getJsonHeaders());
   }
-  /**
-   * POST test/result/last
-   * Returns the most recent test result for the authenticated patient.
-   */
-  async getLastResults(payload = {}) {
-    const envelope = await this.http.post(
-      this.url("test/result/last"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
-    return assertApiResponse(envelope, "test/result/last");
+  /** POST test/result/last */
+  async getLastResults(excludeStatus = "Invalid") {
+    const request = {
+      Data: {
+        ExcludeStatus: excludeStatus
+      }
+    };
+    return this.http.post(this.url("test/result/last"), request, this.getJsonHeaders());
   }
-  /**
-   * POST test/result/history
-   * Returns the full test history for the authenticated patient.
-   */
-  async getTestHistory(payload = {}) {
-    const envelope = await this.http.post(
-      this.url("test/result/history"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
-    return assertApiResponse(envelope, "test/result/history");
+  /** POST test/result/history */
+  async getTestHistory(excludeStatus = "Invalid") {
+    const request = {
+      Data: {
+        ExcludeStatus: excludeStatus
+      }
+    };
+    return this.http.post(this.url("test/result/history"), request, this.getJsonHeaders());
   }
   /**
    * POST test/result/details
-   * Returns detailed result data for a specific test attempt.
-   * NOTE: Returns raw service result — no ApiResponse wrapper on this endpoint.
+   * Returns the direct SafeCDX response without an outer APIResponse wrapper.
    */
   async getResultDetails(userTestResultId) {
-    const payload = {
-      UserTestResultId: userTestResultId
+    const request = {
+      Data: {
+        UserTestResultId: userTestResultId
+      }
     };
-    return this.http.post(
-      this.url("test/result/details"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
+    return this.http.post(this.url("test/result/details"), request, this.getJsonHeaders());
   }
-  /**
-   * POST test/result/pdf
-   * Generates a PDF report for a specific test result.
-   */
-  async getResultPdf(payload) {
-    const envelope = await this.http.post(
-      this.url("test/result/pdf"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
-    return assertApiResponse(envelope, "test/result/pdf");
+  /** POST test/result/pdf */
+  async getResultPdf(userTestResultId) {
+    const request = {
+      Data: {
+        UserTestResultId: userTestResultId
+      }
+    };
+    return this.http.post(this.url("test/result/pdf"), request, this.getJsonHeaders());
   }
   /**
    * POST test/result/image/capture
-   * Returns the image capture URL for a specific test result.
-   * NOTE: Returns raw service result — no ApiResponse wrapper on this endpoint.
+   * Returns the direct SafeCDX response without an outer APIResponse wrapper.
    */
   async getImageCaptureUrl(userTestResultId) {
-    const payload = {
-      UserTestResultId: userTestResultId
+    const request = {
+      Data: {
+        UserTestResultId: userTestResultId
+      }
     };
-    return this.http.post(
-      this.url("test/result/image/capture"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
+    return this.http.post(this.url("test/result/image/capture"), request, this.getJsonHeaders());
   }
-  /**
-   * POST test/result/analytics
-   * Returns analytics data for test results.
-   */
-  async getAnalytics(payload = {}) {
-    const envelope = await this.http.post(
-      this.url("test/result/analytics"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
-    return assertApiResponse(envelope, "test/result/analytics");
-  }
-  // ---------------------------------------------------------------------------
+  // -------------------------------------------------------------------------
   // Resume / Answers / Finalize
-  // ---------------------------------------------------------------------------
-  /**
-   * POST test/resume
-   * Marks a test attempt as resumed (or not).
-   */
+  // -------------------------------------------------------------------------
+  /** POST test/resume */
   async resumeFlow(userTestResultId, resumed = true) {
-    const payload = {
-      UserTestResultId: userTestResultId,
-      Resumed: resumed
+    const request = {
+      Data: {
+        UserTestResultId: userTestResultId,
+        Resumed: resumed
+      }
     };
-    const envelope = await this.http.post(
-      this.url("test/resume"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
-    return assertApiResponse(envelope, "test/resume");
+    return this.http.post(this.url("test/resume"), request, this.getJsonHeaders());
   }
-  /**
-   * POST test/answers
-   * Submits analyte answers for a test attempt.
-   */
-  async submitAnswers(payload) {
-    const envelope = await this.http.post(
-      this.url("test/answers"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
-    return assertApiResponse(envelope, "test/answers");
+  /** POST test/answers */
+  async submitAnswers(submission) {
+    const request = {
+      Data: submission
+    };
+    return this.http.post(this.url("test/answers"), request, this.getJsonHeaders());
   }
-  /**
-   * POST test/finalize
-   * Finalizes a test attempt with CTA, indication, and decision results.
-   */
-  async finalizeTest(payload) {
-    const envelope = await this.http.post(
-      this.url("test/finalize"),
-      wrapData(payload),
-      this.getJsonHeaders()
-    );
-    return assertApiResponse(envelope, "test/finalize");
+  /** POST test/finalize */
+  async finalizeTest(userTestResultId) {
+    const request = {
+      Data: {
+        UserTestResultId: userTestResultId
+      }
+    };
+    return this.http.post(this.url("test/finalize"), request, this.getJsonHeaders());
+  }
+  // -------------------------------------------------------------------------
+  // Private Helpers
+  // -------------------------------------------------------------------------
+  getAuthHeaders() {
+    return {
+      ...this.loginClient.getAuthHeader(),
+      ...this.getApiKeyHeader()
+    };
+  }
+  getJsonHeaders() {
+    return {
+      ...this.getAuthHeaders(),
+      "Content-Type": "application/json"
+    };
+  }
+  getApiKeyHeader() {
+    if (!this.apiKeyHeaderName || !this.apiKeyValue) {
+      return {};
+    }
+    return {
+      [this.apiKeyHeaderName]: this.apiKeyValue
+    };
+  }
+  url(route, query) {
+    return buildUrl(this.baseUrl, route, query);
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@healthcloudai/hc-safe-cdx",
-  "version": "0.1.4",
+  "version": "0.2.1",
   "description": "Healthcheck Safe CDX connector.",
   "author": "Healthcheck Systems Inc",
   "license": "MIT",