@h-ai/feedback 0.1.0-alpha.74 → 0.1.0-alpha.76

package/dist/client/index.js

@@ -1,4 +1,4 @@
-import { feedbackM, HaiFeedbackError, redactFeedbackText } from '../chunk-UIVT267C.js';
+import { feedbackM, HaiFeedbackError, redactFeedbackText } from '../chunk-7W47WZXY.js';
 import { ok, core, err } from '@h-ai/core';
 import { resolveFeedbackBudget, FeedbackSubmitInputSchema, FeedbackBudgetSchema, FeedbackEvidenceInputSchema, FeedbackReportSchema } from '@h-ai/api-contract/feedback';
 
@@ -45,7 +45,14 @@ async function saveFeedbackFile(bytes, filename, contentType = "application/zip"
 // src/client/feedback-client-image.ts
 var PRIVATE_SELECTOR = 'input[type="password"],[data-feedback-private],.rr-block,.rr-mask';
 var CONTROL_SELECTOR = 'input,textarea,select,[contenteditable]:not([contenteditable="false"])';
-async function captureFeedbackScreenshot() {
+async function captureFeedbackScreenshot(signal) {
+  signal?.throwIfAborted();
+  const walker = document.createTreeWalker(document.body, NodeFilter.SHOW_ELEMENT);
+  let nodes = 0;
+  while (walker.nextNode()) {
+    if (++nodes > 1e4)
+      throw new RangeError("Screenshot document budget exceeded");
+  }
   if (document.fonts) {
     let timeout;
     try {
@@ -55,6 +62,7 @@ async function captureFeedbackScreenshot() {
     }
   }
   const { default: html2canvas } = await import('html2canvas');
+  signal?.throwIfAborted();
   const canvas = await html2canvas(document.body, {
     width: window.innerWidth,
     height: window.innerHeight,
@@ -71,6 +79,7 @@ async function captureFeedbackScreenshot() {
     imageTimeout: 1e3,
     ignoreElements: (element) => element.matches("[data-feedback-ignore],iframe,video"),
     onclone: (clone) => {
+      signal?.throwIfAborted();
       const colorCanvas = clone.createElement("canvas");
       colorCanvas.width = 1;
       colorCanvas.height = 1;
@@ -124,7 +133,10 @@ async function captureFeedbackScreenshot() {
     }
   });
   try {
-    return await canvasBytes(canvas);
+    signal?.throwIfAborted();
+    const bytes = await canvasBytes(canvas);
+    signal?.throwIfAborted();
+    return bytes;
   } finally {
     canvas.width = 0;
     canvas.height = 0;
@@ -394,6 +406,8 @@ function createFeedbackClient() {
   let flushTimer;
   let stopReplay;
   let screenshotCaptures = 0;
+  let captureTask;
+  let replayRequested = false;
   let unsubscribeLogger;
   let source = "";
   let keyScreenshots = [];
@@ -412,7 +426,8 @@ function createFeedbackClient() {
     const key = code === "NOT_INITIALIZED" ? "feedback_notInitialized" : code === "LIMIT_EXCEEDED" ? "feedback_limitExceeded" : code === "INVALID_INPUT" ? "feedback_invalidInput" : "feedback_operationFailed";
     const traceId = core.context.get().traceId ?? core.context.get().requestId ?? core.id.uuid();
     const error = { ...HaiFeedbackError[code], traceId, message: message ?? feedbackM(key), cause };
-    core.logger[cause === void 0 ? "warn" : "error"]("Feedback client operation failed", { module: "feedback", traceId, error });
+    if (!(closing && code === "NOT_INITIALIZED"))
+      core.logger[cause === void 0 ? "warn" : "error"]("Feedback client operation failed", { module: "feedback", traceId, error });
     return err({ ...error, message: core.error.formatMessage(error) });
   }
   function limits() {
@@ -484,9 +499,9 @@ function createFeedbackClient() {
     schedulePersist();
     appendToDraft(item, size);
   }
-  function appendToDraft(item, size) {
+  function appendToDraft(item, size, snapshot = false) {
     const bounds = limits();
-    if (draft && !collectionFinished && !collectionSealed && (Date.now() <= deadline && afterCount < bounds.after || item.kind === "environment") && draft.evidence.length < bounds.events && draftBytes + size <= bounds.bytes) {
+    if (draft && !collectionFinished && !collectionSealed && (snapshot || Date.now() <= deadline && afterCount < bounds.after || item.kind === "environment") && draft.evidence.length < bounds.events && draftBytes + size <= bounds.bytes) {
       draft.evidence.push(item);
       draftBytes += size;
       if (item.kind === "log" || item.kind === "error")
@@ -510,6 +525,8 @@ function createFeedbackClient() {
       const numeric = [input.maxEvents, input.maxBytes, input.maxAgeMs, input.beforeCount, input.afterCount, input.afterTimeoutMs, input.screenshotTimeoutMs, input.maxKeyScreenshots, input.keyScreenshotThrottleMs];
       if (numeric.some((value) => value !== void 0 && (!Number.isSafeInteger(value) || value < 0)) || input.persistDraft && !input.persistenceKey)
         return failure("INVALID_INPUT");
+      if (input.replayStart !== void 0 && !["init", "prepare"].includes(input.replayStart))
+        return failure("INVALID_INPUT");
       if (!FeedbackSubmitInputSchema.pick({ appId: true, appVersion: true, buildId: true, commit: true }).safeParse({ appId: input.appId, appVersion: input.appVersion, buildId: input.buildId, commit: input.commit }).success)
         return failure("INVALID_INPUT");
       const initVersion = sessionVersion;
@@ -597,11 +614,17 @@ function createFeedbackClient() {
           void saveFeedbackCheckpoint(storageKey, buffer).catch(() => missing.add("browser-persistence-unavailable"));
         void flush();
       });
-      if (input.replay)
+      replayRequested = input.replayStart === "init";
+      if (input.replay && replayRequested)
         await startReplay(input);
       if (closing || config !== input)
         return failure("NOT_INITIALIZED");
       flushTimer = setInterval(() => {
+        if (draft && Date.now() > deadline && input.replayStart !== "init") {
+          replayRequested = false;
+          stopReplay?.();
+          stopReplay = void 0;
+        }
         if (draft?.report)
           void flush();
       }, 1e3);
@@ -616,8 +639,12 @@ function createFeedbackClient() {
   async function startReplay(activeConfig) {
     try {
       const { record: start } = await import('@rrweb/record');
-      if (closing || config !== activeConfig || screenshotCaptures || stopReplay)
+      if (closing || config !== activeConfig || stopReplay)
+        return;
+      if (screenshotCaptures) {
+        missing.add("replay-deferred-by-capture");
         return;
+      }
       let firstEvent = true;
       stopReplay = start({
         maskAllInputs: true,
@@ -643,7 +670,7 @@ function createFeedbackClient() {
           if (!safe.success)
             return;
           replayChunks.at(-1)?.push(safe.data);
-          appendToDraft(safe.data, new TextEncoder().encode(JSON.stringify(safe.data)).byteLength);
+          appendToDraft(safe.data, new TextEncoder().encode(JSON.stringify(safe.data)).byteLength, event.type === 2 || event.type === 4);
           while (replayChunks.length > 2)
             replayChunks.shift();
           const count = replayChunks.reduce((total, chunk) => total + chunk.length, 0);
@@ -660,7 +687,7 @@ function createFeedbackClient() {
     }
   }
   function captureKeyScreenshot() {
-    if (!config || config.screenshot === false || config.keyScreenshots === false || config.maxKeyScreenshots === 0 || keyScreenshotPromise || Date.now() - lastKeyScreenshot < (config.keyScreenshotThrottleMs ?? 1e4))
+    if (!config || config.screenshot === false || config.keyScreenshots !== true || config.maxKeyScreenshots === 0 || keyScreenshotPromise || captureTask || Date.now() - lastKeyScreenshot < (config.keyScreenshotThrottleMs ?? 1e4))
       return keyScreenshotPromise ?? Promise.resolve();
     const activeConfig = config;
     lastKeyScreenshot = Date.now();
@@ -688,19 +715,30 @@ function createFeedbackClient() {
     return keyScreenshotPromise;
   }
   function takeScreenshot(activeConfig) {
+    if (captureTask) {
+      if (captureTask.config !== activeConfig || captureTask.controller.signal.aborted)
+        return Promise.reject(new Error("Screenshot task is still stopping"));
+      return bounded(captureTask.promise, activeConfig.screenshotTimeoutMs ?? 3e3, captureTask.controller);
+    }
+    const controller = new AbortController();
     screenshotCaptures++;
     stopReplay?.();
     stopReplay = void 0;
     const captured = (async () => {
       try {
-        return await (activeConfig.captureScreenshot?.() ?? captureFeedbackScreenshot());
+        const bytes = await (activeConfig.captureScreenshot?.({ signal: controller.signal }) ?? captureFeedbackScreenshot(controller.signal));
+        controller.signal.throwIfAborted();
+        return bytes;
       } finally {
+        await Promise.resolve();
         screenshotCaptures--;
-        if (!screenshotCaptures && !closing && config === activeConfig && activeConfig.replay)
-          await startReplay(activeConfig);
+        captureTask = void 0;
+        if (!screenshotCaptures && !closing && config?.replay && replayRequested)
+          await startReplay(config);
       }
     })();
-    return bounded(captured, activeConfig.screenshotTimeoutMs ?? 3e3);
+    captureTask = { promise: captured, controller, config: activeConfig };
+    return bounded(captured, activeConfig.screenshotTimeoutMs ?? 3e3, controller);
   }
   async function doPrepare() {
     if (!config || closing)
@@ -722,6 +760,9 @@ function createFeedbackClient() {
         if (!captured.success)
           return captured;
       }
+      replayRequested = true;
+      if (config.replay && !stopReplay)
+        await startReplay(config);
       return ok(draft);
     }
     collectionFinished = false;
@@ -776,6 +817,9 @@ function createFeedbackClient() {
         draft.missing.push("key-screenshot-budget-exceeded");
       else draft.attachments.push(image);
     }
+    replayRequested = true;
+    if (config.replay && !stopReplay)
+      await startReplay(config);
     schedulePersist();
     preparedPage = pageIdentity();
     return ok(draft);
@@ -926,6 +970,8 @@ function createFeedbackClient() {
         if (!result.success)
           return result;
         collectionFinished = true;
+        if (config.replayStart !== "init")
+          pause();
         const updatedReport = FeedbackReportSchema.safeParse(result.data);
         if (updatedReport.success)
           draft.report = updatedReport.data;
@@ -1055,8 +1101,15 @@ function createFeedbackClient() {
     });
     return closePromise;
   }
+  function pause() {
+    replayRequested = false;
+    stopReplay?.();
+    stopReplay = void 0;
+    captureTask?.controller.abort();
+  }
   async function doClose() {
     closing = true;
+    pause();
     saveController.abort();
     unsubscribeLogger?.();
     unsubscribeLogger = void 0;
@@ -1088,6 +1141,7 @@ function createFeedbackClient() {
     lastError = void 0;
     errorWindows = [];
     replayChunks = [];
+    replayRequested = false;
     keyScreenshots = [];
     lastKeyScreenshot = 0;
     initialIds.clear();
@@ -1097,7 +1151,7 @@ function createFeedbackClient() {
     collectionFinished = false;
     collectionSealed = false;
   }
-  return { init, prepare, captureScreenshot, submit, flush, record, getDraft: () => draft, getView, releasePreviews, annotate, addFiles, exportDraft, async saveDraft(input) {
+  return { init, prepare, pause, captureScreenshot, submit, flush, record, getDraft: () => draft, getView, releasePreviews, annotate, addFiles, exportDraft, async saveDraft(input) {
     const session = config;
     const exported = await exportDraft(input);
     if (!exported.success)
@@ -1110,14 +1164,24 @@ function createFeedbackClient() {
   } };
 }
 var feedbackClient = createFeedbackClient();
-async function bounded(promise, ms) {
+async function bounded(promise, ms, controller) {
   let timer;
+  let aborted;
   try {
     return await Promise.race([promise, new Promise((_resolve, reject) => {
-      timer = setTimeout(() => reject(new Error("Capture timed out")), ms);
+      aborted = () => reject(new Error("Capture cancelled"));
+      if (controller.signal.aborted)
+        aborted();
+      else controller.signal.addEventListener("abort", aborted, { once: true });
+      timer = setTimeout(() => {
+        reject(new Error("Capture timed out"));
+        controller.abort();
+      }, ms);
     })]);
   } finally {
     clearTimeout(timer);
+    if (aborted)
+      controller.signal.removeEventListener("abort", aborted);
   }
 }
 async function attachment(name, contentType, bytes) {
@@ -1142,6 +1206,35 @@ function createFeedbackReview(actions) {
       controller.abort();
       controller = new AbortController();
     },
+    async retryReport(id) {
+      const signal = controller.signal;
+      try {
+        const loaded = await actions.get({ id });
+        if (signal.aborted)
+          return failed();
+        if (!loaded.success)
+          return loaded;
+        const targets = /* @__PURE__ */ new Set();
+        if (["partial", "failed"].includes(loaded.data.report.collectionStatus))
+          targets.add("collect");
+        for (const job of loaded.data.jobs) {
+          if (job.status === "failed" && (job.type === "collect" || job.type === "notify" || job.type === "webhook"))
+            targets.add(job.type);
+        }
+        for (const target of targets) {
+          if (signal.aborted)
+            return failed();
+          const retried = await actions.retry({ id, target });
+          if (signal.aborted)
+            return failed();
+          if (!retried.success)
+            return retried;
+        }
+        return ok(void 0);
+      } catch {
+        return failed();
+      }
+    },
     async loadReplay(id) {
       const signal = controller.signal;
       const events = [];