From e55491eb0a219d4b491f0332c577b46b072202aa Mon Sep 17 00:00:00 2001
From: z30034863 <zhangfengzhuang@huawei.com>
Date: Sat, 10 May 2025 20:51:14 +0800
Subject: [PATCH] feature: add pac.json packaging capability

Signed-off-by: z30034863 <zhangfengzhuang@huawei.com>
---
 README_zh.md                                  |  9 ++++--
 adapter/ohos/CommandParser.java               |  5 ++++
 adapter/ohos/CompressVerify.java              | 28 +++++++++++++++++++
 adapter/ohos/Compressor.java                  | 17 ++++++++++-
 adapter/ohos/Constants.java                   |  5 ++++
 adapter/ohos/PackageUtil.java                 |  5 ++++
 adapter/ohos/ShowHelp.java                    |  3 +-
 adapter/ohos/Utility.java                     |  9 ++++++
 .../frameworks/include/app_packager.h         |  1 +
 packing_tool/frameworks/include/constants.h   |  3 ++
 packing_tool/frameworks/src/app_packager.cpp  | 24 ++++++++++++++++
 .../frameworks/src/fast_app_packager.cpp      | 14 ++++++++++
 .../frameworks/src/multiapp_packager.cpp      | 14 ++++++++++
 13 files changed, 132 insertions(+), 5 deletions(-)

diff --git a/README_zh.md b/README_zh.md
index 37b7277b..d820b86f 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -77,7 +77,7 @@ java -jar app_packing_tool.jar --mode res --entrycard-path [option] --pack-info-
 #### 1.3.1 示例
 
 ```
-java -jar app_packing_tool.jar --mode app [--hap-path <path>] [--hsp-path <path>] --out-path <path> [--signature-path <path>] [--certificate-path <path>] [--pack-info-path <path>] --force <option> [--encrypt-path <path>]
+java -jar app_packing_tool.jar --mode app [--hap-path <path>] [--hsp-path <path>] --out-path <path> [--signature-path <path>] [--certificate-path <path>] [--pack-info-path <path>] --force <option> [--encrypt-path <path>] [--pac-json-path <path>]
 ```
 
 #### 1.3.2 参数含义及规范
