@bensandee/forgejo-cli 0.5.5 → 0.5.6

package/dist/bin.mjs

@@ -162,7 +162,7 @@ function loadEnvFileForBin(rawArgs, bin, io = processIo) {
 //#region src/version.ts
 const parsed = z.object({ version: z.string() }).safeParse({
 	name: "@bensandee/forgejo-cli",
-	version: "0.5.5",
+	version: "0.5.6",
 	description: "bst-fj: Forgejo API commands without the rest of bst",
 	license: "MIT",
 	repository: {
@@ -1664,6 +1664,16 @@ const commitStatusCommand = defineCommand({
 	}
 });
 //#endregion
+//#region ../forgejo/src/fetcher.ts
+const LONG_FETCH_TIMEOUT_MS = 6e5;
+function morePagesFollow(res, pageLength, received, pageSize) {
+	if (pageLength === 0) return false;
+	const raw = res.headers.get("x-total-count")?.trim() ?? "";
+	const total = raw === "" ? NaN : Number(raw);
+	if (!Number.isSafeInteger(total) || total < 0) return pageLength >= pageSize;
+	return received < total;
+}
+//#endregion
 //#region ../forgejo/src/label-provisioning.ts
 const LabelSchema = z.object({
 	id: z.number(),
@@ -1673,7 +1683,7 @@ const LabelSchema = z.object({
 	exclusive: z.boolean().optional()
 });
 const LabelListSchema = z.array(LabelSchema);
-const LABELS_PAGE_SIZE = 100;
+const LABELS_PAGE_SIZE = 50;
 const LABELS_MAX_PAGES = 20;
 async function fetchAllForgejoLabels(executor, conn) {
 	const labels = [];
@@ -1686,7 +1696,7 @@ async function fetchAllForgejoLabels(executor, conn) {
 		const parsed = LabelListSchema.safeParse(await res.json());
 		if (!parsed.success) throw new UnexpectedError(`Unexpected label-list response: ${parsed.error.message}`);
 		labels.push(...parsed.data);
-		if (parsed.data.length < LABELS_PAGE_SIZE) break;
+		if (!morePagesFollow(res, parsed.data.length, labels.length, LABELS_PAGE_SIZE)) break;
 	}
 	return labels;
 }
@@ -1900,7 +1910,10 @@ async function fetchIssueListPage(executor, conn, params) {
 		verb: "list issues",
 		resource: conn.repository
 	}, repoNotFoundMessage(conn));
-	return parseIssueListOrThrow(await res.json());
+	return {
+		raw: parseIssueListOrThrow(await res.json()),
+		res
+	};
 }
 function normalizeDetailedIssues(raw, type) {
 	const normalized = raw.map(normalizeIssue);
@@ -1911,7 +1924,7 @@ const DETAILED_LIST_MAX_PAGES = 20;
 async function listForgejoIssuesDetailedPaged(executor, conn, query, options) {
 	const issues = [];
 	for (let page = 1; page <= DETAILED_LIST_MAX_PAGES; page++) {
-		const raw = await fetchIssueListPage(executor, conn, issueListParams(query.type, {
+		const { raw } = await fetchIssueListPage(executor, conn, issueListParams(query.type, {
 			...query,
 			limit: DETAILED_LIST_PAGE_SIZE,
 			page
@@ -2301,9 +2314,6 @@ const labelsCommand = defineCommand({
 	}
 });
 //#endregion
-//#region ../forgejo/src/fetcher.ts
-const LONG_FETCH_TIMEOUT_MS = 6e5;
-//#endregion
 //#region ../forgejo/src/releases.ts
 const SETTLE_ATTEMPTS = 4;
 const SETTLE_BASE_DELAY_MS = 2e3;
@@ -2891,7 +2901,7 @@ async function paginate(executor, conn, endpoint, verb, extract) {
 		}));
 		const items = extract(await res.json());
 		all.push(...items);
-		if (items.length < PAGE_LIMIT) break;
+		if (!morePagesFollow(res, items.length, all.length, PAGE_LIMIT)) break;
 		if (page === 101) throw new UnexpectedError(`${endpoint} still returns full pages after ${String(MAX_PAGES)} pages; refusing to report a prefix of it`);
 	}
 	return all;
@@ -3876,7 +3886,7 @@ async function listForgejoComments(executor, conn, number, options = {}) {
 		}, issueNotFoundMessage(conn, number));
 		const parsed = parseCommentListOrThrow(await res.json());
 		comments.push(...parsed.map(normalizeComment));
-		if (parsed.length < COMMENTS_PAGE_SIZE) break;
+		if (!morePagesFollow(res, parsed.length, comments.length, COMMENTS_PAGE_SIZE)) break;
 		if (page === COMMENTS_MAX_PAGES) {
 			log.warn(`Comment listing for #${String(number)} hit the ${String(COMMENTS_MAX_PAGES)}-page cap; results may be truncated`);
 			options.onPageCap?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bensandee/forgejo-cli",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "bst-fj: Forgejo API commands without the rest of bst",
   "license": "MIT",
   "repository": {