@agentrhq/webcmd 0.1.2 → 0.2.0

package/clis/zhihu/auth.js

@@ -1,59 +0,0 @@
-import { AuthRequiredError, CommandExecutionError } from '@agentrhq/webcmd/errors';
-import { registerSiteAuthCommands } from '../_shared/site-auth.js';
-
-async function hasZhihuAuthCookie(page) {
-  const cookies = await page.getCookies({ url: 'https://www.zhihu.com' });
-  return cookies.some(c => c.name === 'z_c0' && c.value);
-}
-
-async function verifyZhihuIdentity(page) {
-  if (!await hasZhihuAuthCookie(page)) {
-    throw new AuthRequiredError('www.zhihu.com', 'Zhihu z_c0 cookie missing — anonymous');
-  }
-  await page.goto('https://www.zhihu.com/');
-  await page.wait(2);
-  const data = await page.evaluate(`
-    (async () => {
-      try {
-        const r = await fetch('https://www.zhihu.com/api/v4/me?include=url_token', { credentials: 'include' });
-        if (!r.ok) return { __httpError: r.status };
-        return await r.json();
-      } catch (e) {
-        return { __exception: String(e && e.message || e) };
-      }
-    })()
-  `);
-  if (data?.__exception) {
-    throw new CommandExecutionError(`Zhihu whoami failed: ${data.__exception}`);
-  }
-  if (!data || data.__httpError) {
-    const status = data?.__httpError;
-    if (status === 401 || status === 403) {
-      throw new AuthRequiredError('www.zhihu.com', `Zhihu /api/v4/me returned HTTP ${status} — anonymous`);
-    }
-    throw new CommandExecutionError(`Zhihu identity probe failed (HTTP ${status ?? 'unknown'})`);
-  }
-  if (!data.url_token) {
-    throw new AuthRequiredError('www.zhihu.com', 'Zhihu /api/v4/me returned no url_token — anonymous session');
-  }
-  return {
-    url_token: String(data.url_token),
-    name: String(data.name ?? ''),
-    uid: String(data.uid ?? data.id ?? ''),
-  };
-}
-
-registerSiteAuthCommands({
-  site: 'zhihu',
-  domain: 'www.zhihu.com',
-  loginUrl: 'https://www.zhihu.com/signin',
-  columns: ['url_token', 'name', 'uid'],
-  quickCheck: hasZhihuAuthCookie,
-  verify: verifyZhihuIdentity,
-  poll: async (page) => {
-    if (!await hasZhihuAuthCookie(page)) {
-      throw new AuthRequiredError('www.zhihu.com', 'Waiting for Zhihu z_c0 cookie');
-    }
-    return verifyZhihuIdentity(page);
-  },
-});

package/clis/zhihu/collection.js

