Page MenuHomePhabricator
Differential D7855

[web] Send platform details on websocket connection
ClosedPublic
Actions

Authored by michal on May 17 2023, 5:31 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 30, 5:09 AM
Unknown Object (File)
Mon, Mar 10, 9:27 AM
Unknown Object (File)
Mon, Mar 10, 9:27 AM
Unknown Object (File)
Mon, Mar 10, 9:24 AM
Unknown Object (File)
Mon, Mar 10, 9:02 AM
Unknown Object (File)
Feb 23 2025, 2:23 PM
Unknown Object (File)
Feb 23 2025, 2:23 PM
Unknown Object (File)
Feb 23 2025, 2:23 PM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
kamil
tomek
Commits
rCOMM62a1b350b2ca: [web] Send platform details on websocket connection
Summary

Now it makes sense to send it on websocket connection to update the server on the web app version.

Depends on D7854

Test Plan

Run production version of the web app so there's no hot reloading.

  • run the web app, check the db cookie table if it has no version
  • update registerConfig in app.react.js to contain platformDetails with the version
  • reload the web app, check if there's new version in the db

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

michal created this revision.May 17 2023, 5:31 AM
Herald added subscribers: atul, ashoat. · View Herald TranscriptMay 17 2023, 5:31 AM
Harbormaster completed remote builds in B19454: Diff 26619.May 17 2023, 5:49 AM
michal requested review of this revision.May 17 2023, 5:49 AM
michal added inline comments.May 17 2023, 10:43 AM
keyserver/src/socket/socket.js
469–478

This was added to update the platform of the desktop apps from web to macos/windows. It will be better handled by sending the platform details during web socket initialization.

tomek requested changes to this revision.May 19 2023, 1:32 AM
tomek added inline comments.
keyserver/src/socket/socket.js
469–478

Does it require adding some code instead of this one? Or just removing it and modifying the initialPlatformDetailsSent condition does the job?

This revision now requires changes to proceed.May 19 2023, 1:32 AM
michal requested review of this revision.May 19 2023, 3:40 AM
michal added inline comments.
keyserver/src/socket/socket.js
469–478

initialPlatformDetailsSent is enough (this is probably how I should have done this from the beginning).

The previous flow looked like this: client sends initialization -> server responds with request from platform details (if electron) -> client responds with platform details

Now every client will just include platform details in the initialization message.

tomek accepted this revision.May 19 2023, 5:41 AM
This revision is now accepted and ready to land.May 19 2023, 5:41 AM
michal added a child revision: D7903: [keyserver] Don't use web version when sending desktop notifs.May 22 2023, 5:26 AM
Closed by commit rCOMM62a1b350b2ca: [web] Send platform details on websocket connection (authored by Michal Gniadek <michal.gniadek@swmansion.com>). · Explain WhyMay 22 2023, 7:11 AM
This revision was automatically updated to reflect the committed changes.
Michal Gniadek <michal.gniadek@swmansion.com> added a commit: rCOMM62a1b350b2ca: [web] Send platform details on websocket connection.

Revision Contents
Changeset List

PathSize
keyserver/
src/
socket/
10 lines
lib/
socket/
4 lines

Diff 26619

View Options

