openclaw-weiyuan-init 1.0.5 → 1.0.9

package/README.md

@@ -5,7 +5,7 @@ OpenClaw Weiyuan Skill 一键初始化工具
 ## 一键部署
 
 ```bash
-npx -y @weiyuan/openclaw-weiyuan-init@latest init
+npx -y openclaw-weiyuan-init@latest init
 ```
 
 ## 版本化 zip 自动识别
@@ -17,13 +17,13 @@ npx -y @weiyuan/openclaw-weiyuan-init@latest init
 ## 常用参数
 
 ```bash
-npx -y @weiyuan/openclaw-weiyuan-init@latest init --upgrade <upgradeBaseUrl> --server <serverUrl>
+npx -y openclaw-weiyuan-init@latest init --upgrade <upgradeBaseUrl> --server <serverUrl>
 ```
 
 邀请码一键入组（推荐）：
 
 ```bash
-npx -y @weiyuan/openclaw-weiyuan-init@latest init --invite <inviteToken>
+npx -y openclaw-weiyuan-init@latest init --invite <inviteToken>
 ```
 
 `inviteToken` 包含 `server/upgrade/project/code`，会自动完成安装与入组。
@@ -31,5 +31,5 @@ npx -y @weiyuan/openclaw-weiyuan-init@latest init --invite <inviteToken>
 如需指定固定 zip，可覆盖自动识别：
 
 ```bash
-npx -y @weiyuan/openclaw-weiyuan-init@latest init --download <zipUrl> --server <serverUrl>
+npx -y openclaw-weiyuan-init@latest init --download <zipUrl> --server <serverUrl>
 ```

package/bin/cli.js

@@ -14,11 +14,11 @@ program
   .description('初始化 weiyuan skill')
   .option('-w, --workspace <path>', '指定工作目录', 'workspace-weiyuan')
   .option('-s, --server <url>', '指定服务器地址', 'http://121.43.119.190:8787')
