@liiift-studio/sanity-visitor-insights 0.35.0 → 0.36.0

package/dist/server.js

@@ -470,6 +470,30 @@ async function requireStudioUser(req, res, sanityProjectId, requiredRoles) {
   return result.user;
 }
 
+// src/server/fetchWithTimeout.ts
+var REQUEST_TIMEOUT_MS = 12e3;
+async function fetchWithTimeout(input, init = {}, timeoutMs = REQUEST_TIMEOUT_MS) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  const caller = init.signal;
+  const onCallerAbort = () => controller.abort();
+  if (caller) {
+    if (caller.aborted) controller.abort();
+    else caller.addEventListener("abort", onCallerAbort, { once: true });
+  }
+  try {
+    return await fetch(input, { ...init, signal: controller.signal });
+  } catch (error) {
+    if (controller.signal.aborted && !caller?.aborted) {
+      throw new Error(`Request timed out after ${timeoutMs}ms`);
+    }
+    throw error;
+  } finally {
+    clearTimeout(timer);
+    caller?.removeEventListener("abort", onCallerAbort);
+  }
+}
+
 // src/server/googleAuth.ts
 var import_node_crypto = require("crypto");
 var ANALYTICS_READONLY_SCOPE = "https://www.googleapis.com/auth/analytics.readonly";
@@ -545,6 +569,7 @@ async function getAccessToken(key) {
 // src/server/ga4.ts
 var DATA_API_BASE = "https://analyticsdata.googleapis.com/v1beta";
 var DATA_API_ALPHA = "https://analyticsdata.googleapis.com/v1alpha";
+var EMPTY_REPORT = { rows: [], thresholded: false, sampled: false, rowCount: 0 };
 function toMetricNumber(raw) {
   if (raw === void 0 || raw === "") return Number.NaN;
   const parsed = Number(raw);
@@ -616,6 +641,16 @@ function andFilters(...filters) {
   if (present.length === 1) return present[0];
   return { andGroup: { expressions: present } };
 }
+function alignBatch(chunks) {
+  return chunks.flatMap(({ reports, expected }) => {
+    if (reports.length !== expected) {
+      console.error(
+        `Visitor insights: GA4 returned ${reports.length} of ${expected} reports in a batch; padding to keep results aligned.`
+      );
+    }
+    return Array.from({ length: expected }, (_, i) => reports[i] ?? EMPTY_REPORT);
+  });
+}
 function createGa4Client(propertyId, key, options = {}) {
   const hosts = options.hostnames && options.hostnames.length > 0 ? options.hostnames : null;
   const hostFilter = hosts ? hostnameFilter(hosts) : void 0;
@@ -625,7 +660,7 @@ function createGa4Client(propertyId, key, options = {}) {
   }
   async function post(path, body, base = DATA_API_BASE) {
     const token = await getAccessToken(key);
-    const response = await fetch(`${base}/properties/${propertyId}:${path}`, {
+    const response = await fetchWithTimeout(`${base}/properties/${propertyId}:${path}`, {
       method: "POST",
       headers: {
         Authorization: `Bearer ${token}`,
@@ -658,7 +693,12 @@ function createGa4Client(propertyId, key, options = {}) {
           (chunk) => post("batchRunReports", { requests: chunk.map(narrow) })
         )
       );
-      return responses.flatMap((raw) => (raw.reports ?? []).map(parseReport));
+      return alignBatch(
+        responses.map((raw, index) => ({
+          reports: (raw.reports ?? []).map(parseReport),
+          expected: chunks[index].length
+        }))
+      );
     },
     async runFunnelReport(steps, range) {
       const body = {
@@ -741,7 +781,7 @@ function createVercelClient(projectId, token, teamId) {
   async function query(path, extra) {
     const params = new URLSearchParams({ projectId, ...extra });
     if (teamId) params.set("teamId", teamId);
-    const response = await fetch(`${API_BASE}/${path}?${params.toString()}`, {
+    const response = await fetchWithTimeout(`${API_BASE}/${path}?${params.toString()}`, {
       headers: { Authorization: `Bearer ${token}` }
     });
     if (!response.ok) {
@@ -816,7 +856,7 @@ function createMailchimpClient(apiKey, listId) {
   const auth = `Basic ${Buffer.from(`key:${apiKey}`).toString("base64")}`;
   async function get(path, params = {}) {
     const query = new URLSearchParams(params).toString();
-    const response = await fetch(`${base}${path}${query ? `?${query}` : ""}`, {
+    const response = await fetchWithTimeout(`${base}${path}${query ? `?${query}` : ""}`, {
       headers: { Authorization: auth }
     });
     if (!response.ok) {
@@ -903,11 +943,12 @@ function setCached(key, value, ttlMs = DEFAULT_TTL_MS) {
   }
   store.set(key, { value, expiresAt: Date.now() + ttlMs });
 }
-async function withCache(key, ttlMs, compute) {
+async function withCache(key, ttlMs, compute, ttlFor) {
   const hit = getCached(key);
   if (hit !== void 0) return hit;
   const value = await compute();
-  setCached(key, value, ttlMs);
+  const ttl = ttlFor ? ttlFor(value) : ttlMs;
+  if (ttl > 0) setCached(key, value, ttl);
   return value;
 }
 function clearCache() {
@@ -934,6 +975,21 @@ function orderQueryOptions(orders, range) {
 function orderFilter(documentType, excludeFilter) {
   const clauses = [
     `_type == $documentType`,
+    /*
+     * Published only.
+     *
+     * @sanity/client v6 defaults to the `raw` perspective for a token-authenticated request, and
+     * the sites pass a token — so an order that anyone has opened and edited in the Studio comes
+     * back twice, as `orderId` and as `drafts.orderId`. That double-counts it in the order total,
+     * in the revenue, and in its day's stem: a 14% error at seven orders a quarter, in the one
+     * figure this tool calls exact and calibrates the whole capture model against.
+     *
+     * Darden currently has no draft orders, so this is latent rather than live — which is exactly
+     * the kind of thing that stays latent until the day someone opens an order to check it.
+     * Filtering here rather than relying on a perspective the consumer configures, because the
+     * consumer is a site that has no reason to know this report depends on it.
+     */
+    `!(_id in path("drafts.**"))`,
     `_createdAt >= $start`,
     `_createdAt < $end`
   ];
@@ -2445,6 +2501,9 @@ function createVisitorInsightsHandler(options) {
             }
           } : {}
         };
+      }, (envelope2) => {
+        const degraded = Object.values(envelope2.sources).some((source) => source?.status !== "ok");
+        return degraded ? Math.min(ttl, 2e4) : ttl;
       });
       res.status(200).json(envelope);
     } catch (e) {