@web-auto/webauto 0.1.7 → 0.1.9

package/apps/desktop-console/entry/ui-cli.mjs

@@ -409,6 +409,8 @@ async function runFullCover(endpoint) {
     await runProbe('scheduler', '#scheduler-name');
     await runProbe('scheduler', '#scheduler-enabled');
     await runProbe('scheduler', '#scheduler-type');
+    await runProbe('scheduler', '#scheduler-periodic-type-wrap');
+    await runProbe('scheduler', '#scheduler-periodic-type');
     await runProbe('scheduler', '#scheduler-interval-wrap');
     await runProbe('scheduler', '#scheduler-runat-wrap');
     await runProbe('scheduler', '#scheduler-interval');
@@ -424,21 +426,34 @@ async function runFullCover(endpoint) {
     await runProbe('scheduler', '#scheduler-dryrun');
     await runProbe('scheduler', '#scheduler-like-keywords');
     await runProbe('scheduler', '#scheduler-save-btn');
+    await runProbe('scheduler', '#scheduler-run-now-btn');
     await runProbe('scheduler', '#scheduler-reset-btn');
-    await select('#scheduler-type', 'once');
-    await wait('#scheduler-runat-wrap', 8000, 'visible');
+    await select('#scheduler-type', 'immediate');
+    await wait('#scheduler-periodic-type-wrap', 8000, 'hidden');
+    await wait('#scheduler-runat-wrap', 8000, 'hidden');
     await wait('#scheduler-interval-wrap', 8000, 'hidden');
-    await select('#scheduler-type', 'daily');
+    await select('#scheduler-type', 'periodic');
+    await wait('#scheduler-periodic-type-wrap', 8000, 'visible');
+    await wait('#scheduler-interval-wrap', 8000, 'visible');
+    await wait('#scheduler-runat-wrap', 8000, 'hidden');
+    await select('#scheduler-periodic-type', 'daily');
     await wait('#scheduler-runat-wrap', 8000, 'visible');
-    await select('#scheduler-type', 'weekly');
+    await wait('#scheduler-interval-wrap', 8000, 'hidden');
+    await select('#scheduler-periodic-type', 'weekly');
     await wait('#scheduler-runat-wrap', 8000, 'visible');
-    await select('#scheduler-type', 'interval');
-    await wait('#scheduler-interval-wrap', 8000, 'visible');
+    await wait('#scheduler-interval-wrap', 8000, 'hidden');
+    await select('#scheduler-periodic-type', 'interval');
     await wait('#scheduler-runat-wrap', 8000, 'hidden');
+    await wait('#scheduler-interval-wrap', 8000, 'visible');
+    await select('#scheduler-type', 'scheduled');
+    await wait('#scheduler-periodic-type-wrap', 8000, 'hidden');
+    await wait('#scheduler-runat-wrap', 8000, 'visible');
+    await wait('#scheduler-interval-wrap', 8000, 'hidden');
     await input('#scheduler-name', taskName);
-    await select('#scheduler-type', 'interval');
+    await select('#scheduler-type', 'periodic');
+    await select('#scheduler-periodic-type', 'interval');
     await input('#scheduler-interval', '20');
-    await input('#scheduler-profile', 'xiaohongshu-batch-0');
+    await input('#scheduler-profile', '');
     await input('#scheduler-keyword', keywordSeed);
     await input('#scheduler-max-notes', '20');
     await select('#scheduler-env', 'debug');

package/apps/desktop-console/entry/ui-console.mjs

@@ -10,11 +10,15 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const APP_ROOT = path.resolve(__dirname, '..');
 const DIST_MAIN = path.join(APP_ROOT, 'dist', 'main', 'index.mjs');
 
-const args = minimist(process.argv.slice(2), {
-  boolean: ['build', 'install', 'check', 'help', 'headless', 'no-daemon', 'dry-run', 'no-dry-run', 'parallel', 'do-likes'],
+const rawArgv = process.argv.slice(2);
+const args = minimist(rawArgv, {
+  boolean: ['build', 'install', 'check', 'help', 'headless', 'no-daemon', 'foreground', 'dry-run', 'no-dry-run', 'parallel', 'do-likes'],
   string: ['profile', 'profiles', 'keyword', 'target', 'scenario', 'output', 'concurrency', 'like-keywords', 'max-likes'],
   alias: { h: 'help', p: 'profile', k: 'keyword', t: 'target', o: 'output' }
 });
+// minimist treats `--no-foo` as negation of `foo`, so `--no-daemon` must be
+// detected from raw argv to keep backward-compatible CLI behavior.
+const noDaemon = rawArgv.includes('--no-daemon') || rawArgv.includes('--foreground') || args.foreground === true;
 
 function printHelp() {
   console.log(`webauto ui console
@@ -35,6 +39,7 @@ Options:
   --build      Auto-build if missing
   --install    Auto-install if missing deps
   --no-daemon  Run in foreground mode
+  --foreground Alias of --no-daemon
   --scenario   Test scenario name
   --profile    Test profile ID
   --profiles   Test profile IDs (comma-separated)
@@ -677,7 +682,7 @@ async function main() {
     return;
   }
 
-  await startConsole(args['no-daemon']);
+  await startConsole(noDaemon);
 }
 
 main().catch((err) => {

package/apps/webauto/entry/account.mjs

@@ -46,6 +46,12 @@ function normalizeAlias(input) {
   return value || null;
 }
 
+function normalizePlatform(input, fallback = 'xiaohongshu') {
+  const raw = String(input || fallback).trim().toLowerCase();
+  if (!raw || raw === 'xhs') return 'xiaohongshu';
+  return raw;
+}
+
 async function publishAccountEvent(type, payload) {
   try {
     await publishBusEvent({
@@ -60,9 +66,42 @@ async function publishAccountEvent(type, payload) {
 
 async function detectAliasFromActivePage(profileId, selector) {
   const { callAPI } = await import('../../../modules/camo-runtime/src/utils/browser-service.mjs');
-  const script = `(() => {
+  const script = `(async () => {
+    const normalize = (value) => String(value || '').replace(/\\s+/g, ' ').trim();
+    const isVisible = (node) => {
+      if (!(node instanceof HTMLElement)) return false;
+      const style = window.getComputedStyle(node);
+      if (!style) return false;
+      if (style.display === 'none' || style.visibility === 'hidden' || Number(style.opacity || '1') === 0) return false;
+      const rect = node.getBoundingClientRect();
+      return rect.width > 0 && rect.height > 0;
+    };
+    const isSelfTabText = (value) => {
+      const text = normalize(value);
+      return text === '我' || text === '我的' || text === '个人主页' || text === '我的主页';
+    };
+    const selfTabCandidates = Array.from(document.querySelectorAll('a, button, [role="tab"], [role="link"], [class*="tab"]'))
+      .map((node) => ({
+        node,
+        text: normalize(node.textContent || ''),
+        title: normalize(node.getAttribute?.('title') || ''),
+        aria: normalize(node.getAttribute?.('aria-label') || ''),
+      }))
+      .filter((item) => isSelfTabText(item.text) || isSelfTabText(item.title) || isSelfTabText(item.aria));
+    const selfTarget = selfTabCandidates.find((item) => isVisible(item.node)) || selfTabCandidates[0] || null;
+    if (selfTarget?.node) {
+      try {
+        selfTarget.node.click();
+        await new Promise((resolve) => setTimeout(resolve, 900));
+      } catch {
+        // ignore self-tab click failure
+      }
+    }
+
     const requested = ${JSON.stringify(String(selector || '').trim())};
     const defaultSelectors = [
+      '[data-testid*="nickname"]',
+      '[class*="profile"] [class*="name"]',
       '[class*="user"] [class*="name"]',
       '[class*="nickname"]',
       '[class*="account"] [class*="name"]',
@@ -76,14 +115,19 @@ async function detectAliasFromActivePage(profileId, selector) {
     for (const sel of selectors) {
       const nodes = Array.from(document.querySelectorAll(sel)).slice(0, 6);
       for (const node of nodes) {
-        const text = clean(node.textContent || '');
+        const text = clean(node.textContent || node.getAttribute?.('title') || '');
         if (!text) continue;
         candidates.push({ text, selector: sel });
       }
     }
+    const userInfo = document.querySelector('[class*="user"] [class*="nickname"], [class*="profile"] [class*="nickname"]');
+    if (userInfo) {
+      const text = clean(userInfo.textContent || '');
+      if (text) candidates.push({ text, selector: 'profile.nickname' });
+    }
     const title = clean(document.title || '');
     if (title) candidates.push({ text: title, selector: 'document.title' });
-    const bad = ['小红书', '登录', '注册', '搜索'];
+    const bad = ['小红书', '登录', '注册', '搜索', '我', '消息', '通知'];
     const picked = candidates.find((item) => {
       if (!item?.text) return false;
       if (item.text.length < 2) return false;
@@ -114,7 +158,7 @@ function printHelp() {
 
 Usage:
   webauto account --help
-  webauto account list [--json]
+  webauto account list [--platform <name>] [--json]
   webauto account list --records [--json]
   webauto account add [--platform <name>] [--alias <alias>] [--name <name>] [--username <username>] [--profile <id>] [--fingerprint <id>] [--status pending|active|disabled|archived] [--json]
   webauto account get <id|alias> [--json]
@@ -143,8 +187,9 @@ Examples:
 `);
 }
 
-async function cmdList(jsonMode) {
-  const result = listAccountProfiles();
+async function cmdList(jsonMode, platformArg = '') {
+  const platform = normalizeAlias(platformArg) ? normalizePlatform(platformArg) : '';
+  const result = listAccountProfiles(platform ? { platform } : {});
   output({ ok: true, ...result }, jsonMode);
 }
 
@@ -229,8 +274,20 @@ async function cmdLogin(idOrAlias, argv, jsonMode) {
   const account = getAccount(idOrAlias);
   await ensureProfile(account.profileId);
   const url = String(argv.url || inferLoginUrl(account.platform)).trim();
+  // Default idle timeout: 30 minutes, configurable via env or CLI.
+  // Keep validation semantics aligned with camo parseDurationMs.
   const idleTimeout = String(argv['idle-timeout'] || process.env.WEBAUTO_LOGIN_IDLE_TIMEOUT || '30m').trim() || '30m';
 
+  const idleTimeoutLower = idleTimeout.toLowerCase();
+  const idleTimeoutOk = /^(?:\d+(?:\.\d+)?(?:ms|s|m|h)?|0|off|none|disable|disabled)$/.test(idleTimeoutLower);
+  if (!idleTimeoutOk) {
+    output({
+      ok: false,
+      error: 'Invalid idle-timeout format. Use forms like 30m, 1800s, 5000ms, 1h, 0, off.',
+    }, jsonMode);
+    process.exit(1);
+  }
+
   const pendingProfile = await syncXhsAccountByProfile(account.profileId, { pendingWhileLogin: true }).catch((error) => ({
     profileId: account.profileId,
     valid: false,
@@ -340,9 +397,13 @@ async function cmdSyncAlias(idOrAlias, argv, jsonMode) {
 async function cmdSync(target, argv, jsonMode) {
   const pendingWhileLogin = parseBoolean(argv['pending-while-login'], false);
   const resolveAlias = parseBoolean(argv['resolve-alias'], false);
+  const platform = normalizePlatform(argv.platform || 'xiaohongshu');
   const value = String(target || '').trim().toLowerCase();
   if (!value || value === 'all') {
-    const rows = listAccountProfiles().profiles;
+    if (platform !== 'xiaohongshu') {
+      throw new Error(`account sync currently supports platform=xiaohongshu only, got: ${platform}`);
+    }
+    const rows = listAccountProfiles({ platform: 'xiaohongshu' }).profiles;
     const profileIds = rows.map((item) => item.profileId);
     const synced = await syncXhsAccountsByProfiles(profileIds, { pendingWhileLogin, resolveAlias });
     output({ ok: true, count: synced.length, profiles: synced }, jsonMode);
@@ -373,7 +434,7 @@ async function main() {
     return;
   }
 
-  if (cmd === 'list') return argv.records ? cmdListRecords(jsonMode) : cmdList(jsonMode);
+  if (cmd === 'list') return argv.records ? cmdListRecords(jsonMode) : cmdList(jsonMode, argv.platform);
   if (cmd === 'add') return cmdAdd(argv, jsonMode);
   if (cmd === 'get') return cmdGet(arg1, jsonMode);
   if (cmd === 'update') return cmdUpdate(arg1, argv, jsonMode);

package/apps/webauto/entry/lib/account-detect.mjs

@@ -14,7 +14,29 @@ function sleep(ms) {
 
 function buildDetectScript() {
   return `(() => {
-    const guard = Boolean(document.querySelector('.login-container, .login-dialog, #login-container'));
+    const isVisible = (node) => {
+      if (!(node instanceof HTMLElement)) return false;
+      const style = window.getComputedStyle(node);
+      if (!style) return false;
+      if (style.display === 'none' || style.visibility === 'hidden' || Number(style.opacity || '1') === 0) return false;
+      const rect = node.getBoundingClientRect();
+      return rect.width > 0 && rect.height > 0;
+    };
+    const loginGuardSelectors = [
+      '.login-container',
+      '.login-dialog',
+      '#login-container',
+    ];
+    const loginGuardNodes = loginGuardSelectors
+      .flatMap((selector) => Array.from(document.querySelectorAll(selector)));
+    const visibleLoginGuardNodes = loginGuardNodes.filter((node) => isVisible(node));
+    const loginGuardText = visibleLoginGuardNodes
+      .slice(0, 6)
+      .map((node) => String(node.textContent || '').replace(/\\s+/g, ' ').trim())
+      .join(' ');
+    const hasLoginText = /登录|扫码|验证码|手机号|请先登录|注册|sign\\s*in/i.test(loginGuardText);
+    const loginUrl = /\\/login|signin|passport|account\\/login/i.test(String(location.href || ''));
+    const hasGuardSignal = (visibleLoginGuardNodes.length > 0 && hasLoginText) || loginUrl;
     const candidates = [];
     const normalizeAlias = (value) => {
       const text = String(value || '').replace(/\\s+/g, ' ').trim();
@@ -100,14 +122,6 @@ function buildDetectScript() {
       }
     }
 
-    const searchHistoryKey = Object.keys(localStorage || {}).find((key) => String(key || '').startsWith('xhs-pc-search-history-'));
-    if (searchHistoryKey) {
-      const matched = String(searchHistoryKey).match(/^xhs-pc-search-history-(.+)$/);
-      if (matched && matched[1]) {
-        pushCandidate(matched[1], null, 'localStorage.search_history');
-      }
-    }
-
     const selfNavEntry = Array.from(document.querySelectorAll('a[href*="/user/profile/"]'))
       .find((node) => {
         const labels = readLabelCandidates(node);
@@ -132,8 +146,6 @@ function buildDetectScript() {
       const labels = readLabelCandidates(anchor);
       if (labels.some(isSelfLabel)) {
         pushCandidate(matched[1], alias, 'anchor.self');
-      } else {
-        pushCandidate(matched[1], alias, 'anchor');
       }
     }
 
@@ -146,15 +158,11 @@ function buildDetectScript() {
       }
     }
 
-    const strongCandidates = candidates.filter((item) => item.source !== 'localStorage.search_history');
-    const best = strongCandidates
+    const best = candidates
       .find((item) => item.source === 'initial_state.user_info')
-      || strongCandidates.find((item) => item.source === 'nav.self')
-      || strongCandidates.find((item) => item.source === 'anchor.self')
-      || strongCandidates.find((item) => item.source === 'anchor' && item.alias)
-      || strongCandidates.find((item) => item.source === 'anchor')
-      || strongCandidates.find((item) => item.id && item.id.length >= 6)
-      || candidates.find((item) => item.source === 'localStorage.search_history')
+      || candidates.find((item) => item.source === 'nav.self')
+      || candidates.find((item) => item.source === 'anchor.self')
+      || candidates.find((item) => item.id && item.id.length >= 6)
       || candidates[0]
       || null;
     let alias = best ? best.alias : null;
@@ -169,9 +177,10 @@ function buildDetectScript() {
       const picked = findAliasFromDom();
       if (picked) alias = picked;
     }
+    const hasAccountSignal = Boolean(best && best.id);
     return {
       url: location.href,
-      hasLoginGuard: guard,
+      hasLoginGuard: hasGuardSignal,
       accountId: best ? best.id : null,
       alias: alias || null,
       source: best ? best.source : null,
@@ -241,8 +250,77 @@ function buildAliasResolveScript() {
   })()`;
 }
 
+function buildGotoSelfTabScript() {
+  return `(() => {
+    const normalize = (value) => String(value || '').replace(/\\s+/g, ' ').trim();
+    const isSelfLabel = (value) => {
+      const text = normalize(value);
+      if (!text) return false;
+      return text === '我' || text === '我的' || text === '个人主页' || text === '我的主页';
+    };
+    const isVisible = (node) => {
+      if (!(node instanceof HTMLElement)) return false;
+      const style = window.getComputedStyle(node);
+      if (!style) return false;
+      if (style.display === 'none' || style.visibility === 'hidden' || Number(style.opacity || '1') === 0) return false;
+      const rect = node.getBoundingClientRect();
+      return rect.width > 0 && rect.height > 0;
+    };
+    const candidates = Array.from(document.querySelectorAll('a, button, [role="tab"], [role="link"], [class*="tab"]'))
+      .map((node) => {
+        const text = normalize(node.textContent || '');
+        const title = normalize(node.getAttribute?.('title') || '');
+        const aria = normalize(node.getAttribute?.('aria-label') || '');
+        return {
+          node,
+          text,
+          title,
+          aria,
+        };
+      })
+      .filter((item) => isSelfLabel(item.text) || isSelfLabel(item.title) || isSelfLabel(item.aria));
+    const target = candidates.find((item) => isVisible(item.node)) || candidates[0] || null;
+    if (!target?.node) {
+      return { clicked: false, reason: 'self_tab_not_found' };
+    }
+    try {
+      target.node.click();
+      return {
+        clicked: true,
+        reason: 'ok',
+        label: target.text || target.title || target.aria || null,
+      };
+    } catch (error) {
+      return { clicked: false, reason: String(error?.message || error || 'click_failed') };
+    }
+  })()`;
+}
+
+async function resolveAliasFromSelfTab(profileId) {
+  if (!profileId) return null;
+  try {
+    await callAPI('evaluate', { profileId, script: buildGotoSelfTabScript() });
+    await sleep(900);
+    const payload = await callAPI('evaluate', { profileId, script: buildAliasResolveScript() });
+    const result = payload?.result || payload?.data || payload || {};
+    const alias = normalizeText(result.alias);
+    if (!alias) return null;
+    return {
+      alias,
+      source: normalizeText(result.source) ? `self_tab:${normalizeText(result.source)}` : 'self_tab',
+      candidates: Array.isArray(result.candidates) ? result.candidates : [],
+    };
+  } catch {
+    return null;
+  }
+}
+
 async function resolveAliasFromProfilePage(profileId, accountId) {
   if (!profileId || !accountId) return null;
+  const fromSelfTab = await resolveAliasFromSelfTab(profileId);
+  if (fromSelfTab?.alias) {
+    return fromSelfTab;
+  }
   let originalUrl = null;
   try {
     const urlPayload = await callAPI('evaluate', { profileId, script: 'window.location.href' });
@@ -296,15 +374,15 @@ export async function detectXhsAccountIdentity(profileId, options = {}) {
   };
 
   let detected = await runDetect();
-  const shouldRetry = !detected.hasLoginGuard && (
+  const shouldRetry = (
     !detected.accountId
-    || detected.source === 'localStorage.search_history'
     || !detected.alias
+    || detected.hasLoginGuard
   );
   if (shouldRetry) {
     await sleep(1200);
     const retry = await runDetect();
-    if (retry.accountId && (!detected.accountId || detected.source === 'localStorage.search_history')) {
+    if (retry.accountId && !detected.accountId) {
       detected.accountId = retry.accountId;
       detected.source = retry.source || detected.source;
       detected.candidates = retry.candidates;
@@ -314,6 +392,9 @@ export async function detectXhsAccountIdentity(profileId, options = {}) {
       if (!detected.source) detected.source = retry.source || detected.source;
     }
     if (retry.url && !detected.url) detected.url = retry.url;
+    if (detected.hasLoginGuard && !retry.hasLoginGuard) {
+      detected.hasLoginGuard = false;
+    }
   }
   if (options?.resolveAlias === true && detected.accountId && !detected.alias) {
     const resolved = await resolveAliasFromProfilePage(detected.profileId, detected.accountId);
@@ -330,7 +411,7 @@ export async function syncXhsAccountByProfile(profileId, options = {}) {
   if (!normalizedProfileId) throw new Error('profileId is required');
   const pendingWhileLogin = options?.pendingWhileLogin === true;
   try {
-    const existing = listAccountProfiles().profiles.find(
+    const existing = listAccountProfiles({ platform: 'xiaohongshu' }).profiles.find(
       (item) => String(item?.profileId || '').trim() === normalizedProfileId,
     );
     const shouldResolveAlias = options?.resolveAlias === true
@@ -362,7 +443,7 @@ export async function syncXhsAccountByProfile(profileId, options = {}) {
     const msg = String(error?.message || error || '');
     if (msg.toLowerCase().includes('operation is insecure')) {
       try {
-        const existing = listAccountProfiles().profiles.find((item) => String(item?.profileId || '').trim() === normalizedProfileId);
+        const existing = listAccountProfiles({ platform: 'xiaohongshu' }).profiles.find((item) => String(item?.profileId || '').trim() === normalizedProfileId);
         if (existing && existing.valid) return existing;
       } catch {
         // ignore fallback lookup