common扩展

app/services/cargo_service.py

@@ -10,6 +10,9 @@ from selectolax.parser import HTMLParser
 from app.core.config import Settings
 from app.models.scrape import CargoRequest
 from app.utils.parse_util import extract_product_id, format_price
+from surugaya_common.browser_profile import DEFAULT_PAGE_HEADERS, stealth_launch_args
+from surugaya_common.browser_utils import clear_cart
+from surugaya_common.urls import CARGO_DETAIL_URL, product_detail_url
 
 logger = logging.getLogger(__name__)
 
@@ -29,16 +32,7 @@ class CargoService:
         """
         async with async_playwright() as p:
             headless = self._settings.browser_headless_effective
-            launch_args = [
-                "--disable-blink-features=AutomationControlled",
-                "--disable-infobars",
-                "--no-sandbox",
-                "--disable-setuid-sandbox",
-                "--disable-dev-shm-usage",
-                "--disable-gpu",
-                "--use-mock-keychain",
-                "--password-store=basic",
-            ]
+            launch_args = stealth_launch_args()
             if not headless:
                 launch_args.extend(["--start-maximized", "--window-position=0,0"])
 
@@ -61,21 +55,17 @@ class CargoService:
 
                 if self._settings.browser_stealth_enabled:
                     try:
-                        from playwright_stealth import Stealth
-                        await Stealth().apply_stealth_async(context)
+                        # launch_persistent_context 之外的裸 context 用 apply_stealth_async；
+                        # 共享工厂带日语 languages override，与 locale/Accept-Language 对齐。
+                        from surugaya_common.stealth import create_stealth
+                        await create_stealth().apply_stealth_async(context)
                     except Exception as e:
                         logger.warning("应用 playwright-stealth 失败: %s", e)
 
                 page = await context.new_page()
-                await page.set_extra_http_headers(
-                    {
-                        "Accept-Language": "ja-JP,ja;q=0.9,en-US;q=0.8,en;q=0.7",
-                        "Cache-Control": "no-cache",
-                        "Pragma": "no-cache",
-                    }
-                )
+                await page.set_extra_http_headers(DEFAULT_PAGE_HEADERS)
 
-                target_url = "https://www.suruga-ya.jp/cargo/detail"
+                target_url = CARGO_DETAIL_URL
                 # 先进入购物车页面
                 await page.goto(target_url, wait_until="domcontentloaded", timeout=15000)
 
@@ -85,7 +75,7 @@ class CargoService:
                 # 清空购物车
                 await asyncio.sleep(random.uniform(1, 3))  # 加入随机延迟，模拟人工操作间隔
                 if cart_goods_num > 0:
-                    await self.clear_cart(page)
+                    await clear_cart(page)
 
                 # 将待采购的商品加入购物车
                 item_list = request.payload.item_list
@@ -101,7 +91,7 @@ class CargoService:
                         continue
 
                     logger.debug("进入商品 %s 详情页，准备购买数量: %s...", product_id, number)
-                    detail_url = f"https://www.suruga-ya.jp/product/detail/{product_id}"
+                    detail_url = product_detail_url(product_id)
                     await page.goto(detail_url, wait_until="domcontentloaded", timeout=20000)
 
                     # 判断是否缺货
@@ -327,57 +317,3 @@ class CargoService:
             "total_commission_fee": total_commission_fee
         }
 
-    async def clear_cart(self, page):
-        """
-        清空购物车
-        """
-        cart_goods_num = await page.locator("table.item_box tbody tr.item").count()
-        if cart_goods_num < 1:
-            return
-
-        is_delete = 0
-        # 购物车商品数量超过3个后会出现"全削除"按钮
-        if cart_goods_num > 3:
-            try:
-                delete_button = page.locator("#total_box .delbtn-all").get_by_role("button", name="全削除")
-                # 3. 显式等待按钮在页面上可见（容错处理：比如给它最多 3000 毫秒的加载时间）
-                # 如果按钮是一开始就在静态 HTML 里的，这一步也可以省略，直接用下面的 is_visible()
-                await delete_button.wait_for(state="visible", timeout=3000)
-                if await delete_button.is_visible():
-                    logger.debug("检测到‘全削除’按钮存在，正在执行点击...")
-                    await delete_button.click()
-                    is_delete = 1
-            except Exception:
-                logger.debug("未检测到‘全削除’按钮。")
-
-        if is_delete == 1:
-            return
-
-        # 遍历删除
-        item_selector = "table.item_box tbody tr.item"
-        remove_selector = "table.item_box a.remove_product"
-
-        while True:
-            cart_goods_num = await page.locator(item_selector).count()
-            if cart_goods_num == 0:
-                break
-
-            remove_link = page.locator(remove_selector).first
-
-            try:
-                await remove_link.click()
-                # 删除按钮不会触发弹窗，直接等待购物车条目数减少即可。
-                await page.wait_for_function(
-                    """({selector, expectedCount}) => {
-                        return document.querySelectorAll(selector).length < expectedCount;
-                    }""",
-                    arg={"selector": item_selector, "expectedCount": cart_goods_num},
-                    timeout=15_000,
-                )
-                await page.wait_for_timeout(random.randint(800, 1500))
-            except PlaywrightTimeoutError:
-                latest_count = await page.locator(item_selector).count()
-                if latest_count < cart_goods_num:
-                    continue
-
-                await page.wait_for_timeout(1000)