gscdump 2.0.6 → 2.1.1

package/dist/api/inspection.d.mts

@@ -34,7 +34,9 @@ interface ParsedIndexingResult {
   googleCanonical: string | null;
   sitemaps: string | null;
   referringUrls: string | null;
+  /** @deprecated Retained for historical storage rows. */
   mobileVerdict: string | null;
+  /** @deprecated Retained for historical storage rows. */
   mobileIssues: string | null;
   richResultsVerdict: string | null;
   richResultsItems: string | null;
@@ -90,7 +92,7 @@ declare function getNextCheckPriority(result: Pick<ParsedIndexingResult, 'verdic
 /** Next-check unix seconds for a given priority. */
 declare function getNextCheckAfter(priority: InspectionPriority): number;
 declare function canUseUrlInspection(permissionLevel: string | null | undefined): boolean;
-type IndexingIneligibleReason = 'missing_indexing_scope' | 'insufficient_gsc_permission';
+type IndexingIneligibleReason = 'missing_gsc_read_scope' | 'insufficient_gsc_permission';
 interface IndexingEligibility {
   indexingEligible: boolean;
   indexingIneligibleReason?: IndexingIneligibleReason;

package/dist/api/inspection.mjs

@@ -1,5 +1,5 @@
 import { runSequentialBatch } from "./batch.mjs";
-import { hasIndexingScope } from "../core/scopes.mjs";
+import { hasGscReadScope } from "../core/scopes.mjs";
 async function inspectUrl(client, siteUrl, inspectionUrl) {
 	const inspection = (await client.inspect(siteUrl, inspectionUrl)).inspectionResult;
 	return {
@@ -97,12 +97,12 @@ function getNextCheckAfter(priority) {
 	const now = Math.floor(Date.now() / 1e3);
 	switch (priority) {
 		case "critical":
-		case "high": return now + 7 * 86400;
+		case "high": return now + 604800;
 		case "elevated":
-		case "medium": return now + 14 * 86400;
+		case "medium": return now + 1209600;
 		case "low":
-		case "normal": return now + 30 * 86400;
-		case "dormant": return now + 120 * 86400;
+		case "normal": return now + 2592e3;
+		case "dormant": return now + 10368e3;
 	}
 }
 const INSPECTION_ALLOWED_PERMISSIONS = /* @__PURE__ */ new Set([
@@ -118,9 +118,9 @@ function grantedScopeList(scopes) {
 }
 function getIndexingEligibility(grantedScopes, permissionLevel) {
 	const scopes = grantedScopeList(grantedScopes);
-	if (!hasIndexingScope(grantedScopes)) return {
+	if (!hasGscReadScope(grantedScopes)) return {
 		indexingEligible: false,
-		indexingIneligibleReason: "missing_indexing_scope",
+		indexingIneligibleReason: "missing_gsc_read_scope",
 		indexingPermissionLevel: permissionLevel ?? null,
 		grantedScopes: scopes
 	};

package/dist/api/oauth.mjs

@@ -118,7 +118,11 @@ async function requestOAuthResult(url, init, op) {
 			return null;
 		});
 		if (!res) continue;
-		if (!res.ok) return err(oauthHttpError(op, parseGoogleError(await res.text(), res.status)));
+		if (!res.ok) {
+			const text = await res.text();
+			const info = parseGoogleError(text, res.status);
+			return err(oauthHttpError(op, info));
+		}
 		return ok(res);
 	}
 	return err({

package/dist/core/client.d.mts

@@ -85,6 +85,8 @@ interface GoogleSearchConsoleClient {
     }, opts?: CallOptions) => Promise<VerificationWebResource>;
     list: (opts?: CallOptions) => Promise<VerificationWebResource[]>;
     get: (id: string, opts?: CallOptions) => Promise<VerificationWebResource>;
+    patch: (id: string, resource: VerificationWebResource, opts?: CallOptions) => Promise<VerificationWebResource>;
+    update: (id: string, resource: VerificationWebResource, opts?: CallOptions) => Promise<VerificationWebResource>;
     delete: (id: string, opts?: CallOptions) => Promise<void>;
   };
   /** Inspect a URL. `languageCode` is a BCP-47 tag for translating result strings; omit to let Google pick. */

package/dist/core/client.mjs

@@ -91,8 +91,10 @@ function createFetch(auth, options) {
 		},
 		async onResponseError(ctx) {
 			if (ctx.response.status === 403) console.error("[gscdump] Permission denied (403). check your service account permissions being added to the GSC property.");
-			if (options?.onResponseError) if (Array.isArray(options.onResponseError)) for (const handler of options.onResponseError) await handler(ctx);
-			else await options.onResponseError(ctx);
+			if (options?.onResponseError) {
+				if (Array.isArray(options.onResponseError)) for (const handler of options.onResponseError) await handler(ctx);
+				else await options.onResponseError(ctx);
+			}
 		}
 	});
 }
@@ -106,17 +108,31 @@ function googleSearchConsole(auth, options = {}) {
 			const originalOnError = fetchOptions.onResponseError;
 			fetchOptions.onResponseError = async (ctx) => {
 				if (ctx.response.status === 429) await options.onRateLimited({ response: ctx.response });
-				if (originalOnError) if (Array.isArray(originalOnError)) for (const handler of originalOnError) await handler(ctx);
-				else await originalOnError(ctx);
+				if (originalOnError) {
+					if (Array.isArray(originalOnError)) for (const handler of originalOnError) await handler(ctx);
+					else await originalOnError(ctx);
+				}
 			};
 		}
 		fetch = createFetch(authState, fetchOptions);
 	}
-	const querySearchAnalytics = (siteUrl, body, opts) => fetch(`${GSC_API}/webmasters/v3/sites/${encodeSiteUrl(siteUrl)}/searchAnalytics/query`, {
-		method: "POST",
-		body,
-		signal: opts?.signal
-	});
+	const querySearchAnalytics = async (siteUrl, body, opts) => {
+		const response = await fetch(`${GSC_API}/webmasters/v3/sites/${encodeSiteUrl(siteUrl)}/searchAnalytics/query`, {
+			method: "POST",
+			body,
+			signal: opts?.signal
+		});
+		if (!response.metadata) return response;
+		const firstIncompleteDate = response.metadata.first_incomplete_date ?? response.metadata.firstIncompleteDate;
+		const firstIncompleteHour = response.metadata.first_incomplete_hour ?? response.metadata.firstIncompleteHour;
+		return {
+			...response,
+			metadata: {
+				...typeof firstIncompleteDate === "string" ? { first_incomplete_date: firstIncompleteDate } : {},
+				...typeof firstIncompleteHour === "string" ? { first_incomplete_hour: firstIncompleteHour } : {}
+			}
+		};
+	};
 	return {
 		async *query(siteUrl, builder, opts) {
 			const state = builder.getState();
@@ -192,6 +208,16 @@ function googleSearchConsole(auth, options = {}) {
 				return (await fetch(`${SITE_VERIFICATION_API}/webResource`, { signal: opts?.signal })).items || [];
 			},
 			get: (id, opts) => fetch(`${SITE_VERIFICATION_API}/webResource/${encodeURIComponent(id)}`, { signal: opts?.signal }),
+			patch: (id, resource, opts) => fetch(`${SITE_VERIFICATION_API}/webResource/${encodeURIComponent(id)}`, {
+				method: "PATCH",
+				body: resource,
+				signal: opts?.signal
+			}),
+			update: (id, resource, opts) => fetch(`${SITE_VERIFICATION_API}/webResource/${encodeURIComponent(id)}`, {
+				method: "PUT",
+				body: resource,
+				signal: opts?.signal
+			}),
 			delete: (id, opts) => fetch(`${SITE_VERIFICATION_API}/webResource/${encodeURIComponent(id)}`, {
 				method: "DELETE",
 				signal: opts?.signal

package/dist/core/types.d.mts

@@ -5,7 +5,7 @@ interface ApiSite {
 }
 /** Per-content-type counts returned with a sitemap. */
 interface ApiSitemapContent {
-  /** Deprecated by Google, retained because it can still appear on the wire. */
+  /** @deprecated Google can still include this field on the wire. */
   indexed?: string | null;
   submitted?: string | null;
   type?: string | null;
@@ -56,12 +56,8 @@ interface DataRow {
 }
 /** Completeness metadata returned with recent Search Analytics data. */
 interface SearchAnalyticsMetadata {
-  firstIncompleteDate?: string | null;
-  firstIncompleteHour?: string | null;
-  /** Field name returned by the direct REST endpoint. */
-  first_incomplete_date?: string | null;
-  /** Field name returned by the direct REST endpoint. */
-  first_incomplete_hour?: string | null;
+  first_incomplete_date?: string;
+  first_incomplete_hour?: string;
 }
 /** Raw Search Analytics response returned by Google's REST endpoint. */
 interface SearchAnalyticsResponse {
@@ -126,6 +122,7 @@ interface UrlInspectionResult {
   ampResult?: AmpInspectionResult;
   indexStatusResult?: IndexStatusResult;
   inspectionResultLink?: string | null;
+  /** @deprecated Google no longer returns this result. */
   mobileUsabilityResult?: MobileUsabilityResult;
   richResultsResult?: RichResultsResult;
 }

package/dist/query/plan.mjs

@@ -94,7 +94,8 @@ function buildLogicalPlanResult(state, capabilities = {}) {
 	if (!capabilities.regex && allFilters.some((f) => isDimensionLeaf(f) && isRegexOperator(f.operator))) return err(queryErrors.unsupportedCapability("regex", "logical plan"));
 	const metricFilters = extractMetricFilters(normalizedFilter);
 	const specialFilters = extractSpecialOperatorFilters(normalizedFilter);
-	const prefilters = extractMetricFilters(normalizeFilter(state.prefilter));
+	const normalizedPrefilter = normalizeFilter(state.prefilter);
+	const prefilters = extractMetricFilters(normalizedPrefilter);
 	const queryParams = {};
 	const dimensionFilters = [];
 	for (const filter of allFilters) {
@@ -115,8 +116,9 @@ function buildLogicalPlanResult(state, capabilities = {}) {
 	const dimensionFilterTree = buildDimensionFilterTree(normalizedFilter);
 	const filterDims = dimensionFilters.map((filter) => filter.dimension);
 	if (!isDatasetResolvable(state.dimensions, filterDims)) return err(queryErrors.unresolvableDataset(state.dimensions, filterDims));
+	const dataset = inferDataset(state.dimensions, filterDims);
 	return ok({
-		dataset: inferDataset(state.dimensions, filterDims),
+		dataset,
 		dimensions: [...state.dimensions],
 		groupByDimensions: state.dimensions.filter((d) => d !== "date"),
 		hasDate: state.dimensions.includes("date"),

package/dist/query/resolver.mjs

@@ -114,7 +114,6 @@ function extractSpecialFilters(filter) {
 		case "between":
 			startDate = f.expression;
 			endDate = f.expression2;
-			break;
 	}
 	else if (isQueryParam(f.dimension)) {
 		if (f.dimension === "searchType") searchType = f.expression;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gscdump",
   "type": "module",
-  "version": "2.0.6",
+  "version": "2.1.1",
   "description": "Direct Google Search Console client with typed queries, streaming pagination, URL inspection, and indexing helpers",
   "author": {
     "name": "Harlan Wilton",
@@ -88,7 +88,7 @@
   },
   "dependencies": {
     "ofetch": "^1.5.1",
-    "@gscdump/contracts": "^2.0.6"
+    "@gscdump/contracts": "^2.1.1"
   },
   "scripts": {
     "dev": "obuild --stub",