@depup/react-native__dev-middleware 0.84.1-depup.1 → 0.85.0-depup.0

package/dist/inspector-proxy/Device.js

@@ -8,6 +8,7 @@ var _CdpDebugLogging = _interopRequireDefault(require("./CdpDebugLogging"));
 var _DeviceEventReporter = _interopRequireDefault(
   require("./DeviceEventReporter"),
 );
+var _crypto = _interopRequireDefault(require("crypto"));
 var _invariant = _interopRequireDefault(require("invariant"));
 var _ws = _interopRequireDefault(require("ws"));
 function _interopRequireDefault(e) {
@@ -27,7 +28,6 @@ const WS_CLOSE_REASON = (exports.WS_CLOSE_REASON = {
     "[NEW_DEBUGGER_OPENED] New debugger opened for the same app instance",
 });
 const FILE_PREFIX = "file://";
-let fuseboxConsoleNoticeLogged = false;
 const REACT_NATIVE_RELOADABLE_PAGE_ID = "-1";
 class Device {
   #id;
@@ -35,7 +35,7 @@ class Device {
   #app;
   #deviceSocket;
   #pages = new Map();
-  #debuggerConnection = null;
+  #debuggerConnections = new Map();
   #lastConnectedLegacyReactNativePage = null;
   #isLegacyPageReloading = false;
   #lastGetPagesMessage = "";
@@ -43,11 +43,12 @@ class Device {
   #deviceEventReporter;
   #pagesPollingIntervalId;
   #createCustomMessageHandler;
-  #connectedPageIds = new Set();
   #deviceRelativeBaseUrl;
   #serverRelativeBaseUrl;
   #cdpDebugLogging;
+  #experiments;
   constructor(deviceOptions) {
+    this.#experiments = deviceOptions.experiments;
     this.#dangerouslyConstruct(deviceOptions);
   }
   #dangerouslyConstruct({
@@ -125,14 +126,27 @@ class Device {
       }
     });
   }
-  #terminateDebuggerConnection(code, reason) {
-    const debuggerConnection = this.#debuggerConnection;
-    if (debuggerConnection) {
-      this.#sendDisconnectEventToDevice(
-        this.#mapToDevicePageId(debuggerConnection.pageId),
-      );
-      debuggerConnection.socket.close(code, reason);
-      this.#debuggerConnection = null;
+  #terminateDebuggerConnection(code, reason, sessionId) {
+    if (sessionId != null) {
+      const debuggerConnection = this.#debuggerConnections.get(sessionId);
+      if (debuggerConnection) {
+        this.#debuggerConnections.delete(sessionId);
+        this.#sendDisconnectEventToDevice(
+          this.#mapToDevicePageId(debuggerConnection.pageId),
+          sessionId,
+        );
+        debuggerConnection.socket.close(code, reason);
+      }
+    } else {
+      const connections = Array.from(this.#debuggerConnections.entries());
+      this.#debuggerConnections.clear();
+      for (const [sid, debuggerConnection] of connections) {
+        this.#sendDisconnectEventToDevice(
+          this.#mapToDevicePageId(debuggerConnection.pageId),
+          sid,
+        );
+        debuggerConnection.socket.close(code, reason);
+      }
     }
   }
   dangerouslyRecreateDevice(deviceOptions) {
@@ -140,7 +154,7 @@ class Device {
       deviceOptions.id === this.#id,
       "dangerouslyRecreateDevice() can only be used for the same device ID",
     );
-    const oldDebugger = this.#debuggerConnection;
+    const oldDebuggerConnections = new Map(this.#debuggerConnections);
     if (this.#app !== deviceOptions.app || this.#name !== deviceOptions.name) {
       this.#deviceSocket.close(
         WS_CLOSURE_CODE.NORMAL,
@@ -151,19 +165,21 @@ class Device {
         WS_CLOSE_REASON.RECREATING_DEVICE,
       );
     }
-    this.#debuggerConnection = null;
-    if (oldDebugger) {
-      oldDebugger.socket.removeAllListeners();
+    this.#debuggerConnections.clear();
+    if (oldDebuggerConnections.size > 0) {
       this.#deviceSocket.close(
         WS_CLOSURE_CODE.NORMAL,
         WS_CLOSE_REASON.RECREATING_DEVICE,
       );
+    }
+    this.#dangerouslyConstruct(deviceOptions);
+    for (const oldDebugger of oldDebuggerConnections.values()) {
+      oldDebugger.socket.removeAllListeners();
       this.handleDebuggerConnection(oldDebugger.socket, oldDebugger.pageId, {
         debuggerRelativeBaseUrl: oldDebugger.debuggerRelativeBaseUrl,
         userAgent: oldDebugger.userAgent,
       });
     }
-    this.#dangerouslyConstruct(deviceOptions);
   }
   getName() {
     return this.#name;
@@ -199,10 +215,18 @@ class Device {
       return;
     }
     this.#deviceEventReporter?.logDisconnection("debugger");
-    this.#terminateDebuggerConnection(
-      WS_CLOSURE_CODE.NORMAL,
-      WS_CLOSE_REASON.NEW_DEBUGGER_OPENED,
-    );
+    if (!this.#pageHasCapability(page, "supportsMultipleDebuggers")) {
+      for (const [sid, conn] of this.#debuggerConnections) {
+        if (conn.pageId === pageId) {
+          this.#terminateDebuggerConnection(
+            WS_CLOSURE_CODE.NORMAL,
+            WS_CLOSE_REASON.NEW_DEBUGGER_OPENED,
+            sid,
+          );
+        }
+      }
+    }
+    const sessionId = _crypto.default.randomUUID();
     this.#deviceEventReporter?.logConnection("debugger", {
       pageId,
       frontendUserAgent: userAgent,
