playttm 0.0.7 → 0.0.9

package/src/lib.ts

@@ -258,22 +258,143 @@ export class ThaiTicketMajor {
         }
     }
 
+
     /**
-     * Setup declarativeNetRequest session rules in Chrome Extension to set Referer header for API requests only.
-     */
-    /**
-     * Setup declarativeNetRequest session rules in Chrome Extension to set Referer headers accurately for each endpoint.
+     * Setup declarativeNetRequest session rules for Chrome Extension environment.
+     * Overrides forbidden headers (Referer, Origin) to bypass TTM and Kasikorn referrer checks.
+     * Uses excludedInitiatorDomains to NEVER alter requests made directly by tabs on thaiticketmajor.com.
      */
-    public static async setupExtensionRules(): Promise<void> {
+    public static async setupExtensionRules(context?: { k?: string; zone?: string; roundId?: string }): Promise<void> {
         if (typeof chrome === "undefined" || !chrome?.declarativeNetRequest?.updateSessionRules) {
             return;
         }
 
+        const fixedReferer = (context?.k && context?.zone && context?.roundId)
+            ? `https://booking.thaiticketmajor.com/booking/3m/fixed.php?k=${context.k}&zone=${context.zone}&round=${context.roundId}`
+            : "https://booking.thaiticketmajor.com/booking/3m/fixed.php";
+
+        const festivalReferer = (context?.k && context?.zone && context?.roundId)
+            ? `https://booking.thaiticketmajor.com/booking/3m/festival.php?k=${context.k}&zone=${context.zone}&round=${context.roundId}`
+            : "https://booking.thaiticketmajor.com/booking/3m/festival.php";
+
+        const enrollReferer = (context?.k && context?.zone && context?.roundId)
+            ? `https://booking.thaiticketmajor.com/booking/3m/enroll.php?k=${context.k}&zone=${context.zone}&round=${context.roundId}`
+            : "https://booking.thaiticketmajor.com/booking/3m/enroll.php";
+
+        const excludedDomains = ["booking.thaiticketmajor.com", "www.thaiticketmajor.com", "thaiticketmajor.com"];
+
         try {
-            const ruleIdsToRemove = [1001, 1002, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019];
+            const ruleIdsToRemove = [
+                1001, 1002, 1010, 1011, 1012, 1013, 1014, 1015, 1016, 1017, 1018, 1019,
+                1020, 1021, 1022, 1023
+            ];
             await chrome.declarativeNetRequest.updateSessionRules({
                 removeRuleIds: ruleIdsToRemove,
                 addRules: [
+                    {
+                        id: 1020,
+                        priority: 25,
+                        action: {
+                            type: chrome.declarativeNetRequest.RuleActionType?.MODIFY_HEADERS || "modifyHeaders",
+                            requestHeaders: [
+                                {
+                                    header: "Referer",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: fixedReferer,
+                                },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
+                            ],
+                        },
+                        condition: {
+                            urlFilter: "bookingseats.php",
+                            resourceTypes: [
+                                chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
+                            ],
+                            excludedInitiatorDomains: excludedDomains,
+                        },
+                    },
+                    {
+                        id: 1021,
+                        priority: 25,
+                        action: {
+                            type: chrome.declarativeNetRequest.RuleActionType?.MODIFY_HEADERS || "modifyHeaders",
+                            requestHeaders: [
+                                {
+                                    header: "Referer",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: fixedReferer,
+                                },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
+                            ],
+                        },
+                        condition: {
+                            urlFilter: "validateseat.php",
+                            resourceTypes: [
+                                chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
+                            ],
+                            excludedInitiatorDomains: excludedDomains,
+                        },
+                    },
+                    {
+                        id: 1022,
+                        priority: 25,
+                        action: {
+                            type: chrome.declarativeNetRequest.RuleActionType?.MODIFY_HEADERS || "modifyHeaders",
+                            requestHeaders: [
+                                {
+                                    header: "Referer",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: festivalReferer,
+                                },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
+                            ],
+                        },
+                        condition: {
+                            urlFilter: "bookingfestival.php",
+                            resourceTypes: [
+                                chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
+                            ],
+                            excludedInitiatorDomains: excludedDomains,
+                        },
+                    },
+                    {
+                        id: 1023,
+                        priority: 25,
+                        action: {
+                            type: chrome.declarativeNetRequest.RuleActionType?.MODIFY_HEADERS || "modifyHeaders",
+                            requestHeaders: [
+                                {
+                                    header: "Referer",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: enrollReferer,
+                                },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
+                            ],
+                        },
+                        condition: {
+                            urlFilter: "enroll_process.php",
+                            resourceTypes: [
+                                chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
+                            ],
+                            excludedInitiatorDomains: excludedDomains,
+                        },
+                    },
                     {
                         id: 1010,
                         priority: 20,
@@ -285,6 +406,11 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://booking.thaiticketmajor.com/booking/3m/orderenc_kbankqr.php",
                                 },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
                             ],
                         },
                         condition: {
@@ -292,6 +418,7 @@ export class ThaiTicketMajor {
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
                             ],
+                            excludedInitiatorDomains: excludedDomains,
                         },
                     },
                     {
@@ -305,6 +432,11 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://booking.thaiticketmajor.com/booking/3m/orderenc_kbankqr.php",
                                 },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
                             ],
                         },
                         condition: {
@@ -312,6 +444,7 @@ export class ThaiTicketMajor {
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
                             ],
+                            excludedInitiatorDomains: excludedDomains,
                         },
                     },
                     {
@@ -325,6 +458,11 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://booking.thaiticketmajor.com/booking/3m/paycfmall.php",
                                 },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
                             ],
                         },
                         condition: {
@@ -332,6 +470,7 @@ export class ThaiTicketMajor {
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
                             ],
+                            excludedInitiatorDomains: excludedDomains,
                         },
                     },
                     {
@@ -345,6 +484,11 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://booking.thaiticketmajor.com/booking/3m/paymentall.php",
                                 },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
                             ],
                         },
                         condition: {
@@ -352,6 +496,7 @@ export class ThaiTicketMajor {
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
                             ],
+                            excludedInitiatorDomains: excludedDomains,
                         },
                     },
                     {
@@ -365,6 +510,11 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://booking.thaiticketmajor.com/booking/3m/fixed.php",
                                 },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
                             ],
                         },
                         condition: {
@@ -372,6 +522,7 @@ export class ThaiTicketMajor {
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
                             ],
+                            excludedInitiatorDomains: excludedDomains,
                         },
                     },
                     {
@@ -385,13 +536,19 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://booking.thaiticketmajor.com/booking/3m/fixed.php",
                                 },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
                             ],
                         },
                         condition: {
-                            urlFilter: "enroll",
+                            urlFilter: "enroll.php",
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
                             ],
+                            excludedInitiatorDomains: excludedDomains,
                         },
                     },
                     {
@@ -405,6 +562,11 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://booking.thaiticketmajor.com/booking/3m/zones.php",
                                 },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
                             ],
                         },
                         condition: {
@@ -412,6 +574,7 @@ export class ThaiTicketMajor {
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
                             ],
+                            excludedInitiatorDomains: excludedDomains,
                         },
                     },
                     {
@@ -425,6 +588,11 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://kpaymentgateway.kasikornbank.com/",
                                 },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://kpaymentgateway.kasikornbank.com",
