@11agents/cli 0.1.41 → 0.1.43

package/mobile-runtime/python/src/device_control/publishers/tiktok_appium.py

@@ -10,7 +10,12 @@ from device_control.adb import AdbClient
 from device_control.appium_client import AppiumClient
 from device_control.models import Device, PublishRecord, utc_now_iso
 from device_control.publishers import ui_helpers as ui
-from device_control.publishers.tiktok_adb import TIKTOK_PACKAGE, TikTokAdbPublisher
+from device_control.publishers.tiktok_adb import (
+    TIKTOK_PACKAGE,
+    TikTokAdbLinkResult,
+    TikTokAdbPublisher,
+    _is_tiktok_create_home_surface,
+)
 from device_control.store import append_publish_record
 
 
@@ -27,6 +32,12 @@ class TikTokAppiumPublishResult:
     duration_seconds: int
     remote_media_path: str
     screenshot_path: str
+    platform_permalink: str = ""
+    platform_post_id: str = ""
+    link_status: str = ""
+    link_error: str = ""
+    link_screenshot_path: str = ""
+    clipboard_method: str = ""
     error: str = ""
 
 
@@ -45,7 +56,12 @@ class TikTokAppiumPublisher:
         self.appium_server = appium_server
         self.records_path = Path(records_path)
         self.artifact_root = Path(artifact_root)
-        self.media_helper = TikTokAdbPublisher(adb, records_path=records_path, artifact_root=artifact_root)
+        self.media_helper = TikTokAdbPublisher(
+            adb,
+            appium_server=appium_server,
+            records_path=records_path,
+            artifact_root=artifact_root,
+        )
 
     def publish_video(
         self,
@@ -68,6 +84,8 @@ class TikTokAppiumPublisher:
         remote = f"/sdcard/DCIM/Camera/groupctl-{device.device_id}-tiktok-appium-{stamp}{local.suffix or '.mp4'}"
         record_id = f"pub_{stamp.replace('-', '')}_{device.device_id.lower()}_tiktok_appium"
         appium = AppiumClient(self.appium_server)
+        appium_active = False
+        link_result: TikTokAdbLinkResult | None = None
 
         try:
             self._prepare_device(device)
@@ -77,6 +95,7 @@ class TikTokAppiumPublisher:
             time.sleep(1)
 
             appium.start_session(_capabilities(device.adb_serial))
+            appium_active = True
             time.sleep(5)
 
             appium.source(run_dir / "home.xml")
@@ -114,8 +133,24 @@ class TikTokAppiumPublisher:
             if dry_run:
                 status = "dry_run"
             else:
-                self._tap_publish_button(device)
+                self._tap_publish_button(device, run_dir)
+                try:
+                    appium.delete_session()
+                finally:
+                    appium_active = False
                 final_shot = self.media_helper._wait_for_publish_confirmation(device, run_dir)
+                link_result = self.media_helper.copy_current_or_latest_video_link(
+                    device,
+                    run_dir=run_dir / "link",
+                    video_order=1,
+                    close_after_recovery=True,
+                )
+                if link_result.status != "retrieved" or not link_result.platform_permalink:
+                    raise RuntimeError(
+                        "TikTok post-publish link recovery failed: "
+                        f"{link_result.error or link_result.status}"
+                    )
+                final_shot = Path(link_result.screenshot_path)
                 status = "published"
 
             ended_epoch = int(time.time())
@@ -130,13 +165,14 @@ class TikTokAppiumPublisher:
                         post_type="video",
                         local_media_path=str(local),
                         remote_media_path=remote,
+                        platform_post_id=link_result.platform_post_id if link_result else "",
+                        platform_permalink=link_result.platform_permalink if link_result else "",
                         caption=caption,
                         published_at=utc_now_iso(),
                         result_screenshot_path=str(final_shot),
                         status="published",
                     ),
                 )
-                self.media_helper._close_tiktok_best_effort(device, run_dir)
             return TikTokAppiumPublishResult(
                 device_id=device.device_id,
                 status=status,
@@ -146,6 +182,12 @@ class TikTokAppiumPublisher:
                 duration_seconds=ended_epoch - started_epoch,
                 remote_media_path=remote,
                 screenshot_path=str(final_shot),
+                platform_permalink=link_result.platform_permalink if link_result else "",
+                platform_post_id=link_result.platform_post_id if link_result else "",
+                link_status=link_result.status if link_result else "",
+                link_error=link_result.error if link_result else "",
+                link_screenshot_path=link_result.screenshot_path if link_result else "",
+                clipboard_method=link_result.clipboard_method if link_result else "",
             )
         except Exception as exc:
             failure_shot = run_dir / "failed.png"
