We're getting sector lines, WARPS, PORT class.

director.cpp

@@ -1,5 +1,7 @@
 #include "director.h"
+
 #include <boost/format.hpp>
+
 #include "boxes.h"
 #include "galaxy.h"
 #include "logging.h"
@@ -17,6 +19,15 @@ Director::Director() {
   talk_direct = true;
   show_client = true;
   count = 0;
+
+  /*
+  Setup StringFunc for SL_parser:
+  Construct these once, rather then every single time we need them.
+  */
+  SF_cimline = [this](const std::string &s) { this->SL_cimline(s); };
+  SF_sectorline = [this](const std::string &s) { this->SL_sectorline(s); };
+  SF_portline = [this](const std::string &s) { this->SL_portline(s); };
+  SF_warpline = [this](const std::string &s) { this->SL_warpline(s); };
 }
 
 Director::~Director() { BUGZ_LOG(warning) << "Director::~Director()"; }
@@ -71,20 +82,12 @@ void Director::client_input(const std::string &input) {
     // "Command [TL=00:00:00]:[242] (?=Help)? : "
     // the time, and the sector number vary...
 
-    if (prompt.substr(0, 9) == "Command [") {
-      int len = prompt.length();
-      if (prompt.substr(len - 14) == "] (?=Help)? : ") {
+    if (startswith(prompt, "Command [")) {
+      // if (prompt.substr(0, 9) == "Command [") {
+      //  int len = prompt.length();
+      if (endswith(prompt, "] (?=Help)? : ")) {
+        // if (prompt.substr(len - 14) == "] (?=Help)? : ") {
         proxy_activate();
-        /*
-        to_client("\n\r\x1b[1;34mWELCOME!  This is where the proxy would "
-                  "activate.\n\r");
-        // active = true;
-        // show_client = true;  // because if something comes (unexpected)
-        // from the server? talk_direct = false;
-
-        // but we aren't activating (NNY)
-        to_client(get_prompt());
-        */
         return;
       }
     }
@@ -96,14 +99,17 @@ void Director::client_input(const std::string &input) {
   if (emit_client_input)
     emit_client_input(line);
   */
-
 }
 
-void Director::server_line(const std::string &line, const std::string &raw_line) {
+void Director::server_line(const std::string &line,
+                           const std::string &raw_line) {
   // check for if we entered game/left game
 
   if (line.find("TradeWars Game Server   ") != std::string::npos) {
     to_client("\rTradeWars Proxy v2++ READY (~ or ESC to activate)\n\r");
+    if (game) {
+      // TODO:  Save galaxy data
+    }
     game = 0;
     // reset "active game" -- we're at the TWGS main menu
   }
@@ -113,13 +119,48 @@ void Director::server_line(const std::string &line, const std::string &raw_line)
     if (ch >= 'A' && ch < 'Q') {
       game = ch;
       BUGZ_LOG(warning) << "GAME " << game << " activated!";
+      // TODO:  Load game data
     }
     // not needed (handled by above Game Server check).
-    if (ch == 'Q') game = 0;
+    if (ch == 'Q') {
+      if (game) {
+        // TODO:  Save galaxy data
+      }
+      game = 0;
+    }
   }
 
   if (game) {
     // in-game parsing here.
+
+    /*
+      ____                             _     _
+     / ___|  ___ _ ____   _____ _ __  | |   (_)_ __   ___
+     \___ \ / _ \ '__\ \ / / _ \ '__| | |   | | '_ \ / _ \
+      ___) |  __/ |   \ V /  __/ |    | |___| | | | |  __/
+     |____/ \___|_|    \_/ \___|_|    |_____|_|_| |_|\___|
+
+      ____                _
+     |  _ \ __ _ _ __ ___(_)_ __   __ _
+     | |_) / _` | '__/ __| | '_ \ / _` |
+     |  __/ (_| | |  \__ \ | | | | (_| |
+     |_|   \__,_|_|  |___/_|_| |_|\__, |
+                                  |___/
+
+   This is where all of the server lines are gleaned for all the
+   information that we can get out of them.
+
+    */
+
+    if (startswith(line, " Items     Status  Trading % of max OnBoard"))
+      SL_parser = SF_portline;
+    if (startswith(line, "Sector  : ")) SL_parser = SF_sectorline;
+    if (line == ": ") SL_parser = SF_cimline;
+  }
+
+
+  if (SL_parser) {
+    SL_parser(line);
   }
 
   /*
@@ -136,6 +177,20 @@ void Director::server_prompt(const std::string &prompt,
                              const std::string &raw_prompt) {
   current_prompt = prompt;
   current_raw_prompt = raw_prompt;
+
+  if (game) {
+    // in-game parsing here.
+    if (startswith(prompt, "Command [") && endswith(prompt, "] (?=Help)? : ")) {
+      std::string sector_text;
+      size_t before, after;
+      before = prompt.find("]:[") + 3;
+      after = prompt.find("] (?=Help)");
+      sector_text = prompt.substr(before, after - before);
+      current_sector = stoi(sector_text);
+      BUGZ_LOG(fatal) << "Sector: " << sector_text;
+    }
+  }
+
   /*
   if (emit_server_prompt)
     emit_server_prompt(prompt);
@@ -144,8 +199,8 @@ void Director::server_prompt(const std::string &prompt,
 }
 
 void Director::proxy_activate(void) {
-  active = true;  // yes, set keep-alive timer.
-  to_server(" "); // start keep-alive timer.
+  active = true;   // yes, set keep-alive timer.
+  to_server(" ");  // start keep-alive timer.
 
   // set other values we need
   talk_direct = false;
@@ -177,40 +232,40 @@ void Director::proxy_activate(void) {
   std::shared_ptr<Dispatch> menu = std::make_shared<MenuDispatch>(*this);
   chain = menu;
   MenuDispatch *md = static_cast<MenuDispatch *>(&(*menu));
-      md->menu_box_color = "\x1b[1;33;44m";
-    md->menu_text_color = "\x1b[1;37;44m";
-    md->menu_title = "Proxy Menu";
-    md->menu_options_color = "\x1b[1;36;40m";
-
-       md->menu_prompt =
-        "\x1b[0;31;40m\xdb\xb2\xb1\xb0 \x1b[31;40mRED "
-        "\x1b[32;40mGREEN\x1b[30;42m\xdb\xb2\xb1\xb0 \x1b[0m : "; 
-      md->lazy = true;
-       md->menu = {{"A", "Apple"}, {"B", "Blue"}, {"R", "Rabbit"}, {"Z", "ZOOO!"}};
-    md->setNotify([this]() { this->menu_choice(); });
-    menu->activate();
-/*
-  // Using InputDispatch  -- and see have_input
-  std::shared_ptr<Dispatch> readline = std::make_shared<InputDispatch>(*this);
-  chain = readline;
-  InputDispatch *id = static_cast<InputDispatch *>(&(*readline));
-  id->prompt = "\x1b[0m    \x1b[1;33;44m-=>\x1b[0m \x1b[1;37;44m";
-  id->max_length = 15;
-  id->setNotify([this]() { this->have_input(); });
-  readline->activate();
-*/
-
+  md->menu_box_color = "\x1b[1;33;44m";
+  md->menu_text_color = "\x1b[1;37;44m";
+  md->menu_title = "Proxy Menu";
+  md->menu_options_color = "\x1b[1;36;40m";
+
+  md->menu_prompt =
+      "\x1b[0;31;40m\xdb\xb2\xb1\xb0 \x1b[31;40mRED "
+      "\x1b[32;40mGREEN\x1b[30;42m\xdb\xb2\xb1\xb0 \x1b[0m : ";
+  md->lazy = true;
+  md->menu = {{"A", "Apple"}, {"B", "Blue"}, {"R", "Rabbit"}, {"Z", "ZOOO!"}};
+  md->setNotify([this]() { this->menu_choice(); });
+  menu->activate();
+  /*
+    // Using InputDispatch  -- and see have_input
+    std::shared_ptr<Dispatch> readline = std::make_shared<InputDispatch>(*this);
+    chain = readline;
+    InputDispatch *id = static_cast<InputDispatch *>(&(*readline));
+    id->prompt = "\x1b[0m    \x1b[1;33;44m-=>\x1b[0m \x1b[1;37;44m";
+    id->max_length = 15;
+    id->setNotify([this]() { this->have_input(); });
+    readline->activate();
+  */
 }
 
 void Director::menu_choice(void) {
-  MenuDispatch * md = dynamic_cast<MenuDispatch *>(&(*chain));
+  MenuDispatch *md = dynamic_cast<MenuDispatch *>(&(*chain));
   if (md) {
     if (md->input.empty()) {
       to_client("Menu aborted.\n\r");
       proxy_deactivate();
       return;
     } else {
-      std::string text = str(boost::format( "Back from Menu [%1%] was selected.\n\r") % md->input);
+      std::string text = str(
+          boost::format("Back from Menu [%1%] was selected.\n\r") % md->input);
       to_client(text);
 
       md->activate();
@@ -242,15 +297,17 @@ void Director::proxy_deactivate(void) {
   // reset everything back to good state
   talk_direct = true;
   show_client = true;
-  /*
-  current_prompt = old_prompt;
-  current_raw_prompt = old_raw_prompt;
-  */
   chain.reset();
   to_client("\n\r");
   to_client(current_raw_prompt);
 }
 
+/*
+
+Server Line Parsing Routines
+
+ */
+
 void Director::SL_cimline(const std::string &line) {
   if (line == ": ENDINTERROG") {
     SL_parser = nullptr;
@@ -258,6 +315,8 @@ void Director::SL_cimline(const std::string &line) {
   }
   if (line == ": ") {
     // do I need to do anything special here for this?
+    // Maybe -- We would save special ports that don't show up (StarDock/Special) before.
+    // We don't know (at this point) if this is warps or ports.
     return;
   }
   if (line.empty()) {
@@ -266,10 +325,11 @@ void Director::SL_cimline(const std::string &line) {
   }
 
   // parse cimline
-  size_t pos = line.find('%');
-  std::string work = line;
+  // size_t pos = line.find('%');
+  // std::string work = line;
 
-  if (pos == line.npos) {
+  // if (pos == line.npos) {
+  if (in(line, "%")) {
     // warpcim
     BUGZ_LOG(fatal) << "warpcim: [" << line << "]";
     auto warps = split(line);
@@ -287,7 +347,7 @@ void Director::SL_cimline(const std::string &line) {
     // portcim
     struct port p = parse_portcim(line);
     if (p.sector == 0)
-      BUGZ_LOG(fatal) << "portcim: [" << line << "]";
+      BUGZ_LOG(fatal) << "portcim:  FAIL [" << line << "]";
     else
       BUGZ_LOG(fatal) << "portcim: " << p;
   }
@@ -308,6 +368,47 @@ void Director::SL_thiefline(const std::string &line) {
 }
 void Director::SL_sectorline(const std::string &line) {
   BUGZ_LOG(fatal) << "sectorline: [" << line << "]";
+  if (line.empty()) {
+    SL_parser = nullptr;
+  } else {
+    /*
+    sectorline: [Sector  : 926 in The Federation.]
+    sectorline: [Beacon  : FedSpace, FedLaw Enforced]
+    sectorline: [Ports   : Stargate Alpha I, Class 9 (Special) (StarDock)]
+    sectorline: [Traders : Civilian phil, w/ 30 ftrs,]
+    sectorline: [           in Star Stomper (Sverdlov Merchant Cruiser)]
+    sectorline: [Warps to Sector(s) :  70 - 441 - 575 - 600 - 629 - 711]
+    sectorline: [Warps to Sector(s) :  70 - (475) - 569]
+    */
+   if (in(line, "Sector  :")) {
+     current_sector = stoi(line.substr(10));
+     BUGZ_LOG(warning) << "SECTOR: " << current_sector;
+   }
+   if (in(line, "Ports   :")) {
+     std::string port_class;
+     size_t pos = line.find(", Class ");
+     if (pos != std::string::npos) {
+       pos += 8;
+       int class_ = stoi(line.substr(pos));
+       BUGZ_LOG(fatal) << "PORT: " << class_;
+     }
+   }
+   if (in(line, "Warps to Sector(s) :")) {
+     std::string temp = line.substr( 20 );
+     replace(temp, " - ", " ");
+     // unexplored sectors ()
+     // Should I track these?
+     replace(temp, "(", "");
+     replace(temp, ")", "");
+     sector_warps sw;
+     auto warps = split(temp);
+     sw.sector = current_sector;
+     for( auto const &w : warps) {
+       sw.add(stoi(w));
+     }
+     BUGZ_LOG(fatal) << "WARPS: " << sw;
+   }
+  }
 }
 
 void Director::SL_portline(const std::string &line) {
@@ -316,12 +417,18 @@ void Director::SL_portline(const std::string &line) {
     return;
   }
   BUGZ_LOG(info) << "portline : " << line;
-  size_t pos = line.find('%');
-  if (pos != line.npos) {
+  if (in(line, "%")) {
+  // size_t pos = line.find('%');
+  // if (pos != line.npos) {
     // Ok, this is a valid portline
     std::string work = line;
     replace(work, "Fuel Ore", "Fuel");
-    BUGZ_LOG(fatal) << "re.split? : [" << work << "]";
+    auto parts = split(work);
+    BUGZ_LOG(fatal) << "portline split:";
+    for( auto const p : parts) {
+      BUGZ_LOG(fatal) << p;
+    }
+    // BUGZ_LOG(fatal) << "portline split : [" << parts << "]";
   }
 }
 

director.h

@@ -10,8 +10,8 @@ class Director {
   StringFunc to_client;
   StringFunc to_server;
   // void Session::post(notifyFunc nf)
-  std::function <void(notifyFunc)> post;
-  
+  std::function<void(notifyFunc)> post;
+
   void client_input(const std::string &input);
   void server_line(const std::string &line, const std::string &raw_line);
   void server_prompt(const std::string &prompt, const std::string &raw_prompt);
@@ -46,8 +46,12 @@ class Director {
   void menu_choice(void);
   int count;
 
+  int current_sector;
+  
  private:
   StringFunc SL_parser;
+  StringFunc SF_cimline, SF_sectorline, SF_portline, SF_warpline;
+
   void SL_cimline(const std::string &line);
   void SL_thiefline(const std::string &line);
   void SL_sectorline(const std::string &line);

session.cpp

@@ -39,7 +39,7 @@ Session::Session(boost::asio::ip::tcp::socket socket,
   director.to_server = boost::bind(&Session::to_server, this, _1);
   director.to_client = boost::bind(&Session::to_client, this, _1);
   director.post = boost::bind(&Session::post, this, _1);
-  
+
   // replace emit_ with below:  if (director.server_line)
   // director.server_line(s);
   /*
@@ -137,7 +137,8 @@ void Session::on_connect(const boost::system::error_code error) {
  * See \ref split_lines()
  * @param line
  */
-void Session::on_server_line(const std::string &line, const std::string &raw_line) {
+void Session::on_server_line(const std::string &line,
+                             const std::string &raw_line) {
   BUGZ_LOG(info) << "SL: [" << line << "]";
   director.server_line(line, raw_line);
 
@@ -384,7 +385,8 @@ void Session::reset_prompt_timer(void) { prompt_timer_.cancel(); }
 // probably no longer needed --
 void Session::on_server_prompt(const std::string &prompt,
                                const std::string &raw_prompt) {
-  BUGZ_LOG(warning) << "SP: [" << prompt << "]";
+  std::string temp = repr(prompt);
+  BUGZ_LOG(warning) << "SP: [" << temp << "]";
   director.server_prompt(prompt, raw_prompt);
 }
 
@@ -396,7 +398,7 @@ void Session::on_prompt_timeout(const boost::system::error_code error) {
       // SP: [ESC[2JESC[H]
       // which after clean_string is empty.
 
-      std::string clean = server_prompt; // 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);
@@ -414,7 +416,7 @@ void Session::server_read(void) {
       boost::asio::transfer_at_least(1),
       [this, self](boost::system::error_code ec, std::size_t length) {
         if (!ec) {
-          server_buffer[length] = 0;
+          // server_buffer[length] = 0;
 
           // server_prompt.append(server_buffer, length);
           std::string received(server_buffer, length);
@@ -469,7 +471,8 @@ void Session::on_resolve(
 }
 
 void Session::client_input(const std::string &input) {
-  BUGZ_LOG(info) << "CI: " << input;
+  std::string temp = repr(input);
+  BUGZ_LOG(info) << "CI: [" << temp << "]";
   director.client_input(input);
 
 #ifdef DECOUPLE
@@ -586,7 +589,7 @@ void Session::client_read(void) {
       boost::asio::transfer_at_least(1),
       [this, self](boost::system::error_code ec, std::size_t length) {
         if (!ec) {
-          read_buffer[length] = 0;
+          // read_buffer[length] = 0;
           if (rlogin_auth.empty()) {
             // first read should be rlogin information
             rlogin_auth.assign(read_buffer, length);
@@ -624,7 +627,7 @@ void Session::client_read(void) {
           }
           client_read();
         } else {
-          BUGZ_LOG(warning) << "CI: read_failed";
+          BUGZ_LOG(warning) << "CI: read_failed " << ec;
           if (connected) {
             BUGZ_LOG(warning) << "Server.shutdown()";
             server_.shutdown(boost::asio::ip::tcp::socket::shutdown_both);
@@ -646,7 +649,8 @@ void Session::to_client(const std::string &message) {
       [this, self](boost::system::error_code ec, std::size_t /*length*/) {
         if (!ec) {
         } else {
-          BUGZ_LOG(warning) << "2C: write failed? closed? Server.shutdown()";
+          BUGZ_LOG(warning)
+              << "2C: write failed? closed? Server.shutdown()" << ec;
           if (connected) {
             BUGZ_LOG(warning) << "Server.shutdown()";
             server_.shutdown(boost::asio::ip::tcp::socket::shutdown_both);
@@ -663,7 +667,8 @@ void Session::to_server(const std::string &message) {
       [this, self](boost::system::error_code ec, std::size_t /*length*/) {
         if (!ec) {
         } else {
-          BUGZ_LOG(warning) << "S: write failed? closed? socket.shutdown()";
+          BUGZ_LOG(warning)
+              << "S: write failed? closed? socket.shutdown() " << ec;
           // we're no longer connected.
           connected = false;
           socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both);

session.h

@@ -151,12 +151,11 @@ class Session : public std::enable_shared_from_this<Session> {
    * This is too big, we don't get that many characters from the client.
    *
    */
-  char read_buffer[MAX_BUFFER + 1];
+  char read_buffer[MAX_BUFFER];
   /**
    * The server read buffer.
-   * This is MAX_BUFFER + 1 (to store the \0 to terminate the string)
    */
-  char server_buffer[MAX_BUFFER + 1];
+  char server_buffer[MAX_BUFFER];
 
   /**
    * The rlogin information received from the client.

utils.cpp

@@ -50,19 +50,19 @@ std::string repr(const std::string &source) {
   replace(output, "\n", "\\n");
   replace(output, "\r", "\\r");
   replace(output, "\b", "\\b");
-  replace(output, "\x1b", "\\[");  
+  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", "\\n");
+    replace(clean, "\r", "\\r");
+    replace(clean, "\b", "\\b");
+    replace(clean, "\x1b", "\\[");
+  */
   replace(clean, "\n", "");
   replace(clean, "\r", "");
 
@@ -87,6 +87,28 @@ std::vector<std::string> split(const std::string &line) {
   return results;
 }
 
+std::vector<std::string> split(const std::string &line, const std::string &by) {
+  std::string work = line;
+  std::vector<std::string> results;
+  size_t pos;
+  while ( (pos = work.find(by) ) != std::string::npos ) {
+    results.push_back(work.substr(0, pos));
+    work.erase(0, pos + by.length());
+  }
+  if (!work.empty())
+    results.push_back(work);
+  return results;
+}
+
+bool in(const std::string &line, const std::string &has) {
+  return (line.find(has) != std::string::npos);
+}
+
 bool startswith(const std::string &line, const std::string &has) {
   return (line.substr(0, has.length()) == has);
 }
+
+bool endswith(const std::string &line, const std::string &has) {
+  if (line.length() < has.length()) return false;
+  return (line.substr(line.length() - has.length()) == has);
+}

utils.h

@@ -12,6 +12,9 @@ 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);
+std::vector<std::string> split(const std::string &line, const std::string &by);
 bool startswith(const std::string &line, const std::string &has);
+bool endswith(const std::string &line, const std::string &has);
+bool in(const std::string &line, const std::string &has);
 std::string repr(const std::string &source);
 #endif