From 86d3934627da041cef47152a5851109228ca9c57 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Fri, 26 Apr 2024 16:19:05 +0800
Subject: [PATCH 01/20] add hnp_packages

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 modulecheck/module.json | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/modulecheck/module.json b/modulecheck/module.json
index 902a85ee..7062e45b 100644
--- a/modulecheck/module.json
+++ b/modulecheck/module.json
@@ -135,7 +135,8 @@
                 "querySchemes",
                 "routerMap",
                 "appEnvironments",
-                "appStartup"
+                "appStartup",
+                "hnp_packages"
               ]
             },
             "required": [
@@ -1464,6 +1465,35 @@
           "type": "string",
           "pattern": "^[$]profile:[0-9a-zA-Z_.]+$",
           "maxLength": 255
+        },
+        "hnp_packages": {
+          "description": "Native package configuration file.",
+          "type": "array",
+          "items": {
+            "type": "object",
+            "propertyNames": {
+              "enum": [
+                "package",
+                "type"
+              ]
+            },
+            "properties": {
+              "package": {
+                "description": "Indicates the file name of native package.",
+                "type": "string",
+                "pattern": "^[a-zA-Z][0-9a-zA-Z_./]+$",
+                "maxLength": 255
+              },
+              "type": {
+                "description": "Indicates the type of native package.",
+                "type": "string",
+                "enum": [
+                  "public",
+                  "private"
+                ]
+              }
+            }
+          }
         }
       }
     }
-- 
Gitee


From 83833bad08d94b212460431fde66deaff06f65c6 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Fri, 10 May 2024 09:47:47 +0800
Subject: [PATCH 02/20] fix:json gbk -> utf8

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 adapter/ohos/Compressor.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/adapter/ohos/Compressor.java b/adapter/ohos/Compressor.java
index 03e7549a..93b2c590 100644
--- a/adapter/ohos/Compressor.java
+++ b/adapter/ohos/Compressor.java
@@ -27,6 +27,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -524,7 +525,8 @@ public class Compressor {
             String pretty = JSON.toJSONString(jsonObject, new SerializerFeature[]{
                     SerializerFeature.PrettyFormat, SerializerFeature.WriteMapNullValue,
                     SerializerFeature.WriteDateUseDateFormat});
-            bw = new BufferedWriter(new FileWriter(utility.getJsonPath()));
+            bw = new BufferedWriter(new OutputStreamWriter(
+                    new FileOutputStream(utility.getJsonPath()), StandardCharsets.UTF_8));
             bw.write(pretty);
         } catch (BundleException | IOException | JSONException exception) {
             LOG.error("Compressor::setGenerateBuildHash failed.");
@@ -651,7 +653,7 @@ public class Compressor {
             moduleJson.put(BUILD_HASH, hash);
             String pretty = JSON.toJSONString(jsonObject, SerializerFeature.PrettyFormat,
                     SerializerFeature.WriteMapNullValue, SerializerFeature.WriteDateUseDateFormat);
-            bw = new BufferedWriter(new FileWriter(jsonPath));
+            bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(jsonPath), StandardCharsets.UTF_8));
             bw.write(pretty);
         } catch (IOException e) {
             LOG.error("Compressor::putBuildHash failed, IOException: " + e.getMessage());
@@ -2974,7 +2976,8 @@ public class Compressor {
         try {
             String pretty = JSON.toJSONString(jsonObject, SerializerFeature.PrettyFormat,
                 SerializerFeature.WriteMapNullValue, SerializerFeature.WriteDateUseDateFormat);
-            bw = new BufferedWriter(new FileWriter(jsonFilePath));
+            bw = new BufferedWriter(new OutputStreamWriter(
+                    new FileOutputStream(jsonFilePath), StandardCharsets.UTF_8));
             bw.write(pretty);
         } catch (IOException exception) {
             LOG.error("Compressor::writeJson failed for IOException " + exception.getMessage());
-- 
Gitee


From 13c916de86e2386e620ea1f00444c42839debf59 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Fri, 10 May 2024 18:09:15 +0800
Subject: [PATCH 03/20] check resources-path,ets-path, add log

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 adapter/ohos/CompressVerify.java | 10 ++++++++++
 adapter/ohos/Compressor.java     |  3 ++-
 adapter/ohos/Utility.java        |  3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/adapter/ohos/CompressVerify.java b/adapter/ohos/CompressVerify.java
index 520ee7dc..fbf0bc10 100644
--- a/adapter/ohos/CompressVerify.java
+++ b/adapter/ohos/CompressVerify.java
@@ -382,6 +382,11 @@ public class CompressVerify {
             return false;
         }
 
+        if (!utility.getEtsPath().isEmpty() && !isPathValid(utility.getEtsPath(), TYPE_DIR, null)) {
+            LOG.error("CompressVerify::isArgsValidInHapMode ets-path is invalid.");
+            return false;
+        }
+
         return isOutPathValid(utility, HAP_SUFFIX);
     }
 
@@ -944,6 +949,11 @@ public class CompressVerify {
             }
         }
 
+        if (!utility.getEtsPath().isEmpty() && !isPathValid(utility.getEtsPath(), TYPE_DIR, null)) {
+            LOG.error("CompressVerify::isArgsValidInHspMode ets-path is invalid.");
+            return false;
+        }
+
         return isOutPathValid(utility, HSP_SUFFIX);
     }
 
