feat(proto-log): include raw base64 data in the saved json

Author: RaizeTheLimit

src/index.ts

@@ -48,20 +48,23 @@ const httpServer = http.createServer(function (req, res) {
                 }
                 const identifier = parsedData['username'];
                 for (let i = 0; i < parsedData['contents'].length; i++) {
+                    const rawRequest = parsedData['contents'][i].request || "";
+                    const rawResponse = parsedData['contents'][i].payload || "";
+
                     const parsedRequestData = decodePayloadTraffic(
                         parsedData['contents'][i].type,
-                        parsedData['contents'][i].request,
+                        rawRequest,
                         "request"
                     );
                     const parsedResponseData = decodePayloadTraffic(
                         parsedData['contents'][i].type,
-                        parsedData['contents'][i].payload,
+                        rawResponse,
                         "response"
                     );
 
                     // Save sample if enabled
                     if (sampleSaver && parsedRequestData.length > 0 && parsedResponseData.length > 0) {
-                        sampleSaver.savePair(parsedRequestData[0], parsedResponseData[0], "golbat");
+                        sampleSaver.savePair(parsedRequestData[0], parsedResponseData[0], rawRequest, rawResponse, "golbat");
                     }
 
                     if (typeof parsedRequestData === "string") {

src/utils/index.ts

@@ -35,20 +35,23 @@ export function getIPAddress() {
 
 export function handleData(incoming: WebStreamBuffer, outgoing: WebStreamBuffer, identifier: any, parsedData: string, sampleSaver?: any) {
     for (let i = 0; i < parsedData['protos'].length; i++) {
+        const rawRequest = parsedData['protos'][i].request || "";
+        const rawResponse = parsedData['protos'][i].response || "";
+
         const parsedRequestData = decodePayloadTraffic(
             parsedData['protos'][i].method,
-            parsedData['protos'][i].request,
+            rawRequest,
             "request"
         );
         const parsedResponseData = decodePayloadTraffic(
             parsedData['protos'][i].method,
-            parsedData['protos'][i].response,
+            rawResponse,
             "response"
         );
 
         // Save sample if enabled
         if (sampleSaver && parsedRequestData.length > 0 && parsedResponseData.length > 0) {
-            sampleSaver.savePair(parsedRequestData[0], parsedResponseData[0], "traffic");
+            sampleSaver.savePair(parsedRequestData[0], parsedResponseData[0], rawRequest, rawResponse, "traffic");
         }
 
         if (typeof parsedRequestData === "string") {

src/utils/sample-saver.ts

@@ -15,6 +15,8 @@ interface SavedSample {
     timestamp: string;
     request: any;
     response: any;
+    rawRequest: string;
+    rawResponse: string;
 }
 
 interface SampleFile {
@@ -101,7 +103,13 @@ class SampleSaver {
         return true;
     }
 
-    public async saveSample(request: DecodedProto, response: DecodedProto | null, endpoint: string): Promise<void> {
+    public async saveSample(
+        request: DecodedProto,
+        response: DecodedProto | null,
+        rawRequest: string,
+        rawResponse: string,
+        endpoint: string
+    ): Promise<void> {
         if (!request || !request.methodId) return;
         if (!this.shouldSave(endpoint)) return;
 
@@ -117,7 +125,9 @@ class SampleSaver {
             methodName: request.methodName,
             timestamp: this.getTimestamp(),
             request: request.data,
-            response: response ? response.data : null
+            response: response ? response.data : null,
+            rawRequest: rawRequest,
+            rawResponse: rawResponse
         };
 
         const safeMethodName = request.methodName.replace(/[^a-zA-Z0-9_-]/g, '_');
@@ -144,8 +154,14 @@ class SampleSaver {
         }
     }
 
-    public async savePair(request: DecodedProto, response: DecodedProto, endpoint: string): Promise<void> {
-        await this.saveSample(request, response, endpoint);
+    public async savePair(
+        request: DecodedProto,
+        response: DecodedProto,
+        rawRequest: string,
+        rawResponse: string,
+        endpoint: string
+    ): Promise<void> {
+        await this.saveSample(request, response, rawRequest, rawResponse, endpoint);
     }
 }