feat(sync): initialize @blocksuite/sync

.commitlintrc.json

@@ -9,6 +9,7 @@
         "edgeless",
         "database",
         "store",
+        "sync",
         "std",
         "presets",
         "playground",

package.json

@@ -8,6 +8,7 @@
     "packages/framework/inline",
     "packages/framework/lit",
     "packages/framework/store",
+    "packages/framework/sync",
     "packages/blocks",
     "packages/docs",
     "packages/playground",

packages/blocks/src/_common/configs/quick-action/config.ts

@@ -125,58 +125,56 @@ export const quickActionConfig: QuickActionConfig[] = [
 
       const page = host.page;
       const linkedPage = page.workspace.createPage({});
-      linkedPage
-        .load(() => {
-          const pageBlockId = linkedPage.addBlock('affine:page', {
-            title: new page.Text(''),
+      linkedPage.load(() => {
+        const pageBlockId = linkedPage.addBlock('affine:page', {
+          title: new page.Text(''),
+        });
+        linkedPage.addBlock('affine:surface', {}, pageBlockId);
+        const noteId = linkedPage.addBlock('affine:note', {}, pageBlockId);
+
+        const firstBlock = selectedModels[0];
+        assertExists(firstBlock);
+
+        page.addSiblingBlocks(
+          firstBlock,
+          [
+            {
+              flavour: 'affine:embed-linked-doc',
+              pageId: linkedPage.id,
+            },
+          ],
+          'before'
+        );
+
+        if (
+          matchFlavours(firstBlock, ['affine:paragraph']) &&
+          firstBlock.type.match(/^h[1-6]$/)
+        ) {
+          const title = firstBlock.text.toString();
+          linkedPage.workspace.setPageMeta(linkedPage.id, {
+            title,
           });
-          linkedPage.addBlock('affine:surface', {}, pageBlockId);
-          const noteId = linkedPage.addBlock('affine:note', {}, pageBlockId);
-
-          const firstBlock = selectedModels[0];
-          assertExists(firstBlock);
-
-          page.addSiblingBlocks(
-            firstBlock,
-            [
-              {
-                flavour: 'affine:embed-linked-doc',
-                pageId: linkedPage.id,
-              },
-            ],
-            'before'
-          );
 
-          if (
-            matchFlavours(firstBlock, ['affine:paragraph']) &&
-            firstBlock.type.match(/^h[1-6]$/)
-          ) {
-            const title = firstBlock.text.toString();
-            linkedPage.workspace.setPageMeta(linkedPage.id, {
-              title,
-            });
-
-            const pageBlock = linkedPage.getBlockById(pageBlockId);
-            assertExists(pageBlock);
-            linkedPage.updateBlock(pageBlock, {
-              title: new page.Text(title),
-            });
-
-            page.deleteBlock(firstBlock);
-            selectedModels.shift();
-          }
-
-          selectedModels.forEach(model => {
-            const keys = model.keys as (keyof typeof model)[];
-            const values = keys.map(key => model[key]);
-            const blockProps = Object.fromEntries(
-              keys.map((key, i) => [key, values[i]])
-            );
-            linkedPage.addBlock(model.flavour, blockProps, noteId);
-            page.deleteBlock(model);
+          const pageBlock = linkedPage.getBlockById(pageBlockId);
+          assertExists(pageBlock);
+          linkedPage.updateBlock(pageBlock, {
+            title: new page.Text(title),
           });
-        })
-        .catch(console.error);
+
+          page.deleteBlock(firstBlock);
+          selectedModels.shift();
+        }
+
+        selectedModels.forEach(model => {
+          const keys = model.keys as (keyof typeof model)[];
+          const values = keys.map(key => model[key]);
+          const blockProps = Object.fromEntries(
+            keys.map((key, i) => [key, values[i]])
+          );
+          linkedPage.addBlock(model.flavour, blockProps, noteId);
+          page.deleteBlock(model);
+        });
+      });
 
       const linkedDocService = host.spec.getService(
         'affine:embed-linked-doc'

packages/blocks/src/_common/utils/init.ts

@@ -6,21 +6,20 @@ export async function createDefaultPage(
 ) {
   const page = workspace.createPage({ id: options.id });
 
-  await page.load(() => {
-    const title = options.title ?? '';
-    const pageBlockId = page.addBlock('affine:page', {
-      title: new page.Text(title),
-    });
-    workspace.setPageMeta(page.id, {
-      title,
-    });
-    page.addBlock('affine:surface', {}, pageBlockId);
-    const noteId = page.addBlock('affine:note', {}, pageBlockId);
-    page.addBlock('affine:paragraph', {}, noteId);
-    // To make sure the content of new page would not be clear
-    // By undo operation for the first time
-    page.resetHistory();
+  page.load();
+  const title = options.title ?? '';
+  const pageBlockId = page.addBlock('affine:page', {
+    title: new page.Text(title),
   });
+  workspace.setPageMeta(page.id, {
+    title,
+  });
+  page.addBlock('affine:surface', {}, pageBlockId);
+  const noteId = page.addBlock('affine:note', {}, pageBlockId);
+  page.addBlock('affine:paragraph', {}, noteId);
+  // To make sure the content of new page would not be clear
+  // By undo operation for the first time
+  page.resetHistory();
 
   return page;
 }

packages/blocks/src/embed-linked-doc-block/embed-linked-doc-block.ts

@@ -112,16 +112,12 @@ export class EmbedLinkedDocBlockComponent extends EmbedBlockElement<
     this._pageUpdatedAt = this._pageService.getPageUpdatedAt(this.model.pageId);
 
     if (!linkedDoc.loaded) {
-      await new Promise<void>(resolve => {
-        linkedDoc
-          .load()
-          .then(() => resolve())
-          .catch(e => {
-            console.error(e);
-            this.isError = true;
-            resolve();
-          });
-      });
+      try {
+        linkedDoc.load();
+      } catch (e) {
+        console.error(e);
+        this.isError = true;
+      }
     }
 
     if (!this.isError && !linkedDoc.root) {

packages/blocks/src/embed-synced-doc-block/embed-synced-doc-block.ts

@@ -178,16 +178,12 @@ export class EmbedSyncedDocBlockComponent extends EmbedBlockElement<
     this._pageUpdatedAt = this._pageService.getPageUpdatedAt(this.model.pageId);
 
     if (!syncedDoc.loaded) {
-      await new Promise<void>(resolve => {
-        syncedDoc
-          .load()
-          .then(() => resolve())
-          .catch(e => {
-            console.error(e);
-            this._error = true;
-            resolve();
-          });
-      });
+      try {
+        syncedDoc.load();
+      } catch (e) {
+        console.error(e);
+        this._error = true;
+      }
     }
 
     if (!this._error && !syncedDoc.root) {

packages/framework/global/src/utils/index.ts

@@ -1,5 +1,6 @@
 export * from './assert.js';
 export * from './disposable.js';
 export * from './function.js';
+export * from './logger.js';
 export * from './slot.js';
 export * from './types.js';

packages/framework/global/src/utils/logger.ts

@@ -0,0 +1,28 @@
+export interface Logger {
+  debug: (message: string, ...args: unknown[]) => void;
+  info: (message: string, ...args: unknown[]) => void;
+  warn: (message: string, ...args: unknown[]) => void;
+  error: (message: string, ...args: unknown[]) => void;
+}
+
+export class ConsoleLogger implements Logger {
+  debug(message: string, ...args: unknown[]) {
+    console.debug(message, ...args);
+  }
+  info(message: string, ...args: unknown[]) {
+    console.info(message, ...args);
+  }
+  warn(message: string, ...args: unknown[]) {
+    console.warn(message, ...args);
+  }
+  error(message: string, ...args: unknown[]) {
+    console.error(message, ...args);
+  }
+}
+
+export class NoopLogger implements Logger {
+  debug() {}
+  info() {}
+  warn() {}
+  error() {}
+}

packages/framework/store/package.json

@@ -17,6 +17,7 @@
   "dependencies": {
     "@blocksuite/global": "workspace:*",
     "@blocksuite/inline": "workspace:*",
+    "@blocksuite/sync": "workspace:*",
     "@types/flexsearch": "^0.7.6",
     "flexsearch": "0.7.43",
     "idb-keyval": "^6.2.1",
@@ -28,12 +29,10 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
-    "async-call-rpc": "^6.3.1",
     "lit": "^3.1.1",
     "yjs": "^13.6.11"
   },
   "peerDependencies": {
-    "async-call-rpc": "^6",
     "yjs": "^13"
   },
   "exports": {

packages/framework/store/src/workspace/page.ts

@@ -636,16 +636,25 @@ export class Page extends Space<FlatBlockMap> {
     });
   }
 
-  override async load(initFn?: () => Promise<void> | void) {
+  override load(initFn?: () => void): this {
     if (this.ready) {
-      throw new Error('Cannot load page more than once');
+      return this;
     }
 
-    await super.load();
-    this._trySyncFromExistingDoc();
+    super.load();
+
+    if ((this.workspace.meta.pages?.length ?? 0) <= 1) {
+      this._handleVersion();
+    }
+
+    this._initYBlocks();
+
+    this._yBlocks.forEach((_, id) => {
+      this._handleYBlockAdd(id);
+    });
 
     if (initFn) {
-      await initFn();
+      initFn();
     }
 
     this._ready = true;
@@ -792,22 +801,6 @@ export class Page extends Space<FlatBlockMap> {
     }
   }
 
-  private _trySyncFromExistingDoc() {
-    if (this.ready) {
-      throw new Error('Cannot sync from existing doc more than once');
-    }
-
-    if ((this.workspace.meta.pages?.length ?? 0) <= 1) {
-      this._handleVersion();
-    }
-
-    this._initYBlocks();
-
-    this._yBlocks.forEach((_, id) => {
-      this._handleYBlockAdd(id);
-    });
-  }
-
   /** @deprecated use page.load() instead */
   async waitForLoaded() {
     await this.load();

packages/framework/store/src/workspace/space.ts

@@ -54,21 +54,9 @@ export class Space<
     return this._ySpaceDoc;
   }
 
-  async load() {
-    if (this.loaded) {
-      return this;
-    }
-
-    const promise = new Promise(resolve => {
-      this._onLoadSlot.once(() => {
-        resolve(undefined);
-      });
-    });
-
+  load() {
     this._ySpaceDoc.load();
 
-    await promise;
-
     return this;
   }