openclaw-weiyuan-init 1.0.69 → 1.0.73

package/bin/cli.js

@@ -14,6 +14,7 @@ program
   .description('初始化 weiyuan skill')
   .option('-w, --workspace <path>', '指定工作目录', 'workspace-weiyuan')
   .option('-s, --server <url>', '指定服务器地址', 'https://api.magon.com.cn/api')
+  .option('--server-fallbacks <urls>', '备用服务器地址，逗号分隔，如 "https://a/api,https://b/api"')
   .option('-u, --upgrade <url>', '指定升级源地址（含 LATEST_SKILL_VERSION.txt）', 'https://api.magon.com.cn/upgrade')
   .option('-d, --download <url>', '指定下载地址（可覆盖自动版本解析）')
   .option('-i, --invite <token>', '邀请码令牌（包含 server/upgrade/project/code）')

package/lib/commands.js

@@ -16,7 +16,8 @@ const DEFAULT_CONFIG = {
   upgradeBaseUrl: 'https://api.magon.com.cn/upgrade',
   downloadUrl: '',
   serverUrl: 'https://api.magon.com.cn/api',
-  identityFile: '.weiyuan'
+  identityFile: '.weiyuan',
+  serverFallbacks: []
 };
 
 const DEFAULT_SKILL_PACKAGE_JSON = {
@@ -109,18 +110,75 @@ function decodeInviteToken(token) {
   }
 }
 
-async function runJoin(weiyuanPath, identityPath, projectId, code, fromInit = false) {
-  const extra = fromInit ? ['--fromInit'] : [];
+function normalizeServerUrl(raw) {
+  if (!raw || typeof raw !== 'string') return '';
   try {
-    await execFileAsync('npm', ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'join', '--identity', identityPath, '--project', projectId, '--code', code, ...extra], {
-      cwd: weiyuanPath
-    });
-    return;
+    const url = new URL(raw.trim());
+    const p = (url.pathname || '/').replace(/\/+$/, '');
+    if (!p || p === '/') url.pathname = '/api';
+    url.hash = '';
+    return url.toString().replace(/\/$/, '');
   } catch (_) {
+    return '';
   }
-  await execFileAsync('npx', ['-y', '-p', 'tsx', '-p', 'tweetnacl', 'tsx', path.join(weiyuanPath, 'src', 'cliMain.ts'), 'join', '--identity', identityPath, '--project', projectId, '--code', code, ...extra], {
-    cwd: weiyuanPath
-  });
+}
+
+function parseServerFallbacks(raw) {
+  if (!raw || typeof raw !== 'string') return [];
+  return raw
+    .split(',')
+    .map((x) => normalizeServerUrl(x))
+    .filter(Boolean);
+}
+
+function resolveServerCandidates(options, invite) {
+  const envFallbacks = parseServerFallbacks(process.env.WEIYUAN_SERVER_FALLBACKS || '');
+  const optionFallbacks = parseServerFallbacks(options.serverFallbacks || '');
+  const inviteFallbacks = Array.isArray(invite && invite.apis) ? invite.apis.map((x) => normalizeServerUrl(String(x))) : [];
+  const seeds = [
+    normalizeServerUrl(options.server || ''),
+    normalizeServerUrl(invite && invite.api ? invite.api : ''),
+    ...inviteFallbacks,
+    ...optionFallbacks,
+    ...envFallbacks,
+    normalizeServerUrl(DEFAULT_CONFIG.serverUrl)
+  ].filter(Boolean);
+  return [...new Set(seeds)];
+}
+
+function isRetryableGatewayError(error) {
+  const text = String((error && (error.stderr || error.stdout || error.message)) || '').toLowerCase();
+  return /502|bad gateway|econnreset|etimedout|eai_again|socket hang up|network error/.test(text);
+}
+
+async function sleep(ms) {
+  await new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function runJoin(weiyuanPath, identityPath, projectId, code, fromInit = false) {
+  const extra = fromInit ? ['--fromInit'] : [];
+  const maxAttempts = 3;
+  let lastError = null;
+  for (let i = 0; i < maxAttempts; i++) {
+    try {
+      await execFileAsync('npm', ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'join', '--identity', identityPath, '--project', projectId, '--code', code, ...extra], {
+        cwd: weiyuanPath
+      });
+      return;
+    } catch (_) {
+    }
+    try {
+      await execFileAsync('npx', ['-y', '-p', 'tsx', '-p', 'tweetnacl', 'tsx', path.join(weiyuanPath, 'src', 'cliMain.ts'), 'join', '--identity', identityPath, '--project', projectId, '--code', code, ...extra], {
+        cwd: weiyuanPath
+      });
+      return;
+    } catch (error) {
+      lastError = error;
+      if (i >= maxAttempts - 1 || !isRetryableGatewayError(error)) throw error;
+      await sleep(1200 * (i + 1));
+    }
+  }
+  if (lastError) throw lastError;
 }
 
 async function ensureSkillRuntime(weiyuanPath) {
@@ -136,16 +194,25 @@ async function ensureSkillRuntime(weiyuanPath) {
 }
 
 async function runCliInit(weiyuanPath, identityPath, serverUrl) {
-  try {
-    await execFileAsync('npm', ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'init', '--server', serverUrl, '--out', identityPath], {
-      cwd: weiyuanPath
-    });
-    return true;
-  } catch (_) {
+  const maxAttempts = 3;
+  for (let i = 0; i < maxAttempts; i++) {
+    try {
+      await execFileAsync('npm', ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'init', '--server', serverUrl, '--out', identityPath], {
+        cwd: weiyuanPath
+      });
+      return true;
+    } catch (_) {
+    }
+    try {
+      await execFileAsync('npx', ['-y', '-p', 'tsx', '-p', 'tweetnacl', 'tsx', path.join(weiyuanPath, 'src', 'cliMain.ts'), 'init', '--server', serverUrl, '--out', identityPath], {
+        cwd: weiyuanPath
+      });
+      return true;
+    } catch (error) {
+      if (i >= maxAttempts - 1 || !isRetryableGatewayError(error)) throw error;
+      await sleep(1200 * (i + 1));
+    }
   }
-  await execFileAsync('npx', ['-y', '-p', 'tsx', '-p', 'tweetnacl', 'tsx', path.join(weiyuanPath, 'src', 'cliMain.ts'), 'init', '--server', serverUrl, '--out', identityPath], {
-    cwd: weiyuanPath
-  });
   return true;
 }
 
