npm - @ainyc/canonry - Versions diffs - 1.13.3 → 1.15.0 - Mend

@ainyc/canonry 1.13.3 → 1.15.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/assets/assets/index-CQoA5dn_.css +1 -0
package/assets/assets/index-s9Kz4WUv.js +245 -0
package/assets/index.html +2 -2
package/dist/{chunk-JKIWFSYI.js → chunk-WCZMFJUY.js} +99 -1
package/dist/cli.js +125 -2
package/dist/index.d.ts +1 -0
package/dist/index.js +1 -1
package/package.json +5 -5
package/assets/assets/index-BUh6m3HV.css +0 -1
package/assets/assets/index-DOhW7c21.js +0 -245

package/assets/index.html CHANGED Viewed

@@ -12,8 +12,8 @@
     <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32.png" />
     <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
     <title>Canonry</title>
-    <script type="module" crossorigin src="/assets/index-DOhW7c21.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BUh6m3HV.css">
+    <script type="module" crossorigin src="/assets/index-s9Kz4WUv.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-CQoA5dn_.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/{chunk-JKIWFSYI.js → chunk-WCZMFJUY.js} RENAMED Viewed

@@ -320,6 +320,7 @@ var googleConnections = sqliteTable("google_connections", {
   domain: text("domain").notNull(),
   connectionType: text("connection_type").notNull(),
   propertyId: text("property_id"),
+  sitemapUrl: text("sitemap_url"),
   accessToken: text("access_token"),
   refreshToken: text("refresh_token"),
   tokenExpiresAt: text("token_expires_at"),
@@ -619,7 +620,9 @@ var MIGRATIONS = [
   `ALTER TABLE projects ADD COLUMN default_location TEXT`,
   `ALTER TABLE query_snapshots ADD COLUMN location TEXT`,
   // v9: Add location column to runs for per-location run tracking
-  `ALTER TABLE runs ADD COLUMN location TEXT`
+  `ALTER TABLE runs ADD COLUMN location TEXT`,
+  // v10: Add sitemapUrl to google_connections for persistent sitemap storage
+  `ALTER TABLE google_connections ADD COLUMN sitemap_url TEXT`
 ];
 function migrate(db) {
   const statements = MIGRATION_SQL.split(";").map((s) => s.trim()).filter((s) => s.length > 0);
@@ -831,6 +834,7 @@ var googleConnectionDtoSchema = z4.object({
   domain: z4.string(),
   connectionType: googleConnectionTypeSchema,
   propertyId: z4.string().nullable().optional(),
+  sitemapUrl: z4.string().nullable().optional(),
   scopes: z4.array(z4.string()).default([]),
   createdAt: z4.string(),
   updatedAt: z4.string()
@@ -3696,6 +3700,14 @@ async function listSites(accessToken) {
   );
   return data.siteEntry ?? [];
 }
+async function listSitemaps(accessToken, siteUrl) {
+  const encodedSiteUrl = encodeURIComponent(siteUrl);
+  const data = await gscFetch(
+    accessToken,
+    `${GSC_API_BASE}/sites/${encodedSiteUrl}/sitemaps`
+  );
+  return data.sitemap ?? [];
+}
 async function fetchSearchAnalytics(accessToken, siteUrl, opts) {
   const allRows = [];
   let startRow = 0;
@@ -3813,6 +3825,7 @@ async function googleRoutes(app, opts) {
       domain: connection.domain,
       connectionType: connection.connectionType,
       propertyId: connection.propertyId ?? null,
+      sitemapUrl: connection.sitemapUrl ?? null,
       scopes: connection.scopes ?? [],
       createdAt: connection.createdAt,
       updatedAt: connection.updatedAt
@@ -4233,6 +4246,69 @@ async function googleRoutes(app, opts) {
       reasonBreakdown: JSON.parse(r.reasonBreakdown)
     })).reverse();
   });
+  app.get("/projects/:name/google/gsc/sitemaps", async (request, reply) => {
+    const { clientId: googleClientId, clientSecret: googleClientSecret } = getAuthConfig();
+    if (!googleClientId || !googleClientSecret) {
+      const err = validationError("Google OAuth is not configured");
+      return reply.status(err.statusCode).send(err.toJSON());
+    }
+    const store = requireConnectionStore(reply);
+    if (!store) return;
+    const project = resolveProject(app.db, request.params.name);
+    const { accessToken, propertyId } = await getValidToken(store, project.canonicalDomain, "gsc", googleClientId, googleClientSecret);
+    if (!propertyId) {
+      const err = validationError('No GSC property configured for this connection. Set one with "canonry google set-property".');
+      return reply.status(err.statusCode).send(err.toJSON());
+    }
+    const sitemaps = await listSitemaps(accessToken, propertyId);
+    return { sitemaps };
+  });
+  app.post("/projects/:name/google/gsc/discover-sitemaps", async (request, reply) => {
+    const { clientId: googleClientId, clientSecret: googleClientSecret } = getAuthConfig();
+    if (!googleClientId || !googleClientSecret) {
+      const err = validationError("Google OAuth is not configured");
+      return reply.status(err.statusCode).send(err.toJSON());
+    }
+    const store = requireConnectionStore(reply);
+    if (!store) return;
+    const project = resolveProject(app.db, request.params.name);
+    const conn = store.getConnection(project.canonicalDomain, "gsc");
+    if (!conn) {
+      const err = validationError('No GSC connection found for this domain. Run "canonry google connect" first.');
+      return reply.status(err.statusCode).send(err.toJSON());
+    }
+    if (!conn.propertyId) {
+      const err = validationError("No GSC property configured for this connection");
+      return reply.status(err.statusCode).send(err.toJSON());
+    }
+    const { accessToken } = await getValidToken(store, project.canonicalDomain, "gsc", googleClientId, googleClientSecret);
+    const sitemaps = await listSitemaps(accessToken, conn.propertyId);
+    if (sitemaps.length === 0) {
+      const err = validationError("No sitemaps found for this GSC property. Submit a sitemap in Google Search Console first.");
+      return reply.status(err.statusCode).send(err.toJSON());
+    }
+    const primary = sitemaps.find((s) => !s.isSitemapsIndex) ?? sitemaps[0];
+    const sitemapUrl = primary.path;
+    store.updateConnection(project.canonicalDomain, "gsc", {
+      sitemapUrl,
+      updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const runId = crypto13.randomUUID();
+    app.db.insert(runs).values({
+      id: runId,
+      projectId: project.id,
+      kind: "inspect-sitemap",
+      status: "queued",
+      trigger: "manual",
+      createdAt: now
+    }).run();
+    if (opts.onInspectSitemapRequested) {
+      opts.onInspectSitemapRequested(runId, project.id, { sitemapUrl });
+    }
+    const run = app.db.select().from(runs).where(eq12(runs.id, runId)).get();
+    return { sitemaps, primarySitemapUrl: sitemapUrl, run };
+  });
   app.post("/projects/:name/google/gsc/inspect-sitemap", async (request, reply) => {
     const store = requireConnectionStore(reply);
     if (!store) return;
@@ -4263,6 +4339,26 @@ async function googleRoutes(app, opts) {
     const run = app.db.select().from(runs).where(eq12(runs.id, runId)).get();
     return run;
   });
+  app.put("/projects/:name/google/connections/:type/sitemap", async (request, reply) => {
+    const store = requireConnectionStore(reply);
+    if (!store) return;
+    const project = resolveProject(app.db, request.params.name);
+    const { sitemapUrl } = request.body ?? {};
+    if (!sitemapUrl || !sitemapUrl.trim()) {
+      const err = validationError("sitemapUrl is required");
+      return reply.status(err.statusCode).send(err.toJSON());
+    }
+    const conn = store.updateConnection(
+      project.canonicalDomain,
+      request.params.type,
+      { sitemapUrl: sitemapUrl.trim(), updatedAt: (/* @__PURE__ */ new Date()).toISOString() }
+    );
+    if (!conn) {
+      const err = notFound("Google connection", request.params.type);
+      return reply.status(err.statusCode).send(err.toJSON());
+    }
+    return { sitemapUrl: sitemapUrl.trim() };
+  });
   app.put("/projects/:name/google/connections/:type/property", async (request, reply) => {
     const store = requireConnectionStore(reply);
     if (!store) return;
@@ -5313,6 +5409,7 @@ function upsertGoogleConnection(config, connection) {
   const normalized = {
     ...connection,
     propertyId: connection.propertyId ?? null,
+    sitemapUrl: connection.sitemapUrl ?? null,
     refreshToken: connection.refreshToken ?? null,
     tokenExpiresAt: connection.tokenExpiresAt ?? null,
     scopes: connection.scopes ?? []
@@ -5331,6 +5428,7 @@ function patchGoogleConnection(config, domain, connectionType, patch) {
     ...existing,
     ...patch,
     propertyId: Object.prototype.hasOwnProperty.call(patch, "propertyId") ? patch.propertyId ?? null : existing.propertyId ?? null,
+    sitemapUrl: Object.prototype.hasOwnProperty.call(patch, "sitemapUrl") ? patch.sitemapUrl ?? null : existing.sitemapUrl ?? null,
     refreshToken: Object.prototype.hasOwnProperty.call(patch, "refreshToken") ? patch.refreshToken ?? null : existing.refreshToken ?? null,
     tokenExpiresAt: Object.prototype.hasOwnProperty.call(patch, "tokenExpiresAt") ? patch.tokenExpiresAt ?? null : existing.tokenExpiresAt ?? null,
     scopes: patch.scopes ?? existing.scopes ?? []

package/dist/cli.js CHANGED Viewed

@@ -19,7 +19,7 @@ import {
   setGoogleAuthConfig,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-JKIWFSYI.js";
+} from "./chunk-WCZMFJUY.js";
 // src/cli.ts
 import { parseArgs } from "util";
@@ -635,6 +635,9 @@ var ApiClient = class {
   async googleSetProperty(project, type, propertyId) {
     return this.request("PUT", `/projects/${encodeURIComponent(project)}/google/connections/${encodeURIComponent(type)}/property`, { propertyId });
   }
+  async googleSetSitemap(project, type, sitemapUrl) {
+    return this.request("PUT", `/projects/${encodeURIComponent(project)}/google/connections/${encodeURIComponent(type)}/sitemap`, { sitemapUrl });
+  }
   // GSC data
   async gscSync(project, body) {
     return this.request("POST", `/projects/${encodeURIComponent(project)}/google/gsc/sync`, body ?? {});
@@ -663,6 +666,12 @@ var ApiClient = class {
   async gscInspectSitemap(project, body) {
     return this.request("POST", `/projects/${encodeURIComponent(project)}/google/gsc/inspect-sitemap`, body ?? {});
   }
+  async gscSitemaps(project) {
+    return this.request("GET", `/projects/${encodeURIComponent(project)}/google/gsc/sitemaps`);
+  }
+  async gscDiscoverSitemaps(project) {
+    return this.request("POST", `/projects/${encodeURIComponent(project)}/google/gsc/discover-sitemaps`, {});
+  }
 };
 // src/commands/project.ts
@@ -1759,6 +1768,33 @@ Index Coverage for "${project}"
     console.log(`  Last inspected: ${result.lastInspectedAt}`);
   }
 }
+async function googleSetSitemap(project, sitemapUrl) {
+  const client = getClient11();
+  await client.googleSetSitemap(project, "gsc", sitemapUrl);
+  console.log(`GSC sitemap URL set to "${sitemapUrl}" for project "${project}".`);
+}
+async function googleListSitemaps(project, opts) {
+  const client = getClient11();
+  const result = await client.gscSitemaps(project);
+  if (opts.format === "json") {
+    console.log(JSON.stringify(result, null, 2));
+    return;
+  }
+  if (result.sitemaps.length === 0) {
+    console.log(`No sitemaps found for project "${project}". Submit a sitemap in Google Search Console first.`);
+    return;
+  }
+  console.log(`
+Sitemaps for project "${project}":
+`);
+  for (const s of result.sitemaps) {
+    const indexed = s.contents?.[0]?.indexed ?? "?";
+    const submitted = s.contents?.[0]?.submitted ?? "?";
+    const isIndex = s.isSitemapsIndex ? " [index]" : "";
+    console.log(`  ${s.path}${isIndex}`);
+    console.log(`    Indexed: ${indexed} / ${submitted} submitted  |  Last submitted: ${s.lastSubmitted ?? "unknown"}`);
+  }
+}
 async function googleInspectSitemap(project, opts) {
   const client = getClient11();
   const run = await client.gscInspectSitemap(project, {
@@ -1816,6 +1852,51 @@ GSC Coverage History for "${project}" (${rows.length} snapshots):
     console.log(`  ${row.date.padEnd(12)}${String(row.indexed).padEnd(10)}${String(row.notIndexed).padEnd(14)}${reasonStr}`);
   }
 }
+async function googleDiscoverSitemaps(project, opts) {
+  const client = getClient11();
+  const result = await client.gscDiscoverSitemaps(project);
+  if (opts.format === "json") {
+    console.log(JSON.stringify(result, null, 2));
+    return;
+  }
+  console.log(`
+Discovered ${result.sitemaps.length} sitemap(s) for project "${project}":
+`);
+  for (const s of result.sitemaps) {
+    const primary = s.path === result.primarySitemapUrl ? " (primary)" : "";
+    const indexed = s.contents?.[0]?.indexed ?? "?";
+    const submitted = s.contents?.[0]?.submitted ?? "?";
+    console.log(`  ${s.path}${primary}`);
+    console.log(`    Indexed: ${indexed} / ${submitted} submitted  |  Last submitted: ${s.lastSubmitted ?? "unknown"}`);
+  }
+  console.log(`
+Primary sitemap: ${result.primarySitemapUrl}`);
+  console.log(`Sitemap URL saved. Inspection run queued (run ${result.run.id}).`);
+  if (opts.wait) {
+    const timeout = 30 * 60 * 1e3;
+    const start = Date.now();
+    process.stderr.write("Waiting for sitemap inspection to complete");
+    while (Date.now() - start < timeout) {
+      await new Promise((r) => setTimeout(r, 3e3));
+      const current = await client.getRun(result.run.id);
+      process.stderr.write(".");
+      if (current.status === "completed" || current.status === "partial" || current.status === "failed") {
+        process.stderr.write("\n");
+        if (current.status === "completed") {
+          console.log("Sitemap inspection completed successfully.");
+        } else if (current.status === "partial") {
+          console.log("Sitemap inspection completed with some errors.");
+        } else {
+          console.error("Sitemap inspection failed.");
+        }
+        return;
+      }
+    }
+    process.stderr.write("\n");
+    console.error("Timed out waiting for sitemap inspection to complete.");
+    process.exit(1);
+  }
+}
 async function googleDeindexed(project, format) {
   const client = getClient11();
   const rows = await client.gscDeindexed(project);
@@ -1893,6 +1974,9 @@ Usage:
   canonry google status <project>     Show Google connection status
   canonry google properties <project> List available GSC properties
   canonry google set-property <project> <url>  Set GSC property URL
+  canonry google set-sitemap <project> <url>   Set GSC sitemap URL
+  canonry google list-sitemaps <project>       List submitted sitemaps from GSC (no run queued)
+  canonry google discover-sitemaps <project>   Auto-discover sitemaps from GSC and queue inspection (--wait)
   canonry google sync <project>       Sync GSC data (--days 30, --full, --wait)
   canonry google performance <project>  Show GSC search performance data
   canonry google inspect <project> <url>  Inspect a URL via GSC
@@ -2664,6 +2748,25 @@ async function main() {
             await googleSetProperty(project, propertyUrl);
             break;
           }
+          case "set-sitemap": {
+            const project = args[2];
+            const sitemapUrl = args[3];
+            if (!project || !sitemapUrl) {
+              console.error("Error: project name and sitemap URL are required");
+              process.exit(1);
+            }
+            await googleSetSitemap(project, sitemapUrl);
+            break;
+          }
+          case "list-sitemaps": {
+            const project = args[2];
+            if (!project) {
+              console.error("Error: project name is required");
+              process.exit(1);
+            }
+            await googleListSitemaps(project, { format });
+            break;
+          }
           case "sync": {
             const project = args[2];
             if (!project) {
@@ -2805,9 +2908,29 @@ async function main() {
             await googleDeindexed(project, format);
             break;
           }
+          case "discover-sitemaps": {
+            const project = args[2];
+            if (!project) {
+              console.error("Error: project name is required");
+              process.exit(1);
+            }
+            const { values: discoverValues } = parseArgs({
+              args: args.slice(3),
+              options: {
+                wait: { type: "boolean", default: false },
+                format: { type: "string" }
+              },
+              allowPositionals: false
+            });
+            await googleDiscoverSitemaps(project, {
+              wait: discoverValues.wait ?? false,
+              format: discoverValues.format === "json" ? "json" : format
+            });
+            break;
+          }
           default:
             console.error(`Unknown google subcommand: ${subcommand ?? "(none)"}`);
-            console.log("Available: connect, disconnect, status, properties, set-property, sync, performance, inspect, inspect-sitemap, coverage, coverage-history, inspections, deindexed");
+            console.log("Available: connect, disconnect, status, properties, set-property, set-sitemap, list-sitemaps, discover-sitemaps, sync, performance, inspect, inspect-sitemap, coverage, coverage-history, inspections, deindexed");
             process.exit(1);
         }
         break;

package/dist/index.d.ts CHANGED Viewed

@@ -13,6 +13,7 @@ interface GoogleConnectionConfigEntry {
     domain: string;
     connectionType: GoogleConnectionType;
     propertyId?: string | null;
+    sitemapUrl?: string | null;
     accessToken?: string;
     refreshToken?: string | null;
     tokenExpiresAt?: string | null;

package/dist/index.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import {
   createServer,
   loadConfig
-} from "./chunk-JKIWFSYI.js";
+} from "./chunk-WCZMFJUY.js";
 export {
   createServer,
   loadConfig

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ainyc/canonry",
-  "version": "1.13.3",
+  "version": "1.15.0",
   "type": "module",
   "description": "The ultimate open-source AEO monitoring tool - track how answer engines cite your domain",
   "license": "FSL-1.1-ALv2",
@@ -53,13 +53,13 @@
     "tsx": "^4.19.0",
     "@ainyc/canonry-api-routes": "0.0.0",
     "@ainyc/canonry-config": "0.0.0",
-    "@ainyc/canonry-db": "0.0.0",
     "@ainyc/canonry-provider-claude": "0.0.0",
-    "@ainyc/canonry-provider-local": "0.0.0",
     "@ainyc/canonry-provider-gemini": "0.0.0",
-    "@ainyc/canonry-provider-openai": "0.0.0",
+    "@ainyc/canonry-integration-google": "0.0.0",
     "@ainyc/canonry-contracts": "0.0.0",
-    "@ainyc/canonry-integration-google": "0.0.0"
+    "@ainyc/canonry-provider-local": "0.0.0",
+    "@ainyc/canonry-provider-openai": "0.0.0",
+    "@ainyc/canonry-db": "0.0.0"
   },
   "scripts": {
     "build": "tsup && tsx build-web.ts",