gscdump 0.35.11 → 0.36.0

package/dist/api/index.mjs

@@ -1956,13 +1956,14 @@ function assertValidSiteUrl(siteUrl) {
 }
 function createAuth(options) {
 	let credentials = { refresh_token: options.refreshToken };
+	let refreshPromise = null;
 	return {
 		get credentials() {
 			return credentials;
 		},
 		async getAccessToken() {
 			if (credentials?.access_token && credentials.expiry_date && credentials.expiry_date > Date.now()) return { token: credentials.access_token };
-			const response = await ofetch("https://oauth2.googleapis.com/token", {
+			refreshPromise ??= ofetch("https://oauth2.googleapis.com/token", {
 				method: "POST",
 				body: new URLSearchParams({
 					client_id: options.clientId,
@@ -1970,13 +1971,17 @@ function createAuth(options) {
 					refresh_token: options.refreshToken,
 					grant_type: "refresh_token"
 				})
+			}).then((response) => {
+				credentials = {
+					...credentials,
+					access_token: response.access_token,
+					expiry_date: Date.now() + response.expires_in * 1e3
+				};
+				return response.access_token;
+			}).finally(() => {
+				refreshPromise = null;
 			});
-			credentials = {
-				...credentials,
-				access_token: response.access_token,
-				expiry_date: Date.now() + response.expires_in * 1e3
-			};
-			return { token: response.access_token };
+			return { token: await refreshPromise };
 		}
 	};
 }

package/dist/index.mjs

@@ -644,13 +644,9 @@ function getDateRange(startDate, endDate) {
 }
 const DAYS_PER_RANGE = 30;
 function generateGscDateRange(startDate, endDate) {
-	const dates = [];
-	let current = startDate;
-	while (current <= endDate && isValidGscDate(current)) {
-		dates.push(current);
-		current = getNextDate(current);
-	}
-	return dates;
+	const start = startDate < getOldestGscDate() ? getOldestGscDate() : startDate;
+	const end = endDate > getFreshestGscDate() ? getFreshestGscDate() : endDate;
+	return start <= end ? getDateRange(start, end) : [];
 }
 function groupIntoRanges(dates, daysPerRange = 30) {
 	if (dates.length === 0) return [];
@@ -700,9 +696,8 @@ function isValidGscDate(dateStr) {
 function getBackfillProgress(oldestDateSynced, newestDateSynced) {
 	if (!oldestDateSynced || !newestDateSynced) return null;
 	const oldestGsc = getOldestGscDate();
-	const newestGsc = getLatestGscDate();
-	const totalDays = Math.ceil((new Date(newestGsc).getTime() - new Date(oldestGsc).getTime()) / MS_PER_DAY);
-	const syncedDays = Math.ceil((new Date(newestDateSynced).getTime() - new Date(oldestDateSynced).getTime()) / MS_PER_DAY);
+	const totalDays = countDays(oldestGsc, getLatestGscDate());
+	const syncedDays = countDays(oldestDateSynced, newestDateSynced);
 	return {
 		progress: Math.round(Math.min(1, syncedDays / totalDays) * 100) / 100,
 		daysAvailable: totalDays,
@@ -2651,13 +2646,14 @@ function assertValidSiteUrl(siteUrl) {
 }
 function createAuth(options) {
 	let credentials = { refresh_token: options.refreshToken };
+	let refreshPromise = null;
 	return {
 		get credentials() {
 			return credentials;
 		},
 		async getAccessToken() {
 			if (credentials?.access_token && credentials.expiry_date && credentials.expiry_date > Date.now()) return { token: credentials.access_token };
-			const response = await ofetch("https://oauth2.googleapis.com/token", {
+			refreshPromise ??= ofetch("https://oauth2.googleapis.com/token", {
 				method: "POST",
 				body: new URLSearchParams({
 					client_id: options.clientId,
@@ -2665,13 +2661,17 @@ function createAuth(options) {
 					refresh_token: options.refreshToken,
 					grant_type: "refresh_token"
 				})
+			}).then((response) => {
+				credentials = {
+					...credentials,
+					access_token: response.access_token,
+					expiry_date: Date.now() + response.expires_in * 1e3
+				};
+				return response.access_token;
+			}).finally(() => {
+				refreshPromise = null;
 			});
-			credentials = {
-				...credentials,
-				access_token: response.access_token,
-				expiry_date: Date.now() + response.expires_in * 1e3
-			};
-			return { token: response.access_token };
+			return { token: await refreshPromise };
 		}
 	};
 }

package/dist/query/index.mjs

@@ -1885,8 +1885,7 @@ function extractSearchType(state) {
 	if (!state) return void 0;
 	if (state.searchType && KNOWN_SEARCH_TYPES.has(state.searchType)) return state.searchType;
 	const filter = state.filter;
-	if (!filter || typeof filter !== "object") return void 0;
-	const raw = filter.searchType;
+	const raw = extractSpecialFilters(normalizeFilter(filter)).searchType;
 	if (typeof raw !== "string" || raw.length === 0) return void 0;
 	return KNOWN_SEARCH_TYPES.has(raw) ? raw : void 0;
 }
@@ -2157,6 +2156,7 @@ function invertOperator(op) {
 	return INVERSIONS[op];
 }
 function not(filter) {
+	if ((filter._nestedGroups?.length ?? 0) > 0 || filter._filters.length !== 1) throw new Error("not() can only invert a single leaf filter. GSC filter groups do not support compound negation.");
 	const inverted = [];
 	for (const f of filter._filters) {
 		if (DATE_OPERATORS.includes(f.operator)) throw new Error(`not() cannot invert date operator "${f.operator}": GSC has no negated date filter.`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gscdump",
   "type": "module",
-  "version": "0.35.11",
+  "version": "0.36.0",
   "description": "Google Search Console API wrapper with typed query builder, streaming pagination, and SEO analysis functions",
   "author": {
     "name": "Harlan Wilton",
@@ -98,7 +98,7 @@
     "defu": "^6.1.7",
     "ofetch": "^1.5.1",
     "ufo": "^1.6.4",
-    "@gscdump/contracts": "0.35.11"
+    "@gscdump/contracts": "0.36.0"
   },
   "devDependencies": {
     "@googleapis/indexing": "^6.0.1",