gscdump 0.38.2 → 0.40.1

package/README.md

@@ -159,7 +159,7 @@ const cannibalization = analyzeCannibalization(keywordPageData)
 - [`@gscdump/cli`](../cli) — CLI: `sync`, `query`, `dump`, `analyze`, `mcp`, `store` admin.
 - [`@gscdump/engine`](../engine) — Append-only Parquet/DuckDB storage engine.
 - [`@gscdump/analysis`](../analysis) — SEO analyzers (row-based + DuckDB-native + D1-ready).
-- [`@gscdump/nuxt`](../nuxt) — Nuxt layer wrapping the full stack.
+- [`@gscdump/sdk`](../sdk) — Hosted API and ticketed realtime clients.
 
 ## License
 

package/dist/api/index.d.mts

@@ -662,6 +662,10 @@ declare function exchangeAuthCodeResult(code: string, clientId: string, clientSe
 declare function exchangeAuthCode(code: string, clientId: string, clientSecret: string, redirectUri: string): Promise<OAuthTokens & {
   refreshToken?: string;
 }>;
+interface FetchSitesWithSitemapsOptions {
+  /** Maximum concurrent sitemap-list requests. Defaults to 4. */
+  concurrency?: number;
+}
 /**
  * Fetches all sites the authenticated user has access to in Google Search Console.
  */
@@ -669,7 +673,7 @@ declare function fetchSites(client: GoogleSearchConsoleClient): Promise<ApiSite[
 /**
  * Fetches all verified sites with their sitemaps from Google Search Console.
  */
-declare function fetchSitesWithSitemaps(client: GoogleSearchConsoleClient): Promise<(Site & {
+declare function fetchSitesWithSitemaps(client: GoogleSearchConsoleClient, options?: FetchSitesWithSitemapsOptions): Promise<(Site & {
   sitemaps: ApiSitemap[];
 })[]>;
 /**
@@ -705,6 +709,11 @@ declare function deleteSite(client: GoogleSearchConsoleClient, siteUrl: string):
  * `sc-domain:example.com`) to the Site Verification API's site shape.
  */
 declare function siteUrlToVerificationSite(siteUrl: string): VerificationSite;
+/** Resolve a Search Console property and method to Google's verification target. */
+declare function resolveVerificationTarget(siteUrl: string, method?: VerificationMethod): {
+  site: VerificationSite;
+  method: VerificationMethod;
+};
 /**
  * Methods valid for a given site shape. SITE properties can use META/FILE/
  * ANALYTICS/TAG_MANAGER; INET_DOMAIN must use DNS_TXT or DNS_CNAME.
@@ -736,4 +745,4 @@ declare function getVerifiedSite(client: GoogleSearchConsoleClient, id: string):
  * on the property are unaffected.
  */
 declare function unverifySite(client: GoogleSearchConsoleClient, id: string): Promise<void>;
-export { ApiSite, ApiSitemap, ApiSitemapContent, Auth, AuthClient, AuthOptions, CallOptions, DataRow, DimensionFilter, DimensionFilterGroup, DiscoverSitemapOptions, FetchSitemapUrlsOptions, GSC_INDEXING_SCOPE, GSC_QUOTAS, GSC_READ_SCOPE, GSC_SITE_VERIFICATION_SCOPE, GSC_WRITE_SCOPE, GoogleSearchConsoleClient, GoogleSearchConsoleClientOptions, GscApiError, GscApiErrorInfo, GscError, GscErrorKind, GscPropertyCandidate, GscdumpApiOptions, IndexStatusResult, IndexingEligibility, IndexingIneligibleReason, IndexingMetadata, IndexingNotificationType, IndexingResult, InspectUrlIndexResponse, InspectUrlResult, InspectionPriority, MobileUsabilityResult, OAuthTokens, ParsedGscSiteUrl, ParsedIndexingResult, Period, PublishUrlNotificationResponse, QueryReturn, RequiredNonNullable, ResolvedAnalyticsRange, RichResultsResult, SearchAnalyticsQuery, SearchAnalyticsResponse, Site, SiteAnalytics, URL_INSPECTION_DAILY_LIMIT, URL_INSPECTION_EFFECTIVE_LIMIT, UrlInspectionResult, UrlNotificationMetadata, VerificationMethod, VerificationSite, VerificationSiteType, VerificationToken, VerificationWebResource, addSite, batchInspectUrls, batchRequestIndexing, canUseUrlInspection, classifyError, createAuth, createFetch, deleteSite, deleteSitemap, discoverSitemap, exchangeAuthCode, exchangeAuthCodeResult, fetchSitemap, fetchSitemapUrls, fetchSitemaps, fetchSites, fetchSitesWithSitemaps, findBestGscProperty, findExactGscProperty, formatErrorForCli, formatGscPropertyCandidates, getIndexingEligibility, getIndexingMetadata, getNextCheckAfter, getNextCheckPriority, getVerificationToken, getVerifiedSite, googleSearchConsole, grantedScopeList, gscErrorToException, gscPropertyMatchesTarget, gscdumpApi, hasGoogleScope, hasGscReadScope, hasGscWriteScope, hasIndexingScope, inspectUrl, inspectUrlFlat, isPermissionDeniedError, isVerifiedGscPermission, isVerifiedGscProperty, listVerifiedSites, matchGscSite, normalizeGscSiteUrl, normalizeRegistrationTarget, parseGoogleError, parseGoogleScopes, parseGscSiteUrl, pickBestGscProperty, refreshAccessToken, refreshAccessTokenResult, requestIndexing, rethrowAsGscApiError, runSequentialBatch, siteUrlToVerificationSite, storageError, submitSitemap, unverifySite, urlMatchKey, verificationMethodsFor, verifySite };
+export { ApiSite, ApiSitemap, ApiSitemapContent, Auth, AuthClient, AuthOptions, CallOptions, DataRow, DimensionFilter, DimensionFilterGroup, DiscoverSitemapOptions, FetchSitemapUrlsOptions, FetchSitesWithSitemapsOptions, GSC_INDEXING_SCOPE, GSC_QUOTAS, GSC_READ_SCOPE, GSC_SITE_VERIFICATION_SCOPE, GSC_WRITE_SCOPE, GoogleSearchConsoleClient, GoogleSearchConsoleClientOptions, GscApiError, GscApiErrorInfo, GscError, GscErrorKind, GscPropertyCandidate, GscdumpApiOptions, IndexStatusResult, IndexingEligibility, IndexingIneligibleReason, IndexingMetadata, IndexingNotificationType, IndexingResult, InspectUrlIndexResponse, InspectUrlResult, InspectionPriority, MobileUsabilityResult, OAuthTokens, ParsedGscSiteUrl, ParsedIndexingResult, Period, PublishUrlNotificationResponse, QueryReturn, RequiredNonNullable, ResolvedAnalyticsRange, RichResultsResult, SearchAnalyticsQuery, SearchAnalyticsResponse, Site, SiteAnalytics, URL_INSPECTION_DAILY_LIMIT, URL_INSPECTION_EFFECTIVE_LIMIT, UrlInspectionResult, UrlNotificationMetadata, VerificationMethod, VerificationSite, VerificationSiteType, VerificationToken, VerificationWebResource, addSite, batchInspectUrls, batchRequestIndexing, canUseUrlInspection, classifyError, createAuth, createFetch, deleteSite, deleteSitemap, discoverSitemap, exchangeAuthCode, exchangeAuthCodeResult, fetchSitemap, fetchSitemapUrls, fetchSitemaps, fetchSites, fetchSitesWithSitemaps, findBestGscProperty, findExactGscProperty, formatErrorForCli, formatGscPropertyCandidates, getIndexingEligibility, getIndexingMetadata, getNextCheckAfter, getNextCheckPriority, getVerificationToken, getVerifiedSite, googleSearchConsole, grantedScopeList, gscErrorToException, gscPropertyMatchesTarget, gscdumpApi, hasGoogleScope, hasGscReadScope, hasGscWriteScope, hasIndexingScope, inspectUrl, inspectUrlFlat, isPermissionDeniedError, isVerifiedGscPermission, isVerifiedGscProperty, listVerifiedSites, matchGscSite, normalizeGscSiteUrl, normalizeRegistrationTarget, parseGoogleError, parseGoogleScopes, parseGscSiteUrl, pickBestGscProperty, refreshAccessToken, refreshAccessTokenResult, requestIndexing, resolveVerificationTarget, rethrowAsGscApiError, runSequentialBatch, siteUrlToVerificationSite, storageError, submitSitemap, unverifySite, urlMatchKey, verificationMethodsFor, verifySite };

package/dist/api/index.mjs

@@ -2497,9 +2497,16 @@ function pickBestGscProperty(origin, availableSites) {
 	const matches = availableSites.filter((p) => matchGscSite(origin, p.siteUrl));
 	if (!matches.length) return void 0;
 	const isDomain = (p) => !!p.siteUrl?.startsWith("sc-domain:");
+	const isHttps = (p) => !!p.siteUrl?.startsWith("https://");
+	const pickTier = (pool) => pool.find(isDomain) ?? pool.find(isHttps) ?? pool[0];
 	const verified = matches.filter((p) => isVerifiedGscPermission(p.permissionLevel));
 	const pool = verified.length ? verified : matches;
-	return pool.find(isDomain) ?? pool[0];
+	const originHost = stripWww(parseGscSiteUrl(origin).hostname.toLowerCase());
+	const exact = pool.filter((property) => {
+		if (!property.siteUrl) return false;
+		return stripWww(parseGscSiteUrl(property.siteUrl).hostname.toLowerCase()) === originHost;
+	});
+	return pickTier(exact.length ? exact : pool);
 }
 function findBestGscProperty(targetDomain, properties) {
 	const cleanTarget = stripWww(targetDomain);
@@ -2862,15 +2869,16 @@ async function postOAuthTokenResult(body, op) {
 async function fetchSites(client) {
 	return client.sites();
 }
-async function fetchSitesWithSitemaps(client) {
+async function fetchSitesWithSitemaps(client, options = {}) {
 	const sites = (await client.sites()).filter((s) => !!s.siteUrl && s.permissionLevel !== "siteUnverifiedUser");
-	return Promise.all(sites.map(async (site) => {
+	const requestedConcurrency = options.concurrency ?? 4;
+	return runSequentialBatch(sites, async (site) => {
 		const sitemaps = await client.sitemaps.list(site.siteUrl).catch(() => []);
 		return {
 			...site,
 			sitemaps
 		};
-	}));
+	}, { concurrency: Number.isFinite(requestedConcurrency) ? Math.max(1, Math.floor(requestedConcurrency)) : 4 });
 }
 async function fetchSitemaps(client, siteUrl) {
 	return client.sitemaps.list(siteUrl);
@@ -2891,6 +2899,22 @@ async function deleteSite(client, siteUrl) {
 	return client.sites.delete(siteUrl);
 }
 const SC_DOMAIN_PREFIX = "sc-domain:";
+function bareDomain(siteUrl) {
+	if (siteUrl.startsWith(SC_DOMAIN_PREFIX)) return siteUrl.slice(10);
+	try {
+		return new URL(siteUrl.startsWith("http") ? siteUrl : `https://${siteUrl}`).host;
+	} catch {
+		return siteUrl;
+	}
+}
+function urlPrefix(siteUrl) {
+	try {
+		const url = new URL(siteUrl.startsWith("http") ? siteUrl : `https://${siteUrl}`);
+		return `${url.protocol}//${url.host}/`;
+	} catch {
+		return siteUrl;
+	}
+}
 function siteUrlToVerificationSite(siteUrl) {
 	if (siteUrl.startsWith(SC_DOMAIN_PREFIX)) return {
 		type: "INET_DOMAIN",
@@ -2901,6 +2925,32 @@ function siteUrlToVerificationSite(siteUrl) {
 		identifier: siteUrl
 	};
 }
+function resolveVerificationTarget(siteUrl, method) {
+	const isDomainProperty = siteUrl.startsWith(SC_DOMAIN_PREFIX);
+	const chosen = method ?? (isDomainProperty ? "DNS_TXT" : "META");
+	const isDns = chosen === "DNS_TXT" || chosen === "DNS_CNAME";
+	if (isDomainProperty && !isDns) return {
+		site: {
+			type: "INET_DOMAIN",
+			identifier: bareDomain(siteUrl)
+		},
+		method: "DNS_TXT"
+	};
+	if (isDns) return {
+		site: {
+			type: "INET_DOMAIN",
+			identifier: bareDomain(siteUrl)
+		},
+		method: chosen
+	};
+	return {
+		site: {
+			type: "SITE",
+			identifier: urlPrefix(siteUrl)
+		},
+		method: chosen
+	};
+}
 function verificationMethodsFor(site) {
 	if (site.type === "INET_DOMAIN") return ["DNS_TXT", "DNS_CNAME"];
 	return [
@@ -2911,20 +2961,20 @@ function verificationMethodsFor(site) {
 	];
 }
 async function getVerificationToken(client, siteUrl, method) {
-	const site = siteUrlToVerificationSite(siteUrl);
+	const { site, method: verificationMethod } = resolveVerificationTarget(siteUrl, method);
 	return {
 		...await client.verification.getToken({
 			site,
-			verificationMethod: method
+			verificationMethod
 		}),
 		site
 	};
 }
 async function verifySite(client, siteUrl, method) {
-	const site = siteUrlToVerificationSite(siteUrl);
+	const { site, method: verificationMethod } = resolveVerificationTarget(siteUrl, method);
 	return client.verification.insert({
 		site,
-		verificationMethod: method
+		verificationMethod
 	});
 }
 async function listVerifiedSites(client) {
@@ -2936,4 +2986,4 @@ async function getVerifiedSite(client, id) {
 async function unverifySite(client, id) {
 	return client.verification.delete(id);
 }
-export { GSC_INDEXING_SCOPE, GSC_QUOTAS, GSC_READ_SCOPE, GSC_SITE_VERIFICATION_SCOPE, GSC_WRITE_SCOPE, GscApiError, URL_INSPECTION_DAILY_LIMIT, URL_INSPECTION_EFFECTIVE_LIMIT, addSite, batchInspectUrls, batchRequestIndexing, canUseUrlInspection, classifyError, createAuth, createFetch, deleteSite, deleteSitemap, discoverSitemap, exchangeAuthCode, exchangeAuthCodeResult, fetchSitemap, fetchSitemapUrls, fetchSitemaps, fetchSites, fetchSitesWithSitemaps, findBestGscProperty, findExactGscProperty, formatErrorForCli, formatGscPropertyCandidates, getIndexingEligibility, getIndexingMetadata, getNextCheckAfter, getNextCheckPriority, getVerificationToken, getVerifiedSite, googleSearchConsole, grantedScopeList, gscErrorToException, gscPropertyMatchesTarget, gscdumpApi, hasGoogleScope, hasGscReadScope, hasGscWriteScope, hasIndexingScope, inspectUrl, inspectUrlFlat, isPermissionDeniedError, isVerifiedGscPermission, isVerifiedGscProperty, listVerifiedSites, matchGscSite, normalizeGscSiteUrl, normalizeRegistrationTarget, parseGoogleError, parseGoogleScopes, parseGscSiteUrl, pickBestGscProperty, refreshAccessToken, refreshAccessTokenResult, requestIndexing, rethrowAsGscApiError, runSequentialBatch, siteUrlToVerificationSite, storageError, submitSitemap, unverifySite, urlMatchKey, verificationMethodsFor, verifySite };
+export { GSC_INDEXING_SCOPE, GSC_QUOTAS, GSC_READ_SCOPE, GSC_SITE_VERIFICATION_SCOPE, GSC_WRITE_SCOPE, GscApiError, URL_INSPECTION_DAILY_LIMIT, URL_INSPECTION_EFFECTIVE_LIMIT, addSite, batchInspectUrls, batchRequestIndexing, canUseUrlInspection, classifyError, createAuth, createFetch, deleteSite, deleteSitemap, discoverSitemap, exchangeAuthCode, exchangeAuthCodeResult, fetchSitemap, fetchSitemapUrls, fetchSitemaps, fetchSites, fetchSitesWithSitemaps, findBestGscProperty, findExactGscProperty, formatErrorForCli, formatGscPropertyCandidates, getIndexingEligibility, getIndexingMetadata, getNextCheckAfter, getNextCheckPriority, getVerificationToken, getVerifiedSite, googleSearchConsole, grantedScopeList, gscErrorToException, gscPropertyMatchesTarget, gscdumpApi, hasGoogleScope, hasGscReadScope, hasGscWriteScope, hasIndexingScope, inspectUrl, inspectUrlFlat, isPermissionDeniedError, isVerifiedGscPermission, isVerifiedGscProperty, listVerifiedSites, matchGscSite, normalizeGscSiteUrl, normalizeRegistrationTarget, parseGoogleError, parseGoogleScopes, parseGscSiteUrl, pickBestGscProperty, refreshAccessToken, refreshAccessTokenResult, requestIndexing, resolveVerificationTarget, rethrowAsGscApiError, runSequentialBatch, siteUrlToVerificationSite, storageError, submitSitemap, unverifySite, urlMatchKey, verificationMethodsFor, verifySite };

package/dist/dates.d.mts

@@ -43,6 +43,8 @@ declare function groupIntoRanges(dates: string[], daysPerRange?: number): Array<
 declare function countDays(startDate: string, endDate: string): number;
 /** Oldest date GSC retains (~16 months ago). */
 declare function getOldestGscDate(): string;
+/** Add `n` UTC days to a YYYY-MM-DD string (n may be negative). */
+declare function addDays(dateStr: string, n: number): string;
 declare function getNextDate(dateStr: string): string;
 interface BackfillProgress {
   progress: number;
@@ -58,4 +60,4 @@ interface BackfillProgress {
 declare function getBackfillProgress(oldestDateSynced: string | null, newestDateSynced: string | null): BackfillProgress | null;
 declare function currentPstDate(): string;
 declare function daysAgoPst(n: number): string;
-export { DAYS_PER_RANGE, GSC_FINALIZED_LAG_DAYS, GSC_FRESHEST_LAG_DAYS, GSC_RETENTION_MONTHS, MS_PER_DAY, countDays, currentPstDate, daysAgoPst, daysAgo as daysAgoUtc, generateGscDateRange, getBackfillProgress, getDateRange, getFreshestGscDate, getLatestGscDate, getNextDate, getOldestGscDate, getPendingDates, getPstDate, groupIntoRanges, toIsoDate };
+export { DAYS_PER_RANGE, GSC_FINALIZED_LAG_DAYS, GSC_FRESHEST_LAG_DAYS, GSC_RETENTION_MONTHS, MS_PER_DAY, addDays, countDays, currentPstDate, daysAgoPst, daysAgo as daysAgoUtc, generateGscDateRange, getBackfillProgress, getDateRange, getFreshestGscDate, getLatestGscDate, getNextDate, getOldestGscDate, getPendingDates, getPstDate, groupIntoRanges, toIsoDate };

package/dist/dates.mjs

@@ -115,4 +115,4 @@ function daysAgoPst(n) {
 	const { year, month, day } = pstDateParts();
 	return format(subDays(new Date(year, month - 1, day, 12), n), "yyyy-MM-dd");
 }
-export { DAYS_PER_RANGE, GSC_FINALIZED_LAG_DAYS, GSC_FRESHEST_LAG_DAYS, GSC_RETENTION_MONTHS, MS_PER_DAY, countDays, currentPstDate, daysAgoPst, daysAgo as daysAgoUtc, generateGscDateRange, getBackfillProgress, getDateRange, getFreshestGscDate, getLatestGscDate, getNextDate, getOldestGscDate, getPendingDates, getPstDate, groupIntoRanges, toIsoDate };
+export { DAYS_PER_RANGE, GSC_FINALIZED_LAG_DAYS, GSC_FRESHEST_LAG_DAYS, GSC_RETENTION_MONTHS, MS_PER_DAY, addDays, countDays, currentPstDate, daysAgoPst, daysAgo as daysAgoUtc, generateGscDateRange, getBackfillProgress, getDateRange, getFreshestGscDate, getLatestGscDate, getNextDate, getOldestGscDate, getPendingDates, getPstDate, groupIntoRanges, toIsoDate };

package/dist/index.d.mts

@@ -565,6 +565,10 @@ declare function exchangeAuthCodeResult(code: string, clientId: string, clientSe
 declare function exchangeAuthCode(code: string, clientId: string, clientSecret: string, redirectUri: string): Promise<OAuthTokens & {
   refreshToken?: string;
 }>;
+interface FetchSitesWithSitemapsOptions {
+  /** Maximum concurrent sitemap-list requests. Defaults to 4. */
+  concurrency?: number;
+}
 /**
  * Fetches all sites the authenticated user has access to in Google Search Console.
  */
@@ -572,7 +576,7 @@ declare function fetchSites(client: GoogleSearchConsoleClient): Promise<ApiSite[
 /**
  * Fetches all verified sites with their sitemaps from Google Search Console.
  */
-declare function fetchSitesWithSitemaps(client: GoogleSearchConsoleClient): Promise<(Site & {
+declare function fetchSitesWithSitemaps(client: GoogleSearchConsoleClient, options?: FetchSitesWithSitemapsOptions): Promise<(Site & {
   sitemaps: ApiSitemap[];
 })[]>;
 /**
@@ -608,6 +612,11 @@ declare function deleteSite(client: GoogleSearchConsoleClient, siteUrl: string):
  * `sc-domain:example.com`) to the Site Verification API's site shape.
  */
 declare function siteUrlToVerificationSite(siteUrl: string): VerificationSite;
+/** Resolve a Search Console property and method to Google's verification target. */
+declare function resolveVerificationTarget(siteUrl: string, method?: VerificationMethod): {
+  site: VerificationSite;
+  method: VerificationMethod;
+};
 /**
  * Methods valid for a given site shape. SITE properties can use META/FILE/
  * ANALYTICS/TAG_MANAGER; INET_DOMAIN must use DNS_TXT or DNS_CNAME.
@@ -913,4 +922,4 @@ declare function normalizeSiteUrl(siteUrl: string): string;
  * Example: `https://www.Example.com/Foo/` → `example.com/foo`
  */
 declare function urlMatchKey(url: string): string | null;
-export { type AccountNextAction, type AccountStatus, type AnalyticsNextAction, type AnalyticsStatus, ApiSite, ApiSitemap, ApiSitemapContent, Auth, AuthClient, AuthOptions, BackfillProgress, CallOptions, DAYS_PER_RANGE, DataRow, DimensionFilter, DimensionFilterGroup, DiscoverSitemapOptions, Err, FetchSitemapUrlsOptions, GSCDUMP_ONBOARDING_CONTRACT_VERSION, GSCDUMP_OPTIONAL_INDEXING_SCOPE, GSCDUMP_REQUIRED_ANALYTICS_SCOPE, GSCDUMP_WRITE_ANALYTICS_SCOPE, GSC_FINALIZED_LAG_DAYS, GSC_FRESHEST_LAG_DAYS, GSC_INDEXING_SCOPE, GSC_QUOTAS, GSC_READ_SCOPE, GSC_RETENTION_MONTHS, GSC_SITE_VERIFICATION_SCOPE, GSC_WRITE_SCOPE, GoogleSearchConsoleClient, GoogleSearchConsoleClientOptions, GscApiError, GscApiErrorInfo, GscError, GscErrorKind, GscPropertyCandidate, GscdumpApiOptions, INDEXING_ISSUE_FILTERS, INDEXING_ISSUE_LABELS, INDEXING_ISSUE_SEVERITY, IndexStatusResult, IndexingEligibility, IndexingIneligibleReason, IndexingIssueType, IndexingMetadata, type IndexingNextAction, IndexingNotificationType, IndexingResult, type IndexingStatus, InspectUrlIndexResponse, InspectUrlResult, InspectionPriority, KNOWN_COVERAGE_STATES, KNOWN_PAGE_FETCH_STATES, type LifecycleError, type LifecycleErrorCode, type LifecycleProgress, type LifecycleWebhookEnvelope, type LifecycleWebhookEvent, MS_PER_DAY, MobileUsabilityResult, OAuthTokens, Ok, ParsedGscSiteUrl, ParsedIndexingResult, type PartnerLifecycleAccount, type PartnerLifecycleResponse, type PartnerLifecycleSite, Period, type PropertyNextAction, type PropertyStatus, PublishUrlNotificationResponse, QueryReturn, type QuerySourceMode, RequiredNonNullable, ResolvedAnalyticsRange, Result, RichResultsResult, SearchAnalyticsQuery, SearchAnalyticsResponse, Site, SiteAnalytics, type SitemapNextAction, type SitemapStatus, URL_INSPECTION_DAILY_LIMIT, URL_INSPECTION_EFFECTIVE_LIMIT, UnmappedInspectionReasons, UrlInspectionResult, UrlNotificationMetadata, VerificationMethod, VerificationSite, VerificationSiteType, VerificationToken, VerificationWebResource, accountNextActions, accountStatuses, addDays, addSite, analyticsNextActions, analyticsStatuses, batchInspectUrls, batchRequestIndexing, canUseUrlInspection, classifyError, countDays, createAuth, createFetch, daysAgo, decodeSiteId, deleteSite, deleteSitemap, discoverSitemap, encodeSiteId, err, exchangeAuthCode, exchangeAuthCodeResult, fetchSitemap, fetchSitemapUrls, fetchSitemaps, fetchSites, fetchSitesWithSitemaps, findBestGscProperty, findExactGscProperty, formatErrorForCli, formatGscPropertyCandidates, generateGscDateRange, getBackfillProgress, getDateRange, getFreshestGscDate, getIndexingEligibility, getIndexingMetadata, getLatestGscDate, getNextCheckAfter, getNextCheckPriority, getNextDate, getOldestGscDate, getPendingDates, getPreviousDate, getPstDate, getVerificationToken, getVerifiedSite, googleSearchConsole, grantedScopeList, groupIntoRanges, gscErrorToException, gscPropertyMatchesTarget, gscdumpApi, hasGoogleScope, hasGscReadScope, hasGscWriteScope, hasIndexingScope, hasOptionalIndexingScope, hasRequiredAnalyticsScope, indexingNextActions, indexingStatuses, inspectUrl, inspectUrlFlat, isErr, isOk, isPermissionDeniedError, isValidGscDate, isVerifiedGscPermission, isVerifiedGscProperty, lifecycleErrorCodes, lifecycleWebhookEvents, listVerifiedSites, mapErr, mapResult, matchGscSite, matchResult, normalizeGscSiteUrl, normalizeRegistrationTarget, normalizeSiteUrl, normalizeUrl, ok, parseGoogleError, parseGoogleScopes, parseGrantedScopes, parseGscSiteUrl, pickBestGscProperty, progressBar, propertyNextActions, propertyStatuses, querySourceModes, refreshAccessToken, refreshAccessTokenResult, requestIndexing, rethrowAsGscApiError, rowWithMetricDefaults, runSequentialBatch, siteUrlToVerificationSite, sitemapNextActions, sitemapStatuses, storageError, submitSitemap, toIsoDate, unmappedInspectionReasons, unverifySite, unwrapResult, urlMatchKey, verificationMethodsFor, verifySite };
+export { type AccountNextAction, type AccountStatus, type AnalyticsNextAction, type AnalyticsStatus, ApiSite, ApiSitemap, ApiSitemapContent, Auth, AuthClient, AuthOptions, BackfillProgress, CallOptions, DAYS_PER_RANGE, DataRow, DimensionFilter, DimensionFilterGroup, DiscoverSitemapOptions, Err, FetchSitemapUrlsOptions, FetchSitesWithSitemapsOptions, GSCDUMP_ONBOARDING_CONTRACT_VERSION, GSCDUMP_OPTIONAL_INDEXING_SCOPE, GSCDUMP_REQUIRED_ANALYTICS_SCOPE, GSCDUMP_WRITE_ANALYTICS_SCOPE, GSC_FINALIZED_LAG_DAYS, GSC_FRESHEST_LAG_DAYS, GSC_INDEXING_SCOPE, GSC_QUOTAS, GSC_READ_SCOPE, GSC_RETENTION_MONTHS, GSC_SITE_VERIFICATION_SCOPE, GSC_WRITE_SCOPE, GoogleSearchConsoleClient, GoogleSearchConsoleClientOptions, GscApiError, GscApiErrorInfo, GscError, GscErrorKind, GscPropertyCandidate, GscdumpApiOptions, INDEXING_ISSUE_FILTERS, INDEXING_ISSUE_LABELS, INDEXING_ISSUE_SEVERITY, IndexStatusResult, IndexingEligibility, IndexingIneligibleReason, IndexingIssueType, IndexingMetadata, type IndexingNextAction, IndexingNotificationType, IndexingResult, type IndexingStatus, InspectUrlIndexResponse, InspectUrlResult, InspectionPriority, KNOWN_COVERAGE_STATES, KNOWN_PAGE_FETCH_STATES, type LifecycleError, type LifecycleErrorCode, type LifecycleProgress, type LifecycleWebhookEnvelope, type LifecycleWebhookEvent, MS_PER_DAY, MobileUsabilityResult, OAuthTokens, Ok, ParsedGscSiteUrl, ParsedIndexingResult, type PartnerLifecycleAccount, type PartnerLifecycleResponse, type PartnerLifecycleSite, Period, type PropertyNextAction, type PropertyStatus, PublishUrlNotificationResponse, QueryReturn, type QuerySourceMode, RequiredNonNullable, ResolvedAnalyticsRange, Result, RichResultsResult, SearchAnalyticsQuery, SearchAnalyticsResponse, Site, SiteAnalytics, type SitemapNextAction, type SitemapStatus, URL_INSPECTION_DAILY_LIMIT, URL_INSPECTION_EFFECTIVE_LIMIT, UnmappedInspectionReasons, UrlInspectionResult, UrlNotificationMetadata, VerificationMethod, VerificationSite, VerificationSiteType, VerificationToken, VerificationWebResource, accountNextActions, accountStatuses, addDays, addSite, analyticsNextActions, analyticsStatuses, batchInspectUrls, batchRequestIndexing, canUseUrlInspection, classifyError, countDays, createAuth, createFetch, daysAgo, decodeSiteId, deleteSite, deleteSitemap, discoverSitemap, encodeSiteId, err, exchangeAuthCode, exchangeAuthCodeResult, fetchSitemap, fetchSitemapUrls, fetchSitemaps, fetchSites, fetchSitesWithSitemaps, findBestGscProperty, findExactGscProperty, formatErrorForCli, formatGscPropertyCandidates, generateGscDateRange, getBackfillProgress, getDateRange, getFreshestGscDate, getIndexingEligibility, getIndexingMetadata, getLatestGscDate, getNextCheckAfter, getNextCheckPriority, getNextDate, getOldestGscDate, getPendingDates, getPreviousDate, getPstDate, getVerificationToken, getVerifiedSite, googleSearchConsole, grantedScopeList, groupIntoRanges, gscErrorToException, gscPropertyMatchesTarget, gscdumpApi, hasGoogleScope, hasGscReadScope, hasGscWriteScope, hasIndexingScope, hasOptionalIndexingScope, hasRequiredAnalyticsScope, indexingNextActions, indexingStatuses, inspectUrl, inspectUrlFlat, isErr, isOk, isPermissionDeniedError, isValidGscDate, isVerifiedGscPermission, isVerifiedGscProperty, lifecycleErrorCodes, lifecycleWebhookEvents, listVerifiedSites, mapErr, mapResult, matchGscSite, matchResult, normalizeGscSiteUrl, normalizeRegistrationTarget, normalizeSiteUrl, normalizeUrl, ok, parseGoogleError, parseGoogleScopes, parseGrantedScopes, parseGscSiteUrl, pickBestGscProperty, progressBar, propertyNextActions, propertyStatuses, querySourceModes, refreshAccessToken, refreshAccessTokenResult, requestIndexing, resolveVerificationTarget, rethrowAsGscApiError, rowWithMetricDefaults, runSequentialBatch, siteUrlToVerificationSite, sitemapNextActions, sitemapStatuses, storageError, submitSitemap, toIsoDate, unmappedInspectionReasons, unverifySite, unwrapResult, urlMatchKey, verificationMethodsFor, verifySite };

package/dist/index.mjs

@@ -536,15 +536,16 @@ async function postOAuthTokenResult(body, op) {
 async function fetchSites(client) {
 	return client.sites();
 }
-async function fetchSitesWithSitemaps(client) {
+async function fetchSitesWithSitemaps(client, options = {}) {
 	const sites = (await client.sites()).filter((s) => !!s.siteUrl && s.permissionLevel !== "siteUnverifiedUser");
-	return Promise.all(sites.map(async (site) => {
+	const requestedConcurrency = options.concurrency ?? 4;
+	return runSequentialBatch(sites, async (site) => {
 		const sitemaps = await client.sitemaps.list(site.siteUrl).catch(() => []);
 		return {
 			...site,
 			sitemaps
 		};
-	}));
+	}, { concurrency: Number.isFinite(requestedConcurrency) ? Math.max(1, Math.floor(requestedConcurrency)) : 4 });
 }
 async function fetchSitemaps(client, siteUrl) {
 	return client.sitemaps.list(siteUrl);
@@ -565,6 +566,22 @@ async function deleteSite(client, siteUrl) {
 	return client.sites.delete(siteUrl);
 }
 const SC_DOMAIN_PREFIX = "sc-domain:";
+function bareDomain(siteUrl) {
+	if (siteUrl.startsWith(SC_DOMAIN_PREFIX)) return siteUrl.slice(10);
+	try {
+		return new URL(siteUrl.startsWith("http") ? siteUrl : `https://${siteUrl}`).host;
+	} catch {
+		return siteUrl;
+	}
+}
+function urlPrefix(siteUrl) {
+	try {
+		const url = new URL(siteUrl.startsWith("http") ? siteUrl : `https://${siteUrl}`);
+		return `${url.protocol}//${url.host}/`;
+	} catch {
+		return siteUrl;
+	}
+}
 function siteUrlToVerificationSite(siteUrl) {
 	if (siteUrl.startsWith(SC_DOMAIN_PREFIX)) return {
 		type: "INET_DOMAIN",
@@ -575,6 +592,32 @@ function siteUrlToVerificationSite(siteUrl) {
 		identifier: siteUrl
 	};
 }
+function resolveVerificationTarget(siteUrl, method) {
+	const isDomainProperty = siteUrl.startsWith(SC_DOMAIN_PREFIX);
+	const chosen = method ?? (isDomainProperty ? "DNS_TXT" : "META");
+	const isDns = chosen === "DNS_TXT" || chosen === "DNS_CNAME";
+	if (isDomainProperty && !isDns) return {
+		site: {
+			type: "INET_DOMAIN",
+			identifier: bareDomain(siteUrl)
+		},
+		method: "DNS_TXT"
+	};
+	if (isDns) return {
+		site: {
+			type: "INET_DOMAIN",
+			identifier: bareDomain(siteUrl)
+		},
+		method: chosen
+	};
+	return {
+		site: {
+			type: "SITE",
+			identifier: urlPrefix(siteUrl)
+		},
+		method: chosen
+	};
+}
 function verificationMethodsFor(site) {
 	if (site.type === "INET_DOMAIN") return ["DNS_TXT", "DNS_CNAME"];
 	return [
@@ -585,20 +628,20 @@ function verificationMethodsFor(site) {
 	];
 }
 async function getVerificationToken(client, siteUrl, method) {
-	const site = siteUrlToVerificationSite(siteUrl);
+	const { site, method: verificationMethod } = resolveVerificationTarget(siteUrl, method);
 	return {
 		...await client.verification.getToken({
 			site,
-			verificationMethod: method
+			verificationMethod
 		}),
 		site
 	};
 }
 async function verifySite(client, siteUrl, method) {
-	const site = siteUrlToVerificationSite(siteUrl);
+	const { site, method: verificationMethod } = resolveVerificationTarget(siteUrl, method);
 	return client.verification.insert({
 		site,
-		verificationMethod: method
+		verificationMethod
 	});
 }
 async function listVerifiedSites(client) {
@@ -3083,9 +3126,16 @@ function pickBestGscProperty(origin, availableSites) {
 	const matches = availableSites.filter((p) => matchGscSite(origin, p.siteUrl));
 	if (!matches.length) return void 0;
 	const isDomain = (p) => !!p.siteUrl?.startsWith("sc-domain:");
+	const isHttps = (p) => !!p.siteUrl?.startsWith("https://");
+	const pickTier = (pool) => pool.find(isDomain) ?? pool.find(isHttps) ?? pool[0];
 	const verified = matches.filter((p) => isVerifiedGscPermission(p.permissionLevel));
 	const pool = verified.length ? verified : matches;
-	return pool.find(isDomain) ?? pool[0];
+	const originHost = stripWww(parseGscSiteUrl(origin).hostname.toLowerCase());
+	const exact = pool.filter((property) => {
+		if (!property.siteUrl) return false;
+		return stripWww(parseGscSiteUrl(property.siteUrl).hostname.toLowerCase()) === originHost;
+	});
+	return pickTier(exact.length ? exact : pool);
 }
 function findBestGscProperty(targetDomain, properties) {
 	const cleanTarget = stripWww(targetDomain);
@@ -3220,4 +3270,4 @@ function urlMatchKey(url) {
 	if (!u) return null;
 	return [u.hostname.replace(/^www\./, ""), u.pathname.replace(/\/$/, "") || "/"].join("").toLowerCase();
 }
-export { DAYS_PER_RANGE, GSCDUMP_ONBOARDING_CONTRACT_VERSION, GSCDUMP_OPTIONAL_INDEXING_SCOPE, GSCDUMP_REQUIRED_ANALYTICS_SCOPE, GSCDUMP_WRITE_ANALYTICS_SCOPE, GSC_FINALIZED_LAG_DAYS, GSC_FRESHEST_LAG_DAYS, GSC_INDEXING_SCOPE, GSC_QUOTAS, GSC_READ_SCOPE, GSC_RETENTION_MONTHS, GSC_SITE_VERIFICATION_SCOPE, GSC_WRITE_SCOPE, GscApiError, INDEXING_ISSUE_FILTERS, INDEXING_ISSUE_LABELS, INDEXING_ISSUE_SEVERITY, KNOWN_COVERAGE_STATES, KNOWN_PAGE_FETCH_STATES, MS_PER_DAY, URL_INSPECTION_DAILY_LIMIT, URL_INSPECTION_EFFECTIVE_LIMIT, accountNextActions, accountStatuses, addDays, addSite, analyticsNextActions, analyticsStatuses, batchInspectUrls, batchRequestIndexing, canUseUrlInspection, classifyError, countDays, createAuth, createFetch, daysAgo, decodeSiteId, deleteSite, deleteSitemap, discoverSitemap, encodeSiteId, err, exchangeAuthCode, exchangeAuthCodeResult, fetchSitemap, fetchSitemapUrls, fetchSitemaps, fetchSites, fetchSitesWithSitemaps, findBestGscProperty, findExactGscProperty, formatErrorForCli, formatGscPropertyCandidates, generateGscDateRange, getBackfillProgress, getDateRange, getFreshestGscDate, getIndexingEligibility, getIndexingMetadata, getLatestGscDate, getNextCheckAfter, getNextCheckPriority, getNextDate, getOldestGscDate, getPendingDates, getPreviousDate, getPstDate, getVerificationToken, getVerifiedSite, googleSearchConsole, grantedScopeList, groupIntoRanges, gscErrorToException, gscPropertyMatchesTarget, gscdumpApi, hasGoogleScope, hasGscReadScope, hasGscWriteScope, hasIndexingScope, hasOptionalIndexingScope, hasRequiredAnalyticsScope, indexingNextActions, indexingStatuses, inspectUrl, inspectUrlFlat, isErr, isOk, isPermissionDeniedError, isValidGscDate, isVerifiedGscPermission, isVerifiedGscProperty, lifecycleErrorCodes, lifecycleWebhookEvents, listVerifiedSites, mapErr, mapResult, matchGscSite, matchResult, normalizeGscSiteUrl, normalizeRegistrationTarget, normalizeSiteUrl, normalizeUrl, ok, parseGoogleError, parseGoogleScopes, parseGrantedScopes, parseGscSiteUrl, pickBestGscProperty, progressBar, propertyNextActions, propertyStatuses, querySourceModes, refreshAccessToken, refreshAccessTokenResult, requestIndexing, rethrowAsGscApiError, rowWithMetricDefaults, runSequentialBatch, siteUrlToVerificationSite, sitemapNextActions, sitemapStatuses, storageError, submitSitemap, toIsoDate, unmappedInspectionReasons, unverifySite, unwrapResult, urlMatchKey, verificationMethodsFor, verifySite };
+export { DAYS_PER_RANGE, GSCDUMP_ONBOARDING_CONTRACT_VERSION, GSCDUMP_OPTIONAL_INDEXING_SCOPE, GSCDUMP_REQUIRED_ANALYTICS_SCOPE, GSCDUMP_WRITE_ANALYTICS_SCOPE, GSC_FINALIZED_LAG_DAYS, GSC_FRESHEST_LAG_DAYS, GSC_INDEXING_SCOPE, GSC_QUOTAS, GSC_READ_SCOPE, GSC_RETENTION_MONTHS, GSC_SITE_VERIFICATION_SCOPE, GSC_WRITE_SCOPE, GscApiError, INDEXING_ISSUE_FILTERS, INDEXING_ISSUE_LABELS, INDEXING_ISSUE_SEVERITY, KNOWN_COVERAGE_STATES, KNOWN_PAGE_FETCH_STATES, MS_PER_DAY, URL_INSPECTION_DAILY_LIMIT, URL_INSPECTION_EFFECTIVE_LIMIT, accountNextActions, accountStatuses, addDays, addSite, analyticsNextActions, analyticsStatuses, batchInspectUrls, batchRequestIndexing, canUseUrlInspection, classifyError, countDays, createAuth, createFetch, daysAgo, decodeSiteId, deleteSite, deleteSitemap, discoverSitemap, encodeSiteId, err, exchangeAuthCode, exchangeAuthCodeResult, fetchSitemap, fetchSitemapUrls, fetchSitemaps, fetchSites, fetchSitesWithSitemaps, findBestGscProperty, findExactGscProperty, formatErrorForCli, formatGscPropertyCandidates, generateGscDateRange, getBackfillProgress, getDateRange, getFreshestGscDate, getIndexingEligibility, getIndexingMetadata, getLatestGscDate, getNextCheckAfter, getNextCheckPriority, getNextDate, getOldestGscDate, getPendingDates, getPreviousDate, getPstDate, getVerificationToken, getVerifiedSite, googleSearchConsole, grantedScopeList, groupIntoRanges, gscErrorToException, gscPropertyMatchesTarget, gscdumpApi, hasGoogleScope, hasGscReadScope, hasGscWriteScope, hasIndexingScope, hasOptionalIndexingScope, hasRequiredAnalyticsScope, indexingNextActions, indexingStatuses, inspectUrl, inspectUrlFlat, isErr, isOk, isPermissionDeniedError, isValidGscDate, isVerifiedGscPermission, isVerifiedGscProperty, lifecycleErrorCodes, lifecycleWebhookEvents, listVerifiedSites, mapErr, mapResult, matchGscSite, matchResult, normalizeGscSiteUrl, normalizeRegistrationTarget, normalizeSiteUrl, normalizeUrl, ok, parseGoogleError, parseGoogleScopes, parseGrantedScopes, parseGscSiteUrl, pickBestGscProperty, progressBar, propertyNextActions, propertyStatuses, querySourceModes, refreshAccessToken, refreshAccessTokenResult, requestIndexing, resolveVerificationTarget, rethrowAsGscApiError, rowWithMetricDefaults, runSequentialBatch, siteUrlToVerificationSite, sitemapNextActions, sitemapStatuses, storageError, submitSitemap, toIsoDate, unmappedInspectionReasons, unverifySite, unwrapResult, urlMatchKey, verificationMethodsFor, verifySite };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gscdump",
   "type": "module",
-  "version": "0.38.2",
+  "version": "0.40.1",
   "description": "Google Search Console API wrapper with typed query builder, streaming pagination, and SEO analysis functions",
   "author": {
     "name": "Harlan Wilton",
@@ -100,10 +100,8 @@
   },
   "dependencies": {
     "date-fns": "^4.4.0",
-    "defu": "^6.1.7",
     "ofetch": "^1.5.1",
-    "ufo": "^1.6.4",
-    "@gscdump/contracts": "0.38.2"
+    "@gscdump/contracts": "0.40.1"
   },
   "devDependencies": {
     "@googleapis/indexing": "^6.0.1",