playttm 0.0.5 → 0.0.6

package/dist/lib.d.ts

@@ -1,4 +1,8 @@
 export declare const isBrowserEnvironment: () => boolean;
+/**
+ * Extract transaction amount from EMVCo / ThaiQR payload (Tag 54)
+ */
+export declare const parseThaiQRAmount: (qrCode?: string) => string | null;
 export interface TTMConfig {
     cookies?: string;
     headers?: Record<string, string>;
@@ -81,12 +85,14 @@ export declare class ThaiTicketMajor {
     inBrowser: boolean;
     private rawCookies?;
     constructor(config?: TTMConfig);
+    static readonly BOT_PROTECTION_COOKIES: Set<string>;
     /**
      * Synchronize a cookie string into Chrome Extension's cookie store (chrome.cookies API).
+     * Automatically ignores bot protection cookies (Akamai _abck, bm_*, WAF) to prevent Access Denied (403) bans.
      */
     static syncCookiesToChrome(cookieString: string, domainUrl?: string): Promise<void>;
     /**
-     * Setup declarativeNetRequest session rules in Chrome Extension to set Referer and Origin headers
+     * Setup declarativeNetRequest session rules in Chrome Extension to set Referer header for API requests only.
      */
     static setupExtensionRules(): Promise<void>;
     syncCookies(domainUrl?: string): Promise<void>;

package/dist/lib.js

@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.displayQRCode = exports.ThaiTicketMajor = exports.isBrowserEnvironment = void 0;
+exports.displayQRCode = exports.ThaiTicketMajor = exports.parseThaiQRAmount = exports.isBrowserEnvironment = void 0;
 const axios_1 = __importDefault(require("axios"));
 const cheerio = __importStar(require("cheerio"));
 const axios_cookiejar_support_1 = require("axios-cookiejar-support");
@@ -64,6 +64,23 @@ const isBrowserEnvironment = () => {
     return false;
 };
 exports.isBrowserEnvironment = isBrowserEnvironment;
+/**
+ * Extract transaction amount from EMVCo / ThaiQR payload (Tag 54)
+ */
+const parseThaiQRAmount = (qrCode) => {
+    if (!qrCode)
+        return null;
+    const match = qrCode.match(/(?:^|[^0-9])54(\d{2})([0-9.]+)/);
+    if (match) {
+        const len = parseInt(match[1], 10);
+        const amountStr = match[2].substring(0, len);
+        if (!isNaN(parseFloat(amountStr))) {
+            return amountStr;
+        }
+    }
+    return null;
+};
+exports.parseThaiQRAmount = parseThaiQRAmount;
 // ==========================================
 // Main Library Class
 // ==========================================
@@ -109,6 +126,7 @@ class ThaiTicketMajor {
     }
     /**
      * Synchronize a cookie string into Chrome Extension's cookie store (chrome.cookies API).
+     * Automatically ignores bot protection cookies (Akamai _abck, bm_*, WAF) to prevent Access Denied (403) bans.
      */
     static syncCookiesToChrome(cookieString_1) {
         return __awaiter(this, arguments, void 0, function* (cookieString, domainUrl = "https://booking.thaiticketmajor.com") {
@@ -128,6 +146,11 @@ class ThaiTicketMajor {
                 const value = trimmed.substring(eqIndex + 1).trim();
                 if (!name)
                     continue;
+                // DO NOT overwrite Akamai / WAF bot tokens!
+                // Writing stale _abck or bm_* triggers Akamai Bot Protection -> Access Denied.
+                if (ThaiTicketMajor.BOT_PROTECTION_COOKIES.has(name.toLowerCase())) {
+                    continue;
+                }
                 try {
                     yield chrome.cookies.set({
                         url: domainUrl,
@@ -152,11 +175,11 @@ class ThaiTicketMajor {
         });
     }
     /**
-     * Setup declarativeNetRequest session rules in Chrome Extension to set Referer and Origin headers
+     * Setup declarativeNetRequest session rules in Chrome Extension to set Referer header for API requests only.
      */
     static setupExtensionRules() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+            var _a, _b, _c, _d, _e, _f, _g;
             if (typeof chrome === "undefined" || !((_a = chrome === null || chrome === void 0 ? void 0 : chrome.declarativeNetRequest) === null || _a === void 0 ? void 0 : _a.updateSessionRules)) {
                 return;
             }
@@ -175,20 +198,12 @@ class ThaiTicketMajor {
                                         operation: ((_c = chrome.declarativeNetRequest.HeaderOperation) === null || _c === void 0 ? void 0 : _c.SET) || "set",
                                         value: "https://booking.thaiticketmajor.com",
                                     },
-                                    {
-                                        header: "Origin",
-                                        operation: ((_d = chrome.declarativeNetRequest.HeaderOperation) === null || _d === void 0 ? void 0 : _d.SET) || "set",
-                                        value: "https://booking.thaiticketmajor.com",
-                                    },
                                 ],
                             },
                             condition: {
                                 urlFilter: "thaiticketmajor.com",
                                 resourceTypes: [
-                                    ((_e = chrome.declarativeNetRequest.ResourceType) === null || _e === void 0 ? void 0 : _e.XMLHTTPREQUEST) || "xmlhttprequest",
-                                    ((_f = chrome.declarativeNetRequest.ResourceType) === null || _f === void 0 ? void 0 : _f.SUB_FRAME) || "sub_frame",
-                                    ((_g = chrome.declarativeNetRequest.ResourceType) === null || _g === void 0 ? void 0 : _g.MAIN_FRAME) || "main_frame",
-                                    ((_h = chrome.declarativeNetRequest.ResourceType) === null || _h === void 0 ? void 0 : _h.OTHER) || "other",
+                                    ((_d = chrome.declarativeNetRequest.ResourceType) === null || _d === void 0 ? void 0 : _d.XMLHTTPREQUEST) || "xmlhttprequest",
                                 ],
                             },
                         },
@@ -196,11 +211,11 @@ class ThaiTicketMajor {
                             id: 1002,
                             priority: 1,
                             action: {
-                                type: ((_j = chrome.declarativeNetRequest.RuleActionType) === null || _j === void 0 ? void 0 : _j.MODIFY_HEADERS) || "modifyHeaders",
+                                type: ((_e = chrome.declarativeNetRequest.RuleActionType) === null || _e === void 0 ? void 0 : _e.MODIFY_HEADERS) || "modifyHeaders",
                                 requestHeaders: [
                                     {
                                         header: "Referer",
-                                        operation: ((_k = chrome.declarativeNetRequest.HeaderOperation) === null || _k === void 0 ? void 0 : _k.SET) || "set",
+                                        operation: ((_f = chrome.declarativeNetRequest.HeaderOperation) === null || _f === void 0 ? void 0 : _f.SET) || "set",
                                         value: "https://kpaymentgateway.kasikornbank.com/",
                                     },
                                 ],
@@ -208,8 +223,7 @@ class ThaiTicketMajor {
                             condition: {
                                 urlFilter: "kasikornbank.com",
                                 resourceTypes: [
-                                    ((_l = chrome.declarativeNetRequest.ResourceType) === null || _l === void 0 ? void 0 : _l.XMLHTTPREQUEST) || "xmlhttprequest",
-                                    ((_m = chrome.declarativeNetRequest.ResourceType) === null || _m === void 0 ? void 0 : _m.OTHER) || "other",
+                                    ((_g = chrome.declarativeNetRequest.ResourceType) === null || _g === void 0 ? void 0 : _g.XMLHTTPREQUEST) || "xmlhttprequest",
                                 ],
                             },
                         },
@@ -799,7 +813,7 @@ class ThaiTicketMajor {
      */
     quickBook(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const { eventUrl, roundIndex = 0, roundId, zoneId, ticketCount = 1, seatSelection = "random", attendees = [], deliveryType = "1", payType = "KBQR", paymentDelayMs = 1500, } = options;
             if (options.onProgress) {
                 this.onProgressCallback = options.onProgress;
@@ -928,7 +942,14 @@ class ThaiTicketMajor {
             const orderEncData = yield this.orderEncKBankQR(zoneData.k, payCfmData);
             const kbankInfo = yield this.getKBankQR(orderEncData);
             const kbankAuth = yield this.paymentKBankQR(orderEncData, kbankInfo);
-            const qrResult = yield this.generateThaiQR(kbankAuth.orderId, kbankAuth.apiKey, orderEncData.amount);
+            const targetAmount = orderEncData.transactionamount ||
+                orderEncData.totalamount ||
+                orderEncData.amount ||
+                payCfmData.amount ||
+                kbankInfo.totalamount ||
+                paymentAllData["cal_totalamount"] ||
+                "0";
+            const qrResult = yield this.generateThaiQR(kbankAuth.orderId, kbankAuth.apiKey, targetAmount);
             const qrRawCode = (qrResult === null || qrResult === void 0 ? void 0 : qrResult.paint_text) ||
                 (qrResult === null || qrResult === void 0 ? void 0 : qrResult.raw_qr_code) ||
                 (qrResult === null || qrResult === void 0 ? void 0 : qrResult.qr_code) ||
@@ -936,8 +957,14 @@ class ThaiTicketMajor {
                 ((_c = qrResult === null || qrResult === void 0 ? void 0 : qrResult.data) === null || _c === void 0 ? void 0 : _c.qr_code) ||
                 ((_d = qrResult === null || qrResult === void 0 ? void 0 : qrResult.data) === null || _d === void 0 ? void 0 : _d.raw_qr_code) ||
                 (typeof qrResult === "string" ? qrResult : "");
+            const qrAmount = (0, exports.parseThaiQRAmount)(qrRawCode);
+            const finalAmount = qrAmount ||
+                (targetAmount && targetAmount !== "0" ? targetAmount : null) ||
+                (qrResult === null || qrResult === void 0 ? void 0 : qrResult.amount) ||
+                ((_e = qrResult === null || qrResult === void 0 ? void 0 : qrResult.data) === null || _e === void 0 ? void 0 : _e.amount) ||
+                "0";
             const displayQR = (customTitle) => {
-                const title = customTitle || `ThaiQR Payment (KBank) - ยอดชำระ: ${orderEncData.amount || paymentAllData["cal_totalamount"]} บาท`;
+                const title = customTitle || `ThaiQR Payment (KBank) - ยอดชำระ: ${finalAmount} บาท`;
                 ThaiTicketMajor.displayQRCode(qrRawCode, title);
             };
             if (options.printQR !== false && qrRawCode) {
@@ -946,7 +973,7 @@ class ThaiTicketMajor {
             return {
                 success: true,
                 orderId: kbankAuth.orderId,
-                amount: orderEncData.amount || paymentAllData["cal_totalamount"],
+                amount: String(finalAmount),
                 qrRawCode,
                 qrData: qrResult,
                 displayQR,
@@ -957,7 +984,7 @@ class ThaiTicketMajor {
                     venue: paymentAllData["venue"],
                     zone: targetZone.value,
                     ticketCount,
-                    totalAmount: orderEncData.amount || paymentAllData["cal_totalamount"],
+                    totalAmount: String(finalAmount),
                     seats: summarySeats.length > 0 ? summarySeats : undefined,
                 },
                 rawPayload: {
@@ -989,5 +1016,24 @@ class ThaiTicketMajor {
     }
 }
 exports.ThaiTicketMajor = ThaiTicketMajor;
+ThaiTicketMajor.BOT_PROTECTION_COOKIES = new Set([
+    "_abck",
+    "bm_sz",
+    "ak_bmsc",
+    "bm_sv",
+    "bm_mi",
+    "hwwafsesid",
+    "hwwafsestime",
+    "__cf_bm",
+    "cf_clearance",
+    "_ga",
+    "_gid",
+    "_gcl_au",
+    "_fbp",
+    "_clck",
+    "_clsk",
+    "_ttp",
+    "_twpid",
+]);
 exports.displayQRCode = ThaiTicketMajor.displayQRCode;
 exports.default = ThaiTicketMajor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playttm",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Make HTML Metadata to JSON",
   "main": "dist/lib.js",
   "types": "dist/lib.d.ts",

package/src/lib.ts

@@ -18,6 +18,22 @@ export const isBrowserEnvironment = (): boolean => {
     return false;
 };
 
+/**
+ * Extract transaction amount from EMVCo / ThaiQR payload (Tag 54)
+ */
+export const parseThaiQRAmount = (qrCode?: string): string | null => {
+    if (!qrCode) return null;
+    const match = qrCode.match(/(?:^|[^0-9])54(\d{2})([0-9.]+)/);
+    if (match) {
+        const len = parseInt(match[1], 10);
+        const amountStr = match[2].substring(0, len);
+        if (!isNaN(parseFloat(amountStr))) {
+            return amountStr;
+        }
+    }
+    return null;
+};
+
 // ==========================================
 // Interfaces & Types
 // ==========================================
@@ -175,8 +191,29 @@ export class ThaiTicketMajor {
         }
     }
 
+    public static readonly BOT_PROTECTION_COOKIES = new Set([
+        "_abck",
+        "bm_sz",
+        "ak_bmsc",
+        "bm_sv",
+        "bm_mi",
+        "hwwafsesid",
+        "hwwafsestime",
+        "__cf_bm",
+        "cf_clearance",
+        "_ga",
+        "_gid",
+        "_gcl_au",
+        "_fbp",
+        "_clck",
+        "_clsk",
+        "_ttp",
+        "_twpid",
+    ]);
+
     /**
      * Synchronize a cookie string into Chrome Extension's cookie store (chrome.cookies API).
+     * Automatically ignores bot protection cookies (Akamai _abck, bm_*, WAF) to prevent Access Denied (403) bans.
      */
     public static async syncCookiesToChrome(cookieString: string, domainUrl: string = "https://booking.thaiticketmajor.com"): Promise<void> {
         if (typeof chrome === "undefined" || !chrome?.cookies?.set) {
@@ -194,6 +231,12 @@ export class ThaiTicketMajor {
             const value = trimmed.substring(eqIndex + 1).trim();
             if (!name) continue;
 
+            // DO NOT overwrite Akamai / WAF bot tokens!
+            // Writing stale _abck or bm_* triggers Akamai Bot Protection -> Access Denied.
+            if (ThaiTicketMajor.BOT_PROTECTION_COOKIES.has(name.toLowerCase())) {
+                continue;
+            }
+
             try {
                 await chrome.cookies.set({
                     url: domainUrl,
@@ -216,7 +259,7 @@ export class ThaiTicketMajor {
     }
 
     /**
-     * Setup declarativeNetRequest session rules in Chrome Extension to set Referer and Origin headers
+     * Setup declarativeNetRequest session rules in Chrome Extension to set Referer header for API requests only.
      */
     public static async setupExtensionRules(): Promise<void> {
         if (typeof chrome === "undefined" || !chrome?.declarativeNetRequest?.updateSessionRules) {
@@ -238,20 +281,12 @@ export class ThaiTicketMajor {
                                     operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
                                     value: "https://booking.thaiticketmajor.com",
                                 },
-                                {
-                                    header: "Origin",
-                                    operation: chrome.declarativeNetRequest.HeaderOperation?.SET || "set",
-                                    value: "https://booking.thaiticketmajor.com",
-                                },
                             ],
                         },
                         condition: {
                             urlFilter: "thaiticketmajor.com",
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
-                                chrome.declarativeNetRequest.ResourceType?.SUB_FRAME || "sub_frame",
-                                chrome.declarativeNetRequest.ResourceType?.MAIN_FRAME || "main_frame",
-                                chrome.declarativeNetRequest.ResourceType?.OTHER || "other",
                             ],
                         },
                     },
@@ -272,7 +307,6 @@ export class ThaiTicketMajor {
                             urlFilter: "kasikornbank.com",
                             resourceTypes: [
                                 chrome.declarativeNetRequest.ResourceType?.XMLHTTPREQUEST || "xmlhttprequest",
-                                chrome.declarativeNetRequest.ResourceType?.OTHER || "other",
                             ],
                         },
                     },
@@ -1234,7 +1268,16 @@ export class ThaiTicketMajor {
         const kbankInfo = await this.getKBankQR(orderEncData);
         const kbankAuth = await this.paymentKBankQR(orderEncData, kbankInfo);
 
-        const qrResult = await this.generateThaiQR(kbankAuth.orderId, kbankAuth.apiKey, orderEncData.amount);
+        const targetAmount =
+            orderEncData.transactionamount ||
+            orderEncData.totalamount ||
+            orderEncData.amount ||
+            payCfmData.amount ||
+            kbankInfo.totalamount ||
+            paymentAllData["cal_totalamount"] ||
+            "0";
+
+        const qrResult = await this.generateThaiQR(kbankAuth.orderId, kbankAuth.apiKey, targetAmount);
 
         const qrRawCode =
             qrResult?.paint_text ||
@@ -1245,8 +1288,16 @@ export class ThaiTicketMajor {
             qrResult?.data?.raw_qr_code ||
             (typeof qrResult === "string" ? qrResult : "");
 
+        const qrAmount = parseThaiQRAmount(qrRawCode);
+        const finalAmount =
+            qrAmount ||
+            (targetAmount && targetAmount !== "0" ? targetAmount : null) ||
+            qrResult?.amount ||
+            qrResult?.data?.amount ||
+            "0";
+
         const displayQR = (customTitle?: string) => {
-            const title = customTitle || `ThaiQR Payment (KBank) - ยอดชำระ: ${orderEncData.amount || paymentAllData["cal_totalamount"]} บาท`;
+            const title = customTitle || `ThaiQR Payment (KBank) - ยอดชำระ: ${finalAmount} บาท`;
             ThaiTicketMajor.displayQRCode(qrRawCode, title);
         };
 
@@ -1257,7 +1308,7 @@ export class ThaiTicketMajor {
         return {
             success: true,
             orderId: kbankAuth.orderId,
-            amount: orderEncData.amount || paymentAllData["cal_totalamount"],
+            amount: String(finalAmount),
             qrRawCode,
             qrData: qrResult,
             displayQR,
@@ -1268,7 +1319,7 @@ export class ThaiTicketMajor {
                 venue: paymentAllData["venue"],
                 zone: targetZone.value,
                 ticketCount,
-                totalAmount: orderEncData.amount || paymentAllData["cal_totalamount"],
+                totalAmount: String(finalAmount),
                 seats: summarySeats.length > 0 ? summarySeats : undefined,
             },
             rawPayload: {