@ainyc/canonry 4.51.0 → 4.51.1

package/dist/{chunk-FDR3G6SB.js → chunk-JOKPYAEL.js}

@@ -12540,6 +12540,9 @@ var GA4_DEFAULT_SYNC_DAYS = 30;
 var GA4_MAX_SYNC_DAYS = 90;
 var GA4_REQUEST_TIMEOUT_MS = 3e4;
 var GA4_MAX_PAGES = 50;
+var GA4_MAX_CONCURRENT_REQUESTS = 4;
+var GA4_MAX_RETRIES = 3;
+var GA4_INITIAL_RETRY_DELAY_MS = 1e3;
 var GA4_DIMENSIONS = {
   date: "date",
   landingPagePlusQueryString: "landingPagePlusQueryString",
@@ -12560,10 +12563,14 @@ var GA4_METRICS = {
 // ../integration-google-analytics/src/types.ts
 var GA4ApiError = class extends Error {
   status;
-  constructor(message, status) {
+  /** Seconds the GA4 API asked us to wait before retrying. Populated from the
+   *  `Retry-After` response header on 429 and 5xx responses when present. */
+  retryAfterSeconds;
+  constructor(message, status, retryAfterSeconds) {
     super(message);
     this.name = "GA4ApiError";
     this.status = status;
+    if (retryAfterSeconds !== void 0) this.retryAfterSeconds = retryAfterSeconds;
   }
 };
 
@@ -12659,81 +12666,155 @@ async function getAccessToken(clientEmail, privateKey) {
 function escapeRegExp2(str) {
   return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+var gaInFlight = 0;
+var gaWaitQueue = [];
+async function acquireGa4Slot() {
+  if (gaInFlight < GA4_MAX_CONCURRENT_REQUESTS) {
+    gaInFlight++;
+    return;
+  }
+  await new Promise((resolve) => gaWaitQueue.push(resolve));
+}
+function releaseGa4Slot() {
+  const next = gaWaitQueue.shift();
+  if (next) {
+    next();
+  } else {
+    gaInFlight--;
+  }
+}
+async function withGa4Limit(fn) {
+  await acquireGa4Slot();
+  try {
+    return await fn();
+  } finally {
+    releaseGa4Slot();
+  }
+}
+function parseRetryAfter(headerValue) {
+  if (!headerValue) return void 0;
+  const trimmed = headerValue.trim();
+  const asNum = Number(trimmed);
+  if (Number.isFinite(asNum) && asNum >= 0) return asNum;
+  const asDate = Date.parse(trimmed);
+  if (!Number.isNaN(asDate)) {
+    const seconds = Math.max(0, (asDate - Date.now()) / 1e3);
+    return seconds;
+  }
+  return void 0;
+}
+function isRetryableGa4Error(err) {
+  if (err instanceof GA4ApiError) {
+    return err.status === 429 || err.status >= 500;
+  }
+  return false;
+}
+async function withGa4Retry(fn, errLabel) {
+  let lastError;
+  for (let attempt = 0; attempt <= GA4_MAX_RETRIES; attempt++) {
+    try {
+      return await fn();
+    } catch (err) {
+      lastError = err;
+      if (attempt >= GA4_MAX_RETRIES || !isRetryableGa4Error(err)) throw err;
+      const ga4Err = err;
+      const computedDelayMs = GA4_INITIAL_RETRY_DELAY_MS * Math.pow(2, attempt);
+      const delayMs = ga4Err.retryAfterSeconds !== void 0 ? Math.max(0, ga4Err.retryAfterSeconds * 1e3) : computedDelayMs;
+      ga4Log("info", `${errLabel}.retry`, {
+        attempt: attempt + 1,
+        maxAttempts: GA4_MAX_RETRIES + 1,
+        status: ga4Err.status,
+        delayMs,
+        usedRetryAfter: ga4Err.retryAfterSeconds !== void 0
+      });
+      await new Promise((resolve) => setTimeout(resolve, delayMs));
+    }
+  }
+  throw lastError;
+}
 async function runReport(accessToken, propertyId, request) {
   validatePropertyId(propertyId);
   const safePropertyId = encodeURIComponent(propertyId);
   const url = `${GA4_DATA_API_BASE}/properties/${safePropertyId}:runReport`;
-  const res = await fetch(url, {
-    method: "POST",
-    headers: {
-      "Authorization": `Bearer ${accessToken}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify(request),
-    signal: AbortSignal.timeout(GA4_REQUEST_TIMEOUT_MS)
-  });
-  if (res.status === 401 || res.status === 403) {
-    const body = await res.text().catch(() => "");
-    let detail = "";
-    try {
-      const parsed = JSON.parse(body);
-      if (parsed.error?.status === "SERVICE_DISABLED") {
-        detail = " The Google Analytics Data API is not enabled for this GCP project. Enable it at: https://console.developers.google.com/apis/api/analyticsdata.googleapis.com/overview";
-      } else if (parsed.error?.message) {
-        detail = ` ${parsed.error.message}`;
+  return withGa4Limit(() => withGa4Retry(async () => {
+    const res = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Authorization": `Bearer ${accessToken}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(request),
+      signal: AbortSignal.timeout(GA4_REQUEST_TIMEOUT_MS)
+    });
+    if (res.status === 401 || res.status === 403) {
+      const body = await res.text().catch(() => "");
+      let detail = "";
+      try {
+        const parsed = JSON.parse(body);
+        if (parsed.error?.status === "SERVICE_DISABLED") {
+          detail = " The Google Analytics Data API is not enabled for this GCP project. Enable it at: https://console.developers.google.com/apis/api/analyticsdata.googleapis.com/overview";
+        } else if (parsed.error?.message) {
+          detail = ` ${parsed.error.message}`;
+        }
+      } catch {
+        if (body.length < 200) detail = ` ${body}`;
       }
-    } catch {
-      if (body.length < 200) detail = ` ${body}`;
+      ga4Log("error", "report.auth-failed", { propertyId, httpStatus: res.status });
+      throw new GA4ApiError(
+        `GA4 API authentication failed \u2014 check service account permissions.${detail}`,
+        res.status
+      );
     }
-    ga4Log("error", "report.auth-failed", { propertyId, httpStatus: res.status });
-    throw new GA4ApiError(
-      `GA4 API authentication failed \u2014 check service account permissions.${detail}`,
-      res.status
-    );
-  }
-  if (res.status === 429) {
-    ga4Log("error", "report.rate-limited", { propertyId });
-    throw new GA4ApiError("GA4 API rate limit exceeded", 429);
-  }
-  if (!res.ok) {
-    const body = await res.text();
-    ga4Log("error", "report.error", { propertyId, httpStatus: res.status });
-    const detail = body.length <= 500 ? body : `${body.slice(0, 500)}... [truncated]`;
-    throw new GA4ApiError(`GA4 API error (${res.status}): ${detail}`, res.status);
-  }
-  return await res.json();
+    if (res.status === 429) {
+      const retryAfterSeconds = parseRetryAfter(res.headers.get("retry-after"));
+      ga4Log("error", "report.rate-limited", { propertyId, retryAfterSeconds });
+      throw new GA4ApiError("GA4 API rate limit exceeded", 429, retryAfterSeconds);
+    }
+    if (!res.ok) {
+      const body = await res.text();
+      const retryAfterSeconds = res.status >= 500 ? parseRetryAfter(res.headers.get("retry-after")) : void 0;
+      ga4Log("error", "report.error", { propertyId, httpStatus: res.status, retryAfterSeconds });
+      const detail = body.length <= 500 ? body : `${body.slice(0, 500)}... [truncated]`;
+      throw new GA4ApiError(`GA4 API error (${res.status}): ${detail}`, res.status, retryAfterSeconds);
+    }
+    return await res.json();
+  }, "report"));
 }
 async function batchRunReports(accessToken, propertyId, requests) {
   const url = `${GA4_DATA_API_BASE}/properties/${propertyId}:batchRunReports`;
-  const res = await fetch(url, {
-    method: "POST",
-    headers: {
-      "Authorization": `Bearer ${accessToken}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({ requests }),
-    signal: AbortSignal.timeout(GA4_REQUEST_TIMEOUT_MS)
-  });
-  if (res.status === 401 || res.status === 403) {
-    const body = await res.text().catch(() => "");
-    ga4Log("error", "batch-report.auth-failed", { propertyId, httpStatus: res.status });
-    throw new GA4ApiError(
-      `GA4 API authentication failed \u2014 check service account permissions. ${body}`,
-      res.status
-    );
-  }
-  if (res.status === 429) {
-    ga4Log("error", "batch-report.rate-limited", { propertyId });
-    throw new GA4ApiError("GA4 API rate limit exceeded", 429);
-  }
-  if (!res.ok) {
-    const body = await res.text();
-    ga4Log("error", "batch-report.error", { propertyId, httpStatus: res.status });
-    const detail = body.length <= 500 ? body : `${body.slice(0, 500)}... [truncated]`;
-    throw new GA4ApiError(`GA4 API error (${res.status}): ${detail}`, res.status);
-  }
-  const data = await res.json();
-  return data.reports;
+  return withGa4Limit(() => withGa4Retry(async () => {
+    const res = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Authorization": `Bearer ${accessToken}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ requests }),
+      signal: AbortSignal.timeout(GA4_REQUEST_TIMEOUT_MS)
+    });
+    if (res.status === 401 || res.status === 403) {
+      const body = await res.text().catch(() => "");
+      ga4Log("error", "batch-report.auth-failed", { propertyId, httpStatus: res.status });
+      throw new GA4ApiError(
+        `GA4 API authentication failed \u2014 check service account permissions. ${body}`,
+        res.status
+      );
+    }
+    if (res.status === 429) {
+      const retryAfterSeconds = parseRetryAfter(res.headers.get("retry-after"));
+      ga4Log("error", "batch-report.rate-limited", { propertyId, retryAfterSeconds });
+      throw new GA4ApiError("GA4 API rate limit exceeded", 429, retryAfterSeconds);
+    }
+    if (!res.ok) {
+      const body = await res.text();
+      const retryAfterSeconds = res.status >= 500 ? parseRetryAfter(res.headers.get("retry-after")) : void 0;
+      ga4Log("error", "batch-report.error", { propertyId, httpStatus: res.status, retryAfterSeconds });
+      const detail = body.length <= 500 ? body : `${body.slice(0, 500)}... [truncated]`;
+      throw new GA4ApiError(`GA4 API error (${res.status}): ${detail}`, res.status, retryAfterSeconds);
+    }
+    const data = await res.json();
+    return data.reports;
+  }, "batch-report"));
 }
 function formatDate2(d) {
   return d.toISOString().slice(0, 10);

package/dist/cli.js

@@ -21,7 +21,7 @@ import {
   setTelemetrySource,
   showFirstRunNotice,
   trackEvent
-} from "./chunk-FDR3G6SB.js";
+} from "./chunk-JOKPYAEL.js";
 import {
   CliError,
   EXIT_SYSTEM_ERROR,

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   createServer
-} from "./chunk-FDR3G6SB.js";
+} from "./chunk-JOKPYAEL.js";
 import {
   loadConfig
 } from "./chunk-GGXU5VKI.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ainyc/canonry",