@@ -165,7 +232,8 @@ async function runInit(options) {
   const weiyuanPath = path.join(workspacePath, 'weiyuan');
   const upgradeBaseUrl = options.upgrade || DEFAULT_CONFIG.upgradeBaseUrl;
   const requestedDownloadUrl = options.download || DEFAULT_CONFIG.downloadUrl;
-  const serverUrl = options.server || DEFAULT_CONFIG.serverUrl;
+  const serverCandidates = resolveServerCandidates(options, invite);
+  let serverUrl = serverCandidates[0] || DEFAULT_CONFIG.serverUrl;
   const force = options.force || false;
   const hasInviteJoin = Boolean(options.project && options.code);
   const identityPath = path.join(workspacePath, DEFAULT_CONFIG.identityFile);
@@ -201,11 +269,16 @@ async function runInit(options) {
 
   // 2. 检查服务器
   spinner = ora('检查服务器连接...').start();
-  const serverOk = await checkServer(serverUrl);
-  if (serverOk) {
+  let selectedServer = "";
+  for (const candidate of serverCandidates) {
+    const ok = await checkServer(candidate);
+    if (ok) { selectedServer = candidate; break; }
+  }
+  if (selectedServer) {
+    serverUrl = selectedServer;
     spinner.succeed(`服务器: ${serverUrl}`);
   } else {
-    spinner.warn(`服务器连接失败，请检查网络和防火墙`);
+    spinner.warn(`服务器连接失败，继续尝试初始化（候选: ${serverCandidates.join(", ")}）`);
   }
 
   // 3. 下载文件
@@ -257,10 +330,21 @@ async function runInit(options) {
   // 7. 创建身份文件
   spinner = ora('创建身份文件...').start();
   let identityCreated = false;
-  try {
-    identityCreated = await runCliInit(weiyuanPath, identityPath, serverUrl);
-  } catch (_) {
-    identityCreated = await createIdentityFile(identityPath, serverUrl, workspacePath);
+  let initError = null;
+  for (const candidate of serverCandidates) {
+    serverUrl = candidate;
+    try {
+      identityCreated = await runCliInit(weiyuanPath, identityPath, serverUrl);
+      if (identityCreated) break;
+    } catch (error) {
+      initError = error;
+      identityCreated = await createIdentityFile(identityPath, serverUrl, workspacePath);
+      if (identityCreated) break;
+    }
+  }
+  if (!identityCreated && initError) {
+    spinner.fail(`身份文件创建失败: ${initError.message}`);
+    throw initError;
   }
   if (identityCreated) {
     spinner.succeed(`身份文件: ${DEFAULT_CONFIG.identityFile}`);
@@ -280,14 +364,27 @@ async function runInit(options) {
 
   if (options.project && options.code) {
     spinner = ora('自动加入微元项目...').start();
-    try {
-      await runJoin(weiyuanPath, identityPath, options.project, options.code, true);
-      spinner.succeed(`已加入项目: ${options.project}`);
-      console.log(renderFixedMessage(fixedMessages.sceneB, { projectId: options.project }));
-    } catch (error) {
-      spinner.fail(`自动入组失败: ${error.message}`);
-      throw error;
+    let joined = false;
+    let joinErr = null;
+    for (const candidate of serverCandidates) {
+      try {
+        const identity = await fs.readJson(identityPath);
+        identity.serverBaseUrl = candidate;
+        await fs.writeJson(identityPath, identity, { spaces: 2 });
+        await runJoin(weiyuanPath, identityPath, options.project, options.code, true);
+        joined = true;
+        serverUrl = candidate;
+        break;
+      } catch (error) {
+        joinErr = error;
+      }
+    }
+    if (!joined) {
+      spinner.fail(`自动入组失败: ${joinErr ? joinErr.message : 'unknown_error'}`);
+      throw (joinErr || new Error('join_failed'));
     }
+    spinner.succeed(`已加入项目: ${options.project}`);
+    console.log(renderFixedMessage(fixedMessages.sceneB, { projectId: options.project }));
     return;
   }
   console.log(fixedMessages.sceneA);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-weiyuan-init",
-  "version": "1.0.69",
+  "version": "1.0.73",
   "description": "OpenClaw Weiyuan Skill 一键初始化工具",
   "main": "bin/cli.js",
   "bin": {