관리자가 업로드한 음악 파일 m3u8로 형식 파싱하고 Object storage에 업로드, 이미지 Object storage에 업로드 (#77)

* fix: client workspace 인식 문제 해결

* fix: redis container 삭제

* fix: server package에서 모듈 타입 삭제

* feat: local에서 도커 개발환경 구축

* feat: AdminController 전반적인 구성 및 사용 데이터타입 지정

* feat: 임시 디렉토리 설정 및 form-data를 이용한 파일 받아오기 기능 구현

* feat: 관리자가 업데이트한 여러 음악파일을 파싱한 후 object storage에 저장 할 수 있는 기능 구현

* fix: Docker 로컬 환경으로 수정

* fix: default.conf에서의 머지 컨플릭트 해결

* fix: dev 형식으로 수정

* refactor: 새로운 클라이언트 입력 형식에 따른 파일 파싱 로직 수정

* fix: datatype 더 확실히 명시

* update: 현재까지 최신 구현

* fix: 배포 환경으로 수정

Author: yoonseo-han

docker-compose.yml

@@ -25,7 +25,11 @@ services:
     networks:
       - webapp
     healthcheck:
-      test: ["CMD-SHELL", "wget -q --spider http://server:3000/api/health || exit 1"]
+      test:
+        [
+          'CMD-SHELL',
+          'wget -q --spider http://server:3000/api/health || exit 1',
+        ]
       interval: 7s
       timeout: 10s
       retries: 5
@@ -57,6 +61,7 @@ services:
     container_name: nginx
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d:ro
+      - ./client/dist/:/usr/share/nginx/html
     ports:
       - '80:80'
     depends_on:

nginx/Dockerfile

@@ -1,3 +1,3 @@
 FROM nginx:alpine
 
-COPY nginx/nginx.conf /etc/nginx/nginx.conf
+COPY nginx/nginx.conf /etc/nginx/nginx.conf

nginx/conf.d/default.conf

@@ -25,4 +25,4 @@ server {
     location /socket.io {
         proxy_pass http://backend;
     }
-}
+}

server/Dockerfile

@@ -2,6 +2,8 @@ FROM node:22-alpine
 
 WORKDIR /app
 
+RUN apk add --no-cache ffmpeg
+
 COPY package.json yarn.lock .yarnrc.yml tsconfig.json ./
 COPY .yarn .yarn
 COPY server/ server/

server/package.json

@@ -38,6 +38,8 @@
     "@types/socket.io": "^3.0.2",
     "aws-sdk": "^2.1692.0",
     "cache-manager": "5.2.3",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
     "express": "^4.21.1",
     "fluent-ffmpeg": "^2.1.3",
     "hls-server": "^1.5.0",

server/src/admin/admin.controller.ts

