Paths

Table of Contentst

-
native/cpp/CommonCpp/_generated/
-
cpp/
-
CommonCpp/
-
_generated/
-
CMakeLists.txt
-
NativeModules.h
-
NativeModules.cpp

[services] Export generated code as CMake Project
AbandonedPublic
Actions

Authored by • jon on Jun 19 2022, 3:55 PM.

Details

Reviewers

• max
• karol
ashoat
atul
varun

Summary

Export the generated react-native NativeModules
as a CMake Project.

Generating the related files through CMake is a bit more involved,
so just present the generated files with a pretty bow.

Depends on D4301

Test Plan

nix develop && cd native/cpp/ && mkdir build && cd build && cmake .. && make

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

• jon created this revision.Jun 19 2022, 3:55 PM

Herald added subscribers: • abosh, atul, • adrian and 2 others. · View Herald TranscriptJun 19 2022, 3:55 PM

Harbormaster returned this revision to the author for changes because remote builds failed.Jun 19 2022, 4:06 PM

Harbormaster failed remote builds in B9821: Diff 13585!

• jon added a child revision: D4304: [services] Attempt new header layout.Jun 20 2022, 8:25 AM

Apply new header scheme

Harbormaster returned this revision to the author for changes because remote builds failed.Jun 22 2022, 8:34 PM

Harbormaster failed remote builds in B9911: Diff 13703!

Update with protobuf changes

Harbormaster returned this revision to the author for changes because remote builds failed.Jul 3 2022, 9:25 AM

Harbormaster failed remote builds in B10231: Diff 14118!

• jon added a child revision: D4432: [nix] Add fbjni.Jul 3 2022, 10:39 AM

• jon added a child revision: D4447: Update modules build after changes to master.Jul 5 2022, 11:56 AM

Lint

• jon published this revision for review.Jul 7 2022, 3:38 PM

• jon added reviewers: ashoat, atul, varun.

Harbormaster failed remote builds in B10393: Diff 14303!Jul 7 2022, 3:47 PM

Resigning since I'm usually not a good person to set as a first-pass reviewer. Exceptions here

Not able to test this locally because I can't get nix to work at the moment, but it looks right to me.

Some of these CMakeLists.txt files assume that dependencies like gRPC and OpenSSL and whatever are available on the machine and can be found. This seems like a reasonable assumption when everything is under Nix, but could we include calls to FetchContent (https://cmake.org/cmake/help/latest/module/FetchContent.html) to fetch the dependencies in case they aren't on the machine to keep things more portable?

native/cpp/CommonCpp/_generated/CMakeLists.txt
18 ↗	(On Diff #14303)	Can we add a little more detail here before landing?

This revision is now accepted and ready to land.Jul 14 2022, 8:59 PM

Some of these CMakeLists.txt files assume that dependencies like gRPC and OpenSSL and whatever are available on the machine and can be found. This seems like a reasonable assumption when everything is under Nix, but could we include calls to FetchContent (https://cmake.org/cmake/help/latest/module/FetchContent.html) to fetch the dependencies in case they aren't on the machine to keep things more portable?

Yea, that doesn't seem too unreasonable. But there is a long term maintenance burden with doing this, as there's a need to maintain two configuration which may be out-of-sync. However, falling back to pulling from a repo doesn't seem too bad. I can create a task to do so.

• jon added inline comments.Jul 14 2022, 10:06 PM

native/cpp/CommonCpp/_generated/CMakeLists.txt
18 ↗	(On Diff #14303)	yea, I can expand

ashoat requested changes to this revision.Jul 15 2022, 1:01 PM

ashoat added inline comments.

native/cpp/CommonCpp/_generated/CMakeLists.txt
26 ↗	(On Diff #14303)	Line longer than 80 chars. See comment here and *please* prioritize resolving this with a CMake linter so I never have to leave a comment like this again

This revision now requires changes to proceed.Jul 15 2022, 1:01 PM

D4494 was the spiritual successor to this

• jon removed a parent revision: D4301: Add top-level cpp CMake Project.Aug 12 2022, 4:22 PM

Revision Contents
Changeset List

Path

Size

native/

cpp/

CommonCpp/

_generated/

CMakeLists.txt

43 lines

NativeModules.h

NativeModules.cpp

Diff 14118

View Options

native/cpp/CommonCpp/_generated/CMakeLists.txt

Show First 20 Lines • Show All 1,529 Lines • ▼ Show 20 Lines	throw std::system_error(
std::generic_category(),		std::generic_category(),
"Multiple records found for the olm_persist_account table");		"Multiple records found for the olm_persist_account table");
}		}
return (result.size() == 0)		return (result.size() == 0)
? std::nullopt		? std::nullopt
: std::optional<std::string>(result[0].account_data);		: std::optional<std::string>(result[0].account_data);
}		}

