anear-js-api 1.3.0 → 1.3.1

package/lib/state_machines/AnearEventMachine.js

@@ -658,7 +658,8 @@ const ActiveEventStatesConfig = {
           states: {
             idle: {},
             waitingForCancelConfirmations: {
-              entry: ['sendCancelTimeoutToAllAPMs', 'setupPendingCancelConfirmations'],
+              // Note: Setup actions are called in the transitions that lead here, not in entry
+              // This allows different setup for declarative cancel (TRIGGER_CANCEL_SEQUENCE) vs manual cancel (CANCEL_ALL_PARTICIPANT_TIMEOUTS)
               on: {
                 TIMER_CANCELED: {
                   actions: ['removeFromPendingCancelConfirmations']
@@ -677,7 +678,7 @@ const ActiveEventStatesConfig = {
               },
               always: {
                 guard: 'allCancelConfirmationsReceived',
-                actions: ['forwardPendingCancelAction', 'clearCancelState'],
+                actions: ['forwardPendingCancelActionIfExists', 'clearCancelState'],
                 target: '#waitingForActions.idle'
               }
             }
@@ -691,7 +692,12 @@ const ActiveEventStatesConfig = {
               actions: ['trackParticipantTimeout', 'processParticipantTimeout'],
               // v5 note: internal transitions are the default (v4 had `internal: true`)
             },
+            CANCEL_ALL_PARTICIPANT_TIMEOUTS: {
+              actions: ['setupPendingCancelConfirmationsForManualCancel', 'sendCancelTimeoutToAllAPMs'],
+              target: '.waitingForCancelConfirmations'
+            },
             TRIGGER_CANCEL_SEQUENCE: {
+              actions: ['sendCancelTimeoutToAllAPMs', 'setupPendingCancelConfirmations'],
               target: '.waitingForCancelConfirmations'
             },
             TIMER_CANCELED: {
@@ -1749,6 +1755,19 @@ const AnearEventMachineFunctions = ({
         suppressParticipantTimeouts: true  // Drop PARTICIPANT_TIMEOUT events
       }
     }),
+    setupPendingCancelConfirmationsForManualCancel: assign(({ context }) => {
+      // Get all active participants (for manual cancelAllParticipantTimeouts call)
+      const activeParticipantIds = getActiveParticipantIds(context)
+      const pendingConfirmations = new Set(activeParticipantIds)
+
+      logger.info(`[AEM] Starting manual cancellation sequence (cancelAllParticipantTimeouts). Waiting for ${pendingConfirmations.size} APM confirmations: ${[...pendingConfirmations].join(', ')}`)
+
+      return {
+        pendingCancelConfirmations: pendingConfirmations,
+        pendingCancelAction: null, // No ACTION to forward for manual cancel
+        suppressParticipantTimeouts: true  // Drop PARTICIPANT_TIMEOUT events
+      }
+    }),
     removeFromPendingCancelConfirmations: assign(({ context, event }) => {
       const participantId = event.participantId || event.data?.id
       if (!context.pendingCancelConfirmations || !participantId) return {}

package/lib/utils/AppMachineTransition.js

@@ -102,6 +102,14 @@ const AppMachineTransition = (anearEvent) => {
         let timeoutFn
         let displayEvent
 
+        // Extract cancel from meta level (for function-based eachParticipant or top-level cancel)
+        // Supports both "cancel" (developer-friendly) and "cancelActionType" (internal)
+        if (meta.cancel && !cancelActionType) {
+          cancelActionType = meta.cancel
+        } else if (meta.cancelActionType && !cancelActionType) {
+          cancelActionType = meta.cancelActionType
+        }
+
         // Validate that participants: and participant: are not both defined
         if (meta.allParticipants && meta.eachParticipant) {
           logger.error(`[AppMachineTransition] Invalid meta configuration: both 'allParticipants' and 'eachParticipant' are defined. Only one can be used per state.`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anear-js-api",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Javascript Developer API for Anear Apps",
   "main": "lib/index.js",
   "scripts": {