HAR: extended content is always base64-encoded + minor formatting fixes + minor improvement for base64 util

Author: emaheuxPEREN

src/components/intercept/config/android-device-config.tsx

@@ -64,10 +64,7 @@ const Spacer = styled.div`
 `;
 
 function urlSafeBase64(content: string) {
-    return stringToBuffer(content)
-        .toString('base64')
-        .replace(/\+/g, '-')
-        .replace(/\//g, '_');
+    return stringToBuffer(content).toString('base64url');
 }
 
 function getConfigRequestIds(eventsStore: EventsStore) {

src/model/http/har.ts

@@ -51,15 +51,15 @@ interface HarLog extends HarFormat.Log {
 export type RequestContentData = {
     text: string;
     size: number;
-    encoding?: 'base64';
+    encoding: 'base64';
     comment?: string;
 };
 
 export interface ExtendedHarRequest extends HarFormat.Request {
     _requestBodyStatus?:
-        | 'discarded:too-large'
-        | 'discarded:not-representable'
-        | 'discarded:not-decodable';
+    | 'discarded:too-large'
+    | 'discarded:not-representable' // to indicate that extended field `_content` is populated with base64 `postData`
+    | 'discarded:not-decodable';
     _content?: RequestContentData;
     _trailers?: HarFormat.Header[];
 }
@@ -302,7 +302,7 @@ async function generateHarResponse(
 
     const decoded = await response.body.decodedPromise;
 
-    let responseContent: { text: string, encoding?: string } | { comment: string};
+    let responseContent: { text: string, encoding?: string } | { comment: string };
     try {
         if (!decoded || decoded.byteLength > options.bodySizeLimit) {
             // If no body or the body is too large, don't include it
@@ -435,10 +435,10 @@ function generateHarWebSocketMessage(
     return {
         // Note that msg.direction is from the perspective of Mockttp, not the client.
         type: message.direction === 'sent'
-                ? 'receive'
+            ? 'receive'
             : message.direction === 'received'
                 ? 'send'
-            : unreachableCheck(message.direction),
+                : unreachableCheck(message.direction),
 
         opcode: message.isBinary ? 2 : 1,
         data: message.isBinary
@@ -751,7 +751,7 @@ function parseHttpVersion(
 }
 
 function parseHarRequestContents(data: RequestContentData): Buffer {
-    if (data.encoding && Buffer.isEncoding(data.encoding)) {
+    if (Buffer.isEncoding(data.encoding)) {
         return Buffer.from(data.text, data.encoding);
     }
 

src/services/ui-worker-formatters.ts

@@ -39,7 +39,9 @@ const WorkerFormatters = {
         }
     },
     base64: (content: Buffer) => {
-        return Buffer.from(content.toString('utf8'), 'base64').toString('utf8');
+        const b64 = content.toString('ascii');
+        const encoding = b64.match(/[-_]/) ? 'base64url' : 'base64';
+        return Buffer.from(b64, encoding).toString('utf8');
     },
     markdown: (content: Buffer) => {
         return content.toString('utf8');