@gopaycz/gopay-js-sdk 1.6.6 → 1.7.0

package/dist/index.cjs

@@ -23,7 +23,9 @@ __export(src_exports, {
   GoPayErrorCodes: () => GoPayErrorCodes,
   GoPayHTTPError: () => GoPayHTTPError,
   GoPaySDKError: () => GoPaySDKError,
+  GoPayScopes: () => GoPayScopes,
   SDK_VERSION: () => SDK_VERSION,
+  combineScopes: () => combineScopes,
   createGoPaySDK: () => createGoPaySDK
 });
 module.exports = __toCommonJS(src_exports);
@@ -78,6 +80,7 @@ var GoPaySDKError = class extends Error {
       this.cause = options.cause;
     }
     this.errorCode = options?.errorCode;
+    this.chargeState = options?.chargeState;
   }
 };
 var GoPayHTTPError = class extends Error {
@@ -88,6 +91,43 @@ var GoPayHTTPError = class extends Error {
     this.name = "GoPayHTTPError";
   }
 };
+function runPollLoop(poll, intervalMs, signal, reject, onTick, onAbort, extraCleanup) {
+  let stopped = false;
+  let pollHandle;
+  const stop = (fn) => {
+    if (stopped) {
+      return;
+    }
+    stopped = true;
+    clearTimeout(pollHandle);
+    extraCleanup?.();
+    signal?.removeEventListener("abort", abortListener);
+    fn();
+  };
+  const abortListener = () => onAbort(stop);
+  signal?.addEventListener("abort", abortListener, { once: true });
+  const doPoll = () => {
+    if (stopped) {
+      return;
+    }
+    poll().then((state) => {
+      if (stopped) {
+        return;
+      }
+      onTick(state, stop);
+      if (!stopped) {
+        pollHandle = setTimeout(doPoll, intervalMs);
+      }
+    }).catch((err) => {
+      if (stopped) {
+        return;
+      }
+      stop(() => reject(err));
+    });
+  };
+  doPoll();
+  return stop;
+}
 function awaitCharge(poll, options) {
   const intervalMs = options?.intervalMs ?? 2e3;
   const initialTimeoutMs = options?.initialTimeoutMs ?? 3e4;
@@ -99,56 +139,25 @@ function awaitCharge(poll, options) {
     );
   }
   return new Promise((resolve, reject) => {
-    let stopped = false;
     let lastActionRequiredUrl = null;
-    const stop = (fn) => {
-      if (stopped) {
-        return;
-      }
-      stopped = true;
-      clearTimeout(initialTimer);
-      options?.signal?.removeEventListener("abort", onAbort);
-      fn();
-    };
-    let onAbort;
-    onAbort = () => {
-      stop(
-        () => reject(
-          new GoPaySDKError("[GoPaySDK] Charge polling aborted.", {
-            errorCode: GoPayErrorCodes.CHARGE_FAILED
-          })
-        )
-      );
-    };
-    options?.signal?.addEventListener("abort", onAbort, { once: true });
-    const initialTimer = setTimeout(() => {
-      stop(
-        () => reject(
-          new GoPaySDKError(
-            "[GoPaySDK] Charge did not progress within the initial timeout",
-            { errorCode: GoPayErrorCodes.CHARGE_TIMEOUT }
-          )
-        )
-      );
-    }, initialTimeoutMs);
-    const doPoll = () => {
-      if (stopped) {
-        return;
-      }
-      poll().then((state) => {
-        if (stopped) {
-          return;
-        }
+    let initialTimer;
+    const stop = runPollLoop(
+      poll,
+      intervalMs,
+      options?.signal,
+      reject,
+      (state, stop2) => {
         options?.onStateChange?.(state);
         if (state.state === "SUCCEEDED") {
-          stop(() => resolve(state));
+          stop2(() => resolve(state));
           return;
         }
         if (state.state === "FAILED") {
-          stop(
+          stop2(
             () => reject(
               new GoPaySDKError("[GoPaySDK] Charge failed", {
-                errorCode: GoPayErrorCodes.CHARGE_FAILED
+                errorCode: GoPayErrorCodes.CHARGE_FAILED,
+                chargeState: state
               })
             )
           );
@@ -158,20 +167,32 @@ function awaitCharge(poll, options) {
           clearTimeout(initialTimer);
           if (state.action?.redirect_url && state.action.redirect_url !== lastActionRequiredUrl) {
             lastActionRequiredUrl = state.action.redirect_url;
-            options?.onActionRequired?.(
-              state.action.redirect_url
-            );
+            options?.onActionRequired?.(state.action.redirect_url);
           }
         }
-        setTimeout(doPoll, intervalMs);
-      }).catch((err) => {
-        if (stopped) {
-          return;
-        }
-        stop(() => reject(err));
-      });
-    };
-    doPoll();
+      },
+      (stop2) => stop2(
+        () => reject(
+          new GoPaySDKError(
+            "[GoPaySDK] Charge polling aborted.",
+            {
+              errorCode: GoPayErrorCodes.CHARGE_FAILED
+            }
+          )
+        )
+      ),
+      () => clearTimeout(initialTimer)
+    );
+    initialTimer = setTimeout(() => {
+      stop(
+        () => reject(
+          new GoPaySDKError(
+            "[GoPaySDK] Charge did not progress within the initial timeout",
+            { errorCode: GoPayErrorCodes.CHARGE_TIMEOUT }
+          )
+        )
+      );
+    }, initialTimeoutMs);
   });
 }
 var BASE_URLS = {
@@ -209,7 +230,7 @@ function buildUrl(baseUrl, path) {
 var MAX_RETRIES = 2;
 var IDEMPOTENT_METHODS = /* @__PURE__ */ new Set(["GET", "HEAD", "OPTIONS", "PUT", "DELETE"]);
 var sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-async function fetchWithRetry(url, init, timeoutMs) {
+async function fetchWithRetry(url, init, signal) {
   const method = (init?.method ?? "GET").toUpperCase();
   const isIdempotent = IDEMPOTENT_METHODS.has(method);
   let lastResponse;
@@ -222,7 +243,7 @@ async function fetchWithRetry(url, init, timeoutMs) {
       const response = await fetch(
         new Request(url, {
           ...init,
-          signal: AbortSignal.timeout(timeoutMs)
+          signal
         })
       );
       if (response.status < 500) {
@@ -233,7 +254,7 @@ async function fetchWithRetry(url, init, timeoutMs) {
       }
       lastResponse = response;
     } catch (err) {
-      if (err instanceof Error && err.name === "TimeoutError") {
+      if (err instanceof Error && (err.name === "TimeoutError" || err.name === "AbortError")) {
         throw err;
       }
       if (!isIdempotent) {
@@ -300,10 +321,12 @@ function createAuthHandler(deps) {
     }
     headers.set("Authorization", `Bearer ${tokens.access_token}`);
   }
-  async function fetchAndHandle401(url, init) {
+  async function fetchAndHandle401(url, init, signal) {
     const { getTimeoutMs, debugLogResponse, store, emitError } = deps;
     const timeoutMs = getTimeoutMs();
-    let response = await fetchWithRetry(url, init, timeoutMs);
+    const timeoutSignal = AbortSignal.timeout(timeoutMs);
+    const combinedSignal = signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+    let response = await fetchWithRetry(url, init, combinedSignal);
     debugLogResponse(response);
     if (response.status !== 401 || url.includes(AUTH_PATH)) {
       return response;
@@ -319,7 +342,7 @@ function createAuthHandler(deps) {
       new Request(url, {
         ...init,
         headers: retryHeaders,
-        signal: AbortSignal.timeout(timeoutMs)
+        signal: combinedSignal
       })
     );
     debugLogResponse(response);
@@ -487,7 +510,10 @@ function createHttpClient(config, reAuthAction) {
     }
   }
   function emitError(error) {
-    config.onError?.(error);
+    try {
+      config.onError?.(error);
+    } catch {
+    }
     throw error;
   }
   function handleError(err) {
@@ -569,10 +595,11 @@ function createHttpClient(config, reAuthAction) {
         const headers = new Headers({ Accept: "application/json" });
         await auth.injectAuth(headers, url, options);
         debugLogRequest("GET", url);
-        const response = await auth.fetchAndHandle401(url, {
-          method: "GET",
-          headers
-        });
+        const response = await auth.fetchAndHandle401(
+          url,
+          { method: "GET", headers },
+          options?.signal
+        );
         await throwIfNotOk(response);
         return await response.json();
       } catch (err) {
@@ -588,11 +615,11 @@ function createHttpClient(config, reAuthAction) {
         });
         await auth.injectAuth(headers, url, options);
         debugLogRequest("POST", url);
-        const response = await auth.fetchAndHandle401(url, {
-          method: "POST",
-          headers,
-          body: JSON.stringify(body)
-        });
+        const response = await auth.fetchAndHandle401(
+          url,
+          { method: "POST", headers, body: JSON.stringify(body) },
+          options?.signal
+        );
         await throwIfNotOk(response);
         return await response.json();
       } catch (err) {
@@ -605,10 +632,11 @@ function createHttpClient(config, reAuthAction) {
         const headers = new Headers();
         await auth.injectAuth(headers, url, options);
         debugLogRequest("DELETE", url);
-        const response = await auth.fetchAndHandle401(url, {
-          method: "DELETE",
-          headers
-        });
+        const response = await auth.fetchAndHandle401(
+          url,
+          { method: "DELETE", headers },
+          options?.signal
+        );
         await throwIfNotOk(response);
       } catch (err) {
         return handleError(err);
@@ -634,7 +662,10 @@ function createHttpClient(config, reAuthAction) {
             method: "POST",
             headers,
             body: bodyStr,
-            signal: AbortSignal.timeout(timeoutMs())
+            signal: options?.signal ? AbortSignal.any([
+              options.signal,
+              AbortSignal.timeout(timeoutMs())
+            ]) : AbortSignal.timeout(timeoutMs())
           })
         );
         debugLogResponse(response);
@@ -646,6 +677,75 @@ function createHttpClient(config, reAuthAction) {
     }
   };
 }
+var DEFAULT_TERMINAL_STATES = /* @__PURE__ */ new Set([
+  "PAID",
+  "CANCELED",
+  "TIMEOUTED",
+  "REFUNDED",
+  "PARTIALLY_REFUNDED"
+]);
+function awaitPaymentStatus(poll, options) {
+  const intervalMs = options?.intervalMs ?? 3e3;
+  const terminal = options?.terminalStates ? new Set(options.terminalStates) : DEFAULT_TERMINAL_STATES;
+  if (options?.signal?.aborted) {
+    return Promise.reject(
+      new GoPaySDKError("[GoPaySDK] Payment status polling aborted.", {
+        errorCode: GoPayErrorCodes.CHARGE_FAILED
+      })
+    );
+  }
+  return new Promise((resolve, reject) => {
+    let timeoutHandle;
+    const stop = runPollLoop(
+      poll,
+      intervalMs,
+      options?.signal,
+      reject,
+      (status, stop2) => {
+        options?.onStateChange?.(status);
+        if (terminal.has(status.state)) {
+          stop2(() => resolve(status));
+        }
+      },
+      (stop2) => stop2(
+        () => reject(
+          new GoPaySDKError(
+            "[GoPaySDK] Payment status polling aborted.",
+            { errorCode: GoPayErrorCodes.CHARGE_FAILED }
+          )
+        )
+      ),
+      () => clearTimeout(timeoutHandle)
+    );
+    if (options?.timeoutMs !== void 0) {
+      timeoutHandle = setTimeout(() => {
+        stop(
+          () => reject(
+            new GoPaySDKError(
+              "[GoPaySDK] Payment did not reach a terminal state within the timeout.",
+              { errorCode: GoPayErrorCodes.CHARGE_TIMEOUT }
+            )
+          )
+        );
+      }, options.timeoutMs);
+    }
+  });
+}
+var GoPayScopes = {
+  /** Create payments, charge, refund, manage recurrences and payment links. */
+  PAYMENT_WRITE: "payment:write",
+  /** Read payment status, charge state, recurrences, refunds. */
+  PAYMENT_READ: "payment:read",
+  /** Charge a single payment (browser/payment-credentials grant only). */
+  PAYMENT_CHARGE: "payment:charge",
+  /** Tokenize card data via the hosted card form. */
+  CARD_WRITE: "card:write",
+  /** Read and delete stored card tokens. */
+  CARD_READ: "card:read"
+};
+function combineScopes(...scopes) {
+  return scopes.join(" ");
+}
 function requireNonEmptyString(value, field) {
   if (typeof value !== "string" || !value.trim()) {
     throw new GoPaySDKError(`[GoPaySDK] ${field} is required`, {
@@ -861,9 +961,9 @@ function createPaymentsApi(client) {
      *
      * @param paymentId - Payment session ID returned by {@link createPayment}
      */
-    async getPaymentStatus(paymentId) {
+    async getPaymentStatus(paymentId, options) {
       const pid = requireNonEmptyString(paymentId, "paymentId");
-      return client.get(`/payments/${pid}`);
+      return client.get(`/payments/${pid}`, options);
     },
     /**
      * Create a new payment session.
@@ -877,10 +977,11 @@ function createPaymentsApi(client) {
      * @param goid   - Merchant's GoPay ID (eshop identifier)
      * @param params - Payment creation parameters
      */
-    async createPayment(goid, params) {
+    async createPayment(goid, params, options) {
       return client.post(
         `/eshops/${goid}/payments`,
-        params
+        params,
+        options
       );
     },
     /**
@@ -891,11 +992,12 @@ function createPaymentsApi(client) {
      * @param paymentId - Payment session ID returned by {@link createPayment}
      * @param params    - Charge parameters including payment instrument details
      */
-    async chargePayment(paymentId, params) {
+    async chargePayment(paymentId, params, options) {
       const pid = requireNonEmptyString(paymentId, "paymentId");
       return client.post(
         `/payments/${pid}/charge`,
-        params
+        params,
+        options
       );
     },
     /**
@@ -905,10 +1007,11 @@ function createPaymentsApi(client) {
      *
      * @param paymentId - Payment session ID returned by {@link createPayment}
      */
-    async getChargeState(paymentId) {
+    async getChargeState(paymentId, options) {
       const pid = requireNonEmptyString(paymentId, "paymentId");
       return client.get(
-        `/payments/${pid}/charge`
+        `/payments/${pid}/charge`,
+        options
       );
     },
     /**
@@ -1006,10 +1109,33 @@ function createPaymentsApi(client) {
       const pid = requireNonEmptyString(paymentId, "paymentId");
       return awaitCharge(
         () => client.get(
-          `/payments/${pid}/charge`
+          `/payments/${pid}/charge`,
+          { signal: options?.signal }
         ),
         options
       );
+    },
+    /**
+     * Poll the payment status until it reaches a terminal state.
+     *
+     * Resolves with the terminal `PaymentDetails` response.
+     * Use for QR and bank-transfer payments where completion is confirmed at
+     * the payment level (`state === 'PAID'`) rather than the charge level.
+     *
+     * No client-side timeout by default — the server cancels the payment on
+     * its own schedule. Pass `options.timeoutMs` for a client-side ceiling.
+     *
+     * @param paymentId - Payment session ID
+     * @param options   - Polling configuration and callbacks
+     */
+    awaitPaymentStatus(paymentId, options) {
+      const pid = requireNonEmptyString(paymentId, "paymentId");
+      return awaitPaymentStatus(
+        () => client.get(`/payments/${pid}`, {
+          signal: options?.signal
+        }),
+        options
+      );
     }
   };
 }
@@ -1140,7 +1266,7 @@ function createRefundsApi(client) {
 }
 
 // src/version.ts
-var SDK_VERSION = "1.6.6";
+var SDK_VERSION = "1.7.0";
 
 // src/gopay-sdk.ts
 function createGoPaySDK(config = {}) {
@@ -1160,7 +1286,9 @@ function createGoPaySDK(config = {}) {
   GoPayErrorCodes,
   GoPayHTTPError,
   GoPaySDKError,
+  GoPayScopes,
   SDK_VERSION,
+  combineScopes,
   createGoPaySDK
 });
 //# sourceMappingURL=index.cjs.map