diff --git a/adapter/ohos/Compressor.java b/adapter/ohos/Compressor.java
index 03e7549a..212c1312 100644
--- a/adapter/ohos/Compressor.java
+++ b/adapter/ohos/Compressor.java
@@ -2381,8 +2381,9 @@ public class Compressor {
             // compress data
             zipOut.putArchiveEntry(entry);
             zipOut.write(trimJson);
-        } catch (IOException exception) {
+        } catch (Exception exception) {
             LOG.error("Compressor::jsonSpecialProcess io exception: " + exception.getMessage());
+            LOG.warning("Json format err: " + srcFile.getAbsolutePath());
             throw new BundleException("Json special process failed.");
         } finally {
             Utility.closeStream(bufferedReader);
diff --git a/adapter/ohos/Utility.java b/adapter/ohos/Utility.java
index 8d58a0e6..b7ffcbf1 100644
--- a/adapter/ohos/Utility.java
+++ b/adapter/ohos/Utility.java
@@ -41,6 +41,7 @@ public class Utility {
     static final String FALSE_STRING = "false";
     static final String TRUE_STRING = "true";
 
+    private static final String INVALID_PATH = "invalid";
     private static final String CMD_PREFIX = "--";
     private static final Log LOG = new Log(Utility.class.toString());
 
@@ -664,7 +665,7 @@ public class Utility {
         try {
             canonicalPath = file.getCanonicalPath();
         } catch (IOException exception) {
-            canonicalPath = "";
+            canonicalPath = INVALID_PATH;
             LOG.error("Utility::getFormattedPath exception," + exception.getMessage());
         }
         return canonicalPath;
-- 
Gitee


From bf59c798b5186bea084dc2fb57b7738ce0f05270 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Sat, 11 May 2024 20:47:53 +0800
Subject: [PATCH 04/20] catch JSONException

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 adapter/ohos/JsonUtil.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java
index 1ad3360a..5dce29cf 100644
--- a/adapter/ohos/JsonUtil.java
+++ b/adapter/ohos/JsonUtil.java
@@ -1530,12 +1530,16 @@ public class JsonUtil {
             if (jsonStr.isEmpty()) {
                 continue;
             }
-            JSONObject jsonObj = JSON.parseObject(jsonStr);
-            if (jsonObj.containsKey("shortcuts")) {
-                JSONArray shortcutObjs = jsonObj.getJSONArray("shortcuts");
-                for (int j = 0; j < shortcutObjs.size(); ++j) {
-                    shortcuts.add(parseModuleShortcutObj(shortcutObjs.getJSONObject(j), data));
+            try {
+                JSONObject jsonObj = JSON.parseObject(jsonStr);
+                if (jsonObj.containsKey("shortcuts")) {
+                    JSONArray shortcutObjs = jsonObj.getJSONArray("shortcuts");
+                    for (int j = 0; j < shortcutObjs.size(); ++j) {
+                        shortcuts.add(parseModuleShortcutObj(shortcutObjs.getJSONObject(j), data));
+                    }
                 }
+            } catch (JSONException ignore) {
+                LOG.warning("ignored metadata: " + moduleMetadataInfo.name);
             }
         }
         return shortcuts;
-- 
Gitee


From e12a4e6c918caea90d4e745ad5c17874ed07b7e7 Mon Sep 17 00:00:00 2001
From: xinking129 <xinxin13@huawei.com>
Date: Tue, 14 May 2024 14:44:53 +0800
Subject: [PATCH 05/20] modify runOnThread enum

Signed-off-by: xinking129 <xinxin13@huawei.com>
---
 modulecheck/appStartup.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulecheck/appStartup.json b/modulecheck/appStartup.json
index 2bc3d176..0d399e99 100644
--- a/modulecheck/appStartup.json
+++ b/modulecheck/appStartup.json
@@ -64,7 +64,7 @@
             "type": "string",
             "enum": [
               "mainThread",
-              "taskpool"
+	      "taskPool"
             ],
             "default": "mainThread"
           },
-- 
Gitee


From 833102a3513ad0389c3efdf914252d99ae787ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E6=97=AD=E8=BE=89?= <sunxuhui7@huawei.com>
Date: Tue, 14 May 2024 15:42:20 +0800
Subject: [PATCH 06/20] =?UTF-8?q?update=20packing=20tool=20Signed-off-by:?=
 =?UTF-8?q?=20=E5=AD=99=E6=97=AD=E8=BE=89=20<sunxuhui7@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README_zh.md                     |  1 +
 adapter/ohos/CommandParser.java  |  5 +++++
 adapter/ohos/CompressVerify.java |  5 +++++
 adapter/ohos/Compressor.java     | 10 ++++++++++
 adapter/ohos/Utility.java        |  5 +++++
 5 files changed, 26 insertions(+)

diff --git a/README_zh.md b/README_zh.md
index 85914a39..268852d9 100644
--- a/README_zh.md
+++ b/README_zh.md
@@ -52,6 +52,7 @@ java -jar app_packing_tool.jar --mode hap --json-path <option> --maple-so-path [
 | --dir-list       | 否     | NA                   | 可指定目标文件夹列表，将其打入hap包内。                                   | NA         |
 | --compress-level | 否     | number               | 压缩等级，默认值1，可选等级1-9。在应用配置compressNativeLibs参数为true的情况下生效，数值越大压缩率越高、压缩速度越慢。  | NA    |
 | --pkg-context-path      | 否         | NA            | 可指定语境信息表文件路径，文件名必须为pkgContextInfo.json。 | 仅stage模型生效              |
+| --hnp-path | 否 | NA | 指定native软件包文件路径，将native软件包打入hap包内。 | NA |
 
 ### 1.2 har包模式打包指令
 
diff --git a/adapter/ohos/CommandParser.java b/adapter/ohos/CommandParser.java
index ef7c82d4..a12189b1 100644
--- a/adapter/ohos/CommandParser.java
+++ b/adapter/ohos/CommandParser.java
@@ -41,6 +41,7 @@ public class CommandParser {
     private static final String CMD_INDEX_PATH = "--index-path";
     private static final String CMD_JS_PATH = "--js-path";
     private static final String CMD_ETS_PATH = "--ets-path";
+    private static final String CMD_HNP_PATH = "--hnp-path";
     private static final String CMD_RPCID_PATH = "--rpcid-path";
     private static final String CMD_RPCID = "--rpcid";
     private static final String CMD_SO_PATH = "--maple-so-path";
@@ -130,6 +131,10 @@ public class CommandParser {
             entry.getKey().setEtsPath(entry.getValue());
             return true;
         });
+        commandFuncs.put(CMD_HNP_PATH, entry -> {
+            entry.getKey().setHnpPath(entry.getValue());
+            return true;
+        });
         commandFuncs.put(CMD_RPCID_PATH, entry -> {
             entry.getKey().setRpcidPath(entry.getValue());
             return true;
diff --git a/adapter/ohos/CompressVerify.java b/adapter/ohos/CompressVerify.java
index fbf0bc10..ea1a9951 100644
--- a/adapter/ohos/CompressVerify.java
+++ b/adapter/ohos/CompressVerify.java
@@ -345,6 +345,11 @@ public class CompressVerify {
             return false;
         }
 
+        if (isHapPathValid(utility.getHnpPath())) {
+            LOG.error("CompressVerify::isArgsValidInHapMode hnp-path is invalid.");
+            return false;
+        }
+
         if (isHapPathValid(utility.getResPath())) {
             LOG.error("CompressVerify::isArgsValidInHapMode res-path is invalid.");
             return false;
diff --git a/adapter/ohos/Compressor.java b/adapter/ohos/Compressor.java
index 87a93fb2..5d7b9110 100644
--- a/adapter/ohos/Compressor.java
+++ b/adapter/ohos/Compressor.java
@@ -119,6 +119,7 @@ public class Compressor {
     private static final String REGEX_SHAPE = "^circle$";
     private static final String JS_PATH = "js/";
     private static final String ETS_PATH = "ets/";
+    private static final String HNP_PATH = "hnp/";
     private static final String TEMP_HAP_DIR = "tempHapDir";
     private static final String TEMP_HSP_DIR = "tempHspDir";
     private static final String TEMP_SELECTED_HAP_DIR = "tempSelectedHapDir";
@@ -141,6 +142,7 @@ public class Compressor {
     private static final String VERSION_RECORD = "version_record.json";
     private static final String RES_INDEX = "resources.index";
     private static final String ETS_FILE_NAME = "ets";
+    private static final String HNP_FILE_NAME = "hnp";
     private static final String DIR_FILE_NAME = "dir";
     private static final String AN_FILE_NAME = "an";
     private static final String AP_FILE_NAME = "ap";
@@ -898,6 +900,11 @@ public class Compressor {
             pathToFile(utility, utility.getEtsPath(), etsPath, false);
         }
 
+        if (!utility.getHnpPath().isEmpty() && isModuleJSON(utility.getJsonPath())) {
+            String hnpPath = HNP_PATH;
+            pathToFile(utility, utility.getHnpPath(), hnpPath, false);
+        }
+
         if (!utility.getRpcidPath().isEmpty()) {
             String rpcidPath = NULL_DIR_NAME;
             pathToFile(utility, utility.getRpcidPath(), rpcidPath, false);
@@ -3052,6 +3059,9 @@ public class Compressor {
                     case ETS_FILE_NAME:
                         utility.setEtsPath(filePath);
                         break;
+                    case HNP_FILE_NAME:
+                        utility.setHnpPath(filePath);
+                        break;
                     case LIBS_DIR:
                         utility.setLibPath(filePath);
                         break;
diff --git a/adapter/ohos/Utility.java b/adapter/ohos/Utility.java
index b7ffcbf1..54316f0e 100644
--- a/adapter/ohos/Utility.java
+++ b/adapter/ohos/Utility.java
@@ -85,6 +85,7 @@ public class Utility {
     private String filePath = "";
     private String jsPath = "";
     private String etsPath = "";
+    private String hnpPath = "";
     private String rpcidPath = "";
     private int VersionCode = -1;
     private String VersionName = "";
@@ -538,6 +539,10 @@ public class Utility {
 
     public void setEtsPath(String etsPath) { this.etsPath = etsPath; }
 
+    public String getHnpPath() { return hnpPath; }
+
+    public void setHnpPath(String hnpPath) { this.hnpPath = hnpPath; }
+
     public String getRpcidPath() {
         return rpcidPath;
     }
-- 
Gitee


From 647a58028657b1fbf2fd69428656151a534aeea4 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Mon, 20 May 2024 15:41:02 +0800
Subject: [PATCH 07/20] beta1

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
Change-Id: Idf3dd121f8a5a307b818ebf62a4727aa5aacd713
---
 .gitignore                             |   2 +-
 BUILD.gn                               |   4 +
 apt/BUILD.gn                           |  18 ++
 apt/LICENSE                            | 177 ++++++++++++++++++++
 apt/frameworks/BUILD.gn                |  45 +++++
 apt/frameworks/include/app_packager.h  |  44 +++++
 apt/frameworks/include/constants.h     | 150 +++++++++++++++++
 apt/frameworks/include/hap_packager.h  |  44 +++++
 apt/frameworks/include/hsp_packager.h  |  44 +++++
 apt/frameworks/include/packager.h      |  75 +++++++++
 apt/frameworks/include/shell_command.h |  75 +++++++++
 apt/frameworks/src/app_packager.cpp    | 222 +++++++++++++++++++++++++
 apt/frameworks/src/hap_packager.cpp    | 115 +++++++++++++
 apt/frameworks/src/hsp_packager.cpp    | 107 ++++++++++++
 apt/frameworks/src/main.cpp            |  25 +++
 apt/frameworks/src/packager.cpp        | 173 +++++++++++++++++++
 apt/frameworks/src/shell_command.cpp   | 168 +++++++++++++++++++
 bundle.json                            |  10 +-
 18 files changed, 1495 insertions(+), 3 deletions(-)
 create mode 100644 apt/BUILD.gn
 create mode 100644 apt/LICENSE
 create mode 100644 apt/frameworks/BUILD.gn
 create mode 100644 apt/frameworks/include/app_packager.h
 create mode 100644 apt/frameworks/include/constants.h
 create mode 100644 apt/frameworks/include/hap_packager.h
 create mode 100644 apt/frameworks/include/hsp_packager.h
 create mode 100644 apt/frameworks/include/packager.h
 create mode 100644 apt/frameworks/include/shell_command.h
 create mode 100644 apt/frameworks/src/app_packager.cpp
 create mode 100644 apt/frameworks/src/hap_packager.cpp
 create mode 100644 apt/frameworks/src/hsp_packager.cpp
 create mode 100644 apt/frameworks/src/main.cpp
 create mode 100644 apt/frameworks/src/packager.cpp
 create mode 100644 apt/frameworks/src/shell_command.cpp

diff --git a/.gitignore b/.gitignore
index c51f72ae..e74e90f0 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 jar
-.idea/
+.*
\ No newline at end of file
diff --git a/BUILD.gn b/BUILD.gn
index 5b65eddd..66633013 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -63,3 +63,7 @@ ohos_prebuilt_etc("fastjson-1.2.83") {
   source = "//prebuilts/packing_tool/fastjson-1.2.83.jar"
   install_enable = false
 }
+
+ohos_group("ohos_packing_tool") {
+  deps = ["apt:ohos_packing_tool"]
+}
\ No newline at end of file
diff --git a/apt/BUILD.gn b/apt/BUILD.gn
new file mode 100644
index 00000000..79a186d8
--- /dev/null
+++ b/apt/BUILD.gn
@@ -0,0 +1,18 @@
+# Copyright (c) 2024 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+
+ohos_group("ohos_packing_tool") {
+  deps = [ "frameworks:ohos_packing_tool" ]
+}
\ No newline at end of file
diff --git a/apt/LICENSE b/apt/LICENSE
new file mode 100644
index 00000000..4a459866
--- /dev/null
+++ b/apt/LICENSE
@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/apt/frameworks/BUILD.gn b/apt/frameworks/BUILD.gn
new file mode 100644
index 00000000..767cd5e5
--- /dev/null
+++ b/apt/frameworks/BUILD.gn
@@ -0,0 +1,45 @@
+# Copyright (c) 2024 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import("//build/ohos.gni")
+
+ohos_executable("apt") {
+    include_dirs = [
+        "include",
+    ]
+    sources = [
+        "src/main.cpp",
+        "src/shell_command.cpp",
+        "src/packager.cpp",
+        "src/hap_packager.cpp",
+        "src/hsp_packager.cpp",
+        "src/app_packager.cpp"
+    ]
+    configs = []
+    cflags = []
+    external_deps = [
+        "c_utils:utils",
+        "hilog:libhilog",
+        "json:nlohmann_json_static",
+        "zlib:libz",
+    ]
+    install_enable = false
+    subsystem_name = "developtools"
+    part_name = "packing_tool"
+}
+
+ohos_group("ohos_packing_tool") {
+    deps = [
+        ":apt"
+    ]
+}
\ No newline at end of file
diff --git a/apt/frameworks/include/app_packager.h b/apt/frameworks/include/app_packager.h
new file mode 100644
index 00000000..b4c74dbd
--- /dev/null
+++ b/apt/frameworks/include/app_packager.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_APP_PACKAGER_H
+#define DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_APP_PACKAGER_H
+
+#include <iostream>
+#include <map>
+#include <string>
+
+#include "errors.h"
+#include "packager.h"
+
+namespace OHOS {
+namespace AppPackingTool {
+
+class AppPackager : public Packager {
+public:
+    AppPackager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver);
+    ~AppPackager() override {}
+
+protected:
+    ErrCode InitAllowedParam() override;
+    ErrCode PreProcess() override;
+    ErrCode Process() override;
+    ErrCode PostProcess() override;
+};
+
+}  // namespace AppExecFwk
+}  // namespace OHOS
+
+#endif  // DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_APP_PACKAGER_H
\ No newline at end of file
diff --git a/apt/frameworks/include/constants.h b/apt/frameworks/include/constants.h
new file mode 100644
index 00000000..4e5ef11b
--- /dev/null
+++ b/apt/frameworks/include/constants.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_CONSTANTS_H
+#define DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_CONSTANTS_H
+
+#include <iostream>
+#include <map>
+#include <string>
+#include <getopt.h>
+
+namespace OHOS {
+namespace AppPackingTool {
+namespace Constants {
+const std::string CMD_HELP = "help";
+const std::string CMD_PACK = "pack";
+const std::string CMD_UNPACK = "unpack";
+
+const std::string MODE_HAP = "hap";
+const std::string MODE_HSP = "hsp";
+const std::string MODE_APP = "app";
+const std::string MODE_HQF = "hqf";
+const std::string MODE_APPQF = "appqf";
+const std::string MODE_MULTIAPP = "multiApp";
+const std::string MODE_VERSION_NORMALIZE = "versionNormalize";
+const std::string MODE_PACKAGE_NORMALIZE = "packageNormalize";
+
+const std::string PARAM_PREFIX = "--";
+const std::string PARAM_MODE = "mode";
+const std::string PARAM_JSON_PATH = "json-path";
+const std::string PARAM_LIB_PATH = "lib-path";
+const std::string PARAM_RESOURCES_PATH = "resources-path";
+const std::string PARAM_INDEX_PATH = "index-path";
+const std::string PARAM_PACK_INFO_PATH = "pack-info-path";
+const std::string PARAM_PROFILE_PATH = "profile-path";
+const std::string PARAM_ETS_PATH = "ets-path";
+const std::string PARAM_OUT_PATH = "out-path";
+const std::string PARAM_MAPLE_SO_PATH = "maple-so-path";
+const std::string PARAM_MAPLE_SO_DIR = "maple-so-dir";
+const std::string PARAM_DEX_PATH = "dex-path";
+const std::string PARAM_RPCID_PATH = "rpcid-path";
+const std::string PARAM_JS_PATH = "js-path";
+const std::string PARAM_FORCE = "force";
+const std::string PARAM_AN_PATH = "an-path";
+const std::string PARAM_AP_PATH = "ap-path";
+const std::string PARAM_DIR_LIST = "dir-list";
+const std::string PARAM_COMPRESS_LEVEL = "compress-level";
+const std::string PARAM_PKG_CONTEXT_PATH = "pkg-context-path";
+const std::string PARAM_HAP_PATH = "hap-path";
+const std::string PARAM_HSP_PATH = "hsp-path";
+const std::string PARAM_SIGNATURE_PATH = "signature-path";
+const std::string PARAM_CERTIFICATE_PATH = "certificate-path";
+const std::string PARAM_HAP_LIST = "hap-list";
+const std::string PARAM_HSP_LIST = "hsp-list";
+const std::string PARAM_APP_LIST = "app-list";
+const std::string PARAM_HQF_LIST = "hqf-list";
+const std::string PARAM_INPUT_LIST = "input-list";
+const std::string PARAM_VERSION_CODE = "version-code";
+const std::string PARAM_VERSION_NAME = "version-name";
+const std::string PARAM_APP_PATH = "app-path";
+const std::string PARAM_RPCID = "rpcid";
+const std::string PARAM_APPQF_PATH = "appqf-path";
+const std::string PARAM_MAIN_MODULE_LIMIT = "main-module-limit";
+const std::string PARAM_NORMAL_MODULE_LIMIT = "normal-module-limit";
+
+const std::string MODULE_JSON = "module.json";
+const std::string CONFIG_JSON = "config.json";
+const std::string LIB_PATH = "libs";
+const std::string RESOURCES_PATH = "resources";
+const std::string RESOURCES_INDEX = "resources.index";
+const std::string PACK_INFO = "pack.info";
+const std::string ETS_PATH = "ets";
+const std::string RPCID_SC = "rpcid.sc";
+const std::string PKG_CONTEXT_JSON = "pkgContextInfo.json";
+
+const std::string JSON_SUFFIX = ".json";
+const std::string HAP_SUFFIX = ".hap";
+const std::string HSP_SUFFIX = ".hsp";
+const std::string APP_SUFFIX = ".app";
+
+constexpr const char* SHORT_OPTIONS = "";
+const struct option LONG_OPTIONS[] = {
+    {PARAM_MODE.c_str(), required_argument, nullptr, 1},
+    {PARAM_JSON_PATH.c_str(), required_argument, nullptr, 2},
+    {PARAM_LIB_PATH.c_str(), required_argument, nullptr, 3},
+    {PARAM_RESOURCES_PATH.c_str(), required_argument, nullptr, 4},
+    {PARAM_INDEX_PATH.c_str(), required_argument, nullptr, 5},
+    {PARAM_PACK_INFO_PATH.c_str(), required_argument, nullptr, 6},
+    {PARAM_PROFILE_PATH.c_str(), required_argument, nullptr, 7},
+    {PARAM_ETS_PATH.c_str(), required_argument, nullptr, 8},
+    {PARAM_OUT_PATH.c_str(), required_argument, nullptr, 9},
+    {PARAM_MAPLE_SO_PATH.c_str(), required_argument, nullptr, 10},
+    {PARAM_MAPLE_SO_DIR.c_str(), required_argument, nullptr, 11},
+    {PARAM_DEX_PATH.c_str(), required_argument, nullptr, 12},
+    {PARAM_RPCID_PATH.c_str(), required_argument, nullptr, 13},
+    {PARAM_JS_PATH.c_str(), required_argument, nullptr, 14},
+    {PARAM_FORCE.c_str(), required_argument, nullptr, 15},
+    {PARAM_AN_PATH.c_str(), required_argument, nullptr, 16},
+    {PARAM_AP_PATH.c_str(), required_argument, nullptr, 17},
+    {PARAM_DIR_LIST.c_str(), required_argument, nullptr, 18},
+    {PARAM_COMPRESS_LEVEL.c_str(), required_argument, nullptr, 19},
+    {PARAM_PKG_CONTEXT_PATH.c_str(), required_argument, nullptr, 20},
+    {PARAM_HAP_PATH.c_str(), required_argument, nullptr, 21},
+    {PARAM_HSP_PATH.c_str(), required_argument, nullptr, 22},
+    {PARAM_SIGNATURE_PATH.c_str(), required_argument, nullptr, 23},
+    {PARAM_CERTIFICATE_PATH.c_str(), required_argument, nullptr, 24},
+    {PARAM_HAP_LIST.c_str(), required_argument, nullptr, 25},
+    {PARAM_HSP_LIST.c_str(), required_argument, nullptr, 26},
+    {PARAM_APP_LIST.c_str(), required_argument, nullptr, 27},
+    {PARAM_HQF_LIST.c_str(), required_argument, nullptr, 28},
+    {PARAM_INPUT_LIST.c_str(), required_argument, nullptr, 29},
+    {PARAM_VERSION_CODE.c_str(), required_argument, nullptr, 30},
+    {PARAM_VERSION_NAME.c_str(), required_argument, nullptr, 31},
+    {PARAM_APP_PATH.c_str(), required_argument, nullptr, 32},
+    {PARAM_RPCID.c_str(), required_argument, nullptr, 33},
+    {PARAM_APPQF_PATH.c_str(), required_argument, nullptr, 34},
+    {PARAM_MAIN_MODULE_LIMIT.c_str(), required_argument, nullptr, 35},
+    {PARAM_NORMAL_MODULE_LIMIT.c_str(), required_argument, nullptr, 36},
+    {nullptr, 0, nullptr, 0},
+};
+constexpr const int OPTIONS_SIZE = sizeof(LONG_OPTIONS) / sizeof(LONG_OPTIONS[0]);
+
+enum PARAM_TYPE {
+    DEFAULT,
+    REGULAR_FILE,
+    REGULAR_FILE_ARRAY,
+    DIRECTORY,
+    DIRECTORY_ARRAY,
+    FILE_OR_DIRECTORY,
+    FILE_OR_DIRECTORY_ARRAY,
+};
+
+constexpr const int BUF_SIZE = 1024 * 4;
+}
+}  // namespace AppExecFwk
+}  // namespace OHOS
+
+#endif  // DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_CONSTANTS_H
\ No newline at end of file
diff --git a/apt/frameworks/include/hap_packager.h b/apt/frameworks/include/hap_packager.h
new file mode 100644
index 00000000..5d5abbb6
--- /dev/null
+++ b/apt/frameworks/include/hap_packager.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_HAP_PACKAGER_H
+#define DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_HAP_PACKAGER_H
+
+#include <iostream>
+#include <map>
+#include <string>
+
+#include "errors.h"
+#include "packager.h"
+
+namespace OHOS {
+namespace AppPackingTool {
+
+class HapPackager : public Packager {
+public:
+    HapPackager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver);
+    ~HapPackager() override {}
+
+protected:
+    ErrCode InitAllowedParam() override;
+    ErrCode PreProcess() override;
+    ErrCode Process() override;
+    ErrCode PostProcess() override;
+};
+
+}  // namespace AppExecFwk
+}  // namespace OHOS
+
+#endif  // DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_HAP_PACKAGER_H
\ No newline at end of file
diff --git a/apt/frameworks/include/hsp_packager.h b/apt/frameworks/include/hsp_packager.h
new file mode 100644
index 00000000..597549cd
--- /dev/null
+++ b/apt/frameworks/include/hsp_packager.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_HSP_PACKAGER_H
+#define DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_HSP_PACKAGER_H
+
+#include <iostream>
+#include <map>
+#include <string>
+
+#include "errors.h"
+#include "packager.h"
+
+namespace OHOS {
+namespace AppPackingTool {
+
+class HspPackager : public Packager {
+public:
+    HspPackager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver);
+    ~HspPackager() override {}
+
+protected:
+    ErrCode InitAllowedParam() override;
+    ErrCode PreProcess() override;
+    ErrCode Process() override;
+    ErrCode PostProcess() override;
+};
+
+}  // namespace AppExecFwk
+}  // namespace OHOS
+
+#endif  // DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_HSP_PACKAGER_H
\ No newline at end of file
diff --git a/apt/frameworks/include/packager.h b/apt/frameworks/include/packager.h
new file mode 100644
index 00000000..792d5b4a
--- /dev/null
+++ b/apt/frameworks/include/packager.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_PACKAGER_H
+#define DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_PACKAGER_H
+
+#include <filesystem>
+#include <functional>
+#include <iostream>
+#include <map>
+#include <regex>
+#include <string>
+#include <vector>
+
+#include "constants.h"
+#include "contrib/minizip/zip.h"
+#include "contrib/minizip/unzip.h"
+#include "errors.h"
+#include "nlohmann/json.hpp"
+
+namespace fs = std::filesystem;
+
+namespace OHOS {
+namespace AppPackingTool {
+
+struct Parameter {
+    std::string paramName;
+    bool required;
+    Constants::PARAM_TYPE paramType;
+    std::string paramRegrex;
+    std::string zipEntry;
+};
+
+class Packager {
+public:
+    Packager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver);
+    virtual ~Packager();
+
+    std::string MakePackage();
+
+    virtual ErrCode InitAllowedParam() = 0;
+    virtual ErrCode PreProcess() = 0;
+    virtual ErrCode Process() = 0;
+    virtual ErrCode PostProcess() = 0;
+
+protected:
+    const std::map<std::string, std::string> &parameterMap_;
+    std::string &resultReceiver_;
+    std::vector<Parameter> allowedParameters_;
+    nlohmann::json moduleJson;
+    nlohmann::json packInfo;
+    
+    void AddFileToZip(zipFile zf, const fs::path &filePath, const fs::path &zipPath, zip_fileinfo &zipfi);
+    void WriteStringToZip(zipFile zf, const std::string &content, const fs::path &zipPath, zip_fileinfo &zipfi);
+    bool ParseJsonFile(nlohmann::json &jsonObject, std::string filePath);
+    bool CheckFileValid(const std::string &filePath, const std::string &filename);
+    bool endWith(const std::string &str, const std::string &suffix);
+};
+
+}  // namespace AppExecFwk
+}  // namespace OHOS
+
+#endif  // DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_PACKAGER_H
\ No newline at end of file
diff --git a/apt/frameworks/include/shell_command.h b/apt/frameworks/include/shell_command.h
new file mode 100644
index 00000000..84985923
--- /dev/null
+++ b/apt/frameworks/include/shell_command.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_SHELLCOMMAND_H
+#define DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_SHELLCOMMAND_H
+
+#include <map>
+#include <string>
+#include <functional>
+#include <vector>
+
+#include "errors.h"
+#include "packager.h"
+
+namespace OHOS {
+namespace AppPackingTool {
+namespace {
+const int OFFSET_REQUIRED_ARGUMENT = 2;
+const std::string HELP_MSG_NO_OPTION = "error: you must specify an option at least.";
+const std::string STRING_CODE = "code:";
+const std::string TOOL_NAME = "apt";
+
+const std::string HELP_MSG = "usage: apt <command> <options>\n"
+                             "These are common apt commands list:\n"
+                             "  help    list available commands\n"
+                             "  pack    pack a bundle  with options\n";
+
+}  // namespace
+
+class ShellCommand {
+public:
+    ShellCommand(int argc, char *argv[], std::string name);
+    virtual ~ShellCommand();
+
+    ErrCode ParseParam();
+    ErrCode OnCommand();
+    std::string ExecCommand();
+    ErrCode CreateCommandMap();
+
+protected:
+    static constexpr int MIN_ARGUMENT_NUMBER = 2;
+
+    int argc_;
+    char **argv_;
+
+    std::string cmd_;
+    std::string name_;
+    std::map<std::string, std::function<int()>> commandMap_;
+    std::map<std::string, std::string> parameterMap_;
+    std::string resultReceiver_ = "";
+
+    ErrCode RunAsHelpCommand();
+    ErrCode RunAsPackCommand();
+    ErrCode RunAsUnpackCommand();
+
+private:
+    std::unique_ptr<Packager> getPackager();
+};
+
+}  // namespace AppExecFwk
+}  // namespace OHOS
+
+#endif  // DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_SHELLCOMMAND_H
\ No newline at end of file
diff --git a/apt/frameworks/src/app_packager.cpp b/apt/frameworks/src/app_packager.cpp
new file mode 100644
index 00000000..e258153b
--- /dev/null
+++ b/apt/frameworks/src/app_packager.cpp
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <cstddef>
+#include <filesystem>
+#include <fstream>
+#include <iostream>
+#include <ostream>
+#include <sstream>
+#include <string>
+#include <vector>
+#include <random>
+
+#include "app_packager.h"
+#include "constants.h"
+#include "contrib/minizip/unzip.h"
+#include "contrib/minizip/zip.h"
+#include "errors.h"
+#include "packager.h"
+
+namespace OHOS {
+namespace AppPackingTool {
+namespace {}
+
+AppPackager::AppPackager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver)
+    : Packager(parameterMap, resultReceiver)
+{}
+
+ErrCode AppPackager::InitAllowedParam()
+{
+//    std::cout << "Hsp Init" << std::endl;
+//    resultReceiver_.append("Hsp Init\n");
+    return OHOS::ERR_OK;
+}
+ErrCode AppPackager::PreProcess()
+{
+//    std::cout << "Hsp PreCheck" << std::endl;
+//    resultReceiver_.append("Hsp PreCheck\n");
+    return OHOS::ERR_OK;
+}
+
+void updatePackInfoToZip(std::string &srcZip, std::string &destZip, std::string packInfoPath) {
+    std::cout << "updatePackInfoToZip" << std::endl;
+    zipFile zf = zipOpen64(destZip.c_str(), APPEND_STATUS_CREATE);
+    if (zf == nullptr) {
+        std::cout << "err zipOpen64 null" << std::endl;
+    }
+    std::cout << "zipOpen64:" << destZip << std::endl;
+    unzFile zipFile = unzOpen(srcZip.c_str());
+    if (zipFile == nullptr) {
+        std::cout << "err unzOpen null" << std::endl;
+        return;
+    }
+    std::cout << "unzOpen:" << srcZip << std::endl;
+    unz_global_info globalInfo;
+    if (unzGetGlobalInfo(zipFile, &globalInfo) != UNZ_OK) {
+        std::cerr << "Failed to get global info from ZIP file" << std::endl;  
+        unzClose(zipFile);  
+        return; 
+    }
+    std::cout << "unzGetGlobalInfo: " << globalInfo.number_entry << std::endl;
+    unz_file_info fileInfo;
+    for (int i = 0; i < globalInfo.number_entry; i++) {
+        char entryName[256] = {0};
+        int status = unzGetCurrentFileInfo(zipFile, &fileInfo, entryName, sizeof(entryName), NULL, 0, NULL, 0);
+        if (status != UNZ_OK) {
+            std::cerr << "Failed to get file info from ZIP file" << std::endl;  
+            unzClose(zipFile);  
+            return; 
+        }
+        std::cout << "entryName: " << entryName << std::endl;
+        if (std::string(entryName) == Constants::PACK_INFO) {
+            std::ifstream inFile(packInfoPath);
+            if (!inFile.is_open()) {
+                std::cerr << "Failed to open file pack.info." << std::endl;
+                return;
+            }
+            zip_fileinfo fi = {};
+            if (zipOpenNewFileInZip(zf, Constants::PACK_INFO.c_str(), &fi, nullptr, 0, nullptr, 0, nullptr, 0,
+                                Z_DEFAULT_COMPRESSION) == ZIP_OK) {
+                char buffer[Constants::BUF_SIZE];
+                while (inFile.good()) {
+                    inFile.read(buffer, sizeof(buffer));
+                    auto bytesRead = inFile.gcount();
+                    if (bytesRead > 0) {
+                        if (zipWriteInFileInZip(zf, buffer, bytesRead) < 0) {
+                            std::cout << "3 err write to zip file: " << packInfoPath << std::endl;
+                            break;
+                        }
+                    }
+                }
+                zipCloseFileInZip(zf);
+            } else {
+                std::cout << "4 err add file to zip: " << packInfoPath << std::endl;
+            }
+            inFile.close();
+        } else {
+            status = unzOpenCurrentFile(zipFile);
+            if (status != UNZ_OK) {
+                std::cerr << "Failed to get file info from ZIP file" << std::endl;  
+                unzClose(zipFile);  
+                zipClose(zf, nullptr);
+                return; 
+            }
+            zip_fileinfo fi = {};
+            if (zipOpenNewFileInZip(zf, entryName, &fi, nullptr, 0, nullptr, 0, nullptr, 0,
+                                Z_DEFAULT_COMPRESSION) == ZIP_OK) {
+                char buffer[Constants::BUF_SIZE];
+                while (int len = unzReadCurrentFile(zipFile, buffer, Constants::BUF_SIZE)) {
+                    if (len > 0) {
+                        if (zipWriteInFileInZip(zf, buffer, len) < 0) {
+                            std::cout << "3 err write to zip file: " << packInfoPath << std::endl;
+                            break;
+                        }
+                    } else {
+                        std::cout << "len: " << len << std::endl;
+                        break;
+                    }
+                }
+                zipCloseFileInZip(zf);
+            } else {
+                std::cout << "4 err add file to zip: " << packInfoPath << std::endl;
+            }
+        }
+        unzCloseCurrentFile(zipFile);
+        unzGoToNextFile(zipFile);
+    }
+    unzClose(zipFile);
+    zipClose(zf, nullptr);
+}
+
+std::string randomString(size_t len) {
+    static const char alphanum[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    std::random_device rd;
+    std::mt19937 gen(rd());
+    std::uniform_int_distribution<> dis(0, sizeof(alphanum) - 1);
+    std::string str(len, 0);
+    for (char& c : str) {
+        c = alphanum[dis(gen)];
+    }
+    return str;
+}
+
+ErrCode AppPackager::Process()
+{
+    std::cout << "App DoPackage" << std::endl;
+    std::string outPath = parameterMap_.at(Constants::PARAM_OUT_PATH);
+    zipFile zf = zipOpen64(outPath.c_str(), APPEND_STATUS_CREATE);
+    if (zf == nullptr) {
+        std::cout << "err zipOpen64 null" << std::endl;
+        return OHOS::ERR_INVALID_VALUE;
+    }
+    zip_fileinfo fi = {};
+    std::map<std::string, std::string>::const_iterator it = parameterMap_.find(Constants::PARAM_PACK_INFO_PATH);
+    std::string packInfoPath;
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip packInfoPath: " << it->second << std::endl;
+        packInfoPath = it->second;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PACK_INFO), fi);
+    }
+    std::vector<std::string> hapList;
+    it = parameterMap_.find(Constants::PARAM_HAP_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip hapPath: " << it->second << std::endl;
+        std::string hapPath = it->second;
+        if (hapPath != "") {
+            std::string path;
+            std::istringstream iss(hapPath);
+            while(std::getline(iss, path, ',')) {
+                hapList.push_back(path);
+            }
+        }
+    }
+    it = parameterMap_.find(Constants::PARAM_HSP_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip hspPath: " << it->second << std::endl;
+        std::string hspPath = it->second;
+        if (hspPath != "") {
+            std::string path;
+            std::istringstream iss(hspPath);
+            while(std::getline(iss, path, ',')) {
+                hapList.push_back(path);
+            }
+        }
+    }
+    fs::path tempDir = fs::temp_directory_path() / randomString(8);
+    fs::create_directory(tempDir);
+    for(std::string hap : hapList) {
+        std::string tempFile = tempDir / fs::path(hap).filename();
+        std::cout << "tempFile: " << tempFile << ", hapPath:" << hap << std::endl;
+        updatePackInfoToZip(hap, tempFile, packInfoPath);
+        AddFileToZip(zf, fs::path(tempFile), fs::path(tempFile).filename(), fi);
+    }
+    fs::remove_all(tempDir);
+    zipClose(zf, nullptr);
+    std::cout << "app package" << std::endl;
+    return OHOS::ERR_OK;
+}
+
+
+
+ErrCode AppPackager::PostProcess()
+{
+//    std::cout << "Hsp PostCheck" << std::endl;
+//    resultReceiver_.append("Hsp PostCheck\n");
+    return OHOS::ERR_OK;
+}
+
+} // namespace AppPackingTool
+} // namespace OHOS
\ No newline at end of file
diff --git a/apt/frameworks/src/hap_packager.cpp b/apt/frameworks/src/hap_packager.cpp
new file mode 100644
index 00000000..09fda02c
--- /dev/null
+++ b/apt/frameworks/src/hap_packager.cpp
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <filesystem>
+#include <fstream>
+#include <iostream>
+#include <ostream>
+#include <regex>
+#include <string>
+
+#include "hap_packager.h"
+#include "constants.h"
+#include "contrib/minizip/zip.h"
+#include "nlohmann/json.hpp"
+#include "errors.h"
+#include "packager.h"
+
+namespace OHOS {
+namespace AppPackingTool {
+namespace {}
+
+HapPackager::HapPackager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver)
+    : Packager(parameterMap, resultReceiver)
+{}
+
+ErrCode HapPackager::InitAllowedParam()
+{
+    allowedParameters_ = {
+        {}
+    };
+    return OHOS::ERR_OK;
+}
+
+ErrCode HapPackager::PreProcess()
+{
+    return OHOS::ERR_OK;
+}
+
+ErrCode HapPackager::Process()
+{
+    std::cout << "Hap DoPackage" << std::endl;
+    std::string outPath = parameterMap_.at(Constants::PARAM_OUT_PATH);
+    zipFile zf = zipOpen64(outPath.c_str(), APPEND_STATUS_CREATE);
+    if (zf == nullptr) {
+        std::cout << "err zipOpen64 null" << std::endl;
+        return OHOS::ERR_INVALID_VALUE;
+    }
+    zip_fileinfo fi = {};
+    std::map<std::string, std::string>::const_iterator it = parameterMap_.find(Constants::PARAM_JSON_PATH);
+    if (it != parameterMap_.end()) {
+        if (ParseJsonFile(moduleJson, it->second)) {
+            WriteStringToZip(zf, moduleJson.dump(), fs::path(Constants::MODULE_JSON), fi);
+        }
+        //std::cout << "zip jsonPath: " << it->second << std::endl;
+        //std::cout << "zip jsonContent: " << moduleJson.dump() << std::endl;
+    }
+    it = parameterMap_.find(Constants::PARAM_LIB_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip libPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::LIB_PATH), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_RESOURCES_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip resourcesPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RESOURCES_PATH), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_INDEX_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip indexPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RESOURCES_INDEX), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_PACK_INFO_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip packInfoPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PACK_INFO), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_ETS_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip etsPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::ETS_PATH), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_RPCID_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip rpcidPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RPCID_SC), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_PKG_CONTEXT_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip pkgContextPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PKG_CONTEXT_JSON), fi);
+    }
+    zipClose(zf, nullptr);
+    return OHOS::ERR_OK;
+}
+ErrCode HapPackager::PostProcess()
+{
+    //std::cout << "Hap PostCheck" << std::endl;
+    //resultReceiver_.append("Hap PostCheck\n");
+    return OHOS::ERR_OK;
+}
+
+} // namespace AppPackingTool
+} // namespace OHOS
\ No newline at end of file
diff --git a/apt/frameworks/src/hsp_packager.cpp b/apt/frameworks/src/hsp_packager.cpp
new file mode 100644
index 00000000..9f00b45d
--- /dev/null
+++ b/apt/frameworks/src/hsp_packager.cpp
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+#include <ostream>
+#include <string>
+
+#include "hsp_packager.h"
+#include "constants.h"
+#include "errors.h"
+#include "packager.h"
+
+namespace OHOS {
+namespace AppPackingTool {
+namespace {}
+
+HspPackager::HspPackager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver)
+    : Packager(parameterMap, resultReceiver)
+{}
+
+ErrCode HspPackager::InitAllowedParam()
+{
+//    std::cout << "Hsp Init" << std::endl;
+//    resultReceiver_.append("Hsp Init\n");
+    return OHOS::ERR_OK;
+}
+ErrCode HspPackager::PreProcess()
+{
+//    std::cout << "Hsp PreCheck" << std::endl;
+//    resultReceiver_.append("Hsp PreCheck\n");
+    return OHOS::ERR_OK;
+}
+ErrCode HspPackager::Process()
+{
+    std::cout << "Hsp DoPackage" << std::endl;
+    std::string outPath = parameterMap_.at(Constants::PARAM_OUT_PATH);
+    zipFile zf = zipOpen64(outPath.c_str(), APPEND_STATUS_CREATE);
+    if (zf == nullptr) {
+        std::cout << "err zipOpen64 null" << std::endl;
+        return OHOS::ERR_INVALID_VALUE;
+    }
+    zip_fileinfo fi = {};
+    std::map<std::string, std::string>::const_iterator it = parameterMap_.find(Constants::PARAM_JSON_PATH);
+    if (it != parameterMap_.end()) {
+        if (ParseJsonFile(moduleJson, it->second)) {
+            WriteStringToZip(zf, moduleJson.dump(), fs::path(Constants::MODULE_JSON), fi);
+        }
+    }
+    it = parameterMap_.find(Constants::PARAM_LIB_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip libPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::LIB_PATH), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_RESOURCES_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip resourcesPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RESOURCES_PATH), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_INDEX_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip indexPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RESOURCES_INDEX), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_PACK_INFO_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip packInfoPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PACK_INFO), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_ETS_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip etsPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::ETS_PATH), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_RPCID_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip rpcidPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RPCID_SC), fi);
+    }
+    it = parameterMap_.find(Constants::PARAM_PKG_CONTEXT_PATH);
+    if (it != parameterMap_.end()) {
+        //std::cout << "zip pkgContextPath: " << it->second << std::endl;
+        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PKG_CONTEXT_JSON), fi);
+    }
+    zipClose(zf, nullptr);
+    return OHOS::ERR_OK;
+}
+ErrCode HspPackager::PostProcess()
+{
+//    std::cout << "Hsp PostCheck" << std::endl;
+//    resultReceiver_.append("Hsp PostCheck\n");
+    return OHOS::ERR_OK;
+}
+
+} // namespace AppPackingTool
+} // namespace OHOS
\ No newline at end of file
diff --git a/apt/frameworks/src/main.cpp b/apt/frameworks/src/main.cpp
new file mode 100644
index 00000000..e04fc26d
--- /dev/null
+++ b/apt/frameworks/src/main.cpp
@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+
+#include "shell_command.h"
+
+int main(int argc, char *argv[])
+{
+    OHOS::AppPackingTool::ShellCommand cmd(argc, argv, OHOS::AppPackingTool::TOOL_NAME);
+    std::cout << cmd.ExecCommand();
+    quick_exit(0);
+}
\ No newline at end of file
diff --git a/apt/frameworks/src/packager.cpp b/apt/frameworks/src/packager.cpp
new file mode 100644
index 00000000..9b28777f
--- /dev/null
+++ b/apt/frameworks/src/packager.cpp
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <filesystem>
+#include <fstream>
+#include <iostream>
+#include <sstream>
+#include <string>
+
+#include "packager.h"
+#include "errors.h"
+
+namespace OHOS {
+namespace AppPackingTool {
+namespace {}
+
+Packager::Packager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver)
+    : parameterMap_(parameterMap), resultReceiver_(resultReceiver)
+{}
+
+Packager::~Packager() {}
+
+std::string Packager::MakePackage()
+{
+//    for (const auto &pair : parameterMap_) {
+//        std::cout << "** key: " << pair.first << ", value: " << pair.second << std::endl;
+//    }
+//    std::cout << "** resultReceiver: " << resultReceiver_ << std::endl;
+    if (InitAllowedParam() != OHOS::ERR_OK) {
+        std::cout << "PreCheck err" << std::endl;
+    }
+
+    if (PreProcess() != OHOS::ERR_OK) {
+        std::cout << "PreCheck err" << std::endl;
+    }
+
+    if (Process() != OHOS::ERR_OK) {
+        std::cout << "DoPackage err" << std::endl;
+    }
+
+    if (PostProcess() != OHOS::ERR_OK) {
+        std::cout << "PostCheck err" << std::endl;
+    }
+
+    return "OHOS::ERR_OK";
+}
+
+ErrCode Packager::PreProcess()
+{
+    std::cout << "PreCheck" << std::endl;
+    resultReceiver_.append("do PreCheck\n");
+    return OHOS::ERR_OK;
+}
+
+ErrCode Packager::Process()
+{
+    std::cout << "DoPackage" << std::endl;
+    resultReceiver_.append("do DoPackage\n");
+    return OHOS::ERR_OK;
+}
+
+ErrCode Packager::PostProcess()
+{
+    std::cout << "PostCheck" << std::endl;
+    resultReceiver_.append("do PostCheck\n");
+    return OHOS::ERR_OK;
+}
+
+void Packager::AddFileToZip(zipFile zf, const fs::path &filePath, const fs::path &zipPath, zip_fileinfo &zipfi)
+{
+    if (fs::is_directory(filePath)) {
+        for (const auto &entry : fs::directory_iterator(filePath)) {
+            fs::path tmpPath = zipPath / entry.path().filename();
+            //std::cout << "zipPath: " << tmpPath << ", entry.path: " << entry.path() << ", tmpPath: " << tmpPath
+            //          << std::endl;
+            AddFileToZip(zf, entry.path(), tmpPath, zipfi);
+        }
+    } else if (fs::is_regular_file(filePath)) {
+        std::ifstream file(filePath, std::ios::binary);
+        if (!file.is_open()) {
+            std::cout << "2 err opening file for read: " << filePath << std::endl;
+        }
+        if (zipOpenNewFileInZip(zf, zipPath.string().c_str(), &zipfi, nullptr, 0, nullptr, 0, nullptr, 0,
+                                Z_DEFAULT_COMPRESSION) == ZIP_OK) {
+            char buffer[Constants::BUF_SIZE];
+            while (file.good()) {
+                file.read(buffer, sizeof(buffer));
+                auto bytesRead = file.gcount();
+                if (bytesRead > 0) {
+                    if (zipWriteInFileInZip(zf, buffer, bytesRead) < 0) {
+                        std::cout << "3 err write to zip file: " << filePath << std::endl;
+                        break;
+                    }
+                }
+            }
+            zipCloseFileInZip(zf);
+        } else {
+            std::cout << "4 err add file to zip: " << filePath << std::endl;
+        }
+        file.close();
+    }
+}
+
+void Packager::WriteStringToZip(zipFile zf, const std::string &content, const fs::path &zipPath, zip_fileinfo &zipfi)
+{
+    if (zipOpenNewFileInZip(zf, zipPath.string().c_str(), &zipfi, nullptr, 0, nullptr, 0, nullptr, 0,
+                            Z_DEFAULT_COMPRESSION) == ZIP_OK) {
+        if (zipWriteInFileInZip(zf, content.data(), content.length()) < 0) {
+            std::cout << "zipWriteInFileInZip err" << std::endl;
+            return;
+        }
+        zipCloseFileInZip(zf);
+    }
+}
+
+bool Packager::ParseJsonFile(nlohmann::json &jsonObject, std::string filePath)
+{
+    std::ifstream i(filePath);
+    if (!i.is_open()) {
+        std::cout<<"failed to open json file, errno: " << errno << std::endl;
+        return false;
+    }
+    i.seekg(0, std::ios::end);
+    int len = static_cast<int>(i.tellg());
+    if (len == 0) {
+        i.close();
+        std::cout << "json file is empty" << std::endl;
+        return true;
+    }
+    i.seekg(0, std::ios::beg);
+    jsonObject = nlohmann::json::parse(i, nullptr, false);
+    if (jsonObject.is_discarded()) {
+        i.close();
+        std::cout << "ParseJsonFile failed due to data is discarded." << std::endl;
+        return false;
+    }
+    i.close();
+    return true;
+}
+
+bool Packager::endWith(const std::string &str, const std::string &suffix) {
+    if (str.length() >= suffix.length()) {
+        return str.compare(str.length() - suffix.length(), suffix.length(), suffix);
+    }
+    return false;
+}
+
+bool Packager::CheckFileValid(const std::string &filePath, const std::string &filename) 
+{
+    if (fs::is_regular_file(filePath)) {
+        std::string name = fs::path(filePath).filename();
+        if (endWith(name, filename)) {
+            return true;
+        }
+    }
+    return false; 
+}
+
+
+} // namespace AppPackingTool
+} // namespace OHOS
\ No newline at end of file
diff --git a/apt/frameworks/src/shell_command.cpp b/apt/frameworks/src/shell_command.cpp
new file mode 100644
index 00000000..42e05c48
--- /dev/null
+++ b/apt/frameworks/src/shell_command.cpp
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "shell_command.h"
+
+#include <getopt.h>
+#include <iostream>
+#include <memory>
+#include <string>
+
+#include "constants.h"
+#include "packager.h"
+#include "hap_packager.h"
+#include "hsp_packager.h"
+#include "app_packager.h"
+
+namespace OHOS {
+namespace AppPackingTool {
+namespace {
+
+} // namespace
+
+ShellCommand::ShellCommand(int argc, char *argv[], std::string name)
+{
+    opterr = 0;
+    argc_ = argc;
+    argv_ = argv;
+    name_ = name;
+
+    if (argc < MIN_ARGUMENT_NUMBER) {
+        cmd_ = Constants::CMD_HELP;
+        return;
+    }
+    cmd_ = argv[1];
+}
+
+ShellCommand::~ShellCommand() {}
+
+ErrCode ShellCommand::CreateCommandMap()
+{
+    commandMap_ = {
+        {"help", std::bind(&ShellCommand::RunAsHelpCommand, this)},
+        {"pack", std::bind(&ShellCommand::RunAsPackCommand, this)},
+        {"unpack", std::bind(&ShellCommand::RunAsUnpackCommand, this)},
+    };
+    return OHOS::ERR_OK;
+}
+
+ErrCode ShellCommand::ParseParam()
+{
+    int n = 0;
+    while (n < Constants::OPTIONS_SIZE) {
+        int32_t option = getopt_long(argc_, argv_, Constants::SHORT_OPTIONS, Constants::LONG_OPTIONS, nullptr);
+        if (optind < 0 || optind > argc_) {
+            return OHOS::ERR_INVALID_VALUE;
+        }
+        if (option < 0) {
+            std::cout << "ParseParam finish." << std::endl;
+            break;
+        } else if (option == '?') {
+            resultReceiver_.append("not support param: ").append(argv_[optind - 1]).append("\n");
+            return OHOS::ERR_INVALID_VALUE;
+        } else {
+            // example: --mode hap
+            std::string paramName = argv_[optind - OFFSET_REQUIRED_ARGUMENT];
+            paramName = paramName.substr(Constants::PARAM_PREFIX.length());
+            std::string paramValue = optarg;
+            parameterMap_[paramName] = optarg;
+        }
+        n++;
+    }
+    return OHOS::ERR_OK;
+}
+
+ErrCode ShellCommand::OnCommand()
+{
+    auto respond = commandMap_[cmd_];
+    if (respond == nullptr) {
+        resultReceiver_.append("not support command: ").append(cmd_).append("\n");
+        respond = commandMap_[Constants::CMD_HELP];
+    }
+    respond();
+    return OHOS::ERR_OK;
+}
+
+std::string ShellCommand::ExecCommand()
+{
+    int result = CreateCommandMap();
+    if (result != OHOS::ERR_OK) {
+        resultReceiver_.append("failed to create command map.\n");
+        return resultReceiver_;
+    }
+    result = ParseParam();
+    if (result != OHOS::ERR_OK) {
+        resultReceiver_.append("failed to init parameter map.\n");
+        return resultReceiver_;
+    }
+
+    result = OnCommand();
+    if (result != OHOS::ERR_OK) {
+        resultReceiver_.append("failed to execute your command.\n");
+        return resultReceiver_;
+    }
+    return resultReceiver_;
+}
+
+ErrCode ShellCommand::RunAsHelpCommand()
+{
+    resultReceiver_.append(HELP_MSG);
+    return OHOS::ERR_OK;
+}
+
+ErrCode ShellCommand::RunAsPackCommand()
+{
+    std::cout << "RunAsPackCommand " << std::endl;
+    std::unique_ptr<Packager> packager = getPackager();
+    if (packager != nullptr) {
+        packager->MakePackage();
+    } else {
+
+    }
+    int result = OHOS::ERR_OK;
+    return result;
+}
+
+ErrCode ShellCommand::RunAsUnpackCommand()
+{
+    std::cout << "RunAsUnpackCommand " << std::endl;
+    std::unique_ptr<Packager> packager = getPackager();
+    packager->MakePackage();
+    int result = OHOS::ERR_OK;
+    return result;
+}
+
+std::unique_ptr<Packager> ShellCommand::getPackager()
+{
+    std::string mode = parameterMap_[Constants::PARAM_MODE];
+    if (mode == Constants::MODE_HAP) {
+        std::unique_ptr<Packager> packager =
+            std::make_unique<HapPackager>(parameterMap_, resultReceiver_);
+        return packager;
+    } else if (mode == Constants::MODE_HSP) {
+        std::unique_ptr<Packager> packager =
+            std::make_unique<HspPackager>(parameterMap_, resultReceiver_);
+        return packager;
+    } else if (mode == Constants::MODE_APP) {
+        std::unique_ptr<Packager> packager =
+            std::make_unique<AppPackager>(parameterMap_, resultReceiver_);
+        return packager;
+    }
+    resultReceiver_.append("not support --mode: ").append(mode).append("\n");
+    return nullptr;
+}
+
+} // namespace AppPackingTool
+} // namespace OHOS
\ No newline at end of file
diff --git a/bundle.json b/bundle.json
index fb366a96..6dff8c7a 100755
--- a/bundle.json
+++ b/bundle.json
@@ -16,11 +16,17 @@
       "subsystem": "developtools",
       "adapted_system_type": [ "mini", "small", "standard" ],
       "deps": {
-        "components": []
+        "components": [
+          "c_utils",
+          "hilog",
+          "json",
+          "zlib"
+        ]
       },
       "build": {
         "sub_component": [
-          "//developtools/packing_tool:packing_tool"
+          "//developtools/packing_tool:packing_tool",
+          "//developtools/packing_tool:ohos_packing_tool"
         ]
       }
     }