@@ -0,0 +1,113 @@
+import {
+  Body,
+  Controller,
+  Inject,
+  Post,
+  UploadedFiles,
+  UseInterceptors,
+} from '@nestjs/common';
+import { REDIS_CLIENT } from '@/common/redis/redis.module';
+import { RedisClientType } from 'redis';
+import { AlbumDto } from './dto/AlbumDto';
+import { FileFieldsInterceptor } from '@nestjs/platform-express';
+import path from 'path';
+import * as fs from 'fs/promises';
+import { MusicProcessingSevice } from '@/music/music.processor';
+import { AdminService } from './admin.service';
+
+export interface UploadedFiles {
+  albumCover?: Express.Multer.File;
+  bannerCover?: Express.Multer.File;
+  songs: Express.Multer.File[];
+}
+
+@Controller('admin')
+export class AdminController {
+  constructor(
+    @Inject(REDIS_CLIENT) private readonly redisClient: RedisClientType,
+    @Inject() private readonly musicProcessingService: MusicProcessingSevice,
+    private readonly adminService: AdminService,
+  ) {}
+
+  @Post('album')
+  @UseInterceptors(
+    FileFieldsInterceptor([
+      { name: 'albumCover' },
+      { name: 'bannerCover' },
+      { name: 'songs' },
+    ]),
+  )
+  async createAlbum(
+    @UploadedFiles() files: UploadedFiles,
+    @Body('albumData') albumDataString: string,
+  ): Promise<any> {
+    const albumData = JSON.parse(albumDataString) as AlbumDto;
+    // TODO 성준님 1. MySQL DB에 앨범 정보 저장 하고 앨범 Id를 반환 받음
+    //const albumId = this.adminRepository.createAlbum();
+
+    // 앨범 임시 ID
+    const albumId = 'RANDOM_AHH_ALBUM_ID';
+    const imageUrls: {
+      albumCoverURL?: string;
+      bannerCoverURL?: string;
+    } = {};
+
+    //2. 앨범 커버 이미지, 배너 이미지를 S3에 업로드 하고 URL을 반환 받음
+    if (files.albumCover?.[0] || files.bannerCover?.[0]) {
+      const uploadResults = await this.adminService.uploadImageFiles(
+        files.albumCover?.[0],
+        files.bannerCover?.[0],
+        `converted/${albumId}`,
+      );
+
+      Object.assign(imageUrls, uploadResults);
+    }
+
+    // await this.adminRepository.updateAlbumUrls(albumId, {
+    //   albumCoverURL,
+    //   bannerCoverURL
+    // });
+
+    //3. 노래 파일들 처리: 기존 processSongFiles 사용
+    const message = await this.processSongFiles(
+      files.songs,
+      albumData,
+      albumId,
+    );
+    return message;
+
+    // 4. MySQL DB에 노래 정보 저장
+    //return { albumId };
+  }
+
+  private async processSongFiles(
+    songFiles: Express.Multer.File[],
+    albumData: AlbumDto,
+    albumId: string,
+  ): Promise<any> {
+    const tempDir = await this.createTempDirectory(albumId);
+
+    await Promise.all(
+      songFiles.map(async (file, index) => {
+        const songInfo = albumData.songs[index];
+        await this.musicProcessingService.processUpload(file, tempDir, {
+          albumId,
+          ...songInfo,
+        });
+      }),
+    );
+
+    await fs.rm(tempDir, { recursive: true, force: true });
+
+    return {
+      albumId,
+      message: 'Album songs updated to object storage successfully',
+    };
+  }
+
+  private async createTempDirectory(albumId: string): Promise<string> {
+    const tempDir = path.join(__dirname, `album/${albumId}`);
+    await fs.mkdir(tempDir, { recursive: true });
+    return tempDir;
+  }
+}

server/src/admin/admin.module.ts

@@ -0,0 +1,19 @@
+import { Module } from '@nestjs/common';
+import { ConfigModule } from '@nestjs/config';
+import { AdminController } from './admin.controller';
+import { MusicModule } from '@/music/music.module';
+import { AdminService } from './admin.service';
+
+@Module({
+  imports: [
+    ConfigModule.forRoot({
+      isGlobal: true,
+      envFilePath: '.env',
+    }),
+    MusicModule,
+  ],
+  controllers: [AdminController],
+  providers: [AdminService],
+  exports: [AdminService],
+})
+export class AdminModule {}

server/src/admin/admin.service.ts

