@windaka-erp/erp-cli 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windaka-erp/erp-cli",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "ERP CLI - command-line tool for Windaka ERP system",
   "bin": {
     "erp-cli": "scripts/run.js"
@@ -36,5 +36,8 @@
   "cpu": [
     "x64",
     "arm64"
-  ]
+  ],
+  "dependencies": {
+    "@windaka-erp/erp-cli": "^0.2.0"
+  }
 }

package/scripts/install.js

@@ -6,6 +6,7 @@ const fs = require("fs");
 const BINARY_NAME = "erp-cli";
 const VERSION = require("../package.json").version;
 const GITHUB_REPO = "windaka-erp/erp-cli";
+const GITEE_REPO = "xing-wenkai/erp-cli";
 
 // ── 平台映射 ──
 function getPlatformInfo() {
@@ -30,10 +31,56 @@ function getPlatformInfo() {
   return info;
 }
 
-// ── 下载地址 ──
-function getDownloadURL(info) {
+// ── 下载地址（GitHub 优先，Gitee 回退）──
+function getDownloadURLs(info) {
   const filename = `${BINARY_NAME}-${info.target}${info.ext}`;
-  return `https://github.com/${GITHUB_REPO}/releases/download/v${VERSION}/${filename}`;
+  return [
+    `https://github.com/${GITHUB_REPO}/releases/download/v${VERSION}/${filename}`,
+    `https://gitee.com/${GITEE_REPO}/releases/download/v${VERSION}/${filename}`,
+  ];
+}
+
+// ── 获取已安装二进制的版本号 ──
+function getInstalledVersion(binaryPath) {
+  try {
+    const output = execSync(`"${binaryPath}" --version`, {
+      encoding: "utf8",
+      timeout: 5000,
+    });
+    // 输出格式: "erp-cli version v0.2.0" 或 "erp-cli version 0.2.0"
+    const match = output.match(/version\s+v?(\S+)/i);
+    return match ? match[1] : null;
+  } catch {
+    return null;
+  }
+}
+
+// ── 比较版本号 ──
+function isVersionOutdated(installed, expected) {
+  if (!installed) return true;
+  // 去掉 v 前缀统一比较
+  const a = installed.replace(/^v/, "");
+  const b = expected.replace(/^v/, "");
+  return a !== b;
+}
+
+// ── 下载二进制 ──
+function downloadBinary(url, binaryPath) {
+  if (process.platform === "win32") {
+    execSync(
+      `powershell -Command "Invoke-WebRequest -Uri '${url}' -OutFile '${binaryPath}'"`,
+      { stdio: "inherit" }
+    );
+  } else {
+    execSync(`curl -L -o "${binaryPath}" "${url}"`, {
+      stdio: "inherit",
+    });
+  }
+
+  // 设置可执行权限（非 Windows）
+  if (process.platform !== "win32") {
+    fs.chmodSync(binaryPath, 0o755);
+  }
 }
 
 // ── 主流程 ──
@@ -47,10 +94,17 @@ function install() {
   const info = getPlatformInfo();
   const binaryPath = path.join(binDir, `${BINARY_NAME}${info.ext}`);
 
-  // 1. 检查 bin/ 目录是否已有对应平台的二进制（npm pack 打包时带进来的）
+  // 1. 检查 bin/ 目录是否已有对应平台的二进制
   if (fs.existsSync(binaryPath)) {
-    console.log(`Found bundled binary: ${binaryPath}`);
-    return;
+    const installedVer = getInstalledVersion(binaryPath);
+    if (!isVersionOutdated(installedVer, VERSION)) {
+      console.log(`Found bundled binary: ${binaryPath} (v${installedVer})`);
+      return;
+    }
+    // 版本不一致，需要更新
+    console.log(
+      `Binary version mismatch: installed v${installedVer}, expected v${VERSION}. Updating...`
+    );
   }
 
   // 2. 检查项目根目录是否有本地编译产物（开发模式）
@@ -62,33 +116,25 @@ function install() {
     return;
   }
 
-  // 3. 从 GitHub Releases 下载
-  const url = getDownloadURL(info);
+  // 3. 从 GitHub Releases 下载，失败回退 Gitee
+  const urls = getDownloadURLs(info);
   console.log(`Downloading ${BINARY_NAME} v${VERSION} for ${info.target}...`);
-  console.log(`  URL: ${url}`);
 
-  try {
-    if (process.platform === "win32") {
-      // Windows: 使用 PowerShell 下载
-      execSync(
-        `powershell -Command "Invoke-WebRequest -Uri '${url}' -OutFile '${binaryPath}'"`,
-        { stdio: "inherit" }
-      );
-    } else {
-      // macOS/Linux: 使用 curl
-      execSync(`curl -L -o "${binaryPath}" "${url}"`, {
-        stdio: "inherit",
-      });
-    }
-
-    // 设置可执行权限（非 Windows）
-    if (process.platform !== "win32") {
-      fs.chmodSync(binaryPath, 0o755);
+  let downloaded = false;
+  for (const url of urls) {
+    console.log(`  Trying: ${url}`);
+    try {
+      downloadBinary(url, binaryPath);
+      downloaded = true;
+      console.log(`Successfully installed ${BINARY_NAME} v${VERSION}`);
+      break;
+    } catch (err) {
+      console.warn(`  Failed: ${err.message}`);
     }
+  }
 
-    console.log(`Successfully installed ${BINARY_NAME} v${VERSION}`);
-  } catch (err) {
-    console.error(`Download failed: ${err.message}`);
+  if (!downloaded) {
+    console.error(`All download sources failed.`);
     console.error(`You can build from source:`);
     console.error(`  git clone https://github.com/${GITHUB_REPO}.git`);
     console.error(`  cd erp-cli && go build -o ${BINARY_NAME} .`);
@@ -97,4 +143,4 @@ function install() {
   }
 }
 
-install();
+install();

package/scripts/run.js

@@ -1,14 +1,18 @@
 #!/usr/bin/env node
-const { execFileSync } = require("child_process");
+const { execFileSync, execSync } = require("child_process");
 const path = require("path");
 const fs = require("fs");
+const https = require("https");
+const http = require("http");
 
 const BINARY_NAME = "erp-cli";
+const VERSION = require("../package.json").version;
+const GITHUB_REPO = "windaka-erp/erp-cli";
+const GITEE_REPO = "xing-wenkai/erp-cli";
 
 function getBinaryPath() {
   const binDir = path.join(__dirname, "..", "bin");
 
-  // 按优先级查找二进制
   const candidates = [
     path.join(binDir, `${BINARY_NAME}.exe`), // bin/erp-cli.exe (Windows)
     path.join(binDir, BINARY_NAME), // bin/erp-cli (macOS/Linux)
@@ -25,7 +29,182 @@ function getBinaryPath() {
   process.exit(1);
 }
 
+// ── 静默自动更新 ──
+
+function getPlatformInfo() {
+  const platform = process.platform;
+  const arch = process.arch;
+
+  const map = {
+    win32_x64: { target: "windows-amd64", ext: ".exe" },
+    win32_arm64: { target: "windows-arm64", ext: ".exe" },
+    darwin_x64: { target: "darwin-amd64", ext: "" },
+    darwin_arm64: { target: "darwin-arm64", ext: "" },
+    linux_x64: { target: "linux-amd64", ext: "" },
+    linux_arm64: { target: "linux-arm64", ext: "" },
+  };
+
+  return map[`${platform}_${arch}`] || null;
+}
+
+function getInstalledVersion(binaryPath) {
+  try {
+    const output = execSync(`"${binaryPath}" --version`, {
+      encoding: "utf8",
+      timeout: 5000,
+    });
+    const match = output.match(/version\s+v?(\S+)/i);
+    return match ? match[1].replace(/^v/, "") : null;
+  } catch {
+    return null;
+  }
+}
+
+function fetchJSON(url) {
+  return new Promise((resolve, reject) => {
+    const client = url.startsWith("https") ? https : http;
+    client
+      .get(url, { timeout: 5000 }, (res) => {
+        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+          fetchJSON(res.headers.location).then(resolve, reject);
+          return;
+        }
+        if (res.statusCode !== 200) {
+          reject(new Error(`HTTP ${res.statusCode}`));
+          return;
+        }
+        let data = "";
+        res.on("data", (chunk) => (data += chunk));
+        res.on("end", () => {
+          try {
+            resolve(JSON.parse(data));
+          } catch (e) {
+            reject(e);
+          }
+        });
+      })
+      .on("error", reject)
+      .on("timeout", function () {
+        this.destroy();
+        reject(new Error("timeout"));
+      });
+  });
+}
+
+function downloadFile(url, dest) {
+  return new Promise((resolve, reject) => {
+    const client = url.startsWith("https") ? https : http;
+    client
+      .get(url, (res) => {
+        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+          downloadFile(res.headers.location, dest).then(resolve, reject);
+          return;
+        }
+        if (res.statusCode !== 200) {
+          reject(new Error(`HTTP ${res.statusCode}`));
+          return;
+        }
+        const stream = fs.createWriteStream(dest);
+        res.pipe(stream);
+        stream.on("finish", () => {
+          stream.close();
+          if (process.platform !== "win32") {
+            fs.chmodSync(dest, 0o755);
+          }
+          resolve();
+        });
+        stream.on("error", reject);
+      })
+      .on("error", reject);
+  });
+}
+
+async function silentAutoUpdate() {
+  try {
+    const binary = getBinaryPath();
+    const installedVer = getInstalledVersion(binary);
+
+    // 如果已安装版本和 package.json 一致，跳过
+    if (installedVer === VERSION.replace(/^v/, "")) return;
+
+    // 已安装版本比 package.json 新？跳过
+    if (installedVer && installedVer > VERSION.replace(/^v/, "")) return;
+
+    // 检查上次更新时间，每天最多检查一次
+    const updateMarker = path.join(
+      require("os").homedir(),
+      ".erp-cli",
+      ".last-update-check"
+    );
+    try {
+      const lastCheck = parseInt(fs.readFileSync(updateMarker, "utf8"), 10);
+      const ONE_DAY = 24 * 60 * 60 * 1000;
+      if (Date.now() - lastCheck < ONE_DAY) return;
+    } catch {
+      // 文件不存在或读取失败，继续检查
+    }
+    if (installedVer && installedVer > VERSION.replace(/^v/, "")) return;
+
+    // 需要更新：查询 Release 获取最新版本号（GitHub 优先，Gitee 回退）
+    let release;
+    try {
+      release = await fetchJSON(
+        `https://api.github.com/repos/${GITHUB_REPO}/releases/latest`
+      );
+    } catch {
+      // GitHub 不通，回退 Gitee API
+      release = await fetchJSON(
+        `https://gitee.com/api/v5/repos/${GITEE_REPO}/releases/latest`
+      );
+    }
+
+    const latestTag = release.tag_name; // e.g. "v0.3.0"
+    const latestVer = latestTag.replace(/^v/, "");
+
+    // 最新版和 package.json 版本不一致？等 npm update 后再说
+    if (latestVer !== VERSION.replace(/^v/, "")) return;
+
+    // 下载新版本
+    const info = getPlatformInfo();
+    if (!info) return;
+
+    const filename = `${BINARY_NAME}-${info.target}${info.ext}`;
+    const asset = release.assets.find((a) => a.name === filename);
+    if (!asset) return;
+
+    const binDir = path.join(__dirname, "..", "bin");
+    const binaryPath = path.join(binDir, `${BINARY_NAME}${info.ext}`);
+
+    // 下载到临时文件，完成后原子替换
+    const tmpPath = binaryPath + ".tmp";
+    await downloadFile(asset.browser_download_url, tmpPath);
+
+    // 替换旧二进制
+    fs.renameSync(tmpPath, binaryPath);
+
+    // 写入本次检查时间
+    try {
+      const markerDir = path.join(require("os").homedir(), ".erp-cli");
+      if (!fs.existsSync(markerDir)) fs.mkdirSync(markerDir, { recursive: true });
+      fs.writeFileSync(markerDir + "/.last-update-check", String(Date.now()));
+    } catch {
+      // 写入失败不影响
+    }
+  } catch {
+    // 静默失败，不影响正常使用
+    // 即使失败也写入检查时间，避免频繁重试
+    try {
+      const markerDir = path.join(require("os").homedir(), ".erp-cli");
+      if (!fs.existsSync(markerDir)) fs.mkdirSync(markerDir, { recursive: true });
+      fs.writeFileSync(markerDir + "/.last-update-check", String(Date.now()));
+    } catch {}
+  }
+}
+
 function main() {
+  // 后台静默更新，不阻塞主流程
+  silentAutoUpdate().catch(() => {});
+
   const binary = getBinaryPath();
   const args = process.argv.slice(2);
 
@@ -35,10 +214,8 @@ function main() {
       env: { ...process.env },
     });
   } catch (err) {
-    // execFileSync throws on non-zero exit codes; the binary already
-    // wrote its output to stdout/stderr, so just exit with same code.
     process.exitCode = err.status || 1;
   }
 }
 
-main();
+main();