@gscdump/engine-gsc-api 0.27.2 → 0.28.1

package/dist/index.mjs

@@ -218,47 +218,69 @@ async function runGscSyncSlice(opts) {
 	let totalRows = 0;
 	let pageCount = 0;
 	let metadata;
-	while (true) {
-		if (pageCount >= maxPages) return {
-			totalRows,
-			hasMore: true,
-			nextStartRow: startRow,
-			metadata
-		};
-		if (Date.now() - loopStart >= cpuBudgetMs) return {
-			totalRows,
-			hasMore: true,
-			nextStartRow: startRow,
-			metadata
-		};
+	const fetchPage = async (row) => {
 		const query = {
 			startDate: opts.startDate,
 			endDate: opts.endDate,
 			dimensions,
 			rowLimit,
-			startRow,
+			startRow: row,
 			dataState,
 			type: searchType,
 			...dimensionFilterGroups ? { dimensionFilterGroups } : {}
 		};
-		const response = await opts.client._rawQuery(opts.siteUrl, query).catch((err) => {
-			if (isTimeoutLike(err)) return null;
-			throw err;
-		});
-		if (!response) return {
+		try {
+			const response = await opts.client._rawQuery(opts.siteUrl, query);
+			return {
+				kind: "ok",
+				startRow: row,
+				rows: response.rows ?? [],
+				metadata: response.metadata
+			};
+		} catch (err) {
+			if (isTimeoutLike(err)) return {
+				kind: "timeout",
+				startRow: row
+			};
+			return {
+				kind: "error",
+				error: err
+			};
+		}
+	};
+	const startFetchIfAllowed = (row) => {
+		if (pageCount >= maxPages) return null;
+		if (Date.now() - loopStart >= cpuBudgetMs) return null;
+		return fetchPage(row);
+	};
+	let pending = startFetchIfAllowed(startRow);
+	if (pending === null) return {
+		totalRows,
+		hasMore: true,
+		nextStartRow: startRow,
+		metadata
+	};
+	while (pending !== null) {
+		const page = await pending;
+		pending = null;
+		if (page.kind === "error") throw page.error;
+		if (page.kind === "timeout") return {
 			totalRows,
 			hasMore: true,
-			nextStartRow: startRow,
+			nextStartRow: page.startRow,
 			metadata
 		};
-		const rows = response.rows ?? [];
+		const rows = page.rows;
 		totalRows += rows.length;
 		pageCount++;
-		if (response.metadata) metadata = response.metadata;
+		if (page.metadata) metadata = page.metadata;
 		opts.onPage?.({
 			searchType,
 			rowsThisPage: rows.length
 		});
+		const isLastPage = rows.length < rowLimit;
+		const nextStartRow = page.startRow + rows.length;
+		const prefetch = isLastPage ? null : startFetchIfAllowed(nextStartRow);
 		if (rows.length > 0) {
 			if (await opts.onBatch(rows).then(() => false).catch((err) => {
 				if (isTimeoutLike(err)) return true;
@@ -266,12 +288,24 @@ async function runGscSyncSlice(opts) {
 			})) return {
 				totalRows: totalRows - rows.length,
 				hasMore: true,
-				nextStartRow: startRow,
+				nextStartRow: page.startRow,
 				metadata
 			};
 		}
-		if (rows.length < rowLimit) break;
-		startRow += rows.length;
+		if (isLastPage) return {
+			totalRows,
+			hasMore: false,
+			nextStartRow,
+			metadata
+		};
+		if (prefetch === null) return {
+			totalRows,
+			hasMore: true,
+			nextStartRow,
+			metadata
+		};
+		startRow = nextStartRow;
+		pending = prefetch;
 	}
 	return {
 		totalRows,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gscdump/engine-gsc-api",
   "type": "module",
-  "version": "0.27.2",
+  "version": "0.28.1",
   "description": "GSC live-API engine adapter — wraps the Search Analytics REST API as an AnalysisQuerySource for typed analyzer dispatch.",
   "author": {
     "name": "Harlan Wilton",
@@ -36,8 +36,8 @@
     "node": ">=18"
   },
   "dependencies": {
-    "gscdump": "0.27.2",
-    "@gscdump/engine": "0.27.2"
+    "@gscdump/engine": "0.28.1",
+    "gscdump": "0.28.1"
   },
   "devDependencies": {
     "vitest": "^4.1.9"