chore: start refactoring launcher code in server

Author: AtofStryker

packages/server/lib/browsers/utils.ts

@@ -344,16 +344,17 @@ async function ensureAndGetByNameOrPath (nameOrPath: string, returnAll = false,
   // did the user give a bad name, or is this actually a path?
   if (isValidPathToBrowser(nameOrPath)) {
     // looks like a path - try to resolve it to a FoundBrowser
-    return launcher.detectByPath(nameOrPath)
-    .then((browser) => {
+    try {
+      const browser = await launcher.detectByPath(nameOrPath)
+
       if (returnAll) {
         return [browser].concat(browsers)
       }
 
       return browser
-    }).catch((err) => {
+    } catch (err) {
       errors.throwErr('BROWSER_NOT_FOUND_BY_PATH', nameOrPath, err.message)
-    })
+    }
   }
 
   // not a path, not found by name

packages/server/lib/cypress.ts

@@ -16,6 +16,9 @@ import argsUtils from './util/args'
 import { telemetry } from '@packages/telemetry'
 import { getCtx, hasCtx } from '@packages/data-context'
 import { warning as errorsWarning } from './errors'
+import pkg from '@packages/root'
+import { info } from './modes/info'
+import { toNumber } from 'lodash'
 
 const debug = Debug('cypress:server:cypress')
 
@@ -206,74 +209,88 @@ export = {
     })
   },
 
-  startInMode (mode: Mode, options: any) {
+   async startInMode (mode: Mode, options: any) {
     debug('starting in mode %s with options %o', mode, options)
 
     switch (mode) {
       case 'version':
-        return require('./modes/pkg')(options)
-        .get('version')
-        .then((version: any) => {
-          return console.log(version) // eslint-disable-line no-console
-        }).then(exit0)
-        .catch(exitErr)
-
+        try {
+          console.log(pkg.version)// eslint-disable-line no-console
+          exit0()
+        } catch (err) {
+          exitErr(err)
+        }
+        break
       case 'info':
-        return require('./modes/info')(options)
-        .then(exit0)
-        .catch(exitErr)
-
+        try {
+          await info()
+          exit0()
+        } catch (err) {
+          exitErr(err)
+        }
+        break
       case 'smokeTest':
-        return this.runElectron(mode, options)
-        .then((pong: any) => {
+        try {
+          const pong = await this.runElectron(mode, options)
+
           if (!this.isCurrentlyRunningElectron()) {
-            return pong
+            return exit(pong)
           }
 
           if (pong === options.ping) {
-            return 0
+            return exit(0)
           }
 
-          return 1
-        }).then(exit)
-        .catch(exitErr)
+          return exit(1)
+        } catch (err) {
+          exitErr(err)
+        }
+        break
 
       case 'returnPkg':
-        return require('./modes/pkg')(options)
-        .then((pkg: any) => {
-          return console.log(JSON.stringify(pkg)) // eslint-disable-line no-console
-        }).then(exit0)
-        .catch(exitErr)
+        try {
+          console.log(JSON.stringify(pkg)) // eslint-disable-line no-console
+          exit0()
+        } catch (err) {
+          exitErr(err)
+        }
+        break
 
       case 'exitWithCode':
-        return require('./modes/exit')(options)
-        .then(exit)
-        .catch(exitErr)
+        try {
+          const exitCode = toNumber(options.exitWithCode)
 
+          exit(exitCode)
+        } catch (err) {
+          exitErr(err)
+        }
+        break
       case 'run':
         // run headlessly and exit
         // with num of totalFailed
-        return this.runElectron(mode, options)
-        .then((results: any) => {
+        try {
+        const results = await this.runElectron(mode, options)
+
           if (results.runs) {
             const isCanceled = results.runs.filter((run) => run.skippedSpec).length
 
             if (isCanceled) {
               // eslint-disable-next-line no-console
               console.log(require('chalk').magenta('\n  Exiting with non-zero exit code because the run was canceled.'))
 
-              return 1
+              return exit(1)
             }
           }
 
           if (options.posixExitCodes) {
-            return results.totalFailed ? 1 : 0
+            return exit(results.totalFailed ? 1 : 0)
           }
 
-          return results.totalFailed
-        })
-        .then(exit)
-        .catch(exitErr)
+          return exit(results.totalFailed)
+        } catch (err) {
+          exitErr(err)
+        }
+        break
 
       case 'interactive':
         return this.runElectron(mode, options)

packages/server/lib/modes/exit.ts

@@ -127,10 +127,9 @@ const print = (browsers: FoundBrowser[] = []) => {
   }
 }
 
-const info = () => {
-  return launcherDetect()
-  .then(addProfilePath)
-  .then(print)
-}
+export const info = async () => {
+  const browsers = await launcherDetect()
+  const browsersWithProfilePath = await addProfilePath(browsers)
 
-module.exports = info
+  print(browsersWithProfilePath)
+}

packages/server/lib/modes/info.ts

@@ -1,6 +1,6 @@
 require('../../spec_helper')
 
-const info = require(`../../../lib/modes/info`)
+const { info } = require(`../../../lib/modes/info`)
 const capture = require(`../../../lib/capture`)
 const browserUtils = require(`../../../lib/browsers/utils`)
 const { fs } = require(`../../../lib/util/fs`)