fix: speed up sync

Author: akdasa

lib/SyncAggregate.ts

@@ -8,9 +8,9 @@ export interface Syncable {
   version: string
 
   /**
-   * Timestamp of the last sync.
+   * Timestamp of the last modification.
    */
-  syncedAt: number
+  modifiedAt: number
 }
 
 /**

lib/SyncRepository.ts

@@ -55,7 +55,7 @@ export class SyncRepository<
     if (saveOptions.updateVersion) {
       entity.version = options?.version || saveOptions.versionGenerator(entity)
     }
-    entity.syncedAt = saveOptions.syncedAt || new Date().getTime()
+    entity.modifiedAt = saveOptions.syncedAt || new Date().getTime()
     return this.repo.save(entity)
   }
 

lib/SyncService.ts

@@ -1,4 +1,4 @@
-import { AnyIdentity, Query, Logger, Logs, LogTransport, LogRecord } from '@akdasa-studios/framework'
+import { AnyIdentity, Query, Logger } from '@akdasa-studios/framework'
 import { SyncAggregate } from '@lib/SyncAggregate'
 import { SyncRepository } from '@lib/SyncRepository'
 import { SyncConflictSolver } from '@lib/SyncConflictSolver'
@@ -120,30 +120,26 @@ export class SyncService<
 
       for (const sourceEntity of findResult.entities) {
         let targetEntity: TAggregate|undefined = undefined
-        try { targetEntity = await target.get(sourceEntity.id) } catch { /** pass */}
+        try { targetEntity = await target.get(sourceEntity.id) } catch { /** pass **/ }
+
         if (!targetEntity) {
-          this.logger.debug(`${sourceEntity.id.value}: no at target`)
           repResult.aggregatesSynced++
+          this.logger.debug(`${sourceEntity.id.value}: no at target`)
           await target.save(this.makeCopy(sourceEntity), repOptions)
-          await source.save(sourceEntity, repOptions)
-        } else {
-          if (sourceEntity.version !== targetEntity.version) {
-            repResult.aggregatesSynced++
-            const winner = this.conflictSolver.solve(sourceEntity, targetEntity)
-            if (winner === sourceEntity) {
-              this.logger.debug(`${sourceEntity.id}: source won`)
-              await target.save(this.makeCopy(sourceEntity), repOptions)
-              await source.save(sourceEntity, repOptions)
-            } else {
-              this.logger.debug(`${sourceEntity.id}: target won`)
-              await source.save(this.makeCopy(targetEntity), repOptions)
-              await target.save(targetEntity, repOptions)
-            }
+        } else if (sourceEntity.version !== targetEntity.version) {
+          repResult.aggregatesSynced++
+          const winner = this.conflictSolver.solve(sourceEntity, targetEntity)
+          if (winner === sourceEntity) {
+            this.logger.debug(`${sourceEntity.id}: source won`)
+            await target.save(this.makeCopy(sourceEntity), repOptions)
+          } else {
+            this.logger.debug(`${sourceEntity.id}: target won`)
+            await source.save(this.makeCopy(targetEntity), repOptions)
           }
         }
       }
 
-      console.groupEnd()
+      this.logger.endGroup()
     }
     return repResult
   }

lib/queries/sync.ts

@@ -13,9 +13,9 @@ export function syncedAfter(
   const queryBuilder = new QueryBuilder<SyncAggregate<AnyIdentity>>()
   return queryBuilder.or(
     queryBuilder.or(
-      queryBuilder.eq('syncedAt', undefined),
-      queryBuilder.eq('syncedAt', 0),
+      queryBuilder.eq('modifiedAt', undefined),
+      queryBuilder.eq('modifiedAt', 0),
     ),
-    queryBuilder.gt('syncedAt', from),
+    queryBuilder.gt('modifiedAt', from),
   )
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@akdasa-studios/framework-sync",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Template",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package.json

@@ -150,16 +150,16 @@ describe('SyncService', () => {
      */
     it('syncedAt are equal for both entities', async () => {
       // act:
-      await repoARaw.save(row1)
+      await repoA.save(row1)
       await service.sync(repoA, repoB)
 
       // assert:
       const row1FromA = await repoARaw.get(row1.id)
       const row1FromB = await repoBRaw.get(row1.id)
 
-      expect(row1FromA.syncedAt === row1FromB.syncedAt).toBeTrue()
-      expect(row1FromA.syncedAt !== 0).toBeTrue()
-      expect(row1FromA.syncedAt).toBeDefined()
+      expect(row1FromA.modifiedAt === row1FromB.modifiedAt).toBeTrue()
+      expect(row1FromA.modifiedAt !== 0).toBeTrue()
+      expect(row1FromA.modifiedAt).toBeDefined()
 
     })
 

tests/SyncService.spec.ts

@@ -11,7 +11,7 @@ export class Row extends Aggregate<RowId> implements Syncable {
     this.text = text
   }
   version: string
-  syncedAt: number
+  modifiedAt: number
   text: string
 }