Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-21 22:19:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: send progress events during sync

Browse Source
This commit is contained in:
thecodrr
2022-02-08 15:09:39 +05:00
parent bb675e9da2
commit fb0c30ecca
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/api/sync/index.js
View File

@@ -31,6 +31,7 @@ import {
EV,
EVENTS,
sendAttachmentsProgressEvent,
sendSyncProgressEvent,
} from "../../common";
import Constants from "../../utils/constants";
import http from "../../utils/http";
@@ -60,10 +61,11 @@ export default class Sync {
accessTokenFactory: () => this._db.user.tokenManager.getAccessToken(),
})
.build();
this._connection.on("SyncItem", async (type, item) => {
this._connection.on("SyncItem", async (type, item, current, total) => {
this.stopAutoSync();
await this._realtimeMerger.mergeItem(type, JSON.parse(item));
EV.publish(EVENTS.appRefreshRequested);
sendSyncProgressEvent("download", total, current);
await this.startAutoSync();
});
@@ -221,7 +223,9 @@ export default class Sync {
await this._connection.send("FetchItems", lastSynced);
// TODO progress
var serverResponse = await new Promise((resolve) => {
this._connection.on("SyncCompleted", (result) => resolve(result));
this._connection.on("SyncCompleted", (synced, lastSynced) =>
resolve({ synced, lastSynced })
);
});
await this._db.conflicts.check();
@@ -330,6 +334,7 @@ export default class Sync {
}
async sendItemsToServer(type, array, dateSynced) {
let index = 0;
for (const item of array) {
if (!item) return;
const result = await this._connection.invoke(
@@ -339,6 +344,7 @@ export default class Sync {
dateSynced
);
if (result !== 1) throw new Error(`Failed to sync item: ${item.id}.`);
sendSyncProgressEvent("upload", array.length, ++index);
}
}
}