-  "version": "4.51.0",
+  "version": "4.51.1",
   "type": "module",
   "description": "Agent-first open-source AEO operating platform - track how answer engines cite your domain",
   "license": "FSL-1.1-ALv2",
@@ -63,21 +63,21 @@
     "tsx": "^4.19.0",
     "@ainyc/canonry-api-routes": "0.0.0",
     "@ainyc/canonry-config": "0.0.0",
-    "@ainyc/canonry-intelligence": "0.0.0",
-    "@ainyc/canonry-contracts": "0.0.0",
     "@ainyc/canonry-db": "0.0.0",
-    "@ainyc/canonry-integration-bing": "0.0.0",
-    "@ainyc/canonry-integration-commoncrawl": "0.0.0",
+    "@ainyc/canonry-intelligence": "0.0.0",
     "@ainyc/canonry-integration-cloud-run": "0.0.0",
-    "@ainyc/canonry-integration-google": "0.0.0",
+    "@ainyc/canonry-integration-commoncrawl": "0.0.0",
     "@ainyc/canonry-integration-traffic": "0.0.0",
-    "@ainyc/canonry-provider-cdp": "0.0.0",
+    "@ainyc/canonry-integration-bing": "0.0.0",
+    "@ainyc/canonry-integration-google": "0.0.0",
     "@ainyc/canonry-integration-wordpress": "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-cdp": "0.0.0",
+    "@ainyc/canonry-contracts": "0.0.0",
     "@ainyc/canonry-provider-gemini": "0.0.0",
-    "@ainyc/canonry-provider-perplexity": "0.0.0"
+    "@ainyc/canonry-provider-local": "0.0.0",
+    "@ainyc/canonry-provider-perplexity": "0.0.0",
+    "@ainyc/canonry-provider-openai": "0.0.0"
   },
   "scripts": {
     "build": "tsx scripts/copy-agent-assets.ts && tsup && tsx build-web.ts",