BC-9005 Change regex to more strict defintion. (#60)

Author: CeEv

src/infra/y-redis/helper.spec.ts

@@ -57,30 +57,30 @@ describe('helper', () => {
 		it('returns the expected value', () => {
 			const room = 'room';
 			const docid = 'docid';
-			const prefix = 'prefix';
+			const prefix = 'y';
 
 			const result = computeRedisRoomStreamName(room, docid, prefix);
 
-			expect(result).toBe('prefix:room:room:docid');
+			expect(result).toBe('y:room:room:docid');
 		});
 	});
 
 	describe('decodeRedisRoomStreamName', () => {
 		describe('when the rediskey is malformed', () => {
 			it('throws an error', () => {
 				const rediskey = 'invalid';
-				const expectedPrefix = 'prefix';
+				const expectedPrefix = 'y';
 
 				expect(() => decodeRedisRoomStreamName(rediskey, expectedPrefix)).toThrow(
-					`Malformed stream name! prefix="undefined" expectedPrefix="prefix", rediskey="invalid"`,
+					`Malformed stream name! expectedRedisPrefix="y", rediskey="invalid"`,
 				);
 			});
 		});
 
 		describe('when the rediskey is well formed', () => {
 			it('returns the expected values', () => {
-				const rediskey = 'prefix:room:room:docid';
-				const expectedPrefix = 'prefix';
+				const rediskey = 'y:room:room:docid';
+				const expectedPrefix = 'y';
 
 				const result = decodeRedisRoomStreamName(rediskey, expectedPrefix);
 
@@ -91,10 +91,10 @@ describe('helper', () => {
 		describe('when the prefix does not match', () => {
 			it('throws an error', () => {
 				const rediskey = 'invalid:room:room:docid';
-				const expectedPrefix = 'prefix';
+				const expectedPrefix = 'y';
 
 				expect(() => decodeRedisRoomStreamName(rediskey, expectedPrefix)).toThrow(
-					`Malformed stream name! prefix="invalid" expectedPrefix="prefix", rediskey="invalid:room:room:docid"`,
+					`Malformed stream name! expectedRedisPrefix="y", rediskey="invalid:room:room:docid"`,
 				);
 			});
 		});

src/infra/y-redis/helper.ts

@@ -26,15 +26,15 @@ export interface RoomStreamInfos {
 	room: string;
 	docid: string;
 }
-export const decodeRedisRoomStreamName = (rediskey: string, expectedPrefix: string): RoomStreamInfos => {
-	const match = /^(.*):room:(.*):(.*)$/.exec(rediskey);
-	if (match == null || match[1] !== expectedPrefix) {
-		throw new Error(
-			`Malformed stream name! prefix="${match?.[1]}" expectedPrefix="${expectedPrefix}", rediskey="${rediskey}"`,
-		);
+
+export const decodeRedisRoomStreamName = (rediskey: string, expectedRedisPrefix: string): RoomStreamInfos => {
+	const match = new RegExp(`^${expectedRedisPrefix}:room:([^:]+):([^:]+)$`).exec(rediskey);
+
+	if (match == null) {
+		throw new Error(`Malformed stream name! expectedRedisPrefix="${expectedRedisPrefix}", rediskey="${rediskey}"`);
 	}
 
-	return { room: decodeURIComponent(match[2]), docid: decodeURIComponent(match[3]) };
+	return { room: decodeURIComponent(match[1]), docid: decodeURIComponent(match[2]) };
 };
 
 const getIdFromLastStreamMessageReply = (docStreamReplay: StreamMessagesReply): RedisKey | undefined => {