@@ -214,47 +238,47 @@ class Device {
       userAgent: userAgent,
       customHandler: null,
       debuggerRelativeBaseUrl,
+      sessionId,
     };
-    this.#debuggerConnection = debuggerInfo;
+    this.#debuggerConnections.set(sessionId, debuggerInfo);
     debug(
       `Got new debugger connection via ${debuggerRelativeBaseUrl.href} for ` +
-        `page ${pageId} of ${this.#name}`,
+        `page ${pageId} of ${this.#name} with sessionId ${sessionId}`,
     );
-    if (this.#debuggerConnection && this.#createCustomMessageHandler) {
-      this.#debuggerConnection.customHandler = this.#createCustomMessageHandler(
-        {
-          page,
-          debugger: {
-            userAgent: debuggerInfo.userAgent,
-            sendMessage: (message) => {
-              try {
-                const payload = JSON.stringify(message);
-                this.#cdpDebugLogging.log("ProxyToDebugger", payload);
-                socket.send(payload);
-              } catch {}
-            },
+    if (this.#createCustomMessageHandler) {
+      debuggerInfo.customHandler = this.#createCustomMessageHandler({
+        page,
+        debugger: {
+          userAgent: debuggerInfo.userAgent,
+          sendMessage: (message) => {
+            try {
+              const payload = JSON.stringify(message);
+              this.#cdpDebugLogging.log("ProxyToDebugger", payload);
+              socket.send(payload);
+            } catch {}
           },
-          device: {
-            appId: this.#app,
-            id: this.#id,
-            name: this.#name,
-            sendMessage: (message) => {
-              try {
-                const payload = JSON.stringify({
-                  event: "wrappedEvent",
-                  payload: {
-                    pageId: this.#mapToDevicePageId(pageId),
-                    wrappedEvent: JSON.stringify(message),
-                  },
-                });
-                this.#cdpDebugLogging.log("DebuggerToProxy", payload);
-                this.#deviceSocket.send(payload);
-              } catch {}
-            },
+        },
+        device: {
+          appId: this.#app,
+          id: this.#id,
+          name: this.#name,
+          sendMessage: (message) => {
+            try {
+              const payload = JSON.stringify({
+                event: "wrappedEvent",
+                payload: {
+                  pageId: this.#mapToDevicePageId(pageId),
+                  wrappedEvent: JSON.stringify(message),
+                  sessionId,
+                },
+              });
+              this.#cdpDebugLogging.log("DebuggerToProxy", payload);
+              this.#deviceSocket.send(payload);
+            } catch {}
           },
         },
-      );
-      if (this.#debuggerConnection.customHandler) {
+      });
+      if (debuggerInfo.customHandler) {
         debug("Created new custom message handler for debugger connection");
       } else {
         debug(
@@ -262,22 +286,18 @@ class Device {
         );
       }
     }
-    this.#sendConnectEventToDevice(this.#mapToDevicePageId(pageId));
+    this.#sendConnectEventToDevice(this.#mapToDevicePageId(pageId), sessionId);
     socket.on("message", (message) => {
       this.#cdpDebugLogging.log("DebuggerToProxy", message);
       const debuggerRequest = JSON.parse(message);
       this.#deviceEventReporter?.logRequest(debuggerRequest, "debugger", {
-        pageId: this.#debuggerConnection?.pageId ?? null,
+        pageId: debuggerInfo.pageId,
         frontendUserAgent: userAgent,
-        prefersFuseboxFrontend: this.#isPageFuseboxFrontend(
-          this.#debuggerConnection?.pageId,
-        ),
       });
       let processedReq = debuggerRequest;
       if (
-        this.#debuggerConnection?.customHandler?.handleDebuggerMessage(
-          debuggerRequest,
-        ) === true
+        debuggerInfo.customHandler?.handleDebuggerMessage(debuggerRequest) ===
+        true
       ) {
         return;
       }
@@ -294,16 +314,17 @@ class Device {
           payload: {
             pageId: this.#mapToDevicePageId(pageId),
             wrappedEvent: JSON.stringify(processedReq),
+            sessionId,
           },
         });
       }
     });
     socket.on("close", () => {
-      debug(`Debugger for page ${pageId} and ${this.#name} disconnected.`);
+      debug(
+        `Debugger for page ${pageId} and ${this.#name} disconnected (sessionId: ${sessionId}).`,
+      );
       this.#deviceEventReporter?.logDisconnection("debugger");
-      if (this.#debuggerConnection?.socket === socket) {
-        this.#terminateDebuggerConnection();
-      }
+      this.#terminateDebuggerConnection(undefined, undefined, sessionId);
     });
     const cdpDebugLogging = this.#cdpDebugLogging;
     const sendFunc = socket.send;
