buddy-workbench 0.1.69 → 0.1.70

package/package.json

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

package/server/routes/clipboard.js

@@ -1,6 +1,6 @@
 import express, { Router } from 'express';
 import { existsSync, readFileSync } from 'node:fs';
-import { clipboardDates, clipboardItems, clipboardOriginal, deleteClipboardItem, saveClipboardImage, clipboardImagePath, allTaggedClipboardItems, updateClipboardItemTags, markClipboardCopied } from '../services/clipboard-history.js';
+import { clipboardDates, clipboardItems, clipboardOriginal, deleteClipboardItem, saveClipboardImage, clipboardImagePath, allTaggedClipboardItems, updateClipboardItemTags, markClipboardCopied, copyClipboardImage } from '../services/clipboard-history.js';
 
 const router = Router();
 router.get('/', (req, res) => res.json({ dates: clipboardDates(), items: clipboardItems(req.query.date) }));
@@ -48,5 +48,13 @@ router.post('/:date/:id/copied', async (req, res) => {
     res.status(500).json({ error: error.message });
   }
 });
+router.post('/:date/:id/copy-image', async (req, res) => {
+  try {
+    await copyClipboardImage(req.params.date, req.params.id);
+    res.json({ ok: true });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
 router.delete('/:date/:id', (req, res) => { if (!deleteClipboardItem(req.params.date, req.params.id)) return res.status(404).json({ error: 'Clipboard entry not found.' }); res.status(204).end(); });
 export default router;

package/server/routes/updates.js

@@ -83,29 +83,55 @@ function buildReleaseList(metadata) {
 }
 
 async function readNpmPackageMetadata() {
-  // Do not depend on npm being present in the server process PATH. On Windows,
-  // a UI launched from a shortcut often has a reduced PATH and `npm.cmd view`
-  // fails even though npm works in an interactive terminal.
-  const registry = String(process.env.npm_config_registry || 'https://registry.npmjs.org/')
-    .trim()
-    .replace(/\/+$/, '');
-  const response = await fetch(`${registry}/${encodeURIComponent(PACKAGE_NAME)}`, {
-    headers: { Accept: 'application/json' },
-    signal: AbortSignal.timeout(8000)
-  });
-  if (!response.ok) {
-    throw new Error(`The configured npm registry returned HTTP ${response.status}.`);
-  }
-  const packageMetadata = await response.json();
-  const metadata = {
-    version: packageMetadata?.['dist-tags']?.latest,
-    time: packageMetadata?.time,
-    devbuddyChangelog: packageMetadata?.devbuddyChangelog
-  };
-  if (!metadata.version) {
-    throw new Error('The configured npm registry did not return package version metadata.');
+  // npm knows about the user's ~/.npmrc, including private registries,
+  // proxies, authentication and custom CA settings. This matters in the
+  // internal-network desktop build, where those settings are not necessarily
+  // exposed as npm_config_* environment variables.
+  const npmCommand = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+  try {
+    const { stdout } = await execFileAsync(
+      npmCommand,
+      ['view', `${PACKAGE_NAME}@latest`, 'version', 'time', 'devbuddyChangelog', '--json'],
+      {
+        timeout: 8000,
+        maxBuffer: 1024 * 1024,
+        shell: process.platform === 'win32',
+        windowsHide: true
+      }
+    );
+    const metadata = JSON.parse(stdout);
+    if (!metadata || typeof metadata !== 'object' || !metadata.version) {
+      throw new Error('The configured npm registry did not return package version metadata.');
+    }
+    return metadata;
+  } catch (npmError) {
+    // Keep a fallback for desktop launchers whose reduced PATH cannot find
+    // npm. It is intentionally secondary so it cannot bypass ~/.npmrc.
+    const registry = String(process.env.npm_config_registry || 'https://registry.npmjs.org/')
+      .trim()
+      .replace(/\/+$/, '');
+    try {
+      const response = await fetch(`${registry}/${encodeURIComponent(PACKAGE_NAME)}`, {
+        headers: { Accept: 'application/json' },
+        signal: AbortSignal.timeout(8000)
+      });
+      if (!response.ok) {
+        throw new Error(`The configured npm registry returned HTTP ${response.status}.`);
+      }
+      const packageMetadata = await response.json();
+      const metadata = {
+        version: packageMetadata?.['dist-tags']?.latest,
+        time: packageMetadata?.time,
+        devbuddyChangelog: packageMetadata?.devbuddyChangelog
+      };
+      if (!metadata.version) {
+        throw new Error('The configured npm registry did not return package version metadata.');
+      }
+      return metadata;
+    } catch {
+      throw npmError;
+    }
   }
-  return metadata;
 }
 
 async function checkForUpdates() {

package/server/services/clipboard-history.js

@@ -13,6 +13,7 @@ const execFileAsync = promisify(execFile);
 const previewLimit = 2000;
 let lastValue = '';
 let lastImageHash = '';
+let suppressImageCaptureUntil = 0;
 let mozjpegWasmModule = null;
 
 async function compressMozjpeg(rgbaBuf, width, height, quality = 75) {
@@ -304,7 +305,7 @@ export async function captureClipboard() {
   } catch {}
 
   // 2. Image capture (Mac only & clipboardImageEnabled !== false)
-  if (process.platform === 'darwin' && settings.clipboardImageEnabled !== false) {
+  if (process.platform === 'darwin' && settings.clipboardImageEnabled !== false && Date.now() >= suppressImageCaptureUntil) {
     try {
       const imageData = await getMacClipboardImageData();
       if (imageData && imageData.rgbaBuf.length > 0) {
@@ -389,24 +390,13 @@ export async function markClipboardCopied(date, id) {
   if (!item) return null;
 
   if (item.imageFile) {
-    try {
-      const imageData = await getMacClipboardImageData();
-      if (imageData && imageData.rgbaBuf.length > 0) {
-        const currentHash = createHash('md5').update(imageData.rgbaBuf).digest('hex');
-        lastImageHash = currentHash;
-
-        const existingHashes = Array.isArray(item.imageHashes)
-          ? item.imageHashes
-          : [item.imageHash, item.fileHash].filter(Boolean);
-
-        if (!existingHashes.includes(currentHash)) {
-          const updatedItem = { ...item, imageHashes: [...existingHashes, currentHash] };
-          const nextItems = items.map((entry) => (entry.id === id ? updatedItem : entry));
-          writeJson(dayFile(targetDate), nextItems);
-          return updatedItem;
-        }
-      }
-    } catch {}
+    // Set the monitor's last hash before the browser writes the image. This
+    // prevents copying an existing image from being captured as a new item.
+    suppressImageCaptureUntil = Date.now() + 5000;
+    const existingHashes = Array.isArray(item.imageHashes)
+      ? item.imageHashes
+      : [item.imageHash, item.fileHash].filter(Boolean);
+    lastImageHash = existingHashes[0] || '';
   } else {
     const text = clipboardOriginal(targetDate, id) || item.text || item.preview || '';
     if (text) {
@@ -416,6 +406,37 @@ export async function markClipboardCopied(date, id) {
   return item;
 }
 
+export async function copyClipboardImage(date, id) {
+  if (process.platform !== 'darwin') throw new Error('Native image clipboard is only supported on macOS.');
+
+  let item = dayItems(date).find((entry) => entry.id === id);
+  if (!item) {
+    for (const d of clipboardDates()) {
+      item = dayItems(d).find((entry) => entry.id === id);
+      if (item) break;
+    }
+  }
+  if (!item?.imageFile) throw new Error('Clipboard image entry not found.');
+
+  await markClipboardCopied(date, id);
+  const imagePath = clipboardImagePath(item.imageFile);
+  const swiftCode = `
+import Cocoa
+let path = CommandLine.arguments[1]
+if let image = NSImage(contentsOfFile: path),
+   let tiff = image.tiffRepresentation,
+   let rep = NSBitmapImageRep(data: tiff),
+   let png = rep.representation(using: .png, properties: [:]) {
+    let pasteboard = NSPasteboard.general
+    pasteboard.clearContents()
+    if !pasteboard.setData(png, forType: .png) { exit(1) }
+} else {
+    exit(1)
+}
+`;
+  await execFileAsync('swift', ['-e', swiftCode, imagePath], { timeout: 5000 });
+}
+
 export function saveClipboardImage(buffer, ext = 'png', imageHash = '') {
   const date = today();
   const id = randomUUID();