feat(main,util,flow): 1.11.10

1.添加Module::addAs()方法，允许添加多个同类对象，并重命名;
2.优化Action::toJson()，在vars_为空的时候，不生成Json对象;
3.添加终端命名/apps/dump，打印所有的Module数据;
4.添加Module::toJson()方法，实现将所有Module数据导出为为Json;
5.修复Terminal::Impl::~Impl()内存申请与释放不一致的问題;
6.修复编译问题

Author: hevake

examples/main/03_nc_client_and_echo_server/main.cpp

@@ -29,6 +29,7 @@ void RegisterApps(Module &apps, Context &ctx)
 {
     apps.add(new echo_server::App(ctx));
     apps.add(new nc_client::App(ctx));
+    apps.addAs(new nc_client::App(ctx), "nc_client_2");
 }
 
 std::string GetAppDescribe()
@@ -46,7 +47,7 @@ void GetAppVersion(int &major, int &minor, int &rev, int &build)
     major = 1;
     minor = 0;
     rev = 0;
-    build = 0;
+    build = 1;
 }
 
 }

modules/flow/action.cpp

@@ -57,7 +57,8 @@ void Action::toJson(Json &js) const {
   js["state"] = ToString(state_);
   js["result"] = ToString(result_);
 
-  vars_.toJson(js["vars"]);
+  if (!vars_.empty())
+    vars_.toJson(js["vars"]);
 }
 
 bool Action::start() {

modules/main/context_imp.cpp

@@ -35,6 +35,7 @@
 #include <tbox/terminal/helper.h>
 
 #include "main.h"
+#include "module.h"
 
 namespace tbox {
 namespace main {
@@ -110,8 +111,11 @@ void ContextImp::fillDefaultConfig(Json &cfg) const
     cfg["thread_pool"] = R"({"min":0, "max":1})"_json;
 }
 
-bool ContextImp::initialize(const char* proc_name, const Json &cfg)
+bool ContextImp::initialize(const char* proc_name, const Json &cfg, Module *module)
 {
+    TBOX_ASSERT(module != nullptr);
+    module_ = module;
+
     if (util::json::HasObjectField(cfg, "loop")) {
         auto &js_loop = cfg["loop"];
         initLoop(js_loop);
@@ -469,6 +473,23 @@ void ContextImp::initShell()
             wp_nodes->mountNode(info_node, func_node, "what");
         }
     }
+
+    {
+        auto apps_node = wp_nodes->createDirNode("Applications directory");
+        wp_nodes->mountNode(wp_nodes->rootNode(), apps_node, "apps");
+
+        auto func_node = wp_nodes->createFuncNode(
+            [this] (const Session &s, const Args &) {
+                Json js;
+                module_->toJson(js);
+                auto json_str = js.dump(2);
+                util::string::Replace(json_str, "\n", "\r\n");
+                s.send(json_str);
+                s.send("\r\n");
+            }
+            , "Dump apps as JSON");
+        wp_nodes->mountNode(apps_node, func_node, "dump");
+    }
 }
 
 }

modules/main/context_imp.h

