@izara_project/izara-core-library-asynchronous-flow 1.0.35 → 1.0.36

package/index.js

@@ -8,98 +8,19 @@ License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU Affero General Public License for more details.
 
 You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 
-import {
-  createFieldNameUniqueRequestId,
-  createConcatenatedAwaitingStepId,
-  createConcatenatedPendingStepId,
-  createAwaitingStepId,
-  createPendingStepId,
-  createParentFlowId,
-  explodePendingStepId,
-  createFieldNameCacheComplete,
-  createFieldNameStatus,
-  checkUniqueRequestProcessing,
-  checkTimeCacheComplete,
-  checkAndGetTimeCacheComplete,
-  checkCacheUniqueRequestId,
-  validateStartKeyParam,
-  validateMultipleInvocations
-} from './src/asyncFlowSharedLib.js';
-
-import {
-  createAwaitingStep,
-  findPendingStepIdsAwaitingStep,
-  findPendingStepsAwaitingStep,
-  findPendingStepAwaitingStep,
-  findPendingStepAwaitingStepWithCallingFlow,
-  removeAwaitingStep,
-  removeAwaitingStepWithCheckUniqueRequestId
-} from './src/awaitingStep.js';
-
-import {
-  createAwaitingMultipleStepsWithAdditionalAttributes,
-  initAwaitingStepsWithAttrs,
-  createAwaitingMultipleSteps,
-  createNewAwaitingMultipleStep,
-  findPendingStepIdsAwaitingMultipleSteps,
-  findPendingStepsAwaitingMultipleSteps,
-  findPendingStepAwaitingMultipleSteps,
-  findAwaitingMultipleStepByPending,
-  checkAllAwaitingStepsFinishedShared,
-  checkAllAwaitingStepsFinished,
-  checkAllAwaitingStepsFinishedWithReturnParams,
-  clearAllAwaitingSteps,
-  removeAwaitingMultipleStep,
-  createAwaitingMultipleStepsWithAdditionalAttributesAndPublish
-} from './src/awaitingMultipleSteps.js';
+import * as asyncFlowSharedLib from './src/asyncFlowSharedLib.js';
+import * as awaitingStep from './src/awaitingStep.js';
+import * as awaitingMultipleSteps from './src/awaitingMultipleSteps.js';
 
 export default {
-  //  asyncFlowSharedLib
-  createFieldNameUniqueRequestId,
-  createConcatenatedAwaitingStepId,
-  createConcatenatedPendingStepId,
-  createAwaitingStepId,
-  createPendingStepId,
-  createParentFlowId,
-  explodePendingStepId,
-  createFieldNameCacheComplete,
-  createFieldNameStatus,
-  checkUniqueRequestProcessing,
-  checkTimeCacheComplete,
-  checkAndGetTimeCacheComplete,
-  checkCacheUniqueRequestId,
-  validateStartKeyParam,
-  validateMultipleInvocations,
-
-  //  awaitingStep
-  createAwaitingStep,
-  findPendingStepIdsAwaitingStep,
-  findPendingStepsAwaitingStep,
-  findPendingStepAwaitingStep,
-  findPendingStepAwaitingStepWithCallingFlow,
-  removeAwaitingStep,
-  removeAwaitingStepWithCheckUniqueRequestId,
-
-  //  awaitingMultipleSteps
-  createAwaitingMultipleStepsWithAdditionalAttributes,
-  initAwaitingStepsWithAttrs,
-  createAwaitingMultipleSteps,
-  createNewAwaitingMultipleStep,
-  findPendingStepIdsAwaitingMultipleSteps,
-  findPendingStepsAwaitingMultipleSteps,
-  findPendingStepAwaitingMultipleSteps,
-  findAwaitingMultipleStepByPending,
-  checkAllAwaitingStepsFinishedShared,
-  checkAllAwaitingStepsFinished,
-  checkAllAwaitingStepsFinishedWithReturnParams,
-  clearAllAwaitingSteps,
-  removeAwaitingMultipleStep,
-  createAwaitingMultipleStepsWithAdditionalAttributesAndPublish
+  ...asyncFlowSharedLib,
+  ...awaitingStep,
+  ...awaitingMultipleSteps
 };

package/package.json

