Rename more

lib/net.js

@@ -22,7 +22,7 @@ function toAxiosAuth (auth) {
   return (axiosAuth.username && axiosAuth.password) ? axiosAuth : null;
 }
 
-async function uploadFileToHttp (localFileStream, parsedUrl, uploadOptions = {}) {
+async function uploadFileToHttp (localFileStream, parsedUri, uploadOptions = {}) {
   const {
     method = 'POST',
     timeout = 5000,
@@ -34,7 +34,7 @@ async function uploadFileToHttp (localFileStream, parsedUrl, uploadOptions = {})
   const {
     protocol,
     href,
-  } = parsedUrl;
+  } = parsedUri;
 
   const requestOpts = {
     url: href,
@@ -67,7 +67,7 @@ async function uploadFileToHttp (localFileStream, parsedUrl, uploadOptions = {})
   await axios(requestOpts);
 }
 
-async function uploadFileToFtp (localFileStream, parsedUrl, uploadOptions = {}) {
+async function uploadFileToFtp (localFileStream, parsedUri, uploadOptions = {}) {
   const {
     auth,
   } = uploadOptions;
@@ -76,7 +76,7 @@ async function uploadFileToFtp (localFileStream, parsedUrl, uploadOptions = {})
     port,
     protocol,
     pathname,
-  } = parsedUrl;
+  } = parsedUri;
 
   const ftpOpts = {
     host: hostname,
@@ -140,20 +140,20 @@ async function uploadFile (localPath, remoteUri, uploadOptions = {}) {
     isMetered = true,
   } = uploadOptions;
 
-  const remoteUrl = url.parse(remoteUri);
+  const parsedUri = url.parse(remoteUri);
   const {size} = await fs.stat(localPath);
   if (isMetered) {
     log.info(`Uploading '${localPath}' of ${toReadableSizeString(size)} size to '${remoteUri}'...`);
   }
   const timer = new Timer().start();
-  if (['http:', 'https:'].includes(remoteUrl.protocol)) {
-    await uploadFileToHttp(fs.createReadStream(localPath), remoteUrl, uploadOptions);
-  } else if (remoteUrl.protocol === 'ftp:') {
-    await uploadFileToFtp(fs.createReadStream(localPath), remoteUrl, uploadOptions);
+  if (['http:', 'https:'].includes(parsedUri.protocol)) {
+    await uploadFileToHttp(fs.createReadStream(localPath), parsedUri, uploadOptions);
+  } else if (parsedUri.protocol === 'ftp:') {
+    await uploadFileToFtp(fs.createReadStream(localPath), parsedUri, uploadOptions);
   } else {
     throw new Error(`Cannot upload the file at '${localPath}' to '${remoteUri}'. ` +
-                    `Unsupported remote protocol '${remoteUrl.protocol}'. ` +
-                    `Only http/https and ftp/ftps protocols are supported.`);
+      `Unsupported remote protocol '${parsedUri.protocol}'. ` +
+      `Only http/https and ftp/ftps protocols are supported.`);
   }
   if (isMetered) {
     log.info(`Uploaded '${localPath}' of ${toReadableSizeString(size)} size in ${timer.getDuration().asSeconds.toFixed(3)}s`);