feat: 🎸 synchronize SESSION.GLOBAL patches

Author: streamich

package.json

@@ -74,7 +74,7 @@
     "@jsonjoy.com/jit-router": "^1.0.1",
     "@jsonjoy.com/json-pack": "^1.0.2",
     "@jsonjoy.com/util": "^1.0.0",
-    "json-joy": "^15.4.1",
+    "json-joy": "^15.8.0",
     "memfs": "^5.0.0-next.1",
     "sonic-forest": "^1.0.0",
     "thingies": "^2.1.0"

src/json-crdt-repo/local/server-crud/ServerCrudLocalHistory.ts

@@ -20,7 +20,7 @@ export class ServerCrudLocalHistory implements LocalHistory {
 
   public async create(
     collection: string[],
-    log: Log,
+    log: Log<any>,
     id: string = genId(),
   ): Promise<{id: string; remote: Promise<void>}> {
     if (log.end.clock.time <= 1) throw new Error('EMPTY_LOG');

src/json-crdt-repo/local/server-crud/ServerCrudLocalHistorySync.ts

@@ -2,6 +2,7 @@ import {timeout} from 'thingies/lib/timeout';
 import type {RemoteBlockPatch} from '../../remote/types';
 import type {ServerCrudLocalHistoryCore} from './ServerCrudLocalHistoryCore';
 import type {BlockSyncMetadata} from './types';
+import {SESSION} from 'json-joy/lib/json-crdt-patch/constants';
 
 const SYNC_FILE_NAME = 'sync.cbor';
 
@@ -58,8 +59,7 @@ export class ServerCrudLocalHistorySync {
           history!.patches.forEach(({v: patch}) => {
             const id = patch.getId();
             if (!id) return;
-            // TODO: also filter in SESSION.GLOBAL patches.
-            if (id.sid === core.sid && id.time > meta.time) {
+            if ((id.sid === core.sid || (id.sid === SESSION.GLOBAL)) && id.time > meta.time) {
               patches.push({blob: patch.toBinary()});
               time = id.time;
             }

src/json-crdt-repo/local/server-crud/__tests__/ServerCrudLocalHistory.spec.ts

@@ -3,11 +3,12 @@ import {memfs} from 'memfs';
 import {NodeCrud} from 'memfs/lib/node-to-crud';
 import {toTreeSync} from 'memfs/lib/print';
 import {Locks} from 'thingies/lib/Locks';
-import {Model} from 'json-joy/lib/json-crdt';
+import {Model, nodes, s} from 'json-joy/lib/json-crdt';
 import {Log} from 'json-joy/lib/json-crdt/log/Log';
 import {BehaviorSubject} from 'rxjs';
 import {setup as remoteSetup} from '../../../remote/__tests__/setup';
 import {tick} from 'thingies';
+import {SESSION} from 'json-joy/lib/json-crdt-patch/constants';
 
 const setup = async (
   opts: {
@@ -92,6 +93,26 @@ describe('.create()', () => {
     expect(isDirty).toBe(false);
   });
 
+  test('sends over SESSION.GLOBAL patches', async () => {
+    const kit = await setup();
+    const schema = s.obj({
+      foo: s.str('bar'),
+      arr: s.arr<nodes.val<nodes.con<number>>>([]),
+    });
+    const log = Log.fromNewModel(Model.withLogicalClock(kit.sid).setSchema(schema));
+    log.end.api.r.get().get('foo').ins(3, '!');
+    log.end.api.flush();
+    const res = await kit.local.create(['my', 'col'], log, kit.id);
+    await res.remote;
+    const {block} = await kit.remote.remote.read(['my', 'col', kit.id].join('/'));
+    const model2 = Model
+      .fromBinary(block.snapshot.blob)
+      .setSchema(schema)
+      .fork(kit.sid);
+    expect(model2.view()).toEqual({foo: 'bar!', arr: []});
+    expect(model2.clock.peers.has(SESSION.GLOBAL)).toBe(true);
+  });
+
   describe('when not connected', () => {
     const setupNotConnected = () =>
       setup({

yarn.lock

@@ -1926,18 +1926,18 @@ jsesc@^2.5.1:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
-json-joy@^15.4.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/json-joy/-/json-joy-15.4.1.tgz#dc57284782213502057c456b828771b8fc855c0c"
-  integrity sha512-o2x8ave2Si0aoamm7Jg3eX7zjOmtFBzJaS8B/j13FTQDjh7EEbngRGv+Gh15p6C7IirXlgdTO09+nIAYeBz1DA==
+json-joy@^15.8.0:
+  version "15.8.0"
+  resolved "https://registry.yarnpkg.com/json-joy/-/json-joy-15.8.0.tgz#423b64501abaaaf20b2ad9f3e826cf55d52d9c5a"
+  integrity sha512-NzFvF7qA3Dv9Gv6rrSg3f18CNjrbVtVzGxui4vP4OJZvQmT6glJEKXkK2exB7if8Npw2Um+9FyEoexcpPSLbjg==
   dependencies:
     "@jsonjoy.com/base64" "^1.1.1"
     "@jsonjoy.com/json-pack" "^1.0.2"
-    "@jsonjoy.com/util" "^1.0.0"
+    "@jsonjoy.com/util" "^1.1.0"
     arg "^5.0.2"
     hyperdyperid "^1.2.0"
     sonic-forest "^1.0.0"
-    thingies "^1.20.0"
+    thingies "^2.0.0"
 
 json-parse-even-better-errors@^2.3.0:
   version "2.3.1"
@@ -2506,7 +2506,7 @@ thingies@^1.20.0:
   resolved "https://registry.yarnpkg.com/thingies/-/thingies-1.20.0.tgz#27bf93397c39c3ff36601197e8cf78f43b7b2319"
   integrity sha512-WvXY4CjHp/Uim2Ri0daqu6jkNTHJTk1H8NvuMQiOL0mgtdkqoSH5fkENy2M6XnvsLOp5iwyPcbmokoBjVb4lnQ==
 
-thingies@^2.1.0:
+thingies@^2.0.0, thingies@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/thingies/-/thingies-2.1.0.tgz#e0f771d5bc42e147fe9518be48f667319e748e25"
   integrity sha512-SASxQdAtapX03qTa1V/kt9UGhQLUoP54luRasJxZoleeAL+PSQsBlIAGNxj1FoayglyCGUhxByFgSn7dh2JFog==