@marktiderman/genesis-forms 0.3.0 → 0.3.1

package/dist/destinations.js

@@ -60,6 +60,11 @@ async function timedFetch(deps, url, init, signal) {
   const timeout = AbortSignal.timeout(deps.timeoutMs ?? REQUEST_TIMEOUT_MS);
   const any = AbortSignal.any;
   const combined = signal ? any ? any([timeout, signal]) : signal.aborted ? signal : timeout : timeout;
+  try {
+    new Request(url, { method: init.method ?? "GET", headers: init.headers ?? {} });
+  } catch {
+    throw new DeliveryError("Invalid request (a header value or the URL is malformed)", { retryable: false });
+  }
   try {
     return await (deps.fetch ?? fetch)(url, { ...init, signal: combined });
   } catch (error) {
@@ -756,7 +761,7 @@ async function googleAccessToken(account, options = {}) {
   if (!clientEmail || !privateKey) throw new DeliveryError("The Google service account email or private key is not set");
   const scope = options.scope ?? SHEETS_SCOPE;
   const now = options.now?.() ?? Date.now();
-  const cacheKey = `${clientEmail} ${scope}`;
+  const cacheKey = `${clientEmail} ${scope} ${await sha256Hex(privateKey.replace(/\\n/g, "\n").trim())}`;
   const hit = cache.get(cacheKey);
   if (hit && hit.expiresAt - 6e4 > now) return hit.token;
   const iat = Math.floor(now / 1e3);
@@ -787,6 +792,7 @@ var SHEETS_API = "https://sheets.googleapis.com/v4/spreadsheets";
 var DEFAULT_SHEET_NAME = "Responses";
 var DEDUPE_WINDOW = 500;
 var HEADER_SCAN_ROWS = 100;
+var HEADER_WRITE_ATTEMPTS = 3;
 function mergeHeader(existing, keys, width = 0) {
   const header = existing.map((h) => h == null ? "" : String(h));
   while (header.length < width) header.push("");
@@ -882,35 +888,52 @@ function sheetsDestination(options) {
     });
     const keys = [...new Set(rows.flatMap((r) => r.columns))];
     async function setUp(previous) {
-      const meta = await call(
-        "read",
-        `${base}?fields=${encodeURIComponent("sheets.properties(sheetId,title,gridProperties.columnCount)")}`
-      );
-      let sheet = meta.sheets?.map((s) => s.properties).find((p) => p?.title === sheetName);
+      const readTabs = async () => {
+        const meta = await call(
+          "read",
+          `${base}?fields=${encodeURIComponent("sheets.properties(sheetId,title,gridProperties.columnCount)")}`
+        );
+        return meta.sheets?.map((s) => s.properties).find((p) => p?.title === sheetName);
+      };
+      let sheet = await readTabs();
       if (!sheet) {
-        const added = await batchUpdate("add tab", [{ addSheet: { properties: { title: sheetName } } }]);
-        sheet = added.replies?.[0]?.addSheet?.properties ?? { sheetId: 0, title: sheetName };
-      }
-      const read = await call(
-        "read header",
-        `${range(`A1:ZZZ${HEADER_SCAN_ROWS}`)}?majorDimension=COLUMNS`
-      );
-      const used = read.values ?? [];
-      const existing = used.map((column) => column[0] ?? "");
-      const header = mergeHeader(existing, keys, used.length);
-      if (!header.includes("id")) {
-        if (used.length) header.push("id");
-        else header.unshift("id");
+        try {
+          const added = await batchUpdate("add tab", [{ addSheet: { properties: { title: sheetName } } }]);
+          sheet = added.replies?.[0]?.addSheet?.properties ?? { sheetId: 0, title: sheetName };
+        } catch (error) {
+          if (!(error instanceof DeliveryError) || error.status !== 400) throw error;
+          sheet = await readTabs();
+          if (!sheet) throw error;
+        }
       }
+      const readHeader = async () => {
+        const read = await call(
+          "read header",
+          `${range(`A1:ZZZ${HEADER_SCAN_ROWS}`)}?majorDimension=COLUMNS`
+        );
+        const used2 = read.values ?? [];
+        return { used: used2.length, existing: used2.map((column) => column[0] ?? "") };
+      };
       let columns = sheet.gridProperties?.columnCount ?? 26;
-      if (header.length > columns) {
-        await batchUpdate("add columns", [
-          { appendDimension: { sheetId: sheet.sheetId, dimension: "COLUMNS", length: header.length - columns } }
-        ]);
-        columns = header.length;
-      }
-      const changed = header.length !== existing.length || header.some((h, i) => h !== String(existing[i] ?? ""));
-      if (changed) {
+      let { used, existing } = await readHeader();
+      let header = [];
+      for (let attempt = 0; ; attempt++) {
+        header = mergeHeader(existing, keys, used);
+        if (!header.includes("id")) {
+          if (used) header.push("id");
+          else header.unshift("id");
+        }
+        const changed = header.length !== existing.length || header.some((h, i) => h !== String(existing[i] ?? ""));
+        if (!changed) break;
+        if (attempt >= HEADER_WRITE_ATTEMPTS) {
+          throw new DeliveryError("Google Sheets header kept changing while it was written", { retryable: true });
+        }
+        if (header.length > columns) {
+          await batchUpdate("add columns", [
+            { appendDimension: { sheetId: sheet.sheetId, dimension: "COLUMNS", length: header.length - columns } }
+          ]);
+          columns = header.length;
+        }
         await call("write header", `${range("A1")}?valueInputOption=RAW`, {
           method: "PUT",
           body: JSON.stringify({ values: [header] })
@@ -925,6 +948,7 @@ function sheetsDestination(options) {
             }
           ]);
         }
+        ({ used, existing } = await readHeader());
       }
       return {
         spreadsheet_id: spreadsheetId,