jh5_app_build 1.0.30 → 1.0.31

package/lib/build_japp.js

@@ -52,7 +52,7 @@ module.exports = async (cmd, buildCfg) => {
                 // 修改版本号
                 try {
                     console.log(`change dist ver ...`);
-                    var repFile = `${buildCfg.rootPath}\\dist\\index.html`;
+                    var repFile = `${buildCfg.rootPath}/dist/index.html`;
                     var indexStr = fs.readFileSync(repFile, "utf8");
                     indexStr = indexStr.replace(/#J_APPNAME#/g, buildCfg.appName);
                     indexStr = indexStr.replace(/#J_DATE#/g, buildCfg.dateStr);

package/lib/build_std.js

@@ -5,10 +5,11 @@ let archiver = require('archiver');
 let jutils = require('base_parts');
 
 let fs = require('fs');
-let path = require('path');
-let os = require('os');
-let AdmZip = require('adm-zip');
-let child_process = require('child_process');
+let path = require('path');
+let os = require('os');
+let AdmZip = require('adm-zip');
+let child_process = require('child_process');
+let inquirer = require('inquirer');
 
 
 function adler32_buf(buf, seed) {
@@ -101,18 +102,166 @@ async function copyReNameDir(srcDir, destDir, pkgName) {
     }
 }
 
-/**
- * 创建目录并获取尾部带斜线的路径
- * @param {string} dirPath 路径
- * @returns {string} 路径(尾部带斜线)
- */
-function makeAndGetDir(dirPath) {
-    try {
-        fs.mkdirSync(dirPath);
-    } catch (error) {
-    }
-    return path.resolve(dirPath) + "\\";
-}
+/**
+ * 创建目录并获取尾部带斜线的路径
+ * @param {string} dirPath 路径
+ * @returns {string} 路径(尾部带斜线)
+ */
+function makeAndGetDir(dirPath) {
+    try {
+        fs.mkdirSync(dirPath);
+    } catch (error) {
+    }
+    return path.resolve(dirPath) + path.sep;
+}
+
+/**
+ * 获取本机工具缓存文件路径
+ * @returns {string} 缓存文件路径
+ */
+function getMacToolCachePath() {
+    return path.join(os.homedir(), ".jh5_app_build", "apk_tools_macos.json");
+}
+
+/**
+ * 读取macOS工具根目录缓存
+ * @returns {string} 上次输入的工具根目录
+ */
+function readMacToolRootCache() {
+    try {
+        var cacheObj = JSON.parse(fs.readFileSync(getMacToolCachePath(), "utf8"));
+        return cacheObj && cacheObj.toolRoot ? cacheObj.toolRoot : "";
+    } catch (error) {
+    }
+    return "";
+}
+
+/**
+ * 保存macOS工具根目录缓存
+ * @param {string} toolRoot 工具根目录
+ * @returns {void}
+ */
+function saveMacToolRootCache(toolRoot) {
+    try {
+        var cachePath = getMacToolCachePath();
+        fs.mkdirSync(path.dirname(cachePath), { recursive: true });
+        fs.writeFileSync(cachePath, JSON.stringify({
+            toolRoot: toolRoot
+        }, null, 4), "utf8");
+    } catch (error) {
+    }
+}
+
+/**
+ * 判断路径是否为可用文件
+ * @param {string} filePath 文件路径
+ * @returns {boolean} 是否存在文件
+ */
+function isValidFile(filePath) {
+    try {
+        return fs.existsSync(filePath) && fs.statSync(filePath).isFile();
+    } catch (error) {
+    }
+    return false;
+}
+
+/**
+ * 根据工具根目录和架构生成macOS工具路径
+ * @param {string} toolRoot 工具总目录
+ * @returns {*} 工具路径对象
+ */
+function getMacToolPathsByRoot(toolRoot) {
+    // 根据当前Mac架构选择对应工具目录
+    var archDirName = process.arch === "arm64" ? "bin_apple" : "bin_intel";
+    var archRoot = path.join(path.resolve(toolRoot), archDirName);
+    return {
+        root: path.resolve(toolRoot),
+        archRoot: archRoot,
+        cwd: path.join(archRoot, "jre", "bin"),
+        java: path.join(archRoot, "jre", "bin", "java"),
+        keytool: path.join(archRoot, "jre", "bin", "keytool"),
+        jarsigner: path.join(archRoot, "jre", "bin", "jarsigner"),
+        zipalign: path.join(archRoot, "android_build_tools", "zipalign"),
+        apktool: path.join(archRoot, "h5_bin", "apktool.jar")
+    };
+}
+
+/**
+ * 校验macOS打包工具是否完整
+ * @param {*} toolPaths 工具路径对象
+ * @returns {boolean} 是否完整
+ */
+function validMacToolPaths(toolPaths) {
+    return isValidFile(toolPaths.java)
+        && isValidFile(toolPaths.keytool)
+        && isValidFile(toolPaths.jarsigner)
+        && isValidFile(toolPaths.zipalign)
+        && isValidFile(toolPaths.apktool);
+}
+
+/**
+ * 设置macOS命令行工具执行权限
+ * @param {*} toolPaths 工具路径对象
+ * @returns {void}
+ */
+function chmodMacTools(toolPaths) {
+    [toolPaths.java, toolPaths.keytool, toolPaths.jarsigner, toolPaths.zipalign].forEach((filePath) => {
+        try {
+            fs.chmodSync(filePath, 0o755);
+        } catch (error) {
+        }
+    });
+}
+
+/**
+ * 获取macOS打包工具路径
+ * @returns {Promise<*>} 工具路径对象
+ */
+async function getMacApkTools() {
+    // 只输入一次总目录，具体工具按目录规范自动拼接
+    while (true) {
+        var cacheRoot = readMacToolRootCache();
+        var answers = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'toolRoot',
+                message: 'Please input macOS APK tools root path:',
+                default: cacheRoot
+            }
+        ]);
+        var toolRoot = path.resolve((answers.toolRoot || cacheRoot || "").trim());
+        var toolPaths = getMacToolPathsByRoot(toolRoot);
+        if (validMacToolPaths(toolPaths)) {
+            chmodMacTools(toolPaths);
+            saveMacToolRootCache(toolRoot);
+            console.log("[macOS APK tools] " + toolPaths.archRoot);
+            return toolPaths;
+        }
+        console.error("macOS APK tools path invalid, please check: " + toolPaths.archRoot);
+    }
+}
+
+/**
+ * 获取APK打包工具路径
+ * @returns {Promise<*>} 工具路径对象
+ */
+async function getApkTools() {
+    if (process.platform === "darwin") {
+        return await getMacApkTools();
+    }
+
+    // Windows保持原有固定工具目录
+    return {
+        root: "C:\\jdev_develop",
+        archRoot: "C:\\jdev_develop",
+        cwd: "C:\\jdev_develop\\jre\\bin",
+        java: "C:\\jdev_develop\\jre\\bin\\java.exe",
+        keytool: "C:\\jdev_develop\\jre\\bin\\keytool.exe",
+        jarsigner: "C:\\jdev_develop\\jre\\bin\\jarsigner.exe",
+        zipalign: "C:\\jdev_develop\\jre\\bin\\zipalign.exe",
+        apktool: "C:\\jdev_develop\\h5_bin\\apktool.jar"
+    };
+}
 
 /**
  * 创建目录并复制文件
@@ -128,13 +277,13 @@ async function makeDirAndCopy(srcFile, dstFile) {
 module.exports = async (cmd, buildCfg) => {
     console.log(`build file to ${buildCfg.outpath}`);
 
-    try {
-        // 模板目录
-        var stdBinPriDir = `${buildCfg.rootPath}/jbuild_data/std_bins`;
-        var stdBinDir = `${buildCfg.rootPath}/jbuild_data/std_out`;
-
-        // jre目录
-        let jreCwd = "C:\\jdev_develop\\jre\\bin";
+    try {
+        // 模板目录
+        var stdBinPriDir = `${buildCfg.rootPath}/jbuild_data/std_bins`;
+        var stdBinDir = `${buildCfg.rootPath}/jbuild_data/std_out`;
+
+        // APK打包工具
+        let apkTools = await getApkTools();
 
         // apk配置
         let apkConfig = makeAndGetDir(`${buildCfg.rootPath}/apk_cfg`);
@@ -156,18 +305,18 @@ module.exports = async (cmd, buildCfg) => {
         await jfile_utils.mkdir(stdBinDir);
 
         // 存在自定义apk
-        var custumApk = `${buildCfg.rootPath}/apk_cfg/app-release.apk`
-        if (fs.existsSync(custumApk)) {
-            console.warn(`exists custum Apk, unpack custum apk...`);
-            child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\java.exe", [
-                "-jar", "C:\\jdev_develop\\h5_bin\\apktool.jar",
-                "d", custumApk,
-                "-r", "-s", "-f",
-                "-o", stdBinDir
-            ], {
-                cwd: jreCwd
-            });
-        }
+        var custumApk = `${buildCfg.rootPath}/apk_cfg/app-release.apk`
+        if (fs.existsSync(custumApk)) {
+            console.warn(`exists custum Apk, unpack custum apk...`);
+            child_process.execFileSync(apkTools.java, [
+                "-jar", apkTools.apktool,
+                "d", custumApk,
+                "-r", "-s", "-f",
+                "-o", stdBinDir
+            ], {
+                cwd: apkTools.cwd
+            });
+        }
         else {
             // 修改应用名
             if (apkinfoObj.pkgName) {
@@ -190,10 +339,10 @@ module.exports = async (cmd, buildCfg) => {
 
         // 修改版本号
         let platformVer = jutils.getUUID();
-        try {
-            console.log(`change dist ver ...`);
-            let repFile = `${buildCfg.rootPath}\\dist\\index.html`;
-            let indexStr = fs.readFileSync(repFile, "utf8");
+        try {
+            console.log(`change dist ver ...`);
+            let repFile = path.join(buildCfg.rootPath, "dist", "index.html");
+            let indexStr = fs.readFileSync(repFile, "utf8");
             indexStr = indexStr.replace(/#J_APPNAME#/g, buildCfg.appName);
             indexStr = indexStr.replace(/#J_DATE#/g, buildCfg.dateStr);
 
@@ -417,59 +566,59 @@ module.exports = async (cmd, buildCfg) => {
         }
 
         // 打包
-        console.log(`making apk...`);
-        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\java.exe", [
-            "-jar", "C:\\jdev_develop\\h5_bin\\apktool.jar",
-            "b", stdBinDir,
-            "-o", buildCfg.outpath
-        ], {
-            cwd: jreCwd
-        });
+        console.log(`making apk...`);
+        child_process.execFileSync(apkTools.java, [
+            "-jar", apkTools.apktool,
+            "b", stdBinDir,
+            "-o", buildCfg.outpath
+        ], {
+            cwd: apkTools.cwd
+        });
 
         // 生成apk签名
         let keyStoreFile = `${apkConfig}/apk_cert.keystore`;
         if (!fs.existsSync(keyStoreFile)) {
-            console.log(`not find keystore,making ...`);
-            // 生成签名
-            child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\keytool.exe", [
-                "-genkey",
-                "-storepass", "123456",
+            console.log(`not find keystore,making ...`);
+            // 生成签名
+            child_process.execFileSync(apkTools.keytool, [
+                "-genkey",
+                "-storepass", "123456",
                 "-keypass", "123456",
                 "-alias", "cert",
                 "-keyalg", "RSA",
                 "-validity", "20000",
-                "-keystore", keyStoreFile,
-                "-dname", "CN=10.10.6.100,OU=utils,O=utils,L=beijing,ST=beijing,c=cn"
-            ], {
-                cwd: jreCwd
-            });
-        }
+                "-keystore", keyStoreFile,
+                "-dname", "CN=10.10.6.100,OU=utils,O=utils,L=beijing,ST=beijing,c=cn"
+            ], {
+                cwd: apkTools.cwd
+            });
+        }
 
         // 签名
-        console.log(`sign apk ...`);
-        var singApkTmp = buildCfg.outpath + "_sign.apk";
-        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\jarsigner.exe", [
-            "-verbose",
-            "-storepass", "123456",
+        console.log(`sign apk ...`);
+        var singApkTmp = buildCfg.outpath + "_sign.apk";
+        child_process.execFileSync(apkTools.jarsigner, [
+            "-verbose",
+            "-storepass", "123456",
             "-keypass", "123456",
             "-keystore", keyStoreFile,
             "-signedjar", singApkTmp,
-            buildCfg.outpath,
-            "cert"
-        ], {
-            cwd: jreCwd
-        });
+            buildCfg.outpath,
+            "cert"
+        ], {
+            cwd: apkTools.cwd
+        });
         fs.unlinkSync(buildCfg.outpath); // 删除未签名的
 
-        // 对齐apk
-        console.log(`zip align ...`);
-        child_process.execFileSync("C:\\jdev_develop\\jre\\bin\\zipalign.exe", [
-            "-v", "4",
-            singApkTmp,
-            buildCfg.outpath
-        ], {
-            cwd: jreCwd
-        });
+        // 对齐apk
+        console.log(`zip align ...`);
+        child_process.execFileSync(apkTools.zipalign, [
+            "-v", "4",
+            singApkTmp,
+            buildCfg.outpath
+        ], {
+            cwd: apkTools.cwd
+        });
         fs.unlinkSync(singApkTmp); // 删除未对齐的
 
         // 完成

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "jh5_app_build",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "jaskle jh5_app_build",
   "main": "./bin/jh5_app_build.js",
+  "files": [
+    "bin/",
+    "config/",
+    "lib/"
+  ],
   "registry": true,
   "directories": {},
   "scripts": {

package/.eslintrc.js

@@ -1,264 +0,0 @@
-module.exports = {
-    "env": {
-        "node" : true,
-        "browser": true,
-        "commonjs": true,
-        "es6": true,
-        "mocha" : true
-    },
-    "parserOptions": {
-        "ecmaVersion": 8
-        // "sourceType": "module",
-        // "ecmaFeatures": {
-        //     "jsx": true
-        // }
-    },
-    "extends": "eslint:recommended",
-    "rules": {
-        "accessor-pairs": "error",
-        "array-bracket-newline": "error",
-        "array-bracket-spacing": "error",
-        "array-callback-return": "error",
-        "array-element-newline": "off",
-        "arrow-body-style": "off",
-        "arrow-parens": [
-            "error",
-            "always"
-        ],
-        "arrow-spacing": "warn",
-        "block-scoped-var": "off",
-        "block-spacing": [
-            "error",
-            "always"
-        ],
-        "brace-style": "off",
-        "callback-return": "error",
-        "camelcase": "off",
-        "capitalized-comments": "off",
-        "class-methods-use-this": "off",
-        "comma-dangle": "error",
-        "comma-spacing": "off",
-        "comma-style": [
-            "error",
-            "last"
-        ],
-        "complexity": [0, 30],
-        "computed-property-spacing": [
-            "error",
-            "never"
-        ],
-        "consistent-return": "off",
-        "consistent-this": "off",
-        "curly": "off",
-        "default-case": "error",
-        "dot-location": "off",
-        "dot-notation": "off",
-        "eol-last": "off",
-        "eqeqeq": "error",
-        "for-direction": "error",
-        "func-call-spacing": "error",
-        "func-name-matching": "error",
-        "func-names": [
-            "error",
-            "never"
-        ],
-        "func-style": "off",
-        "function-paren-newline": "off",
-        "generator-star-spacing": "off",
-        "getter-return": "error",
-        "global-require": "off",
-        "guard-for-in": "off",
-        "handle-callback-err": "off",
-        "id-blacklist": "error",
-        "id-length": "off",
-        "id-match": "error",
-        "indent": "off",
-        "indent-legacy": "off",
-        "init-declarations": "off",
-        "jsx-quotes": "error",
-        "key-spacing": "off",
-        "keyword-spacing": "off",
-        "line-comment-position": "off",
-        "linebreak-style": "off",
-        "lines-around-comment": "off",
-        "lines-around-directive": "off",
-        "max-depth": [0, 5],
-        "max-len": "off",
-        "max-lines": "off",
-        "max-nested-callbacks": "error",
-        "max-params": "off",
-        "max-statements": "off",
-        "max-statements-per-line": "off",
-        "new-parens": "error",
-        "newline-after-var": "off",
-        "newline-before-return": "off",
-        "newline-per-chained-call": "off",
-        "no-alert": "error",
-        "no-array-constructor": "error",
-        "no-await-in-loop": "off",
-        "no-bitwise": "error",
-        "no-buffer-constructor": "off",
-        "no-caller": "error",
-        "no-catch-shadow": "error",
-        "no-confusing-arrow": "error",
-        "no-continue": "off",
-        "no-div-regex": "error",
-        "no-duplicate-imports": "error",
-        "no-else-return": "off",
-        "no-empty-function": "off",
-        "no-empty": "off",
-        "no-eq-null": "error",
-        "no-eval": "error",
-        "no-extend-native": "error",
-        "no-extra-bind": "error",
-        "no-extra-label": "error",
-        "no-extra-parens": "off",
-        "no-floating-decimal": "error",
-        "no-implicit-coercion": "off",
-        "no-implicit-globals": "error",
-        "no-implied-eval": "error",
-        "no-inline-comments": "off",
-        "no-inner-declarations": [
-            "error",
-            "functions"
-        ],
-        "no-invalid-this": "off",
-        "no-iterator": "error",
-        "no-label-var": "error",
-        "no-labels": "error",
-        "no-lone-blocks": "off",
-        "no-lonely-if": "error",
-        "no-loop-func": "off",
-        "no-magic-numbers": "off",
-        "no-mixed-operators": "error",
-        "no-mixed-requires": "warn",
-        "no-multi-assign": "error",
-        "no-multi-spaces": "off",
-        "no-multi-str": "error",
-        "no-multiple-empty-lines": "off",
-        "no-native-reassign": "error",
-        "no-negated-condition": "off",
-        "no-negated-in-lhs": "error",
-        "no-nested-ternary": "off",
-        "no-new": "error",
-        "no-new-func": "error",
-        "no-new-object": "error",
-        "no-new-require": "error",
-        "no-new-wrappers": "error",
-        "no-octal-escape": "off",
-        "no-param-reassign": "off",
-        "no-path-concat": "off",
-        "no-plusplus": "off",
-        "no-process-env": "off",
-        "no-process-exit": "off",
-        "no-proto": "error",
-        "no-prototype-builtins": "off",
-        "no-restricted-globals": "error",
-        "no-restricted-imports": "error",
-        "no-restricted-modules": "error",
-        "no-restricted-properties": "error",
-        "no-restricted-syntax": "error",
-        "no-return-assign": "error",
-        "no-return-await": "error",
-        "no-script-url": "error",
-        "no-self-compare": "error",
-        "no-sequences": "error",
-        "no-shadow": "off",
-        "no-shadow-restricted-names": "error",
-        "no-spaced-func": "error",
-        "no-sync": "off",
-        "no-tabs": "error",
-        "no-template-curly-in-string": "error",
-        "no-ternary": "off",
-        "no-throw-literal": "error",
-        "no-trailing-spaces": "off",
-        "no-undef-init": "error",
-        "no-undefined": "off",
-        "no-underscore-dangle": "off",
-        "no-unmodified-loop-condition": "error",
-        "no-unneeded-ternary": "off",
-        "no-unused-expressions": "error",
-        "no-use-before-define": "off",
-        "no-useless-call": "error",
-        "no-useless-computed-key": "error",
-        "no-useless-concat": "error",
-        "no-useless-constructor": "off",
-        "no-useless-rename": "error",
-        "no-useless-return": "warn",
-        "no-var": "off",
-        "no-void": "error",
-        "no-warning-comments": "error",
-        "no-whitespace-before-property": "error",
-        "no-with": "error",
-        "object-curly-newline": "off",
-        "object-curly-spacing": "off",
-        "object-property-newline": "off",
-        "object-shorthand": "off",
-        "one-var": "off",
-        "one-var-declaration-per-line": "warn",
-        "no-unused-vars": "warn",
-        "operator-assignment": [
-            "error",
-            "always"
-        ],
-        "operator-linebreak": [
-            "error",
-            "before"
-        ],
-        "padded-blocks": "off",
-        "padding-line-between-statements": "error",
-        "prefer-arrow-callback": "off",
-        "prefer-const": "off",
-        "prefer-destructuring": "off",
-        "prefer-numeric-literals": "error",
-        "prefer-promise-reject-errors": "error",
-        "prefer-reflect": "off",
-        "prefer-rest-params": "off",
-        "prefer-spread": "error",
-        "prefer-template": "off",
-        "quote-props": "off",
-        "quotes": "off",
-        "radix": [
-            "error",
-            "always"
-        ],
-        "require-await": "off",
-        "require-jsdoc": "off",
-        "rest-spread-spacing": "error",
-        "semi": "off",
-        "semi-spacing": "off",
-        "semi-style": [
-            "error",
-            "last"
-        ],
-        "sort-imports": "error",
-        "sort-keys": "off",
-        "sort-vars": "warn",
-        "space-before-blocks": "off",
-        "space-before-function-paren": "off",
-        "space-in-parens": [
-            "error",
-            "never"
-        ],
-        "space-infix-ops": "off",
-        "space-unary-ops": "off",
-        "spaced-comment": "off",
-        "strict": "off",
-        "switch-colon-spacing": "error",
-        "symbol-description": "off",
-        "template-curly-spacing": "error",
-        "template-tag-spacing": "error",
-        "unicode-bom": [
-            "error",
-            "never"
-        ],
-        "valid-jsdoc": "warn",
-        "vars-on-top": "off",
-        "wrap-iife": "error",
-        "wrap-regex": "error",
-        "yield-star-spacing": "error",
-        "yoda": "off",
-        "no-console": "off",
-        "require-yield": "off"
-    }
-};