Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2842712
D13141.id43592.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Referenced Files
None
Subscribers
None
D13141.id43592.diff
View Options
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
@@ -269,6 +269,11 @@
jsi::String threadID,
std::optional<jsi::String> timestampCursor,
std::optional<jsi::String> messageIDCursor) override;
+ virtual jsi::Value fetchMessages(
+ jsi::Runtime &rt,
+ jsi::String threadID,
+ double limit,
+ double offset) override;
public:
CommCoreModule(std::shared_ptr<facebook::react::CallInvoker> 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
@@ -3069,4 +3069,46 @@
});
};
+jsi::Value CommCoreModule::fetchMessages(
+ jsi::Runtime &rt,
+ jsi::String threadID,
+ double limit,
+ double offset) {
+ std::string threadIDCpp = threadID.utf8(rt);
+ int limitInt = std::lround(limit);
+ int offsetInt = std::lround(offset);
+
+ return createPromiseAsJSIValue(
+ rt, [=](jsi::Runtime &innerRt, std::shared_ptr<Promise> promise) {
+ taskType job = [=, &innerRt]() {
+ std::string error;
+ std::shared_ptr<std::vector<MessageEntity>> messages;
+ try {
+ messages = std::make_shared<std::vector<MessageEntity>>(
+ DatabaseManager::getQueryExecutor().fetchMessages(
+ threadIDStr, limitInt, offsetInt));
+ } catch (std::system_error &e) {
+ error = e.what();
+ }
+
+ this->jsInvoker_->invokeAsync([&innerRt,
+ error,
+ promise,
+ messages,
+ messageStore = this->messageStore]() {
+ if (error.size()) {
+ promise->reject(error);
+ return;
+ }
+
+ jsi::Array jsiMessages =
+ messageStore.parseDBDataStore(innerRt, messages);
+ promise->resolve(std::move(jsiMessages));
+ });
+ };
+ GlobalDBSingleton::instance.scheduleOrRunCancellable(
+ job, promise, this->jsInvoker_);
+ });
+}
+
} // 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
@@ -235,6 +235,9 @@
static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_searchMessages(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->searchMessages(rt, args[0].asString(rt), args[1].asString(rt), args[2].isNull() || args[2].isUndefined() ? std::nullopt : std::make_optional(args[2].asString(rt)), args[3].isNull() || args[3].isUndefined() ? std::nullopt : std::make_optional(args[3].asString(rt)));
}
+static jsi::Value __hostFunction_CommCoreModuleSchemaCxxSpecJSI_fetchMessages(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
+ return static_cast<CommCoreModuleSchemaCxxSpecJSI *>(&turboModule)->fetchMessages(rt, args[0].asString(rt), args[1].asNumber(), args[2].asNumber());
+}
CommCoreModuleSchemaCxxSpecJSI::CommCoreModuleSchemaCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
: TurboModule("CommTurboModule", jsInvoker) {
@@ -310,6 +313,7 @@
methodMap_["markPrekeysAsPublished"] = MethodMetadata {0, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_markPrekeysAsPublished};
methodMap_["getRelatedMessages"] = MethodMetadata {1, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_getRelatedMessages};
methodMap_["searchMessages"] = MethodMetadata {4, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_searchMessages};
+ methodMap_["fetchMessages"] = MethodMetadata {3, __hostFunction_CommCoreModuleSchemaCxxSpecJSI_fetchMessages};
}
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
@@ -92,6 +92,7 @@
virtual jsi::Value markPrekeysAsPublished(jsi::Runtime &rt) = 0;
virtual jsi::Value getRelatedMessages(jsi::Runtime &rt, jsi::String messageID) = 0;
virtual jsi::Value searchMessages(jsi::Runtime &rt, jsi::String query, jsi::String threadID, std::optional<jsi::String> timestampCursor, std::optional<jsi::String> messageIDCursor) = 0;
+ virtual jsi::Value fetchMessages(jsi::Runtime &rt, jsi::String threadID, double limit, double offset) = 0;
};
@@ -689,6 +690,14 @@
return bridging::callFromJs<jsi::Value>(
rt, &T::searchMessages, jsInvoker_, instance_, std::move(query), std::move(threadID), std::move(timestampCursor), std::move(messageIDCursor));
}
+ jsi::Value fetchMessages(jsi::Runtime &rt, jsi::String threadID, double limit, double offset) override {
+ static_assert(
+ bridging::getParameterCount(&T::fetchMessages) == 4,
+ "Expected fetchMessages(...) to have 4 parameters");
+
+ return bridging::callFromJs<jsi::Value>(
+ rt, &T::fetchMessages, jsInvoker_, instance_, std::move(threadID), std::move(limit), std::move(offset));
+ }
private:
T *instance_;
diff --git a/native/schema/CommCoreModuleSchema.js b/native/schema/CommCoreModuleSchema.js
--- a/native/schema/CommCoreModuleSchema.js
+++ b/native/schema/CommCoreModuleSchema.js
@@ -198,6 +198,11 @@
timestampCursor: ?string,
messageIDCursor: ?string,
) => Promise<Array<ClientDBMessageInfo>>;
+ +fetchMessages: (
+ threadID: string,
+ limit: number,
+ offset: number,
+ ) => Promise<Array<ClientDBMessageInfo>>;
}
export interface CoreModuleSpec extends Spec {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Sep 30, 3:26 PM (19 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2205537
Default Alt Text
D13141.id43592.diff (5 KB)
Attached To
Mode
D13141: [native] Expose messages fetching function through JSI
Attached
Detach File
Event Timeline
Log In to Comment