diff --git a/lib/types/crypto-types.js b/lib/types/crypto-types.js --- a/lib/types/crypto-types.js +++ b/lib/types/crypto-types.js @@ -186,4 +186,5 @@ signature: string, signingPublicKey: string, ) => Promise, + +markPrekeysAsPublished: () => Promise, }; diff --git a/lib/utils/__mocks__/config.js b/lib/utils/__mocks__/config.js --- a/lib/utils/__mocks__/config.js +++ b/lib/utils/__mocks__/config.js @@ -26,6 +26,7 @@ validateAndUploadPrekeys: jest.fn(), signMessage: jest.fn(), verifyMessage: jest.fn(), + markPrekeysAsPublished: jest.fn(), }, sqliteAPI: { getAllInboundP2PMessage: jest.fn(), diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.h b/native/cpp/CommonCpp/NativeModules/CommCoreModule.h --- a/native/cpp/CommonCpp/NativeModules/CommCoreModule.h +++ b/native/cpp/CommonCpp/NativeModules/CommCoreModule.h @@ -229,6 +229,7 @@ jsi::String messageID, jsi::String deviceID) override; virtual jsi::Value getSyncedDatabaseVersion(jsi::Runtime &rt) override; + virtual jsi::Value markPrekeysAsPublished(jsi::Runtime &rt) override; public: CommCoreModule(std::shared_ptr jsInvoker); diff --git a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp --- a/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp +++ b/native/cpp/CommonCpp/NativeModules/CommCoreModule.cpp @@ -2559,4 +2559,39 @@ }); } +jsi::Value CommCoreModule::markPrekeysAsPublished(jsi::Runtime &rt) { + return createPromiseAsJSIValue( + rt, [=](jsi::Runtime &innerRt, std::shared_ptr promise) { + taskType job = [=, &innerRt]() { + std::string error; + + if (this->contentCryptoModule == nullptr || + this->notifsCryptoModule == nullptr) { + this->jsInvoker_->invokeAsync([=, &innerRt]() { + promise->reject("user has not been initialized"); + }); + return; + } + + try { + this->contentCryptoModule->markPrekeyAsPublished(); + this->notifsCryptoModule->markPrekeyAsPublished(); + this->persistCryptoModules(true, true); + } catch (std::exception &e) { + error = e.what(); + } + + this->jsInvoker_->invokeAsync([=]() { + if (error.size()) { + promise->reject(error); + return; + } + promise->resolve(jsi::Value::undefined()); + }); + }; + + this->cryptoThread->scheduleTask(job); + }); +} + } // namespace comm diff --git a/native/cpp/CommonCpp/_generated/commJSI-generated.cpp b/native/cpp/CommonCpp/_generated/commJSI-generated.cpp --- a/native/cpp/CommonCpp/_generated/commJSI-generated.cpp +++ b/native/cpp/CommonCpp/_generated/commJSI-generated.cpp @@ -205,6 +205,9 @@ static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getSyncedDatabaseVersion(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) { return static_cast(&turboModule)->getSyncedDatabaseVersion(rt); } +static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_markPrekeysAsPublished(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) { + return static_cast(&turboModule)->markPrekeysAsPublished(rt); +} CommCoreModuleSchemaCxxSpecJSI::CommCoreModuleSchemaCxxSpecJSI(std::shared_ptr jsInvoker) : TurboModule("CommTurboModule", jsInvoker) { @@ -270,6 +273,7 @@ methodMap_["markOutboundP2PMessageAsSent"] = MethodMetadata {2, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_markOutboundP2PMessageAsSent}; methodMap_["removeOutboundP2PMessagesOlderThan"] = MethodMetadata {2, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_removeOutboundP2PMessagesOlderThan}; methodMap_["getSyncedDatabaseVersion"] = MethodMetadata {0, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getSyncedDatabaseVersion}; + methodMap_["markPrekeysAsPublished"] = MethodMetadata {0, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_markPrekeysAsPublished}; } diff --git a/native/cpp/CommonCpp/_generated/commJSI.h b/native/cpp/CommonCpp/_generated/commJSI.h --- a/native/cpp/CommonCpp/_generated/commJSI.h +++ b/native/cpp/CommonCpp/_generated/commJSI.h @@ -82,6 +82,7 @@ virtual jsi::Value markOutboundP2PMessageAsSent(jsi::Runtime &rt, jsi::String messageID, jsi::String deviceID) = 0; virtual jsi::Value removeOutboundP2PMessagesOlderThan(jsi::Runtime &rt, jsi::String messageID, jsi::String deviceID) = 0; virtual jsi::Value getSyncedDatabaseVersion(jsi::Runtime &rt) = 0; + virtual jsi::Value markPrekeysAsPublished(jsi::Runtime &rt) = 0; }; @@ -599,6 +600,14 @@ return bridging::callFromJs( rt, &T::getSyncedDatabaseVersion, jsInvoker_, instance_); } + jsi::Value markPrekeysAsPublished(jsi::Runtime &rt) override { + static_assert( + bridging::getParameterCount(&T::markPrekeysAsPublished) == 1, + "Expected markPrekeysAsPublished(...) to have 1 parameters"); + + return bridging::callFromJs( + rt, &T::markPrekeysAsPublished, jsInvoker_, instance_); + } private: T *instance_; diff --git a/native/crypto/olm-api.js b/native/crypto/olm-api.js --- a/native/crypto/olm-api.js +++ b/native/crypto/olm-api.js @@ -116,6 +116,7 @@ throw err; } }, + markPrekeysAsPublished: commCoreModule.markPrekeysAsPublished, }; export { olmAPI }; diff --git a/native/schema/CommCoreModuleSchema.js b/native/schema/CommCoreModuleSchema.js --- a/native/schema/CommCoreModuleSchema.js +++ b/native/schema/CommCoreModuleSchema.js @@ -164,6 +164,7 @@ deviceID: string, ) => Promise; +getSyncedDatabaseVersion: () => Promise; + +markPrekeysAsPublished: () => Promise; } export interface CoreModuleSpec extends Spec { diff --git a/web/crypto/olm-api.js b/web/crypto/olm-api.js --- a/web/crypto/olm-api.js +++ b/web/crypto/olm-api.js @@ -56,6 +56,7 @@ validateAndUploadPrekeys: proxyToWorker('validateAndUploadPrekeys'), signMessage: proxyToWorker('signMessage'), verifyMessage: proxyToWorker('verifyMessage'), + markPrekeysAsPublished: proxyToWorker('markPrekeysAsPublished'), }; export { olmAPI }; diff --git a/web/shared-worker/worker/worker-crypto.js b/web/shared-worker/worker/worker-crypto.js --- a/web/shared-worker/worker/worker-crypto.js +++ b/web/shared-worker/worker/worker-crypto.js @@ -862,6 +862,17 @@ throw err; } }, + async markPrekeysAsPublished(): Promise { + if (!cryptoStore) { + throw new Error('Crypto account not initialized'); + } + const { contentAccount, notificationAccount } = cryptoStore; + + contentAccount.mark_prekey_as_published(); + notificationAccount.mark_prekey_as_published(); + + persistCryptoStore(); + }, }; export {