fixup for arsenal sdk migration

Author: SylvainSenechal

lib/storage/data/external/AwsClient.js

@@ -295,70 +295,47 @@ class AwsClient {
         const abortController = new AbortController();
         this._client.send(command, { abortSignal: abortController.signal })
             .then(data => {
-                // const rawBody = data.Body;
-                // const stream = this._normalizeSdkStream(rawBody);
-                // if (!stream || typeof stream.on !== 'function') {
-                //     const bodyType = rawBody?.constructor?.name || typeof rawBody;
-                //     log.error('unsupported body type from AWS SDK getObject response', {
-                //         method: 'AwsClient.get',
-                //         backendType: this.clientType,
-                //         dataStoreName: this._dataStoreName,
-                //         bodyType,
-                //     });
-                //     return cbOnce(errorInstances.InternalError
-                //         .customizeDescription('Unsupported response body type returned from AWS SDK'));
-                // }
-
-                // if (data.$metadata?.httpHeaders) {
-                //     log.trace(`${this.type} GET request response headers`, {
-                //         responseHeaders: data.$metadata.httpHeaders,
-                //         backendType: this.clientType,
-                //     });
-                // }
-
-                // let finished = false;
-                // const originalDestroy = stream.destroy.bind(stream);
-
-                // const abortRequest = err => {
-                //     if (finished) {
-                //         return stream;
-                //     }
-                //     finished = true;
-                //     log.debug('aborting GET request in progress', { objectGetInfo });
-                //     abortController.abort(err);
-                //     if (rawBody && rawBody !== stream) {
-                //         rawBody.destroy?.(err);
-                //     }
-                //     try {
-                //         originalDestroy(err);
-                //     } catch (destroyErr) {
-                //         log.debug('error while destroying aws sdk stream', {
-                //             method: 'AwsClient.get',
-                //             backendType: this.clientType,
-                //             dataStoreName: this._dataStoreName,
-                //             error: destroyErr,
-                //         });
-                //     }
-                //     return stream;
-                // };
-
-                // stream.abort = abortRequest;
-                // stream.destroy = err => abortRequest(err);
-                // stream.createReadStream = () => stream;
-
-                // stream.on('error', err => {
-                //     const logLevel = err?.code === 'NotFound' ? 'info' : 'error';
-                //     logHelper(
-                //         log,
-                //         logLevel,
-                //         `error streaming data from ${this.type}`,
-                //         err,
-                //         this._dataStoreName,
-                //         this.clientType
-                //     );
-                // });
-
-                return process.nextTick(() => cbOnce(null, null));
+                const stream = data.Body;
+                if (!stream) {
+                    const bodyType = stream?.constructor?.name || typeof stream;
+                    log.error('unsupported body type from AWS SDK getObject response', {
+                        method: 'AwsClient.get',
+                        backendType: this.clientType,
+                        dataStoreName: this._dataStoreName,
+                        bodyType,
+                    });
+                    return cbOnce(errorInstances.InternalError
+                        .customizeDescription('Unsupported response body type returned from AWS SDK'));
+                }
+
+                if (data.$metadata?.httpHeaders) {
+                    log.trace(`${this.type} GET request response headers`, {
+                        responseHeaders: data.$metadata.httpHeaders,
+                        backendType: this.clientType,
+                    });
+                }
+
+                // Override destroy to also abort the HTTP request
+                const originalDestroy = stream.destroy.bind(stream);
+                stream.destroy = err => {
+                    log.debug('aborting GET request in progress', { objectGetInfo });
+                    abortController.abort(err);
+                    return originalDestroy(err);
+                };
+
+                stream.on('error', err => {
+                    const logLevel = err?.code === 'NotFound' ? 'info' : 'error';
+                    logHelper(
+                        log,
+                        logLevel,
+                        `error streaming data from ${this.type}`,
+                        err,
+                        this._dataStoreName,
+                        this.clientType
+                    );
+                });
+
+                return process.nextTick(() => cbOnce(null, stream));
             })
             .catch(err => {
                 if (err instanceof NoSuchKey || err instanceof NotFound) {