@mison/wecom-cleaner 1.2.0 → 1.3.0

package/src/config.js

@@ -2,18 +2,22 @@ import path from 'node:path';
 import { DEFAULT_PROFILE_ROOT, DEFAULT_STATE_ROOT } from './constants.js';
 import { ensureDir, expandHome, readJson, writeJson } from './utils.js';
 import { normalizeRecycleRetention } from './recycle-maintenance.js';
+import { normalizeSelfUpdateConfig } from './updater.js';
 
 const ALLOWED_THEMES = new Set(['auto', 'light', 'dark']);
 const ALLOWED_OUTPUTS = new Set(['json', 'text']);
 const ALLOWED_CONFLICT_STRATEGIES = new Set(['skip', 'overwrite', 'rename']);
 const ALLOWED_EXTERNAL_ROOT_SOURCES = new Set(['preset', 'configured', 'auto', 'all']);
 const ALLOWED_GOVERNANCE_TIERS = new Set(['safe', 'caution', 'protected']);
+const ALLOWED_UPGRADE_METHODS = new Set(['npm', 'github-script']);
+const ALLOWED_UPGRADE_CHANNELS = new Set(['stable', 'pre']);
 const ACTION_FLAG_MAP = new Map([
   ['--cleanup-monthly', 'cleanup_monthly'],
   ['--analysis-only', 'analysis_only'],
   ['--space-governance', 'space_governance'],
   ['--recycle-maintain', 'recycle_maintain'],
   ['--doctor', 'doctor'],
+  ['--check-update', 'check_update'],
 ]);
 const MODE_TO_ACTION_MAP = new Map([
   ['cleanup_monthly', 'cleanup_monthly'],
@@ -22,6 +26,8 @@ const MODE_TO_ACTION_MAP = new Map([
   ['recycle_maintain', 'recycle_maintain'],
   ['restore', 'restore'],
   ['doctor', 'doctor'],
+  ['check_update', 'check_update'],
+  ['upgrade', 'upgrade'],
 ]);
 
 export class CliArgError extends Error {
@@ -106,6 +112,17 @@ export function defaultConfig() {
       lastSelectedTargets: [],
     },
     recycleRetention,
+    selfUpdate: normalizeSelfUpdateConfig({
+      enabled: true,
+      channel: 'stable',
+      checkSchedule: 'tri_daily',
+      autoCheckOnStartup: true,
+      lastCheckAt: 0,
+      lastCheckSlot: '',
+      lastKnownLatest: '',
+      lastKnownSource: '',
+      skipVersion: '',
+    }),
     theme: 'auto',
   };
 }
@@ -175,6 +192,10 @@ export function parseCliArgs(argv) {
     retentionMaxAgeDays: null,
     retentionMinKeepBatches: null,
     retentionSizeThresholdGB: null,
+    upgradeMethod: null,
+    upgradeVersion: null,
+    upgradeChannel: null,
+    upgradeYes: false,
   };
   const actionValues = [];
 
@@ -251,6 +272,34 @@ export function parseCliArgs(argv) {
       i += 1;
       continue;
     }
+    if (token === '--check-update') {
+      parsed.action = 'check_update';
+      parsed.actionFlagCount += 1;
+      actionValues.push('check_update');
+      continue;
+    }
+    if (token === '--upgrade') {
+      parsed.upgradeMethod = parseEnumValue(token, takeValue(token, i), ALLOWED_UPGRADE_METHODS);
+      parsed.action = 'upgrade';
+      parsed.actionFlagCount += 1;
+      actionValues.push('upgrade');
+      i += 1;
+      continue;
+    }
+    if (token === '--upgrade-version') {
+      parsed.upgradeVersion = takeValue(token, i);
+      i += 1;
+      continue;
+    }
+    if (token === '--upgrade-channel') {
+      parsed.upgradeChannel = parseEnumValue(token, takeValue(token, i), ALLOWED_UPGRADE_CHANNELS);
+      i += 1;
+      continue;
+    }
+    if (token === '--upgrade-yes') {
+      parsed.upgradeYes = true;
+      continue;
+    }
     if (token === '--theme') {
       const theme = normalizeTheme(takeValue(token, i));
       if (!theme) {
@@ -480,6 +529,7 @@ export async function loadConfig(cliArgs = {}, options = {}) {
 
   merged.spaceGovernance = normalizeSpaceGovernance(fileConfig.spaceGovernance, base.spaceGovernance);
   merged.recycleRetention = normalizeRecycleRetention(fileConfig.recycleRetention, base.recycleRetention);
+  merged.selfUpdate = normalizeSelfUpdateConfig(fileConfig.selfUpdate, base.selfUpdate);
 
   merged.recycleRoot = expandHome(fileConfig.recycleRoot || path.join(stateRoot, 'recycle-bin'));
   merged.indexPath = expandHome(fileConfig.indexPath || path.join(stateRoot, 'index.jsonl'));
@@ -508,6 +558,7 @@ export async function saveConfig(config) {
     defaultCategories: Array.isArray(config.defaultCategories) ? config.defaultCategories : [],
     spaceGovernance: normalizeSpaceGovernance(config.spaceGovernance, defaultConfig().spaceGovernance),
     recycleRetention: normalizeRecycleRetention(config.recycleRetention, defaultConfig().recycleRetention),
+    selfUpdate: normalizeSelfUpdateConfig(config.selfUpdate, defaultConfig().selfUpdate),
     theme: normalizeTheme(config.theme) || 'auto',
   };
   await writeJson(config.configPath, payload);

package/src/constants.js

@@ -106,6 +106,8 @@ export const MODES = {
   RESTORE: 'restore',
   DOCTOR: 'doctor',
   RECYCLE_MAINTAIN: 'recycle_maintain',
+  CHECK_UPDATE: 'check_update',
+  UPGRADE: 'upgrade',
   SETTINGS: 'settings',
 };
 

package/src/doctor.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { spawnSync } from 'node:child_process';
 import { collectRecycleStats, normalizeRecycleRetention } from './recycle-maintenance.js';
 import { detectExternalStorageRoots, discoverAccounts } from './scanner.js';
+import { normalizeSelfUpdateConfig } from './updater.js';
 
 const STATUS_PASS = 'pass';
 const STATUS_WARN = 'warn';
@@ -151,6 +152,14 @@ function overallStatus(checks) {
   return STATUS_PASS;
 }
 
+function formatTimestamp(ts) {
+  const value = Number(ts || 0);
+  if (!Number.isFinite(value) || value <= 0) {
+    return '无';
+  }
+  return new Date(value).toLocaleString('zh-CN', { hour12: false });
+}
+
 async function readManifest(projectRoot) {
   const manifestPath = path.join(projectRoot, 'native', 'manifest.json');
   try {
@@ -267,6 +276,21 @@ export async function runDoctor({ config, aliases, projectRoot, appVersion }) {
     )
   );
 
+  const selfUpdate = normalizeSelfUpdateConfig(config.selfUpdate);
+  checks.push(
+    buildCheck(
+      'self_update',
+      '升级检查配置',
+      selfUpdate.enabled ? STATUS_PASS : STATUS_WARN,
+      `${selfUpdate.enabled ? '已启用' : '已关闭'}，通道 ${selfUpdate.channel}，最近检查 ${formatTimestamp(selfUpdate.lastCheckAt)}`,
+      selfUpdate.enabled
+        ? selfUpdate.skipVersion
+          ? `当前跳过版本: v${selfUpdate.skipVersion}，如需恢复提醒请清空 skipVersion。`
+          : ''
+        : '建议启用升级检查，及时获取功能与安全修复。'
+    )
+  );
+
   const target = resolveRuntimeTarget();
   const manifest = await readManifest(projectRoot);
   const manifestTarget = manifest.parsed?.targets?.[target.targetTag] || null;

package/src/recycle-maintenance.js

@@ -51,8 +51,23 @@ function isPathWithinRoot(rootPath, targetPath) {
   return !rel.startsWith('..') && !path.isAbsolute(rel);
 }
 
-function resolveBatchRootFromEntries(recycleRoot, batch) {
+async function safeRealpath(targetPath) {
+  try {
+    return await fs.realpath(targetPath);
+  } catch {
+    return null;
+  }
+}
+
+async function resolveBatchRootFromEntries(recycleRoot, batch) {
   const recycleRootAbs = path.resolve(String(recycleRoot || ''));
+  const recycleRootReal = await safeRealpath(recycleRootAbs);
+  if (!recycleRootReal) {
+    return {
+      ok: false,
+      invalidReason: 'missing_recycle_root',
+    };
+  }
   const entries = Array.isArray(batch?.entries) ? batch.entries : [];
   if (entries.length === 0) {
     return {
@@ -78,6 +93,19 @@ function resolveBatchRootFromEntries(recycleRoot, batch) {
         invalidReason: 'recycle_path_outside_recycle_root',
       };
     }
+    const recyclePathReal = await safeRealpath(recyclePathAbs);
+    if (!recyclePathReal) {
+      return {
+        ok: false,
+        invalidReason: 'recycle_path_unresolvable',
+      };
+    }
+    if (!isPathWithinRoot(recycleRootReal, recyclePathReal)) {
+      return {
+        ok: false,
+        invalidReason: 'recycle_path_symlink_escape',
+      };
+    }
 
     const batchRootAbs = path.dirname(recyclePathAbs);
     if (!isPathWithinRoot(recycleRootAbs, batchRootAbs)) {
@@ -92,7 +120,20 @@ function resolveBatchRootFromEntries(recycleRoot, batch) {
         invalidReason: 'batch_root_is_recycle_root',
       };
     }
-    rootSet.add(batchRootAbs);
+    const batchRootReal = await safeRealpath(batchRootAbs);
+    if (!batchRootReal) {
+      return {
+        ok: false,
+        invalidReason: 'batch_root_unresolvable',
+      };
+    }
+    if (!isPathWithinRoot(recycleRootReal, batchRootReal)) {
+      return {
+        ok: false,
+        invalidReason: 'batch_root_symlink_escape',
+      };
+    }
+    rootSet.add(batchRootReal);
   }
 
   if (rootSet.size !== 1) {
@@ -282,7 +323,7 @@ export async function maintainRecycleBin({ indexPath, recycleRoot, policy, dryRu
       onProgress(i + 1, selected.candidates.length);
     }
 
-    const resolvedBatchRoot = resolveBatchRootFromEntries(recycleRoot, batch);
+    const resolvedBatchRoot = await resolveBatchRootFromEntries(recycleRoot, batch);
     if (!resolvedBatchRoot.ok) {
       summary.failBatches += 1;
       summary.operations.push({