crabatool 1.0.819 → 1.0.828

package/index.js

@@ -4,6 +4,7 @@ var autoUpdate = require('./tool/autoUpdate.js');
 var processManager = require('./tool/processManager.js');
 var path = require('path');
 var utils = require('./lib/utils.js');
+const upgrade = require('./tool/upgrade.js');
 
 exports = module.exports;
 exports.config = config;
@@ -161,7 +162,7 @@ async function checkFast(args) {
   if (args.includes('-update')) {
     start.bindAndCheckConfig('-webPath');
     start.checkCraba();
-    require('./tool/upgrade.js').updateCraba();
+    upgrade.updateCraba();
     return false;
   }
 
@@ -179,12 +180,12 @@ async function checkFast(args) {
     start.bindAndCheckConfig('-webPath');
     start.checkCraba();
     console.log('分支名:', config.branchName, config.webPath);
-    require('./tool/upgrade.js').checkUpdateCraba();
+    upgrade.checkUpdateCraba();
     return false;
   }
 
   if (args.includes('-v')) {
-    var data = require('./tool/upgrade.js').getNewVersion();
+    var data = upgrade.getNewVersion();
     console.log(data);
     return false;
   }

package/lib/utils.js

@@ -9,8 +9,10 @@ var compressing = require('compressing');
 var axios = require('axios');
 var os = require('os');
 const { execSync } = require('child_process');
+/*
 const util = require('util');
 const execPromise = util.promisify(execSync);
+*/
 
 if (!String.prototype.replaceAll) {
   String.prototype.replaceAll = function(search, replacement) {
@@ -1236,13 +1238,33 @@ class Utils {
   /**
  * 在指定目录执行命令
  */
-  async executeCommand(command, repoPath = config.webPath, timeout = 30000) {
-    this._log(`执行: ${command}`);
+  executeCommand(command) {
+    console.log(`执行: ${command}`);
 
+    var webPath = config.webPath || config.targetPath || config.skinPath;
+    console.log('执行命令路径:' + webPath);
+
+    try {
+      var msg = execSync(command, { cwd: webPath });
+      console.log(msg);
+      return {
+        success: true,
+        msg: String(msg).trim()
+      };
+    }
+    catch (ex) {
+      console.log(ex);
+      return {
+        success: false,
+        msg: String(ex.message).trim()
+      };
+    }
+
+    /*
     try {
       const { stdout, stderr } = await execPromise(command, {
-        cwd: repoPath,
-        timeout,
+        cwd: webPath,
+        300000,
         maxBuffer: 10 * 1024 * 1024,
         encoding: 'utf-8'
       });
@@ -1256,6 +1278,7 @@ class Utils {
         error: error.message
       };
     }
+    */
   }
 }
 var utils = new Utils();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.819",
+  "version": "1.0.828",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/merge/mergeTool.js

@@ -93,13 +93,19 @@ function buildFolder(options) {
     if (config.exp) {
       var list = config.exp.split(';');
       list.forEach(function(item) {
+        if (!item) return;
         var arr = item.split('=');
-        var key = arr[0].trim();
+        var key = (arr[0] || '').trim();
+        if (!key) return;
+
         var value;
         if (key == '$versionDate$') {
           value = new Date().toString('yyyyMMddhh');
-        } else {
+        } else if (arr.length > 1 && arr[1] != null) {
           value = arr[1].trim();
+        } else {
+          utils.log('exp变量格式不正确，已忽略:' + item);
+          return;
         }
         content = content.replaceAll(key, value);
 
@@ -280,4 +286,4 @@ function copyByteToCache(filePath, content, stats, options) {
   utils.debug("拷贝到缓存:" + cachePath);
   fs.writeFileSync(cachePath, content, 'utf8');
   fs.utimesSync(cachePath, stats.atime, stats.mtime); // 必须同步文件时间
-}
+}

package/tool/upgrade.js

@@ -58,50 +58,35 @@ class Upgrade {
     return { version: version, date: vDate };
   }
 
-  async checkUpdateCraba() {
-    var result = await this.checkGitPermission();
-    if (!result) {
-      console.log('没有git推送权限，取消craba的更新操作');
-      return;
-    }
-    
-    console.log('当前git有推送权限,开始检查更新craba');
-
-    this.checkUpdateCrabaNext();
-  }
-
-  async checkGitPermission() {
+  checkGitPermission() {
     //git commit --allow-empty -m "测试空提交"
     console.log('检查当前git是否有推送权限');
 
+    var branchName = config.branchName || config.version;
+    branchName = branchName.replace('origin/', '');
+
+    utils.executeCommand(`git fetch origin && git merge origin/${branchName} --no-edit`);
+
     console.log('🚀 创建空白提交...');
-    const commitResult = await utils.executeCommand(
+    const commitResult = utils.executeCommand(
       'git commit --allow-empty -m "[检测推送权限测试提交] 空白提交，无需关注" --no-verify'
     );
-
     if (!commitResult.success) {
-      console.log(`创建测试提交失败: ${commitResult.stderr}`);
+      console.log(`创建测试提交失败: ${commitResult.msg}`);
       return false;
     }
 
-    var branchName = config.branchName || config.version;
-    branchName = branchName.replace('origin/', '');
 
-    var gitCmd = `git push origin ${branchName}`;
+    var gitCmd = `git push origin ${branchName} --force`;
     console.log('🚀 执行推送测试是否有权限...');
-    console.log(gitCmd);
-
-    const pushResult = await utils.executeCommand(
-      gitCmd,
-      60000 // 推送可能需要更长时间
-    );
+    const pushResult = utils.executeCommand(gitCmd);
 
     if (!pushResult.success) {
-      console.log(`没有推送权限: ${pushResult.stderr}`);
+      console.log(`没有推送权限: ${pushResult.msg}`);
       return false;
     }
 
-    if (this.classifyError(pushResult.stderr || pushResult.message, pushResult.code)) {
+    if (this.classifyError(pushResult.msg)) {
       return false;
     }
 
@@ -111,9 +96,9 @@ class Upgrade {
   /**
     * 错误分类
     */
-  classifyError(stderr, code) {
-    if (!stderr) return false;
-    const err = stderr.toLowerCase();
+  classifyError(msg) {
+    if (!msg) return false;
+    const err = msg.toLowerCase();
     if (err.includes('permission denied') || err.includes('not allowed')) {
       return 'PERMISSION_DENIED';
     }
@@ -129,10 +114,10 @@ class Upgrade {
     if (err.includes('cannot lock ref') || err.includes('would be overwritten')) {
       return 'CONFLICT_ERROR';
     }
-    if (code === 128 || err.includes('fatal:')) {
+    if (err.includes('fatal:')) {
       return 'GIT_FATAL_ERROR';
     }
-    if (err.includes('timeout') || code === 124) {
+    if (err.includes('timeout')) {
       return 'TIMEOUT_ERROR';
     }
 
@@ -140,7 +125,7 @@ class Upgrade {
   }
 
 
-  checkUpdateCrabaNext() {
+  checkUpdateCraba() {
     var host = config.SourceHost;
     var version = config.version; // 默认临时目录下
     var host = config.host || config.SourceHost;
@@ -170,7 +155,7 @@ class Upgrade {
       if (data.success && data.remark && data.remark.length > 0) {
         //console.log(data.remark);
         that.gitLogs = data.remark; // 先记录日志列表
-        that.updateCraba(); // 需要更新平台
+        that.updateCraba(null, true); // 需要更新平台
       } else {
         console.log('没有检测到更新标记，无需更新平台资源');
       }
@@ -208,9 +193,18 @@ class Upgrade {
     });
   }
 
-  updateCraba(cb) {
+  updateCraba(cb, check) {
     utils.cleardirsSync(config.SaveFilePath);
 
+    if (check) {
+      var result = this.checkGitPermission();
+      if (!result) {
+        console.log('-------------当前git没有推送权限，取消craba的更新操作----------');
+        return;
+      }
+      console.log('当前git有推送权限,开始下载并更新craba');
+    }
+
     this.cb = cb;
     this.projectPath = config.webPath;