@@ -153,6 +195,7 @@ class TikTokAppiumPublisher:
                 appium.screenshot(failure_shot)
             except Exception:
                 self.adb.screenshot(device.adb_serial, failure_shot)
+            self.media_helper._close_tiktok_best_effort(device, run_dir)
             return TikTokAppiumPublishResult(
                 device_id=device.device_id,
                 status="failed",
@@ -162,13 +205,20 @@ class TikTokAppiumPublisher:
                 duration_seconds=int(time.time()) - started_epoch,
                 remote_media_path=remote,
                 screenshot_path=str(failure_shot),
+                platform_permalink=link_result.platform_permalink if link_result else "",
+                platform_post_id=link_result.platform_post_id if link_result else "",
+                link_status=link_result.status if link_result else "",
+                link_error=link_result.error if link_result else "",
+                link_screenshot_path=link_result.screenshot_path if link_result else "",
+                clipboard_method=link_result.clipboard_method if link_result else "",
                 error=str(exc),
             )
         finally:
-            try:
-                appium.delete_session()
-            except Exception:
-                pass
+            if appium_active:
+                try:
+                    appium.delete_session()
+                except Exception:
+                    pass
 
     def _prepare_device(self, device: Device) -> None:
         self._ok(self.adb.wake(device.adb_serial), "wake device")
@@ -187,6 +237,9 @@ class TikTokAppiumPublisher:
         raise RuntimeError(f"{action} failed: {last_error}")
 
     def _set_caption(self, appium: AppiumClient, device: Device, caption: str, run_dir: Path) -> None:
+        if caption.isascii():
+            self._set_caption_with_adb(device, caption, run_dir)
+            return
         try:
             field = appium.find_element("id", f"{TIKTOK_PACKAGE}:id/gjp")
             appium.click(field)
@@ -200,20 +253,76 @@ class TikTokAppiumPublisher:
             self.adb.screenshot(device.adb_serial, run_dir / "caption-failed.png")
             raise RuntimeError(f"caption input failed: {exc}") from exc
 
+    def _set_caption_with_adb(self, device: Device, caption: str, run_dir: Path) -> None:
+        try:
+            node = None
+            try:
+                root = ui.dump_ui(self.adb, device, run_dir / "before-caption.xml")
+                node = ui.find_node(
+                    root,
+                    partial_texts={"添加描述", "描述", "Add description", "Describe"},
+                    clickable_only=False,
+                )
+            except Exception:
+                pass
+            if node is not None:
+                ui.tap_node(self.adb, device, node, sleep_s=1)
+            else:
+                width, height = self._screen_size(device)
+                self._ok(self.adb.tap(device.adb_serial, int(width * 0.18), int(height * 0.13)), "focus caption field")
+                time.sleep(1)
+            result = self.adb.input_text(device.adb_serial, caption)
+            if not result.ok:
+                raise RuntimeError(result.stderr or result.stdout or "adb input text failed")
+            time.sleep(1)
+            self.adb.keyevent(device.adb_serial, "KEYCODE_BACK")
+            time.sleep(1)
+            self.adb.screenshot(device.adb_serial, run_dir / "after-caption.png")
+        except Exception as exc:
+            self.adb.screenshot(device.adb_serial, run_dir / "caption-failed.png")
+            raise RuntimeError(f"caption input failed: {exc}") from exc
+
     def _tap_album_entry(self, device: Device) -> None:
-        self._ok(self.adb.tap(device.adb_serial, 105, 2050), "open album")
+        width, height = self._screen_size(device)
+        self._ok(self.adb.tap(device.adb_serial, int(width * 0.09), int(height * 0.92)), "open album")
 
     def _tap_first_gallery_video(self, device: Device) -> None:
-        self._ok(self.adb.tap(device.adb_serial, 305, 455), "select first gallery video")
+        width, height = self._screen_size(device)
+        self._ok(self.adb.tap(device.adb_serial, int(width * 0.28), int(height * 0.20)), "select first gallery video")
 
     def _tap_gallery_next(self, device: Device) -> None:
-        self._ok(self.adb.tap(device.adb_serial, 790, 2208), "next from gallery")
+        width, height = self._screen_size(device)
+        self._ok(self.adb.tap(device.adb_serial, int(width * 0.73), int(height * 0.92)), "next from gallery")
 
     def _tap_editor_next(self, device: Device) -> None:
-        self._ok(self.adb.tap(device.adb_serial, 795, 2234), "next from editor")
+        width, height = self._screen_size(device)
+        self._ok(self.adb.tap(device.adb_serial, int(width * 0.74), int(height * 0.93)), "next from editor")
+
+    def _tap_publish_button(self, device: Device, run_dir: Path) -> None:
+        width, height = self._screen_size(device)
+        for attempt in range(3):
+            root = None
+            try:
+                root = ui.dump_ui(self.adb, device, run_dir / f"before-publish-tap-{attempt + 1}.xml")
+            except Exception:
+                pass
+            if root is not None:
+                node = _find_publish_button(root, width, height, prefer_bottom=True)
+                if node is not None:
+                    ui.tap_node(self.adb, device, node, sleep_s=2)
+                else:
+                    self._ok(self.adb.tap(device.adb_serial, int(width * 0.75), int(height * 0.92)), "publish")
+                    time.sleep(2)
+            else:
+                self._ok(self.adb.tap(device.adb_serial, int(width * 0.75), int(height * 0.92)), "publish")
+                time.sleep(2)
+
+            self.adb.screenshot(device.adb_serial, run_dir / f"after-publish-tap-{attempt + 1}.png")
+            if not self._still_on_publish_form(device, run_dir, attempt + 1):
+                self.adb.screenshot(device.adb_serial, run_dir / "after-publish-tap.png")
+                return
 
-    def _tap_publish_button(self, device: Device) -> None:
-        self._ok(self.adb.tap(device.adb_serial, 790, 2240), "publish")
+        self.adb.screenshot(device.adb_serial, run_dir / "after-publish-tap.png")
 
     def _raise_if_live_surface(self, device: Device, run_dir: Path, action: str) -> None:
         try:
@@ -221,6 +330,8 @@ class TikTokAppiumPublisher:
         except Exception:
             return
         text = ui.all_text(root)
+        if _is_tiktok_create_home_surface(root):
+            raise RuntimeError(f"{action} failed: TikTok is still on the create camera/template surface")
         if (
             ("访问你的麦克风" in text or "访问麦克风" in text)
             and ("直播" in text or "LIVE" in text.upper())
@@ -234,6 +345,17 @@ class TikTokAppiumPublisher:
         if not result.ok:
             raise RuntimeError(f"{action} failed: {result.stderr or result.stdout}")
 
+    def _screen_size(self, device: Device) -> tuple[int, int]:
+        return self.media_helper._screen_size(device)
+
+    def _still_on_publish_form(self, device: Device, run_dir: Path, attempt: int) -> bool:
+        try:
+            root = ui.dump_ui(self.adb, device, run_dir / f"after-publish-tap-{attempt}.xml")
+        except Exception:
+            return False
+        text = ui.all_text(root)
+        return "发布" in text and ("粉丝可以查看这条发布内容" in text or "更多选项" in text or "分享到" in text)
+
 
 def _capabilities(serial: str) -> dict:
     return {
@@ -258,3 +380,40 @@ def _now_shanghai() -> str:
 
 def _slug(value: str) -> str:
     return "".join(char.lower() if char.isalnum() else "-" for char in value).strip("-")
+
+
+def _find_publish_button(root, width: int, height: int, *, prefer_bottom: bool):
+    candidates = []
+    for node in root.iter("node"):
+        if not ui.is_visible(node):
+            continue
+        text = node.attrib.get("text", "")
+        desc = node.attrib.get("content-desc", "")
+        if text not in {"发布", "Post"} and desc not in {"发布", "Post"}:
+            continue
+        value = ui.bounds(node)
+        if not value:
+            continue
+        left, top, right, bottom = value
+        center_x = (left + right) // 2
+        center_y = (top + bottom) // 2
+        if center_x < int(width * 0.45):
+            continue
+        if center_y < int(height * 0.22):
+            region = "top"
+        elif center_y > int(height * 0.72):
+            region = "bottom"
+        else:
+            continue
+        candidates.append((region, node))
+    if prefer_bottom:
+        bottom = [node for region, node in candidates if region == "bottom"]
+        if bottom:
+            return ui.sorted_visible_nodes(bottom)[-1]
+    top = [node for region, node in candidates if region == "top"]
+    if top:
+        return ui.sorted_visible_nodes(top)[-1]
+    bottom = [node for region, node in candidates if region == "bottom"]
+    if bottom:
+        return ui.sorted_visible_nodes(bottom)[-1]
+    return None