@gscdump/cli 3.8.0 → 4.0.0

package/dist/commands/sites.mjs

@@ -1,10 +1,11 @@
 import { sitesCommandMeta } from "../command-meta.mjs";
+import { formatHostedSync, getCloudSites } from "../auth-state.mjs";
 import { OUTPUT_ARGS, applyOutputMode, logger } from "../utils.mjs";
-import { createCommandContext } from "../context.mjs";
-import { gscErrorHandler } from "../error-handler.mjs";
+import { createCommandContext, formatSiteResolution } from "../context.mjs";
 import process from "node:process";
 import { defineCommand } from "citty";
 import { confirm, isCancel } from "@clack/prompts";
+import { resolveSiteInput } from "gscdump";
 import { addSite, deleteSite, fetchSitesWithSitemaps, getVerificationToken, getVerifiedSite, listVerifiedSites, siteUrlToVerificationSite, unverifySite, verificationMethodsFor, verifySite } from "gscdump/sites";
 const ALL_METHODS = [
 	"META",
@@ -101,7 +102,7 @@ const addCommand = defineCommand({
 	async run({ args }) {
 		applyOutputMode(args);
 		const ctx = await createCommandContext({ needsAuth: true });
-		await addSite(ctx.client, args.url).catch(gscErrorHandler);
+		await addSite(ctx.client, args.url);
 		if (!args.verify) {
 			if (args.json) {
 				console.log(JSON.stringify({
@@ -118,7 +119,7 @@ const addCommand = defineCommand({
 			return;
 		}
 		const method = validateMethod(args.url, args.method ?? pickDefaultMethod(args.url));
-		const tokenResult = await getVerificationToken(ctx.client, args.url, method).catch(gscErrorHandler);
+		const tokenResult = await getVerificationToken(ctx.client, args.url, method);
 		if (args.json) {
 			console.log(JSON.stringify({
 				siteUrl: args.url,
@@ -141,7 +142,7 @@ const addCommand = defineCommand({
 			logger.info("Skipped verification. Run `gscdump sites verify` once the token is live.");
 			return;
 		}
-		const resource = await verifySite(ctx.client, args.url, method).catch(gscErrorHandler);
+		const resource = await verifySite(ctx.client, args.url, method);
 		logger.success(`Verified: ${args.url}`);
 		if (resource.owners?.length) {
 			console.log();
@@ -182,7 +183,7 @@ const deleteCommand = defineCommand({
 			}
 		}
 		const ctx = await createCommandContext({ needsAuth: true });
-		await deleteSite(ctx.client, args.url).catch(gscErrorHandler);
+		await deleteSite(ctx.client, args.url);
 		if (args.json) {
 			console.log(JSON.stringify({
 				siteUrl: args.url,
@@ -202,7 +203,7 @@ const verifyTokenCommand = defineCommand({
 		url: {
 			type: "positional",
 			required: true,
-			description: "Property URL"
+			description: "Site, for example example.com"
 		},
 		method: {
 			type: "string",
@@ -215,7 +216,7 @@ const verifyTokenCommand = defineCommand({
 		applyOutputMode(args);
 		const method = validateMethod(args.url, args.method ?? pickDefaultMethod(args.url));
 		const ctx = await createCommandContext({ needsAuth: true });
-		const result = await getVerificationToken(ctx.client, args.url, method).catch(gscErrorHandler);
+		const result = await getVerificationToken(ctx.client, args.url, method);
 		if (args.json) {
 			console.log(JSON.stringify({
 				siteUrl: args.url,
@@ -237,7 +238,7 @@ const verifyCommand = defineCommand({
 		url: {
 			type: "positional",
 			required: true,
-			description: "Property URL"
+			description: "Site, for example example.com"
 		},
 		method: {
 			type: "string",
@@ -250,7 +251,7 @@ const verifyCommand = defineCommand({
 		applyOutputMode(args);
 		const method = validateMethod(args.url, args.method ?? pickDefaultMethod(args.url));
 		const ctx = await createCommandContext({ needsAuth: true });
-		const resource = await verifySite(ctx.client, args.url, method).catch(gscErrorHandler);
+		const resource = await verifySite(ctx.client, args.url, method);
 		if (args.json) {
 			console.log(JSON.stringify({
 				siteUrl: args.url,
@@ -283,7 +284,7 @@ const verifyGetCommand = defineCommand({
 	async run({ args }) {
 		applyOutputMode(args);
 		const ctx = await createCommandContext({ needsAuth: true });
-		const resource = await getVerifiedSite(ctx.client, args.id).catch(gscErrorHandler);
+		const resource = await getVerifiedSite(ctx.client, args.id);
 		if (args.json) {
 			console.log(JSON.stringify(resource, null, 2));
 			return;
@@ -332,7 +333,7 @@ const unverifyCommand = defineCommand({
 			}
 		}
 		const ctx = await createCommandContext({ needsAuth: true });
-		await unverifySite(ctx.client, args.id).catch(gscErrorHandler);
+		await unverifySite(ctx.client, args.id);
 		if (args.json) {
 			console.log(JSON.stringify({
 				id: args.id,
@@ -352,7 +353,7 @@ const verifyListCommand = defineCommand({
 	async run({ args }) {
 		applyOutputMode(args);
 		const ctx = await createCommandContext({ needsAuth: true });
-		const resources = await listVerifiedSites(ctx.client).catch(gscErrorHandler);
+		const resources = await listVerifiedSites(ctx.client);
 		if (args.json) {
 			console.log(JSON.stringify(resources, null, 2));
 			return;
@@ -382,21 +383,20 @@ const getCommand = defineCommand({
 		url: {
 			type: "positional",
 			required: true,
-			description: "Property URL"
+			description: "Site, for example example.com"
 		},
 		...OUTPUT_ARGS
 	},
 	async run({ args }) {
 		applyOutputMode(args);
-		const site = (await (await createCommandContext({ needsAuth: true })).loadSites()).find((s) => s.siteUrl === args.url);
-		if (!site) {
-			if (args.json) {
-				console.log(JSON.stringify(null));
-				process.exit(1);
-			}
-			logger.error(`Not found: ${args.url}`);
+		const all = await (await createCommandContext({ needsAuth: true })).loadSites();
+		const resolution = resolveSiteInput(String(args.url), all);
+		if (resolution.kind !== "resolved") {
+			if (args.json) console.log(JSON.stringify(null));
+			logger.error(formatSiteResolution(resolution, "account"));
 			process.exit(1);
 		}
+		const site = all.find((s) => s.siteUrl === resolution.siteUrl);
 		if (args.json) {
 			console.log(JSON.stringify(site, null, 2));
 			return;
@@ -426,7 +426,7 @@ async function runListSites(args) {
 	const ctx = await createCommandContext({ needsAuth: true });
 	const ownerOnly = Boolean(args["owner-only"]);
 	if (args["with-sitemaps"]) {
-		const all = await fetchSitesWithSitemaps(ctx.client).catch(gscErrorHandler);
+		const all = await fetchSitesWithSitemaps(ctx.client);
 		const sites = ownerOnly ? all.filter((s) => s.permissionLevel === "siteOwner") : all;
 		if (args.json) {
 			const enriched = sites.map((s) => ({
@@ -458,8 +458,22 @@ async function runListSites(args) {
 	}
 	const all = await ctx.loadSites();
 	const sites = ownerOnly ? all.filter((s) => s.permissionLevel === "siteOwner") : all;
+	const hosted = ctx.authentication._tag === "Cloud" ? await getCloudSites(ctx.authentication).then((list) => new Map(list.map((site) => [site.siteUrl, site])), (error) => {
+		logger.warn(`Hosted sync status is not available: ${error.message}`);
+	}) : void 0;
 	if (args.json) {
-		console.log(JSON.stringify(sites, null, 2));
+		console.log(JSON.stringify(hosted ? sites.map((site) => {
+			const entry = hosted.get(site.siteUrl);
+			return {
+				...site,
+				hostedSync: entry?.registered ? {
+					syncStatus: entry.syncStatus ?? null,
+					syncProgress: entry.syncProgress ?? null,
+					oldestDateSynced: entry.oldestDateSynced ?? null,
+					newestDateSynced: entry.newestDateSynced ?? null
+				} : null
+			};
+		}) : sites, null, 2));
 		return;
 	}
 	if (sites.length === 0) {
@@ -470,7 +484,9 @@ async function runListSites(args) {
 	console.log();
 	for (const site of sites) {
 		const perm = site.permissionLevel === "siteOwner" ? "\x1B[32m" : "\x1B[90m";
-		console.log(`  ${site.siteUrl} ${perm}(${site.permissionLevel})\x1B[0m`);
+		const entry = hosted?.get(site.siteUrl);
+		const sync = entry ? formatHostedSync(entry) : void 0;
+		console.log(`  ${site.siteUrl} ${perm}(${site.permissionLevel})\x1B[0m${sync ? `  hosted sync ${sync}` : ""}`);
 	}
 }
 const listCommand = defineCommand({

package/dist/commands/stats.mjs

@@ -1,14 +1,13 @@
 import { terminalOutputOptions } from "../render/terminal.mjs";
-import { OUTPUT_ARGS, applyOutputMode, displayPath, formatAge, logger } from "../utils.mjs";
+import { OUTPUT_ARGS, applyOutputMode, displayPath, formatAge } from "../utils.mjs";
 import { allTables, tableDimensions } from "../local-store.mjs";
-import { createCommandContext } from "../context.mjs";
+import { readSiteMap, siteUrlForId } from "../store-sites.mjs";
+import { createCommandContext, siteArg } from "../context.mjs";
 import { renderTable, textLines } from "../render/layout.mjs";
 import { formatMetric } from "../render/metrics.mjs";
 import { barColumn } from "../render/charts.mjs";
 import { columnsFor } from "../render/analysis.mjs";
-import process from "node:process";
 import { defineCommand } from "citty";
-import { decodeSiteId, parseGscSiteUrl } from "gscdump";
 import { filesystemStats } from "@gscdump/engine/filesystem";
 const statsCommand = defineCommand({
 	meta: {
@@ -19,19 +18,17 @@ const statsCommand = defineCommand({
 		...OUTPUT_ARGS,
 		site: {
 			type: "string",
-			description: "Limit to one site URL (sc-domain:example.com, https://example.com/, ...)"
+			description: "Limit to one Site, for example example.com"
 		}
 	},
 	async run({ args }) {
 		const { json } = applyOutputMode(args);
-		const store = (await createCommandContext({ needsStore: true })).store;
-		const allEntries = await store.engine.listAll({ userId: store.userId });
-		const knownSites = [...new Set(allEntries.filter((entry) => entry.retiredAt === void 0 && entry.siteId !== void 0).map((entry) => entry.siteId))];
-		const siteId = args.site ? store.siteIdFor(args.site) : void 0;
-		if (args.site && !json && !knownSites.includes(siteId)) {
-			logger.error(`No local data for --site=${args.site}. Known site IDs: ${knownSites.length === 0 ? "(none — run `gscdump sync` first)" : knownSites.join(", ")}`);
-			process.exit(1);
-		}
+		const ctx = await createCommandContext({ needsStore: true });
+		const store = ctx.store;
+		const siteUrl = args.site ? await ctx.resolveSite(String(args.site), { scope: "store" }) : void 0;
+		const siteId = siteUrl ? store.siteIdFor(siteUrl) : void 0;
+		const [allEntries, siteMap] = await Promise.all([store.engine.listAll({ userId: store.userId }), readSiteMap(store.dataDir, store.userId)]);
+		const knownSites = [...new Set(allEntries.filter((entry) => entry.retiredAt === void 0 && entry.siteId !== void 0).map((entry) => siteUrlForId(siteMap, entry.siteId)))];
 		const selectedEntries = siteId === void 0 ? allEntries : allEntries.filter((entry) => entry.siteId === siteId);
 		const perTable = allTables().map((table) => {
 			const all = selectedEntries.filter((entry) => entry.table === table);
@@ -48,9 +45,9 @@ const statsCommand = defineCommand({
 		if (json) {
 			const payload = {
 				dataDir: store.dataDir,
-				siteId: siteId ?? null,
+				siteUrl: siteUrl ?? null,
 				knownSites,
-				nextCommand: `gscdump sync${args.site ? ` --site '${String(args.site).replaceAll("'", "'\\''")}'` : ""} --status --json`,
+				nextCommand: `gscdump sync${siteUrl ? ` --site ${siteArg(siteUrl)}` : ""} --status --json`,
 				disk,
 				tables: perTable.map(({ table, live, retired }) => ({
 					table,
@@ -61,7 +58,7 @@ const statsCommand = defineCommand({
 					retiredFiles: retired.length,
 					retiredBytes: sumBytes(retired),
 					watermarks: watermarks.filter((w) => w.table === table).map((w) => ({
-						siteId: w.siteId ?? null,
+						siteUrl: w.siteId ? siteUrlForId(siteMap, w.siteId) : null,
 						searchType: w.searchType ?? "web",
 						newestDateSynced: w.newestDateSynced,
 						oldestDateSynced: w.oldestDateSynced,
@@ -107,7 +104,7 @@ const statsCommand = defineCommand({
 		];
 		if (rows.length > 1) lines.push(...textLines(`Total ${formatMetric("bytes", rows.reduce((sum, row) => sum + row.liveBytes, 0))} live`, options, "muted"));
 		if (watermarks.length) lines.push("", ...renderTable(sortWatermarks(watermarks).map((w) => ({
-			scope: w.siteId ? `${w.table}@${parseGscSiteUrl(decodeSiteId(w.siteId)).hostname}` : w.table,
+			scope: w.siteId ? `${w.table}@${siteArg(siteUrlForId(siteMap, w.siteId))}` : w.table,
 			dates: `${w.oldestDateSynced} to ${w.newestDateSynced}`,
 			synced: formatAge(w.lastSyncAt)
 		})), [

package/dist/commands/store-purge.mjs

@@ -1,4 +1,5 @@
 import { OUTPUT_ARGS, applyOutputMode, logger } from "../utils.mjs";
+import { removeStoreSite } from "../store-sites.mjs";
 import { createCommandContext } from "../context.mjs";
 import process from "node:process";
 import { defineCommand } from "citty";
@@ -12,7 +13,7 @@ const rmSiteCommand = defineCommand({
 		site: {
 			type: "positional",
 			required: true,
-			description: "Site URL (e.g. sc-domain:example.com)"
+			description: "Site, for example example.com"
 		},
 		yes: {
 			type: "boolean",
@@ -24,11 +25,13 @@ const rmSiteCommand = defineCommand({
 	},
 	async run({ args }) {
 		const { json } = applyOutputMode(args);
-		const store = (await createCommandContext({ needsStore: true })).store;
-		const siteId = store.siteIdFor(String(args.site));
+		const ctx = await createCommandContext({ needsStore: true });
+		const store = ctx.store;
+		const siteUrl = await ctx.resolveSite(String(args.site), { scope: "store" });
+		const siteId = store.siteIdFor(siteUrl);
 		if (!args.yes && !json) {
 			const ok = await confirm({
-				message: `Delete ALL local data for ${args.site}? This is irreversible.`,
+				message: `Delete ALL local data for ${siteUrl}? This is irreversible.`,
 				initialValue: false
 			});
 			if (isCancel(ok) || !ok) {
@@ -40,11 +43,12 @@ const rmSiteCommand = defineCommand({
 			userId: store.userId,
 			siteId
 		});
+		await removeStoreSite(store.dataDir, siteId, store.userId);
 		if (json) {
 			console.log(JSON.stringify(result, null, 2));
 			return;
 		}
-		logger.success(`Removed local data for ${args.site}`);
+		logger.success(`Removed local data for ${siteUrl}`);
 		console.log(`  Objects deleted:    ${result.objectsDeleted}`);
 		console.log(`  Manifest entries:   ${result.entriesRemoved}`);
 		console.log(`  Watermarks:         ${result.watermarksRemoved}`);

package/dist/commands/store.mjs

@@ -1,7 +1,5 @@
 import { storeCommandMeta } from "../command-meta.mjs";
-import { noSubcommandSelected } from "../utils.mjs";
 import { compactCommand } from "./compact.mjs";
-import { exportCommand } from "./export.mjs";
 import { gcCommand } from "./gc.mjs";
 import { rollupsCommand } from "./rollups.mjs";
 import { statsCommand } from "./stats.mjs";
@@ -14,21 +12,11 @@ const storeCommand = defineCommand({
 		"stats": statsCommand,
 		"compact": compactCommand,
 		"gc": gcCommand,
-		"export": exportCommand,
 		"rollups": rollupsCommand,
 		"rm-site": rmSiteCommand,
 		"reset": resetCommand
 	},
 	async run({ args }) {
-		if (!noSubcommandSelected("store", [
-			"stats",
-			"compact",
-			"gc",
-			"export",
-			"rollups",
-			"rm-site",
-			"reset"
-		])) return;
 		await statsCommand.run?.({
 			args,
 			cmd: statsCommand,