From 7d1b18fe42169a21ee797b08d2d9f4b00af98700 Mon Sep 17 00:00:00 2001
From: Sunli <scott_s829@163.com>
Date: Mon, 16 Oct 2023 10:26:17 +0800
Subject: [PATCH] add history candlesticks api

---
 c/cbindgen.toml                               |   1 +
 c/csrc/include/longbridge.h                   |  42 +++-
 c/src/quote_context/context.rs                |  66 +++++-
 c/src/types/datetime.rs                       |  39 +++-
 c/src/types/mod.rs                            |   2 +-
 cpp/include/quote_context.hpp                 |  19 ++
 cpp/include/types.hpp                         |   6 +
 cpp/src/convert.hpp                           |  15 ++
 cpp/src/quote_context.cpp                     |  98 ++++++++
 java/c/com_longbridge_SdkNative.h             |  20 +-
 .../main/java/com/longbridge/SdkNative.java   | 216 +++++++++---------
 java/src/init.rs                              |   2 +
 java/src/quote_context.rs                     |  71 +++++-
 java/src/types/datetime.rs                    |  44 +++-
 nodejs/index.d.ts                             |  17 +-
 nodejs/index.js                               |   3 +-
 nodejs/src/quote/context.rs                   |  54 ++++-
 nodejs/src/time.rs                            |  45 +++-
 python/pysrc/longbridge/openapi.pyi           |  10 +
 python/src/quote/context.rs                   |  51 ++++-
 rust/crates/proto/openapi-protobufs           |   2 +-
 .../proto/src/longbridgeapp.control.v1.rs     |   8 +
 .../proto/src/longbridgeapp.quote.v1.rs       |  53 +++++
 rust/src/blocking/quote.rs                    |  33 ++-
 rust/src/quote/cmd_code.rs                    |   3 +
 rust/src/quote/context.rs                     | 101 +++++++-
 26 files changed, 891 insertions(+), 130 deletions(-)

diff --git a/c/cbindgen.toml b/c/cbindgen.toml
index 17a3b07b2..3307e8d6d 100644
--- a/c/cbindgen.toml
+++ b/c/cbindgen.toml
@@ -44,6 +44,7 @@ cpp_compat = true
 "COptionQuote" = "lb_option_quote_t"
 "CDate" = "lb_date_t"
 "CTime" = "lb_time_t"
+"CDateTime" = "lb_datetime_t"
 "CWarrantQuote" = "lb_warrant_quote_t"
 "CSecurityDepth" = "lb_security_depth_t"
 "CSecurityBrokers" = "lb_security_brokers_t"
diff --git a/c/csrc/include/longbridge.h b/c/csrc/include/longbridge.h
index f6635eb78..a4e640db3 100644
--- a/c/csrc/include/longbridge.h
+++ b/c/csrc/include/longbridge.h
@@ -1153,6 +1153,17 @@ typedef struct lb_date_t {
   uint8_t day;
 } lb_date_t;
 
+typedef struct lb_time_t {
+  uint8_t hour;
+  uint8_t minute;
+  uint8_t second;
+} lb_time_t;
+
+typedef struct lb_datetime_t {
+  struct lb_date_t date;
+  struct lb_time_t time;
+} lb_datetime_t;
+
 /**
  * An request to create a watchlist group
  */
@@ -2055,12 +2066,6 @@ typedef struct lb_issuer_info_t {
   const char *name_hk;
 } lb_issuer_info_t;
 
-typedef struct lb_time_t {
-  uint8_t hour;
-  uint8_t minute;
-  uint8_t second;
-} lb_time_t;
-
 /**
  * The information of trading session
  */
@@ -3214,6 +3219,31 @@ void lb_quote_context_candlesticks(const struct lb_quote_context_t *ctx,
                                    lb_async_callback_t callback,
                                    void *userdata);
 
+/**
+ * Get security history candlesticks by offset
+ */
+void lb_quote_context_history_candlesticks_by_offset(const struct lb_quote_context_t *ctx,
+                                                     const char *symbol,
+                                                     enum lb_period_t period,
+                                                     enum lb_adjust_type_t adjust_type,
+                                                     bool forward,
+                                                     struct lb_datetime_t time,
+                                                     uintptr_t count,
+                                                     lb_async_callback_t callback,
+                                                     void *userdata);
+
+/**
+ * Get security history candlesticks by date
+ */
+void lb_quote_context_history_candlesticks_by_date(const struct lb_quote_context_t *ctx,
+                                                   const char *symbol,
+                                                   enum lb_period_t period,
+                                                   enum lb_adjust_type_t adjust_type,
+                                                   const struct lb_date_t *start,
+                                                   const struct lb_date_t *end,
+                                                   lb_async_callback_t callback,
+                                                   void *userdata);
+
 /**
  * Get option chain expiry date list
  */
diff --git a/c/src/quote_context/context.rs b/c/src/quote_context/context.rs
index 0d0e20ca0..74aa1559f 100644
--- a/c/src/quote_context/context.rs
+++ b/c/src/quote_context/context.rs
@@ -27,7 +27,7 @@ use crate::{
             LB_WATCHLIST_GROUP_NAME, LB_WATCHLIST_GROUP_SECURITIES,
         },
     },
-    types::{cstr_array_to_rust, cstr_to_rust, CCow, CDate, CMarket, CVec, ToFFI},
+    types::{cstr_array_to_rust, cstr_to_rust, CCow, CDate, CDateTime, CMarket, CVec, ToFFI},
 };
 
 pub type COnQuoteCallback = extern "C" fn(*const CQuoteContext, *const CPushQuote, *mut c_void);
@@ -584,6 +584,70 @@ pub unsafe extern "C" fn lb_quote_context_candlesticks(
     });
 }
 
+/// Get security history candlesticks by offset
+#[no_mangle]
+pub unsafe extern "C" fn lb_quote_context_history_candlesticks_by_offset(
+    ctx: *const CQuoteContext,
+    symbol: *const c_char,
+    period: CPeriod,
+    adjust_type: CAdjustType,
+    forward: bool,
+    time: CDateTime,
+    count: usize,
+    callback: CAsyncCallback,
+    userdata: *mut c_void,
+) {
+    let ctx_inner = (*ctx).ctx.clone();
+    let symbol = cstr_to_rust(symbol);
+    execute_async(callback, ctx, userdata, async move {
+        let rows: CVec<CCandlestickOwned> = ctx_inner
+            .history_candlesticks_by_offset(
+                symbol,
+                period.into(),
+                adjust_type.into(),
+                forward,
+                time.into(),
+                count,
+            )
+            .await?
+            .into();
+        Ok(rows)
+    });
+}
+
+/// Get security history candlesticks by date
+#[no_mangle]
+pub unsafe extern "C" fn lb_quote_context_history_candlesticks_by_date(
+    ctx: *const CQuoteContext,
+    symbol: *const c_char,
+    period: CPeriod,
+    adjust_type: CAdjustType,
+    start: *const CDate,
+    end: *const CDate,
+    callback: CAsyncCallback,
+    userdata: *mut c_void,
+) {
+    let ctx_inner = (*ctx).ctx.clone();
+    let symbol = cstr_to_rust(symbol);
+    let start = if start.is_null() {
+        None
+    } else {
+        Some((*start).into())
+    };
+    let end = if end.is_null() {
+        None
+    } else {
+        Some((*end).into())
+    };
+    execute_async(callback, ctx, userdata, async move {
+        let rows: CVec<CCandlestickOwned> = ctx_inner
+            .history_candlesticks_by_date(symbol, period.into(), adjust_type.into(), start, end)
+            .await?
+            .into();
+        Ok(rows)
+    });
+}
+
 /// Get option chain expiry date list
 #[no_mangle]
 pub unsafe extern "C" fn lb_quote_context_option_chain_expiry_date_list(
diff --git a/c/src/types/datetime.rs b/c/src/types/datetime.rs
index cfbf5edd5..adc2c08a8 100644
--- a/c/src/types/datetime.rs
+++ b/c/src/types/datetime.rs
@@ -1,4 +1,4 @@
-use time::{Date, Month, Time};
+use time::{Date, Month, PrimitiveDateTime, Time};
 
 use crate::types::ToFFI;
 
@@ -58,6 +58,12 @@ impl From<Time> for CTime {
     }
 }
 
