Resolve warning in file uploader

apps/app/src/server/service/file-uploader/aws/index.ts

@@ -1,5 +1,6 @@
 import type { Readable } from 'stream';
 
+
 import type { GetObjectCommandInput, HeadObjectCommandInput } from '@aws-sdk/client-s3';
 import {
   S3Client,
@@ -15,6 +16,7 @@ import {
 import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
 import type { NonBlankString } from '@growi/core/dist/interfaces';
 import { toNonBlankStringOrUndefined } from '@growi/core/dist/interfaces';
+import type { Response } from 'express';
 import urljoin from 'url-join';
 
 import type Crowi from '~/server/crowi';
@@ -28,7 +30,7 @@ import { configManager } from '../../config-manager';
 import {
   AbstractFileUploader, type TemporaryUrl, type SaveFileParam,
 } from '../file-uploader';
-import { ContentHeaders } from '../utils';
+import { ContentHeaders, applyHeaders } from '../utils';
 
 import { AwsMultipartUploader } from './multipart-uploader';
 
@@ -49,7 +51,7 @@ const isFileExists = async(s3: S3Client, params: HeadObjectCommandInput) => {
     await s3.send(new HeadObjectCommand(params));
   }
   catch (err) {
-    if (err != null && err.code === 'NotFound') {
+    if (err != null && (err as any).code === 'NotFound') {
       return false;
     }
     throw err;
@@ -131,7 +133,13 @@ class AwsFileUploader extends AbstractFileUploader {
    * @inheritdoc
    */
   override isValidUploadSettings(): boolean {
-    throw new Error('Method not implemented.');
+    return this.configManager.getConfig('aws:s3AccessKeyId') != null
+      && this.configManager.getConfig('aws:s3SecretAccessKey') != null
+      && (
+        this.configManager.getConfig('aws:s3Region') != null
+        || this.configManager.getConfig('aws:s3CustomEndpoint') != null
+      )
+      && this.configManager.getConfig('aws:s3Bucket') != null;
   }
 
   /**
@@ -159,7 +167,7 @@ class AwsFileUploader extends AbstractFileUploader {
    * @inheritdoc
    */
   override determineResponseMode() {
-    return configManager.getConfig('aws:referenceFileWithRelayMode')
+    return this.configManager.getConfig('aws:referenceFileWithRelayMode')
       ? ResponseMode.RELAY
       : ResponseMode.REDIRECT;
   }
@@ -177,7 +185,8 @@ class AwsFileUploader extends AbstractFileUploader {
     const s3 = S3Factory();
 
     const filePath = getFilePathOnStorage(attachment);
-    const contentHeaders = new ContentHeaders(attachment);
+
+    const contentHeaders = await ContentHeaders.create(this.configManager, attachment);
 
     await s3.send(new PutObjectCommand({
       Bucket: getS3Bucket(),
@@ -190,11 +199,27 @@ class AwsFileUploader extends AbstractFileUploader {
     }));
   }
 
-  /**
-   * @inheritdoc
-   */
-  override respond(): void {
-    throw new Error('AwsFileUploader does not support ResponseMode.DELEGATE.');
+
+  override async respond(res: Response, attachment: IAttachmentDocument, opts?: RespondOptions): Promise<void> {
+    const responseMode = this.determineResponseMode();
+
+    if (responseMode === ResponseMode.REDIRECT) {
+      // In REDIRECT mode, generate a temporary URL and redirect
+      const temporaryUrl = await this.generateTemporaryUrl(attachment, opts);
+      res.redirect(temporaryUrl.url);
+    }
+    else if (responseMode === ResponseMode.RELAY) {
+      // In RELAY mode, stream the file content
+      const readableStream = await this.findDeliveryFile(attachment);
+      const isDownload = opts?.download ?? false;
+      const contentHeaders = await ContentHeaders.create(this.configManager, attachment, { inline: !isDownload });
+      applyHeaders(res, contentHeaders.toExpressHttpHeaders());
+      readableStream.pipe(res);
+    }
+    else {
+      // Fallback for any unexpected ResponseMode
+      throw new Error(`AwsFileUploader encountered an unsupported or unexpected ResponseMode: ${responseMode}.`);
+    }
   }
 
   /**
@@ -228,8 +253,8 @@ class AwsFileUploader extends AbstractFileUploader {
 
       // eslint-disable-next-line no-nested-ternary
       return 'stream' in body
-        ? body.stream() as unknown as NodeJS.ReadableStream // get stream from Blob and cast force
-        : body as unknown as NodeJS.ReadableStream; // cast force
+        ? (body as any).transformToWebStream() as unknown as NodeJS.ReadableStream // get stream from Blob and cast force
+        : body as unknown as NodeJS.ReadableStream; // cast force -- Updated for aws-sdk v3 'Body' type
     }
     catch (err) {
       logger.error(err);
@@ -247,12 +272,12 @@ class AwsFileUploader extends AbstractFileUploader {
 
     const s3 = S3Factory();
     const filePath = getFilePathOnStorage(attachment);
-    const lifetimeSecForTemporaryUrl = configManager.getConfig('aws:lifetimeSecForTemporaryUrl');
+    const lifetimeSecForTemporaryUrl = this.configManager.getConfig('aws:lifetimeSecForTemporaryUrl'); // <-- Changed
 
     // issue signed url (default: expires 120 seconds)
     // https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#getSignedUrl-property
     const isDownload = opts?.download ?? false;
-    const contentHeaders = new ContentHeaders(attachment, { inline: !isDownload });
+    const contentHeaders = await ContentHeaders.create(this.configManager, attachment, { inline: !isDownload }); // <-- Changed
     const params: GetObjectCommandInput = {
       Bucket: getS3Bucket(),
       Key: filePath,
@@ -285,7 +310,10 @@ class AwsFileUploader extends AbstractFileUploader {
     }
     catch (e) {
       // allow duplicate abort requests to ensure abortion
-      if (e.response?.status !== 404) {
+      // Note: In AWS SDK v3, 'e.response' might not exist directly.
+      // You may need to inspect the 'name' or 'Code' property for specific error types,
+      // e.g., if (e instanceof NotFound) or (e as any).name === 'NotFound'
+      if ((e as any)?.name !== 'NotFound') {
         throw e;
       }
     }
@@ -293,15 +321,19 @@ class AwsFileUploader extends AbstractFileUploader {
 
 }
 
+// This is the factory function that creates an instance of AwsFileUploader
+// It receives 'crowi' and needs to pass the 'configManager' to the constructor
 module.exports = (crowi: Crowi) => {
-  const lib = new AwsFileUploader(crowi);
+  const lib = new AwsFileUploader(crowi, configManager);
 
+  // For ideal consistency, should be moved into the class as 'override' methods
+  // and use 'this.configManager'.
   lib.isValidUploadSettings = function() {
     return configManager.getConfig('aws:s3AccessKeyId') != null
       && configManager.getConfig('aws:s3SecretAccessKey') != null
       && (
         configManager.getConfig('aws:s3Region') != null
-          || configManager.getConfig('aws:s3CustomEndpoint') != null
+        || configManager.getConfig('aws:s3CustomEndpoint') != null
       )
       && configManager.getConfig('aws:s3Bucket') != null;
   };

apps/app/src/server/service/file-uploader/azure.ts

@@ -86,11 +86,9 @@ function getFilePathOnStorage(attachment: IAttachmentDocument) {
 
 class AzureFileUploader extends AbstractFileUploader {
 
-  private readonly configManager: ConfigManager;
-
   constructor(crowi: Crowi) {
-    super(crowi);
-    this.configManager = crowi.configManager as ConfigManager;
+    super(crowi, configManager);
+    this.configManager = configManager;
   }
 
   /**

apps/app/src/server/service/file-uploader/file-uploader.ts

@@ -10,6 +10,7 @@ import { Attachment, type IAttachmentDocument } from '~/server/models/attachment
 import loggerFactory from '~/utils/logger';
 
 import { configManager } from '../config-manager';
+import type { ConfigManager } from '../config-manager';
 
 import type { MultipartUploader } from './multipart-uploader';
 
@@ -52,12 +53,15 @@ export abstract class AbstractFileUploader implements FileUploader {
 
   private crowi: Crowi;
 
-  constructor(crowi: Crowi) {
+  protected configManager: ConfigManager;
+
+  constructor(crowi: Crowi, configManager: ConfigManager) {
     this.crowi = crowi;
+    this.configManager = configManager;
   }
 
   getIsUploadable() {
-    return !configManager.getConfig('app:fileUploadDisabled') && this.isValidUploadSettings();
+    return !this.configManager.getConfig('app:fileUploadDisabled') && this.isValidUploadSettings();
   }
 
   /**
@@ -96,7 +100,7 @@ export abstract class AbstractFileUploader implements FileUploader {
       return false;
     }
 
-    return !!configManager.getConfig('app:fileUpload');
+    return !!this.configManager.getConfig('app:fileUpload');
   }
 
   abstract listFiles();
@@ -112,10 +116,10 @@ export abstract class AbstractFileUploader implements FileUploader {
    * @returns file upload total limit in bytes
    */
   getFileUploadTotalLimit() {
-    const fileUploadTotalLimit = configManager.getConfig('app:fileUploadType') === 'mongodb'
+    const fileUploadTotalLimit = this.configManager.getConfig('app:fileUploadType') === 'mongodb'
       // Use app:fileUploadTotalLimit if gridfs:totalLimit is null (default for gridfs:totalLimit is null)
-      ? configManager.getConfig('app:fileUploadTotalLimit')
-      : configManager.getConfig('app:fileUploadTotalLimit');
+      ? this.configManager.getConfig('app:fileUploadTotalLimit')
+      : this.configManager.getConfig('app:fileUploadTotalLimit');
     return fileUploadTotalLimit;
   }
 

apps/app/src/server/service/file-uploader/gcs/index.ts

@@ -4,6 +4,7 @@ import { pipeline } from 'stream/promises';
 import { Storage } from '@google-cloud/storage';
 import { toNonBlankStringOrUndefined } from '@growi/core/dist/interfaces';
 import axios from 'axios';
+import type { Response } from 'express'; // <--- ADD THIS IMPORT for 'Response' type
 import urljoin from 'url-join';
 
 import type Crowi from '~/server/crowi';
@@ -17,7 +18,7 @@ import { configManager } from '../../config-manager';
 import {
   AbstractFileUploader, type TemporaryUrl, type SaveFileParam,
 } from '../file-uploader';
-import { ContentHeaders } from '../utils';
+import { ContentHeaders, applyHeaders } from '../utils';
 
 import { GcsMultipartUploader } from './multipart-uploader';
 
@@ -79,11 +80,19 @@ class GcsFileUploader extends AbstractFileUploader {
    */
   override isValidUploadSettings(): boolean {
     try {
-      getGcsBucket();
+      const gcsBucket = toNonBlankStringOrUndefined(this.configManager.getConfig('gcs:bucket'));
+      // You can add a check for apiKeyJsonPath here if it's strictly required
+      // const apiKeyJsonPath = toNonBlankStringOrUndefined(this.configManager.getConfig('gcs:apiKeyJsonPath'));
+
+      if (gcsBucket == null) {
+        throw new Error('GCS bucket is not configured.');
+      }
+      // if (apiKeyJsonPath == null) { /* throw error */ } // Uncomment if API key is strictly required
+
       return true;
     }
     catch (err) {
-      logger.error(err);
+      logger.error('GcsFileUploader isValidUploadSettings error:', err);
       return false;
     }
   }
@@ -113,7 +122,8 @@ class GcsFileUploader extends AbstractFileUploader {
    * @inheritdoc
    */
   override determineResponseMode() {
-    return configManager.getConfig('gcs:referenceFileWithRelayMode')
+    // This is already correct in your provided code, using this.configManager
+    return this.configManager.getConfig('gcs:referenceFileWithRelayMode')
       ? ResponseMode.RELAY
       : ResponseMode.REDIRECT;
   }
@@ -131,8 +141,7 @@ class GcsFileUploader extends AbstractFileUploader {
     const gcs = getGcsInstance();
     const myBucket = gcs.bucket(getGcsBucket());
     const filePath = getFilePathOnStorage(attachment);
-    const contentHeaders = new ContentHeaders(attachment);
-
+    const contentHeaders = await ContentHeaders.create(this.configManager, attachment);
     const file = myBucket.file(filePath);
 
     await pipeline(readable, file.createWriteStream({
@@ -143,9 +152,27 @@ class GcsFileUploader extends AbstractFileUploader {
 
   /**
    * @inheritdoc
+   * <--- FIX: Corrected signature and implemented actual logic
    */
-  override respond(): void {
-    throw new Error('GcsFileUploader does not support ResponseMode.DELEGATE.');
+  override async respond(res: Response, attachment: IAttachmentDocument, opts?: RespondOptions): Promise<void> {
+    const responseMode = this.determineResponseMode();
+
+    if (responseMode === ResponseMode.REDIRECT) {
+      const temporaryUrl = await this.generateTemporaryUrl(attachment, opts);
+      res.redirect(temporaryUrl.url);
+    }
+    else if (responseMode === ResponseMode.RELAY) {
+      const readableStream = await this.findDeliveryFile(attachment);
+      const isDownload = opts?.download ?? false;
+      // ContentHeaders.create already correctly uses this.configManager
+      const contentHeaders = await ContentHeaders.create(this.configManager, attachment, { inline: !isDownload });
+      applyHeaders(res, contentHeaders.toExpressHttpHeaders()); // <--- Uses applyHeaders
+      readableStream.pipe(res);
+    }
+    else {
+      // If you're only expecting REDIRECT or RELAY, this error is appropriate
+      throw new Error(`GcsFileUploader encountered an unsupported or unexpected ResponseMode: ${responseMode}.`);
+    }
   }
 
   /**
@@ -172,7 +199,7 @@ class GcsFileUploader extends AbstractFileUploader {
     }
     catch (err) {
       logger.error(err);
-      throw new Error(`Coudn't get file from AWS for the Attachment (${attachment._id.toString()})`);
+      throw new Error(`Couldn't get file from GCS for the Attachment (${attachment._id.toString()})`);
     }
   }
 
@@ -188,12 +215,12 @@ class GcsFileUploader extends AbstractFileUploader {
     const myBucket = gcs.bucket(getGcsBucket());
     const filePath = getFilePathOnStorage(attachment);
     const file = myBucket.file(filePath);
-    const lifetimeSecForTemporaryUrl = configManager.getConfig('gcs:lifetimeSecForTemporaryUrl');
+    const lifetimeSecForTemporaryUrl = this.configManager.getConfig('gcs:lifetimeSecForTemporaryUrl');
 
     // issue signed url (default: expires 120 seconds)
     // https://cloud.google.com/storage/docs/access-control/signed-urls
     const isDownload = opts?.download ?? false;
-    const contentHeaders = new ContentHeaders(attachment, { inline: !isDownload });
+    const contentHeaders = await ContentHeaders.create(this.configManager, attachment, { inline: !isDownload });
     const [signedUrl] = await file.getSignedUrl({
       action: 'read',
       expires: Date.now() + lifetimeSecForTemporaryUrl * 1000,
@@ -222,7 +249,7 @@ class GcsFileUploader extends AbstractFileUploader {
       // allow 404: allow duplicate abort requests to ensure abortion
       // allow 499: it is the success response code for canceling upload
       // ref: https://cloud.google.com/storage/docs/performing-resumable-uploads#cancel-upload
-      if (e.response?.status !== 404 && e.response?.status !== 499) {
+      if ((e as any).response?.status !== 404 && (e as any).response?.status !== 499) { // Added (e as any) for type safety
         throw e;
       }
     }
@@ -232,12 +259,7 @@ class GcsFileUploader extends AbstractFileUploader {
 
 
 module.exports = function(crowi: Crowi) {
-  const lib = new GcsFileUploader(crowi);
-
-  lib.isValidUploadSettings = function() {
-    return configManager.getConfig('gcs:apiKeyJsonPath') != null
-      && configManager.getConfig('gcs:bucket') != null;
-  };
+  const lib = new GcsFileUploader(crowi, configManager);
 
   (lib as any).deleteFile = function(attachment) {
     const filePath = getFilePathOnStorage(attachment);

apps/app/src/server/service/file-uploader/gridfs.ts

@@ -102,7 +102,7 @@ class GridfsFileUploader extends AbstractFileUploader {
 
 
 module.exports = function(crowi: Crowi) {
-  const lib = new GridfsFileUploader(crowi);
+  const lib = new GridfsFileUploader(crowi, configManager);
 
   // get Collection instance of chunk
   const chunkCollection = mongoose.connection.collection(CHUNK_COLLECTION_NAME);

apps/app/src/server/service/file-uploader/local.ts

@@ -104,7 +104,7 @@ class LocalFileUploader extends AbstractFileUploader {
 }
 
 module.exports = function(crowi: Crowi) {
-  const lib = new LocalFileUploader(crowi);
+  const lib = new LocalFileUploader(crowi, configManager);
 
   const basePath = path.posix.join(crowi.publicDir, 'uploads');
 
@@ -229,7 +229,7 @@ module.exports = function(crowi: Crowi) {
     const internalPath = urljoin(internalPathRoot, relativePath);
 
     const isDownload = opts?.download ?? false;
-    const contentHeaders = await ContentHeaders.create(configManager,attachment, { inline: !isDownload });
+    const contentHeaders = await ContentHeaders.create(configManager, attachment, { inline: !isDownload });
     applyHeaders(res, [
       ...contentHeaders.toExpressHttpHeaders(),
       { field: 'X-Accel-Redirect', value: internalPath },