Skip to content

Commit 179c9ac

Browse files
authored
GetBrowserCatalog to use Response.Json (#345)
* GetBrowserCatalog to use Response.Json * Fixed accidental change * Removed not used stringResponse * Update playwright-state.ts
1 parent 196d2a5 commit 179c9ac

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

Browser/keywords/playwright_state.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ def get_browser_catalog(self):
393393
"""
394394
with self.playwright.grpc_channel() as stub:
395395
response = stub.GetBrowserCatalog(Request().Empty())
396-
parsed = json.loads(response.body)
396+
parsed = json.loads(response.json)
397397
logger.info(json.dumps(parsed))
398398
return parsed
399399

node/playwright-wrapper/grpc-service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export class PlaywrightServer implements IPlaywrightServer {
5959

6060
async getBrowserCatalog(
6161
call: ServerUnaryCall<Request.Empty>,
62-
callback: sendUnaryData<Response.String>,
62+
callback: sendUnaryData<Response.Json>,
6363
): Promise<void> {
6464
return playwrightState.getBrowserCatalog(callback, this.state);
6565
}

node/playwright-wrapper/playwright-state.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { ServerUnaryCall, sendUnaryData } from 'grpc';
1717
import { v4 as uuidv4 } from 'uuid';
1818

1919
import { Request, Response } from './generated/playwright_pb';
20-
import { emptyWithLog, stringResponse } from './response-util';
20+
import { emptyWithLog, jsonResponse, stringResponse } from './response-util';
2121
import { exists, invokeOnPage } from './playwirght-invoke';
2222

2323
import * as pino from 'pino';
@@ -489,10 +489,9 @@ export async function switchBrowser(
489489
}
490490

491491
export async function getBrowserCatalog(
492-
callback: sendUnaryData<Response.String>,
492+
callback: sendUnaryData<Response.Json>,
493493
openBrowsers: PlaywrightState,
494494
): Promise<void> {
495-
const response = new Response.String();
496-
response.setBody(JSON.stringify(await openBrowsers.getCatalog()));
495+
const response = jsonResponse(JSON.stringify(await openBrowsers.getCatalog()), 'Catalog received');
497496
callback(null, response);
498497
}

protobuf/playwright.proto

+1-1
Original file line numberDiff line numberDiff line change
@@ -332,5 +332,5 @@ service Playwright {
332332
rpc CloseAllBrowsers(Request.Empty) returns (Response.Empty);
333333
rpc CloseContext(Request.Empty) returns (Response.Empty);
334334
rpc ClosePage(Request.Empty) returns (Response.Empty);
335-
rpc GetBrowserCatalog(Request.Empty) returns (Response.String);
335+
rpc GetBrowserCatalog(Request.Empty) returns (Response.Json);
336336
}

0 commit comments

Comments
 (0)