keyserver/src/socket/socket.js

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
#ifndef EMSCRIPTEN #ifndef EMSCRIPTEN
NativeSQLiteConnectionManager SQLiteQueryExecutor::connectionManager; NativeSQLiteConnectionManager SQLiteQueryExecutor::connectionManager;
std::unordered_set<std::string> SQLiteQueryExecutor::backedUpTablesBlocklist = { std::unordered_set<std::string> SQLiteQueryExecutor::backedUpTablesBlocklist = {
"olm_persist_account", "olm_persist_account",
"olm_persist_sessions", "olm_persist_sessions",
"metadata", "metadata",
"outbound_p2p_messages", "outbound_p2p_messages",
"received_messages_to_device", "inbound_p2p_messages",
"integrity_store", "integrity_store",
"persist_storage", "persist_storage",
"keyservers", "keyservers",
}; };
#else #else
SQLiteConnectionManager SQLiteQueryExecutor::connectionManager; SQLiteConnectionManager SQLiteQueryExecutor::connectionManager;
#endif #endif
▲ Show 20 Lines • Show All 725 Lines • ▼ Show 20 Lines std::string query =
" original_message_id UNINDEXED," " original_message_id UNINDEXED,"
" message_id UNINDEXED," " message_id UNINDEXED,"
" processed_content," " processed_content,"
" tokenize = porter" " tokenize = porter"
");"; ");";
return create_table(db, query, "message_search"); return create_table(db, query, "message_search");
} }
bool recreate_inbound_p2p_messages_table(sqlite3 *db) {
std::string query =
"DROP TABLE IF EXISTS received_messages_to_device;"
"CREATE TABLE IF NOT EXISTS inbound_p2p_messages ("
" id INTEGER PRIMARY KEY,"
" message_id TEXT NOT NULL,"
" sender_device_id TEXT NOT NULL,"
" plaintext TEXT NOT NULL,"
" status TEXT NOT NULL,"
" sender_user_id TEXT NOT NULL"
");";
"CREATE INDEX IF NOT EXISTS outbound_p2p_messages_idx_id_timestamp"
" ON outbound_p2p_messages (device_id, timestamp);";
kamilAuthorUnsubmitted
Done
Inline Actions
");";
- "CREATE INDEX IF NOT EXISTS outbound_p2p_messages_idx_id_timestamp"
- " ON outbound_p2p_messages (device_id, timestamp);";
+
return create_table(db, query, "inbound_p2p_messages");
kamil:
return create_table(db, query, "inbound_p2p_messages");
}
bool create_schema(sqlite3 *db) { bool create_schema(sqlite3 *db) {
char *error; char *error;
int sidebarSourceTypeInt = static_cast<int>(MessageType::SIDEBAR_SOURCE); int sidebarSourceTypeInt = static_cast<int>(MessageType::SIDEBAR_SOURCE);
std::string sidebarSourceType = std::to_string(sidebarSourceTypeInt); std::string sidebarSourceType = std::to_string(sidebarSourceTypeInt);
auto query = auto query =
"CREATE TABLE IF NOT EXISTS drafts (" "CREATE TABLE IF NOT EXISTS drafts ("
" key TEXT UNIQUE PRIMARY KEY NOT NULL," " key TEXT UNIQUE PRIMARY KEY NOT NULL,"
" text TEXT NOT NULL" " text TEXT NOT NULL"
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Lines auto query =
" aux_user_info TEXT NOT NULL" " aux_user_info TEXT NOT NULL"
");" ");"
"CREATE TABLE IF NOT EXISTS thread_activity (" "CREATE TABLE IF NOT EXISTS thread_activity ("
" id TEXT UNIQUE PRIMARY KEY NOT NULL," " id TEXT UNIQUE PRIMARY KEY NOT NULL,"
" thread_activity_store_entry TEXT NOT NULL" " thread_activity_store_entry TEXT NOT NULL"
");" ");"
"CREATE TABLE IF NOT EXISTS received_messages_to_device (" "CREATE TABLE IF NOT EXISTS inbound_p2p_messages ("
" id INTEGER PRIMARY KEY," " id INTEGER PRIMARY KEY,"
" message_id TEXT NOT NULL," " message_id TEXT NOT NULL,"
" sender_device_id TEXT NOT NULL," " sender_device_id TEXT NOT NULL,"
" plaintext TEXT NOT NULL," " plaintext TEXT NOT NULL,"
" status TEXT NOT NULL" " status TEXT NOT NULL,"
" sender_user_id TEXT NOT NULL"
");" ");"
"CREATE TABLE IF NOT EXISTS entries (" "CREATE TABLE IF NOT EXISTS entries ("
" id TEXT UNIQUE PRIMARY KEY NOT NULL," " id TEXT UNIQUE PRIMARY KEY NOT NULL,"
" entry TEXT NOT NULL" " entry TEXT NOT NULL"
");" ");"
"CREATE TABLE IF NOT EXISTS message_store_local (" "CREATE TABLE IF NOT EXISTS message_store_local ("
▲ Show 20 Lines • Show All 264 Lines • ▼ Show 20 Linesstd::vector<std::pair<unsigned int, SQLiteMigration>> migrations{
{43, {create_thread_activity_table, true}}, {43, {create_thread_activity_table, true}},
{44, {create_received_messages_to_device, true}}, {44, {create_received_messages_to_device, true}},
{45, {recreate_outbound_p2p_messages_table, true}}, {45, {recreate_outbound_p2p_messages_table, true}},
{46, {create_entries_table, true}}, {46, {create_entries_table, true}},
{47, {create_message_store_local_table, true}}, {47, {create_message_store_local_table, true}},
{48, {create_messages_idx_target_message_type_time, true}}, {48, {create_messages_idx_target_message_type_time, true}},
{49, {add_supports_auto_retry_column_to_p2p_messages_table, true}}, {49, {add_supports_auto_retry_column_to_p2p_messages_table, true}},
{50, {create_message_search_table, true}}, {50, {create_message_search_table, true}},
{51, {update_messages_idx_target_message_type_time, true}}}}; {51, {update_messages_idx_target_message_type_time, true}},
{52, {recreate_inbound_p2p_messages_table, true}}}};
enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED }; enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED };
MigrationResult applyMigrationWithTransaction( MigrationResult applyMigrationWithTransaction(
sqlite3 *db, sqlite3 *db,
const MigrateFunction &migrate, const MigrateFunction &migrate,
int index) { int index) {
sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr); sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr);
▲ Show 20 Lines • Show All 1,385 Lines • ▼ Show 20 Linesstd::vector<std::string> SQLiteQueryExecutor::resetOutboundP2PMessagesForDevice(
sqlite3_step(preparedUpdateCiphertextSQL); sqlite3_step(preparedUpdateCiphertextSQL);
return messageIDs; return messageIDs;
} }
void SQLiteQueryExecutor::addInboundP2PMessage( void SQLiteQueryExecutor::addInboundP2PMessage(
InboundP2PMessage message) const { InboundP2PMessage message) const {
static std::string addMessage = static std::string addMessage =
"REPLACE INTO received_messages_to_device (" "REPLACE INTO inbound_p2p_messages ("
" message_id, sender_device_id, plaintext, status)" " message_id, sender_device_id, plaintext, status, sender_user_id)"
"VALUES (?, ?, ?, ?);"; "VALUES (?, ?, ?, ?, ?);";
replaceEntity<InboundP2PMessage>( replaceEntity<InboundP2PMessage>(
SQLiteQueryExecutor::getConnection(), addMessage, message); SQLiteQueryExecutor::getConnection(), addMessage, message);
} }
std::vector<InboundP2PMessage> std::vector<InboundP2PMessage>
SQLiteQueryExecutor::getAllInboundP2PMessage() const { SQLiteQueryExecutor::getAllInboundP2PMessage() const {
static std::string query = static std::string query =
"SELECT message_id, sender_device_id, plaintext, status " "SELECT message_id, sender_device_id, plaintext, status, sender_user_id "
"FROM received_messages_to_device;"; "FROM inbound_p2p_messages;";
return getAllEntities<InboundP2PMessage>( return getAllEntities<InboundP2PMessage>(
SQLiteQueryExecutor::getConnection(), query); SQLiteQueryExecutor::getConnection(), query);
} }
void SQLiteQueryExecutor::removeInboundP2PMessages( void SQLiteQueryExecutor::removeInboundP2PMessages(
const std::vector<std::string> &ids) const { const std::vector<std::string> &ids) const {
if (!ids.size()) { if (!ids.size()) {
return; return;
} }
std::stringstream removeMessagesSQLStream; std::stringstream removeMessagesSQLStream;
removeMessagesSQLStream << "DELETE FROM received_messages_to_device " removeMessagesSQLStream << "DELETE FROM inbound_p2p_messages "
"WHERE message_id IN " "WHERE message_id IN "
<< getSQLStatementArray(ids.size()) << ";"; << getSQLStatementArray(ids.size()) << ";";
removeEntitiesByKeys( removeEntitiesByKeys(
SQLiteQueryExecutor::getConnection(), removeMessagesSQLStream.str(), ids); SQLiteQueryExecutor::getConnection(), removeMessagesSQLStream.str(), ids);
} }
std::vector<MessageEntity> std::vector<MessageEntity>
▲ Show 20 Lines • Show All 511 Lines • Show Last 20 Lines
View Options