@@ -312,27 +333,21 @@ class Device {
       return sendFunc.call(socket, message);
     };
   }
-  #sendConnectEventToDevice(devicePageId) {
-    if (this.#connectedPageIds.has(devicePageId)) {
-      return;
-    }
-    this.#connectedPageIds.add(devicePageId);
+  #sendConnectEventToDevice(devicePageId, sessionId) {
     this.#sendMessageToDevice({
       event: "connect",
       payload: {
         pageId: devicePageId,
+        sessionId,
       },
     });
   }
-  #sendDisconnectEventToDevice(devicePageId) {
-    if (!this.#connectedPageIds.has(devicePageId)) {
-      return;
-    }
-    this.#connectedPageIds.delete(devicePageId);
+  #sendDisconnectEventToDevice(devicePageId, sessionId) {
     this.#sendMessageToDevice({
       event: "disconnect",
       payload: {
         pageId: devicePageId,
+        sessionId,
       },
     });
   }
@@ -350,14 +365,24 @@ class Device {
   }
   #handleMessageFromDevice(message) {
     if (message.event === "getPages") {
+      const shouldDisableMultipleDebuggers =
+        !this.#experiments.enableStandaloneFuseboxShell;
       this.#pages = new Map(
-        message.payload.map(({ capabilities, ...page }) => [
-          page.id,
-          {
-            ...page,
-            capabilities: capabilities ?? {},
-          },
-        ]),
+        message.payload.map(({ capabilities: rawCapabilities, ...page }) => {
+          const capabilities = shouldDisableMultipleDebuggers
+            ? {
+                ...(rawCapabilities ?? {}),
+                supportsMultipleDebuggers: false,
+              }
+            : (rawCapabilities ?? {});
+          return [
+            page.id,
+            {
+              ...page,
+              capabilities,
+            },
+          ];
+        }),
       );
       if (message.payload.length !== this.#pages.size) {
         const duplicateIds = new Set();
@@ -375,7 +400,6 @@ class Device {
       }
       for (const page of this.#pages.values()) {
         if (this.#pageHasCapability(page, "nativePageReloads")) {
-          this.#logFuseboxConsoleNotice();
           continue;
         }
         if (page.title.includes("React")) {
@@ -387,31 +411,62 @@ class Device {
       }
     } else if (message.event === "disconnect") {
       const pageId = message.payload.pageId;
+      const sessionId = message.payload.sessionId;
       const page = this.#pages.get(pageId);
       if (page != null && this.#pageHasCapability(page, "nativePageReloads")) {
         return;
       }
-      const debuggerSocket = this.#debuggerConnection
-        ? this.#debuggerConnection.socket
-        : null;
-      if (debuggerSocket && debuggerSocket.readyState === _ws.default.OPEN) {
+      if (sessionId != null) {
+        const debuggerConnection = this.#debuggerConnections.get(sessionId);
         if (
-          this.#debuggerConnection != null &&
-          this.#debuggerConnection.pageId !== REACT_NATIVE_RELOADABLE_PAGE_ID
+          debuggerConnection &&
+          debuggerConnection.socket.readyState === _ws.default.OPEN
         ) {
-          debug(`Legacy page ${pageId} is reloading.`);
-          debuggerSocket.send(
-            JSON.stringify({
-              method: "reload",
-            }),
-          );
+          if (debuggerConnection.pageId !== REACT_NATIVE_RELOADABLE_PAGE_ID) {
+            debug(
+              `Legacy page ${pageId} is reloading (sessionId: ${sessionId}).`,
+            );
+            debuggerConnection.socket.send(
+              JSON.stringify({
+                method: "reload",
+              }),
+            );
+          }
+        }
+      } else {
+        for (const debuggerConnection of this.#debuggerConnections.values()) {
+          if (
+            debuggerConnection.pageId !== REACT_NATIVE_RELOADABLE_PAGE_ID &&
+            debuggerConnection.socket.readyState === _ws.default.OPEN
+          ) {
+            debug(`Legacy page ${pageId} is reloading.`);
+            debuggerConnection.socket.send(
+              JSON.stringify({
+                method: "reload",
+              }),
+            );
+          }
         }
       }
     } else if (message.event === "wrappedEvent") {
-      if (this.#debuggerConnection == null) {
+      const sessionId = message.payload.sessionId;
+      let debuggerConnection = null;
+      if (sessionId != null) {
+        debuggerConnection = this.#debuggerConnections.get(sessionId);
+      } else {
+        if (this.#debuggerConnections.size > 1) {
+          debug(
+            "WARNING: Device sent message without sessionId but multiple debuggers are connected. " +
+              "This indicates a device/proxy version mismatch.",
+          );
+        }
+        debuggerConnection =
+          this.#debuggerConnections.values().next().value ?? null;
+      }
+      if (debuggerConnection == null) {
         return;
       }
-      const debuggerSocket = this.#debuggerConnection.socket;
+      const debuggerSocket = debuggerConnection.socket;
       if (
         debuggerSocket == null ||
         debuggerSocket.readyState !== _ws.default.OPEN
@@ -419,33 +474,26 @@ class Device {
         return;
       }
       const parsedPayload = JSON.parse(message.payload.wrappedEvent);
-      const pageId = this.#debuggerConnection?.pageId ?? null;
+      const pageId = debuggerConnection.pageId;
       if ("id" in parsedPayload) {
         this.#deviceEventReporter?.logResponse(parsedPayload, "device", {
           pageId,
-          frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
-          prefersFuseboxFrontend: this.#isPageFuseboxFrontend(pageId),
+          frontendUserAgent: debuggerConnection.userAgent ?? null,
         });
       }
-      const debuggerConnection = this.#debuggerConnection;
-      if (debuggerConnection != null) {
-        if (
-          debuggerConnection.customHandler?.handleDeviceMessage(
-            parsedPayload,
-          ) === true
-        ) {
-          return;
-        }
-        this.#processMessageFromDeviceLegacy(
-          parsedPayload,
-          debuggerConnection,
-          pageId,
-        );
-        const messageToSend = JSON.stringify(parsedPayload);
-        debuggerSocket.send(messageToSend);
-      } else {
-        debuggerSocket.send(message.payload.wrappedEvent);
+      if (
+        debuggerConnection.customHandler?.handleDeviceMessage(parsedPayload) ===
+        true
+      ) {
+        return;
       }
+      this.#processMessageFromDeviceLegacy(
+        parsedPayload,
+        debuggerConnection,
+        pageId,
+      );
+      const messageToSend = JSON.stringify(parsedPayload);
+      debuggerSocket.send(messageToSend);
     }
   }
   #sendMessageToDevice(message) {
@@ -459,10 +507,14 @@ class Device {
   }
   #newLegacyReactNativePage(page) {
     debug(`React Native page updated to ${page.id}`);
-    if (
-      this.#debuggerConnection == null ||
-      this.#debuggerConnection.pageId !== REACT_NATIVE_RELOADABLE_PAGE_ID
-    ) {
+    let reloadablePageDebugger = null;
+    for (const debuggerConnection of this.#debuggerConnections.values()) {
+      if (debuggerConnection.pageId === REACT_NATIVE_RELOADABLE_PAGE_ID) {
+        reloadablePageDebugger = debuggerConnection;
+        break;
+      }
+    }
+    if (reloadablePageDebugger == null) {
       this.#lastConnectedLegacyReactNativePage = page;
       return;
     }
@@ -470,9 +522,12 @@ class Device {
     this.#lastConnectedLegacyReactNativePage = page;
     this.#isLegacyPageReloading = true;
     if (oldPageId != null) {
-      this.#sendDisconnectEventToDevice(oldPageId);
+      this.#sendDisconnectEventToDevice(
+        oldPageId,
+        reloadablePageDebugger.sessionId,
+      );
     }
-    this.#sendConnectEventToDevice(page.id);
+    this.#sendConnectEventToDevice(page.id, reloadablePageDebugger.sessionId);
     const toSend = [
       {
         method: "Runtime.enable",
@@ -484,17 +539,17 @@ class Device {
       },
     ];
     for (const message of toSend) {
-      const pageId = this.#debuggerConnection?.pageId ?? null;
+      const pageId = reloadablePageDebugger.pageId;
       this.#deviceEventReporter?.logRequest(message, "proxy", {
         pageId,
-        frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
-        prefersFuseboxFrontend: this.#isPageFuseboxFrontend(pageId),
+        frontendUserAgent: reloadablePageDebugger.userAgent ?? null,
       });
       this.#sendMessageToDevice({
         event: "wrappedEvent",
         payload: {
           pageId: this.#mapToDevicePageId(page.id),
           wrappedEvent: JSON.stringify(message),
+          sessionId: reloadablePageDebugger.sessionId,
         },
       });
     }
