Page MenuHomePhabricator
Differential D11723

[SQLite] add queries to decrypted messages table
ClosedPublic
Actions

Authored by kamil on Apr 22 2024, 4:21 PM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 7, 11:02 AM
Unknown Object (File)
Mar 8 2025, 5:22 PM
Unknown Object (File)
Feb 21 2025, 8:07 AM
Unknown Object (File)
Feb 21 2025, 8:07 AM
Unknown Object (File)
Feb 21 2025, 8:07 AM
Unknown Object (File)
Feb 15 2025, 10:49 AM
Unknown Object (File)
Jan 26 2025, 10:17 AM
Unknown Object (File)
Jan 22 2025, 1:27 AM
View All 52 Files
Subscribers
ashoat

Details

Reviewers
tomek
marcin
Commits
rCOMMd869a28e8c7d: [SQLite] add queries to decrypted messages table
Summary

API to:

  • add decrypted messages
  • get all messages (for now this is only needed method)
  • remove

Depends on D11722

Test Plan

Run tests

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

kamil created this revision.Apr 22 2024, 4:21 PM
kamil held this revision as a draft.
Herald added a subscriber: ashoat. · View Herald TranscriptApr 22 2024, 4:21 PM
Harbormaster completed remote builds in B28380: Diff 39374.Apr 22 2024, 4:37 PM
kamil added a child revision: D11724: [SQLite/web] implement received message to device API.Apr 22 2024, 4:49 PM
kamil published this revision for review.Apr 23 2024, 6:39 AM
marcin added inline comments.Apr 24 2024, 3:39 AM
lib/types/sqlite-types.js
7 ↗(On Diff #39374)

Can we force it to confirm to a limited set of strings here?

marcin added inline comments.Apr 24 2024, 4:13 AM
native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
2172 ↗(On Diff #39374)

Can we simplify this query to SELECT * FROM?

kamil added inline comments.Apr 25 2024, 5:33 AM
lib/types/sqlite-types.js
7 ↗(On Diff #39374)

I'll add a diff with definition and then update the type here

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp
2172 ↗(On Diff #39374)

That will also query id field (see D11722) and we don't want that

marcin accepted this revision.Apr 26 2024, 7:14 AM
This revision is now accepted and ready to land.Apr 26 2024, 7:14 AM
Closed by commit rCOMMd869a28e8c7d: [SQLite] add queries to decrypted messages table (authored by kamil). · Explain WhyApr 29 2024, 2:10 AM
This revision was automatically updated to reflect the committed changes.
kamil added a commit: rCOMMd869a28e8c7d: [SQLite] add queries to decrypted messages table.

Revision Contents
Changeset List

PathSize
lib/
types/
8 lines
native/
cpp/
CommonCpp/
DatabaseManagers/
7 lines
6 lines
35 lines
entities/
34 lines
web/
cpp/
18 lines
shared-worker/
_generated/
queries/
77 lines
types/
5 lines

Diff 39624

View Options

lib/types/sqlite-types.js

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm
View Options

native/cpp/CommonCpp/DatabaseManagers/DatabaseQueryExecutor.h

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm
View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.h

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm
View Options

native/cpp/CommonCpp/DatabaseManagers/SQLiteQueryExecutor.cpp

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm
View Options

native/cpp/CommonCpp/DatabaseManagers/entities/ReceivedMessageToDevice.h

Show All 18 Linesjsi::Array KeyserverStore::parseDBDataStore(
std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const { std::shared_ptr<std::vector<KeyserverInfo>> keyserversVectorPtr) const {
size_t numKeyservers = keyserversVectorPtr->size(); size_t numKeyservers = keyserversVectorPtr->size();
jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers); jsi::Array jsiKeyservers = jsi::Array(rt, numKeyservers);
size_t writeIdx = 0; size_t writeIdx = 0;
for (const KeyserverInfo &keyserver : *keyserversVectorPtr) { for (const KeyserverInfo &keyserver : *keyserversVectorPtr) {
jsi::Object jsiKeyserver = jsi::Object(rt); jsi::Object jsiKeyserver = jsi::Object(rt);
jsiKeyserver.setProperty(rt, "id", keyserver.id); jsiKeyserver.setProperty(rt, "id", keyserver.id);
jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info); jsiKeyserver.setProperty(rt, "keyserverInfo", keyserver.keyserver_info);
jsiKeyserver.setProperty(
rt, "syncedKeyserverInfo", keyserver.synced_keyserver_info);
jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver); jsiKeyservers.setValueAtIndex(rt, writeIdx++, jsiKeyserver);
} }
return jsiKeyservers; return jsiKeyservers;
} }
std::vector<std::unique_ptr<KeyserverStoreOperationBase>> std::vector<std::unique_ptr<KeyserverStoreOperationBase>>
KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations) KeyserverStore::createOperations(jsi::Runtime &rt, const jsi::Array &operations)
const { const {
Show All 20 Lines for (size_t idx = 0; idx < operations.size(rt); idx++) {
} else if (opType == REMOVE_ALL_OPERATION) { } else if (opType == REMOVE_ALL_OPERATION) {
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<RemoveAllKeyserversOperation>()); std::make_unique<RemoveAllKeyserversOperation>());
} else if (opType == REPLACE_OPERATION) { } else if (opType == REPLACE_OPERATION) {
jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt); jsi::Object payloadObj = op.getProperty(rt, "payload").asObject(rt);
std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt); std::string id = payloadObj.getProperty(rt, "id").asString(rt).utf8(rt);
std::string keyserver_info = std::string keyserver_info =
payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt); payloadObj.getProperty(rt, "keyserverInfo").asString(rt).utf8(rt);
std::string synced_keyserver_info =
payloadObj.getProperty(rt, "syncedKeyserverInfo")
.asString(rt)
.utf8(rt);
KeyserverInfo keyserver{id, keyserver_info}; KeyserverInfo keyserver{id, keyserver_info, synced_keyserver_info};
keyserverStoreOps.push_back( keyserverStoreOps.push_back(
std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver))); std::make_unique<ReplaceKeyserverOperation>(std::move(keyserver)));
} else { } else {
throw std::runtime_error("unsupported operation: " + opType); throw std::runtime_error("unsupported operation: " + opType);
} }
}; };
return keyserverStoreOps; return keyserverStoreOps;
} }
} // namespace comm } // namespace comm
View Options

web/cpp/SQLiteQueryExecutorBindings.cpp

Loading...
View Options

web/shared-worker/_generated/comm-query-executor.js

Loading...
View Options

web/shared-worker/_generated/comm_query_executor.wasm

Loading...
View Options

web/shared-worker/queries/received-messages-to-device-queries.test.js

Loading...
View Options

web/shared-worker/types/sqlite-query-executor.js

Loading...