Read a receipt reporting a transient state as non-final too, so the merge waits for the real one

test/dlr.test.ts

@@ -98,22 +98,23 @@ describe('dlrFromPdu()', () => {
 	});
 
 	test('maps every spec status code back to its message state and id', () => {
-		for (const [code, expected, statusId] of [
-			['DELIVRD', 'DELIVERED', 2],
-			['UNDELIV', 'UNDELIVERABLE', 5],
-			['EXPIRED', 'EXPIRED', 3],
-			['DELETED', 'DELETED', 4],
-			['ACCEPTD', 'ACCEPTED', 6],
-			['REJECTD', 'REJECTED', 8],
-			['ENROUTE', 'ENROUTE', 1],
-			['UNKNOWN', 'UNKNOWN', 7],
-			['delivrd', 'DELIVERED', 2],
+		for (const [code, expected, statusId, intermediate] of [
+			['DELIVRD', 'DELIVERED', 2, false],
+			['UNDELIV', 'UNDELIVERABLE', 5, false],
+			['EXPIRED', 'EXPIRED', 3, false],
+			['DELETED', 'DELETED', 4, false],
+			['ACCEPTD', 'ACCEPTED', 6, false],
+			['REJECTD', 'REJECTED', 8, false],
+			['ENROUTE', 'ENROUTE', 1, true],
+			['UNKNOWN', 'UNKNOWN', 7, false],
+			['delivrd', 'DELIVERED', 2, false],
 		] as const) {
 			const dlr = dlrFromPdu(deliverSm(`id:x stat:${code} err:0`));
 
 			assert.ok(dlr);
 			assert.equal(dlr.statusMsg, expected);
 			assert.equal(dlr.statusId, statusId);
+			assert.equal(dlr.intermediate, intermediate);
 		}
 	});
 
@@ -207,7 +208,7 @@ describe('dlrFromPdu()', () => {
 		}
 	});
 
-	test('reads an intermediate delivery notification as a report, marked as one', () => {
+	test('reads a report the peer marked non-final, by either spelling', () => {
 		const enroute = 'id:0195f0c7 sub:001 dlvrd:000 submit date:2508251430 done date:2508251431 stat:ENROUTE err:000 text:';
 		const dlr = dlrFromPdu(deliverSm(enroute, undefined, consts.ESM_CLASS.INTERMEDIATE_DELIVERY));
 
@@ -220,6 +221,12 @@ describe('dlrFromPdu()', () => {
 
 		assert.ok(unreadable, 'the marker makes it a report whatever the body parses to');
 		assert.equal(unreadable.intermediate, true);
+
+		const scheduled = dlrFromPdu(deliverSm('id:0195f0c7', { message_state: { tagValue: 0 } }));
+
+		assert.ok(scheduled);
+		assert.equal(scheduled.statusMsg, 'SCHEDULED');
+		assert.equal(scheduled.intermediate, true, 'an ordinary receipt reporting a transient state is not final either');
 	});
 
 	test('exposes the raw receipt alongside the resolved fields', () => {

test/session-extras.test.ts

@@ -168,6 +168,45 @@ describe('merged delivery reports', () => {
 		assert.deepEqual(perSegment, ['merge-me-1', 'merge-me-2', 'merge-me-3']);
 	});
 
+	test('reports once, on the final receipts, when the peer reports en route first', async t => {
+		const smpp = await startServer(t);
+		const incoming = once<Sms>(resolve => {
+			smpp.on('session', session => session.on('sms', resolve));
+		});
+		const { session } = await connect(t, smpp);
+
+		assert.ok(session);
+
+		const merged = once<MessageDlr>(resolve => { session.on('messageDlr', resolve); });
+		const perSegment: boolean[] = [];
+
+		session.on('dlr', dlr => perSegment.push(dlr.intermediate));
+
+		const [sms] = await Promise.all([
+			incoming.then(async received => {
+				await received.sendResp({ smsId: 'en-route' });
+
+				return received;
+			}),
+			session.sendSms({
+				dlr: true,
+				from: '46701113311',
+				message: 'x'.repeat(400),
+				to: '46709771337',
+			}),
+		]);
+
+		await sms.sendDlr('ENROUTE');
+		await sms.sendDlr('DELIVERED');
+
+		const report = await merged;
+
+		assert.equal(report.smsId, 'en-route');
+		assert.equal(report.statusMsg, 'DELIVERED');
+		assert.equal(report.segments.length, 3);
+		assert.deepEqual(perSegment, [true, true, true, false, false, false]);
+	});
+
 	test('reports the worst status across the segments', async t => {
 		const smpp = await startServer(t);
 		const incoming = once<Sms>(resolve => {