crabatool 1.0.13 → 1.0.18

package/tool/checkjs.js

@@ -0,0 +1,93 @@
+var utils = require('../lib/utils.js');
+var config = require('../lib/config.js');
+var fs = require('fs');
+var ProgressBar = require('./progressbar.js');
+var jschardet = require('iconv-jschardet');
+var path = require('path');
+
+module.exports.start = function() {
+  var jsFiles = utils.getFiles({ source: config.webPath, exts: '.js' });
+
+  var fileSize = 300;
+  var errList = [];
+  var errRegList = [];
+  var bigList = [];
+  var notUtf8List = [];
+  var utf8List = [];
+  var blackList = ['craba.min.js', 'crabaEx.min.js', 'crabaNgp.js', 'echarts-all.js', 'echarts.min.js', 'math.min.js'];
+  // let、const、=>、async、await、then、funName(){}
+  var dangerousJs = ['\\slet\\s', '\\sconst\\s', '\=\>', '\\sasync\\s', '\\sawait\\s', '\\.then\\('];
+  var noFunction = new RegExp('\w.*\(.*\)(\s*|\n){');
+
+  var pb = new ProgressBar('检查进度', jsFiles.length);
+  jsFiles.forEach(function(filePath) {
+    pb.value++;
+    pb.render({ value: pb.value, text: filePath });
+
+    var byte = fs.readFileSync(filePath);
+    var stats = fs.statSync(filePath);
+    if (stats.size / 1024 > fileSize) { // 大于300k的js视为大文件
+      if (!blackList.includes(path.basename(filePath))) {
+        bigList.push(`路径:${filePath} 大小:${parseInt(stats.size / 1024)}kb`);
+      }
+    }
+
+    var content = byte.toString();
+    var ret = jschardet.detect(byte);
+    if (utils.isUtf8(byte, ret.encoding) || ret.encoding == 'UTF-8') {
+      utf8List.push(filePath);
+    } else {
+      var reg = /[\u4e00-\u9FA5]+/;
+      if (!reg.test(content)) { // 不包含中文的情况，jschardet把utf-8也认为是gbk了
+        utf8List.push(filePath);
+      } else {
+        notUtf8List.push(`路径:${filePath} 编码:${ret.encoding}`);
+        content = utils.toUtf8(byte);
+      }
+    }
+
+    var reg = new RegExp(dangerousJs.join('|'), 'ig');
+    if (reg.test(content)) { // 先检查是否有危险字符
+      errList.push(filePath);
+
+      var nreg = new RegExp(dangerousJs.join('|'), 'ig');
+      var all = content.matchAll(nreg);
+      var m = [];
+      var v = all.next()
+      while (!v.done) {
+        m.push(`不兼容字符:${v.value[0]} 位置:${v.value.index}`);
+        v = all.next()
+      }
+
+      errRegList.push({ errList: m });
+    }
+
+  });
+  pb.clear('检验完成');
+
+  var info = [];
+  info.push(`检验结果：一共检查${jsFiles.length}个js文件`);
+  info.push(`语法异常文件数：【${errList.length}】个`);
+  info.push(`utf8文件数：【${utf8List.length}】个`);
+  info.push(`非utf8文件数：【${notUtf8List.length}】个`);
+  console.log(info.join('\r\n'));
+
+  if (errList.length > 0) {
+    console.log('\r\n:::语法异常文件清单如下:::');
+    errList.forEach((s, index) => {
+
+      console.log(s);
+
+      var m = errRegList[index];
+      console.log(m);
+    });
+  }
+
+  if (notUtf8List.length > 0) {
+    console.log('\r\n:::非utf8文件清单如下:::', notUtf8List);
+  }
+
+  if (bigList.length > 0) {
+    console.log(`\r\n:::超过${fileSize}kb的文件清单如下:::`, bigList);
+  }
+}

package/{client → tool}/client.js

