diff --git a/src/components/RepoCard.svelte b/src/components/RepoCard.svelte
index 894319fe0..0a9ef54c5 100644
--- a/src/components/RepoCard.svelte
+++ b/src/components/RepoCard.svelte
@@ -156,11 +156,13 @@
-
+ {#await repoInfo.activity then activity}
+
+ {/await}
diff --git a/src/components/RepoCard.ts b/src/components/RepoCard.ts
index 4edd2ce80..4cdb98a8e 100644
--- a/src/components/RepoCard.ts
+++ b/src/components/RepoCard.ts
@@ -6,13 +6,14 @@ import { HttpdClient } from "@http-client";
export interface RepoInfo {
repo: Repo;
baseUrl: BaseUrl;
- activity: WeeklyActivity[];
+ activity: Promise;
}
export async function fetchRepoInfos(
baseUrl: BaseUrl,
query?: RepoListQuery,
delegate?: string,
+ activitySignal?: AbortSignal,
): Promise {
const api = new HttpdClient(baseUrl);
let repos: Repo[];
@@ -22,24 +23,17 @@ export async function fetchRepoInfos(
} else {
repos = await api.repo.getAll(query);
}
- const info = await Promise.all(
- repos
- .filter(r => Boolean(r.payloads["xyz.radicle.project"]))
- .map(async repo => {
- const activity = await loadRepoActivity(repo.rid, baseUrl);
- return { repo, activity, baseUrl };
- }),
- );
- return info.sort((a, b) => {
- if (a.activity.length === 0 && b.activity.length === 0) {
- return 0;
- } else if (a.activity.length === 0 && b.activity.length > 0) {
- return 1;
- } else if (b.activity.length === 0 && a.activity.length > 0) {
- return -1;
- } else {
- return b.activity[0].time - a.activity[0].time;
- }
- });
+ return repos
+ .filter(r => Boolean(r.payloads["xyz.radicle.project"]))
+ .map(repo => ({
+ repo,
+ baseUrl,
+ activity: loadRepoActivity(repo.rid, baseUrl, activitySignal).catch(e => {
+ if (import.meta.env.DEV && (e as Error)?.name !== "AbortError") {
+ console.warn("loadRepoActivity failed for", repo.rid, e);
+ }
+ return [];
+ }),
+ }));
}
diff --git a/src/lib/commit.ts b/src/lib/commit.ts
index 2f63ac705..88f996d89 100644
--- a/src/lib/commit.ts
+++ b/src/lib/commit.ts
@@ -110,9 +110,15 @@ function groupCommitsByWeek(commits: number[]): WeeklyActivity[] {
return groupedCommits;
}
-export async function loadRepoActivity(id: string, baseUrl: BaseUrl) {
+export async function loadRepoActivity(
+ id: string,
+ baseUrl: BaseUrl,
+ signal?: AbortSignal,
+) {
const api = new HttpdClient(baseUrl);
- const commits = await api.repo.getActivity(id);
+ const timeout = AbortSignal.timeout(8000);
+ const abort = signal ? AbortSignal.any([signal, timeout]) : timeout;
+ const commits = await api.repo.getActivity(id, { abort });
return groupCommitsByWeek(commits.activity);
}