Skip to content

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

Rename managers to services

Hakan Shehu73929f04ec5b
diff --git a/apps/desktop/src/main/data/database-manager.ts b/apps/desktop/src/main/data/database-service.ts
similarity index 98%
rename from apps/desktop/src/main/data/database-manager.ts
rename to apps/desktop/src/main/data/database-service.ts
index b4afba77..48a19925 100644
--- a/apps/desktop/src/main/data/database-manager.ts
+++ b/apps/desktop/src/main/data/database-service.ts
@@ -7,7 +7,7 @@ import { appDatabaseMigrations } from '@/main/data/app/migrations';
import { workspaceDatabaseMigrations } from '@/main/data/workspace/migrations';
import { appDatabasePath, getWorkspaceDirectoryPath } from '@/main/utils';
-class DatabaseManager {
+class DatabaseService {
private initPromise: Promise<void> | null = null;
private readonly workspaceDatabases: Map<
string,
@@ -142,4 +142,4 @@ class DatabaseManager {
}
}
-export const databaseManager = new DatabaseManager();
+export const databaseService = new DatabaseService();
diff --git a/apps/desktop/src/main/handlers/mutations/account-update.ts b/apps/desktop/src/main/handlers/mutations/account-update.ts
index 175d206f..535927b7 100644
--- a/apps/desktop/src/main/handlers/mutations/account-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/account-update.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { httpClient } from '@/lib/http-client';
import { MutationHandler, MutationResult } from '@/main/types';
import { AccountUpdateOutput } from '@/types/accounts';
@@ -10,7 +10,7 @@ export class AccountUpdateMutationHandler
async handleMutation(
input: AccountUpdateMutationInput
): Promise<MutationResult<AccountUpdateMutationInput>> {
- const account = await databaseManager.appDatabase
+ const account = await databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
.where('id', '=', input.id)
@@ -20,7 +20,7 @@ export class AccountUpdateMutationHandler
throw new Error('Account not found!');
}
- const server = await databaseManager.appDatabase
+ const server = await databaseService.appDatabase
.selectFrom('servers')
.selectAll()
.where('domain', '=', account.server)
@@ -43,7 +43,7 @@ export class AccountUpdateMutationHandler
}
);
- await databaseManager.appDatabase
+ await databaseService.appDatabase
.updateTable('accounts')
.set({
name: data.name,
diff --git a/apps/desktop/src/main/handlers/mutations/avatar-upload.ts b/apps/desktop/src/main/handlers/mutations/avatar-upload.ts
index 1ec482be..f12aac55 100644
--- a/apps/desktop/src/main/handlers/mutations/avatar-upload.ts
+++ b/apps/desktop/src/main/handlers/mutations/avatar-upload.ts
@@ -1,6 +1,6 @@
import fs from 'fs';
import FormData from 'form-data';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { MutationHandler, MutationResult } from '@/main/types';
import { AvatarUploadMutationInput } from '@/operations/mutations/avatar-upload';
import { httpClient } from '@/lib/http-client';
@@ -15,7 +15,7 @@ export class AvatarUploadMutationHandler
async handleMutation(
input: AvatarUploadMutationInput
): Promise<MutationResult<AvatarUploadMutationInput>> {
- const credentials = await databaseManager.appDatabase
+ const credentials = await databaseService.appDatabase
.selectFrom('accounts')
.innerJoin('servers', 'accounts.server', 'servers.domain')
.select(['domain', 'attributes', 'token'])
diff --git a/apps/desktop/src/main/handlers/mutations/channel-create.ts b/apps/desktop/src/main/handlers/mutations/channel-create.ts
index 0d47e5af..9af5c4cc 100644
--- a/apps/desktop/src/main/handlers/mutations/channel-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/channel-create.ts
@@ -1,10 +1,10 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { generateId, IdType } from '@colanode/core';
import { generateNodeIndex } from '@/lib/nodes';
import { MutationHandler, MutationResult } from '@/main/types';
import { ChannelCreateMutationInput } from '@/operations/mutations/channel-create';
import { ChannelAttributes } from '@colanode/core';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class ChannelCreateMutationHandler
implements MutationHandler<ChannelCreateMutationInput>
@@ -12,7 +12,7 @@ export class ChannelCreateMutationHandler
async handleMutation(
input: ChannelCreateMutationInput
): Promise<MutationResult<ChannelCreateMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
@@ -45,7 +45,7 @@ export class ChannelCreateMutationHandler
collaborators: null,
};
- await nodeManager.createNode(input.userId, { id, attributes });
+ await nodeService.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 d1167c4f..9fb67a6d 100644
--- a/apps/desktop/src/main/handlers/mutations/chat-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/chat-create.ts
@@ -1,10 +1,10 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { generateId, IdType, NodeTypes, NodeRoles } from '@colanode/core';
import { MutationHandler, MutationResult } from '@/main/types';
import { ChatCreateMutationInput } from '@/operations/mutations/chat-create';
import { sql } from 'kysely';
import { ChatAttributes } from '@colanode/core';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
interface ChatRow {
id: string;
@@ -16,7 +16,7 @@ export class ChatCreateMutationHandler
public async handleMutation(
input: ChatCreateMutationInput
): Promise<MutationResult<ChatCreateMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
@@ -48,7 +48,7 @@ export class ChatCreateMutationHandler
},
};
- await nodeManager.createNode(input.userId, { id, attributes });
+ await nodeService.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 0982660b..f5a2d85e 100644
--- a/apps/desktop/src/main/handlers/mutations/database-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/database-create.ts
@@ -3,7 +3,7 @@ import { generateNodeIndex } from '@/lib/nodes';
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 { nodeService } from '@/main/services/node-service';
export class DatabaseCreateMutationHandler
implements MutationHandler<DatabaseCreateMutationInput>
@@ -42,7 +42,7 @@ export class DatabaseCreateMutationHandler
},
};
- await nodeManager.createNode(input.userId, {
+ await nodeService.createNode(input.userId, {
id: databaseId,
attributes,
});
diff --git a/apps/desktop/src/main/handlers/mutations/document-save.ts b/apps/desktop/src/main/handlers/mutations/document-save.ts
index 4e83e999..b27df3ec 100644
--- a/apps/desktop/src/main/handlers/mutations/document-save.ts
+++ b/apps/desktop/src/main/handlers/mutations/document-save.ts
@@ -2,7 +2,7 @@ import { MutationHandler, MutationResult } from '@/main/types';
import { DocumentSaveMutationInput } from '@/operations/mutations/document-save';
import { mapContentsToBlocks } from '@/lib/editor';
import { Block } from '@colanode/core';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class DocumentSaveMutationHandler
implements MutationHandler<DocumentSaveMutationInput>
@@ -10,7 +10,7 @@ export class DocumentSaveMutationHandler
async handleMutation(
input: DocumentSaveMutationInput
): Promise<MutationResult<DocumentSaveMutationInput>> {
- await nodeManager.updateNode(
+ await nodeService.updateNode(
input.documentId,
input.userId,
(attributes) => {
diff --git a/apps/desktop/src/main/handlers/mutations/email-login.ts b/apps/desktop/src/main/handlers/mutations/email-login.ts
index 44e6b3e5..5cf3da79 100644
--- a/apps/desktop/src/main/handlers/mutations/email-login.ts
+++ b/apps/desktop/src/main/handlers/mutations/email-login.ts
@@ -1,5 +1,5 @@
import { LoginOutput } from '@/types/accounts';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { EmailLoginMutationInput } from '@/operations/mutations/email-login';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
import { httpClient } from '@/lib/http-client';
@@ -10,7 +10,7 @@ export class EmailLoginMutationHandler
async handleMutation(
input: EmailLoginMutationInput
): Promise<MutationResult<EmailLoginMutationInput>> {
- const server = await databaseManager.appDatabase
+ const server = await databaseService.appDatabase
.selectFrom('servers')
.selectAll()
.where('domain', '=', input.server)
@@ -37,7 +37,7 @@ export class EmailLoginMutationHandler
);
const changedTables: MutationChange[] = [];
- await databaseManager.appDatabase.transaction().execute(async (trx) => {
+ await databaseService.appDatabase.transaction().execute(async (trx) => {
await trx
.insertInto('accounts')
.values({
diff --git a/apps/desktop/src/main/handlers/mutations/email-register.ts b/apps/desktop/src/main/handlers/mutations/email-register.ts
index cdb28aa8..904ab841 100644
--- a/apps/desktop/src/main/handlers/mutations/email-register.ts
+++ b/apps/desktop/src/main/handlers/mutations/email-register.ts
@@ -1,5 +1,5 @@
import { LoginOutput } from '@/types/accounts';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { httpClient } from '@/lib/http-client';
import { EmailRegisterMutationInput } from '@/operations/mutations/email-register';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
@@ -10,7 +10,7 @@ export class EmailRegisterMutationHandler
handleMutation = async (
input: EmailRegisterMutationInput
): Promise<MutationResult<EmailRegisterMutationInput>> => {
- const server = await databaseManager.appDatabase
+ const server = await databaseService.appDatabase
.selectFrom('servers')
.selectAll()
.where('domain', '=', input.server)
@@ -38,7 +38,7 @@ export class EmailRegisterMutationHandler
);
const changedTables: MutationChange[] = [];
- await databaseManager.appDatabase.transaction().execute(async (trx) => {
+ await databaseService.appDatabase.transaction().execute(async (trx) => {
await trx
.insertInto('accounts')
.values({
diff --git a/apps/desktop/src/main/handlers/mutations/field-create.ts b/apps/desktop/src/main/handlers/mutations/field-create.ts
index 09d2f606..454600fc 100644
--- a/apps/desktop/src/main/handlers/mutations/field-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/field-create.ts
@@ -3,7 +3,7 @@ import { generateNodeIndex } from '@/lib/nodes';
import { compareString } from '@/lib/utils';
import { MutationHandler, MutationResult } from '@/main/types';
import { FieldCreateMutationInput } from '@/operations/mutations/field-create';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class FieldCreateMutationHandler
implements MutationHandler<FieldCreateMutationInput>
@@ -12,7 +12,7 @@ export class FieldCreateMutationHandler
input: FieldCreateMutationInput
): Promise<MutationResult<FieldCreateMutationInput>> {
const fieldId = generateId(IdType.Field);
- await nodeManager.updateNode(
+ await nodeService.updateNode(
input.databaseId,
input.userId,
(attributes) => {
diff --git a/apps/desktop/src/main/handlers/mutations/file-create.ts b/apps/desktop/src/main/handlers/mutations/file-create.ts
index 1f37a20d..f0248e69 100644
--- a/apps/desktop/src/main/handlers/mutations/file-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/file-create.ts
@@ -1,9 +1,9 @@
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 { fileService } from '@/main/services/file-service';
import { FileAttributes } from '@colanode/core';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class FileCreateMutationHandler
implements MutationHandler<FileCreateMutationInput>
@@ -11,13 +11,13 @@ export class FileCreateMutationHandler
async handleMutation(
input: FileCreateMutationInput
): Promise<MutationResult<FileCreateMutationInput>> {
- const metadata = fileManager.getFileMetadata(input.filePath);
+ const metadata = fileService.getFileMetadata(input.filePath);
if (!metadata) {
throw new Error('Invalid file');
}
const id = generateId(IdType.File);
- fileManager.copyFileToWorkspace(
+ fileService.copyFileToWorkspace(
input.filePath,
id,
metadata.extension,
@@ -34,7 +34,7 @@ export class FileCreateMutationHandler
mimeType: metadata.mimeType,
};
- await nodeManager.createNode(input.userId, {
+ await nodeService.createNode(input.userId, {
id,
attributes,
upload: {
diff --git a/apps/desktop/src/main/handlers/mutations/file-download.ts b/apps/desktop/src/main/handlers/mutations/file-download.ts
index 16c8a47d..31ee2133 100644
--- a/apps/desktop/src/main/handlers/mutations/file-download.ts
+++ b/apps/desktop/src/main/handlers/mutations/file-download.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { MutationHandler, MutationResult } from '@/main/types';
import { FileDownloadMutationInput } from '@/operations/mutations/file-download';
@@ -8,7 +8,7 @@ export class FileDownloadMutationHandler
async handleMutation(
input: FileDownloadMutationInput
): Promise<MutationResult<FileDownloadMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/mutations/folder-create.ts b/apps/desktop/src/main/handlers/mutations/folder-create.ts
index 128b5107..a8a290a5 100644
--- a/apps/desktop/src/main/handlers/mutations/folder-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/folder-create.ts
@@ -2,7 +2,7 @@ import { generateId, IdType } from '@colanode/core';
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 { nodeService } from '@/main/services/node-service';
export class FolderCreateMutationHandler
implements MutationHandler<FolderCreateMutationInput>
@@ -18,7 +18,7 @@ export class FolderCreateMutationHandler
collaborators: {},
};
- await nodeManager.createNode(input.userId, { id, attributes });
+ await nodeService.createNode(input.userId, { id, attributes });
return {
output: {
diff --git a/apps/desktop/src/main/handlers/mutations/logout.ts b/apps/desktop/src/main/handlers/mutations/logout.ts
index fa77ea55..adef5a12 100644
--- a/apps/desktop/src/main/handlers/mutations/logout.ts
+++ b/apps/desktop/src/main/handlers/mutations/logout.ts
@@ -1,5 +1,5 @@
import fs from 'fs';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { LogoutMutationInput } from '@/operations/mutations/logout';
import { MutationHandler, MutationResult } from '@/main/types';
import {
@@ -13,7 +13,7 @@ export class LogoutMutationHandler
async handleMutation(
input: LogoutMutationInput
): Promise<MutationResult<LogoutMutationInput>> {
- const account = await databaseManager.appDatabase
+ const account = await databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
.where('id', '=', input.accountId)
@@ -27,14 +27,14 @@ export class LogoutMutationHandler
};
}
- const workspaces = await databaseManager.appDatabase
+ const workspaces = await databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where('account_id', '=', account.id)
.execute();
for (const workspace of workspaces) {
- await databaseManager.deleteWorkspaceDatabase(workspace.user_id);
+ await databaseService.deleteWorkspaceDatabase(workspace.user_id);
const workspaceDir = getWorkspaceDirectoryPath(workspace.user_id);
if (fs.existsSync(workspaceDir)) {
@@ -47,17 +47,17 @@ export class LogoutMutationHandler
fs.rmSync(avatarsDir, { recursive: true });
}
- await databaseManager.appDatabase
+ await databaseService.appDatabase
.deleteFrom('accounts')
.where('id', '=', account.id)
.execute();
- await databaseManager.appDatabase
+ await databaseService.appDatabase
.deleteFrom('workspaces')
.where('account_id', '=', account.id)
.execute();
- await databaseManager.appDatabase
+ await databaseService.appDatabase
.insertInto('deleted_tokens')
.values({
token: account.token,
diff --git a/apps/desktop/src/main/handlers/mutations/mark-node-as-seen.ts b/apps/desktop/src/main/handlers/mutations/mark-node-as-seen.ts
index 4397ffbe..b99b7ef6 100644
--- a/apps/desktop/src/main/handlers/mutations/mark-node-as-seen.ts
+++ b/apps/desktop/src/main/handlers/mutations/mark-node-as-seen.ts
@@ -1,5 +1,5 @@
import { generateId, IdType } from '@colanode/core';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { MutationHandler, MutationResult } from '@/main/types';
import { MarkNodeAsSeenMutationInput } from '@/operations/mutations/mark-node-as-seen';
import { LocalUserNodeChangeData } from '@/types/sync';
@@ -10,7 +10,7 @@ export class MarkNodeAsSeenMutationHandler
async handleMutation(
input: MarkNodeAsSeenMutationInput
): Promise<MutationResult<MarkNodeAsSeenMutationInput>> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/mutations/message-create.ts b/apps/desktop/src/main/handlers/mutations/message-create.ts
index 089e304e..2f1733d8 100644
--- a/apps/desktop/src/main/handlers/mutations/message-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/message-create.ts
@@ -2,9 +2,9 @@ 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 { fileService } from '@/main/services/file-service';
import { Block, FileAttributes, MessageAttributes } from '@colanode/core';
-import { CreateNodeInput, nodeManager } from '@/main/node-manager';
+import { CreateNodeInput, nodeService } from '@/main/services/node-service';
export class MessageCreateMutationHandler
implements MutationHandler<MessageCreateMutationInput>
@@ -27,7 +27,7 @@ export class MessageCreateMutationHandler
for (const block of blocks) {
if (block.type === EditorNodeTypes.FilePlaceholder) {
const path = block.attrs?.path;
- const metadata = fileManager.getFileMetadata(path);
+ const metadata = fileService.getFileMetadata(path);
if (!metadata) {
throw new Error('Invalid file');
}
@@ -38,7 +38,7 @@ export class MessageCreateMutationHandler
block.type = NodeTypes.File;
block.attrs = null;
- fileManager.copyFileToWorkspace(
+ fileService.copyFileToWorkspace(
path,
fileId,
metadata.extension,
@@ -90,7 +90,7 @@ export class MessageCreateMutationHandler
};
inputs.unshift({ id: messageId, attributes: messageAttributes });
- await nodeManager.createNode(input.userId, inputs);
+ await nodeService.createNode(input.userId, inputs);
const mutationChanges: MutationChange[] = [
{
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 00ce90cf..bf728032 100644
--- a/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-attribute-delete.ts
@@ -1,6 +1,6 @@
import { MutationHandler, MutationResult } from '@/main/types';
import { NodeAttributeDeleteMutationInput } from '@/operations/mutations/node-attribute-delete';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
import { unset } from 'lodash-es';
export class NodeAttributeDeleteMutationHandler
@@ -9,7 +9,7 @@ export class NodeAttributeDeleteMutationHandler
async handleMutation(
input: NodeAttributeDeleteMutationInput
): Promise<MutationResult<NodeAttributeDeleteMutationInput>> {
- await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
+ await nodeService.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 d10733b4..9855b5ed 100644
--- a/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-attribute-set.ts
@@ -1,6 +1,6 @@
import { MutationHandler, MutationResult } from '@/main/types';
import { NodeAttributeSetMutationInput } from '@/operations/mutations/node-attribute-set';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
import { set } from 'lodash-es';
export class NodeAttributeSetMutationHandler
@@ -9,7 +9,7 @@ export class NodeAttributeSetMutationHandler
async handleMutation(
input: NodeAttributeSetMutationInput
): Promise<MutationResult<NodeAttributeSetMutationInput>> {
- await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
+ await nodeService.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 3e30a3d4..72999a1c 100644
--- a/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-collaborator-create.ts
@@ -1,6 +1,6 @@
import { MutationHandler, MutationResult } from '@/main/types';
import { NodeCollaboratorCreateMutationInput } from '@/operations/mutations/node-collaborator-create';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
import { set } from 'lodash-es';
export class NodeCollaboratorCreateMutationHandler
@@ -9,7 +9,7 @@ export class NodeCollaboratorCreateMutationHandler
async handleMutation(
input: NodeCollaboratorCreateMutationInput
): Promise<MutationResult<NodeCollaboratorCreateMutationInput>> {
- await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
+ await nodeService.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 197753bf..4e9a1e5c 100644
--- a/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-collaborator-delete.ts
@@ -1,4 +1,4 @@
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
import { MutationHandler, MutationResult } from '@/main/types';
import { NodeCollaboratorDeleteMutationInput } from '@/operations/mutations/node-collaborator-delete';
import { unset } from 'lodash-es';
@@ -9,7 +9,7 @@ export class NodeCollaboratorDeleteMutationHandler
async handleMutation(
input: NodeCollaboratorDeleteMutationInput
): Promise<MutationResult<NodeCollaboratorDeleteMutationInput>> {
- await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
+ await nodeService.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 28a729e3..bdedbc8f 100644
--- a/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-collaborator-update.ts
@@ -1,4 +1,4 @@
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
import { MutationHandler, MutationResult } from '@/main/types';
import { NodeCollaboratorUpdateMutationInput } from '@/operations/mutations/node-collaborator-update';
import { set } from 'lodash-es';
@@ -9,7 +9,7 @@ export class NodeCollaboratorUpdateMutationHandler
async handleMutation(
input: NodeCollaboratorUpdateMutationInput
): Promise<MutationResult<NodeCollaboratorUpdateMutationInput>> {
- await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
+ await nodeService.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 90aa6ae9..3cafdc63 100644
--- a/apps/desktop/src/main/handlers/mutations/node-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-delete.ts
@@ -1,6 +1,6 @@
import { MutationHandler, MutationResult } from '@/main/types';
import { NodeDeleteMutationInput } from '@/operations/mutations/node-delete';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class NodeDeleteMutationHandler
implements MutationHandler<NodeDeleteMutationInput>
@@ -8,7 +8,7 @@ export class NodeDeleteMutationHandler
async handleMutation(
input: NodeDeleteMutationInput
): Promise<MutationResult<NodeDeleteMutationInput>> {
- await nodeManager.deleteNode(input.nodeId, input.userId);
+ await nodeService.deleteNode(input.nodeId, input.userId);
return {
output: {
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 47b912de..02bf69d8 100644
--- a/apps/desktop/src/main/handlers/mutations/node-reaction-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-reaction-create.ts
@@ -1,4 +1,4 @@
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
import { MutationHandler, MutationResult } from '@/main/types';
import { NodeReactionCreateMutationInput } from '@/operations/mutations/node-reaction-create';
@@ -8,7 +8,7 @@ export class NodeReactionCreateMutationHandler
async handleMutation(
input: NodeReactionCreateMutationInput
): Promise<MutationResult<NodeReactionCreateMutationInput>> {
- await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
+ await nodeService.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 8d29fbe0..84c9e936 100644
--- a/apps/desktop/src/main/handlers/mutations/node-reaction-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/node-reaction-delete.ts
@@ -1,4 +1,4 @@
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
import { MutationHandler, MutationResult } from '@/main/types';
import { NodeReactionDeleteMutationInput } from '@/operations/mutations/node-reaction-delete';
@@ -8,7 +8,7 @@ export class NodeReactionDeleteMutationHandler
async handleMutation(
input: NodeReactionDeleteMutationInput
): Promise<MutationResult<NodeReactionDeleteMutationInput>> {
- await nodeManager.updateNode(input.nodeId, input.userId, (attributes) => {
+ await nodeService.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 b3cafcbe..4dd5403d 100644
--- a/apps/desktop/src/main/handlers/mutations/page-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/page-create.ts
@@ -2,7 +2,7 @@ import { generateId, IdType } from '@colanode/core';
import { MutationHandler, MutationResult } from '@/main/types';
import { PageCreateMutationInput } from '@/operations/mutations/page-create';
import { PageAttributes } from '@colanode/core';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class PageCreateMutationHandler
implements MutationHandler<PageCreateMutationInput>
@@ -18,7 +18,7 @@ export class PageCreateMutationHandler
content: {},
};
- await nodeManager.createNode(input.userId, { id, attributes });
+ await nodeService.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 a206970d..32958153 100644
--- a/apps/desktop/src/main/handlers/mutations/record-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/record-create.ts
@@ -2,7 +2,7 @@ import { generateId, IdType } from '@colanode/core';
import { MutationHandler, MutationResult } from '@/main/types';
import { RecordCreateMutationInput } from '@/operations/mutations/record-create';
import { RecordAttributes } from '@colanode/core';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class RecordCreateMutationHandler
implements MutationHandler<RecordCreateMutationInput>
@@ -20,7 +20,7 @@ export class RecordCreateMutationHandler
content: {},
};
- await nodeManager.createNode(input.userId, { id, attributes });
+ await nodeService.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 6d2fcf3a..eecc77c0 100644
--- a/apps/desktop/src/main/handlers/mutations/select-option-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/select-option-create.ts
@@ -3,7 +3,7 @@ import { generateNodeIndex } from '@/lib/nodes';
import { MutationHandler, MutationResult } from '@/main/types';
import { SelectOptionCreateMutationInput } from '@/operations/mutations/select-option-create';
import { compareString } from '@/lib/utils';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class SelectOptionCreateMutationHandler
implements MutationHandler<SelectOptionCreateMutationInput>
@@ -12,7 +12,7 @@ export class SelectOptionCreateMutationHandler
input: SelectOptionCreateMutationInput
): Promise<MutationResult<SelectOptionCreateMutationInput>> {
const id = generateId(IdType.SelectOption);
- await nodeManager.updateNode(
+ await nodeService.updateNode(
input.databaseId,
input.userId,
(attributes) => {
diff --git a/apps/desktop/src/main/handlers/mutations/server-create.ts b/apps/desktop/src/main/handlers/mutations/server-create.ts
index 4c95adf0..7cac4f34 100644
--- a/apps/desktop/src/main/handlers/mutations/server-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/server-create.ts
@@ -1,5 +1,5 @@
import axios from 'axios';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { MutationHandler, MutationResult } from '@/main/types';
import { ServerCreateMutationInput } from '@/operations/mutations/server-create';
import { ServerConfig } from '@/types/servers';
@@ -14,7 +14,7 @@ export class ServerCreateMutationHandler
`http://${input.domain}/v1/config`
);
- await databaseManager.appDatabase
+ await databaseService.appDatabase
.insertInto('servers')
.values({
domain: input.domain,
diff --git a/apps/desktop/src/main/handlers/mutations/server-node-delete.ts b/apps/desktop/src/main/handlers/mutations/server-node-delete.ts
index 3da839cf..2c869cd9 100644
--- a/apps/desktop/src/main/handlers/mutations/server-node-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/server-node-delete.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { socketManager } from '@/main/sockets/socket-manager';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
import { ServerNodeDeleteMutationInput } from '@/operations/mutations/server-node-delete';
@@ -11,7 +11,7 @@ export class ServerNodeDeleteMutationHandler
): Promise<MutationResult<ServerNodeDeleteMutationInput>> {
const changes: MutationChange[] = [];
- const workspace = await databaseManager.appDatabase
+ const workspace = await databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where((eb) =>
@@ -32,7 +32,7 @@ export class ServerNodeDeleteMutationHandler
const userId = workspace.user_id;
const workspaceDatabase =
- await databaseManager.getWorkspaceDatabase(userId);
+ await databaseService.getWorkspaceDatabase(userId);
await workspaceDatabase
.deleteFrom('nodes')
diff --git a/apps/desktop/src/main/handlers/mutations/server-node-sync.ts b/apps/desktop/src/main/handlers/mutations/server-node-sync.ts
index e0be6e84..e4e06e27 100644
--- a/apps/desktop/src/main/handlers/mutations/server-node-sync.ts
+++ b/apps/desktop/src/main/handlers/mutations/server-node-sync.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { socketManager } from '@/main/sockets/socket-manager';
import { hasInsertChanges, hasUpdateChanges } from '@/main/utils';
import { MutationHandler, MutationResult } from '@/main/types';
@@ -11,7 +11,7 @@ export class ServerNodeSyncMutationHandler
public async handleMutation(
input: ServerNodeSyncMutationInput
): Promise<MutationResult<ServerNodeSyncMutationInput>> {
- const workspace = await databaseManager.appDatabase
+ const workspace = await databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where((eb) =>
@@ -32,7 +32,7 @@ export class ServerNodeSyncMutationHandler
const userId = workspace.user_id;
const workspaceDatabase =
- await databaseManager.getWorkspaceDatabase(userId);
+ await databaseService.getWorkspaceDatabase(userId);
let count = 0;
while (count++ < 10) {
diff --git a/apps/desktop/src/main/handlers/mutations/server-user-node-sync.ts b/apps/desktop/src/main/handlers/mutations/server-user-node-sync.ts
index 7ebc4d07..c8a200cf 100644
--- a/apps/desktop/src/main/handlers/mutations/server-user-node-sync.ts
+++ b/apps/desktop/src/main/handlers/mutations/server-user-node-sync.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { socketManager } from '@/main/sockets/socket-manager';
import { MutationHandler, MutationResult } from '@/main/types';
import { ServerUserNodeSyncMutationInput } from '@/operations/mutations/server-user-node-sync';
@@ -9,7 +9,7 @@ export class ServerUserNodeSyncMutationHandler
public async handleMutation(
input: ServerUserNodeSyncMutationInput
): Promise<MutationResult<ServerUserNodeSyncMutationInput>> {
- const workspace = await databaseManager.appDatabase
+ const workspace = await databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where((eb) =>
@@ -30,7 +30,7 @@ export class ServerUserNodeSyncMutationHandler
const userId = workspace.user_id;
const workspaceDatabase =
- await databaseManager.getWorkspaceDatabase(userId);
+ await databaseService.getWorkspaceDatabase(userId);
await workspaceDatabase
.insertInto('user_nodes')
diff --git a/apps/desktop/src/main/handlers/mutations/space-create.ts b/apps/desktop/src/main/handlers/mutations/space-create.ts
index 7628e4b7..01085dba 100644
--- a/apps/desktop/src/main/handlers/mutations/space-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/space-create.ts
@@ -7,8 +7,8 @@ import {
PageAttributes,
SpaceAttributes,
} from '@colanode/core';
-import { nodeManager } from '@/main/node-manager';
-import { databaseManager } from '@/main/data/database-manager';
+import { nodeService } from '@/main/services/node-service';
+import { databaseService } from '@/main/data/database-service';
export class SpaceCreateMutationHandler
implements MutationHandler<SpaceCreateMutationInput>
@@ -16,7 +16,7 @@ export class SpaceCreateMutationHandler
async handleMutation(
input: SpaceCreateMutationInput
): Promise<MutationResult<SpaceCreateMutationInput>> {
- const workspace = await databaseManager.appDatabase
+ const workspace = await databaseService.appDatabase
.selectFrom('workspaces')
.where('user_id', '=', input.userId)
.selectAll()
@@ -59,7 +59,7 @@ export class SpaceCreateMutationHandler
index: generateNodeIndex(null, null),
};
- await nodeManager.createNode(input.userId, [
+ await nodeService.createNode(input.userId, [
{
id: spaceId,
attributes: spaceAttributes,
diff --git a/apps/desktop/src/main/handlers/mutations/space-update.ts b/apps/desktop/src/main/handlers/mutations/space-update.ts
index 78b693ac..0a96a4d3 100644
--- a/apps/desktop/src/main/handlers/mutations/space-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/space-update.ts
@@ -1,6 +1,6 @@
import { MutationHandler, MutationResult } from '@/main/types';
import { SpaceUpdateMutationInput } from '@/operations/mutations/space-update';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class SpaceUpdateMutationHandler
implements MutationHandler<SpaceUpdateMutationInput>
@@ -8,7 +8,7 @@ export class SpaceUpdateMutationHandler
async handleMutation(
input: SpaceUpdateMutationInput
): Promise<MutationResult<SpaceUpdateMutationInput>> {
- await nodeManager.updateNode(input.id, input.userId, (attributes) => {
+ await nodeService.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 38f798e7..b535657d 100644
--- a/apps/desktop/src/main/handlers/mutations/view-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/view-create.ts
@@ -3,7 +3,7 @@ import { MutationHandler, MutationResult } from '@/main/types';
import { ViewCreateMutationInput } from '@/operations/mutations/view-create';
import { compareString } from '@/lib/utils';
import { generateNodeIndex } from '@/lib/nodes';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
export class ViewCreateMutationHandler
implements MutationHandler<ViewCreateMutationInput>
@@ -12,7 +12,7 @@ export class ViewCreateMutationHandler
input: ViewCreateMutationInput
): Promise<MutationResult<ViewCreateMutationInput>> {
const id = generateId(IdType.View);
- await nodeManager.updateNode(
+ await nodeService.updateNode(
input.databaseId,
input.userId,
(attributes) => {
diff --git a/apps/desktop/src/main/handlers/mutations/view-delete.ts b/apps/desktop/src/main/handlers/mutations/view-delete.ts
index f89b345d..9fa9008a 100644
--- a/apps/desktop/src/main/handlers/mutations/view-delete.ts
+++ b/apps/desktop/src/main/handlers/mutations/view-delete.ts
@@ -1,5 +1,5 @@
import { MutationHandler, MutationResult } from '@/main/types';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
import { ViewDeleteMutationInput } from '@/operations/mutations/view-delete';
export class ViewDeleteMutationHandler
@@ -8,7 +8,7 @@ export class ViewDeleteMutationHandler
async handleMutation(
input: ViewDeleteMutationInput
): Promise<MutationResult<ViewDeleteMutationInput>> {
- await nodeManager.updateNode(
+ await nodeService.updateNode(
input.databaseId,
input.userId,
(attributes) => {
diff --git a/apps/desktop/src/main/handlers/mutations/view-update.ts b/apps/desktop/src/main/handlers/mutations/view-update.ts
index edb6acd7..66256226 100644
--- a/apps/desktop/src/main/handlers/mutations/view-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/view-update.ts
@@ -1,5 +1,5 @@
import { MutationHandler, MutationResult } from '@/main/types';
-import { nodeManager } from '@/main/node-manager';
+import { nodeService } from '@/main/services/node-service';
import { ViewUpdateMutationInput } from '@/operations/mutations/view-update';
export class ViewUpdateMutationHandler
@@ -8,7 +8,7 @@ export class ViewUpdateMutationHandler
async handleMutation(
input: ViewUpdateMutationInput
): Promise<MutationResult<ViewUpdateMutationInput>> {
- await nodeManager.updateNode(
+ await nodeService.updateNode(
input.databaseId,
input.userId,
(attributes) => {
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-create.ts b/apps/desktop/src/main/handlers/mutations/workspace-create.ts
index b06da684..49cf95cc 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-create.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { httpClient } from '@/lib/http-client';
import { WorkspaceCreateMutationInput } from '@/operations/mutations/workspace-create';
import { MutationHandler, MutationResult } from '@/main/types';
@@ -10,7 +10,7 @@ export class WorkspaceCreateMutationHandler
async handleMutation(
input: WorkspaceCreateMutationInput
): Promise<MutationResult<WorkspaceCreateMutationInput>> {
- const account = await databaseManager.appDatabase
+ const account = await databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
.where('id', '=', input.accountId)
@@ -20,7 +20,7 @@ export class WorkspaceCreateMutationHandler
throw new Error('Account not found!');
}
- const server = await databaseManager.appDatabase
+ const server = await databaseService.appDatabase
.selectFrom('servers')
.selectAll()
.where('domain', '=', account.server)
@@ -44,7 +44,7 @@ export class WorkspaceCreateMutationHandler
}
);
- await databaseManager.appDatabase
+ await databaseService.appDatabase
.insertInto('workspaces')
.values({
workspace_id: data.id ?? data.id,
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-update.ts b/apps/desktop/src/main/handlers/mutations/workspace-update.ts
index 69de3fb1..305d2a98 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-update.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { httpClient } from '@/lib/http-client';
import { WorkspaceUpdateMutationInput } from '@/operations/mutations/workspace-update';
import { MutationHandler, MutationResult } from '@/main/types';
@@ -10,7 +10,7 @@ export class WorkspaceUpdateMutationHandler
async handleMutation(
input: WorkspaceUpdateMutationInput
): Promise<MutationResult<WorkspaceUpdateMutationInput>> {
- const account = await databaseManager.appDatabase
+ const account = await databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
.where('id', '=', input.accountId)
@@ -20,7 +20,7 @@ export class WorkspaceUpdateMutationHandler
throw new Error('Account not found!');
}
- const server = await databaseManager.appDatabase
+ const server = await databaseService.appDatabase
.selectFrom('servers')
.selectAll()
.where('domain', '=', account.server)
@@ -44,7 +44,7 @@ export class WorkspaceUpdateMutationHandler
}
);
- await databaseManager.appDatabase
+ await databaseService.appDatabase
.updateTable('workspaces')
.set({
name: data.name,
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-user-role-update.ts b/apps/desktop/src/main/handlers/mutations/workspace-user-role-update.ts
index 622c4da3..57c6934f 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-user-role-update.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-user-role-update.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { httpClient } from '@/lib/http-client';
import { WorkspaceUserRoleUpdateMutationInput } from '@/operations/mutations/workspace-user-role-update';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
@@ -11,7 +11,7 @@ export class WorkspaceUserRoleUpdateMutationHandler
async handleMutation(
input: WorkspaceUserRoleUpdateMutationInput
): Promise<MutationResult<WorkspaceUserRoleUpdateMutationInput>> {
- const workspace = await databaseManager.appDatabase
+ const workspace = await databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where('user_id', '=', input.userId)
@@ -25,7 +25,7 @@ export class WorkspaceUserRoleUpdateMutationHandler
};
}
- const account = await databaseManager.appDatabase
+ const account = await databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
.where('id', '=', workspace.account_id)
@@ -39,7 +39,7 @@ export class WorkspaceUserRoleUpdateMutationHandler
};
}
- const server = await databaseManager.appDatabase
+ const server = await databaseService.appDatabase
.selectFrom('servers')
.selectAll()
.where('domain', '=', account.server)
@@ -65,7 +65,7 @@ export class WorkspaceUserRoleUpdateMutationHandler
}
);
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts b/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
index eb80f387..54ac9b59 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { httpClient } from '@/lib/http-client';
import { WorkspaceUsersInviteMutationInput } from '@/operations/mutations/workspace-users-invite';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
@@ -12,7 +12,7 @@ export class WorkspaceUsersInviteMutationHandler
async handleMutation(
input: WorkspaceUsersInviteMutationInput
): Promise<MutationResult<WorkspaceUsersInviteMutationInput>> {
- const workspace = await databaseManager.appDatabase
+ const workspace = await databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where('user_id', '=', input.userId)
@@ -26,7 +26,7 @@ export class WorkspaceUsersInviteMutationHandler
};
}
- const account = await databaseManager.appDatabase
+ const account = await databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
.where('id', '=', workspace.account_id)
@@ -40,7 +40,7 @@ export class WorkspaceUsersInviteMutationHandler
};
}
- const server = await databaseManager.appDatabase
+ const server = await databaseService.appDatabase
.selectFrom('servers')
.selectAll()
.where('domain', '=', account.server)
@@ -66,7 +66,7 @@ export class WorkspaceUsersInviteMutationHandler
}
);
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/queries/accounts-list.ts b/apps/desktop/src/main/handlers/queries/accounts-list.ts
index 71d20696..d275c60b 100644
--- a/apps/desktop/src/main/handlers/queries/accounts-list.ts
+++ b/apps/desktop/src/main/handlers/queries/accounts-list.ts
@@ -1,5 +1,5 @@
import { AccountListQueryInput } from '@/operations/queries/account-list';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { Account } from '@/types/accounts';
import { SelectAccount } from '@/main/data/app/schema';
import { isEqual } from 'lodash-es';
@@ -59,7 +59,7 @@ export class AccountListQueryHandler
}
private fetchAccounts(): Promise<SelectAccount[]> {
- return databaseManager.appDatabase
+ return databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
.where('status', '=', 'active')
diff --git a/apps/desktop/src/main/handlers/queries/emojis-get.ts b/apps/desktop/src/main/handlers/queries/emojis-get.ts
index c441f398..38d42a0f 100644
--- a/apps/desktop/src/main/handlers/queries/emojis-get.ts
+++ b/apps/desktop/src/main/handlers/queries/emojis-get.ts
@@ -1,4 +1,4 @@
-import { assetManager } from '@/main/asset-manager';
+import { assetService } from '@/main/services/asset-service';
import {
MutationChange,
ChangeCheckResult,
@@ -13,7 +13,7 @@ export class EmojisGetQueryHandler
public async handleQuery(
_: EmojisGetQueryInput
): Promise<QueryResult<EmojisGetQueryInput>> {
- const data = assetManager.getEmojiData();
+ const data = assetService.getEmojiData();
return {
output: data,
diff --git a/apps/desktop/src/main/handlers/queries/file-list.ts b/apps/desktop/src/main/handlers/queries/file-list.ts
index e26cb24b..7aa296d0 100644
--- a/apps/desktop/src/main/handlers/queries/file-list.ts
+++ b/apps/desktop/src/main/handlers/queries/file-list.ts
@@ -1,5 +1,5 @@
import { FileListQueryInput } from '@/operations/queries/file-list';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import {
MutationChange,
ChangeCheckResult,
@@ -72,7 +72,7 @@ export class FileListQueryHandler implements QueryHandler<FileListQueryInput> {
}
private async fetchFiles(input: FileListQueryInput): Promise<FileRow[]> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/queries/icons-get.ts b/apps/desktop/src/main/handlers/queries/icons-get.ts
index 583c1668..692552bf 100644
--- a/apps/desktop/src/main/handlers/queries/icons-get.ts
+++ b/apps/desktop/src/main/handlers/queries/icons-get.ts
@@ -1,4 +1,4 @@
-import { assetManager } from '@/main/asset-manager';
+import { assetService } from '@/main/services/asset-service';
import {
MutationChange,
ChangeCheckResult,
@@ -11,7 +11,7 @@ export class IconsGetQueryHandler implements QueryHandler<IconsGetQueryInput> {
public async handleQuery(
_: IconsGetQueryInput
): Promise<QueryResult<IconsGetQueryInput>> {
- const data = assetManager.getIconData();
+ const data = assetService.getIconData();
return {
output: data,
diff --git a/apps/desktop/src/main/handlers/queries/message-list.ts b/apps/desktop/src/main/handlers/queries/message-list.ts
index ea664453..2a2166b4 100644
--- a/apps/desktop/src/main/handlers/queries/message-list.ts
+++ b/apps/desktop/src/main/handlers/queries/message-list.ts
@@ -1,5 +1,5 @@
import { MessageListQueryInput } from '@/operations/queries/message-list';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import {
MutationChange,
ChangeCheckResult,
@@ -78,7 +78,7 @@ export class MessageListQueryHandler
private async fetchMesssages(
input: MessageListQueryInput
): Promise<SelectNode[]> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
@@ -108,7 +108,7 @@ export class MessageListQueryHandler
return [];
}
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/queries/node-children-get.tsx b/apps/desktop/src/main/handlers/queries/node-children-get.tsx
index 6a199ae2..f52bdcca 100644
--- a/apps/desktop/src/main/handlers/queries/node-children-get.tsx
+++ b/apps/desktop/src/main/handlers/queries/node-children-get.tsx
@@ -1,5 +1,5 @@
import { NodeChildrenGetQueryInput } from '@/operations/queries/node-children-get';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { mapNode } from '@/main/utils';
import { SelectNode } from '@/main/data/workspace/schema';
import {
@@ -65,7 +65,7 @@ export class NodeChildrenGetQueryHandler
private async fetchChildren(
input: NodeChildrenGetQueryInput
): Promise<SelectNode[]> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/queries/node-get.ts b/apps/desktop/src/main/handlers/queries/node-get.ts
index 2760e5f1..dca34c0e 100644
--- a/apps/desktop/src/main/handlers/queries/node-get.ts
+++ b/apps/desktop/src/main/handlers/queries/node-get.ts
@@ -1,5 +1,5 @@
import { NodeGetQueryInput } from '@/operations/queries/node-get';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { mapNode } from '@/main/utils';
import { SelectNode } from '@/main/data/workspace/schema';
import {
@@ -63,7 +63,7 @@ export class NodeGetQueryHandler implements QueryHandler<NodeGetQueryInput> {
private async fetchNode(
input: NodeGetQueryInput
): Promise<SelectNode | undefined> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/queries/node-tree-get.ts b/apps/desktop/src/main/handlers/queries/node-tree-get.ts
index 35a85572..ff30619a 100644
--- a/apps/desktop/src/main/handlers/queries/node-tree-get.ts
+++ b/apps/desktop/src/main/handlers/queries/node-tree-get.ts
@@ -1,4 +1,4 @@
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { mapNode } from '@/main/utils';
import { SelectNode } from '@/main/data/workspace/schema';
import {
@@ -66,7 +66,7 @@ export class NodeTreeGetQueryHandler
private async fetchNodes(
input: NodeTreeGetQueryInput
): Promise<SelectNode[]> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/queries/record-list.ts b/apps/desktop/src/main/handlers/queries/record-list.ts
index 99e4e3af..209914d0 100644
--- a/apps/desktop/src/main/handlers/queries/record-list.ts
+++ b/apps/desktop/src/main/handlers/queries/record-list.ts
@@ -1,5 +1,5 @@
import { RecordListQueryInput } from '@/operations/queries/record-list';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import {
MutationChange,
ChangeCheckResult,
@@ -86,7 +86,7 @@ export class RecordListQueryHandler
private async fetchRecords(
input: RecordListQueryInput
): Promise<SelectNode[]> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
@@ -146,7 +146,7 @@ export class RecordListQueryHandler
databaseId: string
): Promise<DatabaseNode> {
const workspaceDatabase =
- await databaseManager.getWorkspaceDatabase(userId);
+ await databaseService.getWorkspaceDatabase(userId);
const row = await workspaceDatabase
.selectFrom('nodes')
diff --git a/apps/desktop/src/main/handlers/queries/server-list.ts b/apps/desktop/src/main/handlers/queries/server-list.ts
index 08f0224f..df01b614 100644
--- a/apps/desktop/src/main/handlers/queries/server-list.ts
+++ b/apps/desktop/src/main/handlers/queries/server-list.ts
@@ -1,5 +1,5 @@
import { ServerListQueryInput } from '@/operations/queries/server-list';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { SelectServer } from '@/main/data/app/schema';
import {
MutationChange,
@@ -59,7 +59,7 @@ export class ServerListQueryHandler
}
private fetchServers(): Promise<SelectServer[]> {
- return databaseManager.appDatabase
+ return databaseService.appDatabase
.selectFrom('servers')
.selectAll()
.execute();
diff --git a/apps/desktop/src/main/handlers/queries/user-search.ts b/apps/desktop/src/main/handlers/queries/user-search.ts
index d5e61d42..a8ea2e3c 100644
--- a/apps/desktop/src/main/handlers/queries/user-search.ts
+++ b/apps/desktop/src/main/handlers/queries/user-search.ts
@@ -1,5 +1,5 @@
import { UserSearchQueryInput } from '@/operations/queries/user-search';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { sql } from 'kysely';
import { SelectNode } from '@/main/data/workspace/schema';
import { NodeTypes } from '@colanode/core';
@@ -74,7 +74,7 @@ export class UserSearchQueryHandler
private async searchUsers(
input: UserSearchQueryInput
): Promise<SelectNode[]> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
@@ -101,7 +101,7 @@ export class UserSearchQueryHandler
}
private async fetchUsers(input: UserSearchQueryInput): Promise<SelectNode[]> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/handlers/queries/workspace-list.ts b/apps/desktop/src/main/handlers/queries/workspace-list.ts
index a071785e..f40dd9d2 100644
--- a/apps/desktop/src/main/handlers/queries/workspace-list.ts
+++ b/apps/desktop/src/main/handlers/queries/workspace-list.ts
@@ -1,5 +1,5 @@
import { WorkspaceListQueryInput } from '@/operations/queries/workspace-list';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { Workspace } from '@/types/workspaces';
import { WorkspaceRole } from '@colanode/core';
import { SelectWorkspace } from '@/main/data/app/schema';
@@ -61,13 +61,13 @@ export class WorkspaceListQueryHandler
}
private fetchWorkspaces(): Promise<SelectWorkspace[]> {
- return databaseManager.appDatabase
+ return databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where(
'account_id',
'in',
- databaseManager.appDatabase
+ databaseService.appDatabase
.selectFrom('accounts')
.where('status', '=', 'active')
.select('id')
diff --git a/apps/desktop/src/main/handlers/queries/workspace-user-list.ts b/apps/desktop/src/main/handlers/queries/workspace-user-list.ts
index bf94f32d..35ec26d7 100644
--- a/apps/desktop/src/main/handlers/queries/workspace-user-list.ts
+++ b/apps/desktop/src/main/handlers/queries/workspace-user-list.ts
@@ -1,5 +1,5 @@
import { WorkspaceUserListQueryInput } from '@/operations/queries/workspace-user-list';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { NodeTypes } from '@colanode/core';
import { mapNode } from '@/main/utils';
import { SelectNode } from '@/main/data/workspace/schema';
@@ -66,7 +66,7 @@ export class WorkspaceUserListQueryHandler
private async fetchNodes(
input: WorkspaceUserListQueryInput
): Promise<SelectNode[]> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
input.userId
);
diff --git a/apps/desktop/src/main/index.ts b/apps/desktop/src/main/index.ts
index 8ddf590c..23dae942 100644
--- a/apps/desktop/src/main/index.ts
+++ b/apps/desktop/src/main/index.ts
@@ -2,16 +2,16 @@ import { app, shell, BrowserWindow, ipcMain, protocol, dialog } from 'electron';
import { join } from 'path';
import { electronApp, optimizer, is } from '@electron-toolkit/utils';
import { eventBus } from '@/lib/event-bus';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { socketManager } from '@/main/sockets/socket-manager';
import { synchronizer } from '@/main/synchronizer';
-import { avatarManager } from '@/main/avatar-manager';
-import { fileManager } from '@/main/file-manager';
+import { avatarService } from '@/main/services/avatar-service';
+import { fileService } from '@/main/services/file-service';
import { mediator } from '@/main/mediator';
import { FileMetadata } from '@/types/files';
import { MutationInput, MutationMap } from '@/operations/mutations';
import { QueryInput, QueryMap } from '@/operations/queries';
-import { assetManager } from '@/main/asset-manager';
+import { assetService } from '@/main/services/asset-service';
let subscriptionId: string | null = null;
const icon = join(__dirname, '../assets/icon.png');
@@ -19,8 +19,8 @@ const icon = join(__dirname, '../assets/icon.png');
app.setName('Colanode');
const createWindow = async (): Promise<void> => {
- await databaseManager.init();
- assetManager.checkAssets();
+ await databaseService.init();
+ assetService.checkAssets();
socketManager.init();
synchronizer.init();
@@ -62,25 +62,25 @@ const createWindow = async (): Promise<void> => {
if (!protocol.isProtocolHandled('avatar')) {
protocol.handle('avatar', (request) => {
- return avatarManager.handleAvatarRequest(request);
+ return avatarService.handleAvatarRequest(request);
});
}
if (!protocol.isProtocolHandled('local-file')) {
protocol.handle('local-file', (request) => {
- return fileManager.handleFileRequest(request);
+ return fileService.handleFileRequest(request);
});
}
if (!protocol.isProtocolHandled('local-file-preview')) {
protocol.handle('local-file-preview', (request) => {
- return fileManager.handleFilePreviewRequest(request);
+ return fileService.handleFilePreviewRequest(request);
});
}
if (!protocol.isProtocolHandled('asset')) {
protocol.handle('asset', (request) => {
- return assetManager.handleAssetRequest(request);
+ return assetService.handleAssetRequest(request);
});
}
};
@@ -180,7 +180,7 @@ ipcMain.handle(
ipcMain.handle(
'get-file-metadata',
(_: unknown, path: string): FileMetadata | null => {
- return fileManager.getFileMetadata(path);
+ return fileService.getFileMetadata(path);
}
);
@@ -192,6 +192,6 @@ ipcMain.handle(
id: string,
extension: string
): Promise<void> => {
- return fileManager.openFile(userId, id, extension);
+ return fileService.openFile(userId, id, extension);
}
);
diff --git a/apps/desktop/src/main/asset-manager.ts b/apps/desktop/src/main/services/asset-service.ts
similarity index 98%
rename from apps/desktop/src/main/asset-manager.ts
rename to apps/desktop/src/main/services/asset-service.ts
index 4ffe7662..745ebe16 100644
--- a/apps/desktop/src/main/asset-manager.ts
+++ b/apps/desktop/src/main/services/asset-service.ts
@@ -14,7 +14,7 @@ type AssetsVersion = {
const EMOJIS_VERSION = '1.0.0';
const ICONS_VERSION = '1.0.0';
-class AssetManager {
+class AssetService {
private readonly assetsDir: string;
constructor() {
@@ -125,4 +125,4 @@ class AssetManager {
}
}
-export const assetManager = new AssetManager();
+export const assetService = new AssetService();
diff --git a/apps/desktop/src/main/avatar-manager.ts b/apps/desktop/src/main/services/avatar-service.ts
similarity index 90%
rename from apps/desktop/src/main/avatar-manager.ts
rename to apps/desktop/src/main/services/avatar-service.ts
index c5a12968..bde8d7d3 100644
--- a/apps/desktop/src/main/avatar-manager.ts
+++ b/apps/desktop/src/main/services/avatar-service.ts
@@ -1,11 +1,11 @@
import { net } from 'electron';
import path from 'path';
import fs from 'fs';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { httpClient } from '@/lib/http-client';
import { getAccountAvatarsDirectoryPath } from '@/main/utils';
-class AvatarManager {
+class AvatarService {
public async handleAvatarRequest(request: Request): Promise<Response> {
const url = request.url.replace('avatar://', '');
const [accountId, avatarId] = url.split('/');
@@ -19,7 +19,7 @@ class AvatarManager {
}
// Download the avatar file if it doesn't exist
- const credentials = await databaseManager.appDatabase
+ const credentials = await databaseService.appDatabase
.selectFrom('accounts')
.innerJoin('servers', 'accounts.server', 'servers.domain')
.select(['domain', 'attributes', 'token'])
@@ -62,4 +62,4 @@ class AvatarManager {
}
}
-export const avatarManager = new AvatarManager();
+export const avatarService = new AvatarService();
diff --git a/apps/desktop/src/main/file-manager.ts b/apps/desktop/src/main/services/file-service.ts
similarity index 96%
rename from apps/desktop/src/main/file-manager.ts
rename to apps/desktop/src/main/services/file-service.ts
index 086c172f..250d0eb3 100644
--- a/apps/desktop/src/main/file-manager.ts
+++ b/apps/desktop/src/main/services/file-service.ts
@@ -9,13 +9,13 @@ import {
ServerFileUploadResponse,
} from '@/types/files';
import { WorkspaceCredentials } from '@/types/workspaces';
-import { databaseManager } from './data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { httpClient } from '@/lib/http-client';
import { mediator } from '@/main/mediator';
import { getWorkspaceFilesDirectoryPath } from '@/main/utils';
import { FileAttributes } from '@colanode/core';
-class FileManager {
+class FileService {
public async handleFileRequest(request: Request): Promise<Response> {
const url = request.url.replace('local-file://', '');
const [userId, file] = url.split('/');
@@ -90,7 +90,7 @@ class FileManager {
public async checkForUploads(
credentials: WorkspaceCredentials
): Promise<void> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
credentials.userId
);
@@ -191,7 +191,7 @@ class FileManager {
public async checkForDownloads(
credentials: WorkspaceCredentials
): Promise<void> {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
credentials.userId
);
@@ -288,4 +288,4 @@ class FileManager {
}
}
-export const fileManager = new FileManager();
+export const fileService = new FileService();
diff --git a/apps/desktop/src/main/node-manager.ts b/apps/desktop/src/main/services/node-service.ts
similarity index 94%
rename from apps/desktop/src/main/node-manager.ts
rename to apps/desktop/src/main/services/node-service.ts
index 155e8f10..288d99de 100644
--- a/apps/desktop/src/main/node-manager.ts
+++ b/apps/desktop/src/main/services/node-service.ts
@@ -11,7 +11,7 @@ import {
LocalUpdateNodeChangeData,
} from '@/types/sync';
import { generateId, IdType } from '@colanode/core';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { fetchNodeAncestors, hasUpdateChanges, mapNode } from '@/main/utils';
import { CreateDownload, CreateUpload } from '@/main/data/workspace/schema';
@@ -22,9 +22,9 @@ export type CreateNodeInput = {
download?: CreateDownload;
};
-class NodeManager {
+class NodeService {
async createNode(userId: string, input: CreateNodeInput | CreateNodeInput[]) {
- const workspace = await databaseManager.appDatabase
+ const workspace = await databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where('user_id', '=', userId)
@@ -37,7 +37,7 @@ class NodeManager {
const inputs = Array.isArray(input) ? input : [input];
const workspaceDatabase =
- await databaseManager.getWorkspaceDatabase(userId);
+ await databaseService.getWorkspaceDatabase(userId);
await workspaceDatabase.transaction().execute(async (transaction) => {
for (const input of inputs) {
@@ -141,7 +141,7 @@ class NodeManager {
userId: string,
updater: (attributes: NodeAttributes) => NodeAttributes
): Promise<boolean> {
- const workspace = await databaseManager.appDatabase
+ const workspace = await databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where('user_id', '=', userId)
@@ -152,7 +152,7 @@ class NodeManager {
}
const workspaceDatabase =
- await databaseManager.getWorkspaceDatabase(userId);
+ await databaseService.getWorkspaceDatabase(userId);
const ancestorRows = await fetchNodeAncestors(workspaceDatabase, nodeId);
const nodeRow = ancestorRows.find((ancestor) => ancestor.id === nodeId);
@@ -241,7 +241,7 @@ class NodeManager {
}
async deleteNode(nodeId: string, userId: string) {
- const workspace = await databaseManager.appDatabase
+ const workspace = await databaseService.appDatabase
.selectFrom('workspaces')
.selectAll()
.where('user_id', '=', userId)
@@ -252,7 +252,7 @@ class NodeManager {
}
const workspaceDatabase =
- await databaseManager.getWorkspaceDatabase(userId);
+ await databaseService.getWorkspaceDatabase(userId);
const ancestorRows = await fetchNodeAncestors(workspaceDatabase, nodeId);
const ancestors = ancestorRows.map(mapNode);
@@ -303,4 +303,4 @@ class NodeManager {
}
}
-export const nodeManager = new NodeManager();
+export const nodeService = new NodeService();
diff --git a/apps/desktop/src/main/sockets/socket-manager.ts b/apps/desktop/src/main/sockets/socket-manager.ts
index 99ac6d56..0d11824e 100644
--- a/apps/desktop/src/main/sockets/socket-manager.ts
+++ b/apps/desktop/src/main/sockets/socket-manager.ts
@@ -1,5 +1,5 @@
import { SocketConnection } from '@/main/sockets/socket-connection';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { MessageInput } from '@/operations/messages';
const EVENT_LOOP_INTERVAL = 5000;
@@ -39,12 +39,12 @@ class SocketManager {
}
private async checkAccounts() {
- const servers = await databaseManager.appDatabase
+ const servers = await databaseService.appDatabase
.selectFrom('servers')
.selectAll()
.execute();
- const accounts = await databaseManager.appDatabase
+ const accounts = await databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
.where('status', '=', 'active')
diff --git a/apps/desktop/src/main/synchronizer.ts b/apps/desktop/src/main/synchronizer.ts
index f3854f2b..086cbced 100644
--- a/apps/desktop/src/main/synchronizer.ts
+++ b/apps/desktop/src/main/synchronizer.ts
@@ -1,8 +1,8 @@
import { httpClient } from '@/lib/http-client';
-import { databaseManager } from '@/main/data/database-manager';
+import { databaseService } from '@/main/data/database-service';
import { ServerSyncResponse } from '@/types/sync';
import { WorkspaceCredentials } from '@/types/workspaces';
-import { fileManager } from '@/main/file-manager';
+import { fileService } from '@/main/services/file-service';
const EVENT_LOOP_INTERVAL = 1000;
@@ -34,7 +34,7 @@ class Synchronizer {
}
private async syncDeletedTokens() {
- const deletedTokens = await databaseManager.appDatabase
+ const deletedTokens = await databaseService.appDatabase
.selectFrom('deleted_tokens')
.innerJoin('servers', 'deleted_tokens.server', 'servers.domain')
.select([
@@ -61,7 +61,7 @@ class Synchronizer {
return;
}
- await databaseManager.appDatabase
+ await databaseService.appDatabase
.deleteFrom('deleted_tokens')
.where('token', '=', deletedToken.token)
.where('account_id', '=', deletedToken.account_id)
@@ -73,7 +73,7 @@ class Synchronizer {
}
private async syncWorkspaces() {
- const workspaces = await databaseManager.appDatabase
+ const workspaces = await databaseService.appDatabase
.selectFrom('workspaces')
.innerJoin('accounts', 'workspaces.account_id', 'accounts.id')
.innerJoin('servers', 'accounts.server', 'servers.domain')
@@ -99,8 +99,8 @@ class Synchronizer {
try {
await this.checkForChanges(credentials);
- await fileManager.checkForUploads(credentials);
- await fileManager.checkForDownloads(credentials);
+ await fileService.checkForUploads(credentials);
+ await fileService.checkForDownloads(credentials);
} catch (error) {
// console.log('error', error);
}
@@ -108,7 +108,7 @@ class Synchronizer {
}
private async checkForChanges(credentials: WorkspaceCredentials) {
- const workspaceDatabase = await databaseManager.getWorkspaceDatabase(
+ const workspaceDatabase = await databaseService.getWorkspaceDatabase(
credentials.userId
);