YJS: revert editor_id column

Author: stevensJourney

demos/yjs-react-supabase-text-collab/CHANGELOG.md

@@ -5,7 +5,6 @@
 - Added a local development option with local Supabase and PowerSync services.
 - Updated Sync rules to use client parameters. Each client now only syncs `document` and `document_updates` for the document being edited.
 - Updated `PowerSyncYjsProvider` to use an incremental watched query for `document_updates`.
-  - Added a `editor_id` column to the `document_updates` table. This tracks which editor created the update and avoids reapplying updates in the source editor.
   - The incremental watched query now applies updates from external editors.
 
 ## 0.1.16

demos/yjs-react-supabase-text-collab/src/library/powersync/AppSchema.ts

@@ -9,10 +9,7 @@ const document_updates = new Table(
   {
     document_id: column.text,
     created_at: column.text,
-    update_b64: column.text,
-    // Store an id of whom the update was created by.
-    // This is only used to not reapply updates which were created by the local editor.
-    editor_id: column.text
+    update_b64: column.text
   },
   { indexes: { by_document: ['document_id'] } }
 );

demos/yjs-react-supabase-text-collab/src/library/powersync/PowerSyncYjsProvider.ts

@@ -3,7 +3,6 @@ import * as Y from 'yjs';
 import { b64ToUint8Array, Uint8ArrayTob64 } from '@/library/binary-utils';
 import { AbstractPowerSyncDatabase } from '@powersync/web';
 import { ObservableV2 } from 'lib0/observable';
-import { v4 as uuidv4 } from 'uuid';
 import { DocumentUpdates } from './AppSchema';
 
 export interface PowerSyncYjsEvents {
@@ -26,8 +25,6 @@ export interface PowerSyncYjsEvents {
  */
 export class PowerSyncYjsProvider extends ObservableV2<PowerSyncYjsEvents> {
   private abortController = new AbortController();
-  // This ID is updated on every new instance of the provider.
-  private id = uuidv4();
 
   constructor(
     public readonly doc: Y.Doc,
@@ -49,9 +46,8 @@ export class PowerSyncYjsProvider extends ObservableV2<PowerSyncYjsEvents> {
             document_updates
           WHERE
             document_id = ?
-            AND editor_id != ?
         `,
-        parameters: [documentId, this.id]
+        parameters: [documentId]
       })
       .differentialWatch();
 
@@ -68,11 +64,18 @@ export class PowerSyncYjsProvider extends ObservableV2<PowerSyncYjsEvents> {
     this.destroy = this.destroy.bind(this);
 
     let synced = false;
-
+    const origin = this;
     updateQuery.registerListener({
       onDiff: async (diff) => {
         for (const added of diff.added) {
-          Y.applyUpdateV2(doc, b64ToUint8Array(added.update_b64));
+          /**
+           * Local document updates get stored to the database and synced.
+           *
+           * These updates here originate from syncing remote updates.
+           * Applying these updates to YJS should not result in the `storeUpdate`
+           * handler creating a new `document_update` record. We mark the origin
+           */
+          Y.applyUpdateV2(doc, b64ToUint8Array(added.update_b64), origin);
         }
         if (!synced) {
           synced = true;
@@ -89,15 +92,19 @@ export class PowerSyncYjsProvider extends ObservableV2<PowerSyncYjsEvents> {
   }
 
   private async _storeUpdate(update: Uint8Array, origin: any) {
-    // update originated from elsewhere - save to the database
+    if (origin === this) {
+      // update originated from the database / PowerSync - ignore
+      return;
+    }
+
     await this.db.execute(
       /* sql */ `
         INSERT INTO
-          document_updates (id, document_id, update_b64, editor_id)
+          document_updates (id, document_id, update_b64)
         VALUES
-          (uuid (), ?, ?, ?)
+          (uuid (), ?, ?)
       `,
-      [this.documentId, Uint8ArrayTob64(update), this.id]
+      [this.documentId, Uint8ArrayTob64(update)]
     );
   }
 

demos/yjs-react-supabase-text-collab/supabase/functions/merge-document-updates/index.ts

@@ -55,8 +55,7 @@ Deno.serve(async (req) => {
     // insert the new merged update as new single update for the document
     const supabaseInsert = await supabase.from('document_updates').insert({
       document_id: document_id,
-      update_data: Uint8ArrayToHex(docState),
-      editor_id: 'merged_update'
+      update_data: Uint8ArrayToHex(docState)
     });
     if (supabaseInsert.error) {
       throw new Error(supabaseInsert.error);

demos/yjs-react-supabase-text-collab/supabase/migrations/20250618064101_configure_powersync.sql

@@ -10,8 +10,7 @@ CREATE TABLE document_updates(
   id UUID PRIMARY KEY DEFAULT gen_random_uuid(), 
   created_at timestamptz DEFAULT now(),
   document_id UUID, 
-  update_data BYTEA,
-  editor_id UUID
+  update_data BYTEA
 );
 
 
@@ -28,12 +27,11 @@ $$ LANGUAGE SQL;
 CREATE OR REPLACE FUNCTION insert_document_updates(batch TEXT)
 RETURNS VOID AS $$
 BEGIN
-    INSERT INTO document_updates (id, document_id, update_data, editor_id)
+    INSERT INTO document_updates (id, document_id, update_data)
     SELECT
       (elem->>'id')::UUID,
       (elem->>'document_id')::UUID,
-      decode(elem->>'update_b64', 'base64'),
-      (elem->>'editor_id')::UUID
+      decode(elem->>'update_b64', 'base64')
     FROM json_array_elements(batch::json) AS elem
     ON CONFLICT (id) DO NOTHING;
 END;

demos/yjs-react-supabase-text-collab/sync-rules.yaml

@@ -8,4 +8,4 @@ bucket_definitions:
     parameters: SELECT (request.parameters() ->> 'document_id') as document_id
     data:
       - SELECT * FROM documents WHERE id = bucket.document_id
-      - SELECT id, document_id, base64(update_data) as update_b64, editor_id FROM document_updates WHERE document_id = bucket.document_id
+      - SELECT id, document_id, base64(update_data) as update_b64 FROM document_updates WHERE document_id = bucket.document_id