nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1790468 - [remote] Convert /remote/server JSM modules to ESM r=webdriver-reviewers,whimboo

Browse source 
Depends on D158294

Differential Revision: https://phabricator.services.mozilla.com/D158295
This commit is contained in:
Julian Descottes 2022-09-30 11:08:07 +00:00
parent b24d46c99d
commit bf82c5039a
8 changed files with 21 additions and 30 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
remote/cdp/targets/Target.jsm
View file

@ -12,9 +12,13 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
WebSocketHandshake:
"chrome://remote/content/server/WebSocketHandshake.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
CDPConnection: "chrome://remote/content/cdp/CDPConnection.jsm",
WebSocketHandshake: "chrome://remote/content/server/WebSocketHandshake.jsm",
});
/**

4
remote/jar.mn
View file

@ -9,8 +9,8 @@ remote.jar:
# transport layer (http / websocket)
content/server/HTTPD.jsm (../netwerk/test/httpserver/httpd.js)
content/server/WebSocketHandshake.jsm (server/WebSocketHandshake.jsm)
content/server/WebSocketTransport.jsm (server/WebSocketTransport.jsm)
content/server/WebSocketHandshake.sys.mjs (server/WebSocketHandshake.sys.mjs)
content/server/WebSocketTransport.sys.mjs (server/WebSocketTransport.sys.mjs)
# shared modules (all protocols)
content/shared/AppInfo.sys.mjs (shared/AppInfo.sys.mjs)

12
remote/server/WebSocketHandshake.jsm → remote/server/WebSocketHandshake.sys.mjs
View file

@ -2,17 +2,11 @@
* 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";
var EXPORTED_SYMBOLS = ["WebSocketHandshake"];
// This file is an XPCOM service-ified copy of ../devtools/server/socket/websocket-server.js.
const CC = Components.Constructor;
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
const CC = Components.Constructor;
const lazy = {};
@ -320,4 +314,4 @@ async function upgrade(request, response) {
return createWebSocket(transport, input, output);
}
const WebSocketHandshake = { upgrade };
export const WebSocketHandshake = { upgrade };

10
remote/server/WebSocketTransport.jsm → remote/server/WebSocketTransport.sys.mjs
View file

@ -4,13 +4,7 @@
// This is an XPCOM service-ified copy of ../devtools/shared/transport/websocket-transport.js.
"use strict";
var EXPORTED_SYMBOLS = ["WebSocketTransport"];
const { XPCOMUtils } = ChromeUtils.importESModule(
"resource://gre/modules/XPCOMUtils.sys.mjs"
);
import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
const lazy = {};
@ -18,7 +12,7 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
EventEmitter: "resource://gre/modules/EventEmitter.jsm",
});
function WebSocketTransport(socket) {
export function WebSocketTransport(socket) {
lazy.EventEmitter.decorate(this);
this.active = false;

6
remote/shared/WebSocketConnection.sys.mjs
View file

@ -10,10 +10,8 @@ const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
Log: "chrome://remote/content/shared/Log.sys.mjs",
truncate: "chrome://remote/content/shared/Format.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
WebSocketTransport: "chrome://remote/content/server/WebSocketTransport.jsm",
WebSocketTransport:
"chrome://remote/content/server/WebSocketTransport.sys.mjs",
});
XPCOMUtils.defineLazyGetter(lazy, "logger", () => lazy.Log.get());

3
remote/shared/webdriver/Session.sys.mjs
View file

@ -14,6 +14,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
"chrome://remote/content/shared/messagehandler/RootMessageHandler.sys.mjs",
RootMessageHandlerRegistry:
"chrome://remote/content/shared/messagehandler/RootMessageHandlerRegistry.sys.mjs",
WebSocketHandshake:
"chrome://remote/content/server/WebSocketHandshake.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
@ -21,7 +23,6 @@ XPCOMUtils.defineLazyModuleGetters(lazy, {
allowAllCerts: "chrome://remote/content/marionette/cert.js",
WebDriverBiDiConnection:
"chrome://remote/content/webdriver-bidi/WebDriverBiDiConnection.jsm",
WebSocketHandshake: "chrome://remote/content/server/WebSocketHandshake.jsm",
});
XPCOMUtils.defineLazyGetter(lazy, "logger", () => lazy.Log.get());

6
remote/webdriver-bidi/NewSessionHandler.jsm
View file

@ -12,10 +12,14 @@ const { XPCOMUtils } = ChromeUtils.importESModule(
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
WebSocketHandshake:
"chrome://remote/content/server/WebSocketHandshake.sys.mjs",
});
XPCOMUtils.defineLazyModuleGetters(lazy, {
WebDriverBiDiConnection:
"chrome://remote/content/webdriver-bidi/WebDriverBiDiConnection.jsm",
WebSocketHandshake: "chrome://remote/content/server/WebSocketHandshake.jsm",
});
/**

4
tools/esmify/map.json
View file

@ -178,10 +178,6 @@
"chrome://remote/content/marionette/sync.js": "remote/marionette/sync.js",
"chrome://remote/content/marionette/transport.js":
"remote/marionette/transport.js",
"chrome://remote/content/server/WebSocketHandshake.jsm":
"remote/server/WebSocketHandshake.jsm",
"chrome://remote/content/server/WebSocketTransport.jsm":
"remote/server/WebSocketTransport.jsm",
"chrome://remote/content/webdriver-bidi/NewSessionHandler.jsm":
"remote/webdriver-bidi/NewSessionHandler.jsm",
"chrome://remote/content/webdriver-bidi/RemoteValue.jsm":