appium-mac2-driver 4.3.6 → 4.5.0

package/node_modules/async-lock/package.json

@@ -0,0 +1,48 @@
+{
+  "name": "async-lock",
+  "description": "Lock on asynchronous code",
+  "version": "1.4.1",
+  "author": {
+    "name": "Rogier Schouten",
+    "url": "https://github.com/rogierschouten/",
+    "email": "github@workingcode.ninja"
+  },
+  "private": false,
+  "homepage": "https://github.com/rogierschouten/async-lock",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/rogierschouten/async-lock.git"
+  },
+  "bugs": {
+    "url": "https://github.com/rogierschouten/async-lock/issues"
+  },
+  "license": "MIT",
+  "keywords": [
+    "lock",
+    "async",
+    "concurrency",
+    "critical",
+    "section",
+    "mutex"
+  ],
+  "engines": {},
+  "scripts": {
+    "start": "grunt",
+    "test": "grunt test"
+  },
+  "devDependencies": {
+    "bluebird": "^3.5.1",
+    "grunt": "^1.0.4",
+    "grunt-cli": "^1.2.0",
+    "grunt-contrib-clean": "^1.1.0",
+    "grunt-contrib-jshint": "^3.2.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-env": "^1.0.1",
+    "grunt-mocha-test": "^0.13.3",
+    "load-grunt-tasks": "^4.0.0",
+    "lodash": "^4.17.20",
+    "mocha": "^10.2.0",
+    "q": "^1.5.1",
+    "should": "^13.2.1"
+  }
+}

package/node_modules/bare-fs/binding.c

@@ -294,7 +294,7 @@ bare_fs_request_result_stat(js_env_t *env, js_callback_info_t *info) {
     uv_timespec_t time = req->handle.statbuf.st_##property; \
 \
     js_value_t *value; \
-    err = js_create_int64(env, time.tv_sec * 1000 + time.tv_nsec / 1000000, &value); \
+    err = js_create_int64(env, (int64_t) time.tv_sec * 1000 + time.tv_nsec / 1000000, &value); \
     assert(err == 0); \
 \
     err = js_set_element(env, result, i++, value); \

package/node_modules/bare-fs/index.js

@@ -1469,6 +1469,20 @@ async function cp(src, dst, opts, cb) {
     } else if (st.isFile()) {
       await copyFile(src, dst)
       await chmod(dst, st.mode)
+    } else if (st.isSymbolicLink()) {
+      try {
+        if (!(await lstat(dst)).isDirectory()) await unlink(dst)
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e
+      }
+
+      await symlink(await readlink(src), dst)
+    } else {
+      throw new FileError('cannot copy a special file', {
+        operation: 'cp',
+        code: 'ENOTSUP',
+        path: src
+      })
     }
   } catch (e) {
     err = e
@@ -1503,6 +1517,20 @@ function cpSync(src, dst, opts = {}) {
   } else if (st.isFile()) {
     copyFileSync(src, dst)
     chmodSync(dst, st.mode)
+  } else if (st.isSymbolicLink()) {
+    try {
+      if (!lstatSync(dst).isDirectory()) unlinkSync(dst)
+    } catch (e) {
+      if (e.code !== 'ENOENT') throw e
+    }
+
+    symlinkSync(readlinkSync(src), dst)
+  } else {
+    throw new FileError('cannot copy a special file', {
+      operation: 'cp',
+      code: 'ENOTSUP',
+      path: src
+    })
   }
 }
 
