crabatool 1.0.518 → 1.0.703

package/index.js

@@ -182,7 +182,11 @@ async function checkFast(args) {
     if (success) {
       console.log('更新完成！');
     } else {
-      console.log(`更新失败，请检查网络连接或手动执行：npm install crabatool --registry ${config.registry}`);
+      const utils = require('./lib/utils.js');
+      const installCmd = utils.isRunningGlobally()
+        ? `npm install -g crabatool --registry ${config.registry}`
+        : `npm install crabatool --registry ${config.registry}`;
+      console.log(`更新失败，请检查网络连接或手动执行：${installCmd}`);
     }
     process.exit(success ? 0 : 1);
     return false;
@@ -216,10 +220,14 @@ async function checkFast(args) {
 
   // crabatool -upload -host 接收地址 -webPath 平台源码根路径
   if (args.includes('-upload')) {
+    console.log('开始打包craba')
     start.bindAndCheckConfig('-targetPath');
     if (!require('./tool/compress.js').run()) {
+      console.log('打包异常，终止上传');
       return false;
     } // 打包压缩js和css
+
+    console.log('开始上传craba')
     require('./tool/crabapublish.js').upload();
     return false;
   }

package/lib/utils.js

@@ -8,6 +8,7 @@ var logErr = console.dir.bind(console);
 var compressing = require('compressing');
 var axios = require('axios');
 var os = require('os');
+const { execSync } = require('child_process');
 
 if (!String.prototype.replaceAll) {
   String.prototype.replaceAll = function(search, replacement) {
@@ -60,6 +61,25 @@ class Utils {
     this.cryptoKey = '$wssf20119@.Z+Q$';
   }
 
+  isRunningGlobally() {
+    try {
+      const currentScriptPath = path.resolve(process.argv[1]);
+      const globalNodeModules = execSync('npm root -g', { encoding: 'utf8' }).trim();
+      const normalizedGlobal = path.resolve(globalNodeModules);
+
+      return currentScriptPath.startsWith(normalizedGlobal);
+    } catch (e) {
+      // 备用方案：检查是否在PATH中
+      try {
+        const scriptDir = path.dirname(process.argv[1]);
+        const pathDirs = process.env.PATH.split(path.delimiter);
+        return pathDirs.some(dir => path.resolve(dir) === path.resolve(scriptDir));
+      } catch {
+        return false;
+      }
+    }
+  }
+
   removePathPrefix(fullPath, prefix) {
     // 规范化路径（统一分隔符为当前系统的分隔符）
     const normalizedFullPath = path.normalize(fullPath);
@@ -850,7 +870,6 @@ class Utils {
   // 获取当前 npm 版本（若未安装或异常则返回空字符串）
   getNpmVersion(cwd) {
     try {
-      const execSync = require('child_process').execSync;
       const out = execSync('npm -v', { cwd: cwd || process.cwd() });
       return String(out).trim();
     } catch (e) {
@@ -860,7 +879,6 @@ class Utils {
 
   // 获取 Git 用户信息（优先读取项目目录下的本地配置）
   getGitUser(cwd) {
-    const execSync = require('child_process').execSync;
     let name = '',
       email = '';
     try {
@@ -875,7 +893,7 @@ class Utils {
   // 获取当前 Git 分支名（优先使用 git 命令，失败则返回空）
   getCurrentBranch(cwd) {
     try {
-      const execSync = require('child_process').execSync;
+
       const out = execSync('git rev-parse --abbrev-ref HEAD', { cwd: cwd || process.cwd() });
       return String(out).trim();
     } catch (e) {
@@ -886,7 +904,6 @@ class Utils {
   // 获取远程仓库 URL（origin）
   getRemoteUrl(cwd) {
     try {
-      const execSync = require('child_process').execSync;
       const out = execSync('git config --get remote.origin.url', { cwd: cwd || process.cwd() });
       return String(out).trim();
     } catch (e) {
@@ -940,8 +957,6 @@ class Utils {
   }
 
   gitpush(msg) {
-    const execSync = require('child_process').execSync;
-
     var webPath = config.webPath || config.targetPath || config.skinPath;
     console.log('cd ' + webPath);
     //execSync('cd ' + webPath, { cwd: webPath }); // 必须切换到web路径，有些是在node_modules路径下
@@ -1130,6 +1145,7 @@ class Utils {
         crabaTool: {
           version: config.Version || 'unknown',
           startTime: new Date().toISOString(),
+          runningMode: this.isRunningGlobally() ? 'global' : 'local',
         },
         craba: {
           version: crabaLocal.version || '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.518",
+  "version": "1.0.703",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -11,7 +11,6 @@
     "shell-doc": "node ./test/test.js -convertJavadoc -targetPath F:/docs/shell -outPath F:/docs/shell.json",
     "jxc-doc": "node ./test/test.js -convertJavadoc -targetPath F:/docs/jxc -outPath F:/docs/jxc.json",
     "sale-doc": "node ./test/test.js -convertJavadoc -targetPath F:/docs/sale -outPath F:/docs/sale.json",
-    "ngp-parent-doc": "node ./test/test.js -convertJavadoc -targetPath F:/docs/ngp-parent -outPath F:/docs/ngp-parent.json -modName ngp-parent",
     "start": "node run.js",
     "test": "node ./test/test.js",
     "run": "node ./test/test.js -run -webPath F:/basicweb/www -refresh true",

package/tool/autoUpdate.js

@@ -1,9 +1,11 @@
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 const chalk = require('chalk');
 const path = require('path');
 const fs = require('fs');
 const ProgressBar = require('./progressbar.js');
 const config = require('../lib/config.js');
+const utils = require('../lib/utils.js');
+
 
 class AutoUpdate {
   constructor() {
@@ -301,7 +303,14 @@ class AutoUpdate {
   performUpdate(silent = false) {
     return new Promise((resolve) => {
       const command = 'npm';
-      const args = ['install', this.packageName, '--registry', this.registry];
+      const args = ['install'];
+      
+      // 根据运行环境决定是否使用全局安装
+      if (utils.isRunningGlobally()) {
+        args.push('-g');
+      }
+      
+      args.push(this.packageName, '--registry', this.registry);
       
       // 初始化进度条（非静默模式）
       if (!silent) {
@@ -342,7 +351,17 @@ class AutoUpdate {
           // 尝试获取版本信息
           let version = null;
           try {
-            const packageJsonPath = path.join(process.cwd(), 'node_modules', this.packageName, 'package.json');
+            let packageJsonPath;
+            
+            if (utils.isRunningGlobally()) {
+              // 全局安装：从全局 node_modules 获取
+              const globalNodeModules = execSync('npm root -g', { encoding: 'utf8' }).trim();
+              packageJsonPath = path.join(globalNodeModules, this.packageName, 'package.json');
+            } else {
+              // 本地安装：从当前目录 node_modules 获取
+              packageJsonPath = path.join(process.cwd(), 'node_modules', this.packageName, 'package.json');
+            }
+            
             if (fs.existsSync(packageJsonPath)) {
               const packageInfo = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
               version = packageInfo.version;

package/tool/compress.js

@@ -26,6 +26,7 @@ module.exports.run = function() {
     fs.unlinkSync(_zipName);
   }
 
+  console.log('版本号+1', _pkgPath);
   utils.addPackageVersion(_pkgPath); // 版本号+1
 
   // 版本号发生改变， 推送git仓库
@@ -69,7 +70,8 @@ function checkJsOk() {
 
 function checkJsHasZ(jsName) {
   var crabaJs = path.join(_tempJsPath, jsName);
-  var contentJs = fs.readFileSync(crabaJs);
+  var contentJs = fs.readFileSync(crabaJs).toString();
+  console.log('检查压缩后的js里面是否有黑名单替换', crabaJs);
   if (contentJs.indexOf('_Z_') < 0) {
     var tips = '发版警告！！！upload craba失败！！！' + jsName + '文件的黑名单类名(_Z_)替换失败，终止打包和上传任务；请重试打包。';
     utils.postWeebhooks(tips);
@@ -167,6 +169,7 @@ function doCompress() {
 }
 
 function compressCrabaJs(inNames, outName, onEnd) {
+  console.log('打包压缩文件', outName);
   inNames = inNames.map((s) => {
     return path.join(_jsPath, s);
   });

package/tool/crabapublish.js

@@ -13,7 +13,7 @@ var _pkgPath = path.join(_jsPath, 'package.json');
 var pkg = utils.readPackage(_pkgPath);
 
 module.exports.upload = function() {
-  console.log('开始打包zip和上传');
+  console.log('开始打包zip和上传资源');
   doUploadPkg(config.version, _pkgPath, doZipCraba); // 先上传package版本信息文件，然后上传craba.zip资源包，再然后调用自动化测试
 }
 
@@ -27,6 +27,7 @@ function doUploadPkg(version, pkgPath, cb) {
   formData.append('my_file', fs.createReadStream(pkgPath));
   var headers = formData.getHeaders();
 
+  console.log('上传版本管理文件', pkgPath)
   axios({
     method: 'POST',
     url: apis,
@@ -39,9 +40,10 @@ function doUploadPkg(version, pkgPath, cb) {
     }
   }).then(function(response) {
     //console.log(response.data);
+    console.log('版本上传成功');
     if (cb) cb(version);
   }).catch(function(err) {
-    console.log(err.message);
+    console.log('版本上传失败', err.message);
   });
 }
 
@@ -70,7 +72,7 @@ function doUploadCraba(version) {
 
   var text = new Date().toString() + " " + config.modName + '打包完成，上传资源' + pkg.version + '到' + version;
   console.log(text);
-  
+
   //utils.postWeebhooks(text);
 
   axios({

package/tool/merge/mergeTool.js

@@ -165,8 +165,9 @@ function replaceBlackFunction(content, options) {
 
   var txt = fs.readFileSync(blackFile);
   var list = txt.toString().split('\r\n');
-
+  utils.debug("黑名单内容", list.length);
   var index = 0;
+
   list.forEach(function(name) {
     if (!name || name.trim() == '' || name.startsWith('#')) return;
 

package/tool/start.js

@@ -277,11 +277,17 @@ class Start {
         console.log('💡 提示：重新启动 crabaTool 以使用最新版本');
       } else {
         console.log('⚠️  更新失败，请检查网络连接或手动执行：');
-        console.log(`npm install crabatool --registry ${config.registry}`);
+        const installCmd = utils.isRunningGlobally() 
+          ? `npm install -g crabatool --registry ${config.registry}`
+          : `npm install crabatool --registry ${config.registry}`;
+        console.log(installCmd);
       }
     } catch (error) {
       console.log('❌ 更新过程中出现错误：', error.message);
-      console.log(`💡 请手动执行：npm install crabatool --registry ${config.registry}`);
+      const installCmd = utils.isRunningGlobally() 
+        ? `npm install -g crabatool --registry ${config.registry}`
+        : `npm install crabatool --registry ${config.registry}`;
+      console.log(`💡 请手动执行：${installCmd}`);
     }
 
     // 更新完成后返回主菜单

package/tool/upgrade.js

@@ -13,11 +13,11 @@ class Upgrade {
   }
 
   getVersionUrl() {
-    return utils.joinPath(config.SourceHost, "setup/" + config.version + "/package.json");
+    return utils.joinPath(config.SourceHost, "setup/" + config.version + "/package.json?_v_=" + new Date().getTime());
   }
 
   getCrabaFileUrl() {
-    return utils.joinPath(config.SourceHost, "setup/" + config.version + "/craba.zip");
+    return utils.joinPath(config.SourceHost, "setup/" + config.version + "/craba.zip?_v_=" + new Date().getTime());
   }
 
   getLocalVersion() {