crabatool 1.0.288 → 1.0.290

package/hash2.json

@@ -0,0 +1,8 @@
+{
+  "craba/beefun.js": "sha384-pkh4Pn8P8Bt2R3KEeN7N2WBZHd7xFWCD8fY2LuCdypHQv1DXLG538f1Jr+pCyJcM",
+  "craba/craba.js": "sha384-n2XKRVKzBD/TEJshcBPd47g8CuFGr3kaXtCOYmHlDiycT2oYgcS861vnbDO8oOU7",
+  "craba/jslint.js": "sha384-syKt/0UKHwxXV2mHXk7NrTYMaOn3BBKxKYVzetJ8adbczKfIRrDvX1mPu7ywNiwO",
+  "craba/test.js": "sha384-VQy3WyY/3vG+HckZphZEXGAZGOVP/NhqD8fx6wBjMPtfIaX5dUjMOxR+F23VhxAw",
+  "craba/zip.js": "sha384-CfuD5iXqZUPZwLBiIXf8neQb0iPRw5x/UQbWoqs6TFjd8RYiEpa571wYrJf8PRlT",
+  "craba/zip2.js": "sha384-Fm8dHm4XqM/t509sUp5Pawk2mzuRFZaFmIRW3nZCZPjbYA9gMIFGJ+2YaNrj5Fxw"
+}

package/index.js

@@ -111,7 +111,8 @@ function checkFast(args) {
 
 
   if (args.includes('-makeHash')) {
-    start.bindAndCheckConfig('-files');
+    start.bindConfigByArgv('-files', 'array');
+    start.bindConfigByArgv('-exts', 'array');
     start.bindAndCheckConfig('-outJson');
     require('./tool/hash.js').start(); // wps安全改造，工具生成js和css的hash值
     return false;

package/lib/server.js

@@ -53,6 +53,9 @@ var server = http.createServer(app);
 var hostname = '127.0.0.1';
 server.listen(config.port, hostname, () => {
   var url = 'http://127.0.0.1:' + config.port;
+  if (config.virtualName) {
+    url += "/" + config.virtualName;
+  }
   if (config.defaultPage) { // 业务可以自行配置首页
     url += '/' + config.defaultPage;
   } else if (config.modName) { // ngp下面首页是login.html

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.288",
+  "version": "1.0.290",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -17,7 +17,8 @@
     "upload": "node run.js -upload -version master -Debug true -host http://127.0.0.1:9998 -hidejspath true -targetPath F:\\CarpaNET_NEW",
     "crabaNgp": "node run.js -mergejs -hidejspath true -targetPath F:\\CarpaNET_NEW\\src\\Carpa.Web\\js\\crabaNgp -inNames initMs.js,businessControl.js -outName F:\\CarpaMS\\src\\js\\crabaNgp.js",
     "webPath": "node ./test/test.js -checkjs -webhooks 0 -webPath F:\\crabaevery\\www -modName crabaevery",
-    "makeHash": "node run.js -makeHash -webPath ./test/ -modName craba  -files http://crabadoc.ca.com/js/utils/utils.js,F:/newcrabadoc/www/js/utils/utils.js,./test/test.js,./test/beefun.js,https://s5.vip.wpscdn.cn/web-libs/2t/js/userinfo-collect/1.0.3/vas2t-userinfo-collect.min.js?a=1 -outJson ./hash.json -hashName sha384"
+    "makeHash": "node run.js -makeHash -webPath ./test/ -modName craba  -files http://crabadoc.ca.com/js/utils/utils.js,F:/newcrabadoc/www/js/utils/utils.js,./test/test.js,./test/beefun.js,https://s5.vip.wpscdn.cn/web-libs/2t/js/userinfo-collect/1.0.3/vas2t-userinfo-collect.min.js?a=1 -outJson ./hash.json -hashName sha384",
+    "makeHash2": "node run.js -makeHash -webPath ./test/ -modName craba -files ./test/  -exts .js -outJson ./hash2.json -hashName sha384"
   },
   "author": "wssf",
   "dependencies": {

package/tool/hash.js

@@ -13,17 +13,46 @@ module.exports.start = function() {
     config.hashName = 'sha384';
   }
 
-  var hash = {};
-  var files = config.files.split(',');
-  files.forEach(function(f) {
+  if (!config.files) {
+    config.files = [];
+  }
+
+  var results = {};
+  buildFiles(results, config.files);
+
+  utils.mkdirsSync(config.outJson);
+  fs.writeFileSync(config.outJson, JSON.stringify(results));
+}
 
+function buildFiles(results, files) {
+  files.forEach(function(f) {
     console.log(f);
+
     var content;
     var isHttp = f.startsWith('http');
     if (isHttp) {
       var res = requestSync("GET", f);
       content = res.getBody();
     } else if (fs.existsSync(f)) {
+
+      // 磁盘目录
+      var statFs = fs.statSync(f);
+      if (!statFs.isFile()) {
+        var files2 = fs.readdirSync(f);
+        files2 = files2.map(function(s) {
+          return utils.join(f, s);
+        });
+        buildFiles(results, files2);
+        return;
+      }
+
+      if (config.exts && config.exts.length > 0) {
+        var ext = path.extname(f).toLowerCase();
+        if (!config.exts.includes(ext)) {
+          return;
+        }
+      }
+
       content = fs.readFileSync(f);
     } else {
       console.error('文件不存在:' + f);
@@ -50,11 +79,8 @@ module.exports.start = function() {
     // https://www.srihash.org/
 
     var base64 = makeHash(content, config.hashName); // 将文件内容进行hash计算
-    hash[f] = config.hashName + '-' + base64; //  使用 base64 编码 sha384 算法计算出摘要后的 integrity 值的示例
+    results[f] = config.hashName + '-' + base64; //  使用 base64 编码 sha384 算法计算出摘要后的 integrity 值的示例
   });
-
-  utils.mkdirsSync(config.outJson);
-  fs.writeFileSync(config.outJson, JSON.stringify(hash));
 }
 
 function makeHash(str, name) {