SL: Server lines good. server_prompt good.

TradeWars Proxy Notes.md

@@ -2,8 +2,8 @@
 
 ## Things to Improve / Fix
 
-* Moving anywhere should be done in a safe manner.  (Single step and density scan.)
-* Any sectors with a high > 500 > 1000 density should be stored somewhere as "dangerous/of interest".  [How will we handle sectors that have our own fighters/planets in them then?]
+* Moving anywhere should be done in a safe manner.  (Single step and density scan -- unless we just don't have any scanner!)
+* Any sectors with a high > 500 > 1000 density should be stored somewhere as "dangerous/of interest".  [How will we handle sectors that have our own fighters/planets in them then?]  Possibly do density scanner, and save those results as well...
 * The dispatcher should use a stack (FILO).  We should be able to create something (SafeMove) and give it a sector number.  It will then be placed on the stack.  Once it is done, it will be able to return "something" to signal success/failure.  (Maybe have a selectable "callback" with the results?)   "Something" being struct { int value, std::string text }.
 * Dispatcher
   * will have "echo" value -- so we can hide things (if we want) from the client.  [Like loading ports and warps!]

session.cpp

@@ -8,7 +8,9 @@ session::session(boost::asio::ip::tcp::socket socket,
                  std::string port)
     : socket_(std::move(socket)),
       io_service_{io_service}, resolver_{io_service}, server_{io_service},
-      timer_{io_service}, host{hostname}, port{port} {}
+      timer_{io_service}, host{hostname}, port{port} {
+  server_sent = 0;
+}
 
 void session::start(void) {
   std::cout << "session" << std::endl;
@@ -42,7 +44,7 @@ void session::on_connect(const boost::system::error_code error) {
     connected = true;
     if (rlogin_auth[0] != 0) {
       // Ok, the rlogin information was junk --
-      do_write("Let me make up some rlogin for you...\n\r");
+      do_write("Let me make up some fake rlogin data for you...\n\r");
       char temp[] = "\0test\0test\0terminal/9600\0";
       std::string tmp(temp, sizeof(temp));
       server_write(tmp);
@@ -66,6 +68,44 @@ void session::on_connect(const boost::system::error_code error) {
   }
 }
 
+void session::dispatch_line(std::string line) {
+  // Does this have \n\r still on it?  I don't want them.
+  std::cout << "SL: " << line << std::endl;
+  // is echo on?  if so:
+}
+
+void session::process_lines(void) {
+  // break server_prompt into lines and send/process one by one.
+  size_t pos;
+  while ((pos = server_prompt.find("\n\r")) != std::string::npos) {
+    // line
+    std::string line = server_prompt.substr(0, pos + 2);
+    server_prompt = server_prompt.substr(pos + 2); 
+
+    // Remove \n\r for dispatching
+    std::string part = line.substr(0, pos);
+    if (server_sent != 0) {
+      line = line.substr(server_sent);
+      server_sent = 0;
+    };
+    // display on?
+    do_write(line);
+
+    dispatch_line(part);
+  }
+
+  // display on?
+  if (server_sent != 0) {
+      std::string part = server_prompt.substr(server_sent);
+      do_write(part);
+      server_sent = server_prompt.size();
+  } else {
+      do_write(server_prompt);
+      server_sent = server_prompt.size();
+  }
+
+  // server_sent is the # of chars we've already sent of this.
+}
 void session::server_read(void) {
   auto self(shared_from_this());
 
@@ -76,11 +116,17 @@ void session::server_read(void) {
         if (!ec) {
           server_buffer[length] = 0;
 
+          server_prompt.append(server_buffer, length);
+          process_lines();
+
+        /*
           if (length) {
             // std::cout << length << std::endl;
             std::cout << "S: " << server_buffer << std::endl;
             do_write(server_buffer);
           }
+          */
+
           server_read();
         } else {
           std::cout << "S: read_failed: connection closed" << std::endl;

session.h

@@ -25,6 +25,9 @@ public:
   void server_write(std::string message);
   void on_shutdown(boost::system::error_code ec);
 
+  void dispatch_line(std::string line);
+  void process_lines(void);
+
 private:
   boost::asio::ip::tcp::socket socket_;
   boost::asio::io_service &io_service_;
@@ -33,6 +36,9 @@ private:
   boost::asio::high_resolution_timer timer_;
 
   // std::string read_buffer;
+  std::string server_prompt;
+  int server_sent;
+
   char read_buffer[257];
   char server_buffer[257];