add log_path field to Config

c/Cargo.toml

@@ -22,6 +22,7 @@ tokio = { version = "1.19.2", features = ["rt-multi-thread"] }
 once_cell = "1.12.0"
 parking_lot = "0.12.1"
 time = "0.3.9"
+tracing = "0.1.34"
 
 [build-dependencies]
 cbindgen = "0.24.3"

c/csrc/include/longport.h

@@ -3703,6 +3703,7 @@ extern "C" {
  *   `realtime`)
  * - `LONGPORT_PRINT_QUOTE_PACKAGES` - Print quote packages when connected,
  *   `true` or `false` (Default: `true`)
+ * - `LONGPORT_LOG_PATH` - Set the path of the log files (Default: `no logs`)
  */
 struct lb_config_t *lb_config_from_env(struct lb_error_t **error);
 
@@ -3715,7 +3716,8 @@ struct lb_config_t *lb_config_new(const char *app_key,
                                   const enum lb_language_t *language,
                                   bool enable_overight,
                                   const enum lb_push_candlestick_mode_t *push_candlestick_mode,
-                                  bool enable_print_quote_packages);
+                                  bool enable_print_quote_packages,
+                                  const char *log_path);
 
 /**
  * Free the config object

c/src/config.rs

@@ -37,6 +37,7 @@ pub struct CConfig(pub(crate) Arc<Config>);
 ///   `realtime`)
 /// - `LONGPORT_PRINT_QUOTE_PACKAGES` - Print quote packages when connected,
 ///   `true` or `false` (Default: `true`)
+/// - `LONGPORT_LOG_PATH` - Set the path of the log files (Default: `no logs`)
 #[no_mangle]
 pub unsafe extern "C" fn lb_config_from_env(error: *mut *mut CError) -> *mut CConfig {
     match Config::from_env() {
@@ -63,6 +64,7 @@ pub unsafe extern "C" fn lb_config_new(
     enable_overight: bool,
     push_candlestick_mode: *const CPushCandlestickMode,
     enable_print_quote_packages: bool,
+    log_path: *const c_char,
 ) -> *mut CConfig {
     let app_key = CStr::from_ptr(app_key).to_str().expect("invalid app key");
     let app_secret = CStr::from_ptr(app_secret)
@@ -109,6 +111,10 @@ pub unsafe extern "C" fn lb_config_new(
         config = config.dont_print_quote_packages();
     }
 
+    if !log_path.is_null() {
+        config = config.log_path(CStr::from_ptr(log_path).to_str().expect("invalid log path"));
+    }
+
     Box::into_raw(Box::new(CConfig(Arc::new(config))))
 }
 

c/src/quote_context/context.rs

@@ -2,6 +2,7 @@ use std::{
     ffi::{c_void, CString},
     os::raw::c_char,
     sync::Arc,
+    time::Instant,
 };
 
 use longport::{
@@ -127,12 +128,24 @@ pub unsafe extern "C" fn lb_quote_context_new(
                             ..
                         } => {
                             if let Some(callback) = &state.callbacks.quote {
+                                let log_subscriber = ctx.ctx.log_subscriber();
+                                let _guard =
+                                    tracing::dispatcher::set_default(&log_subscriber.into());
+
+                                let s = Instant::now();
+                                tracing::info!("begin call on_quote callback");
+
                                 let quote_owned: CPushQuoteOwned = (symbol, quote).into();
                                 (callback.f)(
                                     Arc::as_ptr(&ctx),
                                     &quote_owned.to_ffi_type(),
                                     callback.userdata,
                                 );
+
+                                tracing::info!(
+                                    duration = ?s.elapsed(),
+                                    "after call on_quote callback"
+                                );
                             }
                         }
                         PushEvent {
@@ -141,12 +154,24 @@ pub unsafe extern "C" fn lb_quote_context_new(
                             ..
                         } => {
                             if let Some(callback) = &state.callbacks.depth {
+                                let log_subscriber = ctx.ctx.log_subscriber();
+                                let _guard =
+                                    tracing::dispatcher::set_default(&log_subscriber.into());
+
+                                let s = Instant::now();
+                                tracing::info!("begin call on_depth callback");
+
                                 let depth_owned: CPushDepthOwned = (symbol, depth).into();
                                 (callback.f)(
                                     Arc::as_ptr(&ctx),
                                     &depth_owned.to_ffi_type(),
                                     callback.userdata,
                                 );
+
+                                tracing::info!(
+                                    duration = ?s.elapsed(),
+                                    "after call on_depth callback"
+                                );
                             }
                         }
                         PushEvent {
@@ -155,12 +180,24 @@ pub unsafe extern "C" fn lb_quote_context_new(
                             ..
                         } => {
                             if let Some(callback) = &state.callbacks.brokers {
+                                let log_subscriber = ctx.ctx.log_subscriber();
+                                let _guard =
+                                    tracing::dispatcher::set_default(&log_subscriber.into());
+
+                                let s = Instant::now();
+                                tracing::info!("begin call on_brokers callback");
+
                                 let brokers_owned: CPushBrokersOwned = (symbol, brokers).into();
                                 (callback.f)(
                                     Arc::as_ptr(&ctx),
                                     &brokers_owned.to_ffi_type(),
                                     callback.userdata,
                                 );
+
+                                tracing::info!(
+                                    duration = ?s.elapsed(),
+                                    "after call on_brokers callback"
+                                );
                             }
                         }
                         PushEvent {
@@ -169,12 +206,24 @@ pub unsafe extern "C" fn lb_quote_context_new(
                             ..
                         } => {
                             if let Some(callback) = &state.callbacks.trades {
+                                let log_subscriber = ctx.ctx.log_subscriber();
+                                let _guard =
+                                    tracing::dispatcher::set_default(&log_subscriber.into());
+
+                                let s = Instant::now();
+                                tracing::info!("begin call on_trades callback");
+
                                 let trades_owned: CPushTradesOwned = (symbol, trades).into();
                                 (callback.f)(
                                     Arc::as_ptr(&ctx),
                                     &trades_owned.to_ffi_type(),
                                     callback.userdata,
                                 );
+
+                                tracing::info!(
+                                    duration = ?s.elapsed(),
+                                    "after call on_trades callback"
+                                );
                             }
                         }
                         PushEvent {
@@ -183,13 +232,25 @@ pub unsafe extern "C" fn lb_quote_context_new(
                             ..
                         } => {
                             if let Some(callback) = &state.callbacks.candlestick {
+                                let log_subscriber = ctx.ctx.log_subscriber();
+                                let _guard =
+                                    tracing::dispatcher::set_default(&log_subscriber.into());
+
+                                let s = Instant::now();
+                                tracing::info!("begin call on_candlestick callback");
+
                                 let candlestick_owned: CPushCandlestickOwned =
                                     (symbol, candlestick).into();
                                 (callback.f)(
                                     Arc::as_ptr(&ctx),
                                     &candlestick_owned.to_ffi_type(),
                                     callback.userdata,
                                 );
+
+                                tracing::info!(
+                                    duration = ?s.elapsed(),
+                                    "after call on_candlestick callback"
+                                );
                             }
                         }
                     }

c/src/trade_context/context.rs

@@ -1,4 +1,4 @@
-use std::{ffi::c_void, os::raw::c_char, sync::Arc};
+use std::{ffi::c_void, os::raw::c_char, sync::Arc, time::Instant};
 
 use longport::{
     trade::{
@@ -98,13 +98,25 @@ pub unsafe extern "C" fn lb_trade_context_new(
                     match event {
                         PushEvent::OrderChanged(order_changed) => {
                             if let Some(callback) = &state.callbacks.order_changed {
+                                let log_subscriber = ctx.ctx.log_subscriber();
+                                let _guard =
+                                    tracing::dispatcher::set_default(&log_subscriber.into());
+
+                                let s = Instant::now();
+                                tracing::info!("begin call on_order_changed callback");
+
                                 let order_changed_owned: CPushOrderChangedOwned =
                                     order_changed.into();
                                 (callback.f)(
                                     Arc::as_ptr(&ctx),
                                     &order_changed_owned.to_ffi_type(),
                                     callback.userdata,
                                 );
+
+                                tracing::info!(
+                                    duration = ?s.elapsed(),
+                                    "after call on_order_changed callback"
+                                );
                             }
                         }
                     }

cpp/include/config.hpp

@@ -37,6 +37,8 @@ class Config
    * @param language Language identifer (Default: Language::EN)
    * @param push_candlestick_mode Push candlestick mode (Default:
    * PushCandlestickMode::Realtime)
+   * @param enable_print_quote_packages Print quote packages when connected
+   * (Default: true)
    */
   Config(const std::string& app_key,
          const std::string& app_secret,
@@ -48,7 +50,8 @@ class Config
          bool enable_overnight = false,
          const std::optional<PushCandlestickMode>& push_candlestick_mode =
            std::nullopt,
-         bool enable_print_quote_packages = true);
+         bool enable_print_quote_packages = true,
+         const std::optional<std::string>& log_path = std::nullopt);
 
   ~Config();
 
