Handle iOS 12.2 for real devices #122
Merged
Conversation
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
lib/helpers.js
Outdated
| function checkIsTargetBased (isSafari, platformVersion) { | ||
| // on iOS 12.2 the messages get sent through the Target domain | ||
| if (_.isString(platformVersion)) { | ||
| platformVersion = parseFloat(platformVersion); |
There was a problem hiding this comment.
please use compareVersions/coerceVersion helpers from appium-support
lib/helpers.js
Outdated
| @@ -209,8 +210,16 @@ function deferredPromise () { | |||
| }; | |||
| } | |||
|
|
|||
| function checkIsTargetBased (isSafari, platformVersion) { | |||
There was a problem hiding this comment.
why not isTargetBased? check prefix means we do some additional verification there
lib/webkit-rpc-client.js
Outdated
| const msgId = data.id; | ||
| let msgId = data.id; | ||
|
|
||
| let result = data.result; |
There was a problem hiding this comment.
let {result, params, error} = data
lib/webkit-rpc-client.js
Outdated
| let error = data.error; | ||
| let method = this.dataMethods[msgId] || data.method; | ||
| if (this.isTargetBased) { | ||
| if (!(data.method || '').startsWith('Target')) { |
There was a problem hiding this comment.
lodash's startsWith method could also be used here. It does safe typecast
lib/webkit-rpc-client.js
Outdated
| return; | ||
| } | ||
| if (data.params.message) { | ||
| const message = JSON.parse(data.params.message); |
There was a problem hiding this comment.
this can throw an exception
| } | ||
|
|
||
| // the message is aggravatingly nested | ||
| if (message.result) { |
There was a problem hiding this comment.
can we change that to message.result && message.result.result && message.result.result.value ?
There was a problem hiding this comment.
No. Anything nested would end up with empty results:
node
> message = {
... "result": {
..... "cookies": [
..... {
....... "name": "guineacookie1",
....... "value": "i%20am%20a%20cookie%20value",
....... "domain": "192.168.1.152",
....... "path": "/",
....... "expires": 0,
....... "size": 40,
....... "httpOnly": false,
....... "secure": false,
....... "session": true,
....... "sameSite": "None"
....... },
..... {
....... "name": "guineacookie2",
....... "value": "cooki%C3%A92",
....... "domain": "192.168.1.152",
....... "path": "/",
....... "expires": 0,
....... "size": 25,
....... "httpOnly": false,
....... "secure": false,
....... "session": true,
....... "sameSite": "None"
....... }
..... ]
..... },
... "id": 6
... }
{ result: { cookies: [ [Object], [Object] ] }, id: 6 }
> b = message.result && message.result.result && message.result.result.value;
undefined
> b = message.result && message.result.result
undefined
> b = message.result
{ cookies:
[ { name: 'guineacookie1',
value: 'i%20am%20a%20cookie%20value',
domain: '192.168.1.152',
path: '/',
expires: 0,
size: 40,
httpOnly: false,
secure: false,
session: true,
sameSite: 'None' },
{ name: 'guineacookie2',
value: 'cooki%C3%A92',
domain: '192.168.1.152',
path: '/',
expires: 0,
size: 25,
httpOnly: false,
secure: false,
session: true,
sameSite: 'None' } ] }
lib/webkit-rpc-client.js
Outdated
| isEventHandled = true; | ||
| break; | ||
| case 'Target.dispatchMessageFromTarget': | ||
| log.debug('HERE'); |
There was a problem hiding this comment.
is this log useful?
mykola-mokhnach
approved these changes
Mar 30, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add support for iOS 12.2 on real devices. For this to work
ios-webkit-debug-proxyneeds to be the latest from HEAD.This duplicates a bunch of logic, but as the package is structured now that is necessary. Once this is in I will allocate some time to refactor this to use the same message handler system, which should remove the duplication.