self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

All: Got clock sync to work on mobile

Browse Source
This commit is contained in:
Laurent Cozic 2020-09-09 12:25:31 +01:00
parent a014b9347e
commit b24d060281
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ReactNativeClient/lib/file-api-driver-dropbox.js
View File

@ -44,7 +44,7 @@ class FileApiDriverDropbox {
metadataToStat_(md, path) { metadataToStat_(md, path) {
const output = { const output = {
path: path, path: path,
updated_time: md.server_modified ? new Date(md.server_modified) : new Date(), updated_time: md.server_modified ? (new Date(md.server_modified)).getTime() : Date.now(),
isDir: md['.tag'] === 'folder', isDir: md['.tag'] === 'folder',
}; };

34
ReactNativeClient/lib/file-api.js
View File

@ -63,6 +63,31 @@ class FileApi {
this.remoteDateMutex_ = new Mutex(); this.remoteDateMutex_ = new Mutex();
} }
async fetchRemoteDateOffset_() {
const tempFile = `${this.tempDirName()}/timeCheck${Math.round(Math.random() * 1000000)}.txt`;
const startTime = Date.now();
await this.put(tempFile, 'timeCheck');
// Normally it should be possible to read the file back immediately but
// just in case, read it in a loop.
const loopStartTime = Date.now();
let stat = null;
while (Date.now() - loopStartTime < 5000) {
stat = await this.stat(tempFile);
if (stat) break;
await time.msleep(200);
}
if (!stat) throw new Error('Timed out trying to get sync target clock time');
this.delete(tempFile); // No need to await for this call
const endTime = Date.now();
const expectedTime = Math.round((endTime + startTime) / 2);
return stat.updated_time - expectedTime;
}
// Approximates the current time on the sync target. It caches the time offset to // Approximates the current time on the sync target. It caches the time offset to
// improve performance. // improve performance.
async remoteDate() { async remoteDate() {
@ -77,17 +102,10 @@ class FileApi {
// Another call might have refreshed the time while we were waiting for the mutex, // Another call might have refreshed the time while we were waiting for the mutex,
// so check again if we need to refresh. // so check again if we need to refresh.
if (shouldSyncTime()) { if (shouldSyncTime()) {
const tempFile = `${this.tempDirName()}/timeCheck${Math.random() * 10000}.txt`; this.remoteDateOffset_ = await this.fetchRemoteDateOffset_();
const startTime = Date.now();
await this.put(tempFile, 'timeCheck');
const stat = await this.stat(tempFile);
const endTime = Date.now();
const expectedTime = Math.round((endTime + startTime) / 2);
this.remoteDateOffset_ = stat.updated_time.getTime() - expectedTime;
// The sync target clock should rarely change but the device one might, // The sync target clock should rarely change but the device one might,
// so we need to refresh relatively frequently. // so we need to refresh relatively frequently.
this.remoteDateNextCheckTime_ = Date.now() + 10 * 60 * 1000; this.remoteDateNextCheckTime_ = Date.now() + 10 * 60 * 1000;
this.delete(tempFile); // No need to await for this call
} }
} catch (error) { } catch (error) {
this.logger().warn('Could not retrieve remote date - defaulting to device date:', error); this.logger().warn('Could not retrieve remote date - defaulting to device date:', error);