Merge branch 'develop'

Author: hevake

CONTRIBUTORS.md

@@ -4,6 +4,7 @@ _If we have forgotten your name, please contact us_
 
  * Hevake Lee
  * Lucas Law
+ * Sky Hou
+ * DuanYH
  * Gwill
  * MacroModel
- * Sky Hou

examples/network/stdio_stream/01_stdin_out/main.cpp

@@ -32,6 +32,9 @@ int main()
     auto sp_stdin = new network::StdinStream(sp_loop);
     auto sp_stdout = new network::StdoutStream(sp_loop);
 
+    sp_stdin->initialize();
+    sp_stdout->initialize();
+
     sp_stdin->bind(sp_stdout);
 
     sp_stdin->enable();

examples/network/stdio_stream/02_stdio/main.cpp

@@ -31,6 +31,8 @@ int main()
     auto sp_loop = event::Loop::New();
     auto sp_stdio = new network::StdioStream(sp_loop);
 
+    sp_stdio->initialize();
+
     sp_stdio->bind(sp_stdio);
     sp_stdio->enable();
 
@@ -53,3 +55,4 @@ int main()
     delete sp_loop;
     return 0;
 }
+

examples/terminal/build_nodes.cpp

@@ -137,6 +137,7 @@ void BuildNodes(TerminalNodes &term, Loop *wp_loop)
 
     term.mountNode(dir1_1_token, term.rootNode(), "root");  //! 循环引用
 
+    //! 演示使用 AddFuncNode() 函数直接添加函数结点
     auto add_func_dir_node = term.createDirNode();
     term.mountNode(term.rootNode(), add_func_dir_node, "add_func");
 
@@ -145,4 +146,44 @@ void BuildNodes(TerminalNodes &term, Loop *wp_loop)
     AddFuncNode(term, add_func_dir_node, "int_value", int_value, 0, 100);
     AddFuncNode(term, add_func_dir_node, "double_value", double_value, 0, 1);
     AddFuncNode(term, add_func_dir_node, "str_value", str_value);
+
+    //! 演示使用 XxxxxFuncNodeProfile 来添加函数结点
+    auto profile_func_dir_node = term.createDirNode();
+    term.mountNode(term.rootNode(), profile_func_dir_node, "profile_func");
+
+    {
+        BooleanFuncNodeProfile profile;
+        profile.set_func = [&] (bool value) { bool_value = value; return true; };
+        profile.get_func = [&] () { return bool_value; };
+
+        AddFuncNode(term, profile_func_dir_node, "bool_value", profile);
+    }
+
+    {
+        StringFuncNodeProfile profile;
+        profile.set_func = [&] (const std::string &value) { str_value = value; return true; };
+        profile.get_func = [&] () { return str_value; };
+
+        AddFuncNode(term, profile_func_dir_node, "str_value", profile);
+    }
+
+    {
+        IntegerFuncNodeProfile profile;
+        profile.set_func = [&] (int value) { int_value = value; return true; };
+        profile.get_func = [&] () { return int_value; };
+        profile.min_value = 1;
+        profile.max_value = 5;
+
+        AddFuncNode(term, profile_func_dir_node, "int_value", profile);
+    }
+
+    {
+        DoubleFuncNodeProfile profile;
+        profile.set_func = [&] (double value) { double_value = value; return true; };
+        profile.get_func = [&] () { return double_value; };
+        profile.min_value = -1;
+        profile.max_value = 1;
+
+        AddFuncNode(term, profile_func_dir_node, "double_value", profile);
+    }
 }

examples/terminal/stdio/Makefile

@@ -0,0 +1,35 @@
+#
+#     .============.
+#    //  M A K E  / \
+#   //  C++ DEV  /   \
+#  //  E A S Y  /  \/ \
+# ++ ----------.  \/\  .
+#  \\     \     \ /\  /
+#   \\     \     \   /
+#    \\     \     \ /
+#     -============'
+#
+# Copyright (c) 2018 Hevake and contributors, all rights reserved.
+#
+# This file is part of cpp-tbox (https://github.com/cpp-main/cpp-tbox)
+# Use of this source code is governed by MIT license that can be found
+# in the LICENSE file in the root of the source tree. All contributing
+# project authors may be found in the CONTRIBUTORS.md file in the root
+# of the source tree.
+#
+
+PROJECT := examples/terminal/stdio
+EXE_NAME := ${PROJECT}
+
+CPP_SRC_FILES := main.cpp ../build_nodes.cpp
+
+CXXFLAGS := -DMODULE_ID='"$(EXE_NAME)"' $(CXXFLAGS)
+LDFLAGS += \
+	-ltbox_terminal \
+	-ltbox_network \
+	-ltbox_event \
+	-ltbox_util \
+	-ltbox_base \
+	-ldl
+
+include $(TOP_DIR)/mk/exe_common.mk

