Merge pull request #267 from salesforcecli/mdonnalley/state-aggregator

feat: use StateAggregator

Author: iowillhoit

package.json

@@ -6,7 +6,7 @@
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^1.7.0",
-    "@salesforce/core": "^3.15.5",
+    "@salesforce/core": "^3.19.4",
     "@salesforce/kit": "^1.5.41",
     "@salesforce/sf-plugins-core": "^1.12.3",
     "@salesforce/source-deploy-retrieve": "^5.13.1",

src/utils/metadataDeployer.ts

@@ -11,7 +11,7 @@ import { Duration } from '@salesforce/kit';
 import {
   AuthInfo,
   ConfigAggregator,
-  GlobalInfo,
+  StateAggregator,
   Messages,
   NamedPackageDir,
   OrgAuthorization,
@@ -145,8 +145,9 @@ export class MetadataDeployer extends Deployer {
 
   public async promptForUsername(): Promise<string> {
     const aliasOrUsername = ConfigAggregator.getValue(OrgConfigProperties.TARGET_ORG)?.value as string;
-    const globalInfo = await GlobalInfo.getInstance();
-    const allAliases = globalInfo.aliases.getAll();
+    const stateAggregator = await StateAggregator.getInstance();
+    await stateAggregator.orgs.readAll();
+    const allAliases = stateAggregator.aliases.getAll();
     let targetOrgAuth: OrgAuthorization;
     // make sure the "target-org" can be used in this deploy
     if (aliasOrUsername) {
@@ -168,18 +169,21 @@ export class MetadataDeployer extends Deployer {
             throw messages.createError('error.UserTerminatedDeployForExpiredOrg');
           }
         } else {
-          return globalInfo.aliases.resolveUsername(aliasOrUsername);
+          return stateAggregator.aliases.resolveUsername(aliasOrUsername);
         }
       }
     }
+
     if (!aliasOrUsername || targetOrgAuth?.isExpired) {
-      const authorizations = (
+      const promises = (
         await AuthInfo.listAllAuthorizations((orgAuth) => !orgAuth.error && orgAuth.isExpired !== true)
-      ).map((orgAuth) => {
-        const org = globalInfo.orgs.get(orgAuth.username);
-        const timestamp = org.timestamp ? new Date(org.timestamp as string) : new Date();
+      ).map(async (orgAuth) => {
+        const stat = await stateAggregator.orgs.stat(orgAuth.username);
+        const timestamp = stat ? new Date(stat.mtimeMs) : new Date();
         return { ...orgAuth, timestamp } as OrgAuthWithTimestamp;
       });
+
+      const authorizations = await Promise.all(promises);
       if (authorizations.length > 0) {
         const newestAuths = authorizations.sort(compareOrgs);
         const options = newestAuths.map((auth) => ({