obsidian-plugin/silvanocerza_github-gitless-sync
1
0
Fork 0
mirror of https://github.com/silvanocerza/github-gitless-sync.git synced 2026-07-22 12:10:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add retry to most requests made by SyncManager

Browse source
This commit is contained in:
Silvano Cerza 2025-04-17 12:57:03 +02:00
parent 53651f5b88
commit b6be53ca16
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/sync-manager.ts
View file

@ -146,10 +146,11 @@ export default class SyncManager {
path: `${this.vault.configDir}/${MANIFEST_FILE_NAME}`, path: `${this.vault.configDir}/${MANIFEST_FILE_NAME}`,
content: "", content: "",
message: "First sync", message: "First sync",
retry: true,
}); });
// Now get the repo content again cause we know for sure it will return a // Now get the repo content again cause we know for sure it will return a
// valid sha that we can use to create the first sync commit. // valid sha that we can use to create the first sync commit.
res = await this.client.getRepoContent(); res = await this.client.getRepoContent({ retry: true });
files = res.files; files = res.files;
treeSha = res.sha; treeSha = res.sha;
} }
@ -333,7 +334,9 @@ export default class SyncManager {
private async syncImpl() { private async syncImpl() {
await this.logger.info("Starting sync"); await this.logger.info("Starting sync");
const { files, sha: treeSha } = await this.client.getRepoContent(); const { files, sha: treeSha } = await this.client.getRepoContent({
retry: true,
});
const manifest = files[`${this.vault.configDir}/${MANIFEST_FILE_NAME}`]; const manifest = files[`${this.vault.configDir}/${MANIFEST_FILE_NAME}`];
if (manifest === undefined) { if (manifest === undefined) {
@ -539,6 +542,8 @@ export default class SyncManager {
await (async () => { await (async () => {
const res = await this.client.getBlob({ const res = await this.client.getBlob({
sha: filesMetadata[filePath].sha!, sha: filesMetadata[filePath].sha!,
retry: true,
maxRetries: 1,
}); });
return decodeBase64String(res.content); return decodeBase64String(res.content);
})(), })(),
@ -762,6 +767,8 @@ export default class SyncManager {
const buffer = await this.vault.adapter.readBinary(filePath); const buffer = await this.vault.adapter.readBinary(filePath);
const { sha } = await this.client.createBlob({ const { sha } = await this.client.createBlob({
content: arrayBufferToBase64(buffer), content: arrayBufferToBase64(buffer),
retry: true,
maxRetries: 3,
}); });
treeFiles[filePath].sha = sha; treeFiles[filePath].sha = sha;
// Can't have both sha and content set, so we delete it // Can't have both sha and content set, so we delete it
@ -782,9 +789,12 @@ export default class SyncManager {
), ),
base_tree: baseTreeSha, base_tree: baseTreeSha,
}; };
const newTreeSha = await this.client.createTree({ tree: newTree }); const newTreeSha = await this.client.createTree({
tree: newTree,
retry: true,
});
const branchHeadSha = await this.client.getBranchHeadSha(); const branchHeadSha = await this.client.getBranchHeadSha({ retry: true });
const commitSha = await this.client.createCommit({ const commitSha = await this.client.createCommit({
// TODO: Make this configurable or find a nicer commit message // TODO: Make this configurable or find a nicer commit message
@ -793,7 +803,7 @@ export default class SyncManager {
parent: branchHeadSha, parent: branchHeadSha,
}); });
await this.client.updateBranchHead({ sha: commitSha }); await this.client.updateBranchHead({ sha: commitSha, retry: true });
// Update the local content of all files that had conflicts we resolved // Update the local content of all files that had conflicts we resolved
await Promise.all( await Promise.all(
@ -820,7 +830,7 @@ export default class SyncManager {
// File already exists and has the same SHA, no need to download it again. // File already exists and has the same SHA, no need to download it again.
return; return;
} }
const blob = await this.client.getBlob({ sha: file.sha }); const blob = await this.client.getBlob({ sha: file.sha, retry: true });
const normalizedPath = normalizePath(file.path); const normalizedPath = normalizePath(file.path);
const fileFolder = normalizePath( const fileFolder = normalizePath(
normalizedPath.split("/").slice(0, -1).join("/"), normalizedPath.split("/").slice(0, -1).join("/"),