crabatool 1.0.282 → 1.0.284

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.282",
+  "version": "1.0.284",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -17,7 +17,7 @@
     "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 -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"
+    "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"
   },
   "author": "wssf",
   "dependencies": {

package/tool/hash.js

@@ -9,13 +9,18 @@ var requestSync = require('sync-request');
 
 
 module.exports.start = function() {
+  if (!config.hashName) {
+    config.hashName = 'sha384';
+  }
+
   var hash = {};
   var files = config.files.split(',');
   files.forEach(function(f) {
 
     console.log(f);
     var content;
-    if (f.startsWith('http')) {
+    var isHttp = f.startsWith('http');
+    if (isHttp) {
       var res = requestSync("GET", f);
       content = res.getBody();
     } else if (fs.existsSync(f)) {
@@ -30,25 +35,29 @@ module.exports.start = function() {
       f = f.substr(0, index);
     }
 
+    // 转为相对webPath的路径
+    if (!isHttp) {
+      f = path.resolve(f);
+      f = f.replace(config.webPath, '');
+      if (config.modName) {
+        f = path.join(config.modName, f);
+      }
+      f = f.replace('\\', '/');
+    }
+
     // SRI Hash Generator
     // https://www.srihash.org/
 
-    var hex = sha384(content); // 将文件内容进行hash计算
-    hash[f] = 'sha384-' + hex; //  使用 base64 编码 sha384 算法计算出摘要后的 integrity 值的示例
+    var base64 = makeHash(content, config.hashName); // 将文件内容进行hash计算
+    hash[f] = config.hashName + '-' + base64; //  使用 base64 编码 sha384 算法计算出摘要后的 integrity 值的示例
   });
 
   utils.mkdirsSync(config.outJson);
   fs.writeFileSync(config.outJson, JSON.stringify(hash));
 }
 
-function sha256(str) {
-  const hash = crypto.createHash('sha256');
-  hash.update(str);
-  return hash.digest('base64');
-}
-
-function sha384(str) {
-  const hash = crypto.createHash('sha384');
+function makeHash(str, name) {
+  const hash = crypto.createHash(name);
   hash.update(str);
   return hash.digest('base64');
 }