Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Refactor workspace databases
Hakan Shehu731475837463
diff --git a/desktop/src/components/spaces/space-create-dialog.tsx b/desktop/src/components/spaces/space-create-dialog.tsxindex 37debb94..cc4e4f11 100644--- a/desktop/src/components/spaces/space-create-dialog.tsx+++ b/desktop/src/components/spaces/space-create-dialog.tsx@@ -18,7 +18,6 @@ import {useForm} from "react-hook-form";import {zodResolver} from "@hookform/resolvers/zod";import {Node} from "@/types/nodes";import {generateId, IdType} from "@/lib/id";-import {createNode} from "@/lib/nodes";const formSchema = z.object({name: z.string().min(3, 'Name must be at least 3 characters long.'),@@ -65,7 +64,7 @@ export const SpaceCreateDialog = ({versionId: generateId(IdType.Version)}- await createNode(workspace.accountId, node);+ await workspace.addNode(node);setIsPending(false);onOpenChange(false);}diff --git a/desktop/src/components/workspaces/workspace.tsx b/desktop/src/components/workspaces/workspace.tsxindex 8d58b614..d4aa38d6 100644--- a/desktop/src/components/workspaces/workspace.tsx+++ b/desktop/src/components/workspaces/workspace.tsx@@ -19,14 +19,17 @@ export const Workspace = observer(() => {...workspace,addNode: async (node) => {await window.workspaceDb.addNode(workspace.accountId, workspace.id, node);+ workspace.setNode(node);},getNodes: async () => {return await window.workspaceDb.getNodes(workspace.accountId, workspace.id);},updateNode: async (node) => {+ workspace.setNode(node);await window.workspaceDb.updateNode(workspace.accountId, workspace.id, node);},deleteNode: async (nodeId) => {+ workspace.deleteNode(nodeId);await window.workspaceDb.deleteNode(workspace.accountId, workspace.id, nodeId);},}}>diff --git a/desktop/src/electron/database/global/index.ts b/desktop/src/electron/database/global/index.tsindex fd8937c0..79b43852 100644--- a/desktop/src/electron/database/global/index.ts+++ b/desktop/src/electron/database/global/index.ts@@ -7,9 +7,11 @@ import {Workspace} from "@/types/workspaces";import {AccountTransactions, Transaction} from "@/types/transactions";import {globalDatabaseMigrations} from "@/electron/database/global/migrations";import {GlobalDatabaseData} from "@/types/global";+import {WorkspaceDatabase} from "@/electron/database/workspace";-class GlobalDatabase {+export class GlobalDatabase {database: Kysely<GlobalDatabaseSchema>;+ workspaceDatabases: Map<string, WorkspaceDatabase> = new Map();constructor() {const appPath = app.getPath('userData');@@ -28,6 +30,10 @@ class GlobalDatabase {const accounts = await this.getAccounts();const workspaces = await this.getWorkspaces();+ for (const workspace of workspaces) {+ await this.initWorkspaceDatabase(workspace);+ }+return {accounts,workspaces@@ -47,6 +53,27 @@ class GlobalDatabase {await migrator.migrateToLatest();}+ getWorkspaceDatabase = (accountId: string, workspaceId: string): WorkspaceDatabase => {+ const key = `${accountId}_${workspaceId}`;+ const workspaceDatabase = this.workspaceDatabases.get(key);+ if (!workspaceDatabase) {+ throw new Error(`Workspace database not found for workspace ID: ${workspaceId}`);+ }++ return workspaceDatabase;+ }++ initWorkspaceDatabase = async (workspace: Workspace) => {+ const key = `${workspace.accountId}_${workspace.id}`;+ if (this.workspaceDatabases.has(key)) {+ return;+ }++ const workspaceDatabase = new WorkspaceDatabase(workspace.accountId, workspace.id, this);+ await workspaceDatabase.migrate();+ this.workspaceDatabases.set(key, workspaceDatabase);+ }+getAccounts = async (): Promise<Account[]> => {const accounts = await this.database.selectFrom('accounts')@@ -101,10 +128,11 @@ class GlobalDatabase {user_node_id: workspace.userNodeId}).execute();++ await this.initWorkspaceDatabase(workspace);}addTransaction = async (transaction: Transaction) => {- console.log(transaction);await this.database.insertInto('transactions').values({diff --git a/desktop/src/electron/database/workspace/index.ts b/desktop/src/electron/database/workspace/index.tsindex 04c1f0af..52c2973b 100644--- a/desktop/src/electron/database/workspace/index.ts+++ b/desktop/src/electron/database/workspace/index.ts@@ -1,14 +1,24 @@import {app} from "electron";import SQLite from "better-sqlite3";import {Kysely, Migration, Migrator, SqliteDialect} from "kysely";-import { GlobalDatabaseSchema } from "@/electron/database/global/schema";+import {WorkspaceDatabaseSchema} from "@/electron/database/workspace/schema";import {workspaceDatabaseMigrations} from "@/electron/database/workspace/migrations";import * as fs from "node:fs";+import {GlobalDatabase} from "@/electron/database/global";+import {Node} from "@/types/nodes";+import {generateId, IdType} from "@/lib/id";-class WorkspaceDatabase {- database: Kysely<GlobalDatabaseSchema>;+export class WorkspaceDatabase {+ accountId: string;+ workspaceId: string;+ database: Kysely<WorkspaceDatabaseSchema>;+ globalDatabase: GlobalDatabase;++ constructor(accountId: string, workspaceId: string, globalDatabase: GlobalDatabase) {+ this.accountId = accountId;+ this.workspaceId = workspaceId;+ this.globalDatabase = globalDatabase- constructor(accountId: string, workspaceId: string) {const appPath = app.getPath('userData');const accountPath = `${appPath}/account_${accountId}`;if (!fs.existsSync(accountPath)) {@@ -19,11 +29,103 @@ class WorkspaceDatabase {database: new SQLite(`${accountPath}/workspace_${workspaceId}.db`),});- this.database = new Kysely<GlobalDatabaseSchema>({+ this.database = new Kysely<WorkspaceDatabaseSchema>({dialect,});}+ getNodes = async (): Promise<Node[]> => {+ const nodes = await this.database+ .selectFrom('nodes')+ .selectAll()+ .execute();++ return nodes.map(node => ({+ id: node.id,+ type: node.type,+ parentId: node.parent_id,+ workspaceId: node.workspace_id,+ attrs: JSON.parse(node.attrs),+ content: JSON.parse(node.content),+ createdAt: new Date(node.created_at),+ createdBy: node.created_by,+ updatedAt: node.updated_at ? new Date(node.updated_at) : null,+ updatedBy: node.updated_by,+ versionId: node.version_id,+ }));+ }++ addNode = async (node: Node) => {+ await this.database+ .insertInto('nodes')+ .values({+ id: node.id,+ type: node.type,+ parent_id: node.parentId,+ workspace_id: this.workspaceId,+ created_at: node.createdAt.toISOString(),+ created_by: node.createdBy,+ version_id: node.versionId,+ attrs: JSON.stringify(node.attrs),+ content: JSON.stringify(node.content),+ })+ .execute();++ await this.globalDatabase.+ addTransaction({+ id: generateId(IdType.Transaction),+ nodeId: node.id,+ type: 'create_node',+ workspaceId: node.workspaceId,+ accountId: this.accountId,+ input: JSON.stringify(node),+ createdAt: new Date(),+ });+ }++ updateNode = async (node: Node) => {+ await this.database+ .updateTable('nodes')+ .set({+ type: node.type,+ parent_id: node.parentId,+ updated_at: node.updatedAt.toISOString(),+ updated_by: node.updatedBy,+ version_id: node.versionId,+ attrs: JSON.stringify(node.attrs),+ content: JSON.stringify(node.content),+ })+ .where('id', '=', node.id)+ .executeTakeFirst();++ await this.globalDatabase.addTransaction({+ id: generateId(IdType.Transaction),+ nodeId: node.id,+ type: 'update_node',+ workspaceId: node.workspaceId,+ accountId: this.accountId,+ input: JSON.stringify(node),+ createdAt: new Date(),+ });+ }++ deleteNode = async (nodeId: string) => {+ await this.database+ .deleteFrom('nodes')+ .where('id', '=', nodeId)+ .execute();++ await this.globalDatabase.addTransaction({+ id: generateId(IdType.Transaction),+ nodeId: nodeId,+ type: 'delete_node',+ workspaceId: this.workspaceId,+ accountId: this.accountId,+ input: null,+ createdAt: new Date(),+ });+ }+migrate = async () => {const migrator = new Migrator({db: this.database,@@ -37,16 +139,3 @@ class WorkspaceDatabase {await migrator.migrateToLatest();}}--const workspaceDatabasesMap = new Map<string, WorkspaceDatabase>();--export const getWorkspaceDatabase = async (accountId: string, workspaceId: string) => {- const key = `${accountId}/${workspaceId}`;- if (!workspaceDatabasesMap.has(key)) {- const workspaceDatabase = new WorkspaceDatabase(accountId, workspaceId);- await workspaceDatabase.migrate();- workspaceDatabasesMap.set(key, workspaceDatabase);- }-- return workspaceDatabasesMap.get(key)!;-}\ No newline at end of filediff --git a/desktop/src/electron/database/workspace/migrations.ts b/desktop/src/electron/database/workspace/migrations.tsindex 053d1e44..19803c96 100644--- a/desktop/src/electron/database/workspace/migrations.ts+++ b/desktop/src/electron/database/workspace/migrations.ts@@ -10,8 +10,8 @@ const createNodesTable: Migration = {.addColumn('type', 'text', (col) => col.notNull()).addColumn('attrs', 'text').addColumn('content', 'text')- .addColumn('created_at', 'timestamp', (col) => col.notNull())- .addColumn('updated_at', 'timestamp')+ .addColumn('created_at', 'text', (col) => col.notNull())+ .addColumn('updated_at', 'text').addColumn('created_by', 'text', (col) => col.notNull()).addColumn('updated_by', 'text').addColumn('version_id', 'text', (col) => col.notNull())diff --git a/desktop/src/electron/database/workspace/schema.ts b/desktop/src/electron/database/workspace/schema.tsindex 9273ff0a..b9e4e2b4 100644--- a/desktop/src/electron/database/workspace/schema.ts+++ b/desktop/src/electron/database/workspace/schema.ts@@ -5,8 +5,8 @@ export interface NodesTableSchema {type: string;attrs: string | null;content: string | null;- created_at: Date;- updated_at: Date | null;+ created_at: string;+ updated_at: string | null;created_by: string;updated_by: string | null;version_id: string;diff --git a/desktop/src/electron/event-loop.ts b/desktop/src/electron/event-loop.tsindex 4fc52b46..251ccf38 100644--- a/desktop/src/electron/event-loop.ts+++ b/desktop/src/electron/event-loop.ts@@ -1,22 +1,11 @@import {globalDatabase} from "@/electron/database/global";-import {getWorkspaceDatabase} from "@/electron/database/workspace";export const initEventLoop = () => {setInterval(async () => {- await initWorkspaceDatabases();await sendTransactions();}, 10000);}-const initWorkspaceDatabases = async () => {- const workspaces = await globalDatabase.getWorkspaces();-- for (const workspace of workspaces) {- const workspaceDatabase = await getWorkspaceDatabase(workspace.accountId, workspace.id);- await workspaceDatabase.migrate();- }-}-const sendTransactions = async () => {const groupedAccountTransactions = await globalDatabase.getGroupedAccountTransactions(20);diff --git a/desktop/src/lib/nodes.ts b/desktop/src/lib/nodes.tsdeleted file mode 100644index 351feb02..00000000--- a/desktop/src/lib/nodes.ts+++ /dev/null@@ -1,28 +0,0 @@-import {Node} from "@/types/nodes";-import {CreateNodeTransactionInput, Transaction} from "@/types/transactions";-import {generateId, IdType} from "@/lib/id";-import {store} from "@/store";--export const createNode = async (accountId: string, node: Node) => {- store.setNode(node);-- const transactionInput: CreateNodeTransactionInput = {- id: node.id,- type: node.type,- parentId: node.parentId,- attrs: node.attrs,- createdAt: node.createdAt,- createdBy: node.createdBy- }-- const transaction: Transaction = {- id: generateId(IdType.Transaction),- nodeId: node.id,- createdAt: new Date(),- type: 'create_node',- input: transactionInput,- workspaceId: node.workspaceId,- accountId: accountId- }- await window.globalDb.addTransaction(transaction);-}\ No newline at end of filediff --git a/desktop/src/main.ts b/desktop/src/main.tsindex 10d6ba76..9645aeef 100644--- a/desktop/src/main.ts+++ b/desktop/src/main.ts@@ -58,4 +58,24 @@ ipcMain.handle('get-workspaces', async () => globalDatabase.getWorkspaces());ipcMain.handle('add-workspace', async (_, workspace) => globalDatabase.addWorkspace(workspace));ipcMain.handle('add-transaction', async (_, transaction) => globalDatabase.addTransaction(transaction));+ipcMain.handle('add-node', async (_, accountId, workspaceId, node) => {+ const workspaceDb = globalDatabase.getWorkspaceDatabase(accountId, workspaceId);+ await workspaceDb.addNode(node);+});++ipcMain.handle('get-nodes', async (_, accountId, workspaceId) => {+ const workspaceDb = globalDatabase.getWorkspaceDatabase(accountId, workspaceId);+ return workspaceDb.getNodes();+});++ipcMain.handle('update-node', async (_, accountId, workspaceId, node) => {+ const workspaceDb = globalDatabase.getWorkspaceDatabase(accountId, workspaceId);+ await workspaceDb.updateNode(node);+});++ipcMain.handle('delete-node', async (_, accountId, workspaceId, nodeId) => {+ const workspaceDb = globalDatabase.getWorkspaceDatabase(accountId, workspaceId);+ await workspaceDb.deleteNode(nodeId);+});+initEventLoop();\ No newline at end of filediff --git a/desktop/src/store/index.ts b/desktop/src/store/index.tsindex c32f43c8..a4948d1a 100644--- a/desktop/src/store/index.ts+++ b/desktop/src/store/index.ts@@ -1,19 +1,17 @@import {Account} from "@/types/accounts";import {Workspace} from "@/types/workspaces";-import {Node} from "@/types/nodes";import {makeAutoObservable} from "mobx";+import {WorkspaceStore} from "@/store/workspace";export class AppStore {loaded: boolean;accounts: Account[];- workspaces: Workspace[];- nodes: Record<string, Node>;+ workspaces: WorkspaceStore[];constructor() {this.loaded = false;this.accounts = [];this.workspaces = [];- this.nodes = {};makeAutoObservable(this);}@@ -31,26 +29,11 @@ export class AppStore {}setWorkspaces(workspaces: Workspace[]) {- this.workspaces = workspaces;+ this.workspaces = workspaces.map(workspace => new WorkspaceStore(workspace));}addWorkspace(workspace: Workspace) {- this.workspaces.push(workspace);- }-- setNodes(nodes: Node[]) {- this.nodes = nodes.reduce((acc, node) => {- acc[node.id] = node;- return acc;- }, {} as Record<string, Node>);- }-- setNode(node: Node) {- this.nodes[node.id] = node;- }-- removeNode(nodeId: string) {- delete this.nodes[nodeId];+ this.workspaces.push(new WorkspaceStore(workspace));}}diff --git a/desktop/src/store/workspace.ts b/desktop/src/store/workspace.tsnew file mode 100644index 00000000..ba6bd609--- /dev/null+++ b/desktop/src/store/workspace.ts@@ -0,0 +1,44 @@+import {Node} from "@/types/nodes";+import {makeAutoObservable} from "mobx";+import {Workspace, WorkspaceRole} from "@/types/workspaces";++export class WorkspaceStore {+ id: string;+ name: string;+ description?: string | null;+ avatar?: string | null;+ versionId: string;+ accountId: string;+ role: WorkspaceRole;+ userNodeId: string;+ nodes: Record<string, Node>;++ constructor(workspace: Workspace) {+ this.id = workspace.id;+ this.name = workspace.name;+ this.description = workspace.description;+ this.avatar = workspace.avatar;+ this.versionId = workspace.versionId;+ this.accountId = workspace.accountId;+ this.role = workspace.role;+ this.userNodeId = workspace.userNodeId;+ this.nodes = {};++ makeAutoObservable(this);+ }++ setNodes(nodes: Node[]) {+ this.nodes = nodes.reduce((acc, node) => {+ acc[node.id] = node;+ return acc;+ }, {} as Record<string, Node>);+ }++ setNode(node: Node) {+ this.nodes[node.id] = node;+ }++ deleteNode(nodeId: string) {+ delete this.nodes[nodeId];+ }+}\ No newline at end of file