-- 
Gitee


From 00c39a7639082177403befd8864cada70acf17e7 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Mon, 20 May 2024 20:03:28 +0800
Subject: [PATCH 08/20] update

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
Change-Id: I30dbd5b6e02497d4c238018635912d730edc8a67
---
 BUILD.gn                              |   4 +-
 apt/BUILD.gn                          |  18 ---
 apt/frameworks/BUILD.gn               |  33 ++--
 apt/frameworks/include/app_packager.h |  44 -----
 apt/frameworks/include/constants.h    |   2 -
 apt/frameworks/src/app_packager.cpp   | 222 --------------------------
 apt/frameworks/src/hap_packager.cpp   |  11 --
 apt/frameworks/src/hsp_packager.cpp   |  13 --
 apt/frameworks/src/packager.cpp       |  52 +++---
 apt/frameworks/src/shell_command.cpp  |   7 -
 bundle.json                           |   2 +-
 11 files changed, 41 insertions(+), 367 deletions(-)
 delete mode 100644 apt/BUILD.gn
 delete mode 100644 apt/frameworks/include/app_packager.h
 delete mode 100644 apt/frameworks/src/app_packager.cpp

diff --git a/BUILD.gn b/BUILD.gn
index 66633013..ee0888e5 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -65,5 +65,5 @@ ohos_prebuilt_etc("fastjson-1.2.83") {
 }
 
 ohos_group("ohos_packing_tool") {
-  deps = ["apt:ohos_packing_tool"]
-}
\ No newline at end of file
+  deps = [ "apt/frameworks:apt" ]
+}
diff --git a/apt/BUILD.gn b/apt/BUILD.gn
deleted file mode 100644
index 79a186d8..00000000
--- a/apt/BUILD.gn
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (c) 2024 Huawei Device Co., Ltd.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import("//build/ohos.gni")
-
-ohos_group("ohos_packing_tool") {
-  deps = [ "frameworks:ohos_packing_tool" ]
-}
\ No newline at end of file
diff --git a/apt/frameworks/BUILD.gn b/apt/frameworks/BUILD.gn
index 767cd5e5..22390781 100644
--- a/apt/frameworks/BUILD.gn
+++ b/apt/frameworks/BUILD.gn
@@ -13,33 +13,26 @@
 
 import("//build/ohos.gni")
 
