Merge pull request #166 from salesforcecli/org_open_refactoring

chore: using sfdx-core utill function

Author: mshanemc

package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@oclif/config": "^1",
     "@salesforce/command": "^3.0.3",
-    "@salesforce/core": "^2.17.0",
+    "@salesforce/core": "^2.27.0",
     "@salesforce/kit": "^1.4.5",
     "open": "8.2.1",
     "tslib": "^2"

src/commands/force/org/open.ts

@@ -5,11 +5,10 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { EOL } from 'os';
-import { URL } from 'url';
 
 import { flags, FlagsConfig, SfdxCommand } from '@salesforce/command';
-import { Messages, Org, MyDomainResolver, SfdxError, sfdc } from '@salesforce/core';
-import { Env, Duration } from '@salesforce/kit';
+import { Messages, Org, SfdcUrl, SfdxError } from '@salesforce/core';
+import { Duration, Env } from '@salesforce/kit';
 import { openUrl } from '../../../shared/utils';
 
 Messages.importMessagesDirectory(__dirname);
@@ -51,7 +50,22 @@ export class OrgOpenCommand extends SfdxCommand {
       return output;
     }
     // we actually need to open the org
-    await this.checkLightningDomain(url);
+    try {
+      this.ux.startSpinner(messages.getMessage('domainWaiting'));
+      const sfdcUrl = new SfdcUrl(url);
+      await sfdcUrl.checkLightningDomain();
+    } catch (err) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,  @typescript-eslint/no-unsafe-call
+      if (err.message?.includes('timeout')) {
+        const domain = `https://${/https?:\/\/([^.]*)/.exec(url)[1]}.lightning.force.com`;
+        const timeout = new Duration(new Env().getNumber('SFDX_DOMAIN_RETRY', 240), Duration.Unit.SECONDS);
+        this.logger.debug(`Did not find IP for ${domain} after ${timeout.seconds} seconds`);
+        throw new SfdxError(messages.getMessage('domainTimeoutError'), 'domainTimeoutError', [
+          messages.getMessage('domainTimeoutAction'),
+        ]);
+      }
+      throw SfdxError.wrap(err);
+    }
     await openUrl(url);
     return output;
   }
@@ -64,32 +78,6 @@ export class OrgOpenCommand extends SfdxCommand {
     const instanceUrlClean = instanceUrl.replace(/\/$/, '');
     return `${instanceUrlClean}/secur/frontdoor.jsp?sid=${accessToken}`;
   }
-
-  private async checkLightningDomain(url: string): Promise<void> {
-    const domain = `https://${/https?:\/\/([^.]*)/.exec(url)[1]}.lightning.force.com`;
-    const timeout = new Duration(new Env().getNumber('SFDX_DOMAIN_RETRY', 240), Duration.Unit.SECONDS);
-    if (sfdc.isInternalUrl(url) || timeout.seconds === 0) {
-      return;
-    }
-
-    const resolver = await MyDomainResolver.create({
-      url: new URL(domain),
-      timeout,
-      frequency: new Duration(1, Duration.Unit.SECONDS),
-    });
-    this.ux.startSpinner(messages.getMessage('domainWaiting'));
-
-    try {
-      const ip = await resolver.resolve();
-      this.logger.debug(`Found IP ${ip} for ${domain}`);
-      return;
-    } catch (error) {
-      this.logger.debug(`Did not find IP for ${domain} after ${timeout.seconds} seconds`);
-      throw new SfdxError(messages.getMessage('domainTimeoutError'), 'domainTimeoutError', [
-        messages.getMessage('domainTimeoutAction'),
-      ]);
-    }
-  }
 }
 
 interface OrgOpenOutput {

test/commands/force/org/open.test.ts

@@ -103,7 +103,10 @@ describe('open commands', () => {
 
     test
       .do(() => {
-        spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').rejects());
+        spies.set(
+          'resolver',
+          stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').throws({ message: 'timeout' })
+        );
       })
       .stdout()
       .command(['force:org:open', '--json', '--targetusername', username, '--path', testPath])
@@ -173,7 +176,10 @@ describe('open commands', () => {
 
     test
       .do(() => {
-        spies.set('resolver', stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').rejects());
+        spies.set(
+          'resolver',
+          stubMethod($$.SANDBOX, MyDomainResolver.prototype, 'resolve').throws({ message: 'timeout' })
+        );
       })
       .stderr()
       .command(['force:org:open', '--targetusername', username, '--path', testPath])

yarn.lock

@@ -627,7 +627,7 @@
     chalk "^2.4.2"
     cli-ux "^4.9.3"
 
-"@salesforce/core@^2.16.3", "@salesforce/core@^2.17.0", "@salesforce/core@^2.2.0", "@salesforce/core@^2.24.0":
+"@salesforce/core@^2.16.3", "@salesforce/core@^2.2.0", "@salesforce/core@^2.24.0", "@salesforce/core@^2.27.0":
   version "2.27.0"
   resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-2.27.0.tgz#47c036a5195839cd0efae4b3f61e551274ff66a0"
   integrity sha512-T+fAkcSVCWn8OC/hJ5cJT1wWwUYzhQIc8xhKA3K/yLib5Y2WV9goD9D+35oZqikJRkHGiKv2uN9DsR4ip4WwXg==