pop-pay 0.3.2 → 0.4.0

package/dist/engine/injector.js

@@ -1,18 +1,18 @@
 "use strict";
 /**
- * PopBrowserInjector: CDP-based browser injector with iframe + Shadow DOM traversal.
+ * PopBrowserInjector: Playwright-based browser injector for payment and billing fields.
  *
  * Connects to an already-running Chromium browser (via --remote-debugging-port)
- * and auto-fills credit card fields on the active page — including fields inside
- * Stripe and other third-party payment iframes. Also fills billing detail fields
- * (name, address, email) that live in the main page frame.
+ * using playwright-core and auto-fills credit card fields across all frames.
  *
- * New in TS port: Shadow DOM piercing support.
+ * This version replaces the raw CDP WebSocket implementation with Playwright's
+ * connectOverCDP, providing better isolation and cross-origin iframe support.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PopBrowserInjector = exports.CITY_SELECTORS = exports.STATE_SELECTORS = exports.COUNTRY_SELECTORS = exports.PHONE_COUNTRY_CODE_SELECTORS = exports.PHONE_SELECTORS = exports.EMAIL_SELECTORS = exports.ZIP_SELECTORS = exports.STREET_SELECTORS = exports.FULL_NAME_SELECTORS = exports.LAST_NAME_SELECTORS = exports.FIRST_NAME_SELECTORS = exports.CVV_SELECTORS = exports.EXPIRY_SELECTORS = exports.CARD_NUMBER_SELECTORS = void 0;
 exports.ssrfValidateUrl = ssrfValidateUrl;
 exports.verifyDomainToctou = verifyDomainToctou;
+const playwright_core_1 = require("playwright-core");
 const known_processors_js_1 = require("./known-processors.js");
 // ---------------------------------------------------------------------------
 // ISO 3166-1 alpha-2 -> E.164 dial prefix
@@ -44,7 +44,7 @@ function nationalNumber(phoneE164, countryCode) {
     return phoneE164;
 }
 // ---------------------------------------------------------------------------
-// US state abbreviation -> full name (for dropdowns that use full names)
+// US state abbreviation -> full name
 // ---------------------------------------------------------------------------
 const US_STATE_CODES = {
     AL: "Alabama", AK: "Alaska", AZ: "Arizona", AR: "Arkansas",
@@ -62,7 +62,7 @@ const US_STATE_CODES = {
     WV: "West Virginia", WI: "Wisconsin", WY: "Wyoming",
 };
 // ---------------------------------------------------------------------------
-// CSS selectors for credit card fields across major payment providers
+// Selectors
 // ---------------------------------------------------------------------------
 exports.CARD_NUMBER_SELECTORS = [
     "input[autocomplete='cc-number']",
@@ -72,8 +72,8 @@ exports.CARD_NUMBER_SELECTORS = [
     "input[id*='card'][id*='number']",
     "input[placeholder*='Card number']",
     "input[placeholder*='card number']",
-    "input[data-elements-stable-field-name='cardNumber']", // Stripe Elements
-    "input.__PrivateStripeElement", // Stripe v2
+    "input[data-elements-stable-field-name='cardNumber']",
+    "input.__PrivateStripeElement",
 ];
 exports.EXPIRY_SELECTORS = [
     "input[autocomplete='cc-exp']",
@@ -83,7 +83,7 @@ exports.EXPIRY_SELECTORS = [
     "input[placeholder*='MM / YY']",
     "input[placeholder*='MM/YY']",
     "input[placeholder*='Expiry']",
-    "input[data-elements-stable-field-name='cardExpiry']", // Stripe Elements
+    "input[data-elements-stable-field-name='cardExpiry']",
 ];
 exports.CVV_SELECTORS = [
     "input[autocomplete='cc-csc']",
@@ -94,11 +94,8 @@ exports.CVV_SELECTORS = [
     "input[placeholder*='CVC']",
     "input[placeholder*='CVV']",
     "input[placeholder*='Security code']",
-    "input[data-elements-stable-field-name='cardCvc']", // Stripe Elements
+    "input[data-elements-stable-field-name='cardCvc']",
 ];
-// ---------------------------------------------------------------------------
-// CSS selectors for billing detail fields
-// ---------------------------------------------------------------------------
 exports.FIRST_NAME_SELECTORS = [
     "input[autocomplete='given-name']",
     "input[name='first_name']", "input[name='firstName']", "input[name='first-name']",
@@ -187,9 +184,6 @@ exports.CITY_SELECTORS = [
     "input[aria-label*='City']",
     "select[autocomplete='address-level2']", "select[name='city']",
 ];
-// ---------------------------------------------------------------------------
-// Known vendor domains (shared with guardrails)
-// ---------------------------------------------------------------------------
 const KNOWN_VENDOR_DOMAINS = {
     aws: ["amazonaws.com", "aws.amazon.com"],
     amazon: ["amazon.com", "amazon.co.uk", "amazon.co.jp"],
@@ -215,7 +209,6 @@ function ssrfValidateUrl(url) {
         if (!["http:", "https:"].includes(parsed.protocol)) {
             return "Only http/https URLs are allowed.";
         }
-        // Block private/reserved IPs
         const hostname = parsed.hostname;
         if (hostname === "localhost" ||
             hostname === "127.0.0.1" ||
@@ -225,7 +218,6 @@ function ssrfValidateUrl(url) {
             /^172\.(1[6-9]|2\d|3[01])\./.test(hostname) ||
             hostname === "[::1]" ||
             hostname.endsWith(".local")) {
-            // Allow localhost only for CDP URLs (checked separately)
             return "Private/reserved IP addresses are not allowed.";
         }
     }
@@ -235,7 +227,7 @@ function ssrfValidateUrl(url) {
     return null;
 }
 // ---------------------------------------------------------------------------
-// TOCTOU domain verification (shared between payment + billing injection)
+// TOCTOU domain verification
 // ---------------------------------------------------------------------------
 function verifyDomainToctou(pageUrl, approvedVendor) {
     if (!pageUrl || !approvedVendor)
@@ -251,7 +243,6 @@ function verifyDomainToctou(pageUrl, approvedVendor) {
     const vendorTokens = new Set(vendorLower.split(/[\s\-_./]+/).filter(Boolean));
     let domainOk = false;
     let vendorIsKnown = false;
-    // Check against KNOWN_VENDOR_DOMAINS using strict suffix matching
     for (const [knownVendor, knownDomains] of Object.entries(KNOWN_VENDOR_DOMAINS)) {
         if (vendorTokens.has(knownVendor) || knownVendor === vendorLower) {
             vendorIsKnown = true;
@@ -261,7 +252,6 @@ function verifyDomainToctou(pageUrl, approvedVendor) {
             break;
         }
     }
-    // Fallback for unknown vendors
     if (!domainOk && !vendorIsKnown) {
         const commonTlds = new Set(["com", "org", "net", "io", "co", "uk", "jp", "de", "fr"]);
         const domainLabels = new Set(actualDomain.split(".").filter((l) => !commonTlds.has(l)));
@@ -270,7 +260,6 @@ function verifyDomainToctou(pageUrl, approvedVendor) {
                 [...vendorTokens].some((tok) => tok.length >= 4 &&
                     [...domainLabels].some((label) => label.includes(tok)));
     }
-    // Payment processor passthrough
     if (!domainOk) {
         let userProcessors = [];
         try {
@@ -288,693 +277,445 @@ function verifyDomainToctou(pageUrl, approvedVendor) {
     return null;
 }
 // ---------------------------------------------------------------------------
-// CDP connection helper using raw WebSocket
-// ---------------------------------------------------------------------------
-async function fetchJSON(url) {
-    const resp = await fetch(url, { signal: AbortSignal.timeout(5000) });
-    return resp.json();
-}
-// Minimal WebSocket-based CDP client
-class CDPClient {
-    ws;
-    msgId = 0;
-    pending = new Map();
-    eventHandlers = new Map();
-    static async connect(wsUrl) {
-        const client = new CDPClient();
-        const { WebSocket } = await import("ws").catch(() => {
-            // Fallback: use global WebSocket if available (Node 21+)
-            return { WebSocket: globalThis.WebSocket };
-        });
-        return new Promise((resolve, reject) => {
-            const ws = new WebSocket(wsUrl);
-            client.ws = ws;
-            ws.onopen = () => resolve(client);
-            ws.onerror = (e) => reject(new Error(`CDP WebSocket error: ${e.message ?? e}`));
-            ws.onmessage = (event) => {
-                const data = typeof event.data === "string" ? event.data : event.data.toString();
-                const msg = JSON.parse(data);
-                if (msg.id !== undefined) {
-                    const p = client.pending.get(msg.id);
-                    if (p) {
-                        client.pending.delete(msg.id);
-                        if (msg.error)
-                            p.reject(new Error(msg.error.message));
-                        else
-                            p.resolve(msg.result);
-                    }
-                }
-                else if (msg.method) {
-                    const handlers = client.eventHandlers.get(msg.method);
-                    if (handlers)
-                        handlers.forEach((h) => h(msg.params));
-                }
-            };
-            ws.onclose = () => {
-                for (const p of client.pending.values()) {
-                    p.reject(new Error("CDP connection closed"));
-                }
-                client.pending.clear();
-            };
-        });
-    }
-    async send(method, params = {}) {
-        const id = ++this.msgId;
-        return new Promise((resolve, reject) => {
-            this.pending.set(id, { resolve, reject });
-            const msg = JSON.stringify({ id, method, params });
-            this.ws.send(msg);
-        });
-    }
-    on(event, handler) {
-        const handlers = this.eventHandlers.get(event) ?? [];
-        handlers.push(handler);
-        this.eventHandlers.set(event, handlers);
-    }
-    close() {
-        try {
-            this.ws.close();
-        }
-        catch { }
-    }
-}
-// ---------------------------------------------------------------------------
 // PopBrowserInjector
 // ---------------------------------------------------------------------------
 class PopBrowserInjector {
     cdpUrl;
-    headless;
-    constructor(cdpUrl = "http://localhost:9222", headless = false) {
+    defaultBillingInfo;
+    browser = null;
+    constructor(cdpUrl = "http://localhost:9222", billingInfoOrHeadless) {
         this.cdpUrl = cdpUrl;
-        this.headless = headless;
+        if (typeof billingInfoOrHeadless === "object") {
+            this.defaultBillingInfo = billingInfoOrHeadless;
+        }
     }
-    // ------------------------------------------------------------------
-    // Public API: inject payment info (card + billing)
-    // ------------------------------------------------------------------
-    async injectPaymentInfo(opts) {
+    /**
+     * Inject payment info into the current page.
+     * Supports both positional and object-based signatures for compatibility.
+     */
+    async injectPaymentInfo(optsOrCard, expiry, cvv, vendor, pageUrl, billingInfo) {
+        let cardNumber;
+        let exp;
+        let cv;
+        let vend;
+        let url;
+        let billing;
+        if (typeof optsOrCard === "object") {
+            cardNumber = optsOrCard.cardNumber;
+            exp = optsOrCard.expiry || optsOrCard.expirationDate || "";
+            cv = optsOrCard.cvv;
+            vend = optsOrCard.vendor || optsOrCard.approvedVendor || "";
+            url = optsOrCard.pageUrl || "";
+            billing = optsOrCard.billingInfo || billingInfo;
+        }
+        else {
+            cardNumber = optsOrCard;
+            exp = expiry || "";
+            cv = cvv || "";
+            vend = vendor || "";
+            url = pageUrl || "";
+            billing = billingInfo;
+        }
         const result = {
             cardFilled: false,
             billingFilled: false,
             blockedReason: "",
         };
         // TOCTOU guard
-        const blocked = verifyDomainToctou(opts.pageUrl ?? "", opts.approvedVendor ?? "");
+        const blocked = verifyDomainToctou(url, vend);
         if (blocked) {
             result.blockedReason = blocked;
             return result;
         }
-        const billingInfo = this.loadBillingInfo();
-        const hasBilling = Object.values(billingInfo).some((v) => v !== "");
-        let client = null;
+        const finalBilling = billing || this.defaultBillingInfo || this.loadBillingFromEnv();
+        const hasBilling = Object.values(finalBilling).some((v) => v !== "");
         try {
-            const target = await this.findBestTarget(opts.pageUrl);
-            if (!target?.webSocketDebuggerUrl) {
-                result.blockedReason = "no_target_found";
+            this.browser = await playwright_core_1.chromium.connectOverCDP(this.cdpUrl);
+            const page = this.findBestPage(this.browser);
+            if (!page) {
+                result.blockedReason = "no_active_page";
                 return result;
             }
-            client = await CDPClient.connect(target.webSocketDebuggerUrl);
-            // Enable DOM + Runtime
-            await client.send("Runtime.enable");
-            await client.send("DOM.enable");
-            await client.send("Page.enable");
+            await page.bringToFront();
             // Blackout mode
             const blackoutMode = (process.env.POP_BLACKOUT_MODE ?? "after").toLowerCase();
             if (blackoutMode === "before") {
-                await this.enableBlackout(client);
+                await this.enableBlackout(page);
             }
-            // Fill card fields across all frames (including iframes + shadow DOM)
-            result.cardFilled = await this.fillCardAcrossFrames(client, opts.cardNumber, opts.expirationDate, opts.cvv);
+            // Fill card fields across all frames
+            result.cardFilled = await this.fillAcrossFrames(page, cardNumber, exp, cv);
             // Fill billing fields
             if (hasBilling) {
-                const billingResult = await this.fillBillingAcrossFrames(client, billingInfo);
+                const billingResult = await this.fillBillingFields(page, finalBilling);
                 result.billingFilled = billingResult.filled.length > 0;
                 result.billingDetails = billingResult;
             }
             if (blackoutMode === "after") {
-                await this.enableBlackout(client);
+                await this.enableBlackout(page);
             }
             return result;
         }
         catch (err) {
-            process.stderr.write(`PopBrowserInjector error: ${err.message}\n`);
+            console.error(`PopBrowserInjector error: ${err.message}`);
             return result;
         }
         finally {
-            client?.close();
+            await this.close();
         }
     }
-    // ------------------------------------------------------------------
-    // Public API: inject billing info only (no card)
-    // ------------------------------------------------------------------
+    /**
+     * Internal method used by mcp-server.ts. Kept for compatibility but marked internal.
+     * @internal
+     */
     async injectBillingOnly(opts) {
-        const result = {
-            cardFilled: false,
-            billingFilled: false,
-            blockedReason: "",
-        };
+        const result = { cardFilled: false, billingFilled: false, blockedReason: "" };
         const blocked = verifyDomainToctou(opts.pageUrl ?? "", opts.approvedVendor ?? "");
         if (blocked) {
             result.blockedReason = blocked;
             return result;
         }
-        const billingInfo = this.loadBillingInfo();
-        let client = null;
+        const billing = this.defaultBillingInfo || this.loadBillingFromEnv();
         try {
-            const target = await this.findBestTarget(opts.pageUrl);
-            if (!target?.webSocketDebuggerUrl) {
-                result.blockedReason = "no_target_found";
+            this.browser = await playwright_core_1.chromium.connectOverCDP(this.cdpUrl);
+            const page = this.findBestPage(this.browser);
+            if (!page) {
+                result.blockedReason = "no_active_page";
                 return result;
             }
-            client = await CDPClient.connect(target.webSocketDebuggerUrl);
-            await client.send("Runtime.enable");
-            await client.send("DOM.enable");
-            const billingResult = await this.fillBillingAcrossFrames(client, billingInfo);
+            const billingResult = await this.fillBillingFields(page, billing);
             result.billingFilled = billingResult.filled.length > 0;
             result.billingDetails = billingResult;
             return result;
         }
         catch (err) {
-            process.stderr.write(`PopBrowserInjector billing error: ${err.message}\n`);
+            console.error(`PopBrowserInjector billing error: ${err.message}`);
             return result;
         }
         finally {
-            client?.close();
+            await this.close();
         }
     }
-    // ------------------------------------------------------------------
-    // Public API: page snapshot
-    // ------------------------------------------------------------------
-    async pageSnapshot(pageUrl) {
-        let client = null;
+    async pageSnapshot(url) {
         try {
-            const target = await this.findBestTarget(pageUrl);
-            if (!target?.webSocketDebuggerUrl)
+            this.browser = await playwright_core_1.chromium.connectOverCDP(this.cdpUrl);
+            const page = this.findBestPage(this.browser);
+            if (!page)
                 return null;
-            client = await CDPClient.connect(target.webSocketDebuggerUrl);
-            await client.send("Runtime.enable");
-            await client.send("DOM.enable");
-            await client.send("Page.enable");
-            // Get main frame info
-            const { result: titleResult } = await client.send("Runtime.evaluate", {
-                expression: "document.title",
-            });
-            const { result: urlResult } = await client.send("Runtime.evaluate", {
-                expression: "window.location.href",
-            });
-            const { result: htmlResult } = await client.send("Runtime.evaluate", {
-                expression: "document.documentElement.outerHTML",
-            });
-            // Get frame tree for iframe content
-            const { frameTree } = await client.send("Page.getFrameTree");
+            const title = await page.title();
+            const pageUrl = page.url();
+            const html = await page.content();
             const frames = [];
-            const collectFrames = async (tree) => {
-                if (tree.childFrames) {
-                    for (const child of tree.childFrames) {
-                        try {
-                            const { result: frameHtml } = await client.send("Runtime.evaluate", {
-                                expression: "document.documentElement.outerHTML",
-                                contextId: undefined, // Would need execution context for each frame
-                            });
-                            frames.push({ url: child.frame.url, html: frameHtml?.value ?? "" });
-                        }
-                        catch { }
-                        await collectFrames(child);
-                    }
+            for (const frame of page.frames()) {
+                if (frame === page.mainFrame())
+                    continue;
+                try {
+                    const frameHtml = await frame.content();
+                    frames.push({ url: frame.url(), html: frameHtml });
                 }
-            };
-            await collectFrames(frameTree);
-            return {
-                url: urlResult?.value ?? target.url,
-                title: titleResult?.value ?? target.title,
-                html: htmlResult?.value ?? "",
-                frames,
-            };
+                catch { }
+            }
+            return { url: pageUrl, title, html, frames };
         }
         catch (err) {
-            process.stderr.write(`PopBrowserInjector snapshot error: ${err.message}\n`);
+            console.error(`PopBrowserInjector snapshot error: ${err.message}`);
             return null;
         }
         finally {
-            client?.close();
+            await this.close();
         }
     }
+    async close() {
+        if (this.browser) {
+            try {
+                await this.browser.close();
+            }
+            catch { }
+            this.browser = null;
+        }
+    }
+    static maskedCard(cardNumber) {
+        const last4 = cardNumber.slice(-4);
+        return `****-****-****-${last4}`;
+    }
     // ------------------------------------------------------------------
-    // Internal: find the best CDP target (prefer checkout pages)
+    // Internal Helpers
     // ------------------------------------------------------------------
-    async findBestTarget(pageUrl) {
-        let targets;
-        try {
-            targets = await fetchJSON(`${this.cdpUrl}/json/list`);
-        }
-        catch {
-            return null;
-        }
-        const pageTargets = targets.filter((t) => t.type === "page");
-        if (pageTargets.length === 0)
+    findBestPage(browser) {
+        const CHECKOUT_KEYWORDS = ["checkout", "payment", "donate", "pay", "purchase", "order", "gateway", "cart"];
+        const allPages = browser.contexts().flatMap((ctx) => ctx.pages());
+        if (allPages.length === 0)
             return null;
-        const checkoutKeywords = [
-            "checkout", "payment", "donate", "pay", "purchase", "order", "gateway", "cart",
-        ];
-        // Prefer pages whose URL looks like a checkout/payment page
-        for (const t of pageTargets) {
-            const urlLower = t.url.toLowerCase();
-            if (checkoutKeywords.some((kw) => urlLower.includes(kw))) {
-                return t;
+        for (const page of allPages) {
+            const url = page.url().toLowerCase();
+            if (CHECKOUT_KEYWORDS.some((kw) => url.includes(kw))) {
+                return page;
             }
         }
-        // If pageUrl is provided, try to find a matching target
-        if (pageUrl) {
-            for (const t of pageTargets) {
-                if (t.url === pageUrl)
-                    return t;
-            }
-        }
-        // Fallback: last target
-        return pageTargets[pageTargets.length - 1];
+        return allPages[allPages.length - 1];
     }
-    // ------------------------------------------------------------------
-    // Internal: fill card fields across all frames (iframes + shadow DOM)
-    // ------------------------------------------------------------------
-    async fillCardAcrossFrames(client, cardNumber, expiry, cvv) {
+    async fillAcrossFrames(page, cardNumber, expiry, cvv) {
+        const allFrames = page.frames();
         let cardFilled = false;
-        // Get frame tree
-        const { frameTree } = await client.send("Page.getFrameTree");
-        // Process main frame
-        const mainFilled = await this.fillCardInContext(client, undefined, cardNumber, expiry, cvv);
-        if (mainFilled)
-            cardFilled = true;
-        // Process child frames (iframes)
-        const processFrame = async (tree) => {
-            if (tree.childFrames) {
-                for (const child of tree.childFrames) {
-                    try {
-                        // Create isolated world for cross-origin iframe access
-                        const { executionContextId } = await client.send("Page.createIsolatedWorld", { frameId: child.frame.id, worldName: "pop-pay-injector" });
-                        const filled = await this.fillCardInContext(client, executionContextId, cardNumber, expiry, cvv);
-                        if (filled)
-                            cardFilled = true;
-                    }
-                    catch {
-                        // Cross-origin frame access may fail — continue
-                    }
-                    await processFrame(child);
+        for (const frame of allFrames) {
+            try {
+                if (await this.fillInFrame(frame, cardNumber, expiry, cvv)) {
+                    cardFilled = true;
+                    // Keep going for expiry/CVV in sibling iframes (Stripe)
                 }
             }
-        };
-        await processFrame(frameTree);
-        // Shadow DOM piercing: search for shadow roots in main frame
-        const shadowFilled = await this.fillCardInShadowDom(client, cardNumber, expiry, cvv);
-        if (shadowFilled)
-            cardFilled = true;
+            catch { }
+        }
+        // Shadow DOM piercing fallback
+        if (!cardFilled) {
+            cardFilled = await this.fillCardInShadowDom(page, cardNumber, expiry, cvv);
+        }
         return cardFilled;
     }
-    // ------------------------------------------------------------------
-    // Internal: fill billing fields across all frames (iframes)
-    // ------------------------------------------------------------------
-    async fillBillingAcrossFrames(client, info) {
-        const result = {
-            filled: [],
-            failed: [],
-            skipped: [],
-        };
-        const merge = (frameResult) => {
-            result.filled.push(...frameResult.filled);
-            result.failed.push(...frameResult.failed);
-            result.skipped.push(...frameResult.skipped);
-        };
-        // Try main frame first
-        merge(await this.fillBillingFields(client, info, {}));
-        // Get frame tree
-        const { frameTree } = await client.send("Page.getFrameTree");
-        // Process child frames (iframes)
-        const processFrame = async (tree) => {
-            if (tree.childFrames) {
-                for (const child of tree.childFrames) {
-                    try {
-                        // Create isolated world for cross-origin iframe access
-                        const { executionContextId } = await client.send("Page.createIsolatedWorld", { frameId: child.frame.id, worldName: "pop-pay-billing-injector" });
-                        merge(await this.fillBillingFields(client, info, { contextId: executionContextId }));
-                    }
-                    catch {
-                        // Cross-origin frame access may fail — continue
-                    }
-                    await processFrame(child);
-                }
-            }
-        };
-        await processFrame(frameTree);
-        // Deduplicate: if a field was filled in any frame, remove from failed/skipped
-        result.filled = [...new Set(result.filled)];
-        result.failed = result.failed.filter((f) => !result.filled.some((filled) => f.startsWith(filled)));
-        result.skipped = result.skipped.filter((s) => !result.filled.includes(s));
-        return result;
-    }
-    // ------------------------------------------------------------------
-    // Internal: fill card fields in a single execution context
-    // ------------------------------------------------------------------
-    async fillCardInContext(client, contextId, cardNumber, expiry, cvv) {
-        const evalOpts = contextId !== undefined
-            ? { contextId }
-            : {};
-        // Try to fill card number
-        const cardSelector = exports.CARD_NUMBER_SELECTORS.join(", ");
-        const cardFilled = await this.fillInputViaEval(client, evalOpts, cardSelector, cardNumber);
-        if (!cardFilled)
+    async fillInFrame(frame, cardNumber, expiry, cvv) {
+        const cardLocator = await this.findVisibleLocator(frame, exports.CARD_NUMBER_SELECTORS);
+        if (!cardLocator)
             return false;
-        // Fill expiry
-        const expirySelector = exports.EXPIRY_SELECTORS.join(", ");
-        await this.fillInputViaEval(client, evalOpts, expirySelector, expiry);
-        // Fill CVV
-        const cvvSelector = exports.CVV_SELECTORS.join(", ");
-        await this.fillInputViaEval(client, evalOpts, cvvSelector, cvv);
+        await cardLocator.fill(cardNumber);
+        const expiryLocator = await this.findVisibleLocator(frame, exports.EXPIRY_SELECTORS);
+        if (expiryLocator)
+            await expiryLocator.fill(expiry);
+        const cvvLocator = await this.findVisibleLocator(frame, exports.CVV_SELECTORS);
+        if (cvvLocator)
+            await cvvLocator.fill(cvv);
         return true;
     }
-    // ------------------------------------------------------------------
-    // Internal: Shadow DOM piercing support (new feature!)
-    // ------------------------------------------------------------------
-    async fillCardInShadowDom(client, cardNumber, expiry, cvv) {
-        try {
-            const { result } = await client.send("Runtime.evaluate", {
-                expression: `
-          (function() {
-            function queryShadowAll(root, selectors) {
-              const results = [];
-              const selectorList = selectors.split(', ');
-              for (const sel of selectorList) {
-                const found = root.querySelector(sel);
-                if (found) results.push(found);
-              }
-              // Recurse into shadow roots
-              const allElements = root.querySelectorAll('*');
-              for (const el of allElements) {
-                if (el.shadowRoot) {
-                  results.push(...queryShadowAll(el.shadowRoot, selectors));
-                }
-              }
-              return results;
-            }
-
-            const cardSelectors = ${JSON.stringify(exports.CARD_NUMBER_SELECTORS.join(", "))};
-            const cardFields = queryShadowAll(document, cardSelectors);
-            return cardFields.length > 0;
-          })()
-        `,
-                returnByValue: true,
-            });
-            if (!result?.value)
-                return false;
-            // Found shadow DOM card fields — fill them
-            const { result: fillResult } = await client.send("Runtime.evaluate", {
-                expression: `
-          (function() {
-            function queryShadowFirst(root, selectors) {
-              const selectorList = selectors.split(', ');
-              for (const sel of selectorList) {
-                const found = root.querySelector(sel);
-                if (found) return found;
-              }
-              const allElements = root.querySelectorAll('*');
-              for (const el of allElements) {
-                if (el.shadowRoot) {
-                  const found = queryShadowFirst(el.shadowRoot, selectors);
-                  if (found) return found;
+    async findVisibleLocator(frame, selectors) {
+        for (const selector of selectors) {
+            try {
+                const locator = frame.locator(selector).first();
+                if (await locator.count() > 0) {
+                    return locator;
                 }
-              }
-              return null;
-            }
-
-            function fillField(root, selectors, value) {
-              const el = queryShadowFirst(root, selectors);
-              if (!el) return false;
-              const nativeSetter = Object.getOwnPropertyDescriptor(
-                HTMLInputElement.prototype, 'value'
-              ).set;
-              nativeSetter.call(el, value);
-              el.dispatchEvent(new Event('input', { bubbles: true }));
-              el.dispatchEvent(new Event('change', { bubbles: true }));
-              el.dispatchEvent(new Event('blur', { bubbles: true }));
-              return true;
-            }
-
-            const cardFilled = fillField(
-              document,
-              ${JSON.stringify(exports.CARD_NUMBER_SELECTORS.join(", "))},
-              ${JSON.stringify(cardNumber)}
-            );
-            if (cardFilled) {
-              fillField(document, ${JSON.stringify(exports.EXPIRY_SELECTORS.join(", "))}, ${JSON.stringify(expiry)});
-              fillField(document, ${JSON.stringify(exports.CVV_SELECTORS.join(", "))}, ${JSON.stringify(cvv)});
             }
-            return cardFilled;
-          })()
-        `,
-                returnByValue: true,
-            });
-            return fillResult?.value === true;
-        }
-        catch {
-            return false;
+            catch { }
         }
+        return null;
     }
-    // ------------------------------------------------------------------
-    // Internal: fill a single input field via Runtime.evaluate
-    // ------------------------------------------------------------------
-    async fillInputViaEval(client, evalOpts, selector, value) {
+    async fillCardInShadowDom(page, cardNumber, expiry, cvv) {
         try {
-            const { result } = await client.send("Runtime.evaluate", {
-                expression: `
-          (function() {
-            const el = document.querySelector(${JSON.stringify(selector)});
-            if (!el) return false;
-            // Use native setter to bypass framework interception
-            const proto = el.tagName === 'SELECT'
-              ? HTMLSelectElement.prototype
-              : HTMLInputElement.prototype;
-            const nativeSetter = Object.getOwnPropertyDescriptor(proto, 'value')?.set;
-            if (nativeSetter) {
-              nativeSetter.call(el, ${JSON.stringify(value)});
-            } else {
-              el.value = ${JSON.stringify(value)};
+            const script = `
+        ([cardNumber, expiry, cvv, cardSels, expSels, cvvSels]) => {
+          function queryShadowFirst(root, selectors) {
+            const selectorList = selectors.split(', ');
+            for (const sel of selectorList) {
+              const found = root.querySelector(sel);
+              if (found) return found;
             }
-            el.dispatchEvent(new Event('input', { bubbles: true }));
-            el.dispatchEvent(new Event('change', { bubbles: true }));
-            el.dispatchEvent(new FocusEvent('blur', { bubbles: true }));
-            return true;
-          })()
-        `,
-                returnByValue: true,
-                ...evalOpts,
-            });
-            return result?.value === true;
-        }
-        catch {
-            return false;
-        }
-    }
-    // ------------------------------------------------------------------
-    // Internal: select an option from a <select> dropdown
-    // ------------------------------------------------------------------
-    async selectOption(client, evalOpts, selector, value) {
-        try {
-            const { result } = await client.send("Runtime.evaluate", {
-                expression: `
-          (function() {
-            const el = document.querySelector(${JSON.stringify(selector)});
-            if (!el || el.tagName !== 'SELECT') return false;
-
-            const options = Array.from(el.options).map(o => ({
-              value: o.value, text: o.text.trim()
-            }));
-            const valueLower = ${JSON.stringify(value.toLowerCase())};
-
-            let matchedValue = null;
-            // Exact value match
-            for (const opt of options) {
-              if (opt.value.toLowerCase() === valueLower) { matchedValue = opt.value; break; }
-            }
-            // Exact text match
-            if (!matchedValue) {
-              for (const opt of options) {
-                if (opt.text.toLowerCase() === valueLower) { matchedValue = opt.value; break; }
-              }
-            }
-            // Partial match
-            if (!matchedValue) {
-              for (const opt of options) {
-                const optText = opt.text.toLowerCase();
-                const optVal = opt.value.toLowerCase();
-                if ((valueLower.includes(optText) || optText.includes(valueLower) ||
-                     valueLower.includes(optVal) || optVal.includes(valueLower)) && opt.value) {
-                  matchedValue = opt.value; break;
-                }
+            const allElements = root.querySelectorAll('*');
+            for (const el of allElements) {
+              if (el.shadowRoot) {
+                const found = queryShadowFirst(el.shadowRoot, selectors);
+                if (found) return found;
               }
             }
-            if (!matchedValue) return false;
+            return null;
+          }
 
-            // Native setter trick for React/Angular/Vue/Zoho
+          function fillField(root, selectors, value) {
+            const el = queryShadowFirst(root, selectors);
+            if (!el) return false;
             const nativeSetter = Object.getOwnPropertyDescriptor(
-              HTMLSelectElement.prototype, 'value'
+              HTMLInputElement.prototype, 'value'
             ).set;
-            nativeSetter.call(el, matchedValue);
-
-            el.dispatchEvent(new FocusEvent('focusin', { bubbles: true }));
-            el.dispatchEvent(new FocusEvent('focus', { bubbles: false }));
-            el.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }));
-            el.dispatchEvent(new MouseEvent('mouseup', { bubbles: true }));
-            el.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+            if (nativeSetter) {
+              nativeSetter.call(el, value);
+            } else {
+              el.value = value;
+            }
             el.dispatchEvent(new Event('input', { bubbles: true }));
             el.dispatchEvent(new Event('change', { bubbles: true }));
-            el.dispatchEvent(new FocusEvent('blur', { bubbles: false }));
-            el.dispatchEvent(new FocusEvent('focusout', { bubbles: true }));
+            el.dispatchEvent(new Event('blur', { bubbles: true }));
+            return true;
+          }
 
-            return el.value === matchedValue;
-          })()
-        `,
-                returnByValue: true,
-                ...evalOpts,
-            });
-            return result?.value === true;
+          const cardFilled = fillField(document, cardSels, cardNumber);
+          if (cardFilled) {
+            fillField(document, expSels, expiry);
+            fillField(document, cvvSels, cvv);
+          }
+          return cardFilled;
+        }
+      `;
+            const result = await page.evaluate(script, [
+                cardNumber, expiry, cvv,
+                exports.CARD_NUMBER_SELECTORS.join(", "),
+                exports.EXPIRY_SELECTORS.join(", "),
+                exports.CVV_SELECTORS.join(", ")
+            ]);
+            return !!result;
         }
         catch {
             return false;
         }
     }
-    // ------------------------------------------------------------------
-    // Internal: fill a billing field (input or select)
-    // ------------------------------------------------------------------
-    async fillBillingField(client, evalOpts, selectors, value, fieldName) {
-        if (!value)
-            return false;
-        // Detect if first matching element is a <select> or <input>
-        const allSelector = selectors.join(", ");
-        try {
-            const { result } = await client.send("Runtime.evaluate", {
-                expression: `
-          (function() {
-            const el = document.querySelector(${JSON.stringify(allSelector)});
-            if (!el) return null;
-            return el.tagName.toLowerCase();
-          })()
-        `,
-                returnByValue: true,
-                ...evalOpts,
-            });
-            if (!result?.value)
-                return false;
-            if (result.value === "select") {
-                return await this.selectOption(client, evalOpts, allSelector, value);
-            }
-            else {
-                return await this.fillInputViaEval(client, evalOpts, allSelector, value);
-            }
-        }
-        catch {
-            return false;
-        }
-    }
-    // ------------------------------------------------------------------
-    // Internal: fill all billing fields
-    // ------------------------------------------------------------------
-    async fillBillingFields(client, info, evalOpts) {
+    async fillBillingFields(page, info) {
         const filled = [];
         const failed = [];
         const skipped = [];
-        // Auto-expand US state abbreviations
-        const state = info.state.length === 2
-            ? US_STATE_CODES[info.state.toUpperCase()] ?? info.state
-            : info.state;
-        const tryFill = async (selectors, value, name) => {
+        const state = info.state.length === 2 ? US_STATE_CODES[info.state.toUpperCase()] ?? info.state : info.state;
+        const tryFill = async (selectors, value, name, label) => {
             if (!value) {
                 skipped.push(name);
                 return;
             }
-            const ok = await this.fillBillingField(client, evalOpts, selectors, value, name);
+            const ok = await this.fillField(page, selectors, value, name, label);
             if (ok)
                 filled.push(name);
             else
                 failed.push(`${name} (value='${value}')`);
         };
-        // Fill ORDER matters: input fields first, then select dropdowns last.
-        // Reason: filling inputs can trigger framework re-renders (React, Zoho)
-        // which reset previously selected dropdowns. Selects go last to survive.
-        const fieldConfigs = [
-            { selectors: exports.FIRST_NAME_SELECTORS, value: info.firstName, name: "first_name" },
-            { selectors: exports.LAST_NAME_SELECTORS, value: info.lastName, name: "last_name" },
-            { selectors: exports.STREET_SELECTORS, value: info.street, name: "street" },
-            { selectors: exports.CITY_SELECTORS, value: info.city, name: "city" },
-            { selectors: exports.STATE_SELECTORS, value: state, name: "state" },
-            { selectors: exports.COUNTRY_SELECTORS, value: info.country, name: "country" },
-            { selectors: exports.ZIP_SELECTORS, value: info.zip, name: "zip" },
-            { selectors: exports.EMAIL_SELECTORS, value: info.email, name: "email" },
-        ];
-        // Full name fallback
+        // Input fields first
+        await tryFill(exports.FIRST_NAME_SELECTORS, info.firstName, "first_name", "First name");
+        await tryFill(exports.LAST_NAME_SELECTORS, info.lastName, "last_name", "Last name");
         if (info.firstName || info.lastName) {
             const fullName = [info.firstName, info.lastName].filter(Boolean).join(" ");
-            fieldConfigs.push({ selectors: exports.FULL_NAME_SELECTORS, value: fullName, name: "full_name" });
+            await tryFill(exports.FULL_NAME_SELECTORS, fullName, "full_name", "Full name");
+        }
+        await tryFill(exports.STREET_SELECTORS, info.street, "street", "Address");
+        await tryFill(exports.CITY_SELECTORS, info.city, "city", "City");
+        await tryFill(exports.ZIP_SELECTORS, info.zip, "zip", "Zip");
+        await tryFill(exports.EMAIL_SELECTORS, info.email, "email", "Email");
+        // Selects last
+        await tryFill(exports.COUNTRY_SELECTORS, info.country, "country", "Country");
+        await tryFill(exports.STATE_SELECTORS, state, "state", "State");
+        // Phone
+        let ccFilled = false;
+        if (info.phoneCountryCode) {
+            ccFilled = await this.fillField(page, exports.PHONE_COUNTRY_CODE_SELECTORS, info.phoneCountryCode, "phone_country_code", "Country code");
+            if (ccFilled)
+                filled.push("phone_country_code");
         }
-        // Detect tagName for each non-empty field
-        const detections = [];
-        for (const config of fieldConfigs) {
-            if (!config.value) {
-                skipped.push(config.name);
-                continue;
+        const phoneValue = ccFilled ? nationalNumber(info.phone, info.phoneCountryCode) : info.phone;
+        await tryFill(exports.PHONE_SELECTORS, phoneValue, "phone", "Phone");
+        return { filled, failed, skipped };
+    }
+    async fillField(page, selectors, value, name, label) {
+        // Strategy 1: getByLabel
+        try {
+            const labelLocator = page.getByLabel(label, { exact: false });
+            if (await labelLocator.count() > 0) {
+                const tag = await labelLocator.first().evaluate("el => el.tagName.toLowerCase()");
+                if (tag === "select") {
+                    return await this.selectOption(labelLocator.first(), value);
+                }
+                else {
+                    await labelLocator.first().fill(value);
+                    await this.dispatchEvents(labelLocator.first());
+                    return true;
+                }
             }
-            let tagName = null;
-            try {
-                const allSelector = config.selectors.join(", ");
-                const { result } = await client.send("Runtime.evaluate", {
-                    expression: `
-            (function() {
-              const el = document.querySelector(${JSON.stringify(allSelector)});
-              return el ? el.tagName.toLowerCase() : null;
-            })()
-          `,
-                    returnByValue: true,
-                    ...evalOpts,
-                });
-                tagName = result?.value || null;
+        }
+        catch { }
+        // Strategy 2: CSS selectors
+        const frame = page.mainFrame();
+        const locator = await this.findVisibleLocator(frame, selectors);
+        if (!locator)
+            return false;
+        try {
+            const tag = await locator.evaluate("el => el.tagName.toLowerCase()");
+            if (tag === "select") {
+                return await this.selectOption(locator, value);
             }
-            catch {
-                // Detection failed — treat as input (non-select)
+            else {
+                await locator.fill(value);
+                await this.dispatchEvents(locator);
+                return true;
             }
-            detections.push({ ...config, tagName });
         }
-        const doFill = async (d) => {
-            const ok = await this.fillBillingField(client, evalOpts, d.selectors, d.value, d.name);
-            if (ok)
-                filled.push(d.name);
-            else
-                failed.push(`${d.name} (value='${d.value}')`);
-        };
-        // Round 1: fill all non-select fields (inputs, textareas, etc.)
-        for (const d of detections) {
-            if (d.tagName !== "select") {
-                await doFill(d);
-            }
+        catch {
+            return false;
         }
-        // Round 2: fill all select dropdowns (survive re-renders)
-        for (const d of detections) {
-            if (d.tagName === "select") {
-                await doFill(d);
+    }
+    async selectOption(locator, value) {
+        try {
+            const options = await locator.evaluate(`el =>
+        Array.from(el.options).map(o => ({ value: o.value, text: o.text.trim() }))
+      `);
+            const valueLower = value.toLowerCase();
+            let matchedValue = null;
+            for (const opt of options) {
+                if (opt.value.toLowerCase() === valueLower) {
+                    matchedValue = opt.value;
+                    break;
+                }
+            }
+            if (!matchedValue) {
+                for (const opt of options) {
+                    if (opt.text.toLowerCase() === valueLower) {
+                        matchedValue = opt.value;
+                        break;
+                    }
+                }
             }
+            if (!matchedValue) {
+                for (const opt of options) {
+                    if ((valueLower.includes(opt.text.toLowerCase()) || opt.text.toLowerCase().includes(valueLower)) && opt.value) {
+                        matchedValue = opt.value;
+                        break;
+                    }
+                }
+            }
+            if (!matchedValue)
+                return false;
+            await locator.selectOption(matchedValue);
+            const actual = await locator.evaluate((el) => el.value);
+            if (actual === matchedValue) {
+                await this.dispatchEvents(locator);
+                return true;
+            }
+            return await locator.evaluate(`(el, val) => {
+        const nativeSetter = Object.getOwnPropertyDescriptor(HTMLSelectElement.prototype, "value")?.set;
+        if (!nativeSetter) return false;
+        nativeSetter.call(el, val);
+        const events = ["focusin", "focus", "mousedown", "mouseup", "click", "input", "change", "blur", "focusout"];
+        events.forEach((evt) => el.dispatchEvent(new Event(evt, { bubbles: true })));
+        return el.value === val;
+      }`, matchedValue);
         }
-        // Phone: country code dropdown first, then number
-        let ccFilled = false;
-        if (info.phoneCountryCode) {
-            ccFilled = await this.fillBillingField(client, evalOpts, exports.PHONE_COUNTRY_CODE_SELECTORS, info.phoneCountryCode, "phone_country_code");
-            if (ccFilled)
-                filled.push("phone_country_code");
+        catch {
+            return false;
         }
-        const phoneValue = ccFilled
-            ? nationalNumber(info.phone, info.phoneCountryCode)
-            : info.phone;
-        await tryFill(exports.PHONE_SELECTORS, phoneValue, "phone");
-        return { filled, failed, skipped };
     }
-    // ------------------------------------------------------------------
-    // Internal: load billing info from env vars
-    // ------------------------------------------------------------------
-    loadBillingInfo() {
+    async dispatchEvents(locator) {
+        try {
+            await locator.dispatchEvent("input");
+            await locator.dispatchEvent("change");
+            await locator.evaluate("el => el.dispatchEvent(new Event('blur', { bubbles: true }))");
+        }
+        catch { }
+    }
+    async enableBlackout(page) {
+        try {
+            for (const frame of page.frames()) {
+                try {
+                    await frame.addStyleTag({
+                        content: `
+              input[autocomplete*="cc-"],
+              input[name*="card"], input[name*="Card"],
+              input[name*="expir"], input[name*="cvc"], input[name*="cvv"],
+              input[data-elements-stable-field-name],
+              input.__PrivateStripeElement,
+              input[name="cardnumber"], input[name="cc-exp"],
+              input[name="security_code"], input[name="card_number"],
+              input[name="card_expiry"], input[name="card_cvc"] {
+                -webkit-text-security: disc !important;
+                color: transparent !important;
+                text-shadow: 0 0 8px rgba(0,0,0,0.5) !important;
+              }
+            `,
+                    });
+                }
+                catch { }
+            }
+        }
+        catch { }
+    }
+    loadBillingFromEnv() {
         return {
             firstName: (process.env.POP_BILLING_FIRST_NAME ?? "").trim(),
             lastName: (process.env.POP_BILLING_LAST_NAME ?? "").trim(),
@@ -988,61 +729,6 @@ class PopBrowserInjector {
             phoneCountryCode: (process.env.POP_BILLING_PHONE_COUNTRY_CODE ?? "").trim(),
         };
     }
-    // ------------------------------------------------------------------
-    // Internal: blackout mode (mask card fields)
-    // ------------------------------------------------------------------
-    async enableBlackout(client) {
-        try {
-            await client.send("Runtime.evaluate", {
-                expression: `
-          (function() {
-            // Inject into main frame
-            function addBlackout(doc) {
-              if (doc.getElementById('pop-pay-blackout')) return;
-              const style = doc.createElement('style');
-              style.id = 'pop-pay-blackout';
-              style.textContent = \`
-                input[autocomplete*="cc-"],
-                input[name*="card"], input[name*="Card"],
-                input[name*="expir"], input[name*="cvc"], input[name*="cvv"],
-                input[data-elements-stable-field-name],
-                input.__PrivateStripeElement,
-                input[name="cardnumber"], input[name="cc-exp"],
-                input[name="security_code"], input[name="card_number"],
-                input[name="card_expiry"], input[name="card_cvc"] {
-                  -webkit-text-security: disc !important;
-                  color: transparent !important;
-                  text-shadow: 0 0 8px rgba(0,0,0,0.5) !important;
-                }
-              \`;
-              doc.head.appendChild(style);
-            }
-            addBlackout(document);
-
-            // Try iframes (same-origin only)
-            try {
-              const iframes = document.querySelectorAll('iframe');
-              for (const iframe of iframes) {
-                try {
-                  if (iframe.contentDocument) {
-                    addBlackout(iframe.contentDocument);
-                  }
-                } catch {}
-              }
-            } catch {}
-          })()
-        `,
-            });
-        }
-        catch { }
-    }
-    // ------------------------------------------------------------------
-    // Masked card display helper
-    // ------------------------------------------------------------------
-    static maskedCard(cardNumber) {
-        const last4 = cardNumber.slice(-4);
-        return `****-****-****-${last4}`;
-    }
 }
 exports.PopBrowserInjector = PopBrowserInjector;
 //# sourceMappingURL=injector.js.map