@wdft/micropayments-sdk 0.0.5 → 0.0.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wdft/micropayments-sdk",
   "description": "wdft - we do fintech - micropayments sdk",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/client.ts

@@ -26,6 +26,8 @@ export type ICommitmentPayloadSimple = Omit<
   "status" | "message"
 >;
 
+const DEFAULT_RETRY_TIME_MS = 5000;
+
 class Commitment {
   private readonly payload: ICommitmentPayload;
 
@@ -57,6 +59,10 @@ class Commitment {
     return this.getStatus() === "resolved";
   }
 
+  getMessage(): string {
+    return this.payload.message || '';
+  }
+
   getStatus(): CommitmentStatus {
     return this.payload.status;
   }
@@ -224,6 +230,10 @@ class Commitment {
     try {
       const status = await this.service.checkCommitment(this.getCommitmentId());
 
+      if (status.retry_after) {
+        this.options.retry_ms = Math.max(this.options.retry_ms || DEFAULT_RETRY_TIME_MS, status.retry_after)
+      }
+
       switch (status.status) {
         case "duplicated": {
           this.markAsDuplicated();
@@ -316,7 +326,7 @@ export class Client {
         reference_id: reference_id,
         expires_at: response.expires_at,
         click_url: response.click_url,
-        retry_ms: this.options.retry_ms ?? 1000,
+        retry_ms: this.options.retry_ms ?? DEFAULT_RETRY_TIME_MS,
       },
       options,
     );
@@ -339,6 +349,7 @@ export class Client {
         commitment.startChecking();
         return on(null, {
           status: commitment.getStatus(),
+          message: commitment.getMessage(),
           reference_id,
           commitment_id: commitment.getCommitmentId(),
           click_url: commitment.getClickUrl(),
@@ -347,6 +358,7 @@ export class Client {
       .onWaiting((commitment) =>
         on(null, {
           status: commitment.getStatus(),
+          message: commitment.getMessage(),
           reference_id,
           commitment_id: commitment.getCommitmentId(),
           click_url: commitment.getClickUrl(),
@@ -355,6 +367,7 @@ export class Client {
       .onDuplicated((commitment) =>
         on(null, {
           status: commitment.getStatus(),
+          message: commitment.getMessage(),
           reference_id,
           commitment_id: commitment.getCommitmentId(),
           click_url: commitment.getClickUrl(),
@@ -363,6 +376,7 @@ export class Client {
       .onExpired((commitment) =>
         on(null, {
           status: commitment.getStatus(),
+          message: commitment.getMessage(),
           reference_id,
           commitment_id: commitment.getCommitmentId(),
           click_url: commitment.getClickUrl(),
@@ -371,6 +385,7 @@ export class Client {
       .onRejected((commitment) =>
         on(null, {
           status: commitment.getStatus(),
+          message: commitment.getMessage(),
           reference_id,
           commitment_id: commitment.getCommitmentId(),
           click_url: commitment.getClickUrl(),
@@ -379,6 +394,7 @@ export class Client {
       .onResolved((commitment) =>
         on(null, {
           status: commitment.getStatus(),
+          message: commitment.getMessage(),
           reference_id,
           commitment_id: commitment.getCommitmentId(),
           click_url: commitment.getClickUrl(),
@@ -400,6 +416,7 @@ export interface CallbackPayload {
   status: CommitmentStatus;
   reference_id: string;
   commitment_id: string;
+  message: string | null;
   click_url: string;
 }
 
@@ -410,7 +427,7 @@ export type ICallback = OnStatusCallback & OnStatusErrorCallback;
 class CommitmentObservabileBuilder {
   private _reference_id: string | undefined;
   private _amount: number | undefined;
-  private _retry_ms = 1000;
+  private _retry_ms = DEFAULT_RETRY_TIME_MS;
   private _currency: string | undefined;
   private _metadata: ICommitmentMetadata = { title: "", url: "" };
   private _onCreatedFn: (commitment: Commitment) => void = () => {};

package/src/service.test.ts

@@ -41,6 +41,8 @@ it("service.checkCommitment - 200 - resolved good data", async () => {
     message: "waiting for sms",
     status: "waiting",
     commitment_id: "sample_commitment_id",
+  }, {
+    'Retry-After': '5'
   });
 
   const status = await my.checkCommitment("sample_commitment_id");
@@ -48,6 +50,7 @@ it("service.checkCommitment - 200 - resolved good data", async () => {
   expect(status).toMatchObject({
     message: "waiting for sms",
     status: "waiting",
+    retry_after: 5000,
     commitment_id: "sample_commitment_id",
   });
 });

package/src/service.ts

@@ -5,6 +5,7 @@ interface CustomResponse {
 
 interface SuccessResponse<T> extends CustomResponse {
   error: false;
+  retry_after: number;
   message: null;
   data: T;
 }
@@ -41,6 +42,28 @@ export type Fetcher = (
   init?: RequestInit,
 ) => Promise<Response>;
 
+function randomBetween(min: number, max: number) {
+  return Math.floor(Math.random() * (max - min + 1)) + min;
+}
+
+function parseRetryAfter(retryAfter: string | undefined | null | number): number {
+  let retryAfterParsed = 0;
+
+  if (!retryAfter) {
+    return retryAfterParsed;
+  }
+
+  const retryAfterSeconds = typeof retryAfter === 'number' ? retryAfter : parseInt(retryAfter, 10);
+
+  if (!isNaN(retryAfterSeconds) && isFinite(retryAfterSeconds)) {
+    retryAfterParsed = retryAfterSeconds * 1000;
+  } else {
+    retryAfterParsed = 0;
+  }
+
+  return retryAfterParsed;
+}
+
 async function request<T = unknown>(
   path: string,
   req: RequestInit,
@@ -49,9 +72,11 @@ async function request<T = unknown>(
   try {
     const response = await fetcher(new Request(path, req));
     if (response.ok) {
+      const retryAfter = response.headers.get('Retry-After');
       return {
         status: response.status,
         error: false,
+        retry_after: parseRetryAfter(response.headers.get('Retry-After')),
         data: (await parseResponse(response)) as T,
       } as ResponseDTO<T>;
     }
@@ -68,6 +93,7 @@ async function request<T = unknown>(
           "message" in errorPayload
         ? errorPayload.message
         : response.statusText,
+      retry_after: parseRetryAfter(response.headers.get('Retry-After')),
       data: null,
     } as ResponseDTO<T>;
   } catch (error) {
@@ -75,6 +101,7 @@ async function request<T = unknown>(
       status: 500,
       error: true,
       message: error instanceof Error ? error.message : `${error}`,
+      retry_after: randomBetween(10_000, 30_000),
       data: null,
     } as ErrorResponse;
   }
@@ -98,6 +125,7 @@ export interface ICommitmentStatus {
   commitment_id: string;
   status: string;
   message: string;
+  retry_after?: number;
 }
 
 export class Service {
@@ -177,6 +205,11 @@ export class Service {
       throw new Error("Bad response");
     }
 
-    return response.data;
+    return {
+      commitment_id: response.data.commitment_id,
+      message: response.data.message,
+      status: response.data.status,
+      retry_after: response.retry_after
+    };
   }
 }