appium-android-driver 5.14.7 → 6.0.1

package/lib/commands/log.js

@@ -1,144 +1,200 @@
-import log from '../logger';
-import os from 'os';
+// @ts-check
+
+import {DEFAULT_WS_PATHNAME_PREFIX, BaseDriver} from 'appium/driver';
 import _ from 'lodash';
+import os from 'node:os';
 import WebSocket from 'ws';
-import { DEFAULT_WS_PATHNAME_PREFIX, BaseDriver } from 'appium/driver';
+import log from '../logger';
+import {mixin} from './mixins';
 
 const GET_SERVER_LOGS_FEATURE = 'get_server_logs';
 
-let commands = {}, helpers = {}, extensions = {};
-
-const WEBSOCKET_ENDPOINT = (sessionId) => `${DEFAULT_WS_PATHNAME_PREFIX}/session/${sessionId}/appium/device/logcat`;
+/**
+ * @param {string} sessionId
+ * @returns {string}
+ */
+const WEBSOCKET_ENDPOINT = (sessionId) =>
+  `${DEFAULT_WS_PATHNAME_PREFIX}/session/${sessionId}/appium/device/logcat`;
 
-// https://github.com/SeleniumHQ/selenium/blob/0d425676b3c9df261dd641917f867d4d5ce7774d/java/client/src/org/openqa/selenium/logging/LogEntry.java
-function toLogRecord (timestamp, level, message) {
+/**
+ *
+ * @see {@link https://github.com/SeleniumHQ/selenium/blob/0d425676b3c9df261dd641917f867d4d5ce7774d/java/client/src/org/openqa/selenium/logging/LogEntry.java}
+ * @param {number} timestamp
+ * @param {string} level
+ * @param {string} message
+ */
+function toLogRecord(timestamp, level, message) {
   return {
     timestamp,
     level,
     message,
   };
 }
-
-extensions.supportedLogTypes = {
-  logcat: {
-    description: 'Logs for Android applications on real device and emulators via ADB',
-    getter: async (self) => await self.adb.getLogcatLogs(),
-  },
-  bugreport: {
-    description: `'adb bugreport' output for advanced issues diagnostic`,
-    getter: async (self) => {
-      const output = await self.adb.bugreport();
-      const timestamp = Date.now();
-      return output.split(os.EOL)
-        .map((x) => toLogRecord(timestamp, 'ALL', x));
+/**
+ * @type {import('./mixins').LogMixin & ThisType<import('../driver').AndroidDriver>}
+ * @satisfies {import('@appium/types').ExternalDriver}
+ */
+const LogMixin = {
+  supportedLogTypes: {
+    logcat: {
+      description: 'Logs for Android applications on real device and emulators via ADB',
+      /**
+       *
+       * @param {import('../driver').AndroidDriver} self
+       * @returns
+       */
+      getter: (self) => /** @type {ADB} */ (self.adb).getLogcatLogs(),
     },
-  },
-  server: {
-    description: 'Appium server logs',
-    getter: (self) => {
-      self.ensureFeatureEnabled(GET_SERVER_LOGS_FEATURE);
-      const timestamp = Date.now();
-      return log.unwrap().record
-        .map((x) => toLogRecord(timestamp,
-                                'ALL',
-                                _.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`)
-        );
+    bugreport: {
+      description: `'adb bugreport' output for advanced issues diagnostic`,
+      /**
+       *
+       * @param {import('../driver').AndroidDriver} self
+       * @returns
+       */
+      getter: async (self) => {
+        const output = await /** @type {ADB} */ (self.adb).bugreport();
+        const timestamp = Date.now();
+        return output.split(os.EOL).map((x) => toLogRecord(timestamp, 'ALL', x));
+      },
+    },
+    server: {
+      description: 'Appium server logs',
+      /**
+       *
+       * @param {import('../driver').AndroidDriver} self
+       * @returns
+       */
+      getter: (self) => {
+        self.ensureFeatureEnabled(GET_SERVER_LOGS_FEATURE);
+        const timestamp = Date.now();
+        return log
+          .unwrap()
+          .record.map((x) =>
+            toLogRecord(
+              timestamp,
+              'ALL',
+              _.isEmpty(x.prefix) ? x.message : `[${x.prefix}] ${x.message}`
+            )
+          );
+      },
     },
   },
-};
 
-/**
- * Starts Android logcat broadcast websocket on the same host and port
- * where Appium server is running at `/ws/session/:sessionId:/appium/logcat` endpoint. The method
- * will return immediately if the web socket is already listening.
- *
- * Each connected websocket listener will receive logcat log lines
- * as soon as they are visible to Appium.
- */
-commands.mobileStartLogsBroadcast = async function mobileStartLogsBroadcast () {
-  const pathname = WEBSOCKET_ENDPOINT(this.sessionId);
-  if (!_.isEmpty(await this.server.getWebSocketHandlers(pathname))) {
-    log.debug(`The logcat broadcasting web socket server is already listening at ${pathname}`);
-    return;
-  }
-
-  log.info(`Starting logcat broadcasting on web socket server ` +
-    `${JSON.stringify(this.server.address())} to ${pathname}`);
-  // https://github.com/websockets/ws/blob/master/doc/ws.md
-  const wss = new WebSocket.Server({
-    noServer: true,
-  });
-  wss.on('connection', (ws, req) => {
-    if (req) {
-      const remoteIp = _.isEmpty(req.headers['x-forwarded-for'])
-        ? req.connection?.remoteAddress
-        : req.headers['x-forwarded-for'];
-      log.debug(`Established a new logcat listener web socket connection from ${remoteIp}`);
-    } else {
-      log.debug('Established a new logcat listener web socket connection');
-    }
-
-    if (_.isEmpty(this._logcatWebsocketListener)) {
-      this._logcatWebsocketListener = (logRecord) => {
-        if (ws?.readyState === WebSocket.OPEN) {
-          ws.send(logRecord.message);
-        }
-      };
+  /**
+   * Starts Android logcat broadcast websocket on the same host and port
+   * where Appium server is running at `/ws/session/:sessionId:/appium/logcat` endpoint. The method
+   * will return immediately if the web socket is already listening.
+   *
+   * Each connected websocket listener will receive logcat log lines
+   * as soon as they are visible to Appium.
+   */
+  async mobileStartLogsBroadcast() {
+    const server = /** @type {import('@appium/types').AppiumServer} */ (this.server);
+    const adb = /** @type {ADB} */ (this.adb);
+    const pathname = WEBSOCKET_ENDPOINT(/** @type {string} */ (this.sessionId));
+    if (!_.isEmpty(await server.getWebSocketHandlers(pathname))) {
+      log.debug(`The logcat broadcasting web socket server is already listening at ${pathname}`);
+      return;
     }
-    this.adb.setLogcatListener(this._logcatWebsocketListener);
 
-    ws.on('close', (code, reason) => {
-      if (!_.isEmpty(this._logcatWebsocketListener)) {
-        try {
-          this.adb.removeLogcatListener(this._logcatWebsocketListener);
-        } catch (ign) {}
-        this._logcatWebsocketListener = null;
+    log.info(
+      `Starting logcat broadcasting on web socket server ` +
+        `${JSON.stringify(server.address())} to ${pathname}`
+    );
+    // https://github.com/websockets/ws/blob/master/doc/ws.md
+    const wss = new WebSocket.Server({
+      noServer: true,
+    });
+    wss.on('connection', (ws, req) => {
+      if (req) {
+        const remoteIp = _.isEmpty(req.headers['x-forwarded-for'])
+          ? req.connection?.remoteAddress
+          : req.headers['x-forwarded-for'];
+        log.debug(`Established a new logcat listener web socket connection from ${remoteIp}`);
+      } else {
+        log.debug('Established a new logcat listener web socket connection');
       }
 
-      let closeMsg = 'Logcat listener web socket is closed.';
-      if (!_.isEmpty(code)) {
-        closeMsg += ` Code: ${code}.`;
-      }
-      if (!_.isEmpty(reason)) {
-        closeMsg += ` Reason: ${reason.toString()}.`;
+      if (_.isEmpty(this._logcatWebsocketListener)) {
+        this._logcatWebsocketListener = (logRecord) => {
+          if (ws?.readyState === WebSocket.OPEN) {
+            ws.send(logRecord.message);
+          }
+        };
       }
-      log.debug(closeMsg);
+      adb.setLogcatListener(this._logcatWebsocketListener);
+
+      ws.on('close', (code, reason) => {
+        if (!_.isEmpty(this._logcatWebsocketListener)) {
+          try {
+            adb.removeLogcatListener(this._logcatWebsocketListener);
+          } catch (ign) {}
+          this._logcatWebsocketListener = undefined;
+        }
+
+        let closeMsg = 'Logcat listener web socket is closed.';
+        if (!_.isEmpty(code)) {
+          closeMsg += ` Code: ${code}.`;
+        }
+        if (!_.isEmpty(reason)) {
+          closeMsg += ` Reason: ${reason.toString()}.`;
+        }
+        log.debug(closeMsg);
+      });
     });
-  });
-  await this.server.addWebSocketHandler(pathname, wss);
-};
+    await server.addWebSocketHandler(
+      pathname,
+      /** @type {import('@appium/types').WSServer} */ (wss)
+    );
+  },
+  /**
+   * Stops the previously started logcat broadcasting wesocket server.
+   * This method will return immediately if no server is running.
+   */
+  async mobileStopLogsBroadcast() {
+    const pathname = WEBSOCKET_ENDPOINT(/** @type {string} */ (this.sessionId));
+    const server = /** @type {import('@appium/types').AppiumServer} */ (this.server);
+    if (_.isEmpty(await server.getWebSocketHandlers(pathname))) {
+      return;
+    }
 
-/**
- * Stops the previously started logcat broadcasting wesocket server.
- * This method will return immediately if no server is running.
- */
-commands.mobileStopLogsBroadcast = async function mobileStopLogsBroadcast () {
-  const pathname = WEBSOCKET_ENDPOINT(this.sessionId);
-  if (_.isEmpty(await this.server.getWebSocketHandlers(pathname))) {
-    return;
-  }
+    log.debug(
+      `Stopping logcat broadcasting on web socket server ` +
+        `${JSON.stringify(server.address())} to ${pathname}`
+    );
+    await server.removeWebSocketHandler(pathname);
+  },
 
-  log.debug(`Stopping logcat broadcasting on web socket server ` +
-    `${JSON.stringify(this.server.address())} to ${pathname}`);
-  await this.server.removeWebSocketHandler(pathname);
-};
+  async getLogTypes() {
+    // XXX why doesn't `super` work here?
+    const nativeLogTypes = await BaseDriver.prototype.getLogTypes.call(this);
+    if (this.isWebContext()) {
+      const webLogTypes = /** @type {string[]} */ (
+        await /** @type {import('appium-chromedriver').Chromedriver} */ (
+          this.chromedriver
+        ).jwproxy.command('/log/types', 'GET')
+      );
+      return [...nativeLogTypes, ...webLogTypes];
+    }
+    return nativeLogTypes;
+  },
 
-commands.getLogTypes = async function getLogTypes () {
-  const nativeLogTypes = await BaseDriver.prototype.getLogTypes.call(this);
-  if (this.isWebContext()) {
-    const webLogTypes = await this.chromedriver.jwproxy.command('/log/types', 'GET');
-    return [...nativeLogTypes, ...webLogTypes];
-  }
-  return nativeLogTypes;
+  async getLog(logType) {
+    if (this.isWebContext() && !_.keys(this.supportedLogTypes).includes(logType)) {
+      return await /** @type {import('appium-chromedriver').Chromedriver} */ (
+        this.chromedriver
+      ).jwproxy.command('/log', 'POST', {type: logType});
+    }
+    // XXX why doesn't `super` work here?
+    return await BaseDriver.prototype.getLog.call(this, logType);
+  },
 };
 
-commands.getLog = async function getLog (logType) {
-  if (this.isWebContext() && !_.keys(this.supportedLogTypes).includes(logType)) {
-    return await this.chromedriver.jwproxy.command('/log', 'POST', {type: logType});
-  }
-  return await BaseDriver.prototype.getLog.call(this, logType);
-};
+mixin(LogMixin);
+
+export default LogMixin;
 
-Object.assign(extensions, commands, helpers);
-export { commands, helpers };
-export default extensions;
+/**
+ * @typedef {import('appium-adb').ADB} ADB
+ */