@browserbridge/bbx 1.2.0 → 1.4.0

package/packages/native-host/src/native-host.js

@@ -2,10 +2,11 @@
 
 import net from 'node:net';
 
-import { createFailure, ERROR_CODES } from '../../protocol/src/index.js';
+import { createFailure, ERROR_CODES, MAX_JSON_LINE_BYTES } from '../../protocol/src/index.js';
+import { readBridgeAuthToken } from './auth-token.js';
 import { createSocketBridgeTransport, getBridgeTransport } from './config.js';
 import { spawnBridgeDaemonProcess } from './daemon-process.js';
-import { createNativeMessageReader, writeJsonLine, writeNativeMessage } from './framing.js';
+import { createNativeMessageReader, createNativeMessageWriter, writeJsonLine } from './framing.js';
 
 /** @typedef {import('./config.js').BridgeTransport} BridgeTransport */
 
@@ -117,11 +118,13 @@ export async function runNativeHost({
   socketPath = undefined,
 } = {}) {
   const resolvedTransport = socketPath ? createSocketBridgeTransport(socketPath) : transport;
+  const writeNativeMessageQueued = createNativeMessageWriter(process.stdout);
+
   let socket;
   try {
     socket = await connectWithBootstrap(resolvedTransport);
   } catch (error) {
-    await writeNativeMessage(process.stdout, {
+    await writeNativeMessageQueued({
       type: 'agent.response',
       response: createFailure(
         'native_bootstrap',
@@ -144,11 +147,21 @@ export async function runNativeHost({
   socket.once('close', cleanupStdinEndListener);
   socket.once('end', cleanupStdinEndListener);
   socket.once('error', cleanupStdinEndListener);
-  await writeJsonLine(socket, { type: 'register', role: 'extension' });
+  const authToken = resolvedTransport.type === 'tcp' ? await readBridgeAuthToken() : null;
+  await writeJsonLine(socket, {
+    type: 'register',
+    role: 'extension',
+    ...(authToken ? { authToken } : {}),
+  });
 
   let lineBuffer = '';
   socket.on('data', (chunk) => {
     lineBuffer += chunk;
+    if (!lineBuffer.includes('\n') && Buffer.byteLength(lineBuffer, 'utf8') > MAX_JSON_LINE_BYTES) {
+      console.error(`native-host: daemon JSON line exceeded ${MAX_JSON_LINE_BYTES} bytes`);
+      socket.destroy();
+      return;
+    }
     while (lineBuffer.includes('\n')) {
       const index = lineBuffer.indexOf('\n');
       const line = lineBuffer.slice(0, index).trim();
@@ -156,6 +169,11 @@ export async function runNativeHost({
       if (!line) {
         continue;
       }
+      if (Buffer.byteLength(line, 'utf8') > MAX_JSON_LINE_BYTES) {
+        console.error(`native-host: daemon JSON line exceeded ${MAX_JSON_LINE_BYTES} bytes`);
+        socket.destroy();
+        return;
+      }
       let message;
       try {
         message = JSON.parse(line);
@@ -164,11 +182,11 @@ export async function runNativeHost({
       }
       void (async () => {
         if (message.type === 'extension.request') {
-          await writeNativeMessage(process.stdout, message.request);
+          await writeNativeMessageQueued(message.request);
           return;
         }
         if (message.type === 'agent.response') {
-          await writeNativeMessage(process.stdout, {
+          await writeNativeMessageQueued({
             type: 'host.bridge_response',
             response: message.response,
           });
@@ -178,7 +196,7 @@ export async function runNativeHost({
           message.type === 'extension.setup_status.response' ||
           message.type === 'extension.setup_status.error'
         ) {
-          await writeNativeMessage(process.stdout, {
+          await writeNativeMessageQueued({
             type:
               message.type === 'extension.setup_status.response'
                 ? 'host.setup_status.response'

package/packages/protocol/src/defaults.js

@@ -24,6 +24,9 @@ export const DEFAULT_DEVICE_SCALE_FACTOR = 0;
 /** Maximum size of a Chrome native messaging message in bytes. */
 export const MAX_NATIVE_MESSAGE_BYTES = 1_048_576;
 
+/** Maximum size of one newline-delimited daemon socket message in bytes. */
+export const MAX_JSON_LINE_BYTES = MAX_NATIVE_MESSAGE_BYTES;
+
 /** Default timeout for a bridge request awaiting an extension response (ms). */
 export const DEFAULT_DAEMON_PENDING_TIMEOUT_MS = 30_000;
 

package/packages/protocol/src/json-lines.js

@@ -1,18 +1,42 @@
 // @ts-check
 
+import { MAX_JSON_LINE_BYTES } from './defaults.js';
+
 /**
  * Install a newline-delimited JSON parser on a socket's `data` event.
  *
  * @param {import('node:net').Socket} socket
  * @param {(message: unknown) => void} onMessage
+ * @param {{ maxLineBytes?: number, onProtocolError?: (error: Error) => void }} [options]
  * @returns {void}
  */
-export function parseJsonLines(socket, onMessage) {
+export function parseJsonLines(socket, onMessage, options = {}) {
   let buffer = '';
+  const maxLineBytes =
+    typeof options.maxLineBytes === 'number' && Number.isFinite(options.maxLineBytes)
+      ? Math.max(1, Math.floor(options.maxLineBytes))
+      : MAX_JSON_LINE_BYTES;
   socket.setEncoding('utf8');
+
+  /**
+   * @param {Error} error
+   * @returns {void}
+   */
+  function fail(error) {
+    options.onProtocolError?.(error);
+    const destroy = /** @type {{ destroy?: (() => void) | undefined }} */ (socket).destroy;
+    if (typeof destroy === 'function') {
+      destroy.call(socket);
+    }
+  }
+
   /** @param {string} chunk */
   socket.on('data', (chunk) => {
     buffer += chunk;
+    if (!buffer.includes('\n') && Buffer.byteLength(buffer, 'utf8') > maxLineBytes) {
+      fail(new Error(`JSON line exceeds ${maxLineBytes} bytes.`));
+      return;
+    }
     while (buffer.includes('\n')) {
       const index = buffer.indexOf('\n');
       const line = buffer.slice(0, index).trim();
@@ -20,6 +44,10 @@ export function parseJsonLines(socket, onMessage) {
       if (!line) {
         continue;
       }
+      if (Buffer.byteLength(line, 'utf8') > maxLineBytes) {
+        fail(new Error(`JSON line exceeds ${maxLineBytes} bytes.`));
+        return;
+      }
       try {
         onMessage(JSON.parse(line));
       } catch {

package/packages/protocol/src/protocol.js

@@ -7,6 +7,7 @@ import {
   DEFAULT_A11Y_MAX_NODES,
   DEFAULT_CONSOLE_LIMIT,
   DEFAULT_EVAL_TIMEOUT_MS,
+  DEFAULT_LOG_TAIL_LIMIT,
   DEFAULT_MAX_DEPTH,
   DEFAULT_MAX_HTML_LENGTH,
   DEFAULT_MAX_NODES,
@@ -29,6 +30,7 @@ import { BRIDGE_METHODS, METHOD_SET, createBridgeMethodGroups } from './registry
 /** @typedef {import('./types.js').BridgeSuccessResponse} BridgeSuccessResponse */
 /** @typedef {import('./types.js').CheckedActionParams} CheckedActionParams */
 /** @typedef {import('./types.js').CdpDispatchKeyEventParams} CdpDispatchKeyEventParams */
+/** @typedef {import('./types.js').CdpNodeIdParams} CdpNodeIdParams */
 /** @typedef {import('./types.js').ConsoleParams} ConsoleParams */
 /** @typedef {import('./types.js').DomQueryParams} DomQueryParams */
 /** @typedef {import('./types.js').DragParams} DragParams */
@@ -38,11 +40,13 @@ import { BRIDGE_METHODS, METHOD_SET, createBridgeMethodGroups } from './registry
 /** @typedef {import('./types.js').GetHtmlParams} GetHtmlParams */
 /** @typedef {import('./types.js').HoverParams} HoverParams */
 /** @typedef {import('./types.js').InputActionParams} InputActionParams */
+/** @typedef {import('./types.js').LogTailParams} LogTailParams */
 /** @typedef {import('./types.js').NavigationActionParams} NavigationActionParams */
 /** @typedef {import('./types.js').NetworkParams} NetworkParams */
 /** @typedef {import('./types.js').NormalizedAccessibilityTreeParams} NormalizedAccessibilityTreeParams */
 /** @typedef {import('./types.js').NormalizedCheckedAction} NormalizedCheckedAction */
 /** @typedef {import('./types.js').NormalizedCdpDispatchKeyEventParams} NormalizedCdpDispatchKeyEventParams */
+/** @typedef {import('./types.js').NormalizedCdpNodeIdParams} NormalizedCdpNodeIdParams */
 /** @typedef {import('./types.js').NormalizedConsoleParams} NormalizedConsoleParams */
 /** @typedef {import('./types.js').NormalizedDomQuery} NormalizedDomQuery */
 /** @typedef {import('./types.js').NormalizedDragParams} NormalizedDragParams */
@@ -52,6 +56,7 @@ import { BRIDGE_METHODS, METHOD_SET, createBridgeMethodGroups } from './registry
 /** @typedef {import('./types.js').NormalizedGetHtmlParams} NormalizedGetHtmlParams */
 /** @typedef {import('./types.js').NormalizedHoverParams} NormalizedHoverParams */
 /** @typedef {import('./types.js').NormalizedInputAction} NormalizedInputAction */
+/** @typedef {import('./types.js').NormalizedLogTailParams} NormalizedLogTailParams */
 /** @typedef {import('./types.js').NormalizedNavigationAction} NormalizedNavigationAction */
 /** @typedef {import('./types.js').NormalizedNetworkParams} NormalizedNetworkParams */
 /** @typedef {import('./types.js').NormalizedPageTextParams} NormalizedPageTextParams */
@@ -209,6 +214,12 @@ export function validateBridgeRequest(request) {
       'session_id is no longer supported. Use tab_id or window-scoped default routing.'
     );
   }
+  if (
+    candidate.params != null &&
+    (typeof candidate.params !== 'object' || Array.isArray(candidate.params))
+  ) {
+    throw new BridgeError(ERROR_CODES.INVALID_REQUEST, 'Request params must be an object.');
+  }
   const parsedTabId = Number(candidate.tab_id);
 
   const method = /** @type {BridgeMethod} */ (candidate.method);
@@ -242,6 +253,8 @@ export function validateBridgeRequest(request) {
  */
 function normalizeRequestParams(method, params) {
   switch (method) {
+    case 'log.tail':
+      return normalizeLogTailParams(params);
     case 'dom.query':
       return normalizeDomQuery(params);
     case 'page.evaluate':
@@ -285,6 +298,9 @@ function normalizeRequestParams(method, params) {
       return normalizeInputAction(params);
     case 'cdp.dispatch_key_event':
       return normalizeCdpDispatchKeyEventParams(params);
+    case 'cdp.get_box_model':
+    case 'cdp.get_computed_styles_for_node':
+      return normalizeCdpNodeIdParams(params);
     case 'input.set_checked':
       return normalizeCheckedAction(params);
     case 'input.select_option':
@@ -429,6 +445,20 @@ export function normalizeCdpDispatchKeyEventParams(params = {}) {
   };
 }
 
+/**
+ * @param {CdpNodeIdParams} [params={}]
+ * @returns {NormalizedCdpNodeIdParams}
+ */
+export function normalizeCdpNodeIdParams(params = {}) {
+  if (typeof params.nodeId !== 'number' || !Number.isFinite(params.nodeId)) {
+    throw new BridgeError(ERROR_CODES.INVALID_REQUEST, 'nodeId must be a finite number.');
+  }
+
+  return {
+    nodeId: params.nodeId,
+  };
+}
+
 /**
  * @param {CheckedActionParams} [params={}]
  * @returns {NormalizedCheckedAction}
@@ -642,6 +672,9 @@ export function normalizeHoverParams(params = {}) {
         : undefined
     ),
     duration: clampInt(params.duration, 0, 5_000, 0),
+    modifiers: Array.isArray(params.modifiers)
+      ? params.modifiers.filter((modifier) => typeof modifier === 'string' && modifier.trim())
+      : [],
   };
 }
 
@@ -763,6 +796,16 @@ export function normalizePageTextParams(params = {}) {
   };
 }
 
+/**
+ * @param {LogTailParams} [params={}]
+ * @returns {NormalizedLogTailParams}
+ */
+export function normalizeLogTailParams(params = {}) {
+  return {
+    limit: clampInt(params.limit, 1, 200, DEFAULT_LOG_TAIL_LIMIT),
+  };
+}
+
 /**
  * @param {ViewportResizeParams} [params={}]
  * @returns {NormalizedViewportResizeParams}

package/packages/protocol/src/registry.js

@@ -123,7 +123,7 @@ export const BRIDGE_METHOD_REGISTRY = Object.freeze({
     ['kind', 'target'],
     'trivial'
   ),
-  'log.tail': createRegistryEntry('log.tail', 'system', false, [], 'trivial'),
+  'log.tail': createRegistryEntry('log.tail', 'system', false, ['limit'], 'trivial'),
   'health.ping': createRegistryEntry('health.ping', 'system', false, [], 'trivial'),
   'daemon.metrics': createRegistryEntry('daemon.metrics', 'system', false, [], 'trivial'),
   // tabs — trivial
@@ -413,18 +413,12 @@ export const BRIDGE_METHOD_REGISTRY = Object.freeze({
   // cdp — high (raw protocol, large payloads)
   'cdp.get_document': createRegistryEntry('cdp.get_document', 'cdp', true, [], 'high'),
   'cdp.get_dom_snapshot': createRegistryEntry('cdp.get_dom_snapshot', 'cdp', true, [], 'high'),
-  'cdp.get_box_model': createRegistryEntry(
-    'cdp.get_box_model',
-    'cdp',
-    true,
-    ['elementRef'],
-    'high'
-  ),
+  'cdp.get_box_model': createRegistryEntry('cdp.get_box_model', 'cdp', true, ['nodeId'], 'high'),
   'cdp.get_computed_styles_for_node': createRegistryEntry(
     'cdp.get_computed_styles_for_node',
     'cdp',
     true,
-    ['elementRef'],
+    ['nodeId'],
     'high'
   ),
   'cdp.dispatch_key_event': createRegistryEntry(