+                                },
                             ],
                         },
                         condition: {
@@ -432,6 +600,7 @@ export class ThaiTicketMajor {
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
                             ],
+                            excludedInitiatorDomains: excludedDomains,
                         },
                     },
                     {
@@ -445,6 +614,11 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://booking.thaiticketmajor.com/booking/3m/",
                                 },
+                                {
+                                    header: "Origin",
+                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
+                                    value: "https://booking.thaiticketmajor.com",
+                                },
                             ],
                         },
                         condition: {
@@ -452,6 +626,7 @@ export class ThaiTicketMajor {
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
                             ],
+                            excludedInitiatorDomains: excludedDomains,
                         },
                     },
                 ],
@@ -481,44 +656,64 @@ export class ThaiTicketMajor {
      * Step 1: ดึงรอบการแสดงทั้งหมดจากหน้าหลักคอนเสิร์ต
      */
     public async getRounds(eventUrl: string): Promise<RoundInfo[]> {
-        this.emitProgress("GET_ROUNDS", `Fetching rounds from ${eventUrl}`);
-
-        const response = await this.client.get(eventUrl, {
-            headers: {
-                ...this.defaultHeaders,
-                referer: "https://www.thaiticketmajor.com/all-event/",
-            },
+        this.emitProgress("GET_ROUNDS", `Fetching rounds from ${eventUrl}`, {
+            url: eventUrl,
+            requestPayload: null,
         });
 
-        const $ = cheerio.load(response.data);
-        const rounds: RoundInfo[] = [];
-
-        $("a[data-button]").each((_, el) => {
-            const link = $(el);
-            const href = link.attr("href") ?? "";
-            const onclick = link.attr("onclick") ?? "";
-            const dataUrl = link.attr("data-url") ?? "";
-            const dataHref = link.attr("data-href") ?? "";
-            const allLinkAttrs = `${href} ${onclick} ${dataUrl} ${dataHref}`;
-
-            const queryMatch = allLinkAttrs.match(/query=([0-9a-zA-Z_-]+)/);
-            const query = queryMatch ? queryMatch[1] : "";
-            const time = link.find(".item-show").text().trim();
-            const date = link.closest(".row").find(".date").text().trim();
-            const isDisabled = link.is(":disabled") || link.attr("disabled") !== undefined || !query;
-
-            rounds.push({
-                id: query || link.attr("data-button") || "",
-                label: `${date} ${time}`.trim(),
-                date,
-                time,
-                url: href,
-                query,
-                isDisabled,
+        try {
+            const response = await this.client.get(eventUrl, {
+                headers: {
+                    ...this.defaultHeaders,
+                    referer: "https://www.thaiticketmajor.com/all-event/",
+                },
+            });
+
+            const $ = cheerio.load(response.data);
+            const rounds: RoundInfo[] = [];
+
+            $("a[data-button]").each((_, el) => {
+                const link = $(el);
+                const href = link.attr("href") ?? "";
+                const onclick = link.attr("onclick") ?? "";
+                const dataUrl = link.attr("data-url") ?? "";
+                const dataHref = link.attr("data-href") ?? "";
+                const allLinkAttrs = `${href} ${onclick} ${dataUrl} ${dataHref}`;
+
+                const queryMatch = allLinkAttrs.match(/query=([0-9a-zA-Z_-]+)/);
+                const query = queryMatch ? queryMatch[1] : "";
+                const time = link.find(".item-show").text().trim();
+                const date = link.closest(".row").find(".date").text().trim();
+                const isDisabled = link.is(":disabled") || link.attr("disabled") !== undefined || !query;
+
+                rounds.push({
+                    id: query || link.attr("data-button") || "",
+                    label: `${date} ${time}`.trim(),
+                    date,
+                    time,
+                    url: href,
+                    query,
+                    isDisabled,
+                });
+            });
+
+            this.emitProgress("GET_ROUNDS_RES", `Found ${rounds.length} rounds`, {
+                url: eventUrl,
+                requestPayload: null,
+                responseStatus: response.status,
+                responseData: rounds,
             });
-        });
 
-        return rounds;
+            return rounds;
+        } catch (err: any) {
+            this.emitProgress("GET_ROUNDS_ERR", `Failed to fetch rounds: ${err.message}`, {
+                url: eventUrl,
+                requestPayload: null,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
@@ -529,113 +724,180 @@ export class ThaiTicketMajor {
             throw new Error("Query ID is missing. The selected round might be disabled or not open for sale yet.");
         }
 
-        this.emitProgress("VERIFY_CONDITION", `Verifying condition for query ${query}`);
-
-        const response = await this.client.post(
-            `${this.endpoint}/verify_checkcondition.php`,
-            new URLSearchParams({
-                rdagree: "1",
-                rdId: "",
-                autopopup: "",
-                query: query,
-            }),
-            { headers: this.defaultHeaders }
-        );
+        const url = `${this.endpoint}/verify_checkcondition.php`;
+        const payload = {
+            rdagree: "1",
+            rdId: "",
+            autopopup: "",
+            query: query,
+        };
+
+        this.emitProgress("VERIFY_CONDITION", `Verifying condition for query ${query}`, {
+            url,
+            requestPayload: payload,
+        });
+
+        try {
+            const response = await this.client.post(
+                url,
+                new URLSearchParams(payload),
+                { headers: this.defaultHeaders }
+            );
 
-        return response.data;
+            this.emitProgress("VERIFY_CONDITION_RES", `Condition check: ${response.data?.result ? "PASS" : "FAIL"}`, {
+                url,
+                requestPayload: payload,
+                responseStatus: response.status,
+                responseData: response.data,
+            });
+
+            return response.data;
+        } catch (err: any) {
+            this.emitProgress("VERIFY_CONDITION_ERR", `Condition check error: ${err.message}`, {
+                url,
+                requestPayload: payload,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
      * Step 3: ดึงข้อมูลโซน, Token (k, tk) และรอบการแสดง
      */
     public async getZones(query: string): Promise<{ k: string; tk: string; query: string; rounds: { id: string; label: string }[]; rawInputs: Record<string, string> }> {
-        this.emitProgress("GET_ZONES", `Fetching zone data and tokens for query ${query}`);
-
-        const response = await this.client.get(`${this.endpoint}/zones.php?query=${query}`, {
-            headers: this.defaultHeaders,
+        const url = `${this.endpoint}/zones.php?query=${query}`;
+        this.emitProgress("GET_ZONES", `Fetching zone data and tokens for query ${query}`, {
+            url,
+            requestPayload: { query },
         });
 
-        const $ = cheerio.load(response.data);
-        const rawInputs: Record<string, string> = {};
+        try {
+            const response = await this.client.get(url, {
+                headers: this.defaultHeaders,
+            });
+
+            const $ = cheerio.load(response.data);
+            const rawInputs: Record<string, string> = {};
 
-        $("#frm input[type='hidden']").each((_, el) => {
-            const name = $(el).attr("name");
-            const value = $(el).attr("value") ?? "";
-            if (name) {
-                rawInputs[name] = value;
-            }
-        });
+            $("#frm input[type='hidden']").each((_, el) => {
+                const name = $(el).attr("name");
+                const value = $(el).attr("value") ?? "";
+                if (name) {
+                    rawInputs[name] = value;
+                }
+            });
 
-        const rounds = $("#rdId option")
-            .filter((_, el) => !!$(el).attr("value"))
-            .map((_, el) => {
-                const opt = $(el);
-                return {
-                    id: opt.attr("value") ?? "",
-                    label: opt.text().trim(),
-                };
-            })
-            .get();
+            const rounds = $("#rdId option")
+                .filter((_, el) => !!$(el).attr("value"))
+                .map((_, el) => {
+                    const opt = $(el);
+                    return {
+                        id: opt.attr("value") ?? "",
+                        label: opt.text().trim(),
+                    };
+                })
+                .get();
+
+            const result = {
+                k: rawInputs["k"] || "",
+                tk: rawInputs["tk"] || "",
+                query,
+                rounds,
+                rawInputs,
+            };
+
+            this.emitProgress("GET_ZONES_RES", `Extracted tokens k=${result.k ? result.k.slice(0, 10) + '...' : 'none'} and ${rounds.length} rounds`, {
+                url,
+                requestPayload: { query },
+                responseStatus: response.status,
+                responseData: result,
+            });
 
-        return {
-            k: rawInputs["k"] || "",
-            tk: rawInputs["tk"] || "",
-            query,
-            rounds,
-            rawInputs,
-        };
+            return result;
+        } catch (err: any) {
+            this.emitProgress("GET_ZONES_ERR", `Failed to get zones: ${err.message}`, {
+                url,
+                requestPayload: { query },
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
      * Step 4: ตรวจสอบสถานะที่นั่งว่างของแต่ละโซน
      */
     public async getZoneAvailability(roundId: string, tk: string, k: string, query: string): Promise<ZoneItem[]> {
-        this.emitProgress("GET_ZONE_AVAIL", `Checking zone availability for round ${roundId}`);
-
-        const response = await this.client.get(`${this.endpoint}/zonesavail.php?round=${roundId}&tk=${tk}`, {
-            headers: {
-                ...this.defaultHeaders,
-                referer: `${this.endpoint}/zones.php?query=${query}`,
-            },
+        const url = `${this.endpoint}/zonesavail.php?round=${roundId}&tk=${tk}`;
+        this.emitProgress("GET_ZONE_AVAIL", `Checking zone availability for round ${roundId}`, {
+            url,
+            requestPayload: { roundId, tk, query },
         });
 
-        const $ = cheerio.load(response.data);
-        const zones: ZoneItem[] = [];
+        try {
+            const response = await this.client.get(url, {
+                headers: {
+                    ...this.defaultHeaders,
+                    referer: `${this.endpoint}/zones.php?query=${query}`,
+                },
+            });
+
+            const $ = cheerio.load(response.data);
+            const zones: ZoneItem[] = [];
 
-        $(".table tbody tr").each((_, el) => {
-            const row = $(el);
-            const zoneId = row.find("td:nth-child(1) a").attr("id") ?? "";
-            const onclick = row.attr("onclick") ?? "";
-            const match = onclick.match(/gonextstep\('([^']+)','([^']+)'/);
+            $(".table tbody tr").each((_, el) => {
+                const row = $(el);
+                const zoneId = row.find("td:nth-child(1) a").attr("id") ?? "";
+                const onclick = row.attr("onclick") ?? "";
+                const match = onclick.match(/gonextstep\('([^']+)','([^']+)'/);
 
-            const page = (match?.[1] ?? "") as "fixed.php" | "festival.php" | string;
-            const zoneValue = match?.[2] ?? "";
-            const statusText = row.find("td:nth-child(2) a").text().trim();
+                const page = (match?.[1] ?? "") as "fixed.php" | "festival.php" | string;
+                const zoneValue = match?.[2] ?? "";
+                const statusText = row.find("td:nth-child(2) a").text().trim();
 
-            let available = 0;
-            let isAvailable = false;
+                let available = 0;
+                let isAvailable = false;
 
-            if (statusText.toLowerCase() === "available") {
-                available = 1;
-                isAvailable = true;
-            } else {
-                const num = Number(statusText);
-                if (!Number.isNaN(num) && num > 0) {
-                    available = num;
+                if (statusText.toLowerCase() === "available") {
+                    available = 1;
                     isAvailable = true;
+                } else {
+                    const num = Number(statusText);
+                    if (!Number.isNaN(num) && num > 0) {
+                        available = num;
+                        isAvailable = true;
+                    }
                 }
-            }
 
-            zones.push({
-                id: zoneId,
-                value: zoneValue,
-                available,
-                page,
-                isAvailable,
+                zones.push({
+                    id: zoneId,
+                    value: zoneValue,
+                    available,
+                    page,
+                    isAvailable,
+                });
             });
-        });
 
-        return zones;
+            this.emitProgress("GET_ZONE_AVAIL_RES", `Found ${zones.length} zones (${zones.filter(z => z.isAvailable).length} available)`, {
+                url,
+                requestPayload: { roundId, tk, query },
+                responseStatus: response.status,
+                responseData: zones,
+            });
+
+            return zones;
+        } catch (err: any) {
+            this.emitProgress("GET_ZONE_AVAIL_ERR", `Failed to check zone availability: ${err.message}`, {
+                url,
+                requestPayload: { roundId, tk, query },
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     // --- Flow บัตรนั่ง (Fixed Seats) ---
@@ -644,33 +906,58 @@ export class ThaiTicketMajor {
      * Step 5 (Fixed): ดึงผังที่นั่งว่างและ form payload
      */
     public async getFixedSeats(k: string, zone: string, roundId: string): Promise<{ seats: SeatItem[]; form: Record<string, string> }> {
-        this.emitProgress("GET_FIXED_SEATS", `Fetching seat layout for zone ${zone}`);
-
-        const response = await this.client.get(`${this.endpoint}/fixed.php?k=${k}&zone=${zone}&round=${roundId}`, {
-            headers: this.defaultHeaders,
+        const url = `${this.endpoint}/fixed.php?k=${k}&zone=${zone}&round=${roundId}`;
+        this.emitProgress("GET_FIXED_SEATS", `Fetching seat layout for zone ${zone}`, {
+            url,
+            requestPayload: { k, zone, roundId },
         });
 
-        const $ = cheerio.load(response.data);
-        const seats: SeatItem[] = $("#tableseats .seatuncheck")
-            .map((_, el) => {
-                const seat = $(el);
-                return {
-                    id: seat.attr("id") ?? "",
-                    seat: seat.attr("data-seat") ?? "",
-                    seatk: seat.attr("data-seatk") ?? "",
-                };
-            })
-            .get();
-
-        const form: Record<string, string> = {};
-        $("#frmPayment input").each((_, el) => {
-            const name = $(el).attr("name");
-            if (name) {
-                form[name] = $(el).attr("value") ?? "";
-            }
-        });
+        try {
+            const response = await this.client.get(url, {
+                headers: this.defaultHeaders,
+            });
+
+            const $ = cheerio.load(response.data);
+            const seats: SeatItem[] = $("#tableseats .seatuncheck")
+                .map((_, el) => {
+                    const seat = $(el);
+                    return {
+                        id: seat.attr("id") ?? "",
+                        seat: seat.attr("data-seat") ?? "",
+                        seatk: seat.attr("data-seatk") ?? "",
+                    };
+                })
+                .get();
+
+            const form: Record<string, string> = {};
+            $("#frmPayment input").each((_, el) => {
+                const name = $(el).attr("name");
+                if (name) {
+                    form[name] = $(el).attr("value") ?? "";
+                }
+            });
 
-        return { seats, form };
+            this.emitProgress("GET_FIXED_SEATS_RES", `Found ${seats.length} available seats in zone ${zone}`, {
+                url,
+                requestPayload: { k, zone, roundId },
+                responseStatus: response.status,
+                responseData: {
+                    seatsCount: seats.length,
+                    seatsSample: seats.slice(0, 10),
+                    form,
+                },
+            });
+
+            return { seats, form };
+        } catch (err: any) {
+            this.emitProgress("GET_FIXED_SEATS_ERR", `Failed to get fixed seats: ${err.message}`, {
+                url,
+                requestPayload: { k, zone, roundId },
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
@@ -732,22 +1019,42 @@ export class ThaiTicketMajor {
             formData.append("seat", seatNo);
             formData.append("book_type", bookType);
 
-            const response = await this.client.post(
-                `${this.endpoint}/validateseat.php?k=${k}&zw=${zone}`,
-                formData.toString(),
-                {
-                    headers: {
-                        ...this.defaultHeaders,
-                        "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                        "x-requested-with": "XMLHttpRequest",
-                        referer: `${this.endpoint}/fixed.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
-                    },
-                }
-            );
+            const url = `${this.endpoint}/validateseat.php?k=${k}&zw=${zone}`;
+            const reqPayloadObj = Object.fromEntries(formData.entries());
+
+            try {
+                const response = await this.client.post(
+                    url,
+                    formData.toString(),
+                    {
+                        headers: {
+                            ...this.defaultHeaders,
+                            "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                            "x-requested-with": "XMLHttpRequest",
+                            referer: `${this.endpoint}/fixed.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
+                        },
+                    }
+                );
+
+                lastResponse = response.data;
+                this.emitProgress("VALIDATE_FIXED_SEATS_RES", `Seat validated (${currentSeat.seat}): ${lastResponse?.result ? "SUCCESS" : "FAIL"}`, {
+                    url,
+                    requestPayload: reqPayloadObj,
+                    responseStatus: response.status,
+                    responseData: lastResponse,
+                });
 
-            lastResponse = response.data;
-            if (!lastResponse.result) {
-                throw new Error(`Validate seat failed (${currentSeat.seat}): ${lastResponse.message || "Unknown error"}`);
+                if (!lastResponse.result) {
+                    throw new Error(`Validate seat failed (${currentSeat.seat}): ${lastResponse.message || "Unknown error"}`);
+                }
+            } catch (err: any) {
+                this.emitProgress("VALIDATE_FIXED_SEATS_ERR", `Validate seat failed (${currentSeat.seat}): ${err.message}`, {
+                    url,
+                    requestPayload: reqPayloadObj,
+                    responseStatus: err.response?.status,
+                    responseData: err.response?.data || err.message,
+                });
+                throw err;
             }
         }
 
@@ -800,25 +1107,45 @@ export class ThaiTicketMajor {
         bodyParams.set("inclvat", "");
         bodyParams.set("seatklist", seatklistvalue);
 
-        const response = await this.client.post(
-            `${this.endpoint}/bookingseats.php?k=${k}`,
-            bodyParams.toString(),
-            {
-                headers: {
-                    ...this.defaultHeaders,
-                    accept: "application/json, text/javascript, */*; q=0.01",
-                    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                    "x-requested-with": "XMLHttpRequest",
-                    referer: `${this.endpoint}/fixed.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
-                    origin: "https://booking.thaiticketmajor.com",
-                },
-            }
-        );
+        const url = `${this.endpoint}/bookingseats.php?k=${k}`;
+        const reqPayloadObj = Object.fromEntries(bodyParams.entries());
 
-        return {
-            data: response.data,
-            nextPayload: bodyParams,
-        };
+        try {
+            const response = await this.client.post(
+                url,
+                bodyParams.toString(),
+                {
+                    headers: {
+                        ...this.defaultHeaders,
+                        accept: "application/json, text/javascript, */*; q=0.01",
+                        "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                        "x-requested-with": "XMLHttpRequest",
+                        referer: `${this.endpoint}/fixed.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
+                        origin: "https://booking.thaiticketmajor.com",
+                    },
+                }
+            );
+
+            this.emitProgress("BOOK_FIXED_SEATS_RES", `Book fixed seats completed`, {
+                url,
+                requestPayload: reqPayloadObj,
+                responseStatus: response.status,
+                responseData: response.data,
+            });
+
+            return {
+                data: response.data,
+                nextPayload: bodyParams,
+            };
+        } catch (err: any) {
+            this.emitProgress("BOOK_FIXED_SEATS_ERR", `Booking seats error: ${err.message}`, {
+                url,
+                requestPayload: reqPayloadObj,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     // --- Flow บัตรยืน (Festival / Standing) ---
@@ -827,26 +1154,47 @@ export class ThaiTicketMajor {
      * Step 5 (Festival): ดึงข้อมูลหน้าบัตรยืน
      */
     public async getFestival(k: string, tk: string, query: string, zone: string, roundId: string): Promise<Record<string, string>> {
-        this.emitProgress("GET_FESTIVAL", `Fetching festival zone ${zone}`);
-
-        const response = await this.client.get(`${this.endpoint}/festival.php?k=${k}&zone=${zone}&round=${roundId}`, {
-            headers: {
-                ...this.defaultHeaders,
-                referer: `${this.endpoint}/zones.php?rdId=${roundId}&k=${k}&tk=${tk}&query=${query}`,
-            },
+        const url = `${this.endpoint}/festival.php?k=${k}&zone=${zone}&round=${roundId}`;
+        this.emitProgress("GET_FESTIVAL", `Fetching festival zone ${zone}`, {
+            url,
+            requestPayload: { k, tk, query, zone, roundId },
         });
 
-        const $ = cheerio.load(response.data);
-        const formData: Record<string, string> = {};
+        try {
+            const response = await this.client.get(url, {
+                headers: {
+                    ...this.defaultHeaders,
+                    referer: `${this.endpoint}/zones.php?rdId=${roundId}&k=${k}&tk=${tk}&query=${query}`,
+                },
+            });
+
+            const $ = cheerio.load(response.data);
+            const formData: Record<string, string> = {};
 
-        $("#frm input").each((_, el) => {
-            const name = $(el).attr("name");
-            if (name) {
-                formData[name] = $(el).attr("value") ?? "";
-            }
-        });
+            $("#frm input").each((_, el) => {
+                const name = $(el).attr("name");
+                if (name) {
+                    formData[name] = $(el).attr("value") ?? "";
+                }
+            });
 
-        return formData;
+            this.emitProgress("GET_FESTIVAL_RES", `Loaded festival form (${Object.keys(formData).length} fields)`, {
+                url,
+                requestPayload: { k, tk, query, zone, roundId },
+                responseStatus: response.status,
+                responseData: formData,
+            });
+
+            return formData;
+        } catch (err: any) {
+            this.emitProgress("GET_FESTIVAL_ERR", `Failed to get festival page: ${err.message}`, {
+                url,
+                requestPayload: { k, tk, query, zone, roundId },
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
@@ -862,21 +1210,39 @@ export class ThaiTicketMajor {
         };
 
         const formData = new URLSearchParams(preparePayload);
+        const url = `${this.endpoint}/validateseat.php?k=${k}&zw=${payload.zone}`;
 
-        const response = await this.client.post(
-            `${this.endpoint}/validateseat.php?k=${k}&zw=${payload.zone}`,
-            formData.toString(),
-            {
-                headers: {
-                    ...this.defaultHeaders,
-                    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                    "x-requested-with": "XMLHttpRequest",
-                    referer: `${this.endpoint}/festival.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
-                },
-            }
-        );
+        try {
+            const response = await this.client.post(
+                url,
+                formData.toString(),
+                {
+                    headers: {
+                        ...this.defaultHeaders,
+                        "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                        "x-requested-with": "XMLHttpRequest",
+                        referer: `${this.endpoint}/festival.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
+                    },
+                }
+            );
+
+            this.emitProgress("VALIDATE_FESTIVAL_RES", `Validate festival tickets: ${response.data?.result ? "SUCCESS" : "FAIL"}`, {
+                url,
+                requestPayload: preparePayload,
+                responseStatus: response.status,
+                responseData: response.data,
+            });
 
-        return response.data;
+            return response.data;
+        } catch (err: any) {
+            this.emitProgress("VALIDATE_FESTIVAL_ERR", `Validate festival error: ${err.message}`, {
+                url,
+                requestPayload: preparePayload,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
@@ -891,21 +1257,39 @@ export class ThaiTicketMajor {
         };
 
         const formData = new URLSearchParams(preparePayload);
+        const url = `${this.endpoint}/bookingfestival.php?k=${k}`;
 
-        const response = await this.client.post(
-            `${this.endpoint}/bookingfestival.php?k=${k}`,
-            formData.toString(),
-            {
-                headers: {
-                    ...this.defaultHeaders,
-                    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                    "x-requested-with": "XMLHttpRequest",
-                    referer: `${this.endpoint}/festival.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
-                },
-            }
-        );
+        try {
+            const response = await this.client.post(
+                url,
+                formData.toString(),
+                {
+                    headers: {
+                        ...this.defaultHeaders,
+                        "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                        "x-requested-with": "XMLHttpRequest",
+                        referer: `${this.endpoint}/festival.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
+                    },
+                }
+            );
+
+            this.emitProgress("BOOK_FESTIVAL_RES", `Book festival tickets completed`, {
+                url,
+                requestPayload: preparePayload,
+                responseStatus: response.status,
+                responseData: response.data,
+            });
 
-        return response.data;
+            return response.data;
+        } catch (err: any) {
+            this.emitProgress("BOOK_FESTIVAL_ERR", `Book festival error: ${err.message}`, {
+                url,
+                requestPayload: preparePayload,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     // --- Flow การลงทะเบียนผู้เข้าชม (Enrollment) ---
@@ -914,30 +1298,51 @@ export class ThaiTicketMajor {
      * Step 8 (Enroll): ดึง Form ลงทะเบียนผู้เข้าชม
      */
     public async enroll(k: string, zone: string, roundId: string, payload: URLSearchParams | string): Promise<Record<string, string>> {
-        this.emitProgress("GET_ENROLL", `Fetching enrollment form`);
+        const url = `${this.endpoint}/enroll.php?k=${k}&zone=${zone}&round=${roundId}`;
+        this.emitProgress("GET_ENROLL", `Fetching enrollment form`, {
+            url,
+            requestPayload: payload.toString(),
+        });
 
-        const response = await this.client.post(
-            `${this.endpoint}/enroll.php?k=${k}&zone=${zone}&round=${roundId}`,
-            payload.toString(),
-            {
-                headers: {
-                    ...this.defaultHeaders,
-                    referer: `${this.endpoint}/fixed.php?k=${k}&zone=${zone}&round=${roundId}`,
-                },
-            }
-        );
+        try {
+            const response = await this.client.post(
+                url,
+                payload.toString(),
+                {
+                    headers: {
+                        ...this.defaultHeaders,
+                        referer: `${this.endpoint}/fixed.php?k=${k}&zone=${zone}&round=${roundId}`,
+                    },
+                }
+            );
 
-        const $ = cheerio.load(response.data);
-        const formData: Record<string, string> = {};
+            const $ = cheerio.load(response.data);
+            const formData: Record<string, string> = {};
 
-        $("#form input, #form select").each((_, el) => {
-            const name = $(el).attr("name");
-            if (name) {
-                formData[name] = $(el).attr("value") ?? $(el).find("option:selected").attr("value") ?? "";
-            }
-        });
+            $("#form input, #form select").each((_, el) => {
+                const name = $(el).attr("name");
+                if (name) {
+                    formData[name] = $(el).attr("value") ?? $(el).find("option:selected").attr("value") ?? "";
+                }
+            });
 
-        return formData;
+            this.emitProgress("GET_ENROLL_RES", `Loaded enrollment form (${Object.keys(formData).length} fields)`, {
+                url,
+                requestPayload: payload.toString(),
+                responseStatus: response.status,
+                responseData: formData,
+            });
+
+            return formData;
+        } catch (err: any) {
+            this.emitProgress("GET_ENROLL_ERR", `Enroll form error: ${err.message}`, {
+                url,
+                requestPayload: payload.toString(),
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
@@ -948,7 +1353,11 @@ export class ThaiTicketMajor {
         payload: Record<string, any>,
         attendees: Attendee[]
     ): Promise<{ data: any; nextPayload: URLSearchParams }> {
-        this.emitProgress("ENROLL_PROCESS", `Submitting info for ${attendees.length} attendees`);
+        const url = `${this.endpoint}/enroll_process.php?k=${k}`;
+        this.emitProgress("ENROLL_PROCESS", `Submitting info for ${attendees.length} attendees`, {
+            url,
+            requestPayload: { attendeesCount: attendees.length, attendees },
+        });
 
         const formData = new URLSearchParams();
 
@@ -978,23 +1387,42 @@ export class ThaiTicketMajor {
             }
         }
 
-        const response = await this.client.post(
-            `${this.endpoint}/enroll_process.php?k=${k}`,
-            formData.toString(),
-            {
-                headers: {
-                    ...this.defaultHeaders,
-                    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                    "x-requested-with": "XMLHttpRequest",
-                    referer: `${this.endpoint}/enroll.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
-                },
-            }
-        );
+        const reqPayloadObj = Object.fromEntries(formData.entries());
 
-        return {
-            data: response.data,
-            nextPayload: formData,
-        };
+        try {
+            const response = await this.client.post(
+                url,
+                formData.toString(),
+                {
+                    headers: {
+                        ...this.defaultHeaders,
+                        "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                        "x-requested-with": "XMLHttpRequest",
+                        referer: `${this.endpoint}/enroll.php?k=${k}&zone=${payload.zone}&round=${payload.rdId}`,
+                    },
+                }
+            );
+
+            this.emitProgress("ENROLL_PROCESS_RES", `Enrollment processed successfully`, {
+                url,
+                requestPayload: reqPayloadObj,
+                responseStatus: response.status,
+                responseData: response.data,
+            });
+
+            return {
+                data: response.data,
+                nextPayload: formData,
+            };
+        } catch (err: any) {
+            this.emitProgress("ENROLL_PROCESS_ERR", `Enrollment error: ${err.message}`, {
+                url,
+                requestPayload: reqPayloadObj,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     // --- Flow การชำระเงิน (Payment) ---
@@ -1009,61 +1437,83 @@ export class ThaiTicketMajor {
         roundId: string,
         delayMs: number = 1000
     ): Promise<Record<string, string>> {
-        this.emitProgress("GET_PAYMENT_DETAILS", `Loading payment confirmation page`);
-
+        const url = `${this.endpoint}/paymentall.php?k=${k}`;
         const body = formData instanceof URLSearchParams ? formData.toString() : new URLSearchParams(formData).toString();
+        const reqPayloadObj = formData instanceof URLSearchParams ? Object.fromEntries(formData.entries()) : formData;
 
-        const response = await this.client.post(`${this.endpoint}/paymentall.php?k=${k}`, body, {
-            headers: {
-                ...this.defaultHeaders,
-                "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                "x-requested-with": "XMLHttpRequest",
-                referer: `${this.endpoint}/enroll.php?k=${k}&zone=${zone}&round=${roundId}`,
-            },
+        this.emitProgress("GET_PAYMENT_DETAILS", `Loading payment confirmation page`, {
+            url,
+            requestPayload: reqPayloadObj,
         });
 
-        const $ = cheerio.load(response.data);
-        const hiddenInputs: Record<string, string> = {};
+        try {
+            const response = await this.client.post(url, body, {
+                headers: {
+                    ...this.defaultHeaders,
+                    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                    "x-requested-with": "XMLHttpRequest",
+                    referer: `${this.endpoint}/enroll.php?k=${k}&zone=${zone}&round=${roundId}`,
+                },
+            });
 
-        $("#frm-confirm input").each((_, el) => {
-            const key = $(el).attr("name") ?? $(el).attr("id");
-            if (key) {
-                hiddenInputs[key] = $(el).val()?.toString() ?? "";
+            const $ = cheerio.load(response.data);
+            const hiddenInputs: Record<string, string> = {};
+
+            $("#frm-confirm input").each((_, el) => {
+                const key = $(el).attr("name") ?? $(el).attr("id");
+                if (key) {
+                    hiddenInputs[key] = $(el).val()?.toString() ?? "";
+                }
+            });
+
+            const addressForm = $("#frm-address");
+            if (addressForm.length > 0) {
+                const fname = addressForm.find("input[name='c_fname_m']").val()?.toString() ?? "";
+                const lname = addressForm.find("input[name='c_lname_m']").val()?.toString() ?? "";
+                const address = addressForm.find("textarea[name='c_address_m']").val()?.toString() ?? "";
+                const ctId = addressForm.find("select[name='c_ctCode'] option:selected").val()?.toString() ?? "";
+                const pvId = addressForm.find("select[name='c_pvId'] option:selected").val()?.toString() ?? "";
+                const amId = addressForm.find("select[name='c_amId'] option:selected").val()?.toString() ?? "";
+                const zipcode = addressForm.find("input[name='c_PostCode']").val()?.toString() ?? "";
+
+                let rawPhone = addressForm.find("input[name='c_ContactRecipient']").val()?.toString() ?? "";
+                if (rawPhone.startsWith("66")) {
+                    rawPhone = rawPhone.slice(2);
+                }
+                const phoneArea = addressForm.find("input[name='telephoneArea']").val()?.toString() ?? "66";
+
+                hiddenInputs["adr_fname"] = fname;
+                hiddenInputs["adr_lname"] = lname;
+                hiddenInputs["adr_address"] = address;
+                hiddenInputs["adr_ctId"] = ctId;
+                hiddenInputs["adr_pvId"] = pvId;
+                hiddenInputs["adr_amId"] = amId;
+                hiddenInputs["adr_zipcode"] = zipcode;
+                hiddenInputs["adr_mobile"] = rawPhone.replace(/(\d{2})(\d{3})(\d{4})/, "$1 $2 $3");
+                hiddenInputs["adr_mobilearea"] = phoneArea;
             }
-        });
 
-        const addressForm = $("#frm-address");
-        if (addressForm.length > 0) {
-            const fname = addressForm.find("input[name='c_fname_m']").val()?.toString() ?? "";
-            const lname = addressForm.find("input[name='c_lname_m']").val()?.toString() ?? "";
-            const address = addressForm.find("textarea[name='c_address_m']").val()?.toString() ?? "";
-            const ctId = addressForm.find("select[name='c_ctCode'] option:selected").val()?.toString() ?? "";
-            const pvId = addressForm.find("select[name='c_pvId'] option:selected").val()?.toString() ?? "";
-            const amId = addressForm.find("select[name='c_amId'] option:selected").val()?.toString() ?? "";
-            const zipcode = addressForm.find("input[name='c_PostCode']").val()?.toString() ?? "";
-
-            let rawPhone = addressForm.find("input[name='c_ContactRecipient']").val()?.toString() ?? "";
-            if (rawPhone.startsWith("66")) {
-                rawPhone = rawPhone.slice(2);
+            this.emitProgress("GET_PAYMENT_DETAILS_RES", `Loaded payment confirmation details (${Object.keys(hiddenInputs).length} fields)`, {
+                url,
+                requestPayload: reqPayloadObj,
+                responseStatus: response.status,
+                responseData: hiddenInputs,
+            });
+
+            if (delayMs > 0) {
+                await new Promise((resolve) => setTimeout(resolve, delayMs));
             }
-            const phoneArea = addressForm.find("input[name='telephoneArea']").val()?.toString() ?? "66";
-
-            hiddenInputs["adr_fname"] = fname;
-            hiddenInputs["adr_lname"] = lname;
-            hiddenInputs["adr_address"] = address;
-            hiddenInputs["adr_ctId"] = ctId;
-            hiddenInputs["adr_pvId"] = pvId;
-            hiddenInputs["adr_amId"] = amId;
-            hiddenInputs["adr_zipcode"] = zipcode;
-            hiddenInputs["adr_mobile"] = rawPhone.replace(/(\d{2})(\d{3})(\d{4})/, "$1 $2 $3");
-            hiddenInputs["adr_mobilearea"] = phoneArea;
-        }
 
-        if (delayMs > 0) {
-            await new Promise((resolve) => setTimeout(resolve, delayMs));
+            return hiddenInputs;
+        } catch (err: any) {
+            this.emitProgress("GET_PAYMENT_DETAILS_ERR", `Payment details error: ${err.message}`, {
+                url,
+                requestPayload: reqPayloadObj,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
         }
-
-        return hiddenInputs;
     }
 
     /**
@@ -1075,8 +1525,7 @@ export class ThaiTicketMajor {
         deliver: string = "1",
         payType: string = "KBQR"
     ): Promise<Record<string, string>> {
-        this.emitProgress("CONFIRM_PAYMENT", `Calculating total and confirming payment (${payType})`);
-
+        const url = `${this.endpoint}/paycfmall.php?k=${k}`;
         const cntTicket = parseInt(payload.cal_cntticket || "0", 10);
         const amountCode = parseFloat(payload.amountcode || "0");
         const deliverFee = parseFloat(payload.cal_deliverfee || payload.val_deliverfee || "80");
@@ -1095,6 +1544,11 @@ export class ThaiTicketMajor {
             cal_totalamount: Math.round(totalAmount).toString(),
         };
 
+        this.emitProgress("CONFIRM_PAYMENT", `Calculating total and confirming payment (${payType})`, {
+            url,
+            requestPayload: computedPayload,
+        });
+
         const formData = new URLSearchParams();
         for (const [key, value] of Object.entries(computedPayload)) {
             if (key !== "check-protect") {
@@ -1102,92 +1556,137 @@ export class ThaiTicketMajor {
             }
         }
 
-        const response = await this.client.post(`${this.endpoint}/paycfmall.php?k=${k}`, formData.toString(), {
-            headers: {
-                ...this.defaultHeaders,
-                "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                "x-requested-with": "XMLHttpRequest",
-                referer: `${this.endpoint}/paymentall.php?k=${k}`,
-            },
-        });
+        try {
+            const response = await this.client.post(url, formData.toString(), {
+                headers: {
+                    ...this.defaultHeaders,
+                    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                    "x-requested-with": "XMLHttpRequest",
+                    referer: `${this.endpoint}/paymentall.php?k=${k}`,
+                },
+            });
 
-        const $ = cheerio.load(response.data);
-        const nextJsonData: Record<string, string> = {};
+            const $ = cheerio.load(response.data);
+            const nextJsonData: Record<string, string> = {};
 
-        $("#payallfrm input[type='hidden']").each((_, el) => {
-            const name = $(el).attr("name");
-            const value = $(el).attr("value") ?? "";
-            if (name) {
-                nextJsonData[name] = value;
-            }
-        });
+            $("#payallfrm input[type='hidden']").each((_, el) => {
+                const name = $(el).attr("name");
+                const value = $(el).attr("value") ?? "";
+                if (name) {
+                    nextJsonData[name] = value;
+                }
+            });
+
+            this.emitProgress("CONFIRM_PAYMENT_RES", `Confirmed payment (Total: ฿${computedPayload.cal_totalamount})`, {
+                url,
+                requestPayload: computedPayload,
+                responseStatus: response.status,
+                responseData: nextJsonData,
+            });
 
-        return nextJsonData;
+            return nextJsonData;
+        } catch (err: any) {
+            this.emitProgress("CONFIRM_PAYMENT_ERR", `Payment confirmation error: ${err.message}`, {
+                url,
+                requestPayload: computedPayload,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
      * Step 12: ดึง payload เข้ารหัสสำหรับ KBank
      */
     public async orderEncKBankQR(k: string, payCfmData: Record<string, string>): Promise<Record<string, string>> {
-        this.emitProgress("ORDER_ENC_KBANK", `Encrypting order payload for KBank`);
+        const url = `${this.endpoint}/orderenc_kbankqr.php`;
+        this.emitProgress("ORDER_ENC_KBANK", `Encrypting order payload for KBank`, {
+            url,
+            requestPayload: payCfmData,
+        });
 
         const formData = new URLSearchParams(payCfmData);
 
-        const response = await this.client.post(`${this.endpoint}/orderenc_kbankqr.php`, formData.toString(), {
-            headers: {
-                ...this.defaultHeaders,
-                "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                "x-requested-with": "XMLHttpRequest",
-                referer: `${this.endpoint}/paycfmall.php?k=${k}`,
-            },
-        });
+        try {
+            const response = await this.client.post(url, formData.toString(), {
+                headers: {
+                    ...this.defaultHeaders,
+                    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                    "x-requested-with": "XMLHttpRequest",
+                    referer: `${this.endpoint}/paycfmall.php?k=${k}`,
+                },
+            });
 
-        this.emitProgress("ORDER_ENC_KBANK_RES", `Received orderenc_kbankqr.php response`, {
-            url: `${this.endpoint}/orderenc_kbankqr.php`,
-            requestPayload: payCfmData,
-            responseStatus: response.status,
-            responseData: response.data,
-        });
+            const $ = cheerio.load(response.data);
+            const kbankqrData: Record<string, string> = {};
 
-        const $ = cheerio.load(response.data);
-        const kbankqrData: Record<string, string> = {};
+            $("#kbankqr input[type='hidden']").each((_, el) => {
+                const name = $(el).attr("name");
+                const value = $(el).attr("value") ?? "";
+                if (name) {
+                    kbankqrData[name] = value;
+                }
+            });
 
-        $("#kbankqr input[type='hidden']").each((_, el) => {
-            const name = $(el).attr("name");
-            const value = $(el).attr("value") ?? "";
-            if (name) {
-                kbankqrData[name] = value;
-            }
-        });
+            this.emitProgress("ORDER_ENC_KBANK_RES", `Received orderenc_kbankqr.php response`, {
+                url,
+                requestPayload: payCfmData,
+                responseStatus: response.status,
+                responseData: Object.keys(kbankqrData).length > 0 ? kbankqrData : response.data,
+            });
 
-        return kbankqrData;
+            return kbankqrData;
+        } catch (err: any) {
+            this.emitProgress("ORDER_ENC_KBANK_ERR", `Order encrypt error: ${err.message}`, {
+                url,
+                requestPayload: payCfmData,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
      * Step 13: เรียก getkbankqr.php
      */
     public async getKBankQR(orderEncData: Record<string, string>): Promise<any> {
-        this.emitProgress("GET_KBANK_QR", `Calling KBank Gateway info`);
+        const url = `${this.endpoint}/getkbankqr.php`;
+        this.emitProgress("GET_KBANK_QR", `Calling KBank Gateway info`, {
+            url,
+            requestPayload: orderEncData,
+        });
 
         const formData = new URLSearchParams(orderEncData);
 
-        const response = await this.client.post(`${this.endpoint}/getkbankqr.php`, formData.toString(), {
-            headers: {
-                ...this.defaultHeaders,
-                "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                "x-requested-with": "XMLHttpRequest",
-                referer: `${this.endpoint}/orderenc_kbankqr.php`,
-            },
-        });
+        try {
+            const response = await this.client.post(url, formData.toString(), {
+                headers: {
+                    ...this.defaultHeaders,
+                    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                    "x-requested-with": "XMLHttpRequest",
+                    referer: `${this.endpoint}/orderenc_kbankqr.php`,
+                },
+            });
 
-        this.emitProgress("GET_KBANK_QR_RES", `Received getkbankqr.php response`, {
-            url: `${this.endpoint}/getkbankqr.php`,
-            requestPayload: orderEncData,
-            responseStatus: response.status,
-            responseData: response.data,
-        });
+            this.emitProgress("GET_KBANK_QR_RES", `Received getkbankqr.php response`, {
+                url,
+                requestPayload: orderEncData,
+                responseStatus: response.status,
+                responseData: response.data,
+            });
 
-        return response.data;
+            return response.data;
+        } catch (err: any) {
+            this.emitProgress("GET_KBANK_QR_ERR", `Get KBank QR error: ${err.message}`, {
+                url,
+                requestPayload: orderEncData,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
@@ -1197,8 +1696,6 @@ export class ThaiTicketMajor {
         orderEncData: Record<string, string>,
         kbankPayload: Record<string, any>
     ): Promise<{ orderId: string; apiKey: string }> {
-        this.emitProgress("PAYMENT_KBANK_QR", `Extracting KBank OrderID and API Key`);
-
         const preparePayload = {
             ...orderEncData,
             reasoncode: kbankPayload?.reasoncode,
@@ -1209,43 +1706,58 @@ export class ThaiTicketMajor {
             kbankqr_txExpiry: kbankPayload?.kbankqr_txExpiry,
         };
 
+        const url = `${this.endpoint}/payment_kbankqr.php`;
+        this.emitProgress("PAYMENT_KBANK_QR", `Extracting KBank OrderID and API Key`, {
+            url,
+            requestPayload: preparePayload,
+        });
+
         const formData = new URLSearchParams(preparePayload);
 
-        const response = await this.client.post(`${this.endpoint}/payment_kbankqr.php`, formData.toString(), {
-            headers: {
-                ...this.defaultHeaders,
-                "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-                "x-requested-with": "XMLHttpRequest",
-                referer: `${this.endpoint}/orderenc_kbankqr.php`,
-            },
-        });
+        try {
+            const response = await this.client.post(url, formData.toString(), {
+                headers: {
+                    ...this.defaultHeaders,
+                    "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+                    "x-requested-with": "XMLHttpRequest",
+                    referer: `${this.endpoint}/orderenc_kbankqr.php`,
+                },
+            });
 
-        this.emitProgress("PAYMENT_KBANK_QR_RES", `Received payment_kbankqr.php response`, {
-            url: `${this.endpoint}/payment_kbankqr.php`,
-            requestPayload: preparePayload,
-            responseStatus: response.status,
-            responseData: response.data,
-        });
+            const $ = cheerio.load(response.data);
+            const script = $("#kbankpost script[data-order-id]");
 
-        const $ = cheerio.load(response.data);
-        const script = $("#kbankpost script[data-order-id]");
+            const orderId = script.attr("data-order-id") ?? "";
+            const apiKey = script.attr("data-apikey") ?? "";
 
-        const orderId = script.attr("data-order-id") ?? "";
-        const apiKey = script.attr("data-apikey") ?? "";
+            this.emitProgress("PAYMENT_KBANK_QR_RES", `Received payment_kbankqr.php response (OrderID: ${orderId || "N/A"})`, {
+                url,
+                requestPayload: preparePayload,
+                responseStatus: response.status,
+                responseData: orderId && apiKey ? { orderId, apiKey, htmlSnippet: $("#kbankpost").html() } : response.data,
+            });
 
-        if (!orderId || !apiKey) {
-            throw new Error("Unable to extract KBank orderId or apiKey from response");
-        }
+            if (!orderId || !apiKey) {
+                throw new Error("Unable to extract KBank orderId or apiKey from response");
+            }
 
-        return { orderId, apiKey };
+            return { orderId, apiKey };
+        } catch (err: any) {
+            this.emitProgress("PAYMENT_KBANK_QR_ERR", `Payment KBank QR error: ${err.message}`, {
+                url,
+                requestPayload: preparePayload,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     /**
      * Step 15: ยิงตรง Kasikorn Bank Gateway เพื่อสร้าง ThaiQR Code
      */
     public async generateThaiQR(orderId: string, apiKey: string, amount: string | number): Promise<any> {
-        this.emitProgress("GENERATE_THAI_QR", `Requesting ThaiQR code from Kasikorn Bank`);
-
+        const url = "https://kpaymentgateway-services.kasikornbank.com/qr/v2/qr";
         const payload = {
             amount: amount,
             currency: "THB",
@@ -1254,15 +1766,37 @@ export class ThaiTicketMajor {
             sof: "ThaiQR",
         };
 
-        const response = await this.client.post("https://kpaymentgateway-services.kasikornbank.com/qr/v2/qr", payload, {
-            headers: {
-                ...this.defaultHeaders,
-                referer: "https://kpaymentgateway.kasikornbank.com/",
-                "x-api-key": apiKey,
-            },
+        this.emitProgress("GENERATE_THAI_QR", `Requesting ThaiQR code from Kasikorn Bank`, {
+            url,
+            requestPayload: payload,
         });
 
-        return response.data;
+        try {
+            const response = await this.client.post(url, payload, {
+                headers: {
+                    ...this.defaultHeaders,
+                    referer: "https://kpaymentgateway.kasikornbank.com/",
+                    "x-api-key": apiKey,
+                },
+            });
+
+            this.emitProgress("GENERATE_THAI_QR_RES", `Received ThaiQR from Kasikorn Bank`, {
+                url,
+                requestPayload: payload,
+                responseStatus: response.status,
+                responseData: response.data,
+            });
+
+            return response.data;
+        } catch (err: any) {
+            this.emitProgress("GENERATE_THAI_QR_ERR", `Kasikorn ThaiQR error: ${err.message}`, {
+                url,
+                requestPayload: payload,
+                responseStatus: err.response?.status,
+                responseData: err.response?.data || err.message,
+            });
+            throw err;
+        }
     }
 
     // ==========================================
@@ -1367,6 +1901,14 @@ export class ThaiTicketMajor {
 
         // 5. ดำเนินการตามประเภทโซน (Fixed vs Festival)
         if (targetZone.page === "fixed.php") {
+            if (this.inBrowser) {
+                await ThaiTicketMajor.setupExtensionRules({
+                    k: zoneData.k,
+                    zone: targetZone.value,
+                    roundId: targetPerformRound.id,
+                });
+            }
+
             const fixedData = await this.getFixedSeats(zoneData.k, targetZone.value, targetPerformRound.id);
             const availableSeats = fixedData.seats;
 
@@ -1412,6 +1954,14 @@ export class ThaiTicketMajor {
             }
         } else {
             // Festival Flow
+            if (this.inBrowser) {
+                await ThaiTicketMajor.setupExtensionRules({
+                    k: zoneData.k,
+                    zone: targetZone.value,
+                    roundId: targetPerformRound.id,
+                });
+            }
+
             const festivalForm = await this.getFestival(zoneData.k, zoneData.tk, selectedRound.query, targetZone.value, targetPerformRound.id);
 
             await this.validateFestivalSeats(zoneData.k, festivalForm, ticketCount);