fix types

appium · Aug 28, 2023 · 923e1b3 · 923e1b3
1 parent 326b3e9
commit 923e1b3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/lib/mixins/connect.js b/lib/mixins/connect.js
@@ -79,7 +79,7 @@ async function connect (timeout = APP_CONNECT_TIMEOUT_MS) {
  try {
  await waitForCondition(() => !_.isEmpty(this.appDict), {
  waitMs: timeout,
- interval: APP_CONNECT_INTERVAL_MS,
+ intervalMs: APP_CONNECT_INTERVAL_MS,
  });
  } catch (err) {
  log.debug(`Timed out waiting for applications to be reported`);
@@ -181,15 +181,15 @@ async function selectApp (currentUrl = null, maxTries = SELECT_APP_RETRIES, igno
  * @returns {Promise<AppPages?>}
  */
 async function searchForApp (currentUrl, maxTries, ignoreAboutBlankUrl) {
- if (!this.rpcClient) {
- throw new Error('rpcClient is undefined. Is the debugger connected?');
- }
-
  const bundleIds = this.includeSafari && !this.isSafari
  ? [this.bundleId, ...this.additionalBundleIds, SAFARI_BUNDLE_ID]
  : [this.bundleId, ...this.additionalBundleIds];
  try {
  return await retryInterval(maxTries, SELECT_APP_RETRY_SLEEP_MS, async (retryCount) => {
+ if (!this.rpcClient) {
+ throw new Error('rpcClient is undefined. Is the debugger connected?');
+ }
+
  logApplicationDictionary(this.appDict);
  const possibleAppIds = getPossibleDebuggerAppKeys(bundleIds, this.appDict);
  log.debug(`Trying out the possible app ids: ${possibleAppIds.join(', ')} (try #${retryCount + 1} of ${maxTries})`);
@@ -200,10 +200,7 @@ async function searchForApp (currentUrl, maxTries, ignoreAboutBlankUrl) {
  continue;
  }
  log.debug(`Attempting app '${attemptedAppIdKey}'`);
- // @ts-ignore rpcClient must be defined
- const [appIdKey, pageDict] = await this.rpcClient.selectApp(
- attemptedAppIdKey, this.onAppConnect.bind(this)
- );
+ const [appIdKey, pageDict] = await this.rpcClient.selectApp(attemptedAppIdKey);
  // in iOS 8.2 the connect logic happens, but with an empty dictionary
  // which leads to the remote debugger getting disconnected, and into a loop
  if (_.isEmpty(pageDict)) {

diff --git a/lib/mixins/message-handlers.js b/lib/mixins/message-handlers.js
@@ -70,7 +70,7 @@ async function onPageChange (err, appIdKey, pageDict) {
 async function onAppConnect (err, dict) {
  const appIdKey = dict.WIRApplicationIdentifierKey;
  log.debug(`Notified that new application '${appIdKey}' has connected`);
- await this.useAppDictLock((done) => {
+ await this.useAppDictLock((/** @type {() => Void} */done) => {
  try {
  this.updateAppsWithDict(dict);
  } finally {

diff --git a/lib/remote-debugger.js b/lib/remote-debugger.js
@@ -48,7 +48,7 @@ class RemoteDebugger extends EventEmitter {
  static EVENT_DISCONNECT;
 
  // methods
- /** @type {(connId: string) => Record<string, any>} */
+ /** @type {() => Promise<void>} */
  setConnectionKey;
  /** @type {() => Promise<void>} */
  disconnect;

diff --git a/lib/rpc/rpc-client-real-device.js b/lib/rpc/rpc-client-real-device.js
@@ -8,12 +8,6 @@ export default class RpcClientRealDevice extends RpcClient {
  super(Object.assign({
  shouldCheckForTarget: false,
  }, opts));
-
- const {
- udid,
- } = opts;
-
- this.udid = udid;
  }
 
  async connect () {

diff --git a/lib/rpc/rpc-client.js b/lib/rpc/rpc-client.js
@@ -50,6 +50,7 @@ export default class RpcClient {
  webInspectorMaxFrameLength,
  socketChunkSize,
  fullPageInitialization = false,
+ udid,
  } = opts;
 
  this.isSafari = isSafari;
@@ -59,6 +60,8 @@ export default class RpcClient {
  this.senderId = util.uuidV4();
  this.msgId = 0;
 
+ this.udid = udid;
+
  this.logAllCommunication = logAllCommunication;
  this.logAllCommunicationHexDump = logAllCommunicationHexDump;
  this.socketChunkSize = socketChunkSize;

diff --git a/test/unit/mixins/execute-specs.js b/test/unit/mixins/execute-specs.js
@@ -55,7 +55,8 @@ describe('execute', function () {
  rpcClient: {
  send () {
  return {result: {objectId: 'fake-object-id'}};
- }
+ },
+ isConnected: true,
  },
  waitForDom () { },
  pageLoading: true,