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
Add background jobs to merge document & node updates (#90)
Hakan Shehu035ed6b677fa
diff --git a/apps/server/src/data/migrations/00027-remove-node-update-revision-trigger.ts b/apps/server/src/data/migrations/00027-remove-node-update-revision-trigger.tsnew file mode 100644index 00000000..8843c3ad--- /dev/null+++ b/apps/server/src/data/migrations/00027-remove-node-update-revision-trigger.ts@@ -0,0 +1,25 @@+import { sql, Migration } from 'kysely';++export const removeNodeUpdateRevisionTrigger: Migration = {+ up: async (db) => {+ await sql`+ DROP TRIGGER IF EXISTS trg_update_node_update_revision ON node_updates;+ DROP FUNCTION IF EXISTS update_node_update_revision();+ `.execute(db);+ },+ down: async (db) => {+ await sql`+ CREATE OR REPLACE FUNCTION update_node_update_revision() RETURNS TRIGGER AS $$+ BEGIN+ NEW.revision = nextval('node_updates_revision_sequence');+ RETURN NEW;+ END;+ $$ LANGUAGE plpgsql;++ CREATE TRIGGER trg_update_node_update_revision+ BEFORE UPDATE ON node_updates+ FOR EACH ROW+ EXECUTE FUNCTION update_node_update_revision();+ `.execute(db);+ },+};diff --git a/apps/server/src/data/migrations/00028-remove-document-update-revision-trigger.ts b/apps/server/src/data/migrations/00028-remove-document-update-revision-trigger.tsnew file mode 100644index 00000000..ee9b2e5f--- /dev/null+++ b/apps/server/src/data/migrations/00028-remove-document-update-revision-trigger.ts@@ -0,0 +1,25 @@+import { sql, Migration } from 'kysely';++export const removeDocumentUpdateRevisionTrigger: Migration = {+ up: async (db) => {+ await sql`+ DROP TRIGGER IF EXISTS trg_update_document_update_revision ON document_updates;+ DROP FUNCTION IF EXISTS update_document_update_revision();+ `.execute(db);+ },+ down: async (db) => {+ await sql`+ CREATE OR REPLACE FUNCTION update_document_update_revision() RETURNS TRIGGER AS $$+ BEGIN+ NEW.revision = nextval('document_updates_revision_sequence');+ RETURN NEW;+ END;+ $$ LANGUAGE plpgsql;++ CREATE TRIGGER trg_update_document_update_revision+ BEFORE UPDATE ON document_updates+ FOR EACH ROW+ EXECUTE FUNCTION update_document_update_revision();+ `.execute(db);+ },+};diff --git a/apps/server/src/data/migrations/index.ts b/apps/server/src/data/migrations/index.tsindex 76c2e146..78638b5e 100644--- a/apps/server/src/data/migrations/index.ts+++ b/apps/server/src/data/migrations/index.ts@@ -26,6 +26,8 @@ import { createWorkspaceUserCounterTriggers } from './00023-create-workspace-useimport { createWorkspaceNodeCounterTriggers } from './00024-create-workspace-node-counter-triggers';import { createWorkspaceUploadCounterTriggers } from './00025-create-workspace-upload-counter-triggers';import { createUserUploadCounterTriggers } from './00026-create-user-upload-counter-triggers';+import { removeNodeUpdateRevisionTrigger } from './00027-remove-node-update-revision-trigger';+import { removeDocumentUpdateRevisionTrigger } from './00028-remove-document-update-revision-trigger';export const databaseMigrations: Record<string, Migration> = {'00001_create_accounts_table': createAccountsTable,@@ -57,4 +59,7 @@ export const databaseMigrations: Record<string, Migration> = {'00025_create_workspace_upload_counter_triggers':createWorkspaceUploadCounterTriggers,'00026_create_user_upload_counter_triggers': createUserUploadCounterTriggers,+ '00027_remove_node_update_revision_trigger': removeNodeUpdateRevisionTrigger,+ '00028_remove_document_update_revision_trigger':+ removeDocumentUpdateRevisionTrigger,};diff --git a/apps/server/src/jobs/document-updates-merge.ts b/apps/server/src/jobs/document-updates-merge.tsnew file mode 100644index 00000000..4ba8a524--- /dev/null+++ b/apps/server/src/jobs/document-updates-merge.ts@@ -0,0 +1,224 @@+import { createDebugger, UpdateMergeMetadata } from '@colanode/core';+import { mergeUpdates } from '@colanode/crdt';+import { database } from '@colanode/server/data/database';+import { SelectDocumentUpdate } from '@colanode/server/data/schema';+import { JobHandler } from '@colanode/server/jobs';+import { config } from '@colanode/server/lib/config';+import { fetchCounter, setCounter } from '@colanode/server/lib/counters';++const debug = createDebugger('server:job:document-updates-merge');++export type DocumentUpdatesMergeInput = {+ type: 'document.updates.merge';+};++declare module '@colanode/server/jobs' {+ interface JobMap {+ 'document.updates.merge': {+ input: DocumentUpdatesMergeInput;+ };+ }+}++export const documentUpdatesMergeHandler: JobHandler<+ DocumentUpdatesMergeInput+> = async () => {+ if (!config.jobs.documentUpdatesMerge.enabled) {+ return;+ }++ debug('Starting document updates merge job');++ const cursor = await fetchCounter(database, 'document.updates.merge.cursor');++ const cutoffTime = new Date();+ cutoffTime.setTime(+ cutoffTime.getTime() - config.jobs.documentUpdatesMerge.cutoffWindow * 1000+ );++ let mergedGroups = 0;+ let deletedUpdates = 0;+ let hasMore = true;+ const currentCursor = cursor;++ while (hasMore) {+ const updates = await database+ .selectFrom('document_updates')+ .selectAll()+ .where('revision', '>', currentCursor.toString())+ .where('created_at', '<', cutoffTime)+ .orderBy('revision', 'asc')+ .limit(config.jobs.documentUpdatesMerge.batchSize)+ .execute();++ if (updates.length === 0) {+ hasMore = false;+ continue;+ }++ debug(`Processing batch of ${updates.length} updates`);++ const documentIds = [+ ...new Set(updates.map((update) => update.document_id)),+ ];++ const maxRevision = updates.reduce((max, update) => {+ const rev = BigInt(update.revision);+ return rev > max ? rev : max;+ }, BigInt(0));++ for (const documentId of documentIds) {+ const result = await processDocumentUpdates(+ documentId,+ maxRevision,+ cutoffTime,+ config.jobs.documentUpdatesMerge.mergeWindow+ );+ mergedGroups += result.mergedGroups;+ deletedUpdates += result.deletedUpdates;+ }++ await setCounter(database, 'document.updates.merge.cursor', maxRevision);++ if (updates.length < config.jobs.documentUpdatesMerge.batchSize) {+ hasMore = false;+ }+ }++ debug(+ `Document updates merge job completed. Merged ${mergedGroups} groups, deleted ${deletedUpdates} redundant updates`+ );+};++const processDocumentUpdates = async (+ documentId: string,+ maxRevision: bigint,+ cutoffTime: Date,+ mergeWindow: number+): Promise<{ mergedGroups: number; deletedUpdates: number }> => {+ const allDocumentUpdates = await database+ .selectFrom('document_updates')+ .selectAll()+ .where('document_id', '=', documentId)+ .where('revision', '<=', maxRevision.toString())+ .where('created_at', '<', cutoffTime)+ .orderBy('created_at', 'asc')+ .execute();++ if (allDocumentUpdates.length < 2) {+ return { mergedGroups: 0, deletedUpdates: 0 };+ }++ const timeGroups = groupUpdatesByMergeWindow(allDocumentUpdates, mergeWindow);++ let mergedGroups = 0;+ let deletedUpdates = 0;++ for (const timeGroup of timeGroups) {+ if (timeGroup.length >= 2) {+ const success = await mergeUpdatesGroup(documentId, timeGroup);+ if (success) {+ mergedGroups++;+ deletedUpdates += timeGroup.length - 1;+ }+ }+ }++ return { mergedGroups, deletedUpdates };+};++const groupUpdatesByMergeWindow = (+ updates: SelectDocumentUpdate[],+ mergeWindow: number+): SelectDocumentUpdate[][] => {+ if (updates.length === 0) return [];++ const sortedUpdates = [...updates].sort(+ (a, b) => a.created_at.getTime() - b.created_at.getTime()+ );++ const timeGroups: SelectDocumentUpdate[][] = [];+ let currentGroup: SelectDocumentUpdate[] = [sortedUpdates[0]!];++ for (let i = 1; i < sortedUpdates.length; i++) {+ const currentUpdate = sortedUpdates[i]!;+ const lastUpdateInGroup = currentGroup[currentGroup.length - 1]!;++ const timeDiff =+ currentUpdate.created_at.getTime() -+ lastUpdateInGroup.created_at.getTime();+ const timeDiffSeconds = timeDiff / 1000;++ if (timeDiffSeconds <= mergeWindow) {+ currentGroup.push(currentUpdate);+ } else {+ timeGroups.push(currentGroup);+ currentGroup = [currentUpdate];+ }+ }++ timeGroups.push(currentGroup);++ return timeGroups;+};++const mergeUpdatesGroup = async (+ documentId: string,+ updates: SelectDocumentUpdate[]+): Promise<boolean> => {+ if (updates.length < 2) {+ return false;+ }++ try {+ const sortedUpdates = [...updates].sort((a, b) => {+ const revA = BigInt(a.revision);+ const revB = BigInt(b.revision);+ if (revA > revB) {+ return 1;+ } else if (revA < revB) {+ return -1;+ }+ return 0;+ });++ const updateData = sortedUpdates.map((update) => update.data);+ const mergedState = mergeUpdates(updateData);++ const lastUpdate = sortedUpdates[sortedUpdates.length - 1]!;+ const mergedUpdatesMetadata: UpdateMergeMetadata[] = sortedUpdates+ .slice(0, -1) // All except the last+ .map((update) => ({+ id: update.id,+ createdAt: update.created_at.toISOString(),+ createdBy: update.created_by,+ }));++ await database.transaction().execute(async (trx) => {+ await trx+ .updateTable('document_updates')+ .set({+ data: mergedState,+ merged_updates: JSON.stringify([+ ...(lastUpdate.merged_updates ?? []),+ ...mergedUpdatesMetadata,+ ]),+ })+ .where('id', '=', lastUpdate.id)+ .execute();++ const updateIdsToDelete = sortedUpdates.slice(0, -1).map((u) => u.id);+ if (updateIdsToDelete.length > 0) {+ await trx+ .deleteFrom('document_updates')+ .where('id', 'in', updateIdsToDelete)+ .execute();+ }+ });++ return true;+ } catch (error) {+ debug(`Failed to merge updates for document ${documentId}: ${error}`);+ return false;+ }+};diff --git a/apps/server/src/jobs/index.ts b/apps/server/src/jobs/index.tsindex e9a2ac5f..c18c69d4 100644--- a/apps/server/src/jobs/index.ts+++ b/apps/server/src/jobs/index.ts@@ -1,11 +1,13 @@import { assistantRespondHandler } from '@colanode/server/jobs/assistant-response';import { documentEmbedHandler } from '@colanode/server/jobs/document-embed';import { documentEmbedScanHandler } from '@colanode/server/jobs/document-embed-scan';+import { documentUpdatesMergeHandler } from '@colanode/server/jobs/document-updates-merge';import { emailPasswordResetSendHandler } from '@colanode/server/jobs/email-password-reset-sent';import { emailVerifySendHandler } from '@colanode/server/jobs/email-verify-send';import { nodeCleanHandler } from '@colanode/server/jobs/node-clean';import { nodeEmbedHandler } from '@colanode/server/jobs/node-embed';import { nodeEmbedScanHandler } from '@colanode/server/jobs/node-embed-scan';+import { nodeUpdatesMergeHandler } from '@colanode/server/jobs/node-updates-merge';import { workspaceCleanHandler } from '@colanode/server/jobs/workspace-clean';// eslint-disable-next-line @typescript-eslint/no-empty-object-type@@ -29,4 +31,6 @@ export const jobHandlerMap: JobHandlerMap = {'assistant.respond': assistantRespondHandler,'node.embed.scan': nodeEmbedScanHandler,'document.embed.scan': documentEmbedScanHandler,+ 'node.updates.merge': nodeUpdatesMergeHandler,+ 'document.updates.merge': documentUpdatesMergeHandler,};diff --git a/apps/server/src/jobs/node-updates-merge.ts b/apps/server/src/jobs/node-updates-merge.tsnew file mode 100644index 00000000..7ff98b84--- /dev/null+++ b/apps/server/src/jobs/node-updates-merge.ts@@ -0,0 +1,222 @@+import { createDebugger, UpdateMergeMetadata } from '@colanode/core';+import { mergeUpdates } from '@colanode/crdt';+import { database } from '@colanode/server/data/database';+import { SelectNodeUpdate } from '@colanode/server/data/schema';+import { JobHandler } from '@colanode/server/jobs';+import { config } from '@colanode/server/lib/config';+import { fetchCounter, setCounter } from '@colanode/server/lib/counters';++const debug = createDebugger('server:job:node-updates-merge');++export type NodeUpdatesMergeInput = {+ type: 'node.updates.merge';+};++declare module '@colanode/server/jobs' {+ interface JobMap {+ 'node.updates.merge': {+ input: NodeUpdatesMergeInput;+ };+ }+}++export const nodeUpdatesMergeHandler: JobHandler<+ NodeUpdatesMergeInput+> = async () => {+ if (!config.jobs.nodeUpdatesMerge.enabled) {+ return;+ }++ debug('Starting node updates merge job');++ const cursor = await fetchCounter(database, 'node.updates.merge.cursor');++ const cutoffTime = new Date();+ cutoffTime.setTime(+ cutoffTime.getTime() - config.jobs.nodeUpdatesMerge.cutoffWindow * 1000+ );++ let mergedGroups = 0;+ let deletedUpdates = 0;+ let hasMore = true;+ const currentCursor = cursor;++ while (hasMore) {+ const updates = await database+ .selectFrom('node_updates')+ .selectAll()+ .where('revision', '>', currentCursor.toString())+ .where('created_at', '<', cutoffTime)+ .orderBy('revision', 'asc')+ .limit(config.jobs.nodeUpdatesMerge.batchSize)+ .execute();++ if (updates.length === 0) {+ hasMore = false;+ continue;+ }++ debug(`Processing batch of ${updates.length} updates`);++ const nodeIds = [...new Set(updates.map((update) => update.node_id))];+ const maxRevision = updates.reduce((max, update) => {+ const rev = BigInt(update.revision);+ return rev > max ? rev : max;+ }, BigInt(0));++ for (const nodeId of nodeIds) {+ const result = await processNodeUpdates(+ nodeId,+ maxRevision,+ cutoffTime,+ config.jobs.nodeUpdatesMerge.mergeWindow+ );+ mergedGroups += result.mergedGroups;+ deletedUpdates += result.deletedUpdates;+ }++ await setCounter(database, 'node.updates.merge.cursor', maxRevision);++ if (updates.length < config.jobs.nodeUpdatesMerge.batchSize) {+ hasMore = false;+ }+ }++ debug(+ `Node updates merge job completed. Merged ${mergedGroups} groups, deleted ${deletedUpdates} redundant updates`+ );+};++const processNodeUpdates = async (+ nodeId: string,+ maxRevision: bigint,+ cutoffTime: Date,+ mergeWindow: number+): Promise<{ mergedGroups: number; deletedUpdates: number }> => {+ const allNodeUpdates = await database+ .selectFrom('node_updates')+ .selectAll()+ .where('node_id', '=', nodeId)+ .where('revision', '<=', maxRevision.toString())+ .where('created_at', '<', cutoffTime)+ .orderBy('created_at', 'asc')+ .execute();++ if (allNodeUpdates.length < 2) {+ return { mergedGroups: 0, deletedUpdates: 0 };+ }++ const timeGroups = groupUpdatesByMergeWindow(allNodeUpdates, mergeWindow);++ let mergedGroups = 0;+ let deletedUpdates = 0;++ for (const timeGroup of timeGroups) {+ if (timeGroup.length >= 2) {+ const success = await mergeUpdatesGroup(nodeId, timeGroup);+ if (success) {+ mergedGroups++;+ deletedUpdates += timeGroup.length - 1;+ }+ }+ }++ return { mergedGroups, deletedUpdates };+};++const groupUpdatesByMergeWindow = (+ updates: SelectNodeUpdate[],+ mergeWindow: number+): SelectNodeUpdate[][] => {+ if (updates.length === 0) return [];++ // Sort updates by creation time+ const sortedUpdates = [...updates].sort(+ (a, b) => a.created_at.getTime() - b.created_at.getTime()+ );++ const timeGroups: SelectNodeUpdate[][] = [];+ let currentGroup: SelectNodeUpdate[] = [sortedUpdates[0]!];++ for (let i = 1; i < sortedUpdates.length; i++) {+ const currentUpdate = sortedUpdates[i]!;+ const lastUpdateInGroup = currentGroup[currentGroup.length - 1]!;++ const timeDiff =+ currentUpdate.created_at.getTime() -+ lastUpdateInGroup.created_at.getTime();+ const timeDiffSeconds = timeDiff / 1000;++ if (timeDiffSeconds <= mergeWindow) {+ currentGroup.push(currentUpdate);+ } else {+ timeGroups.push(currentGroup);+ currentGroup = [currentUpdate];+ }+ }++ timeGroups.push(currentGroup);++ return timeGroups;+};++const mergeUpdatesGroup = async (+ nodeId: string,+ updates: SelectNodeUpdate[]+): Promise<boolean> => {+ if (updates.length < 2) {+ return false;+ }++ try {+ const sortedUpdates = [...updates].sort((a, b) => {+ const revA = BigInt(a.revision);+ const revB = BigInt(b.revision);+ if (revA > revB) {+ return 1;+ } else if (revA < revB) {+ return -1;+ }+ return 0;+ });++ const updateData = sortedUpdates.map((update) => update.data);+ const mergedState = mergeUpdates(updateData);++ const lastUpdate = sortedUpdates[sortedUpdates.length - 1]!;+ const mergedUpdatesMetadata: UpdateMergeMetadata[] = sortedUpdates+ .slice(0, -1) // All except the last+ .map((update) => ({+ id: update.id,+ createdAt: update.created_at.toISOString(),+ createdBy: update.created_by,+ }));++ await database.transaction().execute(async (trx) => {+ await trx+ .updateTable('node_updates')+ .set({+ data: mergedState,+ merged_updates: JSON.stringify([+ ...(lastUpdate.merged_updates ?? []),+ ...mergedUpdatesMetadata,+ ]),+ })+ .where('id', '=', lastUpdate.id)+ .execute();++ const updateIdsToDelete = sortedUpdates.slice(0, -1).map((u) => u.id);+ if (updateIdsToDelete.length > 0) {+ await trx+ .deleteFrom('node_updates')+ .where('id', 'in', updateIdsToDelete)+ .execute();+ }+ });++ return true;+ } catch (error) {+ debug(`Failed to merge updates for node ${nodeId}: ${error}`);+ return false;+ }+};diff --git a/apps/server/src/lib/config/index.ts b/apps/server/src/lib/config/index.tsindex c68bf7b8..391793d5 100644--- a/apps/server/src/lib/config/index.ts+++ b/apps/server/src/lib/config/index.ts@@ -2,6 +2,7 @@ import { z } from 'zod/v4';import { accountConfigSchema, readAccountConfigVariables } from './account';import { aiConfigSchema, readAiConfigVariables } from './ai';+import { jobsConfigSchema, readJobsConfigVariables } from './jobs';import { postgresConfigSchema, readPostgresConfigVariables } from './postgres';import { readRedisConfigVariables, redisConfigSchema } from './redis';import { readServerConfigVariables, serverConfigSchema } from './server';@@ -18,6 +19,7 @@ const configSchema = z.object({storage: storageConfigSchema,smtp: smtpConfigSchema,ai: aiConfigSchema,+ jobs: jobsConfigSchema,});export type Configuration = z.infer<typeof configSchema>;@@ -33,6 +35,7 @@ const readConfigVariables = (): Configuration => {storage: readStorageConfigVariables(),smtp: readSmtpConfigVariables(),ai: readAiConfigVariables(),+ jobs: readJobsConfigVariables(),};return configSchema.parse(input);diff --git a/apps/server/src/lib/config/jobs.ts b/apps/server/src/lib/config/jobs.tsnew file mode 100644index 00000000..e688c952--- /dev/null+++ b/apps/server/src/lib/config/jobs.ts@@ -0,0 +1,65 @@+import { z } from 'zod/v4';++const DEFAULT_BATCH_SIZE = 500;+const DEFAULT_MERGE_WINDOW_SECONDS = 60 * 60;+const DEFAULT_CUTOFF_WINDOW_HOURS = 2 * 60 * 60;+const DEFAULT_CRON_PATTERN = '0 5 */2 * * *'; // every 2 hours at the 5th minute++export const nodeUpdatesMergeJobConfigSchema = z.discriminatedUnion('enabled', [+ z.object({+ enabled: z.literal(true),+ cron: z.string().default(DEFAULT_CRON_PATTERN),+ batchSize: z.coerce.number().default(DEFAULT_BATCH_SIZE),+ mergeWindow: z.coerce.number().default(DEFAULT_MERGE_WINDOW_SECONDS),+ cutoffWindow: z.coerce.number().default(DEFAULT_CUTOFF_WINDOW_HOURS),+ }),+ z.object({+ enabled: z.literal(false),+ }),+]);++export const documentUpdatesMergeJobConfigSchema = z.discriminatedUnion(+ 'enabled',+ [+ z.object({+ enabled: z.literal(true),+ cron: z.string().default(DEFAULT_CRON_PATTERN),+ batchSize: z.coerce.number().default(DEFAULT_BATCH_SIZE),+ mergeWindow: z.coerce.number().default(DEFAULT_MERGE_WINDOW_SECONDS),+ cutoffWindow: z.coerce.number().default(DEFAULT_CUTOFF_WINDOW_HOURS),+ }),+ z.object({+ enabled: z.literal(false),+ }),+ ]+);++export const jobsConfigSchema = z.object({+ nodeUpdatesMerge: nodeUpdatesMergeJobConfigSchema,+ documentUpdatesMerge: documentUpdatesMergeJobConfigSchema,+});++export type JobsConfig = z.infer<typeof jobsConfigSchema>;++export const readJobsConfigVariables = () => {+ return {+ nodeUpdatesMerge: {+ enabled: process.env.JOBS_NODE_UPDATES_MERGE_ENABLED === 'true',+ cron: process.env.JOBS_NODE_UPDATES_MERGE_CRON,+ batchSize: process.env.JOBS_NODE_UPDATES_MERGE_BATCH_SIZE,+ timeWindowMinutes:+ process.env.JOBS_NODE_UPDATES_MERGE_TIME_WINDOW_MINUTES,+ excludeRecentHours:+ process.env.JOBS_NODE_UPDATES_MERGE_EXCLUDE_RECENT_HOURS,+ },+ documentUpdatesMerge: {+ enabled: process.env.JOBS_DOCUMENT_UPDATES_MERGE_ENABLED === 'true',+ cron: process.env.JOBS_DOCUMENT_UPDATES_MERGE_CRON,+ batchSize: process.env.JOBS_DOCUMENT_UPDATES_MERGE_BATCH_SIZE,+ timeWindowMinutes:+ process.env.JOBS_DOCUMENT_UPDATES_MERGE_TIME_WINDOW_MINUTES,+ excludeRecentHours:+ process.env.JOBS_DOCUMENT_UPDATES_MERGE_EXCLUDE_RECENT_HOURS,+ },+ };+};diff --git a/apps/server/src/lib/counters.ts b/apps/server/src/lib/counters.tsindex a81f80b7..a5feabfe 100644--- a/apps/server/src/lib/counters.ts+++ b/apps/server/src/lib/counters.ts@@ -2,7 +2,11 @@ import { Kysely, Transaction } from 'kysely';import { DatabaseSchema } from '@colanode/server/data/schema';-export type CounterKey = `${string}.storage.used` | `${string}.nodes.count`;+export type CounterKey =+ | `${string}.storage.used`+ | `${string}.nodes.count`+ | `node.updates.merge.cursor`+ | `document.updates.merge.cursor`;export const fetchCounter = async (database: Kysely<DatabaseSchema> | Transaction<DatabaseSchema>,@@ -16,3 +20,24 @@ export const fetchCounter = async (return counter?.value ? BigInt(counter.value) : BigInt(0);};++export const setCounter = async (+ database: Kysely<DatabaseSchema> | Transaction<DatabaseSchema>,+ key: CounterKey,+ value: bigint+) => {+ await database+ .insertInto('counters')+ .values({+ key,+ value: value.toString(),+ created_at: new Date(),+ })+ .onConflict((oc) =>+ oc.column('key').doUpdateSet({+ value: value.toString(),+ updated_at: new Date(),+ })+ )+ .execute();+};diff --git a/apps/server/src/services/job-service.ts b/apps/server/src/services/job-service.tsindex 9fe9c537..2b5b640b 100644--- a/apps/server/src/services/job-service.ts+++ b/apps/server/src/services/job-service.ts@@ -68,6 +68,42 @@ class JobService {});}++ if (config.jobs.nodeUpdatesMerge.enabled) {+ this.jobQueue.upsertJobScheduler(+ 'node.updates.merge',+ { pattern: config.jobs.nodeUpdatesMerge.cron },+ {+ name: 'node.updates.merge',+ data: { type: 'node.updates.merge' } as JobInput,+ opts: {+ backoff: 3,+ attempts: 3,+ removeOnFail: 100,+ },+ }+ );+ } else {+ this.jobQueue.removeJobScheduler('node.updates.merge');+ }++ if (config.jobs.documentUpdatesMerge.enabled) {+ this.jobQueue.upsertJobScheduler(+ 'document.updates.merge',+ { pattern: config.jobs.documentUpdatesMerge.cron },+ {+ name: 'document.updates.merge',+ data: { type: 'document.updates.merge' } as JobInput,+ opts: {+ backoff: 3,+ attempts: 3,+ removeOnFail: 100,+ },+ }+ );+ } else {+ this.jobQueue.removeJobScheduler('document.updates.merge');+ }}public async initWorker() {diff --git a/packages/crdt/src/index.ts b/packages/crdt/src/index.tsindex af8c1d8a..3228a79d 100644--- a/packages/crdt/src/index.ts+++ b/packages/crdt/src/index.ts@@ -15,6 +15,10 @@ export const decodeState = (state: string) => {return toUint8Array(state);};+export const mergeUpdates = (updates: Uint8Array[]) => {+ return Y.mergeUpdates(updates);+};+const ORIGIN = 'this';export class YDoc {