examples/terminal/stdio/main.cpp

@@ -0,0 +1,69 @@
+/*
+ *     .============.
+ *    //  M A K E  / \
+ *   //  C++ DEV  /   \
+ *  //  E A S Y  /  \/ \
+ * ++ ----------.  \/\  .
+ *  \\     \     \ /\  /
+ *   \\     \     \   /
+ *    \\     \     \ /
+ *     -============'
+ *
+ * Copyright (c) 2025 Hevake and contributors, all rights reserved.
+ *
+ * This file is part of cpp-tbox (https://github.com/cpp-main/cpp-tbox)
+ * Use of this source code is governed by MIT license that can be found
+ * in the LICENSE file in the root of the source tree. All contributing
+ * project authors may be found in the CONTRIBUTORS.md file in the root
+ * of the source tree.
+ */
+#include <string>
+#include <signal.h>
+
+#include <tbox/base/scope_exit.hpp>
+#include <tbox/base/log_output.h>
+
+#include <tbox/event/loop.h>
+#include <tbox/event/signal_event.h>
+
+#include <tbox/terminal/terminal.h>
+#include <tbox/terminal/service/stdio.h>
+
+using namespace tbox;
+
+void BuildNodes(terminal::TerminalNodes &term, event::Loop *wp_loop);
+
+int main()
+{
+    //LogOutput_Enable();
+    auto sp_loop = event::Loop::New();
+    SetScopeExitAction([sp_loop] { delete sp_loop; });
+
+    terminal::Terminal term(sp_loop);
+    terminal::Stdio stdio(sp_loop, &term);
+    stdio.initialize();
+
+    term.setWelcomeText("Welcome to Terminal STDIO demo! \r\n");
+
+    //! 注册ctrl+C停止信号
+    auto *sp_stop_ev = sp_loop->newSignalEvent();
+    SetScopeExitAction([sp_stop_ev] { delete sp_stop_ev; });
+    sp_stop_ev->initialize({SIGINT,SIGTERM}, event::Event::Mode::kOneshot);
+    //! 指定ctrl+C时要做的事务
+    sp_stop_ev->setCallback(
+        [&] (int) {
+            stdio.stop();
+            sp_loop->exitLoop();    //! (3) 退出事件循环
+        }
+    );
+    sp_stop_ev->enable();
+
+    BuildNodes(term, sp_loop);
+
+    stdio.start();
+
+    sp_loop->runLoop();
+
+    stdio.cleanup();
+    return 0;
+}

modules/flow/actions/switch_action.cpp

@@ -19,6 +19,8 @@
  */
 #include "switch_action.h"
 
+#include <sstream>
+
 #include <tbox/base/assert.h>
 #include <tbox/base/defines.h>
 #include <tbox/base/json.hpp>

modules/log/async_sink.cpp

@@ -93,7 +93,7 @@ void AsyncSink::onLogBackEnd(const LogContent &content)
     char buff[1024];
     size_t len = 0;
 
-    udpateTimestampStr(content.timestamp.sec);
+    updateTimestampStr(content.timestamp.sec);
 
     //! 开启色彩，显示日志等级
     if (enable_color_) {

modules/log/sink.cpp

@@ -102,7 +102,7 @@ void Sink::handleLog(const LogContent *content)
     onLogFrontEnd(content);
 }
 
-void Sink::udpateTimestampStr(uint32_t sec)
+void Sink::updateTimestampStr(uint32_t sec)
 {
     if (timestamp_sec_ != sec) {
         time_t ts_sec = sec;

modules/log/sink.h

@@ -56,7 +56,7 @@ class Sink {
     static void HandleLog(const LogContent *content, void *ptr);
     bool filter(int level, const std::string &module);
 
-    void udpateTimestampStr(uint32_t sec);
+    void updateTimestampStr(uint32_t sec);
 
   protected:
     bool enable_color_ = false;