@salesforce/core-bundle 8.8.6 → 8.9.0

package/lib/index.d.ts

@@ -3841,19 +3841,22 @@ declare module '@salesforce/core-bundle/org/scratchOrgCreate' {
       /** if false, do not use source tracking for this scratch org */
       tracksSource?: boolean;
   };
-  export const scratchOrgResume: (jobId: string) => Promise<ScratchOrgCreateResult>;
+  export const scratchOrgResume: (jobId: string, timeout?: Duration) => Promise<ScratchOrgCreateResult>;
   export const scratchOrgCreate: (options: ScratchOrgCreateOptions) => Promise<ScratchOrgCreateResult>;
 
 }
 declare module '@salesforce/core-bundle/org/scratchOrgErrorCodes' {
   import { Optional } from '@salesforce/ts-types';
+  import { Duration } from '@salesforce/kit';
   import { ScratchOrgInfo } from '@salesforce/core-bundle/org/scratchOrgTypes';
   import { ScratchOrgCache } from '@salesforce/core-bundle/org/scratchOrgCache';
-  export const validateScratchOrgInfoForResume: ({ jobId, scratchOrgInfo, cache, hubUsername, }: {
+  import { Org } from '@salesforce/core-bundle/org/org';
+  export const validateScratchOrgInfoForResume: ({ jobId, hubOrg, cache, hubUsername, timeout, }: {
       jobId: string;
-      scratchOrgInfo: ScratchOrgInfo;
+      hubOrg: Org;
       cache: ScratchOrgCache;
       hubUsername: string;
+      timeout: Duration;
   }) => Promise<ScratchOrgInfo>;
   export const checkScratchOrgInfoForErrors: (orgInfo: Optional<ScratchOrgInfo>, hubUsername: Optional<string>) => Promise<ScratchOrgInfo>;
 

package/lib/index.js

@@ -12310,7 +12310,7 @@ var require_package2 = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@salesforce/core-bundle",
-      version: "8.8.6",
+      version: "8.9.0",
       description: "Core libraries to interact with SFDX projects, orgs, and APIs.",
       main: "lib/index",
       types: "lib/index.d.ts",
@@ -12347,7 +12347,7 @@ var require_package2 = __commonJS({
         "messageTransformer/messageTransformer.ts"
       ],
       dependencies: {
-        "@jsforce/jsforce-node": "^3.6.5",
+        "@jsforce/jsforce-node": "^3.7.0",
         "@salesforce/kit": "^3.2.2",
         "@salesforce/schemas": "^1.9.0",
         "@salesforce/ts-types": "^2.0.10",
@@ -32593,9 +32593,7 @@ var require_request = __commonJS({
         if (resOrErr instanceof node_fetch_1.Response) {
           if (retryOpts.statusCodes.includes(resOrErr.status)) {
             if (maxRetry === retryCount) {
-              const err = new Error("Request failed");
-              err.name = "RequestRetryError";
-              throw err;
+              return false;
             } else {
               return true;
             }
@@ -32650,9 +32648,7 @@ var require_request = __commonJS({
           }
           logger.debug("Skipping retry...");
           if (maxRetry === retryCount) {
-            const error2 = new Error("Request failed", { cause: err });
-            error2.name = "RequestRetryError";
-            throw error2;
+            throw err;
           } else {
             throw err;
           }
@@ -33030,7 +33026,7 @@ var require_VERSION = __commonJS({
   "node_modules/@jsforce/jsforce-node/lib/VERSION.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.default = "3.6.5";
+    exports2.default = "3.7.0";
   }
 });
 
@@ -61493,13 +61489,19 @@ var require_metadata = __commonJS({
         return new DeployResultLocator(this, res);
       }
       /**
-       * Checks the status of declarative metadata call deploy()
+       * Checks the status of declarative metadata call deploy(), using either
+       * SOAP or REST APIs. SOAP is the default.
        */
-      checkDeployStatus(asyncProcessId, includeDetails = false) {
-        return this._invoke("checkDeployStatus", {
-          asyncProcessId,
-          includeDetails
-        }, schema_1.ApiSchemas.DeployResult);
+      async checkDeployStatus(asyncProcessId, includeDetails = false, rest = false) {
+        if (rest) {
+          const url = `/metadata/deployRequest/${asyncProcessId}${includeDetails ? "?includeDetails=true" : ""}`;
+          return (await this._conn.requestGet(url)).deployResult;
+        } else {
+          return this._invoke("checkDeployStatus", {
+            asyncProcessId,
+            includeDetails
+          }, schema_1.ApiSchemas.DeployResult);
+        }
       }
       async cancelDeploy(id) {
         return this._invoke("cancelDeploy", { id });
@@ -94355,11 +94357,14 @@ var require_scratchOrgErrorCodes = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.checkScratchOrgInfoForErrors = exports2.validateScratchOrgInfoForResume = void 0;
+    var kit_1 = require_lib2();
     var messages_12 = require_messages();
     var sfError_12 = require_sfError();
     var logger_12 = require_logger();
+    var pollingClient_12 = require_pollingClient();
     var scratchOrgCache_12 = require_scratchOrgCache();
     var scratchOrgLifecycleEvents_12 = require_scratchOrgLifecycleEvents();
+    var scratchOrgInfoApi_1 = require_scratchOrgInfoApi();
     var WORKSPACE_CONFIG_FILENAME = "sfdx-project.json";
     var messages = new messages_12.Messages("@salesforce/core-bundle", "scratchOrgErrorCodes", /* @__PURE__ */ new Map([["SignupFailedError", "The request to create a scratch org failed with error code: %s."], ["SignupFailedUnknownError", "An unknown server error occurred. Please try again. If you still see this error, contact Salesforce support for assistance. Include the information from 'sfdx force:data:record:get -s ScratchOrgInfo -i %s -u %s'."], ["SignupFailedActionError", "See https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_scratch_orgs_error_codes.htm for information on error code %s."], ["SignupUnexpectedError", "The request to create a scratch org returned an unexpected status"], ["StillInProgressError", "The scratch org is not ready yet (Status = %s)."], ["action.StillInProgress", "Wait for a few minutes, and then try the command again"], ["NoScratchOrgInfoError", "No ScratchOrgInfo object found in the Dev Hub you specified. Check that the ID and the Dev Hub are correct."], ["ScratchOrgDeletedError", "That scratch org has been deleted, so you can't connect to it anymore."], ["INVALID_ID_FIELD", "Provide a valid template ID, in the format 0TTxxxxxxxxxxxx."], ["T-0002", "We couldn\u2019t find a template or snapshot with the ID or name specified in the scratch org definition. If you\u2019re sure the ID is correct, contact Salesforce Support."], ["T-0003", "The template specified in the scratch org definition is unapproved. Contact Salesforce Support to request template approval."], ["T-0004", "The Trialforce Source Organization (TSO) for the template doesn\u2019t exist or has expired."], ["S-1006", "Provide a valid email address in your scratch org definition or your %s file."], ["S-2006", "Provide a valid country code in your scratch org definition or your %s file."], ["S-1017", "Specify a namespace that\u2019s used by a release org associated with your Dev Hub org."], ["S-1018", "Provide a valid My Domain value. This value can\u2019t include double hyphens, end in a hyphen, include restricted words, or be more than 40 characters long."], ["S-1019", "The My Domain value you chose is already in use."], ["S-1026", "Provide a valid namespace value. This value must begin with a letter. It can\u2019t include consecutive underscores, end in an underscore, be more than 15 characters long, or be a restricted or reserved namespace. Only alphanumeric characters and underscores are allowed."], ["S-9999", "A fatal signup error occurred. Please try again. If you still see this error, contact Salesforce Support for assistance."], ["SH-0001", "Can\u2019t create scratch org. Contact the source org admin to add your Dev Hub org ID to Setup > Org Shape. Then try again."], ["SH-0002", "Can\u2019t create scratch org. No org shape exists for the specified sourceOrg. Create an org shape and try again."], ["SH-0003", "Can\u2019t create scratch org from org shape. The org shape version is outdated. Recreate the org shape and try again."], ["C-1007", "The username provided to the org:create command is already in use. Run 'force:org:list --clean' to remove stale org authentications or create the org with a different username."], ["C-1015", "We encountered a problem while registering your My Domain value with the DNS provider. Please try again."], ["C-1016", "We encountered a problem while attempting to configure and approve the Connected App for your org. Verify the Connected App configuration with your Salesforce admin."], ["C-1017", "Provide a valid namespace prefix. This value must begin with a letter. It can\u2019t include consecutive underscores, end in an underscore, be more than 15 characters long, or be a restricted or reserved namespace. Only alphanumeric characters and underscores are allowed."], ["C-1020", "We couldn't find a template with the ID specified in the scratch org definition. If you\u2019re sure the ID is correct, contact Salesforce Support."], ["C-1027", "The template specified in the Scratch Definition isn\u2019t supported. Specify a generic edition (such as Developer or Enterprise), or specify a template ID."], ["C-9999", "A fatal signup error occurred. Please try again. If you still see this error, contact Salesforce Support for assistance"]]));
     var namedMessages = new messages_12.Messages("@salesforce/core-bundle", "scratchOrgErrorCodes", /* @__PURE__ */ new Map([["SignupFailedError", "The request to create a scratch org failed with error code: %s."], ["SignupFailedUnknownError", "An unknown server error occurred. Please try again. If you still see this error, contact Salesforce support for assistance. Include the information from 'sfdx force:data:record:get -s ScratchOrgInfo -i %s -u %s'."], ["SignupFailedActionError", "See https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_scratch_orgs_error_codes.htm for information on error code %s."], ["SignupUnexpectedError", "The request to create a scratch org returned an unexpected status"], ["StillInProgressError", "The scratch org is not ready yet (Status = %s)."], ["action.StillInProgress", "Wait for a few minutes, and then try the command again"], ["NoScratchOrgInfoError", "No ScratchOrgInfo object found in the Dev Hub you specified. Check that the ID and the Dev Hub are correct."], ["ScratchOrgDeletedError", "That scratch org has been deleted, so you can't connect to it anymore."], ["INVALID_ID_FIELD", "Provide a valid template ID, in the format 0TTxxxxxxxxxxxx."], ["T-0002", "We couldn\u2019t find a template or snapshot with the ID or name specified in the scratch org definition. If you\u2019re sure the ID is correct, contact Salesforce Support."], ["T-0003", "The template specified in the scratch org definition is unapproved. Contact Salesforce Support to request template approval."], ["T-0004", "The Trialforce Source Organization (TSO) for the template doesn\u2019t exist or has expired."], ["S-1006", "Provide a valid email address in your scratch org definition or your %s file."], ["S-2006", "Provide a valid country code in your scratch org definition or your %s file."], ["S-1017", "Specify a namespace that\u2019s used by a release org associated with your Dev Hub org."], ["S-1018", "Provide a valid My Domain value. This value can\u2019t include double hyphens, end in a hyphen, include restricted words, or be more than 40 characters long."], ["S-1019", "The My Domain value you chose is already in use."], ["S-1026", "Provide a valid namespace value. This value must begin with a letter. It can\u2019t include consecutive underscores, end in an underscore, be more than 15 characters long, or be a restricted or reserved namespace. Only alphanumeric characters and underscores are allowed."], ["S-9999", "A fatal signup error occurred. Please try again. If you still see this error, contact Salesforce Support for assistance."], ["SH-0001", "Can\u2019t create scratch org. Contact the source org admin to add your Dev Hub org ID to Setup > Org Shape. Then try again."], ["SH-0002", "Can\u2019t create scratch org. No org shape exists for the specified sourceOrg. Create an org shape and try again."], ["SH-0003", "Can\u2019t create scratch org from org shape. The org shape version is outdated. Recreate the org shape and try again."], ["C-1007", "The username provided to the org:create command is already in use. Run 'force:org:list --clean' to remove stale org authentications or create the org with a different username."], ["C-1015", "We encountered a problem while registering your My Domain value with the DNS provider. Please try again."], ["C-1016", "We encountered a problem while attempting to configure and approve the Connected App for your org. Verify the Connected App configuration with your Salesforce admin."], ["C-1017", "Provide a valid namespace prefix. This value must begin with a letter. It can\u2019t include consecutive underscores, end in an underscore, be more than 15 characters long, or be a restricted or reserved namespace. Only alphanumeric characters and underscores are allowed."], ["C-1020", "We couldn't find a template with the ID specified in the scratch org definition. If you\u2019re sure the ID is correct, contact Salesforce Support."], ["C-1027", "The template specified in the Scratch Definition isn\u2019t supported. Specify a generic edition (such as Developer or Enterprise), or specify a template ID."], ["C-9999", "A fatal signup error occurred. Please try again. If you still see this error, contact Salesforce Support for assistance"]]));
@@ -94374,14 +94379,47 @@ var require_scratchOrgErrorCodes = __commonJS({
         return void 0;
       }
     };
-    var validateScratchOrgInfoForResume = async ({ jobId, scratchOrgInfo, cache, hubUsername }) => {
+    var validateScratchOrgInfoForResume = async ({ jobId, hubOrg, cache, hubUsername, timeout }) => {
+      const scratchOrgInfo = await (0, scratchOrgInfoApi_1.queryScratchOrgInfo)(hubOrg, jobId);
       if (!scratchOrgInfo?.Id || scratchOrgInfo.Status === "Deleted") {
         cache.unset(jobId);
         await cache.write();
         throw scratchOrgInfo.Status === "Deleted" ? namedMessages.createError("ScratchOrgDeletedError") : namedMessages.createError("NoScratchOrgInfoError");
       }
       if (["New", "Creating"].includes(scratchOrgInfo.Status)) {
-        throw namedMessages.createError("StillInProgressError", [scratchOrgInfo.Status], ["action.StillInProgress"]);
+        const logger = await logger_12.Logger.child("scratchOrgResume");
+        logger.debug(`PollingTimeout in minutes: ${timeout.minutes}`);
+        const options = {
+          async poll() {
+            try {
+              const resultInProgress = await (0, scratchOrgInfoApi_1.queryScratchOrgInfo)(hubOrg, jobId);
+              logger.debug(`polling client result: ${JSON.stringify(resultInProgress, null, 4)}`);
+              if (resultInProgress.Status === "Active" || resultInProgress.Status === "Error") {
+                return {
+                  completed: true,
+                  payload: resultInProgress
+                };
+              }
+              await (0, scratchOrgLifecycleEvents_12.emit)({ stage: "wait for org", scratchOrgInfo: resultInProgress });
+              logger.debug(`Scratch org status is ${resultInProgress.Status}`);
+              return {
+                completed: false
+              };
+            } catch (error) {
+              logger.debug(`Error: ${error.message}`);
+              logger.debug("Re-trying deploy check again....");
+              return {
+                completed: false
+              };
+            }
+          },
+          frequency: kit_1.Duration.seconds(1),
+          timeoutErrorName: "ScratchOrgResumeTimeOutError",
+          timeout
+        };
+        const client = await pollingClient_12.PollingClient.create(options);
+        const result = await client.subscribe();
+        return (0, exports2.checkScratchOrgInfoForErrors)(result, hubUsername);
       }
       return (0, exports2.checkScratchOrgInfoForErrors)(scratchOrgInfo, hubUsername);
     };
@@ -107361,7 +107399,7 @@ var require_scratchOrgCreate = __commonJS({
         throw messages.createError("RetryNotIntError");
       }
     };
-    var scratchOrgResume = async (jobId) => {
+    var scratchOrgResume = async (jobId, timeout = kit_1.Duration.minutes(15)) => {
       const [logger, cache] = await Promise.all([
         logger_12.Logger.child("scratchOrgResume"),
         scratchOrgCache_12.ScratchOrgCache.create(),
@@ -107378,8 +107416,7 @@ var require_scratchOrgCreate = __commonJS({
         logger.debug(`resuming org create with LoginUrl override= ${signupTargetLoginUrl}`);
       }
       const hubOrg = await org_12.Org.create({ aliasOrUsername: hubUsername });
-      const soi = await (0, scratchOrgInfoApi_1.queryScratchOrgInfo)(hubOrg, jobId);
-      await (0, scratchOrgErrorCodes_1.validateScratchOrgInfoForResume)({ jobId, scratchOrgInfo: soi, cache, hubUsername });
+      const soi = await (0, scratchOrgErrorCodes_1.validateScratchOrgInfoForResume)({ jobId, hubOrg, cache, hubUsername, timeout });
       const username = soi.Username ?? soi.SignupUsername;
       const stateAggregator = await stateAggregator_12.StateAggregator.getInstance();
       const scratchOrgAuthInfo = await stateAggregator.orgs.exists(username) ? await authInfo_12.AuthInfo.create({ username }) : await (0, scratchOrgInfoApi_1.authorizeScratchOrg)({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core-bundle",
-  "version": "8.8.6",
+  "version": "8.9.0",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/index",
   "types": "lib/index.d.ts",
@@ -37,7 +37,7 @@
     "messageTransformer/messageTransformer.ts"
   ],
   "dependencies": {
-    "@jsforce/jsforce-node": "^3.6.5",
+    "@jsforce/jsforce-node": "^3.7.0",
     "@salesforce/kit": "^3.2.2",
     "@salesforce/schemas": "^1.9.0",
     "@salesforce/ts-types": "^2.0.10",