+impl From<CTime> for Time {
+    fn from(time: CTime) -> Self {
+        Time::from_hms(time.hour, time.minute, time.second).expect("invalid time")
+    }
+}
+
 impl ToFFI for CTime {
     type FFIType = Self;
 
@@ -66,3 +72,34 @@ impl ToFFI for CTime {
         *self
     }
 }
+
+#[derive(Debug, Copy, Clone)]
+#[repr(C)]
+pub struct CDateTime {
+    pub date: CDate,
+    pub time: CTime,
+}
+
+impl From<PrimitiveDateTime> for CDateTime {
+    fn from(datetime: PrimitiveDateTime) -> Self {
+        Self {
+            date: datetime.date().into(),
+            time: datetime.time().into(),
+        }
+    }
+}
+
+impl From<CDateTime> for PrimitiveDateTime {
+    fn from(datetime: CDateTime) -> Self {
+        PrimitiveDateTime::new(datetime.date.into(), datetime.time.into())
+    }
+}
+
+impl ToFFI for CDateTime {
+    type FFIType = Self;
+
+    #[inline]
+    fn to_ffi_type(&self) -> Self::FFIType {
+        *self
+    }
+}
diff --git a/c/src/types/mod.rs b/c/src/types/mod.rs
index e1393db0b..b831d60ab 100644
--- a/c/src/types/mod.rs
+++ b/c/src/types/mod.rs
@@ -11,7 +11,7 @@ use std::{ffi::CStr, os::raw::c_char};
 
 pub(crate) use array::CVec;
 pub(crate) use cow::CCow;
-pub(crate) use datetime::{CDate, CTime};
+pub(crate) use datetime::{CDate, CDateTime, CTime};
 pub(crate) use decimal::CDecimal;
 pub(crate) use language::CLanguage;
 pub(crate) use market::CMarket;
diff --git a/cpp/include/quote_context.hpp b/cpp/include/quote_context.hpp
index 3823f56dc..e44793b10 100644
--- a/cpp/include/quote_context.hpp
+++ b/cpp/include/quote_context.hpp
@@ -128,6 +128,25 @@ class QuoteContext
     AdjustType adjust_type,
     AsyncCallback<QuoteContext, std::vector<Candlestick>> callback) const;
 
+  /// Get security history candlesticks by offset
+  void history_candlesticks_by_offset(
+    const std::string& symbol,
+    Period period,
+    AdjustType adjust_type,
+    bool forward,
+    DateTime datetime,
+    uintptr_t count,
+    AsyncCallback<QuoteContext, std::vector<Candlestick>> callback) const;
+
+  /// Get security history candlesticks by date
+  void history_candlesticks_by_date(
+    const std::string& symbol,
+    Period period,
+    AdjustType adjust_type,
+    std::optional<Date> start,
+    std::optional<Date> end,
+    AsyncCallback<QuoteContext, std::vector<Candlestick>> callback) const;
+
   /// Get option chain expiry date list
   void option_chain_expiry_date_list(
     const std::string& symbol,
diff --git a/cpp/include/types.hpp b/cpp/include/types.hpp
index 782ca0cf4..be2826327 100644
--- a/cpp/include/types.hpp
+++ b/cpp/include/types.hpp
@@ -20,6 +20,12 @@ struct Time
   uint8_t second;
 };
 
+struct DateTime
+{
+  Date date;
+  Time time;
+};
+
 /// Language identifer
 enum class Language
 {
diff --git a/cpp/src/convert.hpp b/cpp/src/convert.hpp
index f3d3b0e52..74a5dd44d 100644
--- a/cpp/src/convert.hpp
+++ b/cpp/src/convert.hpp
@@ -407,6 +407,12 @@ convert(const Date* date)
   };
 }
 
+inline lb_time_t
+convert(const Time* time)
+{
+  return lb_time_t{ time->hour, time->minute, time->second };
+}
+
 inline Time
 convert(const lb_time_t* time)
 {
@@ -417,6 +423,15 @@ convert(const lb_time_t* time)
   };
 }
 
+inline lb_datetime_t
+convert(const DateTime* datetime)
+{
+  return lb_datetime_t{
+    convert(&datetime->date),
+    convert(&datetime->time),
+  };
+}
+
 inline OptionQuote
 convert(const lb_option_quote_t* info)
 {
diff --git a/cpp/src/quote_context.cpp b/cpp/src/quote_context.cpp
index d4cfa723a..63f435ed7 100644
--- a/cpp/src/quote_context.cpp
+++ b/cpp/src/quote_context.cpp
@@ -625,6 +625,104 @@ QuoteContext::candlesticks(
     new AsyncCallback<QuoteContext, std::vector<Candlestick>>(callback));
 }
 
