Working (proxy active) display server line.

director.cpp

@@ -144,7 +144,9 @@ void Director::server_prompt(const std::string &prompt,
 }
 
 void Director::proxy_activate(void) {
-  active = true;  // sets Session keep-alive timer.
+  active = true;  // yes, set keep-alive timer.
+  to_server(" "); // start keep-alive timer.
+  
   // set other values we need
   talk_direct = false;
   show_client = false;

dispatchers.cpp

@@ -5,6 +5,7 @@
 
 #include "boxes.h"
 #include "logging.h"
+#include "utils.h"
 
 Dispatch::Dispatch(Director &d) : director{d} {};
 Dispatch::~Dispatch(){};
@@ -31,7 +32,8 @@ void Dispatch::chain_client_input(const std::string &input) {
   }
 }
 
-void Dispatch::chain_server_line(const std::string &line, const std::string &raw_line) {
+void Dispatch::chain_server_line(const std::string &line,
+                                 const std::string &raw_line) {
   if (chain) {
     chain->chain_server_line(line, raw_line);
   } else {
@@ -47,7 +49,8 @@ void Dispatch::chain_server_prompt(const std::string &prompt) {
   }
 }
 
-void Dispatch::server_line(const std::string &line, const std::string &raw_line) {}
+void Dispatch::server_line(const std::string &line,
+                           const std::string &raw_line) {}
 void Dispatch::server_prompt(const std::string &prompt) {}
 void Dispatch::client_input(const std::string &input) {}
 
@@ -166,7 +169,8 @@ void MainDispatch::deactivate(void) {
   notify();
 }
 
-void MainDispatch::server_line(const std::string &line, const std::string &raw_line) {
+void MainDispatch::server_line(const std::string &line,
+                               const std::string &raw_line) {
   BUGZ_LOG(info) << "MDSL: " << line;
   to_client("SL: ");
   to_client(line);
@@ -211,11 +215,47 @@ void InputDispatch::activate(void) {
 
 void InputDispatch::deactivate(void) { notify(); }
 
-void InputDispatch::server_line(const std::string &line, const std::string &raw_line) {
-  // TO FIX:
-  // clear user input and input prompt, display server_line,
-  // and re-display prompt.
+void InputDispatch::server_line(const std::string &line,
+                                const std::string &raw_line) {
+  if (line.empty())
+    return;
+
+  std::string temp = repr(raw_line);
+  BUGZ_LOG(fatal) << "Input:SL(" << temp << ")";
+
+  if (startswith(line, "Command [TL=")) {
+    return;
+  }
+
+  /*
+  temp = raw_line;
+  clean_string(temp);
+  BUGZ_LOG(fatal) << "InputDispatch::server_line(" << temp << ")";
+  */
+  temp = prompt;
+  ansi_clean(temp);
+  size_t total = temp.length() + input.length();
+
+  to_client("\x1b[0m");  // reset colors
+  while (total > 0) {
+    to_client("\b \b");
+    --total;
+  }
+
+  // Lines line "\[[1A\[[1;36mphil \[[0;32mwarps into the sector.\[[0m"
+  temp = raw_line;
+  replace(temp, "\x1b[1A", "");
+  // replace(temp, "\x1[2J", "");
+  to_client(temp); 
+  to_client("\n\r");
+  // Doesn't matter if it is one or two calls.
+  temp = prompt;
+  temp.append(input);
+  to_client(temp);
+  // to_client(prompt);
+  // to_client(input);
 }
+
 // void InputDispatch::server_prompt(const std::string &prompt) {}
 
 void InputDispatch::client_input(const std::string &cinput) {
@@ -362,7 +402,8 @@ void MenuDispatch::calculate_widths(void) {
   instant = max_option_width == 1;
 }
 
-void MenuDispatch::server_line(const std::string &line, const std::string &raw_line) {
+void MenuDispatch::server_line(const std::string &line,
+                               const std::string &raw_line) {
   // TODO:
   // Clear prompt, display raw server line, restore prompt.
 }
@@ -460,7 +501,8 @@ void CoreDispatch::deactivate(void) {
   notify();
 }
 
-void CoreDispatch::server_line(const std::string &line, const std::string &raw_line) {}
+void CoreDispatch::server_line(const std::string &line,
+                               const std::string &raw_line) {}
 void CoreDispatch::server_prompt(const std::string &prompt) {}
 void CoreDispatch::client_input(const std::string &input) {
   BUGZ_LOG(warning) << "Got: " << input << " prompt=" << get_prompt();

dispatchers.h

@@ -113,6 +113,9 @@ class MenuDispatch : public Dispatch {
   void client_input(const std::string &cinput) override;
 };
 
+// This was the original idea, but we've lost our "Main Dispatch" at this point
+// I might bring this back, as a way to test the Input and Menu parts.
+
 /**
  * The main/first proxy Dispatcher.
  *

session.cpp

@@ -119,7 +119,6 @@ void Session::on_connect(const boost::system::error_code error) {
 
     server_read();
   } else {
-    // TODO:
     std::string output =
         str(boost::format("Failed to connect: %1%:%2%\n\r") % host % port);
     to_client(output);
@@ -278,7 +277,7 @@ void Session::process_lines(std::string &received) {
         if (!rm.empty()) {
           size_t rpos = rm.prefix().length();
           int rlen = rm[0].length();
-          if (show_client) {
+          if (director.show_client) {
             line = received.substr(0, rpos + rlen);
             to_client(line);
           }
@@ -298,7 +297,7 @@ void Session::process_lines(std::string &received) {
     rpos = received.find('\n', 0);
 
     // get line to send to the client
-    if (show_client) {
+    if (director.show_client) {
       // that is, if we're sending to the client!
       line = received.substr(0, rpos + 1);
       /*
@@ -343,7 +342,7 @@ void Session::process_lines(std::string &received) {
   // Ok, we have sent all of the \n lines.
 
   if (!received.empty())
-    if (show_client) {
+    if (director.show_client) {
       to_client(received);
       // std::string clean = clean_string(received);
       // BUGZ_LOG(error) << "show_client/leftovers:" << clean;
@@ -397,7 +396,8 @@ void Session::on_prompt_timeout(const boost::system::error_code error) {
       // SP: [ESC[2JESC[H]
       // which after clean_string is empty.
 
-      std::string clean = clean_string(server_prompt);
+      std::string clean = server_prompt; // clean_string(server_prompt);
+      ansi_clean(clean);
       if (!clean.empty()) {
         on_server_prompt(clean, server_prompt);
       }

session.h

@@ -43,7 +43,7 @@ class Session : public std::enable_shared_from_this<Session> {
   // The session line parsing needs show_client
 
   // these move to Director
-  bool show_client = true;
+  // bool show_client = true;
   bool talk_direct = true;
 
   void post(notifyFunc nf);

utils.cpp

@@ -44,19 +44,34 @@ std::smatch ansi_newline(const std::string &str) {
   return m;
 }
 
+std::string repr(const std::string &source) {
+  std::string output = source;
+
+  replace(output, "\n", "\\n");
+  replace(output, "\r", "\\r");
+  replace(output, "\b", "\\b");
+  replace(output, "\x1b", "\\[");  
+  high_ascii(output);
+  return output;
+}
+
 std::string clean_string(const std::string &source) {
   std::string clean = source;
-
+/*
   replace(clean, "\n", "\\n");
   replace(clean, "\r", "\\r");
   replace(clean, "\b", "\\b");
+  replace(clean, "\x1b", "\\[");
+*/
+  replace(clean, "\n", "");
+  replace(clean, "\r", "");
 
   // ANSI too
   ansi_clean(clean);
   // BUGZ_LOG(error) << "cleaned: " << clean;
   high_ascii(clean);
 
-  replace(clean, "\x1b", "^");
+  // replace(clean, "\x1b", "^");
 
   return clean;
 }
@@ -70,4 +85,8 @@ std::vector<std::string> split(const std::string &line) {
     results.push_back(it->str());
   }
   return results;
-}
+}
+
+bool startswith(const std::string &line, const std::string &has) {
+  return (line.substr(0, has.length()) == has);
+}

utils.h

@@ -12,5 +12,6 @@ void high_ascii(std::string &str);
 std::smatch ansi_newline(const std::string &str);
 std::string clean_string(const std::string &source);
 std::vector<std::string> split(const std::string &line);
-
+bool startswith(const std::string &line, const std::string &has);
+std::string repr(const std::string &source);
 #endif