Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1614792 - Rename DebuggerClient to DevToolsClient. r=jdescottes

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D62495

--HG--
rename : devtools/shared/client/debugger-client.js => devtools/shared/client/devtools-client.js
extra : moz-landing-system : lando
This commit is contained in:
Alexandre Poirot 2020-02-17 13:39:25 +00:00
parent 53ffd7288a
commit f3c23535d7
131 changed files with 320 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/components/extensions/test/browser/browser_ext_addon_debugging_netmonitor.js
View File

@ -4,7 +4,7 @@
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const { DevToolsServer } = require("devtools/server/devtools-server");
const { gDevTools } = require("devtools/client/framework/devtools");
const { Toolbox } = require("devtools/client/framework/toolbox");
@ -13,7 +13,7 @@ async function setupToolboxTest(extensionId) {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
const addonFront = await client.mainRoot.getAddon({ id: extensionId });
const target = await addonFront.getTarget();

10
devtools/client/aboutdebugging/src/actions/runtimes.js
View File

@ -75,7 +75,7 @@ async function getRuntimeIcon(runtime, channel) {
: "chrome://devtools/skin/images/aboutdebugging-firefox-nightly.svg";
}
function onRemoteDebuggerClientClosed() {
function onRemoteDevToolsClientClosed() {
window.AboutDebugging.onNetworkLocationsUpdated();
window.AboutDebugging.onUSBRuntimesUpdated();
}
@ -184,7 +184,7 @@ function connectRuntime(id) {
if (runtime.type !== RUNTIMES.THIS_FIREFOX) {
// `closed` event will be emitted when disabling remote debugging
// on the connected remote runtime.
clientWrapper.once("closed", onRemoteDebuggerClientClosed);
clientWrapper.once("closed", onRemoteDevToolsClientClosed);
}
dispatch({
@ -241,7 +241,7 @@ function disconnectRuntime(id, shouldRedirect = false) {
}
if (runtime.type !== RUNTIMES.THIS_FIREFOX) {
clientWrapper.off("closed", onRemoteDebuggerClientClosed);
clientWrapper.off("closed", onRemoteDevToolsClientClosed);
}
await clientWrapper.close();
if (shouldRedirect) {
@ -416,7 +416,7 @@ function updateUSBRuntimes(adbRuntimes) {
/**
* Check that a given runtime can still be found in the provided array of runtimes, and
* that the connection of the associated DebuggerClient is still valid.
* that the connection of the associated DevToolsClient is still valid.
* Note that this check is only valid for runtimes which match the type of the runtimes
* in the array.
*/
@ -529,7 +529,7 @@ function removeRuntimeListeners() {
for (const runtime of remoteRuntimes) {
if (runtime.runtimeDetails) {
const { clientWrapper } = runtime.runtimeDetails;
clientWrapper.off("closed", onRemoteDebuggerClientClosed);
clientWrapper.off("closed", onRemoteDevToolsClientClosed);
}
}
};

2
devtools/client/aboutdebugging/src/middleware/extension-component-data.js
View File

@ -15,7 +15,7 @@ const {
} = require("devtools/client/aboutdebugging/src/modules/extensions-helper");
/**
* This middleware converts extensions object that get from DebuggerClient.listAddons()
* This middleware converts extensions object that get from DevToolsClient.listAddons()
* to data which is used in DebugTargetItem.
*/
const extensionComponentDataMiddleware = store => next => action => {

2
devtools/client/aboutdebugging/src/middleware/process-component-data.js
View File

@ -14,7 +14,7 @@ const {
} = require("devtools/client/aboutdebugging/src/constants");
/**
* This middleware converts tabs object that get from DebuggerClient.listProcesses() to
* This middleware converts tabs object that get from DevToolsClient.listProcesses() to
* data which is used in DebugTargetItem.
*/
const processComponentDataMiddleware = store => next => action => {

2
devtools/client/aboutdebugging/src/middleware/tab-component-data.js
View File

@ -10,7 +10,7 @@ const {
} = require("devtools/client/aboutdebugging/src/constants");
/**
* This middleware converts tabs object that get from DebuggerClient.listTabs() to data
* This middleware converts tabs object that get from DevToolsClient.listTabs() to data
* which is used in DebugTargetItem.
*/
const tabComponentDataMiddleware = store => next => action => {

2
devtools/client/aboutdebugging/src/middleware/worker-component-data.js
View File

@ -12,7 +12,7 @@ const {
} = require("devtools/client/aboutdebugging/src/constants");
/**
* This middleware converts workers object that get from DebuggerClient.listAllWorkers()
* This middleware converts workers object that get from DevToolsClient.listAllWorkers()
* to data which is used in DebugTargetItem.
*/
const workerComponentDataMiddleware = store => next => action => {

8
devtools/client/aboutdebugging/src/modules/runtime-client-factory.js
View File

@ -5,7 +5,7 @@
"use strict";
const { prepareTCPConnection } = require("devtools/shared/adb/commands/index");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const { DevToolsServer } = require("devtools/server/devtools-server");
const {
ClientWrapper,
@ -21,14 +21,14 @@ async function createLocalClient() {
DevToolsServer.registerAllActors();
DevToolsServer.allowChromeProcess = true;
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
return new ClientWrapper(client);
}
async function createNetworkClient(host, port) {
const transport = await DebuggerClient.socketConnect({ host, port });
const client = new DebuggerClient(transport);
const transport = await DevToolsClient.socketConnect({ host, port });
const client = new DevToolsClient(transport);
await client.connect();
return new ClientWrapper(client);
}

2
devtools/client/aboutdebugging/src/types/runtime.js
View File

@ -59,7 +59,7 @@ const runtimeDetails = {
// This might be undefined when connecting to runtimes older than Fx 66
canDebugServiceWorkers: PropTypes.bool,
// ClientWrapper built using a DebuggerClient for the runtime
// ClientWrapper built using a DevToolsClient for the runtime
clientWrapper: PropTypes.instanceOf(ClientWrapper).isRequired,
// compatibility report to check if the target runtime is in range of the backward

2
devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_addons_debug_popup.js
View File

@ -259,7 +259,7 @@ async function toolboxTestScript(toolbox, devtoolsTab) {
"myWebExtensionPopupAddonFunction()"
);
info("Wait for all pending requests to settle on the DebuggerClient");
info("Wait for all pending requests to settle on the DevToolsClient");
await toolbox.target.client.waitForRequestsToSettle();
await removeTab(devtoolsTab);

8
devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_fenix_runtime_display.js
View File

@ -135,7 +135,7 @@ add_task(async function() {
"The runtime icon is the Fenix icon"
);
info("Wait for all pending requests to settle on the DebuggerClient");
info("Wait for all pending requests to settle on the DevToolsClient");
await clientWrapper.client.waitForRequestsToSettle();
await closeAboutDevtoolsToolbox(document, devtoolsTab, window);
@ -150,16 +150,16 @@ add_task(async function() {
});
async function createLocalClientWrapper() {
info("Create a local DebuggerClient");
info("Create a local DevToolsClient");
const { DevToolsServer } = require("devtools/server/devtools-server");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const {
ClientWrapper,
} = require("devtools/client/aboutdebugging/src/modules/client-wrapper");
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
return new ClientWrapper(client);

2
devtools/client/aboutdebugging/test/browser/browser_aboutdebugging_hidden_addons.js
View File

@ -89,7 +89,7 @@ function setupThisFirefoxMock() {
return thisFirefoxClient;
}
// Create basic addon data as the DebuggerClient would return it (debuggable and non
// Create basic addon data as the DevToolsClient would return it (debuggable and non
// temporary).
function createAddonData({ id, name, isSystem, hidden }) {
return {

2
devtools/client/debugger/panel.js
View File

@ -44,7 +44,7 @@ DebuggerPanel.prototype = {
client,
} = await this.panelWin.Debugger.bootstrap({
targetList: this.toolbox.targetList,
debuggerClient: this.toolbox.target.client,
devToolsClient: this.toolbox.target.client,
workers: {
sourceMaps: this.toolbox.sourceMapService,
evaluationsParser: this.toolbox.parserService,

6
devtools/client/debugger/src/client/README.md
View File

@ -1,6 +1,6 @@
# Debugger Client
# DevTools Client
The Debugger client is responsible for managing the communication between the
The DevTools client is responsible for managing the communication between the
client application and JS server.
* When the server sends a notification to the client, the client receives an
@ -39,7 +39,7 @@ should not notify the application that the thread has been paused or resumed.
[protocol]: https://searchfox.org/mozilla-central/source/devtools/docs/backend/protocol.md
[dt-connect]: https://github.com/firefox-devtools/devtools-core/tree/master/packages/devtools-connection
[devtools-client.js]: https://searchfox.org/mozilla-central/source/devtools/shared/client/debugger-client.js
[devtools-client.js]: https://searchfox.org/mozilla-central/source/devtools/shared/client/devtools-client.js
## Chrome

6
devtools/client/debugger/src/client/firefox.js
View File

@ -20,11 +20,11 @@ import { features, prefs } from "../utils/prefs";
let actions;
export async function onConnect(connection: any, _actions: Object) {
const { debuggerClient, targetList } = connection;
const { devToolsClient, targetList } = connection;
actions = _actions;
setupCommands({ debuggerClient });
setupEvents({ actions, debuggerClient });
setupCommands({ devToolsClient });
setupEvents({ actions, devToolsClient });
await targetList.watchTargets(
targetList.ALL_TYPES,
onTargetAvailable,

20
devtools/client/debugger/src/client/firefox/commands.js
View File

@ -28,7 +28,7 @@ import type {
import type {
Target,
DebuggerClient,
DevToolsClient,
Grip,
ThreadFront,
ObjectFront,
@ -44,7 +44,7 @@ import type {
let targets: { [string]: Target };
let currentThreadFront: ThreadFront;
let currentTarget: Target;
let debuggerClient: DebuggerClient;
let devToolsClient: DevToolsClient;
let sourceActors: { [ActorId]: SourceId };
let breakpoints: { [string]: Object };
let eventBreakpoints: ?EventListenerActiveList;
@ -52,11 +52,11 @@ let eventBreakpoints: ?EventListenerActiveList;
const CALL_STACK_PAGE_SIZE = 1000;
type Dependencies = {
debuggerClient: DebuggerClient,
devToolsClient: DevToolsClient,
};
function setupCommands(dependencies: Dependencies) {
debuggerClient = dependencies.debuggerClient;
devToolsClient = dependencies.devToolsClient;
targets = {};
sourceActors = {};
breakpoints = {};
@ -72,14 +72,14 @@ function createObjectFront(grip: Grip): ObjectFront {
throw new Error("Actor is missing");
}
return debuggerClient.createObjectFront(grip, currentThreadFront);
return devToolsClient.createObjectFront(grip, currentThreadFront);
}
async function loadObjectProperties(root: Node) {
const utils = Reps.objectInspector.utils;
const properties = await utils.loadProperties.loadItemProperties(
root,
debuggerClient
devToolsClient
);
return utils.node.getChildren({
item: root,
@ -91,7 +91,7 @@ function releaseActor(actor: String) {
if (!actor) {
return;
}
const objFront = debuggerClient.getFrontByID(actor);
const objFront = devToolsClient.getFrontByID(actor);
if (objFront) {
return objFront.release().catch(() => {});
@ -99,7 +99,7 @@ function releaseActor(actor: String) {
}
function sendPacket(packet: Object) {
return debuggerClient.request(packet);
return devToolsClient.request(packet);
}
// Get a copy of the current targets.
@ -454,7 +454,7 @@ async function fetchThreads() {
await updateTargets({
currentTarget,
debuggerClient,
devToolsClient,
targets,
options,
});
@ -506,7 +506,7 @@ async function getSourceActorBreakableLines({
}
function getFrontByID(actorID: String) {
return debuggerClient.getFrontByID(actorID);
return devToolsClient.getFrontByID(actorID);
}
function timeWarp(position: ExecutionPoint) {

10
devtools/client/debugger/src/client/firefox/events.js
View File

@ -9,7 +9,7 @@ import type {
PausedPacket,
ThreadFront,
Target,
DebuggerClient,
DevToolsClient,
} from "./types";
import Actions from "../../actions";
@ -26,7 +26,7 @@ const {
type Dependencies = {
actions: typeof Actions,
debuggerClient: DebuggerClient,
devToolsClient: DevToolsClient,
};
let actions: typeof Actions;
@ -57,13 +57,13 @@ function attachAllTargets(currentTarget: Target) {
}
function setupEvents(dependencies: Dependencies) {
const { debuggerClient } = dependencies;
const { devToolsClient } = dependencies;
actions = dependencies.actions;
sourceQueue.initialize(actions);
debuggerClient.mainRoot.on("processListChanged", threadListChanged);
devToolsClient.mainRoot.on("processListChanged", threadListChanged);
workersListener = new WorkersListener(debuggerClient.mainRoot);
workersListener = new WorkersListener(devToolsClient.mainRoot);
threadFrontListeners = new WeakMap();
}

18
devtools/client/debugger/src/client/firefox/targets.js
View File

@ -7,14 +7,14 @@
import { addThreadEventListeners, attachAllTargets } from "./events";
import { features } from "../../utils/prefs";
import { sameOrigin } from "../../utils/url";
import type { DebuggerClient, Target } from "./types";
import type { DevToolsClient, Target } from "./types";
// $FlowIgnore
const { defaultThreadOptions } = require("devtools/client/shared/thread-utils");
type Args = {
currentTarget: Target,
debuggerClient: DebuggerClient,
devToolsClient: DevToolsClient,
targets: { [string]: Target },
options: Object,
};
@ -66,7 +66,7 @@ async function attachTargets(targetLists, args) {
}
async function listWorkerTargets(args: Args) {
const { currentTarget, debuggerClient } = args;
const { currentTarget, devToolsClient } = args;
if (!currentTarget.isBrowsingContext || currentTarget.isContentProcess) {
return [];
}
@ -75,7 +75,7 @@ async function listWorkerTargets(args: Args) {
let allWorkers;
let serviceWorkerRegistrations = [];
if (attachAllTargets(currentTarget)) {
workers = await debuggerClient.mainRoot.listAllWorkerTargets();
workers = await devToolsClient.mainRoot.listAllWorkerTargets();
// subprocess workers are ignored because they take several seconds to
// attach to when opening the browser toolbox. See bug 1594597.
@ -85,15 +85,15 @@ async function listWorkerTargets(args: Args) {
const {
registrations,
} = await debuggerClient.mainRoot.listServiceWorkerRegistrations();
} = await devToolsClient.mainRoot.listServiceWorkerRegistrations();
serviceWorkerRegistrations = registrations;
} else {
workers = (await currentTarget.listWorkers()).workers;
if (currentTarget.url && features.windowlessServiceWorkers) {
allWorkers = await debuggerClient.mainRoot.listAllWorkerTargets();
allWorkers = await devToolsClient.mainRoot.listAllWorkerTargets();
const {
registrations,
} = await debuggerClient.mainRoot.listServiceWorkerRegistrations();
} = await devToolsClient.mainRoot.listServiceWorkerRegistrations();
serviceWorkerRegistrations = registrations.filter(front =>
sameOrigin(front.url, currentTarget.url)
);
@ -134,8 +134,8 @@ async function listWorkerTargets(args: Args) {
}
async function getAllProcessTargets(args) {
const { debuggerClient } = args;
const { processes } = await debuggerClient.mainRoot.listProcesses();
const { devToolsClient } = args;
const { processes } = await devToolsClient.mainRoot.listProcesses();
return Promise.all(
processes
.filter(descriptor => !descriptor.isParent)

2
devtools/client/debugger/src/client/firefox/tests/commands.spec.js
View File

@ -18,7 +18,7 @@ function makeThreadCLient(resp) {
function makeDependencies() {
return {
debuggerClient: (null: any),
devToolsClient: (null: any),
supportsWasm: true,
currentTarget: (null: any),
};

4
devtools/client/debugger/src/client/firefox/tests/onconnect.spec.js
View File

@ -36,7 +36,7 @@ const targetList = {
},
};
const debuggerClient = {
const devToolsClient = {
mainRoot: {
traits: {},
},
@ -61,7 +61,7 @@ describe("firefox onConnect", () => {
await onConnect(
{
targetList,
debuggerClient,
devToolsClient,
},
actions
);

4
devtools/client/debugger/src/client/firefox/types.js
View File

@ -234,11 +234,11 @@ type ConsoleFront = {
*/
/**
* DebuggerClient
* DevToolsClient
* @memberof firefox
* @static
*/
export type DebuggerClient = {
export type DevToolsClient = {
_activeRequests: {
get: any => any,
delete: any => void,

4
devtools/client/debugger/src/main.js
View File

@ -15,12 +15,12 @@ function unmountRoot() {
}
module.exports = {
bootstrap: ({ targetList, debuggerClient, workers, panel }: any) =>
bootstrap: ({ targetList, devToolsClient, workers, panel }: any) =>
onConnect(
{
tab: { clientType: "firefox" },
targetList,
debuggerClient,
devToolsClient,
},
workers,
panel

8
devtools/client/debugger/test/mochitest/browser_dbg-chrome-debugging.js
View File

@ -13,15 +13,15 @@ var customLoader = new DevToolsLoader({
invisibleToDebugger: true,
});
var { DevToolsServer } = customLoader.require("devtools/server/devtools-server");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
function initDebuggerClient() {
function initDevToolsClient() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
DevToolsServer.allowChromeProcess = true;
let transport = DevToolsServer.connectPipe();
return new DebuggerClient(transport);
return new DevToolsClient(transport);
}
function onNewSource(packet) {
@ -47,7 +47,7 @@ registerCleanupFunction(function() {
});
add_task(async function() {
gClient = initDebuggerClient();
gClient = initDevToolsClient();
const [type] = await gClient.connect();
is(type, "browser", "Root actor should identify itself as a browser.");

2
devtools/client/debugger/test/mochitest/browser_dbg-navigation-when-paused.js
View File

@ -27,7 +27,7 @@ add_task(async function() {
// If breakpoints aren't properly ignored after navigation, this could
// potentially pause at line 9. This helper also ensures that the file
// source itself has loaded, which may not be the case if navigation cleared
// the source and nothing has sent it to the debugger client yet, as was
// the source and nothing has sent it to the devtools client yet, as was
// the case in Bug 1581530.
assertDebugLine(dbg, 12);
});

6
devtools/client/framework/browser-toolbox/test/helpers-browser-toolbox.js
View File

@ -7,7 +7,7 @@
const { BrowserToolboxLauncher } = ChromeUtils.import(
"resource://devtools/client/framework/browser-toolbox/Launcher.jsm"
);
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
/**
* Open up a browser toolbox and return a ToolboxTask object for interacting
@ -67,7 +67,7 @@ async function initBrowserToolboxTask({
let transport;
while (true) {
try {
transport = await DebuggerClient.socketConnect({
transport = await DevToolsClient.socketConnect({
host: "localhost",
port: 6001,
webSocket: false,
@ -79,7 +79,7 @@ async function initBrowserToolboxTask({
}
ok(true, "Got transport");
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
ok(true, "Connected");

6
devtools/client/framework/browser-toolbox/window.js
View File

@ -14,7 +14,7 @@ loader.require("devtools/client/framework/devtools-browser");
var { gDevTools } = require("devtools/client/framework/devtools");
var { Toolbox } = require("devtools/client/framework/toolbox");
var Services = require("Services");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
var { PrefsHelper } = require("devtools/client/shared/prefs");
const KeyShortcuts = require("devtools/client/shared/key-shortcuts");
const { LocalizationHelper } = require("devtools/shared/l10n");
@ -98,12 +98,12 @@ var connect = async function() {
const host = Prefs.chromeDebuggingHost;
const webSocket = Prefs.chromeDebuggingWebSocket;
appendStatusMessage(`Connecting to ${host}:${port}, ws: ${webSocket}`);
const transport = await DebuggerClient.socketConnect({
const transport = await DevToolsClient.socketConnect({
host,
port,
webSocket,
});
gClient = new DebuggerClient(transport);
gClient = new DevToolsClient(transport);
appendStatusMessage("Start protocol client for connection");
await gClient.connect();

8
devtools/client/framework/devtools-browser.js
View File

@ -37,8 +37,8 @@ loader.lazyRequireGetter(
);
loader.lazyRequireGetter(
this,
"DebuggerClient",
"devtools/shared/client/debugger-client",
"DevToolsClient",
"devtools/shared/client/devtools-client",
true
);
loader.lazyRequireGetter(
@ -364,12 +364,12 @@ var gDevToolsBrowser = (exports.gDevToolsBrowser = {
DevToolsServer.allowChromeProcess = true;
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
const target = await client.mainRoot.getProcess(processId);
// Ensure closing the connection in order to cleanup
// the debugger client and also the server created in the
// the devtools client and also the server created in the
// content process
target.on("close", () => {
client.close();

10
devtools/client/framework/target-from-url.js
View File

@ -5,7 +5,7 @@
"use strict";
const { DevToolsServer } = require("devtools/server/devtools-server");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const {
remoteClientManager,
} = require("devtools/client/shared/remote-debugging/remote-client-manager");
@ -162,7 +162,7 @@ async function _targetFromURL(client, id, type, chrome) {
}
/**
* Create a DebuggerClient for a given URL object having various query parameters:
* Create a DevToolsClient for a given URL object having various query parameters:
*
* host:
* {String} The hostname or IP address to connect to.
@ -175,7 +175,7 @@ async function _targetFromURL(client, id, type, chrome) {
*
* @param {URL} url
* The url to fetch query params from.
* @return a promise that resolves a DebuggerClient object
* @return a promise that resolves a DevToolsClient object
*/
async function clientFromURL(url) {
const params = url.searchParams;
@ -196,14 +196,14 @@ async function clientFromURL(url) {
let transport;
if (port) {
transport = await DebuggerClient.socketConnect({ host, port, webSocket });
transport = await DevToolsClient.socketConnect({ host, port, webSocket });
} else {
// Setup a server if we don't have one already running
DevToolsServer.init();
DevToolsServer.registerAllActors();
transport = DevToolsServer.connectPipe();
}
return new DebuggerClient(transport);
return new DevToolsClient(transport);
}
exports.clientFromURL = clientFromURL;

12
devtools/client/framework/target.js
View File

@ -12,8 +12,8 @@ loader.lazyRequireGetter(
);
loader.lazyRequireGetter(
this,
"DebuggerClient",
"devtools/shared/client/debugger-client",
"DevToolsClient",
"devtools/shared/client/devtools-client",
true
);
@ -29,7 +29,7 @@ exports.TargetFactory = {
*
* @param {XULTab} tab
* The tab to use in creating a new target.
* @param {DebuggerClient} client
* @param {DevToolsClient} client
* Optional client to fetch the target actor from.
*
* @return A target object
@ -56,13 +56,13 @@ exports.TargetFactory = {
*
* This will automatically:
* - if no client is passed, spawn a DevToolsServer in the parent process,
* and create a DebuggerClient and connect it to this local DevToolsServer,
* and create a DevToolsClient and connect it to this local DevToolsServer,
* - call RootActor's `getTab` request to retrieve the FrameTargetActor's form,
* - instantiate a Target instance.
*
* @param {XULTab} tab
* The tab to use in creating a new target.
* @param {DebuggerClient} client
* @param {DevToolsClient} client
* Optional client to fetch the target actor from.
*
* @return A target object
@ -86,7 +86,7 @@ exports.TargetFactory = {
function createLocalClient() {
createLocalServer();
return new DebuggerClient(DevToolsServer.connectPipe());
return new DevToolsClient(DevToolsServer.connectPipe());
}
if (!client) {

16
devtools/client/framework/test/browser_about-devtools-toolbox_reload.js
View File

@ -8,10 +8,10 @@
* client instance.
*/
add_task(async function() {
const debuggerClient = await createLocalClient();
const devToolsClient = await createLocalClient();
info(
"Preload a local DebuggerClient as this-firefox in the remoteClientManager"
"Preload a local DevToolsClient as this-firefox in the remoteClientManager"
);
const {
remoteClientManager,
@ -19,7 +19,7 @@ add_task(async function() {
remoteClientManager.setClient(
"this-firefox",
"this-firefox",
debuggerClient,
devToolsClient,
{}
);
registerCleanupFunction(() => {
@ -50,18 +50,18 @@ add_task(async function() {
const onToolboxDestroy = gDevTools.once("toolbox-destroyed");
await removeTab(tab);
await onToolboxDestroy;
await debuggerClient.close();
await devToolsClient.close();
await removeTab(targetTab);
});
async function createLocalClient() {
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const { DevToolsServer } = require("devtools/server/devtools-server");
DevToolsServer.init();
DevToolsServer.registerAllActors();
DevToolsServer.allowChromeProcess = true;
const debuggerClient = new DebuggerClient(DevToolsServer.connectPipe());
await debuggerClient.connect();
return debuggerClient;
const devToolsClient = new DevToolsClient(DevToolsServer.connectPipe());
await devToolsClient.connect();
return devToolsClient;
}

10
devtools/client/framework/test/browser_target_parents.js
View File

@ -5,7 +5,7 @@
// Test a given Target's parentFront attribute returns the correct parent front.
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const { DevToolsServer } = require("devtools/server/devtools-server");
const TEST_URL = `data:text/html;charset=utf-8,<div id="test"></div>`;
@ -35,7 +35,7 @@ add_task(async function() {
DevToolsServer.registerAllActors();
}
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
const mainRoot = client.mainRoot;
@ -92,7 +92,7 @@ add_task(async function() {
DevToolsServer.registerAllActors();
}
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
const mainRoot = client.mainRoot;
@ -147,7 +147,7 @@ add_task(async function() {
DevToolsServer.registerAllActors();
}
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
const mainRoot = client.mainRoot;
@ -180,7 +180,7 @@ add_task(async function() {
DevToolsServer.registerAllActors();
}
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
const mainRoot = client.mainRoot;

4
devtools/client/framework/test/browser_target_server_compartment.js
View File

@ -84,13 +84,13 @@ async function testMainProcess() {
const { DevToolsServer } = customLoader.require(
"devtools/server/devtools-server"
);
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
DevToolsServer.init();
DevToolsServer.registerAllActors();
DevToolsServer.allowChromeProcess = true;
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
const onThreadActorInstantiated = new Promise(resolve => {

6
devtools/client/framework/test/browser_toolbox_tool_remote_reopen.js
View File

@ -14,7 +14,7 @@ requestLongerTimeout(2);
* The fronts need to be destroyed manually to unbind their onPacket handlers.
*
* When you initialize a front and call |this.manage|, it adds a client actor
* pool that the DebuggerClient uses to route packet replies to that actor.
* pool that the DevToolsClient uses to route packet replies to that actor.
*
* Most (all?) tools create a new front when they are opened. When the destroy
* step is skipped and the tool is reopened, a second front is created and also
@ -24,11 +24,11 @@ requestLongerTimeout(2);
* request, an error occurs.
*
* This problem does not occur with the toolbox for a local tab because the
* toolbox target creates its own DebuggerClient for the local tab, and the
* toolbox target creates its own DevToolsClient for the local tab, and the
* client is destroyed when the toolbox is closed, which removes the client
* actor pools, and avoids this issue.
*
* In remote debugging, we do not destroy the DebuggerClient on toolbox close
* In remote debugging, we do not destroy the DevToolsClient on toolbox close
* because it can still used for other targets.
* Thus, the same client gets reused across multiple toolboxes,
* which leads to the tools failing if they don't destroy their fronts.

4
devtools/client/framework/test/browser_two_tabs.js
View File

@ -6,7 +6,7 @@
*/
var { DevToolsServer } = require("devtools/server/devtools-server");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
const TAB_URL_1 = "data:text/html;charset=utf-8,foo";
const TAB_URL_2 = "data:text/html;charset=utf-8,bar";
@ -19,7 +19,7 @@ add_task(async () => {
const tab2 = await addTab(TAB_URL_2);
// Connect to devtools server to fetch the two target actors for each tab
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
const tabs = await client.mainRoot.listTabs();

4
devtools/client/framework/test/head.js
View File

@ -27,13 +27,13 @@ function toggleAllTools(state) {
function getParentProcessActors(callback) {
const { DevToolsServer } = require("devtools/server/devtools-server");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
DevToolsServer.init();
DevToolsServer.registerAllActors();
DevToolsServer.allowChromeProcess = true;
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
client
.connect()
.then(() => client.mainRoot.getMainProcess())

4
devtools/client/framework/toolbox-init.js
View File

@ -87,7 +87,7 @@ async function initToolbox(url, host) {
} = require("devtools/client/framework/target-from-url");
const { Toolbox } = require("devtools/client/framework/toolbox");
const { DevToolsServer } = require("devtools/server/devtools-server");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
// Specify the default tool to open
const tool = url.searchParams.get("tool");
@ -117,7 +117,7 @@ async function initToolbox(url, host) {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
// Creates a target for a given browser iframe.

4
devtools/client/netmonitor/src/har/har-automation.js
View File

@ -68,7 +68,7 @@ HarAutomation.prototype = {
return;
}
this.debuggerClient = client;
this.devToolsClient = client;
this.webConsoleFront = await this.toolbox.target.getFront("console");
this.tabWatcher = new TabWatcher(this.toolbox, this);
@ -88,7 +88,7 @@ HarAutomation.prototype = {
// data from events sent from the backend.
this.collector = new HarCollector({
webConsoleFront: this.webConsoleFront,
debuggerClient: this.debuggerClient,
devToolsClient: this.devToolsClient,
});
this.collector.start();

8
devtools/client/netmonitor/src/har/har-collector.js
View File

@ -17,7 +17,7 @@ const trace = {
*/
function HarCollector(options) {
this.webConsoleFront = options.webConsoleFront;
this.debuggerClient = options.debuggerClient;
this.devToolsClient = options.devToolsClient;
this.onNetworkEvent = this.onNetworkEvent.bind(this);
this.onNetworkEventUpdate = this.onNetworkEventUpdate.bind(this);
@ -37,12 +37,12 @@ HarCollector.prototype = {
start: function() {
this.webConsoleFront.on("networkEvent", this.onNetworkEvent);
this.debuggerClient.on("networkEventUpdate", this.onNetworkEventUpdate);
this.devToolsClient.on("networkEventUpdate", this.onNetworkEventUpdate);
},
stop: function() {
this.webConsoleFront.off("networkEvent", this.onNetworkEvent);
this.debuggerClient.off("networkEventUpdate", this.onNetworkEventUpdate);
this.devToolsClient.off("networkEventUpdate", this.onNetworkEventUpdate);
},
clear: function() {
@ -204,7 +204,7 @@ HarCollector.prototype = {
// Skip events from unknown actors (not in the list).
// It can happen when there are zombie requests received after
// the target is closed or multiple tabs are attached through
// one connection (one DebuggerClient object).
// one connection (one DevToolsClient object).
const file = this.getFile(packet.from);
if (!file) {
return;

4
devtools/client/responsive/test/browser/head.js
View File

@ -585,9 +585,9 @@ function addDeviceForTest(device) {
}
async function waitForClientClose(ui) {
info("Waiting for RDM debugger client to close");
info("Waiting for RDM devtools client to close");
await ui.client.once("closed");
info("RDM's debugger client is now closed");
info("RDM's devtools client is now closed");
}
async function testDevicePixelRatio(ui, expected) {

8
devtools/client/responsive/ui.js
View File

@ -15,8 +15,8 @@ const { TargetList } = require("devtools/shared/resources/target-list");
loader.lazyRequireGetter(
this,
"DebuggerClient",
"devtools/shared/client/debugger-client",
"DevToolsClient",
"devtools/shared/client/devtools-client",
true
);
loader.lazyRequireGetter(
@ -411,7 +411,7 @@ class ResponsiveUI {
this.toolWindow = null;
this.swap = null;
// Close the debugger client used to speak with responsive emulation actor.
// Close the devtools client used to speak with responsive emulation actor.
// The actor handles clearing any overrides itself, so it's not necessary to clear
// anything on shutdown client side.
const clientClosed = this.client.close();
@ -435,7 +435,7 @@ class ResponsiveUI {
// separately and has a life cycle that doesn't correspond to the toolbox.
DevToolsServer.init();
DevToolsServer.registerAllActors();
this.client = new DebuggerClient(DevToolsServer.connectPipe());
this.client = new DevToolsClient(DevToolsServer.connectPipe());
await this.client.connect();
const targetFront = await this.client.mainRoot.getTab();

2
devtools/client/shared/components/test/chrome/head.js
View File

@ -17,7 +17,7 @@ var promise = require("promise");
var defer = require("devtools/shared/defer");
var Services = require("Services");
var { DevToolsServer } = require("devtools/server/devtools-server");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
var DevToolsUtils = require("devtools/shared/DevToolsUtils");
var { TargetFactory } = require("devtools/client/framework/target");
var { Toolbox } = require("devtools/client/framework/toolbox");

2
devtools/client/shared/remote-debugging/remote-client-manager.js
View File

@ -26,7 +26,7 @@ class RemoteClientManager {
* Remote runtime id (see devtools/client/aboutdebugging/src/types).
* @param {String} type
* Remote runtime type (see devtools/client/aboutdebugging/src/types).
* @param {DebuggerClient} client
* @param {DevToolsClient} client
* @param {Object} runtimeInfo
* See runtimeInfo type from client/aboutdebugging/src/types/runtime.js
*/

4
devtools/client/shared/remote-debugging/test/xpcshell/test_version_checker.js
View File

@ -150,12 +150,12 @@ add_task(async function testVersionChecker() {
});
add_task(async function testVersionCheckWithVeryOldClient() {
// Use an empty object as debugger client, calling any method on it will fail.
// Use an empty object as devtools client, calling any method on it will fail.
const emptyClient = {};
const report = await checkVersionCompatibility(emptyClient);
equal(
report.status,
COMPATIBILITY_STATUS.TOO_OLD,
"Report status too old if debugger client is not implementing expected interface"
"Report status too old if devtools client is not implementing expected interface"
);
});

8
devtools/client/shared/remote-debugging/version-checker.js
View File

@ -62,8 +62,8 @@ function computeMinMaxVersion(localVersion) {
/**
* Tells if the remote device is using a supported version of Firefox.
*
* @param {DebuggerClient} debuggerClient
* DebuggerClient instance connected to the target remote Firefox.
* @param {DevToolsClient} devToolsClient
* DevToolsClient instance connected to the target remote Firefox.
* @return Object with the following attributes:
* * String status, one of COMPATIBILITY_STATUS
* COMPATIBLE if the runtime is compatible,
@ -78,14 +78,14 @@ function computeMinMaxVersion(localVersion) {
* * String deviceID
* Build ID of remote runtime. A date with like this: YYYYMMDD.
*/
async function checkVersionCompatibility(debuggerClient) {
async function checkVersionCompatibility(devToolsClient) {
const localDescription = {
appbuildid: Services.appinfo.appBuildID,
platformversion: AppConstants.MOZ_APP_VERSION,
};
try {
const deviceFront = await debuggerClient.mainRoot.getFront("device");
const deviceFront = await devToolsClient.mainRoot.getFront("device");
const description = await deviceFront.getDescription();
return _compareVersionCompatibility(localDescription, description);
} catch (e) {

2
devtools/client/shared/test/browser_dbg_debugger-statement.js
View File

@ -33,7 +33,7 @@ async function testEarlyDebuggerStatement(client, tab, targetFront) {
ok(false, "Pause shouldn't be called before we've attached!");
};
// using the DebuggerClient to listen to the pause packet, as the
// using the DevToolsClient to listen to the pause packet, as the
// threadFront is not yet attached.
client.on("paused", onPaused);

4
devtools/client/shared/test/browser_dbg_globalactor.js
View File

@ -9,7 +9,7 @@
var { DevToolsServer } = require("devtools/server/devtools-server");
var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
const ACTORS_URL = EXAMPLE_URL + "testactors.js";
@ -24,7 +24,7 @@ add_task(async function() {
});
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
const [type] = await client.connect();
is(type, "browser", "Root actor should identify itself as a browser.");

4
devtools/client/shared/test/browser_dbg_listaddons.js
View File

@ -10,7 +10,7 @@ Services.scriptloader.loadSubScript(
);
var { DevToolsServer } = require("devtools/server/devtools-server");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
/**
* Make sure the listAddons request works as specified.
@ -25,7 +25,7 @@ add_task(async function() {
DevToolsServer.registerAllActors();
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
const [type] = await client.connect();
is(type, "browser", "Root actor should identify itself as a browser.");

4
devtools/client/shared/test/browser_dbg_listtabs-01.js
View File

@ -8,7 +8,7 @@
*/
var { DevToolsServer } = require("devtools/server/devtools-server");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
const TAB1_URL = EXAMPLE_URL + "doc_empty-tab-01.html";
const TAB2_URL = EXAMPLE_URL + "doc_empty-tab-02.html";
@ -20,7 +20,7 @@ function test() {
DevToolsServer.registerAllActors();
const transport = DevToolsServer.connectPipe();
gClient = new DebuggerClient(transport);
gClient = new DevToolsClient(transport);
gClient.connect().then(([aType, aTraits]) => {
is(aType, "browser", "Root actor should identify itself as a browser.");

4
devtools/client/shared/test/browser_dbg_listtabs-03.js
View File

@ -8,7 +8,7 @@
*/
var { DevToolsServer } = require("devtools/server/devtools-server");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
const TAB1_URL = EXAMPLE_URL + "doc_empty-tab-01.html";
@ -17,7 +17,7 @@ add_task(async function test() {
DevToolsServer.registerAllActors();
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
const [type] = await client.connect();
is(type, "browser", "Root actor should identify itself as a browser.");
const tab = await addTab(TAB1_URL);

4
devtools/client/shared/test/browser_dbg_multiple-windows.js
View File

@ -9,7 +9,7 @@
*/
var { DevToolsServer } = require("devtools/server/devtools-server");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
const TAB1_URL = "data:text/html;charset=utf-8,first-tab";
const TAB2_URL = "data:text/html;charset=utf-8,second-tab";
@ -19,7 +19,7 @@ add_task(async function() {
DevToolsServer.registerAllActors();
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
const [type] = await client.connect();
is(type, "browser", "Root actor should identify itself as a browser.");

2
devtools/client/shared/test/helper_workers.js
View File

@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(
);
var { DevToolsServer } = require("devtools/server/devtools-server");
var { DebuggerClient } = require("devtools/shared/client/debugger-client");
var { DevToolsClient } = require("devtools/shared/client/devtools-client");
var { Toolbox } = require("devtools/client/framework/toolbox");
loader.lazyRequireGetter(this, "defer", "devtools/shared/defer");

6
devtools/client/shared/test/test-actor-registry.js
View File

@ -61,14 +61,14 @@
exports.getTestActorWithoutToolbox = async function(tab) {
const { DevToolsServer } = require("devtools/server/devtools-server");
const {
DebuggerClient,
} = require("devtools/shared/client/debugger-client");
DevToolsClient,
} = require("devtools/shared/client/devtools-client");
// We need to spawn a client instance,
// but for that we have to first ensure a server is running
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();

12
devtools/client/storage/test/browser_storage_webext_storage_local.js
View File

@ -14,23 +14,23 @@ loader.lazyRequireGetter(
);
loader.lazyRequireGetter(
this,
"DebuggerClient",
"devtools/shared/client/debugger-client",
"DevToolsClient",
"devtools/shared/client/devtools-client",
true
);
const { Toolbox } = require("devtools/client/framework/toolbox");
/**
* Initialize and connect a DevToolsServer and DebuggerClient. Note: This test
* Initialize and connect a DevToolsServer and DevToolsClient. Note: This test
* does not use TargetFactory, so it has to set up the DevToolsServer and
* DebuggerClient on its own.
* @return {Promise} Resolves with an instance of the DebuggerClient class
* DevToolsClient on its own.
* @return {Promise} Resolves with an instance of the DevToolsClient class
*/
async function setupLocalDevToolsServerAndClient() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
return client;
}

16
devtools/client/webconsole/browser-console-manager.js
View File

@ -13,8 +13,8 @@ const { DevToolsLoader } = ChromeUtils.import(
loader.lazyRequireGetter(this, "Tools", "devtools/client/definitions", true);
loader.lazyRequireGetter(
this,
"DebuggerClient",
"devtools/shared/client/debugger-client",
"DevToolsClient",
"devtools/shared/client/devtools-client",
true
);
loader.lazyRequireGetter(this, "l10n", "devtools/client/webconsole/utils/l10n");
@ -38,7 +38,7 @@ class BrowserConsoleManager {
this._browserConsole = null;
this._browserConsoleInitializing = null;
this._browerConsoleSessionState = false;
this._debuggerClient = null;
this._devToolsClient = null;
}
storeBrowserConsoleSessionState() {
@ -79,8 +79,8 @@ class BrowserConsoleManager {
await this._browserConsole.destroy();
this._browserConsole = null;
await this._debuggerClient.close();
this._debuggerClient = null;
await this._devToolsClient.close();
this._devToolsClient = null;
}
/**
@ -134,9 +134,9 @@ class BrowserConsoleManager {
DevToolsServer.allowChromeProcess = true;
this._debuggerClient = new DebuggerClient(DevToolsServer.connectPipe());
await this._debuggerClient.connect();
return this._debuggerClient.mainRoot.getMainProcess();
this._devToolsClient = new DevToolsClient(DevToolsServer.connectPipe());
await this._devToolsClient.connect();
return this._devToolsClient.mainRoot.getMainProcess();
}
async openWindow() {

6
devtools/client/webconsole/commands.js
View File

@ -5,8 +5,8 @@
"use strict";
class ConsoleCommands {
constructor({ debuggerClient, proxy, threadFront, currentTarget }) {
this.debuggerClient = debuggerClient;
constructor({ devToolsClient, proxy, threadFront, currentTarget }) {
this.devToolsClient = devToolsClient;
this.proxy = proxy;
this.threadFront = threadFront;
this.currentTarget = currentTarget;
@ -25,7 +25,7 @@ class ConsoleCommands {
// given action on a specific object, so it should take precedence over selected
// node front.
if (selectedObjectActor) {
const objectFront = this.debuggerClient.getFrontByID(selectedObjectActor);
const objectFront = this.devToolsClient.getFrontByID(selectedObjectActor);
if (objectFront) {
front = await objectFront.targetFront.getFront("console");
}

2
devtools/client/webconsole/webconsole-connection-proxy.js
View File

@ -51,7 +51,7 @@ class WebConsoleConnectionProxy {
}
/**
* Initialize a debugger client and connect it to the devtools server.
* Initialize a devtools client and connect it to the devtools server.
*
* @return object
* A promise object that is resolved/rejected based on the success of

2
devtools/client/webconsole/webconsole-ui.js
View File

@ -144,7 +144,7 @@ class WebConsoleUI {
await this._attachTargets();
this._commands = new ConsoleCommands({
debuggerClient: this.hud.currentTarget.client,
devToolsClient: this.hud.currentTarget.client,
proxy: this.getProxy(),
threadFront: this.hud.toolbox && this.hud.toolbox.threadFront,
currentTarget: this.hud.currentTarget,

16
devtools/docs/backend/client-api.md
View File

@ -8,7 +8,7 @@ In order to communicate, a client and a server instance must be created and a pr
```javascript
const { DevToolsServer } = require("devtools/server/devtools-server");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
function start() {
// Start the server.
@ -19,7 +19,7 @@ function start() {
let transport = DevToolsServer.connectPipe();
// Start the client.
client = new DebuggerClient(transport);
client = new DevToolsClient(transport);
client.connect((type, traits) => {
// Now the client is connected to the server.
@ -32,7 +32,7 @@ If a TCP socket is required, the function should be split in two parts, a server
```javascript
const { DevToolsServer } = require("devtools/server/devtools-server");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
function startServer() {
// Start the server.
@ -44,10 +44,10 @@ function startServer() {
}
async function startClient() {
let transport = await DebuggerClient.socketConnect({ host: "localhost", port: 2929 });
let transport = await DevToolsClient.socketConnect({ host: "localhost", port: 2929 });
// Start the client.
client = new DebuggerClient(transport);
client = new DevToolsClient(transport);
client.connect((type, traits) => {
// Now the client is connected to the server.
@ -88,7 +88,7 @@ function attachToTab() {
}
```
The debugger client will send event notifications for a number of events the application may be interested in. These events include state changes in the debugger, like pausing and resuming, stack frames or source scripts being ready for retrieval, etc.
The devtools client will send event notifications for a number of events the application may be interested in. These events include state changes in the debugger, like pausing and resuming, stack frames or source scripts being ready for retrieval, etc.
## Handling location changes
@ -139,7 +139,7 @@ Here is the source code for a complete debugger application:
* Debugger API demo.
*/
const { DevToolsServer } = require("devtools/server/devtools-server");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
let client;
let threadFront;
@ -156,7 +156,7 @@ function startDebugger() {
// let transport = debuggerSocketConnect(host, port);
// Start the client.
client = new DebuggerClient(transport);
client = new DevToolsClient(transport);
client.connect((type, traits) => {
// Now the client is connected to the server.
debugTab();

2
devtools/docs/backend/protocol.js.md
View File

@ -95,7 +95,7 @@ How do you get an initial reference to the front? That's a bit tricky, but basi
* Manually
* Magically
Manually - If you're using a DebuggerClient instance, you can discover the actorID manually and create a Front for it:
Manually - If you're using a DevToolsClient instance, you can discover the actorID manually and create a Front for it:
let hello = new HelloFront(this.client, { actor: <hello actorID> });

2
devtools/server/actors/descriptors/webextension.js
View File

@ -153,7 +153,7 @@ const WebExtensionDescriptorActor = protocol.ActorClassWithSpec(
return {};
},
// This function will be called from RootActor in case that the debugger client
// This function will be called from RootActor in case that the devtools client
// retrieves list of addons with `iconDataURL` option.
async loadIconDataURL() {
this._iconDataURL = await this.getIconDataURL();

2
devtools/server/actors/preference.js
View File

@ -19,7 +19,7 @@ function ensurePrefType(name, expectedType) {
/**
* Normally the preferences are set using Services.prefs, but this actor allows
* a debugger client to set preferences on the debuggee. This is particularly useful
* a devtools client to set preferences on the debuggee. This is particularly useful
* when remote debugging, and the preferences should persist to the remote target
* and not to the client. If used for a local target, it effectively behaves the same
* as using Services.prefs.

2
devtools/server/actors/root.js
View File

@ -397,7 +397,7 @@ exports.RootActor = protocol.ActorClassWithSpec(rootSpec, {
},
/**
* This function can receive the following option from debugger client.
* This function can receive the following option from devtools client.
*
* @param {Object} option
* - iconDataURL: {boolean}

2
devtools/server/actors/thread.js
View File

@ -1095,7 +1095,7 @@ const ThreadActor = ActorClassWithSpec(threadSpec, {
}
// In case of multiple nested event loops (due to multiple debuggers open in
// different tabs or multiple debugger clients connected to the same tab)
// different tabs or multiple devtools clients connected to the same tab)
// only allow resumption in a LIFO order.
if (
this._nestedEventLoops.size &&

2
devtools/server/devtools-server.js
View File

@ -65,7 +65,7 @@ loader.lazyRequireGetter(this, "EventEmitter", "devtools/shared/event-emitter");
* It can also create other DevToolsServer, that will live in the same
* environment as the debugged target (content page, worker...).
*
* For instance a regular Toolbox will be linked to DebuggerClient connected to
* For instance a regular Toolbox will be linked to DevToolsClient connected to
* a DevToolsServer running in the same process as the Toolbox (main process).
* But another DevToolsServer will be created in the same process as the page
* targeted by the Toolbox.

2
devtools/server/tests/browser/browser_actor_error.js
View File

@ -21,7 +21,7 @@ async function test() {
});
const transport = DevToolsServer.connectPipe();
const gClient = new DebuggerClient(transport);
const gClient = new DevToolsClient(transport);
await gClient.connect();
const { errorActor } = await gClient.mainRoot.rootForm;

2
devtools/server/tests/browser/browser_register_actor.js
View File

@ -10,7 +10,7 @@ function test() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
gClient = new DebuggerClient(DevToolsServer.connectPipe());
gClient = new DevToolsClient(DevToolsServer.connectPipe());
gClient
.connect()
.then(() => gClient.mainRoot.listTabs())

8
devtools/server/tests/browser/head.js
View File

@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(
this
);
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const {
ActorRegistry,
} = require("devtools/server/actors/utils/actor-registry");
@ -105,7 +105,7 @@ function initDevToolsServer() {
async function initPerfFront() {
initDevToolsServer();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await waitUntilClientConnected(client);
const front = await client.mainRoot.getFront("perf");
return { front, client };
@ -120,8 +120,8 @@ async function initInspectorFront(url) {
}
/**
* Wait until a DebuggerClient is connected.
* @param {DebuggerClient} client
* Wait until a DevToolsClient is connected.
* @param {DevToolsClient} client
* @return {Promise} Resolves when connected.
*/
function waitUntilClientConnected(client) {

2
devtools/server/tests/chrome/inspector-helpers.js
View File

@ -55,7 +55,7 @@ async function getTargetForSelectedTab(gBrowser) {
* find the tab with the devtools server, and call the callback.
*
* Returns a function which can be called to close the opened ta
* and disconnect its debugger client.
* and disconnect its devtools client.
*/
async function attachURL(url) {
// Get the current browser window

6
devtools/server/tests/chrome/test_connectToFrame.html
View File

@ -18,7 +18,7 @@ Bug 966991 - Test connectToFrame
/* eslint-env mozilla/frame-script */
const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const { DevToolsServer } = require("devtools/server/devtools-server");
const {
connectToFrame,
@ -87,7 +87,7 @@ function runTests() {
// Fake a first connection to an iframe
const transport = DevToolsServer.connectPipe();
const conn = transport._serverConnection;
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
const actor = await connectToFrame(conn, iframe);
ok(actor.testActor, "Got the test actor");
@ -131,7 +131,7 @@ function runTests() {
// Then fake a second one, that should spawn a new set of target-scoped actors
const transport = DevToolsServer.connectPipe();
const conn = transport._serverConnection;
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
const actor = await connectToFrame(conn, iframe);
ok(actor.testActor, "Got a test actor for the second connection");
isnot(actor.testActor, firstActor,

4
devtools/server/tests/chrome/test_device.html
View File

@ -16,7 +16,7 @@ Bug 895360 - [app manager] Device meta data actor
window.onload = function() {
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DevToolsClient} = require("devtools/shared/client/devtools-client");
const {DevToolsServer} = require("devtools/server/devtools-server");
const Services = require("Services");
@ -25,7 +25,7 @@ window.onload = function() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
client.connect().then(function onConnect() {
return client.mainRoot.getFront("device");
}).then(function(d) {

4
devtools/server/tests/chrome/test_getProcess.html
View File

@ -18,7 +18,7 @@ Bug 1060093 - Test DevToolsServer.getProcess
/* eslint-env mozilla/frame-script */
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DevToolsClient} = require("devtools/shared/client/devtools-client");
const {DevToolsServer} = require("devtools/server/devtools-server");
const Services = require("Services");
@ -50,7 +50,7 @@ function runTests() {
function connect() {
// Fake a first connection to the content process
const transport = DevToolsServer.connectPipe();
client = new DebuggerClient(transport);
client = new DevToolsClient(transport);
client.connect().then(listProcess);
}

4
devtools/server/tests/chrome/test_preference.html
View File

@ -16,7 +16,7 @@ Bug 943251 - Test preferences actor
function runTests() {
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DevToolsClient} = require("devtools/shared/client/devtools-client");
const {DevToolsServer} = require("devtools/server/devtools-server");
const Services = require("Services");
@ -25,7 +25,7 @@ function runTests() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
client.connect().then(function onConnect() {
return client.mainRoot.getFront("preference");
}).then(function(p) {

4
devtools/server/tests/chrome/test_setupInParentChild.html
View File

@ -15,7 +15,7 @@ Bug 1181100 - Test DevToolsServerConnection.setupInParent and DevToolsServer.set
"use strict";
const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");
const {DebuggerClient} = require("devtools/shared/client/debugger-client");
const {DevToolsClient} = require("devtools/shared/client/devtools-client");
const {DevToolsServer} = require("devtools/server/devtools-server");
const {
connectToFrame,
@ -50,7 +50,7 @@ function runTests() {
// Fake a connection to an iframe
const transport = DevToolsServer.connectPipe();
const conn = transport._serverConnection;
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
// Wait for a response from setupInChild
const onChild = msg => {

4
devtools/server/tests/chrome/test_webextension-addon-debugging-connect.html
View File

@ -30,9 +30,9 @@ add_task(async function test_webextension_addon_debugging_connect() {
await extension.startup();
await extension.awaitMessage("background page ready");
// Connect a DebuggerClient.
// Connect a DevToolsClient.
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
// List addons and assertions on the expected addon actor.

2
devtools/server/tests/chrome/webconsole-helpers.js
View File

@ -32,7 +32,7 @@ if (!DevToolsServer.initialized) {
* - targetFront: the target front
* - webConsoleFront: the console front
* - cleanup: a generator function which can be called to close
* the opened tab and disconnect its debugger client.
* the opened tab and disconnect its devtools client.
*/
async function attachURL(url) {
const tab = await addTab(url);

4
devtools/server/tests/chrome/webextension-helpers.js
View File

@ -8,7 +8,7 @@
const { require, loader } = ChromeUtils.import(
"resource://devtools/shared/Loader.jsm"
);
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const { DevToolsServer } = require("devtools/server/devtools-server");
const {
@ -99,7 +99,7 @@ function collectFrameUpdates({ client }, matchFn) {
async function attachAddon(addonId) {
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();

26
devtools/server/tests/xpcshell/head_dbg.js
View File

@ -42,7 +42,7 @@ const { DevToolsServer } = require("devtools/server/devtools-server");
const { DevToolsServer: WorkerDevToolsServer } = worker.require(
"devtools/server/devtools-server"
);
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const { ObjectFront } = require("devtools/shared/fronts/object");
const { LongStringFront } = require("devtools/shared/fronts/string");
const { TargetFactory } = require("devtools/client/framework/target");
@ -96,7 +96,7 @@ async function createTargetForMainProcess() {
DevToolsServer.registerAllActors();
DevToolsServer.allowChromeProcess = true;
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
return client.mainRoot.getMainProcess();
@ -357,7 +357,7 @@ function addTestGlobal(name, server = DevToolsServer) {
return global;
}
// List the DebuggerClient |client|'s tabs, look for one whose title is
// List the DevToolsClient |client|'s tabs, look for one whose title is
// |title|, and apply |callback| to the packet's entry for that tab.
async function getTestTab(client, title) {
const tabs = await client.mainRoot.listTabs();
@ -434,7 +434,7 @@ async function startTestDevToolsServer(title, server = DevToolsServer) {
DevToolsServer.registerActors({ target: true });
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await connect(client);
return client;
@ -603,7 +603,7 @@ function interrupt(threadFront) {
* Resume JS execution for the specified thread and then wait for the next pause
* event.
*
* @param DebuggerClient client
* @param DevToolsClient client
* @param ThreadFront threadFront
* @returns Promise
*/
@ -641,7 +641,7 @@ function stepOver(threadFront) {
* Resume JS execution for a step out and wait for the pause after the step
* has been taken.
*
* @param DebuggerClient client
* @param DevToolsClient client
* @param ThreadFront threadFront
* @returns Promise
*/
@ -783,10 +783,10 @@ async function setupTestFromUrl(url) {
const global = createTestGlobal("test");
DevToolsServer.addTestGlobal(global);
const debuggerClient = new DebuggerClient(DevToolsServer.connectPipe());
await connect(debuggerClient);
const devToolsClient = new DevToolsClient(DevToolsServer.connectPipe());
await connect(devToolsClient);
const tabs = await listTabs(debuggerClient);
const tabs = await listTabs(devToolsClient);
const targetFront = findTab(tabs, "test");
await targetFront.attach();
@ -799,7 +799,7 @@ async function setupTestFromUrl(url) {
const { source } = await promise;
const sourceFront = threadFront.source(source);
return { global, debuggerClient, threadFront, sourceFront };
return { global, devToolsClient, threadFront, sourceFront };
}
/**
@ -815,8 +815,8 @@ async function setupTestFromUrl(url) {
* principals by default.
* - ThreadFront threadFront
* A reference to a ThreadFront instance that is attached to the debuggee.
* - DebuggerClient client
* A reference to the DebuggerClient used to communicated with the RDP server.
* - DevToolsClient client
* A reference to the DevToolsClient used to communicated with the RDP server.
* @param Object options
* Optional arguments to tweak test environment
* - JSPrincipal principal
@ -850,7 +850,7 @@ function threadFrontTest(test, options = {}) {
debuggee.__name = scriptName;
server.addTestGlobal(debuggee);
const client = new DebuggerClient(server.connectPipe());
const client = new DevToolsClient(server.connectPipe());
await client.connect();
// Attach to the fake tab target and retrieve the ThreadFront instance.

2
devtools/server/tests/xpcshell/test_actor-registry-actor.js
View File

@ -14,7 +14,7 @@ var gActorFront;
function run_test() {
initTestDevToolsServer();
DevToolsServer.registerAllActors();
gClient = new DebuggerClient(DevToolsServer.connectPipe());
gClient = new DevToolsClient(DevToolsServer.connectPipe());
gClient.connect().then(getRegistry);
do_test_pending();
}

2
devtools/server/tests/xpcshell/test_addon_events.js
View File

@ -14,7 +14,7 @@ add_task(async function testReloadExitedAddon() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
// Retrieve the current list of addons to be notified of the next list update.

2
devtools/server/tests/xpcshell/test_addon_reload.js
View File

@ -52,7 +52,7 @@ add_task(async function testReloadExitedAddon() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
// Install our main add-on to trigger reloads on.

2
devtools/server/tests/xpcshell/test_addons_actor.js
View File

@ -8,7 +8,7 @@ async function connect() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
await client.connect();
const addons = await client.mainRoot.getFront("addons");

2
devtools/server/tests/xpcshell/test_attach.js
View File

@ -22,7 +22,7 @@ add_task(
"[object Sandbox]",
"Debuggee client is valid"
);
ok(client instanceof DebuggerClient, "Client is valid");
ok(client instanceof DevToolsClient, "Client is valid");
ok(
targetFront instanceof BrowsingContextTargetFront,
"TargetFront is valid"

4
devtools/server/tests/xpcshell/test_blackboxing-08.js
View File

@ -7,9 +7,9 @@
* Test blackbox ranges
*/
async function testFinish({ threadFront, debuggerClient }) {
async function testFinish({ threadFront, devToolsClient }) {
await threadFront.resume();
await close(debuggerClient);
await close(devToolsClient);
do_test_finished();
}

16
devtools/server/tests/xpcshell/test_client_request.js
View File

@ -3,7 +3,7 @@
"use strict";
// Test the DebuggerClient.request API.
// Test the DevToolsClient.request API.
var gClient, gActorId;
@ -50,7 +50,7 @@ function run_test() {
}
function init() {
gClient = new DebuggerClient(DevToolsServer.connectPipe());
gClient = new DevToolsClient(DevToolsServer.connectPipe());
gClient
.connect()
.then(() => gClient.mainRoot.rootForm)
@ -80,7 +80,7 @@ function checkStack(expectedName) {
}
function test_client_request_callback() {
// Test that DebuggerClient.request accepts a `onResponse` callback as 2nd argument
// Test that DevToolsClient.request accepts a `onResponse` callback as 2nd argument
gClient.request(
{
to: gActorId,
@ -96,7 +96,7 @@ function test_client_request_callback() {
}
function test_client_request_promise() {
// Test that DebuggerClient.request returns a promise that resolves on response
// Test that DevToolsClient.request returns a promise that resolves on response
const request = gClient.request({
to: gActorId,
type: "hello",
@ -111,7 +111,7 @@ function test_client_request_promise() {
}
function test_client_request_promise_error() {
// Test that DebuggerClient.request returns a promise that reject when server
// Test that DevToolsClient.request returns a promise that reject when server
// returns an explicit error message
const request = gClient.request({
to: gActorId,
@ -133,7 +133,7 @@ function test_client_request_promise_error() {
}
function test_client_request_event_emitter() {
// Test that DebuggerClient.request returns also an EventEmitter object
// Test that DevToolsClient.request returns also an EventEmitter object
const request = gClient.request({
to: gActorId,
type: "hello",
@ -215,7 +215,7 @@ function test_close_client_while_sending_requests() {
}
function test_client_request_after_close() {
// Test that DebuggerClient.request fails after we called client.close()
// Test that DevToolsClient.request fails after we called client.close()
// (with promise API)
const request = gClient.request({
to: gActorId,
@ -240,7 +240,7 @@ function test_client_request_after_close() {
}
function test_client_request_after_close_callback() {
// Test that DebuggerClient.request fails after we called client.close()
// Test that DevToolsClient.request fails after we called client.close()
// (with callback API)
gClient
.request(

4
devtools/server/tests/xpcshell/test_extension_storage_actor.js
View File

@ -34,7 +34,7 @@ registerCleanupFunction(() => {
});
/**
* Starts up DevTools server and connects a new Debugger client.
* Starts up DevTools server and connects a new DevTools client.
*
* @return {Promise} Resolves with a client object when the debugger has started up.
*/
@ -42,7 +42,7 @@ async function startDebugger() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
return client;
}

2
devtools/server/tests/xpcshell/test_forwardingprefix.js
View File

@ -50,7 +50,7 @@ function newConnection(prefix) {
/* Create the main connection for these tests. */
function createMainConnection() {
({ conn: gMainConnection, transport: gMainTransport } = newConnection());
gClient = new DebuggerClient(gMainTransport);
gClient = new DevToolsClient(gMainTransport);
gClient.connect().then(([type, traits]) => run_next_test());
}

4
devtools/server/tests/xpcshell/test_front_destroy.js
View File

@ -17,9 +17,9 @@ add_task(async function test() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
info("Create and connect the DebuggerClient");
info("Create and connect the DevToolsClient");
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
info("Get the device front and check calling getDescription() on it");

4
devtools/server/tests/xpcshell/test_nesting-03.js
View File

@ -12,14 +12,14 @@ add_task(async function() {
addTestGlobal(GLOBAL_NAME);
addTestGlobal(GLOBAL_NAME);
// Conect the first client to the first debuggee.
const firstClient = new DebuggerClient(DevToolsServer.connectPipe());
const firstClient = new DevToolsClient(DevToolsServer.connectPipe());
await firstClient.connect();
const { threadFront: firstThreadFront } = await attachTestThread(
firstClient,
GLOBAL_NAME
);
const secondClient = new DebuggerClient(DevToolsServer.connectPipe());
const secondClient = new DevToolsClient(DevToolsServer.connectPipe());
await secondClient.connect();
const { threadFront: secondThreadFront } = await attachTestThread(
secondClient,

2
devtools/server/tests/xpcshell/test_protocolSpec.js
View File

@ -3,7 +3,7 @@
const run_test = Test(async function() {
initTestDevToolsServer();
const connection = DevToolsServer.connectPipe();
const client = new DebuggerClient(connection);
const client = new DevToolsClient(connection);
await client.connect();

2
devtools/server/tests/xpcshell/test_register_actor.js
View File

@ -39,7 +39,7 @@ function test_lazy_api() {
Assert.ok(!isActorLoaded);
Assert.ok(!isActorInstantiated);
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
client.connect().then(function onConnect() {
client.mainRoot.rootForm.then(onRootForm);
});

2
devtools/server/tests/xpcshell/test_requestTypes.js
View File

@ -25,7 +25,7 @@ function run_test() {
DevToolsServer.init();
DevToolsServer.registerAllActors();
const client = new DebuggerClient(DevToolsServer.connectPipe());
const client = new DevToolsClient(DevToolsServer.connectPipe());
client.connect().then(function() {
test_requestTypes_request(client);
});

4
devtools/server/tests/xpcshell/test_stepping-01.js
View File

@ -9,8 +9,8 @@
* going to the function b's call-site.
*/
async function testFinish({ threadFront, debuggerClient }) {
await close(debuggerClient);
async function testFinish({ threadFront, devToolsClient }) {
await close(devToolsClient);
do_test_finished();
}

2
devtools/server/tests/xpcshell/test_xpcshell_debugging.js
View File

@ -23,7 +23,7 @@ add_task(async function() {
testResumed = true;
});
const transport = DevToolsServer.connectPipe();
const client = new DebuggerClient(transport);
const client = new DevToolsClient(transport);
await client.connect();
// Ensure that global actors are available. Just test the device actor.

14
devtools/shared/client/connection-manager.js
View File

@ -7,7 +7,7 @@
const { Cc, Ci, Cr } = require("chrome");
const EventEmitter = require("devtools/shared/event-emitter");
const { DevToolsServer } = require("devtools/server/devtools-server");
const { DebuggerClient } = require("devtools/shared/client/debugger-client");
const { DevToolsClient } = require("devtools/shared/client/devtools-client");
const Services = require("Services");
const REMOTE_TIMEOUT = "devtools.debugger.remote-timeout";
@ -30,10 +30,10 @@ const REMOTE_TIMEOUT = "devtools.debugger.remote-timeout";
*
* # Connection
*
* A connection is a wrapper around a debugger client. It has a simple
* A connection is a wrapper around a devtools client. It has a simple
* API to instantiate a connection to a devtools server. Once disconnected,
* no need to re-create a Connection object. Calling `connect()` again
* will re-create a debugger client.
* will re-create a devtools client.
*
* Methods:
* . connect() Connect to host:port. Expect a "connecting" event.
@ -197,7 +197,7 @@ Connection.prototype = {
this.authenticator = null;
return;
}
const AuthenticatorType = DebuggerClient.Authenticators.get(value);
const AuthenticatorType = DevToolsClient.Authenticators.get(value);
this.authenticator = new AuthenticatorType.Client();
},
@ -305,7 +305,7 @@ Connection.prototype = {
return DevToolsServer.connectPipe();
}
const settings = this.socketSettings;
const transport = await DebuggerClient.socketConnect(settings);
const transport = await DevToolsClient.socketConnect(settings);
return transport;
},
@ -315,7 +315,7 @@ Connection.prototype = {
if (!transport) {
return;
}
this._client = new DebuggerClient(transport);
this._client = new DevToolsClient(transport);
this._client.once("closed", this._onDisconnected);
this._client.connect().then(this._onConnected);
},
@ -329,7 +329,7 @@ Connection.prototype = {
console.error(e);
}
// In some cases, especially on Mac, the openOutputStream call in
// DebuggerClient.socketConnect may throw NS_ERROR_NOT_INITIALIZED.
// DevToolsClient.socketConnect may throw NS_ERROR_NOT_INITIALIZED.
// It occurs when we connect agressively to the simulator,
// and keep trying to open a socket to the server being started in
// the simulator.

2
devtools/shared/client/constants.js
View File

@ -18,7 +18,7 @@ const ThreadStateTypes = {
/**
* Set of protocol messages that are sent by the server without a prior request
* by the client. This only applies to Actors for which we are not using a
* protocol.js Front and instead use DebuggerClient directly.
* protocol.js Front and instead use DevToolsClient directly.
*/
const UnsolicitedNotifications = {
networkEventUpdate: "networkEventUpdate",

20
devtools/shared/client/debugger-client.js → devtools/shared/client/devtools-client.js
View File

@ -46,7 +46,7 @@ loader.lazyRequireGetter(this, "Front", "devtools/shared/protocol", true);
* provides the means to communicate with the server and exchange the messages
* required by the protocol in a traditional JavaScript API.
*/
function DebuggerClient(transport) {
function DevToolsClient(transport) {
this._transport = transport;
this._transport.hooks = this;
@ -72,7 +72,7 @@ function DebuggerClient(transport) {
this.mainRoot = new RootFront(this, packet);
// Root Front is a special case, managing itself as it doesn't have any parent.
// It will register itself to DebuggerClient as a Pool via Front._poolMap.
// It will register itself to DevToolsClient as a Pool via Front._poolMap.
this.mainRoot.manage(this.mainRoot);
this.emit("connected", packet.applicationType, packet.traits);
@ -80,18 +80,18 @@ function DebuggerClient(transport) {
}
// Expose these to save callers the trouble of importing DebuggerSocket
DebuggerClient.socketConnect = function(options) {
DevToolsClient.socketConnect = function(options) {
// Defined here instead of just copying the function to allow lazy-load
return DebuggerSocket.connect(options);
};
DevToolsUtils.defineLazyGetter(DebuggerClient, "Authenticators", () => {
DevToolsUtils.defineLazyGetter(DevToolsClient, "Authenticators", () => {
return Authentication.Authenticators;
});
DevToolsUtils.defineLazyGetter(DebuggerClient, "AuthenticationResult", () => {
DevToolsUtils.defineLazyGetter(DevToolsClient, "AuthenticationResult", () => {
return Authentication.AuthenticationResult;
});
DebuggerClient.prototype = {
DevToolsClient.prototype = {
/**
* Connect to the server and start exchanging protocol messages.
*
@ -438,7 +438,7 @@ DebuggerClient.prototype = {
* Arrange to hand the next reply from |actor| to the handler bound to
* |request|.
*
* DebuggerClient.prototype.request / startBulkRequest usually takes care of
* DevToolsClient.prototype.request / startBulkRequest usually takes care of
* establishing the handler for a given request, but in rare cases (well,
* greetings from new root actors, is the only case at the moment) we must be
* prepared for a "reply" that doesn't correspond to any request we sent.
@ -795,7 +795,7 @@ DebuggerClient.prototype = {
},
/**
* Creates an object front for this DebuggerClient and the grip in parameter,
* Creates an object front for this DevToolsClient and the grip in parameter,
* @param {Object} grip: The grip to create the ObjectFront for.
* @returns {ObjectFront}
*/
@ -808,7 +808,7 @@ DebuggerClient.prototype = {
},
};
EventEmitter.decorate(DebuggerClient.prototype);
EventEmitter.decorate(DevToolsClient.prototype);
class Request extends EventEmitter {
constructor(request) {
@ -822,5 +822,5 @@ class Request extends EventEmitter {
}
module.exports = {
DebuggerClient,
DevToolsClient,
};

2
devtools/shared/client/moz.build
View File

@ -7,5 +7,5 @@
DevToolsModules(
'connection-manager.js',
'constants.js',
'debugger-client.js',
'devtools-client.js',
)

4
devtools/shared/fronts/environment.js
View File

@ -13,8 +13,8 @@ const { environmentSpec } = require("devtools/shared/specs/environment");
/**
* Environment fronts are used to manipulate the lexical environment actors.
*
* @param client DebuggerClient
* The debugger client parent.
* @param client DevToolsClient
* The devtools client parent.
* @param form Object
* The form sent across the remote debugging protocol.
*/

2
devtools/shared/fronts/root.js
View File

@ -48,7 +48,7 @@ class RootFront extends FrontClassWithSpec(rootSpec) {
// Root Front is a special Front. It is the only one to set its actor ID manually
// out of the form object returned by RootActor.sayHello which is called when calling
// DebuggerClient.connect().
// DevToolsClient.connect().
this.actorID = form.from;
this.applicationType = form.applicationType;

4
devtools/shared/fronts/source.js
View File

@ -14,8 +14,8 @@ const { ArrayBufferFront } = require("devtools/shared/fronts/array-buffer");
/**
* A SourceFront provides a way to access the source text of a script.
*
* @param client DebuggerClient
* The Debugger Client instance.
* @param client DevToolsClient
* The DevTools Client instance.
* @param form Object
* The form sent across the remote debugging protocol.
*/

2
devtools/shared/fronts/targets/local-tab.js
View File

@ -120,7 +120,7 @@ class LocalTabTargetFront extends BrowsingContextTargetFront {
const client = this.client;
if (targetSwitchingEnabled) {
// By default, we do close the DebuggerClient when the target is destroyed.
// By default, we do close the DevToolsClient when the target is destroyed.
// This happens when we close the toolbox (Toolbox.destroy calls Target.destroy),
// or when the tab is closes, the server emits tabDetached and the target
// destroy itself.

Some files were not shown because too many files have changed in this diff Show More