@sovovs/bycli 2.1.51 → 2.1.53

package/clis/weixin/_wechat/user-info.js

@@ -53,26 +53,50 @@ export function buildSelectTabScript(label) {
     const compact = value => String(value || '').trim().replace(/\\s+/g, ' ');
     const visible = node => {
       if (!node || node.hidden || node.closest('[hidden], [aria-hidden="true"]')) return false;
-      const style = window.getComputedStyle(node);
-      return style.display !== 'none' && style.visibility !== 'hidden';
+      for (let current = node; current && current.nodeType === 1; current = current.parentElement) {
+        const style = window.getComputedStyle(current);
+        if (style.display === 'none' || style.visibility === 'hidden' || Number(style.opacity) === 0) return false;
+      }
+      return true;
     };
-    const candidates = Array.from(document.querySelectorAll([
+    const selectors = [
+      'a[href]',
+      'button',
       '[role="tab"]',
       '.weui-desktop-tab__nav',
       '.tab_nav',
-      'a',
-      'button',
       'li',
-    ].join(',')));
-    const node = candidates.find(candidate => visible(candidate)
-      && compact(candidate.textContent) === ${JSON.stringify(label)});
-    if (!node) return { selected: false, disabled: false };
+    ];
+    let node = null;
+    for (const selector of selectors) {
+      node = Array.from(document.querySelectorAll(selector)).find(candidate => visible(candidate)
+        && compact(candidate.textContent) === ${JSON.stringify(label)});
+      if (node) break;
+    }
+    if (!node) return { selected: false, disabled: false, href: null };
     const disabled = node.disabled === true
       || node.getAttribute('aria-disabled') === 'true'
       || /(^|\\s)(disabled|is-disabled)(\\s|$)/.test(node.className || '');
-    if (disabled) return { selected: false, disabled: true };
+    if (disabled) return { selected: false, disabled: true, href: null };
+    const rawHref = node.tagName === 'A' ? node.getAttribute('href') : null;
+    if (rawHref) {
+      const href = node.href;
+      let destination = null;
+      try { destination = new URL(href); } catch { /* handled as a click-only placeholder */ }
+      const trustedNavigation = destination
+        && destination.origin === window.location.origin
+        && destination.pathname === '/cgi-bin/settingpage'
+        && Boolean(destination.searchParams.get('token'));
+      if (trustedNavigation) return { selected: true, disabled: false, href };
+      const clickOnly = /^javascript:/i.test(rawHref)
+        || rawHref.charAt(0) === '#'
+        || (destination
+          && destination.origin === window.location.origin
+          && destination.pathname === '/cgi-bin/settingpage');
+      if (!clickOnly) return { selected: true, disabled: false, href };
+    }
     node.click();
-    return { selected: true, disabled: false };
+    return { selected: true, disabled: false, href: null };
   })()`;
 }
 
@@ -84,8 +108,11 @@ export const SETTINGS_SESSION_SCRIPT = `(() => {
   ];
   const visible = node => {
     if (!node || node.hidden || node.closest('[hidden], [aria-hidden="true"]')) return false;
-    const style = window.getComputedStyle(node);
-    return style.display !== 'none' && style.visibility !== 'hidden';
+    for (let current = node; current && current.nodeType === 1; current = current.parentElement) {
+      const style = window.getComputedStyle(current);
+      if (style.display === 'none' || style.visibility === 'hidden' || Number(style.opacity) === 0) return false;
+    }
+    return true;
   };
   return {
     href: window.location.href,
@@ -121,8 +148,11 @@ export const USER_INFO_EXTRACT_SCRIPT = `(() => {
   };
   const visible = node => {
     if (!node || node.hidden || node.closest('[hidden], [aria-hidden="true"]')) return false;
-    const style = window.getComputedStyle(node);
-    return style.display !== 'none' && style.visibility !== 'hidden';
+    for (let current = node; current && current.nodeType === 1; current = current.parentElement) {
+      const style = window.getComputedStyle(current);
+      if (style.display === 'none' || style.visibility === 'hidden' || Number(style.opacity) === 0) return false;
+    }
+    return true;
   };
   const firstVisible = (root, selectors) => {
     for (const selector of selectors) {
@@ -131,20 +161,73 @@ export const USER_INFO_EXTRACT_SCRIPT = `(() => {
     }
     return null;
   };
-  const actionNodes = root => Array.from(root.querySelectorAll('a, button, [role="button"]'))
-    .filter(node => {
-      if (!visible(node)) return false;
-      const label = compact(node.textContent || node.getAttribute('aria-label') || node.title);
-      const hint = [node.className, node.title, node.getAttribute('aria-label')].join(' ');
-      return label && !/(help|question|icon-question|帮助|说明)/i.test(hint);
-    });
-  const action = node => ({
-    label: compact(node.textContent || node.getAttribute('aria-label') || node.title),
-    enabled: !(node.disabled === true
-      || node.getAttribute('aria-disabled') === 'true'
-      || /(^|\\s)(disabled|is-disabled)(\\s|$)/.test(node.className || '')),
-    href: node.tagName === 'A' && node.getAttribute('href') ? node.href : null,
-  });
+  const ignoredValueSelector = [
+    'a',
+    'button',
+    '[role="button"]',
+    '[role="tooltip"]',
+    'svg',
+    '.setting_opr',
+    '.weui-desktop-setting__status',
+    '.setting_status',
+    '.status',
+    '.frm_tips',
+    '.weui-desktop-form__tips',
+    '.weui-desktop-setting__desc',
+    '.setting_desc',
+    '.tips',
+    '.desc',
+    '.description',
+    '.help',
+    '.icon-question',
+    '[class*="question"]',
+    '[class*="help"]',
+    '[class*="popover"]',
+    '[class*="-ask"]',
+  ].join(',');
+  const cleanValueText = node => {
+    if (!node) return null;
+    const copy = node.cloneNode(true);
+    copy.querySelectorAll(ignoredValueSelector).forEach(item => item.remove());
+    return compact(copy.textContent);
+  };
+  const primaryValueText = node => {
+    if (node && node.matches('.weui-desktop-setting__item__info')) {
+      const directText = compact(Array.from(node.childNodes)
+        .filter(child => child.nodeType === Node.TEXT_NODE)
+        .map(child => child.textContent)
+        .join(' '));
+      if (directText) return cleanValueText(node);
+      const primaryChild = Array.from(node.children)
+        .find(child => visible(child) && !child.matches(ignoredValueSelector));
+      if (primaryChild) return cleanValueText(primaryChild);
+    }
+    return cleanValueText(node);
+  };
+  const switchValue = row => {
+    const node = firstVisible(row, [
+      'input[type="checkbox"]',
+      '[role="switch"]',
+      '.weui-desktop-switch',
+      '.weui-switch',
+      '[class*="switch"]',
+    ]);
+    if (!node) return null;
+    const input = node.matches('input[type="checkbox"]')
+      ? node
+      : node.querySelector('input[type="checkbox"]');
+    if (input) return Boolean(input.checked);
+    const ariaNode = node.hasAttribute('aria-checked')
+      ? node
+      : node.querySelector('[aria-checked]');
+    const ariaChecked = ariaNode && ariaNode.getAttribute('aria-checked');
+    if (ariaChecked === 'true') return true;
+    if (ariaChecked === 'false') return false;
+    const className = [node.className, node.parentElement && node.parentElement.className].join(' ');
+    if (/(^|[\\s_-])(checked|on|active)([\\s_-]|$)/i.test(className)) return true;
+    if (/(^|[\\s_-])(unchecked|off)([\\s_-]|$)/i.test(className)) return false;
+    return null;
+  };
   const rowSelectors = [
     '.setting_item',
     '.weui-desktop-setting__item',
@@ -183,72 +266,82 @@ export const USER_INFO_EXTRACT_SCRIPT = `(() => {
     let rows = Array.from(sectionNode.querySelectorAll(rowSelector)).filter(visible);
     rows = rows.filter(node => !rows.some(other => other !== node && other.contains(node)));
     const fields = [];
-    const actions = [];
     const seenFields = new Set();
-    const seenActions = new Set();
+    const fieldRows = new Set();
+    const genericParts = node => Array.from(node.children).flatMap(child => {
+      if (!visible(child)
+        || /^(H1|H2|H3|H4|H5|H6|A|BUTTON)$/.test(child.tagName)
+        || child.getAttribute('role') === 'button') return [];
+      const value = cleanValueText(child);
+      return value ? [value] : [];
+    });
 
     for (const row of rows) {
+      const headerCells = row.tagName === 'TR' ? row.querySelectorAll(':scope > th') : [];
+      const dataCells = row.tagName === 'TR' ? row.querySelectorAll(':scope > td') : [];
+      if (headerCells.length > 0 && dataCells.length === 0) continue;
       const labelNode = firstVisible(row, [
         '.frm_label',
         '.weui-desktop-setting__label',
+        '.weui-desktop-setting__item__label',
         '.weui-desktop-form__label',
         'dt',
         'th',
       ]);
-      const fieldLabel = compact(labelNode && labelNode.textContent);
-      const rowActions = actionNodes(row);
-      for (const node of rowActions) {
-        const item = action(node);
-        const key = JSON.stringify(item);
-        if (!seenActions.has(key)) {
-          seenActions.add(key);
-          actions.push(item);
-        }
-      }
+      const fieldLabel = cleanValueText(labelNode);
       if (!fieldLabel) continue;
       const valueNode = firstVisible(row, [
         '.weui-desktop-setting__value',
+        '.weui-desktop-setting__item__info',
         '.setting_value',
         '.frm_value',
         'dd',
         'td',
         '.frm_controls',
       ]);
-      const statusNode = firstVisible(row, [
-        '.weui-desktop-setting__status',
-        '.setting_status',
-        '.status',
-      ]);
-      let fieldValue = null;
-      if (valueNode) {
-        const copy = valueNode.cloneNode(true);
-        copy.querySelectorAll('a, button, [role="button"], .setting_opr, .weui-desktop-setting__status, .setting_status, .status')
-          .forEach(node => node.remove());
-        fieldValue = compact(copy.textContent);
+      let fieldValue = switchValue(row);
+      if (fieldValue === null) fieldValue = primaryValueText(valueNode);
+      if (fieldValue === null) {
+        const parts = genericParts(row);
+        const labelIndex = parts.indexOf(fieldLabel);
+        if (labelIndex !== -1) {
+          fieldValue = parts[labelIndex + 1] || null;
+        }
       }
       const item = {
         label: fieldLabel,
         value: fieldValue,
-        status: compact(statusNode && statusNode.textContent),
       };
       const key = JSON.stringify(item);
       if (!seenFields.has(key)) {
         seenFields.add(key);
         fields.push(item);
       }
+      fieldRows.add(row);
     }
 
-    const rowSet = new Set(rows);
-    for (const node of actionNodes(sectionNode)) {
-      if (rows.some(row => rowSet.has(row) && row.contains(node))) continue;
-      const item = action(node);
+    let genericRows = Array.from(sectionNode.querySelectorAll('div, li'))
+      .filter(node => visible(node)
+        && !fieldRows.has(node)
+        && !rows.some(row => row !== node && row.contains(node))
+        && genericParts(node).length >= 2);
+    genericRows = genericRows.filter(node => !genericRows.some(other => other !== node && node.contains(other)));
+    for (const row of genericRows) {
+      const parts = genericParts(row);
+      const item = {
+        label: parts[0],
+        value: parts[1] || null,
+      };
       const key = JSON.stringify(item);
-      if (!seenActions.has(key)) {
-        seenActions.add(key);
-        actions.push(item);
+      if (!seenFields.has(key)) {
+        seenFields.add(key);
+        fields.push(item);
       }
     }
-    return fields.length > 0 || actions.length > 0 ? [{ label, fields, actions }] : [];
+
+    if (fields.length > 0) return [{ label, fields }];
+    const empty = Boolean(sectionNode.querySelector('table thead th, table tr > th'));
+    return empty ? [{ label, fields, empty: true }] : [];
   });
 
   if (sections.length === 0 && /(无权限|暂无权限|暂不支持|不可用)/.test(document.body.textContent || '')) {
@@ -264,20 +357,7 @@ function normalizeField(field, tabLabel, sectionIndex, fieldIndex) {
   execution(label, prefix);
   return {
     label,
-    value: text(field.value),
-    status: text(field.status),
-  };
-}
-
-function normalizeAction(action, tabLabel, sectionIndex, actionIndex) {
-  const prefix = `WeChat ${tabLabel} returned an invalid action at section ${sectionIndex} index ${actionIndex}`;
-  execution(object(action), prefix);
-  const label = text(action.label);
-  execution(label, prefix);
-  return {
-    label,
-    enabled: action.enabled !== false,
-    path: sanitizeActionPath(action.href ?? action.path),
+    value: typeof field.value === 'boolean' ? field.value : text(field.value),
   };
 }
 
@@ -297,15 +377,13 @@ export function normalizeUserInfoTab(tabId, payload) {
     const label = text(section.label);
     execution(label, prefix);
     const rawFields = section.fields ?? [];
-    const rawActions = section.actions ?? [];
-    execution(Array.isArray(rawFields) && Array.isArray(rawActions), prefix);
+    execution(Array.isArray(rawFields), prefix);
     const fields = rawFields.map((field, fieldIndex) => (
       normalizeField(field, definition.label, sectionIndex, fieldIndex)
     ));
-    const actions = rawActions.map((action, actionIndex) => (
-      normalizeAction(action, definition.label, sectionIndex, actionIndex)
-    ));
-    return fields.length > 0 || actions.length > 0 ? [{ label, fields, actions }] : [];
+    return fields.length > 0 || section.empty === true
+      ? [{ label, fields }]
+      : [];
   });
 
   execution(sections.length > 0, `WeChat ${definition.label} exposed no recognizable settings`);
@@ -332,6 +410,20 @@ export async function collectUserInfoTabs(page, { settle = 2 } = {}) {
       });
       continue;
     }
+    if (selection.href !== null && selection.href !== undefined) {
+      let navigationUrl;
+      try {
+        navigationUrl = new URL(selection.href);
+      } catch {
+        throw new CommandExecutionError('WeChat account settings exposed an invalid tab destination');
+      }
+      execution(
+        navigationUrl.origin === ORIGIN
+          && Boolean(navigationUrl.searchParams.get('token')?.trim()),
+        'WeChat account settings exposed an untrusted tab destination',
+      );
+      await page.goto(navigationUrl.toString());
+    }
     await page.wait(settle);
     const payload = await page.evaluate(USER_INFO_EXTRACT_SCRIPT);
     result.push({ id: definition.id, data: normalizeUserInfoTab(definition.id, payload) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sovovs/bycli",
-  "version": "2.1.51",
+  "version": "2.1.53",
   "publishConfig": {
     "access": "public"
   },