Asynchronous Inbox + asynchronous house saving

src/CMakeLists.txt

@@ -28,6 +28,7 @@ set(tfs_SRC
 	${CMAKE_CURRENT_LIST_DIR}/housetile.cpp
 	${CMAKE_CURRENT_LIST_DIR}/inbox.cpp
 	${CMAKE_CURRENT_LIST_DIR}/iologindata.cpp
+	${CMAKE_CURRENT_LIST_DIR}/ioinbox.cpp
 	${CMAKE_CURRENT_LIST_DIR}/iomap.cpp
 	${CMAKE_CURRENT_LIST_DIR}/iomapserialize.cpp
 	${CMAKE_CURRENT_LIST_DIR}/iomarket.cpp
@@ -111,6 +112,7 @@ set(tfs_HDR
 	${CMAKE_CURRENT_LIST_DIR}/housetile.h
 	${CMAKE_CURRENT_LIST_DIR}/inbox.h
 	${CMAKE_CURRENT_LIST_DIR}/iologindata.h
+	${CMAKE_CURRENT_LIST_DIR}/ioinbox.h
 	${CMAKE_CURRENT_LIST_DIR}/iomap.h
 	${CMAKE_CURRENT_LIST_DIR}/iomapserialize.h
 	${CMAKE_CURRENT_LIST_DIR}/iomarket.h

src/container.cpp

@@ -682,13 +682,22 @@ void Container::postRemoveNotification(Thing* thing, const Cylinder* newParent,
 
 void Container::internalAddThing(Thing* thing) { internalAddThing(0, thing); }
 
-void Container::internalAddThing(uint32_t, Thing* thing)
+void Container::internalAddThing(uint32_t index, Thing* thing)
 {
 	Item* item = thing->getItem();
 	if (!item) {
 		return;
 	}
 
+	if (index == 0 || itemlist.empty()) {
+		itemlist.push_front(item);
+	} else {
+		size_t pos = std::min<size_t>(std::max<size_t>(0, itemlist.size() - 1), index);
+		auto it = itemlist.begin();
+		std::advance(it, pos);
+		itemlist.insert(it, item);
+	}
+
 	item->setParent(this);
 	itemlist.push_front(item);
 	updateItemWeight(item->getWeight());

src/database.cpp

@@ -213,14 +213,17 @@ bool DBResult::next()
 	return row;
 }
 
-DBInsert::DBInsert(std::string query) : query(std::move(query)) { this->length = this->query.length(); }
+DBInsert::DBInsert(std::string query, Database& db) : query(std::move(query)), db(db)
+{
+	this->length = this->query.length();
+}
 
 bool DBInsert::addRow(const std::string& row)
 {
 	// adds new row to buffer
 	const size_t rowLength = row.length();
 	length += rowLength;
-	if (length > Database::getInstance().getMaxPacketSize() && !execute()) {
+	if (length > db.getMaxPacketSize() && !execute()) {
 		return false;
 	}
 
@@ -253,7 +256,7 @@ bool DBInsert::execute()
 	}
 
 	// executes buffer
-	bool res = Database::getInstance().executeQuery(query + values);
+	bool res = db.executeQuery(query + values);
 	values.clear();
 	length = query.length();
 	return res;

src/database.h

@@ -162,26 +162,27 @@ class DBResult
 class DBInsert
 {
 public:
-	explicit DBInsert(std::string query);
+	explicit DBInsert(std::string query, Database& db = Database::getInstance());
 	bool addRow(const std::string& row);
 	bool addRow(std::ostringstream& row);
 	bool execute();
 
 private:
 	std::string query;
+	Database& db;
 	std::string values;
 	size_t length;
 };
 
 class DBTransaction
 {
 public:
-	constexpr DBTransaction() = default;
+	constexpr DBTransaction(Database& db = Database::getInstance()) : db(db){};
 
 	~DBTransaction()
 	{
 		if (state == STATE_START) {
-			Database::getInstance().rollback();
+			db.rollback();
 		}
 	}
 
@@ -192,7 +193,7 @@ class DBTransaction
 	bool begin()
 	{
 		state = STATE_START;
-		return Database::getInstance().beginTransaction();
+		return db.beginTransaction();
 	}
 
 	bool commit()
@@ -202,10 +203,11 @@ class DBTransaction
 		}
 
 		state = STATE_COMMIT;
-		return Database::getInstance().commit();
+		return db.commit();
 	}
 
 private:
+	Database& db;
 	enum TransactionStates_t
 	{
 		STATE_NO_START,

src/game.cpp

@@ -16,6 +16,7 @@
 #include "globalevent.h"
 #include "housetile.h"
 #include "inbox.h"
+#include "ioinbox.h"
 #include "iologindata.h"
 #include "iomarket.h"
 #include "items.h"
@@ -127,10 +128,13 @@ void Game::setGameState(GameState_t newState)
 
 			saveGameState();
 
+			g_dispatcherInbox.addTask([]() { IOInbox::getInstance().flushDeliverItems(); });
+
 			g_dispatcher.addTask([this]() { shutdown(); });
 
 			g_scheduler.stop();
 			g_databaseTasks.stop();
+			g_dispatcherInbox.stop();
 			g_dispatcher.stop();
 			break;
 		}
@@ -5695,7 +5699,10 @@ void Game::parsePlayerNetworkMessage(uint32_t playerId, uint8_t recvByte, Networ
 std::vector<Item*> Game::getMarketItemList(uint16_t wareId, uint16_t sufficientCount, const Player& player)
 {
 	uint16_t count = 0;
-	std::list<Container*> containers{player.getInbox()};
+	std::list<Container*> containers;
+	if (Inbox* inbox = player.getInbox()) {
+		containers.push_front(inbox);
+	}
 
 	for (const auto& chest : player.depotChests) {
 		if (!chest.second->empty()) {

src/house.cpp

@@ -10,6 +10,7 @@
 #include "game.h"
 #include "housetile.h"
 #include "inbox.h"
+#include "ioinbox.h"
 #include "iologindata.h"
 #include "pugicast.h"
 
@@ -230,9 +231,18 @@ bool House::transferToDepot(Player* player) const
 		}
 	}
 
-	for (Item* item : moveItemList) {
-		g_game.internalMoveItem(item->getParent(), player->getInbox(), INDEX_WHEREEVER, item, item->getItemCount(),
-		                        nullptr, FLAG_NOLIMIT);
+	if (!player->getInbox()) {
+		ItemBlockList itemList;
+		for (Item* item : moveItemList) {
+			itemList.emplace_back(0, item->clone());
+			g_game.internalRemoveItem(item);
+		}
+		IOInbox::getInstance().pushDeliveryItems(player->getGUID(), itemList);
+	} else {
+		for (Item* item : moveItemList) {
+			g_game.internalMoveItem(item->getParent(), player->getInbox(), INDEX_WHEREEVER, item, item->getItemCount(),
+			                        nullptr, FLAG_NOLIMIT);
+		}
 	}
 	return true;
 }