fixup! Split s3Extended into per-command files under src/commands

Author: maeldonn

src/commands/s3Extended/utils.ts

@@ -5,8 +5,10 @@ import { XMLParser } from 'fast-xml-parser';
 export const USER_METADATA_PREFIX = 'x-amz-meta-';
 
 
-export const extendCommandWithExtraParametersMiddleware = (query: string) =>
-    (next: any) => async (args: any) => {
+export function extendCommandWithExtraParametersMiddleware(query: string) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (next: any) => async (args: any) => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const request = args.request as any;
         if (request.query) {
             request.query.search = query;
@@ -15,86 +17,71 @@ export const extendCommandWithExtraParametersMiddleware = (query: string) =>
         }
         return next(args);
     };
+}
 
 
-export const overrideObjectAttributesHeaderMiddleware =
-    (headerName: string, attributes: string[]) => (next: any) => async (args: any) => {
+export function overrideObjectAttributesHeaderMiddleware(headerName: string, attributes: string[]) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (next: any) => async (args: any) => {
         const request = args.request;
         request.headers[headerName] = attributes.join(',');
         return next(args);
     };
+}
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const captureResponseBodyMiddleware = (captured: { xml: string }) => (next: any) => async (args: any) => {
-    const { response } = await next(args);
+export function captureResponseBodyMiddleware(captured: { xml: string }) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (next: any) => async (args: any) => {
+        const { response } = await next(args);
 
-    if (response?.body) {
-        const collected = await streamCollector(response.body);
-        const buffer = Buffer.from(collected);
-        // eslint-disable-next-line no-param-reassign
-        captured.xml = buffer.toString('utf-8');
-        response.body = Readable.from([buffer]);
-    }
+        if (response?.body) {
+            const collected = await streamCollector(response.body);
+            const buffer = Buffer.from(collected);
+            // eslint-disable-next-line no-param-reassign
+            captured.xml = buffer.toString('utf-8');
+            // Re-create the body stream so the SDK deserializer can still consume it
+            response.body = Readable.from([buffer]);
+        }
 
-    return { response };
-};
+        return { response };
+    };
+}
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function extractUserMetadata(obj: Record<string, any>): Record<string, string> {
-    const metadata: Record<string, string> = {};
-    for (const [key, value] of Object.entries(obj)) {
+export function extractUserMetadata(source: Record<string, any>, target: Record<string, string>): void {
+    for (const [key, value] of Object.entries(source)) {
         if (key.startsWith(USER_METADATA_PREFIX)) {
-            metadata[key] = String(value);
+            // eslint-disable-next-line no-param-reassign
+            target[key] = String(value);
         }
     }
-    return metadata;
-}
-
-export function parseGetObjectAttributesUserMetadata(xml: string): Record<string, string> {
-    const parsed = new XMLParser().parse(xml);
-    const response = parsed?.GetObjectAttributesResponse;
-    if (!response) {
-        return {};
-    }
-    return extractUserMetadata(response);
 }
 
-export function parseListObjectsUserMetadata(xml: string): Map<string, Record<string, string>> {
-    const parsed = new XMLParser().parse(xml);
-    const result = parsed?.ListBucketResult;
-    if (!result?.Contents) {
-        return new Map();
-    }
-    const contents = Array.isArray(result.Contents) ? result.Contents : [result.Contents];
-    const metadataByKey = new Map<string, Record<string, string>>();
-    for (const entry of contents) {
-        const metadata = extractUserMetadata(entry);
-        if (Object.keys(metadata).length > 0 && entry.Key) {
-            metadataByKey.set(String(entry.Key), metadata);
+export function parseUserMetadataMiddleware(captured: { xml: string }) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (next: any) => async (args: any) => {
+        const result = await next(args);
+        const parsed = new XMLParser().parse(captured.xml);
+        const response = parsed?.GetObjectAttributesResponse;
+        if (response) {
+            extractUserMetadata(response, result.output);
         }
-    }
-    return metadataByKey;
+        return result;
+    };
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const parseUserMetadataMiddleware = (captured: { xml: string }) => (next: any) => async (args: any) => {
-    const result = await next(args);
-    Object.assign(result.output, parseGetObjectAttributesUserMetadata(captured.xml));
-    return result;
-};
-
 
-export const parseListObjectsUserMetadataMiddleware =
-    (captured: { xml: string }) => (next: any) => async (args: any) => {
+export function parseListObjectsUserMetadataMiddleware(captured: { xml: string }) {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (next: any) => async (args: any) => {
         const result = await next(args);
-        const metadataByKey = parseListObjectsUserMetadata(captured.xml);
-        if (result.output.Contents && metadataByKey.size > 0) {
-            for (const content of result.output.Contents) {
-                const metadata = metadataByKey.get(content.Key);
-                if (metadata) {
-                    Object.assign(content, metadata);
-                }
+        const parsed = new XMLParser().parse(captured.xml);
+        const xmlContents = parsed?.ListBucketResult?.Contents;
+        if (result.output.Contents && xmlContents) {
+            for (let i = 0; i < result.output.Contents.length; i++) {
+                extractUserMetadata(xmlContents[i], result.output.Contents[i]);
             }
         }
         return result;
     };
+}