@@ -587,17 +642,15 @@ class Device {
         id: 0,
       };
       this.#deviceEventReporter?.logRequest(resumeMessage, "proxy", {
-        pageId: this.#debuggerConnection?.pageId ?? null,
-        frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
-        prefersFuseboxFrontend: this.#isPageFuseboxFrontend(
-          this.#debuggerConnection?.pageId,
-        ),
+        pageId: debuggerInfo.pageId,
+        frontendUserAgent: debuggerInfo.userAgent ?? null,
       });
       this.#sendMessageToDevice({
         event: "wrappedEvent",
         payload: {
           pageId: this.#mapToDevicePageId(debuggerInfo.pageId),
           wrappedEvent: JSON.stringify(resumeMessage),
+          sessionId: debuggerInfo.sessionId,
         },
       });
       this.#isLegacyPageReloading = false;
@@ -622,7 +675,7 @@ class Device {
       case "Debugger.setBreakpointByUrl":
         return this.#processDebuggerSetBreakpointByUrl(req, debuggerInfo);
       case "Debugger.getScriptSource":
-        void this.#processDebuggerGetScriptSource(req, socket);
+        void this.#processDebuggerGetScriptSource(req, socket, debuggerInfo);
         return null;
       case "Network.loadNetworkResource":
         const response = {
@@ -636,11 +689,10 @@ class Device {
           },
         };
         socket.send(JSON.stringify(response));
-        const pageId = this.#debuggerConnection?.pageId ?? null;
+        const pageId = debuggerInfo.pageId;
         this.#deviceEventReporter?.logResponse(response, "proxy", {
           pageId,
-          frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
-          prefersFuseboxFrontend: this.#isPageFuseboxFrontend(pageId),
+          frontendUserAgent: debuggerInfo.userAgent ?? null,
         });
         return null;
       default:
@@ -684,7 +736,7 @@ class Device {
     }
     return processedReq;
   }
-  async #processDebuggerGetScriptSource(req, socket) {
+  async #processDebuggerGetScriptSource(req, socket, debuggerInfo) {
     const sendSuccessResponse = (scriptSource) => {
       const response = {
         id: req.id,
@@ -693,11 +745,10 @@ class Device {
         },
       };
       socket.send(JSON.stringify(response));
-      const pageId = this.#debuggerConnection?.pageId ?? null;
+      const pageId = debuggerInfo.pageId;
       this.#deviceEventReporter?.logResponse(response, "proxy", {
         pageId,
-        frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
-        prefersFuseboxFrontend: this.#isPageFuseboxFrontend(pageId),
+        frontendUserAgent: debuggerInfo.userAgent ?? null,
       });
     };
     const sendErrorResponse = (error) => {
@@ -710,12 +761,11 @@ class Device {
         },
       };
       socket.send(JSON.stringify(response));
-      this.#sendErrorToDebugger(error);
-      const pageId = this.#debuggerConnection?.pageId ?? null;
+      this.#sendErrorToDebugger(error, debuggerInfo);
+      const pageId = debuggerInfo.pageId;
       this.#deviceEventReporter?.logResponse(response, "proxy", {
         pageId,