@@ -1,199 +0,0 @@
-import { cli, Strategy } from '@agentrhq/webcmd/registry';
-import { ArgumentError, AuthRequiredError, CommandExecutionError, EmptyResultError } from '@agentrhq/webcmd/errors';
-import { log } from '@agentrhq/webcmd/logger';
-import { stripHtml } from './text.js';
-
-function validatePositiveInt(value, name) {
-  const n = Number(value);
-  if (!Number.isInteger(n) || n <= 0) {
-    throw new ArgumentError(`zhihu collection --${name} must be a positive integer`, 'Example: webcmd zhihu collection 83283292 --limit 20');
-  }
-  return n;
-}
-
-function validateNonNegativeInt(value, name) {
-  const n = Number(value);
-  if (!Number.isInteger(n) || n < 0) {
-    throw new ArgumentError(`zhihu collection --${name} must be a non-negative integer`, 'Example: webcmd zhihu collection 83283292 --offset 0');
-  }
-  return n;
-}
-
-async function fetchCollectionPage(page, collectionId, offset, limit) {
-  const url = `https://www.zhihu.com/api/v4/collections/${collectionId}/items?offset=${offset}&limit=${limit}`;
-  const data = await page.evaluate(`
-    (async () => {
-      const r = await fetch(${JSON.stringify(url)}, { credentials: 'include' });
-      if (!r.ok) return { __httpError: r.status };
-      return await r.json();
-    })()
-  `);
-
-  if (!data || data.__httpError) {
-    const status = data?.__httpError;
-    if (status === 401 || status === 403) {
-      throw new AuthRequiredError('www.zhihu.com', 'Failed to fetch collection data from Zhihu. Please ensure you are logged in.');
-    }
-    throw new CommandExecutionError(
-      status ? `Zhihu collection request failed (HTTP ${status})` : 'Zhihu collection request failed',
-      'Try again later or rerun with -v for more detail',
-    );
-  }
-  return data;
-}
-
-function itemKey(item) {
-  const content = item?.content || {};
-  return `${content.type || ''}:${content.id || content.url || JSON.stringify(content).slice(0, 80)}`;
-}
-
-function mapCollectionItem(item, rank) {
-  const content = item.content || {};
-  const type = content.type || '';
-  if (!['answer', 'article', 'pin'].includes(type)) {
-    throw new CommandExecutionError(
-      `Zhihu collection returned unsupported content type: ${type || 'missing'}`,
-      'Collection items require a supported content.type so the row identity, title, and URL are not silently blank.',
-    );
-  }
-
-  let title = '';
-  let excerpt = '';
-  let url = '';
-  let author = '';
-  let votes = 0;
-
-  if (type === 'answer') {
-    const question = content.question || {};
-    title = question.title || '';
-    excerpt = stripHtml(content.content || '').substring(0, 150);
-    url = content.url || `https://www.zhihu.com/question/${question.id}/answer/${content.id}`;
-    author = content.author?.name || '匿名用户';
-    votes = content.voteup_count || 0;
-  } else if (type === 'article') {
-    title = content.title || '';
-    excerpt = stripHtml(content.content || '').substring(0, 150);
-    url = content.url || `https://zhuanlan.zhihu.com/p/${content.id}`;
-    author = content.author?.name || '匿名用户';
-    votes = content.voteup_count || 0;
-  } else if (type === 'pin') {
-    title = '想法';
-    excerpt = stripHtml((content.content || []).map((c) => c.content || '').join(' ')).substring(0, 150);
-    url = content.url || `https://www.zhihu.com/pin/${content.id}`;
-    author = content.author?.name || '匿名用户';
-    votes = content.reaction_count || 0;
-  }
-
-  if (!String(title || '').trim() || !String(url || '').trim() || url.includes('undefined')) {
-    throw new CommandExecutionError(
-      'Zhihu collection returned a malformed item without title or URL identity',
-      'Collection item rows require type, title, and URL so malformed payloads do not become blank listing rows.',
-    );
-  }
-
-  return {
-    rank,
-    type,
-    title: stripHtml(title).substring(0, 100),
-    author,
-    votes,
-    excerpt,
-    url,
-  };
-}
-
-cli({
-  site: 'zhihu',
-  name: 'collection',
-    access: 'read',
-  description: '知乎收藏夹内容列表（需要登录）',
-  domain: 'www.zhihu.com',
-  strategy: Strategy.COOKIE,
-  browser: true,
-  args: [
-    { name: 'id', positional: true, required: true, help: '收藏夹 ID (数字，可从收藏夹 URL 中获取)' },
-    { name: 'offset', type: 'int', default: 0, help: '起始偏移量（用于分页）' },
-    { name: 'limit', type: 'int', default: 20, help: '每页数量（最大 20）' },
-  ],
-  columns: ['rank', 'type', 'title', 'author', 'votes', 'excerpt', 'url'],
-  func: async (page, kwargs) => {
-    const { id, offset = 0, limit = 20 } = kwargs;
-
-    const collectionId = String(id);
-
-    // 验证收藏夹 ID 为数字
-    if (!/^\d+$/.test(collectionId)) {
-      throw new ArgumentError('Collection ID must be numeric', 'Example: webcmd zhihu collection 83283292');
-    }
-
-    const pageOffset = validateNonNegativeInt(offset, 'offset');
-    const requestedLimit = validatePositiveInt(limit, 'limit');
-    const pageLimit = Math.min(requestedLimit, 20); // 知乎 API 限制每页最大 20
-
-    // 先访问知乎主页建立 session
-    await page.goto('https://www.zhihu.com');
-
-    const collected = [];
-    const seen = new Set();
-    let totals = 0;
-    let nextOffset = pageOffset;
-    const maxPages = Math.ceil(requestedLimit / pageLimit) + 2;
-    for (let pageIndex = 0; pageIndex < maxPages && collected.length < requestedLimit; pageIndex += 1) {
-      const currentFetchLimit = Math.min(pageLimit, requestedLimit - collected.length);
-      const data = await fetchCollectionPage(page, collectionId, nextOffset, currentFetchLimit);
-      const items = Array.isArray(data.data) ? data.data : [];
-      const paging = data.paging || {};
-      totals = Number(paging.totals || totals || 0);
-
-      for (const item of items) {
-        const key = itemKey(item);
-        if (!seen.has(key)) {
-          seen.add(key);
-          collected.push(item);
-        }
-        if (collected.length >= requestedLimit) break;
-      }
-
-      if (items.length === 0 || paging.is_end || collected.length >= requestedLimit) break;
-      if (typeof paging.next === 'string') {
-        try {
-          const nextUrl = new URL(paging.next);
-          const parsedOffset = Number(nextUrl.searchParams.get('offset'));
-          if (Number.isInteger(parsedOffset) && parsedOffset > nextOffset) {
-            nextOffset = parsedOffset;
-            continue;
-          }
-        } catch {}
-      }
-      if (items.length < currentFetchLimit) break;
-      const fallbackOffset = nextOffset + items.length;
-      if (fallbackOffset <= nextOffset) break;
-      nextOffset = fallbackOffset;
-      if (totals && nextOffset >= totals) break;
-    }
-    
-    // 计算总页数
-    const totalPages = Math.ceil(totals / pageLimit);
-    const currentPage = Math.floor(pageOffset / pageLimit) + 1;
-    
-    // 输出统计信息
-    if (totals > 0) {
-      log.info(`收藏夹共有 ${totals} 条内容，共 ${totalPages} 页`);
-      log.info(`当前第 ${currentPage} 页，显示第 ${pageOffset + 1} - ${Math.min(pageOffset + collected.length, totals)} 条`);
-    }
-
-    if (collected.length === 0) {
-      throw new EmptyResultError('zhihu collection', `No items found for collection ${collectionId}. The collection may be empty, private, or the offset may be out of range.`);
-    }
-
-    return collected.slice(0, requestedLimit).map((item, i) => mapCollectionItem(item, pageOffset + i + 1));
-  },
-});
-
-export const __test__ = {
-  stripHtml,
-  validatePositiveInt,
-  validateNonNegativeInt,
-  itemKey,
-  mapCollectionItem,
-};

