将terminal中的interface.h拆成3个子头文件

hevakelcj · hevakelcj · commit 9dbfdb049fcf · 2022-02-14T22:11:39.000+08:00
diff --git a/main/context.h b/main/context.h
@@ -4,7 +4,7 @@
 #include <tbox/event/loop.h>
 #include <tbox/eventx/thread_pool.h>
 #include <tbox/eventx/timer_pool.h>
-#include <tbox/terminal/interface.h>
+#include <tbox/terminal/terminal_nodes.h>
 
 namespace tbox::main {
 
diff --git a/terminal/Makefile b/terminal/Makefile
@@ -5,7 +5,9 @@ LIB_VERSION_Z = 2
 
 HEAD_FILES = \
 	types.h \
-	interface.h \
+	connection.h \
+	terminal_interact.h \
+	terminal_nodes.h \
 	session.h \
 	telnetd.h \
 	terminal.h \
diff --git a/terminal/connection.h b/terminal/connection.h
@@ -0,0 +1,21 @@
+#ifndef TBOX_TERMINAL_CONNECTION_H_20220214
+#define TBOX_TERMINAL_CONNECTION_H_20220214
+
+#include "types.h"
+
+namespace tbox::terminal {
+
+class Connection {
+  public:
+    virtual bool send(const SessionToken &st, char ch) = 0;
+    virtual bool send(const SessionToken &st, const std::string &str) = 0;
+    virtual bool endSession(const SessionToken &st) = 0;
+    virtual bool isValid(const SessionToken &st) const = 0;
+
+  protected:
+    virtual ~Connection() { }
+};
+
+}
+
+#endif //TBOX_TERMINAL_CONNECTION_H_20220214
diff --git a/terminal/impl/telnetd.cpp b/terminal/impl/telnetd.cpp
@@ -6,6 +6,8 @@
 #include <tbox/util/string.h>
 #include <tbox/base/log.h>
 
+#include "../terminal_interact.h"
+
 namespace tbox::terminal {
 
 using namespace std;
diff --git a/terminal/impl/telnetd.h b/terminal/impl/telnetd.h
@@ -6,7 +6,7 @@
 #include <map>
 
 #include "../telnetd.h"
-#include "../interface.h"
+#include "../connection.h"
 
 namespace tbox::terminal {
 
diff --git a/terminal/impl/terminal.cpp b/terminal/impl/terminal.cpp
@@ -4,6 +4,7 @@
 
 #include <tbox/base/log.h>
 
+#include "../connection.h"
 #include "session_context.h"
 #include "dir_node.h"
 #include "func_node.h"
diff --git a/terminal/impl/terminal_commands.cpp b/terminal/impl/terminal_commands.cpp
@@ -9,6 +9,7 @@
 #include "session_context.h"
 #include "dir_node.h"
 #include "func_node.h"
+#include "../connection.h"
 
 namespace tbox::terminal {
 
diff --git a/terminal/impl/terminal_key_events.cpp b/terminal/impl/terminal_key_events.cpp
@@ -7,6 +7,7 @@
 #include "session_context.h"
 #include "dir_node.h"
 #include "func_node.h"
+#include "../connection.h"
 
 namespace tbox::terminal {
 
diff --git a/terminal/interface.h b/terminal/interface.h
diff --git a/terminal/session.cpp b/terminal/session.cpp
@@ -1,6 +1,7 @@
 #include "session.h"
 #include <tbox/base/log.h>
-#include "interface.h"
+
+#include "connection.h"
 
 namespace tbox {
 namespace terminal {
diff --git a/terminal/terminal.h b/terminal/terminal.h
@@ -1,7 +1,8 @@
 #ifndef TBOX_TELNETD_TERMINAL_H_20220128
 #define TBOX_TELNETD_TERMINAL_H_20220128
 
-#include "interface.h"
+#include "terminal_interact.h"
+#include "terminal_nodes.h"
 
 namespace tbox::terminal {
 
diff --git a/terminal/terminal_interact.h b/terminal/terminal_interact.h
@@ -0,0 +1,26 @@
+#ifndef TBOX_TERMINAL_INTERACT_H_20220214
+#define TBOX_TERMINAL_INTERACT_H_20220214
+
+#include "types.h"
+
+namespace tbox::terminal {
+
+class Connection;
+
+class TerminalInteract {
+  public:
+    virtual SessionToken newSession(Connection *wp_conn) = 0;
+    virtual bool deleteSession(const SessionToken &st) = 0;
+
+    virtual bool onBegin(const SessionToken &st) = 0;
+    virtual bool onExit(const SessionToken &st) = 0;
+    virtual bool onRecvString(const SessionToken &st, const std::string &str) = 0;
+    virtual bool onRecvWindowSize(const SessionToken &st, uint16_t w, uint16_t h) = 0;
+
+  protected:
+    virtual ~TerminalInteract() { }
+};
+
+}
+
+#endif //TBOX_TERMINAL_INTERACT_H_20220214
diff --git a/terminal/terminal_nodes.h b/terminal/terminal_nodes.h
@@ -0,0 +1,24 @@
+#ifndef TBOX_TERMINAL_NODES_H_20220214
+#define TBOX_TERMINAL_NODES_H_20220214
+
+#include "types.h"
+
+namespace tbox::terminal {
+
+class TerminalNodes {
+  public:
+    virtual NodeToken createFuncNode(const Func &func, const std::string &help = "") = 0;
+    virtual NodeToken createDirNode(const std::string &help = "") = 0;
+
+    virtual NodeToken rootNode() const = 0;
+    virtual NodeToken findNode(const std::string &path) const = 0;
+
+    virtual bool mountNode(const NodeToken &parent, const NodeToken &child, const std::string &name) = 0;
+
+  protected:
+    virtual ~TerminalNodes() { }
+};
+
+}
+
+#endif //TBOX_TERMINAL_NODES_H_20220214
