1

server/robotserver/player.cc

@@ -1,9 +1,33 @@
 #include "precompile.h"
 
 #include <f8/coroutine.h>
+#include <a8/awaiter.h>
+#include <a8/promise.h>
+
+#include <f8/comgr.h>
 
 #include "player.h"
 
+class ConnectedPromise : public a8::Promise
+{
+protected:
+
+    virtual void DoAwait() override
+    {
+    }
+
+};
+
+class JoinSuccessPromise : public a8::Promise
+{
+protected:
+
+    virtual void DoAwait() override
+    {
+    }
+
+};
+
 void Player::Update()
 {
 
@@ -17,26 +41,21 @@ void Player::Init(int idx,
     account_id_ = account_id;
     session_id_ = session_id;
     web_socket_ = socket;
-}
+    f8::CoMgr::Instance()->CreateCo
-
+        (
-void Player::CoNet(f8::Coroutine* co)
+         [this] (f8::Coroutine* co)
-{
+         {
-    #if 0
+             CoLogin(co);
-    co->Await(CoLogin);
+         });
-    co->Await(CoGame);
-    #endif
 }
 
 void Player::CoLogin(f8::Coroutine* co)
 {
-    while (NetConnected()) {
+    auto a = struct{}{};
-
+    co->CoAwait(std::make_shared<ConnectedPromise>());
-    }
+    co->CoAwait(std::make_shared<JoinSuccessPromise>());
 }
 
 void Player::CoGame(f8::Coroutine* co)
 {
-    while (NetConnected()) {
-
-    }
 }

server/robotserver/player.h

@@ -34,10 +34,9 @@ public:
     int GetSocketId() { return socket_id_; }
     bool NetConnected() { return net_connected_; }
     const std::string& GetAccountId() { return account_id_; }
+    auto GetWebSocket() { return web_socket_; }
 
 private:
-
-    void CoNet(f8::Coroutine* co);
     void CoLogin(f8::Coroutine* co);
     void CoGame(f8::Coroutine* co);
 

server/robotserver/playermgr.cc

@@ -111,5 +111,4 @@ void PlayerMgr::CoCreatePlayer(f8::Coroutine* co,
     auto hum = std::make_shared<Player>();
     hum->Init(idx, account_id, session_id, socket);
     account_id_hash_[hum->GetAccountId()] = hum;
-    socket->Open();
 }

third_party/a8

@@ -1 +1 @@
-Subproject commit 91b5f74b3a08a51674e825a499beba668b5d23be
+Subproject commit 0d5c381b38618310d7b438a03c8942b14c0e0725

third_party/f8

@@ -1 +1 @@
-Subproject commit 1a93316b3852e72c999331172e293083bb059fdb
+Subproject commit 4384bc7ac05ef6bad5e1dfe94b7d4211b81930c0