void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {		void SQLiteQueryExecutor::storeOlmPersistAccount(
		const std::string &accountData) const {
static std::string replaceOlmPersistAccountSQL =		static std::string replaceOlmPersistAccountSQL =
"REPLACE INTO olm_persist_account (id, account_data) "		"REPLACE INTO olm_persist_account (id, account_data) "
"VALUES (?, ?);";		"VALUES (?, ?);";
static std::string replaceOlmPersistSessionSQL =
"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
"VALUES (?, ?);";

OlmPersistAccount persistAccount = {		OlmPersistAccount persistAccount = {ACCOUNT_ID, accountData};
ACCOUNT_ID, std::string(persist.account.begin(), persist.account.end())};
replaceEntity<OlmPersistAccount>(		replaceEntity<OlmPersistAccount>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistAccountSQL,		replaceOlmPersistAccountSQL,
persistAccount);		persistAccount);
		}

		void SQLiteQueryExecutor::storeOlmPersistSession(
		const OlmPersistSession &session) const {
		static std::string replaceOlmPersistSessionSQL =
		"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
		"VALUES (?, ?);";

for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
OlmPersistSession persistSession = {
it->first, std::string(it->second.begin(), it->second.end())};
replaceEntity<OlmPersistSession>(		replaceEntity<OlmPersistSession>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistSessionSQL,		replaceOlmPersistSessionSQL,
persistSession);		session);
		}

		void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {
		std::string accountData =
		std::string(persist.account.begin(), persist.account.end());

		for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
		OlmPersistSession persistSession = {
		it->first, std::string(it->second.begin(), it->second.end())};
		this->storeOlmPersistSession(persistSession);
}		}
}		}

void SQLiteQueryExecutor::setNotifyToken(std::string token) const {		void SQLiteQueryExecutor::setNotifyToken(std::string token) const {
this->setMetadata("notify_token", token);		this->setMetadata("notify_token", token);
}		}

void SQLiteQueryExecutor::clearNotifyToken() const {		void SQLiteQueryExecutor::clearNotifyToken() const {
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	for (const auto &thread : threads) {
webThreads.emplace_back(thread);		webThreads.emplace_back(thread);
}		}
return webThreads;		return webThreads;
};		};

void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {		void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {
this->replaceThread(thread.toThread());		this->replaceThread(thread.toThread());
};		};

		std::vector<MessageWithMedias> SQLiteQueryExecutor::getAllMessagesWeb() const {
		auto allMessages = this->getAllMessages();

		std::vector<MessageWithMedias> allMessageWithMedias;
		for (auto &messageWitMedia : allMessages) {
		allMessageWithMedias.push_back(
		{std::move(messageWitMedia.first), messageWitMedia.second});
		}

		return allMessageWithMedias;
		}

		void SQLiteQueryExecutor::replaceMessageWeb(const WebMessage &message) const {
		this->replaceMessage(message.toMessage());
		};

		NullableString SQLiteQueryExecutor::getOlmPersistAccountDataWeb() const {
		std::optional<std::string> accountData = this->getOlmPersistAccountData();
		if (!accountData.has_value()) {
		return NullableString();
		}
		return std::make_unique<std::string>(accountData.value());
		}
#else		#else
void SQLiteQueryExecutor::clearSensitiveData() {		void SQLiteQueryExecutor::clearSensitiveData() {
SQLiteQueryExecutor::closeConnection();		SQLiteQueryExecutor::closeConnection();
if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&		if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&
std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {		std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {
std::ostringstream errorStream;		std::ostringstream errorStream;
errorStream << "Failed to delete database file. Details: "		errorStream << "Failed to delete database file. Details: "
<< strerror(errno);		<< strerror(errno);
▲ Show 20 Lines • Show All 215 Lines • Show Last 20 Lines

View Options

native/cpp/CommonCpp/_generated/NativeModules.h

Show First 20 Lines • Show All 1,529 Lines • ▼ Show 20 Lines	throw std::system_error(
std::generic_category(),		std::generic_category(),
"Multiple records found for the olm_persist_account table");		"Multiple records found for the olm_persist_account table");
}		}
return (result.size() == 0)		return (result.size() == 0)
? std::nullopt		? std::nullopt
: std::optional<std::string>(result[0].account_data);		: std::optional<std::string>(result[0].account_data);
}		}

