@servicelabsco/nestjs-utility-services 1.2.152 → 1.2.154
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app.controller.d.ts +3 -4
- package/dist/app.controller.js +6 -33
- package/dist/app.controller.js.map +1 -1
- package/dist/platformUtility/es6.classes.js +2 -0
- package/dist/platformUtility/es6.classes.js.map +1 -1
- package/dist/platformUtility/services/sqs.service.d.ts +1 -2
- package/dist/platformUtility/services/sqs.service.js +30 -21
- package/dist/platformUtility/services/sqs.service.js.map +1 -1
- package/dist/system/services/aws.s3.service.d.ts +29 -12
- package/dist/system/services/aws.s3.service.js +49 -32
- package/dist/system/services/aws.s3.service.js.map +1 -1
- package/dist/system/services/upload.service.d.ts +42 -5
- package/dist/system/services/upload.service.js +258 -30
- package/dist/system/services/upload.service.js.map +1 -1
- package/package.json +1 -1
package/dist/app.controller.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ import { ExecuteCodeFixJob } from './system/jobs/execute.code.fix.job';
|
|
|
9
9
|
import { SetScheduledEventJob } from './system/jobs/set.scheduled.event.job';
|
|
10
10
|
import { SyncAllCodeJob } from './system/jobs/sync.all.code.job';
|
|
11
11
|
import { PropertyService } from './system/services/property.service';
|
|
12
|
+
import { UploadService } from './system/services/upload.service';
|
|
12
13
|
export declare class AppController {
|
|
13
14
|
private readonly queueService;
|
|
14
15
|
protected readonly testJob: TestJob;
|
|
@@ -20,7 +21,8 @@ export declare class AppController {
|
|
|
20
21
|
protected readonly syncAllCodeJob: SyncAllCodeJob;
|
|
21
22
|
protected readonly auditService: AuditService;
|
|
22
23
|
protected readonly redisService: RedisService;
|
|
23
|
-
|
|
24
|
+
protected readonly uploadService: UploadService;
|
|
25
|
+
constructor(queueService: QueueService, testJob: TestJob, setScheduledEventJob: SetScheduledEventJob, mailService: MailService, propertyService: PropertyService, sqlService: SqlService, executeCodeFixJob: ExecuteCodeFixJob, syncAllCodeJob: SyncAllCodeJob, auditService: AuditService, redisService: RedisService, uploadService: UploadService);
|
|
24
26
|
get(): Promise<{
|
|
25
27
|
message: string;
|
|
26
28
|
}>;
|
|
@@ -30,7 +32,4 @@ export declare class AppController {
|
|
|
30
32
|
getQueueInstance(): Promise<any>;
|
|
31
33
|
queue(id: string): Promise<any>;
|
|
32
34
|
set(req: Request): Promise<any>;
|
|
33
|
-
test(): Promise<void>;
|
|
34
|
-
pause(query: any): Promise<any>;
|
|
35
|
-
resume(query: any): Promise<any>;
|
|
36
35
|
}
|
package/dist/app.controller.js
CHANGED
|
@@ -25,8 +25,9 @@ const execute_code_fix_job_1 = require("./system/jobs/execute.code.fix.job");
|
|
|
25
25
|
const set_scheduled_event_job_1 = require("./system/jobs/set.scheduled.event.job");
|
|
26
26
|
const sync_all_code_job_1 = require("./system/jobs/sync.all.code.job");
|
|
27
27
|
const property_service_1 = require("./system/services/property.service");
|
|
28
|
+
const upload_service_1 = require("./system/services/upload.service");
|
|
28
29
|
let AppController = class AppController {
|
|
29
|
-
constructor(queueService, testJob, setScheduledEventJob, mailService, propertyService, sqlService, executeCodeFixJob, syncAllCodeJob, auditService, redisService) {
|
|
30
|
+
constructor(queueService, testJob, setScheduledEventJob, mailService, propertyService, sqlService, executeCodeFixJob, syncAllCodeJob, auditService, redisService, uploadService) {
|
|
30
31
|
this.queueService = queueService;
|
|
31
32
|
this.testJob = testJob;
|
|
32
33
|
this.setScheduledEventJob = setScheduledEventJob;
|
|
@@ -37,6 +38,7 @@ let AppController = class AppController {
|
|
|
37
38
|
this.syncAllCodeJob = syncAllCodeJob;
|
|
38
39
|
this.auditService = auditService;
|
|
39
40
|
this.redisService = redisService;
|
|
41
|
+
this.uploadService = uploadService;
|
|
40
42
|
}
|
|
41
43
|
async get() {
|
|
42
44
|
return { message: 'Hello World!' };
|
|
@@ -54,17 +56,7 @@ let AppController = class AppController {
|
|
|
54
56
|
async queue(id) {
|
|
55
57
|
return this.queueService.getJobDetails(id);
|
|
56
58
|
}
|
|
57
|
-
async set(req) {
|
|
58
|
-
await this.testJob.dispatch({ id: 1 }, { delay: 100 });
|
|
59
|
-
return this.queueService.addJob('ba4c3857dfa9feac842416d9c39d0edd', { id: 2 });
|
|
60
|
-
}
|
|
61
|
-
async test() { }
|
|
62
|
-
async pause(query) {
|
|
63
|
-
return this.queueService.pause();
|
|
64
|
-
}
|
|
65
|
-
async resume(query) {
|
|
66
|
-
return this.queueService.resume();
|
|
67
|
-
}
|
|
59
|
+
async set(req) { }
|
|
68
60
|
};
|
|
69
61
|
exports.AppController = AppController;
|
|
70
62
|
__decorate([
|
|
@@ -112,26 +104,6 @@ __decorate([
|
|
|
112
104
|
__metadata("design:paramtypes", [Object]),
|
|
113
105
|
__metadata("design:returntype", Promise)
|
|
114
106
|
], AppController.prototype, "set", null);
|
|
115
|
-
__decorate([
|
|
116
|
-
(0, common_1.Get)('set'),
|
|
117
|
-
__metadata("design:type", Function),
|
|
118
|
-
__metadata("design:paramtypes", []),
|
|
119
|
-
__metadata("design:returntype", Promise)
|
|
120
|
-
], AppController.prototype, "test", null);
|
|
121
|
-
__decorate([
|
|
122
|
-
(0, common_1.Get)('pause'),
|
|
123
|
-
__param(0, (0, common_1.Query)()),
|
|
124
|
-
__metadata("design:type", Function),
|
|
125
|
-
__metadata("design:paramtypes", [Object]),
|
|
126
|
-
__metadata("design:returntype", Promise)
|
|
127
|
-
], AppController.prototype, "pause", null);
|
|
128
|
-
__decorate([
|
|
129
|
-
(0, common_1.Get)('resume'),
|
|
130
|
-
__param(0, (0, common_1.Query)()),
|
|
131
|
-
__metadata("design:type", Function),
|
|
132
|
-
__metadata("design:paramtypes", [Object]),
|
|
133
|
-
__metadata("design:returntype", Promise)
|
|
134
|
-
], AppController.prototype, "resume", null);
|
|
135
107
|
exports.AppController = AppController = __decorate([
|
|
136
108
|
(0, common_1.Controller)(),
|
|
137
109
|
__metadata("design:paramtypes", [queue_service_1.QueueService,
|
|
@@ -143,6 +115,7 @@ exports.AppController = AppController = __decorate([
|
|
|
143
115
|
execute_code_fix_job_1.ExecuteCodeFixJob,
|
|
144
116
|
sync_all_code_job_1.SyncAllCodeJob,
|
|
145
117
|
audit_service_1.AuditService,
|
|
146
|
-
redis_service_1.RedisService
|
|
118
|
+
redis_service_1.RedisService,
|
|
119
|
+
upload_service_1.UploadService])
|
|
147
120
|
], AppController);
|
|
148
121
|
//# sourceMappingURL=app.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0E;
|
|
1
|
+
{"version":3,"file":"app.controller.js","sourceRoot":"","sources":["../src/app.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0E;AAE1E,kDAA+C;AAC/C,8DAA0D;AAC1D,4EAAwE;AACxE,0EAAsE;AACtE,4EAAwE;AACxE,4EAAwE;AACxE,wEAAoE;AACpE,6EAAuE;AACvE,mFAA6E;AAC7E,uEAAiE;AACjE,yEAAqE;AACrE,qEAAiE;AAI1D,IAAM,aAAa,GAAnB,MAAM,aAAa;IACtB,YACqB,YAA0B,EACxB,OAAgB,EAChB,oBAA0C,EAC1C,WAAwB,EACxB,eAAgC,EAChC,UAAsB,EACtB,iBAAoC,EACpC,cAA8B,EAC9B,YAA0B,EAC1B,YAA0B,EAC1B,aAA4B;QAV9B,iBAAY,GAAZ,YAAY,CAAc;QACxB,YAAO,GAAP,OAAO,CAAS;QAChB,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,gBAAW,GAAX,WAAW,CAAa;QACxB,oBAAe,GAAf,eAAe,CAAiB;QAChC,eAAU,GAAV,UAAU,CAAY;QACtB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAc;QAC1B,kBAAa,GAAb,aAAa,CAAe;IAChD,CAAC;IAGE,AAAN,KAAK,CAAC,GAAG;QACL,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC;IACvC,CAAC;IAQK,AAAN,KAAK,CAAC,iBAAiB;QACnB,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO;QACT,OAAO,WAAI,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAU,KAAU,IAAiB,CAAC;IAG3C,AAAN,KAAK,CAAC,gBAAgB;QAClB,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;IAClC,CAAC;IAGK,AAAN,KAAK,CAAC,KAAK,CAAc,EAAU;QAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,GAAG,CAAQ,GAAY,IAAiB,CAAC;CAClD,CAAA;AAlDY,sCAAa;AAgBhB;IADL,IAAA,YAAG,GAAE;;;;wCAGL;AAQK;IADL,IAAA,YAAG,EAAC,UAAU,CAAC;;;;sDAGf;AAGK;IADL,IAAA,YAAG,EAAC,UAAU,CAAC;;;;4CAGf;AAGK;IADL,IAAA,YAAG,EAAC,QAAQ,CAAC;IACD,WAAA,IAAA,cAAK,GAAE,CAAA;;;;0CAA6B;AAG3C;IADL,IAAA,YAAG,EAAC,OAAO,CAAC;;;;qDAGZ;AAGK;IADL,IAAA,YAAG,EAAC,WAAW,CAAC;IACJ,WAAA,IAAA,cAAK,EAAC,IAAI,CAAC,CAAA;;;;0CAEvB;AAGK;IADL,IAAA,aAAI,EAAC,MAAM,CAAC;IACF,WAAA,IAAA,YAAG,GAAE,CAAA;;;;wCAA+B;wBAjDtC,aAAa;IADzB,IAAA,mBAAU,GAAE;qCAG0B,4BAAY;QACf,kBAAO;QACM,8CAAoB;QAC7B,0BAAW;QACP,kCAAe;QACpB,wBAAU;QACH,wCAAiB;QACpB,kCAAc;QAChB,4BAAY;QACZ,4BAAY;QACX,8BAAa;GAZ1C,aAAa,CAkDzB"}
|
|
@@ -18,6 +18,7 @@ const push_notification_response_dto_1 = require("./dtos/push.notification.respo
|
|
|
18
18
|
const push_notification_template_dto_1 = require("./dtos/push.notification.template.dto");
|
|
19
19
|
const queue_options_dto_1 = require("./dtos/queue.options.dto");
|
|
20
20
|
const remote_raw_response_dto_1 = require("./dtos/remote.raw.response.dto");
|
|
21
|
+
const remote_request_config_dto_1 = require("./dtos/remote.request.config.dto");
|
|
21
22
|
const remote_request_log_attributes_dto_1 = require("./dtos/remote.request.log.attributes.dto");
|
|
22
23
|
const set_sms_payload_dto_1 = require("./dtos/set.sms.payload.dto");
|
|
23
24
|
const sms_payload_dto_1 = require("./dtos/sms.payload.dto");
|
|
@@ -92,6 +93,7 @@ const es6Classes = {
|
|
|
92
93
|
push_notification_template_dto_1.PushNotificationTemplateDto,
|
|
93
94
|
queue_options_dto_1.QueueOptionsDto,
|
|
94
95
|
remote_raw_response_dto_1.RemoteRawResponseDto,
|
|
96
|
+
remote_request_config_dto_1.RemoteRequestConfigDto,
|
|
95
97
|
remote_request_log_attributes_dto_1.RemoteRequestLogAttributesDto,
|
|
96
98
|
set_sms_payload_dto_1.SetSmsPayloadDto,
|
|
97
99
|
sms_payload_dto_1.SmsPayloadDto,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/platformUtility/es6.classes.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"es6.classes.js","sourceRoot":"","sources":["../../src/platformUtility/es6.classes.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,7 @@ export declare class SqsService {
|
|
|
7
7
|
private init;
|
|
8
8
|
private getClient;
|
|
9
9
|
add(queue: string, message: any): Promise<any>;
|
|
10
|
-
addBulk(queue: string, messages: any[]): Promise<any>;
|
|
11
|
-
private pushBulk;
|
|
10
|
+
addBulk(queue: string, messages: any[]): Promise<any[]>;
|
|
12
11
|
delete(queue: string, receiptHandle: string): Promise<any>;
|
|
13
12
|
deleteBulk(queue: string, receiptHandles: string[]): Promise<any[]>;
|
|
14
13
|
get(queue: string, count?: number, options?: any): Promise<any>;
|
|
@@ -46,29 +46,38 @@ let SqsService = class SqsService {
|
|
|
46
46
|
return client.send(command);
|
|
47
47
|
}
|
|
48
48
|
async addBulk(queue, messages) {
|
|
49
|
-
|
|
49
|
+
const client = await this.getClient();
|
|
50
|
+
const batchSize = 10;
|
|
51
|
+
const results = [];
|
|
50
52
|
let iteration = 0;
|
|
51
|
-
for (
|
|
52
|
-
const
|
|
53
|
-
entries.
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
for (let i = 0; i < messages.length; i += batchSize) {
|
|
54
|
+
const batch = messages.slice(i, i + batchSize);
|
|
55
|
+
const entries = batch.map((message) => {
|
|
56
|
+
const body = {
|
|
57
|
+
Id: `id-${iteration++}`,
|
|
58
|
+
MessageBody: JSON.stringify(message),
|
|
59
|
+
};
|
|
60
|
+
return body;
|
|
61
|
+
});
|
|
62
|
+
const params = {
|
|
63
|
+
Entries: entries,
|
|
64
|
+
QueueUrl: queue,
|
|
65
|
+
};
|
|
66
|
+
if (this.isFifo(queue)) {
|
|
67
|
+
params.Entries = entries.map((entry) => ({
|
|
68
|
+
...entry,
|
|
69
|
+
MessageGroupId: 'group-1',
|
|
70
|
+
}));
|
|
71
|
+
}
|
|
72
|
+
this.logger.log(`pushing ${entries.length} messages to queue : ${queue}`);
|
|
73
|
+
const command = new client_sqs_1.SendMessageBatchCommand(params);
|
|
74
|
+
const result = await client.send(command);
|
|
75
|
+
if (result.Failed && result.Failed.length > 0) {
|
|
76
|
+
this.logger.warn(`Failed to send ${result.Failed.length} messages to queue ${queue}:`, result.Failed);
|
|
77
|
+
}
|
|
78
|
+
results.push(result);
|
|
57
79
|
}
|
|
58
|
-
|
|
59
|
-
return this.pushBulk(queue, entries);
|
|
60
|
-
}
|
|
61
|
-
async pushBulk(queue, entries) {
|
|
62
|
-
const client = await this.getClient();
|
|
63
|
-
const params = {
|
|
64
|
-
Entries: entries,
|
|
65
|
-
QueueUrl: queue,
|
|
66
|
-
};
|
|
67
|
-
if (this.isFifo(queue))
|
|
68
|
-
params.MessageGroupId = 'group-1';
|
|
69
|
-
this.logger.log(`pushing to queue : ${queue} job`);
|
|
70
|
-
const command = new client_sqs_1.SendMessageCommand(params);
|
|
71
|
-
return client.send(command);
|
|
80
|
+
return results;
|
|
72
81
|
}
|
|
73
82
|
async delete(queue, receiptHandle) {
|
|
74
83
|
const client = await this.getClient();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqs.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/sqs.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"sqs.service.js","sourceRoot":"","sources":["../../../src/platformUtility/services/sqs.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,22 +1,39 @@
|
|
|
1
|
+
import { GetObjectCommandOutput, ListObjectsCommandOutput, CopyObjectCommandOutput, DeleteObjectCommandOutput } from '@aws-sdk/client-s3';
|
|
1
2
|
import { AwsConfigService } from '../../platformUtility/services/aws.config.service';
|
|
2
3
|
import { S3ObjectInfoDto } from '../dtos/s3.object.info.dto';
|
|
4
|
+
interface S3UploadParams {
|
|
5
|
+
Bucket: string;
|
|
6
|
+
Key: string;
|
|
7
|
+
Body: Buffer | Uint8Array | Blob | string;
|
|
8
|
+
ContentType?: string;
|
|
9
|
+
ACL?: string;
|
|
10
|
+
Metadata?: Record<string, string>;
|
|
11
|
+
}
|
|
12
|
+
interface S3UploadResponse {
|
|
13
|
+
Location?: string;
|
|
14
|
+
ETag?: string;
|
|
15
|
+
Bucket?: string;
|
|
16
|
+
Key?: string;
|
|
17
|
+
}
|
|
18
|
+
interface S3UrlParseResult {
|
|
19
|
+
bucket: string;
|
|
20
|
+
key: string;
|
|
21
|
+
region: string;
|
|
22
|
+
}
|
|
3
23
|
export declare class AwsS3Service {
|
|
4
24
|
private readonly awsConfigService;
|
|
5
25
|
private client;
|
|
6
26
|
constructor(awsConfigService: AwsConfigService);
|
|
7
27
|
private init;
|
|
8
28
|
private getClient;
|
|
9
|
-
upload(params:
|
|
10
|
-
uploadToServer(params:
|
|
29
|
+
upload(params: S3UploadParams): Promise<string>;
|
|
30
|
+
uploadToServer(params: S3UploadParams): Promise<S3UploadResponse>;
|
|
11
31
|
getPublicUrl(bucket: string, key: string, expiresIn?: number): Promise<string>;
|
|
12
|
-
getObject(bucket: string, key: string): Promise<
|
|
13
|
-
listObjects(bucket: string): Promise<
|
|
14
|
-
moveObject(source: S3ObjectInfoDto, destination: S3ObjectInfoDto): Promise<
|
|
15
|
-
copyObject(source: S3ObjectInfoDto, destination: S3ObjectInfoDto): Promise<
|
|
16
|
-
dropObject(object: S3ObjectInfoDto): Promise<
|
|
17
|
-
getS3BucketKeyFromUrl(url: string):
|
|
18
|
-
bucket: string;
|
|
19
|
-
key: string;
|
|
20
|
-
region: string;
|
|
21
|
-
};
|
|
32
|
+
getObject(bucket: string, key: string): Promise<GetObjectCommandOutput>;
|
|
33
|
+
listObjects(bucket: string): Promise<ListObjectsCommandOutput>;
|
|
34
|
+
moveObject(source: S3ObjectInfoDto, destination: S3ObjectInfoDto): Promise<CopyObjectCommandOutput>;
|
|
35
|
+
copyObject(source: S3ObjectInfoDto, destination: S3ObjectInfoDto): Promise<CopyObjectCommandOutput>;
|
|
36
|
+
dropObject(object: S3ObjectInfoDto): Promise<DeleteObjectCommandOutput>;
|
|
37
|
+
getS3BucketKeyFromUrl(url: string): S3UrlParseResult;
|
|
22
38
|
}
|
|
39
|
+
export {};
|
|
@@ -39,14 +39,15 @@ let AwsS3Service = class AwsS3Service {
|
|
|
39
39
|
const res = await this.uploadToServer(params);
|
|
40
40
|
if (res.Location)
|
|
41
41
|
return res.Location;
|
|
42
|
+
throw new Error('Upload failed: No location returned');
|
|
42
43
|
}
|
|
43
44
|
async uploadToServer(params) {
|
|
44
45
|
const client = await this.getClient();
|
|
45
46
|
const upload = new lib_storage_1.Upload({
|
|
46
47
|
client,
|
|
47
|
-
params,
|
|
48
|
+
params: params,
|
|
48
49
|
});
|
|
49
|
-
return upload.done();
|
|
50
|
+
return (await upload.done());
|
|
50
51
|
}
|
|
51
52
|
async getPublicUrl(bucket, key, expiresIn = 3600) {
|
|
52
53
|
const client = await this.getClient();
|
|
@@ -60,17 +61,18 @@ let AwsS3Service = class AwsS3Service {
|
|
|
60
61
|
const client = await this.getClient();
|
|
61
62
|
const params = { Bucket: bucket, Key: key };
|
|
62
63
|
const command = new client_s3_1.GetObjectCommand(params);
|
|
63
|
-
return client.send(command);
|
|
64
|
+
return await client.send(command);
|
|
64
65
|
}
|
|
65
66
|
async listObjects(bucket) {
|
|
66
67
|
const client = await this.getClient();
|
|
67
68
|
const params = { Bucket: bucket };
|
|
68
69
|
const command = new client_s3_1.ListObjectsCommand(params);
|
|
69
|
-
return client.send(command);
|
|
70
|
+
return await client.send(command);
|
|
70
71
|
}
|
|
71
72
|
async moveObject(source, destination) {
|
|
72
|
-
if (source.bucket === destination.bucket && source.key === destination.key)
|
|
73
|
-
|
|
73
|
+
if (source.bucket === destination.bucket && source.key === destination.key) {
|
|
74
|
+
throw new Error('Source and destination cannot be the same');
|
|
75
|
+
}
|
|
74
76
|
const response = await this.copyObject(source, destination);
|
|
75
77
|
await this.dropObject(source);
|
|
76
78
|
return response;
|
|
@@ -83,7 +85,7 @@ let AwsS3Service = class AwsS3Service {
|
|
|
83
85
|
Key: destination.key,
|
|
84
86
|
};
|
|
85
87
|
const command = new client_s3_1.CopyObjectCommand(params);
|
|
86
|
-
return client.send(command);
|
|
88
|
+
return await client.send(command);
|
|
87
89
|
}
|
|
88
90
|
async dropObject(object) {
|
|
89
91
|
const client = await this.getClient();
|
|
@@ -92,12 +94,15 @@ let AwsS3Service = class AwsS3Service {
|
|
|
92
94
|
Key: object.key,
|
|
93
95
|
};
|
|
94
96
|
const command = new client_s3_1.DeleteObjectCommand(params);
|
|
95
|
-
return client.send(command);
|
|
97
|
+
return await client.send(command);
|
|
96
98
|
}
|
|
97
99
|
getS3BucketKeyFromUrl(url) {
|
|
98
|
-
|
|
100
|
+
if (!url || typeof url !== 'string') {
|
|
101
|
+
throw new Error('Invalid URL provided');
|
|
102
|
+
}
|
|
103
|
+
const _decodedUrl = decodeURIComponent(url.trim());
|
|
99
104
|
let _result = null;
|
|
100
|
-
let _match = _decodedUrl.match(/^https?:\/\/s3
|
|
105
|
+
let _match = _decodedUrl.match(/^https?:\/\/s3\.amazonaws\.com\/([^\/]+)\/?(.*?)$/);
|
|
101
106
|
if (_match) {
|
|
102
107
|
_result = {
|
|
103
108
|
bucket: _match[1],
|
|
@@ -105,31 +110,43 @@ let AwsS3Service = class AwsS3Service {
|
|
|
105
110
|
region: '',
|
|
106
111
|
};
|
|
107
112
|
}
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
113
|
+
if (!_result) {
|
|
114
|
+
_match = _decodedUrl.match(/^https?:\/\/s3-([^.]+)\.amazonaws\.com\/([^\/]+)\/?(.*?)$/);
|
|
115
|
+
if (_match) {
|
|
116
|
+
_result = {
|
|
117
|
+
bucket: _match[2],
|
|
118
|
+
key: _match[3],
|
|
119
|
+
region: _match[1],
|
|
120
|
+
};
|
|
121
|
+
}
|
|
115
122
|
}
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
+
if (!_result) {
|
|
124
|
+
_match = _decodedUrl.match(/^https?:\/\/([^.]+)\.s3\.amazonaws\.com\/?(.*?)$/);
|
|
125
|
+
if (_match) {
|
|
126
|
+
_result = {
|
|
127
|
+
bucket: _match[1],
|
|
128
|
+
key: _match[2],
|
|
129
|
+
region: '',
|
|
130
|
+
};
|
|
131
|
+
}
|
|
123
132
|
}
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
133
|
+
if (!_result) {
|
|
134
|
+
_match = _decodedUrl.match(/^https?:\/\/([^.]+)\.(?:s3-|s3\.)([^.]+)\.amazonaws\.com\/?(.*?)$/);
|
|
135
|
+
if (_match) {
|
|
136
|
+
_result = {
|
|
137
|
+
bucket: _match[1],
|
|
138
|
+
key: _match[3],
|
|
139
|
+
region: _match[2],
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
if (!_result) {
|
|
144
|
+
throw new Error(`Unsupported S3 URL format: ${url}`);
|
|
145
|
+
}
|
|
146
|
+
_result.key = _result.key.split('?')[0].split('#')[0].trim();
|
|
147
|
+
if (!_result.bucket || !_result.key) {
|
|
148
|
+
throw new Error(`Invalid S3 URL format: missing bucket or key`);
|
|
131
149
|
}
|
|
132
|
-
_result.key = _result.key.split('?')[0];
|
|
133
150
|
return _result;
|
|
134
151
|
}
|
|
135
152
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aws.s3.service.js","sourceRoot":"","sources":["../../../src/system/services/aws.s3.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"aws.s3.service.js","sourceRoot":"","sources":["../../../src/system/services/aws.s3.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,55 @@
|
|
|
1
|
+
import { DeleteObjectCommandOutput } from '@aws-sdk/client-s3';
|
|
2
|
+
import { CommonService } from '../../common/libraries/common.service';
|
|
1
3
|
import { AwsConfigService } from '../../platformUtility/services/aws.config.service';
|
|
2
4
|
import { FileUploadSpecDto } from '../dtos/file.upload.spec.dto';
|
|
3
5
|
import { S3UploadOptionsDto } from '../dtos/s3.upload.options.dto';
|
|
4
6
|
import { LocalFileS3UploadDto } from './../dtos/local.file.s3.upload.dto';
|
|
5
7
|
import { AwsS3Service } from './aws.s3.service';
|
|
6
|
-
|
|
8
|
+
interface S3UploadParams {
|
|
9
|
+
Bucket: string;
|
|
10
|
+
Key: string;
|
|
11
|
+
Body: Buffer | Uint8Array | Blob | string;
|
|
12
|
+
ContentType?: string;
|
|
13
|
+
ACL?: string;
|
|
14
|
+
Metadata?: Record<string, string>;
|
|
15
|
+
}
|
|
16
|
+
interface BulkDeleteResult {
|
|
17
|
+
success: boolean;
|
|
18
|
+
error?: string;
|
|
19
|
+
result?: DeleteObjectCommandOutput;
|
|
20
|
+
identifier: string;
|
|
21
|
+
}
|
|
7
22
|
export declare class UploadService extends CommonService {
|
|
8
23
|
private readonly awsS3Service;
|
|
9
24
|
private readonly awsConfigService;
|
|
10
25
|
protected publicExposed: boolean;
|
|
11
26
|
constructor(awsS3Service: AwsS3Service, awsConfigService: AwsConfigService);
|
|
12
27
|
upload(file: FileUploadSpecDto, options?: S3UploadOptionsDto): Promise<string>;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
28
|
+
uploadWithStats(file: FileUploadSpecDto, options?: S3UploadOptionsDto): Promise<{
|
|
29
|
+
url: string;
|
|
30
|
+
size: number;
|
|
31
|
+
contentType: string;
|
|
32
|
+
}>;
|
|
33
|
+
uploadFile(params: S3UploadParams): Promise<string>;
|
|
16
34
|
saveLocalFileOnS3(options: LocalFileS3UploadDto): Promise<string>;
|
|
17
|
-
|
|
35
|
+
getFileSizeFromUrl(url: string): Promise<number>;
|
|
36
|
+
getFileSizeFromS3Url(s3Url: string): Promise<number>;
|
|
37
|
+
getFileSizeFromS3Key(bucket: string, key: string): Promise<number>;
|
|
38
|
+
getFileSizeFromBuffer(buffer: Buffer): number;
|
|
39
|
+
getFileSizeFromPath(filePath: string): Promise<number>;
|
|
40
|
+
deleteByUrl(fileUrl: string): Promise<DeleteObjectCommandOutput>;
|
|
41
|
+
deleteByKey(bucket: string, key: string): Promise<DeleteObjectCommandOutput>;
|
|
42
|
+
delete(key: string): Promise<DeleteObjectCommandOutput>;
|
|
43
|
+
deleteMultipleByUrl(fileUrls: string[]): Promise<BulkDeleteResult[]>;
|
|
44
|
+
deleteMultipleByKey(bucket: string, keys: string[]): Promise<BulkDeleteResult[]>;
|
|
45
|
+
deleteMultiple(keys: string[]): Promise<BulkDeleteResult[]>;
|
|
46
|
+
detectFileType(buffer: Buffer, filename?: string): string;
|
|
47
|
+
getBufferFromUrl(url: string): Promise<Buffer<ArrayBuffer>>;
|
|
48
|
+
private prepareUploadData;
|
|
49
|
+
private getFileName;
|
|
50
|
+
private readonly fileSignatures;
|
|
51
|
+
private readonly extensionMimeTypes;
|
|
52
|
+
private detectBySignature;
|
|
53
|
+
private getFileExtension;
|
|
18
54
|
}
|
|
55
|
+
export {};
|
|
@@ -13,18 +13,245 @@ exports.UploadService = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const axios_1 = require("axios");
|
|
15
15
|
const fs_1 = require("fs");
|
|
16
|
+
const common_service_1 = require("../../common/libraries/common.service");
|
|
16
17
|
const platform_utility_1 = require("../../common/libraries/platform.utility");
|
|
17
18
|
const aws_config_service_1 = require("../../platformUtility/services/aws.config.service");
|
|
18
19
|
const aws_s3_service_1 = require("./aws.s3.service");
|
|
19
|
-
const common_service_1 = require("../../common/libraries/common.service");
|
|
20
20
|
let UploadService = class UploadService extends common_service_1.CommonService {
|
|
21
21
|
constructor(awsS3Service, awsConfigService) {
|
|
22
22
|
super();
|
|
23
23
|
this.awsS3Service = awsS3Service;
|
|
24
24
|
this.awsConfigService = awsConfigService;
|
|
25
25
|
this.publicExposed = true;
|
|
26
|
+
this.fileSignatures = {
|
|
27
|
+
'image/jpeg': [0xff, 0xd8, 0xff],
|
|
28
|
+
'image/png': [0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a],
|
|
29
|
+
'image/gif': [0x47, 0x49, 0x46, 0x38],
|
|
30
|
+
'image/webp': [0x52, 0x49, 0x46, 0x46],
|
|
31
|
+
'image/bmp': [0x42, 0x4d],
|
|
32
|
+
'image/tiff': [0x49, 0x49, 0x2a, 0x00],
|
|
33
|
+
'image/svg+xml': [0x3c, 0x3f, 0x78, 0x6d, 0x6c],
|
|
34
|
+
'application/pdf': [0x25, 0x50, 0x44, 0x46],
|
|
35
|
+
'application/msword': [0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1],
|
|
36
|
+
'application/vnd.openxmlformats-officedocument.wordprocessingml.document': [0x50, 0x4b, 0x03, 0x04],
|
|
37
|
+
'application/vnd.ms-excel': [0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1],
|
|
38
|
+
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': [0x50, 0x4b, 0x03, 0x04],
|
|
39
|
+
'application/vnd.ms-powerpoint': [0xd0, 0xcf, 0x11, 0xe0, 0xa1, 0xb1, 0x1a, 0xe1],
|
|
40
|
+
'application/vnd.openxmlformats-officedocument.presentationml.presentation': [0x50, 0x4b, 0x03, 0x04],
|
|
41
|
+
'application/zip': [0x50, 0x4b, 0x03, 0x04],
|
|
42
|
+
'application/x-rar-compressed': [0x52, 0x61, 0x72, 0x20, 0x1a, 0x07, 0x00],
|
|
43
|
+
'application/x-7z-compressed': [0x37, 0x7a, 0xbc, 0xaf, 0x27, 0x1c],
|
|
44
|
+
'audio/mpeg': [0xff, 0xfb],
|
|
45
|
+
'audio/wav': [0x52, 0x49, 0x46, 0x46],
|
|
46
|
+
'audio/mp4': [0x66, 0x74, 0x79, 0x70],
|
|
47
|
+
'video/mp4': [0x00, 0x00, 0x00, 0x18, 0x66, 0x74, 0x79, 0x70],
|
|
48
|
+
'video/avi': [0x52, 0x49, 0x46, 0x46],
|
|
49
|
+
'video/quicktime': [0x00, 0x00, 0x00, 0x14, 0x66, 0x74, 0x79, 0x70],
|
|
50
|
+
'text/plain': [0xef, 0xbb, 0xbf],
|
|
51
|
+
'application/json': [0x7b, 0x22],
|
|
52
|
+
'text/csv': [0xef, 0xbb, 0xbf],
|
|
53
|
+
'application/octet-stream': [],
|
|
54
|
+
};
|
|
55
|
+
this.extensionMimeTypes = {
|
|
56
|
+
'.jpg': 'image/jpeg',
|
|
57
|
+
'.jpeg': 'image/jpeg',
|
|
58
|
+
'.png': 'image/png',
|
|
59
|
+
'.gif': 'image/gif',
|
|
60
|
+
'.webp': 'image/webp',
|
|
61
|
+
'.bmp': 'image/bmp',
|
|
62
|
+
'.tiff': 'image/tiff',
|
|
63
|
+
'.tif': 'image/tiff',
|
|
64
|
+
'.svg': 'image/svg+xml',
|
|
65
|
+
'.pdf': 'application/pdf',
|
|
66
|
+
'.doc': 'application/msword',
|
|
67
|
+
'.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
|
68
|
+
'.xls': 'application/vnd.ms-excel',
|
|
69
|
+
'.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
|
70
|
+
'.ppt': 'application/vnd.ms-powerpoint',
|
|
71
|
+
'.pptx': 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
|
|
72
|
+
'.zip': 'application/zip',
|
|
73
|
+
'.rar': 'application/x-rar-compressed',
|
|
74
|
+
'.7z': 'application/x-7z-compressed',
|
|
75
|
+
'.tar': 'application/x-tar',
|
|
76
|
+
'.gz': 'application/gzip',
|
|
77
|
+
'.mp3': 'audio/mpeg',
|
|
78
|
+
'.wav': 'audio/wav',
|
|
79
|
+
'.m4a': 'audio/mp4',
|
|
80
|
+
'.ogg': 'audio/ogg',
|
|
81
|
+
'.flac': 'audio/flac',
|
|
82
|
+
'.mp4': 'video/mp4',
|
|
83
|
+
'.avi': 'video/avi',
|
|
84
|
+
'.mov': 'video/quicktime',
|
|
85
|
+
'.wmv': 'video/x-ms-wmv',
|
|
86
|
+
'.flv': 'video/x-flv',
|
|
87
|
+
'.webm': 'video/webm',
|
|
88
|
+
'.txt': 'text/plain',
|
|
89
|
+
'.json': 'application/json',
|
|
90
|
+
'.csv': 'text/csv',
|
|
91
|
+
'.xml': 'application/xml',
|
|
92
|
+
'.html': 'text/html',
|
|
93
|
+
'.css': 'text/css',
|
|
94
|
+
'.js': 'application/javascript',
|
|
95
|
+
'.ts': 'application/typescript',
|
|
96
|
+
};
|
|
26
97
|
}
|
|
27
98
|
async upload(file, options = {}) {
|
|
99
|
+
const { params } = await this.prepareUploadData(file, options);
|
|
100
|
+
return this.awsS3Service.upload(params);
|
|
101
|
+
}
|
|
102
|
+
async uploadWithStats(file, options = {}) {
|
|
103
|
+
const { params, body, contentType } = await this.prepareUploadData(file, options);
|
|
104
|
+
const result = await this.awsS3Service.upload(params);
|
|
105
|
+
return {
|
|
106
|
+
url: result,
|
|
107
|
+
size: this.getFileSizeFromBuffer(body),
|
|
108
|
+
contentType,
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
async uploadFile(params) {
|
|
112
|
+
return this.awsS3Service.upload(params);
|
|
113
|
+
}
|
|
114
|
+
async saveLocalFileOnS3(options) {
|
|
115
|
+
const splits = options.bucket.split('/');
|
|
116
|
+
const buffer = (0, fs_1.readFileSync)(options.local_file);
|
|
117
|
+
const fileName = options.remoteFile || options.local_file.split('/').pop();
|
|
118
|
+
const contentType = this.detectFileType(buffer, fileName);
|
|
119
|
+
const params = {
|
|
120
|
+
Bucket: splits[0],
|
|
121
|
+
Key: options.remoteFile || options.bucket.replace(`${splits[0]}/`, ''),
|
|
122
|
+
Body: buffer,
|
|
123
|
+
ACL: options.visibility || 'private',
|
|
124
|
+
ContentType: contentType,
|
|
125
|
+
};
|
|
126
|
+
return this.awsS3Service.upload(params);
|
|
127
|
+
}
|
|
128
|
+
async getFileSizeFromUrl(url) {
|
|
129
|
+
try {
|
|
130
|
+
if (url.includes('amazonaws.com') || url.includes('s3.')) {
|
|
131
|
+
return this.getFileSizeFromS3Url(url);
|
|
132
|
+
}
|
|
133
|
+
const response = await axios_1.default.head(url);
|
|
134
|
+
const contentLength = response.headers['content-length'];
|
|
135
|
+
if (contentLength) {
|
|
136
|
+
return parseInt(contentLength, 10);
|
|
137
|
+
}
|
|
138
|
+
throw new Error('Content-Length header not found');
|
|
139
|
+
}
|
|
140
|
+
catch (error) {
|
|
141
|
+
throw new Error(`Failed to get file size from URL: ${error.message}`);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
async getFileSizeFromS3Url(s3Url) {
|
|
145
|
+
try {
|
|
146
|
+
const { bucket, key } = this.awsS3Service.getS3BucketKeyFromUrl(s3Url);
|
|
147
|
+
const result = await this.awsS3Service.getObject(bucket, key);
|
|
148
|
+
return result.ContentLength || 0;
|
|
149
|
+
}
|
|
150
|
+
catch (error) {
|
|
151
|
+
throw new Error(`Failed to get file size from S3 URL: ${error.message}`);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
async getFileSizeFromS3Key(bucket, key) {
|
|
155
|
+
try {
|
|
156
|
+
const result = await this.awsS3Service.getObject(bucket, key);
|
|
157
|
+
return result.ContentLength || 0;
|
|
158
|
+
}
|
|
159
|
+
catch (error) {
|
|
160
|
+
throw new Error(`Failed to get file size from S3 key: ${error.message}`);
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
getFileSizeFromBuffer(buffer) {
|
|
164
|
+
if (!buffer || !Buffer.isBuffer(buffer)) {
|
|
165
|
+
throw new Error('Invalid buffer provided');
|
|
166
|
+
}
|
|
167
|
+
return buffer.length;
|
|
168
|
+
}
|
|
169
|
+
async getFileSizeFromPath(filePath) {
|
|
170
|
+
try {
|
|
171
|
+
const fs = require('fs');
|
|
172
|
+
const stats = await fs.promises.stat(filePath);
|
|
173
|
+
return stats.size;
|
|
174
|
+
}
|
|
175
|
+
catch (error) {
|
|
176
|
+
throw new Error(`Failed to get file size from path: ${error.message}`);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
async deleteByUrl(fileUrl) {
|
|
180
|
+
const { bucket, key } = this.awsS3Service.getS3BucketKeyFromUrl(fileUrl);
|
|
181
|
+
return this.deleteByKey(bucket, key);
|
|
182
|
+
}
|
|
183
|
+
async deleteByKey(bucket, key) {
|
|
184
|
+
return this.awsS3Service.dropObject({ bucket, key });
|
|
185
|
+
}
|
|
186
|
+
async delete(key) {
|
|
187
|
+
const config = await this.awsConfigService.getConfig();
|
|
188
|
+
return this.deleteByKey(config.bucket, key);
|
|
189
|
+
}
|
|
190
|
+
async deleteMultipleByUrl(fileUrls) {
|
|
191
|
+
const results = [];
|
|
192
|
+
for (const url of fileUrls) {
|
|
193
|
+
try {
|
|
194
|
+
const result = await this.deleteByUrl(url);
|
|
195
|
+
results.push({
|
|
196
|
+
identifier: url,
|
|
197
|
+
success: true,
|
|
198
|
+
result,
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
catch (error) {
|
|
202
|
+
results.push({
|
|
203
|
+
identifier: url,
|
|
204
|
+
success: false,
|
|
205
|
+
error: error.message,
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
return results;
|
|
210
|
+
}
|
|
211
|
+
async deleteMultipleByKey(bucket, keys) {
|
|
212
|
+
const results = [];
|
|
213
|
+
for (const key of keys) {
|
|
214
|
+
try {
|
|
215
|
+
const result = await this.deleteByKey(bucket, key);
|
|
216
|
+
results.push({
|
|
217
|
+
identifier: key,
|
|
218
|
+
success: true,
|
|
219
|
+
result,
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
catch (error) {
|
|
223
|
+
results.push({
|
|
224
|
+
identifier: key,
|
|
225
|
+
success: false,
|
|
226
|
+
error: error.message,
|
|
227
|
+
});
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
return results;
|
|
231
|
+
}
|
|
232
|
+
async deleteMultiple(keys) {
|
|
233
|
+
const config = await this.awsConfigService.getConfig();
|
|
234
|
+
return this.deleteMultipleByKey(config.bucket, keys);
|
|
235
|
+
}
|
|
236
|
+
detectFileType(buffer, filename) {
|
|
237
|
+
if (!buffer || buffer.length === 0) {
|
|
238
|
+
return 'application/octet-stream';
|
|
239
|
+
}
|
|
240
|
+
const detectedMimeType = this.detectBySignature(buffer);
|
|
241
|
+
if (detectedMimeType !== 'application/octet-stream') {
|
|
242
|
+
return detectedMimeType;
|
|
243
|
+
}
|
|
244
|
+
if (filename) {
|
|
245
|
+
const extension = this.getFileExtension(filename);
|
|
246
|
+
return this.extensionMimeTypes[extension] || 'application/octet-stream';
|
|
247
|
+
}
|
|
248
|
+
return 'application/octet-stream';
|
|
249
|
+
}
|
|
250
|
+
async getBufferFromUrl(url) {
|
|
251
|
+
const response = await axios_1.default.get(url, { responseType: 'arraybuffer' });
|
|
252
|
+
return Buffer.from(response.data, 'utf-8');
|
|
253
|
+
}
|
|
254
|
+
async prepareUploadData(file, options) {
|
|
28
255
|
const config = await this.awsConfigService.getConfig();
|
|
29
256
|
const folder = options.folder || 'public';
|
|
30
257
|
const fileName = this.getFileName(file, options);
|
|
@@ -34,15 +261,18 @@ let UploadService = class UploadService extends common_service_1.CommonService {
|
|
|
34
261
|
Body = await this.getBufferFromUrl(file.url);
|
|
35
262
|
else
|
|
36
263
|
Body = file.buffer;
|
|
264
|
+
let contentType = options.mime_type;
|
|
265
|
+
if (!contentType) {
|
|
266
|
+
contentType = this.detectFileType(Body, file.originalname || fileName);
|
|
267
|
+
}
|
|
37
268
|
const params = {
|
|
38
269
|
Body,
|
|
39
270
|
Bucket: options.bucket || config.bucket,
|
|
40
271
|
Key: urlKey,
|
|
41
272
|
ACL: options.acl || 'public-read',
|
|
273
|
+
ContentType: contentType,
|
|
42
274
|
};
|
|
43
|
-
|
|
44
|
-
params['ContentType'] = options.mime_type;
|
|
45
|
-
return this.awsS3Service.upload(params);
|
|
275
|
+
return { params, body: Body, contentType };
|
|
46
276
|
}
|
|
47
277
|
getFileName(file, options) {
|
|
48
278
|
if (options.file)
|
|
@@ -50,33 +280,31 @@ let UploadService = class UploadService extends common_service_1.CommonService {
|
|
|
50
280
|
const name = file.originalname.replace(/[^a-zA-Z0-9. ]/g, '');
|
|
51
281
|
return `${platform_utility_1.PlatformUtility.generateRandomAlpha(12).toLowerCase()}_${name.replaceAll(' ', '_')}`;
|
|
52
282
|
}
|
|
53
|
-
|
|
54
|
-
const
|
|
55
|
-
|
|
283
|
+
detectBySignature(buffer) {
|
|
284
|
+
for (const [mimeType, signature] of Object.entries(this.fileSignatures)) {
|
|
285
|
+
if (signature.length === 0)
|
|
286
|
+
continue;
|
|
287
|
+
if (buffer.length >= signature.length) {
|
|
288
|
+
let matches = true;
|
|
289
|
+
for (let i = 0; i < signature.length; i++) {
|
|
290
|
+
if (buffer[i] !== signature[i]) {
|
|
291
|
+
matches = false;
|
|
292
|
+
break;
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
if (matches) {
|
|
296
|
+
return mimeType;
|
|
297
|
+
}
|
|
298
|
+
}
|
|
299
|
+
}
|
|
300
|
+
return 'application/octet-stream';
|
|
56
301
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
const params = {
|
|
64
|
-
Bucket: splits[0],
|
|
65
|
-
Key: options.remoteFile || options.bucket.replace(`${splits[0]}/`, ''),
|
|
66
|
-
Body: buffer,
|
|
67
|
-
ACL: options.visibility || 'private',
|
|
68
|
-
};
|
|
69
|
-
return this.awsS3Service.upload(params);
|
|
70
|
-
}
|
|
71
|
-
async getParam(file) {
|
|
72
|
-
const config = await this.awsConfigService.getConfig();
|
|
73
|
-
const urlkey = `public/${file.originalname}`;
|
|
74
|
-
return {
|
|
75
|
-
Body: file.buffer,
|
|
76
|
-
Bucket: config.bucket,
|
|
77
|
-
Key: urlkey,
|
|
78
|
-
ACL: 'public-read',
|
|
79
|
-
};
|
|
302
|
+
getFileExtension(filename) {
|
|
303
|
+
const lastDotIndex = filename.lastIndexOf('.');
|
|
304
|
+
if (lastDotIndex === -1 || lastDotIndex === filename.length - 1) {
|
|
305
|
+
return '';
|
|
306
|
+
}
|
|
307
|
+
return filename.substring(lastDotIndex).toLowerCase();
|
|
80
308
|
}
|
|
81
309
|
};
|
|
82
310
|
exports.UploadService = UploadService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.service.js","sourceRoot":"","sources":["../../../src/system/services/upload.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.service.js","sourceRoot":"","sources":["../../../src/system/services/upload.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED