@sanohiro/casty 0.5.6 → 0.5.8

package/bin/casty.js

@@ -2,9 +2,17 @@
 // casty - TTY web browser using raw CDP and Kitty graphics protocol
 
 import { execFileSync } from 'node:child_process';
+import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { dirname, join } from 'node:path';
 
+// --version / -v
+if (process.argv[2] === '--version' || process.argv[2] === '-v') {
+  const pkg = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json'), 'utf8'));
+  console.log(`casty ${pkg.version}`);
+  process.exit(0);
+}
+
 // Ensure Chrome is installed (skip if launched from bin/casty shell script)
 if (!process.env.CASTY_ENSURE_CHROME) {
   const __bin = dirname(fileURLToPath(import.meta.url));
@@ -19,7 +27,7 @@ if (!process.env.CASTY_ENSURE_CHROME) {
 }
 
 import { startBrowser, setupPage, startScreencast, stopScreencast } from '../lib/browser.js';
-import { sendFrame, resetFrameCache, clearScreen, hideCursor, showCursor, cleanup as cleanupTmp, transport } from '../lib/kitty.js';
+import { sendFrame, resetFrameCache, clearScreen, hideCursor, showCursor, cleanup as cleanupTmp, transport, setDisplaySize, disableDedup } from '../lib/kitty.js';
 import { enableMouse, disableMouse, startInputHandling } from '../lib/input.js';
 import { loadKeyBindings } from '../lib/keys.js';
 import { loadConfig } from '../lib/config.js';
@@ -89,10 +97,14 @@ async function getTermInfo({ keepAlive = false } = {}) {
 
   const pixelSize = await queryTermPixelSize({ keepAlive });
   if (pixelSize) {
-    const cellWidth = pixelSize.width / cols;
-    const cellHeight = pixelSize.height / rows;
+    // Align to cell boundaries: floor cell size, then multiply back
+    // This ensures image pixels == display pixels (no GPU interpolation blur)
+    const cellWidth = Math.floor(pixelSize.width / cols);
+    const cellHeight = Math.floor(pixelSize.height / rows);
+    const width = cellWidth * cols;
+    const height = cellHeight * rows;
     const zoom = calcZoom(cellWidth);
-    return { cols, rows, width: pixelSize.width, height: pixelSize.height, cellWidth, cellHeight, zoom };
+    return { cols, rows, width, height, cellWidth, cellHeight, zoom };
   }
 
   const cellWidth = parseInt(process.env.CASTY_CELL_WIDTH) || 10;
@@ -114,8 +126,9 @@ async function main() {
   const browser = await browserP;
 
   // Reserve line 1 for URL bar, use the rest for browser display
-  const barHeight = Math.round(term.cellHeight);
+  const barHeight = term.cellHeight;
   const viewHeight = term.height - barHeight;
+  setDisplaySize(term.cols, term.rows - 1);
 
   // Phase 2: CDP connection + page setup
   const { client, cssWidth, cssHeight } = await setupPage(browser, { ...term, height: viewHeight });
@@ -215,25 +228,64 @@ async function main() {
     clearTimeout(resizeTimer);
     resizeTimer = setTimeout(handleResize, 150);
   });
+  // Direct screenshot — bypasses screencast's capturing flag
+  const screenshotOpts = { format: screenshotFormat, optimizeForSpeed: true, captureBeyondViewport: false };
+  if (screenshotFormat === 'jpeg') screenshotOpts.quality = 85;
+  async function directCapture() {
+    try {
+      const { data } = await client.send('Page.captureScreenshot', screenshotOpts);
+      if (data) onFrame(data);
+    } catch {}
+  }
+
   async function handleResize() {
     if (resizing) { pendingResize = true; return; }
     resizing = true;
     try {
+      // Stop old screencast FIRST to prevent stale frames
+      await stopScreencast(client, screencastCleanup);
+
       const t = await getTermInfo({ keepAlive: true });
-      const vh = t.height - Math.round(t.cellHeight);
+      const vh = t.height - t.cellHeight;
       const cw = Math.round(t.width / t.zoom);
       const ch = Math.round(vh / t.zoom);
+      setDisplaySize(t.cols, t.rows - 1);
       console.error(`casty: resize ${cw}x${ch} (dev:${t.width}x${vh}) zoom:${t.zoom.toFixed(2)}`);
 
       urlBar.updateCellSize(t.cellWidth, t.cellHeight);
       clearScreen();
       resetFrameCache();
+      disableDedup(3000); // Force re-send for 3s (bcon may not display first frame)
 
-      await stopScreencast(client, screencastCleanup);
       await client.send('Emulation.setDeviceMetricsOverride', {
         width: cw, height: ch, deviceScaleFactor: t.zoom, mobile: false,
       });
 
+      // Wait for Chrome to finish re-rendering by watching for a screencast frame
+      await new Promise(resolve => {
+        const onFirstFrame = ({ sessionId }) => {
+          client.send('Page.screencastFrameAck', { sessionId }).catch(() => {});
+          client.removeListener('Page.screencastFrame', onFirstFrame);
+          resolve();
+        };
+        client.on('Page.screencastFrame', onFirstFrame);
+        client.send('Page.startScreencast', {
+          format: 'jpeg', quality: 10,
+          maxWidth: Math.round(cw / 4), maxHeight: Math.round(ch / 4),
+          everyNthFrame: 1,
+        }).catch(() => resolve());
+        setTimeout(() => {
+          client.removeListener('Page.screencastFrame', onFirstFrame);
+          resolve();
+        }, 2000);
+      });
+      await client.send('Page.stopScreencast').catch(() => {});
+
+      // Capture hi-res frame (Chrome has finished rendering)
+      await directCapture();
+      urlBar.render();
+
+      // Restart screencast for ongoing change detection
       ({ forceCapture, cleanup: screencastCleanup } = await startScreencast(client, {
         width: cw,
         height: ch,

package/lib/kitty.js

@@ -29,6 +29,16 @@ import { loadConfig } from './config.js';
 const tmpFile = join(tmpdir(), `casty-frame-${process.pid}.png`);
 const tmpPathB64 = Buffer.from(tmpFile).toString('base64');
 
+// Display size in cells (set by caller, used for c=/r= parameters)
+let _cols = 0;
+let _rows = 0;
+
+// Set display size (cols = terminal columns, rows = display rows excluding URL bar)
+export function setDisplaySize(cols, rows) {
+  _cols = cols;
+  _rows = rows;
+}
+
 // Detect transfer mode
 function detectTransport() {
   const config = loadConfig();
@@ -74,24 +84,39 @@ export function cleanup() {
 
 // Frame deduplication — skip identical consecutive frames
 let lastFrameData = '';
+let _dedupDisabled = false;
+let _dedupTimer = null;
+
+// Temporarily disable dedup (e.g. after resize, bcon needs re-send)
+export function disableDedup(ms = 3000) {
+  _dedupDisabled = true;
+  clearTimeout(_dedupTimer);
+  _dedupTimer = setTimeout(() => { _dedupDisabled = false; }, ms);
+}
 
 // File transfer mode (fast: sends only path)
 // Prepends cursor-home to batch into a single write
 function sendFrameFile(base64Data) {
-  if (base64Data.length === lastFrameData.length && base64Data === lastFrameData) return;
+  if (!_dedupDisabled && base64Data.length === lastFrameData.length && base64Data === lastFrameData) {
+    return;
+  }
   lastFrameData = base64Data;
   writeFileSync(tmpFile, Buffer.from(base64Data, 'base64'));
-  process.stdout.write(`${CURSOR_HOME}\x1b_Ga=T,f=100,t=f,q=2,C=1,i=1;${tmpPathB64}\x1b\\`);
+  const crFile = _cols && _rows ? `,c=${_cols},r=${_rows}` : '';
+  process.stdout.write(`${CURSOR_HOME}\x1b_Ga=T,f=100,t=f,q=2,C=1,i=1${crFile};${tmpPathB64}\x1b\\`);
 }
 
 // Inline mode (4096B chunked, PNG only)
 // Prepends cursor-home and batches all chunks into a single stdout.write
 function sendFrameInline(pngBase64) {
-  if (pngBase64.length === lastFrameData.length && pngBase64 === lastFrameData) return;
+  if (!_dedupDisabled && pngBase64.length === lastFrameData.length && pngBase64 === lastFrameData) {
+    return;
+  }
   lastFrameData = pngBase64;
   const CHUNK = 4096;
+  const crInline = _cols && _rows ? `,c=${_cols},r=${_rows}` : '';
   if (pngBase64.length <= CHUNK) {
-    process.stdout.write(`${CURSOR_HOME}\x1b_Ga=T,f=100,q=2,C=1,i=1;${pngBase64}\x1b\\`);
+    process.stdout.write(`${CURSOR_HOME}\x1b_Ga=T,f=100,q=2,C=1,i=1${crInline};${pngBase64}\x1b\\`);
     return;
   }
   const parts = [CURSOR_HOME];
@@ -100,7 +125,7 @@ function sendFrameInline(pngBase64) {
     const chunk = pngBase64.slice(i, i + CHUNK);
     const more = i + CHUNK < pngBase64.length ? 1 : 0;
     if (i === 0) {
-      parts.push(`\x1b_Ga=T,f=100,q=2,C=1,i=1,m=${more};${chunk}\x1b\\`);
+      parts.push(`\x1b_Ga=T,f=100,q=2,C=1,i=1${crInline},m=${more};${chunk}\x1b\\`);
     } else {
       parts.push(`\x1b_Gm=${more};${chunk}\x1b\\`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanohiro/casty",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "description": "TTY web browser using raw CDP and Kitty graphics protocol",
   "main": "bin/casty.js",
   "bin": {