@whooshbang/contract-mock 2.2.0 → 2.3.0

package/CHANGELOG.md

@@ -5,6 +5,12 @@ recorded here.
 
 ## Unreleased
 
+## 2.3.0
+
+### Added
+
+- Match sender-selected interaction expiry, default deadlines and idempotent replay behavior using the 2.3.0 contracts (FXO-3088).
+
 ## 2.2.0
 
 ### Changed

package/dist/core.js

@@ -1,3 +1,4 @@
+import { resolveInteractionExpiry, resolveInteractionRequest, } from "@whooshbang/contracts";
 import { contractVersion, validateAssertEmailConsentRequest, validateBindingSummary, validateMessageListPage, validateMessageDeliveryHistory, validateMessageNotificationImage, validateInteractionTimeline, validateCustomerEventDeliveryHistory, validateCustomerEventDeliveryAttempt, validateDeliveryHolds, validateMachineClientOperationsList, validateRecipientCopyCatalogue, validateUpdateEmailSenderRequest, validateCreateConnectionTestRequest, validateConnectionTest, validateConnectionTestCollection, } from "@whooshbang/contracts";
 import { Hono } from "hono";
 import customerOwnedSlackAppManifestFixture from "@whooshbang/contracts/fixtures/core-v1/success/customer-owned-slack-app-manifest.json" with { type: "json" };
@@ -2148,9 +2149,10 @@ function messageTemporalInputIsValid(request, acceptedAt) {
         }
     }
     if (request.interaction !== undefined) {
-        const interactionExpiresAtMilliseconds = Date.parse(request.interaction.expires_at);
-        if (interactionExpiresAtMilliseconds < acceptedAtMilliseconds + 30 * 1000 ||
-            interactionExpiresAtMilliseconds > latestMilliseconds) {
+        try {
+            resolveInteractionExpiry(new Date(acceptedAt), request.interaction);
+        }
+        catch {
             return false;
         }
     }
@@ -2165,12 +2167,16 @@ function interactionAnswer(interaction) {
     }
     return "synthetic pre-existing answer";
 }
+function resolvedMockInteraction(input, acceptedAt) {
+    return resolveInteractionRequest(new Date(acceptedAt), input);
+}
 function createInteractionSummary(interaction, id, scenario, now) {
     const base = {
         ...(interaction.correlation_id === undefined
             ? {}
             : { correlation_id: interaction.correlation_id }),
-        expires_at: interaction.expires_at,
+        expires_at: interaction.expires_at ??
+            resolveInteractionExpiry(new Date(now), interaction),
         id,
         type: interaction.type,
     };
@@ -3295,7 +3301,7 @@ function expandGroupBroadcasts(state) {
             const now = state.now();
             const interaction = record.request.interaction === undefined
                 ? undefined
-                : createInteractionSummary(record.request.interaction, state.idGenerator("interaction"), state.scenario, now);
+                : createInteractionSummary(resolvedMockInteraction(record.request.interaction, record.broadcast.accepted_at), state.idGenerator("interaction"), state.scenario, now);
             const message = {
                 purpose: record.request.purpose ?? "service",
                 accepted_at: now,
@@ -3341,7 +3347,9 @@ function expandGroupBroadcasts(state) {
                 content: clone(record.request.content),
                 ...(record.request.interaction === undefined
                     ? {}
-                    : { interactionRequest: record.request.interaction }),
+                    : {
+                        interactionRequest: resolvedMockInteraction(record.request.interaction, record.broadcast.accepted_at),
+                    }),
                 message,
                 ownerOrganizationId: record.ownerOrganizationId,
                 providerInFlight: false,
@@ -5669,13 +5677,13 @@ function addPublicRoutes(app, getState, options) {
         if ("response" in parsed)
             return parsed.response;
         const now = state.now();
-        if (!messageTemporalInputIsValid(parsed.value, now)) {
-            return requestInvalid(state);
-        }
         const requestFingerprint = fingerprint(parsed.value);
         const replay = idempotentReplay(state, identity, "createGroupBroadcast", idempotency.key, requestFingerprint);
         if (replay !== undefined)
             return replay;
+        if (!messageTemporalInputIsValid(parsed.value, now)) {
+            return requestInvalid(state);
+        }
         if (identity.credential.environment === "live") {
             const org = identity.credential.organizationId;
             if (!state.billing
@@ -5693,6 +5701,11 @@ function addPublicRoutes(app, getState, options) {
             .map((record) => record.membership)
             .filter((membership) => membership.status === "active");
         const broadcast = {
+            ...(parsed.value.interaction === undefined
+                ? {}
+                : {
+                    interaction_expires_at: resolveInteractionExpiry(new Date(now), parsed.value.interaction),
+                }),
             accepted_at: now,
             aggregate: {
                 audience: members.length,
@@ -6295,7 +6308,9 @@ function addPublicRoutes(app, getState, options) {
             content: clone(normalized.content),
             ...(normalized.interaction === undefined
                 ? {}
-                : { interactionRequest: normalized.interaction }),
+                : {
+                    interactionRequest: resolvedMockInteraction(normalized.interaction, now),
+                }),
             ...(credential.kind === "machine"
                 ? { machineClientId: credential.machineClientId }
                 : {}),