conditionals for context and viewport + viewport config flag fix

Author: Kylejeong2

browserbase/src/config.ts

@@ -35,10 +35,8 @@ export type CLIOptions = {
   port?: number;
   host?: string;
   cookies?: Cookie[];
-  viewPort?: {
-    browserWidth?: number;
-    browserHeight?: number;
-  };
+  browserWidth?: number;
+  browserHeight?: number;
 };
 
 // Default Configuration Values
@@ -103,8 +101,8 @@ export async function configFromCLIOptions(cliOptions: CLIOptions): Promise<Conf
       persist: cliOptions.persist,
     },
     viewPort: {
-      browserWidth: cliOptions.viewPort?.browserWidth,
-      browserHeight: cliOptions.viewPort?.browserHeight,
+      browserWidth: cliOptions.browserWidth,
+      browserHeight: cliOptions.browserHeight,
     },
     cookies: cliOptions.cookies,
   };

browserbase/src/program.ts

@@ -20,7 +20,8 @@ program
     .option('--port <port>', 'Port to listen on for SSE transport.')
     .option('--host <host>', 'Host to bind server to. Default is localhost. Use 0.0.0.0 to bind to all interfaces.')
     .option('--cookies [json]', 'JSON array of cookies to inject into the browser. Format: [{"name":"cookie1","value":"val1","domain":"example.com"}, ...]')
-    .option('--viewPort [json]', 'ViewPort to use for the browser. Format: {"browserWidth":1024,"browserHeight":768}')
+    .option('--browserWidth <width>', 'Browser width to use for the browser.')
+    .option('--browserHeight <height>', 'Browser height to use for the browser.')
     .action(async options => {
       const config = await resolveConfig(options);
       const serverList = new ServerList(async() => createServer(config));

browserbase/src/sessionManager.ts

@@ -73,7 +73,7 @@ export async function addCookiesToContext(context: any, cookies: Cookie[]): Prom
 // Function to create a new Browserbase session and connect Playwright
 export async function createNewBrowserSession(
   newSessionId: string,
-  config: Config, // Accept config object
+  config: Config, 
 ): Promise<BrowserSession> {
   if (!config.browserbaseApiKey) {
     throw new Error("Browserbase API Key is missing in the configuration.");
@@ -92,24 +92,17 @@ export async function createNewBrowserSession(
     projectId: config.browserbaseProjectId!,
     proxies: config.proxies, 
     browserSettings: {
-      viewport: { // better for snapshots
+      ...(config.viewPort ? { viewport: { 
         width: config.viewPort?.browserWidth,
         height: config.viewPort?.browserHeight,
-      },
+      }} : {}),
+      ...(config.context?.contextId ? { context: {
+        id: config.context?.contextId,
+        persist: config.context?.persist ?? true, // Default to true if not specified
+      }} : {})
     },
   };
 
-  console.error("config.context", config.context);
-  // Add context settings if provided
-  if (config.context?.contextId) {
-    sessionOptions.browserSettings = {
-      context: {
-        id: config.context.contextId,
-        persist: config.context.persist || true, // Default to true if not specified
-      },
-    };
-  }
-
   try {
     process.stderr.write(
       `[SessionManager] Creating session ${newSessionId}...\n`