mirror of
https://github.com/RayLabsHQ/gitea-mirror.git
synced 2025-12-09 21:16:48 +03:00
Merge pull request #119 from RayLabsHQ/fix/duplicate-repos-issue-115
Fix/duplicate repos issue 115
This commit is contained in:
207
src/lib/gitea.ts
207
src/lib/gitea.ts
@@ -200,6 +200,96 @@ export const isRepoPresentInGitea = async ({
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Check if a repository is currently being mirrored (in-progress state in database)
|
||||||
|
* This prevents race conditions where multiple concurrent operations try to mirror the same repo
|
||||||
|
*/
|
||||||
|
export const isRepoCurrentlyMirroring = async ({
|
||||||
|
config,
|
||||||
|
repoName,
|
||||||
|
expectedLocation,
|
||||||
|
}: {
|
||||||
|
config: Partial<Config>;
|
||||||
|
repoName: string;
|
||||||
|
expectedLocation?: string; // Format: "owner/repo"
|
||||||
|
}): Promise<boolean> => {
|
||||||
|
try {
|
||||||
|
if (!config.userId) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const { or } = await import("drizzle-orm");
|
||||||
|
|
||||||
|
// Check database for any repository with "mirroring" or "syncing" status
|
||||||
|
const inProgressRepos = await db
|
||||||
|
.select()
|
||||||
|
.from(repositories)
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(repositories.userId, config.userId),
|
||||||
|
eq(repositories.name, repoName),
|
||||||
|
// Check for in-progress statuses
|
||||||
|
or(
|
||||||
|
eq(repositories.status, "mirroring"),
|
||||||
|
eq(repositories.status, "syncing")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
if (inProgressRepos.length > 0) {
|
||||||
|
// Check if any of the in-progress repos are stale (stuck for > 2 hours)
|
||||||
|
const TWO_HOURS_MS = 2 * 60 * 60 * 1000;
|
||||||
|
const now = new Date().getTime();
|
||||||
|
|
||||||
|
const activeRepos = inProgressRepos.filter((repo) => {
|
||||||
|
if (!repo.updatedAt) return true; // No timestamp, assume active
|
||||||
|
const updatedTime = new Date(repo.updatedAt).getTime();
|
||||||
|
const isStale = (now - updatedTime) > TWO_HOURS_MS;
|
||||||
|
|
||||||
|
if (isStale) {
|
||||||
|
console.warn(
|
||||||
|
`[Idempotency] Repository ${repo.name} has been in "${repo.status}" status for over 2 hours. ` +
|
||||||
|
`Considering it stale and allowing retry.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return !isStale;
|
||||||
|
});
|
||||||
|
|
||||||
|
if (activeRepos.length === 0) {
|
||||||
|
console.log(
|
||||||
|
`[Idempotency] All in-progress operations for ${repoName} are stale (>2h). Allowing retry.`
|
||||||
|
);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we have an expected location, verify it matches
|
||||||
|
if (expectedLocation) {
|
||||||
|
const matchingRepo = activeRepos.find(
|
||||||
|
(repo) => repo.mirroredLocation === expectedLocation
|
||||||
|
);
|
||||||
|
if (matchingRepo) {
|
||||||
|
console.log(
|
||||||
|
`[Idempotency] Repository ${repoName} is already being mirrored at ${expectedLocation}`
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log(
|
||||||
|
`[Idempotency] Repository ${repoName} is already being mirrored (${activeRepos.length} in-progress operations found)`
|
||||||
|
);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
} catch (error) {
|
||||||
|
console.error("Error checking if repo is currently mirroring:", error);
|
||||||
|
console.error("Error details:", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helper function to check if a repository exists in Gitea.
|
* Helper function to check if a repository exists in Gitea.
|
||||||
* First checks the recorded mirroredLocation, then falls back to the expected location.
|
* First checks the recorded mirroredLocation, then falls back to the expected location.
|
||||||
@@ -276,11 +366,11 @@ export const mirrorGithubRepoToGitea = async ({
|
|||||||
|
|
||||||
// Determine the actual repository name to use (handle duplicates for starred repos)
|
// Determine the actual repository name to use (handle duplicates for starred repos)
|
||||||
let targetRepoName = repository.name;
|
let targetRepoName = repository.name;
|
||||||
|
|
||||||
if (repository.isStarred && config.githubConfig) {
|
if (repository.isStarred && config.githubConfig) {
|
||||||
// Extract GitHub owner from full_name (format: owner/repo)
|
// Extract GitHub owner from full_name (format: owner/repo)
|
||||||
const githubOwner = repository.fullName.split('/')[0];
|
const githubOwner = repository.fullName.split('/')[0];
|
||||||
|
|
||||||
targetRepoName = await generateUniqueRepoName({
|
targetRepoName = await generateUniqueRepoName({
|
||||||
config,
|
config,
|
||||||
orgName: repoOwner,
|
orgName: repoOwner,
|
||||||
@@ -288,7 +378,7 @@ export const mirrorGithubRepoToGitea = async ({
|
|||||||
githubOwner,
|
githubOwner,
|
||||||
strategy: config.githubConfig.starredDuplicateStrategy,
|
strategy: config.githubConfig.starredDuplicateStrategy,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (targetRepoName !== repository.name) {
|
if (targetRepoName !== repository.name) {
|
||||||
console.log(
|
console.log(
|
||||||
`Starred repo ${repository.fullName} will be mirrored as ${repoOwner}/${targetRepoName} to avoid naming conflict`
|
`Starred repo ${repository.fullName} will be mirrored as ${repoOwner}/${targetRepoName} to avoid naming conflict`
|
||||||
@@ -296,6 +386,23 @@ export const mirrorGithubRepoToGitea = async ({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IDEMPOTENCY CHECK: Check if this repo is already being mirrored
|
||||||
|
const expectedLocation = `${repoOwner}/${targetRepoName}`;
|
||||||
|
const isCurrentlyMirroring = await isRepoCurrentlyMirroring({
|
||||||
|
config,
|
||||||
|
repoName: targetRepoName,
|
||||||
|
expectedLocation,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (isCurrentlyMirroring) {
|
||||||
|
console.log(
|
||||||
|
`[Idempotency] Skipping ${repository.fullName} - already being mirrored to ${expectedLocation}`
|
||||||
|
);
|
||||||
|
|
||||||
|
// Don't throw an error, just return to allow other repos to continue
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const isExisting = await isRepoPresentInGitea({
|
const isExisting = await isRepoPresentInGitea({
|
||||||
config,
|
config,
|
||||||
owner: repoOwner,
|
owner: repoOwner,
|
||||||
@@ -337,11 +444,30 @@ export const mirrorGithubRepoToGitea = async ({
|
|||||||
|
|
||||||
console.log(`Mirroring repository ${repository.name}`);
|
console.log(`Mirroring repository ${repository.name}`);
|
||||||
|
|
||||||
|
// DOUBLE-CHECK: Final idempotency check right before updating status
|
||||||
|
// This catches race conditions in the small window between first check and status update
|
||||||
|
const finalCheck = await isRepoCurrentlyMirroring({
|
||||||
|
config,
|
||||||
|
repoName: targetRepoName,
|
||||||
|
expectedLocation,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (finalCheck) {
|
||||||
|
console.log(
|
||||||
|
`[Idempotency] Race condition detected - ${repository.fullName} is now being mirrored by another process. Skipping.`
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Mark repos as "mirroring" in DB
|
// Mark repos as "mirroring" in DB
|
||||||
|
// CRITICAL: Set mirroredLocation NOW (not after success) so idempotency checks work
|
||||||
|
// This becomes the "target location" - where we intend to mirror to
|
||||||
|
// Without this, the idempotency check can't detect concurrent operations on first mirror
|
||||||
await db
|
await db
|
||||||
.update(repositories)
|
.update(repositories)
|
||||||
.set({
|
.set({
|
||||||
status: repoStatusEnum.parse("mirroring"),
|
status: repoStatusEnum.parse("mirroring"),
|
||||||
|
mirroredLocation: expectedLocation,
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
})
|
})
|
||||||
.where(eq(repositories.id, repository.id!));
|
.where(eq(repositories.id, repository.id!));
|
||||||
@@ -681,32 +807,32 @@ async function generateUniqueRepoName({
|
|||||||
strategy?: string;
|
strategy?: string;
|
||||||
}): Promise<string> {
|
}): Promise<string> {
|
||||||
const duplicateStrategy = strategy || "suffix";
|
const duplicateStrategy = strategy || "suffix";
|
||||||
|
|
||||||
// First check if base name is available
|
// First check if base name is available
|
||||||
const baseExists = await isRepoPresentInGitea({
|
const baseExists = await isRepoPresentInGitea({
|
||||||
config,
|
config,
|
||||||
owner: orgName,
|
owner: orgName,
|
||||||
repoName: baseName,
|
repoName: baseName,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!baseExists) {
|
if (!baseExists) {
|
||||||
return baseName;
|
return baseName;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate name based on strategy
|
// Generate name based on strategy
|
||||||
let candidateName: string;
|
let candidateName: string;
|
||||||
let attempt = 0;
|
let attempt = 0;
|
||||||
const maxAttempts = 10;
|
const maxAttempts = 10;
|
||||||
|
|
||||||
while (attempt < maxAttempts) {
|
while (attempt < maxAttempts) {
|
||||||
switch (duplicateStrategy) {
|
switch (duplicateStrategy) {
|
||||||
case "prefix":
|
case "prefix":
|
||||||
// Prefix with owner: owner-reponame
|
// Prefix with owner: owner-reponame
|
||||||
candidateName = attempt === 0
|
candidateName = attempt === 0
|
||||||
? `${githubOwner}-${baseName}`
|
? `${githubOwner}-${baseName}`
|
||||||
: `${githubOwner}-${baseName}-${attempt}`;
|
: `${githubOwner}-${baseName}-${attempt}`;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "owner-org":
|
case "owner-org":
|
||||||
// This would require creating sub-organizations, not supported in this PR
|
// This would require creating sub-organizations, not supported in this PR
|
||||||
// Fall back to suffix strategy
|
// Fall back to suffix strategy
|
||||||
@@ -718,24 +844,31 @@ async function generateUniqueRepoName({
|
|||||||
: `${baseName}-${githubOwner}-${attempt}`;
|
: `${baseName}-${githubOwner}-${attempt}`;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
const exists = await isRepoPresentInGitea({
|
const exists = await isRepoPresentInGitea({
|
||||||
config,
|
config,
|
||||||
owner: orgName,
|
owner: orgName,
|
||||||
repoName: candidateName,
|
repoName: candidateName,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!exists) {
|
if (!exists) {
|
||||||
console.log(`Found unique name for duplicate starred repo: ${candidateName}`);
|
console.log(`Found unique name for duplicate starred repo: ${candidateName}`);
|
||||||
return candidateName;
|
return candidateName;
|
||||||
}
|
}
|
||||||
|
|
||||||
attempt++;
|
attempt++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If all attempts failed, use timestamp as last resort
|
// SECURITY FIX: Prevent infinite duplicate creation
|
||||||
const timestamp = Date.now();
|
// Instead of falling back to timestamp (which creates infinite duplicates),
|
||||||
return `${baseName}-${githubOwner}-${timestamp}`;
|
// throw an error to prevent hundreds of duplicate repos
|
||||||
|
console.error(`Failed to find unique name for ${baseName} after ${maxAttempts} attempts`);
|
||||||
|
console.error(`Organization: ${orgName}, GitHub Owner: ${githubOwner}, Strategy: ${duplicateStrategy}`);
|
||||||
|
throw new Error(
|
||||||
|
`Unable to generate unique repository name for "${baseName}". ` +
|
||||||
|
`All ${maxAttempts} naming attempts resulted in conflicts. ` +
|
||||||
|
`Please manually resolve the naming conflict or adjust your duplicate strategy.`
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function mirrorGitHubRepoToGiteaOrg({
|
export async function mirrorGitHubRepoToGiteaOrg({
|
||||||
@@ -765,11 +898,11 @@ export async function mirrorGitHubRepoToGiteaOrg({
|
|||||||
|
|
||||||
// Determine the actual repository name to use (handle duplicates for starred repos)
|
// Determine the actual repository name to use (handle duplicates for starred repos)
|
||||||
let targetRepoName = repository.name;
|
let targetRepoName = repository.name;
|
||||||
|
|
||||||
if (repository.isStarred && config.githubConfig) {
|
if (repository.isStarred && config.githubConfig) {
|
||||||
// Extract GitHub owner from full_name (format: owner/repo)
|
// Extract GitHub owner from full_name (format: owner/repo)
|
||||||
const githubOwner = repository.fullName.split('/')[0];
|
const githubOwner = repository.fullName.split('/')[0];
|
||||||
|
|
||||||
targetRepoName = await generateUniqueRepoName({
|
targetRepoName = await generateUniqueRepoName({
|
||||||
config,
|
config,
|
||||||
orgName,
|
orgName,
|
||||||
@@ -777,7 +910,7 @@ export async function mirrorGitHubRepoToGiteaOrg({
|
|||||||
githubOwner,
|
githubOwner,
|
||||||
strategy: config.githubConfig.starredDuplicateStrategy,
|
strategy: config.githubConfig.starredDuplicateStrategy,
|
||||||
});
|
});
|
||||||
|
|
||||||
if (targetRepoName !== repository.name) {
|
if (targetRepoName !== repository.name) {
|
||||||
console.log(
|
console.log(
|
||||||
`Starred repo ${repository.fullName} will be mirrored as ${orgName}/${targetRepoName} to avoid naming conflict`
|
`Starred repo ${repository.fullName} will be mirrored as ${orgName}/${targetRepoName} to avoid naming conflict`
|
||||||
@@ -785,6 +918,23 @@ export async function mirrorGitHubRepoToGiteaOrg({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IDEMPOTENCY CHECK: Check if this repo is already being mirrored
|
||||||
|
const expectedLocation = `${orgName}/${targetRepoName}`;
|
||||||
|
const isCurrentlyMirroring = await isRepoCurrentlyMirroring({
|
||||||
|
config,
|
||||||
|
repoName: targetRepoName,
|
||||||
|
expectedLocation,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (isCurrentlyMirroring) {
|
||||||
|
console.log(
|
||||||
|
`[Idempotency] Skipping ${repository.fullName} - already being mirrored to ${expectedLocation}`
|
||||||
|
);
|
||||||
|
|
||||||
|
// Don't throw an error, just return to allow other repos to continue
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const isExisting = await isRepoPresentInGitea({
|
const isExisting = await isRepoPresentInGitea({
|
||||||
config,
|
config,
|
||||||
owner: orgName,
|
owner: orgName,
|
||||||
@@ -831,11 +981,30 @@ export async function mirrorGitHubRepoToGiteaOrg({
|
|||||||
// Use clean clone URL without embedded credentials (Forgejo 12+ security requirement)
|
// Use clean clone URL without embedded credentials (Forgejo 12+ security requirement)
|
||||||
const cloneAddress = repository.cloneUrl;
|
const cloneAddress = repository.cloneUrl;
|
||||||
|
|
||||||
|
// DOUBLE-CHECK: Final idempotency check right before updating status
|
||||||
|
// This catches race conditions in the small window between first check and status update
|
||||||
|
const finalCheck = await isRepoCurrentlyMirroring({
|
||||||
|
config,
|
||||||
|
repoName: targetRepoName,
|
||||||
|
expectedLocation,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (finalCheck) {
|
||||||
|
console.log(
|
||||||
|
`[Idempotency] Race condition detected - ${repository.fullName} is now being mirrored by another process. Skipping.`
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Mark repos as "mirroring" in DB
|
// Mark repos as "mirroring" in DB
|
||||||
|
// CRITICAL: Set mirroredLocation NOW (not after success) so idempotency checks work
|
||||||
|
// This becomes the "target location" - where we intend to mirror to
|
||||||
|
// Without this, the idempotency check can't detect concurrent operations on first mirror
|
||||||
await db
|
await db
|
||||||
.update(repositories)
|
.update(repositories)
|
||||||
.set({
|
.set({
|
||||||
status: repoStatusEnum.parse("mirroring"),
|
status: repoStatusEnum.parse("mirroring"),
|
||||||
|
mirroredLocation: expectedLocation,
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
})
|
})
|
||||||
.where(eq(repositories.id, repository.id!));
|
.where(eq(repositories.id, repository.id!));
|
||||||
|
|||||||
Reference in New Issue
Block a user