@@ -94,6 +94,7 @@ java -jar app_packing_tool.jar --mode app [--hap-path <path>] [--hsp-path <path>
 | --pack-res-path    | 否     | NA          | 打包res的目标文件路径，文件名需要为pack.res。                                 |
 | --force            | 否     | true或者false | 默认值为false，如果为true，表示当目标文件存在时，强制删除。                           |
 | --encrypt-path     | 否     | NA          | 文件名必须为encrypt.json。                                          |
+| --pac-json-path    | 否     | NA          | 文件名必须为pac.json。                                              |
 
 #### 1.3.3 打包app时hap的合法性校验
 
@@ -109,7 +110,7 @@ API 16变更：每个hap在json文件中配置的minCompatibleVersionCode、targ
 #### 1.4.1 示例
 
 ```
-java -jar app_packing_tool.jar --mode multiApp --hap-list <1.hap,2.hap> --hsp-list <1.hsp,2.hsp> --app-list <1.app,2.app> --out-path <final.app> [--encrypt-path <path>]
+java -jar app_packing_tool.jar --mode multiApp --hap-list <1.hap,2.hap> --hsp-list <1.hsp,2.hsp> --app-list <1.app,2.app> --out-path <final.app> [--encrypt-path <path>] [--pac-json-path <path>]
 ```
 
 #### 1.4.2 参数含义及规范
@@ -123,6 +124,7 @@ java -jar app_packing_tool.jar --mode multiApp --hap-list <1.hap,2.hap> --hsp-li
 | --out-path     | 是     | NA              | 目标文件路径，文件名必须以.app为后缀。            |
 | --force        | 否     | 默认值为false       | 默认值为false，如果为true，表示当目标文件存在时，强制删除。                                                                |
 | --encrypt-path | 否     | encrypt.json的路径 | 文件名必须为encrypt.json。                                                                |
+| --pac-json-path    | 否     | NA          | 文件名必须为pac.json。                                              |
 
 #### 1.4.3 多工程打包hap合法性校验
 
@@ -239,7 +241,7 @@ java -jar path\app_packing_tool.jar --mode packageNormalize --hsp-list path\1.hs
 #### 1.10.1 示例
 
 ```
-java -jar app_packing_tool.jar --mode fastApp --hap-path <option> --hsp-path <option> --out-path [option] --signature-path [option] --certificate-path [option] --pack-info-path [option] --force [option]
+java -jar app_packing_tool.jar --mode fastApp --hap-path <option> --hsp-path <option> --out-path [option] --signature-path [option] --certificate-path [option] --pack-info-path [option] --force [option] [--pac-json-path <path>]
 ```
 
 #### 1.10.2 参数含义及规范
@@ -256,6 +258,7 @@ java -jar app_packing_tool.jar --mode fastApp --hap-path <option> --hsp-path <op
 | --pack-res-path    | 否     | NA          | 打包res的目标文件路径，文件名需要为pack.res。                                                                          |
 | --force            | 否     | true或者false | 默认值为false，如果为true，表示当目标文件存在时，强制删除。                                                                    |
 | --encrypt-path     | 否     | NA          | 文件名必须为encrypt.json。                                                                    |
+| --pac-json-path    | 否     | NA          | 文件名必须为pac.json。                                              |
 
 #### 1.10.3 打包app时hap、hsp的合法性校验
 
diff --git a/adapter/ohos/CommandParser.java b/adapter/ohos/CommandParser.java
index 19615008..bdec936f 100644
--- a/adapter/ohos/CommandParser.java
+++ b/adapter/ohos/CommandParser.java
@@ -65,6 +65,7 @@ public class CommandParser {
     private static final String CMD_OUT_PATH = "--out-path";
     private static final String CMD_PACK_INFO_PATH = "--pack-info-path";
     private static final String CMD_ENCRYPT_PATH = "--encrypt-path";
+    private static final String CMD_PAC_JSON_PATH = "--pac-json-path";
     private static final String CMD_BIN_PATH = "--bin-path";
     private static final String CMD_JAR_PATH = "--jar-path";
     private static final String CMD_TXT_PATH = "--txt-path";
@@ -249,6 +250,10 @@ public class CommandParser {
             entry.getKey().setEncryptPath(entry.getValue());
             return true;
         });
+        commandFuncs.put(CMD_PAC_JSON_PATH, entry -> {
+            entry.getKey().setPacJsonPath(entry.getValue());
+            return true;
+        });
         commandFuncs.put(CMD_BIN_PATH, entry -> {
             entry.getKey().setBinPath(entry.getValue());
             return true;
diff --git a/adapter/ohos/CompressVerify.java b/adapter/ohos/CompressVerify.java
index 1bdd37d6..a6f535b2 100644
--- a/adapter/ohos/CompressVerify.java
+++ b/adapter/ohos/CompressVerify.java
@@ -715,6 +715,12 @@ public class CompressVerify {
             return false;
         }
 
+        if (!isValidPacJsonFile(utility)) {
+            String errMsg = "--pac-json-path is invalid.";
+            LOG.error(PackingToolErrMsg.APP_MODE_ARGS_INVALID.toString(errMsg));
+            return false;
+        }
+
         if (!utility.getSignaturePath().isEmpty() && !(new File(utility.getSignaturePath())).isFile()) {
             String errMsg = "--signature-path is invalid.";
             LOG.error(PackingToolErrMsg.APP_MODE_ARGS_INVALID.toString(errMsg));
@@ -835,6 +841,12 @@ public class CompressVerify {
             return false;
         }
 
+        if (!isValidPacJsonFile(utility)) {
+            String errMsg = "--pac-json-path is invalid.";
+            LOG.error(PackingToolErrMsg.MULTI_APP_MODE_ARGS_INVALID.toString(errMsg));
+            return false;
+        }
+
         File outFile = new File(utility.getOutPath());
         if (("false".equals(utility.getForceRewrite())) && outFile.exists()) {
             String errMsg = "--out-path file already exist, but --force is not 'true'.";
@@ -1511,6 +1523,22 @@ public class CompressVerify {
         return true;
     }
 
+    /**
+     * Indicates whether the "--pac-json-path" parameter is valid.
+     *
+     * @param utility - compress parameters
+     * @return true if "--pac-json-path" param exists and the file name is pac.json, or the "--pac-json-path"
+     *         param is empty, or has no "--pac-json-path" param
+     *         false other situations
+     */
+    private static boolean isValidPacJsonFile(Utility utility) {
+        if (!utility.getPacJsonPath().isEmpty()) {
+            File filePacJson = new File(utility.getPacJsonPath());
+            return filePacJson.isFile() && Constants.FILE_PAC_JSON.equals(filePacJson.getName());
+        }
+        return true;
+    }
+
     private static boolean hasHomeExtensionAbility(Utility utility) {
         try {
             boolean result = false;
diff --git a/adapter/ohos/Compressor.java b/adapter/ohos/Compressor.java
index 256d7ef5..792de8d6 100644
--- a/adapter/ohos/Compressor.java
+++ b/adapter/ohos/Compressor.java
@@ -1464,6 +1464,8 @@ public class Compressor {
             compressFile(utility, file, NULL_DIR_NAME, false);
             // pack encrypt.json file
             packEncryptJsonFile(utility);
+            // pack pac.json file
+            packPacJsonFile(utility);
         } catch (BundleException e) {
             LOG.error(PackingToolErrMsg.COMPRESS_APP_FAILED.toString(
                 "Compress app file exist BundleException: " + e.getMessage()));
@@ -1521,6 +1523,8 @@ public class Compressor {
         pathToFile(utility, utility.getPackInfoPath(), NULL_DIR_NAME, false);
         // pack encrypt.json file
         packEncryptJsonFile(utility);
+        // pack pac.json file
+        packPacJsonFile(utility);
         // hap/hsp
         for (String hapPath : fileList) {
             HapVerifyInfo hapVerifyInfo = hapVerifyInfoMap.get(getFileNameByPath(hapPath));
@@ -1597,6 +1601,8 @@ public class Compressor {
             compressFile(utility, file, NULL_DIR_NAME, false);
             //pack encrypt.json file
             packEncryptJsonFile(utility);
+            // pack pac.json file
+            packPacJsonFile(utility);
         } catch (BundleException | IOException exception) {
             String errMsg = "Compress app mode for multi project file exist Exception (BundleException | IOException): "
                     + exception.getMessage();
@@ -2675,7 +2681,8 @@ public class Compressor {
             if (!entryName.contains(RAW_FILE_PATH)
                     && !entryName.contains(RES_FILE_PATH)
                     && srcFile.getName().toLowerCase(Locale.ENGLISH).endsWith(JSON_SUFFIX)
-                    && !entryName.equals(Constants.FILE_ENCRYPT_JSON)) {
+                    && !entryName.equals(Constants.FILE_ENCRYPT_JSON)
+                    && !entryName.equals(Constants.FILE_PAC_JSON)) {
                 zipEntry.setMethod(ZipEntry.STORED);
                 if (jsonSpecialProcess(utility, srcFile, zipEntry)) {
                     return;
@@ -3795,6 +3802,14 @@ public class Compressor {
         }
     }
 
+    private void packPacJsonFile(Utility utility) throws BundleException {
+        if (!utility.getPacJsonPath().isEmpty()) {
+            pathToFile(utility, utility.getPacJsonPath(), NULL_DIR_NAME, false);
+        } else {
+            LOG.info("Compressor::packPacJsonFile has no pac.json");
+        }
+    }
+
     private void generalNormalize(Utility utility) {
         List<HashMap<String, String>> recordList = new ArrayList<>();
         Path tempDir = null;
diff --git a/adapter/ohos/Constants.java b/adapter/ohos/Constants.java
index 98d2cf23..11151542 100644
--- a/adapter/ohos/Constants.java
+++ b/adapter/ohos/Constants.java
@@ -151,6 +151,11 @@ public class Constants {
      */
     public static final String FILE_ENCRYPT_JSON = "encrypt.json";
 
+    /**
+     * Indicates the file name: pac.json
+     */
+    public static final String FILE_PAC_JSON = "pac.json";
+
     /**
      * Indicates the file name: module.json
      */
diff --git a/adapter/ohos/PackageUtil.java b/adapter/ohos/PackageUtil.java
index 6c246226..26335ccc 100644
--- a/adapter/ohos/PackageUtil.java
+++ b/adapter/ohos/PackageUtil.java
@@ -812,6 +812,11 @@ public class PackageUtil {
             LOG.error(PackingToolErrMsg.FAST_APP_MODE_ARGS_INVALID.toString("--encrypt-path is invalid."));
             return false;
         }
+        if (!utility.getPacJsonPath().isEmpty()
+                && !isFileValid(utility.getPacJsonPath(), Constants.FILE_PAC_JSON)) {
+            LOG.error(PackingToolErrMsg.FAST_APP_MODE_ARGS_INVALID.toString("--pac-json-path is invalid."));
+            return false;
+        }
         Path outPath = Paths.get(utility.getOutPath());
         if (utility.getForceRewrite().equals(Constants.FALSE) && Files.exists(outPath)) {
             LOG.error(PackingToolErrMsg.FAST_APP_MODE_ARGS_INVALID.toString("--out-path file already existed, but " +
diff --git a/adapter/ohos/ShowHelp.java b/adapter/ohos/ShowHelp.java
index bb0430db..b4f71c60 100644
--- a/adapter/ohos/ShowHelp.java
+++ b/adapter/ohos/ShowHelp.java
@@ -87,7 +87,8 @@ public interface ShowHelp {
                 "                                 out file if exists.\n" +
                 "  --signature-path               signature file path.\n" +
                 "  --certificate-path             certificate file path.\n" +
-                "  --encrypt-path                 encrypt.json file path.");
+                "  --encrypt-path                 encrypt.json file path." +
+                "  --pac-json-path                 pac.json file path.");
     }
 
     /**
diff --git a/adapter/ohos/Utility.java b/adapter/ohos/Utility.java
index 3866fb82..c8597fc6 100644
--- a/adapter/ohos/Utility.java
+++ b/adapter/ohos/Utility.java
@@ -69,6 +69,7 @@ public class Utility {
     private String outPath = "";
     private String packInfoPath = "";
     private String encryptPath = "";
+    private String pacJsonPath = "";
     private String binPath = "";
     private boolean isCompressNativeLibs = false;
     private String moduleName = "";
@@ -436,6 +437,14 @@ public class Utility {
         }
     }
 
+    public String getPacJsonPath() {
+        return pacJsonPath;
+    }
+
+    public void setPacJsonPath(String pacJsonPath) {
+        this.pacJsonPath = pacJsonPath;
+    }
+
     public String getJarPath() {
         return jarPath;
     }
diff --git a/packing_tool/frameworks/include/app_packager.h b/packing_tool/frameworks/include/app_packager.h
index 5fa7d402..f193b808 100644
--- a/packing_tool/frameworks/include/app_packager.h
+++ b/packing_tool/frameworks/include/app_packager.h
@@ -49,6 +49,7 @@ public:
     bool CheckCertificatePath();
     bool CheckEntrycardPath();
     bool CheckPackResPath();
+    bool CheckPacJsonPath();
 
 protected:
     int32_t InitAllowedParam() override;
diff --git a/packing_tool/frameworks/include/constants.h b/packing_tool/frameworks/include/constants.h
index 1de895ff..f30670b9 100644
--- a/packing_tool/frameworks/include/constants.h
+++ b/packing_tool/frameworks/include/constants.h
@@ -92,10 +92,12 @@ const std::string PARAM_MAIN_MODULE_LIMIT = "main-module-limit";
 const std::string PARAM_NORMAL_MODULE_LIMIT = "normal-module-limit";
 const std::string PARAM_TOTAL_LIMIT = "total-limit";
 const std::string PARAM_BUNDLE_NAME = "bundle-name";
+const std::string PARAM_PAC_JSON_PATH = "pac-json-path";
 
 const std::string MODULE_JSON = "module.json";
 const std::string CONFIG_JSON = "config.json";
 const std::string PATCH_JSON = "patch.json";
+const std::string PAC_JSON = "pac.json";
 const std::string LIB_PATH = "libs";
 const std::string AN_PATH = "an";
 const std::string AP_PATH = "ap";
@@ -200,6 +202,7 @@ const struct option LONG_OPTIONS[] = {
     {PARAM_ENTRYCARD_PATH.c_str(), required_argument, nullptr, 43},
     {PARAM_BUNDLE_NAME.c_str(), required_argument, nullptr, 44},
     {PARAM_TOTAL_LIMIT.c_str(), required_argument, nullptr, 45},
+    {PARAM_PAC_JSON_PATH.c_str(), required_argument, nullptr, 46},
     {nullptr, 0, nullptr, 0},
 };
 constexpr const int32_t OPTIONS_SIZE = sizeof(LONG_OPTIONS) / sizeof(LONG_OPTIONS[0]);
diff --git a/packing_tool/frameworks/src/app_packager.cpp b/packing_tool/frameworks/src/app_packager.cpp
index 67355a73..bfad58d8 100644
--- a/packing_tool/frameworks/src/app_packager.cpp
+++ b/packing_tool/frameworks/src/app_packager.cpp
@@ -321,6 +321,18 @@ bool AppPackager::CheckPackResPath()
     return true;
 }
 
+bool AppPackager::CheckPacJsonPath()
+{
+    auto it = parameterMap_.find(Constants::PARAM_PAC_JSON_PATH);
+    if (it != parameterMap_.end() && !it->second.empty()) {
+        if (!IsPathValid(it->second, true, Constants::PAC_JSON)) {
+            LOGE("pac-json-path is invalid.");
+            return false;
+        }
+    }
+    return true;
+}
+
 bool AppPackager::IsVerifyValidInAppMode()
 {
     std::string hapPath;
@@ -341,6 +353,11 @@ bool AppPackager::IsVerifyValidInAppMode()
         return false;
     }
 
+    if (!CheckPacJsonPath()) {
+        LOGE("CheckPacJsonPath failed!");
+        return false;
+    }
+
     std::string outPath;
     if (!GetAndCheckOutPath(outPath)) {
         LOGE("GetAndCheckOutPath failed!");
@@ -502,6 +519,13 @@ bool AppPackager::CompressOtherFiles()
             return false;
         }
     }
+    it = parameterMap_.find(Constants::PARAM_PAC_JSON_PATH);
+    if (it != parameterMap_.end()) {
+        if (zipWrapper_.AddFileOrDirectoryToZip(it->second, Constants::PAC_JSON) != ZipErrCode::ZIP_ERR_SUCCESS) {
+            LOGE("AppPackager::CompressOtherFiles: zipWrapper pac.json failed!");
+            return false;
+        }
+    }
     return true;
 }
 
diff --git a/packing_tool/frameworks/src/fast_app_packager.cpp b/packing_tool/frameworks/src/fast_app_packager.cpp
index 6c540d5a..9fc7219f 100644
--- a/packing_tool/frameworks/src/fast_app_packager.cpp
+++ b/packing_tool/frameworks/src/fast_app_packager.cpp
@@ -185,6 +185,13 @@ bool FastAppPackager::IsVerifyValid()
         return false;
     }
 
+    it = parameterMap_.find(Constants::PARAM_PAC_JSON_PATH);
+    if (it != parameterMap_.end() && !it->second.empty() &&
+        !IsPathValid(it->second, true, Constants::PAC_JSON)) {
+        LOGE("FastAppPackager::isVerifyValidInFastAppMode pac-json-path is invalid.");
+        return false;
+    }
+
     it = parameterMap_.find(Constants::PARAM_OUT_PATH);
     if (it == parameterMap_.end() || it->second.empty()) {
         LOGE("FastAppPackager::isVerifyValidInFastAppMode out-path is empty.");
@@ -698,6 +705,13 @@ bool FastAppPackager::PackFastApp(const std::list<std::string> &fileList)
             return false;
         }
     }
+    it = parameterMap_.find(Constants::PARAM_PAC_JSON_PATH);
+    if (it != parameterMap_.end() && !it->second.empty()) {
+        if (zipWrapper_.AddFileOrDirectoryToZip(it->second, Constants::PAC_JSON) != ZipErrCode::ZIP_ERR_SUCCESS) {
+            LOGE("FastAppPackager::PackFastApp: zipWrapper pac.json failed!");
+            return false;
+        }
+    }
     return AddSignatureAndCertificateToApp();
 }
 
diff --git a/packing_tool/frameworks/src/multiapp_packager.cpp b/packing_tool/frameworks/src/multiapp_packager.cpp
index a3014d69..31d74570 100644
--- a/packing_tool/frameworks/src/multiapp_packager.cpp
+++ b/packing_tool/frameworks/src/multiapp_packager.cpp
@@ -161,6 +161,13 @@ bool MultiAppPackager::IsVerifyValidInMultiAppMode()
         }
     }
 
+    it = parameterMap_.find(Constants::PARAM_PAC_JSON_PATH);
+    if (it != parameterMap_.end() && !it->second.empty() &&
+        !IsPathValid(it->second, true, Constants::PAC_JSON)) {
+        LOGE("MultiAppPackager::IsVerifyValidInMultiAppMode pac-json-path is invalid.");
+        return false;
+    }
+
     return IsOutPathValid(outPath, force, Constants::MODE_MULTIAPP);
 }
 
@@ -409,6 +416,13 @@ bool MultiAppPackager::CompressAppModeForMultiProject()
     if (zipWrapper_.AddFileOrDirectoryToZip(finalPackInfoPath, Constants::PACK_INFO) != ZipErrCode::ZIP_ERR_SUCCESS) {
         return false;
     }
+    std::map<std::string, std::string>::const_iterator it = parameterMap_.find(Constants::PARAM_PAC_JSON_PATH);
+    if (it != parameterMap_.end() && !it->second.empty()) {
+        if (zipWrapper_.AddFileOrDirectoryToZip(it->second, Constants::PAC_JSON) != ZipErrCode::ZIP_ERR_SUCCESS) {
+            LOGE("MultiAppPackager::CompressAppModeForMultiProject: zipWrapper pac.json failed!");
+            return false;
+        }
+    }
     zipWrapper_.Close();
     if (fs::exists(tempHapDirPath)) {
         fs::remove_all(tempHapDirPath);
-- 
Gitee