react-native-update 10.59.0 → 10.59.1

package/cpp/update_flow_core/update_flow_core.cpp

@@ -2,12 +2,29 @@
 
 #include <cmath>
 
-namespace updateflow {
+#include "../patch_core/error_codes.h"
+#include "../patch_core/obscured_text.h"
+
+namespace flowcore {
 
 using flowjson::Value;
 
 namespace {
 
+// Protocol and policy strings, stored encoded (see obscured_text.h).
+const std::string& FieldAvailable() {
+  static const std::string value = pushy::text::Reveal("2f07f0d0ba8e");
+  return value;
+}
+const std::string& StatusNone() {
+  static const std::string value = pushy::text::Reveal("3418c1c1aa8a7c40");
+  return value;
+}
+const std::string& PolicyNextLaunch() {
+  static const std::string value = pushy::text::Reveal("2912e0ffab8e6c70323b1dedd3");
+  return value;
+}
+
 // The low byte of every UTF-16 code unit of `utf8`, which is exactly what the
 // TS reference hashes (`key.charCodeAt(i) & 0xff` over `key.length` units).
 // Identity for ASCII; an astral code point contributes its two surrogate
@@ -127,7 +144,7 @@ bool IsInRollout(double rollout, const std::string& uuid) {
 }
 
 bool IsMirrorRetryableCode(const std::string& code) {
-  return code != "PATCH_FAILED";
+  return code != pushy::error_codes::kDeltaFailed;
 }
 
 namespace {
@@ -216,7 +233,7 @@ Value OrderEndpointCandidates(const Value& endpoints, double randomSample) {
   return ordered;
 }
 
-Value BuildCheckRequestBody(const Value& input) {
+Value BuildRequestBody(const Value& input) {
   Value body = Value::Object();
   // Caller extras go in FIRST: they may add fields but never override the
   // identity fields the server keys its decision on (mirrors the TS
@@ -258,7 +275,7 @@ Value BuildCheckRequestBody(const Value& input) {
   return body;
 }
 
-Value ResolveCheckResult(const Value& rootInfo, const Value& identity) {
+Value ResolveResult(const Value& rootInfo, const Value& identity) {
   Value rootResult = Value::Object();
   for (const auto& member : rootInfo.members()) {
     if (member.first != "expVersion") {
@@ -271,7 +288,7 @@ Value ResolveCheckResult(const Value& rootInfo, const Value& identity) {
   // non-object returns Undefined, mirroring optional chaining.
   const Value& rollout = expVersion.Get("config").Get("rollout").Get(
       identity.Get("packageVersion").AsString());
-  if (rootResult.Get("update").Truthy() && expVersion.Truthy() &&
+  if (rootResult.Get(FieldAvailable()).Truthy() && expVersion.Truthy() &&
       rollout.IsNumber()) {
     if (IsInRollout(rollout.AsNumber(), identity.Get("uuid").AsString())) {
       const Value& expHash = expVersion.Get("hash");
@@ -282,7 +299,7 @@ Value ResolveCheckResult(const Value& rootInfo, const Value& identity) {
         return upToDate;
       }
       Value info = Value::Object();
-      info.Set("update", Value::Bool(true));
+      info.Set(FieldAvailable(), Value::Bool(true));
       for (const auto& member : expVersion.members()) {
         info.Set(member.first, member.second);
       }
@@ -293,7 +310,7 @@ Value ResolveCheckResult(const Value& rootInfo, const Value& identity) {
     }
   }
   const Value& rootHash = rootResult.Get("hash");
-  if (rootResult.Get("update").Truthy() && rootHash.IsString() &&
+  if (rootResult.Get(FieldAvailable()).Truthy() && rootHash.IsString() &&
       !rootHash.AsString().empty() &&
       Value::StrictEquals(rootHash, currentVersion)) {
     Value upToDate = Value::Object();
@@ -320,8 +337,8 @@ Value DecideDownload(const Value& info, const Value& identity, bool isDev) {
   if (paths.IsUndefined() || paths.kind() == Value::Kind::Null) {
     paths = Value::Array();  // info.paths ?? [] — a server `null` too
   }
-  if (!info.Get("update").Truthy() || !hash.Truthy()) {
-    return DeclineDownload("noUpdate");
+  if (!info.Get(FieldAvailable()).Truthy() || !hash.Truthy()) {
+    return DeclineDownload(StatusNone().c_str());
   }
   if (Value::StrictEquals(hash, identity.Get("currentVersion"))) {
     return DeclineDownload("alreadyCurrent");
@@ -362,37 +379,37 @@ Value DecideDownload(const Value& info, const Value& identity, bool isDev) {
 
 bool ShouldActivateAfterDownload(const Value& info,
                                  const std::string& afterDownload) {
-  return afterDownload == "setNeedUpdate" ||
+  return afterDownload == PolicyNextLaunch() ||
          info.Get("config").Get("forceBoot").Truthy();
 }
 
-bool IsValidCheckResult(const Value& root) {
+bool IsValidResult(const Value& root) {
   if (!root.IsObject()) {
     return false;
   }
   const Value& upToDate = root.Get("upToDate");
-  const Value& update = root.Get("update");
+  const Value& update = root.Get(FieldAvailable());
   const Value& expired = root.Get("expired");
   const Value& paused = root.Get("paused");
   return upToDate.IsBool() || update.IsBool() || expired.IsBool() ||
          paused.IsString();
 }
 
-bool IsValidCheckResponse(const std::string& responseText) {
+bool IsValidResponse(const std::string& responseText) {
   bool ok = false;
   Value root = flowjson::Parse(responseText, &ok);
-  return ok && IsValidCheckResult(root);
+  return ok && IsValidResult(root);
 }
 
-Value HandleCheckResponse(const std::string& responseText,
+Value HandleResponse(const std::string& responseText,
                           const Value& identity, bool isDev,
                           const std::string& afterDownload) {
   bool ok = false;
   Value root = flowjson::Parse(responseText, &ok);
-  if (!ok || !IsValidCheckResult(root)) {
+  if (!ok || !IsValidResult(root)) {
     return DeclineDownload("invalidResponse");
   }
-  Value resolved = ResolveCheckResult(root, identity);
+  Value resolved = ResolveResult(root, identity);
   Value decision = DecideDownload(resolved, identity, isDev);
   if (decision.Get("action").AsString() == "download") {
     decision.Set("activate", Value::Bool(ShouldActivateAfterDownload(
@@ -402,4 +419,4 @@ Value HandleCheckResponse(const std::string& responseText,
   return decision;
 }
 
-}  // namespace updateflow
+}  // namespace flowcore

package/cpp/update_flow_core/update_flow_core.h

@@ -18,7 +18,10 @@
 // Like the TS side this layer is pure: no IO, no time, no randomness — the
 // random sample, identity and parsed JSON all arrive as parameters. The
 // orchestrators (per-platform HTTP/download/state glue) own all effects.
-namespace updateflow {
+// Keep the core internal to whichever binary links it (see podspec Core).
+#pragma GCC visibility push(hidden)
+
+namespace flowcore {
 
 uint32_t Murmur3_32(const std::string& key, uint32_t seed = 0);
 
@@ -45,10 +48,10 @@ flowjson::Value OrderEndpointCandidates(const flowjson::Value& endpoints,
 
 // input: { packageVersion, currentVersion, buildTime, cInfo,
 //          supportedDiffVersion?, bundleHash?, isDev?, extra? }
-flowjson::Value BuildCheckRequestBody(const flowjson::Value& input);
+flowjson::Value BuildRequestBody(const flowjson::Value& input);
 
 // identity: { packageVersion, currentVersion?, uuid }
-flowjson::Value ResolveCheckResult(const flowjson::Value& rootInfo,
+flowjson::Value ResolveResult(const flowjson::Value& rootInfo,
                                    const flowjson::Value& identity);
 
 // identity: { currentVersion?, rolledBackVersion? }
@@ -71,13 +74,13 @@ flowjson::Value DecideDownload(const flowjson::Value& info,
 // array, `{"error": "..."}`, an HTML page that happened to parse — is a
 // failed endpoint and must not stop the endpoint fallback. Mirrors
 // src/updateFlowCore.ts isValidCheckResult.
-bool IsValidCheckResult(const flowjson::Value& root);
-bool IsValidCheckResponse(const std::string& responseText);
+bool IsValidResult(const flowjson::Value& root);
+bool IsValidResponse(const std::string& responseText);
 
 bool ShouldActivateAfterDownload(const flowjson::Value& info,
                                  const std::string& afterDownload);
 
-// Composes Parse → ResolveCheckResult → DecideDownload: one call from the
+// Composes Parse → ResolveResult → DecideDownload: one call from the
 // raw checkUpdate response text to a download decision, so the platform
 // orchestrators contain no decision logic at all. identity is the union of
 // both composed functions' needs: { packageVersion, currentVersion?, uuid,
@@ -87,9 +90,11 @@ bool ShouldActivateAfterDownload(const flowjson::Value& info,
 // check result — so orchestrators can persist name/description/metaInfo
 // alongside a downloaded version (the JS side's setLocalHashInfo).
 // Malformed JSON yields { action: 'none', reason: 'invalidResponse' }.
-flowjson::Value HandleCheckResponse(const std::string& responseText,
+flowjson::Value HandleResponse(const std::string& responseText,
                                     const flowjson::Value& identity,
                                     bool isDev,
                                     const std::string& afterDownload);
 
-}  // namespace updateflow
+}  // namespace flowcore
+
+#pragma GCC visibility pop

package/cpp/update_flow_core/update_flow_jni.cpp

@@ -1,11 +1,13 @@
 // JNI surface of the update-flow decision layer for the Android orchestrator
-// (NativeCheckOrchestrator.java). Pure string-in/string-out: every payload is
+// (SyncCoordinator.java). Pure string-in/string-out: every payload is
 // JSON, matching the decision layer's own boundary. A null return means
 // "input did not parse" and the caller skips the check round; a C++ exception
 // (bad_alloc/length_error from an oversized body) maps onto that same path —
 // it must never unwind through the JNI boundary.
 #include <jni.h>
 
+#include "jni_natives.h"
+
 #include <cstdint>
 #include <exception>
 #include <limits>
@@ -81,8 +83,7 @@ jstring ToJString(JNIEnv* env, const std::string& value) {
 
 }  // namespace
 
-extern "C" JNIEXPORT jstring JNICALL
-Java_cn_reactnative_modules_update_NativeUpdateFlow_buildCheckRequestBody(
+jstring pushy::jni_natives::FlowBuildRequestBody(
     JNIEnv* env, jclass, jstring inputJson) {
   try {
     bool ok = false;
@@ -92,14 +93,13 @@ Java_cn_reactnative_modules_update_NativeUpdateFlow_buildCheckRequestBody(
       return nullptr;
     }
     return ToJString(
-        env, flowjson::Stringify(updateflow::BuildCheckRequestBody(input)));
+        env, flowjson::Stringify(flowcore::BuildRequestBody(input)));
   } catch (...) {
     return nullptr;
   }
 }
 
-extern "C" JNIEXPORT jstring JNICALL
-Java_cn_reactnative_modules_update_NativeUpdateFlow_orderEndpointCandidates(
+jstring pushy::jni_natives::FlowOrderEndpointCandidates(
     JNIEnv* env, jclass, jstring endpointsJson, jdouble randomSample) {
   try {
     bool ok = false;
@@ -108,21 +108,20 @@ Java_cn_reactnative_modules_update_NativeUpdateFlow_orderEndpointCandidates(
     if (!ok || !endpoints.IsArray()) {
       return nullptr;
     }
-    return ToJString(env, flowjson::Stringify(updateflow::OrderEndpointCandidates(
+    return ToJString(env, flowjson::Stringify(flowcore::OrderEndpointCandidates(
                               endpoints, randomSample)));
   } catch (...) {
     return nullptr;
   }
 }
 
-extern "C" JNIEXPORT jboolean JNICALL
-Java_cn_reactnative_modules_update_NativeUpdateFlow_isValidCheckResponse(
+jboolean pushy::jni_natives::FlowIsValidResponse(
     JNIEnv* env, jclass, jstring responseText) {
   if (responseText == nullptr) {
     return JNI_FALSE;
   }
   try {
-    return updateflow::IsValidCheckResponse(
+    return flowcore::IsValidResponse(
                pushy::jni_util::JStringToString(env, responseText))
                ? JNI_TRUE
                : JNI_FALSE;
@@ -131,8 +130,7 @@ Java_cn_reactnative_modules_update_NativeUpdateFlow_isValidCheckResponse(
   }
 }
 
-extern "C" JNIEXPORT jstring JNICALL
-Java_cn_reactnative_modules_update_NativeUpdateFlow_handleCheckResponse(
+jstring pushy::jni_natives::FlowHandleResponse(
     JNIEnv* env, jclass, jstring responseText, jstring identityJson,
     jstring afterDownload) {
   try {
@@ -142,7 +140,7 @@ Java_cn_reactnative_modules_update_NativeUpdateFlow_handleCheckResponse(
     if (!ok || !identity.IsObject()) {
       return nullptr;
     }
-    return ToJString(env, flowjson::Stringify(updateflow::HandleCheckResponse(
+    return ToJString(env, flowjson::Stringify(flowcore::HandleResponse(
                               pushy::jni_util::JStringToString(env, responseText),
                               identity, false,
                               pushy::jni_util::JStringToString(env, afterDownload))));

package/harmony/pushy/src/main/cpp/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.13)
-project(rnupdate LANGUAGES C CXX)
+project(rnpushy LANGUAGES C CXX)
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
@@ -23,7 +23,7 @@ if(NOT EXISTS ${UPDATE_FLOW_CORE_DIR}/update_flow_core.cpp)
 endif()
 
 # Always compile from source. A prebuilt-import branch used to live here, but
-# it had no symbol verification: a stale libs/<abi>/librnupdate.so missing a
+# it had no symbol verification: a stale libs/<abi>/librnpushy.so missing a
 # newly added export (e.g. getSupportedDiffVersion) would silently ship and
 # crash getConstants at runtime.
 set(HDIFFPATCH_DIR ${ANDROID_JNI_DIR}/HDiffPatch)
@@ -45,11 +45,11 @@ set(HDP_SOURCES
      ${LZMA_DIR}/C/Lzma2Dec.c
 )
 
-add_library(rnupdate SHARED
+add_library(rnpushy SHARED
     ${HDP_SOURCES}
 )
 
-target_include_directories(rnupdate PRIVATE
+target_include_directories(rnpushy PRIVATE
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${PATCH_CORE_DIR}
      ${UPDATE_FLOW_CORE_DIR}
@@ -59,7 +59,7 @@ target_include_directories(rnupdate PRIVATE
      ${LZMA_DIR}/C
 )
 
-target_link_libraries(rnupdate PUBLIC
+target_link_libraries(rnpushy PUBLIC
     libace_napi.z.so
 )
 
@@ -74,15 +74,15 @@ endif()
 # Optimize binary size for Release builds of the NAPI library. --gc-sections
 # only drops anything when every function/data item sits in its own section,
 # and the module registers itself through NAPI_MODULE's static constructor,
-# so no symbol needs default visibility. Scoped to rnupdate: rnoh_pushy must
+# so no symbol needs default visibility. Scoped to rnpushy: rnoh_pushy must
 # keep exporting PushyTurboModule (JSI_EXPORT) for the host's PackageProvider.
 if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    target_compile_options(rnupdate PRIVATE
+    target_compile_options(rnpushy PRIVATE
         -ffunction-sections
         -fdata-sections
         -fvisibility=hidden
         -fvisibility-inlines-hidden
     )
     # Strip debug symbols and garbage-collect the unused sections.
-    target_link_options(rnupdate PRIVATE -Wl,--gc-sections -s)
+    target_link_options(rnpushy PRIVATE -Wl,--gc-sections -s)
 endif()

package/harmony/pushy/src/main/cpp/pushy.cpp

@@ -22,7 +22,6 @@ namespace {
 
 using pushy::state_ops::StateOperation;
 
-constexpr const char* kDefaultBundlePatchEntryName = "index.bundlejs.patch";
 
 void ThrowError(napi_env env, const std::string& message) {
   napi_throw_error(env, nullptr, message.c_str());
@@ -400,14 +399,14 @@ napi_value NewCopyGroupArray(
   return result;
 }
 
-pushy::patch::PatchManifest BuildManifest(
+pushy::delta::PatchManifest BuildManifest(
     const std::vector<std::string>& copy_froms,
     const std::vector<std::string>& copy_tos,
     const std::vector<std::string>& deletes) {
-  pushy::patch::PatchManifest manifest;
+  pushy::delta::PatchManifest manifest;
   for (size_t index = 0; index < copy_froms.size(); ++index) {
     manifest.copies.push_back(
-        pushy::patch::CopyOperation{copy_froms[index], copy_tos[index]});
+        pushy::delta::CopyOperation{copy_froms[index], copy_tos[index]});
   }
   manifest.deletes = deletes;
   return manifest;
@@ -566,7 +565,8 @@ napi_value BuildArchivePatchPlan(napi_env env, napi_callback_info info) {
     return nullptr;
   }
 
-  std::string bundle_patch_entry_name = kDefaultBundlePatchEntryName;
+  std::string bundle_patch_entry_name =
+      pushy::archive_patch::DefaultBundleDeltaEntryName();
   if (argc >= 6) {
     bool ok = false;
     const std::string candidate = GetString(env, args[5], &ok);
@@ -578,15 +578,15 @@ napi_value BuildArchivePatchPlan(napi_env env, napi_callback_info info) {
     }
   }
 
-  const pushy::patch::PatchManifest manifest =
+  const pushy::delta::PatchManifest manifest =
       BuildManifest(copy_froms, copy_tos, deletes);
   pushy::archive_patch::ArchivePatchType archive_type;
   if (!pushy::archive_patch::TryParseArchivePatchType(patch_type, &archive_type)) {
-    ThrowError(env, "Unknown archive patch type");
+    ThrowError(env, "Unknown archive delta type");
     return nullptr;
   }
   pushy::archive_patch::ArchivePatchPlan plan;
-  const pushy::patch::Status status = pushy::archive_patch::BuildArchivePatchPlan(
+  const pushy::delta::Status status = pushy::archive_patch::BuildArchivePatchPlan(
       archive_type,
       manifest,
       entry_names,
@@ -619,10 +619,10 @@ napi_value BuildCopyGroups(napi_env env, napi_callback_info info) {
     return nullptr;
   }
 
-  const pushy::patch::PatchManifest manifest =
+  const pushy::delta::PatchManifest manifest =
       BuildManifest(copy_froms, copy_tos, std::vector<std::string>());
   std::vector<pushy::archive_patch::CopyGroup> groups;
-  const pushy::patch::Status status =
+  const pushy::delta::Status status =
       pushy::archive_patch::BuildCopyGroups(manifest, &groups);
   if (!status.ok) {
     ThrowError(env, status.message);
@@ -635,7 +635,7 @@ napi_value BuildCopyGroups(napi_env env, napi_callback_info info) {
 // ---------------------------------------------------------------------------
 // Async work plumbing for the heavy patch operations.
 //
-// applyPatchFromFileSource and cleanupOldEntries run hdiff / recursive file IO
+// applyDeltaFromSource and cleanupOldEntries run hdiff / recursive file IO
 // that can take hundreds of ms to seconds. The Pushy TurboModule executes on
 // the UI thread, so running these synchronously froze the UI. These are now
 // wrapped in napi_create_async_work: arguments are parsed on the JS thread, the
@@ -659,8 +659,8 @@ void RejectDeferredWithMessage(
 struct ApplyPatchWork {
   napi_async_work work = nullptr;
   napi_deferred deferred = nullptr;
-  pushy::patch::FileSourcePatchOptions options;
-  pushy::patch::Status status{false, ""};
+  pushy::delta::FileSourcePatchOptions options;
+  pushy::delta::Status status{false, ""};
 };
 
 struct CleanupWork {
@@ -672,7 +672,7 @@ struct CleanupWork {
   // evict the running bundle while its on-demand assets are still served).
   std::vector<std::string> keep_names;
   int32_t max_age_days = 0;
-  pushy::patch::Status status{false, ""};
+  pushy::delta::Status status{false, ""};
 };
 
 // Streaming file digest on a worker thread. A full package or bundle is tens
@@ -714,7 +714,7 @@ napi_value ApplyPatchFromFileSource(napi_env env, napi_callback_info info) {
       !GetOptionalStringProperty(env, args[0], "sourceRoot", &source_root) ||
       !GetOptionalStringProperty(env, args[0], "targetRoot", &target_root) ||
       !GetOptionalStringProperty(env, args[0], "originBundlePath", &origin_bundle_path) ||
-      !GetOptionalStringProperty(env, args[0], "bundlePatchPath", &bundle_patch_path) ||
+      !GetOptionalStringProperty(env, args[0], "bundleDeltaPath", &bundle_patch_path) ||
       !GetOptionalStringProperty(env, args[0], "bundleOutputPath", &bundle_output_path) ||
       !GetOptionalStringProperty(env, args[0], "mergeSourceSubdir", &merge_source_subdir) ||
       !GetOptionalStringProperty(
@@ -747,14 +747,14 @@ napi_value ApplyPatchFromFileSource(napi_env env, napi_callback_info info) {
 
   napi_value resource_name = nullptr;
   napi_create_string_utf8(
-      env, "applyPatchFromFileSource", NAPI_AUTO_LENGTH, &resource_name);
+      env, "applyDeltaFromSource", NAPI_AUTO_LENGTH, &resource_name);
   if (napi_create_async_work(
           env,
           nullptr,
           resource_name,
           [](napi_env, void* data) {
             auto* w = static_cast<ApplyPatchWork*>(data);
-            w->status = pushy::patch::ApplyPatchFromFileSource(w->options);
+            w->status = pushy::delta::ApplyPatchFromFileSource(w->options);
           },
           [](napi_env cb_env, napi_status status, void* data) {
             auto* w = static_cast<ApplyPatchWork*>(data);
@@ -841,7 +841,7 @@ napi_value CleanupOldEntries(napi_env env, napi_callback_info info) {
           resource_name,
           [](napi_env, void* data) {
             auto* w = static_cast<CleanupWork*>(data);
-            w->status = pushy::patch::CleanupOldEntries(
+            w->status = pushy::delta::CleanupOldEntries(
                 w->root_dir, w->keep_names, w->max_age_days);
           },
           [](napi_env cb_env, napi_status status, void* data) {
@@ -1108,12 +1108,12 @@ static napi_value MakeUtf8String(napi_env env, const std::string& value) {
   return result;
 }
 
-static napi_value FlowBuildCheckRequestBody(napi_env env,
+static napi_value FlowBuildRequestBody(napi_env env,
                                             napi_callback_info info) {
   size_t argc = 1;
   napi_value args[1] = {nullptr};
   if (!GetArgCount(env, info, &argc, args) || argc < 1) {
-    ThrowError(env, "buildCheckRequestBody: missing input argument");
+    ThrowError(env, "buildRequestBody: missing input argument");
     return nullptr;
   }
   bool ok = false;
@@ -1127,7 +1127,7 @@ static napi_value FlowBuildCheckRequestBody(napi_env env,
     return nullptr;
   }
   return MakeUtf8String(
-      env, flowjson::Stringify(updateflow::BuildCheckRequestBody(input)));
+      env, flowjson::Stringify(flowcore::BuildRequestBody(input)));
 }
 
 static napi_value FlowOrderEndpointCandidates(napi_env env,
@@ -1154,16 +1154,16 @@ static napi_value FlowOrderEndpointCandidates(napi_env env,
     return nullptr;
   }
   return MakeUtf8String(env,
-                        flowjson::Stringify(updateflow::OrderEndpointCandidates(
+                        flowjson::Stringify(flowcore::OrderEndpointCandidates(
                             endpoints, sample)));
 }
 
-static napi_value FlowIsValidCheckResponse(napi_env env,
+static napi_value FlowIsValidResponse(napi_env env,
                                            napi_callback_info info) {
   size_t argc = 1;
   napi_value args[1] = {nullptr};
   if (!GetArgCount(env, info, &argc, args) || argc < 1) {
-    ThrowError(env, "isValidCheckResponse: missing arguments");
+    ThrowError(env, "isValidResponse: missing arguments");
     return nullptr;
   }
   bool ok = false;
@@ -1174,17 +1174,17 @@ static napi_value FlowIsValidCheckResponse(napi_env env,
     return nullptr;
   }
   napi_value result = nullptr;
-  napi_get_boolean(env, updateflow::IsValidCheckResponse(response_text),
+  napi_get_boolean(env, flowcore::IsValidResponse(response_text),
                    &result);
   return result;
 }
 
-static napi_value FlowHandleCheckResponse(napi_env env,
+static napi_value FlowHandleResponse(napi_env env,
                                           napi_callback_info info) {
   size_t argc = 3;
   napi_value args[3] = {nullptr, nullptr, nullptr};
   if (!GetArgCount(env, info, &argc, args) || argc < 3) {
-    ThrowError(env, "handleCheckResponse: missing arguments");
+    ThrowError(env, "handleResponse: missing arguments");
     return nullptr;
   }
   bool ok = false;
@@ -1206,26 +1206,26 @@ static napi_value FlowHandleCheckResponse(napi_env env,
     return nullptr;
   }
   return MakeUtf8String(env,
-                        flowjson::Stringify(updateflow::HandleCheckResponse(
+                        flowjson::Stringify(flowcore::HandleResponse(
                             response_text, identity, false, after_download)));
 }
 
 napi_value Init(napi_env env, napi_value exports) {
   if (!ExportFunction(env, exports, "syncStateWithBinaryVersion", SyncStateWithBinaryVersion) ||
       !ExportFunction(env, exports, "runStateCore", RunStateCore) ||
-      !ExportFunction(env, exports, "buildArchivePatchPlan", BuildArchivePatchPlan) ||
+      !ExportFunction(env, exports, "buildArchivePlan", BuildArchivePatchPlan) ||
       !ExportFunction(env, exports, "buildCopyGroups", BuildCopyGroups) ||
-      !ExportFunction(env, exports, "applyPatchFromFileSource", ApplyPatchFromFileSource) ||
+      !ExportFunction(env, exports, "applyDeltaFromSource", ApplyPatchFromFileSource) ||
       !ExportFunction(env, exports, "cleanupOldEntries", CleanupOldEntries) ||
       !ExportFunction(env, exports, "sha256Hex", Sha256Hex) ||
       !ExportFunction(env, exports, "sha256HexFile", Sha256HexFile) ||
       !ExportFunction(env, exports, "sha256HexFileAsync", Sha256HexFileAsync) ||
       !ExportFunction(env, exports, "crc32", Crc32) ||
       !ExportFunction(env, exports, "getSupportedDiffVersion", GetSupportedDiffVersion) ||
-      !ExportFunction(env, exports, "buildCheckRequestBody", FlowBuildCheckRequestBody) ||
+      !ExportFunction(env, exports, "buildRequestBody", FlowBuildRequestBody) ||
       !ExportFunction(env, exports, "orderEndpointCandidates", FlowOrderEndpointCandidates) ||
-      !ExportFunction(env, exports, "isValidCheckResponse", FlowIsValidCheckResponse) ||
-      !ExportFunction(env, exports, "handleCheckResponse", FlowHandleCheckResponse)) {
+      !ExportFunction(env, exports, "isValidResponse", FlowIsValidResponse) ||
+      !ExportFunction(env, exports, "handleResponse", FlowHandleResponse)) {
     return nullptr;
   }
   return exports;

package/harmony/pushy/src/main/ets/ArchiveLimits.ts

@@ -2,8 +2,8 @@ import fileIo from '@ohos.file.fs';
 import statvfs from '@ohos.file.statvfs';
 import {
   ERROR_FILE_OPERATION_FAILED,
-  ERROR_PATCH_FAILED,
-  createUpdateError,
+  ERROR_DELTA_FAILED,
+  createPushyError,
 } from './ErrorCodes';
 import { isReservedEntryName } from './InstallRecord';
 
@@ -32,8 +32,8 @@ export function checkUncompressedSize(
   uncompressedBytes: number,
 ): void {
   if (uncompressedBytes > MAX_TOTAL_UNCOMPRESSED_BYTES) {
-    throw createUpdateError(
-      ERROR_PATCH_FAILED,
+    throw createPushyError(
+      ERROR_DELTA_FAILED,
       `archive expands beyond ${MAX_TOTAL_UNCOMPRESSED_BYTES} bytes ` +
         `(${uncompressedBytes})`,
     );
@@ -43,8 +43,8 @@ export function checkUncompressedSize(
     archiveBytes > 0 &&
     uncompressedBytes > archiveBytes * MAX_COMPRESSION_RATIO
   ) {
-    throw createUpdateError(
-      ERROR_PATCH_FAILED,
+    throw createPushyError(
+      ERROR_DELTA_FAILED,
       `archive compression ratio exceeds ${MAX_COMPRESSION_RATIO}:1 ` +
         `(${uncompressedBytes}/${archiveBytes})`,
     );
@@ -78,7 +78,7 @@ export async function ensureFreeSpace(
   }
   const needed = Math.max(0, bytesToWrite) + FREE_DISK_MARGIN_BYTES;
   if (free < needed) {
-    throw createUpdateError(
+    throw createPushyError(
       ERROR_FILE_OPERATION_FAILED,
       `insufficient disk space: need ${needed} bytes, have ${free}`,
     );
@@ -103,8 +103,8 @@ export async function measureExtractedDirectory(
   );
   for (const name of names) {
     if (isReservedEntryName(name)) {
-      throw createUpdateError(
-        ERROR_PATCH_FAILED,
+      throw createPushyError(
+        ERROR_DELTA_FAILED,
         `archive contains reserved entry ${name}`,
       );
     }
@@ -112,8 +112,8 @@ export async function measureExtractedDirectory(
     const stat = await fileIo.stat(path);
     acc.entries += 1;
     if (acc.entries > MAX_ENTRIES) {
-      throw createUpdateError(
-        ERROR_PATCH_FAILED,
+      throw createPushyError(
+        ERROR_DELTA_FAILED,
         `archive has too many entries (> ${MAX_ENTRIES})`,
       );
     }
@@ -122,15 +122,15 @@ export async function measureExtractedDirectory(
       continue;
     }
     if (stat.size > MAX_ENTRY_BYTES) {
-      throw createUpdateError(
-        ERROR_PATCH_FAILED,
+      throw createPushyError(
+        ERROR_DELTA_FAILED,
         `archive entry too large: ${name} (${stat.size} bytes)`,
       );
     }
     acc.bytes += stat.size;
     if (acc.bytes > MAX_TOTAL_UNCOMPRESSED_BYTES) {
-      throw createUpdateError(
-        ERROR_PATCH_FAILED,
+      throw createPushyError(
+        ERROR_DELTA_FAILED,
         `archive expands beyond ${MAX_TOTAL_UNCOMPRESSED_BYTES} bytes`,
       );
     }