@ainyc/canonry 1.10.1 → 1.12.0

package/dist/cli.js

@@ -16,9 +16,10 @@ import {
   notificationEventSchema,
   providerQuotaPolicySchema,
   saveConfig,
+  setGoogleAuthConfig,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-2DC7RBXJ.js";
+} from "./chunk-O4HLQBL7.js";
 
 // src/cli.ts
 import { parseArgs } from "util";
@@ -159,6 +160,14 @@ async function bootstrapCommand(_opts) {
   if (providers?.openai) mergedProviders.openai = providers.openai;
   if (providers?.claude) mergedProviders.claude = providers.claude;
   if (providers?.local) mergedProviders.local = providers.local;
+  if (env.googleClientId && !env.googleClientSecret || !env.googleClientId && env.googleClientSecret) {
+    console.warn("Warning: GOOGLE_CLIENT_ID and GOOGLE_CLIENT_SECRET must both be set to configure Google OAuth. Skipping Google auth config.");
+  }
+  const mergedGoogle = env.googleClientId && env.googleClientSecret ? {
+    clientId: env.googleClientId,
+    clientSecret: env.googleClientSecret,
+    connections: existingConfig?.google?.connections ?? []
+  } : existingConfig?.google;
   const keyHash = crypto.createHash("sha256").update(rawApiKey).digest("hex");
   const keyPrefix = rawApiKey.slice(0, 9);
   const db = createClient(databasePath);
@@ -176,7 +185,8 @@ async function bootstrapCommand(_opts) {
     apiUrl: env.apiUrl || existingConfig?.apiUrl || `http://localhost:${process.env.CANONRY_PORT || "4100"}`,
     database: databasePath,
     apiKey: rawApiKey,
-    providers: mergedProviders
+    providers: mergedProviders,
+    google: mergedGoogle
   });
   console.log(`Bootstrap complete. Config saved to ${getConfigPath()}`);
   console.log(`SQLite database path: ${databasePath}`);