-        frontendUserAgent: this.#debuggerConnection?.userAgent ?? null,
-        prefersFuseboxFrontend: this.#isPageFuseboxFrontend(pageId),
+        frontendUserAgent: debuggerInfo.userAgent ?? null,
       });
     };
     const pathToSource = this.#scriptIdToSourcePathMapping.get(
@@ -769,8 +819,8 @@ class Device {
     }
     return text;
   }
-  #sendErrorToDebugger(message) {
-    const debuggerSocket = this.#debuggerConnection?.socket;
+  #sendErrorToDebugger(message, debuggerInfo) {
+    const debuggerSocket = debuggerInfo?.socket;
     if (debuggerSocket && debuggerSocket.readyState === _ws.default.OPEN) {
       debuggerSocket.send(
         JSON.stringify({
@@ -789,22 +839,8 @@ class Device {
       );
     }
   }
-  #isPageFuseboxFrontend(pageId) {
-    const page = pageId == null ? null : this.#pages.get(pageId);
-    if (page == null) {
-      return null;
-    }
-    return this.#pageHasCapability(page, "prefersFuseboxFrontend");
-  }
   dangerouslyGetSocket() {
     return this.#deviceSocket;
   }
-  #logFuseboxConsoleNotice() {
-    if (fuseboxConsoleNoticeLogged) {
-      return;
-    }
-    this.#deviceEventReporter?.logFuseboxConsoleNotice();
-    fuseboxConsoleNoticeLogged = true;
-  }
 }
 exports.default = Device;

package/dist/inspector-proxy/Device.js.flow

@@ -9,6 +9,8 @@
  */
 
 import type { EventReporter } from "../types/EventReporter";
+import type { Experiments } from "../types/Experiments";
+import type { ReadonlyURL } from "../types/ReadonlyURL";
 import type { CreateCustomMessageHandlerFn } from "./CustomMessageHandler";
 import type { Page } from "./types";
 
@@ -23,16 +25,17 @@ declare export const WS_CLOSE_REASON: {
   NEW_DEBUGGER_OPENED: "[NEW_DEBUGGER_OPENED] New debugger opened for the same app instance",
 };
 
-export type DeviceOptions = $ReadOnly<{
+export type DeviceOptions = Readonly<{
   id: string,
   name: string,
   app: string,
   socket: WS,
   eventReporter: ?EventReporter,
   createMessageMiddleware: ?CreateCustomMessageHandlerFn,
-  deviceRelativeBaseUrl: URL,
-  serverRelativeBaseUrl: URL,
+  deviceRelativeBaseUrl: ReadonlyURL,
+  serverRelativeBaseUrl: ReadonlyURL,
   isProfilingBuild: boolean,
+  experiments: Experiments,
 }>;
 
 /**
@@ -53,7 +56,7 @@ declare export default class Device {
   dangerouslyRecreateDevice(deviceOptions: DeviceOptions): void;
   getName(): string;
   getApp(): string;
-  getPagesList(): $ReadOnlyArray<Page>;
+  getPagesList(): ReadonlyArray<Page>;
   // Handles new debugger connection to this device:
   // 1. Sends connect event to device
   // 2. Forwards all messages from the debugger to device as wrappedEvent
@@ -61,8 +64,8 @@ declare export default class Device {
   handleDebuggerConnection(
     socket: WS,
     pageId: string,
-    $$PARAM_2$$: $ReadOnly<{
-      debuggerRelativeBaseUrl: URL,
+    $$PARAM_2$$: Readonly<{
+      debuggerRelativeBaseUrl: ReadonlyURL,
       userAgent: string | null,
     }>,
   ): void;