feat(inApp): functional dispatchEvent & setConflictHandler APIs

packages/aws-amplify/__tests__/exports.test.ts

@@ -102,6 +102,8 @@ describe('aws-amplify Exports', () => {
 			Array [
 			  "identifyUser",
 			  "syncMessages",
+			  "dispatchEvent",
+			  "setConflictHandler",
 			]
 		`);
 		});
@@ -112,6 +114,33 @@ describe('aws-amplify Exports', () => {
 			Array [
 			  "identifyUser",
 			  "syncMessages",
+			  "dispatchEvent",
+			  "setConflictHandler",
+			]
+		`);
+		});
+	});
+
+	describe('InAppMessaging exports', () => {
+		it('should only export expected symbols from the top-level', () => {
+			expect(Object.keys(inAppMessagingTopLevelExports)).toMatchInlineSnapshot(`
+			Array [
+			  "identifyUser",
+			  "syncMessages",
+			  "dispatchEvent",
+			  "setConflictHandler",
+			]
+		`);
+		});
+
+		it('should only export expected symbols from the Pinpoint provider', () => {
+			expect(Object.keys(inAppMessagingPinpointTopLevelExports))
+				.toMatchInlineSnapshot(`
+			Array [
+			  "identifyUser",
+			  "syncMessages",
+			  "dispatchEvent",
+			  "setConflictHandler",
 			]
 		`);
 		});

packages/core/src/Platform/types.ts

@@ -98,6 +98,7 @@ export enum GeoAction {
 export enum InAppMessagingAction {
 	SyncMessages = '1',
 	IdentifyUser = '2',
+	Record = '3',
 }
 export enum InteractionsAction {
 	None = '0',

packages/notifications/__mocks__/data.ts

@@ -172,16 +172,20 @@ export const pinpointInAppMessage: PinpointInAppMessage = {
 	},
 	Priority: 3,
 	Schedule: {
-		EndDate: '2021-01-01T00:00:00Z',
+		EndDate: '2024-01-01T00:00:00Z',
 		EventFilter: {
 			FilterType: 'SYSTEM',
 			Dimensions: {
-				Attributes: {},
+				Attributes: {
+					interests: { Values: ['test-interest'] },
+				},
 				EventType: {
 					DimensionType: 'INCLUSIVE',
 					Values: ['clicked', 'swiped'],
 				},
-				Metrics: {},
+				Metrics: {
+					clicks: { ComparisonOperator: 'EQUAL', Value: 5 },
+				},
 			},
 		},
 		QuietTime: {

packages/notifications/__tests__/inAppMessaging/providers/pinpoint/apis/dispatchEvent.test.ts

@@ -0,0 +1,76 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { defaultStorage } from '@aws-amplify/core';
+import { dispatchEvent } from '../../../../../src/inAppMessaging/providers/pinpoint/apis';
+import { processInAppMessages } from '../../../../../src/inAppMessaging/providers/pinpoint/utils';
+import {
+	inAppMessages,
+	simpleInAppMessages,
+	simpleInAppMessagingEvent,
+} from '../../../../../__mocks__/data';
+import { InAppMessagingError } from '../../../../../src/inAppMessaging/errors';
+import { notifyEventListeners } from '../../../../../src/common/eventListeners';
+
+jest.mock('@aws-amplify/core');
+jest.mock('@aws-amplify/core/internals/utils');
+jest.mock('../../../../../src/inAppMessaging/providers/pinpoint/utils');
+jest.mock('../../../../../src/common/eventListeners');
+
+const mockDefaultStorage = defaultStorage as jest.Mocked<typeof defaultStorage>;
+const mockNotifyEventListeners = notifyEventListeners as jest.Mock;
+const mockProcessInAppMessages = processInAppMessages as jest.Mock;
+
+describe('dispatchEvent', () => {
+	beforeEach(() => {
+		mockDefaultStorage.setItem.mockClear();
+		mockNotifyEventListeners.mockClear();
+	});
+	test('gets in-app messages from store and notifies listeners', async () => {
+		const [message] = inAppMessages;
+		mockDefaultStorage.getItem.mockResolvedValueOnce(
+			JSON.stringify(simpleInAppMessages)
+		);
+		mockProcessInAppMessages.mockReturnValueOnce([message]);
+		await dispatchEvent(simpleInAppMessagingEvent);
+		expect(mockProcessInAppMessages).toBeCalledWith(
+			simpleInAppMessages,
+			simpleInAppMessagingEvent
+		);
+		expect(mockNotifyEventListeners).toBeCalledWith('messageReceived', message);
+	});
+
+	test('handles conflicts through default conflict handler', async () => {
+		mockDefaultStorage.getItem.mockResolvedValueOnce(
+			JSON.stringify(simpleInAppMessages)
+		);
+		mockProcessInAppMessages.mockReturnValueOnce(inAppMessages);
+		await dispatchEvent(simpleInAppMessagingEvent);
+		expect(mockProcessInAppMessages).toBeCalledWith(
+			simpleInAppMessages,
+			simpleInAppMessagingEvent
+		);
+		expect(mockNotifyEventListeners).toBeCalledWith(
+			'messageReceived',
+			inAppMessages[4]
+		);
+	});
+
+	test('does not notify listeners if no messages are returned', async () => {
+		mockProcessInAppMessages.mockReturnValueOnce([]);
+		mockDefaultStorage.getItem.mockResolvedValueOnce(
+			JSON.stringify(simpleInAppMessages)
+		);
+
+		await dispatchEvent(simpleInAppMessagingEvent);
+
+		expect(mockNotifyEventListeners).not.toBeCalled();
+	});
+
+	test('logs error if storage retrieval fails', async () => {
+		mockDefaultStorage.getItem.mockRejectedValueOnce(Error);
+		await expect(
+			dispatchEvent(simpleInAppMessagingEvent)
+		).rejects.toStrictEqual(expect.any(InAppMessagingError));
+	});
+});

packages/notifications/__tests__/inAppMessaging/providers/pinpoint/apis/setConflictHandler.test.ts

@@ -0,0 +1,54 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { defaultStorage } from '@aws-amplify/core';
+import {
+	dispatchEvent,
+	setConflictHandler,
+} from '../../../../../src/inAppMessaging/providers/pinpoint/apis';
+import { processInAppMessages } from '../../../../../src/inAppMessaging/providers/pinpoint/utils';
+import {
+	closestExpiryMessage,
+	customHandledMessage,
+	inAppMessages,
+	simpleInAppMessagingEvent,
+} from '../../../../../__mocks__/data';
+import { notifyEventListeners } from '../../../../../src/common/eventListeners';
+
+jest.mock('@aws-amplify/core');
+jest.mock('@aws-amplify/core/internals/utils');
+jest.mock('../../../../../src/inAppMessaging/providers/pinpoint/utils');
+jest.mock('../../../../../src/common/eventListeners');
+
+const mockDefaultStorage = defaultStorage as jest.Mocked<typeof defaultStorage>;
+const mockNotifyEventListeners = notifyEventListeners as jest.Mock;
+const mockProcessInAppMessages = processInAppMessages as jest.Mock;
+
+describe('Conflict handling', () => {
+	beforeEach(() => {
+		mockDefaultStorage.setItem.mockClear();
+		mockNotifyEventListeners.mockClear();
+	});
+	test('has a default implementation', async () => {
+		mockProcessInAppMessages.mockReturnValueOnce(inAppMessages);
+		await dispatchEvent(simpleInAppMessagingEvent);
+		expect(mockNotifyEventListeners).toBeCalledWith(
+			'messageReceived',
+			closestExpiryMessage
+		);
+	});
+
+	test('can be customized through setConflictHandler', async () => {
+		const customConflictHandler = messages =>
+			messages.find(message => message.id === 'custom-handled');
+		mockProcessInAppMessages.mockReturnValueOnce(inAppMessages);
+
+		setConflictHandler(customConflictHandler);
+		await dispatchEvent(simpleInAppMessagingEvent);
+
+		expect(mockNotifyEventListeners).toBeCalledWith(
+			'messageReceived',
+			customHandledMessage
+		);
+	});
+});

packages/notifications/__tests__/inAppMessaging/utils/processInAppMessages.test.ts

@@ -0,0 +1,59 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+	pinpointInAppMessage,
+	simpleInAppMessagingEvent,
+} from '../../../__mocks__/data';
+import { processInAppMessages } from '../../../src/inAppMessaging/providers/pinpoint/utils/processInAppMessages';
+import { cloneDeep } from 'lodash';
+import {
+	isBeforeEndDate,
+	matchesAttributes,
+	matchesEventType,
+	matchesMetrics,
+} from '../../../src/inAppMessaging/providers/pinpoint/utils/helpers';
+
+jest.mock('@aws-amplify/core');
+jest.mock('@aws-amplify/core/internals/utils');
+jest.mock('../../../src/inAppMessaging/providers/pinpoint/utils/helpers');
+
+const mockIsBeforeEndDate = isBeforeEndDate as jest.Mock;
+const mockMatchesAttributes = matchesAttributes as jest.Mock;
+const mockMatchesEventType = matchesEventType as jest.Mock;
+const mockMatchesMetrics = matchesMetrics as jest.Mock;
+
+// TODO(V6): Add tests for session cap etc
+describe('processInAppMessages', () => {
+	const messages = [
+		cloneDeep(pinpointInAppMessage),
+		{ ...cloneDeep(pinpointInAppMessage), CampaignId: 'uuid-2', Priority: 3 },
+		{ ...cloneDeep(pinpointInAppMessage), CampaignId: 'uuid-3', Priority: 1 },
+		{ ...cloneDeep(pinpointInAppMessage), CampaignId: 'uuid-4', Priority: 2 },
+	];
+	beforeEach(() => {
+		mockMatchesEventType.mockReturnValue(true);
+		mockMatchesAttributes.mockReturnValue(true);
+		mockMatchesMetrics.mockReturnValue(true);
+		mockIsBeforeEndDate.mockReturnValue(true);
+	});
+
+	test('filters in-app messages from Pinpoint by criteria', async () => {
+		mockMatchesEventType.mockReturnValueOnce(false);
+		mockMatchesAttributes.mockReturnValueOnce(false);
+		mockMatchesMetrics.mockReturnValueOnce(false);
+		const [result] = await processInAppMessages(
+			messages,
+			simpleInAppMessagingEvent
+		);
+		expect(result.id).toBe('uuid-4');
+	});
+
+	test('filters in-app messages from Pinpoint by criteria', async () => {
+		const [result] = await processInAppMessages(
+			messages,
+			simpleInAppMessagingEvent
+		);
+		expect(result.id).toBe('uuid-3');
+	});
+});

packages/notifications/src/inAppMessaging/index.ts

@@ -1,4 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export { identifyUser, syncMessages } from './providers/pinpoint';
+export {
+	identifyUser,
+	syncMessages,
+	dispatchEvent,
+	setConflictHandler,
+} from './providers/pinpoint';

packages/notifications/src/inAppMessaging/providers/index.ts

@@ -1,4 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export { identifyUser, syncMessages } from './pinpoint/apis';
+export {
+	identifyUser,
+	syncMessages,
+	dispatchEvent,
+	setConflictHandler,
+} from './pinpoint/apis';

packages/notifications/src/inAppMessaging/providers/pinpoint/apis/dispatchEvent.ts

@@ -0,0 +1,69 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+	PINPOINT_KEY_PREFIX,
+	STORAGE_KEY_SUFFIX,
+	processInAppMessages,
+} from '../utils';
+import { InAppMessage, InAppMessagingEvent } from '../../../types';
+import flatten from 'lodash/flatten';
+import { defaultStorage } from '@aws-amplify/core';
+import { notifyEventListeners } from '../../../../common';
+import { assertServiceError } from '../../../errors';
+import { InAppMessageConflictHandler } from '../types';
+
+let conflictHandler: InAppMessageConflictHandler = defaultConflictHandler;
+
+export function internalSetConflictHandler(
+	handler: InAppMessageConflictHandler
+): void {
+	conflictHandler = handler;
+}
+
+export async function dispatchEvent(event: InAppMessagingEvent): Promise<void> {
+	try {
+		const key = `${PINPOINT_KEY_PREFIX}${STORAGE_KEY_SUFFIX}`;
+		const cachedMessages = await defaultStorage.getItem(key);
+		const messages: InAppMessage[] = await processInAppMessages(
+			cachedMessages ? JSON.parse(cachedMessages) : [],
+			event
+		);
+		const flattenedMessages = flatten(messages);
+
+		if (flattenedMessages.length > 0) {
+			notifyEventListeners(
+				'messageReceived',
+				conflictHandler(flattenedMessages)
+			);
+		}
+	} catch (error) {
+		assertServiceError(error);
+		throw error;
+	}
+}
+
+function defaultConflictHandler(messages: InAppMessage[]): InAppMessage {
+	// default behavior is to return the message closest to expiry
+	// this function assumes that messages processed by providers already filters out expired messages
+	const sorted = messages.sort((a, b) => {
+		const endDateA = a.metadata?.endDate;
+		const endDateB = b.metadata?.endDate;
+		// if both message end dates are falsy or have the same date string, treat them as equal
+		if (endDateA === endDateB) {
+			return 0;
+		}
+		// if only message A has an end date, treat it as closer to expiry
+		if (endDateA && !endDateB) {
+			return -1;
+		}
+		// if only message B has an end date, treat it as closer to expiry
+		if (!endDateA && endDateB) {
+			return 1;
+		}
+		// otherwise, compare them
+		return new Date(endDateA) < new Date(endDateB) ? -1 : 1;
+	});
+	// always return the top sorted
+	return sorted[0];
+}

packages/notifications/src/inAppMessaging/providers/pinpoint/apis/index.ts

@@ -3,3 +3,5 @@
 
 export { identifyUser } from './identifyUser';
 export { syncMessages } from './syncMessages';
+export { dispatchEvent } from './dispatchEvent';
+export { setConflictHandler } from './setConflictHandler';

packages/notifications/src/inAppMessaging/providers/pinpoint/apis/setConflictHandler.ts

@@ -0,0 +1,9 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { InAppMessageConflictHandler } from '../types';
+import { internalSetConflictHandler } from './dispatchEvent';
+
+export function setConflictHandler(handler: InAppMessageConflictHandler): void {
+	internalSetConflictHandler(handler);
+}

packages/notifications/src/inAppMessaging/providers/pinpoint/index.ts

@@ -1,4 +1,9 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-export { identifyUser, syncMessages } from './apis';
+export {
+	identifyUser,
+	syncMessages,
+	dispatchEvent,
+	setConflictHandler,
+} from './apis';

packages/notifications/src/inAppMessaging/providers/pinpoint/types/index.ts

@@ -4,3 +4,11 @@
 export { UpdateEndpointException } from './errors';
 export { IdentifyUserInput } from './inputs';
 export { IdentifyUserOptions } from './options';
+export {
+	PinpointMessageEvent,
+	MetricsComparator,
+	InAppMessageCounts,
+	InAppMessageCountMap,
+	DailyInAppMessageCounter,
+	InAppMessageConflictHandler,
+} from './types';