Merge branch 'fix/7bit/killerjulian' into development

Author: JulianWowra

src/utils/Data/Data.ts

@@ -151,9 +151,9 @@ export class Data {
 			headerSize++;
 		}
 
-		const parts = this.splitMessage(max, headerSize);
+		const parts = this.splitMessage(max - headerSize);
 		const haveHeader = parts.length > 1;
-		const uniqID = Math.floor(Math.random() * 0xffff);
+		const uniqID = (Math.random() * 0x10000) | 0;
 
 		// message will be splited, need headers
 		if (haveHeader) {
@@ -183,10 +183,18 @@ export class Data {
 			const data = tmp.result;
 
 			if (haveHeader) {
-				size += headerSize;
+				if (pdu.dataCodingScheme.textAlphabet === DCS.ALPHABET_DEFAULT) {
+					// When using 7bit encoding (ALPHABET_DEFAULT), the UDH must be padded into septets.
+					// 1 byte = 8 bits, so we calculate the UDH size in septets: ceil(bytes * 8 / 7)
+					// This ensures the user data length is correct and no character is lost.
+					size += Math.ceil((headerSize * 8) / 7);
+				} else {
+					// For 8bit and UCS2, header size is already in bytes and can be added directly.
+					size += headerSize;
+				}
 			}
 
-			this._parts.push(new Part(data, size, '', header));
+			this._parts.push(new Part(data, size, text, header));
 		});
 	}
 
@@ -209,32 +217,18 @@ export class Data {
 	}
 
 	private sortParts() {
-		this._parts.sort((p1, p2) => {
-			const index1 = p1.header?.getCurrent() || 1;
-			const index2 = p2.header?.getCurrent() || 1;
-
-			return index1 > index2 ? 1 : -1;
-		});
-
-		this._data = this._parts.map((part) => part.text).join('');
+		this._data = this._parts
+			.sort((p1, p2) => (p1.header?.getCurrent() || 1) - (p2.header?.getCurrent() || 1))
+			.map((part) => part.text)
+			.join('');
 	}
 
