@nextclaw/x-harness 0.2.39 → 0.2.40

package/SOURCE.md

@@ -1,8 +1,8 @@
 # Corresponding source
 
-Version 0.2.39, commit e3d0f784983fbdef6162a4e92d9921fe15ce3237.
+Version 0.2.40, commit 26581c241d56f52365a0e1e903cb0e0122c6988d.
 
-Complete source, build scripts and dependencies: https://github.com/Peiiii/x-harness/tree/e3d0f784983fbdef6162a4e92d9921fe15ce3237
+Complete source, build scripts and dependencies: https://github.com/Peiiii/x-harness/tree/26581c241d56f52365a0e1e903cb0e0122c6988d
 
 Clone this revision, run npm ci, npm run bootstrap and npm run release:build.
 

package/dist/platform-collections.d.ts

@@ -9,6 +9,8 @@ export declare class PlatformCollections {
     private handleCollectSources;
     private handleReadCreator;
     private handleReadBookmarks;
+    private bookmarkDiscovery;
+    private waitForBookmarkLabel;
     private handleSearchSources;
 }
 export declare function createPlatformCollections(...args: ConstructorParameters<typeof PlatformCollections>): PlatformCollections;

package/dist/platform-collections.js

@@ -174,8 +174,15 @@ export class PlatformCollections {
             targetLabel: folder,
             bookmarkNavigation: true,
         });
+        if (discoverOnly && nav.bookmarkFolders?.length)
+            return this.bookmarkDiscovery(nav);
         const bookmark = (c) => /^(书签|收藏|Bookmarks)$/i.test(c.label);
-        if (!(await this.#choose(nav, bookmark, { activateSelected: true })) &&
+        const matching = (nav.controls ?? []).filter(bookmark);
+        const entered = await this.#choose(nav, bookmark, {
+            activateSelected: true,
+        });
+        const openedTab = entered && matching.length === 1 && matching[0].role === "tab";
+        if (!entered &&
             !(await this.#choose(nav, (c) => /^(历史|History)$/i.test(c.label)))) {
             if (await this.#choose(nav, (c) => /^(更多菜单项|More menu items)$/i.test(c.label))) {
                 nav = await this.#ready({ view: "menu" });
@@ -207,13 +214,19 @@ export class PlatformCollections {
             targetLabel: folder,
             bookmarkNavigation: true,
         });
+        if (discoverOnly &&
+            !(nav.controls ?? []).some((c) => c.role === "tab")) {
+            await this.waitForBookmarkLabel(nav, "书签", "Bookmarks");
+            nav = await this.#ready({ view: "navigation", bookmarkNavigation: true });
+        }
         const tabs = (nav.controls ?? []).filter((c) => c.role === "tab" &&
             (bookmark(c) ||
                 (discoverOnly &&
                     /\/i\/(?:history|bookmarks)(?:\/|$)/.test(nav.page ?? "") &&
                     c.selected &&
                     !/^(喜欢|Likes)$/i.test(c.label))));
-        if (tabs.length === 1 &&
+        if (!openedTab &&
+            tabs.length === 1 &&
             (!tabs[0].selected ||
                 !(nav.controls ?? []).some((c) => c.label.split("\n")[0] === folder))) {
             await this.#choose(nav, (c) => c === tabs[0], {
@@ -226,17 +239,14 @@ export class PlatformCollections {
             });
         }
         if (discoverOnly) {
-            const folders = nav.bookmarkFolders ?? [];
-            return {
-                page: nav.page,
-                accountHandle: nav.accountHandle,
-                observedAt: nav.observedAt,
-                fresh: true,
-                complete: folders.length > 0 && !nav.alerts?.length,
-                pageComplete: false,
-                folders,
-                missing: folders.length ? [] : ["bookmark-folder-menu-unconfirmed"],
-            };
+            if (!nav.bookmarkFolders?.length) {
+                await this.waitForBookmarkLabel(nav, "所有书签", "All bookmarks");
+                nav = await this.#ready({
+                    view: "navigation",
+                    bookmarkNavigation: true,
+                });
+            }
+            return this.bookmarkDiscovery(nav);
         }
         if (!(nav.controls ?? []).some((c) => c.label.split("\n")[0] === folder)) {
             try {
@@ -281,6 +291,31 @@ export class PlatformCollections {
             },
         };
     }
+    bookmarkDiscovery(nav) {
+        const folders = nav.bookmarkFolders ?? [];
+        return {
+            page: nav.page,
+            accountHandle: nav.accountHandle,
+            observedAt: nav.observedAt,
+            fresh: true,
+            complete: folders.length > 0 && !nav.alerts?.length,
+            pageComplete: false,
+            folders,
+            missing: folders.length ? [] : ["bookmark-folder-menu-unconfirmed"],
+        };
+    }
+    async waitForBookmarkLabel(nav, chinese, english) {
+        const folder = (nav.controls ?? []).some((c) => /^(History|Bookmarks)$/i.test(c.label))
+            ? english
+            : chinese;
+        try {
+            await this.#browser.act({ operation: "waitForFolder", folder });
+        }
+        catch (error) {
+            if (!/timed out|timeout/i.test(error.message))
+                throw error;
+        }
+    }
     async handleSearchSources({ query, limit = 3, maxPages = 1, processedIds = [], } = {}) {
         await this.#browser.act({ operation: "searchSources", query });
         const value = await this.handleCollectSources({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextclaw/x-harness",
-  "version": "0.2.39",
+  "version": "0.2.40",
   "type": "module",
   "description": "Typed X task harness with compact business results and explicit diagnostics.",
   "main": "./dist/index.js",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e3d0f784983fbdef6162a4e92d9921fe15ce3237"
+  "gitHead": "26581c241d56f52365a0e1e903cb0e0122c6988d"
 }