@@ -76,6 +79,7 @@ class Config
   ///   `realtime`)
   /// - `LONGPORT_PRINT_QUOTE_PACKAGES` - Print quote packages when connected,
   ///   `true` or `false` (Default: `true`)
+  /// - `LONGPORT_LOG_PATH` - Set the path of the log files (Default: `no logs`)
   static Status from_env(Config& config);
 
   /// Gets a new `access_token`

cpp/src/config.cpp

@@ -30,7 +30,8 @@ Config::Config(const std::string& app_key,
                const std::optional<Language>& language,
                bool enable_overnight,
                const std::optional<PushCandlestickMode>& push_candlestick_mode,
-               bool enable_print_quote_packages)
+               bool enable_print_quote_packages,
+               const std::optional<std::string>& log_path)
 {
   lb_language_t c_language;
   if (language) {
@@ -52,7 +53,8 @@ Config::Config(const std::string& app_key,
                   language ? &c_language : nullptr,
                   enable_overnight,
                   push_candlestick_mode ? &c_push_candlestick_mode : nullptr,
-                  enable_print_quote_packages);
+                  enable_print_quote_packages,
+                  log_path ? log_path->c_str() : nullptr);
 }
 
 Config::~Config()

java/javasrc/src/main/java/com/longport/Config.java