-ohos_executable("apt") {
-    include_dirs = [
-        "include",
-    ]
+if (!defined(ohos_lite)) {
+  ohos_executable("apt") {
+    include_dirs = [ "include" ]
     sources = [
-        "src/main.cpp",
-        "src/shell_command.cpp",
-        "src/packager.cpp",
-        "src/hap_packager.cpp",
-        "src/hsp_packager.cpp",
-        "src/app_packager.cpp"
+      "src/hap_packager.cpp",
+      "src/hsp_packager.cpp",
+      "src/main.cpp",
+      "src/packager.cpp",
+      "src/shell_command.cpp",
     ]
     configs = []
     cflags = []
     external_deps = [
-        "c_utils:utils",
-        "hilog:libhilog",
-        "json:nlohmann_json_static",
-        "zlib:libz",
+      "c_utils:utils",
+      "hilog:libhilog",
+      "json:nlohmann_json_static",
+      "zlib:libz",
     ]
     install_enable = false
     subsystem_name = "developtools"
     part_name = "packing_tool"
+  }
 }
-
-ohos_group("ohos_packing_tool") {
-    deps = [
-        ":apt"
-    ]
-}
\ No newline at end of file
diff --git a/apt/frameworks/include/app_packager.h b/apt/frameworks/include/app_packager.h
deleted file mode 100644
index b4c74dbd..00000000
--- a/apt/frameworks/include/app_packager.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_APP_PACKAGER_H
-#define DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_APP_PACKAGER_H
-
-#include <iostream>
-#include <map>
-#include <string>
-
-#include "errors.h"
-#include "packager.h"
-
-namespace OHOS {
-namespace AppPackingTool {
-
-class AppPackager : public Packager {
-public:
-    AppPackager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver);
-    ~AppPackager() override {}
-
-protected:
-    ErrCode InitAllowedParam() override;
-    ErrCode PreProcess() override;
-    ErrCode Process() override;
-    ErrCode PostProcess() override;
-};
-
-}  // namespace AppExecFwk
-}  // namespace OHOS
-
-#endif  // DEVELOPTOOLS_PACKING_TOOL_APT_FRAMEWORKS_INCLUDE_APP_PACKAGER_H
\ No newline at end of file
diff --git a/apt/frameworks/include/constants.h b/apt/frameworks/include/constants.h
index 4e5ef11b..b6daeb26 100644
--- a/apt/frameworks/include/constants.h
+++ b/apt/frameworks/include/constants.h
@@ -49,7 +49,6 @@ const std::string PARAM_ETS_PATH = "ets-path";
 const std::string PARAM_OUT_PATH = "out-path";
 const std::string PARAM_MAPLE_SO_PATH = "maple-so-path";
 const std::string PARAM_MAPLE_SO_DIR = "maple-so-dir";
