@whyshu/argent-engine 0.7.5 → 0.7.7

package/engine/scripts/invoice_stageb.py

@@ -61,6 +61,7 @@ def login_xinhang(page, m, c):
     pwd = c.get("xhInvoicePass", "")
     page.goto(url, timeout=TIMEOUT, wait_until="domcontentloaded")
     page.wait_for_timeout(2000)
+    close_overlays(page)
     # 会话复用探测（2026-09-08）：登录 URL 固定含 /Login/（goto 即登录页），
     # 直接导航 home 验证 profile 会话：能进 home = 已登录复用；被弹回 Login = 需填表。
     # 避免每票/每轮重复登录（频繁登录有账号风控风险）。
@@ -69,6 +70,7 @@ def login_xinhang(page, m, c):
         page.goto(base + "/home/EleIndex?lang=cn", timeout=TIMEOUT,
                   wait_until="domcontentloaded")
         page.wait_for_timeout(2500)
+        close_overlays(page)
     except Exception:
         pass
     cur = page.url or ""
@@ -223,6 +225,71 @@ def _hover_menu(page, text):
     }''', text)
 
 
+def close_overlays(page) -> int:
+    """关闭鑫中航门户的公告/遮罩弹窗（系统升级公告等），避免挡住菜单/搜索/上传。
+
+    2026-10-21 生产：门户系统公告弹窗遮挡正常流程，脚本没有统一关闭入口。
+    这里只点“可见且带关闭语义”的按钮/×，不做强制 DOM 删除，避免误删业务弹窗。
+    """
+    import time
+    n = 0
+    try:
+        page.keyboard.press("Escape")
+    except Exception:
+        pass
+    # 优先 × 关闭图标（Element UI / layui / 通用）
+    selectors = [
+        ".layui-layer-close", ".el-dialog__close", ".ant-modal-close",
+        ".ivu-modal-close", ".modal-close", "[aria-label='关闭']",
+        "button.close", "a.close", "i.close", ".close",
+    ]
+    for sel in selectors:
+        try:
+            loc = page.locator(sel)
+            for i in range(min(loc.count(), 6)):
+                el = loc.nth(i)
+                try:
+                    if el.is_visible():
+                        el.click(timeout=1500, force=True)
+                        n += 1
+                except Exception:
+                    continue
+        except Exception:
+            continue
+    # 文本按钮兜底（系统公告常见“我知道了/知道了/关闭”）
+    for text in ("我知道了", "知道了", "关闭公告", "关闭", "确定", "继续"):
+        try:
+            loc = page.get_by_text(text, exact=True)
+            for i in range(min(loc.count(), 4)):
+                el = loc.nth(i)
+                try:
+                    if el.is_visible():
+                        el.click(timeout=1500, force=True)
+                        n += 1
+                except Exception:
+                    continue
+        except Exception:
+            continue
+    # 弹窗可能在 iframe 内，遍历 frame 再试一次按钮
+    try:
+        for f in page.frames:
+            for text in ("我知道了", "知道了", "关闭公告", "关闭"):
+                try:
+                    loc = f.get_by_text(text, exact=True)
+                    for i in range(min(loc.count(), 3)):
+                        el = loc.nth(i)
+                        if el.is_visible():
+                            el.click(timeout=1200, force=True); n += 1
+                except Exception:
+                    continue
+    except Exception:
+        pass
+    if n:
+        print(f"  [overlay] 已关闭门户弹窗次数={n}", flush=True)
+    time.sleep(0.5)
+    return n
+
+
 def _find_order_frame(page, timeout=150):
     """找大货订单页 frame（含「单票导入」或「订单号码」文案）。"""
     import time
@@ -305,6 +372,29 @@ def _check_target_row(frame, order_no):
     }''', order_no)
 
 
