appium-support - npm Package Compare versions

Comparing version 2.47.0 to 2.47.1

build/lib/net.js

@@ -98,3 +98,5 @@ "use strict";
   const {
-    auth
+    auth,
+    user,
+    pass
   } = uploadOptions;
@@ -109,6 +111,10 @@ const {
     host: hostname,
-    port: port || 21,
-    auth
+    port: port || 21
   };
 
+  if ((auth === null || auth === void 0 ? void 0 : auth.user) && (auth === null || auth === void 0 ? void 0 : auth.pass) || user && pass) {
+    ftpOpts.user = (auth === null || auth === void 0 ? void 0 : auth.user) || user;
+    ftpOpts.pass = (auth === null || auth === void 0 ? void 0 : auth.pass) || pass;
+  }
+
   _logger.default.debug(`${protocol} upload options: ${JSON.stringify(ftpOpts)}`);
@@ -221,2 +227,2 @@
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/net.js"],"names":["toAxiosAuth","auth","_","isPlainObject","axiosAuth","username","user","password","pass","uploadFileToHttp","localFileStream","parsedUri","uploadOptions","method","timeout","headers","fileFieldName","formFields","protocol","href","requestOpts","url","form","FormData","append","pairs","isArray","toPairs","key","value","toLower","data","Object","assign","getHeaders","log","debug","JSON","stringify","uploadFileToFtp","hostname","port","pathname","ftpOpts","host","B","resolve","reject","Ftp","put","err","uploadFile","localPath","remoteUri","fs","exists","Error","isMetered","parse","size","stat","info","timer","Timer","start","includes","createReadStream","getDuration","asSeconds","toFixed","downloadFile","remoteUrl","dstPath","downloadOptions","responseType","writer","createWriteStream","responseStream","pipe","once","e","unpipe","message","secondsElapsed","bytesPerSec","Math","floor"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport fs from './fs';\nimport url from 'url';\nimport B from 'bluebird';\nimport { toReadableSizeString } from './util';\nimport log from './logger';\nimport Ftp from 'jsftp';\nimport Timer from './timing';\nimport axios from 'axios';\nimport FormData from 'form-data';\n\n\nfunction toAxiosAuth (auth) {\n  if (!_.isPlainObject(auth)) {\n    return null;\n  }\n\n  const axiosAuth = {\n    username: auth.username || auth.user,\n    password: auth.password || auth.pass,\n  };\n  return (axiosAuth.username && axiosAuth.password) ? axiosAuth : null;\n}\n\nasync function uploadFileToHttp (localFileStream, parsedUri, uploadOptions = {}) {\n  const {\n    method = 'POST',\n    timeout = 5000,\n    headers,\n    auth,\n    fileFieldName = 'file',\n    formFields,\n  } = uploadOptions;\n  const {\n    protocol,\n    href,\n  } = parsedUri;\n\n  const requestOpts = {\n    url: href,\n    method,\n    timeout,\n  };\n  const axiosAuth = toAxiosAuth(auth);\n  if (axiosAuth) {\n    requestOpts.auth = axiosAuth;\n  }\n  const form = new FormData();\n  form.append(fileFieldName, localFileStream);\n  if (formFields) {\n    let pairs = [];\n    if (_.isArray(formFields)) {\n      pairs = formFields;\n    } else if (_.isPlainObject(formFields)) {\n      pairs = _.toPairs(formFields);\n    }\n    for (const [key, value] of pairs) {\n      if (_.toLower(key) !== _.toLower(fileFieldName)) {\n        form.append(key, value);\n      }\n    }\n  }\n  requestOpts.data = form;\n  requestOpts.headers = Object.assign({}, _.isPlainObject(headers) ? headers : {}, form.getHeaders());\n\n  log.debug(`${protocol} upload options: ${JSON.stringify(requestOpts)}`);\n  await axios(requestOpts);\n}\n\nasync function uploadFileToFtp (localFileStream, parsedUri, uploadOptions = {}) {\n  const {\n    auth,\n  } = uploadOptions;\n  const {\n    hostname,\n    port,\n    protocol,\n    pathname,\n  } = parsedUri;\n\n  const ftpOpts = {\n    host: hostname,\n    port: port || 21,\n    auth,\n  };\n  log.debug(`${protocol} upload options: ${JSON.stringify(ftpOpts)}`);\n  return await new B((resolve, reject) => {\n    new Ftp(ftpOpts).put(localFileStream, pathname, (err) => {\n      if (err) {\n        reject(err);\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\n/**\n * @typedef {Object} AuthCredentials\n * @property {string} user - Non-empty user name\n * @property {string} pass - Non-empty password\n */\n\n/**\n * @typedef {Object} FtpUploadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual upload performance\n * (e.g. timings and speed)\n * @property {AuthCredentials} auth\n */\n\n/**\n * @typedef {Object} HttpUploadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual upload performance\n * (e.g. timings and speed)\n * @property {string} method [POST] - The HTTP method used for file upload\n * @property {AuthCredentials} auth\n * @property {number} timeout [5000] - The actual request timeout in milliseconds\n * @property {Object} headers - Additional request headers mapping\n * @property {string} fileFieldName [file] - The name of the form field containing the file\n * content to be uploaded\n * @property {Array<Pair>|Object} formFields - The additional form fields\n * to be included into the upload request. This property is only considered if\n * `fileFieldName` is set\n */\n\n/**\n * Uploads the given file to a remote location. HTTP(S) and FTP\n * protocols are supported.\n *\n * @param {string} localPath - The path to a file on the local storage.\n * @param {string} remoteUri - The remote URI to upload the file to.\n * @param {?FtpUploadOptions|HttpUploadOptions} uploadOptions\n */\nasync function uploadFile (localPath, remoteUri, uploadOptions = {}) {\n  if (!await fs.exists(localPath)) {\n    throw new Error (`'${localPath}' does not exists or is not accessible`);\n  }\n\n  const {\n    isMetered = true,\n  } = uploadOptions;\n\n  const parsedUri = url.parse(remoteUri);\n  const {size} = await fs.stat(localPath);\n  if (isMetered) {\n    log.info(`Uploading '${localPath}' of ${toReadableSizeString(size)} size to '${remoteUri}'...`);\n  }\n  const timer = new Timer().start();\n  if (['http:', 'https:'].includes(parsedUri.protocol)) {\n    await uploadFileToHttp(fs.createReadStream(localPath), parsedUri, uploadOptions);\n  } else if (parsedUri.protocol === 'ftp:') {\n    await uploadFileToFtp(fs.createReadStream(localPath), parsedUri, uploadOptions);\n  } else {\n    throw new Error(`Cannot upload the file at '${localPath}' to '${remoteUri}'. ` +\n      `Unsupported remote protocol '${parsedUri.protocol}'. ` +\n      `Only http/https and ftp/ftps protocols are supported.`);\n  }\n  if (isMetered) {\n    log.info(`Uploaded '${localPath}' of ${toReadableSizeString(size)} size in ${timer.getDuration().asSeconds.toFixed(3)}s`);\n  }\n}\n\n/**\n * @typedef {Object} DownloadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual download performance\n * (e.g. timings and speed)\n * @property {AuthCredentials} auth\n * @property {number} timeout [5000] - The actual request timeout in milliseconds\n * @property {Object} headers - Request headers mapping\n */\n\n/**\n * Downloads the given file via HTTP(S)\n *\n * @param {string} remoteUrl - The remote url\n * @param {string} dstPath - The local path to download the file to\n * @param {?DownloadOptions} downloadOptions\n * @throws {Error} If download operation fails\n */\nasync function downloadFile (remoteUrl, dstPath, downloadOptions = {}) {\n  const {\n    isMetered = true,\n    auth,\n    timeout = 5000,\n    headers,\n  } = downloadOptions;\n\n  const requestOpts = {\n    url: remoteUrl,\n    responseType: 'stream',\n    timeout,\n  };\n  const axiosAuth = toAxiosAuth(auth);\n  if (axiosAuth) {\n    requestOpts.auth = axiosAuth;\n  }\n  if (_.isPlainObject(headers)) {\n    requestOpts.headers = headers;\n  }\n\n  const timer = new Timer().start();\n  try {\n    const writer = fs.createWriteStream(dstPath);\n    const responseStream = (await axios(requestOpts)).data;\n    responseStream.pipe(writer);\n\n    await new B((resolve, reject) => {\n      responseStream.once('error', reject);\n      writer.once('finish', resolve);\n      writer.once('error', (e) => {\n        responseStream.unpipe(writer);\n        reject(e);\n      });\n    });\n  } catch (err) {\n    throw new Error(`Cannot download the file from ${remoteUrl}: ${err.message}`);\n  }\n  if (!isMetered) {\n    return;\n  }\n\n  const secondsElapsed = timer.getDuration().asSeconds;\n  const {size} = await fs.stat(dstPath);\n  log.debug(`${remoteUrl} (${toReadableSizeString(size)}) ` +\n    `has been downloaded to '${dstPath}' in ${secondsElapsed.toFixed(3)}s`);\n  if (secondsElapsed >= 2) {\n    const bytesPerSec = Math.floor(size / secondsElapsed);\n    log.debug(`Approximate download speed: ${toReadableSizeString(bytesPerSec)}/s`);\n  }\n}\n\nexport { uploadFile, downloadFile };\n"],"file":"lib/net.js","sourceRoot":"../.."}
+//# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["lib/net.js"],"names":["toAxiosAuth","auth","_","isPlainObject","axiosAuth","username","user","password","pass","uploadFileToHttp","localFileStream","parsedUri","uploadOptions","method","timeout","headers","fileFieldName","formFields","protocol","href","requestOpts","url","form","FormData","append","pairs","isArray","toPairs","key","value","toLower","data","Object","assign","getHeaders","log","debug","JSON","stringify","uploadFileToFtp","hostname","port","pathname","ftpOpts","host","B","resolve","reject","Ftp","put","err","uploadFile","localPath","remoteUri","fs","exists","Error","isMetered","parse","size","stat","info","timer","Timer","start","includes","createReadStream","getDuration","asSeconds","toFixed","downloadFile","remoteUrl","dstPath","downloadOptions","responseType","writer","createWriteStream","responseStream","pipe","once","e","unpipe","message","secondsElapsed","bytesPerSec","Math","floor"],"mappings":"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","sourcesContent":["import _ from 'lodash';\nimport fs from './fs';\nimport url from 'url';\nimport B from 'bluebird';\nimport { toReadableSizeString } from './util';\nimport log from './logger';\nimport Ftp from 'jsftp';\nimport Timer from './timing';\nimport axios from 'axios';\nimport FormData from 'form-data';\n\n\nfunction toAxiosAuth (auth) {\n  if (!_.isPlainObject(auth)) {\n    return null;\n  }\n\n  const axiosAuth = {\n    username: auth.username || auth.user,\n    password: auth.password || auth.pass,\n  };\n  return (axiosAuth.username && axiosAuth.password) ? axiosAuth : null;\n}\n\nasync function uploadFileToHttp (localFileStream, parsedUri, uploadOptions = {}) {\n  const {\n    method = 'POST',\n    timeout = 5000,\n    headers,\n    auth,\n    fileFieldName = 'file',\n    formFields,\n  } = uploadOptions;\n  const {\n    protocol,\n    href,\n  } = parsedUri;\n\n  const requestOpts = {\n    url: href,\n    method,\n    timeout,\n  };\n  const axiosAuth = toAxiosAuth(auth);\n  if (axiosAuth) {\n    requestOpts.auth = axiosAuth;\n  }\n  const form = new FormData();\n  form.append(fileFieldName, localFileStream);\n  if (formFields) {\n    let pairs = [];\n    if (_.isArray(formFields)) {\n      pairs = formFields;\n    } else if (_.isPlainObject(formFields)) {\n      pairs = _.toPairs(formFields);\n    }\n    for (const [key, value] of pairs) {\n      if (_.toLower(key) !== _.toLower(fileFieldName)) {\n        form.append(key, value);\n      }\n    }\n  }\n  requestOpts.data = form;\n  requestOpts.headers = Object.assign({}, _.isPlainObject(headers) ? headers : {}, form.getHeaders());\n\n  log.debug(`${protocol} upload options: ${JSON.stringify(requestOpts)}`);\n  await axios(requestOpts);\n}\n\nasync function uploadFileToFtp (localFileStream, parsedUri, uploadOptions = {}) {\n  const {\n    auth,\n    user,\n    pass,\n  } = uploadOptions;\n  const {\n    hostname,\n    port,\n    protocol,\n    pathname,\n  } = parsedUri;\n\n  const ftpOpts = {\n    host: hostname,\n    port: port || 21,\n  };\n  if ((auth?.user && auth?.pass) || (user && pass)) {\n    ftpOpts.user = auth?.user || user;\n    ftpOpts.pass = auth?.pass || pass;\n  }\n  log.debug(`${protocol} upload options: ${JSON.stringify(ftpOpts)}`);\n  return await new B((resolve, reject) => {\n    new Ftp(ftpOpts).put(localFileStream, pathname, (err) => {\n      if (err) {\n        reject(err);\n      } else {\n        resolve();\n      }\n    });\n  });\n}\n\n/**\n * @typedef {Object} AuthCredentials\n * @property {string} user - Non-empty user name\n * @property {string} pass - Non-empty password\n */\n\n/**\n * @typedef {Object} FtpUploadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual upload performance\n * (e.g. timings and speed)\n * @property {AuthCredentials} auth\n */\n\n/**\n * @typedef {Object} HttpUploadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual upload performance\n * (e.g. timings and speed)\n * @property {string} method [POST] - The HTTP method used for file upload\n * @property {AuthCredentials} auth\n * @property {number} timeout [5000] - The actual request timeout in milliseconds\n * @property {Object} headers - Additional request headers mapping\n * @property {string} fileFieldName [file] - The name of the form field containing the file\n * content to be uploaded\n * @property {Array<Pair>|Object} formFields - The additional form fields\n * to be included into the upload request. This property is only considered if\n * `fileFieldName` is set\n */\n\n/**\n * Uploads the given file to a remote location. HTTP(S) and FTP\n * protocols are supported.\n *\n * @param {string} localPath - The path to a file on the local storage.\n * @param {string} remoteUri - The remote URI to upload the file to.\n * @param {?FtpUploadOptions|HttpUploadOptions} uploadOptions\n */\nasync function uploadFile (localPath, remoteUri, uploadOptions = {}) {\n  if (!await fs.exists(localPath)) {\n    throw new Error (`'${localPath}' does not exists or is not accessible`);\n  }\n\n  const {\n    isMetered = true,\n  } = uploadOptions;\n\n  const parsedUri = url.parse(remoteUri);\n  const {size} = await fs.stat(localPath);\n  if (isMetered) {\n    log.info(`Uploading '${localPath}' of ${toReadableSizeString(size)} size to '${remoteUri}'...`);\n  }\n  const timer = new Timer().start();\n  if (['http:', 'https:'].includes(parsedUri.protocol)) {\n    await uploadFileToHttp(fs.createReadStream(localPath), parsedUri, uploadOptions);\n  } else if (parsedUri.protocol === 'ftp:') {\n    await uploadFileToFtp(fs.createReadStream(localPath), parsedUri, uploadOptions);\n  } else {\n    throw new Error(`Cannot upload the file at '${localPath}' to '${remoteUri}'. ` +\n      `Unsupported remote protocol '${parsedUri.protocol}'. ` +\n      `Only http/https and ftp/ftps protocols are supported.`);\n  }\n  if (isMetered) {\n    log.info(`Uploaded '${localPath}' of ${toReadableSizeString(size)} size in ${timer.getDuration().asSeconds.toFixed(3)}s`);\n  }\n}\n\n/**\n * @typedef {Object} DownloadOptions\n * @property {boolean} isMetered [true] - Whether to log the actual download performance\n * (e.g. timings and speed)\n * @property {AuthCredentials} auth\n * @property {number} timeout [5000] - The actual request timeout in milliseconds\n * @property {Object} headers - Request headers mapping\n */\n\n/**\n * Downloads the given file via HTTP(S)\n *\n * @param {string} remoteUrl - The remote url\n * @param {string} dstPath - The local path to download the file to\n * @param {?DownloadOptions} downloadOptions\n * @throws {Error} If download operation fails\n */\nasync function downloadFile (remoteUrl, dstPath, downloadOptions = {}) {\n  const {\n    isMetered = true,\n    auth,\n    timeout = 5000,\n    headers,\n  } = downloadOptions;\n\n  const requestOpts = {\n    url: remoteUrl,\n    responseType: 'stream',\n    timeout,\n  };\n  const axiosAuth = toAxiosAuth(auth);\n  if (axiosAuth) {\n    requestOpts.auth = axiosAuth;\n  }\n  if (_.isPlainObject(headers)) {\n    requestOpts.headers = headers;\n  }\n\n  const timer = new Timer().start();\n  try {\n    const writer = fs.createWriteStream(dstPath);\n    const responseStream = (await axios(requestOpts)).data;\n    responseStream.pipe(writer);\n\n    await new B((resolve, reject) => {\n      responseStream.once('error', reject);\n      writer.once('finish', resolve);\n      writer.once('error', (e) => {\n        responseStream.unpipe(writer);\n        reject(e);\n      });\n    });\n  } catch (err) {\n    throw new Error(`Cannot download the file from ${remoteUrl}: ${err.message}`);\n  }\n  if (!isMetered) {\n    return;\n  }\n\n  const secondsElapsed = timer.getDuration().asSeconds;\n  const {size} = await fs.stat(dstPath);\n  log.debug(`${remoteUrl} (${toReadableSizeString(size)}) ` +\n    `has been downloaded to '${dstPath}' in ${secondsElapsed.toFixed(3)}s`);\n  if (secondsElapsed >= 2) {\n    const bytesPerSec = Math.floor(size / secondsElapsed);\n    log.debug(`Approximate download speed: ${toReadableSizeString(bytesPerSec)}/s`);\n  }\n}\n\nexport { uploadFile, downloadFile };\n"],"file":"lib/net.js","sourceRoot":"../.."}

lib/net.js

@@ -73,2 +73,4 @@ import _ from 'lodash';
     auth,
+    user,
+    pass,
   } = uploadOptions;
@@ -85,4 +87,7 @@ const {
     port: port || 21,
-    auth,
   };
+  if ((auth?.user && auth?.pass) || (user && pass)) {
+    ftpOpts.user = auth?.user || user;
+    ftpOpts.pass = auth?.pass || pass;
+  }
   log.debug(`${protocol} upload options: ${JSON.stringify(ftpOpts)}`);
@@ -89,0 +94,0 @@ return await new B((resolve, reject) => {

package.json

@@ -7,3 +7,3 @@ {
   ],
-  "version": "2.47.0",
+  "version": "2.47.1",
   "author": "appium",
@@ -87,3 +87,3 @@ "license": "Apache-2.0",
     "ajv": "^6.5.3",
-    "appium-gulp-plugins": "^5.1.1",
+    "appium-gulp-plugins": "^5.2.1",
     "asyncbox": "^2.3.1",
@@ -90,0 +90,0 @@ "chai": "^4.1.2",

No alert changes

Improved metrics

Total package byte prevSize

402105

increased by0.29%

Lines of code

5544

increased by0.24%

No dependency changes