fix(uploads): compatibilité Windows pour l'upload multi-fichiers
- Remplace /tmp/uploads par os.tmpdir() (cross-platform) - Ajoute node_modules/.bin au PATH des commandes bundle asyncapi/redocly - Supprime la déclaration en double de execFileAsync Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Happy <yesreply@happy.engineering>
This commit is contained in:
@@ -11,15 +11,21 @@ import { diskStorage } from 'multer';
|
|||||||
import * as fs from 'fs';
|
import * as fs from 'fs';
|
||||||
import * as fsPromises from 'fs/promises';
|
import * as fsPromises from 'fs/promises';
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
|
import * as os from 'os';
|
||||||
import { execFile } from 'child_process';
|
import { execFile } from 'child_process';
|
||||||
import { promisify } from 'util';
|
import { promisify } from 'util';
|
||||||
import { randomUUID } from 'crypto';
|
import { randomUUID } from 'crypto';
|
||||||
|
|
||||||
|
const execFileAsync = promisify(execFile);
|
||||||
|
const localBin = path.join(process.cwd(), 'node_modules', '.bin');
|
||||||
|
const execEnv = {
|
||||||
|
...process.env,
|
||||||
|
PATH: `${localBin}${path.delimiter}${process.env.PATH ?? ''}`,
|
||||||
|
};
|
||||||
import { ApisService } from '../apis/apis.service';
|
import { ApisService } from '../apis/apis.service';
|
||||||
import { DocsGenerationService } from '../docs-generation/docs-generation.service';
|
import { DocsGenerationService } from '../docs-generation/docs-generation.service';
|
||||||
import { ApiType } from '@datacat/shared';
|
import { ApiType } from '@datacat/shared';
|
||||||
|
|
||||||
const execFileAsync = promisify(execFile);
|
|
||||||
|
|
||||||
@Controller('uploads')
|
@Controller('uploads')
|
||||||
export class UploadsController {
|
export class UploadsController {
|
||||||
constructor(
|
constructor(
|
||||||
@@ -30,7 +36,7 @@ export class UploadsController {
|
|||||||
@Post()
|
@Post()
|
||||||
@UseInterceptors(
|
@UseInterceptors(
|
||||||
FilesInterceptor('files', 20, {
|
FilesInterceptor('files', 20, {
|
||||||
storage: diskStorage({ destination: '/tmp/uploads' }),
|
storage: diskStorage({ destination: path.join(os.tmpdir(), 'datacat-uploads') }),
|
||||||
fileFilter: (_req, file, cb) => {
|
fileFilter: (_req, file, cb) => {
|
||||||
if (!file.originalname.match(/\.(yaml|yml)$/i)) {
|
if (!file.originalname.match(/\.(yaml|yml)$/i)) {
|
||||||
return cb(new BadRequestException('Only YAML files are allowed'), false);
|
return cb(new BadRequestException('Only YAML files are allowed'), false);
|
||||||
@@ -61,8 +67,9 @@ export class UploadsController {
|
|||||||
if (!body.version) throw new BadRequestException('version is required');
|
if (!body.version) throw new BadRequestException('version is required');
|
||||||
|
|
||||||
/* Crée le répertoire si absent */
|
/* Crée le répertoire si absent */
|
||||||
if (!fs.existsSync('/tmp/uploads')) {
|
const uploadDir = path.join(os.tmpdir(), 'datacat-uploads');
|
||||||
fs.mkdirSync('/tmp/uploads', { recursive: true });
|
if (!fs.existsSync(uploadDir)) {
|
||||||
|
fs.mkdirSync(uploadDir, { recursive: true });
|
||||||
}
|
}
|
||||||
|
|
||||||
let yamlContent: string;
|
let yamlContent: string;
|
||||||
@@ -131,7 +138,7 @@ export class UploadsController {
|
|||||||
mainFile: Express.Multer.File,
|
mainFile: Express.Multer.File,
|
||||||
type: ApiType,
|
type: ApiType,
|
||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
const tempDir = `/tmp/uploads/${randomUUID()}`;
|
const tempDir = path.join(os.tmpdir(), 'datacat-uploads', randomUUID());
|
||||||
const bundledPath = path.join(tempDir, 'bundled.yaml');
|
const bundledPath = path.join(tempDir, 'bundled.yaml');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -145,9 +152,9 @@ export class UploadsController {
|
|||||||
const mainPath = path.join(tempDir, mainFile.originalname);
|
const mainPath = path.join(tempDir, mainFile.originalname);
|
||||||
|
|
||||||
if (type === 'OPENAPI') {
|
if (type === 'OPENAPI') {
|
||||||
await execFileAsync('redocly', ['bundle', mainPath, '--output', bundledPath]);
|
await execFileAsync('redocly', ['bundle', mainPath, '--output', bundledPath], { shell: true, env: execEnv });
|
||||||
} else {
|
} else {
|
||||||
await execFileAsync('asyncapi', ['bundle', mainPath, '--output', bundledPath]);
|
await execFileAsync('asyncapi', ['bundle', mainPath, '--output', bundledPath], { shell: true, env: execEnv });
|
||||||
}
|
}
|
||||||
|
|
||||||
return await fsPromises.readFile(bundledPath, 'utf-8');
|
return await fsPromises.readFile(bundledPath, 'utf-8');
|
||||||
|
|||||||
Reference in New Issue
Block a user