Skip to content

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

Refactor node manager and add authorization checks for node create/update/delete

Hakan Shehu42f9236b393f
diff --git a/apps/desktop/src/main/handlers/mutations/channel-create.ts b/apps/desktop/src/main/handlers/mutations/channel-create.ts
index 7c140c9e..0d47e5af 100644
--- a/apps/desktop/src/main/handlers/mutations/channel-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/channel-create.ts
@@ -16,6 +16,16 @@ export class ChannelCreateMutationHandler
input.userId
);
+ const space = await workspaceDatabase
+ .selectFrom('nodes')
+ .selectAll()
+ .where('id', '=', input.spaceId)
+ .executeTakeFirst();
+
+ if (!space) {
+ throw new Error('Space not found');
+ }
+
const maxIndexResult = await workspaceDatabase
.selectFrom('nodes')
.select(['index'])
@@ -35,9 +45,7 @@ export class ChannelCreateMutationHandler
collaborators: null,
};
- await workspaceDatabase.transaction().execute(async (trx) => {
- await nodeManager.createNode(trx, input.userId, id, attributes);
- });
+ await nodeManager.createNode(input.userId, { id, attributes });
return {
output: {
diff --git a/apps/desktop/src/main/handlers/mutations/chat-create.ts b/apps/desktop/src/main/handlers/mutations/chat-create.ts
index fc9119af..d1167c4f 100644
--- a/apps/desktop/src/main/handlers/mutations/chat-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/chat-create.ts
@@ -48,9 +48,7 @@ export class ChatCreateMutationHandler
},
};
- await workspaceDatabase.transaction().execute(async (trx) => {
- await nodeManager.createNode(trx, input.userId, id, attributes);
- });
+ await nodeManager.createNode(input.userId, { id, attributes });
return {
output: {
diff --git a/apps/desktop/src/main/handlers/mutations/database-create.ts b/apps/desktop/src/main/handlers/mutations/database-create.ts
index b82133f3..0982660b 100644
--- a/apps/desktop/src/main/handlers/mutations/database-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/database-create.ts
@@ -4,7 +4,6 @@ import { MutationHandler, MutationResult } from '@/main/types';
import { DatabaseCreateMutationInput } from '@/operations/mutations/database-create';
import { DatabaseAttributes } from '@colanode/core';
import { nodeManager } from '@/main/node-manager';
-import { databaseManager } from '@/main/data/database-manager';
export class DatabaseCreateMutationHandler
implements MutationHandler<DatabaseCreateMutationInput>
@@ -12,10 +11,6 @@ export class DatabaseCreateMutationHandler
async handleMutation(
input: DatabaseCreateMutationInput
): Promise<MutationResult<DatabaseCreateMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
const databaseId = generateId(IdType.Database);
const viewId = generateId(IdType.View);
const fieldId = generateId(IdType.Field);
@@ -47,8 +42,9 @@ export class DatabaseCreateMutationHandler
},
};
- await workspaceDatabase.transaction().execute(async (trx) => {
- await nodeManager.createNode(trx, input.userId, databaseId, attributes);
+ await nodeManager.createNode(input.userId, {
+ id: databaseId,
+ attributes,
});
return {
diff --git a/apps/desktop/src/main/handlers/mutations/document-save.ts b/apps/desktop/src/main/handlers/mutations/document-save.ts
index de688d2e..4e83e999 100644
--- a/apps/desktop/src/main/handlers/mutations/document-save.ts
+++ b/apps/desktop/src/main/handlers/mutations/document-save.ts
@@ -11,8 +11,8 @@ export class DocumentSaveMutationHandler
input: DocumentSaveMutationInput
): Promise<MutationResult<DocumentSaveMutationInput>> {
await nodeManager.updateNode(
- input.userId,
input.documentId,
+ input.userId,
(attributes) => {
if (attributes.type !== 'page' && attributes.type !== 'record') {
throw new Error('Invalid node type');
diff --git a/apps/desktop/src/main/handlers/mutations/field-create.ts b/apps/desktop/src/main/handlers/mutations/field-create.ts
index 3eca4b41..09d2f606 100644
--- a/apps/desktop/src/main/handlers/mutations/field-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/field-create.ts
@@ -13,8 +13,8 @@ export class FieldCreateMutationHandler
): Promise<MutationResult<FieldCreateMutationInput>> {
const fieldId = generateId(IdType.Field);
await nodeManager.updateNode(
- input.userId,
input.databaseId,
+ input.userId,
(attributes) => {
if (attributes.type !== 'database') {
throw new Error('Invalid node type');
diff --git a/apps/desktop/src/main/handlers/mutations/file-create.ts b/apps/desktop/src/main/handlers/mutations/file-create.ts
index 88852a1e..1f37a20d 100644
--- a/apps/desktop/src/main/handlers/mutations/file-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/file-create.ts
@@ -1,20 +1,16 @@
-import { databaseManager } from '@/main/data/database-manager';
import { MutationHandler, MutationResult } from '@/main/types';
import { generateId, IdType } from '@colanode/core';
import { FileCreateMutationInput } from '@/operations/mutations/file-create';
import { fileManager } from '@/main/file-manager';
import { FileAttributes } from '@colanode/core';
import { nodeManager } from '@/main/node-manager';
+
export class FileCreateMutationHandler
implements MutationHandler<FileCreateMutationInput>
{
async handleMutation(
input: FileCreateMutationInput
): Promise<MutationResult<FileCreateMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
const metadata = fileManager.getFileMetadata(input.filePath);
if (!metadata) {
throw new Error('Invalid file');
@@ -38,28 +34,21 @@ export class FileCreateMutationHandler
mimeType: metadata.mimeType,
};
- await workspaceDatabase.transaction().execute(async (trx) => {
- await nodeManager.createNode(trx, input.userId, id, attributes);
-
- await trx
- .insertInto('uploads')
- .values({
- node_id: id,
- created_at: new Date().toISOString(),
- progress: 0,
- retry_count: 0,
- })
- .execute();
-
- await trx
- .insertInto('downloads')
- .values({
- node_id: id,
- created_at: new Date().toISOString(),
- progress: 100,
- retry_count: 0,
- })
- .execute();
+ await nodeManager.createNode(input.userId, {
+ id,
+ attributes,
+ upload: {
+ node_id: id,
+ created_at: new Date().toISOString(),
+ progress: 0,
+ retry_count: 0,
+ },
+ download: {
+ node_id: id,
+ created_at: new Date().toISOString(),
+ progress: 0,
+ retry_count: 0,
+ },
});
return {
diff --git a/apps/desktop/src/main/handlers/mutations/folder-create.ts b/apps/desktop/src/main/handlers/mutations/folder-create.ts
index 7a198cbd..128b5107 100644
--- a/apps/desktop/src/main/handlers/mutations/folder-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/folder-create.ts
@@ -3,7 +3,6 @@ import { MutationHandler, MutationResult } from '@/main/types';
import { FolderCreateMutationInput } from '@/operations/mutations/folder-create';
import { FolderAttributes } from '@colanode/core';
import { nodeManager } from '@/main/node-manager';
-import { databaseManager } from '@/main/data/database-manager';
export class FolderCreateMutationHandler
implements MutationHandler<FolderCreateMutationInput>
@@ -11,10 +10,7 @@ export class FolderCreateMutationHandler
async handleMutation(
input: FolderCreateMutationInput
): Promise<MutationResult<FolderCreateMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
+ const id = generateId(IdType.Folder);
const attributes: FolderAttributes = {
type: 'folder',
parentId: input.parentId,
@@ -22,11 +18,7 @@ export class FolderCreateMutationHandler
collaborators: {},
};
- const id = generateId(IdType.Folder);
-
- await workspaceDatabase.transaction().execute(async (trx) => {
- await nodeManager.createNode(trx, input.userId, id, attributes);
- });
+ await nodeManager.createNode(input.userId, { id, attributes });
return {
output: {
diff --git a/apps/desktop/src/main/handlers/mutations/message-create.ts b/apps/desktop/src/main/handlers/mutations/message-create.ts
index f0a81056..089e304e 100644
--- a/apps/desktop/src/main/handlers/mutations/message-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/message-create.ts
@@ -1,18 +1,10 @@
-import * as Y from 'yjs';
-import { databaseManager } from '@/main/data/database-manager';
import { generateId, IdType, EditorNodeTypes, NodeTypes } from '@colanode/core';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
import { MessageCreateMutationInput } from '@/operations/mutations/message-create';
import { mapContentsToBlocks } from '@/lib/editor';
import { fileManager } from '@/main/file-manager';
-import { CreateDownload, CreateUpload } from '@/main/data/workspace/schema';
-import {
- NodeAttributes,
- Block,
- FileAttributes,
- MessageAttributes,
-} from '@colanode/core';
-import { nodeManager } from '@/main/node-manager';
+import { Block, FileAttributes, MessageAttributes } from '@colanode/core';
+import { CreateNodeInput, nodeManager } from '@/main/node-manager';
export class MessageCreateMutationHandler
implements MutationHandler<MessageCreateMutationInput>
@@ -20,13 +12,8 @@ export class MessageCreateMutationHandler
async handleMutation(
input: MessageCreateMutationInput
): Promise<MutationResult<MessageCreateMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
- const nodeAttributes: NodeAttributes[] = [];
- const downloadsToCreate: CreateDownload[] = [];
- const uploadsToCreate: CreateUpload[] = [];
+ const inputs: CreateNodeInput[] = [];
+ let hasFiles = false;
const messageId = generateId(IdType.Message);
const createdAt = new Date().toISOString();
@@ -58,21 +45,6 @@ export class MessageCreateMutationHandler
input.userId
);
- const fileDoc = new Y.Doc({
- guid: fileId,
- });
-
- const fileAttributesMap = fileDoc.getMap('attributes');
- fileDoc.transact(() => {
- fileAttributesMap.set('type', NodeTypes.File);
- fileAttributesMap.set('parentId', messageId);
- fileAttributesMap.set('name', metadata.name);
- fileAttributesMap.set('fileName', metadata.name);
- fileAttributesMap.set('extension', metadata.extension);
- fileAttributesMap.set('size', metadata.size);
- fileAttributesMap.set('mimeType', metadata.mimeType);
- });
-
const fileAttributes: FileAttributes = {
type: 'file',
parentId: messageId,
@@ -83,21 +55,24 @@ export class MessageCreateMutationHandler
extension: metadata.extension,
};
- nodeAttributes.push(fileAttributes);
-
- downloadsToCreate.push({
- node_id: fileId,
- created_at: createdAt,
- progress: 100,
- retry_count: 0,
+ inputs.push({
+ id: fileId,
+ attributes: fileAttributes,
+ download: {
+ node_id: fileId,
+ created_at: createdAt,
+ progress: 100,
+ retry_count: 0,
+ },
+ upload: {
+ node_id: fileId,
+ created_at: createdAt,
+ progress: 0,
+ retry_count: 0,
+ },
});
- uploadsToCreate.push({
- node_id: fileId,
- created_at: createdAt,
- progress: 0,
- retry_count: 0,
- });
+ hasFiles = true;
}
}
@@ -114,26 +89,8 @@ export class MessageCreateMutationHandler
reactions: {},
};
- nodeAttributes.unshift(messageAttributes);
-
- await workspaceDatabase.transaction().execute(async (trx) => {
- for (const nodeAttribute of nodeAttributes) {
- await nodeManager.createNode(
- trx,
- input.userId,
- messageId,
- nodeAttribute
- );
- }
-
- if (uploadsToCreate.length > 0) {
- await trx.insertInto('uploads').values(uploadsToCreate).execute();
- }
-
- if (downloadsToCreate.length > 0) {
- await trx.insertInto('downloads').values(downloadsToCreate).execute();
- }
- });
+ inputs.unshift({ id: messageId, attributes: messageAttributes });
+ await nodeManager.createNode(input.userId, inputs);
const mutationChanges: MutationChange[] = [
{
@@ -148,15 +105,13 @@ export class MessageCreateMutationHandler
},
];
- if (downloadsToCreate.length > 0) {
+ if (hasFiles) {
mutationChanges.push({
type: 'workspace',
table: 'downloads',
userId: input.userId,
});
- }
- if (uploadsToCreate.length > 0) {
mutationChanges.push({
type: 'workspace',
table: 'uploads',
diff --git a/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts b/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts
index e5e8aa42..00ce90cf 100644
--- a/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts
@@ -9,7 +9,7 @@ export class NodeAttributeDeleteMutationHandler
async handleMutation(
input: NodeAttributeDeleteMutationInput
): Promise<MutationResult<NodeAttributeDeleteMutationInput>> {
- await nodeManager.updateNode(input.userId, input.nodeId, (attributes) => {
+ await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
unset(attributes, input.path);
return attributes;
});
diff --git a/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts b/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts
index d0707844..d10733b4 100644
--- a/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts
@@ -9,7 +9,7 @@ export class NodeAttributeSetMutationHandler
async handleMutation(
input: NodeAttributeSetMutationInput
): Promise<MutationResult<NodeAttributeSetMutationInput>> {
- await nodeManager.updateNode(input.userId, input.nodeId, (attributes) => {
+ await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
set(attributes, input.path, input.value);
return attributes;
});
diff --git a/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts b/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts
index d8769506..3e30a3d4 100644
--- a/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts
@@ -9,7 +9,7 @@ export class NodeCollaboratorCreateMutationHandler
async handleMutation(
input: NodeCollaboratorCreateMutationInput
): Promise<MutationResult<NodeCollaboratorCreateMutationInput>> {
- await nodeManager.updateNode(input.userId, input.nodeId, (attributes) => {
+ await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
for (const collaboratorId of input.collaboratorIds) {
set(attributes, `collaborators.${collaboratorId}`, input.role);
}
diff --git a/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts b/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts
index dd1bec4e..197753bf 100644
--- a/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts
@@ -9,7 +9,7 @@ export class NodeCollaboratorDeleteMutationHandler
async handleMutation(
input: NodeCollaboratorDeleteMutationInput
): Promise<MutationResult<NodeCollaboratorDeleteMutationInput>> {
- await nodeManager.updateNode(input.userId, input.nodeId, (attributes) => {
+ await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
unset(attributes, `collaborators.${input.collaboratorId}`);
return attributes;
});
diff --git a/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts b/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts
index be2aaaeb..28a729e3 100644
--- a/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts
@@ -9,7 +9,7 @@ export class NodeCollaboratorUpdateMutationHandler
async handleMutation(
input: NodeCollaboratorUpdateMutationInput
): Promise<MutationResult<NodeCollaboratorUpdateMutationInput>> {
- await nodeManager.updateNode(input.userId, input.nodeId, (attributes) => {
+ await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
set(attributes, `collaborators.${input.collaboratorId}`, input.role);
return attributes;
});
diff --git a/apps/desktop/src/main/handlers/mutations/node-delete.ts b/apps/desktop/src/main/handlers/mutations/node-delete.ts
index cfa6aa2d..90aa6ae9 100644
--- a/apps/desktop/src/main/handlers/mutations/node-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-delete.ts
@@ -1,9 +1,6 @@
-import { NodeTypes } from '@colanode/core';
-import { databaseManager } from '@/main/data/database-manager';
-import { fileManager } from '@/main/file-manager';
-import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
+import { MutationHandler, MutationResult } from '@/main/types';
import { NodeDeleteMutationInput } from '@/operations/mutations/node-delete';
-import { LocalDeleteNodeChangeData } from '@/types/sync';
+import { nodeManager } from '@/main/node-manager';
export class NodeDeleteMutationHandler
implements MutationHandler<NodeDeleteMutationInput>
@@ -11,98 +8,34 @@ export class NodeDeleteMutationHandler
async handleMutation(
input: NodeDeleteMutationInput
): Promise<MutationResult<NodeDeleteMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
- const node = await workspaceDatabase
- .selectFrom('nodes')
- .select(['id', 'type', 'attributes'])
- .where('id', '=', input.nodeId)
- .executeTakeFirst();
-
- if (!node) {
- return {
- output: {
- success: false,
- },
- };
- }
-
- const changeData: LocalDeleteNodeChangeData = {
- type: 'node_delete',
- id: node.id,
- deletedAt: new Date().toISOString(),
- deletedBy: input.userId,
- };
-
- const isFile = node.type === NodeTypes.File;
-
- await workspaceDatabase.transaction().execute(async (trx) => {
- await trx
- .deleteFrom('user_nodes')
- .where('node_id', '=', input.nodeId)
- .execute();
-
- await trx.deleteFrom('nodes').where('id', '=', input.nodeId).execute();
-
- if (isFile) {
- await trx
- .deleteFrom('uploads')
- .where('node_id', '=', node.id)
- .execute();
-
- await trx
- .deleteFrom('downloads')
- .where('node_id', '=', node.id)
- .execute();
- }
-
- await trx
- .insertInto('changes')
- .values({
- data: JSON.stringify(changeData),
- created_at: new Date().toISOString(),
- retry_count: 0,
- })
- .execute();
- });
-
- const changes: MutationChange[] = [
- {
- type: 'workspace',
- table: 'nodes',
- userId: input.userId,
- },
- {
- type: 'workspace',
- table: 'changes',
- userId: input.userId,
- },
- ];
-
- if (isFile) {
- const attributes = JSON.parse(node.attributes);
- fileManager.deleteFile(input.userId, node.id, attributes.extension);
-
- changes.push({
- type: 'workspace',
- table: 'uploads',
- userId: input.userId,
- });
-
- changes.push({
- type: 'workspace',
- table: 'downloads',
- userId: input.userId,
- });
- }
+ await nodeManager.deleteNode(input.nodeId, input.userId);
return {
output: {
success: true,
},
- changes,
+ changes: [
+ {
+ type: 'workspace',
+ table: 'nodes',
+ userId: input.userId,
+ },
+ {
+ type: 'workspace',
+ table: 'changes',
+ userId: input.userId,
+ },
+ {
+ type: 'workspace',
+ table: 'uploads',
+ userId: input.userId,
+ },
+ {
+ type: 'workspace',
+ table: 'downloads',
+ userId: input.userId,
+ },
+ ],
};
}
}
diff --git a/apps/desktop/src/main/handlers/mutations/node-reaction-create.ts b/apps/desktop/src/main/handlers/mutations/node-reaction-create.ts
index c971b218..47b912de 100644
--- a/apps/desktop/src/main/handlers/mutations/node-reaction-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-reaction-create.ts
@@ -8,7 +8,7 @@ export class NodeReactionCreateMutationHandler
async handleMutation(
input: NodeReactionCreateMutationInput
): Promise<MutationResult<NodeReactionCreateMutationInput>> {
- await nodeManager.updateNode(input.userId, input.nodeId, (attributes) => {
+ await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
if (attributes.type !== 'message') {
throw new Error('Node is not a message');
}
diff --git a/apps/desktop/src/main/handlers/mutations/node-reaction-delete.ts b/apps/desktop/src/main/handlers/mutations/node-reaction-delete.ts
index 0462a025..8d29fbe0 100644
--- a/apps/desktop/src/main/handlers/mutations/node-reaction-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-reaction-delete.ts
@@ -8,7 +8,7 @@ export class NodeReactionDeleteMutationHandler
async handleMutation(
input: NodeReactionDeleteMutationInput
): Promise<MutationResult<NodeReactionDeleteMutationInput>> {
- await nodeManager.updateNode(input.userId, input.nodeId, (attributes) => {
+ await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
if (attributes.type !== 'message') {
throw new Error('Node is not a message');
}
diff --git a/apps/desktop/src/main/handlers/mutations/page-create.ts b/apps/desktop/src/main/handlers/mutations/page-create.ts
index cfb20b49..b3cafcbe 100644
--- a/apps/desktop/src/main/handlers/mutations/page-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/page-create.ts
@@ -1,4 +1,3 @@
-import { databaseManager } from '@/main/data/database-manager';
import { generateId, IdType } from '@colanode/core';
import { MutationHandler, MutationResult } from '@/main/types';
import { PageCreateMutationInput } from '@/operations/mutations/page-create';
@@ -11,10 +10,6 @@ export class PageCreateMutationHandler
async handleMutation(
input: PageCreateMutationInput
): Promise<MutationResult<PageCreateMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
const id = generateId(IdType.Page);
const attributes: PageAttributes = {
type: 'page',
@@ -23,9 +18,7 @@ export class PageCreateMutationHandler
content: {},
};
- await workspaceDatabase.transaction().execute(async (trx) => {
- await nodeManager.createNode(trx, input.userId, id, attributes);
- });
+ await nodeManager.createNode(input.userId, { id, attributes });
return {
output: {
diff --git a/apps/desktop/src/main/handlers/mutations/record-create.ts b/apps/desktop/src/main/handlers/mutations/record-create.ts
index 2fe2d039..a206970d 100644
--- a/apps/desktop/src/main/handlers/mutations/record-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/record-create.ts
@@ -1,4 +1,3 @@
-import { databaseManager } from '@/main/data/database-manager';
import { generateId, IdType } from '@colanode/core';
import { MutationHandler, MutationResult } from '@/main/types';
import { RecordCreateMutationInput } from '@/operations/mutations/record-create';
@@ -11,10 +10,6 @@ export class RecordCreateMutationHandler
async handleMutation(
input: RecordCreateMutationInput
): Promise<MutationResult<RecordCreateMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
const id = generateId(IdType.Record);
const attributes: RecordAttributes = {
type: 'record',
@@ -25,9 +20,7 @@ export class RecordCreateMutationHandler
content: {},
};
- await workspaceDatabase.transaction().execute(async (trx) => {
- await nodeManager.createNode(trx, input.userId, id, attributes);
- });
+ await nodeManager.createNode(input.userId, { id, attributes });
return {
output: {
diff --git a/apps/desktop/src/main/handlers/mutations/select-option-create.ts b/apps/desktop/src/main/handlers/mutations/select-option-create.ts
index 23800ea3..6d2fcf3a 100644
--- a/apps/desktop/src/main/handlers/mutations/select-option-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/select-option-create.ts
@@ -13,8 +13,8 @@ export class SelectOptionCreateMutationHandler
): Promise<MutationResult<SelectOptionCreateMutationInput>> {
const id = generateId(IdType.SelectOption);
await nodeManager.updateNode(
- input.userId,
input.databaseId,
+ input.userId,
(attributes) => {
if (attributes.type !== 'database') {
throw new Error('Node is not a database');
diff --git a/apps/desktop/src/main/handlers/mutations/space-create.ts b/apps/desktop/src/main/handlers/mutations/space-create.ts
index 1496c215..b3f1d628 100644
--- a/apps/desktop/src/main/handlers/mutations/space-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/space-create.ts
@@ -1,4 +1,3 @@
-import { databaseManager } from '@/main/data/database-manager';
import { generateId, IdType, NodeRoles } from '@colanode/core';
import { generateNodeIndex } from '@/lib/nodes';
import { MutationHandler, MutationResult } from '@/main/types';
@@ -16,10 +15,6 @@ export class SpaceCreateMutationHandler
async handleMutation(
input: SpaceCreateMutationInput
): Promise<MutationResult<SpaceCreateMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
- input.userId
- );
-
const spaceId = generateId(IdType.Space);
const spaceAttributes: SpaceAttributes = {
type: 'space',
@@ -49,16 +44,20 @@ export class SpaceCreateMutationHandler
index: generateNodeIndex(null, null),
};
- await workspaceDatabase.transaction().execute(async (trx) => {
- await nodeManager.createNode(trx, input.userId, spaceId, spaceAttributes);
- await nodeManager.createNode(trx, input.userId, pageId, pageAttributes);
- await nodeManager.createNode(
- trx,
- input.userId,
- channelId,
- channelAttributes
- );
- });
+ await nodeManager.createNode(input.userId, [
+ {
+ id: spaceId,
+ attributes: spaceAttributes,
+ },
+ {
+ id: pageId,
+ attributes: pageAttributes,
+ },
+ {
+ id: channelId,
+ attributes: channelAttributes,
+ },
+ ]);
return {
output: {
diff --git a/apps/desktop/src/main/handlers/mutations/space-update.ts b/apps/desktop/src/main/handlers/mutations/space-update.ts
index de10273b..78b693ac 100644
--- a/apps/desktop/src/main/handlers/mutations/space-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/space-update.ts
@@ -8,7 +8,7 @@ export class SpaceUpdateMutationHandler
async handleMutation(
input: SpaceUpdateMutationInput
): Promise<MutationResult<SpaceUpdateMutationInput>> {
- await nodeManager.updateNode(input.userId, input.id, (attributes) => {
+ await nodeManager.updateNode(input.id, input.userId, (attributes) => {
if (attributes.type !== 'space') {
throw new Error('Node is not a space');
}
diff --git a/apps/desktop/src/main/handlers/mutations/view-create.ts b/apps/desktop/src/main/handlers/mutations/view-create.ts
index 3b02c2e1..38f798e7 100644
--- a/apps/desktop/src/main/handlers/mutations/view-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/view-create.ts
@@ -13,8 +13,8 @@ export class ViewCreateMutationHandler
): Promise<MutationResult<ViewCreateMutationInput>> {
const id = generateId(IdType.View);
await nodeManager.updateNode(
- input.userId,
input.databaseId,
+ input.userId,
(attributes) => {
if (attributes.type !== 'database') {
throw new Error('Node is not a database');
diff --git a/apps/desktop/src/main/handlers/mutations/view-delete.ts b/apps/desktop/src/main/handlers/mutations/view-delete.ts
index 9088c233..f89b345d 100644
--- a/apps/desktop/src/main/handlers/mutations/view-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/view-delete.ts
@@ -9,8 +9,8 @@ export class ViewDeleteMutationHandler
input: ViewDeleteMutationInput
): Promise<MutationResult<ViewDeleteMutationInput>> {
await nodeManager.updateNode(
- input.userId,
input.databaseId,
+ input.userId,
(attributes) => {
if (attributes.type !== 'database') {
throw new Error('Node is not a database');
diff --git a/apps/desktop/src/main/handlers/mutations/view-update.ts b/apps/desktop/src/main/handlers/mutations/view-update.ts
index 0e087ddb..edb6acd7 100644
--- a/apps/desktop/src/main/handlers/mutations/view-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/view-update.ts
@@ -9,8 +9,8 @@ export class ViewUpdateMutationHandler
input: ViewUpdateMutationInput
): Promise<MutationResult<ViewUpdateMutationInput>> {
await nodeManager.updateNode(
- input.userId,
input.databaseId,
+ input.userId,
(attributes) => {
if (attributes.type !== 'database') {
throw new Error('Node is not a database');
diff --git a/apps/desktop/src/main/node-manager.ts b/apps/desktop/src/main/node-manager.ts
index add0f78c..41dd7735 100644
--- a/apps/desktop/src/main/node-manager.ts
+++ b/apps/desktop/src/main/node-manager.ts
@@ -1,172 +1,368 @@
import * as Y from 'yjs';
-import { NodeAttributes, registry } from '@colanode/core';
+import {
+ Node,
+ NodeAttributes,
+ NodeMutationContext,
+ registry,
+} from '@colanode/core';
import { applyCrdt } from '@colanode/crdt';
import { fromUint8Array, toUint8Array } from 'js-base64';
import {
LocalCreateNodeChangeData,
+ LocalDeleteNodeChangeData,
LocalUpdateNodeChangeData,
} from '@/types/sync';
import { generateId, IdType } from '@colanode/core';
import { databaseManager } from '@/main/data/database-manager';
-import { hasUpdateChanges } from '@/main/utils';
-import { Transaction } from 'kysely';
-import { WorkspaceDatabaseSchema } from '@/main/data/workspace/schema';
+import { hasUpdateChanges, mapNode } from '@/main/utils';
+import { Kysely, Transaction } from 'kysely';
+import {
+ CreateDownload,
+ CreateUpload,
+ SelectNode,
+ WorkspaceDatabaseSchema,
+} from '@/main/data/workspace/schema';
+
+export type CreateNodeInput = {
+ id: string;
+ attributes: NodeAttributes;
+ upload?: CreateUpload;
+ download?: CreateDownload;
+};
class NodeManager {
- async createNode(
- transaction: Transaction<WorkspaceDatabaseSchema>,
- userId: string,
- id: string,
- attributes: NodeAttributes
- ) {
- const doc = new Y.Doc({
- guid: id,
- });
- const attributesMap = doc.getMap('attributes');
+ async createNode(userId: string, input: CreateNodeInput | CreateNodeInput[]) {
+ const workspace = await databaseManager.appDatabase
+ .selectFrom('workspaces')
+ .selectAll()
+ .where('user_id', '=', userId)
+ .executeTakeFirst();
- const model = registry[attributes.type];
- if (!model) {
- throw new Error('Invalid node type');
+ if (!workspace) {
+ throw new Error('Workspace not found');
}
- if (!model.schema.safeParse(attributes).success) {
- throw new Error('Invalid attributes');
- }
+ const inputs = Array.isArray(input) ? input : [input];
- applyCrdt(model.schema, attributes, attributesMap);
- const encodedState = fromUint8Array(Y.encodeStateAsUpdate(doc));
+ const workspaceDatabase =
+ await databaseManager.getWorkspaceDatabase(userId);
- const createdAt = new Date().toISOString();
- const versionId = generateId(IdType.Version);
+ await workspaceDatabase.transaction().execute(async (transaction) => {
+ for (const input of inputs) {
+ const doc = new Y.Doc({ guid: input.id });
+ const attributesMap = doc.getMap('attributes');
- const changeData: LocalCreateNodeChangeData = {
- type: 'node_create',
- id: id,
- state: encodedState,
- createdAt: createdAt,
- createdBy: userId,
- versionId: versionId,
- };
+ const model = registry[input.attributes.type];
+ if (!model) {
+ throw new Error('Invalid node type');
+ }
- await transaction
- .insertInto('nodes')
- .values({
- id: id,
- attributes: JSON.stringify(attributes),
- state: encodedState,
- created_at: createdAt,
- created_by: userId,
- version_id: versionId,
- })
- .execute();
+ if (!model.schema.safeParse(input.attributes).success) {
+ throw new Error('Invalid attributes');
+ }
- await transaction
- .insertInto('changes')
- .values({
- data: JSON.stringify(changeData),
- created_at: createdAt,
- retry_count: 0,
- })
- .execute();
+ let ancestors: Node[] = [];
+ if (input.attributes.parentId) {
+ const ancestorRows = await this.fetchNodeAncestors(
+ transaction,
+ input.attributes.parentId
+ );
+ ancestors = ancestorRows.map(mapNode);
+ }
+
+ const context = new NodeMutationContext(
+ workspace.account_id,
+ workspace.workspace_id,
+ userId,
+ ancestors
+ );
+
+ if (!model.canCreate(context, input.attributes)) {
+ throw new Error('Insufficient permissions');
+ }
+
+ applyCrdt(model.schema, input.attributes, attributesMap);
+ const encodedState = fromUint8Array(Y.encodeStateAsUpdate(doc));
+
+ const createdAt = new Date().toISOString();
+ const versionId = generateId(IdType.Version);
+
+ const changeData: LocalCreateNodeChangeData = {
+ type: 'node_create',
+ id: input.id,
+ state: encodedState,
+ createdAt: createdAt,
+ createdBy: context.userId,
+ versionId: versionId,
+ };
+
+ await transaction
+ .insertInto('nodes')
+ .values({
+ id: input.id,
+ attributes: JSON.stringify(input.attributes),
+ state: encodedState,
+ created_at: createdAt,
+ created_by: context.userId,
+ version_id: versionId,
+ })
+ .execute();
+
+ await transaction
+ .insertInto('changes')
+ .values({
+ data: JSON.stringify(changeData),
+ created_at: createdAt,
+ retry_count: 0,
+ })
+ .execute();
+
+ if (input.upload) {
+ await transaction
+ .insertInto('uploads')
+ .values(input.upload)
+ .execute();
+ }
+
+ if (input.download) {
+ await transaction
+ .insertInto('downloads')
+ .values(input.download)
+ .execute();
+ }
+ }
+ });
}
async updateNode(
+ nodeId: string,
userId: string,
- id: string,
updater: (attributes: NodeAttributes) => NodeAttributes
) {
- const workspaceDatabase =
- await databaseManager.getWorkspaceDatabase(userId);
-
let count = 0;
while (count++ < 20) {
- const node = await workspaceDatabase
- .selectFrom('nodes')
- .select(['state', 'attributes', 'version_id'])
- .where('id', '=', id)
- .executeTakeFirst();
-
- if (!node) {
- throw new Error('Node not found');
+ const updated = await this.tryUpdateNode(nodeId, userId, updater);
+ if (updated) {
+ return;
}
+ }
- const doc = new Y.Doc({
- guid: id,
- });
- Y.applyUpdate(doc, toUint8Array(node.state));
+ throw new Error('Failed to update node');
+ }
- const versionId = generateId(IdType.Version);
- const updatedAt = new Date().toISOString();
- const updates: string[] = [];
+ private async tryUpdateNode(
+ nodeId: string,
+ userId: string,
+ updater: (attributes: NodeAttributes) => NodeAttributes
+ ): Promise<boolean> {
+ const workspace = await databaseManager.appDatabase
+ .selectFrom('workspaces')
+ .selectAll()
+ .where('user_id', '=', userId)
+ .executeTakeFirst();
- doc.on('update', (update) => {
- updates.push(fromUint8Array(update));
- });
+ if (!workspace) {
+ throw new Error('Workspace not found');
+ }
- const attributes = JSON.parse(node.attributes) as NodeAttributes;
- const updatedAttributes = updater(attributes);
+ const workspaceDatabase =
+ await databaseManager.getWorkspaceDatabase(userId);
- const attributesMap = doc.getMap('attributes');
- doc.transact(() => {
- applyCrdt(
- registry[updatedAttributes.type].schema,
- updatedAttributes,
- attributesMap
- );
- });
+ const ancestorRows = await this.fetchNodeAncestors(
+ workspaceDatabase,
+ nodeId
+ );
+ const nodeRow = ancestorRows.find((ancestor) => ancestor.id === nodeId);
+ if (!nodeRow) {
+ throw new Error('Node not found');
+ }
- if (updates.length === 0) {
- return true;
- }
+ const ancestors = ancestorRows.map(mapNode);
+ const node = mapNode(nodeRow);
+
+ if (!node) {
+ throw new Error('Node not found');
+ }
- const attributesJson = JSON.stringify(attributesMap.toJSON());
- const encodedState = fromUint8Array(Y.encodeStateAsUpdate(doc));
-
- const changeData: LocalUpdateNodeChangeData = {
- type: 'node_update',
- id: id,
- updatedAt: updatedAt,
- updatedBy: userId,
- versionId: versionId,
- updates: updates,
- };
-
- const result = await workspaceDatabase
- .transaction()
- .execute(async (trx) => {
- const result = await trx
- .updateTable('nodes')
- .set({
- attributes: attributesJson,
- state: encodedState,
- updated_at: updatedAt,
- updated_by: userId,
- version_id: versionId,
+ const context = new NodeMutationContext(
+ workspace.account_id,
+ workspace.workspace_id,
+ userId,
+ ancestors
+ );
+
+ const doc = new Y.Doc({ guid: nodeId });
+ Y.applyUpdate(doc, toUint8Array(nodeRow.state));
+
+ const versionId = generateId(IdType.Version);
+ const updatedAt = new Date().toISOString();
+ const updates: string[] = [];
+
+ doc.on('update', (update) => {
+ updates.push(fromUint8Array(update));
+ });
+
+ const updatedAttributes = updater(node.attributes);
+
+ const model = registry[node.type];
+ if (!model) {
+ throw new Error('Invalid node type');
+ }
+
+ if (!model.schema.safeParse(updatedAttributes).success) {
+ throw new Error('Invalid attributes');
+ }
+
+ if (!model.canUpdate(context, node, updatedAttributes)) {
+ throw new Error('Insufficient permissions');
+ }
+
+ const attributesMap = doc.getMap('attributes');
+ doc.transact(() => {
+ applyCrdt(
+ registry[updatedAttributes.type].schema,
+ updatedAttributes,
+ attributesMap
+ );
+ });
+
+ if (updates.length === 0) {
+ return true;
+ }
+
+ const attributesJson = JSON.stringify(attributesMap.toJSON());
+ const encodedState = fromUint8Array(Y.encodeStateAsUpdate(doc));
+
+ const changeData: LocalUpdateNodeChangeData = {
+ type: 'node_update',
+ id: nodeId,
+ updatedAt: updatedAt,
+ updatedBy: context.userId,
+ versionId: versionId,
+ updates: updates,
+ };
+
+ const result = await workspaceDatabase
+ .transaction()
+ .execute(async (trx) => {
+ const result = await trx
+ .updateTable('nodes')
+ .set({
+ attributes: attributesJson,
+ state: encodedState,
+ updated_at: updatedAt,
+ updated_by: context.userId,
+ version_id: versionId,
+ })
+ .where('id', '=', nodeId)
+ .where('version_id', '=', node.versionId)
+ .execute();
+
+ const hasChanges = hasUpdateChanges(result);
+
+ if (hasChanges) {
+ await trx
+ .insertInto('changes')
+ .values({
+ data: JSON.stringify(changeData),
+ created_at: updatedAt,
+ retry_count: 0,
})
- .where('id', '=', id)
- .where('version_id', '=', node.version_id)
.execute();
+ }
- const hasChanges = hasUpdateChanges(result);
+ return hasChanges;
+ });
- if (hasChanges) {
- await trx
- .insertInto('changes')
- .values({
- data: JSON.stringify(changeData),
- created_at: updatedAt,
- retry_count: 0,
- })
- .execute();
- }
+ return result;
+ }
- return hasChanges;
- });
+ async deleteNode(nodeId: string, userId: string) {
+ const workspace = await databaseManager.appDatabase
+ .selectFrom('workspaces')
+ .selectAll()
+ .where('user_id', '=', userId)
+ .executeTakeFirst();
- return result;
+ if (!workspace) {
+ throw new Error('Workspace not found');
}
- throw new Error('Failed to update node');
+ const workspaceDatabase =
+ await databaseManager.getWorkspaceDatabase(userId);
+
+ const ancestorRows = await this.fetchNodeAncestors(
+ workspaceDatabase,
+ nodeId
+ );
+ const ancestors = ancestorRows.map(mapNode);
+ const node = ancestors.find((ancestor) => ancestor.id === nodeId);
+
+ if (!node) {
+ throw new Error('Node not found');
+ }
+
+ const model = registry[node.type];
+ if (!model) {
+ throw new Error('Invalid node type');
+ }
+
+ const context = new NodeMutationContext(
+ workspace.account_id,
+ workspace.workspace_id,
+ userId,
+ ancestors
+ );
+
+ if (!model.canDelete(context, node)) {
+ throw new Error('Insufficient permissions');
+ }
+
+ const changeData: LocalDeleteNodeChangeData = {
+ type: 'node_delete',
+ id: nodeId,
+ deletedAt: new Date().toISOString(),
+ deletedBy: context.userId,
+ };
+
+ await workspaceDatabase.transaction().execute(async (trx) => {
+ await trx
+ .deleteFrom('user_nodes')
+ .where('node_id', '=', nodeId)
+ .execute();
+ await trx.deleteFrom('nodes').where('id', '=', nodeId).execute();
+ await trx.deleteFrom('uploads').where('node_id', '=', nodeId).execute();
+ await trx.deleteFrom('downloads').where('node_id', '=', nodeId).execute();
+
+ await trx
+ .insertInto('changes')
+ .values({
+ data: JSON.stringify(changeData),
+ created_at: new Date().toISOString(),
+ retry_count: 0,
+ })
+ .execute();
+ });
+ }
+
+ private async fetchNodeAncestors(
+ database:
+ | Kysely<WorkspaceDatabaseSchema>
+ | Transaction<WorkspaceDatabaseSchema>,
+ nodeId: string
+ ): Promise<SelectNode[]> {
+ return database
+ .selectFrom('nodes')
+ .selectAll()
+ .where(
+ 'id',
+ 'in',
+ database
+ .selectFrom('node_paths')
+ .select('ancestor_id')
+ .where('descendant_id', '=', nodeId)
+ )
+ .execute();
}
}
diff --git a/packages/core/src/registry/core.ts b/packages/core/src/registry/core.ts
index 196bcf52..68e7d098 100644
--- a/packages/core/src/registry/core.ts
+++ b/packages/core/src/registry/core.ts
@@ -3,16 +3,49 @@ import { Node, NodeAttributes } from './';
export type NodeRole = 'admin' | 'editor' | 'collaborator' | 'viewer';
-export interface NodeMutationContext {
- accountId: string;
- workspaceId: string;
- userId: string;
- ancestors: Node[];
- role: NodeRole;
- hasAdminAccess: () => boolean;
- hasEditorAccess: () => boolean;
- hasCollaboratorAccess: () => boolean;
- hasViewerAccess: () => boolean;
+export class NodeMutationContext {
+ public accountId: string;
+ public workspaceId: string;
+ public userId: string;
+ public ancestors: Node[];
+ public role: NodeRole = 'viewer';
+
+ constructor(
+ accountId: string,
+ workspaceId: string,
+ userId: string,
+ ancestors: Node[]
+ ) {
+ this.accountId = accountId;
+ this.workspaceId = workspaceId;
+ this.userId = userId;
+ this.ancestors = ancestors;
+ }
+
+ public hasAdminAccess = () => {
+ return this.role === 'admin';
+ };
+
+ public hasEditorAccess = () => {
+ return this.role === 'admin' || this.role === 'editor';
+ };
+
+ public hasCollaboratorAccess = () => {
+ return (
+ this.role === 'admin' ||
+ this.role === 'editor' ||
+ this.role === 'collaborator'
+ );
+ };
+
+ public hasViewerAccess = () => {
+ return (
+ this.role === 'admin' ||
+ this.role === 'editor' ||
+ this.role === 'collaborator' ||
+ this.role === 'viewer'
+ );
+ };
}
export interface NodeModel {