@gscdump/cli 2.1.0 → 2.2.0

package/README.md

@@ -48,7 +48,7 @@ gscdump mcp
 | `sites add <url>` / `sites delete <url> [--yes]` | Register / remove a property in Search Console (add registers in unverified state) |
 | `sites verify-token <url> [--method]` / `sites verify <url> [--method]` | Get a verification token, then trigger ownership verification (META/FILE/DNS_TXT/DNS_CNAME/ANALYTICS/TAG_MANAGER) |
 | `sitemaps` | GSC CRUD, explicit live probes, and hosted canonical reads (`current`, `history`, `membership`, `lastmod`, `export`) |
-| `inspect <url>` / `inspect batch [--concurrency]` | URL inspection (single URL or batch from file/stdin); renders index status, rich results, AMP, mobile usability |
+| `inspect <url>` / `inspect batch [--concurrency]` | URL inspection (single URL or batch from file/stdin); renders index status, rich results, and AMP |
 | `indexing` | Notify Google about URL changes (`submit`, `remove`, `status`, `batch [--concurrency] [--yes]`); supports `--retries` |
 | `sync` | Sync GSC data to the local Parquet store; `--retry-failed`, `--dry-run` |
 | `query` | Run a search analytics query (local store by default; `--live` hits GSC API). Filters: `--query`, `--page`, `--country`, `--device`, `--search-appearance`, `--type`, `--data-state`, `--aggregation-type`. `--explain` previews the request body; `--output -` writes to stdout. |

package/dist/analysis-local.mjs

@@ -17,7 +17,8 @@ async function hasLocalData(store, siteUrl) {
 	})).length > 0;
 }
 async function listLocalSites(dataDir, userId = "local") {
-	return readdir(join(dataDir, `u_${userId}`), { withFileTypes: true }).then((entries) => entries.filter((e) => e.isDirectory() && (e.name.startsWith("d_") || e.name.startsWith("h_"))).map((e) => decodeSiteId(e.name))).catch(() => []);
+	const tenantDir = join(dataDir, `u_${userId}`);
+	return readdir(tenantDir, { withFileTypes: true }).then((entries) => entries.filter((e) => e.isDirectory() && (e.name.startsWith("d_") || e.name.startsWith("h_"))).map((e) => decodeSiteId(e.name))).catch(() => []);
 }
 function pickLocalSite(siteUrls, hint) {
 	if (siteUrls.length === 0) return null;

package/dist/auth.mjs

@@ -257,7 +257,7 @@ async function getAuthCodeViaLoopback(authUrl) {
 		server.on("error", (err) => settle(() => reject(err)));
 		timeoutId = setTimeout(() => {
 			settle(() => reject(/* @__PURE__ */ new Error("Authorization timed out. If Google showed \"redirect_uri_mismatch\", your OAuth client must be type \"Desktop application\" (create one at https://console.cloud.google.com/apis/credentials and run `gscdump init --force`).")));
-		}, 300 * 1e3);
+		}, 3e5);
 	});
 }
 async function authenticate(credentials, interactive, opts = {}) {

package/dist/cli.mjs

@@ -28,8 +28,9 @@ function prepareCliArgs(input) {
 		stderrIsTTY: Boolean(process.stderr.isTTY)
 	});
 	const profile = pluckArgValue(rawArgs, "--profile");
+	const configDir = pluckArgValue(rawArgs, "--config-dir") ?? env.configDir ?? null;
 	applyProfileFromCli({
-		configDir: pluckArgValue(rawArgs, "--config-dir") ?? env.configDir ?? null,
+		configDir,
 		profile,
 		envProfile: env.profile
 	});

package/dist/commands/analyze.mjs

@@ -304,30 +304,31 @@ function renderResults(results, total, format) {
 	logger.success(`${results.length} results`);
 	if (total > results.length) logger.info(`Total: ${total} (showing ${results.length})`);
 }
+const listCommand = defineCommand({
+	meta: {
+		name: "list",
+		description: "List available analyzer ids"
+	},
+	args: { json: {
+		type: "boolean",
+		default: false,
+		description: "Output as JSON"
+	} },
+	async run({ args }) {
+		if (args.json) {
+			console.log(JSON.stringify(ANALYSIS_TOOLS, null, 2));
+			return;
+		}
+		for (const id of ANALYSIS_TOOLS) console.log(id);
+	}
+});
 const analyzeCommand = defineCommand({
 	meta: {
 		name: "analyze",
 		description: "SEO analysis tools"
 	},
 	subCommands: {
-		list: defineCommand({
-			meta: {
-				name: "list",
-				description: "List available analyzer ids"
-			},
-			args: { json: {
-				type: "boolean",
-				default: false,
-				description: "Output as JSON"
-			} },
-			async run({ args }) {
-				if (args.json) {
-					console.log(JSON.stringify(ANALYSIS_TOOLS, null, 2));
-					return;
-				}
-				for (const id of ANALYSIS_TOOLS) console.log(id);
-			}
-		}),
+		list: listCommand,
 		...Object.fromEntries(ANALYSIS_TOOLS.map((tool) => [tool, makeToolCommand(tool)]))
 	}
 });

