jh5_app_build 1.0.15 → 1.0.18

package/.eslintrc.js

@@ -126,7 +126,7 @@ module.exports = {
         "no-iterator": "error",
         "no-label-var": "error",
         "no-labels": "error",
-        "no-lone-blocks": "error",
+        "no-lone-blocks": "off",
         "no-lonely-if": "error",
         "no-loop-func": "off",
         "no-magic-numbers": "off",

package/bin/jh5_app_build.js

@@ -9,6 +9,8 @@ var jlog = jutils.jlog(__filename);
 
 var AdmZip = require('adm-zip');
 
+var inquirer = require('inquirer');
+
 // 关闭日志输出
 jlog.setEnable(false, "*");
 
@@ -71,6 +73,21 @@ function getBuildCfg(cmd) {
     return buildCfg;
 }
 
+/**
+ * 检查项目
+ * @param {*} buildCfg 构建配置
+ * @returns {void} 
+ */
+function chkProj(buildCfg) {
+    // 判断是否为h5项目
+    if (!fs.existsSync(buildCfg.rootPath + "/public/index.html")) {
+        console.error("The directory is not valid");
+        process.exit(-1);
+        return null;
+    }
+}
+
+
 // 命令
 program
     .command('build')
@@ -86,6 +103,36 @@ program
         // 获取配置
         var buildCfg = getBuildCfg(cmd);
 
+        // 检查项目
+        chkProj(buildCfg);
+
+        // 选择编译类型
+        var answers = await inquirer.prompt([
+            {
+                type: 'list',
+                name: 'platform',
+                message: 'Please select a compilation platform:',
+                choices: [
+                    {
+                        name: 'Weds device(*.jap file)',
+                        value: "weds"
+                    },
+                    {
+                        name: 'Std device(*.apk file)',
+                        value: "std"
+                    },
+                    {
+                        name: 'Std device lite(*.apk file,no web)',
+                        value: "std,noweb"
+                    }
+                ]
+            }
+        ]);
+        buildCfg.platform = answers.platform.split(",");
+
+        // 标准应用
+        buildCfg.isStdApp = buildCfg.platform.includes("std");
+
         // 缺省输出文件
         if (cmd.outpath) {
             buildCfg.outpath = cmd.outpath;
@@ -107,19 +154,27 @@ program
             buildCfg.dateStr = jutils.getNowDate().replace(/(-|:)/g, "").replace(/ /g, "_").substr(2, 11);
 
             // 处理文件名
-            buildCfg.outpath = `${process.cwd()}/jh5_${buildCfg.appName}_${buildCfg.dateStr}.jap`;
+            buildCfg.outpath = `${process.cwd()}/jh5_${buildCfg.appName}_${buildCfg.dateStr}.${buildCfg.isStdApp ? "apk" : "jap"}`;
         }
         buildCfg.outpath = path.resolve(buildCfg.outpath);
         jfile_utils.createDirs(buildCfg.outpath, true); // 建立目录
         console.log("[Out path] " + buildCfg.outpath);
 
-        // 执行编译
-        await require('../lib/build_japp')(cmd, buildCfg);
+        // 标准应用
+        if (buildCfg.isStdApp) {
+            // 执行编译
+            await require('../lib/build_std')(cmd, buildCfg);
+        }
+        // weds 应用
+        else {
+            // 执行编译
+            await require('../lib/build_japp')(cmd, buildCfg);
+        }
 
         // 执行自定义脚本
         var scriptObj = await loadUpdateScript(buildCfg.rootPath);
         if (scriptObj.build) {
-            console.log("run script...");
+            console.log("run build script...");
             try {
                 await scriptObj.build(cmd, buildCfg);
             } catch (error) {
@@ -131,6 +186,82 @@ program
     });
 
 
+/**
+ * 升级函数
+ * @param {*} cmd 命令行
+ * @returns {void}
+ */
+async function cmdUpdate(cmd) {
+    // 获取配置
+    var buildCfg = getBuildCfg(cmd);
+
+    // 检查项目
+    chkProj(buildCfg);
+
+    // 使用开发版
+    if (!cmd.ver && cmd.insiders) cmd.ver = "insiders";
+
+    // 获取版本
+    try {
+        var verData = await jutils.jhttp_utils.postJson(`http://reg.weds.com.cn:6608/res/get_build_pkg`, {
+            ver: cmd.ver || ""
+        }, {
+            stdBody: true
+        });
+        if (!verData.url) {
+            console.log("no url!");
+            return;
+        }
+        console.log("pkg version:" + verData.version);
+        console.log("start download");
+    } catch (error) {
+        console.error(error.message);
+        return;
+    }
+    // 下载
+    var downFilePath = buildCfg.rootPath + "/temp.jzip";
+    var perTimer = null;
+    await jutils.jhttp_utils.downloadFile(`http://reg.weds.com.cn:6608/${verData.url}`, downFilePath, {
+    }, (res, dwObj) => {
+        // 进度
+        perTimer = setInterval(() => {
+            console.log(`download [${parseInt(dwObj.current * 100 / dwObj.total, 10)}%] ${dwObj.current}/${dwObj.total}`);
+        }, 1000);
+    });
+    if (perTimer) {
+        clearInterval(perTimer);
+    }
+
+    // 删除旧资源
+    console.log("delete jbuild_data...");
+    await jutils.jfile_utils.deleteFolder(buildCfg.rootPath + "/jbuild_data");
+
+    // 解压
+    console.log("unpack...");
+    var myZip = new AdmZip(downFilePath);
+    myZip.extractAllTo(buildCfg.rootPath, true);
+    await jutils.jfile_utils.unlink(downFilePath);
+    try {
+        fs.writeFileSync(buildCfg.rootPath + "/jbuild_data/info.txt", JSON.stringify({
+            version: verData.version
+        }, null, 4));
+    } catch (error) {
+    }
+
+    // 执行自定义脚本
+    var scriptObj = await loadUpdateScript(buildCfg.rootPath);
+    if (scriptObj.update) {
+        console.log("run update script...");
+        try {
+            await scriptObj.update(cmd, buildCfg);
+        } catch (error) {
+            console.error(error);
+        }
+    }
+
+    console.log("update finish,ver:" + verData.version);
+}
+
 // 命令
 program
     .command('update')
@@ -139,16 +270,80 @@ program
     .option('-i, --insiders', 'use last insiders version')
     .option('-d, --details', 'show list files details')
     .option('-e, --exparam <param>', 'ext param')
+    .action(cmdUpdate);
+
+
+// 命令
+program
+    .command('clean')
+    .option('-c, --config <file>', 'Config file')
+    .option('-d, --details', 'show list files details')
     .action(async (cmd) => {
         // 获取配置
         var buildCfg = getBuildCfg(cmd);
 
+        // 检查项目
+        chkProj(buildCfg);
+
+        console.log("clean...");
+
+        // 删除下载包
+        console.log("delete dist...");
+        await jutils.jfile_utils.deleteFolder(buildCfg.rootPath + "/dist");
+        // console.log("delete jbuild_data...");
+        // await jutils.jfile_utils.deleteFolder(buildCfg.rootPath + "/jbuild_data");
+
+        // 删除生成的文件
+        var filelist = await jutils.jfile_utils.readdir(buildCfg.rootPath);
+        for (let index = 0; index < filelist.length; index++) {
+            const element = filelist[index];
+            if ([".jzip", ".tmp"].indexOf(path.extname(element)) >= 0) {
+                console.log("delete:" + element);
+                await jutils.jfile_utils.deleteFile(buildCfg.rootPath + "/" + element);
+            }
+        }
+        console.log("clean finish");
+    });
+
+
+// 命令
+program
+    .command('init')
+    .option('-n, --pname <pname>', 'use name')
+    .option('-v, --ver <ver>', 'use fixed version')
+    .option('-i, --insiders', 'use last insiders version')
+    .option('-d, --details', 'show list files details')
+    .action(async (cmd) => {
+        // 获取配置
+        var buildCfg = getBuildCfg(cmd);
+
+        // 判断是否已经存在软件包,防止应用被覆盖
+        if (fs.existsSync(path.resolve(buildCfg.rootPath + "/package.json"))
+            || fs.existsSync(path.resolve(buildCfg.rootPath + "/src"))) {
+            console.error("Project exists in current directory!");
+            return;
+        }
+
+        // 应用名
+        buildCfg.appName = cmd.pname || "";
+        if (!buildCfg.appName) {
+            try {
+                var appNameTmp = path.basename(buildCfg.rootPath) || "app";
+                for (let index = 0; index < appNameTmp.length; index++) {
+                    if (buildCfg.appName.length < 15 && Math.abs(appNameTmp.charCodeAt(index)) < 255) {
+                        buildCfg.appName += appNameTmp[index];
+                    }
+                }
+            } catch (error) {
+            }
+        }
+
         // 使用开发版
         if (!cmd.ver && cmd.insiders) cmd.ver = "insiders";
 
         // 获取版本
         try {
-            var verData = await jutils.jhttp_utils.postJson(`http://reg.weds.com.cn:6608/res/get_build_pkg`, {
+            var verData = await jutils.jhttp_utils.postJson(`http://reg.weds.com.cn:6608/res/get_init_pkg`, {
                 ver: cmd.ver || ""
             }, {
                 stdBody: true
@@ -157,7 +352,7 @@ program
                 console.log("no url!");
                 return;
             }
-            console.log("pkg version:" + verData.version);
+            console.log("init version:" + verData.version);
             console.log("start download");
         } catch (error) {
             console.error(error.message);
@@ -177,66 +372,41 @@ program
             clearInterval(perTimer);
         }
 
-        // 删除旧资源
-        console.log("delete jbuild_data...");
-        await jutils.jfile_utils.deleteFolder(buildCfg.rootPath + "/jbuild_data");
-
         // 解压
         console.log("unpack...");
         var myZip = new AdmZip(downFilePath);
         myZip.extractAllTo(buildCfg.rootPath, true);
         await jutils.jfile_utils.unlink(downFilePath);
+
+        // 修改package
         try {
-            fs.writeFileSync(buildCfg.rootPath + "/jbuild_data/info.txt", JSON.stringify({
-                version: verData.version
-            }, null, 4));
+            var pkgObj = JSON.parse(fs.readFileSync(buildCfg.rootPath + "/package.json", "utf8"));
+            pkgObj.name = buildCfg.appName;
+            pkgObj.versionJh5 = verData.version;
+            fs.writeFileSync(buildCfg.rootPath + "/package.json", JSON.stringify(pkgObj, null, 4));
         } catch (error) {
         }
 
+        // 执行update
+        await cmdUpdate({});
+
         // 执行自定义脚本
         var scriptObj = await loadUpdateScript(buildCfg.rootPath);
-        if (scriptObj.update) {
-            console.log("run script...");
+        if (scriptObj.init) {
+            console.log("run init script...");
             try {
-                await scriptObj.update(cmd, buildCfg);
+                await scriptObj.init(cmd, buildCfg);
             } catch (error) {
                 console.error(error);
             }
         }
 
-        console.log("update finish,ver:" + verData.version);
+        console.log("init finish,ver:" + verData.version);
+        console.warn("please run:[npm install] to install node_modules.");
     });
 
 
 
-// 命令
-program
-    .command('clean')
-    .option('-c, --config <file>', 'Config file')
-    .option('-d, --details', 'show list files details')
-    .action(async (cmd) => {
-        // 获取配置
-        var buildCfg = getBuildCfg(cmd);
-        console.log("clean...");
-
-        // 删除下载包
-        console.log("delete dist...");
-        await jutils.jfile_utils.deleteFolder(buildCfg.rootPath + "/dist");
-        // console.log("delete jbuild_data...");
-        // await jutils.jfile_utils.deleteFolder(buildCfg.rootPath + "/jbuild_data");
-
-        // 删除生成的文件
-        var filelist = await jutils.jfile_utils.readdir(buildCfg.rootPath);
-        for (let index = 0; index < filelist.length; index++) {
-            const element = filelist[index];
-            if ([".jap", ".jzip", ".tmp"].indexOf(path.extname(element)) >= 0) {
-                console.log("delete:" + element);
-                await jutils.jfile_utils.deleteFile(buildCfg.rootPath + "/" + element);
-            }
-        }
-        console.log("clean finish");
-    });
-
 // 开始解析
 program.parse(process.argv);
 

package/lib/build_std.js

@@ -0,0 +1,164 @@
+let glob = require("glob")
+let archiver = require('archiver');
+let jutils = require('base_parts');
+
+let fs = require('fs');
+let os = require('os');
+let AdmZip = require('adm-zip');
+
+module.exports = async (cmd, buildCfg) => {
+    return new Promise((resolve, reject) => {
+        (async () => {
+
+            // 建立压缩文件
+            console.log(`build file to ${buildCfg.outpath}`);
+            let output = fs.createWriteStream(buildCfg.outpath);
+            let archive = archiver('zip', {
+                zlib: { level: 9 }
+            });
+            output.on('close', function () {
+                console.log(archive.pointer() + ' total bytes');
+                console.log(`build success:${buildCfg.outpath}`);
+                resolve();
+            });
+            output.on('end', function () {
+            });
+            archive.on('warning', function (err) {
+                if (err.code === 'ENOENT') {
+                } else {
+                    reject(err);
+                }
+            });
+            archive.on('error', function (err) {
+                reject(err);
+            });
+            archive.pipe(output);
+
+            // 修改版本号
+            let platformVer = jutils.getUUID();
+            try {
+                console.log(`change dist ver ...`);
+                let repFile = `${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);
+
+                // 读取H5版本
+                try {
+                    let bInfoStr = fs.readFileSync(`${buildCfg.rootPath}/jbuild_data/info.txt`, "utf8");
+                    let bInfoObj = JSON.parse(bInfoStr);
+                    if (bInfoObj.version) {
+                        platformVer = bInfoObj.version;
+                        indexStr = indexStr.replace(/#J_H5_VER#/g, bInfoObj.version);
+                    }
+                } catch (error) {
+                    console.log(`no h5Ver!`);
+                }
+
+                // 保存
+                fs.writeFileSync(repFile, indexStr);
+            } catch (error) {
+            }
+
+            // 载入apk
+            {
+                console.log(`load files ...`);
+                let myZip = new AdmZip(`${buildCfg.rootPath}/jbuild_data/std_bins/app-release.apk`);
+
+                // 循环添加
+                let zipEntries = myZip.getEntries();
+                zipEntries.forEach(function (zipEntry) {
+                    // 过滤签名
+                    if (!["META-INF/CERT.RSA", "META-INF/CERT.SF", "META-INF/MANIFEST.MF"].includes(zipEntry.entryName.toUpperCase())) {
+                        archive.append(zipEntry.getData(), { name: zipEntry.entryName });
+                    }
+                    else {
+                        console.error(">>>>>>>>>" + zipEntry);
+                    }
+                });
+            }
+
+            // 添加用户文件
+            {
+                let pathSub = "dist";
+                console.log(`scaning ${pathSub} ...`);
+                let fileList = glob(`${pathSub}/**/*`, {
+                    dot: true,
+                    sync: true,
+                    nodir: true,
+                    cwd: buildCfg.rootPath,
+                    ignore: []
+                });
+                if (fileList.length === 0) {
+                    console.error("no dist files!");
+                    return;
+                }
+                console.log(`add [${fileList.length}] files ...`);
+                for (let index = 0; index < fileList.length; index++) {
+                    let element = fileList[index].substr(pathSub.length + 1);
+
+                    // 添加文件
+                    archive.append(fs.readFileSync(`${buildCfg.rootPath}/${pathSub}/${element}`), { name: "assets/h5app/" + element });
+                }
+            }
+
+            // 需要web
+            if (!buildCfg.platform.includes("noweb")) {
+                // 添加框架二进制
+                {
+                    let pathSub = "jbuild_data/jext";
+                    console.log(`scaning ${pathSub} ...`);
+                    let fileList = glob(`${pathSub}/**/*`, {
+                        dot: true,
+                        sync: true,
+                        nodir: true,
+                        cwd: buildCfg.rootPath,
+                        ignore: []
+                    });
+                    console.log(`add [${fileList.length}] files ...`);
+                    for (let index = 0; index < fileList.length; index++) {
+                        let element = fileList[index].substr(pathSub.length + 1);
+
+                        // 添加文件
+                        archive.append(fs.readFileSync(`${buildCfg.rootPath}/${pathSub}/${element}`), { name: "assets/jext/" + element });
+                    }
+                }
+
+                // 添加后台服务
+                {
+                    console.log(`add device_webapi files ...`);
+                    // 载入zip
+                    let myZip = new AdmZip(`${buildCfg.rootPath}/jbuild_data/device_webapi.zip`);
+
+                    // 循环添加
+                    let zipEntries = myZip.getEntries();
+                    zipEntries.forEach(function (zipEntry) {
+                        archive.append(zipEntry.getData(), { name: "assets/device_webapi/" + zipEntry.entryName });
+                    });
+
+                    // 版本号
+                    archive.append(Buffer.from(platformVer), { name: "assets/device_webapi/info.txt" });
+                }
+
+            }
+            // 添加设备信息
+            try {
+                let pkgInfo = os.networkInterfaces();
+                pkgInfo.buildTime = jutils.getNowDate();
+                archive.append(JSON.stringify(pkgInfo, null, 4), { name: "assets/build_info.txt" });
+            } catch (error) {
+            }
+
+            // 开始压缩
+            archive.finalize();
+        })().catch((err) => {
+            console.error("build error,please run [jh5 update] first.");
+            try {
+                jutils.jfile_utils.deleteFile(buildCfg.outpath);
+            } catch (error) {
+            }
+        });
+    });
+
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jh5_app_build",
-  "version": "1.0.15",
+  "version": "1.0.18",
   "description": "jaskle jh5_app_build",
   "main": "./bin/jh5_app_build.js",
   "registry": true,
@@ -22,6 +22,7 @@
     "base_parts": "^2.*",
     "commander": "^2.*",
     "glob": "^7.*",
+    "inquirer": "^8.2.4",
     "request": "^2.*"
   },
   "devDependencies": {