+void
+QuoteContext::history_candlesticks_by_offset(
+  const std::string& symbol,
+  Period period,
+  AdjustType adjust_type,
+  bool forward,
+  DateTime datetime,
+  uintptr_t count,
+  AsyncCallback<QuoteContext, std::vector<Candlestick>> callback) const
+{
+  lb_quote_context_history_candlesticks_by_offset(
+    ctx_,
+    symbol.c_str(),
+    convert(period),
+    convert(adjust_type),
+    forward,
+    convert(&datetime),
+    count,
+    [](auto res) {
+      auto callback_ptr =
+        callback::get_async_callback<QuoteContext, std::vector<Candlestick>>(
+          res->userdata);
+      QuoteContext ctx((const lb_quote_context_t*)res->ctx);
+      Status status(res->error);
+
+      if (status) {
+        auto rows = (const lb_candlestick_t*)res->data;
+        std::vector<Candlestick> rows2;
+        std::transform(rows,
+                       rows + res->length,
+                       std::back_inserter(rows2),
+                       [](auto row) { return convert(&row); });
+
+        (*callback_ptr)(AsyncResult<QuoteContext, std::vector<Candlestick>>(
+          ctx, std::move(status), &rows2));
+      } else {
+        (*callback_ptr)(AsyncResult<QuoteContext, std::vector<Candlestick>>(
+          ctx, std::move(status), nullptr));
+      }
+    },
+    new AsyncCallback<QuoteContext, std::vector<Candlestick>>(callback));
+}
+
+void
+QuoteContext::history_candlesticks_by_date(
+  const std::string& symbol,
+  Period period,
+  AdjustType adjust_type,
+  std::optional<Date> start,
+  std::optional<Date> end,
+  AsyncCallback<QuoteContext, std::vector<Candlestick>> callback) const
+{
+  lb_date_t cstart, cend;
+  const lb_date_t* cstart_ptr = nullptr;
+  const lb_date_t* cend_ptr = nullptr;
+
+  if (start) {
+    cstart = convert(&*start);
+    cstart_ptr = &cstart;
+  }
+
+  if (end) {
+    cend = convert(&*end);
+    cend_ptr = &cend;
+  }
+
+  lb_quote_context_history_candlesticks_by_date(
+    ctx_,
+    symbol.c_str(),
+    convert(period),
+    convert(adjust_type),
+    cstart_ptr,
+    cend_ptr,
+    [](auto res) {
+      auto callback_ptr =
+        callback::get_async_callback<QuoteContext, std::vector<Candlestick>>(
+          res->userdata);
+      QuoteContext ctx((const lb_quote_context_t*)res->ctx);
+      Status status(res->error);
+
+      if (status) {
+        auto rows = (const lb_candlestick_t*)res->data;
+        std::vector<Candlestick> rows2;
+        std::transform(rows,
+                       rows + res->length,
+                       std::back_inserter(rows2),
+                       [](auto row) { return convert(&row); });
+
+        (*callback_ptr)(AsyncResult<QuoteContext, std::vector<Candlestick>>(
+          ctx, std::move(status), &rows2));
+      } else {
+        (*callback_ptr)(AsyncResult<QuoteContext, std::vector<Candlestick>>(
+          ctx, std::move(status), nullptr));
+      }
+    },
+    new AsyncCallback<QuoteContext, std::vector<Candlestick>>(callback));
+}
+
 void
 QuoteContext::option_chain_expiry_date_list(
   const std::string& symbol,
diff --git a/java/c/com_longbridge_SdkNative.h b/java/c/com_longbridge_SdkNative.h
index 9edc9fb03..2b86f9349 100644
--- a/java/c/com_longbridge_SdkNative.h
+++ b/java/c/com_longbridge_SdkNative.h
@@ -255,6 +255,22 @@ JNIEXPORT void JNICALL Java_com_longbridge_SdkNative_quoteContextIntraday
 JNIEXPORT void JNICALL Java_com_longbridge_SdkNative_quoteContextCandlesticks
   (JNIEnv *, jclass, jlong, jstring, jobject, jint, jobject, jobject);
 
+/*
+ * Class:     com_longbridge_SdkNative
+ * Method:    quoteContextHistoryCandlesticksByOffset
+ * Signature: (JLjava/lang/String;Lcom/longbridge/quote/Period;Lcom/longbridge/quote/AdjustType;ZLjava/time/LocalDateTime;ILcom/longbridge/AsyncCallback;)V
+ */
+JNIEXPORT void JNICALL Java_com_longbridge_SdkNative_quoteContextHistoryCandlesticksByOffset
+  (JNIEnv *, jclass, jlong, jstring, jobject, jobject, jboolean, jobject, jint, jobject);
+
+/*
+ * Class:     com_longbridge_SdkNative
+ * Method:    quoteContextHistoryCandlesticksByDate
+ * Signature: (JLjava/lang/String;Lcom/longbridge/quote/Period;Lcom/longbridge/quote/AdjustType;Ljava/time/LocalDate;Ljava/time/LocalDate;Lcom/longbridge/AsyncCallback;)V
+ */
+JNIEXPORT void JNICALL Java_com_longbridge_SdkNative_quoteContextHistoryCandlesticksByDate
+  (JNIEnv *, jclass, jlong, jstring, jobject, jobject, jobject, jobject, jobject);
+
 /*
  * Class:     com_longbridge_SdkNative
  * Method:    quoteContextOptionChainExpiryDateList
@@ -482,10 +498,10 @@ JNIEXPORT void JNICALL Java_com_longbridge_SdkNative_tradeContextCancelOrder
 /*
  * Class:     com_longbridge_SdkNative
  * Method:    tradeContextAccountBalance
- * Signature: (JLcom/longbridge/AsyncCallback;)V
+ * Signature: (JLjava/lang/String;Lcom/longbridge/AsyncCallback;)V
  */
 JNIEXPORT void JNICALL Java_com_longbridge_SdkNative_tradeContextAccountBalance
-  (JNIEnv *, jclass, jlong, jobject);
+  (JNIEnv *, jclass, jlong, jstring, jobject);
 
 /*
  * Class:     com_longbridge_SdkNative
diff --git a/java/javasrc/src/main/java/com/longbridge/SdkNative.java b/java/javasrc/src/main/java/com/longbridge/SdkNative.java
index 48ab0ff17..33f895010 100644
--- a/java/javasrc/src/main/java/com/longbridge/SdkNative.java
+++ b/java/javasrc/src/main/java/com/longbridge/SdkNative.java
@@ -4,6 +4,7 @@
 import java.time.LocalDate;
 import org.scijava.nativelib.NativeLoader;
 import java.time.OffsetDateTime;
+import java.time.LocalDateTime;
 
 import com.longbridge.quote.*;
 import com.longbridge.trade.*;
@@ -12,175 +13,182 @@
  * @hidden
  */
 public class SdkNative {
-    static native void init();
+        static native void init();
 
-    public static native long newHttpClient(String httpUrl, String appKey, String appSecret, String accessToken);
+        public static native long newHttpClient(String httpUrl, String appKey, String appSecret, String accessToken);
 
-    public static native long newHttpClientFromEnv();
+        public static native long newHttpClientFromEnv();
 
-    public static native void freeHttpClient(long httpClient);
+        public static native void freeHttpClient(long httpClient);
 
-    public static native void httpClientRequest(long httpClient, String request, AsyncCallback callback);
+        public static native void httpClientRequest(long httpClient, String request, AsyncCallback callback);
 
-    public static native long newConfig(String appKey, String appSecret, String accessToken, String httpUrl,
-            String quoteWsUrl, String tradeWsUrl, Language language);
+        public static native long newConfig(String appKey, String appSecret, String accessToken, String httpUrl,
+                        String quoteWsUrl, String tradeWsUrl, Language language);
 
-    public static native long newConfigFromEnv();
+        public static native long newConfigFromEnv();
 
-    public static native void configRefreshAccessToken(long config, OffsetDateTime expired_at,
-            AsyncCallback callback);
+        public static native void configRefreshAccessToken(long config, OffsetDateTime expired_at,
+                        AsyncCallback callback);
 
-    public static native void freeConfig(long config);
+        public static native void freeConfig(long config);
 
-    public static native void newQuoteContext(long config, AsyncCallback callback);
+        public static native void newQuoteContext(long config, AsyncCallback callback);
 
-    public static native void freeQuoteContext(long config);
+        public static native void freeQuoteContext(long config);
 
-    public static native void quoteContextSetOnQuote(long context, QuoteHandler handler);
+        public static native void quoteContextSetOnQuote(long context, QuoteHandler handler);
 
-    public static native void quoteContextSetOnDepth(long context, DepthHandler handler);
+        public static native void quoteContextSetOnDepth(long context, DepthHandler handler);
 
-    public static native void quoteContextSetOnBrokers(long context, BrokersHandler handler);
+        public static native void quoteContextSetOnBrokers(long context, BrokersHandler handler);
 
-    public static native void quoteContextSetOnTrades(long context, TradesHandler handler);
+        public static native void quoteContextSetOnTrades(long context, TradesHandler handler);
 
-    public static native void quoteContextSetOnCandlestick(long context, CandlestickHandler handler);
+        public static native void quoteContextSetOnCandlestick(long context, CandlestickHandler handler);
 
-    public static native void quoteContextSubscribe(long context, String[] symbols, int flags, boolean isFirstPush,
-            AsyncCallback callback);
+        public static native void quoteContextSubscribe(long context, String[] symbols, int flags, boolean isFirstPush,
+                        AsyncCallback callback);
 
-    public static native void quoteContextUnsubscribe(long context, String[] symbols, int flags,
-            AsyncCallback callback);
+        public static native void quoteContextUnsubscribe(long context, String[] symbols, int flags,
+                        AsyncCallback callback);
 
-    public static native void quoteContextSubscribeCandlesticks(long context, String symbol, Period period,
-            AsyncCallback callback);
+        public static native void quoteContextSubscribeCandlesticks(long context, String symbol, Period period,
+                        AsyncCallback callback);
 
-    public static native void quoteContextUnsubscribeCandlesticks(long context, String symbol, Period period,
-            AsyncCallback callback);
+        public static native void quoteContextUnsubscribeCandlesticks(long context, String symbol, Period period,
+                        AsyncCallback callback);
 
-    public static native void quoteContextSubscriptions(long context, AsyncCallback callback);
+        public static native void quoteContextSubscriptions(long context, AsyncCallback callback);
 
-    public static native void quoteContextStaticInfo(long context, String[] symbols, AsyncCallback callback);
+        public static native void quoteContextStaticInfo(long context, String[] symbols, AsyncCallback callback);
 
-    public static native void quoteContextQuote(long context, String[] symbols, AsyncCallback callback);
+        public static native void quoteContextQuote(long context, String[] symbols, AsyncCallback callback);
 
-    public static native void quoteContextOptionQuote(long context, String[] symbols, AsyncCallback callback);
+        public static native void quoteContextOptionQuote(long context, String[] symbols, AsyncCallback callback);
 
-    public static native void quoteContextWarrantQuote(long context, String[] symbols, AsyncCallback callback);
+        public static native void quoteContextWarrantQuote(long context, String[] symbols, AsyncCallback callback);
 
-    public static native void quoteContextDepth(long context, String symbol, AsyncCallback callback);
+        public static native void quoteContextDepth(long context, String symbol, AsyncCallback callback);
 
-    public static native void quoteContextBrokers(long context, String symbol, AsyncCallback callback);
+        public static native void quoteContextBrokers(long context, String symbol, AsyncCallback callback);
 
-    public static native void quoteContextParticipants(long context, AsyncCallback callback);
+        public static native void quoteContextParticipants(long context, AsyncCallback callback);
 
-    public static native void quoteContextTrades(long context, String symbol, int count, AsyncCallback callback);
+        public static native void quoteContextTrades(long context, String symbol, int count, AsyncCallback callback);
 
-    public static native void quoteContextIntraday(long context, String symbol, AsyncCallback callback);
+        public static native void quoteContextIntraday(long context, String symbol, AsyncCallback callback);
 
-    public static native void quoteContextCandlesticks(long context, String symbol, Period period, int count,
-            AdjustType adjustType, AsyncCallback callback);
+        public static native void quoteContextCandlesticks(long context, String symbol, Period period, int count,
+                        AdjustType adjustType, AsyncCallback callback);
 
-    public static native void quoteContextOptionChainExpiryDateList(long context, String symbol,
-            AsyncCallback callback);
+        public static native void quoteContextHistoryCandlesticksByOffset(long context, String symbol, Period period,
+                        AdjustType adjustType, boolean forward, LocalDateTime datetime, int count,
+                        AsyncCallback callback);
 
-    public static native void quoteContextOptionChainInfoByDate(long context, String symbol, LocalDate expiryDate,
-            AsyncCallback callback);
+        public static native void quoteContextHistoryCandlesticksByDate(long context, String symbol, Period period,
+                        AdjustType adjustType, LocalDate start, LocalDate end, AsyncCallback callback);
 
-    public static native void quoteContextWarrantIssuers(long context, AsyncCallback callback);
+        public static native void quoteContextOptionChainExpiryDateList(long context, String symbol,
+                        AsyncCallback callback);
 
-    public static native void quoteContextTradingSession(long context, AsyncCallback callback);
+        public static native void quoteContextOptionChainInfoByDate(long context, String symbol, LocalDate expiryDate,
+                        AsyncCallback callback);
 
-    public static native void quoteContextTradingDays(long context, Market market, LocalDate begin, LocalDate end,
-            AsyncCallback callback);
+        public static native void quoteContextWarrantIssuers(long context, AsyncCallback callback);
 
-    public static native void quoteContextCapitalFlow(long context, String symbol, AsyncCallback callback);
+        public static native void quoteContextTradingSession(long context, AsyncCallback callback);
 
-    public static native void quoteContextCapitalDistribution(long context, String symbol, AsyncCallback callback);
+        public static native void quoteContextTradingDays(long context, Market market, LocalDate begin, LocalDate end,
+                        AsyncCallback callback);
 
-    public static native void quoteContextWatchlist(long context, AsyncCallback callback);
+        public static native void quoteContextCapitalFlow(long context, String symbol, AsyncCallback callback);
 
-    public static native void quoteContextCreateWatchlistGroup(long context, CreateWatchlistGroup req,
-            AsyncCallback callback);
+        public static native void quoteContextCapitalDistribution(long context, String symbol, AsyncCallback callback);
 
-    public static native void quoteContextDeleteWatchlistGroup(long context, DeleteWatchlistGroup req,
-            AsyncCallback callback);
+        public static native void quoteContextWatchlist(long context, AsyncCallback callback);
 
-    public static native void quoteContextUpdateWatchlistGroup(long context, UpdateWatchlistGroup req,
-            AsyncCallback callback);
+        public static native void quoteContextCreateWatchlistGroup(long context, CreateWatchlistGroup req,
+                        AsyncCallback callback);
 
-    public static native void quoteContextRealtimeQuote(long context, String[] symbols, AsyncCallback callback);
+        public static native void quoteContextDeleteWatchlistGroup(long context, DeleteWatchlistGroup req,
+                        AsyncCallback callback);
 
-    public static native void quoteContextRealtimeDepth(long context, String symbol, AsyncCallback callback);
+        public static native void quoteContextUpdateWatchlistGroup(long context, UpdateWatchlistGroup req,
+                        AsyncCallback callback);
 
-    public static native void quoteContextRealtimeBrokers(long context, String symbol, AsyncCallback callback);
+        public static native void quoteContextRealtimeQuote(long context, String[] symbols, AsyncCallback callback);
 
-    public static native void quoteContextRealtimeTrades(long context, String symbol, int count,
-            AsyncCallback callback);
+        public static native void quoteContextRealtimeDepth(long context, String symbol, AsyncCallback callback);
 
-    public static native void quoteContextRealtimeCandlesticks(long context, String symbol, Period period,
-            int count,
-            AsyncCallback callback);
+        public static native void quoteContextRealtimeBrokers(long context, String symbol, AsyncCallback callback);
 
-    public static native void newTradeContext(long config, AsyncCallback callback);
+        public static native void quoteContextRealtimeTrades(long context, String symbol, int count,
+                        AsyncCallback callback);
 
-    public static native void freeTradeContext(long config);
+        public static native void quoteContextRealtimeCandlesticks(long context, String symbol, Period period,
+                        int count,
+                        AsyncCallback callback);
 
-    public static native void tradeContextSetOnOrderChanged(long context, OrderChangedHandler handler);
+        public static native void newTradeContext(long config, AsyncCallback callback);
 
-    public static native void tradeContextSubscribe(long context, TopicType[] topics, AsyncCallback callback);
+        public static native void freeTradeContext(long config);
 
-    public static native void tradeContextUnsubscribe(long context, TopicType[] topics, AsyncCallback callback);
+        public static native void tradeContextSetOnOrderChanged(long context, OrderChangedHandler handler);
 
-    public static native void tradeContextHistoryExecutions(long context, GetHistoryExecutionsOptions opts,
-            AsyncCallback callback);
+        public static native void tradeContextSubscribe(long context, TopicType[] topics, AsyncCallback callback);
 
-    public static native void tradeContextTodayExecutions(long context, GetTodayExecutionsOptions opts,
-            AsyncCallback callback);
+        public static native void tradeContextUnsubscribe(long context, TopicType[] topics, AsyncCallback callback);
 
-    public static native void tradeContextHistoryOrders(long context, GetHistoryOrdersOptions opts,
-            AsyncCallback callback);
+        public static native void tradeContextHistoryExecutions(long context, GetHistoryExecutionsOptions opts,
+                        AsyncCallback callback);
 
-    public static native void tradeContextTodayOrders(long context, GetTodayOrdersOptions opts,
-            AsyncCallback callback);
+        public static native void tradeContextTodayExecutions(long context, GetTodayExecutionsOptions opts,
+                        AsyncCallback callback);
 
-    public static native void tradeContextReplaceOrder(long context, ReplaceOrderOptions opts,
-            AsyncCallback callback);
+        public static native void tradeContextHistoryOrders(long context, GetHistoryOrdersOptions opts,
+                        AsyncCallback callback);
 
-    public static native void tradeContextSubmitOrder(long context, SubmitOrderOptions opts,
-            AsyncCallback callback);
+        public static native void tradeContextTodayOrders(long context, GetTodayOrdersOptions opts,
+                        AsyncCallback callback);
 
-    public static native void tradeContextCancelOrder(long context, String orderId, AsyncCallback callback);
+        public static native void tradeContextReplaceOrder(long context, ReplaceOrderOptions opts,
+                        AsyncCallback callback);
 
-    public static native void tradeContextAccountBalance(long context, String currency, AsyncCallback callback);
+        public static native void tradeContextSubmitOrder(long context, SubmitOrderOptions opts,
+                        AsyncCallback callback);
 
-    public static native void tradeContextCashFlow(long context, GetCashFlowOptions opts, AsyncCallback callback);
+        public static native void tradeContextCancelOrder(long context, String orderId, AsyncCallback callback);
 
-    public static native void tradeContextFundPositions(long context, GetFundPositionsOptions opts,
-            AsyncCallback callback);
+        public static native void tradeContextAccountBalance(long context, String currency, AsyncCallback callback);
 
-    public static native void tradeContextStockPositions(long context, GetStockPositionsOptions opts,
-            AsyncCallback callback);
+        public static native void tradeContextCashFlow(long context, GetCashFlowOptions opts, AsyncCallback callback);
 
-    public static native void tradeContextMarginRatio(long context, String symbol, AsyncCallback callback);
+        public static native void tradeContextFundPositions(long context, GetFundPositionsOptions opts,
+                        AsyncCallback callback);
 
-    public static native void tradeContextOrderDetail(long context, String orderId, AsyncCallback callback);
+        public static native void tradeContextStockPositions(long context, GetStockPositionsOptions opts,
+                        AsyncCallback callback);
 
-    public static native void tradeContextEstimateMaxPurchaseQuantity(long context,
-            EstimateMaxPurchaseQuantityOptions opts,
-            AsyncCallback callback);
+        public static native void tradeContextMarginRatio(long context, String symbol, AsyncCallback callback);
 
-    static {
-        try {
-            NativeLoader.loadLibrary("longbridge_java");
-        } catch (IOException e) {
-            System.out.println("======================================");
-            System.out.println("Failed to load longbridge_java");
-            e.printStackTrace();
-            System.out.println("======================================");
-            System.load("longbridge_java");
-        } finally {
-            SdkNative.init();
+        public static native void tradeContextOrderDetail(long context, String orderId, AsyncCallback callback);
+
+        public static native void tradeContextEstimateMaxPurchaseQuantity(long context,
+                        EstimateMaxPurchaseQuantityOptions opts,
+                        AsyncCallback callback);
+
+        static {
+                try {
+                        NativeLoader.loadLibrary("longbridge_java");
+                } catch (IOException e) {
+                        System.out.println("======================================");
+                        System.out.println("Failed to load longbridge_java");
+                        e.printStackTrace();
+                        System.out.println("======================================");
+                        System.load("longbridge_java");
+                } finally {
+                        SdkNative.init();
+                }
         }
-    }
 }
diff --git a/java/src/init.rs b/java/src/init.rs
index 94de11b70..1f8aaff54 100644
--- a/java/src/init.rs
+++ b/java/src/init.rs
@@ -14,6 +14,7 @@ pub(crate) static TIME_INSTANT_CLASS: OnceCell<GlobalRef> = OnceCell::new();
 pub(crate) static TIME_OFFSETDATETIME_CLASS: OnceCell<GlobalRef> = OnceCell::new();
 pub(crate) static TIME_LOCALDATE_CLASS: OnceCell<GlobalRef> = OnceCell::new();
 pub(crate) static TIME_LOCALTIME_CLASS: OnceCell<GlobalRef> = OnceCell::new();
+pub(crate) static TIME_LOCALDATETIME_CLASS: OnceCell<GlobalRef> = OnceCell::new();
 pub(crate) static TIME_ZONE_ID: OnceCell<GlobalRef> = OnceCell::new();
 pub(crate) static QUOTE_CONTEXT_CLASS: OnceCell<GlobalRef> = OnceCell::new();
 pub(crate) static TRADE_CONTEXT_CLASS: OnceCell<GlobalRef> = OnceCell::new();
@@ -64,6 +65,7 @@ pub extern "system" fn Java_com_longbridge_SdkNative_init<'a>(
         (TIME_OFFSETDATETIME_CLASS, "java/time/OffsetDateTime"),
         (TIME_LOCALDATE_CLASS, "java/time/LocalDate"),
         (TIME_LOCALTIME_CLASS, "java/time/LocalTime"),
+        (TIME_LOCALDATETIME_CLASS, "java/time/LocalDateTime"),
         (DERIVATIVE_TYPE_CLASS, "com/longbridge/quote/DerivativeType"),
         (OPENAPI_EXCEPTION_CLASS, "com/longbridge/OpenApiException"),
         (QUOTE_CONTEXT_CLASS, "com/longbridge/quote/QuoteContext"),
diff --git a/java/src/quote_context.rs b/java/src/quote_context.rs
index 95e4be3fd..4f6002045 100644
--- a/java/src/quote_context.rs
+++ b/java/src/quote_context.rs
@@ -14,7 +14,7 @@ use longbridge::{
     Config, Market, QuoteContext,
 };
 use parking_lot::Mutex;
-use time::Date;
+use time::{Date, PrimitiveDateTime};
 
 use crate::{
     async_util,
@@ -553,6 +553,75 @@ pub unsafe extern "system" fn Java_com_longbridge_SdkNative_quoteContextCandlest
     })
 }
 