@@ -1736,9 +1764,7 @@ async function symlink(target, filepath, type, cb) {
       target = path.resolve(filepath, '..', target)
 
       try {
-        type = (await stat(target)).isDirectory()
-          ? constants.UV_FS_SYMLINK_DIR
-          : constants.UV_FS_SYMLINK_JUNCTION
+        type = (await stat(target)).isDirectory() ? constants.UV_FS_SYMLINK_DIR : 0
       } catch {
         type = 0
       }
@@ -1791,9 +1817,7 @@ function symlinkSync(target, filepath, type) {
       target = path.resolve(filepath, '..', target)
 
       try {
-        type = statSync(target).isDirectory()
-          ? constants.UV_FS_SYMLINK_DIR
-          : constants.UV_FS_SYMLINK_JUNCTION
+        type = statSync(target).isDirectory() ? constants.UV_FS_SYMLINK_DIR : 0
       } catch {
         type = 0
       }

package/node_modules/bare-fs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-fs",
-  "version": "4.8.2",
+  "version": "4.8.4",
   "description": "Native file system operations for Bare",
   "exports": {
     "./package": "./package.json",

package/node_modules/bare-url/README.md

@@ -28,6 +28,10 @@ require('bare-url/global')
 
 See the [`bare-url` reference](https://docs.pears.com/reference/bare/modules/bare-url).
 
+## Threat model
+
+`bare-url` is one of the addons Bare compiles into its binary, so it inherits [Bare's threat model](https://github.com/holepunchto/bare/blob/main/docs/threat-model.md). See [`docs/threat-model.md`](docs/threat-model.md) for where this addon sits in it.
+
 ## License
 
 Apache-2.0

package/node_modules/bare-url/index.d.ts

@@ -87,6 +87,9 @@ declare namespace URL {
   /**
    * Convert a platform-specific file path to a `file:` URL.
    * @param pathname - The platform-specific file path to convert.
+   * @throws {INVALID_ARG_VALUE} (Windows) the path is a UNC path with an empty server name or
+   * no resource path.
+   * @throws {INVALID_URL} the path does not form a valid `file:` URL.
    */
   export function pathToFileURL(pathname: string): URL
 

package/node_modules/bare-url/index.js

@@ -494,6 +494,26 @@ function encodePath(value) {
   return value.replace(pathDelimiterAll, (match) => escapes[match])
 }
 
+function encodeFilePath(value) {
+  // Paths hardly ever contain any of these, so one pass to rule them out is
+  // cheaper than the six or seven replacements it stands in for.
+  if (!reserved.test(value)) return value
+
+  value = value
+    .replaceAll('%', '%25') // Must be first
+    .replaceAll('#', '%23')
+    .replaceAll('?', '%3f')
+    .replaceAll('\n', '%0a')
+    .replaceAll('\r', '%0d')
+    .replaceAll('\t', '%09')
+
+  if (!isWindows) {
+    value = value.replaceAll('\\', '%5c')
+  }
+
+  return value
+}
+
 function encodeQuery(value) {
   if (value.indexOf('#') === -1) return value
 
@@ -600,7 +620,27 @@ exports.fileURLToPath = function fileURLToPath(url) {
 }
 
 exports.pathToFileURL = function pathToFileURL(pathname) {
-  let resolved = path.resolve(pathname)
+  const isUNC = isWindows && pathname.startsWith('\\\\')
+
+  let resolved = isUNC ? pathname : path.resolve(pathname)
+
+  if (isUNC || (isWindows && resolved.startsWith('\\\\'))) {
+    // https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation
+    const hostStart = resolved.startsWith('\\\\?\\UNC\\') ? 8 : 2
+    const hostEnd = resolved.indexOf('\\', hostStart)
+
+    if (hostEnd === -1) {
+      throw errors.INVALID_ARG_VALUE('Missing UNC resource path')
+    }
+
+    if (hostEnd === 2) {
+      throw errors.INVALID_ARG_VALUE('Empty UNC servername')
+    }
+
+    const hostname = truncateHost('file', resolved.slice(hostStart, hostEnd))
+
+    return new URL('file://' + hostname + encodeFilePath(resolved.slice(hostEnd)))
+  }
 
   if (pathname[pathname.length - 1] === '/') {
     resolved += '/'
@@ -608,23 +648,7 @@ exports.pathToFileURL = function pathToFileURL(pathname) {
     resolved += '\\'
   }
 
-  // Paths hardly ever contain any of these, so one pass to rule them out is
-  // cheaper than the six or seven replacements it stands in for.
-  if (reserved.test(resolved)) {
-    resolved = resolved
-      .replaceAll('%', '%25') // Must be first
-      .replaceAll('#', '%23')
-      .replaceAll('?', '%3f')
-      .replaceAll('\n', '%0a')
-      .replaceAll('\r', '%0d')
-      .replaceAll('\t', '%09')
-
-    if (!isWindows) {
-      resolved = resolved.replaceAll('\\', '%5c')
-    }
-  }
-
-  return new URL('file:' + resolved)
+  return new URL('file:' + encodeFilePath(resolved))
 }
 
 exports.format = function format(parts) {

package/node_modules/bare-url/lib/errors.js

@@ -30,4 +30,8 @@ module.exports = class URLError extends Error {
   static INVALID_FILE_URL_PATH(msg = 'Invalid file: URL path') {
     return new URLError(msg, URLError.INVALID_FILE_URL_PATH)
   }
+
+  static INVALID_ARG_VALUE(msg = 'Invalid argument value') {
+    return new URLError(msg, URLError.INVALID_ARG_VALUE)
+  }
 }

package/node_modules/bare-url/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-url",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "WHATWG URL implementation for JavaScript",
   "exports": {
     "./package": "./package.json",

package/node_modules/readable-stream/lib/internal/shims/process.js

@@ -0,0 +1,19 @@
+'use strict'
+
+/* wraps the internal process module, circumventing issues with some polyfills (see #539) */
+const process = ((base, esmKey, keys, isValid) => {
+  if (esmKey in base && base[esmKey] === true) {
+    let candidate
+    for (const key of keys) {
+      if (!(key in base)) {
+        continue
+      }
+      candidate = base[key]
+      if (isValid(candidate)) {
+        return candidate
+      }
+    }
+  }
+  return base
+})(require('process/'), '__esModule', ['default', 'process'], (candidate) => 'nextTick' in candidate)
+module.exports = process

package/node_modules/readable-stream/lib/internal/streams/destroy.js

@@ -2,7 +2,7 @@
 
 /* replacement start */
 
-const process = require('process/')
+const process = require('../shims/process')
 
 /* replacement end */
 

package/node_modules/readable-stream/lib/internal/streams/duplexify.js

@@ -1,6 +1,6 @@
 /* replacement start */
 
-const process = require('process/')
+const process = require('../shims/process')
 
 /* replacement end */
 

package/node_modules/readable-stream/lib/internal/streams/end-of-stream.js

@@ -5,7 +5,7 @@
 
 /* replacement start */
 
-const process = require('process/')
+const process = require('../shims/process')
 
 /* replacement end */
 

package/node_modules/readable-stream/lib/internal/streams/from.js

@@ -2,7 +2,7 @@
 
 /* replacement start */
 
-const process = require('process/')
+const process = require('../shims/process')
 
 /* replacement end */
 

package/node_modules/readable-stream/lib/internal/streams/legacy.js

@@ -42,8 +42,13 @@ Stream.prototype.pipe = function (dest, options) {
 
   // Don't leave dangling pipes when there are errors.
   function onerror(er) {
+    var _this$listenerCount
     cleanup()
-    if (EE.listenerCount(this, 'error') === 0) {
+    if (
+      ((_this$listenerCount = this.listenerCount) === null || _this$listenerCount === undefined
+        ? undefined
+        : _this$listenerCount.call(this, 'error')) === 0
+    ) {
       this.emit('error', er)
     }
   }

package/node_modules/readable-stream/lib/internal/streams/pipeline.js

@@ -1,6 +1,6 @@
 /* replacement start */
 
-const process = require('process/')
+const process = require('../shims/process')
 
 /* replacement end */
 // Ported from https://github.com/mafintosh/pump with

package/node_modules/readable-stream/lib/internal/streams/readable.js

@@ -23,7 +23,7 @@
 
 /* replacement start */
 
-const process = require('process/')
+const process = require('../shims/process')
 
 /* replacement end */
 

package/node_modules/readable-stream/lib/internal/streams/writable.js

@@ -27,7 +27,7 @@
 
 /* replacement start */
 
-const process = require('process/')
+const process = require('../shims/process')
 
 /* replacement end */
 

package/node_modules/readable-stream/package.json

@@ -1,6 +1,6 @@
 {
   "name": "readable-stream",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "Node.js Streams, a user-land copy of the stream library from Node.js",
   "homepage": "https://github.com/nodejs/readable-stream",
   "license": "MIT",
@@ -17,7 +17,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git://github.com/nodejs/readable-stream"
+    "url": "https://github.com/nodejs/readable-stream"
   },
   "bugs": {
     "url": "https://github.com/nodejs/readable-stream/issues"
@@ -61,6 +61,7 @@
     "@rollup/plugin-inject": "^4.0.4",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@sinonjs/fake-timers": "^9.1.2",
+    "ajv": "^8.20.0",
     "browserify": "^17.0.0",
     "c8": "^7.11.2",
     "esbuild": "^0.19.9",

package/node_modules/tar-stream/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tar-stream",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "tar-stream is a streaming tar parser and generator and nothing else. It operates purely using streams which means you can easily extract/parse tarballs without ever hitting the file system.",
   "main": "index.js",
   "exports": {
@@ -24,7 +24,7 @@
     }
   },
   "scripts": {
-    "test": "standard && brittle test/*.js"
+    "test": "standard && brittle-node test/*.js"
   },
   "repository": {
     "type": "git",
@@ -37,13 +37,13 @@
   },
   "homepage": "https://github.com/mafintosh/tar-stream",
   "dependencies": {
-    "b4a": "^1.6.4",
-    "bare-fs": "^4.5.5",
-    "fast-fifo": "^1.2.0",
-    "streamx": "^2.15.0"
+    "b4a": "^1.9.0",
+    "bare-fs": "^4.8.2",
+    "fast-fifo": "^1.3.2",
+    "streamx": "^2.28.1"
   },
   "devDependencies": {
-    "brittle": "^3.3.2",
+    "brittle": "^4.3.0",
     "concat-stream": "^2.0.0",
     "standard": "^17.0.1"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-mac2-driver",
-  "version": "4.3.6",
+  "version": "4.5.0",
   "description": "XCTest-based Appium driver for macOS apps automation",
   "keywords": [
     "XCTest",
@@ -47,7 +47,8 @@
   "dependencies": {
     "@appium/strongbox": "2.0.1",
     "@colors/colors": "1.6.1",
-    "appium-xcode": "7.2.2",
+    "appium-xcode": "7.2.3",
+    "async-lock": "1.4.1",
     "asyncbox": "6.4.3",
     "axios": "1.20.0",
     "portscanner": "2.2.0",
@@ -68,7 +69,8 @@
     ],
     "mainClass": "Mac2Driver",
     "scripts": {
-      "open-wda": "./scripts/open-wda.mjs"
+      "open-wda": "./scripts/open-wda.mjs",
+      "setup-accessibility": "./scripts/setup-accessibility.mjs"
     },
     "doctor": {
       "checks": [
@@ -81,6 +83,7 @@
     "@appium/strongbox",
     "@colors/colors",
     "appium-xcode",
+    "async-lock",
     "asyncbox",
     "axios",
     "portscanner",