Merge pull request #56 from volcengine/release_2.6.15

2.6.15 特性提交

Author: luoyanpeng-bytedancer

CHANGELOG.md

@@ -1,4 +1,14 @@
 ## Release Note
+### 2025.4.19 Version 2.6.15
+- 支持 请求时携带客户端证书
+- 修复 默认流控实现中返回时间单位错误问题
+- 支持 指定客户端签名时间
+- 支持 递归删除目录和 Rename 递归创建目录
+
+### 2025.1.23 Version 2.6.14
+- 支持 Qos Policy 相关接口
+- 支持 DeleteObject 和 DeleteMultiObjects 接口携带递归删除参数
+
 ### 2025.1.9 Version 2.6.13
 - 修复：GetFileStatus 接口扁平桶返回对象名错误的问题
 

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 project(ve-tos-cpp-sdk
-        VERSION 2.6.13
+        VERSION 2.6.15
         LANGUAGES CXX)
 
 # project settings

example/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-example
-        VERSION 2.6.13
+        VERSION 2.6.15
         LANGUAGES CXX)
 
 add_executable(${PROJECT_NAME} example.cc)

sdk/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 project(ve-tos-cpp-sdk-lib
-        VERSION 2.6.13
+        VERSION 2.6.15
         LANGUAGES CXX)
 set(SDK_HEADER
         include/auth/Credential.h
@@ -89,6 +89,7 @@ set(SDK_HEADER
         include/model/object/UploadFileCheckpoint.h
         include/model/object/UploadFilePartInfo.h
         include/model/RequestInfo.h
+        include/model/GenericInput.h
         include/utils/BaseUtils.h
         include/utils/crc64.h
         include/ClientConfig.h
@@ -247,6 +248,12 @@ set(SDK_HEADER
         include/model/bucket/DeleteBucketRenameInput.h
         include/model/bucket/DeleteBucketRenameOutput.h
         include/model/object/GetFileStatusInput.h
+        include/model/control/PutQosPolicyInput.h
+        include/model/control/PutQosPolicyOutput.h
+        include/model/control/GetQosPolicyInput.h
+        include/model/control/GetQosPolicyOutput.h
+        include/model/control/DeleteQosPolicyInput.h
+        include/model/control/DeleteQosPolicyOutput.h
         )
 set(SDK_LIB
         src/transport/http/HttpClient.cc

sdk/include/ClientConfig.h

@@ -21,6 +21,7 @@ class ClientConfig {
     ~ClientConfig() = default;
 
     std::string endPoint;
+    std::string controlEndPoint;
     bool autoRecognizeContentType;
     int maxRetryCount;
     int connectionTimeout;
@@ -42,6 +43,8 @@ class ClientConfig {
     std::string userAgentSoftName;
     std::string userAgentSoftVersion;
     std::map<std::string,std::string> userAgentCustomizedKeyValues;
+    std::string clientCrt;
+    std::string clientKey;
 
     // int MaxConnections;
     // int IdleConnectionTime;

sdk/include/Config.h

@@ -10,6 +10,12 @@ class Config {
 public:
     Config() = default;
     ~Config() = default;
+    const std::string& getControlEndpoint() const {
+        return controlEndpoint_;
+    }
+    void setControlEndpoint(const std::string& endpoint) {
+        controlEndpoint_ = endpoint;
+    }
     const std::string& getEndpoint() const {
         return endpoint_;
     }
@@ -66,6 +72,7 @@ class Config {
 
 private:
     std::string endpoint_;
+    std::string controlEndpoint_;
     std::string region_;
     bool enableCRC_ = true;
     bool autoRecognizeContentType_ = true;

sdk/include/RequestBuilder.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ctime>
 #include <utility>
 #include "auth/Signer.h"
 #include "common/Common.h"
@@ -45,12 +46,14 @@ class HttpRange {
 };
 class RequestBuilder {
 public:
-    RequestBuilder(std::shared_ptr<Signer> signer, std::string scheme, std::string host, std::string bucket,
-                   std::string object, int urlMode, std::map<std::string, std::string> headers,
-                   std::map<std::string, std::string> query, bool isCustomDomain)
+    RequestBuilder(std::shared_ptr<Signer> signer, std::string scheme, std::string host, std::string controlHost_,
+                   std::string accountID, std::string bucket, std::string object, int urlMode,
+                   std::map<std::string, std::string> headers, std::map<std::string, std::string> query, bool isCustomDomain)
             : signer_(std::move(signer)),
               scheme_(std::move(scheme)),
               host_(std::move(host)),
+              controlHost_(std::move(controlHost_)),
+              accountID_(std::move(accountID)),
               bucket_(std::move(bucket)),
               object_(std::move(object)),
               URLMode_(urlMode),
@@ -105,17 +108,29 @@ class RequestBuilder {
             query_[key] = value;
         }
     }
+    std::time_t getRequestDate() const {
+        return requestDate_;
+    }
+    void setRequestDate(std::time_t requestDate) {
+        requestDate_ = requestDate;
+    }
+
     std::shared_ptr<TosRequest> Build(const std::string& method);
+    std::shared_ptr<TosRequest> BuildControlRequest(const std::string& method);
     std::shared_ptr<TosRequest> Build(const std::string& method, std::shared_ptr<std::iostream> content);
+    std::shared_ptr<TosRequest> BuildControlRequest(const std::string& method, std::shared_ptr<std::iostream> content);
     std::shared_ptr<TosRequest> BuildWithCopySource(const std::string& method, const std::string& srcBucket,
                                                     const std::string& srcObject);
     std::shared_ptr<TosRequest> build(const std::string& method);
+    std::shared_ptr<TosRequest> buildControlRequest(const std::string& method);
     std::shared_ptr<TosRequest> buildSignedURL(const std::string& method);
 
 private:
     std::shared_ptr<Signer> signer_;
     std::string scheme_;
     std::string host_;
+    std::string controlHost_;
+    std::string accountID_;
     std::string bucket_;
     std::string object_;
     int URLMode_ = 0;
@@ -125,5 +140,7 @@ class RequestBuilder {
     std::map<std::string, std::string> query_;
     bool autoRecognizeContentType_ = true;
     bool isCustomDomain_ = false;
+
+    std::time_t requestDate_ = 0;
 };
 }  // namespace VolcengineTos

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.13";
+static const char* TOS_SDK_VERSION = "v2.6.15";
 #ifdef WIN32
 static const char* PLATFORM_NAME = "windows";
 #elif __linux__

sdk/include/TosClientV2.h

@@ -190,6 +190,12 @@
 #include "model/bucket/DeleteBucketRenameOutput.h"
 #include "auth/EnvCredentials.h"
 #include "auth/EcsCredentials.h"
+#include "model/control/PutQosPolicyInput.h"
+#include "model/control/PutQosPolicyOutput.h"
+#include "model/control/GetQosPolicyInput.h"
+#include "model/control/GetQosPolicyOutput.h"
+#include "model/control/DeleteQosPolicyInput.h"
+#include "model/control/DeleteQosPolicyOutput.h"
 
 namespace VolcengineTos {
 
@@ -359,7 +365,11 @@ class TosClientV2 : public TosClient {
     Outcome<TosError, GetBucketRenameOutput> getBucketRename(const GetBucketRenameInput& input);
     Outcome<TosError, DeleteBucketRenameOutput> deleteBucketRename(const DeleteBucketRenameInput& input);
     Outcome<TosError,GetFileStatusOutput> getFileStatus(const GetFileStatusInput& input);
-//    Outcome<TosError, ModifyObjectOutput> modifyObject(const ModifyObjectInput& input);
+    // Outcome<TosError, ModifyObjectOutput> modifyObject(const ModifyObjectInput& input);
+
+    Outcome<TosError, PutQosPolicyOutput> putQosPolicy(const PutQosPolicyInput& input);
+    Outcome<TosError, GetQosPolicyOutput> getQosPolicy(const GetQosPolicyInput& input);
+    Outcome<TosError, DeleteQosPolicyOutput> deleteQosPolicy(const DeleteQosPolicyInput& input);
 
 private:
     std::shared_ptr<TosClientImpl> tosClientImpl_;

sdk/include/TosRequest.h

@@ -144,6 +144,13 @@ class TosRequest {
         checkHighLatency_ = checkHighLatency;
     }
 
+    std::time_t getRequestDate() const {
+        return requestDate_;
+    }
+    void setRequestDate(std::time_t requestDate) {
+        requestDate_ = requestDate;
+    }
+
 private:
     std::string scheme_;
     std::string method_;
@@ -163,5 +170,6 @@ class TosRequest {
     int64_t contentOffset_ = 0;
     uint64_t preHashCrc64ecma_ = 0;
     bool checkHighLatency_ = false;
+    std::time_t requestDate_ = 0;
 };
 }  // namespace VolcengineTos