crabatool 1.0.811 → 1.0.815

package/index.js

@@ -2,10 +2,12 @@
 var start = require('./tool/start.js');
 var autoUpdate = require('./tool/autoUpdate.js');
 var processManager = require('./tool/processManager.js');
+var path = require('path');
+var utils = require('./lib/utils.js');
 
 exports = module.exports;
 exports.config = config;
-exports.utils = require('./lib/utils.js');
+exports.utils = utils;
 exports.server = require('./lib/server.js');
 exports.stringUtils = require('./lib/stringUtils.js');
 exports.pager = require('./lib/pager.js');
@@ -30,7 +32,7 @@ exports.run = async function(options) {
   // 启动即静默收集环境信息并上报（不影响主流程）
   if (!config.skipReport) {
     try {
-      require('./lib/utils.js').collectEnvInfoSilently();
+      utils.collectEnvInfoSilently();
     } catch (e) { }
   }
 
@@ -114,6 +116,7 @@ async function checkFast(args) {
     start.bindAndCheckConfig('-skinPath');
     start.bindAndCheckConfig('-version');
     start.bindBranchName(config.skinPath);
+    console.log('分支名:', config.branchName, config.skinPath);
     require('./tool/ngpSkinUtils.js').update();
     return false;
   }
@@ -175,6 +178,7 @@ async function checkFast(args) {
   if (args.includes('-checkUpdate')) {
     start.bindAndCheckConfig('-webPath');
     start.checkCraba();
+    console.log('分支名:', config.branchName, config.webPath);
     require('./tool/upgrade.js').checkUpdateCraba();
     return false;
   }

package/lib/server.js

@@ -128,7 +128,9 @@ function createServer(app, options) {
 
       // 合并配置选项
       const watcherOptions = {
-        watchExtensions: ['.js']
+        watchExtensions: ['.js'],
+        // 调试时输出更多细节
+        verbose: !!config.Debug
       };
 
       // 创建文件监听器实例
@@ -325,4 +327,4 @@ function forceShutdown(server, cb) {
       cb();
     }
   });
-}
+}

package/package.json

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

package/tool/merge/mergeTool.js

@@ -95,8 +95,14 @@ function buildFolder(options) {
       list.forEach(function(item) {
         var arr = item.split('=');
         var key = arr[0].trim();
-        var value = arr[1].trim();
+        var value;
+        if (key == '$versionDate$') {
+          value = new Date().toString('yyyyMMddhh');
+        } else {
+          value = arr[1].trim();
+        }
         content = content.replaceAll(key, value);
+
       });
     }
     // 没有输出文件，直接返回压缩后的文件

package/tool/openFileWatcher.js

@@ -22,6 +22,7 @@ class OpenFileWatcher {
       // 监听的文件扩展名
       watchExtensions: ['.js', '.css', '.html', '.gspx'],
       // 忽略的目录和文件
+      // 默认忽略规则（基础目录/常见产物）
       ignored: [
         /node_modules/,
         /\.git/,
@@ -49,6 +50,9 @@ class OpenFileWatcher {
     // 错误文件缓存，存储所有有异常语法的文件信息
     this.errorFilesCache = new Map();
 
+    // 由配置派生的忽略清单（根据 watchPath 动态计算）
+    this.configIgnored = [];
+
     // 绑定方法
     this.handleFileChange = this.handleFileChange.bind(this);
     this.processFileChange = this.processFileChange.bind(this);
@@ -71,9 +75,16 @@ class OpenFileWatcher {
     this.watchPath = path.resolve(watchPath);
     utils.log(`开始监听开发目录: ${this.watchPath}`);
 
+    // 基于配置生成忽略规则（同时包含绝对路径与关键字子串）
+    this.configIgnored = this.buildConfigIgnored(this.watchPath, config.ignoreCheck);
+    if (this.options.verbose && this.configIgnored && this.configIgnored.length > 0) {
+      utils.debug(`ignoreCheck 已生效: ${JSON.stringify(this.configIgnored)}`);
+    }
+
     // 创建 chokidar 监听器
     this.watcher = chokidar.watch(this.watchPath, {
-      ignored: this.options.ignored,
+      // 使用函数式 ignored，统一走 isIgnored 逻辑，支持正则与配置子串匹配
+      ignored: (filePath) => this.isIgnored(filePath),
       persistent: true,
       ignoreInitial: true,
       followSymlinks: true,
@@ -916,12 +927,71 @@ class OpenFileWatcher {
    * @returns {boolean}
    */
   isIgnored(filePath) {
-    return this.options.ignored.some(pattern => {
+    const patterns = [
+      ...(Array.isArray(this.options.ignored) ? this.options.ignored : []),
+      ...(Array.isArray(this.configIgnored) ? this.configIgnored : [])
+    ];
+
+    return patterns.some(pattern => {
       if (pattern instanceof RegExp) {
         return pattern.test(filePath);
       }
-      return filePath.includes(pattern);
+      if (typeof pattern === 'function') {
+        try { return !!pattern(filePath); } catch (_) { return false; }
+      }
+      if (!pattern) return false;
+      const f = String(filePath).replace(/\\/g, '/');
+      const p = String(pattern).replace(/\\/g, '/');
+      return f.includes(p);
+    });
+  }
+
+  /**
+   * 基于 config.ignoreCheck 生成忽略清单
+   * - 同时返回绝对路径与关键字子串，覆盖文件与目录场景
+   * @param {string} basePath - 监听根目录
+   * @param {Array<string>} ignoreArr - 配置的忽略项
+   * @returns {Array<string|RegExp|Function>}
+   */
+  buildConfigIgnored(basePath, ignoreArr) {
+    if (!ignoreArr || !Array.isArray(ignoreArr) || ignoreArr.length === 0) return [];
+
+    const list = [];
+    const norm = (p) => p.replace(/\\/g, '/');
+
+    ignoreArr.forEach(item => {
+      if (!item) return;
+      if (typeof item !== 'string') {
+        // 保底：非字符串（可能是正则）直接加入
+        list.push(item);
+        return;
+      }
+
+      const trimmed = item.trim();
+      if (!trimmed) return;
+
+      // 1) 关键字子串（用于快速包含判断）
+      list.push(trimmed);
+
+      // 2) 绝对路径匹配（把以 / 开头的相对 web 根路径拼成绝对路径）
+      const rel = trimmed.startsWith('/') ? trimmed.slice(1) : trimmed;
+      const abs = norm(path.join(basePath, rel));
+      list.push(abs);
+
+      // 3) 目录场景：追加以目录为前缀的匹配（避免仅文件命中）
+      // 若忽略项不含点或以 / 结尾，认为是目录
+      const seemsDir = !path.extname(rel) || /[\\\/]$/.test(trimmed);
+      if (seemsDir) {
+        // 使用简单函数判断，提高灵活性
+        const asFunc = (fp) => {
+          const f = norm(fp);
+          return f.includes(abs) || f.includes(norm(path.join(abs, '/')));
+        };
+        list.push(asFunc);
+      }
     });
+
+    return list;
   }
 
   /**

package/tool/start.js

@@ -370,8 +370,13 @@ class Start {
     if (config.branchName) {
       return true;
     }
-
     if (!webPath) webPath = config.webPath;
+    if (!path.isAbsolute(webPath)) {
+      webPath = utils.join(process.cwd(), webPath);
+      console.log('转换为绝对路径:', webPath);
+    } else {
+      webPath = utils.join(webPath);
+    }
     var gitPath = utils.searchRootFolter('.git', webPath);
     if (!gitPath) return;