buddy-workbench 0.1.96 → 0.1.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "buddy-workbench",
-  "version": "0.1.96",
+  "version": "0.1.98",
   "private": false,
   "type": "module",
   "bin": {

package/server/services/clipboard-history.js

@@ -12,6 +12,8 @@ import { readWindowsClipboard } from './windows.js';
 
 const execFileAsync = promisify(execFile);
 const previewLimit = 2000;
+const macClipboardCommandMaxBuffer = 100 * 1024 * 1024;
+const macClipboardCommandTimeout = 10 * 1000;
 let lastValue = '';
 let lastImageHash = '';
 let suppressImageCaptureUntil = 0;
@@ -101,7 +103,10 @@ async function getMacClipboardImageData() {
     }
   `;
   try {
-    const { stdout } = await execFileAsync('osascript', ['-l', 'JavaScript', '-e', jsaScript], { timeout: 3000 });
+    const { stdout } = await execFileAsync('osascript', ['-l', 'JavaScript', '-e', jsaScript], {
+      timeout: macClipboardCommandTimeout,
+      maxBuffer: macClipboardCommandMaxBuffer
+    });
     const str = stdout.trim();
     markClipboardSuccess('macOS image clipboard read (osascript)');
     if (!str) return null;
@@ -113,8 +118,7 @@ async function getMacClipboardImageData() {
     const base64 = str.slice(secondColon + 1);
     if (!width || !height || !base64) return null;
     return { width, height, rgbaBuf: Buffer.from(base64, 'base64') };
-  } catch (error) {
-    logClipboardError('macOS image clipboard read (osascript)', error);
+  } catch {
     // If osascript failed with an error, attempt the Swift fallback for image capture
     const rawBuffer = await getMacClipboardImageBuffer();
     if (rawBuffer && rawBuffer.length > 0) {
@@ -141,20 +145,20 @@ if let data = pb.data(forType: .png) {
 }
 `;
   try {
-    const { stdout } = await execFileAsync('swift', ['-e', swiftCode], { encoding: 'buffer', timeout: 3000 });
+    const { stdout } = await execFileAsync('swift', ['-e', swiftCode], {
+      encoding: 'buffer',
+      timeout: macClipboardCommandTimeout,
+      maxBuffer: macClipboardCommandMaxBuffer
+    });
     if (stdout && stdout.length > 0) {
       markClipboardSuccess('macOS image clipboard read (Swift)');
       swiftClipboardRetryAt = 0;
       return stdout;
     }
-  } catch (error) {
+  } catch {
     // Back off before trying Swift again. A failed `swift -e` invocation is
     // commonly persistent and clipboard polling runs every two seconds.
     swiftClipboardRetryAt = Date.now() + 5 * 60 * 1000;
-    logClipboardError('macOS image clipboard read (Swift)', error);
-    // This failure is now rate-limited by the retry window; don't let the
-    // displayed "consecutive failures" grow without bound.
-    clipboardErrorCounts.delete('macOS image clipboard read (Swift)');
     try {
       const jsaScript = `
         ObjC.import("AppKit");
@@ -174,15 +178,16 @@ if let data = pb.data(forType: .png) {
           "";
         }
       `;
-      const { stdout } = await execFileAsync('osascript', ['-l', 'JavaScript', '-e', jsaScript], { timeout: 3000 });
+      const { stdout } = await execFileAsync('osascript', ['-l', 'JavaScript', '-e', jsaScript], {
+        timeout: macClipboardCommandTimeout,
+        maxBuffer: macClipboardCommandMaxBuffer
+      });
       const str = stdout.trim();
       if (str) {
         markClipboardSuccess('macOS image clipboard fallback read (osascript)');
         return Buffer.from(str, 'base64');
       }
-    } catch (fallbackError) {
-      logClipboardError('macOS image clipboard fallback read (osascript)', fallbackError);
-    }
+    } catch {}
   }
   return null;
 }
@@ -394,11 +399,11 @@ export async function captureClipboard() {
             }
           }
 
-          lastImageHash = hash;
           if (!isDuplicate) {
             try {
               const mozjpegBuf = await compressMozjpeg(imageData.rgbaBuf, imageData.width, imageData.height, 75);
               saveClipboardImage(mozjpegBuf, 'jpg', hash);
+              lastImageHash = hash;
               markClipboardSuccess('image compression or save (WASM/JPEG)', 'image save');
             } catch (error) {
               logClipboardError('image compression or save (WASM/JPEG)', error);
@@ -406,12 +411,15 @@ export async function captureClipboard() {
               if (rawBuf) {
                 try {
                   saveClipboardImage(rawBuf, 'png', hash);
+                  lastImageHash = hash;
                   markClipboardSuccess('raw image save after compression fallback', 'image save');
                 } catch (fallbackError) {
                   logClipboardError('raw image save after compression fallback', fallbackError);
                 }
               }
             }
+          } else {
+            lastImageHash = hash;
           }
         }
       } else if (imageData.rawBuffer && imageData.rawBuffer.length > 0) {
@@ -431,14 +439,16 @@ export async function captureClipboard() {
             }
           }
 
-          lastImageHash = hash;
           if (!isDuplicate) {
             try {
               saveClipboardImage(imageData.rawBuffer, 'png', hash);
+              lastImageHash = hash;
               markClipboardSuccess('image save');
             } catch (error) {
               logClipboardError('image save', error);
             }
+          } else {
+            lastImageHash = hash;
           }
         }
       }
@@ -446,7 +456,22 @@ export async function captureClipboard() {
   }
 }
 
-export function startClipboardCapture() { captureClipboard(); const timer = setInterval(captureClipboard, 2000); timer.unref(); }
+export function startClipboardCapture() {
+  let captureInProgress = false;
+  const capture = async () => {
+    if (captureInProgress) return;
+    captureInProgress = true;
+    try {
+      await captureClipboard();
+    } finally {
+      captureInProgress = false;
+    }
+  };
+
+  void capture();
+  const timer = setInterval(() => { void capture(); }, 2000);
+  timer.unref();
+}
 
 export async function markClipboardCopied(date, id) {
   let targetDate = date;