Merge pull request #58 from volcengine/release_2.6.17

lingyun-tos · web-flow · commit a6db68c2aae4 · 2025-08-04T21:15:31.000+08:00
2.6.17 support notify callback and delete object with if-match
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Release Note
 
+### 2025.8.4 Version 2.6.17
+- 支持 deleteObject 接口携带 if-match 
+- 支持事件通知回调
+
 ### 2025.6.23 Version 2.6.16
 - 支持 请求指定请求头域
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 project(ve-tos-cpp-sdk
-        VERSION 2.6.16
+        VERSION 2.6.17
         LANGUAGES CXX)
 
 # project settings
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-example
-        VERSION 2.6.16
+        VERSION 2.6.17
         LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} example.cc)
diff --git a/sdk/CMakeLists.txt b/sdk/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-lib
-        VERSION 2.6.16
+        VERSION 2.6.17
         LANGUAGES CXX)
 set(SDK_HEADER
         include/auth/Credential.h
diff --git a/sdk/include/TosClient.h b/sdk/include/TosClient.h
@@ -57,7 +57,7 @@
 #include "model/object/ModifyObjectInput.h"
 #include "model/object/ModifyObjectOutput.h"
 namespace VolcengineTos {
-static const char* TOS_SDK_VERSION = "v2.6.16";
+static const char* TOS_SDK_VERSION = "v2.6.17";
 #ifdef WIN32
 static const char* PLATFORM_NAME = "windows";
 #elif __linux__
diff --git a/sdk/include/common/Common.h b/sdk/include/common/Common.h
@@ -95,7 +95,7 @@ static const char* HEADER_TRAFFIC_LIMIT = "X-Tos-Traffic-Limit";
 static const char* HEADER_COMPLETE_ALL = "X-Tos-Complete-All";
 static const char* HEADER_CALLBACK = "X-Tos-Callback";
 static const char* HEADER_CALLBACK_VAR = "X-Tos-Callback-Var";
-
+static const char* HEADER_NOTIFY_CUSTOM_PARAM = "X-Tos-Notification-Custom-Parameters";
 // HNS
 static const char* HEADER_DIRECTORY = "X-Tos-Directory";
 static const char* HEADER_BUCKET_TYPE = "X-Tos-Bucket-Type";
diff --git a/sdk/include/model/object/AppendObjectV2Input.h b/sdk/include/model/object/AppendObjectV2Input.h
@@ -151,6 +151,12 @@ class AppendObjectV2Input : public GenericInput {
     void setTrafficLimit(int64_t trafficLimit) {
         trafficLimit_ = trafficLimit;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
 
 private:
     std::string bucket_;
@@ -180,5 +186,7 @@ class AppendObjectV2Input : public GenericInput {
     uint64_t preHashCrc64ecma_ = 0;  // 与初始化参数 EnableCRC 配套使用，代表上一次调用 AppendObjectOutput 返回的
                                      // HashCrc64ecma，第一次请求时为 0
     int64_t trafficLimit_ = 0;
+
+    std::string notificationCustomParameters_;
 };
 }  // namespace VolcengineTos
diff --git a/sdk/include/model/object/CompleteMultipartUploadV2Input.h b/sdk/include/model/object/CompleteMultipartUploadV2Input.h
@@ -64,6 +64,12 @@ class CompleteMultipartUploadV2Input : public GenericInput {
     void setCallBackVar(const std::string& callBackVar) {
         callBackVar_ = callBackVar;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
     std::string toJsonString() const;
 
 private:
@@ -74,6 +80,7 @@ class CompleteMultipartUploadV2Input : public GenericInput {
     bool completeAll_ = false;
     std::string callBack_;
     std::string callBackVar_;
+    std::string notificationCustomParameters_;
 };
 
 }  // namespace VolcengineTos
diff --git a/sdk/include/model/object/CopyObjectV2Input.h b/sdk/include/model/object/CopyObjectV2Input.h
@@ -208,6 +208,12 @@ class CopyObjectV2Input : public GenericInput {
     void setTrafficLimit(int64_t trafficLimit) {
         trafficLimit_ = trafficLimit;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
 
 private:
     std::string bucket_;
@@ -249,5 +255,7 @@ class CopyObjectV2Input : public GenericInput {
     std::string websiteRedirectLocation_;
     StorageClassType storageClass_ = StorageClassType::NotSet;
     int64_t trafficLimit_ = 0;
+
+    std::string notificationCustomParameters_;
 };
 }  // namespace VolcengineTos
diff --git a/sdk/include/model/object/DeleteMultiObjectsInput.h b/sdk/include/model/object/DeleteMultiObjectsInput.h
@@ -41,16 +41,22 @@ class DeleteMultiObjectsInput : public GenericInput {
     bool getSkipTrash() const {
         return skipTrash_;
     }
-
     void setSkipTrash(bool skipTrash) {
         skipTrash_ = skipTrash;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
 
 private:
     std::vector<ObjectTobeDeleted> objectTobeDeleteds_;
     bool quiet_;
     std::string bucket_;
     bool recursive_ = false;
     bool skipTrash_ = false;
+    std::string notificationCustomParameters_;
 };
 }  // namespace VolcengineTos
diff --git a/sdk/include/model/object/DeleteObjectInput.h b/sdk/include/model/object/DeleteObjectInput.h
@@ -30,6 +30,20 @@ class DeleteObjectInput : public GenericInput {
         versionID_ = versionID;
     }
 
+    const std::string& getIfMatch() const {
+        return ifMatch_;
+    }
+    void setIfMatch(const std::string& ifMatch) {
+        ifMatch_ = ifMatch;
+    }
+
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
+
     bool getRecursive() const {
         return recursive_;
     }
@@ -50,6 +64,8 @@ class DeleteObjectInput : public GenericInput {
     std::string bucket_;
     std::string key_;
     std::string versionID_;
+    std::string ifMatch_;
+    std::string notificationCustomParameters_;
     bool recursive_ = false;
     bool skipTrash_ = false;
 };
diff --git a/sdk/include/model/object/FetchObjectInput.h b/sdk/include/model/object/FetchObjectInput.h
@@ -111,6 +111,12 @@ class FetchObjectInput : public GenericInput {
     void setHexMd5(const std::string& hexMd5) {
         hexMD5_ = hexMd5;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
 
     std::string toJsonString() const;
 
@@ -133,5 +139,7 @@ class FetchObjectInput : public GenericInput {
     std::string url_;
     bool ignoreSameKey_ = false;
     std::string hexMD5_;
+
+    std::string notificationCustomParameters_;
 };
 }  // namespace VolcengineTos
diff --git a/sdk/include/model/object/GetObjectV2Input.h b/sdk/include/model/object/GetObjectV2Input.h
@@ -150,6 +150,12 @@ class GetObjectV2Input : public GenericInput {
     void setProcess(const std::string& process) {
         process_ = process;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
 
 private:
     std::string bucket_;
@@ -181,5 +187,7 @@ class GetObjectV2Input : public GenericInput {
 
     int64_t trafficLimit_ = 0;
     std::string process_;
+
+    std::string notificationCustomParameters_;
 };
 }  // namespace VolcengineTos
diff --git a/sdk/include/model/object/ModifyObjectInput.h b/sdk/include/model/object/ModifyObjectInput.h
@@ -60,6 +60,12 @@ class ModifyObjectInput : public GenericInput {
     void setTrafficLimit(long trafficLimit) {
         trafficLimit_ = trafficLimit;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
 
 private:
     std::string bucket_;
@@ -70,5 +76,6 @@ class ModifyObjectInput : public GenericInput {
     DataTransferListener dataTransferListener_ = {nullptr, nullptr};  // 进度条特性
     std::shared_ptr<RateLimiter> rateLimiter_ = nullptr;              // 客户端限速
     long trafficLimit_;
+    std::string notificationCustomParameters_;
 };
 }  // namespace VolcengineTos
diff --git a/sdk/include/model/object/PutObjectBasicInput.h b/sdk/include/model/object/PutObjectBasicInput.h
@@ -180,6 +180,12 @@ class PutObjectBasicInput {
     void setCallBackVar(const std::string& callBackVar) {
         callBackVar_ = callBackVar;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
 
 private:
     std::string bucket_;
@@ -216,5 +222,7 @@ class PutObjectBasicInput {
     int64_t trafficLimit_ = 0;
     std::string callBack_;
     std::string callBackVar_;
+
+    std::string notificationCustomParameters_;
 };
 }  // namespace VolcengineTos
diff --git a/sdk/include/model/object/RenameObjectInput.h b/sdk/include/model/object/RenameObjectInput.h
@@ -45,12 +45,19 @@ class RenameObjectInput : public GenericInput {
     void setForbidOverwrite(bool forbidOverwrite) {
         forbidOverwrite_ = forbidOverwrite;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
 
 private:
     std::string bucket_;
     std::string key_;
     std::string newKey_;
     bool recursiveMkdir_ = false;
     bool forbidOverwrite_ = false;
+    std::string notificationCustomParameters_;
 };
 }  // namespace VolcengineTos
diff --git a/sdk/include/model/object/RestoreObjectInput.h b/sdk/include/model/object/RestoreObjectInput.h
@@ -55,6 +55,12 @@ class RestoreObjectInput : public GenericInput {
     void setRestoreJobParameters(const RestoreJobParameters& restoreJobParameters) {
         restoreJobParameters_ = restoreJobParameters;
     }
+    const std::string& getNotificationCustomParameters() const {
+        return notificationCustomParameters_;
+    }
+    void setNotificationCustomParameters(const std::string& notificationCustomParameters) {
+        notificationCustomParameters_ = notificationCustomParameters;
+    }
     std::string toJsonString() const;
 
 private:
@@ -63,5 +69,6 @@ class RestoreObjectInput : public GenericInput {
     std::string versionID_;
     int days_ = 0;
     RestoreJobParameters restoreJobParameters_ = RestoreJobParameters(TierType::NotSet);
+    std::string notificationCustomParameters_;
 };
 }  // namespace VolcengineTos
diff --git a/sdk/src/TosClientImpl.cc b/sdk/src/TosClientImpl.cc
@@ -792,8 +792,9 @@ static void getObjectSetOptionHeader(RequestBuilder& rb, const GetObjectV2Input&
     if (input.getTrafficLimit() != 0) {
         rb.withHeader(HEADER_TRAFFIC_LIMIT, std::to_string(input.getTrafficLimit()));
     }
-    rb.withQueryCheckEmpty("x-tos-process", input.getProcess());
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
 
+    rb.withQueryCheckEmpty("x-tos-process", input.getProcess());
     rb.withQueryCheckEmpty("response-cache-control", input.getResponseCacheControl());
     rb.withQueryCheckEmpty("response-content-disposition", input.getResponseContentDisposition());
     rb.withQueryCheckEmpty("response-content-encoding", input.getResponseContentEncoding());
@@ -1137,6 +1138,9 @@ Outcome<TosError, DeleteObjectOutput> TosClientImpl::deleteObject(const DeleteOb
 
     auto rb = newBuilder(input.getBucket(), input.getKey(), input);
 
+    rb.withHeader(http::HEADER_IF_MATCH, input.getIfMatch());
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
+
     rb.withQueryCheckEmpty("versionId", input.getVersionID());
 
     if (input.getRecursive()) {
@@ -1253,8 +1257,14 @@ Outcome<TosError, DeleteMultiObjectsOutput> TosClientImpl::deleteMultiObjects(De
     std::string data = input.toJsonString();
     std::string dataMd5 = CryptoUtils::md5Sum(data);
     auto rb = newBuilder(input.getBucket(), "", input);
-
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
     rb.withHeader(http::HEADER_CONTENT_MD5, dataMd5);
+    if (input.getRecursive()) {
+        rb.withQueryCheckEmpty("recursive", "true");
+    }
+    if (input.getSkipTrash()) {
+        rb.withQueryCheckEmpty("skipTrash", "true");
+    }
     rb.withQuery("delete", "");
     auto req = rb.Build(http::MethodPost, std::make_shared<std::stringstream>(data));
     auto tosRes = roundTrip(req, 200);
@@ -1352,6 +1362,7 @@ static void putObjectSetOptionHeader(RequestBuilder& rb, const PutObjectBasicInp
     if (!basic_input.getCallBackVar().empty()) {
         rb.withHeader(HEADER_CALLBACK_VAR, basic_input.getCallBackVar());
     }
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, basic_input.getNotificationCustomParameters());
 }
 
 //Outcome<TosError, ModifyObjectOutput> TosClientImpl::modifyObject(const ModifyObjectInput& input) {
@@ -1377,6 +1388,7 @@ Outcome<TosError, ModifyObjectOutput> TosClientImpl::modifyObject(const ModifyOb
     if (input.getTrafficLimit() != 0) {
         rb.withHeader(HEADER_TRAFFIC_LIMIT, std::to_string(input.getTrafficLimit()));
     }
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
 
     auto req = rb.Build(http::MethodPost, input.getContent());
     auto handler = input.getDataTransferListener();
@@ -3090,6 +3102,7 @@ static void appendObjectSetOptionHeader(RequestBuilder& rb, const AppendObjectV2
     setMetaHeader(input.getMeta(), rb);
     rb.withHeader(HEADER_WEBSITE_REDIRECT_LOCATION, input.getWebsiteRedirectLocation());
     rb.withHeader(HEADER_STORAGE_CLASS, StorageClassTypetoString[input.getStorageClass()]);
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
     if (input.getTrafficLimit() != 0) {
         rb.withHeader(HEADER_TRAFFIC_LIMIT, std::to_string(input.getTrafficLimit()));
     }
@@ -3524,6 +3537,7 @@ static void copyObjectSetOptionHeader(RequestBuilder& rb, const CopyObjectV2Inpu
     setMetaHeader(input.getMeta(), rb);
     rb.withHeader(HEADER_WEBSITE_REDIRECT_LOCATION, input.getWebsiteRedirectLocation());
     rb.withHeader(HEADER_STORAGE_CLASS, StorageClassTypetoString[input.getStorageClass()]);
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
     if (input.getTrafficLimit() != 0) {
         rb.withHeader(HEADER_TRAFFIC_LIMIT, std::to_string(input.getTrafficLimit()));
     }
@@ -4544,6 +4558,7 @@ Outcome<TosError, CompleteMultipartUploadV2Output> TosClientImpl::completeMultip
 
     auto rb = newBuilder(input.getBucket(), input.getKey(), input);
     rb.withQuery("uploadId", input.getUploadId());
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
     if (input.isCompleteAll()) {
         rb.withHeader(HEADER_COMPLETE_ALL, "yes");
     }
@@ -5773,6 +5788,7 @@ static void fetchObjectSetOptionHeader(RequestBuilder& rb, const FetchObjectInpu
     rb.withHeader(HEADER_GRANT_WRITE_ACP, input.getGrantWriteAcp());
     setMetaHeader(input.getMeta(), rb);
     setSSECHeader(input.getSsecAlgorithm(), input.getSsecKey(), input.getSsecKeyMd5(), rb);
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
     rb.withHeader(HEADER_STORAGE_CLASS, StorageClassTypetoString[input.getStorageClass()]);
 }
 
@@ -7280,6 +7296,7 @@ Outcome<TosError, RestoreObjectOutput> TosClientImpl::restoreObject(const Restor
     auto rb = newBuilder(input.getBucket(), input.getKey(), input);
     rb.withQuery("restore", "");
     rb.withQueryCheckEmpty("versionId", input.getVersionId());
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
     std::shared_ptr<std::stringstream> ss = nullptr;
     std::string jsonRules(input.toJsonString());
     if (jsonRules != "null") {
@@ -7337,6 +7354,8 @@ Outcome<TosError, RenameObjectOutput> TosClientImpl::renameObject(const RenameOb
         rb.withHeader(HEADER_RECURSIVE_MKDIR, "true");
     }
 
+    rb.withHeader(HEADER_NOTIFY_CUSTOM_PARAM, input.getNotificationCustomParameters());
+
     auto req = rb.Build(http::MethodPut, nullptr);
     auto tosRes = roundTrip(req, 204);
     if (!tosRes.isSuccess()) {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
diff --git a/test/src/Object/ObjectCopyTest.cc b/test/src/Object/ObjectCopyTest.cc
diff --git a/test/src/Object/ObjectPutGetTest.cc b/test/src/Object/ObjectPutGetTest.cc
diff --git a/test/src/Object/ObjectRenameTest.cc b/test/src/Object/ObjectRenameTest.cc
