Skip to content

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

Sync improvements

Hakan Shehu9141d60b5cb6
diff --git a/desktop/src/main/data/workspace/migrations.ts b/desktop/src/main/data/workspace/migrations.ts
index bdea5ad5..7cdd453c 100644
--- a/desktop/src/main/data/workspace/migrations.ts
+++ b/desktop/src/main/data/workspace/migrations.ts
@@ -44,16 +44,27 @@ const createNodesTable: Migration = {
},
};
-const createNodeNamesTable: Migration = {
+const createNodeUserStatesTable: Migration = {
up: async (db) => {
- await sql`
- CREATE VIRTUAL TABLE node_names USING fts5(id UNINDEXED, name);
- `.execute(db);
+ await db.schema
+ .createTable('node_user_states')
+ .addColumn('node_id', 'text', (col) =>
+ col.notNull().references('nodes.id'),
+ )
+ .addColumn('user_id', 'text', (col) => col.notNull())
+ .addColumn('last_seen_version_id', 'text')
+ .addColumn('last_seen_at', 'text')
+ .addColumn('mentions_count', 'integer', (col) =>
+ col.notNull().defaultTo(0),
+ )
+ .addColumn('version_id', 'text', (col) => col.notNull())
+ .addColumn('created_at', 'text', (col) => col.notNull())
+ .addColumn('updated_at', 'text')
+ .addPrimaryKeyConstraint('node_user_states_pk', ['node_id', 'user_id'])
+ .execute();
},
down: async (db) => {
- await sql`
- DROP TABLE node_names;
- `.execute(db);
+ await db.schema.dropTable('node_user_states').execute();
},
};
@@ -72,9 +83,11 @@ const createChangesTable: Migration = {
},
};
-const createNodeInsertNameTrigger: Migration = {
+const createNodeNamesTable: Migration = {
up: async (db) => {
await sql`
+ CREATE VIRTUAL TABLE node_names USING fts5(id UNINDEXED, name);
+
CREATE TRIGGER node_insert_name
AFTER INSERT ON nodes
WHEN json_type(NEW.attributes, '$.name') = 'text'
@@ -85,18 +98,7 @@ const createNodeInsertNameTrigger: Migration = {
json_extract(NEW.attributes, '$.name')
);
END;
- `.execute(db);
- },
- down: async (db) => {
- await sql`
- DROP TRIGGER node_insert_name;
- `.execute(db);
- },
-};
-const createNodeUpdateNameTrigger: Migration = {
- up: async (db) => {
- await sql`
CREATE TRIGGER node_update_name
AFTER UPDATE ON nodes
WHEN json_extract(OLD.attributes, '$.name') IS NOT json_extract(NEW.attributes, '$.name')
@@ -109,18 +111,7 @@ const createNodeUpdateNameTrigger: Migration = {
json_extract(NEW.attributes, '$.name')
WHERE json_type(NEW.attributes, '$.name') = 'text';
END;
- `.execute(db);
- },
- down: async (db) => {
- await sql`
- DROP TRIGGER node_update_name;
- `.execute(db);
- },
-};
-const createNodeDeleteNameTrigger: Migration = {
- up: async (db) => {
- await sql`
CREATE TRIGGER node_delete_name
AFTER DELETE ON nodes
BEGIN
@@ -130,7 +121,10 @@ const createNodeDeleteNameTrigger: Migration = {
},
down: async (db) => {
await sql`
- DROP TRIGGER node_delete_name;
+ DROP TABLE node_names;
+ DROP TRIGGER IF EXISTS node_insert_name;
+ DROP TRIGGER IF EXISTS node_update_name;
+ DROP TRIGGER IF EXISTS node_delete_name;
`.execute(db);
},
};
@@ -173,11 +167,9 @@ const createDownloadsTable: Migration = {
export const workspaceDatabaseMigrations: Record<string, Migration> = {
'00001_create_nodes_table': createNodesTable,
- '00002_create_node_names_table': createNodeNamesTable,
+ '00002_create_node_user_states_table': createNodeUserStatesTable,
'00003_create_changes_table': createChangesTable,
- '00004_create_node_insert_name_trigger': createNodeInsertNameTrigger,
- '00005_create_node_update_name_trigger': createNodeUpdateNameTrigger,
- '00006_create_node_delete_name_trigger': createNodeDeleteNameTrigger,
- '00007_create_uploads_table': createUploadsTable,
- '00008_create_downloads_table': createDownloadsTable,
+ '00004_create_node_names_table': createNodeNamesTable,
+ '00005_create_uploads_table': createUploadsTable,
+ '00006_create_downloads_table': createDownloadsTable,
};
diff --git a/desktop/src/main/data/workspace/schema.ts b/desktop/src/main/data/workspace/schema.ts
index 035a8ecb..1cc73ebe 100644
--- a/desktop/src/main/data/workspace/schema.ts
+++ b/desktop/src/main/data/workspace/schema.ts
@@ -21,6 +21,21 @@ export type SelectNode = Selectable<NodeTable>;
export type CreateNode = Insertable<NodeTable>;
export type UpdateNode = Updateable<NodeTable>;
+interface NodeUserStateTable {
+ node_id: ColumnType<string, string, never>;
+ user_id: ColumnType<string, string, never>;
+ last_seen_version_id: ColumnType<string | null, string | null, string | null>;
+ last_seen_at: ColumnType<string | null, string | null, string | null>;
+ mentions_count: ColumnType<number, number, number>;
+ version_id: ColumnType<string, string, string>;
+ created_at: ColumnType<string, string, never>;
+ updated_at: ColumnType<string | null, string | null, string | null>;
+}
+
+export type SelectNodeUserState = Selectable<NodeUserStateTable>;
+export type CreateNodeUserState = Insertable<NodeUserStateTable>;
+export type UpdateNodeUserState = Updateable<NodeUserStateTable>;
+
interface ChangeTable {
id: ColumnType<number, never, never>;
data: ColumnType<string, string, never>;
@@ -58,6 +73,7 @@ export type UpdateDownload = Updateable<DownloadTable>;
export interface WorkspaceDatabaseSchema {
nodes: NodeTable;
+ node_user_states: NodeUserStateTable;
changes: ChangeTable;
uploads: UploadTable;
downloads: DownloadTable;
diff --git a/desktop/src/main/handlers/messages/index.ts b/desktop/src/main/handlers/messages/index.ts
index acca75cc..153069a6 100644
--- a/desktop/src/main/handlers/messages/index.ts
+++ b/desktop/src/main/handlers/messages/index.ts
@@ -3,6 +3,8 @@ import { LocalNodeSyncMessageHandler } from '@/main/handlers/messages/local-node
import { LocalNodeDeleteMessageHandler } from '@/main/handlers/messages/local-node-delete';
import { ServerNodeSyncMessageHandler } from '@/main/handlers/messages/server-node-sync';
import { ServerNodeDeleteMessageHandler } from '@/main/handlers/messages/server-node-delete';
+import { ServerNodeUserStateSyncMessageHandler } from '@/main/handlers/messages/server-node-user-state-sync';
+import { LocalNodeUserStateSyncMessageHandler } from '@/main/handlers/messages/local-node-user-state-sync';
type MessageHandlerMap = {
[K in keyof MessageMap]: MessageHandler<MessageMap[K]>;
@@ -13,4 +15,6 @@ export const messageHandlerMap: MessageHandlerMap = {
local_node_delete: new LocalNodeDeleteMessageHandler(),
server_node_sync: new ServerNodeSyncMessageHandler(),
server_node_delete: new ServerNodeDeleteMessageHandler(),
+ server_node_user_state_sync: new ServerNodeUserStateSyncMessageHandler(),
+ local_node_user_state_sync: new LocalNodeUserStateSyncMessageHandler(),
};
diff --git a/desktop/src/main/handlers/messages/local-node-user-state-sync.ts b/desktop/src/main/handlers/messages/local-node-user-state-sync.ts
new file mode 100644
index 00000000..a77adc39
--- /dev/null
+++ b/desktop/src/main/handlers/messages/local-node-user-state-sync.ts
@@ -0,0 +1,14 @@
+import { MessageContext, MessageHandler } from '@/operations/messages';
+import { LocalNodeUserStateSyncMessageInput } from '@/operations/messages/local-node-user-state-sync';
+import { socketManager } from '@/main/sockets/socket-manager';
+
+export class LocalNodeUserStateSyncMessageHandler
+ implements MessageHandler<LocalNodeUserStateSyncMessageInput>
+{
+ public async handleMessage(
+ context: MessageContext,
+ input: LocalNodeUserStateSyncMessageInput,
+ ): Promise<void> {
+ socketManager.sendMessage(context.accountId, input);
+ }
+}
diff --git a/desktop/src/main/handlers/messages/server-node-user-state-sync.ts b/desktop/src/main/handlers/messages/server-node-user-state-sync.ts
new file mode 100644
index 00000000..03c1e019
--- /dev/null
+++ b/desktop/src/main/handlers/messages/server-node-user-state-sync.ts
@@ -0,0 +1,26 @@
+import { MessageContext, MessageHandler } from '@/operations/messages';
+import { ServerNodeUserStateSyncMessageInput } from '@/operations/messages/server-node-user-state-sync';
+import { mediator } from '@/main/mediator';
+
+export class ServerNodeUserStateSyncMessageHandler
+ implements MessageHandler<ServerNodeUserStateSyncMessageInput>
+{
+ public async handleMessage(
+ context: MessageContext,
+ input: ServerNodeUserStateSyncMessageInput,
+ ): Promise<void> {
+ await mediator.executeMutation({
+ type: 'server_node_user_state_sync',
+ accountId: context.accountId,
+ nodeId: input.nodeId,
+ userId: input.userId,
+ workspaceId: input.workspaceId,
+ versionId: input.versionId,
+ lastSeenAt: input.lastSeenAt,
+ lastSeenVersionId: input.lastSeenVersionId,
+ mentionsCount: input.mentionsCount,
+ createdAt: input.createdAt,
+ updatedAt: input.updatedAt,
+ });
+ }
+}
diff --git a/desktop/src/main/handlers/mutations/index.ts b/desktop/src/main/handlers/mutations/index.ts
index 237bc99a..a5d9286d 100644
--- a/desktop/src/main/handlers/mutations/index.ts
+++ b/desktop/src/main/handlers/mutations/index.ts
@@ -36,6 +36,8 @@ import { FileCreateMutationHandler } from '@/main/handlers/mutations/file-create
import { FileDownloadMutationHandler } from '@/main/handlers/mutations/file-download';
import { SpaceUpdateMutationHandler } from '@/main/handlers/mutations/space-update';
import { AccountUpdateMutationHandler } from '@/main/handlers/mutations/account-update';
+import { ServerNodeUserStateSyncMutationHandler } from '@/main/handlers/mutations/server-node-user-state-sync';
+import { MarkNodeAsSeenMutationHandler } from '@/main/handlers/mutations/mark-node-as-seen';
type MutationHandlerMap = {
[K in keyof MutationMap]: MutationHandler<MutationMap[K]['input']>;
@@ -79,4 +81,6 @@ export const mutationHandlerMap: MutationHandlerMap = {
file_download: new FileDownloadMutationHandler(),
space_update: new SpaceUpdateMutationHandler(),
account_update: new AccountUpdateMutationHandler(),
+ server_node_user_state_sync: new ServerNodeUserStateSyncMutationHandler(),
+ mark_node_as_seen: new MarkNodeAsSeenMutationHandler(),
};
diff --git a/desktop/src/main/handlers/mutations/mark-node-as-seen.ts b/desktop/src/main/handlers/mutations/mark-node-as-seen.ts
new file mode 100644
index 00000000..355c9775
--- /dev/null
+++ b/desktop/src/main/handlers/mutations/mark-node-as-seen.ts
@@ -0,0 +1,67 @@
+import { generateId, IdType } from '@/lib/id';
+import { databaseManager } from '@/main/data/database-manager';
+import { MutationHandler, MutationResult } from '@/operations/mutations';
+import { MarkNodeAsSeenMutationInput } from '@/operations/mutations/mark-node-as-seen';
+import { LocalNodeUserStateChangeData } from '@/types/sync';
+
+export class MarkNodeAsSeenMutationHandler
+ implements MutationHandler<MarkNodeAsSeenMutationInput>
+{
+ async handleMutation(
+ input: MarkNodeAsSeenMutationInput,
+ ): Promise<MutationResult<MarkNodeAsSeenMutationInput>> {
+ const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ input.userId,
+ );
+
+ const changeData: LocalNodeUserStateChangeData = {
+ type: 'node_user_state_update',
+ nodeId: input.nodeId,
+ userId: input.userId,
+ lastSeenVersionId: input.versionId,
+ lastSeenAt: new Date().toISOString(),
+ mentionsCount: 0,
+ versionId: generateId(IdType.Version),
+ };
+
+ await workspaceDatabase.transaction().execute(async (trx) => {
+ await trx
+ .updateTable('node_user_states')
+ .set({
+ last_seen_version_id: input.versionId,
+ last_seen_at: new Date().toISOString(),
+ mentions_count: 0,
+ version_id: generateId(IdType.Version),
+ })
+ .where('node_id', '=', input.nodeId)
+ .where('user_id', '=', input.userId)
+ .execute();
+
+ await trx
+ .insertInto('changes')
+ .values({
+ data: JSON.stringify(changeData),
+ created_at: new Date().toISOString(),
+ })
+ .execute();
+ });
+
+ return {
+ output: {
+ success: true,
+ },
+ changes: [
+ {
+ type: 'workspace',
+ table: 'node_user_states',
+ userId: input.userId,
+ },
+ {
+ type: 'workspace',
+ table: 'changes',
+ userId: input.userId,
+ },
+ ],
+ };
+ }
+}
diff --git a/desktop/src/main/handlers/mutations/node-attribute-set.ts b/desktop/src/main/handlers/mutations/node-attribute-set.ts
index 33f6acd3..4ebf1da8 100644
--- a/desktop/src/main/handlers/mutations/node-attribute-set.ts
+++ b/desktop/src/main/handlers/mutations/node-attribute-set.ts
@@ -33,6 +33,7 @@ export class NodeAttributeSetMutationHandler
const doc = new Y.Doc({
guid: node.id,
});
+
Y.applyUpdate(doc, toUint8Array(node.state));
doc.on('update', (update) => {
diff --git a/desktop/src/main/handlers/mutations/server-node-user-state-sync.ts b/desktop/src/main/handlers/mutations/server-node-user-state-sync.ts
new file mode 100644
index 00000000..5b42b3f0
--- /dev/null
+++ b/desktop/src/main/handlers/mutations/server-node-user-state-sync.ts
@@ -0,0 +1,83 @@
+import { databaseManager } from '@/main/data/database-manager';
+import { socketManager } from '@/main/sockets/socket-manager';
+import {
+ MutationChange,
+ MutationHandler,
+ MutationResult,
+} from '@/operations/mutations';
+import { ServerNodeUserStateSyncMutationInput } from '@/operations/mutations/server-node-user-state-sync';
+
+export class ServerNodeUserStateSyncMutationHandler
+ implements MutationHandler<ServerNodeUserStateSyncMutationInput>
+{
+ public async handleMutation(
+ input: ServerNodeUserStateSyncMutationInput,
+ ): Promise<MutationResult<ServerNodeUserStateSyncMutationInput>> {
+ const workspace = await databaseManager.appDatabase
+ .selectFrom('workspaces')
+ .selectAll()
+ .where((eb) =>
+ eb.and([
+ eb('account_id', '=', input.accountId),
+ eb('workspace_id', '=', input.workspaceId),
+ ]),
+ )
+ .executeTakeFirst();
+
+ if (!workspace) {
+ return {
+ output: {
+ success: false,
+ },
+ };
+ }
+
+ const userId = workspace.user_id;
+ const workspaceDatabase =
+ await databaseManager.getWorkspaceDatabase(userId);
+
+ await workspaceDatabase
+ .insertInto('node_user_states')
+ .values({
+ node_id: input.nodeId,
+ user_id: input.userId,
+ version_id: input.versionId,
+ last_seen_at: input.lastSeenAt,
+ last_seen_version_id: input.lastSeenVersionId,
+ mentions_count: input.mentionsCount,
+ created_at: input.createdAt,
+ updated_at: input.updatedAt,
+ })
+ .onConflict((cb) =>
+ cb.columns(['node_id', 'user_id']).doUpdateSet({
+ last_seen_at: input.lastSeenAt,
+ last_seen_version_id: input.lastSeenVersionId,
+ mentions_count: input.mentionsCount,
+ updated_at: input.updatedAt,
+ version_id: input.versionId,
+ }),
+ )
+ .execute();
+
+ socketManager.sendMessage(workspace.account_id, {
+ type: 'local_node_user_state_sync',
+ nodeId: input.nodeId,
+ versionId: input.versionId,
+ workspaceId: input.workspaceId,
+ userId: input.userId,
+ });
+
+ return {
+ output: {
+ success: true,
+ },
+ changes: [
+ {
+ type: 'workspace',
+ table: 'node_user_states',
+ userId: userId,
+ },
+ ],
+ };
+ }
+}
diff --git a/desktop/src/main/handlers/queries/message-list.ts b/desktop/src/main/handlers/queries/message-list.ts
index ac6f5d7a..1f543c67 100644
--- a/desktop/src/main/handlers/queries/message-list.ts
+++ b/desktop/src/main/handlers/queries/message-list.ts
@@ -156,6 +156,7 @@ export class MessageListQueryHandler
const message: MessageNode = {
id: messageNode.id,
+ versionId: messageNode.versionId,
createdAt: messageNode.createdAt,
author: author ?? {
id: messageNode.createdBy,
diff --git a/desktop/src/main/handlers/queries/sidebar-chat-list.ts b/desktop/src/main/handlers/queries/sidebar-chat-list.ts
index dfdd7c62..8cd34370 100644
--- a/desktop/src/main/handlers/queries/sidebar-chat-list.ts
+++ b/desktop/src/main/handlers/queries/sidebar-chat-list.ts
@@ -12,6 +12,12 @@ import { mapNode } from '@/lib/nodes';
import { MutationChange } from '@/operations/mutations';
import { isEqual } from 'lodash';
+interface UnreadCountRow {
+ node_id: string;
+ unread_count: number;
+ mentions_count: number;
+}
+
export class SidebarChatListQueryHandler
implements QueryHandler<SidebarChatListQueryInput>
{
@@ -20,12 +26,19 @@ export class SidebarChatListQueryHandler
): Promise<QueryResult<SidebarChatListQueryInput>> {
const chats = await this.fetchChats(input);
const collaborators = await this.fetchChatCollaborators(input, chats);
+ const unreadCounts = await this.fetchUnreadCounts(input, chats);
return {
- output: this.buildSidebarChatNodes(input.userId, chats, collaborators),
+ output: this.buildSidebarChatNodes(
+ input.userId,
+ chats,
+ collaborators,
+ unreadCounts,
+ ),
state: {
chats,
collaborators,
+ unreadCounts,
},
};
}
@@ -39,7 +52,7 @@ export class SidebarChatListQueryHandler
!changes.some(
(change) =>
change.type === 'workspace' &&
- change.table === 'nodes' &&
+ (change.table === 'nodes' || change.table === 'node_user_states') &&
change.userId === input.userId,
)
) {
@@ -50,9 +63,12 @@ export class SidebarChatListQueryHandler
const chats = await this.fetchChats(input);
const collaborators = await this.fetchChatCollaborators(input, chats);
+ const unreadCounts = await this.fetchUnreadCounts(input, chats);
+
if (
isEqual(chats, state.chats) &&
- isEqual(collaborators, state.collaborators)
+ isEqual(collaborators, state.collaborators) &&
+ isEqual(unreadCounts, state.unreadCounts)
) {
return {
hasChanges: false,
@@ -62,10 +78,16 @@ export class SidebarChatListQueryHandler
return {
hasChanges: true,
result: {
- output: this.buildSidebarChatNodes(input.userId, chats, collaborators),
+ output: this.buildSidebarChatNodes(
+ input.userId,
+ chats,
+ collaborators,
+ unreadCounts,
+ ),
state: {
chats,
collaborators,
+ unreadCounts,
},
},
};
@@ -125,10 +147,38 @@ export class SidebarChatListQueryHandler
return collaborators;
}
+ private async fetchUnreadCounts(
+ input: SidebarChatListQueryInput,
+ chats: SelectNode[],
+ ): Promise<UnreadCountRow[]> {
+ const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ input.userId,
+ );
+
+ const chatIds = chats.map((chat) => chat.id);
+ const unreadCounts = await workspaceDatabase
+ .selectFrom('node_user_states as nus')
+ .innerJoin('nodes as n', 'nus.node_id', 'n.id')
+ .where('nus.user_id', '=', input.userId)
+ .where('n.type', '=', NodeTypes.Message)
+ .where('n.parent_id', 'in', chatIds)
+ .where('nus.last_seen_version_id', 'is', null)
+ .select(['n.parent_id as node_id'])
+ .select((eb) => [
+ eb.fn.count<number>('nus.node_id').as('unread_count'),
+ eb.fn.sum<number>('nus.mentions_count').as('mentions_count'),
+ ])
+ .groupBy('n.parent_id')
+ .execute();
+
+ return unreadCounts;
+ }
+
private buildSidebarChatNodes = (
userId: string,
chats: SelectNode[],
collaborators: SelectNode[],
+ unreadCounts: UnreadCountRow[],
): SidebarChatNode[] => {
const sidebarChatNodes: SidebarChatNode[] = [];
@@ -158,11 +208,15 @@ export class SidebarChatListQueryHandler
}
const collaboratorNode = mapNode(collaboratorRow);
+ const unreadCountRow = unreadCounts.find((r) => r.node_id === chat.id);
+
sidebarChatNodes.push({
id: chatNode.id,
type: chatNode.type,
name: collaboratorNode.attributes.name ?? 'Unknown',
avatar: collaboratorNode.attributes.avatar ?? null,
+ unreadCount: unreadCountRow?.unread_count ?? 0,
+ mentionsCount: unreadCountRow?.mentions_count ?? 0,
});
}
diff --git a/desktop/src/main/handlers/queries/sidebar-space-list.ts b/desktop/src/main/handlers/queries/sidebar-space-list.ts
index d348eb60..74ac5fb5 100644
--- a/desktop/src/main/handlers/queries/sidebar-space-list.ts
+++ b/desktop/src/main/handlers/queries/sidebar-space-list.ts
@@ -15,6 +15,12 @@ import { MutationChange } from '@/operations/mutations';
import { isEqual } from 'lodash';
import { compareString } from '@/lib/utils';
+interface UnreadCountRow {
+ node_id: string;
+ unread_count: number;
+ mentions_count: number;
+}
+
export class SidebarSpaceListQueryHandler
implements QueryHandler<SidebarSpaceListQueryInput>
{
@@ -22,10 +28,13 @@ export class SidebarSpaceListQueryHandler
input: SidebarSpaceListQueryInput,
): Promise<QueryResult<SidebarSpaceListQueryInput>> {
const rows = await this.fetchNodes(input);
+ const unreadCounts = await this.fetchUnreadCounts(input, rows);
+
return {
- output: this.buildSidebarSpaceNodes(rows),
+ output: this.buildSidebarSpaceNodes(rows, unreadCounts),
state: {
rows,
+ unreadCounts,
},
};
}
@@ -39,7 +48,7 @@ export class SidebarSpaceListQueryHandler
!changes.some(
(change) =>
change.type === 'workspace' &&
- change.table === 'nodes' &&
+ (change.table === 'nodes' || change.table === 'node_user_states') &&
change.userId === input.userId,
)
) {
@@ -49,7 +58,11 @@ export class SidebarSpaceListQueryHandler
}
const rows = await this.fetchNodes(input);
- if (isEqual(rows, state.rows)) {
+ const unreadCounts = await this.fetchUnreadCounts(input, rows);
+ if (
+ isEqual(rows, state.rows) &&
+ isEqual(unreadCounts, state.unreadCounts)
+ ) {
return {
hasChanges: false,
};
@@ -58,7 +71,7 @@ export class SidebarSpaceListQueryHandler
return {
hasChanges: true,
result: {
- output: this.buildSidebarSpaceNodes(rows),
+ output: this.buildSidebarSpaceNodes(rows, unreadCounts),
state: {
rows,
},
@@ -93,7 +106,40 @@ export class SidebarSpaceListQueryHandler
return result.rows;
}
- private buildSidebarSpaceNodes = (rows: SelectNode[]): SidebarSpaceNode[] => {
+ private async fetchUnreadCounts(
+ input: SidebarSpaceListQueryInput,
+ rows: SelectNode[],
+ ): Promise<UnreadCountRow[]> {
+ const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ input.userId,
+ );
+
+ const channelIds = rows
+ .filter((r) => r.type === NodeTypes.Channel)
+ .map((r) => r.id);
+
+ const unreadCounts = await workspaceDatabase
+ .selectFrom('node_user_states as nus')
+ .innerJoin('nodes as n', 'nus.node_id', 'n.id')
+ .where('nus.user_id', '=', input.userId)
+ .where('n.type', '=', NodeTypes.Message)
+ .where('n.parent_id', 'in', channelIds)
+ .where('nus.last_seen_version_id', 'is', null)
+ .select(['n.parent_id as node_id'])
+ .select((eb) => [
+ eb.fn.count<number>('nus.node_id').as('unread_count'),
+ eb.fn.sum<number>('nus.mentions_count').as('mentions_count'),
+ ])
+ .groupBy('n.parent_id')
+ .execute();
+
+ return unreadCounts;
+ }
+
+ private buildSidebarSpaceNodes = (
+ rows: SelectNode[],
+ unreadCounts: UnreadCountRow[],
+ ): SidebarSpaceNode[] => {
const nodes: LocalNode[] = rows.map(mapNode);
const spaces: SidebarSpaceNode[] = [];
@@ -106,7 +152,7 @@ export class SidebarSpaceListQueryHandler
.filter((n) => n.parentId === node.id)
.sort((a, b) => compareString(a.index, b.index));
- spaces.push(this.buildSpaceNode(node, children));
+ spaces.push(this.buildSpaceNode(node, children, unreadCounts));
}
return spaces;
@@ -115,22 +161,34 @@ export class SidebarSpaceListQueryHandler
private buildSpaceNode = (
node: LocalNode,
children: LocalNode[],
+ unreadCounts: UnreadCountRow[],
): SidebarSpaceNode => {
return {
id: node.id,
type: node.type,
name: node.attributes?.name ?? null,
avatar: node.attributes?.avatar ?? null,
- children: children.map(this.buildSidearNode),
+ children: children.map((child) =>
+ this.buildSidearNode(child, unreadCounts),
+ ),
+ unreadCount: 0,
+ mentionsCount: 0,
};
};
- private buildSidearNode = (node: LocalNode): SidebarNode => {
+ private buildSidearNode = (
+ node: LocalNode,
+ unreadCounts: UnreadCountRow[],
+ ): SidebarNode => {
+ const unreadCountRow = unreadCounts.find((r) => r.node_id === node.id);
+
return {
id: node.id,
type: node.type,
name: node.attributes.name ?? null,
avatar: node.attributes.avatar ?? null,
+ unreadCount: unreadCountRow?.unread_count ?? 0,
+ mentionsCount: unreadCountRow?.mentions_count ?? 0,
};
};
}
diff --git a/desktop/src/operations/messages/local-node-user-state-sync.ts b/desktop/src/operations/messages/local-node-user-state-sync.ts
new file mode 100644
index 00000000..0a7f0030
--- /dev/null
+++ b/desktop/src/operations/messages/local-node-user-state-sync.ts
@@ -0,0 +1,13 @@
+export type LocalNodeUserStateSyncMessageInput = {
+ type: 'local_node_user_state_sync';
+ nodeId: string;
+ userId: string;
+ workspaceId: string;
+ versionId: string;
+};
+
+declare module '@/operations/messages' {
+ interface MessageMap {
+ local_node_user_state_sync: LocalNodeUserStateSyncMessageInput;
+ }
+}
diff --git a/desktop/src/operations/messages/server-node-user-state-sync.ts b/desktop/src/operations/messages/server-node-user-state-sync.ts
new file mode 100644
index 00000000..da56eaac
--- /dev/null
+++ b/desktop/src/operations/messages/server-node-user-state-sync.ts
@@ -0,0 +1,18 @@
+export type ServerNodeUserStateSyncMessageInput = {
+ type: 'server_node_user_state_sync';
+ nodeId: string;
+ userId: string;
+ workspaceId: string;
+ versionId: string;
+ lastSeenAt: string | null;
+ lastSeenVersionId: string | null;
+ mentionsCount: number;
+ createdAt: string;
+ updatedAt: string | null;
+};
+
+declare module '@/operations/messages' {
+ interface MessageMap {
+ server_node_user_state_sync: ServerNodeUserStateSyncMessageInput;
+ }
+}
diff --git a/desktop/src/operations/mutations/mark-node-as-seen.ts b/desktop/src/operations/mutations/mark-node-as-seen.ts
new file mode 100644
index 00000000..f82a64f0
--- /dev/null
+++ b/desktop/src/operations/mutations/mark-node-as-seen.ts
@@ -0,0 +1,21 @@
+import { JSONContent } from '@tiptap/core';
+
+export type MarkNodeAsSeenMutationInput = {
+ type: 'mark_node_as_seen';
+ userId: string;
+ nodeId: string;
+ versionId: string;
+};
+
+export type MarkNodeAsSeenMutationOutput = {
+ success: boolean;
+};
+
+declare module '@/operations/mutations' {
+ interface MutationMap {
+ mark_node_as_seen: {
+ input: MarkNodeAsSeenMutationInput;
+ output: MarkNodeAsSeenMutationOutput;
+ };
+ }
+}
diff --git a/desktop/src/operations/mutations/server-node-user-state-sync.ts b/desktop/src/operations/mutations/server-node-user-state-sync.ts
new file mode 100644
index 00000000..90be3c30
--- /dev/null
+++ b/desktop/src/operations/mutations/server-node-user-state-sync.ts
@@ -0,0 +1,26 @@
+export type ServerNodeUserStateSyncMutationInput = {
+ type: 'server_node_user_state_sync';
+ accountId: string;
+ nodeId: string;
+ userId: string;
+ workspaceId: string;
+ versionId: string;
+ lastSeenAt: string | null;
+ lastSeenVersionId: string | null;
+ mentionsCount: number;
+ createdAt: string;
+ updatedAt: string | null;
+};
+
+export type ServerNodeUserStateSyncMutationOutput = {
+ success: boolean;
+};
+
+declare module '@/operations/mutations' {
+ interface MutationMap {
+ server_node_user_state_sync: {
+ input: ServerNodeUserStateSyncMutationInput;
+ output: ServerNodeUserStateSyncMutationOutput;
+ };
+ }
+}
diff --git a/desktop/src/renderer/components/messages/message.tsx b/desktop/src/renderer/components/messages/message.tsx
index ead41ae4..437894e0 100644
--- a/desktop/src/renderer/components/messages/message.tsx
+++ b/desktop/src/renderer/components/messages/message.tsx
@@ -98,7 +98,9 @@ export const Message = ({
<InView
rootMargin="50px"
onChange={(inView) => {
- // onVisibilityChange?.(data.id, inView);
+ if (inView) {
+ workspace.markAsSeen(message.id, message.versionId);
+ }
}}
>
<ul className="invisible absolute -top-2 right-1 z-10 flex flex-row bg-gray-100 text-muted-foreground shadow group-hover:visible">
diff --git a/desktop/src/renderer/components/workspaces/sidebars/sidebar-chat-item.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-chat-item.tsx
index 6b397870..c79d3282 100644
--- a/desktop/src/renderer/components/workspaces/sidebars/sidebar-chat-item.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-chat-item.tsx
@@ -11,8 +11,7 @@ export const SidebarChatItem = ({
node,
}: SidebarChatItemProps): React.ReactNode => {
const isActive = false;
- const isUnread = false;
- const directCount = 0;
+ const isUnread = node.unreadCount > 0 || node.mentionsCount > 0;
return (
<div
@@ -31,14 +30,11 @@ export const SidebarChatItem = ({
>
{node.name ?? 'Unnamed'}
</span>
- {directCount > 0 && (
- <span className="mr-1 rounded-md bg-sidebar-accent px-1 py-0.5 text-xs text-sidebar-accent-foreground">
- {directCount}
+ {node.unreadCount > 0 && (
+ <span className="rounded-md bg-red-500 px-1 py-0.5 text-xs text-white">
+ {node.unreadCount}
</span>
)}
- {directCount == 0 && isUnread && (
- <span className="mr-2 size-3 rounded-full bg-red-500 p-0.5" />
- )}
</div>
);
};
diff --git a/desktop/src/renderer/components/workspaces/sidebars/sidebar-item.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-item.tsx
index c50e7ed6..91ef35cb 100644
--- a/desktop/src/renderer/components/workspaces/sidebars/sidebar-item.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-item.tsx
@@ -1,5 +1,4 @@
import React from 'react';
-import { useWorkspace } from '@/renderer/contexts/workspace';
import { SidebarNode } from '@/types/workspaces';
import { cn } from '@/lib/utils';
import { Avatar } from '@/renderer/components/avatars/avatar';
@@ -9,10 +8,8 @@ interface SidebarItemProps {
}
export const SidebarItem = ({ node }: SidebarItemProps): React.ReactNode => {
- const workspace = useWorkspace();
const isActive = false;
- const isUnread = false;
- const directCount = 0;
+ const isUnread = node.unreadCount > 0 || node.mentionsCount > 0;
return (
<button
@@ -36,13 +33,13 @@ export const SidebarItem = ({ node }: SidebarItemProps): React.ReactNode => {
>
{node.name ?? 'Unnamed'}
</span>
- {directCount > 0 && (
+ {node.mentionsCount > 0 && (
<span className="mr-1 rounded-md bg-sidebar-accent px-1 py-0.5 text-xs text-sidebar-accent-foreground">
- {directCount}
+ {node.mentionsCount}
</span>
)}
- {directCount == 0 && isUnread && (
- <span className="mr-2 size-3 rounded-full bg-red-500 p-0.5" />
+ {node.mentionsCount == 0 && isUnread && (
+ <span className="size-2 rounded-full bg-red-500" />
)}
</button>
);
diff --git a/desktop/src/renderer/components/workspaces/sidebars/sidebar-space-item.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-space-item.tsx
index 59dd47fe..f08ba019 100644
--- a/desktop/src/renderer/components/workspaces/sidebars/sidebar-space-item.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-space-item.tsx
@@ -148,7 +148,7 @@ export const SidebarSpaceItem = ({ node }: SidebarSpaceNodeProps) => {
</DropdownMenu>
<CollapsibleContent>
- <SidebarMenuSub>
+ <SidebarMenuSub className="mr-0 pr-0">
{node.children.map((child) => (
<SidebarMenuSubItem
key={child.id}
diff --git a/desktop/src/renderer/components/workspaces/workspace.tsx b/desktop/src/renderer/components/workspaces/workspace.tsx
index caf7ad91..0660dcb2 100644
--- a/desktop/src/renderer/components/workspaces/workspace.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace.tsx
@@ -47,6 +47,14 @@ export const Workspace = () => {
openSettings() {
setOpenSettings(true);
},
+ markAsSeen(nodeId, versionId) {
+ window.neuron.executeMutation({
+ type: 'mark_node_as_seen',
+ nodeId: nodeId,
+ versionId: versionId,
+ userId: workspace.userId,
+ });
+ },
}}
>
<SidebarProvider>
diff --git a/desktop/src/renderer/contexts/workspace.ts b/desktop/src/renderer/contexts/workspace.ts
index 96c66b0d..b09251d3 100644
--- a/desktop/src/renderer/contexts/workspace.ts
+++ b/desktop/src/renderer/contexts/workspace.ts
@@ -5,6 +5,7 @@ interface WorkspaceContext extends Workspace {
navigateToNode: (nodeId: string) => void;
openModal: (nodeId: string) => void;
openSettings: () => void;
+ markAsSeen: (nodeId: string, versionId: string) => void;
}
export const WorkspaceContext = createContext<WorkspaceContext>(
diff --git a/desktop/src/types/messages.ts b/desktop/src/types/messages.ts
index 13876601..e3c02d41 100644
--- a/desktop/src/types/messages.ts
+++ b/desktop/src/types/messages.ts
@@ -7,6 +7,7 @@ export type MessageNode = {
createdAt: string;
author: UserNode;
reactionCounts: MessageReactionCount[];
+ versionId: string;
};
export type MessageReactionCount = {
diff --git a/desktop/src/types/sync.ts b/desktop/src/types/sync.ts
index 4bbf4401..85234241 100644
--- a/desktop/src/types/sync.ts
+++ b/desktop/src/types/sync.ts
@@ -34,7 +34,18 @@ export type LocalDeleteNodeChangeData = {
deletedBy: string;
};
+export type LocalNodeUserStateChangeData = {
+ type: 'node_user_state_update';
+ nodeId: string;
+ userId: string;
+ lastSeenVersionId: string;
+ lastSeenAt: string;
+ mentionsCount: number;
+ versionId: string;
+};
+
export type LocalNodeChangeData =
| LocalCreateNodeChangeData
| LocalUpdateNodeChangeData
- | LocalDeleteNodeChangeData;
+ | LocalDeleteNodeChangeData
+ | LocalNodeUserStateChangeData;
diff --git a/desktop/src/types/workspaces.ts b/desktop/src/types/workspaces.ts
index ea3a55ce..37396b83 100644
--- a/desktop/src/types/workspaces.ts
+++ b/desktop/src/types/workspaces.ts
@@ -47,6 +47,8 @@ export type SidebarNode = {
type: string;
name: string | null;
avatar: string | null;
+ unreadCount: number;
+ mentionsCount: number;
};
export type SidebarSpaceNode = SidebarNode & {
@@ -58,6 +60,8 @@ export type SidebarChatNode = {
type: string;
name: string | null;
avatar: string | null;
+ unreadCount: number;
+ mentionsCount: number;
};
export type BreadcrumbNode = {
diff --git a/server/src/api.ts b/server/src/api.ts
index 606d50ee..7914eab8 100644
--- a/server/src/api.ts
+++ b/server/src/api.ts
@@ -9,9 +9,9 @@ import { syncRouter } from '@/routes/sync';
import { configRouter } from '@/routes/config';
import { avatarsRouter } from '@/routes/avatars';
import { filesRouter } from '@/routes/files';
-import { socketManager } from '@/sockets/socket-manager';
+import { synapse } from '@/services/synapse';
-export const initApi = () => {
+export const initApi = async () => {
const app = express();
const port = 3000;
@@ -34,7 +34,7 @@ export const initApi = () => {
app.use('/v1/files', authMiddleware, filesRouter);
const server = http.createServer(app);
- socketManager.init(server);
+ await synapse.init(server);
server.listen(port, () => {
console.log(`Server is running at http://localhost:${port}`);
diff --git a/server/src/consumers/changes-subcriber.ts b/server/src/consumers/changes-subcriber.ts
deleted file mode 100644
index 7390ee97..00000000
--- a/server/src/consumers/changes-subcriber.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { database } from '@/data/database';
-import { redis, CHANNEL_NAMES } from '@/data/redis';
-import { getIdType, IdType } from '@/lib/id';
-import { socketManager } from '@/sockets/socket-manager';
-import { ServerNodeChangeEvent } from '@/types/sync';
-
-export const initChangesSubscriber = async () => {
- const subscriber = redis.duplicate();
- await subscriber.connect();
- await subscriber.subscribe(CHANNEL_NAMES.CHANGES, handleEvent);
-};
-
-const handleEvent = async (event: string) => {
- const data: ServerNodeChangeEvent = JSON.parse(event);
- if (data.type === 'node_create') {
- const id = data.nodeId;
- const idType = getIdType(id);
- if (idType === IdType.User) {
- const workspaceUser = await database
- .selectFrom('workspace_users')
- .selectAll()
- .where('id', '=', id)
- .executeTakeFirst();
-
- if (!workspaceUser) {
- return;
- }
-
- const devices = await database
- .selectFrom('devices')
- .selectAll()
- .where('account_id', '=', workspaceUser.account_id)
- .execute();
-
- for (const device of devices) {
- const socketConnection = socketManager.getConnection(device.id);
- if (socketConnection === undefined) {
- continue;
- }
-
- socketConnection.addWorkspaceUser({
- workspaceId: data.workspaceId,
- userId: id,
- });
- }
- }
- }
-
- const userDevices = new Map<string, string[]>();
- for (const connection of socketManager.getConnections()) {
- const workspaceUsers = connection.getWorkspaceUsers();
- for (const workspaceUser of workspaceUsers) {
- if (workspaceUser.workspaceId !== data.workspaceId) {
- continue;
- }
-
- const userIds = userDevices.get(workspaceUser.userId) ?? [];
- userIds.push(connection.getDeviceId());
- userDevices.set(workspaceUser.userId, userIds);
- }
- }
-
- const userIds = Array.from(userDevices.keys());
- if (userIds.length === 0) {
- return;
- }
-
- const nodeUserStates = await database
- .selectFrom('node_user_states')
- .selectAll()
- .where((eb) =>
- eb.and([eb('user_id', 'in', userIds), eb('node_id', '=', data.nodeId)]),
- )
- .execute();
-
- if (nodeUserStates.length === 0) {
- return;
- }
-
- if (data.type === 'node_delete') {
- for (const nodeUserState of nodeUserStates) {
- const deviceIds = userDevices.get(nodeUserState.user_id) ?? [];
- for (const deviceId of deviceIds) {
- const socketConnection = socketManager.getConnection(deviceId);
- if (socketConnection === undefined) {
- continue;
- }
-
- socketConnection.send({
- type: 'server_node_delete',
- id: data.nodeId,
- workspaceId: data.workspaceId,
- });
- }
- }
-
- return;
- }
-
- const node = await database
- .selectFrom('nodes')
- .select([
- 'id',
- 'state',
- 'created_at',
- 'created_by',
- 'updated_at',
- 'updated_by',
- 'server_created_at',
- 'server_updated_at',
- 'version_id',
- ])
- .where('id', '=', data.nodeId)
- .executeTakeFirst();
-
- if (!node) {
- return;
- }
-
- for (const nodeUserState of nodeUserStates) {
- const deviceIds = userDevices.get(nodeUserState.user_id) ?? [];
- if (deviceIds.length === 0) {
- continue;
- }
-
- for (const deviceId of deviceIds) {
- const socketConnection = socketManager.getConnection(deviceId);
- if (socketConnection === undefined) {
- continue;
- }
-
- if (nodeUserState.access_removed_at !== null) {
- socketConnection.send({
- type: 'server_node_delete',
- id: data.nodeId,
- workspaceId: data.workspaceId,
- });
- } else {
- socketConnection.send({
- type: 'server_node_sync',
- id: node.id,
- workspaceId: data.workspaceId,
- state: node.state!,
- createdAt: node.created_at.toISOString(),
- createdBy: node.created_by,
- updatedAt: node.updated_at?.toISOString() ?? null,
- updatedBy: node.updated_by ?? null,
- serverCreatedAt: node.server_created_at.toISOString(),
- serverUpdatedAt: node.server_updated_at?.toISOString() ?? null,
- versionId: node.version_id,
- });
- }
- }
- }
-};
diff --git a/server/src/data/redis.ts b/server/src/data/redis.ts
index ab48174d..f76bf473 100644
--- a/server/src/data/redis.ts
+++ b/server/src/data/redis.ts
@@ -31,5 +31,5 @@ export const initRedis = async () => {
};
export const CHANNEL_NAMES = {
- CHANGES: process.env.REDIS_CHANGES_CHANNEL_NAME || 'neuron_changes',
+ SYNAPSE: process.env.REDIS_SYNAPSE_CHANNEL_NAME || 'neuron_synapse',
};
diff --git a/server/src/index.ts b/server/src/index.ts
index 11782ed7..c5959abe 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -1,21 +1,16 @@
import { initApi } from '@/api';
import { initRedis } from '@/data/redis';
-import { initChangesSubscriber } from '@/consumers/changes-subcriber';
import { migrate } from '@/data/database';
import { initEventWorker } from '@/queues/events';
import { initTaskWorker } from '@/queues/tasks';
-migrate().then(() => {
- initApi();
+const init = async () => {
+ await migrate();
+ await initRedis();
+ await initApi();
- initRedis().then(() => {
- console.log('Redis initialized');
+ initEventWorker();
+ initTaskWorker();
+};
- initEventWorker();
- initTaskWorker();
-
- initChangesSubscriber().then(() => {
- console.log('Change subscriber started');
- });
- });
-});
+init();
diff --git a/server/src/messages/index.ts b/server/src/messages/index.ts
deleted file mode 100644
index b40bc970..00000000
--- a/server/src/messages/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { LocalNodeSyncMessageInput } from '@/messages/local-node-sync';
-import { LocalNodeDeleteMessageInput } from '@/messages/local-node-delete';
-import { ServerNodeSyncMessageInput } from '@/messages/server-node-sync';
-import { ServerNodeDeleteMessageInput } from '@/messages/server-node-delete';
-
-export interface MessageMap {
- local_node_sync: LocalNodeSyncMessageInput;
- local_node_delete: LocalNodeDeleteMessageInput;
- server_node_sync: ServerNodeSyncMessageInput;
- server_node_delete: ServerNodeDeleteMessageInput;
-}
-
-export type MessageInput = MessageMap[keyof MessageMap];
-
-export type MessageContext = {
- accountId: string;
- deviceId: string;
-};
diff --git a/server/src/messages/local-node-delete.ts b/server/src/messages/local-node-delete.ts
deleted file mode 100644
index 94ab698a..00000000
--- a/server/src/messages/local-node-delete.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type LocalNodeDeleteMessageInput = {
- type: 'local_node_delete';
- nodeId: string;
- workspaceId: string;
-};
diff --git a/server/src/messages/local-node-sync.ts b/server/src/messages/local-node-sync.ts
deleted file mode 100644
index f021cd6f..00000000
--- a/server/src/messages/local-node-sync.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export type LocalNodeSyncMessageInput = {
- type: 'local_node_sync';
- nodeId: string;
- versionId: string;
- workspaceId: string;
-};
diff --git a/server/src/messages/server-node-delete.ts b/server/src/messages/server-node-delete.ts
deleted file mode 100644
index 1c91b0bd..00000000
--- a/server/src/messages/server-node-delete.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export type ServerNodeDeleteMessageInput = {
- type: 'server_node_delete';
- id: string;
- workspaceId: string;
-};
diff --git a/server/src/messages/server-node-sync.ts b/server/src/messages/server-node-sync.ts
deleted file mode 100644
index ee6045fe..00000000
--- a/server/src/messages/server-node-sync.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-export type ServerNodeSyncMessageInput = {
- type: 'server_node_sync';
- id: string;
- workspaceId: string;
- state: string;
- createdAt: string;
- createdBy: string;
- updatedAt: string | null;
- updatedBy: string | null;
- serverCreatedAt: string;
- serverUpdatedAt: string | null;
- versionId: string;
-};
diff --git a/server/src/queues/events.ts b/server/src/queues/events.ts
index b5dce3a2..c18bca6b 100644
--- a/server/src/queues/events.ts
+++ b/server/src/queues/events.ts
@@ -1,11 +1,12 @@
import { database } from '@/data/database';
-import { CHANNEL_NAMES, redis, redisConfig } from '@/data/redis';
+import { redisConfig } from '@/data/redis';
import { CreateNodeUserState } from '@/data/schema';
import { filesStorage } from '@/data/storage';
import { BUCKET_NAMES } from '@/data/storage';
import { NodeTypes } from '@/lib/constants';
import { generateId, IdType } from '@/lib/id';
import { fetchNodeCollaborators, fetchWorkspaceUsers } from '@/lib/nodes';
+import { synapse } from '@/services/synapse';
import {
NodeCreatedEvent,
NodeDeletedEvent,
@@ -61,14 +62,22 @@ const handleNodeCreatedEvent = async (
event: NodeCreatedEvent,
): Promise<void> => {
await createNodeUserStates(event);
- await publishChange(event.id, event.workspaceId, 'node_create');
+ await synapse.sendSynapseMessage({
+ type: 'node_create',
+ nodeId: event.id,
+ workspaceId: event.workspaceId,
+ });
};
const handleNodeUpdatedEvent = async (
event: NodeUpdatedEvent,
): Promise<void> => {
await checkForCollaboratorsChange(event);
- await publishChange(event.id, event.workspaceId, 'node_update');
+ await synapse.sendSynapseMessage({
+ type: 'node_update',
+ nodeId: event.id,
+ workspaceId: event.workspaceId,
+ });
};
const handleNodeDeletedEvent = async (
@@ -83,7 +92,11 @@ const handleNodeDeletedEvent = async (
await filesStorage.send(command);
}
- await publishChange(event.id, event.workspaceId, 'node_delete');
+ await synapse.sendSynapseMessage({
+ type: 'node_delete',
+ nodeId: event.id,
+ workspaceId: event.workspaceId,
+ });
};
const createNodeUserStates = async (event: NodeCreatedEvent): Promise<void> => {
@@ -95,9 +108,9 @@ const createNodeUserStates = async (event: NodeCreatedEvent): Promise<void> => {
userStatesToCreate.push({
user_id: userId,
node_id: event.id,
- last_seen_version_id: null,
workspace_id: event.workspaceId,
last_seen_at: null,
+ last_seen_version_id: null,
mentions_count: 0,
created_at: new Date(),
access_removed_at: null,
@@ -112,8 +125,8 @@ const createNodeUserStates = async (event: NodeCreatedEvent): Promise<void> => {
userStatesToCreate.push({
user_id: event.id,
node_id: userId,
- last_seen_version_id: null,
workspace_id: event.workspaceId,
+ last_seen_version_id: null,
last_seen_at: null,
mentions_count: 0,
created_at: new Date(),
@@ -130,9 +143,11 @@ const createNodeUserStates = async (event: NodeCreatedEvent): Promise<void> => {
userStatesToCreate.push({
user_id: collaboratorId,
node_id: event.id,
- last_seen_version_id: null,
workspace_id: event.workspaceId,
- last_seen_at: null,
+ last_seen_at:
+ collaboratorId === event.createdBy ? new Date(event.createdAt) : null,
+ last_seen_version_id:
+ collaboratorId === event.createdBy ? event.versionId : null,
mentions_count: 0,
created_at: new Date(),
access_removed_at: null,
@@ -258,17 +273,3 @@ const extractCollaboratorIds = (collaborators: ServerNodeAttributes) => {
return Object.keys(collaborators.collaborators).sort();
};
-
-const publishChange = async (
- nodeId: string,
- workspaceId: string,
- type: 'node_create' | 'node_update' | 'node_delete',
-): Promise<void> => {
- const changeJson = JSON.stringify({
- nodeId,
- workspaceId,
- type,
- });
-
- await redis.publish(CHANNEL_NAMES.CHANGES, changeJson);
-};
diff --git a/server/src/routes/sync.ts b/server/src/routes/sync.ts
index 269470ce..12aa895e 100644
--- a/server/src/routes/sync.ts
+++ b/server/src/routes/sync.ts
@@ -1,3 +1,4 @@
+import * as Y from 'yjs';
import { ApiError, NeuronRequest, NeuronResponse } from '@/types/api';
import { database } from '@/data/database';
import { Router } from 'express';
@@ -6,6 +7,7 @@ import {
LocalCreateNodeChangeData,
LocalDeleteNodeChangeData,
LocalNodeChangeData,
+ LocalNodeUserStateChangeData,
LocalUpdateNodeChangeData,
ServerSyncChangeResult,
SyncLocalChangeResult,
@@ -15,13 +17,13 @@ import { SelectWorkspaceUser } from '@/data/schema';
import { fetchCollaboratorRole } from '@/lib/nodes';
import { ServerNodeAttributes } from '@/types/nodes';
import { fromUint8Array, toUint8Array } from 'js-base64';
-import * as Y from 'yjs';
import {
NodeCreatedEvent,
NodeDeletedEvent,
NodeUpdatedEvent,
} from '@/types/events';
import { enqueueEvent } from '@/queues/events';
+import { synapse } from '@/services/synapse';
export const syncRouter = Router();
@@ -101,6 +103,9 @@ const handleLocalChange = async (
case 'node_delete': {
return handleDeleteNodeChange(workspaceUser, changeData);
}
+ case 'node_user_state_update': {
+ return handleNodeUserStateChange(workspaceUser, changeData);
+ }
default: {
return {
status: 'error',
@@ -298,3 +303,36 @@ const handleDeleteNodeChange = async (
status: 'success',
};
};
+
+const handleNodeUserStateChange = async (
+ workspaceUser: SelectWorkspaceUser,
+ changeData: LocalNodeUserStateChangeData,
+): Promise<SyncLocalChangeResult> => {
+ if (workspaceUser.id !== changeData.userId) {
+ return {
+ status: 'error',
+ };
+ }
+
+ await database
+ .updateTable('node_user_states')
+ .set({
+ last_seen_version_id: changeData.lastSeenVersionId,
+ last_seen_at: new Date(changeData.lastSeenAt),
+ mentions_count: changeData.mentionsCount,
+ version_id: changeData.versionId,
+ updated_at: new Date(changeData.lastSeenAt),
+ })
+ .where('node_id', '=', changeData.nodeId)
+ .where('user_id', '=', changeData.userId)
+ .execute();
+
+ await synapse.sendSynapseMessage({
+ type: 'node_user_state_update',
+ nodeId: changeData.nodeId,
+ userId: changeData.userId,
+ workspaceId: workspaceUser.workspace_id,
+ });
+
+ return { status: 'success' };
+};
diff --git a/server/src/services/synapse.ts b/server/src/services/synapse.ts
new file mode 100644
index 00000000..be6a0aa4
--- /dev/null
+++ b/server/src/services/synapse.ts
@@ -0,0 +1,526 @@
+import { database } from '@/data/database';
+import { Server } from 'http';
+import { WebSocketServer, WebSocket } from 'ws';
+import { verifyToken } from '@/lib/tokens';
+import { CHANNEL_NAMES } from '@/data/redis';
+import { redis } from '@/data/redis';
+import {
+ SynapseMessage,
+ SynapseNodeChangeMessage,
+ SynapseNodeUserStateChangeMessage,
+} from '@/types/events';
+import { getIdType, IdType } from '@/lib/id';
+import { MessageInput } from '@/types/messages';
+
+interface SynapseConnection {
+ accountId: string;
+ deviceId: string;
+ workspaceUsers: {
+ workspaceId: string;
+ userId: string;
+ }[];
+ pendingSyncs: Set<string>;
+ socket: WebSocket;
+ pendingSyncTimeout: NodeJS.Timeout | null;
+}
+
+class SynapseService {
+ private readonly connections: Map<string, SynapseConnection> = new Map();
+
+ public async init(server: Server) {
+ const wss = new WebSocketServer({
+ server,
+ path: '/v1/synapse',
+ verifyClient: async (info, callback) => {
+ const req = info.req;
+ const token = req.headers['authorization'];
+
+ if (!token) {
+ return callback(false, 401, 'Unauthorized');
+ }
+
+ callback(true);
+ },
+ });
+
+ wss.on('connection', async (socket, req) => {
+ const token = req.headers['authorization'];
+ if (!token) {
+ socket.close();
+ return;
+ }
+
+ const result = await verifyToken(token);
+ if (!result.authenticated) {
+ socket.close();
+ return;
+ }
+
+ const account = result.account;
+
+ socket.on('close', () => {
+ const connection = this.connections.get(account.deviceId);
+ if (connection) {
+ if (connection.pendingSyncTimeout) {
+ clearTimeout(connection.pendingSyncTimeout);
+ }
+
+ this.connections.delete(account.deviceId);
+ }
+ });
+
+ const connection: SynapseConnection = {
+ accountId: account.id,
+ deviceId: account.deviceId,
+ workspaceUsers: [],
+ pendingSyncs: new Set(),
+ pendingSyncTimeout: null,
+ socket,
+ };
+
+ socket.on('message', (message) => {
+ this.handleSocketMessage(connection, JSON.parse(message.toString()));
+ });
+
+ this.connections.set(account.deviceId, connection);
+ this.fetchWorkspaceUsers(connection).then(() => {
+ this.sendPendingChangesDebounced(connection);
+ });
+ });
+
+ const subscriber = redis.duplicate();
+ await subscriber.connect();
+ await subscriber.subscribe(CHANNEL_NAMES.SYNAPSE, (message) =>
+ this.handleSynapseMessage(message.toString()),
+ );
+ }
+
+ private sendSocketMessage(
+ connection: SynapseConnection,
+ message: MessageInput,
+ ) {
+ connection.socket.send(JSON.stringify(message));
+ }
+
+ private async handleSocketMessage(
+ connection: SynapseConnection,
+ message: MessageInput,
+ ) {
+ if (message.type === 'local_node_sync') {
+ await database
+ .insertInto('node_device_states')
+ .values({
+ node_id: message.nodeId,
+ device_id: connection.deviceId,
+ node_version_id: message.versionId,
+ user_state_version_id: null,
+ user_state_synced_at: null,
+ workspace_id: message.workspaceId,
+ node_synced_at: new Date(),
+ })
+ .onConflict((cb) =>
+ cb.columns(['node_id', 'device_id']).doUpdateSet({
+ workspace_id: message.workspaceId,
+ node_version_id: message.versionId,
+ node_synced_at: new Date(),
+ }),
+ )
+ .execute();
+ } else if (message.type === 'local_node_user_state_sync') {
+ await database
+ .insertInto('node_device_states')
+ .values({
+ node_id: message.nodeId,
+ device_id: connection.deviceId,
+ node_version_id: null,
+ user_state_version_id: message.versionId,
+ user_state_synced_at: new Date(),
+ workspace_id: message.workspaceId,
+ node_synced_at: new Date(),
+ })
+ .onConflict((cb) =>
+ cb.columns(['node_id', 'device_id']).doUpdateSet({
+ workspace_id: message.workspaceId,
+ user_state_version_id: message.versionId,
+ user_state_synced_at: new Date(),
+ }),
+ )
+ .execute();
+ } else if (message.type === 'local_node_delete') {
+ await database
+ .deleteFrom('node_device_states')
+ .where('device_id', '=', connection.deviceId)
+ .where('node_id', '=', message.nodeId)
+ .execute();
+
+ const userId = connection.workspaceUsers.find(
+ (wu) => wu.workspaceId === message.workspaceId,
+ )?.userId;
+
+ if (userId) {
+ await database
+ .deleteFrom('node_user_states')
+ .where('node_id', '=', message.nodeId)
+ .where('user_id', '=', userId)
+ .execute();
+ }
+ }
+
+ this.sendPendingChangesDebounced(connection);
+ }
+
+ public async sendSynapseMessage(message: SynapseMessage) {
+ await redis.publish(CHANNEL_NAMES.SYNAPSE, JSON.stringify(message));
+ }
+
+ private async handleSynapseMessage(message: string) {
+ const data: SynapseMessage = JSON.parse(message);
+ if (
+ data.type === 'node_create' ||
+ data.type === 'node_update' ||
+ data.type === 'node_delete'
+ ) {
+ this.handleNodeChangeMessage(data);
+ } else if (data.type === 'node_user_state_update') {
+ this.handleNodeUserStateUpdateMessage(data);
+ }
+ }
+
+ private async handleNodeChangeMessage(data: SynapseNodeChangeMessage) {
+ const idType = getIdType(data.nodeId);
+ if (idType === IdType.User) {
+ await this.addNewWorkspaceUser(data.nodeId, data.workspaceId);
+ }
+
+ await this.broadcastNodeChange(data);
+ }
+
+ private async broadcastNodeChange(data: SynapseNodeChangeMessage) {
+ const userDevices = this.getWorkspaceUserDevices(data.workspaceId);
+ const userIds = Array.from(userDevices.keys());
+ if (userIds.length === 0) {
+ return;
+ }
+
+ const nodeUserStates = await database
+ .selectFrom('node_user_states')
+ .selectAll()
+ .where((eb) =>
+ eb.and([eb('user_id', 'in', userIds), eb('node_id', '=', data.nodeId)]),
+ )
+ .execute();
+
+ if (nodeUserStates.length === 0) {
+ return;
+ }
+
+ if (data.type === 'node_delete') {
+ for (const nodeUserState of nodeUserStates) {
+ const deviceIds = userDevices.get(nodeUserState.user_id) ?? [];
+ for (const deviceId of deviceIds) {
+ const socketConnection = this.connections.get(deviceId);
+ if (socketConnection === undefined) {
+ continue;
+ }
+
+ this.sendSocketMessage(socketConnection, {
+ type: 'server_node_delete',
+ id: data.nodeId,
+ workspaceId: data.workspaceId,
+ });
+ }
+ }
+
+ return;
+ }
+
+ const node = await database
+ .selectFrom('nodes')
+ .select([
+ 'id',
+ 'state',
+ 'created_at',
+ 'created_by',
+ 'updated_at',
+ 'updated_by',
+ 'server_created_at',
+ 'server_updated_at',
+ 'version_id',
+ ])
+ .where('id', '=', data.nodeId)
+ .executeTakeFirst();
+
+ if (!node) {
+ return;
+ }
+
+ for (const nodeUserState of nodeUserStates) {
+ const deviceIds = userDevices.get(nodeUserState.user_id) ?? [];
+ if (deviceIds.length === 0) {
+ continue;
+ }
+
+ for (const deviceId of deviceIds) {
+ const socketConnection = this.connections.get(deviceId);
+ if (socketConnection === undefined) {
+ continue;
+ }
+
+ if (nodeUserState.access_removed_at !== null) {
+ this.sendSocketMessage(socketConnection, {
+ type: 'server_node_delete',
+ id: data.nodeId,
+ workspaceId: data.workspaceId,
+ });
+ } else {
+ this.sendSocketMessage(socketConnection, {
+ type: 'server_node_sync',
+ id: node.id,
+ workspaceId: data.workspaceId,
+ state: node.state!,
+ createdAt: node.created_at.toISOString(),
+ createdBy: node.created_by,
+ updatedAt: node.updated_at?.toISOString() ?? null,
+ updatedBy: node.updated_by ?? null,
+ serverCreatedAt: node.server_created_at.toISOString(),
+ serverUpdatedAt: node.server_updated_at?.toISOString() ?? null,
+ versionId: node.version_id,
+ });
+ }
+ }
+ }
+ }
+
+ private async handleNodeUserStateUpdateMessage(
+ data: SynapseNodeUserStateChangeMessage,
+ ) {
+ const userDevices = this.getWorkspaceUserDevices(data.workspaceId);
+ if (!userDevices.has(data.userId)) {
+ return;
+ }
+
+ const userState = await database
+ .selectFrom('node_user_states')
+ .selectAll()
+ .where('user_id', '=', data.userId)
+ .where('node_id', '=', data.nodeId)
+ .executeTakeFirst();
+
+ if (!userState) {
+ return;
+ }
+
+ const deviceIds = userDevices.get(data.userId) ?? [];
+ for (const deviceId of deviceIds) {
+ const socketConnection = this.connections.get(deviceId);
+ if (socketConnection === undefined) {
+ continue;
+ }
+
+ this.sendSocketMessage(socketConnection, {
+ type: 'server_node_user_state_sync',
+ userId: data.userId,
+ nodeId: data.nodeId,
+ lastSeenVersionId: userState.last_seen_version_id,
+ workspaceId: data.workspaceId,
+ versionId: userState.version_id,
+ lastSeenAt: userState.last_seen_at?.toISOString() ?? null,
+ createdAt: userState.created_at.toISOString(),
+ updatedAt: userState.updated_at?.toISOString() ?? null,
+ mentionsCount: userState.mentions_count,
+ });
+ }
+ }
+
+ private sendPendingChangesDebounced(connection: SynapseConnection) {
+ if (connection.pendingSyncTimeout) {
+ clearTimeout(connection.pendingSyncTimeout);
+ }
+
+ connection.pendingSyncTimeout = setTimeout(async () => {
+ await this.sendPendingChanges(connection);
+ }, 500);
+ }
+
+ private async sendPendingChanges(connection: SynapseConnection) {
+ const userIds = connection.workspaceUsers.map(
+ (workspaceUser) => workspaceUser.userId,
+ );
+
+ console.log('sendPendingChanges', userIds);
+
+ if (userIds.length === 0) {
+ return;
+ }
+
+ const unsyncedNodes = await database
+ .selectFrom('node_user_states as nus')
+ .leftJoin('nodes as n', 'n.id', 'nus.node_id')
+ .leftJoin('node_device_states as nds', (join) =>
+ join
+ .onRef('nds.node_id', '=', 'nus.node_id')
+ .on('nds.device_id', '=', connection.deviceId),
+ )
+ .select([
+ 'n.id',
+ 'n.state',
+ 'n.created_at',
+ 'n.created_by',
+ 'n.updated_at',
+ 'n.updated_by',
+ 'n.server_created_at',
+ 'n.server_updated_at',
+ 'nus.access_removed_at',
+ 'n.version_id as node_version_id',
+ 'nus.node_id',
+ 'nus.user_id',
+ 'nus.workspace_id',
+ 'nus.last_seen_version_id',
+ 'nus.last_seen_at',
+ 'nus.mentions_count',
+ 'nus.created_at',
+ 'nus.updated_at',
+ 'nus.version_id as user_state_version_id',
+ 'nds.node_version_id as device_node_version_id',
+ 'nds.user_state_version_id as device_user_state_version_id',
+ ])
+ .where((eb) =>
+ eb.and([
+ eb('nus.user_id', 'in', userIds),
+ eb.or([
+ eb('n.id', 'is', null),
+ eb('nus.access_removed_at', 'is not', null),
+ eb('nds.node_version_id', 'is', null),
+ eb('nds.node_version_id', '!=', eb.ref('n.version_id')),
+ eb('nds.user_state_version_id', 'is', null),
+ eb('nds.user_state_version_id', '!=', eb.ref('nus.version_id')),
+ ]),
+ ]),
+ )
+ .orderBy('n.id', 'asc')
+ .limit(100)
+ .execute();
+
+ if (unsyncedNodes.length === 0) {
+ return;
+ }
+
+ for (const row of unsyncedNodes) {
+ connection.pendingSyncs.add(row.node_id);
+ if (row.id === null) {
+ this.sendSocketMessage(connection, {
+ type: 'server_node_delete',
+ id: row.node_id,
+ workspaceId: row.workspace_id,
+ });
+ continue;
+ }
+
+ if (row.user_state_version_id !== row.device_user_state_version_id) {
+ this.sendSocketMessage(connection, {
+ type: 'server_node_user_state_sync',
+ nodeId: row.node_id,
+ userId: row.user_id,
+ workspaceId: row.workspace_id,
+ versionId: row.user_state_version_id!,
+ lastSeenAt: row.last_seen_at?.toISOString() ?? null,
+ lastSeenVersionId: row.last_seen_version_id ?? null,
+ mentionsCount: row.mentions_count,
+ createdAt: row.created_at!.toISOString(),
+ updatedAt: row.updated_at?.toISOString() ?? null,
+ });
+ }
+
+ if (row.node_version_id !== row.device_node_version_id) {
+ this.sendSocketMessage(connection, {
+ type: 'server_node_sync',
+ id: row.id,
+ workspaceId: row.workspace_id,
+ state: row.state!,
+ createdAt: row.created_at!.toISOString(),
+ createdBy: row.created_by!,
+ updatedAt: row.updated_at?.toISOString() ?? null,
+ updatedBy: row.updated_by ?? null,
+ serverCreatedAt: row.server_created_at!.toISOString(),
+ serverUpdatedAt: row.server_updated_at?.toISOString() ?? null,
+ versionId: row.node_version_id!,
+ });
+ }
+ }
+ }
+
+ private async addNewWorkspaceUser(userId: string, workspaceId: string) {
+ const workspaceUser = await database
+ .selectFrom('workspace_users')
+ .selectAll()
+ .where('id', '=', userId)
+ .executeTakeFirst();
+
+ if (!workspaceUser) {
+ return;
+ }
+
+ const devices = await database
+ .selectFrom('devices')
+ .selectAll()
+ .where('account_id', '=', workspaceUser.account_id)
+ .execute();
+
+ for (const device of devices) {
+ const connection = this.connections.get(device.id);
+ if (!connection) {
+ continue;
+ }
+
+ if (connection.workspaceUsers.find((wu) => wu.userId === userId)) {
+ continue;
+ }
+
+ connection.workspaceUsers.push({
+ workspaceId,
+ userId,
+ });
+ }
+ }
+
+ private async fetchWorkspaceUsers(
+ connection: SynapseConnection,
+ ): Promise<void> {
+ const workspaceUsers = await database
+ .selectFrom('workspace_users')
+ .selectAll()
+ .where('account_id', '=', connection.accountId)
+ .execute();
+
+ for (const workspaceUser of workspaceUsers) {
+ if (
+ !connection.workspaceUsers.find((wu) => wu.userId === workspaceUser.id)
+ ) {
+ connection.workspaceUsers.push({
+ workspaceId: workspaceUser.workspace_id,
+ userId: workspaceUser.id,
+ });
+ }
+ }
+ }
+
+ private getWorkspaceUserDevices(workspaceId: string): Map<string, string[]> {
+ const userDevices = new Map<string, string[]>();
+ for (const connection of this.connections.values()) {
+ const workspaceUsers = connection.workspaceUsers;
+ for (const workspaceUser of workspaceUsers) {
+ if (workspaceUser.workspaceId !== workspaceId) {
+ continue;
+ }
+
+ const userIds = userDevices.get(workspaceUser.userId) ?? [];
+ userIds.push(connection.deviceId);
+ userDevices.set(workspaceUser.userId, userIds);
+ }
+ }
+
+ return userDevices;
+ }
+}
+
+export const synapse = new SynapseService();
diff --git a/server/src/sockets/socket-connection.ts b/server/src/sockets/socket-connection.ts
deleted file mode 100644
index 18802c72..00000000
--- a/server/src/sockets/socket-connection.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import { database } from '@/data/database';
-import { MessageInput } from '@/messages';
-import { NeuronRequestAccount } from '@/types/api';
-import { WebSocket } from 'ws';
-
-interface WorkspaceUser {
- workspaceId: string;
- userId: string;
-}
-
-export class SocketConnection {
- private readonly socket: WebSocket;
- private readonly accountId: string;
- private readonly deviceId: string;
- private readonly workspaceUsers: WorkspaceUser[];
- private readonly pendingSyncs: Set<string>;
-
- constructor(socket: WebSocket, account: NeuronRequestAccount) {
- this.socket = socket;
- this.accountId = account.id;
- this.deviceId = account.deviceId;
- this.workspaceUsers = [];
- this.pendingSyncs = new Set();
-
- socket.on('message', (message) => {
- this.handleMessage(message.toString());
- });
- }
-
- public send(message: MessageInput): void {
- this.socket.send(JSON.stringify(message));
- }
-
- public init(): void {
- this.fetchWorkspaceUsers().then(() => {
- this.sendPendingChanges();
- });
- }
-
- public getDeviceId(): string {
- return this.deviceId;
- }
-
- public getWorkspaceUsers(): WorkspaceUser[] {
- return this.workspaceUsers;
- }
-
- public addWorkspaceUser(workspaceUser: WorkspaceUser): void {
- if (this.workspaceUsers.find((wu) => wu.userId === workspaceUser.userId)) {
- return;
- }
-
- this.workspaceUsers.push(workspaceUser);
- this.sendPendingChanges();
- }
-
- private async fetchWorkspaceUsers(): Promise<void> {
- const workspaceUsers = await database
- .selectFrom('workspace_users')
- .selectAll()
- .where('account_id', '=', this.accountId)
- .execute();
-
- for (const workspaceUser of workspaceUsers) {
- this.workspaceUsers.push({
- workspaceId: workspaceUser.workspace_id,
- userId: workspaceUser.id,
- });
- }
- }
-
- private async handleMessage(message: string): Promise<void> {
- const messageInput: MessageInput = JSON.parse(message);
- console.log(messageInput);
- if (messageInput.type === 'local_node_sync') {
- this.pendingSyncs.delete(messageInput.nodeId);
- await database
- .insertInto('node_device_states')
- .values({
- node_id: messageInput.nodeId,
- device_id: this.deviceId,
- node_version_id: messageInput.versionId,
- user_state_version_id: null,
- user_state_synced_at: null,
- workspace_id: messageInput.workspaceId,
- node_synced_at: new Date(),
- })
- .onConflict((cb) =>
- cb.columns(['node_id', 'device_id']).doUpdateSet({
- workspace_id: messageInput.workspaceId,
- node_version_id: messageInput.versionId,
- node_synced_at: new Date(),
- }),
- )
- .execute();
-
- if (this.pendingSyncs.size === 0) {
- this.sendPendingChanges();
- }
- } else if (messageInput.type === 'local_node_delete') {
- this.pendingSyncs.delete(messageInput.nodeId);
-
- await database
- .deleteFrom('node_device_states')
- .where('device_id', '=', this.deviceId)
- .where('node_id', '=', messageInput.nodeId)
- .execute();
-
- const userId = this.workspaceUsers.find(
- (wu) => wu.workspaceId === messageInput.workspaceId,
- )?.userId;
-
- if (userId) {
- await database
- .deleteFrom('node_user_states')
- .where('node_id', '=', messageInput.nodeId)
- .where('user_id', '=', userId)
- .execute();
- }
-
- if (this.pendingSyncs.size === 0) {
- this.sendPendingChanges();
- }
- }
- }
-
- private async sendPendingChanges() {
- const userIds = this.workspaceUsers.map(
- (workspaceUser) => workspaceUser.userId,
- );
-
- if (userIds.length === 0) {
- return;
- }
-
- console.log('userIds', userIds);
-
- const unsyncedNodes = await database
- .selectFrom('node_user_states as nus')
- .leftJoin('nodes as n', 'n.id', 'nus.node_id')
- .leftJoin('node_device_states as nds', (join) =>
- join
- .onRef('nds.node_id', '=', 'n.id')
- .on('nds.device_id', '=', this.deviceId),
- )
- .select([
- 'n.id',
- 'n.state',
- 'n.created_at',
- 'n.created_by',
- 'n.updated_at',
- 'n.updated_by',
- 'n.server_created_at',
- 'n.server_updated_at',
- 'nus.access_removed_at',
- 'n.version_id',
- 'nus.node_id',
- 'nus.workspace_id',
- ])
- .where((eb) =>
- eb.and([
- eb('nus.user_id', 'in', userIds),
- eb.or([
- eb('n.id', 'is', null),
- eb('nds.node_version_id', 'is', null),
- eb('nds.node_version_id', '!=', eb.ref('n.version_id')),
- eb('nus.access_removed_at', 'is not', null),
- ]),
- ]),
- )
- .orderBy('n.id', 'asc')
- .limit(100)
- .execute();
-
- if (unsyncedNodes.length === 0) {
- return;
- }
-
- for (const row of unsyncedNodes) {
- this.pendingSyncs.add(row.node_id);
- if (row.id === null) {
- this.send({
- type: 'server_node_delete',
- id: row.node_id,
- workspaceId: row.workspace_id,
- });
- } else {
- this.send({
- type: 'server_node_sync',
- id: row.id,
- workspaceId: row.workspace_id,
- state: row.state!,
- createdAt: row.created_at!.toISOString(),
- createdBy: row.created_by!,
- updatedAt: row.updated_at?.toISOString() ?? null,
- updatedBy: row.updated_by ?? null,
- serverCreatedAt: row.server_created_at!.toISOString(),
- serverUpdatedAt: row.server_updated_at?.toISOString() ?? null,
- versionId: row.version_id!,
- });
- }
- }
- }
-}
diff --git a/server/src/sockets/socket-manager.ts b/server/src/sockets/socket-manager.ts
deleted file mode 100644
index a3c85ed1..00000000
--- a/server/src/sockets/socket-manager.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import http from 'http';
-import { WebSocketServer } from 'ws';
-import { verifyToken } from '@/lib/tokens';
-import { SocketConnection } from '@/sockets/socket-connection';
-import { MessageInput } from '@/messages';
-
-class SocketManager {
- private readonly sockets: Map<string, SocketConnection> = new Map();
-
- public init(server: http.Server) {
- const wss = new WebSocketServer({
- server,
- path: '/v1/synapse',
- verifyClient: async (info, callback) => {
- const req = info.req;
- const token = req.headers['authorization'];
-
- if (!token) {
- return callback(false, 401, 'Unauthorized');
- }
-
- callback(true);
- },
- });
-
- wss.on('connection', async (socket, req) => {
- const token = req.headers['authorization'];
- if (!token) {
- socket.close();
- return;
- }
-
- const result = await verifyToken(token);
- if (!result.authenticated) {
- socket.close();
- return;
- }
-
- const account = result.account;
-
- socket.on('close', () => {
- this.sockets.delete(account.deviceId);
- });
-
- const connection = new SocketConnection(socket, account);
- connection.init();
-
- this.sockets.set(account.deviceId, connection);
- });
- }
-
- public getConnections(): IterableIterator<SocketConnection> {
- return this.sockets.values();
- }
-
- public getConnection(deviceId: string): SocketConnection | undefined {
- return this.sockets.get(deviceId);
- }
-
- public send(deviceId: string, message: MessageInput) {
- const connection = this.sockets.get(deviceId);
- if (!connection) {
- return;
- }
-
- connection.send(message);
- }
-}
-
-export const socketManager = new SocketManager();
diff --git a/server/src/types/events.ts b/server/src/types/events.ts
index 6b7bb2b1..12ecda6c 100644
--- a/server/src/types/events.ts
+++ b/server/src/types/events.ts
@@ -32,3 +32,20 @@ export type NodeDeletedEvent = {
attributes: ServerNodeAttributes;
deletedAt: string;
};
+
+export type SynapseNodeChangeMessage = {
+ workspaceId: string;
+ nodeId: string;
+ type: 'node_create' | 'node_update' | 'node_delete';
+};
+
+export type SynapseNodeUserStateChangeMessage = {
+ workspaceId: string;
+ nodeId: string;
+ userId: string;
+ type: 'node_user_state_update';
+};
+
+export type SynapseMessage =
+ | SynapseNodeChangeMessage
+ | SynapseNodeUserStateChangeMessage;
diff --git a/server/src/types/messages.ts b/server/src/types/messages.ts
new file mode 100644
index 00000000..a79ed16d
--- /dev/null
+++ b/server/src/types/messages.ts
@@ -0,0 +1,61 @@
+export type LocalNodeSyncMessageInput = {
+ type: 'local_node_sync';
+ nodeId: string;
+ versionId: string;
+ workspaceId: string;
+};
+
+export type LocalNodeDeleteMessageInput = {
+ type: 'local_node_delete';
+ nodeId: string;
+ workspaceId: string;
+};
+
+export type LocalNodeUserStateSyncMessageInput = {
+ type: 'local_node_user_state_sync';
+ nodeId: string;
+ userId: string;
+ workspaceId: string;
+ versionId: string;
+};
+
+export type ServerNodeSyncMessageInput = {
+ type: 'server_node_sync';
+ id: string;
+ workspaceId: string;
+ state: string;
+ createdAt: string;
+ createdBy: string;
+ updatedAt: string | null;
+ updatedBy: string | null;
+ serverCreatedAt: string;
+ serverUpdatedAt: string | null;
+ versionId: string;
+};
+
+export type ServerNodeUserStateSyncMessageInput = {
+ type: 'server_node_user_state_sync';
+ nodeId: string;
+ userId: string;
+ workspaceId: string;
+ versionId: string;
+ lastSeenAt: string | null;
+ lastSeenVersionId: string | null;
+ mentionsCount: number;
+ createdAt: string;
+ updatedAt: string | null;
+};
+
+export type ServerNodeDeleteMessageInput = {
+ type: 'server_node_delete';
+ id: string;
+ workspaceId: string;
+};
+
+export type MessageInput =
+ | LocalNodeSyncMessageInput
+ | LocalNodeDeleteMessageInput
+ | ServerNodeSyncMessageInput
+ | ServerNodeDeleteMessageInput
+ | LocalNodeUserStateSyncMessageInput
+ | ServerNodeUserStateSyncMessageInput;
diff --git a/server/src/types/sync.ts b/server/src/types/sync.ts
index 7ab7e949..1d03a722 100644
--- a/server/src/types/sync.ts
+++ b/server/src/types/sync.ts
@@ -44,13 +44,18 @@ export type LocalDeleteNodeChangeData = {
deletedBy: string;
};
+export type LocalNodeUserStateChangeData = {
+ type: 'node_user_state_update';
+ nodeId: string;
+ userId: string;
+ lastSeenVersionId: string;
+ lastSeenAt: string;
+ mentionsCount: number;
+ versionId: string;
+};
+
export type LocalNodeChangeData =
| LocalCreateNodeChangeData
| LocalUpdateNodeChangeData
- | LocalDeleteNodeChangeData;
-
-export type ServerNodeChangeEvent = {
- workspaceId: string;
- nodeId: string;
- type: 'node_create' | 'node_update' | 'node_delete';
-};
+ | LocalDeleteNodeChangeData
+ | LocalNodeUserStateChangeData;