Skip to content

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

Improve syncing and radar service

Hakan Shehu6cc1acf6c04d
diff --git a/apps/desktop/src/main/handlers/queries/read-states-get.ts b/apps/desktop/src/main/handlers/queries/read-states-get.ts
index 7a219b53..e919f09f 100644
--- a/apps/desktop/src/main/handlers/queries/read-states-get.ts
+++ b/apps/desktop/src/main/handlers/queries/read-states-get.ts
@@ -19,12 +19,7 @@ export class ReadStatesGetQueryHandler
_: ReadStatesGetQueryInput,
___: Record<string, WorkspaceReadState>
): Promise<ChangeCheckResult<ReadStatesGetQueryInput>> {
- if (
- event.type === 'node_created' ||
- event.type === 'node_updated' ||
- event.type === 'node_deleted' ||
- event.type === 'user_node_created'
- ) {
+ if (event.type === 'radar_data_updated') {
const data = radarService.getWorkspaceStates();
return {
hasChanges: true,
diff --git a/apps/desktop/src/main/services/radar-service.ts b/apps/desktop/src/main/services/radar-service.ts
index 2cd41da0..53a777c6 100644
--- a/apps/desktop/src/main/services/radar-service.ts
+++ b/apps/desktop/src/main/services/radar-service.ts
@@ -91,12 +91,18 @@ class RadarService {
private async handleEvent(event: Event) {
if (event.type === 'workspace_deleted') {
delete this.workspaceStates[event.workspace.userId];
+ eventBus.publish({
+ type: 'radar_data_updated',
+ });
} else if (event.type === 'user_node_created') {
// to be optimized
const workspaceDatabase = await databaseService.getWorkspaceDatabase(
event.userId
);
await this.initWorkspace(event.userId, workspaceDatabase);
+ eventBus.publish({
+ type: 'radar_data_updated',
+ });
}
}
}
diff --git a/apps/desktop/src/main/synchronizer.ts b/apps/desktop/src/main/synchronizer.ts
index 2fb3495c..ff5fb9ed 100644
--- a/apps/desktop/src/main/synchronizer.ts
+++ b/apps/desktop/src/main/synchronizer.ts
@@ -1,8 +1,13 @@
import { httpClient } from '@/shared/lib/http-client';
import { databaseService } from '@/main/data/database-service';
-import { ServerSyncResponse } from '@/shared/types/sync';
+import { LocalChange, SyncChangesOutput } from '@colanode/core';
import { WorkspaceCredentials } from '@/shared/types/workspaces';
import { fileService } from '@/main/services/file-service';
+import {
+ SelectChange,
+ WorkspaceDatabaseSchema,
+} from '@/main/data/workspace/schema';
+import { Kysely } from 'kysely';
const EVENT_LOOP_INTERVAL = 1000;
@@ -112,24 +117,13 @@ class Synchronizer {
credentials.userId
);
- let hasMoreChanges = true;
- while (hasMoreChanges) {
- const changes = await workspaceDatabase
- .selectFrom('changes')
- .selectAll()
- .orderBy('id asc')
- .limit(20)
- .execute();
-
- if (changes.length === 0) {
- hasMoreChanges = false;
- break;
- }
-
- const { data } = await httpClient.post<ServerSyncResponse>(
+ const changes = await this.fetchAndCompactChanges(workspaceDatabase);
+ while (changes.length > 0) {
+ const changesToSync = changes.splice(0, 20);
+ const { data } = await httpClient.post<SyncChangesOutput>(
`/v1/sync/${credentials.workspaceId}`,
{
- changes: changes,
+ changes: changesToSync,
},
{
serverDomain: credentials.serverDomain,
@@ -171,6 +165,81 @@ class Synchronizer {
}
}
}
+
+ private async fetchAndCompactChanges(
+ database: Kysely<WorkspaceDatabaseSchema>
+ ): Promise<LocalChange[]> {
+ const changeRows = await database
+ .selectFrom('changes')
+ .selectAll()
+ .orderBy('id asc')
+ .limit(1000)
+ .execute();
+
+ if (changeRows.length === 0) {
+ return [];
+ }
+
+ const changes: LocalChange[] = changeRows.map(this.mapChange);
+ const changesToDelete = new Set<number>();
+ for (let i = changes.length - 1; i >= 0; i--) {
+ const change = changes[i];
+
+ if (changesToDelete.has(change.id)) {
+ continue;
+ }
+
+ if (change.data.type === 'node_delete') {
+ for (let j = i - 1; j >= 0; j--) {
+ const otherChange = changes[j];
+ if (
+ otherChange.data.type === 'node_create' &&
+ otherChange.data.id === change.data.id
+ ) {
+ // if the node has been created and then deleted, we don't need to sync the delete
+ changesToDelete.add(change.id);
+ changesToDelete.add(otherChange.id);
+ }
+
+ if (
+ otherChange.data.type === 'node_update' &&
+ otherChange.data.id === change.data.id
+ ) {
+ changesToDelete.add(otherChange.id);
+ }
+ }
+ } else if (change.data.type === 'user_node_update') {
+ for (let j = i - 1; j >= 0; j--) {
+ const otherChange = changes[j];
+ if (
+ otherChange.data.type === 'user_node_update' &&
+ otherChange.data.nodeId === change.data.nodeId &&
+ otherChange.data.userId === change.data.userId
+ ) {
+ changesToDelete.add(otherChange.id);
+ }
+ }
+ }
+ }
+
+ if (changesToDelete.size > 0) {
+ const toDeleteIds = Array.from(changesToDelete);
+ await database
+ .deleteFrom('changes')
+ .where('id', 'in', toDeleteIds)
+ .execute();
+ }
+
+ return changes.filter((change) => !changesToDelete.has(change.id));
+ }
+
+ private mapChange(change: SelectChange): LocalChange {
+ return {
+ id: change.id,
+ data: JSON.parse(change.data),
+ createdAt: change.created_at,
+ };
+ }
}
export const synchronizer = new Synchronizer();
diff --git a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx
index 27c04f53..8b93d8ee 100644
--- a/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/channels/channel-create-dialog.tsx
@@ -68,7 +68,7 @@ export const ChannelCreateDialog = ({
onSuccess(output) {
onOpenChange(false);
form.reset();
- workspace.navigateToNode(output.id);
+ workspace.openInMain(output.id);
},
});
};
diff --git a/apps/desktop/src/renderer/components/chats/chat-create-command.tsx b/apps/desktop/src/renderer/components/chats/chat-create-command.tsx
index f07c78bd..1981b1b4 100644
--- a/apps/desktop/src/renderer/components/chats/chat-create-command.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-create-command.tsx
@@ -47,7 +47,7 @@ export const ChatCreateCommand = () => {
workspaceId: workspace.id,
},
onSuccess(output) {
- workspace.navigateToNode(output.id);
+ workspace.openInMain(output.id);
setQuery('');
},
});
diff --git a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
index 4979002b..e0c72118 100644
--- a/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/chats/chat-sidebar-item.tsx
@@ -56,7 +56,9 @@ export const ChatSidebarItem = ({ node }: ChatSidebarItemProps) => {
>
{data.attributes.name ?? 'Unnamed'}
</span>
- <ReadStateIndicator count={unreadCount} hasChanges={unreadCount > 0} />
+ {!isActive && (
+ <ReadStateIndicator count={unreadCount} hasChanges={unreadCount > 0} />
+ )}
</div>
);
};
diff --git a/apps/desktop/src/renderer/components/databases/boards/board-view-card.tsx b/apps/desktop/src/renderer/components/databases/boards/board-view-card.tsx
index 0f87c388..29223a26 100644
--- a/apps/desktop/src/renderer/components/databases/boards/board-view-card.tsx
+++ b/apps/desktop/src/renderer/components/databases/boards/board-view-card.tsx
@@ -69,7 +69,7 @@ export const BoardViewCard = ({ record }: BoardViewCardProps) => {
'animate-fade-in flex cursor-pointer flex-col gap-1 rounded-md border p-2 text-left hover:bg-gray-50',
hasName ? '' : 'text-muted-foreground'
)}
- onClick={() => workspace.openModal(record.id)}
+ onClick={() => workspace.openInModal(record.id)}
>
{name ?? 'Unnamed'}
</button>
diff --git a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-card.tsx b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-card.tsx
index 8f0be249..7d0c8934 100644
--- a/apps/desktop/src/renderer/components/databases/calendars/calendar-view-card.tsx
+++ b/apps/desktop/src/renderer/components/databases/calendars/calendar-view-card.tsx
@@ -20,7 +20,7 @@ export const CalendarViewCard = ({ record }: CalendarViewCardProps) => {
'animate-fade-in flex cursor-pointer flex-col gap-1 rounded-md border p-2 hover:bg-gray-50',
hasName ? '' : 'text-muted-foreground'
)}
- onClick={() => workspace.openModal(record.id)}
+ onClick={() => workspace.openInModal(record.id)}
>
{name ?? 'Unnamed'}
</button>
diff --git a/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx b/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx
index 7d6c90a0..9376e9d2 100644
--- a/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/databases/database-create-dialog.tsx
@@ -64,7 +64,7 @@ export const DatabaseCreateDialog = ({
onSuccess(output) {
onOpenChange(false);
form.reset();
- workspace.navigateToNode(output.id);
+ workspace.openInMain(output.id);
},
});
};
diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx
index cc259a7b..fa26cb66 100644
--- a/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx
+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx
@@ -96,7 +96,7 @@ export const TableViewNameCell = ({ record }: TableViewNameCellProps) => {
<button
type="button"
className="absolute right-2 flex h-6 cursor-pointer flex-row items-center gap-1 rounded-md border bg-white p-1 text-sm text-muted-foreground opacity-0 hover:bg-gray-50 group-hover:opacity-100"
- onClick={() => workspace.openModal(record.id)}
+ onClick={() => workspace.openInModal(record.id)}
>
<Maximize2 className="mr-1 size-4" /> <p>Open</p>
</button>
diff --git a/apps/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx b/apps/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx
index 74e3e79f..4856e766 100644
--- a/apps/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx
+++ b/apps/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx
@@ -25,7 +25,7 @@ export const TableViewRecordCreateRow = () => {
userId: workspace.userId,
},
onSuccess: (output) => {
- workspace.openModal(output.id);
+ workspace.openInModal(output.id);
},
});
}}
diff --git a/apps/desktop/src/renderer/components/files/file-block.tsx b/apps/desktop/src/renderer/components/files/file-block.tsx
index cd464ed9..c705ed4b 100644
--- a/apps/desktop/src/renderer/components/files/file-block.tsx
+++ b/apps/desktop/src/renderer/components/files/file-block.tsx
@@ -27,7 +27,7 @@ export const FileBlock = ({ id }: FileBlockProps) => {
<div
className="flex h-72 max-h-72 w-full cursor-pointer overflow-hidden rounded-md p-2 hover:bg-gray-100"
onClick={() => {
- workspace.openModal(id);
+ workspace.openInModal(id);
}}
>
{downloadProgress !== 100 ? (
diff --git a/apps/desktop/src/renderer/components/files/file-context-menu.tsx b/apps/desktop/src/renderer/components/files/file-context-menu.tsx
index 9eb750e7..44712421 100644
--- a/apps/desktop/src/renderer/components/files/file-context-menu.tsx
+++ b/apps/desktop/src/renderer/components/files/file-context-menu.tsx
@@ -26,7 +26,7 @@ export const FileContextMenu = ({ id, children }: FileContextMenuProps) => {
<ContextMenuContent className="w-64">
<ContextMenuItem
onSelect={() => {
- workspace.openModal(id);
+ workspace.openInModal(id);
}}
className="pl-2"
>
diff --git a/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx b/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx
index 7f9383ea..ca3fedaa 100644
--- a/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-create-dialog.tsx
@@ -65,7 +65,7 @@ export const FolderCreateDialog = ({
onSuccess(output) {
onOpenChange(false);
form.reset();
- workspace.navigateToNode(output.id);
+ workspace.openInMain(output.id);
},
});
};
diff --git a/apps/desktop/src/renderer/components/folders/folder-files.tsx b/apps/desktop/src/renderer/components/folders/folder-files.tsx
index 53e996ef..b91692ce 100644
--- a/apps/desktop/src/renderer/components/folders/folder-files.tsx
+++ b/apps/desktop/src/renderer/components/folders/folder-files.tsx
@@ -47,9 +47,9 @@ export const FolderFiles = ({ id, name, layout }: FolderFilesProps) => {
const idType = getIdType(id);
if (idType === IdType.Folder) {
- workspace.navigateToNode(id);
+ workspace.openInMain(id);
} else if (idType === IdType.File) {
- workspace.openModal(id);
+ workspace.openInModal(id);
}
},
onMove: () => {},
diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx
index e036eddf..74cf0d41 100644
--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx
+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-chats.tsx
@@ -37,7 +37,7 @@ export const LayoutSidebarChats = () => {
<SidebarMenuButton
isActive={workspace.isNodeActive(item.id)}
onClick={() => {
- workspace.navigateToNode(item.id);
+ workspace.openInMain(item.id);
}}
>
<ChatSidebarItem node={item} />
diff --git a/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx b/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx
index 34faa1bb..758fcb25 100644
--- a/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx
+++ b/apps/desktop/src/renderer/components/layouts/node-breadcrumb.tsx
@@ -53,7 +53,7 @@ export const NodeBreadcrumb = ({ nodes }: NodeBreadcrumbProps) => {
}
onClick={() => {
if (isClickableNode) {
- workspace.navigateToNode(node.id);
+ workspace.openInMain(node.id);
}
}}
>
@@ -78,7 +78,7 @@ export const NodeBreadcrumb = ({ nodes }: NodeBreadcrumbProps) => {
disabled={!isClickableEllipsisNode}
onClick={() => {
if (isClickableEllipsisNode) {
- workspace.navigateToNode(ellipsisNode.id);
+ workspace.openInMain(ellipsisNode.id);
}
}}
>
diff --git a/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsx b/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsx
index 71d848c4..3e488812 100644
--- a/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsx
+++ b/apps/desktop/src/renderer/components/layouts/node-fullscreen-button.tsx
@@ -12,7 +12,7 @@ export const NodeFullscreenButton = ({ nodeId }: NodeFullscreenButtonProps) => {
<Fullscreen
className="size-5 cursor-pointer text-muted-foreground hover:text-foreground"
onClick={() => {
- workspace.navigateToNode(nodeId);
+ workspace.openInMain(nodeId);
}}
/>
);
diff --git a/apps/desktop/src/renderer/components/messages/message.tsx b/apps/desktop/src/renderer/components/messages/message.tsx
index 9fc11182..010e4190 100644
--- a/apps/desktop/src/renderer/components/messages/message.tsx
+++ b/apps/desktop/src/renderer/components/messages/message.tsx
@@ -15,6 +15,7 @@ import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { MessagesSquare, Reply } from 'lucide-react';
import { useConversation } from '@/renderer/contexts/conversation';
+import { useRadar } from '@/renderer/contexts/radar';
interface MessageProps {
message: MessageNode;
@@ -42,6 +43,7 @@ const shouldDisplayUserInfo = (
export const Message = ({ message, previousMessage }: MessageProps) => {
const workspace = useWorkspace();
const conversation = useConversation();
+ const radar = useRadar();
const { mutate, isPending } = useMutation();
@@ -91,7 +93,7 @@ export const Message = ({ message, previousMessage }: MessageProps) => {
rootMargin="50px"
onChange={(inView) => {
if (inView) {
- workspace.markAsSeen(message.id, message.versionId);
+ radar.markAsSeen(workspace.userId, message.id, message.versionId);
}
}}
>
diff --git a/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx b/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx
index f987bcc7..484a01d6 100644
--- a/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx
+++ b/apps/desktop/src/renderer/components/pages/page-create-dialog.tsx
@@ -65,7 +65,7 @@ export const PageCreateDialog = ({
onSuccess(output) {
onOpenChange(false);
form.reset();
- workspace.navigateToNode(output.id);
+ workspace.openInMain(output.id);
},
});
};
diff --git a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
index 6edc846f..8279cf9b 100644
--- a/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
+++ b/apps/desktop/src/renderer/components/spaces/space-sidebar-item.tsx
@@ -163,7 +163,7 @@ export const SpaceSidebarItem = ({ node }: SpaceSidebarItemProps) => {
<SidebarMenuSubItem
key={child.id}
onClick={() => {
- workspace.navigateToNode(child.id);
+ workspace.openInMain(child.id);
}}
className="cursor-pointer"
>
diff --git a/apps/desktop/src/renderer/components/workspaces/workspace.tsx b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
index 8070072e..42693b72 100644
--- a/apps/desktop/src/renderer/components/workspaces/workspace.tsx
+++ b/apps/desktop/src/renderer/components/workspaces/workspace.tsx
@@ -24,7 +24,7 @@ export const Workspace = () => {
<WorkspaceContext.Provider
value={{
...workspace,
- navigateToNode(nodeId) {
+ openInMain(nodeId) {
setSearchParams((prev) => {
prev.set('main', nodeId);
if (nodeId === modal) {
@@ -36,7 +36,7 @@ export const Workspace = () => {
isNodeActive(id) {
return id === main;
},
- openModal(modal) {
+ openInModal(modal) {
setSearchParams((prev) => {
prev.set('modal', modal);
return prev;
@@ -51,14 +51,6 @@ export const Workspace = () => {
openSettings() {
setOpenSettings(true);
},
- markAsSeen() {
- // window.colanode.executeMutation({
- // type: 'mark_node_as_seen',
- // nodeId: nodeId,
- // versionId: versionId,
- // userId: workspace.userId,
- // });
- },
}}
>
<Layout main={main} modal={modal} />
diff --git a/apps/desktop/src/renderer/contexts/radar.ts b/apps/desktop/src/renderer/contexts/radar.ts
index 551ce505..2a6f7754 100644
--- a/apps/desktop/src/renderer/contexts/radar.ts
+++ b/apps/desktop/src/renderer/contexts/radar.ts
@@ -9,6 +9,7 @@ interface RadarContext {
getWorkspaceState: (userId: string) => WorkspaceReadState;
getChatState: (userId: string, nodeId: string) => ChatReadState;
getChannelState: (userId: string, nodeId: string) => ChannelReadState;
+ markAsSeen: (userId: string, nodeId: string, versionId: string) => void;
}
export const RadarContext = createContext<RadarContext>({} as RadarContext);
diff --git a/apps/desktop/src/renderer/contexts/workspace.ts b/apps/desktop/src/renderer/contexts/workspace.ts
index 7759eb30..f26a5b01 100644
--- a/apps/desktop/src/renderer/contexts/workspace.ts
+++ b/apps/desktop/src/renderer/contexts/workspace.ts
@@ -2,11 +2,10 @@ import { createContext, useContext } from 'react';
import { Workspace } from '@/shared/types/workspaces';
interface WorkspaceContext extends Workspace {
- navigateToNode: (nodeId: string) => void;
+ openInMain: (nodeId: string) => void;
isNodeActive: (nodeId: string) => boolean;
- openModal: (nodeId: string) => void;
+ openInModal: (nodeId: string) => void;
closeModal: () => void;
- markAsSeen: (nodeId: string, versionId: string) => void;
openSettings: () => void;
}
diff --git a/apps/desktop/src/renderer/editor/views/folder.tsx b/apps/desktop/src/renderer/editor/views/folder.tsx
index d445addc..729b4d2a 100644
--- a/apps/desktop/src/renderer/editor/views/folder.tsx
+++ b/apps/desktop/src/renderer/editor/views/folder.tsx
@@ -30,7 +30,7 @@ export const FolderNodeView = ({ node }: NodeViewProps) => {
data-id={node.attrs.id}
className="my-0.5 flex h-12 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"
onClick={() => {
- workspace.navigateToNode(id);
+ workspace.openInMain(id);
}}
>
<Avatar size="small" id={id} name={name} avatar={avatar} />
diff --git a/apps/desktop/src/renderer/editor/views/page.tsx b/apps/desktop/src/renderer/editor/views/page.tsx
index c0d34d13..09fc77c6 100644
--- a/apps/desktop/src/renderer/editor/views/page.tsx
+++ b/apps/desktop/src/renderer/editor/views/page.tsx
@@ -30,7 +30,7 @@ export const PageNodeView = ({ node }: NodeViewProps) => {
data-id={node.attrs.id}
className="my-0.5 flex h-12 w-full cursor-pointer flex-row items-center gap-1 rounded-md bg-gray-50 p-2 hover:bg-gray-100"
onClick={() => {
- workspace.navigateToNode(id);
+ workspace.openInMain(id);
}}
>
<Avatar size="small" id={id} name={name} avatar={avatar} />
diff --git a/apps/desktop/src/renderer/radar-provider.tsx b/apps/desktop/src/renderer/radar-provider.tsx
index 94699fe0..6a0b2db7 100644
--- a/apps/desktop/src/renderer/radar-provider.tsx
+++ b/apps/desktop/src/renderer/radar-provider.tsx
@@ -54,6 +54,14 @@ export const RadarProvider = ({ children }: RadarProviderProps) => {
mentionsCount: 0,
};
},
+ markAsSeen: (userId, nodeId, versionId) => {
+ window.colanode.executeMutation({
+ type: 'mark_node_as_seen',
+ nodeId,
+ versionId,
+ userId,
+ });
+ },
}}
>
{children}
diff --git a/apps/desktop/src/shared/types/events.ts b/apps/desktop/src/shared/types/events.ts
index 50d15000..1903c4d6 100644
--- a/apps/desktop/src/shared/types/events.ts
+++ b/apps/desktop/src/shared/types/events.ts
@@ -105,6 +105,10 @@ export type QueryResultUpdatedEvent = {
result: any;
};
+export type RadarDataUpdatedEvent = {
+ type: 'radar_data_updated';
+};
+
export type Event =
| NodeCreatedEvent
| NodeUpdatedEvent
@@ -123,4 +127,5 @@ export type Event =
| UploadCreatedEvent
| UploadUpdatedEvent
| UploadDeletedEvent
- | QueryResultUpdatedEvent;
+ | QueryResultUpdatedEvent
+ | RadarDataUpdatedEvent;
diff --git a/apps/desktop/src/shared/types/sync.ts b/apps/desktop/src/shared/types/sync.ts
deleted file mode 100644
index 254d0d3f..00000000
--- a/apps/desktop/src/shared/types/sync.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-export type ServerSyncResponse = {
- results: ServerSyncChangeResult[];
-};
-
-export type ServerSyncChangeResult = {
- id: number;
- status: ServerSyncChangeStatus;
-};
-
-export type ServerSyncChangeStatus = 'success' | 'error';
-
-export type LocalCreateNodeChangeData = {
- type: 'node_create';
- id: string;
- state: string;
- createdAt: string;
- createdBy: string;
- versionId: string;
-};
-
-export type LocalUpdateNodeChangeData = {
- type: 'node_update';
- id: string;
- updates: string[];
- updatedAt: string;
- updatedBy: string;
- versionId: string;
-};
-
-export type LocalDeleteNodeChangeData = {
- type: 'node_delete';
- id: string;
- deletedAt: string;
- deletedBy: string;
-};
-
-export type LocalUserNodeChangeData = {
- type: 'user_node_update';
- nodeId: string;
- userId: string;
- lastSeenVersionId: string;
- lastSeenAt: string;
- mentionsCount: number;
- versionId: string;
-};
-
-export type LocalNodeChangeData =
- | LocalCreateNodeChangeData
- | LocalUpdateNodeChangeData
- | LocalDeleteNodeChangeData
- | LocalUserNodeChangeData;
diff --git a/apps/server/src/routes/sync.ts b/apps/server/src/routes/sync.ts
index 38b10a4e..e295d412 100644
--- a/apps/server/src/routes/sync.ts
+++ b/apps/server/src/routes/sync.ts
@@ -1,17 +1,6 @@
import { ApiError, ColanodeRequest, ColanodeResponse } from '@/types/api';
import { database, hasUpdateChanges } from '@/data/database';
import { Router } from 'express';
-import {
- LocalChange,
- LocalCreateNodeChangeData,
- LocalDeleteNodeChangeData,
- LocalNodeChangeData,
- LocalUpdateNodeChangeData,
- LocalUserNodeChangeData,
- ServerSyncChangeResult,
- SyncLocalChangeResult,
- SyncLocalChangesInput,
-} from '@/types/sync';
import { SelectWorkspaceUser } from '@/data/schema';
import {
NodeCreatedEvent,
@@ -21,7 +10,18 @@ import {
import { enqueueEvent } from '@/queues/events';
import { synapse } from '@/services/synapse';
import { fetchNodeAncestors, mapNode } from '@/lib/nodes';
-import { NodeMutationContext, registry } from '@colanode/core';
+import {
+ NodeMutationContext,
+ registry,
+ LocalChange,
+ LocalCreateNodeChangeData,
+ LocalDeleteNodeChangeData,
+ LocalUpdateNodeChangeData,
+ LocalUserNodeChangeData,
+ SyncChangeResult,
+ SyncChangesInput,
+ SyncChangeStatus,
+} from '@colanode/core';
import { YDoc } from '@colanode/crdt';
export const syncRouter = Router();
@@ -30,7 +30,7 @@ syncRouter.post(
'/:workspaceId',
async (req: ColanodeRequest, res: ColanodeResponse) => {
const workspaceId = req.params.workspaceId as string;
- const input = req.body as SyncLocalChangesInput;
+ const input = req.body as SyncChangesInput;
if (!req.account) {
return res.status(401).json({
code: ApiError.Unauthorized,
@@ -52,13 +52,13 @@ syncRouter.post(
});
}
- const results: ServerSyncChangeResult[] = [];
+ const results: SyncChangeResult[] = [];
for (const change of input.changes) {
try {
- const result = await handleLocalChange(workspaceUser, change);
+ const status = await handleLocalChange(workspaceUser, change);
results.push({
id: change.id,
- status: result.status,
+ status: status,
});
} catch (error) {
console.error('Error handling local change', error);
@@ -77,25 +77,22 @@ syncRouter.post(
const handleLocalChange = async (
workspaceUser: SelectWorkspaceUser,
change: LocalChange
-): Promise<SyncLocalChangeResult> => {
- const changeData = JSON.parse(change.data) as LocalNodeChangeData;
- switch (changeData.type) {
+): Promise<SyncChangeStatus> => {
+ switch (change.data.type) {
case 'node_create': {
- return handleCreateNodeChange(workspaceUser, changeData);
+ return handleCreateNodeChange(workspaceUser, change.data);
}
case 'node_update': {
- return handleUpdateNodeChange(workspaceUser, changeData);
+ return handleUpdateNodeChange(workspaceUser, change.data);
}
case 'node_delete': {
- return handleDeleteNodeChange(workspaceUser, changeData);
+ return handleDeleteNodeChange(workspaceUser, change.data);
}
case 'user_node_update': {
- return handleUserNodeStateChange(workspaceUser, changeData);
+ return handleUserNodeStateChange(workspaceUser, change.data);
}
default: {
- return {
- status: 'error',
- };
+ return 'error';
}
}
};
@@ -103,16 +100,14 @@ const handleLocalChange = async (
const handleCreateNodeChange = async (
workspaceUser: SelectWorkspaceUser,
changeData: LocalCreateNodeChangeData
-): Promise<SyncLocalChangeResult> => {
+): Promise<SyncChangeStatus> => {
const existingNode = await database
.selectFrom('nodes')
.where('id', '=', changeData.id)
.executeTakeFirst();
if (existingNode) {
- return {
- status: 'success',
- };
+ return 'success';
}
const ydoc = new YDoc(changeData.id, changeData.state);
@@ -120,9 +115,7 @@ const handleCreateNodeChange = async (
const model = registry.getModel(attributes.type);
if (!model.schema.safeParse(attributes).success) {
- return {
- status: 'error',
- };
+ return 'error';
}
const ancestorRows = attributes.parentId
@@ -139,9 +132,7 @@ const handleCreateNodeChange = async (
);
if (!model.canCreate(context, attributes)) {
- return {
- status: 'error',
- };
+ return 'error';
}
await database
@@ -171,15 +162,13 @@ const handleCreateNodeChange = async (
await enqueueEvent(event);
- return {
- status: 'success',
- };
+ return 'success';
};
const handleUpdateNodeChange = async (
workspaceUser: SelectWorkspaceUser,
changeData: LocalUpdateNodeChangeData
-): Promise<SyncLocalChangeResult> => {
+): Promise<SyncChangeStatus> => {
let count = 0;
while (count++ < 10) {
const existingNode = await database
@@ -192,9 +181,7 @@ const handleUpdateNodeChange = async (
!existingNode ||
existingNode.workspace_id != workspaceUser.workspace_id
) {
- return {
- status: 'error',
- };
+ return 'error';
}
const ydoc = new YDoc(changeData.id, existingNode.state);
@@ -209,18 +196,14 @@ const handleUpdateNodeChange = async (
const model = registry.getModel(attributes.type);
if (!model.schema.safeParse(attributes).success) {
- return {
- status: 'error',
- };
+ return 'error';
}
const ancestorRows = await fetchNodeAncestors(existingNode.id);
const ancestors = ancestorRows.map(mapNode);
const node = ancestors.find((ancestor) => ancestor.id === existingNode.id);
if (!node) {
- return {
- status: 'error',
- };
+ return 'error';
}
const context = new NodeMutationContext(
@@ -232,9 +215,7 @@ const handleUpdateNodeChange = async (
);
if (!model.canUpdate(context, node, attributes)) {
- return {
- status: 'error',
- };
+ return 'error';
}
const result = await database
@@ -266,21 +247,17 @@ const handleUpdateNodeChange = async (
await enqueueEvent(event);
- return {
- status: 'success',
- };
+ return 'success';
}
}
- return {
- status: 'error',
- };
+ return 'error';
};
const handleDeleteNodeChange = async (
workspaceUser: SelectWorkspaceUser,
changeData: LocalDeleteNodeChangeData
-): Promise<SyncLocalChangeResult> => {
+): Promise<SyncChangeStatus> => {
const existingNode = await database
.selectFrom('nodes')
.where('id', '=', changeData.id)
@@ -288,15 +265,11 @@ const handleDeleteNodeChange = async (
.executeTakeFirst();
if (!existingNode) {
- return {
- status: 'success',
- };
+ return 'success';
}
if (existingNode.workspace_id !== workspaceUser.workspace_id) {
- return {
- status: 'error',
- };
+ return 'error';
}
const model = registry.getModel(existingNode.type);
@@ -304,9 +277,7 @@ const handleDeleteNodeChange = async (
const ancestors = ancestorRows.map(mapNode);
const node = ancestors.find((ancestor) => ancestor.id === existingNode.id);
if (!node) {
- return {
- status: 'error',
- };
+ return 'error';
}
const context = new NodeMutationContext(
@@ -318,9 +289,7 @@ const handleDeleteNodeChange = async (
);
if (!model.canDelete(context, node)) {
- return {
- status: 'error',
- };
+ return 'error';
}
await database.deleteFrom('nodes').where('id', '=', changeData.id).execute();
@@ -334,19 +303,15 @@ const handleDeleteNodeChange = async (
await enqueueEvent(event);
- return {
- status: 'success',
- };
+ return 'success';
};
const handleUserNodeStateChange = async (
workspaceUser: SelectWorkspaceUser,
changeData: LocalUserNodeChangeData
-): Promise<SyncLocalChangeResult> => {
+): Promise<SyncChangeStatus> => {
if (workspaceUser.id !== changeData.userId) {
- return {
- status: 'error',
- };
+ return 'error';
}
await database
@@ -369,5 +334,5 @@ const handleUserNodeStateChange = async (
workspaceId: workspaceUser.workspace_id,
});
- return { status: 'success' };
+ return 'success';
};
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 11841ad5..c0d58526 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -19,3 +19,4 @@ export * from './registry/zod';
export * from './registry/workspace';
export * from './types/workspaces';
export * from './types/nodes';
+export * from './types/sync';
diff --git a/apps/server/src/types/sync.ts b/packages/core/src/types/sync.ts
similarity index 75%
rename from apps/server/src/types/sync.ts
rename to packages/core/src/types/sync.ts
index 10fae951..9b54f5ac 100644
--- a/apps/server/src/types/sync.ts
+++ b/packages/core/src/types/sync.ts
@@ -1,21 +1,21 @@
-export type SyncLocalChangesInput = {
+export type SyncChangesInput = {
changes: LocalChange[];
};
-export type SyncLocalChangeResult = {
- status: SyncLocalChangeStatus;
+export type SyncChangesOutput = {
+ results: SyncChangeResult[];
};
-export type SyncLocalChangeStatus = 'success' | 'error';
+export type SyncChangeStatus = 'success' | 'error';
-export type ServerSyncChangeResult = {
+export type SyncChangeResult = {
id: number;
- status: SyncLocalChangeStatus;
+ status: SyncChangeStatus;
};
export type LocalChange = {
id: number;
- data: string;
+ data: LocalChangeData;
createdAt: string;
};
@@ -54,7 +54,7 @@ export type LocalUserNodeChangeData = {
versionId: string;
};
-export type LocalNodeChangeData =
+export type LocalChangeData =
| LocalCreateNodeChangeData
| LocalUpdateNodeChangeData
| LocalDeleteNodeChangeData