+#[no_mangle]
+pub unsafe extern "system" fn Java_com_longbridge_SdkNative_quoteContextHistoryCandlesticksByOffset(
+    mut env: JNIEnv,
+    _class: JClass,
+    context: i64,
+    symbol: JString,
+    period: JObject,
+    adjust_type: JObject,
+    forward: bool,
+    datetime: JObject,
+    count: i32,
+    callback: JObject,
+) {
+    jni_result(&mut env, (), |env| {
+        let context = &*(context as *const ContextObj);
+        let symbol: String = FromJValue::from_jvalue(env, symbol.into())?;
+        let period: Period = FromJValue::from_jvalue(env, period.into())?;
+        let adjust_type: AdjustType = FromJValue::from_jvalue(env, adjust_type.into())?;
+        let datetime: PrimitiveDateTime = FromJValue::from_jvalue(env, datetime.into())?;
+        async_util::execute(env, callback, async move {
+            Ok(ObjectArray(
+                context
+                    .ctx
+                    .history_candlesticks_by_offset(
+                        symbol,
+                        period,
+                        adjust_type,
+                        forward,
+                        datetime,
+                        count as usize,
+                    )
+                    .await?,
+            ))
+        })?;
+        Ok(())
+    })
+}
+
+#[no_mangle]
+pub unsafe extern "system" fn Java_com_longbridge_SdkNative_quoteContextHistoryCandlesticksByDate(
+    mut env: JNIEnv,
+    _class: JClass,
+    context: i64,
+    symbol: JString,
+    period: JObject,
+    adjust_type: JObject,
+    start: JObject,
+    end: JObject,
+    callback: JObject,
+) {
+    jni_result(&mut env, (), |env| {
+        let context = &*(context as *const ContextObj);
+        let symbol: String = FromJValue::from_jvalue(env, symbol.into())?;
+        let period: Period = FromJValue::from_jvalue(env, period.into())?;
+        let adjust_type: AdjustType = FromJValue::from_jvalue(env, adjust_type.into())?;
+        let start: Option<Date> = FromJValue::from_jvalue(env, start.into())?;
+        let end: Option<Date> = FromJValue::from_jvalue(env, end.into())?;
+        async_util::execute(env, callback, async move {
+            Ok(ObjectArray(
+                context
+                    .ctx
+                    .history_candlesticks_by_date(symbol, period, adjust_type, start, end)
+                    .await?,
+            ))
+        })?;
+        Ok(())
+    })
+}
+
 #[no_mangle]
 pub unsafe extern "system" fn Java_com_longbridge_SdkNative_quoteContextOptionChainExpiryDateList(
     mut env: JNIEnv,
diff --git a/java/src/types/datetime.rs b/java/src/types/datetime.rs
index 7651f4ea9..8e2aa6674 100644
--- a/java/src/types/datetime.rs
+++ b/java/src/types/datetime.rs
@@ -5,14 +5,14 @@ use jni::{
     objects::{JValue, JValueOwned},
     JNIEnv,
 };
-use time::{Date, Month, OffsetDateTime, Time};
+use time::{Date, Month, OffsetDateTime, PrimitiveDateTime, Time};
 
 use crate::{
     init::{
-        TIME_INSTANT_CLASS, TIME_LOCALDATE_CLASS, TIME_LOCALTIME_CLASS, TIME_OFFSETDATETIME_CLASS,
-        TIME_ZONE_ID,
+        TIME_INSTANT_CLASS, TIME_LOCALDATETIME_CLASS, TIME_LOCALDATE_CLASS, TIME_LOCALTIME_CLASS,
+        TIME_OFFSETDATETIME_CLASS, TIME_ZONE_ID,
     },
-    types::{ClassLoader, FromJValue, IntoJValue, JSignature},
+    types::{get_field, ClassLoader, FromJValue, IntoJValue, JSignature},
 };
 
 impl ClassLoader for OffsetDateTime {
@@ -138,3 +138,39 @@ impl IntoJValue for Time {
         )
     }
 }
