From 876747efc9d85d2e1522b35827dff79d801c4cb6 Mon Sep 17 00:00:00 2001
From: Gabbeh <31376076+hvgab@users.noreply.github.com>
Date: Sun, 28 Jan 2024 16:53:59 +0100
Subject: [PATCH] feat: add different log formats for file and http on the
 parse function

---
 src/log-parser.ts         | 20 +++++++++++++----
 tests/received_at.test.ts | 45 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 tests/received_at.test.ts

diff --git a/src/log-parser.ts b/src/log-parser.ts
index 97684c5..594e9db 100644
--- a/src/log-parser.ts
+++ b/src/log-parser.ts
@@ -91,17 +91,29 @@ export type Events =
   | ValidatedEvent
   | WarmodEvent;
 
-const { length: LENGTH_OF_DATE } = "10/20/2020 - 10:30:50: ";
+const { length: LENGTH_OF_DATE_FILE } = "10/20/2020 - 10:30:50: ";  // File format
+const { length: LENGTH_OF_DATE_HTTP } = "01/28/2024 - 13:11:03.628 - ";  // Http format
 
 export interface IParseOptions {
   parsers?: IBaseParser<Events>[];
+  format?: "file" | "http";
 }
 
-export function parse(rawLog: string, { parsers = defaultParsers }: IParseOptions = {}): Events | undefined {
-  const receivedAt = new Date(rawLog.substring(0, LENGTH_OF_DATE - 2).replace(" - ", " "));
+export function parse(rawLog: string, { parsers = defaultParsers, format="file" }: IParseOptions = {}): Events | undefined {
 
-  const log = rawLog.substring(LENGTH_OF_DATE);
+  let receivedAt: Date;
+  let log: string;
 
+  if (format==="file"){
+    receivedAt = new Date(rawLog.substring(0, LENGTH_OF_DATE_FILE - 2).replace(" - ", " "));
+    log = rawLog.substring(LENGTH_OF_DATE_FILE);
+  } else if (format==="http"){
+    receivedAt = new Date(rawLog.substring(0, LENGTH_OF_DATE_HTTP - 3).replace(" - ", " "));
+    log = rawLog.substring(LENGTH_OF_DATE_HTTP);
+  } else {
+    throw new Error("Invalid format specified.");
+  }
+  
   for (const parser of parsers) {
     const pattern = parser.patterns.find((item) => item.test(log));
 
diff --git a/tests/received_at.test.ts b/tests/received_at.test.ts
new file mode 100644
index 0000000..5d45439
--- /dev/null
+++ b/tests/received_at.test.ts
@@ -0,0 +1,45 @@
+import { ok } from "assert";
+import { parse, IParseOptions } from "../src";
+
+const DATE_FILE = "01/28/2024 - 16:17:18: "
+const DATE_HTTP = "01/28/2024 - 16:17:18.000 - "
+const DATE      = "01/28/2024 16:17:18"
+
+describe("parse function", (): void => {
+  it("should correctly parse the receivedAt date for 'file' format", () => {
+    const log = `${DATE_FILE}"PlayerName<1><[U:1:230970467]><>" connected, address ""`;
+    const options: IParseOptions = {
+      format: 'file'
+    }
+    const result = parse(log, options);
+    const expectedDate = new Date(DATE)
+
+    ok(result !== undefined, `Failed parse log: ${log}`);
+    expect(result).toBeDefined();
+    expect(result.receivedAt).toEqual(expectedDate);
+  });
+
+  it("should correctly parse the receivedAt date for 'http' format", () => {
+    const log = `${DATE_HTTP}"PlayerName<1><[U:1:230970467]><>" connected, address ""`;
+    const options: IParseOptions = {
+      format: 'http'
+    }
+    const result = parse(log, options);
+    const expectedDate = new Date(DATE)
+
+    ok(result !== undefined, `Failed parse log: ${log}`);
+    expect(result).toBeDefined();
+    expect(result.receivedAt).toEqual(expectedDate);
+  });
+
+  it('should use "file" when not specified for backwards compatibility.', () => {
+    const log = `${DATE_FILE}"PlayerName<1><[U:1:230970467]><>" connected, address ""`;
+    const result = parse(log);
+    const expectedDate = new Date(DATE)
+
+    ok(result !== undefined, `Failed parse log: ${log}`);
+    expect(result).toBeDefined();
+    expect(result.receivedAt).toBeInstanceOf(Date);
+    expect(result.receivedAt).toEqual(expectedDate);
+  });
+});