@esri/solution-deployer 6.4.0-next.20250806 → 6.4.0-next.20250808

package/dist/cjs/deploySolutionFromTemplate.js

@@ -24,6 +24,19 @@ const post_process_1 = require("./helpers/post-process");
 const sortTemplates_1 = require("./helpers/sortTemplates");
 // NOTE: Moved to separate file to allow stubbing in main deploySolution tests
 async function deploySolutionFromTemplate(templateSolutionId, solutionTemplateBase, solutionTemplateData, authentication, options) {
+    /**
+     * function to abort the current process. Will delete solution and reject the promise
+     *
+     * @return a reject on the parent promise.
+     */
+    function checkCancelled() {
+        if (options && options.abortController) {
+            if (options.abortController.signal.aborted) {
+                throw new Error("Operation was cancelled");
+            }
+        }
+    }
+    checkCancelled();
     options.storageVersion = common.extractSolutionVersion(solutionTemplateData);
     // It is possible to provide a separate authentication for the source
     const storageAuthentication = options.storageAuthentication
@@ -75,6 +88,7 @@ async function deploySolutionFromTemplate(templateSolutionId, solutionTemplateBa
     templateDictionary.user = userResponse;
     templateDictionary.user.folders = foldersAndGroupsResponse.folders;
     templateDictionary.user.groups = foldersAndGroupsResponse.groups.filter((group) => group.owner === templateDictionary.user.username);
+    checkCancelled();
     // Add information needed for workflow manager
     const user = await common.getUser(authentication);
     templateDictionary.workflowBaseUrl = await common.getWorkflowBaseURL(authentication, portalResponse, user.orgId);
@@ -90,6 +104,7 @@ async function deploySolutionFromTemplate(templateSolutionId, solutionTemplateBa
     // Apply the portal extents to the solution
     const portalExtent = portalResponse.defaultExtent;
     const extentsPromise = common.convertExtentWithFallback(portalExtent, undefined, { wkid: 4326 }, portalResponse.helperServices.geometry.url, authentication);
+    checkCancelled();
     // Await completion of async actions: folder creation & extents conversion
     const folderExtentsResponses = await Promise.all([folderPromise, extentsPromise, trackingOwnerPromise]);
     const [folderResponse, wgs84Extent, trackingOwnerResponse] = folderExtentsResponses;
@@ -120,10 +135,12 @@ async function deploySolutionFromTemplate(templateSolutionId, solutionTemplateBa
         if (options.additionalTypeKeywords) {
             createSolutionItemBase.typeKeywords = ["Solution"].concat(options.additionalTypeKeywords);
         }
+        checkCancelled();
         // Create deployed solution item
         createSolutionItemBase.thumbnail = options.thumbnail;
         const createSolutionResponse = await common.createItemWithData(createSolutionItemBase, {}, authentication, deployedFolderId);
         deployedSolutionId = createSolutionResponse.id;
+        checkCancelled();
         // Protect the solution item
         const protectOptions = {
             id: deployedSolutionId,
@@ -135,9 +152,11 @@ async function deploySolutionFromTemplate(templateSolutionId, solutionTemplateBa
         solutionTemplateBase.tryitUrl = _checkedReplaceAll(solutionTemplateBase.tryitUrl, templateSolutionId, deployedSolutionId);
         solutionTemplateBase.url = _checkedReplaceAll(solutionTemplateBase.url, templateSolutionId, deployedSolutionId);
     }
+    checkCancelled();
     // Handle the contained item templates
     const clonedSolutionsResponse = await deployItems.deploySolutionItems(storageAuthentication.portal, templateSolutionId, solutionTemplateData.templates, storageAuthentication, templateDictionary, deployedSolutionId, authentication, options);
     solutionTemplateData.templates = solutionTemplateData.templates.map((itemTemplate) => {
+        checkCancelled();
         // Update ids present in template dictionary
         itemTemplate.itemId = common.getProp(templateDictionary, `${itemTemplate.itemId}.itemId`);
         // Update the dependencies hash to point to the new item ids
@@ -146,6 +165,7 @@ async function deploySolutionFromTemplate(templateSolutionId, solutionTemplateBa
     });
     // Sort the templates into build order, which is provided by clonedSolutionsResponse
     (0, sortTemplates_1.sortTemplates)(solutionTemplateData.templates, clonedSolutionsResponse.map((response) => response.id));
+    checkCancelled();
     // Wrap up with post-processing, in which we deal with groups and cycle remnants
     await (0, post_process_1.postProcess)(deployedSolutionId, solutionTemplateData.templates, clonedSolutionsResponse, authentication, templateDictionary);
     if (!options.dontCreateSolutionItem) {
@@ -168,6 +188,7 @@ async function deploySolutionFromTemplate(templateSolutionId, solutionTemplateBa
         if (templateDictionary.params) {
             solutionTemplateBase.data.params = templateDictionary.params;
         }
+        checkCancelled();
         await common.updateItem(solutionTemplateBase, authentication, deployedFolderId);
     }
     return solutionTemplateBase.id;

package/dist/cjs/deploySolutionItems.d.ts

@@ -212,7 +212,7 @@ export declare function _findExistingItem(query: string, authentication: common.
  *         already in the templates list
  * @private
  */
-export declare function _createItemFromTemplateWhenReady(template: common.IItemTemplate, resourceFilePaths: common.IDeployFileCopyPath[], storageAuthentication: common.UserSession, templateDictionary: any, destinationAuthentication: common.UserSession, itemProgressCallback: common.IItemProgressCallback): Promise<common.ICreateItemFromTemplateResponse>;
+export declare function _createItemFromTemplateWhenReady(template: common.IItemTemplate, resourceFilePaths: common.IDeployFileCopyPath[], storageAuthentication: common.UserSession, templateDictionary: any, destinationAuthentication: common.UserSession, itemProgressCallback: common.IItemProgressCallback, abortController?: AbortController): Promise<common.ICreateItemFromTemplateResponse>;
 /**
  * Accumulates the estimated deployment cost of a set of templates.
  *

package/dist/cjs/deploySolutionItems.js

@@ -41,6 +41,18 @@ const UNSUPPORTED = null;
  */
 function deploySolutionItems(portalSharingUrl, storageItemId, templates, storageAuthentication, templateDictionary, deployedSolutionId, destinationAuthentication, options) {
     return new Promise((resolve, reject) => {
+        /**
+         * function to abort the current process. Will delete solution and reject the promise
+         *
+         * @return a reject on the parent promise.
+         */
+        function checkCancelled() {
+            if (options && options.abortController) {
+                if (options.abortController.signal.aborted) {
+                    reject(new Error(`Operation was cancelled`));
+                }
+            }
+        }
         // Prepare feedback mechanism
         const totalEstimatedCost = _estimateDeploymentCost(templates) + 1; // solution items, plus avoid divide by 0
         let percentDone = 10; // allow for previous deployment work
@@ -48,6 +60,7 @@ function deploySolutionItems(portalSharingUrl, storageItemId, templates, storage
         const failedTemplateItemIds = [];
         const deployedItemIds = [];
         let statusOK = true;
+        checkCancelled();
         // TODO: move to separate fn
         const itemProgressCallback = (itemId, status, costUsed, createdItemId) => {
             percentDone += progressPercentStep * costUsed;
@@ -92,12 +105,15 @@ function deploySolutionItems(portalSharingUrl, storageItemId, templates, storage
         //   * create item in destination group
         //   * add created item's id into the template dictionary
         const awaitAllItems = [];
+        checkCancelled();
         const reuseItemsDef = _reuseDeployedItems(templates, options.enableItemReuse ?? false, templateDictionary, destinationAuthentication);
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         reuseItemsDef.then(() => {
+            checkCancelled();
             const useExistingItemsDef = _useExistingItems(templates, common.getProp(templateDictionary, "params.useExisting"), templateDictionary, destinationAuthentication);
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             useExistingItemsDef.then(() => {
+                checkCancelled();
                 templates = common.setNamesAndTitles(templates);
                 buildOrder.forEach((id) => {
                     // Get the item's template out of the list of templates
@@ -110,11 +126,12 @@ function deploySolutionItems(portalSharingUrl, storageItemId, templates, storage
                         // Remove qc.project.json files from the resources--we don't use them from solutions
                         template.resources = template.resources.filter((filename) => !filename.endsWith("qc.project.json"));
                     }
-                    awaitAllItems.push(_createItemFromTemplateWhenReady(template, common.generateStorageFilePaths(portalSharingUrl, storageItemId, template.resources, options.storageVersion), storageAuthentication, templateDictionary, destinationAuthentication, itemProgressCallback));
+                    awaitAllItems.push(_createItemFromTemplateWhenReady(template, common.generateStorageFilePaths(portalSharingUrl, storageItemId, template.resources, options.storageVersion), storageAuthentication, templateDictionary, destinationAuthentication, itemProgressCallback, options.abortController));
                 });
                 // Wait until all items have been created
                 // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 Promise.all(awaitAllItems).then((clonedSolutionItems) => {
+                    checkCancelled();
                     if (failedTemplateItemIds.length === 0) {
                         // Do we have any items to be patched (i.e., they refer to dependencies using the template id rather
                         // than the cloned id because the item had to be created before the dependency)? Flag these items
@@ -736,7 +753,19 @@ exports._findExistingItem = _findExistingItem;
  *         already in the templates list
  * @private
  */
-function _createItemFromTemplateWhenReady(template, resourceFilePaths, storageAuthentication, templateDictionary, destinationAuthentication, itemProgressCallback) {
+function _createItemFromTemplateWhenReady(template, resourceFilePaths, storageAuthentication, templateDictionary, destinationAuthentication, itemProgressCallback, abortController) {
+    /**
+     * function to abort the current process. Will delete solution and reject the promise
+     *
+     * @return a reject on the parent promise.
+     */
+    function checkCancelled() {
+        if (abortController) {
+            if (abortController.signal.aborted) {
+                throw new Error(`Operation was cancelled`);
+            }
+        }
+    }
     const sourceItemId = template.itemId;
     // ensure this is present
     template.dependencies = template.dependencies || [];
@@ -744,6 +773,7 @@ function _createItemFromTemplateWhenReady(template, resourceFilePaths, storageAu
     // or if we have a basic entry without the deferred request for its creation, add it
     if (!templateDictionary.hasOwnProperty(template.itemId) ||
         !common.getProp(templateDictionary[template.itemId], "def")) {
+        checkCancelled();
         let createResponse;
         let statusCode = common.EItemProgressStatus.Unknown;
         let itemHandler;
@@ -773,6 +803,7 @@ function _createItemFromTemplateWhenReady(template, resourceFilePaths, storageAu
                 : _awaitDependencies;
             Promise.all(awaitDependencies)
                 .then(() => {
+                checkCancelled();
                 // Find the conversion handler for this item type
                 const templateType = template.type;
                 itemHandler = module_map_1.moduleMap[templateType];
@@ -793,12 +824,14 @@ function _createItemFromTemplateWhenReady(template, resourceFilePaths, storageAu
                 return common.getThumbnailFromStorageItem(storageAuthentication, resourceFilePaths);
             })
                 .then((thumbnail) => {
+                checkCancelled();
                 template.item.thumbnail = thumbnail;
                 // Delegate the creation of the item to the handler
                 // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 return itemHandler.createItemFromTemplate(template, templateDictionary, destinationAuthentication, itemProgressCallback);
             })
                 .then(async (response) => {
+                checkCancelled();
                 if (response.id === "") {
                     statusCode = common.EItemProgressStatus.Failed;
                     throw new Error("handled"); // fails to create item
@@ -824,11 +857,13 @@ function _createItemFromTemplateWhenReady(template, resourceFilePaths, storageAu
                             }
                         });
                         if (formZipFilePath) {
+                            checkCancelled();
                             // Fetch the form's zip file and send it to the item
                             const zipObject = await common.fetchZipObject(formZipFilePath.url, storageAuthentication);
                             await common.updateItemWithZipObject(zipObject, destinationItemId, destinationAuthentication);
                         }
                     }
+                    checkCancelled();
                     // Copy resources, metadata
                     return common.copyFilesFromStorageItem(storageAuthentication, resourceFilePaths, sourceItemId, templateDictionary.folderId, destinationItemId, destinationAuthentication, createResponse.item, templateDictionary);
                 }

package/dist/cjs/deployer.d.ts

@@ -32,3 +32,4 @@ import { IModel } from "@esri/hub-common";
  * @returns The id of the created deployed solution item
  */
 export declare function deploySolution(maybeModel: string | IModel, authentication: common.UserSession, options?: common.IDeploySolutionOptions): Promise<string>;
+export declare function deployCatchHandler(ex: any, authentication: common.UserSession): void;

package/dist/cjs/deployer.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deploySolution = void 0;
+exports.deployCatchHandler = exports.deploySolution = void 0;
 const tslib_1 = require("tslib");
 /**
  * Manages the deployment of a Solution.
@@ -41,6 +41,18 @@ async function deploySolution(maybeModel, authentication, options) {
     if (!maybeModel) {
         return Promise.reject(common.fail("The Solution Template id is missing"));
     }
+    /**
+     * function to abort the current process. Will delete solution and reject the promise
+     *
+     * @return a reject on the parent promise.
+     */
+    function checkCancelled() {
+        if (options && options.abortController) {
+            if (options.abortController.signal.aborted) {
+                throw new Error("Operation was cancelled");
+            }
+        }
+    }
     let deployOptions = options || {};
     /* istanbul ignore else */
     if (deployOptions.progressCallback) {
@@ -50,9 +62,11 @@ async function deploySolution(maybeModel, authentication, options) {
     const storageAuthentication = deployOptions.storageAuthentication
         ? deployOptions.storageAuthentication
         : authentication;
+    void checkCancelled();
     // deal with maybe getting an item or an id
     return (0, deployerUtils_1.getSolutionTemplateItem)(maybeModel, storageAuthentication)
         .then((model) => {
+        void checkCancelled();
         if (!(0, deployerUtils_1.isSolutionTemplateItem)(model.item)) {
             return Promise.reject(common.fail(`${model.item.id} is not a Solution Template`));
         }
@@ -75,6 +89,7 @@ async function deploySolution(maybeModel, authentication, options) {
         deployOptions = (0, deployerUtils_1.updateDeployOptions)(deployOptions, item, storageAuthentication);
         // Clone before mutating? This was messing me up in some testing...
         common.deleteItemProps(item);
+        checkCancelled();
         return (0, deploySolutionFromTemplate_1.deploySolutionFromTemplate)(itemId, item, data, authentication, deployOptions);
     })
         .then((createdSolutionId) => {
@@ -92,7 +107,16 @@ async function deploySolution(maybeModel, authentication, options) {
         return Promise.reject(error);
     })
         .catch((ex) => {
+        deployCatchHandler(ex, authentication);
         throw ex;
     });
 }
 exports.deploySolution = deploySolution;
+function deployCatchHandler(ex, authentication) {
+    const options = {
+        consoleProgress: true,
+        sendToRecycling: false,
+    };
+    void common.deleteSolution(ex.trim(), authentication, options);
+}
+exports.deployCatchHandler = deployCatchHandler;

package/dist/esm/deploySolutionFromTemplate.js

@@ -20,6 +20,19 @@ import { postProcess } from "./helpers/post-process";
 import { sortTemplates } from "./helpers/sortTemplates";
 // NOTE: Moved to separate file to allow stubbing in main deploySolution tests
 export async function deploySolutionFromTemplate(templateSolutionId, solutionTemplateBase, solutionTemplateData, authentication, options) {
+    /**
+     * function to abort the current process. Will delete solution and reject the promise
+     *
+     * @return a reject on the parent promise.
+     */
+    function checkCancelled() {
+        if (options && options.abortController) {
+            if (options.abortController.signal.aborted) {
+                throw new Error("Operation was cancelled");
+            }
+        }
+    }
+    checkCancelled();
     options.storageVersion = common.extractSolutionVersion(solutionTemplateData);
     // It is possible to provide a separate authentication for the source
     const storageAuthentication = options.storageAuthentication
@@ -71,6 +84,7 @@ export async function deploySolutionFromTemplate(templateSolutionId, solutionTem
     templateDictionary.user = userResponse;
     templateDictionary.user.folders = foldersAndGroupsResponse.folders;
     templateDictionary.user.groups = foldersAndGroupsResponse.groups.filter((group) => group.owner === templateDictionary.user.username);
+    checkCancelled();
     // Add information needed for workflow manager
     const user = await common.getUser(authentication);
     templateDictionary.workflowBaseUrl = await common.getWorkflowBaseURL(authentication, portalResponse, user.orgId);
@@ -86,6 +100,7 @@ export async function deploySolutionFromTemplate(templateSolutionId, solutionTem
     // Apply the portal extents to the solution
     const portalExtent = portalResponse.defaultExtent;
     const extentsPromise = common.convertExtentWithFallback(portalExtent, undefined, { wkid: 4326 }, portalResponse.helperServices.geometry.url, authentication);
+    checkCancelled();
     // Await completion of async actions: folder creation & extents conversion
     const folderExtentsResponses = await Promise.all([folderPromise, extentsPromise, trackingOwnerPromise]);
     const [folderResponse, wgs84Extent, trackingOwnerResponse] = folderExtentsResponses;
@@ -116,10 +131,12 @@ export async function deploySolutionFromTemplate(templateSolutionId, solutionTem
         if (options.additionalTypeKeywords) {
             createSolutionItemBase.typeKeywords = ["Solution"].concat(options.additionalTypeKeywords);
         }
+        checkCancelled();
         // Create deployed solution item
         createSolutionItemBase.thumbnail = options.thumbnail;
         const createSolutionResponse = await common.createItemWithData(createSolutionItemBase, {}, authentication, deployedFolderId);
         deployedSolutionId = createSolutionResponse.id;
+        checkCancelled();
         // Protect the solution item
         const protectOptions = {
             id: deployedSolutionId,
@@ -131,9 +148,11 @@ export async function deploySolutionFromTemplate(templateSolutionId, solutionTem
         solutionTemplateBase.tryitUrl = _checkedReplaceAll(solutionTemplateBase.tryitUrl, templateSolutionId, deployedSolutionId);
         solutionTemplateBase.url = _checkedReplaceAll(solutionTemplateBase.url, templateSolutionId, deployedSolutionId);
     }
+    checkCancelled();
     // Handle the contained item templates
     const clonedSolutionsResponse = await deployItems.deploySolutionItems(storageAuthentication.portal, templateSolutionId, solutionTemplateData.templates, storageAuthentication, templateDictionary, deployedSolutionId, authentication, options);
     solutionTemplateData.templates = solutionTemplateData.templates.map((itemTemplate) => {
+        checkCancelled();
         // Update ids present in template dictionary
         itemTemplate.itemId = common.getProp(templateDictionary, `${itemTemplate.itemId}.itemId`);
         // Update the dependencies hash to point to the new item ids
@@ -142,6 +161,7 @@ export async function deploySolutionFromTemplate(templateSolutionId, solutionTem
     });
     // Sort the templates into build order, which is provided by clonedSolutionsResponse
     sortTemplates(solutionTemplateData.templates, clonedSolutionsResponse.map((response) => response.id));
+    checkCancelled();
     // Wrap up with post-processing, in which we deal with groups and cycle remnants
     await postProcess(deployedSolutionId, solutionTemplateData.templates, clonedSolutionsResponse, authentication, templateDictionary);
     if (!options.dontCreateSolutionItem) {
@@ -164,6 +184,7 @@ export async function deploySolutionFromTemplate(templateSolutionId, solutionTem
         if (templateDictionary.params) {
             solutionTemplateBase.data.params = templateDictionary.params;
         }
+        checkCancelled();
         await common.updateItem(solutionTemplateBase, authentication, deployedFolderId);
     }
     return solutionTemplateBase.id;

package/dist/esm/deploySolutionItems.d.ts

@@ -212,7 +212,7 @@ export declare function _findExistingItem(query: string, authentication: common.
  *         already in the templates list
  * @private
  */
-export declare function _createItemFromTemplateWhenReady(template: common.IItemTemplate, resourceFilePaths: common.IDeployFileCopyPath[], storageAuthentication: common.UserSession, templateDictionary: any, destinationAuthentication: common.UserSession, itemProgressCallback: common.IItemProgressCallback): Promise<common.ICreateItemFromTemplateResponse>;
+export declare function _createItemFromTemplateWhenReady(template: common.IItemTemplate, resourceFilePaths: common.IDeployFileCopyPath[], storageAuthentication: common.UserSession, templateDictionary: any, destinationAuthentication: common.UserSession, itemProgressCallback: common.IItemProgressCallback, abortController?: AbortController): Promise<common.ICreateItemFromTemplateResponse>;
 /**
  * Accumulates the estimated deployment cost of a set of templates.
  *

package/dist/esm/deploySolutionItems.js

@@ -37,6 +37,18 @@ const UNSUPPORTED = null;
  */
 export function deploySolutionItems(portalSharingUrl, storageItemId, templates, storageAuthentication, templateDictionary, deployedSolutionId, destinationAuthentication, options) {
     return new Promise((resolve, reject) => {
+        /**
+         * function to abort the current process. Will delete solution and reject the promise
+         *
+         * @return a reject on the parent promise.
+         */
+        function checkCancelled() {
+            if (options && options.abortController) {
+                if (options.abortController.signal.aborted) {
+                    reject(new Error(`Operation was cancelled`));
+                }
+            }
+        }
         // Prepare feedback mechanism
         const totalEstimatedCost = _estimateDeploymentCost(templates) + 1; // solution items, plus avoid divide by 0
         let percentDone = 10; // allow for previous deployment work
@@ -44,6 +56,7 @@ export function deploySolutionItems(portalSharingUrl, storageItemId, templates,
         const failedTemplateItemIds = [];
         const deployedItemIds = [];
         let statusOK = true;
+        checkCancelled();
         // TODO: move to separate fn
         const itemProgressCallback = (itemId, status, costUsed, createdItemId) => {
             percentDone += progressPercentStep * costUsed;
@@ -88,12 +101,15 @@ export function deploySolutionItems(portalSharingUrl, storageItemId, templates,
         //   * create item in destination group
         //   * add created item's id into the template dictionary
         const awaitAllItems = [];
+        checkCancelled();
         const reuseItemsDef = _reuseDeployedItems(templates, options.enableItemReuse ?? false, templateDictionary, destinationAuthentication);
         // eslint-disable-next-line @typescript-eslint/no-floating-promises
         reuseItemsDef.then(() => {
+            checkCancelled();
             const useExistingItemsDef = _useExistingItems(templates, common.getProp(templateDictionary, "params.useExisting"), templateDictionary, destinationAuthentication);
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             useExistingItemsDef.then(() => {
+                checkCancelled();
                 templates = common.setNamesAndTitles(templates);
                 buildOrder.forEach((id) => {
                     // Get the item's template out of the list of templates
@@ -106,11 +122,12 @@ export function deploySolutionItems(portalSharingUrl, storageItemId, templates,
                         // Remove qc.project.json files from the resources--we don't use them from solutions
                         template.resources = template.resources.filter((filename) => !filename.endsWith("qc.project.json"));
                     }
-                    awaitAllItems.push(_createItemFromTemplateWhenReady(template, common.generateStorageFilePaths(portalSharingUrl, storageItemId, template.resources, options.storageVersion), storageAuthentication, templateDictionary, destinationAuthentication, itemProgressCallback));
+                    awaitAllItems.push(_createItemFromTemplateWhenReady(template, common.generateStorageFilePaths(portalSharingUrl, storageItemId, template.resources, options.storageVersion), storageAuthentication, templateDictionary, destinationAuthentication, itemProgressCallback, options.abortController));
                 });
                 // Wait until all items have been created
                 // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 Promise.all(awaitAllItems).then((clonedSolutionItems) => {
+                    checkCancelled();
                     if (failedTemplateItemIds.length === 0) {
                         // Do we have any items to be patched (i.e., they refer to dependencies using the template id rather
                         // than the cloned id because the item had to be created before the dependency)? Flag these items
@@ -716,7 +733,19 @@ export function _findExistingItem(query, authentication) {
  *         already in the templates list
  * @private
  */
-export function _createItemFromTemplateWhenReady(template, resourceFilePaths, storageAuthentication, templateDictionary, destinationAuthentication, itemProgressCallback) {
+export function _createItemFromTemplateWhenReady(template, resourceFilePaths, storageAuthentication, templateDictionary, destinationAuthentication, itemProgressCallback, abortController) {
+    /**
+     * function to abort the current process. Will delete solution and reject the promise
+     *
+     * @return a reject on the parent promise.
+     */
+    function checkCancelled() {
+        if (abortController) {
+            if (abortController.signal.aborted) {
+                throw new Error(`Operation was cancelled`);
+            }
+        }
+    }
     const sourceItemId = template.itemId;
     // ensure this is present
     template.dependencies = template.dependencies || [];
@@ -724,6 +753,7 @@ export function _createItemFromTemplateWhenReady(template, resourceFilePaths, st
     // or if we have a basic entry without the deferred request for its creation, add it
     if (!templateDictionary.hasOwnProperty(template.itemId) ||
         !common.getProp(templateDictionary[template.itemId], "def")) {
+        checkCancelled();
         let createResponse;
         let statusCode = common.EItemProgressStatus.Unknown;
         let itemHandler;
@@ -753,6 +783,7 @@ export function _createItemFromTemplateWhenReady(template, resourceFilePaths, st
                 : _awaitDependencies;
             Promise.all(awaitDependencies)
                 .then(() => {
+                checkCancelled();
                 // Find the conversion handler for this item type
                 const templateType = template.type;
                 itemHandler = moduleMap[templateType];
@@ -773,12 +804,14 @@ export function _createItemFromTemplateWhenReady(template, resourceFilePaths, st
                 return common.getThumbnailFromStorageItem(storageAuthentication, resourceFilePaths);
             })
                 .then((thumbnail) => {
+                checkCancelled();
                 template.item.thumbnail = thumbnail;
                 // Delegate the creation of the item to the handler
                 // eslint-disable-next-line @typescript-eslint/no-floating-promises
                 return itemHandler.createItemFromTemplate(template, templateDictionary, destinationAuthentication, itemProgressCallback);
             })
                 .then(async (response) => {
+                checkCancelled();
                 if (response.id === "") {
                     statusCode = common.EItemProgressStatus.Failed;
                     throw new Error("handled"); // fails to create item
@@ -804,11 +837,13 @@ export function _createItemFromTemplateWhenReady(template, resourceFilePaths, st
                             }
                         });
                         if (formZipFilePath) {
+                            checkCancelled();
                             // Fetch the form's zip file and send it to the item
                             const zipObject = await common.fetchZipObject(formZipFilePath.url, storageAuthentication);
                             await common.updateItemWithZipObject(zipObject, destinationItemId, destinationAuthentication);
                         }
                     }
+                    checkCancelled();
                     // Copy resources, metadata
                     return common.copyFilesFromStorageItem(storageAuthentication, resourceFilePaths, sourceItemId, templateDictionary.folderId, destinationItemId, destinationAuthentication, createResponse.item, templateDictionary);
                 }

package/dist/esm/deployer.d.ts

@@ -32,3 +32,4 @@ import { IModel } from "@esri/hub-common";
  * @returns The id of the created deployed solution item
  */
 export declare function deploySolution(maybeModel: string | IModel, authentication: common.UserSession, options?: common.IDeploySolutionOptions): Promise<string>;
+export declare function deployCatchHandler(ex: any, authentication: common.UserSession): void;

package/dist/esm/deployer.js

@@ -37,6 +37,18 @@ export async function deploySolution(maybeModel, authentication, options) {
     if (!maybeModel) {
         return Promise.reject(common.fail("The Solution Template id is missing"));
     }
+    /**
+     * function to abort the current process. Will delete solution and reject the promise
+     *
+     * @return a reject on the parent promise.
+     */
+    function checkCancelled() {
+        if (options && options.abortController) {
+            if (options.abortController.signal.aborted) {
+                throw new Error("Operation was cancelled");
+            }
+        }
+    }
     let deployOptions = options || {};
     /* istanbul ignore else */
     if (deployOptions.progressCallback) {
@@ -46,9 +58,11 @@ export async function deploySolution(maybeModel, authentication, options) {
     const storageAuthentication = deployOptions.storageAuthentication
         ? deployOptions.storageAuthentication
         : authentication;
+    void checkCancelled();
     // deal with maybe getting an item or an id
     return getSolutionTemplateItem(maybeModel, storageAuthentication)
         .then((model) => {
+        void checkCancelled();
         if (!isSolutionTemplateItem(model.item)) {
             return Promise.reject(common.fail(`${model.item.id} is not a Solution Template`));
         }
@@ -71,6 +85,7 @@ export async function deploySolution(maybeModel, authentication, options) {
         deployOptions = updateDeployOptions(deployOptions, item, storageAuthentication);
         // Clone before mutating? This was messing me up in some testing...
         common.deleteItemProps(item);
+        checkCancelled();
         return deploySolutionFromTemplate(itemId, item, data, authentication, deployOptions);
     })
         .then((createdSolutionId) => {
@@ -88,6 +103,14 @@ export async function deploySolution(maybeModel, authentication, options) {
         return Promise.reject(error);
     })
         .catch((ex) => {
+        deployCatchHandler(ex, authentication);
         throw ex;
     });
 }
+export function deployCatchHandler(ex, authentication) {
+    const options = {
+        consoleProgress: true,
+        sendToRecycling: false,
+    };
+    void common.deleteSolution(ex.trim(), authentication, options);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/solution-deployer",
-  "version": "6.4.0-next.20250806",
+  "version": "6.4.0-next.20250808",
   "description": "Manages the deployment of a Solution for @esri/solution.js.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -24,18 +24,18 @@
   },
   "dependencies": {
     "@esri/hub-common": "^17.0.2",
-    "@esri/solution-common": "^6.4.0-next.20250806",
-    "@esri/solution-feature-layer": "^6.4.0-next.20250806",
-    "@esri/solution-file": "^6.4.0-next.20250806",
-    "@esri/solution-form": "^6.4.0-next.20250806",
-    "@esri/solution-group": "^6.4.0-next.20250806",
-    "@esri/solution-hub-types": "^6.4.0-next.20250806",
-    "@esri/solution-simple-types": "^6.4.0-next.20250806",
-    "@esri/solution-storymap": "^6.4.0-next.20250806",
-    "@esri/solution-velocity": "^6.4.0-next.20250806",
-    "@esri/solution-web-experience": "^6.4.0-next.20250806",
-    "@esri/solution-web-tool": "^6.4.0-next.20250806",
-    "@esri/solution-workflow": "^6.4.0-next.20250806",
+    "@esri/solution-common": "^6.4.0-next.20250808",
+    "@esri/solution-feature-layer": "^6.4.0-next.20250808",
+    "@esri/solution-file": "^6.4.0-next.20250808",
+    "@esri/solution-form": "^6.4.0-next.20250808",
+    "@esri/solution-group": "^6.4.0-next.20250808",
+    "@esri/solution-hub-types": "^6.4.0-next.20250808",
+    "@esri/solution-simple-types": "^6.4.0-next.20250808",
+    "@esri/solution-storymap": "^6.4.0-next.20250808",
+    "@esri/solution-velocity": "^6.4.0-next.20250808",
+    "@esri/solution-web-experience": "^6.4.0-next.20250808",
+    "@esri/solution-web-tool": "^6.4.0-next.20250808",
+    "@esri/solution-workflow": "^6.4.0-next.20250808",
     "tslib": "1.14.1"
   },
   "scripts": {
@@ -90,5 +90,5 @@
     "esri",
     "ES6"
   ],
-  "gitHead": "231a47edad8afb71cb1d33e6a1b83679ec428193"
+  "gitHead": "fc677f0f21a1a090d65743f08073eeed47e22ef0"
 }