@@ -3,7 +3,7 @@
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "license": "AGPL-3.0-or-later",
   "homepage": "https://bitbucket.org/izara-core-libraries/izara-core-library-asynchronous-flow#readme",
-  "version": "1.0.35",
+  "version": "1.0.36",
   "description": "Shared asynchronous flow logic",
   "type": "module",
   "main": "index.js",

package/src/asyncFlowSharedLib.js

@@ -106,7 +106,7 @@ export function createParentFlowId(prefix = '') {
  */
 export function explodePendingStepId(pendingStepId, prefix = '') {
   if (!pendingStepId) {
-    throw NoRetryError('pendingStepId is required');
+    throw new NoRetryError('pendingStepId is required');
   }
 
   if (prefix === '') {
@@ -195,7 +195,7 @@ export async function checkUniqueRequestProcessing(
   );
 
   if (!tableName || !primaryKey) {
-    throw NoRetryError('tableName and primaryKey are required');
+    throw new NoRetryError('tableName and primaryKey are required');
   }
 
   try {
@@ -327,7 +327,7 @@ export async function checkTimeCacheComplete(
   });
 
   if (!fullMainTableName || !keyValues || !timeCacheComplete || !prefix) {
-    throw NoRetryError(
+    throw new NoRetryError(
       'fullMainTableName, keyValues, timeCacheComplete and prefix are required'
     );
   }

package/src/awaitingMultipleSteps.js

@@ -22,191 +22,79 @@ import snsSharedLib from '@izara_project/izara-core-library-sns';
 
 import { createParentFlowId } from './asyncFlowSharedLib.js';
 
-//====================================== AwaitingMultipleSteps
-// AwaitingMultipleSteps is when a flow is awaiting multiple external flows before it can continue
-// One awaitingStepId can have multiple pendingStepIds that are awaiting it
-// One pendingStepId can have multiple awaitingStepIds it is awaiting
-// logic can prepend any prefix to awaitingStepId if want to be share one table and differentiate different external step ids
-
-/**
- * Create multiple awaiting records with optional per-record additional attributes.
- * Writes to both "AwaitingMultipleSteps" and "AwaitingMultipleStepByPending".
- * @async
- * @param {IzContext} _izContext
- * @param {AwaitingMultiInputRecord[]} records
- * @param {string} pendingStepId
- * @returns {Promise<void>}
- */
-export async function createAwaitingMultipleStepsWithAdditionalAttributes(
+async function putAwaitingMultipleStepRecords(
   _izContext,
-  records, // array of object including properties: awaitingStepId / (optional) additionalAttributes
-  pendingStepId
+  records,
+  pendingStepId,
+  sharedAttributes = {}
 ) {
-  _izContext.logger.debug(
-    '[Lib:AsyncFlow:createAwaitingMultipleStepsWithAdditionalAttributes] Input: ',
-    {
-      records,
-      pendingStepId
-    }
+  const multipleStepsTable = dynamodbSharedLib.tableName(
+    _izContext,
+    'AwaitingMultipleSteps'
+  );
+  const byPendingTable = dynamodbSharedLib.tableName(
+    _izContext,
+    'AwaitingMultipleStepByPending'
   );
 
-  const promiseArray = [];
-
-  for (const record of records) {
-    const attributesWhenCreate = {
-      awaitingStepId: record.awaitingStepId,
-      pendingStepId: pendingStepId,
-      timestamp: Date.now(),
-      ...record.additionalAttributes
-    };
-
-    promiseArray.push(
-      dynamodbSharedLib.putItem(
-        _izContext,
-        dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-        attributesWhenCreate
-      )
-    );
-    promiseArray.push(
-      dynamodbSharedLib.putItem(
-        _izContext,
-        dynamodbSharedLib.tableName(
-          _izContext,
-          'AwaitingMultipleStepByPending'
-        ),
-        {
-          pendingStepId: pendingStepId,
-          awaitingStepId: record.awaitingStepId,
-          timestamp: Date.now()
-        }
-      )
-    );
-  }
+  await Promise.all(
+    records.flatMap(({ awaitingStepId, additionalAttributes }) => {
+      const baseAttrs = {
+        awaitingStepId,
+        pendingStepId,
+        ...sharedAttributes
+      };
 
-  await Promise.all(promiseArray);
+      return [
+        dynamodbSharedLib.putItem(_izContext, multipleStepsTable, baseAttrs),
+        dynamodbSharedLib.putItem(_izContext, byPendingTable, {
+          ...baseAttrs,
+          additionalAttributes
+        })
+      ];
+    })
+  );
 }
 
-/**
- * Batch initializes multiple pending steps in DynamoDB.
- * Records status in both the primary tracking table and the pending-relation table.
- * * @async
- * @param {Object} _izContext - The system context providing logger and shared utilities.
- * @param {Array<Object>} records - Array of step objects to be initialized.
- * @param {string} records[].awaitingStepId - The unique identifier for the specific step.
- * @param {Object} [records[].additionalAttributes] - Optional metadata to store with the step.
- * @param {string} pendingStepId - The parent ID linking all related steps together.
- * @returns {Promise<void>}
- */
-export async function initAwaitingStepsWithAttrs(
-  _izContext,
-  records,
-  pendingStepId
-) {
-  _izContext.logger.debug(
-    '[Lib:AsyncFlow:initAwaitingStepsWithAttrs] Input: ',
+async function queryAwaitingMultipleSteps(_izContext, awaitingStepId) {
+  return dynamodbSharedLib.query(
+    _izContext,
+    dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
     {
-      records,
-      pendingStepId
+      awaitingStepId
     }
   );
-
-  const timestamp = Date.now();
-  const promiseArray = [];
-
-  for (const record of records) {
-    promiseArray.push(
-      dynamodbSharedLib.putItem(
-        _izContext,
-        dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-        {
-          awaitingStepId: record.awaitingStepId,
-          pendingStepId,
-          timestamp
-        }
-      )
-    );
-    promiseArray.push(
-      dynamodbSharedLib.putItem(
-        _izContext,
-        dynamodbSharedLib.tableName(
-          _izContext,
-          'AwaitingMultipleStepByPending'
-        ),
-        {
-          pendingStepId,
-          awaitingStepId: record.awaitingStepId,
-          timestamp,
-          ...record.additionalAttributes
-        }
-      )
-    );
-  }
-
-  await Promise.all(promiseArray);
 }
 
+//====================================== AwaitingMultipleSteps
+// AwaitingMultipleSteps is when a flow is awaiting multiple external flows before it can continue
+// One awaitingStepId can have multiple pendingStepIds that are awaiting it
+// One pendingStepId can have multiple awaitingStepIds it is awaiting
+// logic can prepend any prefix to awaitingStepId if want to be share one table and differentiate different external step ids
+
 /**
- * Create multiple awaiting records given an array of awaitingStepIds.
+ * Create multiple awaiting records with optional per-record additional attributes.
  * Writes to both "AwaitingMultipleSteps" and "AwaitingMultipleStepByPending".
  * @async
  * @param {IzContext} _izContext
- * @param {string[]} records - array of awaitingStepIds
+ * @param {AwaitingMultiInputRecord[]} records
  * @param {string} pendingStepId
  * @returns {Promise<void>}
  */
-export async function createAwaitingMultipleSteps(
+export async function createAwaitingMultipleStepsWithAdditionalAttributes(
   _izContext,
-  records, // array of awaitingStepIds
+  records, // array of object including properties: awaitingStepId / (optional) additionalAttributes
   pendingStepId
 ) {
   _izContext.logger.debug(
-    '[Lib:AsyncFlow:createAwaitingMultipleSteps] Input: ',
-    {
-      records: records,
-      pendingStepId: pendingStepId
-    }
+    '[Lib:AsyncFlow:createAwaitingMultipleStepsWithAdditionalAttributes] Input: ',
+    { records, pendingStepId }
   );
 
-  const promiseArray = [];
-
-  for (const record of records) {
-    const attributesWhenCreate = {
-      awaitingStepId: record,
-      pendingStepId: pendingStepId,
-      timestamp: Date.now()
-    };
-    _izContext.logger.debug(
-      '[Lib:AsyncFlow:createAwaitingMultipleSteps] attributesWhenCreate: ',
-      attributesWhenCreate
-    );
-    promiseArray.push(
-      dynamodbSharedLib.putItem(
-        _izContext,
-        dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-        attributesWhenCreate
-      )
-    );
-
-    _izContext.logger.debug(
-      '[Lib:AsyncFlow:createAwaitingMultipleSteps] putItem:AwaitingMultipleStepByPending',
-      {
-        awaitingStepId: attributesWhenCreate.awaitingStepId
-      }
-    );
-
-    promiseArray.push(
-      dynamodbSharedLib.putItem(
-        _izContext,
-        dynamodbSharedLib.tableName(
-          _izContext,
-          'AwaitingMultipleStepByPending'
-        ),
-        attributesWhenCreate
-      )
-    );
-  }
-
-  await Promise.all(promiseArray);
+  const timestamp = Date.now();
+  await putAwaitingMultipleStepRecords(_izContext, records, pendingStepId, {
+    timestamp
+  });
 }
 
 /**
@@ -219,14 +107,14 @@ export async function createAwaitingMultipleSteps(
  *   The same object is applied to all steps (caller cannot know the generated UUIDs beforehand).
  * @returns {Promise<string>} The awaiting  step ID created.
  */
-export async function createNewAwaitingMultipleStep(
+export async function createAwaitingMultipleStep(
   _izContext,
   pendingStepId,
   prefix = '',
   additionalAttributes = {}
 ) {
   _izContext.logger.debug(
-    '[Lib:AsyncFlow:createNewAwaitingMultipleStep] Input: ',
+    '[Lib:AsyncFlow:createAwaitingMultipleStep] Input: ',
     {
       pendingStepId,
       additionalAttributes
@@ -234,38 +122,25 @@ export async function createNewAwaitingMultipleStep(
   );
 
   const parentFlowId = createParentFlowId(prefix);
-
-  const attributesWhenCreate = {
-    awaitingStepId: parentFlowId,
-    pendingStepId: pendingStepId,
+  const sharedAttributes = {
     complete: false,
     errorsFound: []
   };
 
   _izContext.logger.debug(
-    '[Lib:AsyncFlow:createNewAwaitingMultipleStep] attributesWhenCreate: ',
-    attributesWhenCreate
-  );
-
-  await dynamodbSharedLib.putItem(
-    _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-    attributesWhenCreate
+    '[Lib:AsyncFlow:createAwaitingMultipleStep] sharedAttributes: ',
+    { awaitingStepId: parentFlowId, pendingStepId, ...sharedAttributes }
   );
 
-  const attributesForPending = {
-    ...attributesWhenCreate,
-    additionalAttributes: additionalAttributes
-  };
-
-  await dynamodbSharedLib.putItem(
+  await putAwaitingMultipleStepRecords(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
-    attributesForPending
+    [{ awaitingStepId: parentFlowId, additionalAttributes }],
+    pendingStepId,
+    sharedAttributes
   );
 
   _izContext.logger.debug(
-    '[Lib:AsyncFlow:createNewAwaitingMultipleStep] Returning: ',
+    '[Lib:AsyncFlow:createAwaitingMultipleStep] Returning: ',
     parentFlowId
   );
 
@@ -273,18 +148,18 @@ export async function createNewAwaitingMultipleStep(
 }
 
 /**
- * Find all pendingStepIds that are waiting on a given awaitingStepId (multiple).
+ * Find one pendingStepId waiting on a given awaitingStepId (multiple).
  * @async
  * @param {IzContext} _izContext
  * @param {string} awaitingStepId
- * @returns {Promise<string[]>}
+ * @returns {Promise<string>}
  */
-export async function findPendingStepIdsAwaitingMultipleSteps(
+export async function findPendingStepIdAwaitingMultipleSteps(
   _izContext,
   awaitingStepId
 ) {
   _izContext.logger.debug(
-    '[Lib:findPendingStepIdsAwaitingMultipleSteps] Input parameters',
+    '[Lib:findPendingStepIdAwaitingMultipleSteps] Input parameters',
     {
       awaitingStepId: awaitingStepId
     }
@@ -292,31 +167,29 @@ export async function findPendingStepIdsAwaitingMultipleSteps(
 
   if (!awaitingStepId) {
     _izContext.logger.error(
-      '[Lib:findPendingStepIdsAwaitingMultipleSteps] awaitingStepId is required'
+      '[Lib:findPendingStepIdAwaitingMultipleSteps] awaitingStepId is required'
     );
     throw new NoRetryError('awaitingStepId is required');
   }
 
-  const pendingStepIds = [];
-
-  const listPendingStepIds = await dynamodbSharedLib.query(
+  const listPendingSteps = await queryAwaitingMultipleSteps(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-    {
-      awaitingStepId: awaitingStepId
-    }
+    awaitingStepId
   );
-
-  for (const item of listPendingStepIds.Items) {
-    pendingStepIds.push(item.pendingStepId);
+  if (listPendingSteps.Items.length !== 1) {
+    _izContext.logger.error(
+      '[Lib:findPendingStepIdAwaitingMultipleSteps] listPendingSteps not equals 1'
+    );
+    throw new NoRetryError('listPendingSteps not equals 1');
   }
+  const pendingStepId = listPendingSteps.Items[0].pendingStepId;
 
   _izContext.logger.debug(
-    '[Lib:findPendingStepIdsAwaitingMultipleSteps] Pending step IDs',
-    pendingStepIds
+    '[Lib:findPendingStepIdAwaitingMultipleSteps] Pending step ID',
+    pendingStepId
   );
 
-  return pendingStepIds;
+  return pendingStepId;
 }
 
 /**
@@ -344,12 +217,9 @@ export async function findPendingStepsAwaitingMultipleSteps(
     throw new NoRetryError('awaitingStepId is required');
   }
 
-  const listPendingSteps = await dynamodbSharedLib.query(
+  const listPendingSteps = await queryAwaitingMultipleSteps(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-    {
-      awaitingStepId: awaitingStepId
-    }
+    awaitingStepId
   );
 
   _izContext.logger.debug(
@@ -386,12 +256,9 @@ export async function findPendingStepAwaitingMultipleSteps(
     throw new NoRetryError('awaitingStepId is required');
   }
 
-  const listPendingSteps = await dynamodbSharedLib.query(
+  const listPendingSteps = await queryAwaitingMultipleSteps(
     _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
-    {
-      awaitingStepId: awaitingStepId
-    }
+    awaitingStepId
   );
 
   _izContext.logger.debug(
@@ -455,102 +322,6 @@ export async function findAwaitingMultipleStepByPending(
   return listAwaitingSteps.Items;
 }
 
-/**
- * Updates the completion status of a specific awaiting step within a multiple-step pending process.
- * Marks the given awaiting step as complete and stores any encountered errors or additional attributes.
- *
- * @param {Object} _izContext - The execution context object containing logger and other utilities.
- * @param {string} pendingStepId - The unique identifier of the parent pending step.
- * @param {string|null} [currentAwaitingStepId=null] - The unique identifier of the specific awaiting step being processed. If null, no update is performed.
- * @param {Array<Object|string>} [errorsFound=[]] - An array of errors encountered during the step's execution.
- * @param {Object} [additionalAttributes={}] - Any extra data to save along with the completion status.
- * @returns {Promise<void>} Resolves when the update operation is complete.
- */
-export async function checkAllAwaitingStepsFinishedShared(
-  _izContext,
-  pendingStepId,
-  currentAwaitingStepId = null,
-  errorsFound = [],
-  additionalAttributes = {}
-) {
-  _izContext.logger.debug(
-    '[Lib:checkAllAwaitingStepsFinishedShared] Input parameters',
-    {
-      pendingStepId: pendingStepId,
-      currentAwaitingStepId: currentAwaitingStepId,
-      errorsFound: errorsFound
-    }
-  );
-
-  if (currentAwaitingStepId) {
-    await dynamodbSharedLib.updateItem(
-      _izContext,
-      dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
-      {
-        pendingStepId: pendingStepId,
-        awaitingStepId: currentAwaitingStepId
-      },
-      {
-        complete: true,
-        errorsFound: errorsFound,
-        additionalAttributes: additionalAttributes
-      }
-    );
-  }
-}
-
-/**
- * Same as checkAllAwaitingStepsFinished but writes errors/additionalAttributes to the *_ByPending row.
- * @async
- * @param {IzContext} _izContext
- * @param {string} pendingStepId
- * @param {string|null} [currentAwaitingStepId=null]
- * @param {any[]} [errorsFound=[]]
- * @param {Attrs} [additionalAttributes={}]
- * @returns {Promise<boolean>}
- */
-export async function checkAllAwaitingStepsFinished(
-  _izContext,
-  pendingStepId,
-  currentAwaitingStepId = null,
-  errorsFound = [],
-  additionalAttributes = {}
-) {
-  _izContext.logger.debug(
-    '[Lib:checkAllAwaitingStepsFinished] Input parameters',
-    {
-      pendingStepId: pendingStepId,
-      currentAwaitingStepId: currentAwaitingStepId,
-      errorsFound: errorsFound
-    }
-  );
-
-  await checkAllAwaitingStepsFinishedShared(
-    _izContext,
-    pendingStepId,
-    currentAwaitingStepId,
-    errorsFound,
-    additionalAttributes
-  );
-
-  const items = await dynamodbSharedLib.query(
-    _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
-    { pendingStepId },
-    { limit: 50 }
-  );
-
-  for (const item of items.Items) {
-    if (item.awaitingStepId === currentAwaitingStepId) continue;
-    if (!item.complete) return false;
-  }
-
-  _izContext.logger.debug(
-    '[Lib:checkAllAwaitingStepsFinished] All steps are complete'
-  );
-  return true;
-}
-
 /**
  * Checks if all awaiting steps for a pending step are complete after marking the current one as complete.
  * If all steps are finished, returns an object with `isComplete: true` and the collected data.
@@ -560,7 +331,7 @@ export async function checkAllAwaitingStepsFinished(
  * @param {string} pendingStepId
  * @param {string|null} [currentAwaitingStepId=null] - The step that has just finished.
  * @param {any[]} [errorsFound=[]]
- * @param {Attrs} [additionalAttributes={}]
+ * @param {Attrs} [returnValues={}]
  * @returns {Promise<{
  *   isComplete: boolean,
  *   collectedAttributes: Record<string, any>|null,
@@ -573,7 +344,10 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
   pendingStepId,
   currentAwaitingStepId = null,
   errorsFound = [],
-  additionalAttributes = {}
+  returnValues = {},
+  settings = {
+    checkIsAllError: true
+  }
 ) {
   _izContext.logger.debug(
     '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Input parameters',
@@ -581,24 +355,26 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
       pendingStepId,
       currentAwaitingStepId,
       errorsFound,
-      additionalAttributes
+      returnValues
     }
   );
 
-  if (!pendingStepId || !currentAwaitingStepId) {
-    throw NoRetryError(
-      '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] pendingStepId or currentAwaitingStepId is required'
+  if (currentAwaitingStepId) {
+    await dynamodbSharedLib.updateItem(
+      _izContext,
+      dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
+      {
+        pendingStepId: pendingStepId,
+        awaitingStepId: currentAwaitingStepId
+      },
+      {
+        complete: true,
+        errorsFound: errorsFound,
+        returnValues: returnValues
+      }
     );
   }
 
-  await checkAllAwaitingStepsFinishedShared(
-    _izContext,
-    pendingStepId,
-    currentAwaitingStepId,
-    errorsFound,
-    additionalAttributes
-  );
-
   const awaitingStepItems = await dynamodbSharedLib.query(
     _izContext,
     dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleStepByPending'),
@@ -612,15 +388,17 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
   );
 
   // Pass 1: check completeness of all other steps before collecting any data
-  for (const item of awaitingStepItems.Items) {
-    if (item.awaitingStepId !== currentAwaitingStepId && !item.complete) {
-      return {
-        isComplete: false,
-        collectedAttributes: null,
-        collectedErrors: [],
-        sharedAdditionalAttributes: null
-      };
-    }
+  const hasIncomplete = awaitingStepItems.Items.some(
+    item => item.awaitingStepId !== currentAwaitingStepId && !item.complete
+  );
+
+  if (hasIncomplete) {
+    return {
+      isComplete: false,
+      collectedAttributes: null,
+      collectedErrors: [],
+      returnValues: null
+    };
   }
 
   _izContext.logger.debug(
@@ -629,22 +407,21 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
 
   // Pass 2: all steps are complete — collect errors and attributes
   const collectedAttributes = {};
-  const collectedErrors = [];
-  let sharedAdditionalAttributes = null;
+  let sharedReturnValues = null;
 
   for (const item of awaitingStepItems.Items) {
-    if (item.errorsFound?.length > 0) {
-      collectedErrors.push(...item.errorsFound);
-    }
-
-    if (item.additionalAttributes) {
-      collectedAttributes[item.awaitingStepId] = item.additionalAttributes;
-      if (sharedAdditionalAttributes === null) {
-        sharedAdditionalAttributes = item.additionalAttributes;
-      }
+    if (item.returnValues) {
+      collectedAttributes[item.awaitingStepId] = item.returnValues;
+      sharedReturnValues ??= item.returnValues; // ponytail: use nullish coalescing
     }
   }
 
+  const collectedErrors = awaitingStepItems.Items.flatMap(item =>
+    item.errorsFound?.length > 0
+      ? [`Error found in step ${item.awaitingStepId}`, ...item.errorsFound]
+      : []
+  );
+
   _izContext.logger.debug(
     '[Lib:checkAllAwaitingStepsFinishedWithReturnParams] Pass 2: all steps are complete — collect errors and attributes'
   );
@@ -653,7 +430,14 @@ export async function checkAllAwaitingStepsFinishedWithReturnParams(
     isComplete: true,
     collectedAttributes,
     collectedErrors,
-    sharedAdditionalAttributes
+    returnValues: sharedReturnValues,
+    additionalAttributes:
+      awaitingStepItems.Items[0]?.additionalAttributes || null,
+    ...(settings.checkIsAllError && {
+      isAllError: awaitingStepItems.Items.every(
+        item => item.errorsFound?.length > 0
+      )
+    })
   };
 }
 
@@ -670,7 +454,9 @@ export async function clearAllAwaitingSteps(_izContext, pendingStepId) {
   });
 
   if (!pendingStepId) {
-    throw NoRetryError('[Lib:clearAllAwaitingSteps] pendingStepId is required');
+    throw new NoRetryError(
+      '[Lib:clearAllAwaitingSteps] pendingStepId is required'
+    );
   }
 
   // ----- query items from GSI table
@@ -747,7 +533,7 @@ export async function removeAwaitingMultipleStep(
   });
 
   if (!awaitingStepId || !pendingStepId) {
-    throw NoRetryError(
+    throw new NoRetryError(
       '[Lib:removeAwaitingMultipleStep] awaitingStepId or pendingStepId is required'
     );
   }
@@ -836,14 +622,14 @@ export async function createAwaitingMultipleStepsWithAdditionalAttributesAndPubl
   );
 
   if (!Array.isArray(messages)) {
-    throw NoRetryError('messages must be an array');
+    throw new NoRetryError('messages must be an array');
   }
 
   const flowTag = flowType.flowTag;
   const serviceTag = flowType.serviceTag;
 
   if (flowTag === undefined || serviceTag === undefined) {
-    throw NoRetryError('flowType must have both flowTag and serviceTag');
+    throw new NoRetryError('flowType must have both flowTag and serviceTag');
   }
 
   const topicArn = snsSharedLib.snsTopicArnByFlowSchema(
@@ -857,21 +643,27 @@ export async function createAwaitingMultipleStepsWithAdditionalAttributesAndPubl
     topicArn
   );
 
-  const messagesWithParentId = await Promise.all(
-    messages.map(async message => {
-      const parentFlowId = await createNewAwaitingMultipleStep(
-        _izContext,
-        pendingStepId,
-        prefix,
-        additionalAttributes
-      );
-      return {
-        ...message,
-        parentFlowId
-      };
-    })
+  // Generate IDs and prepare messages
+  const messagesWithParentId = messages.map(message => {
+    const parentFlowId = createParentFlowId(prefix);
+    return { ...message, parentFlowId };
+  });
+
+  // 1. Wait for all DynamoDB records to be created first (to avoid race conditions)
+  await putAwaitingMultipleStepRecords(
+    _izContext,
+    messagesWithParentId.map(({ parentFlowId }) => ({
+      awaitingStepId: parentFlowId,
+      additionalAttributes
+    })),
+    pendingStepId,
+    {
+      complete: false,
+      errorsFound: []
+    }
   );
 
+  // 2. Then publish messages concurrently
   await Promise.all(
     messagesWithParentId.map(message =>
       sns.publishAsync(_izContext, {

package/src/awaitingStep.js

@@ -19,6 +19,16 @@ import { NoRetryError } from '@izara_project/izara-core-library-core';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import { createFieldNameUniqueRequestId } from './asyncFlowSharedLib.js';
 
+async function queryAwaitingSteps(_izContext, awaitingStepId) {
+  return dynamodbSharedLib.query(
+    _izContext,
+    dynamodbSharedLib.tableName(_izContext, 'AwaitingStep'),
+    {
+      awaitingStepId
+    }
+  );
+}
+
 //====================================== AwaitingStep //======================================
 // AwaitingStep is when a flow is awaiting one external flow, and will continue it's flow once that one external flow is complete
 // One awaitingStepId can have multiple pendingStepIds that are awaiting it
@@ -90,24 +100,11 @@ export async function findPendingStepIdsAwaitingStep(
   );
 
   if (!awaitingStepId) {
-    throw NoRetryError('awaitingStepId is required');
+    throw new NoRetryError('awaitingStepId is required');
   }
 
-  const pendingStepIds = [];
-
-  const listPendingStepIds = await dynamodbSharedLib.query(
-    _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingStep'),
-    {
-      awaitingStepId: awaitingStepId
-    }
-  );
-
-  for (let idx = 0; idx < listPendingStepIds.Items.length; idx++) {
-    pendingStepIds.push(listPendingStepIds.Items[idx].pendingStepId);
-  }
-
-  return pendingStepIds;
+  const listPendingStepIds = await queryAwaitingSteps(_izContext, awaitingStepId);
+  return listPendingStepIds.Items.map(item => item.pendingStepId);
 }
 
 /**
@@ -126,16 +123,10 @@ export async function findPendingStepsAwaitingStep(_izContext, awaitingStepId) {
   );
 
   if (!awaitingStepId) {
-    throw NoRetryError('awaitingStepId is required');
+    throw new NoRetryError('awaitingStepId is required');
   }
 
-  const listPendingSteps = await dynamodbSharedLib.query(
-    _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingStep'),
-    {
-      awaitingStepId: awaitingStepId
-    }
-  );
+  const listPendingSteps = await queryAwaitingSteps(_izContext, awaitingStepId);
   _izContext.logger.debug('Record of awaitingStepId', listPendingSteps);
   return listPendingSteps.Items;
 }
@@ -157,16 +148,10 @@ export async function findPendingStepAwaitingStep(_izContext, awaitingStepId) {
   );
 
   if (!awaitingStepId) {
-    throw NoRetryError('awaitingStepId is required');
+    throw new NoRetryError('awaitingStepId is required');
   }
 
-  const listPendingSteps = await dynamodbSharedLib.query(
-    _izContext,
-    dynamodbSharedLib.tableName(_izContext, 'AwaitingStep'),
-    {
-      awaitingStepId: awaitingStepId
-    }
-  );
+  const listPendingSteps = await queryAwaitingSteps(_izContext, awaitingStepId);
 
   _izContext.logger.debug(
     '[Lib:AsyncFlow:findPendingStepAwaitingStep] Found records: ',
@@ -174,7 +159,7 @@ export async function findPendingStepAwaitingStep(_izContext, awaitingStepId) {
   );
 
   if (listPendingSteps.Items.length !== 1) {
-    throw NoRetryError('listPendingSteps not equals 1');
+    throw new NoRetryError('listPendingSteps not equals 1');
   }
   return listPendingSteps.Items[0];
 }
@@ -200,7 +185,7 @@ export async function findPendingStepAwaitingStepWithCallingFlow(
   );
 
   if (!awaitingStepId) {
-    throw NoRetryError('awaitingStepId is required');
+    throw new NoRetryError('awaitingStepId is required');
   }
 
   let callingFlowConfig = null;
@@ -239,7 +224,7 @@ export async function removeAwaitingStep(
   });
 
   if (!awaitingStepId || !pendingStepId) {
-    throw NoRetryError('awaitingStepId and pendingStepId are required');
+    throw new NoRetryError('awaitingStepId and pendingStepId are required');
   }
 
   await dynamodbSharedLib.deleteItem(
@@ -282,7 +267,7 @@ export async function removeAwaitingStepWithCheckUniqueRequestId(
   );
 
   if (!awaitingStepId || !pendingStepId || !checkUniqueRequestId) {
-    throw NoRetryError(
+    throw new NoRetryError(
       'awaitingStepId, pendingStepId and checkUniqueRequestId are required'
     );
   }