@@ -30,6 +30,8 @@
 namespace tbox {
 namespace main {
 
+class Module;
+
 //! 进程上下文
 class ContextImp : public Context {
   public:
@@ -38,7 +40,7 @@ class ContextImp : public Context {
 
     void fillDefaultConfig(Json &cfg) const;
 
-    bool initialize(const char *proc_name, const Json &cfg);
+    bool initialize(const char *proc_name, const Json &cfg, Module *module);
     bool start();
     void stop();
     void cleanup();
@@ -76,6 +78,8 @@ class ContextImp : public Context {
     coroutine::Scheduler *sp_coroutine_ = nullptr;
 
     std::chrono::steady_clock::time_point start_time_point_;
+
+    Module *module_ = nullptr;
 };
 
 }

modules/main/module.cpp

@@ -54,18 +54,35 @@ bool Module::add(Module *child, bool required)
 
     auto iter = std::find_if(children_.begin(), children_.end(),
         [child] (const ModuleItem &item) {
-            return item.module_ptr == child;
+            return item.module_ptr == child ||
+                   item.module_ptr->name() == child->name();
         }
     );
-    if (iter != children_.end())
+    if (iter != children_.end()) {
+        LogWarn("module %s is already exist or name duplicated.", child->name().c_str());
         return false;
+    }
 
     children_.emplace_back(ModuleItem{ child, required });
     child->vars_.setParent(&vars_);
 
     return true;
 }
 
+bool Module::addAs(Module *child, const std::string &name, bool required)
+{
+    auto tmp = child->name_;
+    child->name_ = name;
+
+    if (!add(child, required)) {
+        //! 如果失败了，还原之前的名称
+        child->name_ = tmp;
+        return false;
+    }
+
+    return true;
+}
+
 void Module::fillDefaultConfig(Json &js_parent)
 {
     Json &js_this = name_.empty() ? js_parent : js_parent[name_];
@@ -157,5 +174,20 @@ void Module::cleanup()
     state_ = State::kNone;
 }
 
+void Module::toJson(Json &js) const
+{
+    if (!vars_.empty())
+        vars_.toJson(js["vars"]);
+
+    if (!children_.empty()) {
+        Json &js_children = js["children"];
+        for (auto &item : children_) {
+            Json &js_child = js_children[item.module_ptr->name()];
+            js_child["required"] = item.required;
+            item.module_ptr->toJson(js_child);
+        }
+    }
+}
+
 }
 }

modules/main/module.h

@@ -98,6 +98,9 @@ class Module {
      */
     bool add(Module *child, bool required = true);
 
+    //! 同上，但会对child进行重新命名
+    bool addAs(Module *child, const std::string &name, bool required = true);
+
     //! 下面5个函数，由父Module自动调用。使用者不需要关心
     void fillDefaultConfig(Json &js_parent);
     bool initialize(const Json &js_parent);
@@ -110,6 +113,9 @@ class Module {
     inline State state() const { return state_; }
     inline util::Variables& vars() { return vars_; }
 
+    //! 导出为JSON对象
+    virtual void toJson(Json &js) const;
+
   protected:
     //! 下面的5个虚函数，可由使用者根据需要重写。如果没有操作，就不用重写
 

modules/main/run_in_backend.cpp

@@ -167,7 +167,7 @@ bool Start(int argc, char **argv)
             std::this_thread::sleep_for(std::chrono::seconds(1));
     };
 
-    if (ctx.initialize(argv[0], js_conf)) {
+    if (ctx.initialize(argv[0], js_conf, &apps)) {
         if (apps.initialize(js_conf)) {
             if (ctx.start()) {  //! 启动所有应用
                 if (apps.start()) {

modules/main/run_in_frontend.cpp

@@ -155,7 +155,7 @@ int Main(int argc, char **argv)
             std::this_thread::sleep_for(std::chrono::seconds(1));
     };
 
-    if (ctx.initialize(argv[0], js_conf)) {
+    if (ctx.initialize(argv[0], js_conf, &apps)) {
         if (apps.initialize(js_conf)) {
             if (ctx.start() && apps.start()) {  //! 启动所有应用
                 RunInFrontend(ctx, apps, exit_wait_sec);

modules/terminal/impl/terminal.cpp

@@ -55,8 +55,8 @@ Terminal::Impl::Impl(event::Loop *wp_loop)
 Terminal::Impl::~Impl()
 {
     sessions_.foreach(
-        [](SessionContext *p) {
-            delete p;
+        [this](SessionContext *s) {
+            session_ctx_pool_.free(s);
         }
     );
     sessions_.clear();

modules/util/variables.h

@@ -21,9 +21,11 @@
 #define TBOX_VARIABLES_H_20250201
 
 #include <map>
+
 #include <tbox/base/defines.h>
 #include <tbox/base/json_fwd.h>
-#include <tbox/util/json.h>
+
+#include "json.h"
 
 namespace tbox {
 namespace util {
@@ -100,6 +102,9 @@ class Variables {
      */
     bool set(const std::string &name, const Json &js_new_value, bool local_only = false);
 
+    //! 检查是否没有变量
+    inline bool empty() const { return var_map_ == nullptr; }
+
   public:
     void toJson(Json &js) const;        //! 导出为Json对象
 

version.mk

@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 11
-TBOX_VERSION_REVISION := 8
+TBOX_VERSION_REVISION := 10