proto-update-tool 1.0.0 → 1.0.2

package/README.md

@@ -8,13 +8,13 @@ Usage: Proto 助手 [options]
 Options:
   -V, --version      output the version number
   -h, --help         显示帮助信息
-  -p, --path <path>  指定 Proto 配置文件路径 (default: "./proto.config.json")
+  -p, --path <path>  指定 Proto 配置文件路径 (default: "./.proto.config.json")
 ```
 
 # 配置文件示例
 
 ```json5
-// proto.config.json 示例
+// .proto.config.json 示例
 [
     {
         // 仓库地址

package/bin/git.factory.d.ts

@@ -1,9 +1,9 @@
-export interface GitImportOption {
+export type RepoConfig = {
     repository: string;
     ref: string;
     outDir: string;
-    fileFilter: string;
     destPath: string;
-}
-export declare function gitFactory(options: GitImportOption[]): Promise<void>;
+};
+export declare function gitConfigFactory(configs: RepoConfig[]): Promise<void>;
+export declare function gitFactory(configPath: string): Promise<void>;
 //# sourceMappingURL=git.factory.d.ts.map

package/bin/git.factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.factory.d.ts","sourceRoot":"","sources":["../src/git.factory.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,UAAU,CAAC,OAAO,EAAE,eAAe,EAAE,iBA4C1D"}
+{"version":3,"file":"git.factory.d.ts","sourceRoot":"","sources":["../src/git.factory.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,UAAU,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC;AA2IF,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,iBAiC3D;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,iBAGlD"}

package/bin/git.factory.js

@@ -3,58 +3,170 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.gitConfigFactory = gitConfigFactory;
 exports.gitFactory = gitFactory;
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const child_process_1 = require("child_process");
 const fs_extra_1 = require("fs-extra");
-const os_1 = require("os");
-const path_1 = require("path");
-const simple_git_1 = __importDefault(require("simple-git"));
-async function gitFactory(options) {
-    const tempDir = (0, path_1.join)((0, os_1.homedir)(), '.proto-import-cache');
-    // console.log('tempDir:', tempDir);
-    if (!(0, fs_extra_1.existsSync)(tempDir))
-        (0, fs_extra_1.mkdirSync)(tempDir, { recursive: true });
-    await Promise.all(options.map(async (config) => {
-        const path = (0, path_1.join)(__dirname, '..', config.destPath);
-        if (!(0, fs_extra_1.existsSync)(path)) {
-            (0, fs_extra_1.mkdirSync)(path, { recursive: true });
-        }
-        const tempPath = (0, path_1.join)(tempDir, config.repository);
-        let isCloned = false;
-        if (!(0, fs_extra_1.existsSync)(tempPath)) {
-            (0, fs_extra_1.mkdirSync)(tempPath, { recursive: true });
-            isCloned = true;
-        }
-        const git = (0, simple_git_1.default)(tempPath);
-        if (isCloned) {
-            await git.clone(config.repository, tempPath);
-        }
-        await git.fetch(tempPath, 'origin', ['--tags']);
-        const tags = await git.tags();
-        console.log('可用 tags:', tags.all);
-        if (!tags.all.includes(config.ref)) {
-            throw new Error(`tag ${config.ref} not found`);
-        }
-        await git.checkout(config.ref);
-        const destPath = (0, path_1.join)(process.cwd(), config.destPath);
-        (0, fs_extra_1.removeSync)(destPath);
-        if (!(0, fs_extra_1.existsSync)(destPath))
-            (0, fs_extra_1.mkdirSync)(destPath, { recursive: true });
-        (0, fs_extra_1.copySync)((0, path_1.join)(tempPath, config.outDir), destPath, {
-            overwrite: true,
-            filter: (src) => {
-                if (src.startsWith('.git'))
-                    return false;
-                if ((0, fs_extra_1.statSync)(src).isDirectory())
-                    return true;
-                const regExp = new RegExp(eval(config.fileFilter));
-                if (regExp.test(src)) {
-                    console.info(`copy ${src} to .${destPath.replace(process.cwd(), '')}`);
-                    return true;
-                }
-                return false;
-            },
+async function readConfig(filename = ".proto.config.json") {
+    const cfgPath = path_1.default.resolve(process.cwd(), filename);
+    const raw = await (0, fs_extra_1.readFileSync)(cfgPath, "utf-8");
+    const data = JSON.parse(raw);
+    if (!Array.isArray(data)) {
+        throw new Error("格式错误：应为数组");
+    }
+    return data.map((x) => {
+        if (!x.repository || !x.ref || !x.outDir || !x.destPath) {
+            throw new Error("配置缺少必要字段 repository/ref/outDir/destPath");
+        }
+        return { repository: String(x.repository), ref: String(x.ref), outDir: String(x.outDir), destPath: String(x.destPath) };
+    });
+}
+function execCmd(cmd, args, cwd) {
+    return new Promise((resolve, reject) => {
+        const child = (0, child_process_1.spawn)(cmd, args, {
+            cwd,
+            stdio: "inherit",
+        });
+        child.on("error", reject);
+        child.on("exit", (code) => {
+            if (code === 0)
+                resolve();
+            else
+                reject(new Error(`${cmd} ${args.join(" ")} 退出码: ${code}`));
+        });
+    });
+}
+function execCmdCapture(cmd, args, cwd) {
+    return new Promise((resolve, reject) => {
+        const child = (0, child_process_1.spawn)(cmd, args, {
+            cwd,
+            stdio: ["ignore", "pipe", "pipe"],
         });
-        return true;
-    }));
+        let stdout = "";
+        let stderr = "";
+        child.stdout.on("data", (d) => {
+            stdout += d.toString();
+        });
+        child.stderr.on("data", (d) => {
+            stderr += d.toString();
+        });
+        child.on("error", reject);
+        child.on("exit", (code) => {
+            resolve({ code: code ?? 0, stdout, stderr });
+        });
+    });
+}
+async function copyDirFilterTs(src, dest) {
+    const entries = await (0, fs_extra_1.readdir)(src, { withFileTypes: true });
+    await (0, fs_extra_1.mkdirSync)(dest, { recursive: true });
+    for (const entry of entries) {
+        const s = path_1.default.join(src, entry.name);
+        const d = path_1.default.join(dest, entry.name);
+        if (entry.isDirectory()) {
+            await copyDirFilterTs(s, d);
+        }
+        else if (entry.isFile() && entry.name.endsWith(".ts")) {
+            await (0, fs_extra_1.copyFile)(s, d);
+        }
+    }
+}
+async function processRepo(conf) {
+    const tmpBase = path_1.default.join(os_1.default.tmpdir(), '.proto-import-cache');
+    const repoDirName = conf.destPath.replace(/[^\w.-]/g, "_") + "_" + conf.ref.replace(/[^\w.-]/g, "_");
+    const cloneDir = path_1.default.join(tmpBase, repoDirName);
+    await (0, fs_extra_1.mkdirSync)(tmpBase, { recursive: true });
+    await (0, fs_extra_1.removeSync)(cloneDir);
+    console.log(`开始处理: ${conf.repository} @ ${conf.ref}`);
+    try {
+        await execCmd("git", ["clone", "--depth", "1", "--branch", conf.ref, conf.repository, cloneDir]);
+    }
+    catch (e) {
+        console.warn(`直接克隆分支失败，回退到默认分支后切换: ${e.message}`);
+        await execCmd("git", ["clone", conf.repository, cloneDir]);
+        await execCmd("git", ["fetch", "--all"], cloneDir);
+        try {
+            await execCmd("git", ["checkout", conf.ref], cloneDir);
+        }
+        catch {
+            await execCmd("git", ["checkout", `origin/${conf.ref}`], cloneDir);
+        }
+    }
+    const srcGen = path_1.default.join(cloneDir, conf.outDir);
+    const destRoot = path_1.default.resolve(process.cwd(), conf.destPath);
+    const destGen = path_1.default.join(destRoot, conf.outDir);
+    let last = undefined;
+    try {
+        if (!(0, fs_extra_1.statSync)(srcGen).isDirectory()) {
+            throw new Error(`源仓库中不存在 ${conf.outDir} 目录`);
+        }
+    }
+    catch {
+        throw new Error(`源仓库 ${conf.repository} 的 ${conf.ref} 未找到 ${conf.outDir} 目录`);
+    }
+    try {
+        const info = await execCmdCapture("git", ["log", "-1", "--pretty=format:%H|||%an|||%ad|||%s", "--date=iso"], cloneDir);
+        const body = await execCmdCapture("git", ["log", "-1", "--pretty=format:%B"], cloneDir);
+        const parts = info.stdout.trim().split("|||");
+        if (parts.length >= 4) {
+            last = {
+                hash: parts[0] ?? "",
+                author: parts[1] ?? "",
+                date: parts[2] ?? "",
+                subject: parts[3] ?? "",
+                body: body.stdout ?? "",
+            };
+        }
+    }
+    catch {
+    }
+    await (0, fs_extra_1.mkdirSync)(destRoot, { recursive: true });
+    await (0, fs_extra_1.removeSync)(destGen);
+    await (0, fs_extra_1.mkdirSync)(destGen);
+    await copyDirFilterTs(srcGen, destGen);
+    console.log(`已拷贝 ${conf.repository} 的 ${conf.ref} 下 ${conf.outDir} 目录下 .ts 文件到 ${destGen}`);
+    await (0, fs_extra_1.removeSync)(cloneDir);
+    return { path: conf.repository, version: conf.ref, destGen, ...last ? { last } : {} };
+}
+async function gitConfigFactory(configs) {
+    const results = [];
+    for (const conf of configs) {
+        const r = await processRepo(conf);
+        results.push(r);
+    }
+    console.log("所有 Proto TS 更新完成");
+    await (0, fs_extra_1.removeSync)(path_1.default.join(os_1.default.tmpdir(), '.proto-import-cache'));
+    for (const r of results) {
+        await execCmd("git", ["add", r.destGen], process.cwd());
+        const staged = await execCmdCapture("git", ["diff", "--cached", "--name-only", "--", r.destGen], process.cwd());
+        if (staged.stdout.trim().length > 0) {
+            const msg1 = `更新${r.path}仓库协议版本${r.version}`;
+            const extras = [];
+            if (r.last) {
+                extras.push(`上游提交 ${r.last.hash}`);
+                extras.push(`作者: ${r.last.author} 日期: ${r.last.date}`);
+                extras.push(`内容: ${r.last.subject}`);
+                const bodyTrim = (r.last.body || "").trim();
+                if (bodyTrim.length) {
+                    const bodyShort = bodyTrim.length > 1000 ? bodyTrim.slice(0, 1000) + "…" : bodyTrim;
+                    extras.push(bodyShort);
+                }
+            }
+            const args = ["commit", "-m", msg1];
+            for (const e of extras)
+                args.push("-m", e);
+            args.push("--", r.destGen);
+            await execCmd("git", args, process.cwd());
+            console.log("已提交更新提交：", msg1);
+        }
+        else {
+            console.log(`无变更，跳过提交：${r.path}`);
+        }
+    }
+}
+async function gitFactory(configPath) {
+    const configs = await readConfig(configPath);
+    return await gitConfigFactory(configs);
 }
 //# sourceMappingURL=git.factory.js.map

package/bin/git.factory.js.map

@@ -1 +1 @@
-{"version":3,"file":"git.factory.js","sourceRoot":"","sources":["../src/git.factory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git.factory.js","sourceRoot":"","sources":["../src/git.factory.ts"],"names":[],"mappings":"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"}

package/bin/index.js

@@ -3,9 +3,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const package_json_1 = require("../package.json");
-const path_1 = require("path");
-const fs_extra_1 = require("fs-extra");
-const fs_1 = require("fs");
 const git_factory_1 = require("./git.factory");
 async function bootstrap() {
     const program = new commander_1.Command();
@@ -13,20 +10,16 @@ async function bootstrap() {
         .name('Proto 助手')
         .description('通过 Gitlab SSH 拉取 Proto 配置')
         .option('-h, --help', '显示帮助信息')
-        .option('-p, --path <path>', '指定 Proto 配置文件路径', './proto.config.json')
+        .option('-p, --path <path>', '指定 Proto 配置文件路径', './.proto.config.json')
         .parse(process.argv);
     const options = program.opts();
     if (options.help) {
         program.outputHelp();
         process.exit(0);
     }
-    const path = options.path || './proto.config.json';
-    const configPath = (0, path_1.join)(process.cwd(), path);
-    if (!(0, fs_extra_1.existsSync)(configPath)) {
-        throw new Error(`Proto 配置文件不存在: ${configPath}`);
-    }
-    const config = JSON.parse((0, fs_1.readFileSync)(configPath, 'utf-8'));
-    await (0, git_factory_1.gitFactory)(config);
+    const path = options.path || './.proto.config.json';
+    if (path)
+        (0, git_factory_1.gitFactory)(path);
     return true;
 }
 bootstrap();

package/bin/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AACpC,kDAA0C;AAC1C,+BAA4B;AAC5B,uCAAsC;AACtC,2BAAkC;AAClC,+CAA2C;AAE3C,KAAK,UAAU,SAAS;IACpB,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAE9B,OAAO,CAAC,OAAO,CAAC,sBAAO,CAAC;SACnB,IAAI,CAAC,UAAU,CAAC;SAChB,WAAW,CAAC,2BAA2B,CAAC;SACxC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC;SAC9B,MAAM,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,qBAAqB,CAAC;SACrE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,qBAAqB,CAAC;IACnD,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;IAC7C,IAAI,CAAC,IAAA,qBAAU,EAAC,UAAU,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,kBAAkB,UAAU,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC;IAC7D,MAAM,IAAA,wBAAU,EAAC,MAAM,CAAC,CAAC;IACzB,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AACpC,kDAA0C;AAC1C,+CAA2C;AAE3C,KAAK,UAAU,SAAS;IACpB,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAC;IAE9B,OAAO,CAAC,OAAO,CAAC,sBAAO,CAAC;SACnB,IAAI,CAAC,UAAU,CAAC;SAChB,WAAW,CAAC,2BAA2B,CAAC;SACxC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC;SAC9B,MAAM,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,sBAAsB,CAAC;SACtE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAC/B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpB,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,sBAAsB,CAAC;IACpD,IAAG,IAAI;QAAE,IAAA,wBAAU,EAAC,IAAI,CAAC,CAAC;IAC1B,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,EAAE,CAAC"}

package/bin/transform.d.ts

@@ -1,9 +1,9 @@
 import * as ts from 'typescript';
-import { GitImportOption } from './git.factory';
+import { RepoConfig } from './git.factory';
 export interface GitImportPluginOptions {
     transform: string;
     type: string;
-    options: GitImportOption[];
+    options: RepoConfig[];
 }
 export declare enum GitImportStatus {
     Waiting = "waiting",

package/bin/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAc,eAAe,EAAE,MAAM,eAAe,CAAC;AAE5D,MAAM,WAAW,sBAAsB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,eAAe,EAAE,CAAC;CAC9B;AACD,oBAAY,eAAe;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,MAAM,WAAW;CACpB;AAKD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,sBAAsB;uBAUlD,EAAE,CAAC,qBAAqB,MAEvC,YAAY,EAAE,CAAC,UAAU;EAOxC"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,EAAoB,UAAU,EAAE,MAAM,eAAe,CAAC;AAE7D,MAAM,WAAW,sBAAsB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,UAAU,EAAE,CAAC;CACzB;AACD,oBAAY,eAAe;IACvB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,MAAM,WAAW;CACpB;AAKD,MAAM,CAAC,OAAO,WAAW,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,EAAE,sBAAsB;uBAUlD,EAAE,CAAC,qBAAqB,MAEvC,YAAY,EAAE,CAAC,UAAU;EAOxC"}

package/bin/transform.js

@@ -18,7 +18,7 @@ function default_1(program, { options }) {
     if (buildStatus.status === GitImportStatus.Waiting) {
         // console.log(111111, buildStatus, options);
         buildStatus.status = GitImportStatus.Pending;
-        (0, git_factory_1.gitFactory)(options).then(() => {
+        (0, git_factory_1.gitConfigFactory)(options).then(() => {
             buildStatus.status = GitImportStatus.Success;
         }).catch(() => {
             buildStatus.status = GitImportStatus.Failed;

package/bin/transform.js.map

@@ -1 +1 @@
-{"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":";;;AAkBA,4BAmBC;AApCD,+CAA4D;AAO5D,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACrB,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AACD,MAAM,WAAW,GAAG;IAChB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;IAClD,MAAM,EAAE,eAAe,CAAC,OAAO;CAClC,CAAC;AACF,mBAAyB,OAAmB,EAAE,EAAE,OAAO,EAA0B;IAC7E,IAAI,WAAW,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;QACjD,6CAA6C;QAC7C,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QAC7C,IAAA,wBAAU,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YAC1B,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QACjD,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACV,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC;IACD,SAAS,QAAQ,CAAC,OAAiC;QAC/C,qBAAqB;QACrB,OAAO,CAAC,UAAyB,EAAE,EAAE;YACjC,0CAA0C;YAC1C,OAAO;YACP,OAAO,UAAU,CAAC;QACtB,CAAC,CAAC;IACN,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;AAClC,CAAC"}
+{"version":3,"file":"transform.js","sourceRoot":"","sources":["../src/transform.ts"],"names":[],"mappings":";;;AAkBA,4BAmBC;AApCD,+CAA6D;AAO7D,IAAY,eAKX;AALD,WAAY,eAAe;IACvB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACrB,CAAC,EALW,eAAe,+BAAf,eAAe,QAK1B;AACD,MAAM,WAAW,GAAG;IAChB,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC;IAClD,MAAM,EAAE,eAAe,CAAC,OAAO;CAClC,CAAC;AACF,mBAAyB,OAAmB,EAAE,EAAE,OAAO,EAA0B;IAC7E,IAAI,WAAW,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;QACjD,6CAA6C;QAC7C,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QAC7C,IAAA,8BAAgB,EAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YAChC,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QACjD,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACV,WAAW,CAAC,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC;QAChD,CAAC,CAAC,CAAC;IACP,CAAC;IACD,SAAS,QAAQ,CAAC,OAAiC;QAC/C,qBAAqB;QACrB,OAAO,CAAC,UAAyB,EAAE,EAAE;YACjC,0CAA0C;YAC1C,OAAO;YACP,OAAO,UAAU,CAAC;QACtB,CAAC,CAAC;IACN,CAAC;IACD,OAAO,EAAE,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;AAClC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proto-update-tool",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "license": "ISC",
   "author": "huaqingyi",

package/src/git.factory.ts

@@ -1,58 +1,188 @@
-import { copySync, existsSync, mkdirSync, removeSync, statSync } from 'fs-extra';
-import { homedir } from 'os';
-import { join } from 'path';
-import simpleGit from 'simple-git';
+import path from "path";
+import os from "os";
+import { spawn } from "child_process";
+import { copyFile, mkdirSync, readdir, readFileSync, removeSync, statSync } from "fs-extra";
 
-export interface GitImportOption {
+export type RepoConfig = {
     repository: string;
     ref: string;
     outDir: string;
-    fileFilter: string;
     destPath: string;
+};
+
+type RepoResult = {
+    path: string;
+    version: string;
+    destGen: string;
+    last?: {
+        hash: string;
+        author: string;
+        date: string;
+        subject: string;
+        body: string;
+    };
+};
+
+async function readConfig(filename: string = ".proto.config.json"): Promise<RepoConfig[]> {
+    const cfgPath = path.resolve(process.cwd(), filename);
+    const raw = await readFileSync(cfgPath, "utf-8");
+    const data = JSON.parse(raw) as RepoConfig[];
+    if (!Array.isArray(data)) {
+        throw new Error("格式错误：应为数组");
+    }
+    return data.map((x) => {
+        if (!x.repository || !x.ref || !x.outDir || !x.destPath) {
+            throw new Error("配置缺少必要字段 repository/ref/outDir/destPath");
+        }
+        return { repository: String(x.repository), ref: String(x.ref), outDir: String(x.outDir), destPath: String(x.destPath) };
+    });
+}
+
+function execCmd(cmd: string, args: string[], cwd?: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+        const child = spawn(cmd, args, {
+            cwd,
+            stdio: "inherit",
+        });
+        child.on("error", reject);
+        child.on("exit", (code) => {
+            if (code === 0) resolve();
+            else reject(new Error(`${cmd} ${args.join(" ")} 退出码: ${code}`));
+        });
+    });
 }
 
-export async function gitFactory(options: GitImportOption[]) {
-    const tempDir = join(homedir(), '.proto-import-cache');
-    // console.log('tempDir:', tempDir);
-    if (!existsSync(tempDir)) mkdirSync(tempDir, { recursive: true });
-    await Promise.all(options.map(async (config) => {
-        const path = join(__dirname, '..', config.destPath);
-        if (!existsSync(path)) {
-            mkdirSync(path, { recursive: true });
+function execCmdCapture(cmd: string, args: string[], cwd?: string): Promise<{ code: number; stdout: string; stderr: string }> {
+    return new Promise((resolve, reject) => {
+        const child = spawn(cmd, args, {
+            cwd,
+            stdio: ["ignore", "pipe", "pipe"],
+        });
+        let stdout = "";
+        let stderr = "";
+        child.stdout.on("data", (d) => {
+            stdout += d.toString();
+        });
+        child.stderr.on("data", (d) => {
+            stderr += d.toString();
+        });
+        child.on("error", reject);
+        child.on("exit", (code) => {
+            resolve({ code: code ?? 0, stdout, stderr });
+        });
+    });
+}
+
+async function copyDirFilterTs(src: string, dest: string) {
+    const entries = await readdir(src, { withFileTypes: true });
+    await mkdirSync(dest, { recursive: true });
+    for (const entry of entries) {
+        const s = path.join(src, entry.name);
+        const d = path.join(dest, entry.name);
+        if (entry.isDirectory()) {
+            await copyDirFilterTs(s, d);
+        } else if (entry.isFile() && entry.name.endsWith(".ts")) {
+            await copyFile(s, d);
         }
-        const tempPath = join(tempDir, config.repository);
-        let isCloned = false;
-        if (!existsSync(tempPath)) {
-            mkdirSync(tempPath, { recursive: true });
-            isCloned = true;
+    }
+}
+
+async function processRepo(conf: RepoConfig): Promise<RepoResult> {
+    const tmpBase = path.join(os.tmpdir(), '.proto-import-cache');
+    const repoDirName = conf.destPath.replace(/[^\w.-]/g, "_") + "_" + conf.ref.replace(/[^\w.-]/g, "_");
+    const cloneDir = path.join(tmpBase, repoDirName);
+
+    await mkdirSync(tmpBase, { recursive: true });
+    await removeSync(cloneDir);
+
+    console.log(`开始处理: ${conf.repository} @ ${conf.ref}`);
+    try {
+        await execCmd("git", ["clone", "--depth", "1", "--branch", conf.ref, conf.repository, cloneDir]);
+    } catch (e) {
+        console.warn(`直接克隆分支失败，回退到默认分支后切换: ${(e as Error).message}`);
+        await execCmd("git", ["clone", conf.repository, cloneDir]);
+        await execCmd("git", ["fetch", "--all"], cloneDir);
+        try {
+            await execCmd("git", ["checkout", conf.ref], cloneDir);
+        } catch {
+            await execCmd("git", ["checkout", `origin/${conf.ref}`], cloneDir);
         }
-        const git = simpleGit(tempPath);
-        if (isCloned) {
-            await git.clone(config.repository, tempPath);
+    }
+
+    const srcGen = path.join(cloneDir, conf.outDir);
+    const destRoot = path.resolve(process.cwd(), conf.destPath);
+    const destGen = path.join(destRoot, conf.outDir);
+    let last: RepoResult["last"] | undefined = undefined;
+
+    try {
+        if (!statSync(srcGen).isDirectory()) {
+            throw new Error(`源仓库中不存在 ${conf.outDir} 目录`);
         }
-        await git.fetch(tempPath, 'origin', ['--tags']);
-        const tags = await git.tags();
-        console.log('可用 tags:', tags.all);
-        if (!tags.all.includes(config.ref)) {
-            throw new Error(`tag ${config.ref} not found`);
+    } catch {
+        throw new Error(`源仓库 ${conf.repository} 的 ${conf.ref} 未找到 ${conf.outDir} 目录`);
+    }
+
+    try {
+        const info = await execCmdCapture("git", ["log", "-1", "--pretty=format:%H|||%an|||%ad|||%s", "--date=iso"], cloneDir);
+        const body = await execCmdCapture("git", ["log", "-1", "--pretty=format:%B"], cloneDir);
+        const parts = info.stdout.trim().split("|||");
+        if (parts.length >= 4) {
+            last = {
+                hash: parts[0] ?? "",
+                author: parts[1] ?? "",
+                date: parts[2] ?? "",
+                subject: parts[3] ?? "",
+                body: body.stdout ?? "",
+            };
         }
-        await git.checkout(config.ref);
-        const destPath = join(process.cwd(), config.destPath);
-        removeSync(destPath);
-        if (!existsSync(destPath)) mkdirSync(destPath, { recursive: true })
-        copySync(join(tempPath, config.outDir), destPath, {
-            overwrite: true,
-            filter: (src) => {
-                if (src.startsWith('.git')) return false;
-                if (statSync(src).isDirectory()) return true;
-                const regExp = new RegExp(eval(config.fileFilter));
-                if (regExp.test(src)) {
-                    console.info(`copy ${src} to .${destPath.replace(process.cwd(), '')}`);
-                    return true;
+    } catch {
+    }
+
+    await mkdirSync(destRoot, { recursive: true });
+    await removeSync(destGen);
+    await mkdirSync(destGen);
+    await copyDirFilterTs(srcGen, destGen);
+    console.log(`已拷贝 ${conf.repository} 的 ${conf.ref} 下 ${conf.outDir} 目录下 .ts 文件到 ${destGen}`);
+    await removeSync(cloneDir);
+    return { path: conf.repository, version: conf.ref, destGen, ...last ? { last } : {} };
+}
+
+export async function gitConfigFactory(configs: RepoConfig[]) {
+    const results: RepoResult[] = [];
+    for (const conf of configs) {
+        const r = await processRepo(conf);
+        results.push(r);
+    }
+    console.log("所有 Proto TS 更新完成");
+    await removeSync(path.join(os.tmpdir(), '.proto-import-cache'));
+    for (const r of results) {
+        await execCmd("git", ["add", r.destGen], process.cwd());
+        const staged = await execCmdCapture("git", ["diff", "--cached", "--name-only", "--", r.destGen], process.cwd());
+        if (staged.stdout.trim().length > 0) {
+            const msg1 = `更新${r.path}仓库协议版本${r.version}`;
+            const extras: string[] = [];
+            if (r.last) {
+                extras.push(`上游提交 ${r.last.hash}`);
+                extras.push(`作者: ${r.last.author} 日期: ${r.last.date}`);
+                extras.push(`内容: ${r.last.subject}`);
+                const bodyTrim = (r.last.body || "").trim();
+                if (bodyTrim.length) {
+                    const bodyShort = bodyTrim.length > 1000 ? bodyTrim.slice(0, 1000) + "…" : bodyTrim;
+                    extras.push(bodyShort);
                 }
-                return false;
-            },
-        });
-        return true;
-    }));
-}
+            }
+            const args = ["commit", "-m", msg1];
+            for (const e of extras) args.push("-m", e);
+            args.push("--", r.destGen);
+            await execCmd("git", args, process.cwd());
+            console.log("已提交更新提交：", msg1);
+        } else {
+            console.log(`无变更，跳过提交：${r.path}`);
+        }
+    }
+}
+
+export async function gitFactory(configPath: string) {
+    const configs = await readConfig(configPath);
+    return await gitConfigFactory(configs);
+}

package/src/index.ts

@@ -2,9 +2,6 @@
 
 import { Command } from "commander";
 import { version } from '../package.json';
-import { join } from 'path';
-import { existsSync } from "fs-extra";
-import { readFileSync } from "fs";
 import { gitFactory } from "./git.factory";
 
 async function bootstrap() {
@@ -14,7 +11,7 @@ async function bootstrap() {
         .name('Proto 助手')
         .description('通过 Gitlab SSH 拉取 Proto 配置')
         .option('-h, --help', '显示帮助信息')
-        .option('-p, --path <path>', '指定 Proto 配置文件路径', './proto.config.json')
+        .option('-p, --path <path>', '指定 Proto 配置文件路径', './.proto.config.json')
         .parse(process.argv);
 
     const options = program.opts();
@@ -22,13 +19,8 @@ async function bootstrap() {
         program.outputHelp();
         process.exit(0);
     }
-    const path = options.path || './proto.config.json';
-    const configPath = join(process.cwd(), path);
-    if (!existsSync(configPath)) {
-        throw new Error(`Proto 配置文件不存在: ${configPath}`);
-    }
-    const config = JSON.parse(readFileSync(configPath, 'utf-8'));
-    await gitFactory(config);
+    const path = options.path || './.proto.config.json';
+    if(path) gitFactory(path);
     return true;
 }
 

package/src/transform.ts

@@ -1,10 +1,10 @@
 import * as ts from 'typescript';
-import { gitFactory, GitImportOption } from './git.factory';
+import { gitConfigFactory, RepoConfig } from './git.factory';
 
 export interface GitImportPluginOptions {
     transform: string;
     type: string;
-    options: GitImportOption[];
+    options: RepoConfig[];
 }
 export enum GitImportStatus {
     Waiting = 'waiting',
@@ -20,7 +20,7 @@ export default function (program: ts.Program, { options }: GitImportPluginOption
     if (buildStatus.status === GitImportStatus.Waiting) {
         // console.log(111111, buildStatus, options);
         buildStatus.status = GitImportStatus.Pending;
-        gitFactory(options).then(() => {
+        gitConfigFactory(options).then(() => {
             buildStatus.status = GitImportStatus.Success;
         }).catch(() => {
             buildStatus.status = GitImportStatus.Failed;