Skip to content

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

Use blob data type for the state column in sqlite

Hakan Shehuf17223b213f0
diff --git a/apps/desktop/src/main/data/workspace/migrations.ts b/apps/desktop/src/main/data/workspace/migrations.ts
index e0370996..17f63b3c 100644
--- a/apps/desktop/src/main/data/workspace/migrations.ts
+++ b/apps/desktop/src/main/data/workspace/migrations.ts
@@ -22,7 +22,7 @@ const createNodesTable: Migration = {
col.generatedAlwaysAs(sql`json_extract(attributes, '$.index')`).stored()
)
.addColumn('attributes', 'text', (col) => col.notNull())
- .addColumn('state', 'text', (col) => col.notNull())
+ .addColumn('state', 'blob', (col) => col.notNull())
.addColumn('created_at', 'text', (col) => col.notNull())
.addColumn('updated_at', 'text')
.addColumn('created_by', 'text', (col) => col.notNull())
diff --git a/apps/desktop/src/main/data/workspace/schema.ts b/apps/desktop/src/main/data/workspace/schema.ts
index 38a5985e..f02c5709 100644
--- a/apps/desktop/src/main/data/workspace/schema.ts
+++ b/apps/desktop/src/main/data/workspace/schema.ts
@@ -6,7 +6,7 @@ interface NodeTable {
type: ColumnType<string, never, never>;
index: ColumnType<string | null, never, never>;
attributes: ColumnType<string, string, string>;
- state: ColumnType<string, string, string>;
+ state: ColumnType<Uint8Array, Uint8Array, Uint8Array>;
created_at: ColumnType<string, string, never>;
updated_at: ColumnType<string | null, string | null, string | null>;
created_by: ColumnType<string, string, never>;
diff --git a/apps/desktop/src/main/handlers/mutations/email-login.ts b/apps/desktop/src/main/handlers/mutations/email-login.ts
index b6a2eccd..5e86b1bc 100644
--- a/apps/desktop/src/main/handlers/mutations/email-login.ts
+++ b/apps/desktop/src/main/handlers/mutations/email-login.ts
@@ -3,6 +3,7 @@ import { databaseManager } from '@/main/data/database-manager';
import { EmailLoginMutationInput } from '@/operations/mutations/email-login';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
import { httpClient } from '@/lib/http-client';
+import { toUint8Array } from 'js-base64';
export class EmailLoginMutationHandler
implements MutationHandler<EmailLoginMutationInput>
@@ -94,7 +95,7 @@ export class EmailLoginMutationHandler
.values({
id: user.id,
attributes: JSON.stringify(user.attributes),
- state: user.state,
+ state: toUint8Array(user.state),
created_at: user.createdAt,
created_by: user.createdBy,
updated_at: user.updatedAt,
diff --git a/apps/desktop/src/main/handlers/mutations/email-register.ts b/apps/desktop/src/main/handlers/mutations/email-register.ts
index 73f441b2..354b8740 100644
--- a/apps/desktop/src/main/handlers/mutations/email-register.ts
+++ b/apps/desktop/src/main/handlers/mutations/email-register.ts
@@ -3,6 +3,7 @@ import { databaseManager } from '@/main/data/database-manager';
import { httpClient } from '@/lib/http-client';
import { EmailRegisterMutationInput } from '@/operations/mutations/email-register';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
+import { toUint8Array } from 'js-base64';
export class EmailRegisterMutationHandler
implements MutationHandler<EmailRegisterMutationInput>
@@ -95,7 +96,7 @@ export class EmailRegisterMutationHandler
.values({
id: user.id,
attributes: JSON.stringify(user.attributes),
- state: user.state,
+ state: toUint8Array(user.state),
created_at: user.createdAt,
created_by: user.createdBy,
updated_at: user.updatedAt,
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 1267ce12..b3963a23 100644
--- a/apps/desktop/src/main/handlers/mutations/server-node-sync.ts
+++ b/apps/desktop/src/main/handlers/mutations/server-node-sync.ts
@@ -44,11 +44,9 @@ export class ServerNodeSyncMutationHandler
.executeTakeFirst();
if (!existingNode) {
- const doc = new Y.Doc({
- guid: input.id,
- });
-
- Y.applyUpdate(doc, toUint8Array(input.state));
+ const doc = new Y.Doc({ guid: input.id });
+ const state = toUint8Array(input.state);
+ Y.applyUpdate(doc, state);
const attributesMap = doc.getMap('attributes');
const attributes = JSON.stringify(attributesMap.toJSON());
@@ -58,7 +56,7 @@ export class ServerNodeSyncMutationHandler
.values({
id: input.id,
attributes: attributes,
- state: input.state,
+ state: state,
created_at: input.createdAt,
created_by: input.createdBy,
version_id: input.versionId,
@@ -91,20 +89,18 @@ export class ServerNodeSyncMutationHandler
};
}
} else {
- const doc = new Y.Doc({
- guid: input.id,
- });
-
- Y.applyUpdate(doc, toUint8Array(existingNode.state));
+ const doc = new Y.Doc({ guid: input.id });
+ Y.applyUpdate(doc, existingNode.state);
Y.applyUpdate(doc, toUint8Array(input.state));
const attributesMap = doc.getMap('attributes');
const attributes = JSON.stringify(attributesMap.toJSON());
+ const state = Y.encodeStateAsUpdate(doc);
const result = await workspaceDatabase
.updateTable('nodes')
.set({
- state: input.state,
+ state: state,
attributes: attributes,
server_created_at: input.serverCreatedAt,
server_updated_at: input.serverUpdatedAt,
diff --git a/apps/desktop/src/main/handlers/mutations/workspace-create.ts b/apps/desktop/src/main/handlers/mutations/workspace-create.ts
index ce515fac..ae513e8d 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-create.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-create.ts
@@ -3,6 +3,7 @@ import { httpClient } from '@/lib/http-client';
import { WorkspaceCreateMutationInput } from '@/operations/mutations/workspace-create';
import { MutationHandler, MutationResult } from '@/main/types';
import { WorkspaceOutput } from '@/types/workspaces';
+import { toUint8Array } from 'js-base64';
export class WorkspaceCreateMutationHandler
implements MutationHandler<WorkspaceCreateMutationInput>
@@ -69,7 +70,7 @@ export class WorkspaceCreateMutationHandler
.values({
id: user.id,
attributes: JSON.stringify(user.attributes),
- state: user.state,
+ state: toUint8Array(user.state),
created_at: user.createdAt,
created_by: user.createdBy,
updated_at: user.updatedAt,
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 2d73dc6b..22351352 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
@@ -3,6 +3,7 @@ import { httpClient } from '@/lib/http-client';
import { WorkspaceUserRoleUpdateMutationInput } from '@/operations/mutations/workspace-user-role-update';
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
import { WorkspaceUserRoleUpdateOutput } from '@/types/workspaces';
+import { toUint8Array } from 'js-base64';
export class WorkspaceUserRoleUpdateMutationHandler
implements MutationHandler<WorkspaceUserRoleUpdateMutationInput>
@@ -72,7 +73,7 @@ export class WorkspaceUserRoleUpdateMutationHandler
.updateTable('nodes')
.set({
attributes: JSON.stringify(data.user.attributes),
- state: data.user.state,
+ state: toUint8Array(data.user.state),
updated_at: data.user.updatedAt,
updated_by: data.user.updatedBy,
version_id: data.user.versionId,
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 29880108..a947499e 100644
--- a/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
+++ b/apps/desktop/src/main/handlers/mutations/workspace-users-invite.ts
@@ -4,6 +4,7 @@ import { WorkspaceUsersInviteMutationInput } from '@/operations/mutations/worksp
import { MutationChange, MutationHandler, MutationResult } from '@/main/types';
import { WorkspaceUsersInviteOutput } from '@/types/workspaces';
import { CreateNode } from '@/main/data/workspace/schema';
+import { toUint8Array } from 'js-base64';
export class WorkspaceUsersInviteMutationHandler
implements MutationHandler<WorkspaceUsersInviteMutationInput>
@@ -73,7 +74,7 @@ export class WorkspaceUsersInviteMutationHandler
return {
id: user.id,
attributes: JSON.stringify(user.attributes),
- state: user.state,
+ state: toUint8Array(user.state),
created_at: user.createdAt,
created_by: user.createdBy,
updated_at: user.updatedAt,
diff --git a/apps/desktop/src/main/node-manager.ts b/apps/desktop/src/main/node-manager.ts
index 41dd7735..a656b5d0 100644
--- a/apps/desktop/src/main/node-manager.ts
+++ b/apps/desktop/src/main/node-manager.ts
@@ -6,7 +6,7 @@ import {
registry,
} from '@colanode/core';
import { applyCrdt } from '@colanode/crdt';
-import { fromUint8Array, toUint8Array } from 'js-base64';
+import { fromUint8Array } from 'js-base64';
import {
LocalCreateNodeChangeData,
LocalDeleteNodeChangeData,
@@ -82,7 +82,7 @@ class NodeManager {
}
applyCrdt(model.schema, input.attributes, attributesMap);
- const encodedState = fromUint8Array(Y.encodeStateAsUpdate(doc));
+ const state = Y.encodeStateAsUpdate(doc);
const createdAt = new Date().toISOString();
const versionId = generateId(IdType.Version);
@@ -90,7 +90,7 @@ class NodeManager {
const changeData: LocalCreateNodeChangeData = {
type: 'node_create',
id: input.id,
- state: encodedState,
+ state: fromUint8Array(state),
createdAt: createdAt,
createdBy: context.userId,
versionId: versionId,
@@ -101,7 +101,7 @@ class NodeManager {
.values({
id: input.id,
attributes: JSON.stringify(input.attributes),
- state: encodedState,
+ state: state,
created_at: createdAt,
created_by: context.userId,
version_id: versionId,
@@ -192,7 +192,7 @@ class NodeManager {
);
const doc = new Y.Doc({ guid: nodeId });
- Y.applyUpdate(doc, toUint8Array(nodeRow.state));
+ Y.applyUpdate(doc, nodeRow.state);
const versionId = generateId(IdType.Version);
const updatedAt = new Date().toISOString();
@@ -231,7 +231,7 @@ class NodeManager {
}
const attributesJson = JSON.stringify(attributesMap.toJSON());
- const encodedState = fromUint8Array(Y.encodeStateAsUpdate(doc));
+ const state = Y.encodeStateAsUpdate(doc);
const changeData: LocalUpdateNodeChangeData = {
type: 'node_update',
@@ -249,7 +249,7 @@ class NodeManager {
.updateTable('nodes')
.set({
attributes: attributesJson,
- state: encodedState,
+ state: state,
updated_at: updatedAt,
updated_by: context.userId,
version_id: versionId,
diff --git a/apps/server/src/lib/workspaces.ts b/apps/server/src/lib/workspaces.ts
index 9015aba5..151632cb 100644
--- a/apps/server/src/lib/workspaces.ts
+++ b/apps/server/src/lib/workspaces.ts
@@ -68,9 +68,7 @@ const buildUserNodeCreate = (
): CreateNode => {
const id = generateId(IdType.User);
const versionId = generateId(IdType.Version);
- const doc = new Y.Doc({
- guid: id,
- });
+ const doc = new Y.Doc({ guid: id });
const attributesMap = doc.getMap('attributes');
doc.transact(() => {
@@ -103,9 +101,7 @@ const buildSpaceNodeCreate = (
): CreateNode => {
const id = generateId(IdType.Space);
const versionId = generateId(IdType.Version);
- const doc = new Y.Doc({
- guid: id,
- });
+ const doc = new Y.Doc({ guid: id });
const attributesMap = doc.getMap('attributes');
doc.transact(() => {
@@ -143,9 +139,7 @@ const buildPageNodeCreate = (
): CreateNode => {
const id = generateId(IdType.Page);
const versionId = generateId(IdType.Version);
- const doc = new Y.Doc({
- guid: id,
- });
+ const doc = new Y.Doc({ guid: id });
const attributesMap = doc.getMap('attributes');
doc.transact(() => {
@@ -176,9 +170,7 @@ const buildChannelNodeCreate = (
): CreateNode => {
const id = generateId(IdType.Channel);
const versionId = generateId(IdType.Version);
- const doc = new Y.Doc({
- guid: id,
- });
+ const doc = new Y.Doc({ guid: id });
const attributesMap = doc.getMap('attributes');
doc.transact(() => {
diff --git a/apps/server/src/routes/accounts.ts b/apps/server/src/routes/accounts.ts
index ce450e72..659376ca 100644
--- a/apps/server/src/routes/accounts.ts
+++ b/apps/server/src/routes/accounts.ts
@@ -319,9 +319,7 @@ accountsRouter.put(
continue;
}
- const doc = new Y.Doc({
- guid: user.id,
- });
+ const doc = new Y.Doc({ guid: user.id });
Y.applyUpdate(doc, toUint8Array(user.state));
const attributesMap = doc.getMap('attributes');
diff --git a/apps/server/src/routes/sync.ts b/apps/server/src/routes/sync.ts
index c724d105..96cb62fc 100644
--- a/apps/server/src/routes/sync.ts
+++ b/apps/server/src/routes/sync.ts
@@ -117,10 +117,7 @@ const handleCreateNodeChange = async (
};
}
- const doc = new Y.Doc({
- guid: changeData.id,
- });
-
+ const doc = new Y.Doc({ guid: changeData.id });
Y.applyUpdate(doc, toUint8Array(changeData.state));
const attributesMap = doc.getMap('attributes');
@@ -192,10 +189,7 @@ const handleUpdateNodeChange = async (
};
}
- const doc = new Y.Doc({
- guid: changeData.id,
- });
-
+ const doc = new Y.Doc({ guid: changeData.id });
Y.applyUpdate(doc, toUint8Array(existingNode.state));
for (const update of changeData.updates) {
diff --git a/apps/server/src/routes/workspaces.ts b/apps/server/src/routes/workspaces.ts
index d2089bb8..0c748204 100644
--- a/apps/server/src/routes/workspaces.ts
+++ b/apps/server/src/routes/workspaces.ts
@@ -67,9 +67,7 @@ workspacesRouter.post(
const userId = generateId(IdType.User);
const userVersionId = generateId(IdType.Version);
- const userDoc = new Y.Doc({
- guid: userId,
- });
+ const userDoc = new Y.Doc({ guid: userId });
const userAttributesMap = userDoc.getMap('attributes');
userDoc.transact(() => {
@@ -618,9 +616,7 @@ workspacesRouter.post(
const userId = generateId(IdType.User);
const userVersionId = generateId(IdType.Version);
- const userDoc = new Y.Doc({
- guid: userId,
- });
+ const userDoc = new Y.Doc({ guid: userId });
const userAttributesMap = userDoc.getMap('attributes');
userDoc.transact(() => {
@@ -794,10 +790,7 @@ workspacesRouter.put(
});
}
- const userDoc = new Y.Doc({
- guid: user.id,
- });
-
+ const userDoc = new Y.Doc({ guid: user.id });
Y.applyUpdate(userDoc, toUint8Array(user.state));
const userUpdates: string[] = [];