void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {		void SQLiteQueryExecutor::storeOlmPersistAccount(
		const std::string &accountData) const {
static std::string replaceOlmPersistAccountSQL =		static std::string replaceOlmPersistAccountSQL =
"REPLACE INTO olm_persist_account (id, account_data) "		"REPLACE INTO olm_persist_account (id, account_data) "
"VALUES (?, ?);";		"VALUES (?, ?);";
static std::string replaceOlmPersistSessionSQL =
"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
"VALUES (?, ?);";

OlmPersistAccount persistAccount = {		OlmPersistAccount persistAccount = {ACCOUNT_ID, accountData};
ACCOUNT_ID, std::string(persist.account.begin(), persist.account.end())};
replaceEntity<OlmPersistAccount>(		replaceEntity<OlmPersistAccount>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistAccountSQL,		replaceOlmPersistAccountSQL,
persistAccount);		persistAccount);
		}

		void SQLiteQueryExecutor::storeOlmPersistSession(
		const OlmPersistSession &session) const {
		static std::string replaceOlmPersistSessionSQL =
		"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
		"VALUES (?, ?);";

for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
OlmPersistSession persistSession = {
it->first, std::string(it->second.begin(), it->second.end())};
replaceEntity<OlmPersistSession>(		replaceEntity<OlmPersistSession>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistSessionSQL,		replaceOlmPersistSessionSQL,
persistSession);		session);
		}

		void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {
		std::string accountData =
		std::string(persist.account.begin(), persist.account.end());

		for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
		OlmPersistSession persistSession = {
		it->first, std::string(it->second.begin(), it->second.end())};
		this->storeOlmPersistSession(persistSession);
}		}
}		}

void SQLiteQueryExecutor::setNotifyToken(std::string token) const {		void SQLiteQueryExecutor::setNotifyToken(std::string token) const {
this->setMetadata("notify_token", token);		this->setMetadata("notify_token", token);
}		}

void SQLiteQueryExecutor::clearNotifyToken() const {		void SQLiteQueryExecutor::clearNotifyToken() const {
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	for (const auto &thread : threads) {
webThreads.emplace_back(thread);		webThreads.emplace_back(thread);
}		}
return webThreads;		return webThreads;
};		};

void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {		void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {
this->replaceThread(thread.toThread());		this->replaceThread(thread.toThread());
};		};

		std::vector<MessageWithMedias> SQLiteQueryExecutor::getAllMessagesWeb() const {
		auto allMessages = this->getAllMessages();

		std::vector<MessageWithMedias> allMessageWithMedias;
		for (auto &messageWitMedia : allMessages) {
		allMessageWithMedias.push_back(
		{std::move(messageWitMedia.first), messageWitMedia.second});
		}

		return allMessageWithMedias;
		}

		void SQLiteQueryExecutor::replaceMessageWeb(const WebMessage &message) const {
		this->replaceMessage(message.toMessage());
		};

		NullableString SQLiteQueryExecutor::getOlmPersistAccountDataWeb() const {
		std::optional<std::string> accountData = this->getOlmPersistAccountData();
		if (!accountData.has_value()) {
		return NullableString();
		}
		return std::make_unique<std::string>(accountData.value());
		}
#else		#else
void SQLiteQueryExecutor::clearSensitiveData() {		void SQLiteQueryExecutor::clearSensitiveData() {
SQLiteQueryExecutor::closeConnection();		SQLiteQueryExecutor::closeConnection();
if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&		if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&
std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {		std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {
std::ostringstream errorStream;		std::ostringstream errorStream;
errorStream << "Failed to delete database file. Details: "		errorStream << "Failed to delete database file. Details: "
<< strerror(errno);		<< strerror(errno);
▲ Show 20 Lines • Show All 215 Lines • Show Last 20 Lines

View Options

native/cpp/CommonCpp/_generated/NativeModules.cpp

Show First 20 Lines • Show All 1,529 Lines • ▼ Show 20 Lines	throw std::system_error(
std::generic_category(),		std::generic_category(),
"Multiple records found for the olm_persist_account table");		"Multiple records found for the olm_persist_account table");
}		}
return (result.size() == 0)		return (result.size() == 0)
? std::nullopt		? std::nullopt
: std::optional<std::string>(result[0].account_data);		: std::optional<std::string>(result[0].account_data);
}		}

