mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
7049f0b13a
Introduce protocol version levels in the Marionette server. On establishing a connection to a local end, the remote will return a `marionetteProtocol` field indicating which level it speaks. The protocol level can be used by local ends to either fall into compatibility mode or warn the user that the local end is incompatible with the remote. The protocol is currently also more expressive than it needs to be and this expressiveness has previously resulted in subtle inconsistencies in the fields returned. This patch reduces the amount of superfluous fields, reducing the amount of data sent. Aligning the protocol closer to the WebDriver specification's expectations will also reduce the amount of post-processing required in the httpd. Previous to this patch, this is a value response: {"from":"0","value":null,"status":0,"sessionId":"{6b6d68d2-4ac9-4308-9f07-d2e72519c407}"} And this for ok responses: {"from":"0","ok":true} And this for errors: {"from":"0","status":21,"sessionId":"{6b6d68d2-4ac9-4308-9f07-d2e72519c407}","error":{"message":"Error loading page, timed out (onDOMContentLoaded)","stacktrace":null,"status":21}} This patch drops the `from` and `sessionId` fields, and the `status` field from non-error responses. It also drops the `ok` field in non-value responses and flattens the error response to a simple dictionary with the `error` (previously `status`), `message`, and `stacktrace` properties, which are now all required. r=jgriffin
164 lines
4.8 KiB
JavaScript
164 lines
4.8 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
"use strict";
|
|
|
|
const {utils: Cu} = Components;
|
|
|
|
Cu.import("resource://gre/modules/Log.jsm");
|
|
Cu.import("resource://gre/modules/Task.jsm");
|
|
|
|
Cu.import("chrome://marionette/content/error.js");
|
|
|
|
this.EXPORTED_SYMBOLS = ["CommandProcessor", "Response"];
|
|
const logger = Log.repository.getLogger("Marionette");
|
|
|
|
const validator = {
|
|
exclusionary: {
|
|
"capabilities": ["error", "value"],
|
|
"error": ["value", "sessionId", "capabilities"],
|
|
"sessionId": ["error", "value"],
|
|
"value": ["error", "sessionId", "capabilities"],
|
|
},
|
|
|
|
set: function(obj, prop, val) {
|
|
let tests = this.exclusionary[prop];
|
|
if (tests) {
|
|
for (let t of tests) {
|
|
if (obj.hasOwnProperty(t)) {
|
|
throw new TypeError(`${t} set, cannot set ${prop}`);
|
|
}
|
|
}
|
|
}
|
|
|
|
obj[prop] = val;
|
|
return true;
|
|
},
|
|
};
|
|
|
|
/**
|
|
* The response body is exposed as an argument to commands.
|
|
* Commands can set fields on the body through defining properties.
|
|
*
|
|
* Setting properties invokes a validator that performs tests for
|
|
* mutually exclusionary fields on the input against the existing data
|
|
* in the body.
|
|
*
|
|
* For example setting the {@code error} property on the body when
|
|
* {@code value}, {@code sessionId}, or {@code capabilities} have been
|
|
* set previously will cause an error.
|
|
*/
|
|
this.ResponseBody = () => new Proxy({}, validator);
|
|
|
|
/**
|
|
* Represents the response returned from the remote end after execution
|
|
* of its corresponding command.
|
|
*
|
|
* The response is a mutable object passed to each command for
|
|
* modification through the available setters. To send data in a response,
|
|
* you modify the body property on the response. The body property can
|
|
* also be replaced completely.
|
|
*
|
|
* The response is sent implicitly by CommandProcessor when a command
|
|
* has finished executing, and any modifications made subsequent to that
|
|
* will have no effect.
|
|
*
|
|
* @param {number} cmdId
|
|
* UUID tied to the corresponding command request this is
|
|
* a response for.
|
|
* @param {function(Object, number)} respHandler
|
|
* Callback function called on responses.
|
|
*/
|
|
this.Response = function(cmdId, respHandler) {
|
|
this.id = cmdId;
|
|
this.respHandler = respHandler;
|
|
this.sent = false;
|
|
this.body = ResponseBody();
|
|
};
|
|
|
|
Response.prototype.send = function() {
|
|
if (this.sent) {
|
|
throw new RangeError("Response has already been sent: " + this.toString());
|
|
}
|
|
this.respHandler(this.body, this.id);
|
|
this.sent = true;
|
|
};
|
|
|
|
Response.prototype.sendError = function(err) {
|
|
let wd = error.isWebDriverError(err);
|
|
let we = wd ? err : new WebDriverError(err.message);
|
|
|
|
this.body.error = we.status;
|
|
this.body.message = we.message || null;
|
|
this.body.stacktrace = we.stack || null;
|
|
|
|
this.send();
|
|
|
|
// propagate errors that are implementation problems
|
|
if (!wd) {
|
|
throw err;
|
|
}
|
|
};
|
|
|
|
/**
|
|
* The command processor receives messages on execute(payload, …)
|
|
* from the dispatcher, processes them, and wraps the functions that
|
|
* it executes from the WebDriver implementation, driver.
|
|
*
|
|
* @param {GeckoDriver} driver
|
|
* Reference to the driver implementation.
|
|
*/
|
|
this.CommandProcessor = function(driver) {
|
|
this.driver = driver;
|
|
};
|
|
|
|
/**
|
|
* Executes a WebDriver command based on the received payload,
|
|
* which is expected to be an object with a "parameters" property
|
|
* that is a simple key/value collection of arguments.
|
|
*
|
|
* The respHandler function will be called with the JSON object to
|
|
* send back to the client.
|
|
*
|
|
* The cmdId is the UUID tied to this request that prevents
|
|
* the dispatcher from sending responses in the wrong order.
|
|
*
|
|
* @param {Object} payload
|
|
* Message as received from client.
|
|
* @param {function(Object, number)} respHandler
|
|
* Callback function called on responses.
|
|
* @param {number} cmdId
|
|
* The unique identifier for the command to execute.
|
|
*/
|
|
CommandProcessor.prototype.execute = function(payload, respHandler, cmdId) {
|
|
let cmd = payload;
|
|
let resp = new Response(cmdId, respHandler);
|
|
let sendResponse = resp.send.bind(resp);
|
|
let sendError = resp.sendError.bind(resp);
|
|
|
|
// Ideally handlers shouldn't have to care about the command ID,
|
|
// but some methods (newSession, executeScript, et al.) have not
|
|
// yet been converted to use the new form of request dispatching.
|
|
cmd.id = cmdId;
|
|
|
|
let req = Task.spawn(function*() {
|
|
let fn = this.driver.commands[cmd.name];
|
|
if (typeof fn == "undefined") {
|
|
throw new UnknownCommandError(cmd.name);
|
|
}
|
|
|
|
let rv = yield fn.bind(this.driver)(cmd, resp);
|
|
|
|
if (typeof rv != "undefined") {
|
|
if (typeof rv != "object") {
|
|
resp.body = {value: rv};
|
|
} else {
|
|
resp.body = rv;
|
|
}
|
|
}
|
|
}.bind(this));
|
|
|
|
req.then(sendResponse, sendError).catch(error.report);
|
|
};
|