feat(adaptors): upgrade flock to 4.1.0 and use inclusiveVersion for sync check (#45)

- Update @loro-dev/flock peerDependency to ^4.1.0 in loro-adaptors
- Update @loro-dev/flock devDependency to ^4.1.0 in loro-websocket
- Use flock.version() for encoding (sending to server)
- Use flock.inclusiveVersion() for waitForReachingServerVersion check

The inclusiveVersion() includes all peers ever seen, making it correct
for checking if we have received all data from the server, while
version() only includes peers with current entries, which is correct
for incremental sync.

Co-authored-by: lody <agent@lody.ai>

Author: lodyai[bot]

packages/loro-adaptors/package.json

@@ -15,7 +15,7 @@
     "loro-protocol": "workspace:*"
   },
   "peerDependencies": {
-    "@loro-dev/flock": "^4.0.0",
+    "@loro-dev/flock": "^4.1.0",
     "loro-crdt": "^1.9.0",
     "yjs": "*"
   },

packages/loro-adaptors/src/flock-adaptor.ts

@@ -155,7 +155,7 @@ export class FlockAdaptor implements CrdtDocAdaptor {
     try {
       const serverVersion = decodeVersionVector(res.version);
       this.initServerVersion = serverVersion;
-      const comparison = compareVersions(this.flock.version(), serverVersion);
+      const comparison = compareVersions(this.flock.inclusiveVersion(), serverVersion);
       if (comparison != null && comparison >= 0) {
         this.markReachedServerVersion();
       }
@@ -195,7 +195,7 @@ export class FlockAdaptor implements CrdtDocAdaptor {
     this.lastExportVersion = (this.flock.version());
     if (this.initServerVersion && !this.hasReachedServerVersion) {
       const comparison = compareVersions(
-        this.flock.version(),
+        this.flock.inclusiveVersion(),
         this.initServerVersion
       );
       if (comparison != null && comparison >= 0) {

packages/loro-websocket/package.json

@@ -72,7 +72,7 @@
     "ws": "^8.18.3"
   },
   "devDependencies": {
-    "@loro-dev/flock": "^4.0.0",
+    "@loro-dev/flock": "^4.1.0",
     "get-port": "^7.1.0",
     "tsdown": "^0.14.1",
     "tsx": "^4.20.5",