@@ -39,6 +39,7 @@ public class Config implements AutoCloseable {
      * `realtime`)
      * - `LONGPORT_PRINT_QUOTE_PACKAGES` - Print quote packages when connected,
      * `true` or `false` (Default: `true`)
+     * - `LONGPORT_LOG_PATH` - Set the path of the log files (Default: `no logs`)
      * 
      * @return Config object
      * @throws OpenApiException If an error occurs

java/javasrc/src/main/java/com/longport/ConfigBuilder.java

@@ -14,6 +14,7 @@ public class ConfigBuilder {
     private boolean enableOvernight;
     private PushCandlestickMode pushCandlestickMode;
     private boolean enablePrintQuotePackages;
+    private String logPath;
 
     /**
      * Create a `Config` object builder
@@ -113,6 +114,17 @@ public ConfigBuilder dontPrintQuotePackages() {
         return this;
     }
 
+    /**
+     * Set the path of the log files.
+     * 
+     * @param path The path of the log files (Default: `no logs`)
+     * @return this object
+     */
+    public ConfigBuilder logPath(String path) {
+        this.logPath = path;
+        return this;
+    }
+
     /**
      * Build a Config object
      * 
@@ -122,6 +134,6 @@ public ConfigBuilder dontPrintQuotePackages() {
     public Config build() throws OpenApiException {
         return new Config(
                 SdkNative.newConfig(appKey, appSecret, accessToken, httpUrl, quoteWsUrl, tradeWsUrl, language,
-                        enableOvernight, pushCandlestickMode, enablePrintQuotePackages));
+                        enableOvernight, pushCandlestickMode, enablePrintQuotePackages, logPath));
     }
 }

java/javasrc/src/main/java/com/longport/SdkNative.java

@@ -26,7 +26,7 @@ public class SdkNative {
 
         public static native long newConfig(String appKey, String appSecret, String accessToken, String httpUrl,
                         String quoteWsUrl, String tradeWsUrl, Language language, boolean enableOvernight,
-                        PushCandlestickMode mode, boolean enablePrintQuotePackages);
+                        PushCandlestickMode mode, boolean enablePrintQuotePackages, String logPath);
 
         public static native long newConfigFromEnv();
 

java/src/config.rs

@@ -22,6 +22,7 @@ pub extern "system" fn Java_com_longport_SdkNative_newConfig(
     enable_overnight: jboolean,
     push_candlestick_mode: JObject,
     enable_print_quote_packages: jboolean,
+    log_path: JString,
 ) -> jlong {
     jni_result(&mut env, 0, |env| {
         let app_key = String::from_jvalue(env, app_key.into())?;
@@ -33,6 +34,7 @@ pub extern "system" fn Java_com_longport_SdkNative_newConfig(
         let language = <Option<Language>>::from_jvalue(env, language.into())?;
         let push_candlestick_mode =
             <Option<PushCandlestickMode>>::from_jvalue(env, push_candlestick_mode.into())?;
+        let log_path = <Option<String>>::from_jvalue(env, log_path.into())?;
 
         let mut config = Config::new(app_key, app_secret, access_token);
 
@@ -57,6 +59,9 @@ pub extern "system" fn Java_com_longport_SdkNative_newConfig(
         if enable_print_quote_packages == 0 {
             config = config.dont_print_quote_packages();
         }
+        if let Some(log_path) = log_path {
+            config = config.log_path(log_path);
+        }
 
         Ok(Box::into_raw(Box::new(config)) as jlong)
     })

nodejs/index.d.ts

@@ -34,6 +34,8 @@ export interface ConfigParams {
    * (default: true)
    */
   enablePrintQuotePackages: boolean
+  /** Set the path of the log files (Default: `no logs`) */
+  logPath?: string
 }
 /** An request to create a watchlist group */
 export interface CreateWatchlistGroup {
@@ -2048,6 +2050,10 @@ export class PushQuote {
   get tradeStatus(): TradeStatus
   /** Trade session */
   get tradeSession(): TradeSession
+  /** Increase volume between pushes */
+  get currentVolume(): number
+  /** Increase turnover between pushes */
+  get currentTurnover(): Decimal
 }
 /** Push real-time depth */
 export class PushDepth {

nodejs/src/config.rs

@@ -33,6 +33,8 @@ pub struct ConfigParams {
     /// Enable printing the opened quote packages when connected to the server
     /// (default: true)
     pub enable_print_quote_packages: bool,
+    /// Set the path of the log files (Default: `no logs`)
+    pub log_path: Option<String>,
 }
 
 /// Configuration for LongPort sdk
@@ -75,6 +77,10 @@ impl Config {
             config = config.dont_print_quote_packages();
         }
 
+        if let Some(log_path) = params.log_path {
+            config = config.log_path(log_path);
+        }
+
         Self(config)
     }
 

python/Makefile.toml

@@ -13,7 +13,7 @@ args = ["install", "maturin==1.7.4"]
 command = "pip"
 args = [
     "install",
-    "target/wheels/longport-2.1.6-cp311-cp311-win_amd64.whl",
+    "target/wheels/longport-2.1.7-cp311-cp311-win_amd64.whl",
     "-I",
 ]
 dependencies = ["python"]