From aca05c3aec4b8a29f0fbbec274aaf5b31d32ef91 Mon Sep 17 00:00:00 2001
From: Johan Nyman <johan@nytamin.se>
Date: Wed, 10 Jan 2024 20:08:18 +0100
Subject: [PATCH] chore: fix error message

---
 packages/connector/src/MosDevice.ts                       | 6 +++++-
 .../connector/src/__tests__/Profile0-non-strict.spec.ts   | 4 ++--
 packages/connector/src/__tests__/Profile0.spec.ts         | 8 ++++----
 packages/connector/src/__tests__/Profile2.spec.ts         | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/connector/src/MosDevice.ts b/packages/connector/src/MosDevice.ts
index dab48989..0ce048cf 100644
--- a/packages/connector/src/MosDevice.ts
+++ b/packages/connector/src/MosDevice.ts
@@ -1428,7 +1428,11 @@ export class MosDevice implements IMOSDevice {
 	private badRoAckReply(xmlRoAck: AnyXML) {
 		try {
 			const roAck = MosModel.XMLMosROAck.fromXML(xmlRoAck, this.strict)
-			return new Error(`Reply: ${roAck.toString()}`)
+			return new Error(
+				`Reply: ${this.mosTypes.mosString128.stringify(
+					roAck.Status
+				)}, ID: ${this.mosTypes.mosString128.stringify(roAck.ID)}`
+			)
 		} catch (e) {
 			return new Error(`Reply: Unparsable reply: ${safeStringify(xmlRoAck).slice(0, 200)}`)
 		}
diff --git a/packages/connector/src/__tests__/Profile0-non-strict.spec.ts b/packages/connector/src/__tests__/Profile0-non-strict.spec.ts
index 29b0e09c..71aca752 100644
--- a/packages/connector/src/__tests__/Profile0-non-strict.spec.ts
+++ b/packages/connector/src/__tests__/Profile0-non-strict.spec.ts
@@ -170,7 +170,7 @@ describe('Profile 0 - non strict', () => {
 		})
 		expect(mockReply).toHaveBeenCalledTimes(1)
 
-		expect(String(caughtError)).toMatch(/error when parsing reply.*Invalid timestamp/i)
+		expect(String(caughtError)).toMatch(/Unable to parse MOS reply.*Invalid timestamp/i)
 	})
 	test('requestMachineInfo - missing <opTime>', async () => {
 		// Prepare mock server response:
@@ -236,6 +236,6 @@ describe('Profile 0 - non strict', () => {
 		})
 		expect(mockReply).toHaveBeenCalledTimes(1)
 
-		expect(String(caughtError)).toMatch(/error when parsing reply.*Invalid timestamp/i)
+		expect(String(caughtError)).toMatch(/Unable to parse MOS reply.*Invalid timestamp/i)
 	})
 })
diff --git a/packages/connector/src/__tests__/Profile0.spec.ts b/packages/connector/src/__tests__/Profile0.spec.ts
index 1378ae87..6161e513 100644
--- a/packages/connector/src/__tests__/Profile0.spec.ts
+++ b/packages/connector/src/__tests__/Profile0.spec.ts
@@ -283,7 +283,7 @@ describe('Profile 0', () => {
 		})
 		expect(mockReply).toHaveBeenCalledTimes(1)
 
-		expect(String(caughtError)).toMatch(/error when parsing reply.*listMachInfo.opTime.*Invalid timestamp/i)
+		expect(String(caughtError)).toMatch(/Unable to parse MOS reply.*listMachInfo.opTime.*Invalid timestamp/i)
 	})
 	test('requestMachineInfo - missing <time>', async () => {
 		// Prepare mock server response:
@@ -302,7 +302,7 @@ describe('Profile 0', () => {
 		})
 		expect(mockReply).toHaveBeenCalledTimes(1)
 
-		expect(String(caughtError)).toMatch(/error when parsing reply.*listMachInfo.time.*Invalid input/i)
+		expect(String(caughtError)).toMatch(/Unable to parse MOS reply.*listMachInfo.time.*Invalid input/i)
 	})
 	test('requestMachineInfo - empty <time>', async () => {
 		// Prepare mock server response:
@@ -321,7 +321,7 @@ describe('Profile 0', () => {
 		})
 		expect(mockReply).toHaveBeenCalledTimes(1)
 
-		expect(String(caughtError)).toMatch(/error when parsing reply.*listMachInfo.time.*Invalid input/i)
+		expect(String(caughtError)).toMatch(/Unable to parse MOS reply.*listMachInfo.time.*Invalid input/i)
 	})
 	test('requestMachineInfo - bad formatted <time>', async () => {
 		// Prepare mock server response:
@@ -340,6 +340,6 @@ describe('Profile 0', () => {
 		})
 		expect(mockReply).toHaveBeenCalledTimes(1)
 
-		expect(String(caughtError)).toMatch(/error when parsing reply.*listMachInfo.time.*Invalid timestamp/i)
+		expect(String(caughtError)).toMatch(/Unable to parse MOS reply.*listMachInfo.time.*Invalid timestamp/i)
 	})
 })
diff --git a/packages/connector/src/__tests__/Profile2.spec.ts b/packages/connector/src/__tests__/Profile2.spec.ts
index df695bc1..1a837781 100644
--- a/packages/connector/src/__tests__/Profile2.spec.ts
+++ b/packages/connector/src/__tests__/Profile2.spec.ts
@@ -415,7 +415,7 @@ describe('Profile 2', () => {
 			error = e
 		}
 		expect(error).toBeTruthy()
-		expect(`${error}`).toMatch(/Reply from NRCS.*rundown not under MOS control/)
+		expect(`${error}`).toMatch(/Reply.*rundown not under MOS control/)
 	})
 	test('onMetadataReplace', async () => {
 		// Fake incoming message on socket: