@tineon/t9n 0.1.6 → 0.1.8

package/dist/index.d.ts

@@ -6,10 +6,12 @@ export declare class T9nCheckout {
     private sessionId;
     private intervalId?;
     private statusPollId?;
+    private closeTimeoutId?;
     private expiresAt?;
     private isOpen;
     private lastResultFailed;
     private hasAttemptedConfirm;
+    private skipCloseMark;
     private successNotified;
     private failureNotified;
     constructor(config: CheckoutConfig);
@@ -29,6 +31,7 @@ export declare class T9nCheckout {
     private assertSecureConfig;
     private applyButtonStyle;
     private applyButtonTheme;
+    private scheduleAutoClose;
     private normalizeStatus;
     private markFailed;
     private markClosed;

package/dist/index.js

@@ -8,6 +8,7 @@ export class T9nCheckout {
         this.isOpen = false;
         this.lastResultFailed = false;
         this.hasAttemptedConfirm = false;
+        this.skipCloseMark = false;
         this.successNotified = false;
         this.failureNotified = false;
         this.cfg = checkoutConfigSchema.parse(config);
@@ -73,16 +74,23 @@ export class T9nCheckout {
         }
     }
     close() {
+        if (this.closeTimeoutId) {
+            window.clearTimeout(this.closeTimeoutId);
+            this.closeTimeoutId = undefined;
+        }
         if (this.intervalId)
             window.clearInterval(this.intervalId);
         if (this.statusPollId)
             window.clearInterval(this.statusPollId);
-        if (this.lastResultFailed && this.sessionId) {
-            void this.markFailed();
-        }
-        else if (!this.hasAttemptedConfirm && this.sessionId) {
-            void this.markClosed();
+        if (!this.skipCloseMark) {
+            if (this.lastResultFailed && this.sessionId) {
+                void this.markFailed();
+            }
+            else if (!this.hasAttemptedConfirm && this.sessionId) {
+                void this.markClosed();
+            }
         }
+        this.skipCloseMark = false;
         this.modal?.close();
         this.modal = undefined;
         this.sessionId = "";
@@ -178,46 +186,83 @@ export class T9nCheckout {
     async confirmPayment() {
         this.hasAttemptedConfirm = true;
         this.modal?.setConfirmPending(true);
-        const res = await this.fetchWithTimeout(`${this.getApiBaseUrl()}/api/merchant/checkout/sessions/${this.sessionId}/confirm-payment`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-                "x-public-key": this.cfg.publicKey,
-            },
-            body: "{}",
-        });
-        if (!res.ok) {
+        try {
+            const res = await this.fetchWithTimeout(`${this.getApiBaseUrl()}/api/merchant/checkout/sessions/${this.sessionId}/confirm-payment`, {
+                method: "POST",
+                headers: {
+                    "Content-Type": "application/json",
+                    "x-public-key": this.cfg.publicKey,
+                },
+                body: "{}",
+            });
+            if (!res.ok) {
+                this.modal?.setConfirmPending(false);
+                this.modal?.showResult("failed", "Verification failed. Please try again.");
+                this.lastResultFailed = true;
+                this.modal?.setConfirmLabel("Retry check");
+                this.emitStatus("failed");
+                this.emitFailOnce({ sessionId: this.sessionId || undefined, error: "confirm request failed" });
+                return;
+            }
+            let payload = {};
+            try {
+                payload = (await res.json());
+            }
+            catch (_) {
+                this.modal?.setConfirmPending(false);
+                this.modal?.showResult("failed", "Verification failed. Please try again.");
+                this.lastResultFailed = true;
+                this.modal?.setConfirmLabel("Retry check");
+                this.emitStatus("failed");
+                this.emitFailOnce({ sessionId: this.sessionId || undefined, error: "invalid confirm response" });
+                return;
+            }
             this.modal?.setConfirmPending(false);
+            const normalized = this.normalizeStatus(payload.status || "");
+            this.emitStatus(normalized);
+            if (normalized === "settled") {
+                this.modal?.setConfirmLabel("I have made the payment");
+                this.modal?.showResult("success", "Payment received successfully.");
+                this.lastResultFailed = false;
+                this.emitSuccessOnce({ sessionId: this.sessionId, status: payload.status || "settled" });
+                return;
+            }
+            if (normalized === "expired") {
+                this.modal?.showResult("failed", "This session has expired.");
+                this.lastResultFailed = false;
+                this.emitFailOnce({ sessionId: this.sessionId, error: "checkout expired" });
+                this.scheduleAutoClose();
+                return;
+            }
+            if (normalized === "failed") {
+                this.modal?.showResult("failed", "Payment failed. Please try again.");
+                this.lastResultFailed = true;
+                this.modal?.setConfirmLabel("Retry check");
+                this.emitFailOnce({ sessionId: this.sessionId || undefined, error: "checkout failed" });
+                return;
+            }
+            if (normalized === "closed") {
+                this.modal?.showResult("failed", "Checkout was closed. Please try again.");
+                this.lastResultFailed = true;
+                this.modal?.setConfirmLabel("Retry check");
+                this.emitFailOnce({ sessionId: this.sessionId || undefined, error: "checkout closed" });
+                return;
+            }
             this.modal?.showResult("failed", "No payment detected yet. Please try again.");
             this.lastResultFailed = true;
             this.modal?.setConfirmLabel("Retry check");
-            this.emitStatus("pending_confirmation");
-            this.emitFailOnce({ sessionId: this.sessionId || undefined, error: "confirm request failed" });
-            throw new Error("T9N: failed to confirm payment");
+            this.emitFailOnce({ sessionId: this.sessionId || undefined, error: "payment not detected" });
         }
-        const payload = (await res.json());
-        this.modal?.setConfirmPending(false);
-        const normalized = this.normalizeStatus(payload.status);
-        this.emitStatus(normalized);
-        if (payload.status === "pending" ||
-            payload.status === "processing" ||
-            normalized === "pending_confirmation" ||
-            normalized === "awaiting_payment") {
-            this.modal?.showResult("failed", "No payment detected yet. Please try again.");
+        catch (err) {
+            this.modal?.setConfirmPending(false);
+            this.modal?.showResult("failed", "Verification failed. Please try again.");
             this.lastResultFailed = true;
             this.modal?.setConfirmLabel("Retry check");
-            return;
-        }
-        this.modal?.setConfirmLabel("I have made the payment");
-        if (payload.status === "settled") {
-            this.modal?.showResult("success", "Payment received successfully.");
-            this.lastResultFailed = false;
-            this.emitSuccessOnce({ sessionId: this.sessionId, status: payload.status });
-        }
-        if (payload.status === "expired") {
-            this.modal?.showResult("failed", "This session has expired.");
-            this.lastResultFailed = true;
-            this.emitFailOnce({ sessionId: this.sessionId, error: "checkout expired" });
+            this.emitStatus("failed");
+            this.emitFailOnce({
+                sessionId: this.sessionId || undefined,
+                error: err?.message || "confirm request failed",
+            });
         }
     }
     startTimer() {
@@ -227,8 +272,14 @@ export class T9nCheckout {
             const ms = this.expiresAt.getTime() - Date.now();
             if (ms <= 0) {
                 this.modal?.setTimer("00:00");
-                this.modal?.setStatus("Session expired");
-                this.close();
+                if (this.intervalId)
+                    window.clearInterval(this.intervalId);
+                if (this.statusPollId)
+                    window.clearInterval(this.statusPollId);
+                this.modal?.showResult("failed", "This session has expired.");
+                this.lastResultFailed = false;
+                this.emitFailOnce({ sessionId: this.sessionId || undefined, error: "checkout expired" });
+                this.scheduleAutoClose();
                 return;
             }
             const minutes = Math.floor(ms / 60000)
@@ -275,17 +326,19 @@ export class T9nCheckout {
                         if (this.hasAttemptedConfirm) {
                             this.modal?.showResult("failed", "No payment detected yet. Please try again.");
                             this.lastResultFailed = true;
+                            this.emitFailOnce({ sessionId: this.sessionId || undefined, error: "payment not detected" });
                         }
                     }
                 }
                 if (payload.status === "expired") {
                     this.modal?.showResult("failed", "This session has expired.");
-                    this.lastResultFailed = true;
+                    this.lastResultFailed = false;
                     if (this.intervalId)
                         window.clearInterval(this.intervalId);
                     if (this.statusPollId)
                         window.clearInterval(this.statusPollId);
                     this.emitFailOnce({ sessionId: this.sessionId, error: "checkout expired" });
+                    this.scheduleAutoClose();
                 }
             }
             catch (_) {
@@ -397,6 +450,16 @@ export class T9nCheckout {
                 break;
         }
     }
+    scheduleAutoClose(delayMs = 1200) {
+        this.skipCloseMark = true;
+        if (this.closeTimeoutId) {
+            window.clearTimeout(this.closeTimeoutId);
+        }
+        this.closeTimeoutId = window.setTimeout(() => {
+            if (this.isOpen)
+                this.close();
+        }, delayMs);
+    }
     normalizeStatus(value) {
         switch (value) {
             case "created":
@@ -404,6 +467,10 @@ export class T9nCheckout {
                 return "awaiting_payment";
             case "awaiting_payment":
             case "pending_confirmation":
+                return value;
+            case "pending":
+            case "processing":
+                return "pending_confirmation";
             case "closed":
             case "expired":
             case "settled":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tineon/t9n",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",