@@ -0,0 +1,73 @@
+import { Injectable } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import * as AWS from 'aws-sdk';
+
+@Injectable()
+export class AdminService {
+  private s3;
+
+  constructor(private configService: ConfigService) {
+    this.s3 = new AWS.S3({
+      endpoint: new AWS.Endpoint('https://kr.object.ncloudstorage.com'),
+      region: 'kr-standard',
+      credentials: {
+        accessKeyId: this.configService.get<string>('S3_ACCESS_KEY'),
+        secretAccessKey: this.configService.get<string>('S3_SECRET_KEY'),
+      },
+    });
+  }
+
+  async uploadImageFiles(
+    albumCoverFile: Express.Multer.File,
+    bannerCoverFile: Express.Multer.File,
+    prefix: string,
+  ) {
+    const results: {
+      albumCoverURL?: string;
+      bannerCoverURL?: string;
+    } = {};
+
+    if (albumCoverFile) {
+      results.albumCoverURL = await this.uploadFile(
+        albumCoverFile,
+        prefix,
+        'cover',
+      );
+    }
+
+    if (bannerCoverFile) {
+      results.bannerCoverURL = await this.uploadFile(
+        bannerCoverFile,
+        prefix,
+        'banner',
+      );
+    }
+
+    return results;
+  }
+
+  async uploadFile(
+    file: Express.Multer.File,
+    folder: string,
+    fileType: 'cover' | 'banner',
+  ): Promise<string> {
+    const bucket = this.configService.get<string>('S3_BUCKET_NAME');
+    const fileExtension = file.originalname.split('.').pop();
+    const key = `${folder}/${fileType}.${fileExtension}`;
+
+    const uploadParams = {
+      Bucket: bucket,
+      Key: key,
+      Body: file.buffer,
+      ContentType: file.mimetype,
+      ACL: 'public-read',
+    };
+
+    try {
+      const result = await this.s3.upload(uploadParams).promise();
+      return result.Location;
+    } catch (error) {
+      throw new Error(`Failed to upload file to S3: ${error.message}`);
+    }
+  }
+}

server/src/admin/dto/AlbumDto.ts

@@ -0,0 +1,34 @@
+import {
+  IsArray,
+  IsDateString,
+  IsNotEmpty,
+  IsNumber,
+  IsString,
+  Min,
+} from 'class-validator';
+import { SongDto } from './SongDto';
+
+export class AlbumDto {
+  @IsNotEmpty()
+  @IsString()
+  title: string;
+
+  @IsNotEmpty()
+  @IsString()
+  artist: string;
+
+  @IsNotEmpty()
+  @IsDateString()
+  releaseDate: string;
+
+  @IsString()
+  releaseTime?: string;
+
+  @IsNotEmpty()
+  @IsNumber()
+  @Min(0)
+  totalTracks?: number;
+
+  @IsArray()
+  songs: SongDto[];
+}

server/src/admin/dto/SongDto.ts

@@ -0,0 +1,30 @@
+import {
+  IsArray,
+  IsDateString,
+  IsNotEmpty,
+  IsNumber,
+  IsString,
+  Min,
+} from 'class-validator';
+
+export class SongDto {
+  @IsString()
+  @IsNotEmpty()
+  title: string;
+
+  @IsNumber()
+  @Min(1)
+  trackNumber: number;
+
+  @IsString()
+  lyrics: string;
+
+  @IsString()
+  composer: string;
+
+  @IsString()
+  writer: string;
+
+  @IsString()
+  instrument: string;
+}

server/src/album/album.service.ts

@@ -0,0 +1 @@
+

server/src/app.module.ts

@@ -9,9 +9,16 @@ import { RoomController } from '@/room/room.controller';
 import { RoomGateway } from './room/room.gateway';
 import { MusicProcessingSevice } from './music/music.processor';
 import { MusicModule } from './music/music.module';
+import { AdminModule } from './admin/admin.module';
 
 @Module({
-  imports: [CommonModule, ConfigModule.forRoot(), RedisModule, MusicModule],
+  imports: [
+    CommonModule,
+    ConfigModule.forRoot(),
+    RedisModule,
+    MusicModule,
+    AdminModule,
+  ],
   controllers: [AppController, RoomController],
   providers: [Logger, AppService, RoomRepository, RoomGateway],
 })

server/src/main.ts

@@ -19,9 +19,7 @@ async function bootstrap() {
     .setVersion('1.0.0')
     .build();
   const document = SwaggerModule.createDocument(app, config);
-  SwaggerModule.setup('api', app, document);
-
-  app.useStaticAssets(join(__dirname, '..', 'public'));
+  SwaggerModule.setup('api/api-document', app, document);
 
   await app.listen(process.env.PORT ?? 3000);
 }