Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Add a queue for processing events in query service check for changes

Hakan Shehu139763585e57
diff --git a/apps/desktop/src/main/services/query-service.ts b/apps/desktop/src/main/services/query-service.ts
index 3ddc3eb8..504e176f 100644
--- a/apps/desktop/src/main/services/query-service.ts
+++ b/apps/desktop/src/main/services/query-service.ts
@@ -9,9 +9,17 @@ class QueryService {
private readonly subscribedQueries: Map<string, SubscribedQuery<QueryInput>> =
new Map();
+ private readonly eventsQueue: Event[] = [];
+ private isProcessingEvents = false;
+
constructor() {
eventBus.subscribe((event: Event) => {
- this.checkForQueryChanges(event);
+ if (event.type === 'query_result_updated') {
+ return;
+ }
+
+ this.eventsQueue.push(event);
+ this.processEventsQueue();
});
}
@@ -44,38 +52,51 @@ class QueryService {
this.subscribedQueries.delete(id);
}
- private async checkForQueryChanges(event: Event): Promise<void> {
- if (event.type === 'query_result_updated') {
+ private async processEventsQueue() {
+ if (this.isProcessingEvents) {
return;
}
+ this.isProcessingEvents = true;
+
+ const events = this.eventsQueue.splice(0, this.eventsQueue.length);
for (const [id, query] of this.subscribedQueries) {
const handler = queryHandlerMap[query.input.type] as QueryHandler<
typeof query.input
>;
- const changeCheckResult = await handler.checkForChanges(
- event,
- query.input,
- query.result
- );
-
- if (
- changeCheckResult.hasChanges &&
- changeCheckResult.result &&
- !isEqual(query.result, changeCheckResult.result)
- ) {
- const newResult = changeCheckResult.result;
- this.subscribedQueries.set(id, {
- input: query.input,
- result: newResult,
- });
-
- eventBus.publish({
- type: 'query_result_updated',
- id,
- result: newResult,
- });
+
+ let result = query.result;
+ for (const event of events) {
+ const changeCheckResult = await handler.checkForChanges(
+ event,
+ query.input,
+ result
+ );
+
+ if (changeCheckResult.hasChanges) {
+ result = changeCheckResult.result;
+ }
}
+
+ if (isEqual(result, query.result)) {
+ continue;
+ }
+
+ this.subscribedQueries.set(id, {
+ input: query.input,
+ result,
+ });
+
+ eventBus.publish({
+ type: 'query_result_updated',
+ id,
+ result,
+ });
+ }
+
+ this.isProcessingEvents = false;
+ if (this.eventsQueue.length > 0) {
+ this.processEventsQueue();
}
}
}
diff --git a/apps/desktop/src/renderer/components/messages/message-actions.tsx b/apps/desktop/src/renderer/components/messages/message-actions.tsx
index a9631fdf..1d2c0035 100644
--- a/apps/desktop/src/renderer/components/messages/message-actions.tsx
+++ b/apps/desktop/src/renderer/components/messages/message-actions.tsx
@@ -41,8 +41,6 @@ export const MessageActions = ({ message }: MessageActionsProps) => {
return;
}
- console.log('reaction', reaction);
-
mutate({
input: {
type: 'node_reaction_create',