-	private splitMessage(max: number, headerSize = Data.HEADER_SIZE) {
-		// size less or equal max
-		if (this.size <= max) {
-			return [this._data];
-		}
-
-		// parts of message
+	private splitMessage(size: number) {
 		const data = [];
-		const size = max - headerSize;
-		let offset = 0;
-
-		do {
-			const part = this._data.substring(offset, offset + size);
-			data.push(part);
-			offset += size;
-		} while (offset < this.size);
+
+		for (let i = 0; i < this._data.length; i += size) {
+			data.push(this._data.substring(i, i + size));
+		}
 
 		return data;
 	}

src/utils/Data/Part.ts

@@ -61,6 +61,6 @@ export class Part {
 	 */
 	toString(pdu: Deliver | Submit) {
 		// concate pdu, size of part, headers, data
-		return this.getPduString(pdu) + this.getPartSize() + (this.header || '') + this.data;
+		return this.getPduString(pdu) + this.getPartSize() + (!!this.header ? this.header.toString() : '') + this.data;
 	}
 }

src/utils/Helper.ts

@@ -87,9 +87,10 @@ export class Helper {
 	static decode7Bit(text: string, inLen?: number, alignBits?: number) {
 		const ret: number[] = [];
 		const data = Buffer.from(text, 'hex');
+
 		let dataPos = 0; // Position in the input octets stream
 		let buf = 0; // Bit buffer, used in FIFO manner
-		let bufLen = 0; // Ammount of buffered bits
+		let bufLen = 0; // Amount of buffered bits
 		let inDone = 0;
 		let inExt = false;
 
@@ -113,22 +114,18 @@ export class Helper {
 			}
 
 			// Fetch next septet from the FIFO buffer
-			let digit = buf & 0x7f;
+			const digit = buf & 0x7f;
+
 			buf >>= 7;
 			bufLen -= 7;
 			inDone++;
 
 			if (digit % 128 === 27) {
+				// Escape character
 				inExt = true;
 			} else {
-				let c;
-
-				if (inExt) {
-					c = Helper.EXTENDED_TABLE.charCodeAt(digit);
-					inExt = false;
-				} else {
-					c = Helper.ALPHABET_7BIT.charCodeAt(digit);
-				}
+				let c = inExt ? Helper.EXTENDED_TABLE.charCodeAt(digit) || 63 : Helper.ALPHABET_7BIT.charCodeAt(digit);
+				inExt = false;
 
 				if (c < 0x80) {
 					ret.push(c);
@@ -140,7 +137,7 @@ export class Helper {
 					(Helper.EXTENDED_TABLE.charCodeAt(digit + 1) & 0xfc00) === 0xdc00
 				) {
 					// Surrogate Pair
-					c = 0x10000 + ((c & 0x03ff) << 10) + (Helper.EXTENDED_TABLE.charCodeAt(++digit) & 0x03ff);
+					c = 0x10000 + ((c & 0x03ff) << 10) + (Helper.EXTENDED_TABLE.charCodeAt(digit + 1) & 0x03ff);
 					ret.push(0xf0 | (c >> 18), 0x80 | ((c >> 12) & 0x3f), 0x80 | ((c >> 6) & 0x3f), 0x80 | (c & 0x3f));
 				} else {
 					ret.push(0xe0 | (c >> 12), 0x80 | ((c >> 6) & 0x3f), 0x80 | (c & 0x3f));
@@ -175,7 +172,7 @@ export class Helper {
 		const buffer = Buffer.from(text, 'ascii');
 
 		for (let i = 0; i < buffer.length; i++) {
-			pdu += this.toStringHex(buffer[i]);
+			pdu += Helper.toStringHex(buffer[i]);
 			length++;
 		}
 
@@ -190,50 +187,57 @@ export class Helper {
 	 *
 	 * @returns An object containing the length of the encoded text in septets and the result as a hexadecimal string
 	 */
-	static encode7Bit(text: string, alignBits?: number) {
-		let ret = '';
+	static encode7Bit(text: string, alignBits = 0) {
+		let result = '';
 		let buf = 0; // Bit buffer, used in FIFO manner
-		let bufLen = 0; // Ammount of buffered bits
-		let length = 0; // Ammount of produced septets
+		let bufLen = 0; // Amount of buffered bits
+		let length = 0; // Amount of produced septets
 
-		// Insert leading alignment zero bits if requested
-		if (alignBits) {
-			bufLen += alignBits;
-		}
+		// Adjust for initial padding if alignBits is specified
+		bufLen = alignBits;
 
 		for (const symb of text) {
-			let code;
+			let code: number;
 
 			if ((code = Helper.ALPHABET_7BIT.indexOf(symb)) !== -1) {
+				// Normal character
 				buf |= code << bufLen;
 				bufLen += 7;
 				length++;
 			} else if ((code = Helper.EXTENDED_TABLE.indexOf(symb)) !== -1) {
-				buf |= ((code << 7) | 27) << bufLen;
-				bufLen += 14;
-				length += 2;
+				// ESC character (27), then the actual extended character
+				buf |= 27 << bufLen;
+				bufLen += 7;
+				length++;
+
+				// Then add extended character
+				buf |= code << bufLen;
+				bufLen += 7;
+				length++;
 			} else {
-				buf |= 37 << bufLen; // Place space symbol
+				// Replace unknown with space (' '- code 0x20)
+				buf |= 32 << bufLen;
 				bufLen += 7;
 				length++;
 			}
 
 			while (bufLen >= 8) {
-				ret += this.toStringHex(buf & 0xff);
+				result += Helper.toStringHex(buf & 0xff);
 				buf >>= 8;
 				bufLen -= 8;
 			}
 		}
 
-		if (bufLen) {
-			ret += this.toStringHex(buf); // here we have less then 8 bits
+		// Write out remaining bits if needed
+		if (bufLen > 0) {
+			result += Helper.toStringHex(buf & 0xff);
 		}
 
 		if (alignBits) {
 			length++; // Add 1 to length to account for the padding septet
 		}
 
-		return { length, result: ret };
+		return { length, result };
 	}
 
 	/**
@@ -248,7 +252,7 @@ export class Helper {
 
 		for (let i = 0; i < text.length; i++) {
 			const byte = Helper.order(text.substring(i, i + 1));
-			pdu += this.toStringHex(byte, 4);
+			pdu += Helper.toStringHex(byte, 4);
 			length += 2;
 		}
 
@@ -263,12 +267,6 @@ export class Helper {
 	 * @returns The number as a hexadecimal string
 	 */
 	static toStringHex(number: number, fill = 2) {
-		let str = number.toString(16);
-
-		while (str.length < fill) {
-			str = '0' + str;
-		}
-
-		return str.toUpperCase();
+		return number.toString(16).padStart(fill, '0').toUpperCase();
 	}
 }

tests/creating.test.ts

@@ -0,0 +1,30 @@
+import { describe, expect, test } from 'vitest';
+import { Submit } from '../src/index';
+
+describe('Test PDU creation', () => {
+	test('should correctly create a single-part Submit PDU message', () => {
+		const submit = new Submit('+1234567890', 'Hello, this is a simple Submit.');
+
+		const pduParts = submit.getPartStrings();
+		expect(pduParts).toHaveLength(1);
+
+		expect(pduParts[0]).toBe('0001000A91214365870900001FC8329BFD6681E8E8F41C949E83C2A079BA0D679741D3BAB89DA6BB00');
+	});
+
+	test('should correctly create a multi-part Submit PDU message', () => {
+		const submit = new Submit(
+			'+1234567890',
+			'Hello, this is a long text to reproduce the issue that Adam Smid has provided, I am trying to reproduce this with success. I hope you guys have a good day today, make every day count in your live!'
+		);
+
+		const pduParts = submit.getPartStrings();
+		expect(pduParts).toHaveLength(2);
+
+		expect(pduParts[0]).toBe(
+			'0041000A91214365870900008D06080403B60201C8329BFD6681E8E8F41C949E83C220F6DB7D06D1CB783A88FE06C9CB70F99B5C1F9741747419949ECFEB65101D1DA68382E4701B346DA7C92074780E82CBDFF634B94C668192A0701B4497E7D3EE3388FE06C9CB70F99B5C1F974174747A0EBAA7E968D0BC3E1E97E77317280942BFE16550FE5D07'
+		);
+		expect(pduParts[1]).toBe(
+			'0041000A91214365870900004706080403B60202A0733D3F07A1C3F632280C3ABFDF6410399C07D1DFE4709E056A87D76550D95E96E741E4701E347ED7DD7450DA0DCABFEB72103B6D2F8700'
+		);
+	});
+});