-const std::string PARAM_DEX_PATH = "dex-path";
 const std::string PARAM_RPCID_PATH = "rpcid-path";
 const std::string PARAM_JS_PATH = "js-path";
 const std::string PARAM_FORCE = "force";
@@ -103,7 +102,6 @@ const struct option LONG_OPTIONS[] = {
     {PARAM_OUT_PATH.c_str(), required_argument, nullptr, 9},
     {PARAM_MAPLE_SO_PATH.c_str(), required_argument, nullptr, 10},
     {PARAM_MAPLE_SO_DIR.c_str(), required_argument, nullptr, 11},
-    {PARAM_DEX_PATH.c_str(), required_argument, nullptr, 12},
     {PARAM_RPCID_PATH.c_str(), required_argument, nullptr, 13},
     {PARAM_JS_PATH.c_str(), required_argument, nullptr, 14},
     {PARAM_FORCE.c_str(), required_argument, nullptr, 15},
diff --git a/apt/frameworks/src/app_packager.cpp b/apt/frameworks/src/app_packager.cpp
deleted file mode 100644
index e258153b..00000000
--- a/apt/frameworks/src/app_packager.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <cstddef>
-#include <filesystem>
-#include <fstream>
-#include <iostream>
-#include <ostream>
-#include <sstream>
-#include <string>
-#include <vector>
-#include <random>
-
-#include "app_packager.h"
-#include "constants.h"
-#include "contrib/minizip/unzip.h"
-#include "contrib/minizip/zip.h"
-#include "errors.h"
-#include "packager.h"
-
-namespace OHOS {
-namespace AppPackingTool {
-namespace {}
-
-AppPackager::AppPackager(const std::map<std::string, std::string> &parameterMap, std::string &resultReceiver)
-    : Packager(parameterMap, resultReceiver)
-{}
-
-ErrCode AppPackager::InitAllowedParam()
-{
-//    std::cout << "Hsp Init" << std::endl;
-//    resultReceiver_.append("Hsp Init\n");
-    return OHOS::ERR_OK;
-}
-ErrCode AppPackager::PreProcess()
-{
-//    std::cout << "Hsp PreCheck" << std::endl;
-//    resultReceiver_.append("Hsp PreCheck\n");
-    return OHOS::ERR_OK;
-}
-
-void updatePackInfoToZip(std::string &srcZip, std::string &destZip, std::string packInfoPath) {
-    std::cout << "updatePackInfoToZip" << std::endl;
-    zipFile zf = zipOpen64(destZip.c_str(), APPEND_STATUS_CREATE);
-    if (zf == nullptr) {
-        std::cout << "err zipOpen64 null" << std::endl;
-    }
-    std::cout << "zipOpen64:" << destZip << std::endl;
-    unzFile zipFile = unzOpen(srcZip.c_str());
-    if (zipFile == nullptr) {
-        std::cout << "err unzOpen null" << std::endl;
-        return;
-    }
-    std::cout << "unzOpen:" << srcZip << std::endl;
-    unz_global_info globalInfo;
-    if (unzGetGlobalInfo(zipFile, &globalInfo) != UNZ_OK) {
-        std::cerr << "Failed to get global info from ZIP file" << std::endl;  
-        unzClose(zipFile);  
-        return; 
-    }
-    std::cout << "unzGetGlobalInfo: " << globalInfo.number_entry << std::endl;
-    unz_file_info fileInfo;
-    for (int i = 0; i < globalInfo.number_entry; i++) {
-        char entryName[256] = {0};
-        int status = unzGetCurrentFileInfo(zipFile, &fileInfo, entryName, sizeof(entryName), NULL, 0, NULL, 0);
-        if (status != UNZ_OK) {
-            std::cerr << "Failed to get file info from ZIP file" << std::endl;  
-            unzClose(zipFile);  
-            return; 
-        }
-        std::cout << "entryName: " << entryName << std::endl;
-        if (std::string(entryName) == Constants::PACK_INFO) {
-            std::ifstream inFile(packInfoPath);
-            if (!inFile.is_open()) {
-                std::cerr << "Failed to open file pack.info." << std::endl;
-                return;
-            }
-            zip_fileinfo fi = {};
-            if (zipOpenNewFileInZip(zf, Constants::PACK_INFO.c_str(), &fi, nullptr, 0, nullptr, 0, nullptr, 0,
-                                Z_DEFAULT_COMPRESSION) == ZIP_OK) {
-                char buffer[Constants::BUF_SIZE];
-                while (inFile.good()) {
-                    inFile.read(buffer, sizeof(buffer));
-                    auto bytesRead = inFile.gcount();
-                    if (bytesRead > 0) {
-                        if (zipWriteInFileInZip(zf, buffer, bytesRead) < 0) {
-                            std::cout << "3 err write to zip file: " << packInfoPath << std::endl;
-                            break;
-                        }
-                    }
-                }
-                zipCloseFileInZip(zf);
-            } else {
-                std::cout << "4 err add file to zip: " << packInfoPath << std::endl;
-            }
-            inFile.close();
-        } else {
-            status = unzOpenCurrentFile(zipFile);
-            if (status != UNZ_OK) {
-                std::cerr << "Failed to get file info from ZIP file" << std::endl;  
-                unzClose(zipFile);  
-                zipClose(zf, nullptr);
-                return; 
-            }
-            zip_fileinfo fi = {};
-            if (zipOpenNewFileInZip(zf, entryName, &fi, nullptr, 0, nullptr, 0, nullptr, 0,
-                                Z_DEFAULT_COMPRESSION) == ZIP_OK) {
-                char buffer[Constants::BUF_SIZE];
-                while (int len = unzReadCurrentFile(zipFile, buffer, Constants::BUF_SIZE)) {
-                    if (len > 0) {
-                        if (zipWriteInFileInZip(zf, buffer, len) < 0) {
-                            std::cout << "3 err write to zip file: " << packInfoPath << std::endl;
-                            break;
-                        }
-                    } else {
-                        std::cout << "len: " << len << std::endl;
-                        break;
-                    }
-                }
-                zipCloseFileInZip(zf);
-            } else {
-                std::cout << "4 err add file to zip: " << packInfoPath << std::endl;
-            }
-        }
-        unzCloseCurrentFile(zipFile);
-        unzGoToNextFile(zipFile);
-    }
-    unzClose(zipFile);
-    zipClose(zf, nullptr);
-}
-
-std::string randomString(size_t len) {
-    static const char alphanum[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-    std::random_device rd;
-    std::mt19937 gen(rd());
-    std::uniform_int_distribution<> dis(0, sizeof(alphanum) - 1);
-    std::string str(len, 0);
-    for (char& c : str) {
-        c = alphanum[dis(gen)];
-    }
-    return str;
-}
-
-ErrCode AppPackager::Process()
-{
-    std::cout << "App DoPackage" << std::endl;
-    std::string outPath = parameterMap_.at(Constants::PARAM_OUT_PATH);
-    zipFile zf = zipOpen64(outPath.c_str(), APPEND_STATUS_CREATE);
-    if (zf == nullptr) {
-        std::cout << "err zipOpen64 null" << std::endl;
-        return OHOS::ERR_INVALID_VALUE;
-    }
-    zip_fileinfo fi = {};
-    std::map<std::string, std::string>::const_iterator it = parameterMap_.find(Constants::PARAM_PACK_INFO_PATH);
-    std::string packInfoPath;
-    if (it != parameterMap_.end()) {
-        //std::cout << "zip packInfoPath: " << it->second << std::endl;
-        packInfoPath = it->second;
-        AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PACK_INFO), fi);
-    }
-    std::vector<std::string> hapList;
-    it = parameterMap_.find(Constants::PARAM_HAP_PATH);
-    if (it != parameterMap_.end()) {
-        //std::cout << "zip hapPath: " << it->second << std::endl;
-        std::string hapPath = it->second;
-        if (hapPath != "") {
-            std::string path;
-            std::istringstream iss(hapPath);
-            while(std::getline(iss, path, ',')) {
-                hapList.push_back(path);
-            }
-        }
-    }
-    it = parameterMap_.find(Constants::PARAM_HSP_PATH);
-    if (it != parameterMap_.end()) {
-        //std::cout << "zip hspPath: " << it->second << std::endl;
-        std::string hspPath = it->second;
-        if (hspPath != "") {
-            std::string path;
-            std::istringstream iss(hspPath);
-            while(std::getline(iss, path, ',')) {
-                hapList.push_back(path);
-            }
-        }
-    }
-    fs::path tempDir = fs::temp_directory_path() / randomString(8);
-    fs::create_directory(tempDir);
-    for(std::string hap : hapList) {
-        std::string tempFile = tempDir / fs::path(hap).filename();
-        std::cout << "tempFile: " << tempFile << ", hapPath:" << hap << std::endl;
-        updatePackInfoToZip(hap, tempFile, packInfoPath);
-        AddFileToZip(zf, fs::path(tempFile), fs::path(tempFile).filename(), fi);
-    }
-    fs::remove_all(tempDir);
-    zipClose(zf, nullptr);
-    std::cout << "app package" << std::endl;
-    return OHOS::ERR_OK;
-}
-
-
-
-ErrCode AppPackager::PostProcess()
-{
-//    std::cout << "Hsp PostCheck" << std::endl;
-//    resultReceiver_.append("Hsp PostCheck\n");
-    return OHOS::ERR_OK;
-}
-
-} // namespace AppPackingTool
-} // namespace OHOS
\ No newline at end of file
diff --git a/apt/frameworks/src/hap_packager.cpp b/apt/frameworks/src/hap_packager.cpp
index 09fda02c..84e9705f 100644
--- a/apt/frameworks/src/hap_packager.cpp
+++ b/apt/frameworks/src/hap_packager.cpp
@@ -63,42 +63,33 @@ ErrCode HapPackager::Process()
         if (ParseJsonFile(moduleJson, it->second)) {
             WriteStringToZip(zf, moduleJson.dump(), fs::path(Constants::MODULE_JSON), fi);
         }
-        //std::cout << "zip jsonPath: " << it->second << std::endl;
-        //std::cout << "zip jsonContent: " << moduleJson.dump() << std::endl;
     }
     it = parameterMap_.find(Constants::PARAM_LIB_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip libPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::LIB_PATH), fi);
     }
     it = parameterMap_.find(Constants::PARAM_RESOURCES_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip resourcesPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RESOURCES_PATH), fi);
     }
     it = parameterMap_.find(Constants::PARAM_INDEX_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip indexPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RESOURCES_INDEX), fi);
     }
     it = parameterMap_.find(Constants::PARAM_PACK_INFO_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip packInfoPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PACK_INFO), fi);
     }
     it = parameterMap_.find(Constants::PARAM_ETS_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip etsPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::ETS_PATH), fi);
     }
     it = parameterMap_.find(Constants::PARAM_RPCID_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip rpcidPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RPCID_SC), fi);
     }
     it = parameterMap_.find(Constants::PARAM_PKG_CONTEXT_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip pkgContextPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PKG_CONTEXT_JSON), fi);
     }
     zipClose(zf, nullptr);
@@ -106,8 +97,6 @@ ErrCode HapPackager::Process()
 }
 ErrCode HapPackager::PostProcess()
 {
-    //std::cout << "Hap PostCheck" << std::endl;
-    //resultReceiver_.append("Hap PostCheck\n");
     return OHOS::ERR_OK;
 }
 
diff --git a/apt/frameworks/src/hsp_packager.cpp b/apt/frameworks/src/hsp_packager.cpp
index 9f00b45d..06bb084e 100644
--- a/apt/frameworks/src/hsp_packager.cpp
+++ b/apt/frameworks/src/hsp_packager.cpp
@@ -32,14 +32,10 @@ HspPackager::HspPackager(const std::map<std::string, std::string> &parameterMap,
 
 ErrCode HspPackager::InitAllowedParam()
 {
-//    std::cout << "Hsp Init" << std::endl;
-//    resultReceiver_.append("Hsp Init\n");
     return OHOS::ERR_OK;
 }
 ErrCode HspPackager::PreProcess()
 {
-//    std::cout << "Hsp PreCheck" << std::endl;
-//    resultReceiver_.append("Hsp PreCheck\n");
     return OHOS::ERR_OK;
 }
 ErrCode HspPackager::Process()
@@ -60,37 +56,30 @@ ErrCode HspPackager::Process()
     }
     it = parameterMap_.find(Constants::PARAM_LIB_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip libPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::LIB_PATH), fi);
     }
     it = parameterMap_.find(Constants::PARAM_RESOURCES_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip resourcesPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RESOURCES_PATH), fi);
     }
     it = parameterMap_.find(Constants::PARAM_INDEX_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip indexPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RESOURCES_INDEX), fi);
     }
     it = parameterMap_.find(Constants::PARAM_PACK_INFO_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip packInfoPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PACK_INFO), fi);
     }
     it = parameterMap_.find(Constants::PARAM_ETS_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip etsPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::ETS_PATH), fi);
     }
     it = parameterMap_.find(Constants::PARAM_RPCID_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip rpcidPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::RPCID_SC), fi);
     }
     it = parameterMap_.find(Constants::PARAM_PKG_CONTEXT_PATH);
     if (it != parameterMap_.end()) {
-        //std::cout << "zip pkgContextPath: " << it->second << std::endl;
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PKG_CONTEXT_JSON), fi);
     }
     zipClose(zf, nullptr);
@@ -98,8 +87,6 @@ ErrCode HspPackager::Process()
 }
 ErrCode HspPackager::PostProcess()
 {
-//    std::cout << "Hsp PostCheck" << std::endl;
-//    resultReceiver_.append("Hsp PostCheck\n");
     return OHOS::ERR_OK;
 }
 