+
+impl ClassLoader for PrimitiveDateTime {
+    fn init(_env: &mut JNIEnv) {}
+
+    fn class_ref() -> jni::objects::GlobalRef {
+        TIME_LOCALTIME_CLASS.get().cloned().unwrap()
+    }
+}
+
+impl JSignature for PrimitiveDateTime {
+    fn signature() -> Cow<'static, str> {
+        "Ljava/time/LocalDateTime;".into()
+    }
+}
+
+impl FromJValue for PrimitiveDateTime {
+    fn from_jvalue(env: &mut JNIEnv, value: JValueOwned) -> Result<Self> {
+        let obj = value.l()?;
+        let date: Date = get_field(env, &obj, "date")?;
+        let time: Time = get_field(env, &obj, "time")?;
+        Ok(PrimitiveDateTime::new(date, time))
+    }
+}
+
+impl IntoJValue for PrimitiveDateTime {
+    fn into_jvalue<'a>(self, env: &mut JNIEnv<'a>) -> Result<JValueOwned<'a>> {
+        let date = self.date().into_jvalue(env)?;
+        let time = self.time().into_jvalue(env)?;
+        let obj = env.new_object(
+            TIME_LOCALDATETIME_CLASS.get().unwrap(),
+            "(Ljava/time/LocalDate;Ljava/time/LocalTime;)V",
+            &[date.borrow(), time.borrow()],
+        )?;
+        Ok(JValueOwned::from(obj))
+    }
+}
diff --git a/nodejs/index.d.ts b/nodejs/index.d.ts
index f15f10077..8c20cd2bf 100644
--- a/nodejs/index.d.ts
+++ b/nodejs/index.d.ts
@@ -1019,6 +1019,10 @@ export class QuoteContext {
    * ```
    */
   candlesticks(symbol: string, period: Period, count: number, adjustType: AdjustType): Promise<Array<Candlestick>>
+  /** Get security history candlesticks by offset */
+  historyCandlesticksByOffset(symbol: string, period: Period, adjustType: AdjustType, forward: boolean, datetime: NaiveDatetime, count: number): Promise<Array<Candlestick>>
+  /** Get security history candlesticks by date */
+  historyCandlesticksByDate(symbol: string, period: Period, adjustType: AdjustType, start?: NaiveDate | undefined | null, end?: NaiveDate | undefined | null): Promise<Array<Candlestick>>
   /**
    * Get option chain expiry date list
    *
@@ -1813,13 +1817,20 @@ export class NaiveDate {
   get day(): number
   toString(): string
 }
-/** Naive date type */
+/** Time type */
 export class Time {
   constructor(hour: number, minute: number, second: number)
   get hour(): number
   get monute(): number
   get toString(): string
 }
+/** Naive datetime type */
+export class NaiveDatetime {
+  constructor(date: NaiveDate, time: Time)
+  get date(): NaiveDate
+  get time(): Time
+  toString(): string
+}
 /** Trade context */
 export class TradeContext {
   static new(config: Config): Promise<TradeContext>
@@ -2061,7 +2072,7 @@ export class TradeContext {
    *   });
    * ```
    */
-  accountBalance(): Promise<Array<AccountBalance>>
+  accountBalance(currency?: string | undefined | null): Promise<Array<AccountBalance>>
   /**
    * Get cash flow
    *
@@ -2157,7 +2168,7 @@ export class TradeContext {
    *
    * let config = Config.fromEnv()
    * TradeContext.new(config)
-   *   .then((ctx) => ctx.estimate_max_purchase_quantity({
+   *   .then((ctx) => ctx.estimateMaxPurchaseQuantity({
    *     symbol: "700.HK",
    *     orderType: OrderType.LO,
    *     side: OrderSide.Buy,
diff --git a/nodejs/index.js b/nodejs/index.js
index bd11f6f6c..67d8e0d51 100644
--- a/nodejs/index.js
+++ b/nodejs/index.js
@@ -236,7 +236,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { Config, Decimal, HttpClient, QuoteContext, PushQuoteEvent, PushDepthEvent, PushBrokersEvent, PushTradesEvent, PushCandlestickEvent, Subscription, DerivativeType, TradeStatus, TradeSession, SubType, TradeDirection, OptionType, OptionDirection, WarrantType, Period, AdjustType, SecurityBoard, SecurityStaticInfo, PrePostQuote, SecurityQuote, OptionQuote, WarrantQuote, Depth, SecurityDepth, Brokers, SecurityBrokers, ParticipantInfo, Trade, IntradayLine, Candlestick, StrikePriceInfo, IssuerInfo, TradingSessionInfo, MarketTradingSession, RealtimeQuote, PushQuote, PushDepth, PushBrokers, PushTrades, PushCandlestick, MarketTradingDays, CapitalFlowLine, CapitalDistribution, CapitalDistributionResponse, WatchlistGroup, WatchlistSecurity, SecuritiesUpdateMode, NaiveDate, Time, TradeContext, TopicType, Execution, OrderStatus, OrderSide, OrderType, OrderTag, TimeInForceType, TriggerStatus, OutsideRTH, Order, CommissionFreeStatus, DeductionStatus, ChargeCategoryCode, OrderHistoryDetail, OrderChargeFee, OrderChargeItem, OrderChargeDetail, OrderDetail, PushOrderChanged, SubmitOrderResponse, CashInfo, AccountBalance, BalanceType, CashFlowDirection, CashFlow, FundPositionsResponse, FundPositionChannel, FundPosition, StockPositionsResponse, StockPositionChannel, StockPosition, MarginRatio, EstimateMaxPurchaseQuantityResponse, Market, Language } = nativeBinding
+const { Config, Decimal, HttpClient, QuoteContext, PushQuoteEvent, PushDepthEvent, PushBrokersEvent, PushTradesEvent, PushCandlestickEvent, Subscription, DerivativeType, TradeStatus, TradeSession, SubType, TradeDirection, OptionType, OptionDirection, WarrantType, Period, AdjustType, SecurityBoard, SecurityStaticInfo, PrePostQuote, SecurityQuote, OptionQuote, WarrantQuote, Depth, SecurityDepth, Brokers, SecurityBrokers, ParticipantInfo, Trade, IntradayLine, Candlestick, StrikePriceInfo, IssuerInfo, TradingSessionInfo, MarketTradingSession, RealtimeQuote, PushQuote, PushDepth, PushBrokers, PushTrades, PushCandlestick, MarketTradingDays, CapitalFlowLine, CapitalDistribution, CapitalDistributionResponse, WatchlistGroup, WatchlistSecurity, SecuritiesUpdateMode, NaiveDate, Time, NaiveDatetime, TradeContext, TopicType, Execution, OrderStatus, OrderSide, OrderType, OrderTag, TimeInForceType, TriggerStatus, OutsideRTH, Order, CommissionFreeStatus, DeductionStatus, ChargeCategoryCode, OrderHistoryDetail, OrderChargeFee, OrderChargeItem, OrderChargeDetail, OrderDetail, PushOrderChanged, SubmitOrderResponse, CashInfo, AccountBalance, BalanceType, CashFlowDirection, CashFlow, FundPositionsResponse, FundPositionChannel, FundPosition, StockPositionsResponse, StockPositionChannel, StockPosition, MarginRatio, EstimateMaxPurchaseQuantityResponse, Market, Language } = nativeBinding
 
 module.exports.Config = Config
 module.exports.Decimal = Decimal
@@ -291,6 +291,7 @@ module.exports.WatchlistSecurity = WatchlistSecurity
 module.exports.SecuritiesUpdateMode = SecuritiesUpdateMode
 module.exports.NaiveDate = NaiveDate
 module.exports.Time = Time
+module.exports.NaiveDatetime = NaiveDatetime
 module.exports.TradeContext = TradeContext
 module.exports.TopicType = TopicType
 module.exports.Execution = Execution
diff --git a/nodejs/src/quote/context.rs b/nodejs/src/quote/context.rs
index 165776688..0d95d0c0a 100644
--- a/nodejs/src/quote/context.rs
+++ b/nodejs/src/quote/context.rs
@@ -20,7 +20,7 @@ use crate::{
             WarrantQuote, WatchlistGroup,
         },
     },
-    time::NaiveDate,
+    time::{NaiveDate, NaiveDatetime},
     types::Market,
     utils::JsCallback,
 };
@@ -543,6 +543,58 @@ impl QuoteContext {
             .collect()
     }
 
+    /// Get security history candlesticks by offset
+    #[napi]
+    pub async fn history_candlesticks_by_offset(
+        &self,
+        symbol: String,
+        period: Period,
+        adjust_type: AdjustType,
+        forward: bool,
+        datetime: &NaiveDatetime,
+        count: i32,
+    ) -> Result<Vec<Candlestick>> {
+        self.ctx
+            .history_candlesticks_by_offset(
+                symbol,
+                period.into(),
+                adjust_type.into(),
+                forward,
+                datetime.0,
+                count as usize,
+            )
+            .await
+            .map_err(ErrorNewType)?
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect()
+    }
+
+    /// Get security history candlesticks by date
+    #[napi]
+    pub async fn history_candlesticks_by_date(
+        &self,
+        symbol: String,
+        period: Period,
+        adjust_type: AdjustType,
+        start: Option<&NaiveDate>,
+        end: Option<&NaiveDate>,
+    ) -> Result<Vec<Candlestick>> {
+        self.ctx
+            .history_candlesticks_by_date(
+                symbol,
+                period.into(),
+                adjust_type.into(),
+                start.map(|date| date.0),
+                end.map(|date| date.0),
+            )
+            .await
+            .map_err(ErrorNewType)?
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect()
+    }
+
     /// Get option chain expiry date list
     ///
     /// #### Example
diff --git a/nodejs/src/time.rs b/nodejs/src/time.rs
index 6db687069..ae62fdd04 100644
--- a/nodejs/src/time.rs
+++ b/nodejs/src/time.rs
@@ -52,7 +52,7 @@ impl NaiveDate {
     }
 }
 
-/// Naive date type
+/// Time type
 #[derive(Debug, Copy, Clone)]
 #[napi_derive::napi]
 pub struct Time(pub(crate) time::Time);
@@ -97,3 +97,46 @@ impl Time {
             .unwrap()
     }
 }
+
+/// Naive datetime type
+#[derive(Debug, Copy, Clone)]
+#[napi_derive::napi]
+pub struct NaiveDatetime(pub(crate) time::PrimitiveDateTime);
+
+impl From<time::PrimitiveDateTime> for NaiveDatetime {
+    #[inline]
+    fn from(datetime: time::PrimitiveDateTime) -> Self {
+        Self(datetime)
+    }
+}
+
+#[napi_derive::napi]
+impl NaiveDatetime {
+    #[napi(constructor)]
+    pub fn new(date: &NaiveDate, time: &Time) -> Self {
+        Self(time::PrimitiveDateTime::new(date.0, time.0))
+    }
+
+    #[napi(getter)]
+    #[inline]
+    pub fn date(&self) -> NaiveDate {
+        self.0.date().into()
+    }
+
+    #[napi(getter)]
+    #[inline]
+    pub fn time(&self) -> Time {
+        self.0.time().into()
+    }
+
+    #[napi]
+    #[inline]
+    #[allow(clippy::wrong_self_convention, clippy::inherent_to_string)]
+    pub fn to_string(&self) -> String {
+        self.0
+            .format(time::macros::format_description!(
+                "[year]-[month]-[day] [hour]:[minute]:[second]"
+            ))
+            .unwrap()
+    }
+}
diff --git a/python/pysrc/longbridge/openapi.pyi b/python/pysrc/longbridge/openapi.pyi
index 754db95ac..906d2969f 100644
--- a/python/pysrc/longbridge/openapi.pyi
+++ b/python/pysrc/longbridge/openapi.pyi
@@ -2009,6 +2009,16 @@ class QuoteContext:
                 print(resp)
         """
 
+    def history_candlesticks(self, symbol: str, period: Type[Period], adjust_type: Type[AdjustType], forward: bool, time: datetime, count: int) -> List[Candlestick]:
+        """
+        Get security history candlesticks by offset
+        """
+
+    def history_candlesticks_by_date(self, symbol: str, period: Type[Period], adjust_type: Type[AdjustType], start: Optional[date], end: Optional[date]) -> List[Candlestick]:
+        """
+        Get security history candlesticks by date
+        """
+
     def option_chain_expiry_date_list(self, symbol: str) -> List[date]:
         """
         Get option chain expiry date list
diff --git a/python/src/quote/context.rs b/python/src/quote/context.rs
index 9dac03331..a9c01b24d 100644
--- a/python/src/quote/context.rs
+++ b/python/src/quote/context.rs
@@ -6,6 +6,7 @@ use longbridge::{
 };
 use parking_lot::Mutex;
 use pyo3::prelude::*;
+use time::PrimitiveDateTime;
 
 use crate::{
     config::Config,
@@ -20,7 +21,7 @@ use crate::{
             Trade, WarrantQuote, WatchlistGroup,
         },
     },
-    time::PyDateWrapper,
+    time::{PyDateWrapper, PyOffsetDateTimeWrapper},
     types::Market,
 };
 
@@ -248,6 +249,54 @@ impl QuoteContext {
             .collect()
     }
 
+    /// Get security history candlesticks by offset
+    fn history_candlesticks_by_offset(
+        &self,
+        symbol: String,
+        period: Period,
+        adjust_type: AdjustType,
+        forward: bool,
+        time: PyOffsetDateTimeWrapper,
+        count: usize,
+    ) -> PyResult<Vec<Candlestick>> {
+        self.ctx
+            .history_candlesticks_by_offset(
+                symbol,
+                period.into(),
+                adjust_type.into(),
+                forward,
+                PrimitiveDateTime::new(time.0.date(), time.0.time()),
+                count,
+            )
+            .map_err(ErrorNewType)?
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect()
+    }
+
+    /// Get security history candlesticks by offset
+    fn history_candlesticks_by_date(
+        &self,
+        symbol: String,
+        period: Period,
+        adjust_type: AdjustType,
+        start: Option<PyDateWrapper>,
+        end: Option<PyDateWrapper>,
+    ) -> PyResult<Vec<Candlestick>> {
+        self.ctx
+            .history_candlesticks_by_date(
+                symbol,
+                period.into(),
+                adjust_type.into(),
+                start.map(|d| d.0),
+                end.map(|d| d.0),
+            )
+            .map_err(ErrorNewType)?
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect()
+    }
+
     /// Get option chain expiry date list
     fn option_chain_expiry_date_list(&self, symbol: String) -> PyResult<Vec<PyDateWrapper>> {
         Ok(self
diff --git a/rust/crates/proto/openapi-protobufs b/rust/crates/proto/openapi-protobufs
index e832e776d..a28a44bba 160000
--- a/rust/crates/proto/openapi-protobufs
+++ b/rust/crates/proto/openapi-protobufs
@@ -1 +1 @@
-Subproject commit e832e776d943e1ba45856b993a8ef335836a028c
+Subproject commit a28a44bba6b2feefa417bf520eec6f55910c4105
diff --git a/rust/crates/proto/src/longbridgeapp.control.v1.rs b/rust/crates/proto/src/longbridgeapp.control.v1.rs
index 6605f5714..eb198bb4e 100644
--- a/rust/crates/proto/src/longbridgeapp.control.v1.rs
+++ b/rust/crates/proto/src/longbridgeapp.control.v1.rs
@@ -44,6 +44,10 @@ pub struct AuthResponse {
     pub session_id: ::prost::alloc::string::String,
     #[prost(int64, tag="2")]
     pub expires: i64,
+    #[prost(uint32, tag="3")]
+    pub limit: u32,
+    #[prost(uint32, tag="4")]
+    pub online: u32,
 }
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct ReconnectRequest {
@@ -56,6 +60,10 @@ pub struct ReconnectResponse {
     pub session_id: ::prost::alloc::string::String,
     #[prost(int64, tag="2")]
     pub expires: i64,
+    #[prost(uint32, tag="3")]
+    pub limit: u32,
+    #[prost(uint32, tag="4")]
+    pub online: u32,
 }
 /// control command, see document: <https://open.longbridgeapp.com/docs/socket/control-command>
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
diff --git a/rust/crates/proto/src/longbridgeapp.quote.v1.rs b/rust/crates/proto/src/longbridgeapp.quote.v1.rs
index 078ec515b..5ed3a6491 100644
--- a/rust/crates/proto/src/longbridgeapp.quote.v1.rs
+++ b/rust/crates/proto/src/longbridgeapp.quote.v1.rs
@@ -757,6 +757,42 @@ pub struct SecurityCalcQuoteResponse {
     #[prost(message, repeated, tag="1")]
     pub security_calc_index: ::prost::alloc::vec::Vec<SecurityCalcIndex>,
 }
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct SecurityHistoryCandlestickRequest {
+    #[prost(string, tag="1")]
+    pub symbol: ::prost::alloc::string::String,
+    #[prost(enumeration="Period", tag="2")]
+    pub period: i32,
+    #[prost(enumeration="AdjustType", tag="3")]
+    pub adjust_type: i32,
+    #[prost(enumeration="HistoryCandlestickQueryType", tag="4")]
+    pub query_type: i32,
+    #[prost(message, optional, tag="5")]
+    pub offset_request: ::core::option::Option<security_history_candlestick_request::OffsetQuery>,
+    #[prost(message, optional, tag="6")]
+    pub date_request: ::core::option::Option<security_history_candlestick_request::DateQuery>,
+}
+/// Nested message and enum types in `SecurityHistoryCandlestickRequest`.
+pub mod security_history_candlestick_request {
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct OffsetQuery {
+        #[prost(enumeration="super::Direction", tag="1")]
+        pub direction: i32,
+        #[prost(string, tag="2")]
+        pub date: ::prost::alloc::string::String,
+        #[prost(string, tag="3")]
+        pub minute: ::prost::alloc::string::String,
+        #[prost(int32, tag="4")]
+        pub count: i32,
+    }
+    #[derive(Clone, PartialEq, ::prost::Message)]
+    pub struct DateQuery {
+        #[prost(string, tag="1")]
+        pub start_date: ::prost::alloc::string::String,
+        #[prost(string, tag="2")]
+        pub end_date: ::prost::alloc::string::String,
+    }
+}
 /// 协议指令定义
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
@@ -812,6 +848,8 @@ pub enum Command {
     QueryCapitalFlowDistribution = 25,
     ///查询标的指标数据
     QuerySecurityCalcIndex = 26,
+    ///查询标的历史 k 线
+    QueryHistoryCandlestick = 27,
     ///推送行情
     PushQuoteData = 101,
     ///推送盘口
@@ -917,3 +955,18 @@ pub enum CalcIndex {
     CalcindexVega = 39,
     CalcindexRho = 40,
 }
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum HistoryCandlestickQueryType {
+    UnknownQueryType = 0,
+    QueryByOffset = 1,
+    QueryByDate = 2,
+}
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
+#[repr(i32)]
+pub enum Direction {
+    /// 老数据, 从最新的数据往历史数据翻页
+    Backward = 0,
+    /// 新数据, 从当前数据往最新数据翻页
+    Forward = 1,
+}
diff --git a/rust/src/blocking/quote.rs b/rust/src/blocking/quote.rs
index 544523efe..20b78b772 100644
--- a/rust/src/blocking/quote.rs
+++ b/rust/src/blocking/quote.rs
@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use time::Date;
+use time::{Date, PrimitiveDateTime};
 
 use crate::{
     blocking::runtime::BlockingRuntime,
@@ -432,6 +432,37 @@ impl QuoteContextSync {
         })
     }
 
+    /// Get security history candlesticks by offset
+    pub fn history_candlesticks_by_offset(
+        &self,
+        symbol: impl Into<String> + Send + 'static,
+        period: Period,
+        adjust_type: AdjustType,
+        forward: bool,
+        time: PrimitiveDateTime,
+        count: usize,
+    ) -> Result<Vec<Candlestick>> {
+        self.rt.call(move |ctx| async move {
+            ctx.history_candlesticks_by_offset(symbol, period, adjust_type, forward, time, count)
+                .await
+        })
+    }
+
+    /// Get security history candlesticks by date
+    pub fn history_candlesticks_by_date(
+        &self,
+        symbol: impl Into<String> + Send + 'static,
+        period: Period,
+        adjust_type: AdjustType,
+        start: Option<Date>,
+        end: Option<Date>,
+    ) -> Result<Vec<Candlestick>> {
+        self.rt.call(move |ctx| async move {
+            ctx.history_candlesticks_by_date(symbol, period, adjust_type, start, end)
+                .await
+        })
+    }
+
     /// Get option chain expiry date list
     ///
     /// # Examples
diff --git a/rust/src/quote/cmd_code.rs b/rust/src/quote/cmd_code.rs
index 16b6413f2..c085844ba 100644
--- a/rust/src/quote/cmd_code.rs
+++ b/rust/src/quote/cmd_code.rs
@@ -55,6 +55,9 @@ pub(crate) const GET_CAPITAL_FLOW_INTRADAY: u8 = 24;
 /// Get Security Capital Distribution
 pub(crate) const GET_SECURITY_CAPITAL_DISTRIBUTION: u8 = 25;
 
+/// Get History candlesticks
+pub(crate) const GET_SECURITY_HISTORY_CANDLESTICKS: u8 = 26;
+
 /// Push Real-time Quote
 pub(crate) const PUSH_REALTIME_QUOTE: u8 = 101;
 
diff --git a/rust/src/quote/context.rs b/rust/src/quote/context.rs
index 137534222..755cc88f7 100644
--- a/rust/src/quote/context.rs
+++ b/rust/src/quote/context.rs
@@ -4,7 +4,7 @@ use longbridge_httpcli::{HttpClient, Json, Method};
 use longbridge_proto::quote;
 use longbridge_wscli::WsClientError;
 use serde::{Deserialize, Serialize};
-use time::Date;
+use time::{Date, PrimitiveDateTime};
 use tokio::sync::{mpsc, oneshot};
 
 use crate::{
@@ -674,6 +674,105 @@ impl QuoteContext {
         Ok(candlesticks)
     }
 
+    /// Get security history candlesticks by offset
+    pub async fn history_candlesticks_by_offset(
+        &self,
+        symbol: impl Into<String>,
+        period: Period,
+        adjust_type: AdjustType,
+        forward: bool,
+        time: PrimitiveDateTime,
+        count: usize,
+    ) -> Result<Vec<Candlestick>> {
+        let resp: quote::SecurityCandlestickResponse = self
+            .request(
+                cmd_code::GET_SECURITY_HISTORY_CANDLESTICKS,
+                quote::SecurityHistoryCandlestickRequest {
+                    symbol: symbol.into(),
+                    period: period.into(),
+                    adjust_type: adjust_type.into(),
+                    query_type: quote::HistoryCandlestickQueryType::QueryByOffset.into(),
+                    offset_request: Some(
+                        quote::security_history_candlestick_request::OffsetQuery {
+                            direction: if forward {
+                                quote::Direction::Forward
+                            } else {
+                                quote::Direction::Backward
+                            }
+                            .into(),
+                            date: format!(
+                                "{:04}{:02}{:02}",
+                                time.year(),
+                                time.month() as u8,
+                                time.day()
+                            ),
+                            minute: format!("{:02}{:02}", time.hour(), time.minute()),
+                            count: count as i32,
+                        },
+                    ),
+                    date_request: None,
+                },
+            )
+            .await?;
+        let candlesticks = resp
+            .candlesticks
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect::<Result<Vec<_>>>()?;
+        Ok(candlesticks)
+    }
+
+    /// Get security history candlesticks by date
+    pub async fn history_candlesticks_by_date(
+        &self,
+        symbol: impl Into<String>,
+        period: Period,
+        adjust_type: AdjustType,
+        start: Option<Date>,
+        end: Option<Date>,
+    ) -> Result<Vec<Candlestick>> {
+        let resp: quote::SecurityCandlestickResponse = self
+            .request(
+                cmd_code::GET_SECURITY_HISTORY_CANDLESTICKS,
+                quote::SecurityHistoryCandlestickRequest {
+                    symbol: symbol.into(),
+                    period: period.into(),
+                    adjust_type: adjust_type.into(),
+                    query_type: quote::HistoryCandlestickQueryType::QueryByDate.into(),
+                    offset_request: None,
+                    date_request: Some(quote::security_history_candlestick_request::DateQuery {
+                        start_date: start
+                            .map(|date| {
+                                format!(
+                                    "{:04}{:02}{:02}",
+                                    date.year(),
+                                    date.month() as u8,
+                                    date.day()
+                                )
+                            })
+                            .unwrap_or_default(),
+                        end_date: end
+                            .map(|date| {
+                                format!(
+                                    "{:04}{:02}{:02}",
+                                    date.year(),
+                                    date.month() as u8,
+                                    date.day()
+                                )
+                            })
+                            .unwrap_or_default(),
+                    }),
+                },
+            )
+            .await?;
+        let candlesticks = resp
+            .candlesticks
+            .into_iter()
+            .map(TryInto::try_into)
+            .collect::<Result<Vec<_>>>()?;
+        Ok(candlesticks)
+    }
+
     /// Get option chain expiry date list
     ///
     /// Reference: <https://open.longbridgeapp.com/en/docs/quote/pull/optionchain-date>