parspack uploader
This commit is contained in:
@@ -13,28 +13,23 @@ export class S3Service {
|
|||||||
private readonly logger = new Logger(S3Service.name);
|
private readonly logger = new Logger(S3Service.name);
|
||||||
private readonly s3Client: S3Client;
|
private readonly s3Client: S3Client;
|
||||||
private readonly bucketName: string;
|
private readonly bucketName: string;
|
||||||
private readonly region: string; // Region is often 'us-east-1' or similar for Liara, but depends on your config
|
private readonly region: string;
|
||||||
private readonly endpointUrl: string; // Renamed 'url' to 'endpointUrl' for clarity
|
private readonly endpointUrl: string;
|
||||||
|
|
||||||
constructor(private readonly configService: ConfigService) {
|
constructor(private readonly configService: ConfigService) {
|
||||||
// --- Configuration for Liara S3 ---
|
|
||||||
this.bucketName = this.configService.getOrThrow<string>('BUCKET_NAME');
|
this.bucketName = this.configService.getOrThrow<string>('BUCKET_NAME');
|
||||||
// Liara S3 usually requires a specific endpoint URL
|
this.endpointUrl = this.configService.getOrThrow<string>('PARSPACK_S3_ENDPOINT');
|
||||||
this.endpointUrl = this.configService.getOrThrow<string>('LIARA_S3_ENDPOINT');
|
|
||||||
// The region for Liara S3 is often 'us-east-1' or just a placeholder,
|
|
||||||
// but we'll keep it configurable for consistency.
|
|
||||||
this.region = this.configService.getOrThrow<string>('BUCKET_REGION');
|
this.region = this.configService.getOrThrow<string>('BUCKET_REGION');
|
||||||
|
|
||||||
this.s3Client = new S3Client({
|
this.s3Client = new S3Client({
|
||||||
region: this.region, // Use the configured region
|
region: this.region,
|
||||||
endpoint: this.endpointUrl, // This is the crucial change for Liara S3
|
endpoint: this.endpointUrl,
|
||||||
forcePathStyle: true, // Often required when using custom S3 endpoints like Liara
|
forcePathStyle: true,
|
||||||
credentials: {
|
credentials: {
|
||||||
accessKeyId: this.configService.getOrThrow<string>('BUCKET_ACCESS_KEY'),
|
accessKeyId: this.configService.getOrThrow<string>('BUCKET_ACCESS_KEY'),
|
||||||
secretAccessKey: this.configService.getOrThrow<string>('BUCKET_SECRET_KEY'),
|
secretAccessKey: this.configService.getOrThrow<string>('BUCKET_SECRET_KEY'),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
// ------------------------------------
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -57,9 +52,6 @@ export class S3Service {
|
|||||||
{} as Record<string, string>,
|
{} as Record<string, string>,
|
||||||
)
|
)
|
||||||
: undefined;
|
: undefined;
|
||||||
// NOTE: 'ACL: public-read' might not be supported or necessary for Liara S3,
|
|
||||||
// depending on your bucket configuration on Liara.
|
|
||||||
// If uploads fail, try removing this line.
|
|
||||||
const command = new PutObjectCommand({
|
const command = new PutObjectCommand({
|
||||||
Bucket: this.bucketName,
|
Bucket: this.bucketName,
|
||||||
Key: key,
|
Key: key,
|
||||||
@@ -71,8 +63,6 @@ export class S3Service {
|
|||||||
|
|
||||||
await this.s3Client.send(command);
|
await this.s3Client.send(command);
|
||||||
|
|
||||||
// --- URL for Liara S3 ---
|
|
||||||
// The public URL for Liara S3 files is typically: ${endpoint}/${bucketName}/${key}
|
|
||||||
const url = `${this.endpointUrl}/${this.bucketName}/${key}`;
|
const url = `${this.endpointUrl}/${this.bucketName}/${key}`;
|
||||||
|
|
||||||
this.logger.log(`File uploaded to S3: ${key}`);
|
this.logger.log(`File uploaded to S3: ${key}`);
|
||||||
@@ -88,8 +78,6 @@ export class S3Service {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Other methods remain the same as they use the S3Client which is now configured for Liara ---
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get file stream from S3
|
* Get file stream from S3
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user