wip

Author: Lenakh97

nordicNRPlus/processNrplusMessagesAndUpdateThingShadow.spec.ts

@@ -215,4 +215,49 @@ void describe('processNrplusMessagesAndUpdateThingShadow', () => {
 			'updateShadow is not called',
 		)
 	})
+	void it('should call ensureThing only once per thingName', async () => {
+		const thingName = 'team1'
+		const deviceId1 = 'device1'
+		const deviceId2 = 'device2'
+		const ensureThing = mock.fn(async () => {})
+		const updateShadow = mock.fn(async () => {})
+		const process = processNrplusMessagesAndUpdateThingShadow({
+			ensureThing,
+			updateShadow,
+		})
+		await process({
+			messages: [
+				{
+					teamId: thingName,
+					deviceId: deviceId1,
+					messageId: '',
+					message: { test: 'message1' },
+				},
+				{
+					teamId: thingName,
+					deviceId: deviceId1,
+					messageId: '',
+					message: { test: 'message2' },
+				},
+				{
+					teamId: thingName,
+					deviceId: deviceId2,
+					messageId: '',
+					message: { test: 'message3' },
+				},
+			],
+			type: 'device.messages',
+			timestamp: '',
+		})
+		assert.equal(
+			ensureThing.mock.calls.length,
+			2,
+			'ensureThing is called twice',
+		)
+		assert.equal(
+			updateShadow.mock.calls.length,
+			0,
+			'updateShadow is not called',
+		)
+	})
 })

nordicNRPlus/processNrplusMessagesAndUpdateThingShadow.ts

@@ -15,16 +15,23 @@ export const processNrplusMessagesAndUpdateThingShadow =
 	async (
 		validatedInput: Static<typeof inputSchemaLwm2mMessage>,
 	): Promise<void> => {
+		const ensuredThings = new Map<string, Promise<void>>()
 		for (const message of validatedInput.messages) {
 			const { teamId, deviceId } = message
 			const thingName = `${teamId}-${deviceId}`
-			try {
-				await ensureThing(thingName)
-			} catch (error) {
-				throw new Error(
-					`Failed to ensure thing exists: ${thingName} with the error: ${(error as Error).message}`,
-				)
+			let ensurePromise = ensuredThings.get(thingName)
+			if (!ensurePromise) {
+				ensurePromise = ensureThing(thingName).catch((error) => {
+					// If it fails, remove it from cache to allow retries
+					ensuredThings.delete(thingName)
+					throw new Error(
+						`Failed to ensure thing exists: ${thingName} with the error: ${(error as Error).message}`,
+					)
+				})
+				ensuredThings.set(thingName, ensurePromise)
 			}
+			await ensurePromise
+
 			const maybeProcessedMessage = processMessage(message)
 			if (maybeProcessedMessage === undefined) {
 				log?.('Unhandled message:', message)