[:recycle:] update messages and delays

bin/Bot.ts

@@ -14,7 +14,6 @@ import {
   saveLocalCopy,
   submitLoginForm,
   timer,
-  wait,
   waitAndNavigate,
   waitForRedirects
 } from "./utils";
@@ -89,22 +88,22 @@ export default class Bot {
   }
 
   private async _login(page: Page): Promise<void> {
-    let spinner = new Spinner("\t. Navigating to the login page...");
+    const spinner = new Spinner("\t. Navigating to the login page...");
 
     spinner.start();
     await waitAndNavigate(page, page.goto("https://www.figma.com/login"));
     spinner.stop();
 
-    const checkRecent = () =>
-      page.url().includes("https://www.figma.com/files/recent");
+    const checkRecent = (url: string) =>
+      url.includes("https://www.figma.com/files") && url.includes("/recent");
 
-    if (checkRecent()) {
+    if (checkRecent(page.url())) {
       log(chalk.red("\t.") + chalk.bold(` Bot is already logged in.`));
       return;
     }
 
     try {
-      spinner = new Spinner("\t. Submitting the login form...");
+      spinner.message("\t. Submitting the login form...");
 
       spinner.start();
       await waitAndNavigate(
@@ -119,7 +118,8 @@ export default class Bot {
       throw new AuthorizationError(e as Error);
     }
 
-    if (checkRecent()) {
+    const pageUrl = page.url();
+    if (checkRecent(pageUrl)) {
       log(chalk.red("\t.") + chalk.bold(` Bot successfully logged in.`));
 
       if (this._cookiesProvider) {
@@ -129,13 +129,11 @@ export default class Bot {
         SESSION_DATA.cookies = cookies;
         await this._cookiesProvider.setCookies(cookies);
       }
-    } else if (page.url() === "https://www.figma.com/login") {
+    } else if (pageUrl === "https://www.figma.com/login") {
       const error = await parseLoginFormError(page);
       throw new AuthorizationError(error || "unknown error");
     } else {
-      throw new AuthorizationError(
-        `Unexpectedly redirected to "${page.url()}"`
-      );
+      throw new AuthorizationError(`Unexpectedly redirected to "${pageUrl}"`);
     }
   }
 
@@ -151,10 +149,11 @@ export default class Bot {
 
       if (!cookies) throw new Error("No cached cookies found.");
 
-      log(chalk.red("\t.") + chalk.bold(` Restoring the cached cookies...`));
+      log(chalk.red("\t.") + chalk.bold(` Setting the cached cookies...`));
       await page.setCookie(...cookies);
 
       const spinner = new Spinner("\t. Waiting for the redirection...");
+
       spinner.start();
       await waitForRedirects(page);
       spinner.stop();
@@ -172,25 +171,23 @@ export default class Bot {
     const page: Page = await this._browser.newPage();
     page.setDefaultNavigationTimeout(60 * 1000);
 
-    let spinner = new Spinner(`\t. Navigating to the file(${file.name})...`);
+    const spinner = new Spinner(`\t. Navigating to the file(${file.name})...`);
 
-    log(chalk.red(">") + chalk.bold(` Backuping the file(${file.name})...`));
+    log(chalk.red(">") + chalk.bold(` Backing up the file(${file.name})...`));
 
     spinner.start();
     await waitAndNavigate(page, goToFilePage(page, file.id));
     spinner.stop();
 
-    spinner = new Spinner("\t. Waiting for the page to be loaded...");
+    spinner.message("\t. Waiting for the page to be loaded...");
 
     spinner.start();
-    await wait(this._interactionDelay);
     await page.waitForFunction(
       () => !document.querySelector('[class*="progress_bar--outer"]')
     );
     spinner.stop();
 
-    log(chalk.red("\t.") + chalk.bold(` Setting the download behaviour...`));
-    await wait(this._interactionDelay);
+    log(chalk.red("\t.") + chalk.bold(` Setting the download behavior...`));
 
     const client = await page.target().createCDPSession();
     await client.send("Page.setDownloadBehavior", {