@@ -15,9 +15,9 @@
     }
   });
   ngp_socket.add_close(function(e) {
-    $common.showInfo('前端自动刷新服务关闭');
+    $common.showInfo('服务器已退出，前端自动刷新服务关闭');
   });
   ngp_socket.add_error(function(e) {
-    $common.showError('前端自动刷新服务异常');
+    $common.showError('服务器异常，前端自动刷新服务异常');
   });
 })();

package/{merge → tool}/merge.js

@@ -38,11 +38,11 @@ function readFileList(folder, filesList) {
 
   var files = fs.readdirSync(folder);
   files.forEach(function(itm, index) {
-    var file = folder + '/' + itm;
+    var file = path.join(folder, itm);
     var stat = fs.statSync(file);
     if (stat.isDirectory()) {
       //递归读取文件
-      readFileList(folder + itm + "/", filesList)
+      readFileList(file, filesList)
     } else {
       if (filesList.indexOf(file) >= 0) {
         return;
@@ -66,7 +66,9 @@ function buildFolder(folderInPath, fileOutPath) {
 
   filesList.forEach(function(filePath) {
     if (!filePath) return;
-    utils.log(filePath);
+    if (!fs.existsSync(filePath)) return;
+
+    utils.debug(filePath);
     filePath = getAbsPath(filePath);
     var stats = fs.statSync(filePath);
     if (!stats.isFile()) return;
@@ -81,7 +83,7 @@ function buildFolder(folderInPath, fileOutPath) {
     fileOutPath = getAbsPath(fileOutPath);
     mkdirsSync(npath.dirname(fileOutPath));
     fs.writeFileSync(fileOutPath, __bom + __filesContent.join('\n'), 'utf8'); // "\ufeff"->> utf-8 BOM标记
-    utils.log("out file:" + fileOutPath);
+    utils.debug("out file:" + fileOutPath);
   }
 };
 
@@ -122,7 +124,7 @@ function replaceBlackFunction(content) {
 }
 
 function compressFile(filePath) {
-  utils.log("compress and merge:" + filePath);
+  utils.debug("compress and merge:" + filePath);
 
   var content = fs.readFileSync(filePath);
 
@@ -175,13 +177,11 @@ __blackFileName = args[3]; // 黑名单文件
 
 if (!__inPath || !__outPath) throw ("args参数不能为空");
 
-utils.log("source files:" + __inPath);
-utils.log("out file:" + __outPath);
-utils.log("start merge...\r\n");
+utils.debug("source files:" + __inPath);
+utils.debug("out file:" + __outPath);
+utils.debug("start merge...\r\n");
 
 var startT = new Date();
 buildFolder(__inPath, __outPath);
 var endT = new Date();
-utils.log("\r\nALL Done, Files:" + (__filesContent.length / 2) + " js");
-utils.log("Total Times:" + (endT.getTime() - startT.getTime()));
-utils.log("\r\n-------压缩合并任务完成----------use -ignorecompress:" + __ignoreCompress);
+utils.log(`打包完成\t 耗时:${endT.getTime() - startT.getTime()}毫秒\t-ignorecompress:${__ignoreCompress}\t合并文件数:${(__filesContent.length / 2)}个`);

package/{lib → tool}/ngptool.js

@@ -1,18 +1,19 @@
-var config = require('./config.js');
+var config = require('../lib/config.js');
 var path = require('path');
 var chokidar = require('chokidar');
 var fs = require('fs');
 var fork = require('child_process').fork;
-var utils = require('./utils.js');
+var utils = require('../lib/utils.js');
 
-var mergeJs = path.join(__dirname, '/merge/merge.js');
-var log = console.dir.bind(console);
+var mergeJs = path.join(__dirname, 'merge.js');
 var compressArgs = config.ignoreCompress ? ['-ignorecompress'] : []; // 是否压缩
 
 // 打包biz.js
 function mergeBiz() {
   var bizPath = path.join(config.webPath, '/js/biz');
-  utils.mkdirsSync(bizPath);
+  if (!fs.existsSync(bizPath)) {
+    return utils.error('error biz.js关联打包的路径不存在，已经取消打包功能。如需打包请先创建目录：' + bizPath);
+  }
 
   var watcher = chokidar.watch([bizPath], {
     persistent: true,
@@ -20,15 +21,15 @@ function mergeBiz() {
   });
 
   var watchAction = function() {
-    log('文件变动，重新打包中');
+    utils.debug('打包中');
     // 这里进行文件更改后的操作
     var p = fork(mergeJs, [`${[bizPath]}`, `${[path.join(config.webPath, '/js/biz.js')]}`, compressArgs])
     p.on('exit', code => {
-      log('打包完成');
+      utils.debug('打包完成');
     });
   }
   watcher
-    .on('ready', () => log(`${bizPath}，Initial scan complete. Ready for changes.`))
+    .on('ready', () => utils.debug(`${bizPath}，Initial scan complete. Ready for changes.`))
     //.on('add', path => log(`File ${path} has been added`))
     .on('change', path => watchAction({ event: 'change', eventPath: path }))
     .on('unlink', path => watchAction({ event: 'remove', eventPath: path }));
@@ -38,14 +39,20 @@ function mergeBiz() {
 
 // 打包生成jxc/js/init.js
 function mergeInit() {
+  var modJs = path.join(config.webPath, '/js/' + config.modName + '.js'); // jxc/js/jxc.js
+  if (!fs.existsSync(modJs)) {
+    return utils.error(`error 模块对应的资源不存在:${modJs}，已经取消打包功能。如需打包，请先将${config.modName}/js/init.js修改为：${config.modName}/js/${config.modName}.js`);
+  }
+
   var inits = [];
+  inits.push(modJs);
 
   var watchAction = function() {
-    log('文件变动，重新打包中');
+    utils.debug('打包中');
     // 这里进行文件更改后的操作
     var p = fork(mergeJs, [`${[inits]}`, `${[path.join(config.webPath, '/js/init.js')]}`, compressArgs])
     p.on('exit', code => {
-      log('打包完成');
+      utils.debug('打包完成');
     });
   }
 
@@ -55,24 +62,21 @@ function mergeInit() {
       usePolling: true
     });
     watcher
-      .on('ready', () => log(`${jsPath}，Initial scan complete. Ready for changes.`))
+      .on('ready', () => utils.debug(`${jsPath}，Initial scan complete. Ready for changes.`))
       //.on('add', path => log(`File ${path} has been added`))
       .on('change', path => watchAction({ event: 'change', eventPath: path }))
       .on('unlink', path => watchAction({ event: 'remove', eventPath: path }));
   }
 
-  var modJs = path.join(config.webPath, '/js/' + config.modName + '.js'); // jxc/js/jxc.js
-  if (!fs.existsSync(modJs)) {
-    console.error(`模块对应的资源不存在:${modJs}，请将${config.modName}/js/init.js先修改为：${config.modName}/js/${config.modName}.js`);
-  }
-  inits.push(modJs);
   watchJs(modJs);
 
   config.childModList.forEach(childName => {
     var childInitPath = path.join(config.webPath, childName, 'js/init.js');
     inits.push(childInitPath);
-    utils.mkdirsSync(childInitPath);
-
+    //utils.mkdirsSync(childInitPath);
+    if (!fs.existsSync(childInitPath)) {
+      utils.error('error 监听打包的资源不存在' + childInitPath);
+    }
     watchJs(childInitPath);
   });
   inits = inits.join(',');
@@ -80,12 +84,8 @@ function mergeInit() {
   watchAction();// 启动就打包一次
 }
 
-if (config.childModList && config.childModList.length > 0) {
-  utils.log('启动打包服务', config.childModList);
-
-  utils.mkdirsSync(config.webPath);
-
-  mergeBiz(); // 如果有需要
+utils.log('启动打包服务', config.childModList);
+utils.mkdirsSync(config.webPath);
 
-  mergeInit(); // 如果有需要
-}
+mergeBiz(); // 如果有需要
+mergeInit(); // 如果有需要

package/tool/progressbar.js

@@ -7,10 +7,14 @@ function ProgressBar(description, bar_length) {
   this.description = description || 'Progress';       // 命令行开头的文字信息
   this.length = bar_length || 25;                     // 进度条的长度(单位：字符)，默认设为 25
 
+  var that = this;
+  that.value = 0;
+
   // 刷新进度条图案、文字的方法
-  this.render = function(opts) {
-    if (!opts.total) opts.total = 100;
-    var percent = (opts.completed / opts.total).toFixed(4);    // 计算进度(子任务的 完成数 除以 总数)
+  that.render = function(opts) {
+    if (!opts.total) opts.total = this.length;
+    that.value = opts.value;
+    var percent = (opts.value / opts.total).toFixed(4);    // 计算进度(子任务的 完成数 除以 总数)
     var cell_num = Math.floor(percent * this.length);             // 计算需要多少个 █ 符号来拼凑图案
 
     // 拼接黑色条
@@ -26,14 +30,14 @@ function ProgressBar(description, bar_length) {
     }
 
     // 拼接最终文本
-    var cmdText = this.description + ': ' + (100 * percent).toFixed(2) + '% ' + cell + empty + ' ' + (opts.text || '');
+    var cmdText = this.description + ': ' + (100 * percent).toFixed(2) + '% ' + cell + empty + ' ' + (opts.text || '') + '\r\n';
 
     // 在单行输出文本
     slog(cmdText);
   };
 
-  this.clear = function(text) {
-    slog(text || '');
+  that.clear = function(text) {
+    slog((text || '') + '\r\n');
   }
 }
 

package/{lib → tool}/sockettool.js

@@ -1,5 +1,5 @@
-var utils = require('./utils.js');
-var config = require('./config.js');
+var utils = require('../lib/utils.js');
+var config = require('../lib/config.js');
 var ws = require("nodejs-websocket");
 var path = require('path');
 var chokidar = require('chokidar');
@@ -7,7 +7,7 @@ var fs = require('fs');
 var exts = [".js", ".css", ".html", ".gspx"];
 
 function watchWebChange() {
-  utils.log("创建文件变动监听");
+  utils.debug("创建文件变动监听");
 
   var watcher = chokidar.watch([config.webPath], {
     persistent: true,
@@ -19,37 +19,36 @@ function watchWebChange() {
     if (!exts.includes(ext)) return;
 
     utils.log('文件变动，刷新浏览器');
-    console.log(args);
+    //console.log(args);
 
     broadcast('refresh');
   }
   watcher
-    .on('ready', () => { utils.log('watchWebPath change ready !!') })
+    .on('ready', () => { utils.debug('watch webPath change ready !!') })
     .on('change', path => watchAction({ event: 'change', eventPath: path }))
     .on('unlink', path => watchAction({ event: 'remove', eventPath: path }));
 
 }
 
 function createSocket() {
-  utils.log("监听浏览器");
   socketServer = ws.createServer(function(conn) {
     conn.on("text", function(str) {
-      utils.log("收到的信息为:" + str);
+      utils.debug("收到的信息为:" + str);
     });
     conn.on('connect', function(code, reason) {
       utils.log('connect连接成功');
       broadcast('ws connect success');
     });
     conn.on("close", function(code, reason) {
-      utils.log("Socket关闭", arguments);
+      utils.debug("connect关闭");
     });
     conn.on("error", function(code, reason) {
-      utils.log("Socket异常", arguments);
+
     });
   }).listen(config.socketPort);
 
   socketServer.on('connection', function(code, reason) {
-    utils.log('connection连接成功');
+    utils.debug('connection连接成功');
     broadcast('ws connection success');
   });
 }

package/tool/upgrade.js

@@ -1,7 +1,6 @@
 var config = require('../lib/config.js');
 var path = require('path');
 var fs = require('fs');
-var request = require('request');
 var requestSync = require('sync-request');
 var utils = require('../lib/utils.js');
 var axios = require('axios');
@@ -10,26 +9,18 @@ var StreamZip = require('node-stream-zip');
 
 class Upgrade {
   constructor() {
-    this.Host = "http://crabadoc.mygjp.com.cn";
-    this.TempPath = path.join(__dirname, 'temp');
-    this.ImageCache = path.join(this.TempPath, "_img");
-    this.JsonFile = path.join(this.TempPath, "craba.json");
-    this.SaveFilePath = path.join(this.TempPath, "_CrabaUpdate");
-    this.CachePath = path.join(this.SaveFilePath, "_unzip");
-    this.WebPath = path.join(this.SaveFilePath, "_www");
-    this.ServerPath = path.join(this.SaveFilePath, "_server");
-    this.CacheFileName = path.join(this.SaveFilePath, "craba.zip");
+    this.serverFolder = 'crabatool';
   }
 
   getVersionUrl() {
-    var url = this.Host;
+    var url = config.Host;
     if (!url.endsWith("/")) url += "/";
     url += "setup/crabaConfig.json";
     return url;
   }
 
   getCrabaFileUrl() {
-    var url = this.Host;
+    var url = config.Host;
     if (!url.endsWith("/")) url += "/";
     url += "setup/craba.zip";
     return url;
@@ -55,8 +46,8 @@ class Upgrade {
   }
 
   getNewVersion() {
-    var version = "error";
-    var vDate = "error";
+    var version = "network error";
+    var vDate = "network error";
 
     try {
       var res = requestSync("GET", this.getVersionUrl());
@@ -71,71 +62,162 @@ class Upgrade {
   }
 
   updateCraba(cb) {
+    utils.cleardirsSync(config.SaveFilePath);
+
+    this.cb = cb;
+    this.projectPath = config.webPath;
     var localData = this.getLocalVersion();
     var newData = this.getNewVersion();
     if (localData.version == newData.version) {
-      console.log('本地已经是最新版本，不需要更新。');
+      console.log(':::本地已经是最新版本，不需要更新:::');
       if (cb) cb();
       return;
     }
 
-    this.pb = new ProgressBar('更新进度', 50);
-    this._deleteCache();
+    this.done = this._updateDone;
+    this.downloadCraba();
+  }
+
+  createProject(options) {
+
+    var projectPath = "";
+    if (options.type == 1) {
+      projectPath = path.join(options.projectPath, 'www');
+    } else if (options.type == 2) {
+      projectPath = `${options.modName}/web/src/main/resources/static/${options.modName}`;
+      projectPath = path.join(options.projectPath, projectPath);
+      projectPath = projectPath;
+    }
+
+    this.done = this._createDone;
+    this.options = options;
+    this.projectPath = projectPath;
+
+    this.downloadCraba()
+  }
+
+  _updateDone() {
+    this.pb.clear('完成');
+
+    if (this.cb) {
+      this.cb();
+      delete this.cb;
+    }
+
+    // 可能文件占用中
+    setTimeout(function() {
+      //utils.cleardirsSync(config.SaveFilePath);
+    }, 1000);
+  }
+
+  _createDone() {
+    // 拷贝server文件
+    utils.copyFiles(config.ServerPath, path.join(this.options.projectPath, this.serverFolder), null, utils.createDelegate(this, function(fileName) {
+      this.pb.render({ value: ++this.pb.value, text: fileName });
+    }));
+
+    // 拷贝www 案例文件
+    if (this.options.type == 1) { // 普通项目，拷贝demo页面
+      utils.copyFiles(config.WebPath, this.projectPath, ['ngp'], utils.createDelegate(this, function(fileName) {
+        this.pb.render({ value: ++this.pb.value, text: fileName });
+      }));
+    } else {
+      var that = this;
+      utils.copyFiles(path.join(config.WebPath, 'ngp'), this.projectPath, null, utils.createDelegate(this, function(fileName, bytes) {
+        this.pb.render({ value: ++this.pb.value, text: fileName });
+        return bytes.toString().replaceAll('${modName}', that.options.modName);
+      }));
+    }
+
+    // 重写craba.js的配置
+    this._rewriteNode(); // 创建node启动脚本
+
+    this._updateDone();
+
+    console.log('项目创建完成，请切换到新项目下继续操作。' + path.join(this.options.projectPath, this.serverFolder));
+  }
+
+  _rewriteNode() {
+    /*
+    webPath: "${this.projectPath}",
+
+    //【必填】
+    // 告诉工具当前项目前端服务器端口地址
+    port: ${10000 + parseInt(Math.random() * 1000)},
+    */
+    var nodeJs = path.join(path.join(this.options.projectPath, this.serverFolder), 'craba.js');
+    var content = fs.readFileSync(nodeJs).toString();
+    content = content.replace('${webPath}', this.projectPath.replaceAll('\\', '/'));
+    content = content.replace('${port}', (10000 + parseInt(Math.random() * 1000)));
+    content = content.replace('${modName}', this.options.modName ? this.options.modName : '');
+    fs.writeFileSync(nodeJs, content);
+  }
 
-    this.downloadFile(this.getCrabaFileUrl(), this.CacheFileName, utils.createDelegate(this, this._doCrabaLoaded));
+  downloadCraba() {
+    this.pb = new ProgressBar('下载进度', 50);
+    this.pb.render({ value: 10, text: '下载资源' });
+    utils.mkdirsSync(config.SaveFilePath); // 创建缓存目录
+    this.downloadFile(this.getCrabaFileUrl(), config.CacheFileName, utils.createDelegate(this, this._doCrabaLoaded));
   }
 
   _doCrabaLoaded(filePath) {
     if (!fs.existsSync(filePath)) {// 检查文件
-      console.log("服务不可用，拉取文件失败，请联系平台管理员");
+      console.log(":::服务不可用，拉取文件失败，请联系平台管理员:::");
       return;
     }
-    this.pb.render({ completed: 50, text: '下载完成' });
 
+    this.pb.render({ value: 50, text: '下载完成' });
+    var that = this;
     //console.log(filePath);
-    var zip = new StreamZip({ file: filePath });
+    var zip = new StreamZip({ file: filePath, storeEntries: true, skipEntryNameValidation: true });
     zip.on('ready', () => {
-      that.pb.render({ completed: 60, text: '解压文件' });
-      utils.mkdirsSync(that.CachePath);
-      zip.extract(null, that.CachePath, (err, count) => {
-        that.pb.render({ completed: 70, text: `解压完成，开始拷贝文件` });
+      that.pb.render({ value: 70, text: '解压并拷贝文件' });
+
+      utils.mkdirsSync(config.CachePath);
+
+      zip.extract(null, config.CachePath, (err, count) => {
         zip.close();
-        that.copyFile();
+
+        that._copyFiles();
       });
     });
   }
 
-  copyFile() {
+  _copyFiles() {
+    var dest = this.projectPath;
+    var source = config.CachePath;
+    var ignores = ["server", "www"];
+
+    utils.copyFiles(source, dest, ignores, utils.createDelegate(this, function(fileName) {
+      this.pb.render({ value: ++this.pb.value, text: fileName });
+    }));
 
+    if (this.done) {
+      this.done();
+    }
   }
 
   downloadFile(uri, filePath, callback) {
     if (!uri || !filePath) throw new Error('uri或filePath不能为空');
 
     //console.log('下载craba文件');
-
+    var that = this;
     // 获取远端图片
     axios({
       method: 'get',
       url: this.getCrabaFileUrl(),
       responseType: 'stream'
     }).then(function(response) {
-      that.pb.render({ completed: 40, text: '下载资源' });
       response.data
-        .pipe(fs.createWriteStream(that.CacheFileName))
+        .pipe(fs.createWriteStream(config.CacheFileName))
         .on('close', () => {
           if (callback) callback(filePath);
         });
     }).catch(function(error) {
-      that.pb.clear('[内网才能访问]，出错了:', error.message);
+      that.pb.clear('[内网才能访问]，出错了:');
+      console.log(error);
     });
   }
-
-  _deleteCache() {
-    this.pb.render({ completed: 10, text: '清理缓存' });
-    utils.cleardirsSync(this.SaveFilePath);
-    utils.mkdirsSync(this.SaveFilePath); // 创建缓存目录
-    this.pb.render({ completed: 20, text: '清理完成' });
-  }
 }
-that = module.exports = new Upgrade();
+
+module.exports = new Upgrade();