npm - @ainyc/canonry - Versions diffs - 1.35.0 → 1.36.0 - Mend

@ainyc/canonry 1.35.0 → 1.36.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 (8) hide show

package/assets/assets/{index-B9SBdBOm.css → index-CborW-lk.css} +1 -1
package/assets/assets/index-Du_w835k.js +281 -0
package/assets/index.html +2 -2
package/dist/{chunk-ETP5IOHC.js → chunk-PZKK53EX.js} +116 -51
package/dist/cli.js +6 -1
package/dist/index.js +1 -1
package/package.json +4 -4
package/assets/assets/index-DyipkdOb.js +0 -281

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-DyipkdOb.js"></script>
-    <link rel="stylesheet" crossorigin href="./assets/index-B9SBdBOm.css">
+    <script type="module" crossorigin src="./assets/index-Du_w835k.js"></script>
+    <link rel="stylesheet" crossorigin href="./assets/index-CborW-lk.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/{chunk-ETP5IOHC.js → chunk-PZKK53EX.js} RENAMED Viewed

@@ -1081,6 +1081,12 @@ var ga4AiReferralHistoryEntrySchema = z11.object({
   sessions: z11.number(),
   users: z11.number()
 });
+var ga4SessionHistoryEntrySchema = z11.object({
+  date: z11.string(),
+  sessions: z11.number(),
+  organicSessions: z11.number(),
+  users: z11.number()
+});
 // ../contracts/src/answer-visibility.ts
 var GENERIC_TOKENS = /* @__PURE__ */ new Set([
@@ -1519,6 +1525,7 @@ function createClient(databasePath) {
   const sqlite = new Database(databasePath);
   sqlite.pragma("journal_mode = WAL");
   sqlite.pragma("foreign_keys = ON");
+  sqlite.pragma("busy_timeout = 5000");
   return drizzle(sqlite, { schema: schema_exports });
 }
@@ -1846,7 +1853,14 @@ var MIGRATIONS = [
   `CREATE INDEX IF NOT EXISTS idx_ga_ai_ref_source ON ga_ai_referrals(source)`,
   `CREATE UNIQUE INDEX IF NOT EXISTS idx_ga_ai_ref_unique ON ga_ai_referrals(project_id, date, source, medium)`,
   // v18: Answer-level visibility derived from answer text
-  `ALTER TABLE query_snapshots ADD COLUMN answer_mentioned INTEGER`
+  `ALTER TABLE query_snapshots ADD COLUMN answer_mentioned INTEGER`,
+  // v19: Add named unique indexes and missing columns from early tables
+  `CREATE UNIQUE INDEX IF NOT EXISTS idx_keywords_project_keyword ON keywords(project_id, keyword)`,
+  `CREATE UNIQUE INDEX IF NOT EXISTS idx_competitors_project_domain ON competitors(project_id, domain)`,
+  `CREATE UNIQUE INDEX IF NOT EXISTS idx_schedules_project ON schedules(project_id)`,
+  `CREATE UNIQUE INDEX IF NOT EXISTS idx_usage_scope_period_metric ON usage_counters(scope, period, metric)`,
+  `ALTER TABLE projects ADD COLUMN config_source TEXT NOT NULL DEFAULT 'cli'`,
+  `ALTER TABLE projects ADD COLUMN config_revision INTEGER NOT NULL DEFAULT 1`
 ];
 function migrate(db) {
   const statements = MIGRATION_SQL.split(";").map((s) => s.trim()).filter((s) => s.length > 0);
@@ -5773,6 +5787,18 @@ var routeCatalog = [
       404: { description: "Project not found." }
     }
   },
+  {
+    method: "get",
+    path: "/api/v1/projects/{name}/ga/session-history",
+    summary: "Get total sessions per day for the project",
+    tags: ["ga4"],
+    parameters: [nameParameter],
+    responses: {
+      200: { description: "Session history returned." },
+      400: { description: "GA4 is not connected." },
+      404: { description: "Project not found." }
+    }
+  },
   {
     method: "get",
     path: "/api/v1/projects/{name}/ga/coverage",
@@ -8504,6 +8530,22 @@ async function ga4Routes(app, opts) {
     }).from(gaAiReferrals).where(eq16(gaAiReferrals.projectId, project.id)).orderBy(gaAiReferrals.date).all();
     return rows;
   });
