tabmate 0.1.0 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/mcp.js +82 -36
  2. package/package.json +1 -1
  3. package/server.js +9 -4
package/mcp.js CHANGED
@@ -4194,7 +4194,8 @@ var findTool = {
4194
4194
 
4195
4195
  // src/shared/types.ts
4196
4196
  var DEFAULT_CONFIG = {
4197
- bridgeUrl: "ws://127.0.0.1:8765/extension",
4197
+ /** Empty = discover the bridge automatically (see shared/ports.ts). */
4198
+ bridgeUrl: "",
4198
4199
  bridgeToken: "",
4199
4200
  autoConnect: true,
4200
4201
  permissionMode: "ask",
@@ -4204,6 +4205,26 @@ var DEFAULT_CONFIG = {
4204
4205
  maxScreenshotPx: 1568
4205
4206
  };
4206
4207
 
4208
+ // src/shared/ports.ts
4209
+ var BRIDGE_SERVICE = "tabmate-bridge";
4210
+ var LISTEN_PORTS = [23765, 23766, 23767];
4211
+ var LEGACY_PORTS = [8765];
4212
+ var DISCOVERY_PORTS = [...LISTEN_PORTS, ...LEGACY_PORTS];
4213
+ var DEFAULT_PORT = LISTEN_PORTS[0];
4214
+ var DEFAULT_HOST = "127.0.0.1";
4215
+ var LEGACY_BRIDGE_URL = "ws://127.0.0.1:8765/extension";
4216
+ function bridgeHttpUrl(port, host = DEFAULT_HOST) {
4217
+ return `http://${formatHost(host)}:${port}`;
4218
+ }
4219
+ function formatHost(host) {
4220
+ return host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
4221
+ }
4222
+ async function firstMatch(items, probe) {
4223
+ const results = await Promise.all(items.map((item) => probe(item).catch(() => false)));
4224
+ const index = results.indexOf(true);
4225
+ return index === -1 ? void 0 : items[index];
4226
+ }
4227
+
4207
4228
  // src/background/config.ts
4208
4229
  var CONFIG_KEY = "agentConfig";
4209
4230
  async function getConfig() {
@@ -4211,9 +4232,14 @@ async function getConfig() {
4211
4232
  return {
4212
4233
  ...DEFAULT_CONFIG,
4213
4234
  ...stored ?? {},
4214
- blockedHosts: Array.isArray(stored?.blockedHosts) ? stored.blockedHosts : DEFAULT_CONFIG.blockedHosts
4235
+ blockedHosts: Array.isArray(stored?.blockedHosts) ? stored.blockedHosts : DEFAULT_CONFIG.blockedHosts,
4236
+ bridgeUrl: normalizeBridgeUrl(stored?.bridgeUrl)
4215
4237
  };
4216
4238
  }
4239
+ function normalizeBridgeUrl(value) {
4240
+ const url = typeof value === "string" ? value.trim() : "";
4241
+ return url === LEGACY_BRIDGE_URL ? "" : url;
4242
+ }
4217
4243
 
4218
4244
  // src/shared/sleep.ts
4219
4245
  function sleep(ms, signal) {
@@ -5888,9 +5914,6 @@ var import_websocket = __toESM(require_websocket(), 1);
5888
5914
  var import_websocket_server = __toESM(require_websocket_server(), 1);
5889
5915
 
5890
5916
  // src/bridge/hub.ts
5891
- var BRIDGE_SERVICE = "tabmate-bridge";
5892
- var DEFAULT_PORT = 8765;
5893
- var DEFAULT_HOST = "127.0.0.1";
5894
5917
  var CLOSE_INVALID_TOKEN = 4001;
5895
5918
  var CLOSE_BUSY = 4003;
5896
5919
  var STALE_CLIENT_MS = 6e4;
@@ -6274,14 +6297,46 @@ function escapeHtml(value) {
6274
6297
  );
6275
6298
  }
6276
6299
 
6300
+ // src/bridge/select.ts
6301
+ async function selectBridge(options) {
6302
+ const existing = await firstMatch(options.discoveryPorts, options.isBridge);
6303
+ if (existing !== void 0) return { kind: "proxy", port: existing };
6304
+ const busy = [];
6305
+ for (const port of options.listenPorts) {
6306
+ const bridge = options.create(port);
6307
+ try {
6308
+ await bridge.listen();
6309
+ return { kind: "embedded", port, bridge };
6310
+ } catch (error) {
6311
+ void bridge.close().catch(() => void 0);
6312
+ if (error.code !== "EADDRINUSE") throw error;
6313
+ }
6314
+ if (await options.isBridge(port)) return { kind: "proxy", port };
6315
+ busy.push(port);
6316
+ }
6317
+ throw new Error(
6318
+ `Port${busy.length > 1 ? "s" : ""} ${busy.join(", ")} ${busy.length > 1 ? "are" : "is"} used by other programs. Set TABMATE_PORT to a free port and enter the same port in the extension options (Advanced \u2192 WebSocket URL).`
6319
+ );
6320
+ }
6321
+ async function isTabmateBridge(port, host = DEFAULT_HOST, timeoutMs = 2e3) {
6322
+ try {
6323
+ const response = await fetch(`${bridgeHttpUrl(port, host)}/health`, { signal: AbortSignal.timeout(timeoutMs) });
6324
+ const data = await response.json();
6325
+ return data.service === BRIDGE_SERVICE;
6326
+ } catch {
6327
+ return false;
6328
+ }
6329
+ }
6330
+
6277
6331
  // src/bridge/mcp.ts
6278
- var VERSION = "0.1.0";
6279
- var PORT = Number(process.env.TABMATE_PORT ?? DEFAULT_PORT);
6332
+ var VERSION = "0.2.0";
6333
+ var PINNED_PORT = process.env.TABMATE_PORT ? Number(process.env.TABMATE_PORT) : void 0;
6334
+ var LISTEN = PINNED_PORT !== void 0 ? [PINNED_PORT] : LISTEN_PORTS;
6335
+ var DISCOVER = PINNED_PORT !== void 0 ? [PINNED_PORT] : DISCOVERY_PORTS;
6280
6336
  var HOST = process.env.TABMATE_HOST ?? DEFAULT_HOST;
6281
6337
  var TOKEN = process.env.TABMATE_TOKEN?.trim() ?? "";
6282
6338
  var CONNECT_WAIT_MS = Number(process.env.TABMATE_CONNECT_WAIT_MS ?? 6e4);
6283
6339
  var DEFAULT_SESSION = process.env.TABMATE_SESSION ?? "default";
6284
- var REMOTE_URL = `http://${HOST.includes(":") ? `[${HOST}]` : HOST}:${PORT}`;
6285
6340
  var STATIC_TOOLS = createTools().map((tool) => tool.definition).sort((a, b) => a.name.localeCompare(b.name));
6286
6341
  var backend;
6287
6342
  var backendPromise;
@@ -6296,27 +6351,27 @@ function getBackend() {
6296
6351
  return backendPromise;
6297
6352
  }
6298
6353
  async function startBackend() {
6299
- const bridge = createBridge({
6300
- port: PORT,
6301
- host: HOST,
6302
- version: VERSION,
6303
- token: TOKEN,
6304
- extensionIds: (process.env.TABMATE_EXTENSION_IDS ?? "").split(","),
6305
- connectWaitMs: CONNECT_WAIT_MS,
6306
- log
6354
+ const selection = await selectBridge({
6355
+ listenPorts: LISTEN,
6356
+ discoveryPorts: DISCOVER,
6357
+ isBridge: (port) => isTabmateBridge(port, HOST),
6358
+ create: (port) => createBridge({
6359
+ port,
6360
+ host: HOST,
6361
+ version: VERSION,
6362
+ token: TOKEN,
6363
+ extensionIds: (process.env.TABMATE_EXTENSION_IDS ?? "").split(","),
6364
+ connectWaitMs: CONNECT_WAIT_MS,
6365
+ log
6366
+ })
6307
6367
  });
6308
- try {
6309
- await bridge.listen();
6310
- log(`bridge listening on ${REMOTE_URL} (waiting for the Chrome extension)`);
6311
- return embedded(bridge);
6312
- } catch (error) {
6313
- if (error.code !== "EADDRINUSE") throw error;
6368
+ const url = bridgeHttpUrl(selection.port, HOST);
6369
+ if (selection.kind === "embedded") {
6370
+ log(`bridge listening on ${url} (waiting for the Chrome extension)`);
6371
+ return embedded(selection.bridge);
6314
6372
  }
6315
- if (!await isBridge(REMOTE_URL)) {
6316
- throw new Error(`Port ${PORT} is used by another program. Set TABMATE_PORT to a free port.`);
6317
- }
6318
- log(`another agent already runs the bridge on ${REMOTE_URL}; forwarding to it`);
6319
- return proxy(REMOTE_URL);
6373
+ log(`another agent already runs the bridge on ${url}; forwarding to it`);
6374
+ return proxy(url);
6320
6375
  }
6321
6376
  function embedded(bridge) {
6322
6377
  return {
@@ -6350,15 +6405,6 @@ function proxy(baseUrl) {
6350
6405
  close: async () => void 0
6351
6406
  };
6352
6407
  }
6353
- async function isBridge(baseUrl) {
6354
- try {
6355
- const response = await fetch(`${baseUrl}/health`, { signal: AbortSignal.timeout(2e3) });
6356
- const data = await response.json();
6357
- return data.service === BRIDGE_SERVICE;
6358
- } catch {
6359
- return false;
6360
- }
6361
- }
6362
6408
  function isConnectionRefused(error) {
6363
6409
  const cause = error?.cause;
6364
6410
  return cause?.code === "ECONNREFUSED" || cause?.code === "ECONNRESET" || cause?.code === "UND_ERR_SOCKET";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tabmate",
3
- "version": "0.1.0",
3
+ "version": "0.2.0",
4
4
  "description": "MCP server for the Tabmate Chrome extension. Lets AI agents control your Chrome.",
5
5
  "type": "module",
6
6
  "bin": {
package/server.js CHANGED
@@ -3777,10 +3777,15 @@ var import_subprotocol = __toESM(require_subprotocol(), 1);
3777
3777
  var import_websocket = __toESM(require_websocket(), 1);
3778
3778
  var import_websocket_server = __toESM(require_websocket_server(), 1);
3779
3779
 
3780
- // src/bridge/hub.ts
3780
+ // src/shared/ports.ts
3781
3781
  var BRIDGE_SERVICE = "tabmate-bridge";
3782
- var DEFAULT_PORT = 8765;
3782
+ var LISTEN_PORTS = [23765, 23766, 23767];
3783
+ var LEGACY_PORTS = [8765];
3784
+ var DISCOVERY_PORTS = [...LISTEN_PORTS, ...LEGACY_PORTS];
3785
+ var DEFAULT_PORT = LISTEN_PORTS[0];
3783
3786
  var DEFAULT_HOST = "127.0.0.1";
3787
+
3788
+ // src/bridge/hub.ts
3784
3789
  var CLOSE_INVALID_TOKEN = 4001;
3785
3790
  var CLOSE_BUSY = 4003;
3786
3791
  var STALE_CLIENT_MS = 6e4;
@@ -4165,7 +4170,7 @@ function escapeHtml(value) {
4165
4170
  }
4166
4171
 
4167
4172
  // src/bridge/server.ts
4168
- var VERSION = "0.1.0";
4173
+ var VERSION = "0.2.0";
4169
4174
  var PORT = Number(process.env.TABMATE_PORT ?? DEFAULT_PORT);
4170
4175
  var HOST = process.env.TABMATE_HOST ?? DEFAULT_HOST;
4171
4176
  var TOKEN = process.env.TABMATE_TOKEN?.trim() ?? "";
@@ -4183,7 +4188,7 @@ try {
4183
4188
  } catch (error) {
4184
4189
  const code = error.code;
4185
4190
  log(
4186
- code === "EADDRINUSE" ? `Port ${PORT} is already in use (an MCP server may already be running the bridge).` : `Failed to start: ${String(error)}`
4191
+ code === "EADDRINUSE" ? `Port ${PORT} is already in use (an MCP server may already be running the bridge, or another program holds it). Set TABMATE_PORT to use another port.` : `Failed to start: ${String(error)}`
4187
4192
  );
4188
4193
  process.exit(1);
4189
4194
  }