Skip to content

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

Add events for account and workspace changes in server and desktop

Hakan Shehue4aeabf3b61e
diff --git a/apps/desktop/src/main/services/socket-connection.ts b/apps/desktop/src/main/services/socket-connection.ts
index 5b164e8e..ed86a829 100644
--- a/apps/desktop/src/main/services/socket-connection.ts
+++ b/apps/desktop/src/main/services/socket-connection.ts
@@ -1,6 +1,7 @@
import { Message } from '@colanode/core';
import { WebSocket } from 'ws';
+import { accountService } from '@/main/services/account-service';
import { createDebugger } from '@/main/debugger';
import { SelectAccount } from '@/main/data/app/schema';
import { syncService } from '@/main/services/sync-service';
@@ -65,6 +66,14 @@ export class SocketConnection {
syncService.syncServerCollaborations(message);
} else if (message.type === 'interactions_batch') {
syncService.syncServerInteractions(message);
+ } else if (message.type === 'account_updated') {
+ accountService.syncAccounts();
+ } else if (message.type === 'workspace_updated') {
+ accountService.syncAccounts();
+ } else if (message.type === 'workspace_user_created') {
+ accountService.syncAccounts();
+ } else if (message.type === 'workspace_deleted') {
+ accountService.syncAccounts();
}
};
diff --git a/apps/server/src/controllers/client/accounts/account-update.ts b/apps/server/src/controllers/client/accounts/account-update.ts
index d1cff37e..b6d1f66b 100644
--- a/apps/server/src/controllers/client/accounts/account-update.ts
+++ b/apps/server/src/controllers/client/accounts/account-update.ts
@@ -4,6 +4,7 @@ import { AccountUpdateInput, AccountUpdateOutput } from '@colanode/core';
import { database } from '@/data/database';
import { ApiError } from '@/types/api';
import { nodeService } from '@/services/node-service';
+import { eventBus } from '@/lib/event-bus';
export const accountUpdateHandler = async (
req: Request,
@@ -98,6 +99,11 @@ export const accountUpdateHandler = async (
});
}
+ eventBus.publish({
+ type: 'account_updated',
+ accountId: account.id,
+ });
+
const output: AccountUpdateOutput = {
id: account.id,
name: input.name,
diff --git a/apps/server/src/controllers/client/accounts/logout.ts b/apps/server/src/controllers/client/accounts/logout.ts
index 0c46ba58..75533777 100644
--- a/apps/server/src/controllers/client/accounts/logout.ts
+++ b/apps/server/src/controllers/client/accounts/logout.ts
@@ -1,6 +1,7 @@
import { Request, Response } from 'express';
import { database } from '@/data/database';
+import { eventBus } from '@/lib/event-bus';
export const logoutHandler = async (
req: Request,
@@ -13,5 +14,11 @@ export const logoutHandler = async (
.where('id', '=', account.deviceId)
.execute();
+ eventBus.publish({
+ type: 'device_deleted',
+ accountId: account.id,
+ deviceId: account.deviceId,
+ });
+
res.status(200).end();
};
diff --git a/apps/server/src/controllers/client/workspaces/workspace-delete.ts b/apps/server/src/controllers/client/workspaces/workspace-delete.ts
index b8dbbc45..745bfc04 100644
--- a/apps/server/src/controllers/client/workspaces/workspace-delete.ts
+++ b/apps/server/src/controllers/client/workspaces/workspace-delete.ts
@@ -2,6 +2,7 @@ import { Request, Response } from 'express';
import { database } from '@/data/database';
import { ApiError } from '@/types/api';
+import { eventBus } from '@/lib/event-bus';
export const workspaceDeleteHandler = async (
req: Request,
@@ -22,6 +23,11 @@ export const workspaceDeleteHandler = async (
.where('id', '=', workspaceId)
.execute();
+ eventBus.publish({
+ type: 'workspace_deleted',
+ workspaceId: workspaceId,
+ });
+
res.status(200).json({
id: res.locals.workspace.id,
});
diff --git a/apps/server/src/controllers/client/workspaces/workspace-update.ts b/apps/server/src/controllers/client/workspaces/workspace-update.ts
index 7b0f9f75..86e4af2b 100644
--- a/apps/server/src/controllers/client/workspaces/workspace-update.ts
+++ b/apps/server/src/controllers/client/workspaces/workspace-update.ts
@@ -4,6 +4,7 @@ import { WorkspaceOutput, WorkspaceUpdateInput } from '@colanode/core';
import { database } from '@/data/database';
import { nodeService } from '@/services/node-service';
import { ApiError } from '@/types/api';
+import { eventBus } from '@/lib/event-bus';
export const workspaceUpdateHandler = async (
req: Request,
@@ -58,6 +59,11 @@ export const workspaceUpdateHandler = async (
},
});
+ eventBus.publish({
+ type: 'workspace_updated',
+ workspaceId: updatedWorkspace.id,
+ });
+
const output: WorkspaceOutput = {
id: updatedWorkspace.id,
name: updatedWorkspace.name,
diff --git a/apps/server/src/services/socket-connection.ts b/apps/server/src/services/socket-connection.ts
index d9a9e71a..d15a239e 100644
--- a/apps/server/src/services/socket-connection.ts
+++ b/apps/server/src/services/socket-connection.ts
@@ -22,6 +22,7 @@ import {
mapTransaction,
} from '@/lib/nodes';
import {
+ AccountUpdatedEvent,
CollaboratorAddedEvent,
CollaboratorRemovedEvent,
Event,
@@ -29,6 +30,9 @@ import {
NodeCreatedEvent,
NodeDeletedEvent,
NodeUpdatedEvent,
+ WorkspaceDeletedEvent,
+ WorkspaceUpdatedEvent,
+ WorkspaceUserCreatedEvent,
} from '@/types/events';
const PUBLIC_NODES: NodeType[] = ['workspace', 'user'];
@@ -74,6 +78,10 @@ export class SocketConnection {
this.socket.send(JSON.stringify(message));
}
+ public close() {
+ this.socket.close();
+ }
+
public handleEvent(event: Event) {
if (event.type === 'node_created') {
this.handleNodeCreatedEvent(event);
@@ -87,6 +95,14 @@ export class SocketConnection {
this.handleCollaboratorRemovedEvent(event);
} else if (event.type === 'interaction_updated') {
this.handleInteractionUpdatedEvent(event);
+ } else if (event.type === 'account_updated') {
+ this.handleAccountUpdatedEvent(event);
+ } else if (event.type === 'workspace_user_created') {
+ this.handleWorkspaceUserCreatedEvent(event);
+ } else if (event.type === 'workspace_updated') {
+ this.handleWorkspaceUpdatedEvent(event);
+ } else if (event.type === 'workspace_deleted') {
+ this.handleWorkspaceDeletedEvent(event);
}
}
@@ -455,4 +471,58 @@ export class SocketConnection {
this.users.set(userId, newSocketUser);
return newSocketUser;
}
+
+ private handleAccountUpdatedEvent(event: AccountUpdatedEvent) {
+ if (event.accountId !== this.account.id) {
+ return;
+ }
+
+ this.sendMessage({
+ type: 'account_updated',
+ accountId: this.account.id,
+ });
+ }
+
+ private handleWorkspaceUserCreatedEvent(event: WorkspaceUserCreatedEvent) {
+ if (event.accountId !== this.account.id) {
+ return;
+ }
+
+ this.sendMessage({
+ type: 'workspace_user_created',
+ workspaceId: event.workspaceId,
+ userId: event.userId,
+ accountId: event.accountId,
+ });
+ }
+
+ private handleWorkspaceUpdatedEvent(event: WorkspaceUpdatedEvent) {
+ const workspaceUsers = Array.from(this.users.values()).filter(
+ (user) => user.workspaceId === event.workspaceId
+ );
+
+ if (workspaceUsers.length === 0) {
+ return;
+ }
+
+ this.sendMessage({
+ type: 'workspace_updated',
+ workspaceId: event.workspaceId,
+ });
+ }
+
+ private handleWorkspaceDeletedEvent(event: WorkspaceDeletedEvent) {
+ const workspaceUsers = Array.from(this.users.values()).filter(
+ (user) => user.workspaceId === event.workspaceId
+ );
+
+ if (workspaceUsers.length === 0) {
+ return;
+ }
+
+ this.sendMessage({
+ type: 'workspace_deleted',
+ accountId: this.account.id,
+ });
+ }
}
diff --git a/apps/server/src/services/socket-service.ts b/apps/server/src/services/socket-service.ts
index 1dad4d53..df11ac89 100644
--- a/apps/server/src/services/socket-service.ts
+++ b/apps/server/src/services/socket-service.ts
@@ -14,6 +14,15 @@ class SocketService {
constructor() {
eventBus.subscribe((event) => {
+ if (event.type === 'device_deleted') {
+ const connection = this.connections.get(event.deviceId);
+ if (connection) {
+ connection.close();
+ this.connections.delete(event.deviceId);
+ return;
+ }
+ }
+
for (const connection of this.connections.values()) {
connection.handleEvent(event);
}
diff --git a/apps/server/src/services/workspace-service.ts b/apps/server/src/services/workspace-service.ts
index 43163a47..d49933d9 100644
--- a/apps/server/src/services/workspace-service.ts
+++ b/apps/server/src/services/workspace-service.ts
@@ -11,6 +11,7 @@ import { database } from '@/data/database';
import { SelectAccount } from '@/data/schema';
import { mapNode } from '@/lib/nodes';
import { nodeService } from '@/services/node-service';
+import { eventBus } from '@/lib/event-bus';
class WorkspaceService {
public async createWorkspace(
@@ -137,6 +138,18 @@ class WorkspaceService {
});
}
+ eventBus.publish({
+ type: 'workspace_created',
+ workspaceId: workspaceId,
+ });
+
+ eventBus.publish({
+ type: 'workspace_user_created',
+ userId: userId,
+ workspaceId: workspaceId,
+ accountId: account.id,
+ });
+
return {
id: workspace.id,
name: workspace.name,
diff --git a/apps/server/src/types/events.ts b/apps/server/src/types/events.ts
index 923778c1..d9ef61ba 100644
--- a/apps/server/src/types/events.ts
+++ b/apps/server/src/types/events.ts
@@ -41,10 +41,49 @@ export type InteractionUpdatedEvent = {
workspaceId: string;
};
+export type WorkspaceUserCreatedEvent = {
+ type: 'workspace_user_created';
+ userId: string;
+ workspaceId: string;
+ accountId: string;
+};
+
+export type AccountUpdatedEvent = {
+ type: 'account_updated';
+ accountId: string;
+};
+
+export type WorkspaceCreatedEvent = {
+ type: 'workspace_created';
+ workspaceId: string;
+};
+
+export type WorkspaceUpdatedEvent = {
+ type: 'workspace_updated';
+ workspaceId: string;
+};
+
+export type WorkspaceDeletedEvent = {
+ type: 'workspace_deleted';
+ workspaceId: string;
+};
+
+export type DeviceDeletedEvent = {
+ type: 'device_deleted';
+ accountId: string;
+ deviceId: string;
+};
+
export type Event =
| NodeCreatedEvent
| NodeUpdatedEvent
| NodeDeletedEvent
| CollaboratorAddedEvent
| CollaboratorRemovedEvent
- | InteractionUpdatedEvent;
+ | InteractionUpdatedEvent
+ | WorkspaceUserCreatedEvent
+ | AccountUpdatedEvent
+ | WorkspaceCreatedEvent
+ | WorkspaceUpdatedEvent
+ | WorkspaceDeletedEvent
+ | DeviceDeletedEvent;
diff --git a/packages/core/src/types/messages.ts b/packages/core/src/types/messages.ts
index 7de58220..9b93f815 100644
--- a/packages/core/src/types/messages.ts
+++ b/packages/core/src/types/messages.ts
@@ -48,10 +48,36 @@ export type InitSyncConsumerMessage = {
cursor: string;
};
+export type AccountUpdatedMessage = {
+ type: 'account_updated';
+ accountId: string;
+};
+
+export type WorkspaceUpdatedMessage = {
+ type: 'workspace_updated';
+ workspaceId: string;
+};
+
+export type WorkspaceUserCreatedMessage = {
+ type: 'workspace_user_created';
+ workspaceId: string;
+ userId: string;
+ accountId: string;
+};
+
+export type WorkspaceDeletedMessage = {
+ type: 'workspace_deleted';
+ accountId: string;
+};
+
export type Message =
| TransactionsBatchMessage
| CollaborationsBatchMessage
| DeletedCollaborationsBatchMessage
| InteractionsBatchMessage
| SyncInteractionsMessage
- | InitSyncConsumerMessage;
+ | InitSyncConsumerMessage
+ | AccountUpdatedMessage
+ | WorkspaceUpdatedMessage
+ | WorkspaceUserCreatedMessage
+ | WorkspaceDeletedMessage;