void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {		void SQLiteQueryExecutor::storeOlmPersistAccount(
		const std::string &accountData) const {
static std::string replaceOlmPersistAccountSQL =		static std::string replaceOlmPersistAccountSQL =
"REPLACE INTO olm_persist_account (id, account_data) "		"REPLACE INTO olm_persist_account (id, account_data) "
"VALUES (?, ?);";		"VALUES (?, ?);";
static std::string replaceOlmPersistSessionSQL =
"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
"VALUES (?, ?);";

OlmPersistAccount persistAccount = {		OlmPersistAccount persistAccount = {ACCOUNT_ID, accountData};
ACCOUNT_ID, std::string(persist.account.begin(), persist.account.end())};
replaceEntity<OlmPersistAccount>(		replaceEntity<OlmPersistAccount>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistAccountSQL,		replaceOlmPersistAccountSQL,
persistAccount);		persistAccount);
		}

		void SQLiteQueryExecutor::storeOlmPersistSession(
		const OlmPersistSession &session) const {
		static std::string replaceOlmPersistSessionSQL =
		"REPLACE INTO olm_persist_sessions (target_user_id, session_data) "
		"VALUES (?, ?);";

for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
OlmPersistSession persistSession = {
it->first, std::string(it->second.begin(), it->second.end())};
replaceEntity<OlmPersistSession>(		replaceEntity<OlmPersistSession>(
SQLiteQueryExecutor::getConnection(),		SQLiteQueryExecutor::getConnection(),
replaceOlmPersistSessionSQL,		replaceOlmPersistSessionSQL,
persistSession);		session);
		}

		void SQLiteQueryExecutor::storeOlmPersistData(crypto::Persist persist) const {
		std::string accountData =
		std::string(persist.account.begin(), persist.account.end());

		for (auto it = persist.sessions.begin(); it != persist.sessions.end(); it++) {
		OlmPersistSession persistSession = {
		it->first, std::string(it->second.begin(), it->second.end())};
		this->storeOlmPersistSession(persistSession);
}		}
}		}

void SQLiteQueryExecutor::setNotifyToken(std::string token) const {		void SQLiteQueryExecutor::setNotifyToken(std::string token) const {
this->setMetadata("notify_token", token);		this->setMetadata("notify_token", token);
}		}

void SQLiteQueryExecutor::clearNotifyToken() const {		void SQLiteQueryExecutor::clearNotifyToken() const {
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Lines	for (const auto &thread : threads) {
webThreads.emplace_back(thread);		webThreads.emplace_back(thread);
}		}
return webThreads;		return webThreads;
};		};

void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {		void SQLiteQueryExecutor::replaceThreadWeb(const WebThread &thread) const {
this->replaceThread(thread.toThread());		this->replaceThread(thread.toThread());
};		};

		std::vector<MessageWithMedias> SQLiteQueryExecutor::getAllMessagesWeb() const {
		auto allMessages = this->getAllMessages();

		std::vector<MessageWithMedias> allMessageWithMedias;
		for (auto &messageWitMedia : allMessages) {
		allMessageWithMedias.push_back(
		{std::move(messageWitMedia.first), messageWitMedia.second});
		}

		return allMessageWithMedias;
		}

		void SQLiteQueryExecutor::replaceMessageWeb(const WebMessage &message) const {
		this->replaceMessage(message.toMessage());
		};

		NullableString SQLiteQueryExecutor::getOlmPersistAccountDataWeb() const {
		std::optional<std::string> accountData = this->getOlmPersistAccountData();
		if (!accountData.has_value()) {
		return NullableString();
		}
		return std::make_unique<std::string>(accountData.value());
		}
#else		#else
void SQLiteQueryExecutor::clearSensitiveData() {		void SQLiteQueryExecutor::clearSensitiveData() {
SQLiteQueryExecutor::closeConnection();		SQLiteQueryExecutor::closeConnection();
if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&		if (file_exists(SQLiteQueryExecutor::sqliteFilePath) &&
std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {		std::remove(SQLiteQueryExecutor::sqliteFilePath.c_str())) {
std::ostringstream errorStream;		std::ostringstream errorStream;
errorStream << "Failed to delete database file. Details: "		errorStream << "Failed to delete database file. Details: "
<< strerror(errno);		<< strerror(errno);
▲ Show 20 Lines • Show All 215 Lines • Show Last 20 Lines

[services] Export generated code as CMake ProjectAbandonedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 14118

native/cpp/CommonCpp/_generated/CMakeLists.txt

native/cpp/CommonCpp/_generated/NativeModules.h

native/cpp/CommonCpp/_generated/NativeModules.cpp

[services] Export generated code as CMake Project
AbandonedPublic
Actions

Revision Contents
Changeset List