@@ -218,23 +228,40 @@ async function initCommand(opts) {
   if (!fs.existsSync(configDir)) {
     fs.mkdirSync(configDir, { recursive: true });
   }
-  const envProviders = getBootstrapEnv(process.env, {
+  const bootstrapEnv = getBootstrapEnv(process.env, {
     GEMINI_API_KEY: opts?.geminiKey,
     OPENAI_API_KEY: opts?.openaiKey,
     ANTHROPIC_API_KEY: opts?.claudeKey,
     LOCAL_BASE_URL: opts?.localUrl,
     LOCAL_MODEL: opts?.localModel,
-    LOCAL_API_KEY: opts?.localKey
-  }).providers;
-  const nonInteractive = !!(envProviders.gemini || envProviders.openai || envProviders.claude || envProviders.local);
+    LOCAL_API_KEY: opts?.localKey,
+    GOOGLE_CLIENT_ID: opts?.googleClientId,
+    GOOGLE_CLIENT_SECRET: opts?.googleClientSecret
+  });
+  if (bootstrapEnv.googleClientId && !bootstrapEnv.googleClientSecret || !bootstrapEnv.googleClientId && bootstrapEnv.googleClientSecret) {
+    console.error("Google OAuth requires both a client ID and client secret when configured non-interactively.");
+    process.exit(1);
+  }
+  const envProviders = bootstrapEnv.providers;
+  const envGoogleConfigured = !!(bootstrapEnv.googleClientId && bootstrapEnv.googleClientSecret);
+  const nonInteractive = !!(envProviders.gemini || envProviders.openai || envProviders.claude || envProviders.local || envGoogleConfigured);
   const providers = {};
+  let google;
   if (nonInteractive) {
     Object.assign(providers, envProviders);
+    if (envGoogleConfigured) {
+      google = {
+        clientId: bootstrapEnv.googleClientId,
+        clientSecret: bootstrapEnv.googleClientSecret,
+        connections: []
+      };
+    }
   } else {
     console.log("Configure AI providers (at least one required):\n");
-    console.log("Tip: For non-interactive setup, pass --gemini-key, --openai-key,");
-    console.log("--claude-key flags or set GEMINI_API_KEY, OPENAI_API_KEY,");
-    console.log('ANTHROPIC_API_KEY env vars. Or use "canonry bootstrap".\n');
+    console.log("Tip: For non-interactive setup, pass provider flags or set");
+    console.log("GEMINI_API_KEY, OPENAI_API_KEY, ANTHROPIC_API_KEY,");
+    console.log("GOOGLE_CLIENT_ID, and GOOGLE_CLIENT_SECRET env vars.");
+    console.log('Or use "canonry bootstrap".\n');
     const geminiApiKey = await prompt("Gemini API key (press Enter to skip): ");
     if (geminiApiKey) {
       const geminiModel = await prompt("  Gemini model [gemini-2.5-flash]: ") || "gemini-2.5-flash";
@@ -257,6 +284,20 @@ async function initCommand(opts) {
       const localApiKey = await prompt("  API key (press Enter if not needed): ") || void 0;
       providers.local = { baseUrl: localBaseUrl, apiKey: localApiKey, model: localModel, quota: DEFAULT_QUOTA };
     }
+    console.log("\nGoogle Search Console OAuth (optional):");
+    const googleClientId = await prompt("Google OAuth client ID (press Enter to skip): ");
+    if (googleClientId) {
+      const googleClientSecret = await prompt("  Google OAuth client secret: ");
+      if (!googleClientSecret) {
+        console.error("\nGoogle OAuth client secret is required when a client ID is provided.");
+        process.exit(1);
+      }
+      google = {
+        clientId: googleClientId,
+        clientSecret: googleClientSecret,
+        connections: []
+      };
+    }
   }
   const hasProvider = providers.gemini || providers.openai || providers.claude || providers.local;
   if (!hasProvider) {
@@ -281,7 +322,8 @@ async function initCommand(opts) {
     apiUrl: "http://localhost:4100",
     database: databasePath,
     apiKey: rawApiKey,
-    providers
+    providers,
+    google
   });
   const providerNames = Object.keys(providers);
   console.log(`
@@ -1109,9 +1151,15 @@ async function setProvider(name, opts) {
 }
 async function showSettings(format) {
   const client = getClient8();
+  const config = loadConfig();
   const settings = await client.getSettings();
   if (format === "json") {
-    console.log(JSON.stringify(settings, null, 2));
+    console.log(JSON.stringify({
+      ...settings,
+      google: {
+        configured: Boolean(config.google?.clientId && config.google?.clientSecret)
+      }
+    }, null, 2));
     return;
   }
   console.log("Provider settings:\n");
@@ -1125,6 +1173,18 @@ async function showSettings(format) {
       }
     }
   }
+  console.log("\nGoogle OAuth:\n");
+  console.log(`  ${config.google?.clientId && config.google?.clientSecret ? "configured" : "not configured"}`);
+}
+function setGoogleAuth(opts) {
+  const config = loadConfig();
+  setGoogleAuthConfig(config, {
+    clientId: opts.clientId,
+    clientSecret: opts.clientSecret
+  });
+  saveConfig(config);
+  console.log(`Google OAuth credentials saved to ${getConfigPath()}.`);
+  console.log("Restart the local server if it is already running.");
 }
 
 // src/commands/schedule.ts
@@ -1331,12 +1391,19 @@ function getClient11() {
 }
 async function googleConnect(project, opts) {
   const client = getClient11();
-  const { authUrl } = await client.googleConnect(project, { type: opts.type });
+  const { authUrl, redirectUri } = await client.googleConnect(project, {
+    type: opts.type,
+    publicUrl: opts.publicUrl
+  });
   console.log(`
 Open this URL in your browser to authorize Google ${opts.type.toUpperCase()} access:
 `);
   console.log(`  ${authUrl}
 `);
+  if (redirectUri) {
+    console.log(`Redirect URI: ${redirectUri}`);
+    console.log("(Ensure this URI is listed in your Google Cloud Console OAuth client's authorized redirect URIs)\n");
+  }
   try {
     const { exec } = await import("child_process");
     const platform = process.platform;
@@ -1578,7 +1645,7 @@ Usage:
   canonry notify remove <project> <id>  Remove notification
   canonry notify test <project> <id>  Send test webhook
   canonry notify events               List available notification event types
-  canonry google connect <project>     Connect Google Search Console (--type gsc|ga4)
+  canonry google connect <project>     Connect Google Search Console (--type gsc|ga4, --public-url <url>)
   canonry google disconnect <project> Disconnect Google integration
   canonry google status <project>     Show Google connection status
   canonry google properties <project> List available GSC properties
@@ -1590,6 +1657,7 @@ Usage:
   canonry google deindexed <project>  Show pages that lost indexing
   canonry settings                    Show active provider and quota settings
   canonry settings provider <name>    Update a provider config
+  canonry settings google             Update Google OAuth credentials
   canonry telemetry status            Show telemetry status
   canonry telemetry enable            Enable anonymous telemetry
   canonry telemetry disable           Disable anonymous telemetry
@@ -1603,6 +1671,8 @@ Options:
   --local-url <url>    Local LLM base URL (or LOCAL_BASE_URL env var)
   --local-model <name> Local LLM model name (default: llama3)
   --local-key <key>    Local LLM API key (or LOCAL_API_KEY env var)
+  --google-client-id <id>      Google OAuth client ID (or GOOGLE_CLIENT_ID env var)
+  --google-client-secret <key> Google OAuth client secret (or GOOGLE_CLIENT_SECRET env var)
   --port <port>        Server port (default: 4100)
   --host <host>        Server bind address (default: 127.0.0.1)
   --domain <domain>    Canonical domain for project create/update
@@ -1625,6 +1695,8 @@ Options:
   --api-key <key>      Provider API key (settings provider)
   --base-url <url>     Provider base URL (settings provider)
   --model <name>       Provider model name (settings provider)
+  --client-id <id>     Google OAuth client ID (settings google)
+  --client-secret <key> Google OAuth client secret (settings google)
   --max-concurrent <n> Max concurrent requests per provider
   --max-per-minute <n> Max requests per minute per provider
   --max-per-day <n>    Max requests per day per provider
@@ -1669,7 +1741,9 @@ async function main() {
             "claude-key": { type: "string" },
             "local-url": { type: "string" },
             "local-model": { type: "string" },
-            "local-key": { type: "string" }
+            "local-key": { type: "string" },
+            "google-client-id": { type: "string" },
+            "google-client-secret": { type: "string" }
           },
           allowPositionals: false
         });
@@ -1680,7 +1754,9 @@ async function main() {
           claudeKey: initValues["claude-key"],
           localUrl: initValues["local-url"],
           localModel: initValues["local-model"],
-          localKey: initValues["local-key"]
+          localKey: initValues["local-key"],
+          googleClientId: initValues["google-client-id"],
+          googleClientSecret: initValues["google-client-secret"]
         });
         break;
       }
@@ -2171,6 +2247,23 @@ async function main() {
             model: values.model,
             quota: Object.keys(quota).length > 0 ? quota : void 0
           });
+        } else if (subcommand === "google") {
+          const { values } = parseArgs({
+            args: args.slice(2),
+            options: {
+              "client-id": { type: "string" },
+              "client-secret": { type: "string" }
+            },
+            allowPositionals: false
+          });
+          if (!values["client-id"] || !values["client-secret"]) {
+            console.error("Error: --client-id and --client-secret are both required");
+            process.exit(1);
+          }
+          setGoogleAuth({
+            clientId: values["client-id"],
+            clientSecret: values["client-secret"]
+          });
         } else {
           await showSettings(format);
         }
@@ -2192,11 +2285,15 @@ async function main() {
             const { values: connectValues } = parseArgs({
               args: args.slice(3),
               options: {
-                type: { type: "string", default: "gsc" }
+                type: { type: "string", default: "gsc" },
+                "public-url": { type: "string" }
               },
               allowPositionals: false
             });
-            await googleConnect(project, { type: connectValues.type ?? "gsc" });
+            await googleConnect(project, {
+              type: connectValues.type ?? "gsc",
+              publicUrl: connectValues["public-url"]
+            });
             break;
           }
           case "disconnect": {

package/dist/index.d.ts

@@ -2,14 +2,32 @@ import { FastifyInstance } from 'fastify';
 import { DatabaseClient } from '@ainyc/canonry-db';
 import { ProviderQuotaPolicy } from '@ainyc/canonry-contracts';
 
+type GoogleConnectionType = 'gsc' | 'ga4';
 interface ProviderConfigEntry {
     apiKey?: string;
     baseUrl?: string;
     model?: string;
     quota?: ProviderQuotaPolicy;
 }
+interface GoogleConnectionConfigEntry {
+    domain: string;
+    connectionType: GoogleConnectionType;
+    propertyId?: string | null;
+    accessToken?: string;
+    refreshToken?: string | null;
+    tokenExpiresAt?: string | null;
+    scopes?: string[];
+    createdAt: string;
+    updatedAt: string;
+}
+interface GoogleConfigEntry {
+    clientId?: string;
+    clientSecret?: string;
+    connections?: GoogleConnectionConfigEntry[];
+}
 interface CanonryConfig {
     apiUrl: string;
+    publicUrl?: string;
     database: string;
     apiKey: string;
     port?: number;
@@ -22,6 +40,7 @@ interface CanonryConfig {
         claude?: ProviderConfigEntry;
         local?: ProviderConfigEntry;
     };
+    google?: GoogleConfigEntry;
     telemetry?: boolean;
     anonymousId?: string;
 }
@@ -31,6 +50,7 @@ declare function createServer(opts: {
     config: CanonryConfig;
     db: DatabaseClient;
     open?: boolean;
+    logger?: boolean;
 }): Promise<FastifyInstance>;
 
 export { type CanonryConfig, createServer, loadConfig };

package/dist/index.js

@@ -1,7 +1,7 @@
 import {
   createServer,
   loadConfig
-} from "./chunk-2DC7RBXJ.js";
+} from "./chunk-O4HLQBL7.js";
 export {
   createServer,
   loadConfig

package/package.json

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