zen-gitsync 1.4.0 → 1.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "1.4.0",
+  "version": "1.5.2",
   "description": "一个 git 自动查看差异并提交的工具",
   "main": "index.js",
   "type": "module",
@@ -32,7 +32,10 @@
     "type": "git",
     "url": "git+https://github.com/xz333221/zen-gitsync.git"
   },
-  "keywords": ["gitsync", "git"],
+  "keywords": [
+    "gitsync",
+    "git"
+  ],
   "author": "",
   "license": "MIT",
   "bugs": {
@@ -43,6 +46,8 @@
     "boxen": "^8.0.1",
     "chalk": "^5.4.1",
     "cli-table3": "^0.6.5",
+    "date-fns": "^4.1.0",
+    "log-update": "^6.1.0",
     "ora": "^8.1.1",
     "string-width": "^7.2.0"
   }

package/src/config.js

@@ -1,6 +1,7 @@
 import { promises as fs } from 'fs';
 import path from 'path';
 import os from 'os';
+import chalk from 'chalk';
 
 const configPath = path.join(os.homedir(), '.git-commit-tool.json');
 
@@ -23,8 +24,27 @@ async function loadConfig() {
 async function saveConfig(config) {
   await fs.writeFile(configPath, JSON.stringify(config, null, 2), 'utf-8');
 }
+// 添加配置管理函数
+async function handleConfigCommands() {
+  if (process.argv.includes('get-config')) {
+    const currentConfig = await loadConfig();
+    console.log('Current configuration:');
+    console.log(currentConfig);
+    process.exit();
+  }
 
+  const setMsgArg = process.argv.find(arg => arg.startsWith('--set-default-message='));
+  if (setMsgArg) {
+    const newMessage = setMsgArg.split('=')[1];
+    const currentConfig = await loadConfig();
+    currentConfig.defaultCommitMessage = newMessage;
+    await saveConfig(currentConfig);
+    console.log(chalk.green(`✓ 默认提交信息已设置为: "${newMessage}"`));
+    process.exit();
+  }
+}
 export default {
   loadConfig,
-  saveConfig
+  saveConfig,
+  handleConfigCommands
 };

package/src/gitCommit.js

@@ -1,427 +1,241 @@
 #!/usr/bin/env node
-
-import {exec, execSync} from 'child_process'
-import os from 'os'
-import {coloredLog, errorLog} from './utils/index.js';
+import {
+  coloredLog, errorLog, execGitCommand, execSyncGitCommand, showHelp,
+  getCwd, judgePlatform, judgeLog, judgeHelp, exec_exit, judgeUnmerged, formatDuration,
+  exec_push, execPull, judgeRemote, execDiff, execAddAndCommit, delay
+} from './utils/index.js';
 import readline from 'readline'
 import ora from 'ora';
 import chalk from 'chalk';
 import boxen from 'boxen';
 import config from './config.js';
-const { loadConfig, saveConfig } = config;
-const {defaultCommitMessage} = config
-
-let timer = null
-const showHelp = () => {
-  const helpMessage = `
-Usage: g [options]
+import dateFormat from 'date-fns/format';
+import logUpdate from 'log-update';
 
-Options:
-  -h, --help                   Show this help message
-  --set-default-message=<msg>  Set default commit message
-  get-config                   Show current configuration
-  -y                           Auto commit with default message
-  -m <message>                 Commit message (use quotes if message contains spaces)
-  -m=<message>                 Commit message (use this form without spaces around '=')
-  --path=<path>                Set custom working directory
-  --cwd=<path>                 Set custom working directory
-  --interval=<seconds>         Set interval time for automatic commits (in seconds)
-  log                          Show git commit logs
-    --n=<number>               Number of commits to show with --log
-  --no-diff                    Skip displaying git diff
+let countdownInterval = null;
 
-Example:
-  g -m "Initial commit"      Commit with a custom message
-  g -m=Fix-bug               Commit with a custom message (no spaces around '=')
-  g -y                       Auto commit with the default message
-  g -y --interval=600        Commit every 10 minutes (600 seconds)
-  g --path=/path/to/repo     Specify a custom working directory
-  g log                      Show recent commit logs
-  g log --n=5                Show the last 5 commits with --log
+function startCountdown(interval) {
+  let remaining = interval;
 
-Add auto submit in package.json:
-  "scripts": {
-    "g:y": "g -y"
+  // 清除旧的倒计时
+  if (countdownInterval) {
+    clearInterval(countdownInterval);
   }
 
-Start a background process for automatic commits:
-  start /min cmd /k "g -y --path=your-folder --interval"
-  `;
+  const render = () => {
+    const nextTime = Date.now() + remaining;
+    const formattedTime = dateFormat(nextTime, 'yyyy-MM-dd HH:mm:ss');
+    const duration = formatDuration(remaining);
 
-  console.log(helpMessage);
-  process.exit();
-};
-// 添加配置管理函数
-async function handleConfigCommands() {
-  if (process.argv.includes('get-config')) {
-    const currentConfig = await loadConfig();
-    console.log('Current configuration:');
-    console.log(currentConfig);
-    process.exit();
-  }
+    const message = [
+      chalk.green.bold('🕒 倒计时'),
+      chalk.cyan(`下次提交: ${formattedTime}`),
+      chalk.yellow(`剩余时间: ${duration}`),
+      chalk.dim('按 Ctrl+C 终止进程')
+    ].join('\n');
 
-  const setMsgArg = process.argv.find(arg => arg.startsWith('--set-default-message='));
-  if (setMsgArg) {
-    const newMessage = setMsgArg.split('=')[1];
-    const currentConfig = await loadConfig();
-    currentConfig.defaultCommitMessage = newMessage;
-    await saveConfig(currentConfig);
-    console.log(chalk.green(`✓ 默认提交信息已设置为: "${newMessage}"`));
-    process.exit();
-  }
-}
-const judgePlatform = () => {
-  // 判断是否是 Windows 系统
-  if (os.platform() === 'win32') {
-    try {
-      // 设置终端字符编码为 UTF-8
-      execSync('chcp 65001');
-    } catch (e) {
-      console.error('设置字符编码失败:', e.message);
-    }
-  }
-};
-const getCwd = () => {
-  const cwdArg = process.argv.find(arg => arg.startsWith('--path')) || process.argv.find(arg => arg.startsWith('--cwd'));
-  if (cwdArg) {
-    // console.log(`cwdArg ==> `, cwdArg)
-    const [, value] = cwdArg.split('=')
-    // console.log(`value ==> `, value)
-    return value || process.cwd()
-  }
-  return process.cwd()
-}
-
-class GitCommit {
-  constructor(options) {
-    this.statusOutput = null
-    this.exit = options.exit
-    // 从配置加载默认提交信息
-    loadConfig().then(config => {
-      this.commitMessage = config.defaultCommitMessage;
-      this.init();
+    const box = boxen(message, {
+      padding: 1,
+      margin: 1,
+      borderColor: 'cyan',
+      borderStyle: 'round'
     });
-  }
 
-  exec_exit() {
-    if (this.exit) {
-      process.exit()
-    }
-  }
-
-  judgeLog() {
-    const logArg = process.argv.find(arg => arg === 'log');
-    if (logArg) {
-      this.printGitLog(); // 如果有 log 参数，打印 Git 提交记录
-      return true;
-    }
-  }
+    setTimeout(() => {
+      logUpdate(box);
+    }, 200);
+    // logUpdate(box);
+  };
 
-  judgeHelp() {
-    if (process.argv.includes('-h') || process.argv.includes('--help')) {
-      showHelp();
-      return true;
-    }
-  }
+  // 立即渲染一次
+  render();
 
-  execDiff() {
-    const no_diff = process.argv.find(arg => arg.startsWith('--no-diff'))
-    if (!no_diff) {
-      this.execSyncGitCommand('git diff --color=always', {
-        head: `git diff`
-      })
-    }
-  }
+  // 每秒更新
+  countdownInterval = setInterval(() => {
+    remaining -= 1000;
 
-  async execAddAndCommit() {
-    // 检查 -m 参数（提交信息）
-    const commitMessageArg = process.argv.find(arg => arg.startsWith('-m'));
-    if (commitMessageArg) {
-      if (commitMessageArg.includes('=')) {
-        // 处理 -m=<message> 的情况
-        this.commitMessage = commitMessageArg.split('=')[1]?.replace(/^['"]|['"]$/g, '') || defaultCommitMessage;
-      } else {
-        // 处理 -m <message> 的情况
-        const index = process.argv.indexOf(commitMessageArg);
-        if (index !== -1 && process.argv[index + 1]) {
-          this.commitMessage = process.argv[index + 1]?.replace(/^['"]|['"]$/g, '') || defaultCommitMessage;
-        }
-      }
+    if (remaining <= 0) {
+      clearInterval(countdownInterval);
+      logUpdate.clear();
+      return;
     }
 
-    // 检查命令行参数，判断是否有 -y 参数
-    const autoCommit = process.argv.includes('-y');
-
-    if (!autoCommit && !commitMessageArg) {
-      // 如果没有 -y 参数，则等待用户输入提交信息
-      const rl = readline.createInterface({
-        input: process.stdin,
-        output: process.stdout
-      })
-
-      function rlPromisify(fn) {
-        return async (...args) => {
-          return new Promise((resolve, reject) => fn(...args, resolve, reject))
-        }
-      }
+    render();
+  }, 1000);
+}
 
-      const question = rlPromisify(rl.question.bind(rl))
-      this.commitMessage = await question('请输入提交信息：');
-    }
+const {loadConfig, saveConfig, handleConfigCommands} = config;
+const {defaultCommitMessage} = config
 
-    this.statusOutput.includes('(use "git add') && this.execSyncGitCommand('git add .')
+let timer = null
 
-    // 执行 git commit
-    if (this.statusOutput.includes('Untracked files:') || this.statusOutput.includes('Changes not staged for commit') || this.statusOutput.includes('Changes to be committed')) {
-      this.execSyncGitCommand(`git commit -m "${this.commitMessage || defaultCommitMessage}"`)
-    }
-  }
+async function createGitCommit(options) {
+  // console.log(`自动提交流程开始=====================>`)
+  try {
+    let statusOutput = null
+    let exit = options ? !!options.exit : true
+    const config = await loadConfig()
+    let commitMessage = config.defaultCommitMessage
+    let {stdout} = await execGitCommand('git status')
+    statusOutput = stdout
+    judgeUnmerged(statusOutput)
+    // 先检查本地是否有未提交的更改
+    const hasLocalChanges = !statusOutput.includes('nothing to commit, working tree clean');
+    if (hasLocalChanges) {
+      // 检查是否有 --no-diff 参数
+      await execDiff()
+      await execAddAndCommit({statusOutput, commitMessage, exit})
+      statusOutput.includes('use "git pull') && await execPull()
 
-  async judgeRemote() {
-    try {
-      const spinner = ora('正在检查远程更新...').start();
       // 检查是否有远程更新
-      // 先获取远程最新状态
-      await this.execGitCommand('git remote update', {
-        head: 'Fetching remote updates',
-        log: false
-      });
-      // 检查是否需要 pull
-      const res = await this.execGitCommand('git rev-list HEAD..@{u} --count', {
-        head: 'Checking if behind remote',
-        log: false
-      });
-      const behindCount = res.stdout.trim()
-      // 如果本地落后于远程
-      if (parseInt(behindCount) > 0) {
-        try {
-          spinner.stop();
-          // const spinner_pull = ora('发现远程更新，正在拉取...').start();
-          await this.execPull()
-
-          // // 尝试使用 --ff-only 拉取更新
-          // const res = await this.execGitCommand('git pull --ff-only', {
-          //   spinner: spinner_pull,
-          //   head: 'Pulling updates'
-          // });
-          console.log(chalk.green('✓ 已成功同步远程更新'));
-        } catch (pullError) {
-          // // 如果 --ff-only 拉取失败，尝试普通的 git pull
-          // console.log(chalk.yellow('⚠️ 无法快进合并，尝试普通合并...'));
-          // await this.execPull()
-          throw new Error(pullError)
-        }
+      await judgeRemote()  // 等待 judgeRemote 完成
+
+      await exec_push({exit, commitMessage})
+    } else {
+      if (statusOutput.includes('use "git push')) {
+        await exec_push({exit, commitMessage})
+      } else if (statusOutput.includes('use "git pull')) {
+        await execPull()
       } else {
-        spinner.stop();
-        console.log(chalk.green('✓ 本地已是最新'));
+        await judgeRemote()  // 等待 judgeRemote 完成
+        exec_exit(exit);
       }
-    } catch (e) {
-      // console.log(`e ==> `, e)
-      spinner.stop();
-      throw new Error(e)
-    }
-  }
-
-  async execPull() {
-    try {
-      // 检查是否需要拉取更新
-      const spinner = ora('正在拉取代码...').start();
-      await this.execGitCommand('git pull', {
-        spinner
-      })
-    } catch (e) {
-      console.log(chalk.yellow('⚠️ 拉取远程更新合并失败，可能存在冲突，请手动处理'));
-      throw Error(e)
     }
+  } catch (e) {
+    console.error(chalk.red.bold('提交流程错误:'));
+    console.error(chalk.dim(e.stack)); // 打印完整错误堆栈
+    throw e; // 继续向上抛出错误
   }
+}
+async function main() {
+  judgePlatform()
 
-  async init() {
-    try {
-      judgePlatform()
+  // 检查是否有 log 参数
+  judgeLog()
 
-      // 检查是否有 log 参数
-      if (this.judgeLog()) return
+  // 检查帮助参数
+  judgeHelp()
 
-      // 检查帮助参数
-      if (this.judgeHelp()) return
+  await handleConfigCommands();
 
-      this.statusOutput = this.execSyncGitCommand('git status')
-      const hasUnmerged = this.statusOutput.includes('You have unmerged paths');
-      if (hasUnmerged) {
-        errorLog('错误', '存在未合并的文件，请先解决冲突')
-        process.exit(1);
-      }
-      // 先检查本地是否有未提交的更改
-      const hasLocalChanges = !this.statusOutput.includes('nothing to commit, working tree clean');
-      if (hasLocalChanges) {
-        // 检查是否有 --no-diff 参数
-        this.execDiff()
+  judgeInterval();
+}
 
-        await this.execAddAndCommit()
+const showStartInfo = (interval) => {
+  const cwd = getCwd();
+  const intervalSeconds = interval / 1000;
+  const startTime = new Date().toLocaleString();
 
-        this.statusOutput.includes('use "git pull') && await this.execPull()
+  const head = `⏰ 定时提交任务已启动`;
 
-        // 检查是否有远程更新
-        await this.judgeRemote()  // 等待 judgeRemote 完成
+  const message = chalk.green.bold([
+    `开始时间: ${chalk.yellow(startTime)}`,
+    `工作目录: ${chalk.cyan(cwd)}`,
+    `提交间隔: ${chalk.magenta(formatDuration(interval))}`,
+  ].join("\n"));
 
-        this.exec_push()
-      } else {
-        if (this.statusOutput.includes('use "git push')) {
-          this.exec_push()
-        } else if (this.statusOutput.includes('use "git pull')) {
-          await this.execPull()
-        } else {
-          await this.judgeRemote()  // 等待 judgeRemote 完成
-          this.exec_exit();
-        }
-      }
-    } catch (e) {
-      // console.log(`e ==> `, e)
-      // console.log(`e.message ==> `, e.message)
-      // 应该提供更具体的错误信息
-      // console.error('Git operation failed:', e.message);
-      // 考虑不同错误类型的处理
-      if (e.message.includes('not a git repository')) {
-        errorLog('错误', '当前目录不是git仓库')
-      } else if (e.message.includes('Permission denied')) {
-        errorLog('错误', '权限不足，请检查git配置')
-      }
-      process.exit(1);
-    }
-  }
-
-  async printGitLog() {
-    let n = 20;
-    let logArg = process.argv.find(arg => arg.startsWith('--n='));
-    if (logArg) {
-      n = parseInt(logArg.split('=')[1], 10);
-    }
-    const logCommand = `git log -n ${n} --pretty=format:"%C(green)%h%C(reset) | %C(cyan)%an%C(reset) | %C(yellow)%ad%C(reset) | %C(blue)%D%C(reset) | %C(magenta)%s%C(reset)" --date=format:"%Y-%m-%d %H:%M" --graph --decorate --color`
-    try {
-      const logOutput = this.execSyncGitCommand(logCommand, {
-        head: `git log`
-      });
-      // // 格式化输出 Git 提交记录
-      // const box = boxen(chalk.green.bold(logOutput), {
-      //   borderStyle: 'round',
-      //   borderColor: 'cyan',
-      //   backgroundColor: 'black',
-      // });
-      // console.log(box); // 打印优雅的 Git 提交记录
-    } catch (error) {
-      console.error('无法获取 Git 提交记录:', error.message);
-    }
-    this.exec_exit(); // 打印完成后退出
+  coloredLog(head, message)
+  // console.log('\n'.repeat(6));
+}
+const commitAndSchedule = async (interval) => {
+  try {
+    await createGitCommit({exit: false});
+    // await delay(2000)
+    startCountdown(interval); // 启动倒计时
+
+    // 设置定时提交
+    timer = setTimeout(async () => {
+      await commitAndSchedule(interval);
+    }, interval + 100);
+  } catch (error) {
+    console.error('提交出错:', error.message);
+    clearTimeout(timer);
+    clearInterval(countdownInterval);
+    process.exit(1);
   }
+};
+const judgeInterval = async () => {
+  const intervalArg = process.argv.find(arg => arg.startsWith('--interval'));
+  if (intervalArg) {
+    let interval = parseInt(intervalArg.split('=')[1] || '3600', 10) * 1000;
 
-  exec_push() {
-    // 执行 git push
-    // this.execSyncGitCommand(`git push`);
-    const spinner = ora('正在推送代码...').start();
-    this.execGitCommand('git push', {
-      spinner
-    }, (error, stdout, stderr) => {
-
-      // 使用 boxen 绘制带边框的消息
-      let msg = ` SUCCESS: 提交完成 
- message: ${this.commitMessage || defaultCommitMessage} 
- time: ${new Date().toLocaleString()} `
-      const message = chalk.green.bold(msg);
-      const box = boxen(message, {
-        // borderStyle: 'round', // 方框的样式
-        // borderColor: 'whiteBright', // 边框颜色
-        // backgroundColor: 'black', // 背景颜色
-      });
-
-      console.log(box); // 打印带有边框的消息
-      // this.execSyncGitCommand(`git log -n 1 --pretty=format:"%B%n%h %d%n%ad" --date=iso`)
-      this.exec_exit();
-    })
-  }
+    showStartInfo(interval);
 
-  execSyncGitCommand(command, options = {}) {
-    let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, head = command, log = true} = options
     try {
-      let cwd = getCwd()
-      const output = execSync(command, {env: { ...process.env, LANG: 'C.UTF-8' },encoding, maxBuffer, cwd})
-      if (options.spinner) {
-        options.spinner.stop();
-      }
-      let result = output.trim()
-      log && coloredLog(head, result)
-      return result
-    } catch (e) {
-      // console.log(`执行命令出错 ==> `, command, e)
-      log && coloredLog(command, e, 'error')
-      throw new Error(e)
-    }
-  }
-
-  execGitCommand(command, options = {}, callback) {
-    return new Promise((resolve, reject) => {
-      let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, head = command, log = true} = options
-      let cwd = getCwd()
-      exec(command, {env: { ...process.env, LANG: 'C.UTF-8' },encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
-        if (options.spinner) {
-          options.spinner.stop();
-        }
-        if (error) {
-          log && coloredLog(head, error, 'error')
-          reject(error)
-          return
-        }
-        if (stdout) {
-          log && coloredLog(head, stdout)
-        }
-        if (stderr) {
-          log && coloredLog(head, stderr)
-        }
-        resolve({
-          stdout,
-          stderr
-        })
-        callback && callback(error, stdout, stderr)
-      })
-    })
-  }
-}
-// 在 judgeInterval 函数前添加配置命令处理
-async function main() {
-  await handleConfigCommands();
-  judgeInterval();
-}
-const judgeInterval = () => {
-  // 判断是否有 --interval 参数
-  const intervalArg = process.argv.find(arg => arg.startsWith('--interval'));
-  if (intervalArg) {
-    // console.log(`intervalArg ==> `, intervalArg)
-    let interval = intervalArg.split('=')[1] || 60 * 60; // 默认间隔为1小时
-    // console.log(`interval ==> `, interval)
-    interval = parseInt(interval, 10) * 1000; // 将间隔时间转换为毫秒
-    // console.log(`interval ==> `, interval)
-    if (isNaN(interval)) {
-      console.log('无效的间隔时间，请使用 --interval=秒数');
+      await commitAndSchedule(interval);
+    } catch (error) {
+      console.error(chalk.red.bold('定时提交致命错误:'), error.message);
       process.exit(1);
     }
-    if (timer) {
-      console.log(`清空定时器`)
-      clearInterval(timer);
-      timer = null;
-    }
-    new GitCommit({
-      exit: false
-    })
-    timer = setInterval(() => {
-      // console.log(`定时执行`)
-      new GitCommit({
-        exit: false
-      })
-    }, interval)
+
+    // 处理退出清理
+    process.on('SIGINT', () => {
+      logUpdate.clear();
+      clearTimeout(timer);
+      clearInterval(countdownInterval);
+      console.log(chalk.yellow('\n🛑 定时任务已终止'));
+      process.exit();
+    });
   } else {
-    new GitCommit({
-      exit: true
-    })
+    createGitCommit({exit: false});
   }
 };
+// const judgeInterval = async () => {
+//   // 判断是否有 --interval 参数
+//   const intervalArg = process.argv.find(arg => arg.startsWith('--interval'));
+//   if (intervalArg) {
+//     // // console.log(`intervalArg ==> `, intervalArg)
+//     // let interval = intervalArg.split('=')[1] || 60 * 60; // 默认间隔为1小时
+//     // // console.log(`interval ==> `, interval)
+//     // interval = parseInt(interval, 10) * 1000; // 将间隔时间转换为毫秒
+//     // // console.log(`interval ==> `, interval)
+//     // if (isNaN(interval)) {
+//     //   console.log('无效的间隔时间，请使用 --interval=秒数');
+//     //   process.exit(1);
+//     // }
+//     // if (timer) {
+//     //   console.log(`清空定时器`)
+//     //   clearInterval(timer);
+//     //   timer = null;
+//     // }
+//     // showStartInfo(interval);
+//     // await createGitCommit({exit: false})
+//     //
+//     // timer = setInterval(() => {
+//     //   // console.log(`定时执行`)
+//     //   createGitCommit({exit: false})
+//     // }, interval)
+//
+//     let interval = parseInt(intervalArg.split('=')[1] || '3600', 10) * 1000;
+//     // const showUpdates = () => {
+//     //   showNextCommitTime(interval);
+//     //   // 每小时更新一次时间显示
+//     //   timer = setTimeout(() => {
+//     //     showUpdates();
+//     //   }, 20000); // 每小时更新一次
+//     // };
+//
+//     const commitAndSchedule = async (interval) => {
+//       try {
+//         await createGitCommit({exit: false});
+//         startCountdown(interval); // 启动倒计时
+//
+//         // 设置定时提交
+//         timer = setTimeout(async () => {
+//           await commitAndSchedule(interval);
+//         }, interval);
+//       } catch (error) {
+//         console.error('提交出错:', error.message);
+//       }
+//     };
+//
+//     await commitAndSchedule();
+//
+//     // 设置定时提交
+//     timer = setInterval(commitAndSchedule, interval);
+//   } else {
+//     createGitCommit({exit: false})
+//   }
+// };
 
 main()

package/src/utils/index.js

@@ -18,6 +18,12 @@ import stringWidth from 'string-width';
 import Table from 'cli-table3';
 import chalk from 'chalk';
 import boxen from "boxen";
+import {exec, execSync} from 'child_process'
+import os from 'os'
+import ora from "ora";
+import readline from 'readline'
+import path from 'path'
+
 
 const printTableWithHeaderUnderline = (head, content, style) => {
   // 获取终端的列数（宽度）
@@ -43,6 +49,14 @@ const printTableWithHeaderUnderline = (head, content, style) => {
     style: style,
     wordWrap: true,  // 启用自动换行
     // chars: {
+    //   'top': '─',
+    //   'top-mid': '┬',
+    //   'bottom': '─',
+    //   'mid': '─',
+    //   'left': '│',
+    //   'right': '│'
+    // },
+    // chars: {
     //   'top': '═',       // 顶部边框使用长横线
     //   'top-mid': '╤',   // 顶部连接符
     //   'top-left': '╔',   // 左上角
@@ -94,6 +108,7 @@ function getRandomColor() {
 function resetColor() {
   return '\x1b[0m';
 }
+
 const calcColor = (commandLine, str) => {
   let color = 'reset'
   switch (commandLine) {
@@ -159,6 +174,9 @@ const coloredLog = (...args) => {
   const commandLine = args[0];
   const content = args[1];
   const type = args[2] || 'common';
+  // console.log(`commandLine ==> `, commandLine)
+  // console.log(`content ==> `, content)
+  // console.log(`type ==> `, type)
   tableLog(commandLine, content, type);
 }
 const errorLog = (commandLine, content) => {
@@ -169,4 +187,410 @@ const errorLog = (commandLine, content) => {
   const box = boxen(message);
   console.log(box); // 打印带有边框的消息
 }
-export {coloredLog, errorLog};
+
+function execSyncGitCommand(command, options = {}) {
+  let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, head = command, log = true} = options
+  try {
+    let cwd = getCwd()
+    const output = execSync(command, {
+      env: {
+        ...process.env,
+        // LANG: 'en_US.UTF-8',    // Linux/macOS
+        // LC_ALL: 'en_US.UTF-8',  // Linux/macOS
+        GIT_CONFIG_PARAMETERS: "'core.quotepath=false'" // 关闭路径转义
+      }, encoding, maxBuffer, cwd
+    })
+    if (options.spinner) {
+      options.spinner.stop();
+    }
+    let result = output.trim()
+    log && coloredLog(head, result)
+    return result
+  } catch (e) {
+    // console.log(`执行命令出错 ==> `, command, e)
+    log && coloredLog(command, e, 'error')
+    throw new Error(e)
+  }
+}
+
+function execGitCommand(command, options = {}) {
+  return new Promise((resolve, reject) => {
+    let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, head = command, log = true} = options
+    let cwd = getCwd()
+
+    // setTimeout(() => {
+    exec(command, {
+      env: {
+        ...process.env,
+        // LANG: 'en_US.UTF-8',    // Linux/macOS
+        // LC_ALL: 'en_US.UTF-8',  // Linux/macOS
+        GIT_CONFIG_PARAMETERS: "'core.quotepath=false'" // 关闭路径转义
+      },
+      encoding,
+      maxBuffer,
+      cwd
+    }, (error, stdout, stderr) => {
+      if (options.spinner) {
+        options.spinner.stop();
+      }
+
+      if (stdout) {
+        log && coloredLog(head, stdout)
+      }
+      if (stderr) {
+        log && coloredLog(head, stderr)
+      }
+      if (error) {
+        log && coloredLog(head, error, 'error')
+        reject(error)
+        return
+      }
+      resolve({
+        stdout,
+        stderr
+      })
+    })
+    // }, 1000)
+
+  })
+}
+
+const getCwd = () => {
+  const cwdArg = process.argv.find(arg => arg.startsWith('--path')) || process.argv.find(arg => arg.startsWith('--cwd'));
+  if (cwdArg) {
+    // console.log(`cwdArg ==> `, cwdArg)
+    const [, value] = cwdArg.split('=')
+    // console.log(`value ==> `, value)
+    return value || process.cwd()
+  }
+  return process.cwd()
+}
+const judgePlatform = () => {
+  // 判断是否是 Windows 系统
+  if (os.platform() === 'win32') {
+    try {
+      // 设置终端字符编码为 UTF-8
+      execSync('chcp 65001');
+    } catch (e) {
+      console.error('设置字符编码失败:', e.message);
+    }
+  }
+};
+const showHelp = () => {
+  const helpMessage = `
+Usage: g [options]
+
+Options:
+  -h, --help                   Show this help message
+  --set-default-message=<msg>  Set default commit message
+  get-config                   Show current configuration
+  -y                           Auto commit with default message
+  -m <message>                 Commit message (use quotes if message contains spaces)
+  -m=<message>                 Commit message (use this form without spaces around '=')
+  --path=<path>                Set custom working directory
+  --cwd=<path>                 Set custom working directory
+  --interval=<seconds>         Set interval time for automatic commits (in seconds)
+  log                          Show git commit logs
+    --n=<number>               Number of commits to show with --log
+  --no-diff                    Skip displaying git diff
+
+Example:
+  g -m "Initial commit"      Commit with a custom message
+  g -m=Fix-bug               Commit with a custom message (no spaces around '=')
+  g -y                       Auto commit with the default message
+  g -y --interval=600        Commit every 10 minutes (600 seconds)
+  g --path=/path/to/repo     Specify a custom working directory
+  g log                      Show recent commit logs
+  g log --n=5                Show the last 5 commits with --log
+
+Add auto submit in package.json:
+  "scripts": {
+    "g:y": "g -y"
+  }
+
+Run in the background across platforms:
+  Windows:
+    start /min cmd /k "g -y --path=your-folder --interval=600"
+  
+  Linux/macOS:
+    nohup g -y --path=your-folder --interval=600 > git-autocommit.log 2>&1 &
+
+Stop all monitoring processes:
+  Windows: Terminate the Node.js process in the Task Manager.
+  Linux/macOS:
+    pkill -f "g -y"       # Terminate all auto-commit processes
+    ps aux | grep "g -y"  # Find the specific process ID
+    kill [PID]            # Terminate the specified process
+  `;
+
+  console.log(helpMessage);
+  process.exit();
+};
+
+function judgeLog() {
+  const logArg = process.argv.find(arg => arg === 'log');
+  if (logArg) {
+    printGitLog(); // 如果有 log 参数，打印 Git 提交记录
+    // 打印完成后退出
+    process.exit();
+  }
+}
+
+function judgeHelp() {
+  if (process.argv.includes('-h') || process.argv.includes('--help')) {
+    showHelp();
+  }
+}
+
+async function printGitLog() {
+  let n = 20;
+  let logArg = process.argv.find(arg => arg.startsWith('--n='));
+  if (logArg) {
+    n = parseInt(logArg.split('=')[1], 10);
+  }
+  const logCommand = `git log -n ${n} --pretty=format:"%C(green)%h%C(reset) | %C(cyan)%an%C(reset) | %C(yellow)%ad%C(reset) | %C(blue)%D%C(reset) | %C(magenta)%s%C(reset)" --date=format:"%Y-%m-%d %H:%M" --graph --decorate --color`
+  try {
+    const logOutput = execSyncGitCommand(logCommand, {
+      head: `git log`
+    });
+  } catch (error) {
+    console.error('无法获取 Git 提交记录:', error.message);
+  }
+  // 打印完成后退出
+  process.exit();
+}
+
+function exec_exit(exit) {
+  if (exit) {
+    process.exit()
+  }
+}
+
+function judgeUnmerged(statusOutput) {
+  const hasUnmerged = statusOutput.includes('You have unmerged paths');
+  if (hasUnmerged) {
+    errorLog('错误', '存在未合并的文件，请先解决冲突')
+    process.exit(1);
+  }
+}
+
+function exec_push({exit, commitMessage}) {
+  // 执行 git push
+  // execSyncGitCommand(`git push`);
+  return new Promise((resolve, reject) => {
+    const spinner = ora('正在推送代码...').start();
+    execGitCommand('git push', {
+      spinner
+    }).then(({stdout, stderr}) => {
+      printCommitLog({commitMessage})
+      resolve({stdout, stderr})
+    })
+  });
+}
+
+function printCommitLog({commitMessage}) {
+  try {
+    // 获取项目名称（取git仓库根目录名）
+    const projectRoot = execSyncGitCommand('git rev-parse --show-toplevel', {log: false});
+    const projectName = chalk.blueBright(path.basename(projectRoot.trim()));
+
+    // 获取当前提交hash（取前7位）
+    const commitHash = execSyncGitCommand('git rev-parse --short HEAD', {log: false}).trim();
+    const hashDisplay = chalk.yellow(commitHash);
+
+    // 获取分支信息
+    const branch = execSyncGitCommand('git branch --show-current', {log: false}).trim();
+    const branchDisplay = chalk.magenta(branch);
+
+    // 构建信息内容
+    const message = [
+      `${chalk.cyan.bold('Project:')} ${projectName}`,
+      `${chalk.cyan.bold('Commit:')} ${hashDisplay} ${chalk.dim('on')} ${branchDisplay}`,
+      `${chalk.cyan.bold('Message:')} ${chalk.reset(commitMessage)}`,
+      `${chalk.cyan.bold('Time:')} ${new Date().toLocaleString()}`
+    ].join('\n');
+
+    // 使用boxen创建装饰框
+    const box = boxen(message, {
+      padding: 1,
+      margin: 1,
+      borderStyle: 'round',
+      borderColor: 'green',
+      title: chalk.bold.green('✅ COMMIT SUCCESS'),
+      titleAlignment: 'center',
+      float: 'left',
+      textAlignment: 'left'
+    });
+
+    console.log(box);
+  } catch (error) {
+    // 异常处理
+    const errorBox = boxen(chalk.red(`Failed to get commit details: ${error.message}`), {
+      borderColor: 'red',
+      padding: 1
+    });
+    console.log(errorBox);
+  }
+}
+
+async function execPull() {
+  try {
+    // 检查是否需要拉取更新
+    const spinner = ora('正在拉取代码...').start();
+    await execGitCommand('git pull', {
+      spinner
+    })
+  } catch (e) {
+    console.log(chalk.yellow('⚠️ 拉取远程更新合并失败，可能存在冲突，请手动处理'));
+    throw Error(e)
+  }
+}
+
+function delay(timeout) {
+  return new Promise(resolve => setTimeout(resolve, timeout));
+}
+
+async function judgeRemote() {
+  const spinner = ora('正在检查远程更新...').start();
+  try {
+    // 检查是否有远程更新
+    // 先获取远程最新状态
+    await execGitCommand('git remote update', {
+      head: 'Fetching remote updates',
+      log: false
+    });
+    // 检查是否需要 pull
+    const res = await execGitCommand('git rev-list HEAD..@{u} --count', {
+      head: 'Checking if behind remote',
+      log: false
+    });
+    const behindCount = res.stdout.trim()
+    const { green, black, bgGreen, white } = chalk;
+    // 如果本地落后于远程
+    if (parseInt(behindCount) > 0) {
+      try {
+        spinner.stop();
+        // const spinner_pull = ora('发现远程更新，正在拉取...').start();
+        await execPull()
+
+        // // 尝试使用 --ff-only 拉取更新
+        // const res = await execGitCommand('git pull --ff-only', {
+        //   spinner: spinner_pull,
+        //   head: 'Pulling updates'
+        // });
+        // console.log(
+        //   bgGreen.white.bold(' SYNC ') +
+        //   green` ➔ ` +
+        //   chalk.blue.bold('远程仓库已同步') +
+        //   green(' ✔')
+        // );
+        const message = '已成功同步远程更新'.split('').map((char, i) =>
+          chalk.rgb(0, 255 - i*10, 0)(char)
+        ).join('');
+
+        console.log(chalk.bold(`✅ ${message}`));
+      } catch (pullError) {
+        // // 如果 --ff-only 拉取失败，尝试普通的 git pull
+        // console.log(chalk.yellow('⚠️ 无法快进合并，尝试普通合并...'));
+        // await this.execPull()
+        throw new Error(pullError)
+      }
+    } else {
+      spinner.stop();
+      const message = '本地已是最新'.split('').map((char, i) =>
+        chalk.rgb(0, 255 - i*10, 0)(char)
+      ).join('');
+      console.log(chalk.bold(`✅ ${message}`));
+    }
+  } catch (e) {
+    // console.log(`e ==> `, e)
+    spinner.stop();
+    throw new Error(e)
+  }
+}
+
+async function execDiff() {
+  const no_diff = process.argv.find(arg => arg.startsWith('--no-diff'))
+  if (!no_diff) {
+    await execGitCommand('git diff --color=always', {
+      head: `git diff`
+    })
+  }
+}
+
+async function execAddAndCommit({statusOutput, commitMessage, exit}) {
+  // 检查 -m 参数（提交信息）
+  const commitMessageArg = process.argv.find(arg => arg.startsWith('-m'));
+  if (commitMessageArg) {
+    if (commitMessageArg.includes('=')) {
+      // 处理 -m=<message> 的情况
+      commitMessage = commitMessageArg.split('=')[1]?.replace(/^['"]|['"]$/g, '');
+    } else {
+      // 处理 -m <message> 的情况
+      const index = process.argv.indexOf(commitMessageArg);
+      if (index !== -1 && process.argv[index + 1]) {
+        commitMessage = process.argv[index + 1]?.replace(/^['"]|['"]$/g, '');
+      }
+    }
+  }
+
+  // 检查命令行参数，判断是否有 -y 参数
+  const autoCommit = process.argv.includes('-y');
+
+  if (!autoCommit && !commitMessageArg) {
+    // 如果没有 -y 参数，则等待用户输入提交信息
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    })
+
+    function rlPromisify(fn) {
+      return async (...args) => {
+        return new Promise((resolve, reject) => fn(...args, resolve, reject))
+      }
+    }
+
+    const question = rlPromisify(rl.question.bind(rl))
+    commitMessage = await question('请输入提交信息：') || commitMessage;
+  }
+
+  statusOutput.includes('(use "git add') && await execGitCommand('git add .')
+  // 强制添加所有变更
+  // await execGitCommand('git add -A .');
+
+  // 提交前二次校验
+  const checkStatus = await execGitCommand('git status --porcelain', {log: false});
+  if (!checkStatus.stdout.trim()) {
+    console.log(chalk.yellow('⚠️ 没有检测到可提交的变更'));
+    // exec_exit(exit)
+    return;
+  }
+
+  // 执行 git commit
+  if (statusOutput.includes('Untracked files:') || statusOutput.includes('Changes not staged for commit') || statusOutput.includes('Changes to be committed')) {
+    await execGitCommand(`git commit -m "${commitMessage}"`)
+  }
+}
+
+// 添加时间格式化函数
+function formatDuration(ms) {
+  const totalSeconds = Math.floor(ms / 1000);
+  const days = Math.floor(totalSeconds / (3600 * 24));
+  const hours = Math.floor((totalSeconds % (3600 * 24)) / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  const seconds = totalSeconds % 60;
+
+  return [
+    days && `${days}天`,
+    hours && `${hours}小时`,
+    minutes && `${minutes}分`,
+    `${seconds}秒`
+  ].filter(Boolean).join('');
+}
+
+export {
+  coloredLog, errorLog, execSyncGitCommand,
+  execGitCommand, getCwd, judgePlatform, showHelp, judgeLog, printGitLog,
+  judgeHelp, exec_exit, judgeUnmerged, delay, formatDuration,
+  exec_push, execPull, judgeRemote, execDiff, execAddAndCommit
+};