lib/socket/socket.react.js

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
#ifndef EMSCRIPTEN #ifndef EMSCRIPTEN
NativeSQLiteConnectionManager SQLiteQueryExecutor::connectionManager; NativeSQLiteConnectionManager SQLiteQueryExecutor::connectionManager;
std::unordered_set<std::string> SQLiteQueryExecutor::backedUpTablesBlocklist = { std::unordered_set<std::string> SQLiteQueryExecutor::backedUpTablesBlocklist = {
"olm_persist_account", "olm_persist_account",
"olm_persist_sessions", "olm_persist_sessions",
"metadata", "metadata",
"outbound_p2p_messages", "outbound_p2p_messages",
"received_messages_to_device", "inbound_p2p_messages",
"integrity_store", "integrity_store",
"persist_storage", "persist_storage",
"keyservers", "keyservers",
}; };
#else #else
SQLiteConnectionManager SQLiteQueryExecutor::connectionManager; SQLiteConnectionManager SQLiteQueryExecutor::connectionManager;
#endif #endif
▲ Show 20 Lines • Show All 725 Lines • ▼ Show 20 Lines std::string query =
" original_message_id UNINDEXED," " original_message_id UNINDEXED,"
" message_id UNINDEXED," " message_id UNINDEXED,"
" processed_content," " processed_content,"
" tokenize = porter" " tokenize = porter"
");"; ");";
return create_table(db, query, "message_search"); return create_table(db, query, "message_search");
} }
bool recreate_inbound_p2p_messages_table(sqlite3 *db) {
std::string query =
"DROP TABLE IF EXISTS received_messages_to_device;"
"CREATE TABLE IF NOT EXISTS inbound_p2p_messages ("
" id INTEGER PRIMARY KEY,"
" message_id TEXT NOT NULL,"
" sender_device_id TEXT NOT NULL,"
" plaintext TEXT NOT NULL,"
" status TEXT NOT NULL,"
" sender_user_id TEXT NOT NULL"
");";
"CREATE INDEX IF NOT EXISTS outbound_p2p_messages_idx_id_timestamp"
" ON outbound_p2p_messages (device_id, timestamp);";
kamilAuthorUnsubmitted
Done
Inline Actions
");";
- "CREATE INDEX IF NOT EXISTS outbound_p2p_messages_idx_id_timestamp"
- " ON outbound_p2p_messages (device_id, timestamp);";
+
return create_table(db, query, "inbound_p2p_messages");
kamil:
return create_table(db, query, "inbound_p2p_messages");
}
bool create_schema(sqlite3 *db) { bool create_schema(sqlite3 *db) {
char *error; char *error;
int sidebarSourceTypeInt = static_cast<int>(MessageType::SIDEBAR_SOURCE); int sidebarSourceTypeInt = static_cast<int>(MessageType::SIDEBAR_SOURCE);
std::string sidebarSourceType = std::to_string(sidebarSourceTypeInt); std::string sidebarSourceType = std::to_string(sidebarSourceTypeInt);
auto query = auto query =
"CREATE TABLE IF NOT EXISTS drafts (" "CREATE TABLE IF NOT EXISTS drafts ("
" key TEXT UNIQUE PRIMARY KEY NOT NULL," " key TEXT UNIQUE PRIMARY KEY NOT NULL,"
" text TEXT NOT NULL" " text TEXT NOT NULL"
▲ Show 20 Lines • Show All 131 Lines • ▼ Show 20 Lines auto query =
" aux_user_info TEXT NOT NULL" " aux_user_info TEXT NOT NULL"
");" ");"
"CREATE TABLE IF NOT EXISTS thread_activity (" "CREATE TABLE IF NOT EXISTS thread_activity ("
" id TEXT UNIQUE PRIMARY KEY NOT NULL," " id TEXT UNIQUE PRIMARY KEY NOT NULL,"
" thread_activity_store_entry TEXT NOT NULL" " thread_activity_store_entry TEXT NOT NULL"
");" ");"
"CREATE TABLE IF NOT EXISTS received_messages_to_device (" "CREATE TABLE IF NOT EXISTS inbound_p2p_messages ("
" id INTEGER PRIMARY KEY," " id INTEGER PRIMARY KEY,"
" message_id TEXT NOT NULL," " message_id TEXT NOT NULL,"
" sender_device_id TEXT NOT NULL," " sender_device_id TEXT NOT NULL,"
" plaintext TEXT NOT NULL," " plaintext TEXT NOT NULL,"
" status TEXT NOT NULL" " status TEXT NOT NULL,"
" sender_user_id TEXT NOT NULL"
");" ");"
"CREATE TABLE IF NOT EXISTS entries (" "CREATE TABLE IF NOT EXISTS entries ("
" id TEXT UNIQUE PRIMARY KEY NOT NULL," " id TEXT UNIQUE PRIMARY KEY NOT NULL,"
" entry TEXT NOT NULL" " entry TEXT NOT NULL"
");" ");"
"CREATE TABLE IF NOT EXISTS message_store_local (" "CREATE TABLE IF NOT EXISTS message_store_local ("
▲ Show 20 Lines • Show All 264 Lines • ▼ Show 20 Linesstd::vector<std::pair<unsigned int, SQLiteMigration>> migrations{
{43, {create_thread_activity_table, true}}, {43, {create_thread_activity_table, true}},
{44, {create_received_messages_to_device, true}}, {44, {create_received_messages_to_device, true}},
{45, {recreate_outbound_p2p_messages_table, true}}, {45, {recreate_outbound_p2p_messages_table, true}},
{46, {create_entries_table, true}}, {46, {create_entries_table, true}},
{47, {create_message_store_local_table, true}}, {47, {create_message_store_local_table, true}},
{48, {create_messages_idx_target_message_type_time, true}}, {48, {create_messages_idx_target_message_type_time, true}},
{49, {add_supports_auto_retry_column_to_p2p_messages_table, true}}, {49, {add_supports_auto_retry_column_to_p2p_messages_table, true}},
{50, {create_message_search_table, true}}, {50, {create_message_search_table, true}},
{51, {update_messages_idx_target_message_type_time, true}}}}; {51, {update_messages_idx_target_message_type_time, true}},
{52, {recreate_inbound_p2p_messages_table, true}}}};
enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED }; enum class MigrationResult { SUCCESS, FAILURE, NOT_APPLIED };
MigrationResult applyMigrationWithTransaction( MigrationResult applyMigrationWithTransaction(
sqlite3 *db, sqlite3 *db,
const MigrateFunction &migrate, const MigrateFunction &migrate,
int index) { int index) {
sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr); sqlite3_exec(db, "BEGIN TRANSACTION;", nullptr, nullptr, nullptr);
▲ Show 20 Lines • Show All 1,385 Lines • ▼ Show 20 Linesstd::vector<std::string> SQLiteQueryExecutor::resetOutboundP2PMessagesForDevice(
sqlite3_step(preparedUpdateCiphertextSQL); sqlite3_step(preparedUpdateCiphertextSQL);
return messageIDs; return messageIDs;
} }
void SQLiteQueryExecutor::addInboundP2PMessage( void SQLiteQueryExecutor::addInboundP2PMessage(
InboundP2PMessage message) const { InboundP2PMessage message) const {
static std::string addMessage = static std::string addMessage =
"REPLACE INTO received_messages_to_device (" "REPLACE INTO inbound_p2p_messages ("
" message_id, sender_device_id, plaintext, status)" " message_id, sender_device_id, plaintext, status, sender_user_id)"
"VALUES (?, ?, ?, ?);"; "VALUES (?, ?, ?, ?, ?);";
replaceEntity<InboundP2PMessage>( replaceEntity<InboundP2PMessage>(
SQLiteQueryExecutor::getConnection(), addMessage, message); SQLiteQueryExecutor::getConnection(), addMessage, message);
} }
std::vector<InboundP2PMessage> std::vector<InboundP2PMessage>
SQLiteQueryExecutor::getAllInboundP2PMessage() const { SQLiteQueryExecutor::getAllInboundP2PMessage() const {
static std::string query = static std::string query =
"SELECT message_id, sender_device_id, plaintext, status " "SELECT message_id, sender_device_id, plaintext, status, sender_user_id "
"FROM received_messages_to_device;"; "FROM inbound_p2p_messages;";
return getAllEntities<InboundP2PMessage>( return getAllEntities<InboundP2PMessage>(
SQLiteQueryExecutor::getConnection(), query); SQLiteQueryExecutor::getConnection(), query);
} }
void SQLiteQueryExecutor::removeInboundP2PMessages( void SQLiteQueryExecutor::removeInboundP2PMessages(
const std::vector<std::string> &ids) const { const std::vector<std::string> &ids) const {
if (!ids.size()) { if (!ids.size()) {
return; return;
} }
std::stringstream removeMessagesSQLStream; std::stringstream removeMessagesSQLStream;
removeMessagesSQLStream << "DELETE FROM received_messages_to_device " removeMessagesSQLStream << "DELETE FROM inbound_p2p_messages "
"WHERE message_id IN " "WHERE message_id IN "
<< getSQLStatementArray(ids.size()) << ";"; << getSQLStatementArray(ids.size()) << ";";
removeEntitiesByKeys( removeEntitiesByKeys(
SQLiteQueryExecutor::getConnection(), removeMessagesSQLStream.str(), ids); SQLiteQueryExecutor::getConnection(), removeMessagesSQLStream.str(), ids);
} }
std::vector<MessageEntity> std::vector<MessageEntity>
▲ Show 20 Lines • Show All 511 Lines • Show Last 20 Lines