appium-xcuitest-driver 7.31.0 → 7.32.1

package/lib/commands/context.js

@@ -4,6 +4,9 @@ import {util, timing} from 'appium/support';
 import IOSPerformanceLog from '../device-log/ios-performance-log';
 import _ from 'lodash';
 import { NATIVE_WIN } from '../utils';
+import { makeContextUpdatedEvent } from './bidi/models';
+import { BIDI_EVENT_NAME } from './bidi/constants';
+import { assignBiDiLogListener } from './log';
 
 const WEBVIEW_WIN = 'WEBVIEW';
 const WEBVIEW_BASE = `${WEBVIEW_WIN}_`;
@@ -345,6 +348,7 @@ const extensions = {
       (async () => {
         try {
           await /** @type {RemoteDebugger} */ (this.remote).selectPage(appIdKey, parseInt(newPage, 10));
+          await notifyBiDiContextChange.bind(this)();
         } catch (e) {
           this.log.warn(`Failed to select page: ${e.message}`);
           this.curContext = oldContext;
@@ -372,6 +376,7 @@ const helpers = {
     }
     await this.remote.disconnect();
     this.curContext = null;
+    await notifyBiDiContextChange.bind(this)();
     this.curWebFrames = [];
     this.remote = null;
   },
@@ -519,6 +524,7 @@ const commands = {
     if (isNativeContext(strName)) {
       // switching into the native context
       this.curContext = null;
+      await notifyBiDiContextChange.bind(this)();
       return;
     }
 
@@ -548,6 +554,7 @@ const commands = {
     try {
       this.selectingNewPage = true;
       await (/** @type {RemoteDebugger} */ (this.remote)).selectPage(appIdKey, pageIdKey, skipReadyCheck);
+      await notifyBiDiContextChange.bind(this)();
     } catch (err) {
       this.curContext = this.curWindowHandle = oldContext;
       throw err;
@@ -559,7 +566,7 @@ const commands = {
     if (this.opts.enablePerformanceLogging && this.remote) {
       const context = this.curContext;
       this.log.debug(`Starting performance log on '${context}'`);
-      [this.logs.performance,] = this.assignBiDiLogListener(
+      [this.logs.performance,] = assignBiDiLogListener.bind(this)(
         new IOSPerformanceLog({
           remoteDebugger: this.remote,
           log: this.log,
@@ -699,6 +706,17 @@ function isUrlIgnored(url, safariIgnoreWebHostnames) {
   return false;
 }
 
+/**
+ * https://github.com/appium/appium/issues/20741
+ *
+ * @this {XCUITestDriver}
+ * @returns {Promise<void>}
+ */
+export async function notifyBiDiContextChange() {
+  const name = await this.getCurrentContext();
+  this.eventEmitter.emit(BIDI_EVENT_NAME, makeContextUpdatedEvent(name));
+}
+
 export default {...helpers, ...extensions, ...commands};
 
 /**

package/lib/commands/log.js

@@ -8,7 +8,9 @@ import WebSocket from 'ws';
 import SafariConsoleLog from '../device-log/safari-console-log';
 import SafariNetworkLog from '../device-log/safari-network-log';
 import { toLogEntry } from '../device-log/helpers';
-import { NATIVE_WIN, BIDI_EVENT_NAME } from '../utils';
+import { NATIVE_WIN } from '../utils';
+import { BIDI_EVENT_NAME } from './bidi/constants';
+import { makeLogEntryAddedEvent } from './bidi/models';
 
 /**
  * Determines the websocket endpoint based on the `sessionId`
@@ -107,42 +109,6 @@ export default {
     );
   },
 
-  /**
-   * https://w3c.github.io/webdriver-bidi/#event-log-entryAdded
-   *
-   * @template {import('node:events').EventEmitter} EE
-   * @this {XCUITestDriver}
-   * @param {EE} logEmitter
-   * @param {BiDiListenerProperties} properties
-   * @returns {[EE, import('./types').LogListener]}
-   */
-  assignBiDiLogListener (logEmitter, properties) {
-    const {
-      type,
-      context = NATIVE_WIN,
-      srcEventName = 'output',
-      entryTransformer,
-    } = properties;
-    const listener = (/** @type {import('./types').LogEntry} */ logEntry) => {
-      const finalEntry = entryTransformer ? entryTransformer(logEntry) : logEntry;
-      this.eventEmitter.emit(BIDI_EVENT_NAME, {
-        context,
-        method: 'log.entryAdded',
-        params: {
-          type,
-          level: finalEntry.level,
-          source: {
-            realm: '',
-          },
-          text: finalEntry.message,
-          timestamp: finalEntry.timestamp,
-        },
-      });
-    };
-    logEmitter.on(srcEventName, listener);
-    return [logEmitter, listener];
-  },
-
   /**
    * @this {XCUITestDriver}
    */
@@ -154,7 +120,7 @@ export default {
     }
 
     if (_.isUndefined(this.logs.syslog)) {
-      [this.logs.crashlog,] = this.assignBiDiLogListener(
+      [this.logs.crashlog,] = assignBiDiLogListener.bind(this)(
         new IOSCrashLog({
           sim: /** @type {import('appium-ios-simulator').Simulator} */ (this.device),
           udid: this.isRealDevice() ? this.opts.udid : undefined,
@@ -163,7 +129,7 @@ export default {
           type: 'crashlog',
         }
       );
-      [this.logs.syslog,] = this.assignBiDiLogListener(
+      [this.logs.syslog,] = assignBiDiLogListener.bind(this)(
         this.isRealDevice()
           ? new IOSDeviceLog({
             udid: this.opts.udid,
@@ -182,7 +148,7 @@ export default {
         }
       );
       if (_.isBoolean(this.opts.showSafariConsoleLog)) {
-        [this.logs.safariConsole,] = this.assignBiDiLogListener(
+        [this.logs.safariConsole,] = assignBiDiLogListener.bind(this)(
           new SafariConsoleLog({
             showLogs: this.opts.showSafariConsoleLog,
             log: this.log,
@@ -192,7 +158,7 @@ export default {
         );
       }
       if (_.isBoolean(this.opts.showSafariNetworkLog)) {
-        [this.logs.safariNetwork,] = this.assignBiDiLogListener(
+        [this.logs.safariNetwork,] = assignBiDiLogListener.bind(this)(
           new SafariNetworkLog({
             showLogs: this.opts.showSafariNetworkLog,
             log: this.log,
@@ -202,7 +168,7 @@ export default {
         );
       }
       if (this.isFeatureEnabled(GET_SERVER_LOGS_FEATURE)) {
-        [, this._bidiServerLogListener] = this.assignBiDiLogListener(
+        [, this._bidiServerLogListener] = assignBiDiLogListener.bind(this)(
           this.log.unwrap(), {
             type: 'server',
             srcEventName: 'log',
@@ -323,14 +289,32 @@ export default {
 };
 
 /**
- * @typedef {import('../driver').XCUITestDriver} XCUITestDriver
+ * https://w3c.github.io/webdriver-bidi/#event-log-entryAdded
+ *
+ * @template {import('node:events').EventEmitter} EE
+ * @this {XCUITestDriver}
+ * @param {EE} logEmitter
+ * @param {BiDiListenerProperties} properties
+ * @returns {[EE, import('./types').LogListener]}
  */
+export function assignBiDiLogListener (logEmitter, properties) {
+  const {
+    type,
+    context = NATIVE_WIN,
+    srcEventName = 'output',
+    entryTransformer,
+  } = properties;
+  const listener = (/** @type {import('./types').LogEntry} */ logEntry) => {
+    const finalEntry = entryTransformer ? entryTransformer(logEntry) : logEntry;
+    this.eventEmitter.emit(BIDI_EVENT_NAME, makeLogEntryAddedEvent(finalEntry, context, type));
+  };
+  logEmitter.on(srcEventName, listener);
+  return [logEmitter, listener];
+}
 
 /**
+ * @typedef {import('../driver').XCUITestDriver} XCUITestDriver
  * @typedef {keyof typeof SUPPORTED_LOG_TYPES} XCUITestDriverLogTypes
- */
-
-/**
  * @typedef {import('@appium/types').AppiumServer} AppiumServer
  */
 

package/lib/driver.js

@@ -62,6 +62,7 @@ import {
   translateDeviceName,
 } from './utils';
 import { AppInfosCache } from './app-infos-cache';
+import { notifyBiDiContextChange } from './commands/context';
 
 const SHUTDOWN_OTHER_FEAT_NAME = 'shutdown_other_sims';
 const CUSTOMIZE_RESULT_BUNDLE_PATH = 'customize_result_bundle_path';
@@ -660,6 +661,9 @@ export class XCUITestDriver extends BaseDriver {
 
     if (this.isSafari() || this.opts.autoWebview) {
       await this.activateRecentWebview();
+    } else {
+      // We want to always setup the initial context value upon session startup
+      await notifyBiDiContextChange.bind(this)();
     }
     if (this.isSafari()) {
       if (shouldSetInitialSafariUrl(this.opts)) {
@@ -2017,7 +2021,6 @@ export class XCUITestDriver extends BaseDriver {
   extractLogs = commands.logExtensions.extractLogs;
   supportedLogTypes = commands.logExtensions.supportedLogTypes;
   startLogCapture = commands.logExtensions.startLogCapture;
-  assignBiDiLogListener = commands.logExtensions.assignBiDiLogListener;
   mobileStartLogsBroadcast = commands.logExtensions.mobileStartLogsBroadcast;
   mobileStopLogsBroadcast = commands.logExtensions.mobileStopLogsBroadcast;
 

package/lib/utils.js

@@ -21,7 +21,6 @@ const XCTEST_LOG_FILES_PATTERNS = [
 ];
 const XCTEST_LOGS_CACHE_FOLDER_PREFIX = 'com.apple.dt.XCTest';
 export const NATIVE_WIN = 'NATIVE_APP';
-export const BIDI_EVENT_NAME = 'bidiEvent';
 
 /**
  * @privateRemarks Is the minimum version really Xcode 7.3?