@nextclaw/x-harness 0.1.1 → 0.2.1

package/dist/browser-dom-editing.js

@@ -1,21 +1,65 @@
 import { attachImage } from "./readers-actions.js";
-export function createDOMEditing(dependencies) {
-    const { session, unique, locator, tab, observe } = dependencies;
-    async function dismissMenu(command) {
-        const { query, result } = session.current;
+export class DOMEditing {
+    #session;
+    #unique;
+    #locator;
+    #tab;
+    #observe;
+    dismissMenu;
+    openControl;
+    openOwnPostMenu;
+    submitEditedPost;
+    expandPost;
+    nextPosts;
+    clearPreparedText;
+    closePreparedReply;
+    closePreparedMedia;
+    removePreparedMedia;
+    attachAssets;
+    follow;
+    openReply;
+    fillComposer;
+    submitPost;
+    submitReply;
+    constructor(dependencies) {
+        const { session, unique, locator, tab, observe } = dependencies;
+        this.#session = session;
+        this.#unique = unique;
+        this.#locator = locator;
+        this.#tab = tab;
+        this.#observe = observe;
+        this.dismissMenu = this.handleDismissMenu.bind(this);
+        this.openControl = this.handleOpenControl.bind(this);
+        this.openOwnPostMenu = this.handleOpenOwnPostMenu.bind(this);
+        this.submitEditedPost = this.handleSubmitEditedPost.bind(this);
+        this.expandPost = this.handleExpandPost.bind(this);
+        this.nextPosts = this.handleNextPosts.bind(this);
+        this.clearPreparedText = this.handleClearPreparedText.bind(this);
+        this.closePreparedReply = this.handleClosePreparedReply.bind(this);
+        this.closePreparedMedia = this.handleClosePreparedMedia.bind(this);
+        this.removePreparedMedia = this.handleRemovePreparedMedia.bind(this);
+        this.attachAssets = this.handleAttachAssets.bind(this);
+        this.follow = this.handleFollow.bind(this);
+        this.openReply = this.handleOpenReply.bind(this);
+        this.fillComposer = this.handleFillComposer.bind(this);
+        this.submitPost = this.handleSubmitPost.bind(this);
+        this.submitReply = this.handleSubmitPost.bind(this);
+    }
+    async handleDismissMenu(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "menu" ||
             result.needsStateCheck ||
             !result.items?.length)
             throw new Error("关闭菜单需已有菜单证据");
         const item = result.items[0];
-        session.current = null;
-        await (await unique(locator(item.role, item.label))).press("Escape");
+        this.#session.current = null;
+        await (await this.#unique(this.#locator(item.role, item.label))).press("Escape");
         return { completed: true };
         return { completed: false, loc, submittedEditor };
     }
-    async function openControl(command) {
-        const { query, result } = session.current;
+    async handleOpenControl(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (!["navigation", "menu"].includes(query.view) || result.needsStateCheck)
             throw new Error("导航控件须先唯一观察");
@@ -25,19 +69,19 @@ export function createDOMEditing(dependencies) {
             !c.disabled);
         if (matches.length !== 1)
             throw new Error("导航控件未唯一观察");
-        session.current = null;
-        await (await unique(command.role === "text"
-            ? tab.playwright.getByText(command.label, { exact: true })
-            : locator(command.role, command.label))).click();
+        this.#session.current = null;
+        await (await this.#unique(command.role === "text"
+            ? this.#tab.playwright.getByText(command.label, { exact: true })
+            : this.#locator(command.role, command.label))).click();
         if (command.href?.startsWith("/"))
-            await tab.playwright.waitForURL(`https://x.com${command.href}`, {
+            await this.#tab.playwright.waitForURL(`https://x.com${command.href}`, {
                 timeoutMs: 5000,
             });
         return { completed: true };
         return { completed: false, loc, submittedEditor };
     }
-    async function openOwnPostMenu(command) {
-        const { query, result } = session.current;
+    async handleOpenOwnPostMenu(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         const post = result.posts?.[0];
         if (query.view !== "posts" ||
@@ -50,32 +94,32 @@ export function createDOMEditing(dependencies) {
         const more = post.buttons.filter((b) => /^(更多|More)$/.test(b.label) && !b.disabled);
         if (more.length !== 1)
             throw new Error("原帖更多按钮未唯一观察");
-        const article = locator("article").filter({
-            has: tab.playwright.locator(`a[href=${JSON.stringify(post.primary)}]`),
+        const article = this.#locator("article").filter({
+            has: this.#tab.playwright.locator(`a[href=${JSON.stringify(post.primary)}]`),
             visible: true,
         });
-        session.editBinding = {
+        this.#session.editBinding = {
             postId: post.id,
             accountHandle: result.accountHandle,
             body: post.body,
         };
-        session.current = null;
-        await (await unique((await unique(article)).getByRole("button", {
+        this.#session.current = null;
+        await (await this.#unique((await this.#unique(article)).getByRole("button", {
             name: more[0].label,
             exact: true,
         }))).click();
         return { completed: true };
         return { completed: false, loc, submittedEditor };
     }
-    async function submitEditedPost(command) {
-        const { query, result } = session.current;
+    async handleSubmitEditedPost(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "composer" ||
             result.needsStateCheck ||
             result.alerts?.length ||
-            !session.editBinding ||
-            session.editBinding.postId !== command.postId ||
-            result.accountHandle !== session.editBinding.accountHandle ||
+            !this.#session.editBinding ||
+            this.#session.editBinding.postId !== command.postId ||
+            result.accountHandle !== this.#session.editBinding.accountHandle ||
             !command.evidenceRef ||
             !command.approvedText?.trim() ||
             result.editorText !== command.approvedText ||
@@ -84,57 +128,57 @@ export function createDOMEditing(dependencies) {
         const updates = result.buttons.filter((b) => /^(更新|Update)$/.test(b.label) && !b.disabled);
         if (updates.length !== 1)
             throw new Error("编辑更新按钮未唯一观察");
-        const update = await unique(locator("button", updates[0].label));
+        const update = await this.#unique(this.#locator("button", updates[0].label));
         await command.beforeSubmit?.();
-        session.current = null;
-        session.editBinding = null;
+        this.#session.current = null;
+        this.#session.editBinding = null;
         if (command.activation === "keyboard")
             await update.press("Enter");
         else
             await update.click();
-        await tab.playwright.waitForLoadState({
+        await this.#tab.playwright.waitForLoadState({
             state: "networkidle",
             timeoutMs: 8000,
         });
         return { completed: true };
         return { completed: false, loc, submittedEditor };
     }
-    async function expandPost(command) {
-        const { query, result } = session.current;
+    async handleExpandPost(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "posts" ||
             result.posts?.length !== 1 ||
             result.posts[0].id !== command.postId)
             throw new Error("展开需唯一原帖");
         const primary = result.posts[0].primary;
-        const article = locator("article").filter({
-            has: tab.playwright.locator(`a[href=${JSON.stringify(primary)}]`),
+        const article = this.#locator("article").filter({
+            has: this.#tab.playwright.locator(`a[href=${JSON.stringify(primary)}]`),
             visible: true,
         });
-        const control = (await unique(article)).getByText(/^(显示更多|Show more)$/i);
-        session.current = null;
-        await (await unique(control)).click();
+        const control = (await this.#unique(article)).getByText(/^(显示更多|Show more)$/i);
+        this.#session.current = null;
+        await (await this.#unique(control)).click();
         return { completed: true };
         return { completed: false, loc, submittedEditor };
     }
-    async function nextPosts(command) {
-        const { query, result } = session.current;
+    async handleNextPosts(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "posts" || result.needsStateCheck)
             throw new Error("翻页须先观察原列表");
         const primary = result.posts?.at(-1)?.primary;
         if (!primary)
             throw new Error("翻页须有已观察原帖链接");
-        const anchor = await unique(tab.playwright
+        const anchor = await this.#unique(this.#tab.playwright
             .locator(`a[href=${JSON.stringify(primary)}]`)
             .filter({ visible: true }));
-        session.current = null;
+        this.#session.current = null;
         await anchor.press("PageDown");
         return { completed: true };
         return { completed: false, loc, submittedEditor };
     }
-    async function clearPreparedText(command) {
-        const { query, result } = session.current;
+    async handleClearPreparedText(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "composer" ||
             result.needsStateCheck ||
@@ -144,27 +188,30 @@ export function createDOMEditing(dependencies) {
                 command.text.replace(/\n{3,}/g, "\n\n") ||
             result.editors?.length !== 1)
             throw new Error("仅恢复本次已知稿件准备");
-        const editor = await unique(locator("textbox", result.editors[0].label));
+        const editor = await this.#unique(this.#locator("textbox", result.editors[0].label));
         await editor.press("Meta+A");
         await editor.press("Backspace");
-        return { completed: true, value: observe({ view: "composer" }) };
+        return { completed: true, value: this.#observe({ view: "composer" }) };
         return { completed: false, loc, submittedEditor };
     }
-    async function closePreparedReply(command) {
-        const { query, result } = session.current;
+    async handleClosePreparedReply(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "composer" ||
             result.needsStateCheck ||
             result.editorText?.trim() !== "" ||
             !command.evidenceRef)
             throw new Error("仅关闭有准备失败证据的空回复");
-        await (await unique(locator("button", "关闭"))).click();
-        session.replyBinding = null;
-        return { completed: true, value: observe({ view: "posts", limit: 5 }) };
+        await (await this.#unique(this.#locator("button", "关闭"))).click();
+        this.#session.replyBinding = null;
+        return {
+            completed: true,
+            value: this.#observe({ view: "posts", limit: 5 }),
+        };
         return { completed: false, loc, submittedEditor };
     }
-    async function closePreparedMedia(command) {
-        const { query, result } = session.current;
+    async handleClosePreparedMedia(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "media" ||
             result.needsStateCheck ||
@@ -173,15 +220,15 @@ export function createDOMEditing(dependencies) {
         const backs = result.controls.filter((b) => b.role === "button" && /^(返回|Back)$/i.test(b.label) && !b.disabled);
         if (backs.length !== 1)
             throw new Error("媒体返回入口不唯一");
-        await (await unique(locator("button", backs[0].label))).click();
-        await tab.playwright
+        await (await this.#unique(this.#locator("button", backs[0].label))).click();
+        await this.#tab.playwright
             .getByRole("textbox", { name: /^(帖子文本|Post text)$/i })
             .waitFor({ state: "visible", timeoutMs: 5000 });
-        return { completed: true, value: observe({ view: "composer" }) };
+        return { completed: true, value: this.#observe({ view: "composer" }) };
         return { completed: false, loc, submittedEditor };
     }
-    async function removePreparedMedia(command) {
-        const { query, result } = session.current;
+    async handleRemovePreparedMedia(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "composer" ||
             result.needsStateCheck ||
@@ -191,12 +238,12 @@ export function createDOMEditing(dependencies) {
         const removes = result.buttons.filter((b) => /^(移除媒体|Remove media)$/i.test(b.label) && !b.disabled);
         if (removes.length !== 1)
             throw new Error("待恢复媒体不唯一");
-        await (await unique(locator("button", removes[0].label))).click();
-        return { completed: true, value: observe({ view: "composer" }) };
+        await (await this.#unique(this.#locator("button", removes[0].label))).click();
+        return { completed: true, value: this.#observe({ view: "composer" }) };
         return { completed: false, loc, submittedEditor };
     }
-    async function attachAssets(command) {
-        const { query, result } = session.current;
+    async handleAttachAssets(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "composer" ||
             result.needsStateCheck ||
@@ -205,49 +252,49 @@ export function createDOMEditing(dependencies) {
         const asset = command.assets[0];
         if (!asset.alt?.trim())
             throw new Error("图片须有完整ALT");
-        session.current = null;
-        await attachImage(tab, { path: asset.path });
-        await tab.playwright
+        this.#session.current = null;
+        await attachImage(this.#tab, { path: asset.path });
+        await this.#tab.playwright
             .getByRole("button", {
             name: /^(?:编辑|Edit)(?:图片|照片|媒体| image| photo| media)?(?: \d+)?$/i,
         })
             .waitFor({ state: "visible", timeoutMs: 5000 });
-        const composer = await observe({ view: "composer" });
+        const composer = await this.#observe({ view: "composer" });
         const edits = composer.buttons.filter((b) => /^(?:编辑|Edit)(?:图片|照片|媒体| image| photo| media)?(?: \d+)?$/i.test(b.label) && !b.disabled);
         if (edits.length !== 1)
             throw new Error("图片编辑入口未唯一观察");
-        await (await unique(locator("button", edits[0].label))).click();
-        await tab.playwright
+        await (await this.#unique(this.#locator("button", edits[0].label))).click();
+        await this.#tab.playwright
             .getByRole("tab", {
             name: /^(编辑图片描述|Edit image description)$/i,
         })
             .waitFor({ state: "visible", timeoutMs: 5000 });
-        let media = await observe({ view: "media" });
+        let media = await this.#observe({ view: "media" });
         const tabControl = media.controls.find((c) => c.role === "tab" &&
             /^(编辑图片描述|Edit image description)$/i.test(c.label));
         if (!tabControl)
             throw new Error("ALT页签未观察");
-        await (await unique(locator("tab", tabControl.label))).click();
-        media = await observe({ view: "media" });
+        await (await this.#unique(this.#locator("tab", tabControl.label))).click();
+        media = await this.#observe({ view: "media" });
         if (media.needsStateCheck || media.fields.length !== 1)
             throw new Error("ALT输入未唯一观察");
         const field = media.fields[0];
         const input = field.label
-            ? tab.playwright.getByLabel(field.label, { exact: true })
+            ? this.#tab.playwright.getByLabel(field.label, { exact: true })
             : field.placeholder
-                ? tab.playwright.getByPlaceholder(field.placeholder, {
+                ? this.#tab.playwright.getByPlaceholder(field.placeholder, {
                     exact: true,
                 })
-                : locator("textbox");
-        await (await unique(input)).fill(asset.alt);
-        media = await observe({ view: "media" });
+                : this.#locator("textbox");
+        await (await this.#unique(input)).fill(asset.alt);
+        media = await this.#observe({ view: "media" });
         if (media.fields[0]?.value !== asset.alt)
             throw new Error("ALT全文不匹配");
         const save = media.controls.filter((c) => c.role === "button" && /^(保存|Save)$/i.test(c.label) && !c.disabled);
         if (save.length !== 1)
             throw new Error("ALT保存入口不唯一");
-        await (await unique(locator("button", save[0].label))).click();
-        const after = await observe({ view: "composer" });
+        await (await this.#unique(this.#locator("button", save[0].label))).click();
+        const after = await this.#observe({ view: "composer" });
         if (after.needsStateCheck || !after.images?.length)
             throw new Error("上传图片未回到编辑器");
         return {
@@ -260,8 +307,8 @@ export function createDOMEditing(dependencies) {
         };
         return { completed: false, loc, submittedEditor };
     }
-    async function follow(command) {
-        const { query, result } = session.current;
+    async handleFollow(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "person" ||
             query.handle !== command.handle ||
@@ -270,13 +317,13 @@ export function createDOMEditing(dependencies) {
         const name = result.relationship === "follows-you"
             ? `回关 @${command.handle}`
             : `关注 @${command.handle}`;
-        loc = await unique(locator("button", name));
+        loc = await this.#unique(this.#locator("button", name));
         return { completed: false, loc, submittedEditor };
     }
-    async function openReply(command) {
-        const { query, result } = session.current;
+    async handleOpenReply(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
-        session.replyBinding = null;
+        this.#session.replyBinding = null;
         if (query.targetId !== command.postId || result.posts?.length !== 1)
             throw new Error("回复主帖未唯一绑定");
         const names = result.posts[0].buttons.filter((b) => /回复|Reply/i.test(b.label));
@@ -285,35 +332,35 @@ export function createDOMEditing(dependencies) {
         const primary = result.posts[0].primary;
         if (!primary || primary.match(/\/status\/(\d+)$/)?.[1] !== command.postId)
             throw new Error("回复主帖永久链接未绑定");
-        const article = locator("article").filter({
-            has: tab.playwright.locator(`a[href=${JSON.stringify(primary)}]`),
+        const article = this.#locator("article").filter({
+            has: this.#tab.playwright.locator(`a[href=${JSON.stringify(primary)}]`),
             visible: true,
         });
-        loc = await unique((await unique(article)).getByRole("button", {
+        loc = await this.#unique((await this.#unique(article)).getByRole("button", {
             name: names[0].label,
             exact: true,
         }));
         return { completed: false, loc, submittedEditor };
     }
-    async function fillComposer(command) {
-        const { query, result } = session.current;
+    async handleFillComposer(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "composer" || result.editors?.length !== 1)
             throw new Error("编辑器未唯一观察");
-        loc = await unique(locator("textbox", result.editors[0].label));
-        session.current = null;
+        loc = await this.#unique(this.#locator("textbox", result.editors[0].label));
+        this.#session.current = null;
         await loc.fill(command.text);
         const submits = result.buttons.filter((b) => /^(回复|Reply|发帖|发布|Post|更新|Update)$/i.test(b.label));
         if (submits.length !== 1)
             throw new Error("编辑后提交入口不唯一");
-        await locator("button", submits[0].label)
-            .and(tab.playwright.locator(':not([disabled]):not([aria-disabled="true"])'))
+        await this.#locator("button", submits[0].label)
+            .and(this.#tab.playwright.locator(':not([disabled]):not([aria-disabled="true"])'))
             .waitFor({ state: "visible", timeoutMs: 5000 });
         return { completed: true };
         return { completed: false, loc, submittedEditor };
     }
-    async function submitPost(command) {
-        const { query, result } = session.current;
+    async handleSubmitPost(command) {
+        const { query, result } = this.#session.current;
         let loc, submittedEditor;
         if (query.view !== "composer")
             throw new Error("未观察编辑器");
@@ -323,7 +370,7 @@ export function createDOMEditing(dependencies) {
         const buttons = result.buttons?.filter((b) => pattern.test(b.label) && !b.disabled) ?? [];
         if (buttons.length !== 1)
             throw new Error("提交按钮未唯一观察");
-        loc = await unique(locator("button", buttons[0].label));
+        loc = await this.#unique(this.#locator("button", buttons[0].label));
         if (command.activation !== undefined &&
             !["click", "keyboard"].includes(command.activation))
             throw new Error("提交激活方式无效");
@@ -332,7 +379,7 @@ export function createDOMEditing(dependencies) {
         if (command.operation === "submitReply") {
             if (result.editors?.length !== 1 || !result.editorText?.trim())
                 throw new Error("回复提交缺唯一完整编辑器");
-            submittedEditor = locator("textbox", result.editors[0].label).filter({
+            submittedEditor = this.#locator("textbox", result.editors[0].label).filter({
                 hasText: new RegExp(
                 // Full text and actor are checked by platform.compose before this act.
                 // Use a short observed anchor for the retained-text wait: host locator
@@ -343,14 +390,14 @@ export function createDOMEditing(dependencies) {
                     .slice(0, 64)
                     .replace(/[.*+?^${}()|[\]\\]/g, "\\$&")),
             });
-            await unique(submittedEditor);
+            await this.#unique(submittedEditor);
         }
         else {
             if (result.editors?.length !== 1 || !result.editorText?.trim())
                 throw new Error("发帖提交缺唯一完整编辑器");
             // Publication with media may stay pending after the click. Do not let
             // receipt navigation interrupt it while the submitted text is retained.
-            submittedEditor = locator("textbox", result.editors[0].label).filter({
+            submittedEditor = this.#locator("textbox", result.editors[0].label).filter({
                 hasText: new RegExp(
                 // Full text and actor are checked by platform.compose before this act.
                 // Use a short observed anchor for the retained-text wait: host locator
@@ -361,26 +408,11 @@ export function createDOMEditing(dependencies) {
                     .slice(0, 64)
                     .replace(/[.*+?^${}()|[\]\\]/g, "\\$&")),
             });
-            await unique(submittedEditor);
+            await this.#unique(submittedEditor);
         }
         return { completed: false, loc, submittedEditor };
     }
-    return {
-        dismissMenu,
-        openControl,
-        openOwnPostMenu,
-        submitEditedPost,
-        expandPost,
-        nextPosts,
-        clearPreparedText,
-        closePreparedReply,
-        closePreparedMedia,
-        removePreparedMedia,
-        attachAssets,
-        follow,
-        openReply,
-        fillComposer,
-        submitPost,
-        submitReply: submitPost,
-    };
+}
+export function createDOMEditing(...args) {
+    return new DOMEditing(...args);
 }

package/dist/browser-dom-navigation.d.ts

@@ -1,9 +1,18 @@
 import type { DOMDependencies } from "./browser-dom-dependencies.js";
-export declare function createDOMNavigation(dependencies: Pick<DOMDependencies, "session" | "tab" | "observe">): {
+export declare class DOMNavigation {
+    #private;
     searchSources: (command: any) => Promise<void>;
     waitForFolder: (command: any) => Promise<void>;
     waitForPosts: (command: any) => Promise<void>;
     openObserved: (command: any) => Promise<void>;
     refreshPerson: (command: any) => Promise<void>;
     refreshPosts: (command: any) => Promise<void>;
-};
+    constructor(dependencies: Pick<DOMDependencies, "session" | "tab" | "observe">);
+    private handleSearchSources;
+    private handleWaitForFolder;
+    private handleWaitForPosts;
+    private handleOpenObserved;
+    private handleRefreshPerson;
+    private handleRefreshPosts;
+}
+export declare function createDOMNavigation(...args: ConstructorParameters<typeof DOMNavigation>): DOMNavigation;