package/clis/zhihu/collection.test.js

@@ -1,337 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { getRegistry } from '@agentrhq/webcmd/registry';
-import { ArgumentError, AuthRequiredError, CommandExecutionError, EmptyResultError } from '@agentrhq/webcmd/errors';
-
-// Mock logger
-vi.mock('@agentrhq/webcmd/logger', () => ({
-  log: {
-    info: vi.fn(),
-    status: vi.fn(),
-    success: vi.fn(),
-    warn: vi.fn(),
-    error: vi.fn(),
-    verbose: vi.fn(),
-    debug: vi.fn(),
-    step: vi.fn(),
-    stepResult: vi.fn(),
-  },
-}));
-
-import './collection.js';
-
-describe('zhihu collection', () => {
-  it('returns collection items from the Zhihu API', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    expect(cmd?.func).toBeTypeOf('function');
-
-    const goto = vi.fn().mockResolvedValue(undefined);
-    const evaluate = vi.fn().mockImplementation(async (js) => {
-      expect(js).toContain('collections/83283292/items');
-      expect(js).toContain("credentials: 'include'");
-      return {
-        data: [
-          {
-            content: {
-              type: 'answer',
-              id: 123456,
-              question: { id: 789012, title: '"Test" & Question' },
-              author: { name: 'test_author' },
-              voteup_count: 42,
-              content: '<p>&#34;Test&#34; &#x26; answer content</p>',
-              url: 'https://www.zhihu.com/question/789012/answer/123456',
-            },
-          },
-        ],
-        paging: { totals: 100 },
-      };
-    });
-
-    const page = { goto, evaluate };
-
-    const result = await cmd.func(page, { id: '83283292', offset: 0, limit: 20 });
-    
-    expect(result).toHaveLength(1);
-    expect(result[0]).toMatchObject({
-      rank: 1,
-      type: 'answer',
-      title: '"Test" & Question',
-      author: 'test_author',
-      votes: 42,
-      excerpt: '"Test" & answer content',
-      url: 'https://www.zhihu.com/question/789012/answer/123456',
-    });
-
-    expect(goto).toHaveBeenCalledWith('https://www.zhihu.com');
-    expect(evaluate).toHaveBeenCalledTimes(1);
-  });
-
-  it('handles article type items', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const evaluate = vi.fn().mockResolvedValue({
-      data: [
-        {
-          content: {
-            type: 'article',
-            id: 987654,
-            title: 'Test Article',
-            author: { name: 'article_author' },
-            voteup_count: 100,
-            content: '<p>Article content</p>',
-            url: 'https://zhuanlan.zhihu.com/p/987654',
-          },
-        },
-      ],
-      paging: { totals: 50 },
-    });
-
-    const page = { goto: vi.fn().mockResolvedValue(undefined), evaluate };
-
-    const result = await cmd.func(page, { id: '83283292', offset: 0, limit: 20 });
-    
-    expect(result[0]).toMatchObject({
-      type: 'article',
-      title: 'Test Article',
-      author: 'article_author',
-      votes: 100,
-    });
-  });
-
-  it('handles pin type items', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const evaluate = vi.fn().mockResolvedValue({
-      data: [
-        {
-          content: {
-            type: 'pin',
-            id: 111222,
-            author: { name: 'pin_author' },
-            reaction_count: 25,
-            content: [{ content: 'Pin content here' }],
-            url: 'https://www.zhihu.com/pin/111222',
-          },
-        },
-      ],
-      paging: { totals: 30 },
-    });
-
-    const page = { goto: vi.fn().mockResolvedValue(undefined), evaluate };
-
-    const result = await cmd.func(page, { id: '83283292', offset: 0, limit: 20 });
-    
-    expect(result[0]).toMatchObject({
-      type: 'pin',
-      title: '想法',
-      author: 'pin_author',
-      votes: 25,
-    });
-  });
-
-  it('maps auth failures to AuthRequiredError', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const page = {
-      goto: vi.fn().mockResolvedValue(undefined),
-      evaluate: vi.fn().mockResolvedValue({ __httpError: 401 }),
-    };
-
-    await expect(
-      cmd.func(page, { id: '83283292', offset: 0, limit: 20 }),
-    ).rejects.toBeInstanceOf(AuthRequiredError);
-  });
-
-  it('maps 403 errors to AuthRequiredError', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const page = {
-      goto: vi.fn().mockResolvedValue(undefined),
-      evaluate: vi.fn().mockResolvedValue({ __httpError: 403 }),
-    };
-
-    await expect(
-      cmd.func(page, { id: '83283292', offset: 0, limit: 20 }),
-    ).rejects.toBeInstanceOf(AuthRequiredError);
-  });
-
-  it('preserves non-auth fetch failures as CommandExecutionError', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const page = {
-      goto: vi.fn().mockResolvedValue(undefined),
-      evaluate: vi.fn().mockResolvedValue({ __httpError: 500 }),
-    };
-
-    await expect(
-      cmd.func(page, { id: '83283292', offset: 0, limit: 20 }),
-    ).rejects.toBeInstanceOf(CommandExecutionError);
-  });
-
-  it('handles null evaluate response as fetch error', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const page = {
-      goto: vi.fn().mockResolvedValue(undefined),
-      evaluate: vi.fn().mockResolvedValue(null),
-    };
-
-    await expect(
-      cmd.func(page, { id: '83283292', offset: 0, limit: 20 }),
-    ).rejects.toBeInstanceOf(CommandExecutionError);
-  });
-
-  it('rejects non-numeric collection IDs', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const page = { goto: vi.fn(), evaluate: vi.fn() };
-
-    await expect(
-      cmd.func(page, { id: "abc'; alert(1); //", offset: 0, limit: 20 }),
-    ).rejects.toBeInstanceOf(ArgumentError);
-
-    expect(page.goto).not.toHaveBeenCalled();
-    expect(page.evaluate).not.toHaveBeenCalled();
-  });
-
-  it('respects pagination offset', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const evaluate = vi.fn().mockResolvedValue({
-      data: [
-        {
-          content: {
-            type: 'answer',
-            id: 1,
-            question: { id: 1, title: 'Test' },
-            author: { name: 'author' },
-            voteup_count: 10,
-            content: 'Content',
-          },
-        },
-      ],
-      paging: { totals: 100 },
-    });
-
-    const page = { goto: vi.fn().mockResolvedValue(undefined), evaluate };
-
-    const result = await cmd.func(page, { id: '83283292', offset: 40, limit: 20 });
-    
-    expect(result[0].rank).toBe(41); // offset 40 + index 0 + 1
-    expect(evaluate).toHaveBeenCalledWith(
-      expect.stringContaining('offset=40'),
-    );
-  });
-
-  it('rejects invalid offset and limit before navigation', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const page = { goto: vi.fn(), evaluate: vi.fn() };
-
-    await expect(cmd.func(page, { id: '83283292', offset: -1, limit: 20 }))
-      .rejects.toBeInstanceOf(ArgumentError);
-    await expect(cmd.func(page, { id: '83283292', offset: 0, limit: 0 }))
-      .rejects.toBeInstanceOf(ArgumentError);
-    expect(page.goto).not.toHaveBeenCalled();
-  });
-
-  it('paginates until requested limit and deduplicates items', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const evaluate = vi.fn()
-      .mockResolvedValueOnce({
-        data: [
-          {
-            content: {
-              type: 'answer',
-              id: 1,
-              question: { id: 1, title: 'A' },
-              author: { name: 'alice' },
-              content: 'A',
-            },
-          },
-        ],
-        paging: { totals: 3, is_end: false, next: 'https://www.zhihu.com/api/v4/collections/83283292/items?offset=1&limit=1' },
-      })
-      .mockResolvedValueOnce({
-        data: [
-          {
-            content: {
-              type: 'answer',
-              id: 1,
-              question: { id: 1, title: 'A duplicate' },
-              author: { name: 'alice' },
-              content: 'A',
-            },
-          },
-          {
-            content: {
-              type: 'answer',
-              id: 2,
-              question: { id: 2, title: 'B' },
-              author: { name: 'bob' },
-              content: 'B',
-            },
-          },
-        ],
-        paging: { totals: 3, is_end: true },
-      });
-
-    const page = { goto: vi.fn().mockResolvedValue(undefined), evaluate };
-
-    const result = await cmd.func(page, { id: '83283292', offset: 0, limit: 2 });
-
-    expect(result.map((row) => row.title)).toEqual(['A', 'B']);
-    expect(evaluate).toHaveBeenCalledTimes(2);
-    expect(evaluate.mock.calls[1][0]).toContain('offset=1');
-  });
-
-  it('throws EmptyResultError for empty collection', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const page = {
-      goto: vi.fn().mockResolvedValue(undefined),
-      evaluate: vi.fn().mockResolvedValue({
-        data: [],
-        paging: { totals: 0 },
-      }),
-    };
-
-    await expect(cmd.func(page, { id: '83283292', offset: 0, limit: 20 }))
-      .rejects.toBeInstanceOf(EmptyResultError);
-  });
-
-  it('fails typed for missing content.type instead of emitting a blank identity row', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const evaluate = vi.fn().mockResolvedValue({
-      data: [
-        {
-          content: {
-            id: 555,
-            question: { id: 666, title: 'No-type Question' },
-            author: { name: 'a' },
-            voteup_count: 1,
-            content: '<p>x</p>',
-            url: 'https://www.zhihu.com/question/666',
-          },
-        },
-      ],
-      paging: { totals: 1 },
-    });
-    const page = { goto: vi.fn().mockResolvedValue(undefined), evaluate };
-    await expect(cmd.func(page, { id: '83283292', offset: 0, limit: 20 }))
-      .rejects.toBeInstanceOf(CommandExecutionError);
-  });
-
-  it('fails typed for supported collection items missing title/url identity', async () => {
-    const cmd = getRegistry().get('zhihu/collection');
-    const page = {
-      goto: vi.fn().mockResolvedValue(undefined),
-      evaluate: vi.fn().mockResolvedValue({
-        data: [
-          {
-            content: {
-              type: 'answer',
-              id: 555,
-              question: { id: 666, title: '' },
-              author: { name: 'a' },
-              voteup_count: 1,
-              content: '<p>x</p>',
-            },
-          },
-        ],
-        paging: { totals: 1 },
-      }),
-    };
-    await expect(cmd.func(page, { id: '83283292', offset: 0, limit: 20 }))
-      .rejects.toBeInstanceOf(CommandExecutionError);
-  });
-});