-  .option('-u, --upgrade <url>', '指定升级源地址（含 LATEST_SKILL_VERSION.txt）', 'http://121.43.119.190:8788')
-  .option('-d, --download <url>', '指定下载地址（可覆盖自动版本解析）')
-  .option('-i, --invite <token>', '邀请码令牌（包含 server/upgrade/project/code）')
-  .option('-p, --project <id>', '邀请加入的项目 ID')
-  .option('-c, --code <code>', '邀请口令')
+  .option('-u, --upgrade <url>', '指定升级源地址（含 LATEST_SKILL_VERSION.txt）', 'http://121.43.119.190/upgrade')
+  .option('-d, --download <url>', '指定下载地址（可覆盖自动版本解析）')
+  .option('-i, --invite <token>', '邀请码令牌（包含 server/upgrade/project/code）')
+  .option('-p, --project <id>', '邀请加入的项目 ID')
+  .option('-c, --code <code>', '邀请口令')
   .option('-f, --force', '强制覆盖已有文件')
   .action(async (options) => {
     try {
@@ -46,7 +46,7 @@ program
   .command('status')
   .description('查看 weiyuan 状态')
   .option('-w, --workspace <path>', '指定工作目录', 'workspace-weiyuan')
-  .option('-s, --server <url>', '指定服务器地址', 'http://121.43.119.190:8787')
+  .option('-s, --server <url>', '指定服务器地址', 'http://121.43.119.190:8787')
   .action(async (options) => {
     try {
       await runStatus(options);
@@ -56,4 +56,4 @@ program
     }
   });
 
-program.parse();
+program.parse();

package/lib/commands.js

@@ -2,59 +2,59 @@ const chalk = require('chalk');
 const ora = require('ora');
 const path = require('path');
 const fs = require('fs-extra');
-const { execFile } = require('child_process');
-const { promisify } = require('util');
-const { downloadFile, resolvePackageSource } = require('./downloader');
+const { execFile } = require('child_process');
+const { promisify } = require('util');
+const { downloadFile, resolvePackageSource } = require('./downloader');
 const { extractZip } = require('./extractor');
 const { createIdentityFile } = require('./identity');
 const { checkServer, initSkill } = require('./server');
 const { printBanner, printSummary, listDirectory } = require('./utils');
-const execFileAsync = promisify(execFile);
+const execFileAsync = promisify(execFile);
 
 const DEFAULT_CONFIG = {
   workspaceName: 'workspace-weiyuan',
-  upgradeBaseUrl: 'http://121.43.119.190:8788',
-  downloadUrl: '',
+  upgradeBaseUrl: 'http://121.43.119.190/upgrade',
+  downloadUrl: '',
   serverUrl: 'http://121.43.119.190:8787',
   identityFile: '.weiyuan'
 };
-
-function decodeInviteToken(token) {
-  if (!token || typeof token !== 'string') return null;
-  try {
-    const normalized = token.replace(/-/g, '+').replace(/_/g, '/');
-    const pad = normalized.length % 4 === 0 ? '' : '='.repeat(4 - (normalized.length % 4));
-    const raw = Buffer.from(normalized + pad, 'base64').toString('utf8');
-    const parsed = JSON.parse(raw);
-    if (!parsed || parsed.v !== 1) return null;
-    if (!parsed.api || !parsed.upgrade || !parsed.projectId || !parsed.code) return null;
-    return parsed;
-  } catch (_) {
-    return null;
-  }
-}
-
-async function runJoin(weiyuanPath, identityPath, projectId, code) {
-  await execFileAsync('npm', ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'join', '--identity', identityPath, '--project', projectId, '--code', code], {
-    cwd: weiyuanPath
-  });
-}
+
+function decodeInviteToken(token) {
+  if (!token || typeof token !== 'string') return null;
+  try {
+    const normalized = token.replace(/-/g, '+').replace(/_/g, '/');
+    const pad = normalized.length % 4 === 0 ? '' : '='.repeat(4 - (normalized.length % 4));
+    const raw = Buffer.from(normalized + pad, 'base64').toString('utf8');
+    const parsed = JSON.parse(raw);
+    if (!parsed || parsed.v !== 1) return null;
+    if (!parsed.api || !parsed.upgrade || !parsed.projectId || !parsed.code) return null;
+    return parsed;
+  } catch (_) {
+    return null;
+  }
+}
+
+async function runJoin(weiyuanPath, identityPath, projectId, code) {
+  await execFileAsync('npm', ['--prefix', weiyuanPath, 'run', 'weiyuan', '--', 'join', '--identity', identityPath, '--project', projectId, '--code', code], {
+    cwd: weiyuanPath
+  });
+}
 
 async function runInit(options) {
   printBanner();
-
-  const invite = decodeInviteToken(options.invite);
-  if (invite) {
-    options.server = options.server || invite.api;
-    options.upgrade = options.upgrade || invite.upgrade;
-    options.project = options.project || invite.projectId;
-    options.code = options.code || invite.code;
-  }
+
+  const invite = decodeInviteToken(options.invite);
+  if (invite) {
+    options.server = options.server || invite.api;
+    options.upgrade = options.upgrade || invite.upgrade;
+    options.project = options.project || invite.projectId;
+    options.code = options.code || invite.code;
+  }
 
   const workspacePath = path.join(process.cwd(), options.workspace);
   const weiyuanPath = path.join(workspacePath, 'weiyuan');
-  const upgradeBaseUrl = options.upgrade || DEFAULT_CONFIG.upgradeBaseUrl;
-  const requestedDownloadUrl = options.download || DEFAULT_CONFIG.downloadUrl;
+  const upgradeBaseUrl = options.upgrade || DEFAULT_CONFIG.upgradeBaseUrl;
+  const requestedDownloadUrl = options.download || DEFAULT_CONFIG.downloadUrl;
   const serverUrl = options.server || DEFAULT_CONFIG.serverUrl;
   const force = options.force || false;
 
@@ -85,22 +85,22 @@ async function runInit(options) {
   }
 
   // 3. 下载文件
-  spinner = ora('解析下载包...').start();
-  const source = await resolvePackageSource({
-    downloadUrl: requestedDownloadUrl,
-    upgradeBaseUrl,
-    spinner
-  });
-  spinner.succeed(`下载源: ${source.downloadUrl}`);
-
-  spinner = ora('下载 weiyuan skill...').start();
-  const zipPath = path.join(weiyuanPath, source.zipFilename);
-  const downloadSuccess = await downloadFile(source.downloadUrl, zipPath, spinner);
+  spinner = ora('解析下载包...').start();
+  const source = await resolvePackageSource({
+    downloadUrl: requestedDownloadUrl,
+    upgradeBaseUrl,
+    spinner
+  });
+  spinner.succeed(`下载源: ${source.downloadUrl}`);
+
+  spinner = ora('下载 weiyuan skill...').start();
+  const zipPath = path.join(weiyuanPath, source.zipFilename);
+  const downloadSuccess = await downloadFile(source.downloadUrl, zipPath, spinner);
   if (!downloadSuccess) {
     spinner.fail('下载失败');
     throw new Error('下载失败');
   }
-  spinner.succeed(`下载完成: ${source.zipFilename}`);
+  spinner.succeed(`下载完成: ${source.zipFilename}`);
 
   // 4. 解压
   spinner = ora('解压文件...').start();
@@ -142,20 +142,20 @@ async function runInit(options) {
   } else {
     spinner.warn('初始化端点不存在，请手动调用');
   }
-
-  if (options.project && options.code) {
-    spinner = ora('自动加入微元项目...').start();
-    try {
-      await runJoin(weiyuanPath, identityPath, options.project, options.code);
-      spinner.succeed(`已加入项目: ${options.project}`);
-    } catch (error) {
-      spinner.fail(`自动入组失败: ${error.message}`);
-      throw error;
-    }
-  }
+
+  if (options.project && options.code) {
+    spinner = ora('自动加入微元项目...').start();
+    try {
+      await runJoin(weiyuanPath, identityPath, options.project, options.code);
+      spinner.succeed(`已加入项目: ${options.project}`);
+    } catch (error) {
+      spinner.fail(`自动入组失败: ${error.message}`);
+      throw error;
+    }
+  }
 
   // 打印总结
-  printSummary(workspacePath, serverUrl, source.downloadUrl);
+  printSummary(workspacePath, serverUrl, source.downloadUrl);
 }
 
 async function runClean(options) {
@@ -211,15 +211,15 @@ async function runStatus(options) {
   }
 
   // 检查服务器
-  const serverUrl = options.server || DEFAULT_CONFIG.serverUrl;
-  const serverOk = await checkServer(serverUrl);
+  const serverUrl = options.server || DEFAULT_CONFIG.serverUrl;
+  const serverOk = await checkServer(serverUrl);
   if (serverOk) {
-    console.log(chalk.green(`✅ 服务器: ${serverUrl}`));
+    console.log(chalk.green(`✅ 服务器: ${serverUrl}`));
   } else {
-    console.log(chalk.red(`❌ 服务器不可达: ${serverUrl}`));
+    console.log(chalk.red(`❌ 服务器不可达: ${serverUrl}`));
   }
 
   console.log('');
 }
 
-module.exports = { runInit, runClean, runStatus, DEFAULT_CONFIG };
+module.exports = { runInit, runClean, runStatus, DEFAULT_CONFIG };

package/lib/downloader.js

@@ -1,36 +1,36 @@
 const axios = require('axios');
 const fs = require('fs-extra');
 
-function trimSlash(url) {
-  return String(url || '').replace(/\/+$/, '');
-}
-
-function toZipFilename(downloadUrl) {
-  const clean = String(downloadUrl || '').split('?')[0].split('#')[0];
-  const parts = clean.split('/');
-  return parts[parts.length - 1] || 'weiyuan-openclaw-skill.zip';
-}
-
-async function resolvePackageSource({ downloadUrl, upgradeBaseUrl, spinner = null }) {
-  if (downloadUrl) {
-    return { downloadUrl, zipFilename: toZipFilename(downloadUrl), version: null, from: 'download_url' };
-  }
-
-  const base = trimSlash(upgradeBaseUrl);
-  const latestUrl = `${base}/LATEST_SKILL_VERSION.txt`;
-  const latestResp = await axios.get(latestUrl, { timeout: 10000 });
-  const version = String(latestResp.data || '').trim();
-  if (!version) {
-    throw new Error('empty_latest_version');
-  }
-  const zipFilename = `weiyuan-openclaw-skill-v${version}.zip`;
-  const resolvedDownloadUrl = `${base}/${zipFilename}`;
-  if (spinner) {
-    spinner.text = `已解析最新版本: v${version}`;
-  }
-  return { downloadUrl: resolvedDownloadUrl, zipFilename, version, from: 'latest_version' };
-}
-
+function trimSlash(url) {
+  return String(url || '').replace(/\/+$/, '');
+}
+
+function toZipFilename(downloadUrl) {
+  const clean = String(downloadUrl || '').split('?')[0].split('#')[0];
+  const parts = clean.split('/');
+  return parts[parts.length - 1] || 'weiyuan-openclaw-skill.zip';
+}
+
+async function resolvePackageSource({ downloadUrl, upgradeBaseUrl, spinner = null }) {
+  if (downloadUrl) {
+    return { downloadUrl, zipFilename: toZipFilename(downloadUrl), version: null, from: 'download_url' };
+  }
+
+  const base = trimSlash(upgradeBaseUrl);
+  const latestUrl = `${base}/LATEST_SKILL_VERSION.txt`;
+  const latestResp = await axios.get(latestUrl, { timeout: 10000 });
+  const version = String(latestResp.data || '').trim();
+  if (!version) {
+    throw new Error('empty_latest_version');
+  }
+  const zipFilename = `weiyuan-openclaw-skill-v${version}.zip`;
+  const resolvedDownloadUrl = `${base}/${zipFilename}`;
+  if (spinner) {
+    spinner.text = `已解析最新版本: v${version}`;
+  }
+  return { downloadUrl: resolvedDownloadUrl, zipFilename, version, from: 'latest_version' };
+}
+
 async function downloadFile(url, outputPath, spinner = null) {
   try {
     const response = await axios({
@@ -70,4 +70,4 @@ async function downloadFile(url, outputPath, spinner = null) {
   }
 }
 
-module.exports = { downloadFile, resolvePackageSource };
+module.exports = { downloadFile, resolvePackageSource };

package/package.json

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