+  app.get("/projects/:name/ga/session-history", async (request, _reply) => {
+    const project = resolveProject(app.db, request.params.name);
+    requireGa4Connection(opts, project.name, project.canonicalDomain);
+    const rows = app.db.select({
+      date: gaTrafficSnapshots.date,
+      sessions: sql4`SUM(${gaTrafficSnapshots.sessions})`,
+      organicSessions: sql4`SUM(${gaTrafficSnapshots.organicSessions})`,
+      users: sql4`SUM(${gaTrafficSnapshots.users})`
+    }).from(gaTrafficSnapshots).where(eq16(gaTrafficSnapshots.projectId, project.id)).groupBy(gaTrafficSnapshots.date).orderBy(gaTrafficSnapshots.date).all();
+    return rows.map((r) => ({
+      date: r.date,
+      sessions: r.sessions ?? 0,
+      organicSessions: r.organicSessions ?? 0,
+      users: r.users ?? 0
+    }));
+  });
   app.get("/projects/:name/ga/coverage", async (request, _reply) => {
     const project = resolveProject(app.db, request.params.name);
     requireGa4Connection(opts, project.name, project.canonicalDomain);
@@ -8930,12 +8972,20 @@ async function getSiteStatus(connection, env) {
 async function listActivePlugins(connection, env) {
   const site = resolveEnvironment(connection, env);
   try {
-    const { body } = await fetchJson(
-      connection,
-      site.siteUrl,
-      "/wp-json/wp/v2/plugins?per_page=100&_fields=plugin,status"
-    );
-    return body.filter((plugin) => plugin.status === "active").map((plugin) => plugin.plugin).sort();
+    const allPlugins = [];
+    let page = 1;
+    let totalPages = 1;
+    while (page <= totalPages) {
+      const { body, response } = await fetchJson(
+        connection,
+        site.siteUrl,
+        `/wp-json/wp/v2/plugins?per_page=100&page=${page}&_fields=plugin,status`
+      );
+      totalPages = Number.parseInt(response.headers.get("x-wp-totalpages") ?? "1", 10) || 1;
+      allPlugins.push(...body);
+      page += 1;
+    }
+    return allPlugins.filter((plugin) => plugin.status === "active").map((plugin) => plugin.plugin).sort();
   } catch (error) {
     if (error instanceof WordpressApiError && (error.statusCode === 403 || error.statusCode === 404)) {
       return null;
@@ -10743,7 +10793,7 @@ function extractCitedDomains2(raw) {
 function extractDomainFromUri2(uri) {
   try {
     const url = new URL(uri);
-    return url.hostname.replace(/^www\./, "");
+    return url.hostname.replace(/^www\./, "").toLowerCase();
   } catch {
     return null;
   }
@@ -10751,11 +10801,11 @@ function extractDomainFromUri2(uri) {
 async function generateText2(prompt, config) {
   const model = config.model ?? DEFAULT_MODEL2;
   const client = new OpenAI({ apiKey: config.apiKey });
-  const response = await client.chat.completions.create({
+  const response = await client.responses.create({
     model,
-    messages: [{ role: "user", content: prompt }]
+    input: prompt
   });
-  return response.choices[0]?.message?.content ?? "";
+  return extractResponseText(response);
 }
 function responseToRecord2(response) {
   try {
@@ -11004,7 +11054,7 @@ function extractCitedDomains3(raw) {
 function extractDomainFromUri3(uri) {
   try {
     const url = new URL(uri);
-    return url.hostname.replace(/^www\./, "");
+    return url.hostname.replace(/^www\./, "").toLowerCase();
   } catch {
     return null;
   }
@@ -11170,7 +11220,7 @@ async function executeTrackedQuery4(input) {
   });
   return {
     provider: "local",
-    rawResponse: JSON.parse(JSON.stringify(response)),
+    rawResponse: responseToRecord4(response),
     model,
     groundingSources: [],
     searchQueries: []
@@ -11225,6 +11275,13 @@ function extractDomainMentions(text2) {
   }
   return [...domains];
 }
+function responseToRecord4(response) {
+  try {
+    return JSON.parse(JSON.stringify(response));
+  } catch {
+    return { error: "failed to serialize response" };
+  }
+}
 // ../provider-local/src/adapter.ts
 function toLocalConfig(config) {
@@ -11754,6 +11811,10 @@ function getConnection(config) {
   if (parts.length >= 1 && parts[0]) host = parts[0];
   if (parts.length >= 2 && parts[1]) port = parseInt(parts[1], 10) || 9222;
   if (!sharedConnection || sharedConnection.endpoint !== `${host}:${port}`) {
+    if (sharedConnection) {
+      sharedConnection.disconnect().catch(() => {
+      });
+    }
     sharedConnection = new CDPConnectionManager(host, port);
   }
   return sharedConnection;
@@ -11903,7 +11964,7 @@ async function executeTrackedQuery5(input) {
       { role: "user", content: prompt }
     ]
   });
-  const rawResponse = responseToRecord4(response);
+  const rawResponse = responseToRecord5(response);
   const citations = extractCitations(rawResponse);
   const groundingSources = citations.map((url) => ({
     uri: url,
@@ -11967,7 +12028,7 @@ function extractCitedDomains5(groundingSources) {
 function extractDomainFromUri4(uri) {
   try {
     const url = new URL(uri);
-    return url.hostname.replace(/^www\./, "");
+    return url.hostname.replace(/^www\./, "").toLowerCase();
   } catch {
     return null;
   }
@@ -11981,7 +12042,7 @@ async function generateText5(prompt, config) {
   });
   return response.choices[0]?.message?.content ?? "";
 }
-function responseToRecord4(response) {
+function responseToRecord5(response) {
   try {
     return JSON.parse(JSON.stringify(response));
   } catch {
@@ -12613,7 +12674,7 @@ var JobRunner = class {
       });
       if (this.onRunCompleted) {
         this.onRunCompleted(runId, projectId).catch((notifErr) => {
-          console.error("[JobRunner] Notification callback failed:", notifErr);
+          log.error("notification.callback-failed", { runId, error: notifErr instanceof Error ? notifErr.message : String(notifErr) });
         });
       }
     }
@@ -13313,45 +13374,49 @@ var Scheduler = class {
     log4.info("cron.registered", { projectId, schedule: label, timezone });
   }
   triggerRun(scheduleId, projectId) {
-    const now = (/* @__PURE__ */ new Date()).toISOString();
-    const currentSchedule = this.db.select().from(schedules).where(eq20(schedules.id, scheduleId)).get();
-    if (!currentSchedule || currentSchedule.enabled !== 1) {
-      log4.warn("schedule.stale", { scheduleId, projectId, msg: "schedule no longer exists or is disabled" });
-      this.remove(projectId);
-      return;
-    }
-    const task = this.tasks.get(projectId);
-    const nextRunAt = task?.getNextRun()?.toISOString() ?? null;
-    const project = this.db.select().from(projects).where(eq20(projects.id, projectId)).get();
-    if (!project) {
-      log4.error("project.not-found", { projectId, msg: "skipping scheduled run" });
-      this.remove(projectId);
-      return;
-    }
-    const queueResult = queueRunIfProjectIdle(this.db, {
-      createdAt: now,
-      kind: "answer-visibility",
-      projectId,
-      trigger: "scheduled"
-    });
-    if (queueResult.conflict) {
-      log4.info("run.skipped-active", { projectName: project.name, activeRunId: queueResult.activeRunId });
+    try {
+      const now = (/* @__PURE__ */ new Date()).toISOString();
+      const currentSchedule = this.db.select().from(schedules).where(eq20(schedules.id, scheduleId)).get();
+      if (!currentSchedule || currentSchedule.enabled !== 1) {
+        log4.warn("schedule.stale", { scheduleId, projectId, msg: "schedule no longer exists or is disabled" });
+        this.remove(projectId);
+        return;
+      }
+      const task = this.tasks.get(projectId);
+      const nextRunAt = task?.getNextRun()?.toISOString() ?? null;
+      const project = this.db.select().from(projects).where(eq20(projects.id, projectId)).get();
+      if (!project) {
+        log4.error("project.not-found", { projectId, msg: "skipping scheduled run" });
+        this.remove(projectId);
+        return;
+      }
+      const queueResult = queueRunIfProjectIdle(this.db, {
+        createdAt: now,
+        kind: "answer-visibility",
+        projectId,
+        trigger: "scheduled"
+      });
+      if (queueResult.conflict) {
+        log4.info("run.skipped-active", { projectName: project.name, activeRunId: queueResult.activeRunId });
+        this.db.update(schedules).set({
+          nextRunAt,
+          updatedAt: now
+        }).where(eq20(schedules.id, currentSchedule.id)).run();
+        return;
+      }
+      const runId = queueResult.runId;
       this.db.update(schedules).set({
+        lastRunAt: now,
         nextRunAt,
         updatedAt: now
       }).where(eq20(schedules.id, currentSchedule.id)).run();
-      return;
+      const scheduleProviders = JSON.parse(currentSchedule.providers);
+      const providers = scheduleProviders.length > 0 ? scheduleProviders : void 0;
+      log4.info("run.triggered", { runId, projectName: project.name, providers: providers ?? "all" });
+      this.callbacks.onRunCreated(runId, projectId, providers);
+    } catch (err) {
+      log4.error("trigger.error", { scheduleId, projectId, error: err instanceof Error ? err.message : String(err) });
     }
-    const runId = queueResult.runId;
-    this.db.update(schedules).set({
-      lastRunAt: now,
-      nextRunAt,
-      updatedAt: now
-    }).where(eq20(schedules.id, currentSchedule.id)).run();
-    const scheduleProviders = JSON.parse(currentSchedule.providers);
-    const providers = scheduleProviders.length > 0 ? scheduleProviders : void 0;
-    log4.info("run.triggered", { runId, projectName: project.name, providers: providers ?? "all" });
-    this.callbacks.onRunCreated(runId, projectId, providers);
   }
 };

package/dist/cli.js CHANGED Viewed

@@ -26,7 +26,7 @@ import {
   setGoogleAuthConfig,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-ETP5IOHC.js";
+} from "./chunk-PZKK53EX.js";
 // src/cli.ts
 import { pathToFileURL } from "url";
@@ -670,6 +670,9 @@ var ApiClient = class {
   async gaAiReferralHistory(project) {
     return this.request("GET", `/projects/${encodeURIComponent(project)}/ga/ai-referral-history`);
   }
+  async gaSessionHistory(project) {
+    return this.request("GET", `/projects/${encodeURIComponent(project)}/ga/session-history`);
+  }
   async wordpressConnect(project, body) {
     return this.request("POST", `/projects/${encodeURIComponent(project)}/wordpress/connect`, body);
   }
@@ -2631,6 +2634,7 @@ async function importKeywords(project, filePath, format) {
     throw new CliError({
       code: "KEYWORD_IMPORT_FILE_NOT_FOUND",
       message: `File not found: ${filePath}`,
+      displayMessage: `Error: file not found: ${filePath}`,
       details: {
         project,
         filePath
@@ -4852,6 +4856,7 @@ var envSchema = z.object({
   WORKER_PORT: z.coerce.number().int().positive().default(3001),
   WEB_PORT: z.coerce.number().int().positive().default(4173),
   BOOTSTRAP_SECRET: z.string().default("change-me"),
+  CANONRY_BASE_PATH: z.string().default("/"),
   // Gemini
   GEMINI_API_KEY: z.string().optional(),
   GEMINI_MODEL: z.string().optional(),

package/dist/index.js CHANGED Viewed

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

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@ainyc/canonry",
-  "version": "1.35.0",
+  "version": "1.36.0",
   "type": "module",
   "description": "The ultimate open-source AEO monitoring tool - track how answer engines cite your domain",
   "license": "FSL-1.1-ALv2",
@@ -56,17 +56,17 @@
     "tsx": "^4.19.0",
     "@ainyc/canonry-api-routes": "0.0.0",
     "@ainyc/canonry-config": "0.0.0",
+    "@ainyc/canonry-contracts": "0.0.0",
     "@ainyc/canonry-integration-bing": "0.0.0",
     "@ainyc/canonry-db": "0.0.0",
-    "@ainyc/canonry-contracts": "0.0.0",
     "@ainyc/canonry-integration-google": "0.0.0",
     "@ainyc/canonry-integration-wordpress": "0.0.0",
     "@ainyc/canonry-provider-cdp": "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-provider-gemini": "0.0.0",
     "@ainyc/canonry-provider-perplexity": "0.0.0",
-    "@ainyc/canonry-provider-gemini": "0.0.0"
+    "@ainyc/canonry-provider-local": "0.0.0"
   },
   "scripts": {
     "build": "tsup && tsx build-web.ts",