@spinajs/http 2.0.432 → 2.0.434
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/file-middlewares/info.d.ts +2 -0
- package/lib/cjs/file-middlewares/info.d.ts.map +1 -1
- package/lib/cjs/file-middlewares/info.js +9 -4
- package/lib/cjs/file-middlewares/info.js.map +1 -1
- package/lib/cjs/file-middlewares/validation.js +1 -1
- package/lib/cjs/file-middlewares/validation.js.map +1 -1
- package/lib/cjs/route-args/FromForm.d.ts +2 -3
- package/lib/cjs/route-args/FromForm.d.ts.map +1 -1
- package/lib/cjs/route-args/FromForm.js +26 -7
- package/lib/cjs/route-args/FromForm.js.map +1 -1
- package/lib/cjs/uploaders/ImmediateFileUploader.d.ts +5 -2
- package/lib/cjs/uploaders/ImmediateFileUploader.d.ts.map +1 -1
- package/lib/cjs/uploaders/ImmediateFileUploader.js +8 -9
- package/lib/cjs/uploaders/ImmediateFileUploader.js.map +1 -1
- package/lib/mjs/file-middlewares/info.d.ts +2 -0
- package/lib/mjs/file-middlewares/info.d.ts.map +1 -1
- package/lib/mjs/file-middlewares/info.js +10 -5
- package/lib/mjs/file-middlewares/info.js.map +1 -1
- package/lib/mjs/file-middlewares/validation.js +2 -2
- package/lib/mjs/file-middlewares/validation.js.map +1 -1
- package/lib/mjs/route-args/FromForm.d.ts +2 -3
- package/lib/mjs/route-args/FromForm.d.ts.map +1 -1
- package/lib/mjs/route-args/FromForm.js +28 -9
- package/lib/mjs/route-args/FromForm.js.map +1 -1
- package/lib/mjs/uploaders/ImmediateFileUploader.d.ts +5 -2
- package/lib/mjs/uploaders/ImmediateFileUploader.d.ts.map +1 -1
- package/lib/mjs/uploaders/ImmediateFileUploader.js +9 -10
- package/lib/mjs/uploaders/ImmediateFileUploader.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/package.json +11 -11
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { FileUploadMiddleware, IUploadedFile, IUploadOptions } from "../interfaces.js";
|
|
2
2
|
import { Log } from "@spinajs/log-common";
|
|
3
|
+
import { FileInfoService } from "@spinajs/fs";
|
|
3
4
|
/**
|
|
4
5
|
* Middleware that retrieves file info after upload
|
|
5
6
|
*/
|
|
6
7
|
export declare class FileInfoMiddleware extends FileUploadMiddleware {
|
|
7
8
|
protected Log: Log;
|
|
9
|
+
protected FileInfo: FileInfoService;
|
|
8
10
|
beforeUpload(file: IUploadedFile<any>, paramOptions: IUploadOptions): Promise<any>;
|
|
9
11
|
}
|
|
10
12
|
//# sourceMappingURL=info.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../src/file-middlewares/info.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../src/file-middlewares/info.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C;;GAEG;AACH,qBAEa,kBAAmB,SAAQ,oBAAoB;IAExD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,QAAQ,EAAG,eAAe,CAAC;IAExB,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC;CAqBlG"}
|
|
@@ -13,6 +13,7 @@ exports.FileInfoMiddleware = void 0;
|
|
|
13
13
|
const di_1 = require("@spinajs/di");
|
|
14
14
|
const interfaces_js_1 = require("../interfaces.js");
|
|
15
15
|
const log_common_1 = require("@spinajs/log-common");
|
|
16
|
+
const fs_1 = require("@spinajs/fs");
|
|
16
17
|
/**
|
|
17
18
|
* Middleware that retrieves file info after upload
|
|
18
19
|
*/
|
|
@@ -21,14 +22,14 @@ let FileInfoMiddleware = class FileInfoMiddleware extends interfaces_js_1.FileUp
|
|
|
21
22
|
/**
|
|
22
23
|
* Only if option is set
|
|
23
24
|
*/
|
|
24
|
-
if (
|
|
25
|
-
if (!
|
|
26
|
-
this.Log.warn(`
|
|
25
|
+
if (paramOptions.fileInfo) {
|
|
26
|
+
if (!this.FileInfo) {
|
|
27
|
+
this.Log.warn(`FileInfo service not available, cannot retrieve file info for uploaded file ${file.Name}.`);
|
|
27
28
|
return file;
|
|
28
29
|
}
|
|
29
30
|
return {
|
|
30
31
|
...file,
|
|
31
|
-
Info: await
|
|
32
|
+
Info: await this.FileInfo.getInfo(file.OriginalFile.filepath)
|
|
32
33
|
};
|
|
33
34
|
}
|
|
34
35
|
return file;
|
|
@@ -39,6 +40,10 @@ __decorate([
|
|
|
39
40
|
(0, log_common_1.Logger)('http'),
|
|
40
41
|
__metadata("design:type", log_common_1.Log)
|
|
41
42
|
], FileInfoMiddleware.prototype, "Log", void 0);
|
|
43
|
+
__decorate([
|
|
44
|
+
(0, di_1.Autoinject)(),
|
|
45
|
+
__metadata("design:type", fs_1.FileInfoService)
|
|
46
|
+
], FileInfoMiddleware.prototype, "FileInfo", void 0);
|
|
42
47
|
exports.FileInfoMiddleware = FileInfoMiddleware = __decorate([
|
|
43
48
|
(0, di_1.Injectable)(),
|
|
44
49
|
(0, di_1.Singleton)()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../src/file-middlewares/info.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../src/file-middlewares/info.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAgE;AAChE,oDAAuF;AACvF,oDAAkD;AAClD,oCAA8C;AAG9C;;GAEG;AAGI,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,oCAAoB;IAOjD,KAAK,CAAC,YAAY,CAAC,IAAwB,EAAE,YAA4B;QAE5E;;WAEG;QACH,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;YAExB,IAAG,CAAC,IAAI,CAAC,QAAQ,EAAC,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+EAA+E,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;gBAC3G,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,OAAO;gBACH,GAAG,IAAI;gBACP,IAAI,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;aAChE,CAAA;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAEhB,CAAC;CACJ,CAAA;AA5BY,gDAAkB;AAEjB;IADT,IAAA,mBAAM,EAAC,MAAM,CAAC;8BACA,gBAAG;+CAAC;AAGT;IADT,IAAA,eAAU,GAAE;8BACQ,oBAAe;oDAAC;6BAL5B,kBAAkB;IAF9B,IAAA,eAAU,GAAE;IACZ,IAAA,cAAS,GAAE;GACC,kBAAkB,CA4B9B"}
|
|
@@ -174,7 +174,7 @@ __decorate([
|
|
|
174
174
|
], FileValidationMiddleware.prototype, "Log", void 0);
|
|
175
175
|
exports.FileValidationMiddleware = FileValidationMiddleware = __decorate([
|
|
176
176
|
(0, di_1.Injectable)(),
|
|
177
|
-
(0, di_1.
|
|
177
|
+
(0, di_1.NewInstance)(),
|
|
178
178
|
__metadata("design:paramtypes", [Object])
|
|
179
179
|
], FileValidationMiddleware);
|
|
180
180
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/file-middlewares/validation.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/file-middlewares/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,14 +28,13 @@ export interface FormOptions {
|
|
|
28
28
|
}
|
|
29
29
|
export declare abstract class FromFormBase extends RouteArgs {
|
|
30
30
|
FormData: FormData;
|
|
31
|
-
|
|
31
|
+
protected DefaultUploadFs: fs;
|
|
32
|
+
extract(callData: IRouteCall, _args: unknown[], routeParameter: IRouteParameter, req: Request, _res: express.Response, _route?: IRoute): Promise<IRouteArgsResult>;
|
|
32
33
|
}
|
|
33
34
|
export declare class FromFile extends FromFormBase {
|
|
34
35
|
FormData: FormData;
|
|
35
|
-
protected FileService: fs;
|
|
36
36
|
Priority?: number;
|
|
37
37
|
protected Log: Log;
|
|
38
|
-
protected DefaultFsProviderName: string;
|
|
39
38
|
protected DefaultFileMiddlewares: UploadFileMiddlewareDescriptor[];
|
|
40
39
|
get SupportedType(): ParameterType;
|
|
41
40
|
constructor(FormData: FormData);
|
|
@@ -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,EAAyD,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AACtM,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAmB,EAAE,MAAM,EAAE,KAAK,EAAgB,MAAM,YAAY,CAAC;AACrE,OAAO,EAAU,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAE,EAAE,EAAY,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"FromForm.d.ts","sourceRoot":"","sources":["../../../src/route-args/FromForm.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,8 @@ const util_1 = require("@spinajs/util");
|
|
|
24
24
|
const validation_1 = require("@spinajs/validation");
|
|
25
25
|
const exceptions_js_1 = require("../exceptions.js");
|
|
26
26
|
const exceptions_1 = require("@spinajs/exceptions");
|
|
27
|
+
const fs_3 = require("@spinajs/fs");
|
|
28
|
+
const ImmediateFileUploader_js_1 = require("../uploaders/ImmediateFileUploader.js");
|
|
27
29
|
const parseForm = (req, options) => {
|
|
28
30
|
const form = new formidable_1.IncomingForm(options);
|
|
29
31
|
return new Promise((res, rej) => {
|
|
@@ -43,11 +45,20 @@ const parseForm = (req, options) => {
|
|
|
43
45
|
});
|
|
44
46
|
};
|
|
45
47
|
class FromFormBase extends RouteArgs_js_1.RouteArgs {
|
|
46
|
-
async extract(callData, _args, routeParameter, req, _res, _route
|
|
48
|
+
async extract(callData, _args, routeParameter, req, _res, _route) {
|
|
47
49
|
if (!this.FormData) {
|
|
50
|
+
if (this.DefaultUploadFs === null) {
|
|
51
|
+
throw new exceptions_1.IOFail('Default upload fs provider not available. Please check fs.providers for __file_upload_default_provider__ provider.');
|
|
52
|
+
}
|
|
53
|
+
if (!(this.DefaultUploadFs instanceof fs_1.fsNative)) {
|
|
54
|
+
throw new exceptions_1.IOFail('Default upload fs provider is not native fs. Form upload requires local file system provider becouse it needs to store files locally before processing.');
|
|
55
|
+
}
|
|
56
|
+
if (!this.DefaultUploadFs.Options || !this.DefaultUploadFs.Options.basePath) {
|
|
57
|
+
throw new exceptions_1.IOFail('Default upload fs provider base path not set. Please check fs.providers for __file_upload_default_provider__ provider.');
|
|
58
|
+
}
|
|
48
59
|
const options = {
|
|
49
60
|
...routeParameter.Options,
|
|
50
|
-
uploadDir:
|
|
61
|
+
uploadDir: this.DefaultUploadFs.Options.basePath,
|
|
51
62
|
};
|
|
52
63
|
this.FormData = callData?.Payload?.Form ?? (await parseForm(req, options));
|
|
53
64
|
}
|
|
@@ -64,6 +75,10 @@ class FromFormBase extends RouteArgs_js_1.RouteArgs {
|
|
|
64
75
|
}
|
|
65
76
|
}
|
|
66
77
|
exports.FromFormBase = FromFormBase;
|
|
78
|
+
__decorate([
|
|
79
|
+
(0, fs_3.FileSystem)('__file_upload_default_provider__'),
|
|
80
|
+
__metadata("design:type", fs_1.fs)
|
|
81
|
+
], FromFormBase.prototype, "DefaultUploadFs", void 0);
|
|
67
82
|
let FromFile = class FromFile extends FromFormBase {
|
|
68
83
|
get SupportedType() {
|
|
69
84
|
return interfaces_js_1.ParameterType.FromFile;
|
|
@@ -81,7 +96,7 @@ let FromFile = class FromFile extends FromFormBase {
|
|
|
81
96
|
const uploadFs = di_1.DI.resolve('__file_provider__', [fsName]);
|
|
82
97
|
// extract form data if not processed already
|
|
83
98
|
// and prepare result object
|
|
84
|
-
const result = await super.extract(callData, _args, param, req, res, route
|
|
99
|
+
const result = await super.extract(callData, _args, param, req, res, route);
|
|
85
100
|
// get incoming files
|
|
86
101
|
const { Files } = this.FormData;
|
|
87
102
|
const files = (0, util_1.toArray)(Files[param.Name]);
|
|
@@ -130,6 +145,14 @@ let FromFile = class FromFile extends FromFormBase {
|
|
|
130
145
|
Object.assign(f, result);
|
|
131
146
|
}
|
|
132
147
|
}
|
|
148
|
+
// copy to target fs if different than default temp fs
|
|
149
|
+
if (uploadFs && this.DefaultUploadFs.Name !== uploadFs.Name) {
|
|
150
|
+
const fu = di_1.DI.resolve(ImmediateFileUploader_js_1.ImmediateFileUploader, [{ sourceFs: this.DefaultUploadFs, deleteSource: true }]);
|
|
151
|
+
const pResults = await Promise.allSettled(uplFiles.map((f) => fu.upload(f)));
|
|
152
|
+
uFiles = pResults.filter((r) => r.status === 'fulfilled').map((r) => r.value);
|
|
153
|
+
}
|
|
154
|
+
// if any uploader is set in options, use it to upload files
|
|
155
|
+
// additionaly
|
|
133
156
|
if (uploadOptions.uploader) {
|
|
134
157
|
const type = uploadOptions.uploader.service ?? uploadOptions.uploader;
|
|
135
158
|
const options = uploadOptions.uploader.options ?? {};
|
|
@@ -147,10 +170,6 @@ __decorate([
|
|
|
147
170
|
(0, log_common_1.Logger)('http'),
|
|
148
171
|
__metadata("design:type", log_common_1.Log)
|
|
149
172
|
], FromFile.prototype, "Log", void 0);
|
|
150
|
-
__decorate([
|
|
151
|
-
(0, configuration_1.Config)('fs.defaultProvider'),
|
|
152
|
-
__metadata("design:type", String)
|
|
153
|
-
], FromFile.prototype, "DefaultFsProviderName", void 0);
|
|
154
173
|
__decorate([
|
|
155
174
|
(0, configuration_1.Config)('http.upload.middlewares', {
|
|
156
175
|
defaultValue: [{ service: 'FileInfoMiddleware' }]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FromForm.js","sourceRoot":"","sources":["../../../src/route-args/FromForm.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"FromForm.js","sourceRoot":"","sources":["../../../src/route-args/FromForm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import { FormFileUploader, IUploadedFile } from '../interfaces.js';
|
|
2
|
+
import { fs } from '@spinajs/fs';
|
|
2
3
|
import { Log } from '@spinajs/log-common';
|
|
3
4
|
export declare class ImmediateFileUploader extends FormFileUploader {
|
|
4
5
|
Options: {
|
|
5
|
-
|
|
6
|
+
deleteSource?: boolean;
|
|
7
|
+
sourceFs?: fs;
|
|
6
8
|
};
|
|
7
9
|
protected Log: Log;
|
|
8
10
|
constructor(Options: {
|
|
9
|
-
|
|
11
|
+
deleteSource?: boolean;
|
|
12
|
+
sourceFs?: fs;
|
|
10
13
|
});
|
|
11
14
|
upload(file: IUploadedFile<unknown>): Promise<IUploadedFile<unknown>>;
|
|
12
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImmediateFileUploader.d.ts","sourceRoot":"","sources":["../../../src/uploaders/ImmediateFileUploader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"ImmediateFileUploader.d.ts","sourceRoot":"","sources":["../../../src/uploaders/ImmediateFileUploader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;AAGlD,qBAEa,qBAAsB,SAAQ,gBAAgB;IAItC,OAAO,EAAE;QAAE,YAAY,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,EAAE,CAAA;KAAE;IAFrE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;gBAEA,OAAO,EAAE;QAAE,YAAY,CAAC,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,EAAE,CAAA;KAAE;IAG/D,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC;CAsB1C"}
|
|
@@ -20,22 +20,21 @@ let ImmediateFileUploader = class ImmediateFileUploader extends interfaces_js_1.
|
|
|
20
20
|
this.Options = Options;
|
|
21
21
|
}
|
|
22
22
|
async upload(file) {
|
|
23
|
-
const fs = di_1.DI.resolve('__file_provider__', [this.Options.fs]);
|
|
24
|
-
if (!fs) {
|
|
25
|
-
throw new exceptions_1.IOFail(`Filesystem ${this.Options.fs} not exists, pleas check your configuration`);
|
|
26
|
-
}
|
|
27
23
|
// if its the same - do nothing
|
|
28
|
-
if (
|
|
24
|
+
if (this.Options.sourceFs?.Name === file.Provider.Name) {
|
|
29
25
|
return;
|
|
30
26
|
}
|
|
31
27
|
try {
|
|
32
|
-
await
|
|
33
|
-
this.Log.trace(`Uploaded incoming file ${file.OriginalFile.filepath} to ${file.BaseName} using ${
|
|
28
|
+
await this.Options.sourceFs.copy(file.BaseName, file.BaseName, file.Provider);
|
|
29
|
+
this.Log.trace(`Uploaded incoming file ${file.OriginalFile.filepath} to ${file.BaseName} using ${file.Provider.Name} filesystem`);
|
|
30
|
+
if (this.Options.deleteSource) {
|
|
31
|
+
await this.Options.sourceFs.rm(file.BaseName);
|
|
32
|
+
this.Log.trace(`Deleted source incoming file ${file.OriginalFile.filepath} from ${this.Options.sourceFs.Name} filesystem after upload to ${file.Provider.Name} filesystem`);
|
|
33
|
+
}
|
|
34
34
|
}
|
|
35
35
|
catch (err) {
|
|
36
|
-
throw new exceptions_1.IOFail(`Error copying incoming file ${file.OriginalFile.filepath} to ${file.BaseName} using ${
|
|
36
|
+
throw new exceptions_1.IOFail(`Error copying incoming file ${file.OriginalFile.filepath} to ${file.BaseName} using ${file.Provider.Name} filesystem`, err);
|
|
37
37
|
}
|
|
38
|
-
file.Provider = fs;
|
|
39
38
|
return file;
|
|
40
39
|
}
|
|
41
40
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImmediateFileUploader.js","sourceRoot":"","sources":["../../../src/uploaders/ImmediateFileUploader.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"ImmediateFileUploader.js","sourceRoot":"","sources":["../../../src/uploaders/ImmediateFileUploader.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAsD;AACtD,oDAAmE;AAEnE,oDAAkD;AAClD,oDAA6C;AAItC,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,gCAAgB;IAIzD,YAAmB,OAAkD;QACnE,KAAK,EAAE,CAAC;QADS,YAAO,GAAP,OAAO,CAA2C;IAErE,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAA4B;QAEvC,+BAA+B;QAC/B,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvD,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,YAAY,CAAC,QAAQ,OAAO,IAAI,CAAC,QAAQ,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,CAAC;YAElI,IAAI,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;gBAC9B,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC9C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,IAAI,CAAC,YAAY,CAAC,QAAQ,SAAS,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,+BAA+B,IAAI,CAAC,QAAQ,CAAC,IAAI,aAAa,CAAC,CAAC;YAC9K,CAAC;QAEH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,mBAAM,CAAC,+BAA+B,IAAI,CAAC,YAAY,CAAC,QAAQ,OAAO,IAAI,CAAC,QAAQ,UAAU,IAAI,CAAC,QAAQ,CAAC,IAAI,aAAa,EAAE,GAAG,CAAC,CAAC;QAChJ,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA7BY,sDAAqB;AAEtB;IADT,IAAA,mBAAM,EAAC,MAAM,CAAC;8BACA,gBAAG;kDAAC;gCAFR,qBAAqB;IAFjC,IAAA,eAAU,GAAE;IACZ,IAAA,gBAAW,GAAE;;GACD,qBAAqB,CA6BjC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { FileUploadMiddleware, IUploadedFile, IUploadOptions } from "../interfaces.js";
|
|
2
2
|
import { Log } from "@spinajs/log-common";
|
|
3
|
+
import { FileInfoService } from "@spinajs/fs";
|
|
3
4
|
/**
|
|
4
5
|
* Middleware that retrieves file info after upload
|
|
5
6
|
*/
|
|
6
7
|
export declare class FileInfoMiddleware extends FileUploadMiddleware {
|
|
7
8
|
protected Log: Log;
|
|
9
|
+
protected FileInfo: FileInfoService;
|
|
8
10
|
beforeUpload(file: IUploadedFile<any>, paramOptions: IUploadOptions): Promise<any>;
|
|
9
11
|
}
|
|
10
12
|
//# sourceMappingURL=info.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../src/file-middlewares/info.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"info.d.ts","sourceRoot":"","sources":["../../../src/file-middlewares/info.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C;;GAEG;AACH,qBAEa,kBAAmB,SAAQ,oBAAoB;IAExD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAGnB,SAAS,CAAC,QAAQ,EAAG,eAAe,CAAC;IAExB,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC;CAqBlG"}
|
|
@@ -7,9 +7,10 @@ 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, Singleton } from "@spinajs/di";
|
|
10
|
+
import { Autoinject, Injectable, Singleton } from "@spinajs/di";
|
|
11
11
|
import { FileUploadMiddleware } from "../interfaces.js";
|
|
12
12
|
import { Log, Logger } from "@spinajs/log-common";
|
|
13
|
+
import { FileInfoService } from "@spinajs/fs";
|
|
13
14
|
/**
|
|
14
15
|
* Middleware that retrieves file info after upload
|
|
15
16
|
*/
|
|
@@ -18,14 +19,14 @@ let FileInfoMiddleware = class FileInfoMiddleware extends FileUploadMiddleware {
|
|
|
18
19
|
/**
|
|
19
20
|
* Only if option is set
|
|
20
21
|
*/
|
|
21
|
-
if (
|
|
22
|
-
if (!
|
|
23
|
-
this.Log.warn(`
|
|
22
|
+
if (paramOptions.fileInfo) {
|
|
23
|
+
if (!this.FileInfo) {
|
|
24
|
+
this.Log.warn(`FileInfo service not available, cannot retrieve file info for uploaded file ${file.Name}.`);
|
|
24
25
|
return file;
|
|
25
26
|
}
|
|
26
27
|
return {
|
|
27
28
|
...file,
|
|
28
|
-
Info: await
|
|
29
|
+
Info: await this.FileInfo.getInfo(file.OriginalFile.filepath)
|
|
29
30
|
};
|
|
30
31
|
}
|
|
31
32
|
return file;
|
|
@@ -35,6 +36,10 @@ __decorate([
|
|
|
35
36
|
Logger('http'),
|
|
36
37
|
__metadata("design:type", Log)
|
|
37
38
|
], FileInfoMiddleware.prototype, "Log", void 0);
|
|
39
|
+
__decorate([
|
|
40
|
+
Autoinject(),
|
|
41
|
+
__metadata("design:type", FileInfoService)
|
|
42
|
+
], FileInfoMiddleware.prototype, "FileInfo", void 0);
|
|
38
43
|
FileInfoMiddleware = __decorate([
|
|
39
44
|
Injectable(),
|
|
40
45
|
Singleton()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../src/file-middlewares/info.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"info.js","sourceRoot":"","sources":["../../../src/file-middlewares/info.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAiC,MAAM,kBAAkB,CAAC;AACvF,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAG9C;;GAEG;AAGI,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,oBAAoB;IAOjD,KAAK,CAAC,YAAY,CAAC,IAAwB,EAAE,YAA4B;QAE5E;;WAEG;QACH,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;YAExB,IAAG,CAAC,IAAI,CAAC,QAAQ,EAAC,CAAC;gBACf,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,+EAA+E,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;gBAC3G,OAAO,IAAI,CAAC;YAChB,CAAC;YAED,OAAO;gBACH,GAAG,IAAI;gBACP,IAAI,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC;aAChE,CAAA;QACL,CAAC;QAED,OAAO,IAAI,CAAC;IAEhB,CAAC;CACJ,CAAA;AA1Ba;IADT,MAAM,CAAC,MAAM,CAAC;8BACA,GAAG;+CAAC;AAGT;IADT,UAAU,EAAE;8BACQ,eAAe;oDAAC;AAL5B,kBAAkB;IAF9B,UAAU,EAAE;IACZ,SAAS,EAAE;GACC,kBAAkB,CA4B9B"}
|
|
@@ -7,7 +7,7 @@ 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,
|
|
10
|
+
import { Injectable, NewInstance } from "@spinajs/di";
|
|
11
11
|
import { FileProportions, FileUploadMiddleware } from "../interfaces.js";
|
|
12
12
|
import { Log, Logger } from "@spinajs/log-common";
|
|
13
13
|
import { ValidationFailed } from "@spinajs/validation";
|
|
@@ -170,7 +170,7 @@ __decorate([
|
|
|
170
170
|
], FileValidationMiddleware.prototype, "Log", void 0);
|
|
171
171
|
FileValidationMiddleware = __decorate([
|
|
172
172
|
Injectable(),
|
|
173
|
-
|
|
173
|
+
NewInstance(),
|
|
174
174
|
__metadata("design:paramtypes", [Object])
|
|
175
175
|
], FileValidationMiddleware);
|
|
176
176
|
export { FileValidationMiddleware };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/file-middlewares/validation.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../../src/file-middlewares/validation.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,14 +28,13 @@ export interface FormOptions {
|
|
|
28
28
|
}
|
|
29
29
|
export declare abstract class FromFormBase extends RouteArgs {
|
|
30
30
|
FormData: FormData;
|
|
31
|
-
|
|
31
|
+
protected DefaultUploadFs: fs;
|
|
32
|
+
extract(callData: IRouteCall, _args: unknown[], routeParameter: IRouteParameter, req: Request, _res: express.Response, _route?: IRoute): Promise<IRouteArgsResult>;
|
|
32
33
|
}
|
|
33
34
|
export declare class FromFile extends FromFormBase {
|
|
34
35
|
FormData: FormData;
|
|
35
|
-
protected FileService: fs;
|
|
36
36
|
Priority?: number;
|
|
37
37
|
protected Log: Log;
|
|
38
|
-
protected DefaultFsProviderName: string;
|
|
39
38
|
protected DefaultFileMiddlewares: UploadFileMiddlewareDescriptor[];
|
|
40
39
|
get SupportedType(): ParameterType;
|
|
41
40
|
constructor(FormData: FormData);
|
|
@@ -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,EAAyD,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AACtM,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AACnC,OAAmB,EAAE,MAAM,EAAE,KAAK,EAAgB,MAAM,YAAY,CAAC;AACrE,OAAO,EAAU,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAG/D,OAAO,EAAE,EAAE,EAAY,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"FromForm.d.ts","sourceRoot":"","sources":["../../../src/route-args/FromForm.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,14 +13,16 @@ import { IncomingForm } from 'formidable';
|
|
|
13
13
|
import { Config } from '@spinajs/configuration';
|
|
14
14
|
import { DI, Injectable, NewInstance } from '@spinajs/di';
|
|
15
15
|
import { parse } from 'csv';
|
|
16
|
-
import { fsNative } from '@spinajs/fs';
|
|
16
|
+
import { fs, fsNative } from '@spinajs/fs';
|
|
17
17
|
import { createReadStream, promises } from 'fs';
|
|
18
18
|
import { Log, Logger } from '@spinajs/log-common';
|
|
19
19
|
import { basename } from 'node:path';
|
|
20
20
|
import { toArray } from '@spinajs/util';
|
|
21
21
|
import { ValidationFailed } from '@spinajs/validation';
|
|
22
22
|
import { EntityTooLargeException } from '../exceptions.js';
|
|
23
|
-
import { BadRequest, Exception } from '@spinajs/exceptions';
|
|
23
|
+
import { BadRequest, Exception, IOFail } from '@spinajs/exceptions';
|
|
24
|
+
import { FileSystem } from "@spinajs/fs";
|
|
25
|
+
import { ImmediateFileUploader } from '../uploaders/ImmediateFileUploader.js';
|
|
24
26
|
const parseForm = (req, options) => {
|
|
25
27
|
const form = new IncomingForm(options);
|
|
26
28
|
return new Promise((res, rej) => {
|
|
@@ -40,11 +42,20 @@ const parseForm = (req, options) => {
|
|
|
40
42
|
});
|
|
41
43
|
};
|
|
42
44
|
export class FromFormBase extends RouteArgs {
|
|
43
|
-
async extract(callData, _args, routeParameter, req, _res, _route
|
|
45
|
+
async extract(callData, _args, routeParameter, req, _res, _route) {
|
|
44
46
|
if (!this.FormData) {
|
|
47
|
+
if (this.DefaultUploadFs === null) {
|
|
48
|
+
throw new IOFail('Default upload fs provider not available. Please check fs.providers for __file_upload_default_provider__ provider.');
|
|
49
|
+
}
|
|
50
|
+
if (!(this.DefaultUploadFs instanceof fsNative)) {
|
|
51
|
+
throw new IOFail('Default upload fs provider is not native fs. Form upload requires local file system provider becouse it needs to store files locally before processing.');
|
|
52
|
+
}
|
|
53
|
+
if (!this.DefaultUploadFs.Options || !this.DefaultUploadFs.Options.basePath) {
|
|
54
|
+
throw new IOFail('Default upload fs provider base path not set. Please check fs.providers for __file_upload_default_provider__ provider.');
|
|
55
|
+
}
|
|
45
56
|
const options = {
|
|
46
57
|
...routeParameter.Options,
|
|
47
|
-
uploadDir:
|
|
58
|
+
uploadDir: this.DefaultUploadFs.Options.basePath,
|
|
48
59
|
};
|
|
49
60
|
this.FormData = callData?.Payload?.Form ?? (await parseForm(req, options));
|
|
50
61
|
}
|
|
@@ -60,6 +71,10 @@ export class FromFormBase extends RouteArgs {
|
|
|
60
71
|
return result;
|
|
61
72
|
}
|
|
62
73
|
}
|
|
74
|
+
__decorate([
|
|
75
|
+
FileSystem('__file_upload_default_provider__'),
|
|
76
|
+
__metadata("design:type", fs)
|
|
77
|
+
], FromFormBase.prototype, "DefaultUploadFs", void 0);
|
|
63
78
|
let FromFile = class FromFile extends FromFormBase {
|
|
64
79
|
get SupportedType() {
|
|
65
80
|
return ParameterType.FromFile;
|
|
@@ -77,7 +92,7 @@ let FromFile = class FromFile extends FromFormBase {
|
|
|
77
92
|
const uploadFs = DI.resolve('__file_provider__', [fsName]);
|
|
78
93
|
// extract form data if not processed already
|
|
79
94
|
// and prepare result object
|
|
80
|
-
const result = await super.extract(callData, _args, param, req, res, route
|
|
95
|
+
const result = await super.extract(callData, _args, param, req, res, route);
|
|
81
96
|
// get incoming files
|
|
82
97
|
const { Files } = this.FormData;
|
|
83
98
|
const files = toArray(Files[param.Name]);
|
|
@@ -126,6 +141,14 @@ let FromFile = class FromFile extends FromFormBase {
|
|
|
126
141
|
Object.assign(f, result);
|
|
127
142
|
}
|
|
128
143
|
}
|
|
144
|
+
// copy to target fs if different than default temp fs
|
|
145
|
+
if (uploadFs && this.DefaultUploadFs.Name !== uploadFs.Name) {
|
|
146
|
+
const fu = DI.resolve(ImmediateFileUploader, [{ sourceFs: this.DefaultUploadFs, deleteSource: true }]);
|
|
147
|
+
const pResults = await Promise.allSettled(uplFiles.map((f) => fu.upload(f)));
|
|
148
|
+
uFiles = pResults.filter((r) => r.status === 'fulfilled').map((r) => r.value);
|
|
149
|
+
}
|
|
150
|
+
// if any uploader is set in options, use it to upload files
|
|
151
|
+
// additionaly
|
|
129
152
|
if (uploadOptions.uploader) {
|
|
130
153
|
const type = uploadOptions.uploader.service ?? uploadOptions.uploader;
|
|
131
154
|
const options = uploadOptions.uploader.options ?? {};
|
|
@@ -142,10 +165,6 @@ __decorate([
|
|
|
142
165
|
Logger('http'),
|
|
143
166
|
__metadata("design:type", Log)
|
|
144
167
|
], FromFile.prototype, "Log", void 0);
|
|
145
|
-
__decorate([
|
|
146
|
-
Config('fs.defaultProvider'),
|
|
147
|
-
__metadata("design:type", String)
|
|
148
|
-
], FromFile.prototype, "DefaultFsProviderName", void 0);
|
|
149
168
|
__decorate([
|
|
150
169
|
Config('http.upload.middlewares', {
|
|
151
170
|
defaultValue: [{ service: 'FileInfoMiddleware' }]
|