+def close_temp_tabs(ctx, keep=None) -> int:
+    """关闭发票脚本/门户自己打开的临时标签页（下单 PDF、下载预览等），保留主门户页。"""
+    n = 0
+    try:
+        pages = list(ctx.pages)
+    except Exception:
+        return 0
+    for pg in pages:
+        if keep is not None and pg is keep:
+            continue
+        try:
+            url = pg.url or ""
+        except Exception:
+            continue
+        if any(k in url for k in ("/orderhebing/", "_PHD.pdf", "SelectLableTypes", "about:blank")):
+            try:
+                pg.close()
+                n += 1
+            except Exception:
+                pass
+    return n
+
+
 def download_label(order_no, save_name=None, wait_keep=15):
     """按订单号搜索 → 单行校验 → 勾选 → 选大货标签模板 → 捕获 popup PDF → 保存。
 
@@ -322,6 +412,7 @@ def download_label(order_no, save_name=None, wait_keep=15):
         if not ok:
             return None
         page.wait_for_timeout(3000)
+        close_overlays(page)
         menu_ok = False
         for attempt in range(3):
             r1 = _click_menu(page, "大货订单管理")
@@ -418,6 +509,10 @@ def download_label(order_no, save_name=None, wait_keep=15):
         traceback.print_exc()
         return None
     finally:
+        try:
+            close_temp_tabs(ctx, keep=locals().get('page'))
+        except Exception:
+            pass
         try:
             p.stop()
         except Exception:
@@ -462,6 +557,7 @@ def upload_invoice(invoice_path, order_no=None, wait_keep=20):
             print("✗ 订单页未就绪", flush=True)
             return False
         print("订单页就绪，开始上传", flush=True)
+        close_overlays(page)
         r = frame.evaluate('''() => {
             const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_TEXT);
             let node;
@@ -477,6 +573,7 @@ def upload_invoice(invoice_path, order_no=None, wait_keep=20):
         }''')
         print("  点击单票导入:", r, flush=True)
         page.wait_for_timeout(6000)
+        close_overlays(page)
         fi = frame.locator("input[type=file]")
         if fi.count():
             fi.first.set_input_files(invoice_path)
@@ -504,6 +601,10 @@ def upload_invoice(invoice_path, order_no=None, wait_keep=20):
         traceback.print_exc()
         return False
     finally:
+        try:
+            close_temp_tabs(ctx, keep=locals().get('page'))
+        except Exception:
+            pass
         try:
             p.stop()
         except Exception:

package/engine/scripts/login-readiness.py

@@ -0,0 +1,220 @@
+#!/usr/bin/env python3
+"""登录态就绪检查（安装/生产前置；只读，除显式 --open 不启动浏览器）。
+
+目标（2026-10-21 用户口径）：
+  · 登录态是**安装期**前置条件，不是生产第一票才暴露的问题；
+  · 文鳐：需要先打开长驻 Chrome 窗口/标签页。若门户出现滑块，由用户人工拖动；
+    登录成功后保持该窗口/标签页不关，等于保持登录态。
+  · 鑫中航：同样保留一个标签页/浏览器，供发票流程 CDP 复用；
+  · 紫鸟：常驻 WebDriver 客户端 + 每个店铺窗口保留标签页，供 FULL/抢预约复用。
+
+本脚本只做**检测**：
+  - 检查配置/凭据文件是否存在；
+  - 检查 CDP 端口是否有页面（文鳐 9333 / 鑫中航 9223）；
+  - 检查紫鸟 WebDriver IPC 是否正常、能否列店铺；
+  - 给出可照做的修复命令。
+显式 `--open` 才会启动文鳐浏览器并提示人工过滑块（不会自动提交滑块，也不写业务表）。
+退出码：0 = 无 fail（warn 不阻断）；1 = 有 fail；2 = 参数/脚本错误。
+"""
+from __future__ import annotations
+
+import argparse
+import json
+import os
+import pathlib
+import subprocess
+import sys
+
+HERE = pathlib.Path(__file__).resolve().parent
+sys.path.insert(0, str(HERE / 'lib'))
+from argent_datadir import resolve_data_dir  # noqa: E402
+DATA = pathlib.Path(resolve_data_dir()['dir'])
+
+
+def _read_env(name: str) -> dict:
+    out = {}
+    try:
+        for line in (DATA / name).read_text(encoding='utf-8').splitlines():
+            t = line.strip()
+            if t and not t.startswith('#') and '=' in t:
+                k, _, v = t.partition('=')
+                out[k.strip()] = v.strip().strip('"').strip("'")
+    except Exception:
+        pass
+    return out
+
+
+def _run(cmd: list[str], timeout: int = 30) -> tuple[int, str, str]:
+    try:
+        p = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout)
+        return p.returncode, (p.stdout or ''), (p.stderr or '')
+    except FileNotFoundError:
+        return 127, '', f'命令不存在: {cmd[0]}'
+    except subprocess.TimeoutExpired:
+        return 124, '', f'超时: {cmd[:2]}'
+    except Exception as exc:  # noqa: BLE001
+        return 125, '', str(exc)
+
+
+def _pages(port: int) -> list:
+    """CDP /json/list：返回可复用页面；不可用返回空列表。"""
+    try:
+        import urllib.request
+        with urllib.request.urlopen(f'http://127.0.0.1:{port}/json/list', timeout=3) as r:
+            doc = json.loads(r.read().decode('utf-8', 'replace'))
+        return [x for x in (doc or []) if isinstance(x, dict) and x.get('type') == 'page']
+    except Exception:  # noqa: BLE001
+        return []
+
+
+def _item(i: str, level: str, title: str, detail: str = '', fix: str = '') -> dict:
+    return {'id': i, 'level': level, 'title': title, 'detail': detail, 'fix': fix}
+
+
+def check_wenyao(open_it: bool = False) -> list[dict]:
+    env = _read_env('wenyao.env')
+    miss = [k for k in ('WENYAO_URL', 'WENYAO_PHONE', 'WENYAO_PASSWORD') if not env.get(k)]
+    if miss:
+        return [_item('login.wenyao.config', 'fail', '文鳐门户凭据缺失',
+                      f'缺 {",".join(miss)}', '在客户机 ~/.dsh/argent/wenyao.env 补齐（600；不要贴到对话）')]
+    items = [_item('login.wenyao.config', 'ok', '文鳐门户凭据存在', 'wenyao.env（600）')]
+    script = HERE / 'wenyao-browser.sh'
+    pages = _pages(9333)
+    if not pages:
+        if open_it and script.exists():
+            code, out, err = _run(['bash', str(script), 'start'], timeout=120)
+            pages = _pages(9333)
+            items.append(_item('login.wenyao.browser', 'warn' if pages else 'fail',
+                               '文鳐长驻窗口未打开' if not pages else '文鳐窗口已启动，等待人工登录',
+                               (out or err).strip()[-300:] if not pages else '请在弹出的 Chrome 里拖滑块并点登录，成功后不要关窗口',
+                               f'bash {script} start'))
+        else:
+            items.append(_item('login.wenyao.browser', 'warn', '文鳐长驻窗口未打开',
+                               '安装/生产前应打开并保留一个标签页；没有窗口不等于凭据失效，但第一票会重新登录',
+                               f'bash {script} start'))
+        return items
+    # 有页面：调用 attach 状态判断是否登录（只读）
+    code, out, err = _run([sys.executable, str(HERE / 'wenyao_attach.py'), '--status'], timeout=30)
+    text = ((out or '') + (err or '')).strip()
+    logged = code == 0 and not any(x in text for x in ('未登录', '登录失败', '需要登录'))
+    items.append(_item('login.wenyao.browser', 'ok' if logged else 'warn',
+                       '文鳐窗口已有标签页' if logged else '文鳐窗口在，但登录态未确认',
+                       (text.splitlines()[-1] if text else '已连接 CDP 9333'),
+                       '若未登录：在窗口里完成滑块+登录；完成后保持标签页不关'))
+    return items
+
+
+def check_xzh(open_it: bool = False) -> list[dict]:
+    items = []
+    mapping = DATA / 'invoice-mapping.json'
+    if not mapping.exists():
+        items.append(_item('login.xzh.config', 'warn', '鑫中航映射文件缺失',
+                           str(mapping), '补齐 invoice-mapping.json（含 xinzhonghang.url）'))
+    else:
+        items.append(_item('login.xzh.config', 'ok', '鑫中航映射文件存在', str(mapping)))
+    pages = _pages(9223)
+    if not pages and open_it:
+        # 不直接起浏览器：由 launchd 常驻；只提示并尝试 kickstart
+        code, out, err = _run(['launchctl', 'kickstart', f'gui/{os.getuid()}/com.whyshu.xzh-browser'], timeout=30)
+        pages = _pages(9223)
+        items.append(_item('login.xzh.browser', 'warn' if not pages else 'ok',
+                           '鑫中航常驻浏览器未打开' if not pages else '鑫中航浏览器已启动',
+                           (out or err).strip()[-200:] if not pages else '保留标签页/登录态',
+                           'launchctl kickstart gui/$(id -u)/com.whyshu.xzh-browser'))
+    elif not pages:
+        items.append(_item('login.xzh.browser', 'warn', '鑫中航常驻浏览器未打开',
+                           'CDP 9223 无页面；安装/生产前应保留标签页/登录态',
+                           'launchctl kickstart gui/$(id -u)/com.whyshu.xzh-browser（或安装 com.whyshu.xzh-browser）'))
+    else:
+        items.append(_item('login.xzh.browser', 'ok', '鑫中航浏览器已有标签页',
+                           f'CDP 9223：{len(pages)} 个页面；保持标签页/登录态'))
+    return items
+
+
+def check_ziniao(open_it: bool = False, open_stores: bool = False) -> list[dict]:
+    items = []
+    cli = os.environ.get('ZINIAO_CLI') or 'ziniao-cli'
+    code, out, err = _run([cli, 'store', 'list', '--all', '--format', 'json'], timeout=30)
+    stores = []
+    if code == 0:
+        try:
+            doc = json.loads(out)
+            if isinstance(doc, list):
+                stores = doc
+            else:
+                data = doc.get('data') or doc
+                stores = data.get('items') if isinstance(data, dict) else (data or [])
+        except Exception:  # noqa: BLE001
+            stores = []
+    if code != 0 or not stores:
+        items.append(_item('login.ziniao.stores', 'warn', '紫鸟店铺清单读取失败',
+                           (err or out).strip()[-200:], '确认 ziniao-cli 已登录/有权限；再跑 bash scripts/ziniao-keepalive.sh status'))
+    else:
+        items.append(_item('login.ziniao.stores', 'ok', f'紫鸟店铺清单可读：{len(stores)} 个',
+                           '每个已打开店铺窗口应保留一个标签页，供 FULL/预约复用'))
+        if open_stores:
+            opened, failed = [], []
+            for st in stores:
+                sid = str((st or {}).get('storeId') or (st or {}).get('id') or '').strip()
+                if not sid:
+                    continue
+                c, o, e = _run([cli, 'store', 'open', '--id', sid], timeout=60)
+                (opened if c == 0 else failed).append(sid)
+            items.append(_item('login.ziniao.open', 'ok' if not failed else 'warn',
+                               f'紫鸟店铺窗口已打开 {len(opened)} 个',
+                               ('失败：' + '、'.join(failed[:6])) if failed else '每个窗口保留一个标签页，不要关闭',
+                               f'ziniao-cli store open --id <storeId>（逐个补开）'))
+    keep = HERE / 'ziniao-keepalive.sh'
+    if keep.exists():
+        code, out, err = _run(['bash', str(keep), 'status'], timeout=30)
+        txt = ((out or '') + (err or '')).strip()
+        ipc_ok = 'getRunningInfo 正常' in txt or 'IPC 正常' in txt
+        agent_ok = '未安装' not in txt and 'com.whyshu.ziniao-keepalive' in txt
+        level = 'ok' if ipc_ok else 'warn'
+        fix = '' if ipc_ok else f'bash {keep} install（并确认客户端以 WebDriver 模式运行）'
+        items.append(_item('login.ziniao.keepalive', level,
+                           '紫鸟 WebDriver IPC 正常' if ipc_ok else '紫鸟 WebDriver IPC 异常/守护未安装',
+                           ('守护已加载' if agent_ok else '守护未安装（install）') + '｜' + txt.splitlines()[-1][:160],
+                           fix))
+    else:
+        items.append(_item('login.ziniao.keepalive', 'warn', '缺 ziniao-keepalive.sh',
+                           '', 'git pull 后重跑'))
+    return items
+
+
+def main(argv=None) -> int:
+    ap = argparse.ArgumentParser(description='登录态就绪检查（安装/生产前置）')
+    ap.add_argument('--flow', action='append', choices=['wenyao-invoice', 'xzh-invoice', 'full'],
+                    help='只检查指定流程；默认三个都检查')
+    ap.add_argument('--open', action='store_true', help='文鳐未打开时启动长驻窗口；鑫中航尝试 kickstart（人工完成滑块/登录）')
+    ap.add_argument('--open-ziniao', action='store_true', help='逐个打开紫鸟店铺窗口（安装时保留标签页；会打开多个窗口）')
+    ap.add_argument('--json', action='store_true')
+    a = ap.parse_args(argv)
+    flows = a.flow or ['wenyao-invoice', 'xzh-invoice', 'full']
+    items = []
+    if 'wenyao-invoice' in flows:
+        items += check_wenyao(a.open)
+    if 'xzh-invoice' in flows:
+        items += check_xzh(a.open)
+    if 'full' in flows:
+        items += check_ziniao(a.open, a.open_ziniao)
+    counts = {k: sum(1 for it in items if it['level'] == k) for k in ('ok', 'warn', 'fail')}
+    if a.json:
+        print(json.dumps({'dataDir': str(DATA), 'flows': flows, 'checks': items, 'summary': counts},
+                         ensure_ascii=False, indent=2))
+    else:
+        icon = {'ok': '✅', 'warn': '⚠️', 'fail': '❌'}
+        for it in items:
+            print(f"{icon.get(it['level'], '·')} [{it['id']}] {it['title']}")
+            if it.get('detail'):
+                print(f"   {it['detail']}")
+            if it.get('fix'):
+                print(f"   修复：{it['fix']}")
+        print(f"\n登录态：ok={counts['ok']} warn={counts['warn']} fail={counts['fail']}")
+        if counts['warn']:
+            print('提示：warn 不阻断流程，但生产前应完成窗口/标签页登录；文鳐滑块需人工完成。')
+    return 1 if counts['fail'] else 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())

package/engine/scripts/ml-oauth-setup.mjs

@@ -49,7 +49,7 @@ const SCRIPT_DIR = dirname(fileURLToPath(import.meta.url))
 // 其他站点域名实测被拦（403），后续逐个站点验证后更新此表。
 const AUTH_HOSTS = {
   MLM: 'auth.mercadolibre.com.mx',
-  MLB: 'auth.mercadolivre.com.br',   // 2026-10-17 实测修正：巴西站点域名是 mercadolivre（auth.mercadolibre.com.br 无 DNS）
+  MLB: 'auth.mercadolibre.com.br',
   MLA: 'auth.mercadolibre.com.ar',
   MLC: 'auth.mercadolibre.cl',
   MCO: 'auth.mercadolibre.com.co',