diff --git a/apt/frameworks/src/packager.cpp b/apt/frameworks/src/packager.cpp
index 9b28777f..195f32a6 100644
--- a/apt/frameworks/src/packager.cpp
+++ b/apt/frameworks/src/packager.cpp
@@ -34,10 +34,6 @@ Packager::~Packager() {}
 
 std::string Packager::MakePackage()
 {
-//    for (const auto &pair : parameterMap_) {
-//        std::cout << "** key: " << pair.first << ", value: " << pair.second << std::endl;
-//    }
-//    std::cout << "** resultReceiver: " << resultReceiver_ << std::endl;
     if (InitAllowedParam() != OHOS::ERR_OK) {
         std::cout << "PreCheck err" << std::endl;
     }
@@ -83,32 +79,34 @@ void Packager::AddFileToZip(zipFile zf, const fs::path &filePath, const fs::path
     if (fs::is_directory(filePath)) {
         for (const auto &entry : fs::directory_iterator(filePath)) {
             fs::path tmpPath = zipPath / entry.path().filename();
-            //std::cout << "zipPath: " << tmpPath << ", entry.path: " << entry.path() << ", tmpPath: " << tmpPath
-            //          << std::endl;
             AddFileToZip(zf, entry.path(), tmpPath, zipfi);
         }
     } else if (fs::is_regular_file(filePath)) {
         std::ifstream file(filePath, std::ios::binary);
         if (!file.is_open()) {
-            std::cout << "2 err opening file for read: " << filePath << std::endl;
+            std::cout << "err opening file for read: " << filePath << std::endl;
         }
-        if (zipOpenNewFileInZip(zf, zipPath.string().c_str(), &zipfi, nullptr, 0, nullptr, 0, nullptr, 0,
-                                Z_DEFAULT_COMPRESSION) == ZIP_OK) {
-            char buffer[Constants::BUF_SIZE];
-            while (file.good()) {
-                file.read(buffer, sizeof(buffer));
-                auto bytesRead = file.gcount();
-                if (bytesRead > 0) {
-                    if (zipWriteInFileInZip(zf, buffer, bytesRead) < 0) {
-                        std::cout << "3 err write to zip file: " << filePath << std::endl;
-                        break;
-                    }
-                }
+        int ret = zipOpenNewFileInZip(zf, zipPath.string().c_str(), &zipfi, nullptr, 0,
+            nullptr, 0, nullptr, 0, Z_DEFAULT_COMPRESSION);
+        if (ret != ZIP_OK) {
+            std::cout << "zipOpenNewFileInZip err: " << ret << ", " << filePath << std::endl;
+            file.close();
+            return ;
+        }
+        char buffer[Constants::BUF_SIZE];
+        while (file.good()) {
+            file.read(buffer, sizeof(buffer));
+            auto bytesRead = file.gcount();
+            if (bytesRead <= 0) {
+                std::cout << "read file: " << filePath << " err, bytesRead: " << bytesRead << std::endl;
+                break;
+            }
+            if (zipWriteInFileInZip(zf, buffer, bytesRead) < 0) {
+                std::cout << "err write to zip file: " << filePath << std::endl;
+                break;
             }
-            zipCloseFileInZip(zf);
-        } else {
-            std::cout << "4 err add file to zip: " << filePath << std::endl;
         }
+        zipCloseFileInZip(zf);
         file.close();
     }
 }
@@ -118,8 +116,7 @@ void Packager::WriteStringToZip(zipFile zf, const std::string &content, const fs
     if (zipOpenNewFileInZip(zf, zipPath.string().c_str(), &zipfi, nullptr, 0, nullptr, 0, nullptr, 0,
                             Z_DEFAULT_COMPRESSION) == ZIP_OK) {
         if (zipWriteInFileInZip(zf, content.data(), content.length()) < 0) {
-            std::cout << "zipWriteInFileInZip err" << std::endl;
-            return;
+            std::cout << "zipWriteInFileInZip err: " << errno << std::endl;
         }
         zipCloseFileInZip(zf);
     }
@@ -150,14 +147,15 @@ bool Packager::ParseJsonFile(nlohmann::json &jsonObject, std::string filePath)
     return true;
 }
 
-bool Packager::endWith(const std::string &str, const std::string &suffix) {
+bool Packager::endWith(const std::string &str, const std::string &suffix)
+{
     if (str.length() >= suffix.length()) {
         return str.compare(str.length() - suffix.length(), suffix.length(), suffix);
     }
     return false;
 }
 
-bool Packager::CheckFileValid(const std::string &filePath, const std::string &filename) 
+bool Packager::CheckFileValid(const std::string &filePath, const std::string &filename)
 {
     if (fs::is_regular_file(filePath)) {
         std::string name = fs::path(filePath).filename();
@@ -165,7 +163,7 @@ bool Packager::CheckFileValid(const std::string &filePath, const std::string &fi
             return true;
         }
     }
-    return false; 
+    return false;
 }
 
 
diff --git a/apt/frameworks/src/shell_command.cpp b/apt/frameworks/src/shell_command.cpp
index 42e05c48..0ec0e70b 100644
--- a/apt/frameworks/src/shell_command.cpp
+++ b/apt/frameworks/src/shell_command.cpp
@@ -24,7 +24,6 @@
 #include "packager.h"
 #include "hap_packager.h"
 #include "hsp_packager.h"
-#include "app_packager.h"
 
 namespace OHOS {
 namespace AppPackingTool {
@@ -128,8 +127,6 @@ ErrCode ShellCommand::RunAsPackCommand()
     std::unique_ptr<Packager> packager = getPackager();
     if (packager != nullptr) {
         packager->MakePackage();
-    } else {
-
     }
     int result = OHOS::ERR_OK;
     return result;
@@ -155,10 +152,6 @@ std::unique_ptr<Packager> ShellCommand::getPackager()
         std::unique_ptr<Packager> packager =
             std::make_unique<HspPackager>(parameterMap_, resultReceiver_);
         return packager;
-    } else if (mode == Constants::MODE_APP) {
-        std::unique_ptr<Packager> packager =
-            std::make_unique<AppPackager>(parameterMap_, resultReceiver_);
-        return packager;
     }
     resultReceiver_.append("not support --mode: ").append(mode).append("\n");
     return nullptr;
diff --git a/bundle.json b/bundle.json
index 6dff8c7a..88c21c08 100755
--- a/bundle.json
+++ b/bundle.json
@@ -1,5 +1,5 @@
 {
-    "name": "packing_tool",
+    "name": "@ohos/packing_tool",
     "version": "3.2",
     "license": "Apache License 2.0",
     "publishAs": "code-segment",
-- 
Gitee


From f96cb72f1a151929bae81e53e58df160c585299f Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Tue, 21 May 2024 14:30:15 +0800
Subject: [PATCH 09/20] rm c_utils

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
Change-Id: Ie483542d1db26d89357239b18b96543521307862
---
 apt/frameworks/BUILD.gn                | 40 ++++++++++++--------------
 apt/frameworks/include/hap_packager.h  |  9 +++---
 apt/frameworks/include/hsp_packager.h  |  9 +++---
 apt/frameworks/include/packager.h      | 14 +++++----
 apt/frameworks/include/shell_command.h | 13 ++++-----
 apt/frameworks/src/hap_packager.cpp    | 20 ++++++-------
 apt/frameworks/src/hsp_packager.cpp    | 19 ++++++------
 apt/frameworks/src/packager.cpp        | 21 +++++++-------
 apt/frameworks/src/shell_command.cpp   | 36 +++++++++++------------
 bundle.json                            |  4 +--
 10 files changed, 88 insertions(+), 97 deletions(-)

diff --git a/apt/frameworks/BUILD.gn b/apt/frameworks/BUILD.gn
index 22390781..0bae49f9 100644
--- a/apt/frameworks/BUILD.gn
+++ b/apt/frameworks/BUILD.gn
@@ -13,26 +13,22 @@
 
 import("//build/ohos.gni")
 
-if (!defined(ohos_lite)) {
-  ohos_executable("apt") {
-    include_dirs = [ "include" ]
-    sources = [
-      "src/hap_packager.cpp",
-      "src/hsp_packager.cpp",
-      "src/main.cpp",
-      "src/packager.cpp",
-      "src/shell_command.cpp",
-    ]
-    configs = []
-    cflags = []
-    external_deps = [
-      "c_utils:utils",
-      "hilog:libhilog",
-      "json:nlohmann_json_static",
-      "zlib:libz",
-    ]
-    install_enable = false
-    subsystem_name = "developtools"
-    part_name = "packing_tool"
-  }
+ohos_executable("apt") {
+  include_dirs = [ "include" ]
+  sources = [
+    "src/hap_packager.cpp",
+    "src/hsp_packager.cpp",
+    "src/main.cpp",
+    "src/packager.cpp",
+    "src/shell_command.cpp",
+  ]
+  configs = []
+  cflags = []
+  external_deps = [
+    "json:nlohmann_json_static",
+    "zlib:libz",
+  ]
+  install_enable = false
+  subsystem_name = "developtools"
+  part_name = "packing_tool"
 }
diff --git a/apt/frameworks/include/hap_packager.h b/apt/frameworks/include/hap_packager.h
index 5d5abbb6..a6e14287 100644
--- a/apt/frameworks/include/hap_packager.h
+++ b/apt/frameworks/include/hap_packager.h
@@ -20,7 +20,6 @@
 #include <map>
 #include <string>
 
-#include "errors.h"
 #include "packager.h"
 
 namespace OHOS {
@@ -32,10 +31,10 @@ public:
     ~HapPackager() override {}
 
 protected:
-    ErrCode InitAllowedParam() override;
-    ErrCode PreProcess() override;
-    ErrCode Process() override;
-    ErrCode PostProcess() override;
+    int InitAllowedParam() override;
+    int PreProcess() override;
+    int Process() override;
+    int PostProcess() override;
 };
 
 }  // namespace AppExecFwk
diff --git a/apt/frameworks/include/hsp_packager.h b/apt/frameworks/include/hsp_packager.h
index 597549cd..bfc88de1 100644
--- a/apt/frameworks/include/hsp_packager.h
+++ b/apt/frameworks/include/hsp_packager.h
@@ -20,7 +20,6 @@
 #include <map>
 #include <string>
 
-#include "errors.h"
 #include "packager.h"
 
 namespace OHOS {
@@ -32,10 +31,10 @@ public:
     ~HspPackager() override {}
 
 protected:
-    ErrCode InitAllowedParam() override;
-    ErrCode PreProcess() override;
-    ErrCode Process() override;
-    ErrCode PostProcess() override;
+    int InitAllowedParam() override;
+    int PreProcess() override;
+    int Process() override;
+    int PostProcess() override;
 };
 
 }  // namespace AppExecFwk
diff --git a/apt/frameworks/include/packager.h b/apt/frameworks/include/packager.h
index 792d5b4a..eb643dab 100644
--- a/apt/frameworks/include/packager.h
+++ b/apt/frameworks/include/packager.h
@@ -27,7 +27,6 @@
 #include "constants.h"
 #include "contrib/minizip/zip.h"
 #include "contrib/minizip/unzip.h"
-#include "errors.h"
 #include "nlohmann/json.hpp"
 
 namespace fs = std::filesystem;
@@ -35,6 +34,11 @@ namespace fs = std::filesystem;
 namespace OHOS {
 namespace AppPackingTool {
 
+enum ErrCode {
+    ERR_OK = 0,
+    ERR_INVALID_VALUE,
+};
+
 struct Parameter {
     std::string paramName;
     bool required;
@@ -50,10 +54,10 @@ public:
 
     std::string MakePackage();
 
-    virtual ErrCode InitAllowedParam() = 0;
-    virtual ErrCode PreProcess() = 0;
-    virtual ErrCode Process() = 0;
-    virtual ErrCode PostProcess() = 0;
+    virtual int InitAllowedParam() = 0;
+    virtual int PreProcess() = 0;
+    virtual int Process() = 0;
+    virtual int PostProcess() = 0;
 
 protected:
     const std::map<std::string, std::string> &parameterMap_;
diff --git a/apt/frameworks/include/shell_command.h b/apt/frameworks/include/shell_command.h
index 84985923..02d90d42 100644
--- a/apt/frameworks/include/shell_command.h
+++ b/apt/frameworks/include/shell_command.h
@@ -21,7 +21,6 @@
 #include <functional>
 #include <vector>
 
-#include "errors.h"
 #include "packager.h"
 
 namespace OHOS {
@@ -44,10 +43,10 @@ public:
     ShellCommand(int argc, char *argv[], std::string name);
     virtual ~ShellCommand();
 
-    ErrCode ParseParam();
-    ErrCode OnCommand();
+    int ParseParam();
+    int OnCommand();
     std::string ExecCommand();
-    ErrCode CreateCommandMap();
+    int CreateCommandMap();
 
 protected:
     static constexpr int MIN_ARGUMENT_NUMBER = 2;
@@ -61,9 +60,9 @@ protected:
     std::map<std::string, std::string> parameterMap_;
     std::string resultReceiver_ = "";
 
-    ErrCode RunAsHelpCommand();
-    ErrCode RunAsPackCommand();
-    ErrCode RunAsUnpackCommand();
+    int RunAsHelpCommand();
+    int RunAsPackCommand();
+    int RunAsUnpackCommand();
 
 private:
     std::unique_ptr<Packager> getPackager();
diff --git a/apt/frameworks/src/hap_packager.cpp b/apt/frameworks/src/hap_packager.cpp
index 84e9705f..fda8730b 100644
--- a/apt/frameworks/src/hap_packager.cpp
+++ b/apt/frameworks/src/hap_packager.cpp
@@ -24,7 +24,6 @@
 #include "constants.h"
 #include "contrib/minizip/zip.h"
 #include "nlohmann/json.hpp"
-#include "errors.h"
 #include "packager.h"
 
 namespace OHOS {
@@ -35,27 +34,27 @@ HapPackager::HapPackager(const std::map<std::string, std::string> &parameterMap,
     : Packager(parameterMap, resultReceiver)
 {}
 
-ErrCode HapPackager::InitAllowedParam()
+int HapPackager::InitAllowedParam()
 {
     allowedParameters_ = {
         {}
     };
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
-ErrCode HapPackager::PreProcess()
+int HapPackager::PreProcess()
 {
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
-ErrCode HapPackager::Process()
+int HapPackager::Process()
 {
     std::cout << "Hap DoPackage" << std::endl;
     std::string outPath = parameterMap_.at(Constants::PARAM_OUT_PATH);
     zipFile zf = zipOpen64(outPath.c_str(), APPEND_STATUS_CREATE);
     if (zf == nullptr) {
         std::cout << "err zipOpen64 null" << std::endl;
-        return OHOS::ERR_INVALID_VALUE;
+        return ERR_INVALID_VALUE;
     }
     zip_fileinfo fi = {};
     std::map<std::string, std::string>::const_iterator it = parameterMap_.find(Constants::PARAM_JSON_PATH);
@@ -93,11 +92,12 @@ ErrCode HapPackager::Process()
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PKG_CONTEXT_JSON), fi);
     }
     zipClose(zf, nullptr);
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
-ErrCode HapPackager::PostProcess()
+
+int HapPackager::PostProcess()
 {
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
 } // namespace AppPackingTool
diff --git a/apt/frameworks/src/hsp_packager.cpp b/apt/frameworks/src/hsp_packager.cpp
index 06bb084e..e625197d 100644
--- a/apt/frameworks/src/hsp_packager.cpp
+++ b/apt/frameworks/src/hsp_packager.cpp
@@ -19,7 +19,6 @@
 
 #include "hsp_packager.h"
 #include "constants.h"
-#include "errors.h"
 #include "packager.h"
 
 namespace OHOS {
@@ -30,22 +29,22 @@ HspPackager::HspPackager(const std::map<std::string, std::string> &parameterMap,
     : Packager(parameterMap, resultReceiver)
 {}
 
-ErrCode HspPackager::InitAllowedParam()
+int HspPackager::InitAllowedParam()
 {
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
-ErrCode HspPackager::PreProcess()
+int HspPackager::PreProcess()
 {
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
-ErrCode HspPackager::Process()
+int HspPackager::Process()
 {
     std::cout << "Hsp DoPackage" << std::endl;
     std::string outPath = parameterMap_.at(Constants::PARAM_OUT_PATH);
     zipFile zf = zipOpen64(outPath.c_str(), APPEND_STATUS_CREATE);
     if (zf == nullptr) {
         std::cout << "err zipOpen64 null" << std::endl;
-        return OHOS::ERR_INVALID_VALUE;
+        return ERR_INVALID_VALUE;
     }
     zip_fileinfo fi = {};
     std::map<std::string, std::string>::const_iterator it = parameterMap_.find(Constants::PARAM_JSON_PATH);
@@ -83,11 +82,11 @@ ErrCode HspPackager::Process()
         AddFileToZip(zf, fs::path(it->second), fs::path(Constants::PKG_CONTEXT_JSON), fi);
     }
     zipClose(zf, nullptr);
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
-ErrCode HspPackager::PostProcess()
+int HspPackager::PostProcess()
 {
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
 } // namespace AppPackingTool
diff --git a/apt/frameworks/src/packager.cpp b/apt/frameworks/src/packager.cpp
index 195f32a6..77c2a7ed 100644
--- a/apt/frameworks/src/packager.cpp
+++ b/apt/frameworks/src/packager.cpp
@@ -20,7 +20,6 @@
 #include <string>
 
 #include "packager.h"
-#include "errors.h"
 
 namespace OHOS {
 namespace AppPackingTool {
@@ -34,44 +33,44 @@ Packager::~Packager() {}
 
 std::string Packager::MakePackage()
 {
-    if (InitAllowedParam() != OHOS::ERR_OK) {
+    if (InitAllowedParam() != ERR_OK) {
         std::cout << "PreCheck err" << std::endl;
     }
 
-    if (PreProcess() != OHOS::ERR_OK) {
+    if (PreProcess() != ERR_OK) {
         std::cout << "PreCheck err" << std::endl;
     }
 
-    if (Process() != OHOS::ERR_OK) {
+    if (Process() != ERR_OK) {
         std::cout << "DoPackage err" << std::endl;
     }
 
-    if (PostProcess() != OHOS::ERR_OK) {
+    if (PostProcess() != ERR_OK) {
         std::cout << "PostCheck err" << std::endl;
     }
 
     return "OHOS::ERR_OK";
 }
 
-ErrCode Packager::PreProcess()
+int Packager::PreProcess()
 {
     std::cout << "PreCheck" << std::endl;
     resultReceiver_.append("do PreCheck\n");
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
-ErrCode Packager::Process()
+int Packager::Process()
 {
     std::cout << "DoPackage" << std::endl;
     resultReceiver_.append("do DoPackage\n");
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
-ErrCode Packager::PostProcess()
+int Packager::PostProcess()
 {
     std::cout << "PostCheck" << std::endl;
     resultReceiver_.append("do PostCheck\n");
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
 void Packager::AddFileToZip(zipFile zf, const fs::path &filePath, const fs::path &zipPath, zip_fileinfo &zipfi)
diff --git a/apt/frameworks/src/shell_command.cpp b/apt/frameworks/src/shell_command.cpp
index 0ec0e70b..a72b34ec 100644
--- a/apt/frameworks/src/shell_command.cpp
+++ b/apt/frameworks/src/shell_command.cpp
@@ -47,30 +47,30 @@ ShellCommand::ShellCommand(int argc, char *argv[], std::string name)
 
 ShellCommand::~ShellCommand() {}
 
-ErrCode ShellCommand::CreateCommandMap()
+int ShellCommand::CreateCommandMap()
 {
     commandMap_ = {
         {"help", std::bind(&ShellCommand::RunAsHelpCommand, this)},
         {"pack", std::bind(&ShellCommand::RunAsPackCommand, this)},
         {"unpack", std::bind(&ShellCommand::RunAsUnpackCommand, this)},
     };
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
-ErrCode ShellCommand::ParseParam()
+int ShellCommand::ParseParam()
 {
     int n = 0;
     while (n < Constants::OPTIONS_SIZE) {
         int32_t option = getopt_long(argc_, argv_, Constants::SHORT_OPTIONS, Constants::LONG_OPTIONS, nullptr);
         if (optind < 0 || optind > argc_) {
-            return OHOS::ERR_INVALID_VALUE;
+            return ERR_INVALID_VALUE;
         }
         if (option < 0) {
             std::cout << "ParseParam finish." << std::endl;
             break;
         } else if (option == '?') {
             resultReceiver_.append("not support param: ").append(argv_[optind - 1]).append("\n");
-            return OHOS::ERR_INVALID_VALUE;
+            return ERR_INVALID_VALUE;
         } else {
             // example: --mode hap
             std::string paramName = argv_[optind - OFFSET_REQUIRED_ARGUMENT];
@@ -80,10 +80,10 @@ ErrCode ShellCommand::ParseParam()
         }
         n++;
     }
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
-ErrCode ShellCommand::OnCommand()
+int ShellCommand::OnCommand()
 {
     auto respond = commandMap_[cmd_];
     if (respond == nullptr) {
@@ -91,54 +91,52 @@ ErrCode ShellCommand::OnCommand()
         respond = commandMap_[Constants::CMD_HELP];
     }
     respond();
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
 std::string ShellCommand::ExecCommand()
 {
     int result = CreateCommandMap();
-    if (result != OHOS::ERR_OK) {
+    if (result != ERR_OK) {
         resultReceiver_.append("failed to create command map.\n");
         return resultReceiver_;
     }
     result = ParseParam();
-    if (result != OHOS::ERR_OK) {
+    if (result != ERR_OK) {
         resultReceiver_.append("failed to init parameter map.\n");
         return resultReceiver_;
     }
 
     result = OnCommand();
-    if (result != OHOS::ERR_OK) {
+    if (result != ERR_OK) {
         resultReceiver_.append("failed to execute your command.\n");
         return resultReceiver_;
     }
     return resultReceiver_;
 }
 
-ErrCode ShellCommand::RunAsHelpCommand()
+int ShellCommand::RunAsHelpCommand()
 {
     resultReceiver_.append(HELP_MSG);
-    return OHOS::ERR_OK;
+    return ERR_OK;
 }
 
-ErrCode ShellCommand::RunAsPackCommand()
+int ShellCommand::RunAsPackCommand()
 {
     std::cout << "RunAsPackCommand " << std::endl;
     std::unique_ptr<Packager> packager = getPackager();
     if (packager != nullptr) {
         packager->MakePackage();
     }
-    int result = OHOS::ERR_OK;
-    return result;
+    return ERR_OK;
 }
 
-ErrCode ShellCommand::RunAsUnpackCommand()
+int ShellCommand::RunAsUnpackCommand()
 {
     std::cout << "RunAsUnpackCommand " << std::endl;
     std::unique_ptr<Packager> packager = getPackager();
     packager->MakePackage();
-    int result = OHOS::ERR_OK;
-    return result;
+    return ERR_OK;
 }
 
 std::unique_ptr<Packager> ShellCommand::getPackager()
diff --git a/bundle.json b/bundle.json
index 88c21c08..570c8e61 100755
--- a/bundle.json
+++ b/bundle.json
@@ -1,5 +1,5 @@
 {
-    "name": "@ohos/packing_tool",
+    "name": "packing_tool",
     "version": "3.2",
     "license": "Apache License 2.0",
     "publishAs": "code-segment",
@@ -17,8 +17,6 @@
       "adapted_system_type": [ "mini", "small", "standard" ],
       "deps": {
         "components": [
-          "c_utils",
-          "hilog",
           "json",
           "zlib"
         ]
-- 
Gitee


From b0b159bc5ac951737db7d1902f2a263db6d9abf3 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Wed, 22 May 2024 10:54:47 +0800
Subject: [PATCH 10/20] rename

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
Change-Id: Idae8be7ad705cb8730c9139ce9ce790bac977108
---
 BUILD.gn                                                      | 2 +-
 {apt => ohos_packing_tool}/LICENSE                            | 0
 {apt => ohos_packing_tool}/frameworks/BUILD.gn                | 2 +-
 {apt => ohos_packing_tool}/frameworks/include/constants.h     | 0
 {apt => ohos_packing_tool}/frameworks/include/hap_packager.h  | 0
 {apt => ohos_packing_tool}/frameworks/include/hsp_packager.h  | 0
 {apt => ohos_packing_tool}/frameworks/include/packager.h      | 0
 {apt => ohos_packing_tool}/frameworks/include/shell_command.h | 0
 {apt => ohos_packing_tool}/frameworks/src/hap_packager.cpp    | 0
 {apt => ohos_packing_tool}/frameworks/src/hsp_packager.cpp    | 0
 {apt => ohos_packing_tool}/frameworks/src/main.cpp            | 0
 {apt => ohos_packing_tool}/frameworks/src/packager.cpp        | 0
 {apt => ohos_packing_tool}/frameworks/src/shell_command.cpp   | 2 --
 13 files changed, 2 insertions(+), 4 deletions(-)
 rename {apt => ohos_packing_tool}/LICENSE (100%)
 rename {apt => ohos_packing_tool}/frameworks/BUILD.gn (96%)
 rename {apt => ohos_packing_tool}/frameworks/include/constants.h (100%)
 rename {apt => ohos_packing_tool}/frameworks/include/hap_packager.h (100%)
 rename {apt => ohos_packing_tool}/frameworks/include/hsp_packager.h (100%)
 rename {apt => ohos_packing_tool}/frameworks/include/packager.h (100%)
 rename {apt => ohos_packing_tool}/frameworks/include/shell_command.h (100%)
 rename {apt => ohos_packing_tool}/frameworks/src/hap_packager.cpp (100%)
 rename {apt => ohos_packing_tool}/frameworks/src/hsp_packager.cpp (100%)
 rename {apt => ohos_packing_tool}/frameworks/src/main.cpp (100%)
 rename {apt => ohos_packing_tool}/frameworks/src/packager.cpp (100%)
 rename {apt => ohos_packing_tool}/frameworks/src/shell_command.cpp (98%)

diff --git a/BUILD.gn b/BUILD.gn
index ee0888e5..55ddcd18 100755
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -65,5 +65,5 @@ ohos_prebuilt_etc("fastjson-1.2.83") {
 }
 
 ohos_group("ohos_packing_tool") {
-  deps = [ "apt/frameworks:apt" ]
+  deps = [ "ohos_packing_tool/frameworks:ohos_packing_tool" ]
 }
diff --git a/apt/LICENSE b/ohos_packing_tool/LICENSE
similarity index 100%
rename from apt/LICENSE
rename to ohos_packing_tool/LICENSE
diff --git a/apt/frameworks/BUILD.gn b/ohos_packing_tool/frameworks/BUILD.gn
similarity index 96%
rename from apt/frameworks/BUILD.gn
rename to ohos_packing_tool/frameworks/BUILD.gn
index 0bae49f9..78bb699a 100644
--- a/apt/frameworks/BUILD.gn
+++ b/ohos_packing_tool/frameworks/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//build/ohos.gni")
 
-ohos_executable("apt") {
+ohos_executable("ohos_packing_tool") {
   include_dirs = [ "include" ]
   sources = [
     "src/hap_packager.cpp",
diff --git a/apt/frameworks/include/constants.h b/ohos_packing_tool/frameworks/include/constants.h
similarity index 100%
rename from apt/frameworks/include/constants.h
rename to ohos_packing_tool/frameworks/include/constants.h
diff --git a/apt/frameworks/include/hap_packager.h b/ohos_packing_tool/frameworks/include/hap_packager.h
similarity index 100%
rename from apt/frameworks/include/hap_packager.h
rename to ohos_packing_tool/frameworks/include/hap_packager.h
diff --git a/apt/frameworks/include/hsp_packager.h b/ohos_packing_tool/frameworks/include/hsp_packager.h
similarity index 100%
rename from apt/frameworks/include/hsp_packager.h
rename to ohos_packing_tool/frameworks/include/hsp_packager.h
diff --git a/apt/frameworks/include/packager.h b/ohos_packing_tool/frameworks/include/packager.h
similarity index 100%
rename from apt/frameworks/include/packager.h
rename to ohos_packing_tool/frameworks/include/packager.h
diff --git a/apt/frameworks/include/shell_command.h b/ohos_packing_tool/frameworks/include/shell_command.h
similarity index 100%
rename from apt/frameworks/include/shell_command.h
rename to ohos_packing_tool/frameworks/include/shell_command.h
diff --git a/apt/frameworks/src/hap_packager.cpp b/ohos_packing_tool/frameworks/src/hap_packager.cpp
similarity index 100%
rename from apt/frameworks/src/hap_packager.cpp
rename to ohos_packing_tool/frameworks/src/hap_packager.cpp
diff --git a/apt/frameworks/src/hsp_packager.cpp b/ohos_packing_tool/frameworks/src/hsp_packager.cpp
similarity index 100%
rename from apt/frameworks/src/hsp_packager.cpp
rename to ohos_packing_tool/frameworks/src/hsp_packager.cpp
diff --git a/apt/frameworks/src/main.cpp b/ohos_packing_tool/frameworks/src/main.cpp
similarity index 100%
rename from apt/frameworks/src/main.cpp
rename to ohos_packing_tool/frameworks/src/main.cpp
diff --git a/apt/frameworks/src/packager.cpp b/ohos_packing_tool/frameworks/src/packager.cpp
similarity index 100%
rename from apt/frameworks/src/packager.cpp
rename to ohos_packing_tool/frameworks/src/packager.cpp
diff --git a/apt/frameworks/src/shell_command.cpp b/ohos_packing_tool/frameworks/src/shell_command.cpp
similarity index 98%
rename from apt/frameworks/src/shell_command.cpp
rename to ohos_packing_tool/frameworks/src/shell_command.cpp
index a72b34ec..fe51887b 100644
--- a/apt/frameworks/src/shell_command.cpp
+++ b/ohos_packing_tool/frameworks/src/shell_command.cpp
@@ -134,8 +134,6 @@ int ShellCommand::RunAsPackCommand()
 int ShellCommand::RunAsUnpackCommand()
 {
     std::cout << "RunAsUnpackCommand " << std::endl;
-    std::unique_ptr<Packager> packager = getPackager();
-    packager->MakePackage();
     return ERR_OK;
 }
 
-- 
Gitee


From bb2e41b03d386ae266cc522f1ee5c86b2e667040 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Wed, 22 May 2024 14:46:02 +0800
Subject: [PATCH 11/20] update hnpPackages

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 modulecheck/module.json | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modulecheck/module.json b/modulecheck/module.json
index 7062e45b..b48ebdbc 100644
--- a/modulecheck/module.json
+++ b/modulecheck/module.json
@@ -136,7 +136,7 @@
                 "routerMap",
                 "appEnvironments",
                 "appStartup",
-                "hnp_packages"
+                "hnpPackages"
               ]
             },
             "required": [
@@ -1466,9 +1466,10 @@
           "pattern": "^[$]profile:[0-9a-zA-Z_.]+$",
           "maxLength": 255
         },
-        "hnp_packages": {
+        "hnpPackages": {
           "description": "Native package configuration file.",
           "type": "array",
+          "minItems": 1,
           "items": {
             "type": "object",
             "propertyNames": {
@@ -1477,11 +1478,15 @@
                 "type"
               ]
             },
+            "required": [
+              "package",
+              "type"
+            ],
             "properties": {
               "package": {
                 "description": "Indicates the file name of native package.",
                 "type": "string",
-                "pattern": "^[a-zA-Z][0-9a-zA-Z_./]+$",
+                "pattern": "^([a-zA-Z0-9_-]+(\/[a-zA-Z0-9_-]+)*\/)?[a-zA-Z0-9_-]+\.hnp$",
                 "maxLength": 255
               },
               "type": {
-- 
Gitee


From 35986104b1b8215ac0bdbea3f4b6c16722412081 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Wed, 22 May 2024 16:59:42 +0800
Subject: [PATCH 12/20] json format err, continue

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 adapter/ohos/Compressor.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/adapter/ohos/Compressor.java b/adapter/ohos/Compressor.java
index 87a93fb2..5b7737fd 100644
--- a/adapter/ohos/Compressor.java
+++ b/adapter/ohos/Compressor.java
@@ -2181,8 +2181,9 @@ public class Compressor {
             if (!entryName.contains(RAW_FILE_PATH) &&
                     srcFile.getName().toLowerCase(Locale.ENGLISH).endsWith(JSON_SUFFIX)) {
                 zipEntry.setMethod(ZipEntry.STORED);
-                jsonSpecialProcess(utility, srcFile, zipEntry);
-                return;
+                if (jsonSpecialProcess(utility, srcFile, zipEntry)) {
+                    return;
+                }
             }
 
             if (isCompression) {
@@ -2328,10 +2329,9 @@ public class Compressor {
      * @param utility common data
      * @param srcFile file input
      * @param entry   zip file entry
-     * @throws BundleException FileNotFoundException|IOException.
+     * @return true if process success
      */
-    private void jsonSpecialProcess(Utility utility, File srcFile, ZipArchiveEntry entry)
-            throws BundleException {
+    private boolean jsonSpecialProcess(Utility utility, File srcFile, ZipArchiveEntry entry) {
         FileInputStream fileInputStream = null;
         BufferedReader bufferedReader = null;
         InputStreamReader inputStreamReader = null;
@@ -2386,12 +2386,13 @@ public class Compressor {
         } catch (Exception exception) {
             LOG.error("Compressor::jsonSpecialProcess io exception: " + exception.getMessage());
             LOG.warning("Json format err: " + srcFile.getAbsolutePath());
-            throw new BundleException("Json special process failed.");
+            return false;
         } finally {
             Utility.closeStream(bufferedReader);
             Utility.closeStream(inputStreamReader);
             Utility.closeStream(fileInputStream);
         }
+        return true;
     }
 
     /**
-- 
Gitee


From b40c9cc516dd8762d0655b08fe76b7309a1e87e5 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Thu, 23 May 2024 09:12:55 +0800
Subject: [PATCH 13/20] update

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 modulecheck/module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulecheck/module.json b/modulecheck/module.json
index 91f9d5fc..ad7a78c2 100644
--- a/modulecheck/module.json
+++ b/modulecheck/module.json
@@ -1536,7 +1536,7 @@
               "package": {
                 "description": "Indicates the file name of native package.",
                 "type": "string",
-                "pattern": "^([a-zA-Z0-9_-]+(\/[a-zA-Z0-9_-]+)*\/)?[a-zA-Z0-9_-]+\.hnp$",
+                "pattern": "^([a-zA-Z0-9_-]+(\/[a-zA-Z0-9_-]+)*\/)?[a-zA-Z0-9_-]+\\.hnp$",
                 "maxLength": 255
               },
               "type": {
-- 
Gitee


From 2751c440cbd25ce888434311f71209de337ea297 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Thu, 23 May 2024 21:27:38 +0800
Subject: [PATCH 14/20] fix multiAppMode

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 modulecheck/app.json | 132 ++++++++++++++++++++++++++++++-------------
 1 file changed, 93 insertions(+), 39 deletions(-)

diff --git a/modulecheck/app.json b/modulecheck/app.json
index 9a695913..17c2fe7f 100644
--- a/modulecheck/app.json
+++ b/modulecheck/app.json
@@ -78,45 +78,95 @@
         "versionCode",
         "versionName"
       ],
-      "propertyNames": {
-        "enum": [
-          "bundleName",
-          "debug",
-          "bundleType",
-          "icon",
-          "label",
-          "description",
-          "vendor",
-          "versionCode",
-          "versionName",
-          "minCompatibleVersionCode",
-          "minAPIVersion",
-          "targetAPIVersion",
-          "apiReleaseType",
-          "distributedNotificationEnabled",
-          "entityType",
-          "keepAlive",
-          "removable",
-          "singleton",
-          "userDataClearable",
-          "accessible",
-          "multiProjects",
-          "asanEnabled",
-          "default",
-          "tablet",
-          "tv",
-          "wearable",
-          "car",
-          "targetBundleName",
-          "targetPriority",
-          "generateBuildHash",
-          "2in1",
-          "GWPAsanEnabled",
-          "tsanEnabled",
-          "appEnvironments",
-          "maxChildProcess",
-          "multiAppMode"
-        ]
+      "if": {
+        "properties": {
+          "bundleType": {
+            "const": "app"
+          }
+        }
+      },
+      "then": {
+        "propertyNames": {
+          "enum": [
+            "bundleName",
+            "debug",
+            "bundleType",
+            "icon",
+            "label",
+            "description",
+            "vendor",
+            "versionCode",
+            "versionName",
+            "minCompatibleVersionCode",
+            "minAPIVersion",
+            "targetAPIVersion",
+            "apiReleaseType",
+            "distributedNotificationEnabled",
+            "entityType",
+            "keepAlive",
+            "removable",
+            "singleton",
+            "userDataClearable",
+            "accessible",
+            "multiProjects",
+            "asanEnabled",
+            "default",
+            "tablet",
+            "tv",
+            "wearable",
+            "car",
+            "targetBundleName",
+            "targetPriority",
+            "generateBuildHash",
+            "2in1",
+            "GWPAsanEnabled",
+            "tsanEnabled",
+            "appEnvironments",
+            "maxChildProcess",
+            "multiAppMode"
+          ]
+        }
+      },
+      "else": {
+        "propertyNames": {
+          "enum": [
+            "bundleName",
+            "debug",
+            "bundleType",
+            "icon",
+            "label",
+            "description",
+            "vendor",
+            "versionCode",
+            "versionName",
+            "minCompatibleVersionCode",
+            "minAPIVersion",
+            "targetAPIVersion",
+            "apiReleaseType",
+            "distributedNotificationEnabled",
+            "entityType",
+            "keepAlive",
+            "removable",
+            "singleton",
+            "userDataClearable",
+            "accessible",
+            "multiProjects",
+            "asanEnabled",
+            "default",
+            "tablet",
+            "tv",
+            "wearable",
+            "car",
+            "targetBundleName",
+            "targetPriority",
+            "generateBuildHash",
+            "2in1",
+            "GWPAsanEnabled",
+            "tsanEnabled",
+            "appEnvironments",
+            "maxChildProcess"
+          ]
+        }
       },
       "properties": {
         "bundleName": {
@@ -344,6 +394,10 @@
               "maxCount"
             ]
           },
+          "required": [
+            "multiAppModeType",
+            "maxCount"
+          ],
           "properties": {
             "multiAppModeType": {
               "description": "Indicates the type of application multiple open mode.",
-- 
Gitee


From 881cd62ab8dc93d4621858b92ba30b71dd4dfa64 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Sun, 26 May 2024 15:16:24 +0800
Subject: [PATCH 15/20] versionNormalize update pack.info

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 adapter/ohos/Compressor.java | 38 ++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/adapter/ohos/Compressor.java b/adapter/ohos/Compressor.java
index 5d7b9110..3d60bc95 100644
--- a/adapter/ohos/Compressor.java
+++ b/adapter/ohos/Compressor.java
@@ -135,6 +135,7 @@ public class Compressor {
     private static final String JSON_SUFFIX = ".json";
     private static final String ATOMIC_SERVICE = "atomicService";
     private static final String RAW_FILE_PATH = "resources/rawfile";
+    private static final String SUMMARY = "summary";
     private static final String VERSION_CODE = "versionCode";
     private static final String VERSION_NAME = "versionName";
     private static final String VERSION = "version";
@@ -2909,6 +2910,8 @@ public class Compressor {
                         tempDir.toAbsolutePath() + LINUX_FILE_SEPARATOR + MODULE_JSON);
                 File configFile = new File(
                         tempDir.toAbsolutePath() + LINUX_FILE_SEPARATOR + CONFIG_JSON);
+                File packInfoFile = new File(
+                        tempDir.toAbsolutePath() + LINUX_FILE_SEPARATOR + PACKINFO_NAME);
 
                 if (moduleFile.exists() && configFile.exists()) {
                     LOG.error("versionNormalize failed, invalid hap structure.");
@@ -2924,6 +2927,10 @@ public class Compressor {
                     LOG.error("versionNormalize failed, invalid hap structure.");
                     throw new BundleException("versionNormalize failed, invalid hap structure.");
                 }
+                if (packInfoFile.exists()) {
+                    String packInfoPath = tempDir.resolve(PACKINFO_NAME).toString();
+                    parseAndModifyPackInfo(packInfoPath, utility);
+                }
 
                 verifyModuleVersion(util, utility);
                 utils.add(util);
@@ -2979,6 +2986,37 @@ public class Compressor {
         return util;
     }
 
+    private void parseAndModifyPackInfo(String packInfoPath, Utility utility)
+            throws BundleException {
+        try (FileInputStream jsonStream = new FileInputStream(packInfoPath)) {
+            JSONObject jsonObject = JSON.parseObject(jsonStream, JSONObject.class);
+            if (jsonObject == null) {
+                LOG.warning("parseAndModifyPackInfo failed, json format invalid.");
+                return;
+            }
+            JSONObject summaryObject = jsonObject.getJSONObject(SUMMARY);
+            if (summaryObject == null) {
+                LOG.warning("parseAndModifyPackInfo failed, summary invalid.");
+                return;
+            }
+            JSONObject appObject = summaryObject.getJSONObject(APP);
+            if (appObject == null) {
+                LOG.warning("parseAndModifyPackInfo failed, app invalid.");
+                return;
+            }
+            JSONObject versionObject = appObject.getJSONObject(VERSION);
+            if (versionObject == null) {
+                LOG.warning("parseAndModifyPackInfo failed, version invalid.");
+                return;
+            }
+            versionObject.put(CODE, utility.getVersionCode());
+            versionObject.put(NAME, utility.getVersionName());
+            writeJson(packInfoPath, jsonObject);
+        } catch (IOException e) {
+            LOG.warning("parseAndModifyPackInfo failed, IOException." + e.getMessage());
+        }
+    }
+
     private void writeJson(String jsonFilePath, JSONObject jsonObject) throws IOException, BundleException {
         BufferedWriter bw = null;
         try {
-- 
Gitee


From 3c64ad66a037f7d12dfc2d32bee81390ec7de984 Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Sun, 26 May 2024 18:08:04 +0800
Subject: [PATCH 16/20] catch some json err

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 adapter/ohos/JsonUtil.java | 90 ++++++++++++++++++++++----------------
 1 file changed, 53 insertions(+), 37 deletions(-)

diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java
index 5dce29cf..e25c0f6d 100644
--- a/adapter/ohos/JsonUtil.java
+++ b/adapter/ohos/JsonUtil.java
@@ -1382,10 +1382,14 @@ public class JsonUtil {
         if (!jsonObject.containsKey(META_DATA)) {
             return moduleMetadataInfos;
         }
-        JSONArray metadatas = jsonObject.getJSONArray(META_DATA);
-        for (int i = 0; i < metadatas.size(); ++i) {
-            JSONObject metadata = metadatas.getJSONObject(i);
-            moduleMetadataInfos.add(parseModuleMetadata(metadata, data, profileJsons));
+        try {
+            JSONArray metadatas = jsonObject.getJSONArray(META_DATA);
+            for (int i = 0; i < metadatas.size(); ++i) {
+                JSONObject metadata = metadatas.getJSONObject(i);
+                moduleMetadataInfos.add(parseModuleMetadata(metadata, data, profileJsons));
+            }
+        } catch (JSONException | NullPointerException ex) {
+            LOG.warning("JsonUtil::parseModuleMetadataInfos err: " + ex.getMessage());
         }
         return moduleMetadataInfos;
     }
@@ -1492,23 +1496,27 @@ public class JsonUtil {
      */
     static List<CommonEvent> parseModuleCommonEvents(JSONObject jsonObject) {
         List<CommonEvent> commonEvents = new ArrayList<>();
-        JSONArray commonEventObjs = jsonObject.getJSONArray("commonEvents");
-        for (int i = 0; i < commonEventObjs.size(); ++i) {
-            JSONObject commonEventObj = commonEventObjs.getJSONObject(i);
-            CommonEvent commonEvent = new CommonEvent();
-            if (commonEventObj.containsKey("name")) {
-                commonEvent.name = getJsonString(commonEventObj, "name");
-            }
-            if (commonEventObj.containsKey("permission")) {
-                commonEvent.permission = getJsonString(commonEventObj, "permission");
-            }
-            if (commonEventObj.containsKey("types")) {
-                commonEvent.type = JSON.parseArray(getJsonString(commonEventObj, "types"), String.class);
-            }
-            if (commonEventObj.containsKey("events")) {
-                commonEvent.events = JSON.parseArray(getJsonString(commonEventObj, "events"), String.class);
+        try {
+            JSONArray commonEventObjs = jsonObject.getJSONArray("commonEvents");
+            for (int i = 0; i < commonEventObjs.size(); ++i) {
+                JSONObject commonEventObj = commonEventObjs.getJSONObject(i);
+                CommonEvent commonEvent = new CommonEvent();
+                if (commonEventObj.containsKey("name")) {
+                    commonEvent.name = getJsonString(commonEventObj, "name");
+                }
+                if (commonEventObj.containsKey("permission")) {
+                    commonEvent.permission = getJsonString(commonEventObj, "permission");
+                }
+                if (commonEventObj.containsKey("types")) {
+                    commonEvent.type = JSON.parseArray(getJsonString(commonEventObj, "types"), String.class);
+                }
+                if (commonEventObj.containsKey("events")) {
+                    commonEvent.events = JSON.parseArray(getJsonString(commonEventObj, "events"), String.class);
+                }
+                commonEvents.add(commonEvent);
             }
-            commonEvents.add(commonEvent);
+        } catch (JSONException | NullPointerException ex) {
+            LOG.warning("JsonUtil::parseModuleCommonEvents err: " + ex.getMessage());
         }
         return commonEvents;
     }
@@ -1737,31 +1745,39 @@ public class JsonUtil {
         if (!moduleJson.containsKey(DEFINE_PERMISSIONS)) {
             return definePermissions;
         }
-        JSONArray definePermissionObjs = moduleJson.getJSONArray(DEFINE_PERMISSIONS);
-        for (int i = 0; i < definePermissionObjs.size(); ++i) {
-            definePermissions.add(parseDefinePermission(definePermissionObjs.getJSONObject(i), data));
+        try {
+            JSONArray definePermissionObjs = moduleJson.getJSONArray(DEFINE_PERMISSIONS);
+            for (int i = 0; i < definePermissionObjs.size(); ++i) {
+                definePermissions.add(parseDefinePermission(definePermissionObjs.getJSONObject(i), data));
+            }
+        } catch (JSONException | NullPointerException ex) {
+            LOG.warning("JsonUtil::parseDefinePermissions err: " + ex.getMessage());
         }
         return definePermissions;
     }
 
     static ModuleAtomicService parseModuleAtomicService(JSONObject moduleJson) {
         ModuleAtomicService moduleAtomicService = new ModuleAtomicService();
-        JSONObject atomicServiceObj = null;
-        if (!moduleJson.containsKey(ATOMIC_SERVICE)) {
-            return moduleAtomicService;
-        }
-        atomicServiceObj = moduleJson.getJSONObject(ATOMIC_SERVICE);
-        JSONArray preloadObjs = atomicServiceObj.getJSONArray(PRELOADS);
-        List<PreloadItem> preloadItems = new ArrayList<>();
-        for (int i = 0; i < preloadObjs.size(); ++i) {
-            PreloadItem preloadItem = new PreloadItem();
-            JSONObject itemObj = preloadObjs.getJSONObject(i);
-            if (itemObj.containsKey(MODULE_NAME)) {
-                preloadItem.setModuleName(getJsonString(itemObj, MODULE_NAME));
+        try {
+            JSONObject atomicServiceObj = null;
+            if (!moduleJson.containsKey(ATOMIC_SERVICE)) {
+                return moduleAtomicService;
+            }
+            atomicServiceObj = moduleJson.getJSONObject(ATOMIC_SERVICE);
+            JSONArray preloadObjs = atomicServiceObj.getJSONArray(PRELOADS);
+            List<PreloadItem> preloadItems = new ArrayList<>();
+            for (int i = 0; i < preloadObjs.size(); ++i) {
+                PreloadItem preloadItem = new PreloadItem();
+                JSONObject itemObj = preloadObjs.getJSONObject(i);
+                if (itemObj.containsKey(MODULE_NAME)) {
+                    preloadItem.setModuleName(getJsonString(itemObj, MODULE_NAME));
+                }
+                preloadItems.add(preloadItem);
             }
-            preloadItems.add(preloadItem);
+            moduleAtomicService.setPreloadItems(preloadItems);
+        } catch (JSONException | NullPointerException ex) {
+            LOG.warning("JsonUtil::parseModuleAtomicService err: " + ex.getMessage());
         }
-        moduleAtomicService.setPreloadItems(preloadItems);
 
         return moduleAtomicService;
     }
-- 
Gitee


From 74457945c1799508bb8f0f5f2f5a57094597cb7c Mon Sep 17 00:00:00 2001
From: zhrenqiang <zhangrenqiang@huawei.com>
Date: Mon, 27 May 2024 12:00:27 +0800
Subject: [PATCH 17/20] fix: unpcak err no resources

Signed-off-by: zhrenqiang <zhangrenqiang@huawei.com>
---
 adapter/ohos/JsonUtil.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/adapter/ohos/JsonUtil.java b/adapter/ohos/JsonUtil.java
index e25c0f6d..70df337f 100644
--- a/adapter/ohos/JsonUtil.java
+++ b/adapter/ohos/JsonUtil.java
@@ -1930,7 +1930,9 @@ public class JsonUtil {
         if (jsonObject.containsKey("iconId")) {
             int resId = jsonObject.getIntValue("iconId");
             iconPath = ResourcesParser.getBaseResourceById(resId, data);
-            iconPath = iconPath.substring(iconPath.indexOf("resources"));
+            if (iconPath.contains("resources")) {
+                iconPath = iconPath.substring(iconPath.indexOf("resources"));
+            }
         }
         if (!iconPath.isEmpty()) {
             return iconPath;
-- 
Gitee


From 60bf953a86a26acf74869a365526626c50b5ee9d Mon Sep 17 00:00:00 2001
From: xinking129 <xinxin13@huawei.com>
Date: Tue, 28 May 2024 19:44:39 +0800
Subject: [PATCH 18/20] modify format]

Signed-off-by: xinking129 <xinxin13@huawei.com>
---
 modulecheck/appStartup.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modulecheck/appStartup.json b/modulecheck/appStartup.json
index 0d399e99..238efcd8 100644
--- a/modulecheck/appStartup.json
+++ b/modulecheck/appStartup.json
@@ -64,7 +64,7 @@
             "type": "string",
             "enum": [
               "mainThread",
-	      "taskPool"
+              "taskPool"
             ],
             "default": "mainThread"
           },
@@ -82,4 +82,4 @@
       "maxLength": 127
     }
   }
-}
+}
\ No newline at end of file
-- 
Gitee


From 1efa68118539e6819b0970ab7f99c9343a524732 Mon Sep 17 00:00:00 2001
From: xinking129 <xinxin13@huawei.com>
Date: Fri, 31 May 2024 10:30:51 +0800
Subject: [PATCH 19/20] modify taskpool format

Signed-off-by: xinking129 <xinxin13@huawei.com>
---
 modulecheck/appStartup.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulecheck/appStartup.json b/modulecheck/appStartup.json
index 238efcd8..ae1983c2 100644
--- a/modulecheck/appStartup.json
+++ b/modulecheck/appStartup.json
@@ -64,7 +64,7 @@
             "type": "string",
             "enum": [
               "mainThread",
-              "taskPool"
+	            "taskPool"
             ],
             "default": "mainThread"
           },
-- 
Gitee


From 2b172002b4c3bc38aad2ffe1e77be8577409e350 Mon Sep 17 00:00:00 2001
From: xinking129 <xinxin13@huawei.com>
Date: Fri, 31 May 2024 10:54:32 +0800
Subject: [PATCH 20/20] modify taskpool format

Signed-off-by: xinking129 <xinxin13@huawei.com>
---
 modulecheck/appStartup.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modulecheck/appStartup.json b/modulecheck/appStartup.json
index 238efcd8..ae1983c2 100644
--- a/modulecheck/appStartup.json
+++ b/modulecheck/appStartup.json
@@ -64,7 +64,7 @@
             "type": "string",
             "enum": [
               "mainThread",
-              "taskPool"
+	            "taskPool"
             ],
             "default": "mainThread"
           },
-- 
Gitee