codewave-openclaw-installer 2.1.2 → 2.1.3

package/bin/check.mjs

@@ -16,6 +16,11 @@ import { spawn } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { homedir, platform } from 'node:os';
+import {
+  CHANNEL_DEFINITIONS,
+  detectDesktopAppInstallMatches,
+  getDesktopAppCandidates,
+} from './install-lib.mjs';
 
 // ─── 颜色 ───
 const NO_COLOR = process.env.NO_COLOR || process.argv.includes('--json');
@@ -32,6 +37,12 @@ const isMac = process.platform === 'darwin';
 const isLinux = process.platform === 'linux';
 const JSON_MODE = process.argv.includes('--json');
 const FIX_MODE = process.argv.includes('--fix');
+const WINDOWS_UNINSTALL_KEYS = [
+  'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
+  'HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
+  'HKLM\\Software\\WOW6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall',
+];
+let windowsUninstallDisplayNamesPromise = null;
 
 // ─── 工具函数 ───
 
@@ -86,6 +97,54 @@ function run(cmd, args) {
   });
 }
 
+function runCapture(cmd, args) {
+  return new Promise((resolve) => {
+    const child = spawn(cmd, args, { stdio: ['ignore', 'pipe', 'pipe'], shell: isWin });
+    let stdout = '';
+    let stderr = '';
+    child.stdout?.on('data', (chunk) => { stdout += chunk.toString(); });
+    child.stderr?.on('data', (chunk) => { stderr += chunk.toString(); });
+    child.on('close', (code) => resolve({ code: code ?? 1, stdout, stderr }));
+    child.on('error', (err) => resolve({ code: 1, stdout, stderr: err.message }));
+  });
+}
+
+async function getWindowsUninstallDisplayNames() {
+  if (!isWin) {
+    return [];
+  }
+  if (!windowsUninstallDisplayNamesPromise) {
+    windowsUninstallDisplayNamesPromise = (async () => {
+      const displayNames = [];
+      for (const registryKey of WINDOWS_UNINSTALL_KEYS) {
+        const result = await runCapture('reg', ['query', registryKey, '/s', '/v', 'DisplayName']);
+        const lines = `${result.stdout}\n${result.stderr}`.split(/\r?\n/);
+        for (const line of lines) {
+          const match = line.match(/^\s*DisplayName\s+REG_\w+\s+(.+?)\s*$/i);
+          if (match?.[1]) {
+            displayNames.push(match[1].trim());
+          }
+        }
+      }
+      return [...new Set(displayNames)];
+    })();
+  }
+  return windowsUninstallDisplayNamesPromise;
+}
+
+async function findDesktopApps(definition) {
+  const installedRegistryDisplayNames = await getWindowsUninstallDisplayNames();
+  return detectDesktopAppInstallMatches({
+    platform: process.platform,
+    homeDir: homedir(),
+    env: process.env,
+    fileCandidates: getDesktopAppCandidates(definition, process.platform),
+    registryDisplayNames: definition.desktopAppWindowsRegistryNames ?? [],
+    installedRegistryDisplayNames,
+    exists: existsSync,
+  });
+}
+
 // ─── 检测项定义 ───
 
 /** @typedef {{ name: string, status: 'ok'|'warn'|'fail', version?: string, message: string, fix?: string }} CheckResult */
@@ -267,9 +326,11 @@ async function checkChannel(name, configPaths, envVars, commands, options = {})
 
   const configMatches = configPaths.filter(fileExists);
   const envMatches = envVars.filter((key) => Boolean(process.env[key]));
+  const desktopMatches = options.definition ? await findDesktopApps(options.definition) : [];
 
   const hints = [
     ...commandMatches.map((cmd) => `命令:${cmd}`),
+    ...desktopMatches.map((path) => `桌面客户端:${path}`),
     ...configMatches.map((path) => `配置:${path}`),
     ...envMatches.map((key) => `环境变量:${key}`),
   ];
@@ -282,7 +343,7 @@ async function checkChannel(name, configPaths, envVars, commands, options = {})
     };
   }
 
-  if (configMatches.length > 0 || envMatches.length > 0) {
+  if (desktopMatches.length > 0 || configMatches.length > 0 || envMatches.length > 0) {
     return {
       name,
       status: 'warn',
@@ -416,11 +477,12 @@ async function main() {
     ],
     ['LARK_APP_ID', 'LARK_APP_SECRET', 'FEISHU_APP_ID', 'FEISHU_APP_SECRET'],
     [],
-    { hintMessage: `检测到环境线索，可通过 openclaw 渠道引导继续 (${[
+    { definition: CHANNEL_DEFINITIONS.lark, hintMessage: `检测到环境线索，可通过 openclaw 渠道引导继续 (${[
       join(homedir(), '.openclaw', 'lark.json'),
       join(homedir(), '.openclaw', 'extensions', '@openclaw', 'feishu'),
       join(homedir(), '.openclaw', 'extensions', 'openclaw-lark'),
     ].filter(fileExists).map((path) => `配置:${path}`).concat(
+      await findDesktopApps(CHANNEL_DEFINITIONS.lark).then((matches) => matches.map((path) => `桌面客户端:${path}`)),
       ['LARK_APP_ID', 'LARK_APP_SECRET', 'FEISHU_APP_ID', 'FEISHU_APP_SECRET']
         .filter((key) => Boolean(process.env[key]))
         .map((key) => `环境变量:${key}`),
@@ -435,6 +497,7 @@ async function main() {
     ],
     ['DWS_CLIENT_ID', 'DWS_CLIENT_SECRET'],
     ['dws', 'dingtalk', 'dingtalk-workspace-cli'],
+    { definition: CHANNEL_DEFINITIONS.dingtalk },
   );
 
   // 打印基础环境结果

package/bin/install-lib.mjs

@@ -22,9 +22,17 @@ export const CHANNEL_DEFINITIONS = {
     desktopAppCandidates: ['Feishu.app', 'Lark.app', '飞书.app'],
     desktopAppWindowsCandidates: [
       'Feishu.exe',
+      'FeishuLauncher.exe',
+      'Feishu/Feishu.exe',
+      'Feishu/FeishuLauncher.exe',
       'Lark.exe',
+      'LarkLauncher.exe',
+      'Lark/Lark.exe',
+      'Lark/LarkLauncher.exe',
       'Programs/Feishu/Feishu.exe',
+      'Programs/Feishu/FeishuLauncher.exe',
       'Programs/Lark/Lark.exe',
+      'Programs/Lark/LarkLauncher.exe',
     ],
     desktopAppWindowsRegistryNames: ['Feishu', 'Lark', '飞书'],
     configPaths: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codewave-openclaw-installer",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "网易智企 CodeWave OpenClaw 扩展：Skills + CLI 依赖一键安装",
   "type": "module",
   "main": "index.js",