@marktiderman/genesis-forms 0.9.0 → 0.9.1

package/dist/destinations.cjs

@@ -2095,7 +2095,7 @@ function padded(text) {
   return fromBase64(text + "=".repeat((4 - text.length % 4) % 4));
 }
 
-// src/destinations/runner.ts
+// ../notifications/src/runner/index.ts
 var DEFAULT_MAX_ATTEMPTS = 8;
 var DEFAULT_MAX_DEFERRALS = 24;
 var DEFAULT_BATCH_SIZE = 25;
@@ -2104,8 +2104,11 @@ function defaultBackoff(attempt, random) {
   const r = typeof random === "function" ? random() : Math.random();
   return Math.round(nominal * (0.8 + 0.4 * Math.min(1, Math.max(0, r))));
 }
-function deliveryOutcome(result, attempt, options = {}) {
-  if (result.ok) return result.notSent ? { status: "skipped", reason: result.notSent.slice(0, 500) } : { status: "sent" };
+function jobOutcome(result, attempt, options = {}) {
+  if (result.ok) {
+    if (result.notSent) return { status: "skipped", reason: result.notSent.slice(0, 500) };
+    return result.alreadyThere ? { status: "sent", alreadyThere: true } : { status: "sent" };
+  }
   const http = result.status !== void 0 ? { httpStatus: result.status } : {};
   if (result.disable) return { status: "failed", error: result.error, ...http, disable: true };
   if (!result.retryable) return { status: "failed", error: result.error, ...http };
@@ -2119,14 +2122,109 @@ function deliveryOutcome(result, attempt, options = {}) {
   const seconds = Math.max(1, Math.ceil((options.backoff ?? defaultBackoff)(attempt)));
   return { status: "retry", error: result.error, retryAt: new Date(now + seconds * 1e3), retryAfterSeconds: seconds, counted: true, ...http };
 }
-function createDeliveryRunner(options) {
+function failureOf(error) {
+  const e = error;
+  if (e && typeof e === "object" && typeof e.retryable === "boolean" && typeof e.message === "string") {
+    return {
+      ok: false,
+      retryable: e.disable === true ? false : e.retryable,
+      error: e.message.slice(0, 500),
+      ...typeof e.retryAfterSeconds === "number" ? { retryAfterSeconds: e.retryAfterSeconds } : {},
+      ...typeof e.status === "number" ? { status: e.status } : {},
+      ...e.disable === true ? { disable: true } : {}
+    };
+  }
+  const timeout = e && typeof e === "object" && (e.name === "TimeoutError" || e.name === "AbortError");
+  return { ok: false, retryable: true, error: timeout ? "Timed out" : "Unexpected error" };
+}
+function createRunner(options) {
   const log = (message) => {
     try {
       options.log?.(message);
     } catch {
     }
   };
+  const label = (job) => options.label?.(job) ?? `Job ${job.id}`;
+  const recordLabel = (job) => options.recordLabel?.(job) ?? `job ${job.id}`;
   const now = () => options.now?.() ?? Date.now();
+  return {
+    async run(runOptions = {}) {
+      const report = { claimed: 0, sent: 0, filtered: 0, skipped: 0, retrying: 0, deferred: 0, failed: 0, stale: 0, unrecorded: 0 };
+      const limit = runOptions.limit ?? options.batchSize ?? DEFAULT_BATCH_SIZE;
+      const claimed = await options.claim({ limit, filter: runOptions.filter });
+      report.claimed = claimed.length;
+      const groups = /* @__PURE__ */ new Map();
+      claimed.forEach((job, i) => {
+        const key = options.group ? options.group(job) : `\0${i}`;
+        const list = groups.get(key) ?? [];
+        list.push(job);
+        groups.set(key, list);
+      });
+      await Promise.all(
+        [...groups.values()].map(async (group) => {
+          let results;
+          try {
+            results = await options.send(group, { signal: runOptions.signal });
+            if (results.length !== group.length) throw new Error("send answered the wrong number of results");
+          } catch (error) {
+            const failure = failureOf(error);
+            results = group.map(() => failure);
+          }
+          const at = now();
+          await Promise.all(
+            group.map(async (job, i) => {
+              const result = results[i];
+              const outcome = result === "filtered" ? { status: "filtered" } : jobOutcome(result, job.attempt, {
+                now: at,
+                maxAttempts: options.maxAttempts,
+                backoff: options.backoff,
+                deferrals: job.deferrals,
+                maxDeferrals: options.maxDeferrals
+              });
+              if (outcome.status === "failed" || outcome.status === "retry") {
+                log(`${label(job)} ${outcome.status === "failed" ? "failed" : "will be retried"}: ${outcome.error}`);
+              } else if (outcome.status === "skipped") {
+                log(`${label(job)} skipped: ${outcome.reason}`);
+              }
+              let recorded;
+              try {
+                recorded = await options.record(job, outcome);
+              } catch {
+                report.unrecorded++;
+                log(`Recording ${recordLabel(job)} failed`);
+                return;
+              }
+              if (recorded === false) report.stale++;
+              else if (outcome.status === "sent") report.sent++;
+              else if (outcome.status === "filtered") report.filtered++;
+              else if (outcome.status === "skipped") report.skipped++;
+              else if (outcome.status === "failed") report.failed++;
+              else if (outcome.counted) report.retrying++;
+              else report.deferred++;
+            })
+          );
+        })
+      );
+      return report;
+    }
+  };
+}
+
+// src/destinations/runner.ts
+var DEFAULT_MAX_ATTEMPTS2 = DEFAULT_MAX_ATTEMPTS;
+var DEFAULT_MAX_DEFERRALS2 = DEFAULT_MAX_DEFERRALS;
+var DEFAULT_BATCH_SIZE2 = DEFAULT_BATCH_SIZE;
+var defaultBackoff2 = defaultBackoff;
+function deliveryOutcome(result, attempt, options = {}) {
+  return jobOutcome(result.ok ? { ok: true, notSent: result.notSent } : result, attempt, options);
+}
+function createDeliveryRunner(options) {
+  const log = (message) => {
+    try {
+      options.log?.(message);
+    } catch {
+    }
+  };
   async function send(group, signal) {
     const first = group[0];
     const destination = options.destinations[first.kind];
@@ -2187,78 +2285,34 @@ function createDeliveryRunner(options) {
     let next = 0;
     return results.map((r) => r ?? sent[next++]);
   }
-  return {
-    async run(runOptions = {}) {
-      const report = {
-        claimed: 0,
-        sent: 0,
-        filtered: 0,
-        skipped: 0,
-        retrying: 0,
-        deferred: 0,
-        failed: 0,
-        stale: 0,
-        unrecorded: 0
-      };
-      const limit = runOptions.limit ?? options.batchSize ?? DEFAULT_BATCH_SIZE;
-      const claimed = await options.claim({ limit, filter: runOptions.filter });
-      report.claimed = claimed.length;
-      const groups = /* @__PURE__ */ new Map();
-      for (const delivery of claimed) {
-        const list = groups.get(delivery.destinationId) ?? [];
-        list.push(delivery);
-        groups.set(delivery.destinationId, list);
-      }
-      await Promise.all(
-        [...groups.values()].map(async (group) => {
-          const results = await send(group, runOptions.signal);
-          const at = now();
-          await Promise.all(
-            group.map(async (delivery, i) => {
-              const result = results[i];
-              const outcome = result === "filtered" ? { status: "filtered" } : deliveryOutcome(result, delivery.attempt, {
-                now: at,
-                maxAttempts: options.maxAttempts,
-                backoff: options.backoff,
-                deferrals: delivery.deferrals,
-                maxDeferrals: options.maxDeferrals
-              });
-              if (outcome.status === "sent" && result !== "filtered" && result.ok && result.skipped?.includes(delivery.submission.id)) {
-                outcome.alreadyThere = true;
-              }
-              if (outcome.status === "failed" || outcome.status === "retry") {
-                log(`Delivery ${delivery.id} (${delivery.kind}) ${outcome.status === "failed" ? "failed" : "will be retried"}: ${outcome.error}`);
-              } else if (outcome.status === "skipped") {
-                log(`Delivery ${delivery.id} (${delivery.kind}) skipped: ${outcome.reason}`);
-              }
-              let recorded;
-              try {
-                recorded = await options.record(delivery, outcome);
-              } catch {
-                report.unrecorded++;
-                log(`Recording delivery ${delivery.id} failed`);
-                return;
-              }
-              if (recorded === false) report.stale++;
-              else if (outcome.status === "sent") report.sent++;
-              else if (outcome.status === "filtered") report.filtered++;
-              else if (outcome.status === "skipped") report.skipped++;
-              else if (outcome.status === "failed") report.failed++;
-              else if (outcome.counted) report.retrying++;
-              else report.deferred++;
-            })
-          );
-        })
-      );
-      return report;
-    }
-  };
+  return createRunner({
+    claim: options.claim,
+    // One group per destination: a sheet gets one append for all its rows.
+    group: (delivery) => delivery.destinationId,
+    async send(group, { signal }) {
+      const results = await send(group, signal);
+      return results.map((result, i) => {
+        if (result === "filtered") return result;
+        if (!result.ok) return result;
+        return { ok: true, notSent: result.notSent, alreadyThere: result.skipped?.includes(group[i].submission.id) && !result.notSent };
+      });
+    },
+    record: options.record,
+    now: options.now,
+    log: options.log,
+    label: (delivery) => `Delivery ${delivery.id} (${delivery.kind})`,
+    recordLabel: (delivery) => `delivery ${delivery.id}`,
+    batchSize: options.batchSize,
+    maxAttempts: options.maxAttempts,
+    maxDeferrals: options.maxDeferrals,
+    backoff: options.backoff
+  });
 }
 
 exports.DEDUPE_WINDOW = DEDUPE_WINDOW;
-exports.DEFAULT_BATCH_SIZE = DEFAULT_BATCH_SIZE;
-exports.DEFAULT_MAX_ATTEMPTS = DEFAULT_MAX_ATTEMPTS;
-exports.DEFAULT_MAX_DEFERRALS = DEFAULT_MAX_DEFERRALS;
+exports.DEFAULT_BATCH_SIZE = DEFAULT_BATCH_SIZE2;
+exports.DEFAULT_MAX_ATTEMPTS = DEFAULT_MAX_ATTEMPTS2;
+exports.DEFAULT_MAX_DEFERRALS = DEFAULT_MAX_DEFERRALS2;
 exports.DEFAULT_SHEET_NAME = DEFAULT_SHEET_NAME;
 exports.DRIVE_FILE_SCOPE = DRIVE_FILE_SCOPE;
 exports.DeliveryError = DeliveryError;
@@ -2284,7 +2338,7 @@ exports.clearGoogleTokenCache = clearGoogleTokenCache;
 exports.columnLetter = columnLetter;
 exports.conditionOf = conditionOf;
 exports.createDeliveryRunner = createDeliveryRunner;
-exports.defaultBackoff = defaultBackoff;
+exports.defaultBackoff = defaultBackoff2;
 exports.deliveryFailure = deliveryFailure;
 exports.deliveryOutcome = deliveryOutcome;
 exports.deriveSecretKey = deriveSecretKey;