package/dist/commands/config.mjs

@@ -40,6 +40,174 @@ const VALID_KEYS = [
 	"serviceAccountPath"
 ];
 const NUMERIC_KEYS = /* @__PURE__ */ new Set(["defaultLimit"]);
+const setCommand = defineCommand({
+	meta: {
+		name: "set",
+		description: "Set a config value"
+	},
+	args: {
+		key: {
+			type: "positional",
+			description: `Config key (${VALID_KEYS.join(", ")})`,
+			required: true
+		},
+		value: {
+			type: "positional",
+			description: "Value to set",
+			required: true
+		},
+		...OUTPUT_ARGS
+	},
+	async run({ args }) {
+		applyOutputMode(args);
+		if (!VALID_KEYS.includes(args.key)) {
+			logger.error(`Invalid key: ${args.key}`);
+			logger.info(`Valid keys: ${VALID_KEYS.join(", ")}`);
+			process.exit(1);
+		}
+		const config = await loadConfig();
+		const value = NUMERIC_KEYS.has(args.key) ? Number(args.value) : args.value;
+		if (NUMERIC_KEYS.has(args.key) && !Number.isFinite(value)) {
+			logger.error(`Invalid numeric value for ${args.key}: ${args.value}`);
+			process.exit(1);
+		}
+		config[args.key] = value;
+		await saveConfig(config);
+		logger.success(`Set ${args.key} = ${value}`);
+	}
+});
+const unsetCommand = defineCommand({
+	meta: {
+		name: "unset",
+		description: "Remove a config value"
+	},
+	args: {
+		key: {
+			type: "positional",
+			description: `Config key to remove (${VALID_KEYS.join(", ")})`,
+			required: true
+		},
+		...OUTPUT_ARGS
+	},
+	async run({ args }) {
+		applyOutputMode(args);
+		if (!VALID_KEYS.includes(args.key)) {
+			logger.error(`Invalid key: ${args.key}`);
+			logger.info(`Valid keys: ${VALID_KEYS.join(", ")}`);
+			process.exit(1);
+		}
+		const config = await loadConfig();
+		delete config[args.key];
+		await saveConfig(config);
+		logger.success(`Removed ${args.key}`);
+	}
+});
+const pathCommand = defineCommand({
+	meta: {
+		name: "path",
+		description: "Show config file path"
+	},
+	run() {
+		console.log(getConfigPath());
+	}
+});
+const validateCommand = defineCommand({
+	meta: {
+		name: "validate",
+		description: "Validate the saved config (defaultSite is verified, dataDir exists/writable)"
+	},
+	args: { ...OUTPUT_ARGS },
+	async run({ args }) {
+		const { json } = applyOutputMode(args);
+		const { resolveDataDir } = await import("../config.mjs");
+		const fs = await import("node:fs/promises");
+		const config = await loadConfig();
+		const issues = [];
+		const dataDir = resolveDataDir(config);
+		const dataDirDisplay = displayPath(dataDir);
+		const stat = await fs.stat(dataDir).catch(() => null);
+		if (stat && !stat.isDirectory()) issues.push({
+			key: "dataDir",
+			level: "fail",
+			message: `${dataDirDisplay} is not a directory`
+		});
+		else if (stat) {
+			const probe = `${dataDir}/.gscdump-config-probe`;
+			if (!await fs.writeFile(probe, "").then(() => fs.rm(probe)).then(() => true).catch(() => false)) issues.push({
+				key: "dataDir",
+				level: "fail",
+				message: `${dataDirDisplay} not writable`
+			});
+		} else issues.push({
+			key: "dataDir",
+			level: "warn",
+			message: `${dataDirDisplay} does not exist (will be created on first sync)`
+		});
+		if (config.defaultSite) {
+			if (!!config.clientId && !!config.clientSecret) {
+				const { createCommandContext } = await import("../context.mjs");
+				const ctx = await createCommandContext({ needsAuth: true }).catch(() => null);
+				if (ctx) {
+					const sites = await ctx.loadSites().catch(() => null);
+					if (sites && !sites.some((s) => s.siteUrl === config.defaultSite || s.siteUrl.includes(String(config.defaultSite)))) issues.push({
+						key: "defaultSite",
+						level: "fail",
+						message: `${config.defaultSite} is not in the verified site list`
+					});
+				}
+			} else issues.push({
+				key: "defaultSite",
+				level: "warn",
+				message: "set, but auth not configured — skipping verification"
+			});
+		}
+		if (config.defaultFormat && !["json", "csv"].includes(config.defaultFormat)) issues.push({
+			key: "defaultFormat",
+			level: "fail",
+			message: `unknown format: ${config.defaultFormat}`
+		});
+		const { SearchTypes } = await import("gscdump/query");
+		const allowedSearchTypes = Object.values(SearchTypes);
+		if (config.defaultSearchType && !allowedSearchTypes.includes(config.defaultSearchType)) issues.push({
+			key: "defaultSearchType",
+			level: "fail",
+			message: `unknown search type: ${config.defaultSearchType} (allowed: ${allowedSearchTypes.join(", ")})`
+		});
+		const allowedDataStates = [
+			"all",
+			"final",
+			"hourly_all"
+		];
+		if (config.defaultDataState && !allowedDataStates.includes(config.defaultDataState)) issues.push({
+			key: "defaultDataState",
+			level: "fail",
+			message: `unknown data state: ${config.defaultDataState} (allowed: ${allowedDataStates.join(", ")})`
+		});
+		if (config.serviceAccountPath) {
+			if (!await fs.stat(config.serviceAccountPath).catch(() => null)) issues.push({
+				key: "serviceAccountPath",
+				level: "fail",
+				message: `${displayPath(config.serviceAccountPath)} does not exist`
+			});
+		}
+		if (json) {
+			console.log(JSON.stringify({
+				ok: !issues.some((i) => i.level === "fail"),
+				issues
+			}, null, 2));
+			return;
+		}
+		if (issues.length === 0) {
+			logger.success("Config OK");
+			return;
+		}
+		for (const i of issues) {
+			const prefix = i.level === "fail" ? "\x1B[31m✗\x1B[0m" : "\x1B[33m!\x1B[0m";
+			console.log(`  ${prefix} ${i.key}: ${i.message}`);
+		}
+		if (issues.some((i) => i.level === "fail")) process.exit(1);
+	}
+});
 const configCommand = defineCommand({
 	meta: {
 		name: "config",
@@ -47,172 +215,10 @@ const configCommand = defineCommand({
 	},
 	subCommands: {
 		show: showCommand,
-		set: defineCommand({
-			meta: {
-				name: "set",
-				description: "Set a config value"
-			},
-			args: {
-				key: {
-					type: "positional",
-					description: `Config key (${VALID_KEYS.join(", ")})`,
-					required: true
-				},
-				value: {
-					type: "positional",
-					description: "Value to set",
-					required: true
-				},
-				...OUTPUT_ARGS
-			},
-			async run({ args }) {
-				applyOutputMode(args);
-				if (!VALID_KEYS.includes(args.key)) {
-					logger.error(`Invalid key: ${args.key}`);
-					logger.info(`Valid keys: ${VALID_KEYS.join(", ")}`);
-					process.exit(1);
-				}
-				const config = await loadConfig();
-				const value = NUMERIC_KEYS.has(args.key) ? Number(args.value) : args.value;
-				if (NUMERIC_KEYS.has(args.key) && !Number.isFinite(value)) {
-					logger.error(`Invalid numeric value for ${args.key}: ${args.value}`);
-					process.exit(1);
-				}
-				config[args.key] = value;
-				await saveConfig(config);
-				logger.success(`Set ${args.key} = ${value}`);
-			}
-		}),
-		unset: defineCommand({
-			meta: {
-				name: "unset",
-				description: "Remove a config value"
-			},
-			args: {
-				key: {
-					type: "positional",
-					description: `Config key to remove (${VALID_KEYS.join(", ")})`,
-					required: true
-				},
-				...OUTPUT_ARGS
-			},
-			async run({ args }) {
-				applyOutputMode(args);
-				if (!VALID_KEYS.includes(args.key)) {
-					logger.error(`Invalid key: ${args.key}`);
-					logger.info(`Valid keys: ${VALID_KEYS.join(", ")}`);
-					process.exit(1);
-				}
-				const config = await loadConfig();
-				delete config[args.key];
-				await saveConfig(config);
-				logger.success(`Removed ${args.key}`);
-			}
-		}),
-		path: defineCommand({
-			meta: {
-				name: "path",
-				description: "Show config file path"
-			},
-			run() {
-				console.log(getConfigPath());
-			}
-		}),
-		validate: defineCommand({
-			meta: {
-				name: "validate",
-				description: "Validate the saved config (defaultSite is verified, dataDir exists/writable)"
-			},
-			args: { ...OUTPUT_ARGS },
-			async run({ args }) {
-				const { json } = applyOutputMode(args);
-				const { resolveDataDir } = await import("../config.mjs");
-				const fs = await import("node:fs/promises");
-				const config = await loadConfig();
-				const issues = [];
-				const dataDir = resolveDataDir(config);
-				const dataDirDisplay = displayPath(dataDir);
-				const stat = await fs.stat(dataDir).catch(() => null);
-				if (stat && !stat.isDirectory()) issues.push({
-					key: "dataDir",
-					level: "fail",
-					message: `${dataDirDisplay} is not a directory`
-				});
-				else if (stat) {
-					const probe = `${dataDir}/.gscdump-config-probe`;
-					if (!await fs.writeFile(probe, "").then(() => fs.rm(probe)).then(() => true).catch(() => false)) issues.push({
-						key: "dataDir",
-						level: "fail",
-						message: `${dataDirDisplay} not writable`
-					});
-				} else issues.push({
-					key: "dataDir",
-					level: "warn",
-					message: `${dataDirDisplay} does not exist (will be created on first sync)`
-				});
-				if (config.defaultSite) if (!!config.clientId && !!config.clientSecret) {
-					const { createCommandContext } = await import("../context.mjs");
-					const ctx = await createCommandContext({ needsAuth: true }).catch(() => null);
-					if (ctx) {
-						const sites = await ctx.loadSites().catch(() => null);
-						if (sites && !sites.some((s) => s.siteUrl === config.defaultSite || s.siteUrl.includes(String(config.defaultSite)))) issues.push({
-							key: "defaultSite",
-							level: "fail",
-							message: `${config.defaultSite} is not in the verified site list`
-						});
-					}
-				} else issues.push({
-					key: "defaultSite",
-					level: "warn",
-					message: "set, but auth not configured — skipping verification"
-				});
-				if (config.defaultFormat && !["json", "csv"].includes(config.defaultFormat)) issues.push({
-					key: "defaultFormat",
-					level: "fail",
-					message: `unknown format: ${config.defaultFormat}`
-				});
-				const { SearchTypes } = await import("gscdump/query");
-				const allowedSearchTypes = Object.values(SearchTypes);
-				if (config.defaultSearchType && !allowedSearchTypes.includes(config.defaultSearchType)) issues.push({
-					key: "defaultSearchType",
-					level: "fail",
-					message: `unknown search type: ${config.defaultSearchType} (allowed: ${allowedSearchTypes.join(", ")})`
-				});
-				const allowedDataStates = [
-					"all",
-					"final",
-					"hourly_all"
-				];
-				if (config.defaultDataState && !allowedDataStates.includes(config.defaultDataState)) issues.push({
-					key: "defaultDataState",
-					level: "fail",
-					message: `unknown data state: ${config.defaultDataState} (allowed: ${allowedDataStates.join(", ")})`
-				});
-				if (config.serviceAccountPath) {
-					if (!await fs.stat(config.serviceAccountPath).catch(() => null)) issues.push({
-						key: "serviceAccountPath",
-						level: "fail",
-						message: `${displayPath(config.serviceAccountPath)} does not exist`
-					});
-				}
-				if (json) {
-					console.log(JSON.stringify({
-						ok: !issues.some((i) => i.level === "fail"),
-						issues
-					}, null, 2));
-					return;
-				}
-				if (issues.length === 0) {
-					logger.success("Config OK");
-					return;
-				}
-				for (const i of issues) {
-					const prefix = i.level === "fail" ? "\x1B[31m✗\x1B[0m" : "\x1B[33m!\x1B[0m";
-					console.log(`  ${prefix} ${i.key}: ${i.message}`);
-				}
-				if (issues.some((i) => i.level === "fail")) process.exit(1);
-			}
-		})
+		set: setCommand,
+		unset: unsetCommand,
+		path: pathCommand,
+		validate: validateCommand
 	},
 	async run({ args }) {
 		if (!noSubcommandSelected("config", [

package/dist/commands/doctor.mjs

@@ -17,7 +17,7 @@ const REQUIRED_SCOPES = [
 	"https://www.googleapis.com/auth/siteverification"
 ];
 const FETCH_TIMEOUT_MS = 5e3;
-const TIME_SKEW_WARN_MS = 5 * 6e4;
+const TIME_SKEW_WARN_MS = 3e5;
 const WATERMARK_STALE_DAYS_WARN = 7;
 const RELEVANT_ENV_KEYS = [
 	"GSC_ACCESS_TOKEN",

package/dist/commands/dump.mjs

@@ -176,7 +176,8 @@ async function dumpRowFormat(store, entries, outDir, siteUrl, format) {
 	let files = 0;
 	let totalRows = 0;
 	for (const [table, tableEntries] of byTable) {
-		const rows = await readParquetRows(tableEntries.map((e) => path.join(store.dataDir, e.objectKey)), table);
+		const filePaths = tableEntries.map((e) => path.join(store.dataDir, e.objectKey));
+		const rows = await readParquetRows(filePaths, table);
 		const ext = format === "csv" ? "csv" : format === "ndjson" ? "ndjson" : "json";
 		const target = path.join(siteDir, `${table}.${ext}`);
 		let body;