@spinajs/http 2.0.416 → 2.0.418
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/lib/cjs/config/http.d.ts +6 -0
- package/lib/cjs/config/http.d.ts.map +1 -1
- package/lib/cjs/config/http.js +6 -0
- package/lib/cjs/config/http.js.map +1 -1
- package/lib/cjs/controllers.d.ts.map +1 -1
- package/lib/cjs/controllers.js +17 -1
- package/lib/cjs/controllers.js.map +1 -1
- package/lib/cjs/file-middlewares/index.d.ts +5 -0
- package/lib/cjs/file-middlewares/index.d.ts.map +1 -0
- package/lib/cjs/{file-transformers → file-middlewares}/index.js +2 -0
- package/lib/cjs/file-middlewares/index.js.map +1 -0
- package/lib/cjs/file-middlewares/info.d.ts +10 -0
- package/lib/cjs/file-middlewares/info.d.ts.map +1 -0
- package/lib/cjs/file-middlewares/info.js +46 -0
- package/lib/cjs/file-middlewares/info.js.map +1 -0
- package/lib/cjs/file-middlewares/unzip.d.ts +7 -0
- package/lib/cjs/file-middlewares/unzip.d.ts.map +1 -0
- package/lib/cjs/{file-transformers → file-middlewares}/unzip.js +4 -3
- package/lib/cjs/{file-transformers → file-middlewares}/unzip.js.map +1 -1
- package/lib/cjs/file-middlewares/validation.d.ts +15 -0
- package/lib/cjs/file-middlewares/validation.d.ts.map +1 -0
- package/lib/cjs/file-middlewares/validation.js +180 -0
- package/lib/cjs/file-middlewares/validation.js.map +1 -0
- package/lib/cjs/file-middlewares/zip.d.ts +7 -0
- package/lib/cjs/file-middlewares/zip.d.ts.map +1 -0
- package/lib/cjs/{file-transformers → file-middlewares}/zip.js +4 -3
- package/lib/cjs/{file-transformers → file-middlewares}/zip.js.map +1 -1
- package/lib/cjs/index.d.ts +1 -1
- package/lib/cjs/index.d.ts.map +1 -1
- package/lib/cjs/index.js +1 -1
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/interfaces.d.ts +52 -6
- package/lib/cjs/interfaces.d.ts.map +1 -1
- package/lib/cjs/interfaces.js +33 -3
- package/lib/cjs/interfaces.js.map +1 -1
- package/lib/cjs/route-args/FromForm.d.ts +2 -1
- package/lib/cjs/route-args/FromForm.d.ts.map +1 -1
- package/lib/cjs/route-args/FromForm.js +26 -10
- package/lib/cjs/route-args/FromForm.js.map +1 -1
- package/lib/mjs/config/http.d.ts +6 -0
- package/lib/mjs/config/http.d.ts.map +1 -1
- package/lib/mjs/config/http.js +6 -0
- package/lib/mjs/config/http.js.map +1 -1
- package/lib/mjs/controllers.d.ts.map +1 -1
- package/lib/mjs/controllers.js +17 -1
- package/lib/mjs/controllers.js.map +1 -1
- package/lib/mjs/file-middlewares/index.d.ts +5 -0
- package/lib/mjs/file-middlewares/index.d.ts.map +1 -0
- package/lib/mjs/file-middlewares/index.js +5 -0
- package/lib/mjs/file-middlewares/index.js.map +1 -0
- package/lib/mjs/file-middlewares/info.d.ts +10 -0
- package/lib/mjs/file-middlewares/info.d.ts.map +1 -0
- package/lib/mjs/file-middlewares/info.js +43 -0
- package/lib/mjs/file-middlewares/info.js.map +1 -0
- package/lib/mjs/file-middlewares/unzip.d.ts +7 -0
- package/lib/mjs/file-middlewares/unzip.d.ts.map +1 -0
- package/lib/mjs/{file-transformers → file-middlewares}/unzip.js +6 -5
- package/lib/mjs/file-middlewares/unzip.js.map +1 -0
- package/lib/mjs/file-middlewares/validation.d.ts +15 -0
- package/lib/mjs/file-middlewares/validation.d.ts.map +1 -0
- package/lib/mjs/file-middlewares/validation.js +177 -0
- package/lib/mjs/file-middlewares/validation.js.map +1 -0
- package/lib/mjs/file-middlewares/zip.d.ts +7 -0
- package/lib/mjs/file-middlewares/zip.d.ts.map +1 -0
- package/lib/mjs/{file-transformers → file-middlewares}/zip.js +6 -5
- package/lib/mjs/file-middlewares/zip.js.map +1 -0
- package/lib/mjs/index.d.ts +1 -1
- package/lib/mjs/index.d.ts.map +1 -1
- package/lib/mjs/index.js +1 -1
- package/lib/mjs/index.js.map +1 -1
- package/lib/mjs/interfaces.d.ts +52 -6
- package/lib/mjs/interfaces.d.ts.map +1 -1
- package/lib/mjs/interfaces.js +31 -1
- package/lib/mjs/interfaces.js.map +1 -1
- package/lib/mjs/route-args/FromForm.d.ts +2 -1
- package/lib/mjs/route-args/FromForm.d.ts.map +1 -1
- package/lib/mjs/route-args/FromForm.js +26 -10
- package/lib/mjs/route-args/FromForm.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +11 -11
- package/lib/cjs/file-transformers/index.d.ts +0 -3
- package/lib/cjs/file-transformers/index.d.ts.map +0 -1
- package/lib/cjs/file-transformers/index.js.map +0 -1
- package/lib/cjs/file-transformers/unzip.d.ts +0 -7
- package/lib/cjs/file-transformers/unzip.d.ts.map +0 -1
- package/lib/cjs/file-transformers/zip.d.ts +0 -7
- package/lib/cjs/file-transformers/zip.d.ts.map +0 -1
- package/lib/mjs/file-transformers/index.d.ts +0 -3
- package/lib/mjs/file-transformers/index.d.ts.map +0 -1
- package/lib/mjs/file-transformers/index.js +0 -3
- package/lib/mjs/file-transformers/index.js.map +0 -1
- package/lib/mjs/file-transformers/unzip.d.ts +0 -7
- package/lib/mjs/file-transformers/unzip.d.ts.map +0 -1
- package/lib/mjs/file-transformers/unzip.js.map +0 -1
- package/lib/mjs/file-transformers/zip.d.ts +0 -7
- package/lib/mjs/file-transformers/zip.d.ts.map +0 -1
- package/lib/mjs/file-transformers/zip.js.map +0 -1
|
@@ -7,12 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { Injectable } from "@spinajs/di";
|
|
11
|
-
import {
|
|
10
|
+
import { Injectable, Singleton } from "@spinajs/di";
|
|
11
|
+
import { FileUploadMiddleware } from "../interfaces.js";
|
|
12
12
|
import { Log, Logger } from "@spinajs/log-common";
|
|
13
13
|
import { basename } from "path";
|
|
14
|
-
let UnzipFileTransformer = class UnzipFileTransformer extends
|
|
15
|
-
async
|
|
14
|
+
let UnzipFileTransformer = class UnzipFileTransformer extends FileUploadMiddleware {
|
|
15
|
+
async beforeUpload(file) {
|
|
16
16
|
const originalName = file.BaseName;
|
|
17
17
|
const originalSize = file.Size;
|
|
18
18
|
try {
|
|
@@ -45,7 +45,8 @@ __decorate([
|
|
|
45
45
|
__metadata("design:type", Log)
|
|
46
46
|
], UnzipFileTransformer.prototype, "Log", void 0);
|
|
47
47
|
UnzipFileTransformer = __decorate([
|
|
48
|
-
Injectable()
|
|
48
|
+
Injectable(),
|
|
49
|
+
Singleton()
|
|
49
50
|
], UnzipFileTransformer);
|
|
50
51
|
export { UnzipFileTransformer };
|
|
51
52
|
//# sourceMappingURL=unzip.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"unzip.js","sourceRoot":"","sources":["../../../src/file-middlewares/unzip.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAiB,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAIzB,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,oBAAoB;IAInD,KAAK,CAAC,YAAY,CAAC,IAAwB;QAE9C,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;QAE/B,IAAI,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,YAAY,EAAE,CAAC,CAAA;YAC3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC7E,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,YAAY,OAAO,MAAM,eAAe,QAAQ,IAAI,CAAC,CAAC;YAExF,OAAO;gBACH,GAAG,IAAI;gBACP,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC;gBAC1B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE;oBACF,YAAY,EAAE,YAAY;oBAC1B,YAAY,EAAE,YAAY;iBAC7B;aACJ,CAAA;QAGL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACd,CAAC;gBACO,CAAC;YACL,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC;IAEL,CAAC;CACJ,CAAA;AAlCa;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;iDAAC;AAFV,oBAAoB;IAFhC,UAAU,EAAE;IACZ,SAAS,EAAE;GACC,oBAAoB,CAoChC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { FileUploadMiddleware, FileValidationRules, IUploadedFile, IUploadOptions } from "../interfaces.js";
|
|
2
|
+
import { Log } from "@spinajs/log-common";
|
|
3
|
+
/**
|
|
4
|
+
* Middleware that validates file before upload eg. check file type, withth, height, size, etc.
|
|
5
|
+
*/
|
|
6
|
+
export declare class FileValidationMiddleware extends FileUploadMiddleware {
|
|
7
|
+
protected Rules: FileValidationRules;
|
|
8
|
+
protected Log: Log;
|
|
9
|
+
constructor(Rules: FileValidationRules);
|
|
10
|
+
beforeUpload(file: IUploadedFile<any>, _paramOptions: IUploadOptions): Promise<any>;
|
|
11
|
+
protected validateType(file: IUploadedFile<any>): void;
|
|
12
|
+
protected validateProportions(file: IUploadedFile<any>): IUploadedFile<any>;
|
|
13
|
+
protected validateResolution(file: IUploadedFile<any>): void;
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=validation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../../src/file-middlewares/validation.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,oBAAoB,EAAE,mBAAmB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7H,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;AAIlD;;GAEG;AACH,qBAEa,wBAAyB,SAAQ,oBAAoB;IAIlD,SAAS,CAAC,KAAK,EAAE,mBAAmB;IAFhD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;gBAEG,KAAK,EAAE,mBAAmB;IAKnC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC;IAOhG,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC;IAwC/C,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC;IAoDtD,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC;CAmExD"}
|
|
@@ -0,0 +1,177 @@
|
|
|
1
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
+
};
|
|
7
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
|
+
};
|
|
10
|
+
import { Injectable, Singleton } from "@spinajs/di";
|
|
11
|
+
import { FileProportions, FileUploadMiddleware } from "../interfaces.js";
|
|
12
|
+
import { Log, Logger } from "@spinajs/log-common";
|
|
13
|
+
import { ValidationFailed } from "@spinajs/validation";
|
|
14
|
+
/**
|
|
15
|
+
* Middleware that validates file before upload eg. check file type, withth, height, size, etc.
|
|
16
|
+
*/
|
|
17
|
+
let FileValidationMiddleware = class FileValidationMiddleware extends FileUploadMiddleware {
|
|
18
|
+
constructor(Rules) {
|
|
19
|
+
super();
|
|
20
|
+
this.Rules = Rules;
|
|
21
|
+
}
|
|
22
|
+
async beforeUpload(file, _paramOptions) {
|
|
23
|
+
this.validateType(file);
|
|
24
|
+
this.validateProportions(file);
|
|
25
|
+
this.validateResolution(file);
|
|
26
|
+
return file;
|
|
27
|
+
}
|
|
28
|
+
validateType(file) {
|
|
29
|
+
if (!this.Rules.types || this.Rules.types.length === 0) {
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
if (!file.Info.MimeType) {
|
|
33
|
+
throw new ValidationFailed('validation error', [{
|
|
34
|
+
instancePath: '/file/type',
|
|
35
|
+
schemaPath: '#/properties/file/type',
|
|
36
|
+
keyword: 'type',
|
|
37
|
+
params: {},
|
|
38
|
+
message: 'Unable to determine file type'
|
|
39
|
+
}]);
|
|
40
|
+
}
|
|
41
|
+
const isValid = this.Rules.types.some(allowedType => {
|
|
42
|
+
// Support wildcards like 'image/*'
|
|
43
|
+
if (allowedType.endsWith('/*')) {
|
|
44
|
+
const category = allowedType.split('/')[0];
|
|
45
|
+
return file.Info.MimeType.startsWith(category + '/');
|
|
46
|
+
}
|
|
47
|
+
return file.Info.MimeType.toLowerCase() === allowedType.toLowerCase();
|
|
48
|
+
});
|
|
49
|
+
if (!isValid) {
|
|
50
|
+
throw new ValidationFailed('validation error', [{
|
|
51
|
+
instancePath: '/file/type',
|
|
52
|
+
schemaPath: '#/properties/file/type',
|
|
53
|
+
keyword: 'type',
|
|
54
|
+
params: {
|
|
55
|
+
allowedTypes: this.Rules.types,
|
|
56
|
+
actual: file.Info.MimeType
|
|
57
|
+
},
|
|
58
|
+
message: `File type must be one of: ${this.Rules.types.join(', ')}. Got: ${file.Info.MimeType}`
|
|
59
|
+
}]);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
validateProportions(file) {
|
|
63
|
+
if (!this.Rules.proportions) {
|
|
64
|
+
return file;
|
|
65
|
+
}
|
|
66
|
+
if (!file.Info.Width || !file.Info.Height) {
|
|
67
|
+
throw new ValidationFailed('validation error', [{
|
|
68
|
+
instancePath: '/file',
|
|
69
|
+
schemaPath: '#/properties/file/proportions',
|
|
70
|
+
keyword: 'proportions',
|
|
71
|
+
params: {},
|
|
72
|
+
message: 'Unable to read image dimensions from file metadata'
|
|
73
|
+
}]);
|
|
74
|
+
}
|
|
75
|
+
this.Rules.proportions.forEach(prop => {
|
|
76
|
+
if (prop === FileProportions.Free) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
const [expectedWidth, expectedHeight] = prop.split(':').map(Number);
|
|
80
|
+
if (!expectedWidth || !expectedHeight) {
|
|
81
|
+
throw new ValidationFailed('validation error', [{
|
|
82
|
+
instancePath: '/file/proportions',
|
|
83
|
+
schemaPath: '#/properties/file/proportions',
|
|
84
|
+
keyword: 'proportions',
|
|
85
|
+
params: { proportions: prop },
|
|
86
|
+
message: `Invalid proportion format: ${prop}`
|
|
87
|
+
}]);
|
|
88
|
+
}
|
|
89
|
+
const actualRatio = file.Info.Width / file.Info.Height;
|
|
90
|
+
const expectedRatio = expectedWidth / expectedHeight;
|
|
91
|
+
const tolerance = 0.01; // 1% tolerance
|
|
92
|
+
if (Math.abs(actualRatio - expectedRatio) > tolerance) {
|
|
93
|
+
throw new ValidationFailed('validation error', [{
|
|
94
|
+
instancePath: '/file/proportions',
|
|
95
|
+
schemaPath: '#/properties/file/proportions',
|
|
96
|
+
keyword: 'proportions',
|
|
97
|
+
params: {
|
|
98
|
+
expected: this.Rules.proportions,
|
|
99
|
+
actual: `${file.Info.Width}x${file.Info.Height}`,
|
|
100
|
+
ratio: actualRatio.toFixed(2)
|
|
101
|
+
},
|
|
102
|
+
message: `Image proportions must be ${this.Rules.proportions}. Got: ${file.Info.Width}x${file.Info.Height} (${actualRatio.toFixed(2)})`
|
|
103
|
+
}]);
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
validateResolution(file) {
|
|
108
|
+
if (!this.Rules.resolution) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
if (!file.Info.Width || !file.Info.Height) {
|
|
112
|
+
throw new ValidationFailed('validation error', [{
|
|
113
|
+
instancePath: '/file',
|
|
114
|
+
schemaPath: '#/properties/file/resolution',
|
|
115
|
+
keyword: 'resolution',
|
|
116
|
+
params: {},
|
|
117
|
+
message: 'Unable to read image dimensions from file metadata'
|
|
118
|
+
}]);
|
|
119
|
+
}
|
|
120
|
+
if (file.Info.Width < this.Rules.resolution?.minWidth) {
|
|
121
|
+
throw new ValidationFailed('validation error', [{
|
|
122
|
+
instancePath: '/file/width',
|
|
123
|
+
schemaPath: '#/properties/file/resolution/width',
|
|
124
|
+
keyword: 'resolution',
|
|
125
|
+
params: { expected: this.Rules.resolution?.minWidth, actual: file.Info.Width },
|
|
126
|
+
message: `Image width must be greater than ${this.Rules.resolution?.minWidth}px. Got: ${file.Info.Width}px`
|
|
127
|
+
}]);
|
|
128
|
+
}
|
|
129
|
+
if (file.Info.Height < this.Rules.resolution?.minHeight) {
|
|
130
|
+
throw new ValidationFailed('validation error', [{
|
|
131
|
+
instancePath: '/file/height',
|
|
132
|
+
schemaPath: '#/properties/file/resolution/height',
|
|
133
|
+
keyword: 'resolution',
|
|
134
|
+
params: { expected: this.Rules.resolution?.minHeight, actual: file.Info.Height },
|
|
135
|
+
message: `Image height must be greater than ${this.Rules.resolution?.minHeight}px. Got: ${file.Info.Height}px`
|
|
136
|
+
}]);
|
|
137
|
+
}
|
|
138
|
+
if (file.Info.Height > this.Rules.resolution?.maxHeight) {
|
|
139
|
+
throw new ValidationFailed('validation error', [{
|
|
140
|
+
instancePath: '/file/height',
|
|
141
|
+
schemaPath: '#/properties/file/resolution/height',
|
|
142
|
+
keyword: 'resolution',
|
|
143
|
+
params: { expected: this.Rules.resolution?.maxHeight, actual: file.Info.Height },
|
|
144
|
+
message: `Image height must be lower than ${this.Rules.resolution?.maxHeight}px. Got: ${file.Info.Height}px`
|
|
145
|
+
}]);
|
|
146
|
+
}
|
|
147
|
+
if (file.Info.Width > this.Rules.resolution?.maxWidth) {
|
|
148
|
+
throw new ValidationFailed('validation error', [{
|
|
149
|
+
instancePath: '/file/width',
|
|
150
|
+
schemaPath: '#/properties/file/resolution/width',
|
|
151
|
+
keyword: 'resolution',
|
|
152
|
+
params: { expected: this.Rules.resolution?.maxWidth, actual: file.Info.Width },
|
|
153
|
+
message: `Image width must be lower than ${this.Rules.resolution?.maxWidth}px. Got: ${file.Info.Width}px`
|
|
154
|
+
}]);
|
|
155
|
+
}
|
|
156
|
+
if (file.Info.Height > this.Rules.resolution?.maxHeight) {
|
|
157
|
+
throw new ValidationFailed('validation error', [{
|
|
158
|
+
instancePath: '/file/height',
|
|
159
|
+
schemaPath: '#/properties/file/resolution/height',
|
|
160
|
+
keyword: 'resolution',
|
|
161
|
+
params: { expected: this.Rules.resolution?.maxHeight, actual: file.Info.Height },
|
|
162
|
+
message: `Image height must be lower than ${this.Rules.resolution?.maxHeight}px. Got: ${file.Info.Height}px`
|
|
163
|
+
}]);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
};
|
|
167
|
+
__decorate([
|
|
168
|
+
Logger('http'),
|
|
169
|
+
__metadata("design:type", Log)
|
|
170
|
+
], FileValidationMiddleware.prototype, "Log", void 0);
|
|
171
|
+
FileValidationMiddleware = __decorate([
|
|
172
|
+
Injectable(),
|
|
173
|
+
Singleton(),
|
|
174
|
+
__metadata("design:paramtypes", [Object])
|
|
175
|
+
], FileValidationMiddleware);
|
|
176
|
+
export { FileValidationMiddleware };
|
|
177
|
+
//# sourceMappingURL=validation.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/file-middlewares/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { FileUploadMiddleware, IUploadedFile } from "../interfaces.js";
|
|
2
|
+
import { Log } from "@spinajs/log-common";
|
|
3
|
+
export declare class ZipFileTransformer extends FileUploadMiddleware {
|
|
4
|
+
protected Log: Log;
|
|
5
|
+
beforeUpload(file: IUploadedFile<any>): Promise<IUploadedFile<any>>;
|
|
6
|
+
}
|
|
7
|
+
//# sourceMappingURL=zip.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zip.d.ts","sourceRoot":"","sources":["../../../src/file-middlewares/zip.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;AAGlD,qBAEa,kBAAmB,SAAQ,oBAAoB;IAExD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEN,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CAkCnF"}
|
|
@@ -7,12 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
7
7
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
|
-
import { Injectable } from "@spinajs/di";
|
|
11
|
-
import {
|
|
10
|
+
import { Injectable, Singleton } from "@spinajs/di";
|
|
11
|
+
import { FileUploadMiddleware } from "../interfaces.js";
|
|
12
12
|
import { Log, Logger } from "@spinajs/log-common";
|
|
13
13
|
import Path from 'path';
|
|
14
|
-
let ZipFileTransformer = class ZipFileTransformer extends
|
|
15
|
-
async
|
|
14
|
+
let ZipFileTransformer = class ZipFileTransformer extends FileUploadMiddleware {
|
|
15
|
+
async beforeUpload(file) {
|
|
16
16
|
const originalName = file.BaseName;
|
|
17
17
|
const originalSize = file.Size;
|
|
18
18
|
try {
|
|
@@ -46,7 +46,8 @@ __decorate([
|
|
|
46
46
|
__metadata("design:type", Log)
|
|
47
47
|
], ZipFileTransformer.prototype, "Log", void 0);
|
|
48
48
|
ZipFileTransformer = __decorate([
|
|
49
|
-
Injectable()
|
|
49
|
+
Injectable(),
|
|
50
|
+
Singleton()
|
|
50
51
|
], ZipFileTransformer);
|
|
51
52
|
export { ZipFileTransformer };
|
|
52
53
|
//# sourceMappingURL=zip.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"zip.js","sourceRoot":"","sources":["../../../src/file-middlewares/zip.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAAiB,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,IAAI,MAAM,MAAM,CAAC;AAIjB,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,oBAAoB;IAIjD,KAAK,CAAC,YAAY,CAAC,IAAwB;QAC9C,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC;QACnC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC;QAE/B,IAAI,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,YAAY,EAAE,CAAC,CAAA;YAE3C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACpE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;YAE3D,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,YAAY,OAAO,MAAM,CAAC,UAAU,EAAE,eAAe,QAAQ,IAAI,CAAC,CAAC;YAEvG,OAAO;gBACH,GAAG,IAAI;gBACP,QAAQ,EAAE,MAAM,CAAC,UAAU,EAAE;gBAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,IAAI,EAAE,iBAAiB;gBACvB,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,MAAM;gBACzC,IAAI,EAAE;oBACF,YAAY,EAAE,YAAY;oBAC1B,YAAY,EAAE,YAAY;iBAC7B;aACJ,CAAA;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACd,CAAC;gBACO,CAAC;YACL,MAAM,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC;QACzC,CAAC;IAGL,CAAC;CAEJ,CAAA;AApCa;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;+CAAC;AAFV,kBAAkB;IAF9B,UAAU,EAAE;IACZ,SAAS,EAAE;GACC,kBAAkB,CAsC9B"}
|
package/lib/mjs/index.d.ts
CHANGED
|
@@ -6,6 +6,6 @@ export * from './route-args/index.js';
|
|
|
6
6
|
export * from './controllers.js';
|
|
7
7
|
export * from './server.js';
|
|
8
8
|
export * from './transformers/index.js';
|
|
9
|
-
export * from './file-
|
|
9
|
+
export * from './file-middlewares/index.js';
|
|
10
10
|
export * from './bootstrap.js';
|
|
11
11
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/mjs/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC"}
|
package/lib/mjs/index.js
CHANGED
|
@@ -6,6 +6,6 @@ export * from './route-args/index.js';
|
|
|
6
6
|
export * from './controllers.js';
|
|
7
7
|
export * from './server.js';
|
|
8
8
|
export * from './transformers/index.js';
|
|
9
|
-
export * from './file-
|
|
9
|
+
export * from './file-middlewares/index.js';
|
|
10
10
|
export * from './bootstrap.js';
|
|
11
11
|
//# sourceMappingURL=index.js.map
|
package/lib/mjs/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC"}
|
package/lib/mjs/interfaces.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as express from 'express';
|
|
2
2
|
import { Constructor, AsyncService, Class } from '@spinajs/di';
|
|
3
|
-
import { fs } from '@spinajs/fs';
|
|
3
|
+
import { fs, IFileInfo } from '@spinajs/fs';
|
|
4
4
|
import formidable from 'formidable';
|
|
5
5
|
import { CookieOptions } from 'express';
|
|
6
6
|
/**
|
|
@@ -76,6 +76,48 @@ export interface IHttpStaticFileConfiguration {
|
|
|
76
76
|
*/
|
|
77
77
|
Path: string;
|
|
78
78
|
}
|
|
79
|
+
export declare enum FileTypeEnum {
|
|
80
|
+
jpeg = "jpeg",
|
|
81
|
+
jpg = "jpg",
|
|
82
|
+
png = "png",
|
|
83
|
+
gif = "gif",
|
|
84
|
+
mp4 = "mp4",
|
|
85
|
+
mov = "mov",
|
|
86
|
+
mp3 = "mp3",
|
|
87
|
+
wav = "wav",
|
|
88
|
+
pdf = "pdf",
|
|
89
|
+
doc = "doc",
|
|
90
|
+
docx = "docx",
|
|
91
|
+
xls = "xls",
|
|
92
|
+
xlsx = "xlsx",
|
|
93
|
+
ppt = "ppt",
|
|
94
|
+
pptx = "pptx",
|
|
95
|
+
txt = "txt",
|
|
96
|
+
zip = "zip",
|
|
97
|
+
any = "any"
|
|
98
|
+
}
|
|
99
|
+
export declare enum FileProportions {
|
|
100
|
+
'16:9' = "16:9",
|
|
101
|
+
'4:3' = "4:3",
|
|
102
|
+
'1:1' = "1:1",
|
|
103
|
+
'3:4' = "3:4",
|
|
104
|
+
'9:16' = "9:16",
|
|
105
|
+
'Free' = "Free"
|
|
106
|
+
}
|
|
107
|
+
export interface FileValidationRules {
|
|
108
|
+
resolution?: {
|
|
109
|
+
minWidth?: number;
|
|
110
|
+
maxWidth?: number;
|
|
111
|
+
minHeight?: number;
|
|
112
|
+
maxHeight?: number;
|
|
113
|
+
};
|
|
114
|
+
proportions?: FileProportions[];
|
|
115
|
+
types?: FileTypeEnum[];
|
|
116
|
+
}
|
|
117
|
+
export type UploadFileMiddlewareDescriptor = string | Class<FileUploadMiddleware> | {
|
|
118
|
+
options: any;
|
|
119
|
+
service: string | Class<FileUploadMiddleware>;
|
|
120
|
+
};
|
|
79
121
|
/**
|
|
80
122
|
* Uploaded file fields
|
|
81
123
|
*/
|
|
@@ -106,6 +148,10 @@ export interface IUploadedFile<T = any> {
|
|
|
106
148
|
* Additional data filled by middlewares if needed
|
|
107
149
|
*/
|
|
108
150
|
Data?: T;
|
|
151
|
+
/**
|
|
152
|
+
* File info obtained during upload when fileInfo option is set
|
|
153
|
+
*/
|
|
154
|
+
Info?: IFileInfo;
|
|
109
155
|
/**
|
|
110
156
|
* Formidable original file data
|
|
111
157
|
*/
|
|
@@ -121,8 +167,8 @@ export interface Request extends express.Request {
|
|
|
121
167
|
export declare abstract class FormFileUploader {
|
|
122
168
|
abstract upload(file: IUploadedFile): Promise<IUploadedFile>;
|
|
123
169
|
}
|
|
124
|
-
export declare abstract class
|
|
125
|
-
abstract
|
|
170
|
+
export declare abstract class FileUploadMiddleware {
|
|
171
|
+
abstract beforeUpload(file: IUploadedFile, options?: IUploadOptions): Promise<IUploadedFile>;
|
|
126
172
|
}
|
|
127
173
|
export interface IActionLocalStoregeContext {
|
|
128
174
|
requestId: string;
|
|
@@ -372,10 +418,10 @@ export interface IUploadOptions {
|
|
|
372
418
|
service: string | Class<FormFileUploader>;
|
|
373
419
|
};
|
|
374
420
|
/**
|
|
375
|
-
* File
|
|
376
|
-
*
|
|
421
|
+
* File middlewares, eg. after upload file can be transformed to other format or zipped.
|
|
422
|
+
* Middlewares are executed before file is uploaded to final destination by uploader
|
|
377
423
|
*/
|
|
378
|
-
|
|
424
|
+
middlewares?: UploadFileMiddlewareDescriptor[];
|
|
379
425
|
/**
|
|
380
426
|
* File system provider used to upload files. Default is taken from configuration - __file_upload_default_provider__
|
|
381
427
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAa,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"interfaces.d.ts","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"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"}
|
package/lib/mjs/interfaces.js
CHANGED
|
@@ -35,13 +35,43 @@ export var HttpAcceptHeaders;
|
|
|
35
35
|
*/
|
|
36
36
|
HttpAcceptHeaders[HttpAcceptHeaders["ALL"] = 7] = "ALL";
|
|
37
37
|
})(HttpAcceptHeaders || (HttpAcceptHeaders = {}));
|
|
38
|
+
export var FileTypeEnum;
|
|
39
|
+
(function (FileTypeEnum) {
|
|
40
|
+
FileTypeEnum["jpeg"] = "jpeg";
|
|
41
|
+
FileTypeEnum["jpg"] = "jpg";
|
|
42
|
+
FileTypeEnum["png"] = "png";
|
|
43
|
+
FileTypeEnum["gif"] = "gif";
|
|
44
|
+
FileTypeEnum["mp4"] = "mp4";
|
|
45
|
+
FileTypeEnum["mov"] = "mov";
|
|
46
|
+
FileTypeEnum["mp3"] = "mp3";
|
|
47
|
+
FileTypeEnum["wav"] = "wav";
|
|
48
|
+
FileTypeEnum["pdf"] = "pdf";
|
|
49
|
+
FileTypeEnum["doc"] = "doc";
|
|
50
|
+
FileTypeEnum["docx"] = "docx";
|
|
51
|
+
FileTypeEnum["xls"] = "xls";
|
|
52
|
+
FileTypeEnum["xlsx"] = "xlsx";
|
|
53
|
+
FileTypeEnum["ppt"] = "ppt";
|
|
54
|
+
FileTypeEnum["pptx"] = "pptx";
|
|
55
|
+
FileTypeEnum["txt"] = "txt";
|
|
56
|
+
FileTypeEnum["zip"] = "zip";
|
|
57
|
+
FileTypeEnum["any"] = "any";
|
|
58
|
+
})(FileTypeEnum || (FileTypeEnum = {}));
|
|
59
|
+
export var FileProportions;
|
|
60
|
+
(function (FileProportions) {
|
|
61
|
+
FileProportions["16:9"] = "16:9";
|
|
62
|
+
FileProportions["4:3"] = "4:3";
|
|
63
|
+
FileProportions["1:1"] = "1:1";
|
|
64
|
+
FileProportions["3:4"] = "3:4";
|
|
65
|
+
FileProportions["9:16"] = "9:16";
|
|
66
|
+
FileProportions["Free"] = "Free";
|
|
67
|
+
})(FileProportions || (FileProportions = {}));
|
|
38
68
|
/**
|
|
39
69
|
* File upload provider, used to copy incoming formidable
|
|
40
70
|
* file to desired location eg. local, aws s3 etc.
|
|
41
71
|
*/
|
|
42
72
|
export class FormFileUploader {
|
|
43
73
|
}
|
|
44
|
-
export class
|
|
74
|
+
export class FileUploadMiddleware {
|
|
45
75
|
}
|
|
46
76
|
export class ServerMiddleware extends AsyncService {
|
|
47
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,YAAY,EAAS,SAAS,EAAE,MAAM,aAAa,CAAC;AAI1E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C;;GAEG;AACH,MAAM,CAAN,IAAY,iBAqCX;AArCD,WAAY,iBAAiB;IAC3B;;OAEG;IACH,yDAAQ,CAAA;IAER;;OAEG;IACH,yDAAQ,CAAA;IAER;;OAEG;IACH,uDAAO,CAAA;IAEP;;OAEG;IACH,yDAAQ,CAAA;IAER;;OAEG;IACH,4DAAU,CAAA;IAEV,wDAAQ,CAAA;IAER;;OAEG;IACH,4DAAU,CAAA;IAEV;;OAEG;IACH,uDAAe,CAAA;AACjB,CAAC,EArCW,iBAAiB,KAAjB,iBAAiB,QAqC5B;
|
|
1
|
+
{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../src/interfaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IRouteArgsResult, RouteArgs } from './RouteArgs.js';
|
|
2
|
-
import { IRouteParameter, ParameterType, IRouteCall, Request, IRoute, IUploadOptions } from '../interfaces.js';
|
|
2
|
+
import { IRouteParameter, ParameterType, IRouteCall, Request, IRoute, IUploadOptions, UploadFileMiddlewareDescriptor } from '../interfaces.js';
|
|
3
3
|
import * as express from 'express';
|
|
4
4
|
import { Fields, Files } from 'formidable';
|
|
5
5
|
import { Configuration } from '@spinajs/configuration';
|
|
@@ -36,6 +36,7 @@ export declare class FromFile extends FromFormBase {
|
|
|
36
36
|
Priority?: number;
|
|
37
37
|
protected Log: Log;
|
|
38
38
|
protected DefaultFsProviderName: string;
|
|
39
|
+
protected DefaultFileMiddlewares: UploadFileMiddlewareDescriptor[];
|
|
39
40
|
get SupportedType(): ParameterType;
|
|
40
41
|
constructor(FormData: FormData);
|
|
41
42
|
extract(callData: IRouteCall, _args: unknown[], param: IRouteParameter<IUploadOptions>, req: Request, res: express.Response, route?: IRoute): Promise<any>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FromForm.d.ts","sourceRoot":"","sources":["../../../src/route-args/FromForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"FromForm.d.ts","sourceRoot":"","sources":["../../../src/route-args/FromForm.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,7 +72,8 @@ let FromFile = class FromFile extends FromFormBase {
|
|
|
72
72
|
async extract(callData, _args, param, req, res, route) {
|
|
73
73
|
// copy to provided fs or default temp fs
|
|
74
74
|
// delete intermediate files ( from express ) regardless of copy result
|
|
75
|
-
const
|
|
75
|
+
const uploadOptions = param.Options ?? {};
|
|
76
|
+
const fsName = uploadOptions.fs ? uploadOptions.fs : '__file_upload_default_provider__';
|
|
76
77
|
const uploadFs = DI.resolve('__file_provider__', [fsName]);
|
|
77
78
|
// extract form data if not processed already
|
|
78
79
|
// and prepare result object
|
|
@@ -80,7 +81,7 @@ let FromFile = class FromFile extends FromFormBase {
|
|
|
80
81
|
// get incoming files
|
|
81
82
|
const { Files } = this.FormData;
|
|
82
83
|
const files = toArray(Files[param.Name]);
|
|
83
|
-
if (
|
|
84
|
+
if (uploadOptions.required && files.length === 0) {
|
|
84
85
|
throw new ValidationFailed(`File ${param.Name} is required`, [
|
|
85
86
|
{
|
|
86
87
|
propertyName: param.Name,
|
|
@@ -106,19 +107,28 @@ let FromFile = class FromFile extends FromFormBase {
|
|
|
106
107
|
return uploadedFile;
|
|
107
108
|
});
|
|
108
109
|
let uFiles = uplFiles;
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
110
|
+
const middlewareDescriptors = [
|
|
111
|
+
...(this.DefaultFileMiddlewares ?? []),
|
|
112
|
+
...(uploadOptions.middlewares ?? []),
|
|
113
|
+
];
|
|
114
|
+
const middlewares = middlewareDescriptors.map((m) => {
|
|
115
|
+
if (typeof m === 'string' || typeof m === 'function') {
|
|
116
|
+
return DI.resolve(m);
|
|
117
|
+
}
|
|
118
|
+
const { service, options } = m;
|
|
119
|
+
return DI.resolve(service, [options]);
|
|
120
|
+
});
|
|
121
|
+
for (const m of middlewares) {
|
|
113
122
|
for (const f of uplFiles) {
|
|
114
|
-
|
|
123
|
+
this.Log.trace(`Executing file middleware ${m.constructor.name} for file ${f.Name}`);
|
|
124
|
+
const result = await m.beforeUpload(f, uploadOptions);
|
|
115
125
|
// merge transform result
|
|
116
126
|
Object.assign(f, result);
|
|
117
127
|
}
|
|
118
128
|
}
|
|
119
|
-
if (
|
|
120
|
-
const type =
|
|
121
|
-
const options =
|
|
129
|
+
if (uploadOptions.uploader) {
|
|
130
|
+
const type = uploadOptions.uploader.service ?? uploadOptions.uploader;
|
|
131
|
+
const options = uploadOptions.uploader.options ?? {};
|
|
122
132
|
const fu = DI.resolve(type, [options]);
|
|
123
133
|
const pResults = await Promise.allSettled(uplFiles.map((f) => fu.upload(f)));
|
|
124
134
|
uFiles = pResults.filter((r) => r.status === 'fulfilled').map((r) => r.value);
|
|
@@ -136,6 +146,12 @@ __decorate([
|
|
|
136
146
|
Config('fs.defaultProvider'),
|
|
137
147
|
__metadata("design:type", String)
|
|
138
148
|
], FromFile.prototype, "DefaultFsProviderName", void 0);
|
|
149
|
+
__decorate([
|
|
150
|
+
Config('http.upload.middlewares', {
|
|
151
|
+
defaultValue: [{ service: 'FileInfoMiddleware' }]
|
|
152
|
+
}),
|
|
153
|
+
__metadata("design:type", Array)
|
|
154
|
+
], FromFile.prototype, "DefaultFileMiddlewares", void 0);
|
|
139
155
|
FromFile = __decorate([
|
|
140
156
|
Injectable(),
|
|
141
157
|
NewInstance(),
|