-
-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[rb] Implement High Level Logging API with BiDi (#14073)
* add and remove logging handlers with BiDi * use #object_id instead of creating new ids to track callbacks * do not send browsing contexts to subscription if not needed * deprecate Driver#script & LogInspector * error if trying to remove an id that does not exist * do not unsubscribe if never subscribed in the first place * do not deprecate callbacks people don't have to care about getting the id back
- Loading branch information
1 parent
e672104
commit 8ac19e4
Showing
14 changed files
with
350 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
# frozen_string_literal: true | ||
|
||
# Licensed to the Software Freedom Conservancy (SFC) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The SFC licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
|
||
module Selenium | ||
module WebDriver | ||
class BiDi | ||
class LogHandler | ||
ConsoleLogEntry = BiDi::Struct.new(:level, :text, :timestamp, :method, :args, :type) | ||
JavaScriptLogEntry = BiDi::Struct.new(:level, :text, :timestamp, :stack_trace, :type) | ||
|
||
def initialize(bidi) | ||
@bidi = bidi | ||
@log_entry_subscribed = false | ||
end | ||
|
||
# @return [int] id of the handler | ||
def add_message_handler(type) | ||
subscribe_log_entry unless @log_entry_subscribed | ||
@bidi.add_callback('log.entryAdded') do |params| | ||
if params['type'] == type | ||
log_entry_klass = type == 'console' ? ConsoleLogEntry : JavaScriptLogEntry | ||
yield(log_entry_klass.new(**params)) | ||
end | ||
end | ||
end | ||
|
||
# @param [int] id of the handler previously added | ||
def remove_message_handler(id) | ||
@bidi.remove_callback('log.entryAdded', id) | ||
unsubscribe_log_entry if @log_entry_subscribed && @bidi.callbacks['log.entryAdded'].empty? | ||
end | ||
|
||
private | ||
|
||
def subscribe_log_entry | ||
@bidi.session.subscribe('log.entryAdded') | ||
@log_entry_subscribed = true | ||
end | ||
|
||
def unsubscribe_log_entry | ||
@bidi.session.unsubscribe('log.entryAdded') | ||
@log_entry_subscribed = false | ||
end | ||
end # LogHandler | ||
end # Bidi | ||
end # WebDriver | ||
end # Selenium |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# frozen_string_literal: true | ||
|
||
# Licensed to the Software Freedom Conservancy (SFC) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The SFC licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
|
||
module Selenium | ||
module WebDriver | ||
class BiDi | ||
class Struct < ::Struct | ||
def self.new(*args, &block) | ||
super(*args) do | ||
define_method(:initialize) do |**kwargs| | ||
converted_kwargs = kwargs.transform_keys { |key| camel_to_snake(key.to_s).to_sym } | ||
super(*converted_kwargs.values_at(*self.class.members)) | ||
end | ||
class_eval(&block) if block | ||
end | ||
end | ||
|
||
def camel_to_snake(camel_str) | ||
camel_str.gsub(/([A-Z])/, '_\1').downcase | ||
end | ||
end | ||
end # BiDi | ||
end # WebDriver | ||
end # Selenium |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
# frozen_string_literal: true | ||
|
||
# Licensed to the Software Freedom Conservancy (SFC) under one | ||
# or more contributor license agreements. See the NOTICE file | ||
# distributed with this work for additional information | ||
# regarding copyright ownership. The SFC licenses this file | ||
# to you under the Apache License, Version 2.0 (the | ||
# "License"); you may not use this file except in compliance | ||
# with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, | ||
# software distributed under the License is distributed on an | ||
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
# KIND, either express or implied. See the License for the | ||
# specific language governing permissions and limitations | ||
# under the License. | ||
|
||
module Selenium | ||
module WebDriver | ||
class Script | ||
def initialize(bridge) | ||
@log_handler = BiDi::LogHandler.new(bridge.bidi) | ||
end | ||
|
||
# @return [int] id of the handler | ||
def add_console_message_handler(&block) | ||
@log_handler.add_message_handler('console', &block) | ||
end | ||
|
||
# @return [int] id of the handler | ||
def add_javascript_error_handler(&block) | ||
@log_handler.add_message_handler('javascript', &block) | ||
end | ||
|
||
# @param [int] id of the handler previously added | ||
def remove_console_message_handler(id) | ||
@log_handler.remove_message_handler(id) | ||
end | ||
|
||
alias remove_javascript_error_handler remove_console_message_handler | ||
end # Script | ||
end # WebDriver | ||
end # Selenium |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
module Selenium | ||
module WebDriver | ||
class Script | ||
@bidi: BiDi | ||
@log_entry_subscribed: bool | ||
|
||
def add_console_message_handler: -> untyped | ||
|
||
def add_javascript_error_handler: -> untyped | ||
|
||
def remove_console_message_handler: -> untyped | ||
|
||
alias remove_javascript_error_handler remove_console_message_handler | ||
|
||
private | ||
|
||
def subscribe_log_entry: -> untyped | ||
end | ||
end | ||
end |
Oops, something went wrong.