refactor(minio): rename minio to s3

ycdzj · ycdzj · commit d3c27ba0f758 · 2025-11-13T11:27:29.000+08:00
diff --git a/src/attachments/attachments.module.ts b/src/attachments/attachments.module.ts
@@ -3,7 +3,7 @@ import { PermissionsModule } from 'omniboxd/permissions/permissions.module';
 import { AttachmentsController } from 'omniboxd/attachments/attachments.controller';
 import { ShareAttachmentsController } from 'omniboxd/attachments/share-attachments.controller';
 import { AttachmentsService } from 'omniboxd/attachments/attachments.service';
-import { MinioModule } from 'omniboxd/minio/minio.module';
+import { S3Module } from 'omniboxd/s3/s3.module';
 import { ResourceAttachmentsModule } from 'omniboxd/resource-attachments/resource-attachments.module';
 import { SharesModule } from 'omniboxd/shares/shares.module';
 import { SharedResourcesModule } from 'omniboxd/shared-resources/shared-resources.module';
@@ -14,7 +14,7 @@ import { SharedResourcesModule } from 'omniboxd/shared-resources/shared-resource
   controllers: [AttachmentsController, ShareAttachmentsController],
   imports: [
     PermissionsModule,
-    MinioModule,
+    S3Module,
     ResourceAttachmentsModule,
     SharesModule,
     SharedResourcesModule,
diff --git a/src/attachments/attachments.service.ts b/src/attachments/attachments.service.ts
@@ -6,10 +6,10 @@ import { Injectable, Logger, HttpStatus } from '@nestjs/common';
 import { AppException } from 'omniboxd/common/exceptions/app.exception';
 import { I18nService } from 'nestjs-i18n';
 import { Response } from 'express';
-import { MinioService } from 'omniboxd/minio/minio.service';
+import { S3Service } from 'omniboxd/s3/s3.service';
 import { PermissionsService } from 'omniboxd/permissions/permissions.service';
 import { ResourcePermission } from 'omniboxd/permissions/resource-permission.enum';
-import { objectStreamResponse } from 'omniboxd/minio/utils';
+import { objectStreamResponse } from 'omniboxd/s3/utils';
 import { ResourceAttachmentsService } from 'omniboxd/resource-attachments/resource-attachments.service';
 import {
   UploadAttachmentsResponseDto,
@@ -24,7 +24,7 @@ export class AttachmentsService {
   private readonly logger = new Logger(AttachmentsService.name);
 
   constructor(
-    private readonly minioService: MinioService,
+    private readonly s3Service: S3Service,
     private readonly permissionsService: PermissionsService,
     private readonly resourceAttachmentsService: ResourceAttachmentsService,
     private readonly sharesService: SharesService,
@@ -50,7 +50,7 @@ export class AttachmentsService {
     }
   }
 
-  minioPath(attachmentId: string): string {
+  s3Path(attachmentId: string): string {
     return `attachments/${attachmentId}`;
   }
 
@@ -69,7 +69,7 @@ export class AttachmentsService {
       ResourcePermission.CAN_EDIT,
     );
 
-    const id = await this.minioService.put(filename, buffer, mimetype, {
+    const id = await this.s3Service.put(filename, buffer, mimetype, {
       folder: 'attachments',
     });
 
@@ -148,8 +148,8 @@ export class AttachmentsService {
       attachmentId,
     );
 
-    const objectResponse = await this.minioService.get(
-      this.minioPath(attachmentId),
+    const objectResponse = await this.s3Service.get(
+      this.s3Path(attachmentId),
     );
 
     // Display media files inline, download other files as attachments
@@ -198,8 +198,8 @@ export class AttachmentsService {
       attachmentId,
     );
 
-    const objectResponse = await this.minioService.get(
-      this.minioPath(attachmentId),
+    const objectResponse = await this.s3Service.get(
+      this.s3Path(attachmentId),
     );
 
     // Display media files inline, download other files as attachments
diff --git a/src/feedback/feedback.controller.ts b/src/feedback/feedback.controller.ts
@@ -13,7 +13,7 @@ import { Request } from 'express';
 import { FeedbackService } from './feedback.service';
 import { CreateFeedbackDto } from './dto/create-feedback.dto';
 import { UserId } from 'omniboxd/decorators/user-id.decorator';
-import { MinioService } from 'omniboxd/minio/minio.service';
+import { S3Service } from 'omniboxd/s3/s3.service';
 import { CookieAuth } from 'omniboxd/auth';
 import { FeedbackResponseDto } from 'omniboxd/feedback/dto/feedback.dto';
 import { AppException } from 'omniboxd/common/exceptions/app.exception';
@@ -22,7 +22,7 @@ import { AppException } from 'omniboxd/common/exceptions/app.exception';
 export class FeedbackController {
   constructor(
     private readonly feedbackService: FeedbackService,
-    private readonly minioService: MinioService,
+    private readonly s3Service: S3Service,
   ) {}
 
   @Post()
@@ -58,7 +58,7 @@ export class FeedbackController {
 
     if (image) {
       const originalname = encodeFileName(image.originalname);
-      imageUrl = await this.minioService.put(
+      imageUrl = await this.s3Service.put(
         originalname,
         image.buffer,
         image.mimetype,
diff --git a/src/feedback/feedback.module.ts b/src/feedback/feedback.module.ts
@@ -3,11 +3,11 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { FeedbackController } from './feedback.controller';
 import { FeedbackService } from './feedback.service';
 import { Feedback } from './entities/feedback.entity';
-import { MinioModule } from 'omniboxd/minio/minio.module';
+import { S3Module } from 'omniboxd/s3/s3.module';
 import { InternalFeedbackController } from 'omniboxd/feedback/internal.feedback.controller';
 
 @Module({
-  imports: [MinioModule, TypeOrmModule.forFeature([Feedback])],
+  imports: [S3Module, TypeOrmModule.forFeature([Feedback])],
   controllers: [FeedbackController, InternalFeedbackController],
   providers: [FeedbackService],
   exports: [FeedbackService],
diff --git a/src/minio/minio.module.ts b/src/minio/minio.module.ts
diff --git a/src/namespace-resources/namespace-resources.module.ts b/src/namespace-resources/namespace-resources.module.ts
@@ -8,7 +8,7 @@ import { InternalResourcesController } from 'omniboxd/namespace-resources/intern
 import { OpenResourcesController } from 'omniboxd/namespace-resources/open.resource.controller';
 import { PermissionsModule } from 'omniboxd/permissions/permissions.module';
 import { FileResourcesController } from 'omniboxd/namespace-resources/file-resources.controller';
-import { MinioModule } from 'omniboxd/minio/minio.module';
+import { S3Module } from 'omniboxd/s3/s3.module';
 import { Namespace } from 'omniboxd/namespaces/entities/namespace.entity';
 import { TasksModule } from 'omniboxd/tasks/tasks.module';
 import { TagModule } from 'omniboxd/tag/tag.module';
@@ -31,7 +31,7 @@ import { FilesModule } from 'omniboxd/files/files.module';
     TypeOrmModule.forFeature([Namespace]),
     TagModule,
     PermissionsModule,
-    MinioModule,
+    S3Module,
     TasksModule,
     ResourceAttachmentsModule,
     ResourcesModule,
diff --git a/src/namespace-resources/namespace-resources.service.ts b/src/namespace-resources/namespace-resources.service.ts
@@ -21,7 +21,7 @@ import { Injectable, HttpStatus } from '@nestjs/common';
 import { AppException } from 'omniboxd/common/exceptions/app.exception';
 import { I18nService } from 'nestjs-i18n';
 import { Task } from 'omniboxd/tasks/tasks.entity';
-import { MinioService } from 'omniboxd/minio/minio.service';
+import { S3Service } from 'omniboxd/s3/s3.service';
 import { WizardTaskService } from 'omniboxd/tasks/wizard-task.service';
 import { PermissionsService } from 'omniboxd/permissions/permissions.service';
 import { PrivateSearchResourceDto } from 'omniboxd/wizard/dto/agent-request.dto';
@@ -58,7 +58,7 @@ export class NamespaceResourcesService {
     private readonly namespaceRepository: Repository<Namespace>,
     private readonly tagService: TagService,
     private readonly dataSource: DataSource,
-    private readonly minioService: MinioService,
+    private readonly s3Service: S3Service,
     private readonly permissionsService: PermissionsService,
     private readonly resourceAttachmentsService: ResourceAttachmentsService,
     private readonly wizardTaskService: WizardTaskService,
@@ -797,7 +797,7 @@ export class NamespaceResourcesService {
     });
   }
 
-  minioPath(resourceId: string) {
+  s3Path(resourceId: string) {
     return `resources/${resourceId}`;
   }
 
@@ -849,8 +849,8 @@ export class NamespaceResourcesService {
 
     const artifactName = resource.id;
 
-    await this.minioService.putObject(
-      this.minioPath(artifactName),
+    await this.s3Service.putObject(
+      this.s3Path(artifactName),
       file.buffer,
       file.mimetype,
     );
@@ -890,8 +890,8 @@ export class NamespaceResourcesService {
     }
     const artifactName = resource.id;
 
-    const fileStream = await this.minioService.getObject(
-      this.minioPath(artifactName),
+    const fileStream = await this.s3Service.getObject(
+      this.s3Path(artifactName),
     );
     return { fileStream, resource };
   }
diff --git a/src/s3/s3.module.ts b/src/s3/s3.module.ts
@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { S3Service } from 'omniboxd/s3/s3.service';
+
+@Module({
+  exports: [S3Service],
+  providers: [S3Service],
+  controllers: [],
+  imports: [],
+})
+export class S3Module {}
diff --git a/src/s3/s3.service.ts b/src/s3/s3.service.ts
@@ -38,7 +38,7 @@ export interface GetResponse extends ObjectInfo {
 }
 
 @Injectable()
-export class MinioService implements OnModuleInit {
+export class S3Service implements OnModuleInit {
   private readonly s3Client: S3Client;
   private readonly bucket: string;
 
diff --git a/src/s3/utils.ts b/src/s3/utils.ts
@@ -1,4 +1,4 @@
-import { GetResponse as ObjectResponse } from 'omniboxd/minio/minio.service';
+import { GetResponse as ObjectResponse } from 'omniboxd/s3/s3.service';
 import { Response } from 'express';
 
 export function objectStreamResponse(
diff --git a/src/wizard/chunk-manager.service.ts b/src/wizard/chunk-manager.service.ts
@@ -1,5 +1,5 @@
 import { Injectable, Logger } from '@nestjs/common';
-import { MinioService } from 'omniboxd/minio/minio.service';
+import { S3Service } from 'omniboxd/s3/s3.service';
 import { ConfigService } from '@nestjs/config';
 import { buffer } from 'node:stream/consumers';
 
@@ -9,7 +9,7 @@ export class ChunkManagerService {
   private readonly cleanupDelay: number;
 
   constructor(
-    private readonly minioService: MinioService,
+    private readonly s3Service: S3Service,
     private readonly configService: ConfigService,
   ) {
     this.cleanupDelay =
@@ -27,7 +27,7 @@ export class ChunkManagerService {
     const buffer = Buffer.from(data, 'base64');
 
     try {
-      await this.minioService.putObject(chunkPath, buffer);
+      await this.s3Service.putObject(chunkPath, buffer);
       this.logger.debug(
         `Stored chunk ${chunkIndex + 1}/${totalChunks} for task ${taskId}`,
       );
@@ -44,7 +44,7 @@ export class ChunkManagerService {
     const buffers: Buffer[] = [];
     for (let i = 0; i < totalChunks; i++) {
       const chunkPath = this.getChunkPath(taskId, i);
-      const stream = await this.minioService.getObject(chunkPath);
+      const stream = await this.s3Service.getObject(chunkPath);
       buffers.push(await buffer(stream));
     }
     return Buffer.concat(buffers).toString('utf-8');
@@ -75,7 +75,7 @@ export class ChunkManagerService {
 
       await Promise.all(
         objectsToRemove.map((objectName) =>
-          this.minioService.deleteObject(objectName).catch((error) => {
+          this.s3Service.deleteObject(objectName).catch((error) => {
             this.logger.warn(`Failed to remove object ${objectName}:`, error);
           }),
         ),
diff --git a/src/wizard/wizard.module.ts b/src/wizard/wizard.module.ts
@@ -16,7 +16,7 @@ import { MessagesModule } from 'omniboxd/messages/messages.module';
 import { UserModule } from 'omniboxd/user/user.module';
 import { AttachmentsModule } from 'omniboxd/attachments/attachments.module';
 import { TasksModule } from 'omniboxd/tasks/tasks.module';
-import { MinioModule } from 'omniboxd/minio/minio.module';
+import { S3Module } from 'omniboxd/s3/s3.module';
 import { OpenWizardController } from 'omniboxd/wizard/open.wizard.controller';
 import { ConversationsModule } from 'omniboxd/conversations/conversations.module';
 import { OpenWizardService } from 'omniboxd/wizard/open.wizard.service';
@@ -37,7 +37,7 @@ import { ResourcesModule } from 'omniboxd/resources/resources.module';
     ConversationsModule,
     AttachmentsModule,
     TasksModule,
-    MinioModule,
+    S3Module,
     SharedResourcesModule,
     TypeOrmModule.forFeature([Task]),
   ],
diff --git a/src/wizard/wizard.service.ts b/src/wizard/wizard.service.ts
@@ -27,7 +27,7 @@ import { Image, ProcessedImage } from 'omniboxd/wizard/types/wizard.types';
 import { InternalTaskDto } from 'omniboxd/tasks/dto/task.dto';
 import { isEmpty } from 'omniboxd/utils/is-empty';
 import { FetchTaskRequest } from 'omniboxd/wizard/dto/fetch-task-request.dto';
-import { MinioService } from 'omniboxd/minio/minio.service';
+import { S3Service } from 'omniboxd/s3/s3.service';
 import { createGunzip } from 'zlib';
 import { SharedResourcesService } from 'omniboxd/shared-resources/shared-resources.service';
 import { ResourcesService } from 'omniboxd/resources/resources.service';
@@ -49,7 +49,7 @@ export class WizardService {
     private readonly messagesService: MessagesService,
     private readonly configService: ConfigService,
     private readonly attachmentsService: AttachmentsService,
-    private readonly minioService: MinioService,
+    private readonly s3Service: S3Service,
     private readonly sharedResourcesService: SharedResourcesService,
     private readonly resourcesService: ResourcesService,
     private readonly i18n: I18nService,
@@ -158,7 +158,7 @@ export class WizardService {
     );
 
     const filename = 'html.gz';
-    const id = await this.minioService.put(
+    const id = await this.s3Service.put(
       filename,
       compressedHtml.buffer,
       compressedHtml.mimetype,
@@ -489,7 +489,7 @@ export class WizardService {
   }
 
   async getHtmlFromMinioGzipFile(path: string) {
-    const stream = await this.minioService.getObject(path);
+    const stream = await this.s3Service.getObject(path);
     const gunzip = createGunzip();
     return new Promise<string>((resolve, reject) => {
       const chunks: Buffer[] = [];

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export interface GetResponse extends ObjectInfo {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Injectable()`
`41`		`-export class MinioService implements OnModuleInit {`
	`41`	`+export class S3Service implements OnModuleInit {`
`42`	`42`	`private readonly s3Client: S3Client;`
`43`	`43`	`private readonly bucket: string;`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { GetResponse as ObjectResponse } from 'omniboxd/minio/minio.service';`
	`1`	`+import { GetResponse as ObjectResponse } from 'omniboxd/s3/s3.service';`
`2`	`2`	`import { Response } from 'express';`
`3`	`3`
`4`	`4`	`export function objectStreamResponse(`