From a4e7ce10bde6c386b724972ab6eab228b44be900 Mon Sep 17 00:00:00 2001 From: "Tommy D. Rossi" Date: Sun, 28 Dec 2025 21:05:04 +0100 Subject: [PATCH] move cdp-relay and protocol out of extension subfolder --- extension/src/background.ts | 2 +- playwriter/scripts/extension-server.ts | 2 +- playwriter/src/{extension => }/cdp-relay.ts | 6 +++--- playwriter/src/cdp-timing.md | 2 +- playwriter/src/cli.ts | 2 +- playwriter/src/index.ts | 2 +- playwriter/src/mcp.test.ts | 2 +- playwriter/src/{extension => }/protocol.ts | 2 +- playwriter/src/start-relay-server.ts | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename playwriter/src/{extension => }/cdp-relay.ts (99%) rename playwriter/src/{extension => }/protocol.ts (94%) diff --git a/extension/src/background.ts b/extension/src/background.ts index 6061d5d..48daeb6 100644 --- a/extension/src/background.ts +++ b/extension/src/background.ts @@ -3,7 +3,7 @@ declare const process: { env: { PLAYWRITER_PORT: string } } import { createStore } from 'zustand/vanilla' import type { ExtensionState, ConnectionState, TabState, TabInfo } from './types' import type { CDPEvent, Protocol } from 'playwriter/src/cdp-types' -import type { ExtensionCommandMessage, ExtensionResponseMessage } from 'playwriter/src/extension/protocol' +import type { ExtensionCommandMessage, ExtensionResponseMessage } from 'playwriter/src/protocol' const RELAY_PORT = process.env.PLAYWRITER_PORT const RELAY_URL = `ws://localhost:${RELAY_PORT}/extension` diff --git a/playwriter/scripts/extension-server.ts b/playwriter/scripts/extension-server.ts index 74caaae..fc417ba 100644 --- a/playwriter/scripts/extension-server.ts +++ b/playwriter/scripts/extension-server.ts @@ -1,4 +1,4 @@ -import { startPlayWriterCDPRelayServer } from '../src/extension/cdp-relay.js' +import { startPlayWriterCDPRelayServer } from '../src/cdp-relay.js' async function main() { const server = await startPlayWriterCDPRelayServer({ port: 19988 }) diff --git a/playwriter/src/extension/cdp-relay.ts b/playwriter/src/cdp-relay.ts similarity index 99% rename from playwriter/src/extension/cdp-relay.ts rename to playwriter/src/cdp-relay.ts index 5de54ef..5989d1e 100644 --- a/playwriter/src/extension/cdp-relay.ts +++ b/playwriter/src/cdp-relay.ts @@ -2,12 +2,12 @@ import { Hono } from 'hono' import { serve } from '@hono/node-server' import { createNodeWebSocket } from '@hono/node-ws' import type { WSContext } from 'hono/ws' -import type { Protocol } from '../cdp-types.js' -import type { CDPCommand, CDPResponseBase, CDPEventBase, CDPEventFor, RelayServerEvents } from '../cdp-types.js' +import type { Protocol } from './cdp-types.js' +import type { CDPCommand, CDPResponseBase, CDPEventBase, CDPEventFor, RelayServerEvents } from './cdp-types.js' import type { ExtensionMessage, ExtensionEventMessage } from './protocol.js' import chalk from 'chalk' import { EventEmitter } from 'node:events' -import { VERSION } from '../utils.js' +import { VERSION } from './utils.js' type ConnectedTarget = { sessionId: string diff --git a/playwriter/src/cdp-timing.md b/playwriter/src/cdp-timing.md index d6e2cad..64e030f 100644 --- a/playwriter/src/cdp-timing.md +++ b/playwriter/src/cdp-timing.md @@ -124,5 +124,5 @@ The `Runtime.enable` fix addresses reason #1 at the CDP level, but test waits ar ## Files Changed -- `playwriter/src/extension/cdp-relay.ts` - Added event-based wait in `Runtime.enable` handler +- `playwriter/src/cdp-relay.ts` - Added event-based wait in `Runtime.enable` handler - `extension/src/background.ts` - Removed arbitrary `sleep(200)` from `Runtime.enable` handler diff --git a/playwriter/src/cli.ts b/playwriter/src/cli.ts index 5fa5f58..7a6bd40 100644 --- a/playwriter/src/cli.ts +++ b/playwriter/src/cli.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import { cac } from 'cac' -import { startPlayWriterCDPRelayServer } from './extension/cdp-relay.js' +import { startPlayWriterCDPRelayServer } from './cdp-relay.js' import { createFileLogger } from './create-logger.js' import { VERSION } from './utils.js' diff --git a/playwriter/src/index.ts b/playwriter/src/index.ts index bade296..ef27357 100644 --- a/playwriter/src/index.ts +++ b/playwriter/src/index.ts @@ -1,2 +1,2 @@ -export * from './extension/cdp-relay.js' +export * from './cdp-relay.js' export * from './utils.js' diff --git a/playwriter/src/mcp.test.ts b/playwriter/src/mcp.test.ts index 1021fa9..bae6c27 100644 --- a/playwriter/src/mcp.test.ts +++ b/playwriter/src/mcp.test.ts @@ -13,7 +13,7 @@ import { imageSize } from 'image-size' import { getCDPSessionForPage } from './cdp-session.js' import { Debugger } from './debugger.js' import { Editor } from './editor.js' -import { startPlayWriterCDPRelayServer, type RelayServer } from './extension/cdp-relay.js' +import { startPlayWriterCDPRelayServer, type RelayServer } from './cdp-relay.js' import { createFileLogger } from './create-logger.js' import type { CDPCommand } from './cdp-types.js' import { killPortProcess } from 'kill-port-process' diff --git a/playwriter/src/extension/protocol.ts b/playwriter/src/protocol.ts similarity index 94% rename from playwriter/src/extension/protocol.ts rename to playwriter/src/protocol.ts index 272038a..52fe15c 100644 --- a/playwriter/src/extension/protocol.ts +++ b/playwriter/src/protocol.ts @@ -1,4 +1,4 @@ -import { CDPEventFor, ProtocolMapping } from '../cdp-types.js' +import { CDPEventFor, ProtocolMapping } from './cdp-types.js' export const VERSION = 1 diff --git a/playwriter/src/start-relay-server.ts b/playwriter/src/start-relay-server.ts index 4aea6a1..0365c50 100644 --- a/playwriter/src/start-relay-server.ts +++ b/playwriter/src/start-relay-server.ts @@ -1,4 +1,4 @@ -import { startPlayWriterCDPRelayServer } from './extension/cdp-relay.js' +import { startPlayWriterCDPRelayServer } from './cdp-relay.js' import { createFileLogger } from './create-logger.js' process.title = 'playwriter-ws-server'