@g9tm/syncdata 1.5.5 → 1.5.7

package/PARITY.md

@@ -44,6 +44,8 @@ it). This file maps every .NET piece to its twin and lists every deliberate diff
 | `IncarnationMarkerPath` | `incarnationMarker` (`fileIncarnationMarker(fileSystem, path)`) | any `G9FileSystem` (Lynx: the SignalR native module's) |
 | `ExportPendingChangesAsync(path)` | `exportPendingChanges(writeLine)` | the caller writes the lines where it wants |
 | `CheckIntegrityAsync` | `checkIntegrity()` | |
+| `KeepLostConflicts` (LES-0072) | `keepLostConflicts` | same SQL, same rejection row (code, lost columns, server values as JSON); `G9ApplyReport.conflictsKept`; `test/keepLostConflicts.test.ts` |
+| `SaveHelloAsync(hello, localMidpointUtc, ct)` (LES-0075) | `saveHello(hello, signal, localMidpointMs)` | the engine measures the Hello round trip in both clients and stores `serverTime - midpoint` |
 | `G9CSqliteException` (`IG9SyncLocalStoreFailure`) | `G9SqliteStoreError` (`localStoreFailure`) | classified from the driver's code |
 | `G9CSignalRSyncTransport`, options | `G9SignalRSyncTransport` (`@g9tm/syncdata/signalr`) | over `G9Client` of `@g9tm/signalr-supernetcore-client`; Lynx: `createLynxSyncTransport`. Limits (ADR-0074): `CallTimeout` / `PlanTimeout` / `PushTimeout` / `StreamIdleTimeout` = `callTimeoutMs` / `planTimeoutMs` / `pushTimeoutMs` / `streamIdleTimeoutMs`, same defaults, same retryable `G9S-NET-FAILURE`, same connection drop (`SignalRTimeoutTests` / `test/transportTimeouts.test.ts`) |
 | `G9CInMemorySyncTransport`, `G9CTransportFaults` | `G9FaultInjectingTransport`, `G9TransportFaults` (`@g9tm/syncdata/testing`) | wraps a real transport (no in-process server engine in JavaScript) |

package/dist/client/engine.js

@@ -468,16 +468,23 @@ export class G9SyncEngine {
                 await this._ensureConnected(ct);
                 await this._store.collectExpiredEphemeral(Date.now(), ct);
                 const subscriptions = await this._store.getSubscriptions(ct);
-                const hello = await this._withRetry((token) => this._transport.hello({
-                    clientId: this._clientId,
-                    appVersion: this._options.appVersion,
-                    protocolVersion: 1,
-                    tables: this.model.tables.map((t) => t.toWire()),
-                    subscriptions: subscriptions.map(toSubscriptionRef),
-                }, token), ct);
+                let helloMidpointMs = Date.now();
+                const hello = await this._withRetry(async (token) => {
+                    // The round trip of the attempt that answered: its midpoint is the local time of the server's clock reading (LES-0075).
+                    const sent = Date.now();
+                    const answer = await this._transport.hello({
+                        clientId: this._clientId,
+                        appVersion: this._options.appVersion,
+                        protocolVersion: 1,
+                        tables: this.model.tables.map((t) => t.toWire()),
+                        subscriptions: subscriptions.map(toSubscriptionRef),
+                    }, token);
+                    helloMidpointMs = sent + (Date.now() - sent) / 2;
+                    return answer;
+                }, ct);
                 if (hello.error)
                     throw syncErrorToException(hello.error);
-                await this._store.saveHello(hello, ct);
+                await this._store.saveHello(hello, ct, helloMidpointMs);
                 if (hello.unknownTables.length > 0) {
                     this._log('warning', 20016, 'The server does not know these client tables (they will not sync): ' + hello.unknownTables.join(', '));
                 }
@@ -871,7 +878,8 @@ export class G9SyncEngine {
             // What the server TOOK (its acknowledgement), not "sent minus refused": a row refused on the device (too large) is in
             // `rejected` but was never sent (LES-0071).
             accepted += report.accepted + report.commandsCompleted;
-            rejected += result.rejections.length;
+            // A conflict the device lost is kept on it as a rejection (LES-0072): refused work the operator must decide on.
+            rejected += result.rejections.length + report.conflictsKept;
             conflicts += result.conflicts.length;
             tracker.report(pushed);
             this._log('debug', 20014, `Pushed batch ${batch.batchId}: ${batch.rowCount} rows, ${result.rejections.length} rejected, ${result.conflicts.length} conflicts, replayed ${result.alreadyApplied}`);