@spinajs/http 2.0.182 → 2.0.184
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 +0 -7
- package/lib/cjs/config/http.d.ts.map +1 -1
- package/lib/cjs/config/http.js +8 -8
- package/lib/cjs/config/http.js.map +1 -1
- package/lib/cjs/decorators.d.ts +2 -1
- package/lib/cjs/decorators.d.ts.map +1 -1
- package/lib/cjs/decorators.js +2 -5
- package/lib/cjs/decorators.js.map +1 -1
- package/lib/cjs/exceptions.d.ts +3 -0
- package/lib/cjs/exceptions.d.ts.map +1 -1
- package/lib/cjs/exceptions.js +7 -0
- package/lib/cjs/exceptions.js.map +1 -1
- package/lib/cjs/file-transformers/index.d.ts +3 -0
- package/lib/cjs/file-transformers/index.d.ts.map +1 -0
- package/lib/cjs/file-transformers/index.js +19 -0
- package/lib/cjs/file-transformers/index.js.map +1 -0
- package/lib/cjs/file-transformers/unzip.d.ts +7 -0
- package/lib/cjs/file-transformers/unzip.d.ts.map +1 -0
- package/lib/cjs/file-transformers/unzip.js +54 -0
- package/lib/cjs/file-transformers/unzip.js.map +1 -0
- package/lib/cjs/file-transformers/zip.d.ts +7 -0
- package/lib/cjs/file-transformers/zip.d.ts.map +1 -0
- package/lib/cjs/file-transformers/zip.js +58 -0
- package/lib/cjs/file-transformers/zip.js.map +1 -0
- package/lib/cjs/index.d.ts +1 -0
- package/lib/cjs/index.d.ts.map +1 -1
- package/lib/cjs/index.js +1 -0
- package/lib/cjs/index.js.map +1 -1
- package/lib/cjs/interfaces.d.ts +36 -9
- package/lib/cjs/interfaces.d.ts.map +1 -1
- package/lib/cjs/interfaces.js +8 -1
- package/lib/cjs/interfaces.js.map +1 -1
- package/lib/cjs/response-methods/entityTooLarge.d.ts +13 -0
- package/lib/cjs/response-methods/entityTooLarge.d.ts.map +1 -0
- package/lib/cjs/response-methods/entityTooLarge.js +20 -0
- package/lib/cjs/response-methods/entityTooLarge.js.map +1 -0
- package/lib/cjs/response-methods/file.js +2 -2
- package/lib/cjs/response-methods/file.js.map +1 -1
- package/lib/cjs/route-args/FromForm.d.ts +8 -5
- package/lib/cjs/route-args/FromForm.d.ts.map +1 -1
- package/lib/cjs/route-args/FromForm.js +86 -42
- package/lib/cjs/route-args/FromForm.js.map +1 -1
- package/lib/cjs/route-args/RouteArgs.d.ts.map +1 -1
- package/lib/cjs/route-args/RouteArgs.js +1 -4
- package/lib/cjs/route-args/RouteArgs.js.map +1 -1
- package/lib/cjs/server.d.ts.map +1 -1
- package/lib/cjs/server.js +7 -0
- package/lib/cjs/server.js.map +1 -1
- package/lib/cjs/uploaders/ImmediateFileUploader.d.ts +9 -15
- package/lib/cjs/uploaders/ImmediateFileUploader.d.ts.map +1 -1
- package/lib/cjs/uploaders/ImmediateFileUploader.js +17 -34
- package/lib/cjs/uploaders/ImmediateFileUploader.js.map +1 -1
- package/lib/mjs/config/http.d.ts +0 -7
- package/lib/mjs/config/http.d.ts.map +1 -1
- package/lib/mjs/config/http.js +8 -8
- package/lib/mjs/config/http.js.map +1 -1
- package/lib/mjs/decorators.d.ts +2 -1
- package/lib/mjs/decorators.d.ts.map +1 -1
- package/lib/mjs/decorators.js +2 -5
- package/lib/mjs/decorators.js.map +1 -1
- package/lib/mjs/exceptions.d.ts +3 -1
- package/lib/mjs/exceptions.d.ts.map +1 -1
- package/lib/mjs/exceptions.js +3 -1
- package/lib/mjs/exceptions.js.map +1 -1
- package/lib/mjs/file-transformers/index.d.ts +3 -0
- package/lib/mjs/file-transformers/index.d.ts.map +1 -0
- package/lib/mjs/file-transformers/index.js +3 -0
- package/lib/mjs/file-transformers/index.js.map +1 -0
- package/lib/mjs/file-transformers/unzip.d.ts +7 -0
- package/lib/mjs/file-transformers/unzip.d.ts.map +1 -0
- package/lib/mjs/file-transformers/unzip.js +51 -0
- package/lib/mjs/file-transformers/unzip.js.map +1 -0
- package/lib/mjs/file-transformers/zip.d.ts +7 -0
- package/lib/mjs/file-transformers/zip.d.ts.map +1 -0
- package/lib/mjs/file-transformers/zip.js +52 -0
- package/lib/mjs/file-transformers/zip.js.map +1 -0
- package/lib/mjs/index.d.ts +1 -0
- package/lib/mjs/index.d.ts.map +1 -1
- package/lib/mjs/index.js +1 -0
- package/lib/mjs/index.js.map +1 -1
- package/lib/mjs/interfaces.d.ts +36 -9
- package/lib/mjs/interfaces.d.ts.map +1 -1
- package/lib/mjs/interfaces.js +6 -0
- package/lib/mjs/interfaces.js.map +1 -1
- package/lib/mjs/response-methods/entityTooLarge.d.ts +13 -0
- package/lib/mjs/response-methods/entityTooLarge.d.ts.map +1 -0
- package/lib/mjs/response-methods/entityTooLarge.js +16 -0
- package/lib/mjs/response-methods/entityTooLarge.js.map +1 -0
- package/lib/mjs/response-methods/file.js +2 -2
- package/lib/mjs/response-methods/file.js.map +1 -1
- package/lib/mjs/route-args/FromForm.d.ts +8 -5
- package/lib/mjs/route-args/FromForm.d.ts.map +1 -1
- package/lib/mjs/route-args/FromForm.js +80 -36
- package/lib/mjs/route-args/FromForm.js.map +1 -1
- package/lib/mjs/route-args/RouteArgs.d.ts.map +1 -1
- package/lib/mjs/route-args/RouteArgs.js +1 -4
- package/lib/mjs/route-args/RouteArgs.js.map +1 -1
- package/lib/mjs/server.d.ts.map +1 -1
- package/lib/mjs/server.js +7 -0
- package/lib/mjs/server.js.map +1 -1
- package/lib/mjs/uploaders/ImmediateFileUploader.d.ts +9 -15
- package/lib/mjs/uploaders/ImmediateFileUploader.d.ts.map +1 -1
- package/lib/mjs/uploaders/ImmediateFileUploader.js +21 -38
- package/lib/mjs/uploaders/ImmediateFileUploader.js.map +1 -1
- package/lib/tsconfig.cjs.tsbuildinfo +1 -1
- package/lib/tsconfig.mjs.tsbuildinfo +1 -1
- package/lib/views/responses/entityTooLarge.pug +13 -0
- package/package.json +11 -11
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"entityTooLarge.js","sourceRoot":"","sources":["../../../src/response-methods/entityTooLarge.ts"],"names":[],"mappings":";;;AACA,oDAA8D;AAC9D,kDAA+C;AAE/C;;;;GAIG;AACH,MAAa,cAAe,SAAQ,wBAAQ;IAC1C,YAAY,IAAS;QACnB,KAAK,CAAC,IAAI,CAAC,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAAqB,EAAE,IAAsB;QAChE,OAAO,MAAM,IAAA,2BAAY,EAAC,IAAI,CAAC,YAAY,EAAE,gCAAgB,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,CAAC;IACxG,CAAC;CACF;AARD,wCAQC"}
|
|
@@ -29,8 +29,8 @@ class ZipResponse extends interfaces_js_1.Response {
|
|
|
29
29
|
const zippedFile = await provider.zip(this.Options.path);
|
|
30
30
|
const fPath = zippedFile.asFilePath();
|
|
31
31
|
return new Promise((resolve, reject) => {
|
|
32
|
-
res.download(fPath, this.Options.filename, (err) => {
|
|
33
|
-
|
|
32
|
+
res.download(zippedFile.fs.resolvePath(fPath), this.Options.filename, (err) => {
|
|
33
|
+
zippedFile.fs.rm(fPath).finally(() => {
|
|
34
34
|
if (!lodash_1.default.isNil(err)) {
|
|
35
35
|
reject(err);
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../src/response-methods/file.ts"],"names":[],"mappings":";;;;;;AAAA,oCAAiC;AACjC,oDAA+D;AAE/D,oDAAuB;AACvB,gDAAwB;AACxB,sDAAoE;AAGpE,MAAa,WAAY,SAAQ,wBAAQ;IACvC;;;OAGG;IACH,YAAsB,OAA6B;QACjD,KAAK,CAAC,IAAI,CAAC,CAAC;QADQ,YAAO,GAAP,OAAO,CAAsB;QAGjD,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC;IACtD,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,IAAqB,EAAE,GAAqB;QAC/D,MAAM,QAAQ,GAAG,MAAM,OAAE,CAAC,OAAO,CAAK,mBAAmB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QACpF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAExD,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,6BAAgB,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,IAAI,aAAa,CAAC,CAAC;SACpE;QAED,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACzD,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;QAEtC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACrC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,GAAU,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../src/response-methods/file.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ export interface FormOptions {
|
|
|
28
28
|
}
|
|
29
29
|
export declare abstract class FromFormBase extends RouteArgs {
|
|
30
30
|
FormData: FormData;
|
|
31
|
-
extract(callData: IRouteCall, routeParameter: IRouteParameter, req: Request, _res: express.Response, _route?: IRoute): Promise<IRouteArgsResult>;
|
|
31
|
+
extract(callData: IRouteCall, routeParameter: IRouteParameter, req: Request, _res: express.Response, _route?: IRoute, uploadFs?: fs): Promise<IRouteArgsResult>;
|
|
32
32
|
}
|
|
33
33
|
export declare class FromFile extends FromFormBase {
|
|
34
34
|
FormData: FormData;
|
|
@@ -39,14 +39,17 @@ export declare class FromFile extends FromFormBase {
|
|
|
39
39
|
constructor(FormData: FormData);
|
|
40
40
|
extract(callData: IRouteCall, param: IRouteParameter<IUploadOptions>, req: Request, res: express.Response, route?: IRoute): Promise<any>;
|
|
41
41
|
}
|
|
42
|
-
export declare class
|
|
42
|
+
export declare class FromJsonFile extends FromFile {
|
|
43
43
|
get SupportedType(): ParameterType;
|
|
44
44
|
extract(callData: IRouteCall, param: IRouteParameter, req: Request, res: express.Response, route?: IRoute): Promise<any>;
|
|
45
45
|
}
|
|
46
|
-
export declare class
|
|
46
|
+
export declare class FromCSV extends FromFormBase {
|
|
47
47
|
get SupportedType(): ParameterType;
|
|
48
|
-
extract(callData: IRouteCall, param: IRouteParameter, req: Request, res: express.Response, route?: IRoute): Promise<
|
|
49
|
-
|
|
48
|
+
extract(callData: IRouteCall, param: IRouteParameter, req: Request, res: express.Response, route?: IRoute): Promise<{
|
|
49
|
+
Args: any[];
|
|
50
|
+
CallData: IRouteCall;
|
|
51
|
+
}>;
|
|
52
|
+
protected parseCvs(param: IRouteParameter, path: string): Promise<unknown>;
|
|
50
53
|
}
|
|
51
54
|
export declare class FromFormField extends FromFormBase {
|
|
52
55
|
get SupportedType(): ParameterType;
|
|
@@ -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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"}
|
|
@@ -9,24 +9,33 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.FromForm = exports.FromFormField = exports.
|
|
12
|
+
exports.FromForm = exports.FromFormField = exports.FromCSV = exports.FromJsonFile = exports.FromFile = exports.FromFormBase = void 0;
|
|
13
13
|
const RouteArgs_js_1 = require("./RouteArgs.js");
|
|
14
14
|
const interfaces_js_1 = require("../interfaces.js");
|
|
15
15
|
const formidable_1 = require("formidable");
|
|
16
16
|
const configuration_1 = require("@spinajs/configuration");
|
|
17
17
|
const di_1 = require("@spinajs/di");
|
|
18
18
|
const csv_1 = require("csv");
|
|
19
|
-
const fs_1 = require("fs");
|
|
19
|
+
const fs_1 = require("@spinajs/fs");
|
|
20
|
+
const fs_2 = require("fs");
|
|
20
21
|
const log_common_1 = require("@spinajs/log-common");
|
|
21
22
|
const node_path_1 = require("node:path");
|
|
22
23
|
const util_1 = require("@spinajs/util");
|
|
23
24
|
const validation_1 = require("@spinajs/validation");
|
|
25
|
+
const exceptions_js_1 = require("../exceptions.js");
|
|
26
|
+
const exceptions_1 = require("@spinajs/exceptions");
|
|
24
27
|
const parseForm = (req, options) => {
|
|
25
28
|
const form = new formidable_1.IncomingForm(options);
|
|
26
29
|
return new Promise((res, rej) => {
|
|
27
30
|
form.parse(req, (err, fields, files) => {
|
|
28
31
|
if (err) {
|
|
29
|
-
|
|
32
|
+
switch (err.code) {
|
|
33
|
+
case 1009:
|
|
34
|
+
rej(new exceptions_js_1.EntityTooLargeException(err.message, err));
|
|
35
|
+
break;
|
|
36
|
+
default:
|
|
37
|
+
rej(new exceptions_1.Exception(err.message, err));
|
|
38
|
+
}
|
|
30
39
|
return;
|
|
31
40
|
}
|
|
32
41
|
res({ Fields: fields, Files: files });
|
|
@@ -34,9 +43,13 @@ const parseForm = (req, options) => {
|
|
|
34
43
|
});
|
|
35
44
|
};
|
|
36
45
|
class FromFormBase extends RouteArgs_js_1.RouteArgs {
|
|
37
|
-
async extract(callData, routeParameter, req, _res, _route) {
|
|
46
|
+
async extract(callData, routeParameter, req, _res, _route, uploadFs) {
|
|
38
47
|
if (!this.FormData) {
|
|
39
|
-
|
|
48
|
+
const options = {
|
|
49
|
+
...routeParameter.Options,
|
|
50
|
+
uploadDir: uploadFs && uploadFs instanceof fs_1.fsNative ? uploadFs.Options.basePath : undefined,
|
|
51
|
+
};
|
|
52
|
+
this.FormData = callData?.Payload?.Form ?? (await parseForm(req, options));
|
|
40
53
|
}
|
|
41
54
|
const result = {
|
|
42
55
|
CallData: {
|
|
@@ -62,26 +75,57 @@ let FromFile = class FromFile extends FromFormBase {
|
|
|
62
75
|
async extract(callData, param, req, res, route) {
|
|
63
76
|
// copy to provided fs or default temp fs
|
|
64
77
|
// delete intermediate files ( from express ) regardless of copy result
|
|
78
|
+
const fsName = param.Options?.fs ? param.Options.fs : '__file_upload_default_provider__';
|
|
79
|
+
const uploadFs = di_1.DI.resolve('__file_provider__', [fsName]);
|
|
65
80
|
// extract form data if not processed already
|
|
66
81
|
// and prepare result object
|
|
67
|
-
const result = await super.extract(callData, param, req, res, route);
|
|
82
|
+
const result = await super.extract(callData, param, req, res, route, uploadFs);
|
|
68
83
|
// get incoming files
|
|
69
84
|
const { Files } = this.FormData;
|
|
70
|
-
// get fs provider for storing files
|
|
71
|
-
const fs = di_1.DI.resolve(param.Options.uploader ?? "ImmediateFileUploader", [param.Options.uploaderFs]);
|
|
72
85
|
const files = (0, util_1.toArray)(Files[param.Name]);
|
|
73
|
-
if (param.Options
|
|
74
|
-
throw new validation_1.ValidationFailed(`File ${param.Name} is required`, [
|
|
86
|
+
if (param.Options?.required && files.length === 0) {
|
|
87
|
+
throw new validation_1.ValidationFailed(`File ${param.Name} is required`, [
|
|
88
|
+
{
|
|
75
89
|
propertyName: param.Name,
|
|
76
|
-
message:
|
|
77
|
-
keyword:
|
|
90
|
+
message: 'Missing file',
|
|
91
|
+
keyword: 'required',
|
|
78
92
|
params: {},
|
|
79
|
-
schemaPath:
|
|
80
|
-
instancePath:
|
|
81
|
-
}
|
|
93
|
+
schemaPath: '#/required',
|
|
94
|
+
instancePath: 'FormData',
|
|
95
|
+
},
|
|
96
|
+
]);
|
|
97
|
+
}
|
|
98
|
+
const uplFiles = files.map((f) => {
|
|
99
|
+
const uploadedFile = {
|
|
100
|
+
Size: f.size,
|
|
101
|
+
BaseName: (0, node_path_1.basename)(f.filepath),
|
|
102
|
+
Name: f.originalFilename,
|
|
103
|
+
Type: f.mimetype,
|
|
104
|
+
LastModifiedDate: f.mtime,
|
|
105
|
+
Hash: f.hash,
|
|
106
|
+
Provider: uploadFs,
|
|
107
|
+
OriginalFile: f,
|
|
108
|
+
};
|
|
109
|
+
return uploadedFile;
|
|
110
|
+
});
|
|
111
|
+
let uFiles = uplFiles;
|
|
112
|
+
for (const t of param.Options?.transformers ?? []) {
|
|
113
|
+
const c = Array.isArray(t) ? t[0] : t;
|
|
114
|
+
const o = Array.isArray(t) ? [t[1]] : [];
|
|
115
|
+
const transformer = di_1.DI.resolve(c, o);
|
|
116
|
+
for (const f of uplFiles) {
|
|
117
|
+
const result = await transformer.transform(f);
|
|
118
|
+
// merge transform result
|
|
119
|
+
Object.assign(f, result);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
if (param.Options?.uploader) {
|
|
123
|
+
const type = param.Options.uploader.service ?? param.Options.uploader;
|
|
124
|
+
const options = param.Options.uploader.options ?? {};
|
|
125
|
+
const fu = di_1.DI.resolve(type, [options]);
|
|
126
|
+
const pResults = await Promise.allSettled(uplFiles.map((f) => fu.upload(f)));
|
|
127
|
+
uFiles = pResults.filter((r) => r.status === 'fulfilled').map((r) => r.value);
|
|
82
128
|
}
|
|
83
|
-
const pResults = await Promise.allSettled(files.map((f) => fs.upload(f, (0, node_path_1.basename)(f.filepath))));
|
|
84
|
-
const uFiles = pResults.filter(r => r.status === "fulfilled").map((r) => r.value);
|
|
85
129
|
return Object.assign(result, {
|
|
86
130
|
Args: param.RuntimeType.name === 'Array' ? uFiles : uFiles[0],
|
|
87
131
|
});
|
|
@@ -101,16 +145,16 @@ exports.FromFile = FromFile = __decorate([
|
|
|
101
145
|
(0, di_1.NewInstance)(),
|
|
102
146
|
__metadata("design:paramtypes", [Object])
|
|
103
147
|
], FromFile);
|
|
104
|
-
let
|
|
148
|
+
let FromJsonFile = class FromJsonFile extends FromFile {
|
|
105
149
|
get SupportedType() {
|
|
106
150
|
return interfaces_js_1.ParameterType.FromJSONFile;
|
|
107
151
|
}
|
|
108
152
|
async extract(callData, param, req, res, route) {
|
|
109
153
|
const data = await super.extract(callData, param, req, res, route);
|
|
110
154
|
const sourceFile = this.FormData.Files[param.Name].filepath;
|
|
111
|
-
const content = await
|
|
155
|
+
const content = await fs_2.promises.readFile(sourceFile, { encoding: param.Options.Encoding ?? 'utf-8', flag: 'r' });
|
|
112
156
|
if (param.Options.DeleteFile) {
|
|
113
|
-
await
|
|
157
|
+
await fs_2.promises.unlink(sourceFile);
|
|
114
158
|
}
|
|
115
159
|
return {
|
|
116
160
|
...data,
|
|
@@ -118,43 +162,49 @@ let JsonFileRouteArgs = class JsonFileRouteArgs extends FromFile {
|
|
|
118
162
|
};
|
|
119
163
|
}
|
|
120
164
|
};
|
|
121
|
-
exports.
|
|
122
|
-
exports.
|
|
165
|
+
exports.FromJsonFile = FromJsonFile;
|
|
166
|
+
exports.FromJsonFile = FromJsonFile = __decorate([
|
|
123
167
|
(0, di_1.Injectable)(),
|
|
124
168
|
(0, di_1.NewInstance)()
|
|
125
|
-
],
|
|
126
|
-
let
|
|
169
|
+
], FromJsonFile);
|
|
170
|
+
let FromCSV = class FromCSV extends FromFormBase {
|
|
127
171
|
get SupportedType() {
|
|
128
172
|
return interfaces_js_1.ParameterType.FromCSV;
|
|
129
173
|
}
|
|
130
174
|
async extract(callData, param, req, res, route) {
|
|
131
175
|
const data = await super.extract(callData, param, req, res, route);
|
|
132
|
-
const
|
|
176
|
+
const files = this.FormData.Files[param.Name];
|
|
177
|
+
const file = files ? (Array.isArray(files) ? files[0] : files) : null;
|
|
178
|
+
if (!file) {
|
|
179
|
+
throw new exceptions_1.BadRequest('Missing csv file');
|
|
180
|
+
}
|
|
181
|
+
const sourceFile = file.filepath;
|
|
182
|
+
const cvsData = (await this.parseCvs(param, sourceFile));
|
|
133
183
|
if (param.Options.DeleteFile) {
|
|
134
|
-
await
|
|
184
|
+
await fs_2.promises.unlink(sourceFile);
|
|
135
185
|
}
|
|
136
|
-
const
|
|
186
|
+
const args = await Promise.all(cvsData.map((x) => this.tryHydrateParam(x, param, route)));
|
|
137
187
|
return {
|
|
138
188
|
...data,
|
|
139
|
-
Args:
|
|
189
|
+
Args: args,
|
|
140
190
|
};
|
|
141
191
|
}
|
|
142
|
-
async parseCvs(path) {
|
|
192
|
+
async parseCvs(param, path) {
|
|
143
193
|
const data = [];
|
|
144
194
|
return new Promise((res, rej) => {
|
|
145
|
-
(0,
|
|
146
|
-
.pipe((0, csv_1.parse)())
|
|
147
|
-
.on('error', (err) => rej(err))
|
|
195
|
+
(0, fs_2.createReadStream)(path)
|
|
196
|
+
.pipe((0, csv_1.parse)(param.Options ?? {}))
|
|
197
|
+
.on('error', (err) => rej(new exceptions_1.BadRequest('Cannot read data from cvs', err)))
|
|
148
198
|
.on('data', (row) => data.push(row))
|
|
149
199
|
.on('end', () => res(data));
|
|
150
200
|
});
|
|
151
201
|
}
|
|
152
202
|
};
|
|
153
|
-
exports.
|
|
154
|
-
exports.
|
|
203
|
+
exports.FromCSV = FromCSV;
|
|
204
|
+
exports.FromCSV = FromCSV = __decorate([
|
|
155
205
|
(0, di_1.Injectable)(),
|
|
156
206
|
(0, di_1.NewInstance)()
|
|
157
|
-
],
|
|
207
|
+
], FromCSV);
|
|
158
208
|
let FromFormField = class FromFormField extends FromFormBase {
|
|
159
209
|
get SupportedType() {
|
|
160
210
|
return interfaces_js_1.ParameterType.FormField;
|
|
@@ -193,13 +243,7 @@ let FromForm = class FromForm extends FromFormBase {
|
|
|
193
243
|
const fData = Object.fromEntries(Object.entries(this.FormData.Fields).map(([key, value]) => {
|
|
194
244
|
return [key, value[0]];
|
|
195
245
|
}));
|
|
196
|
-
|
|
197
|
-
if (hydrator) {
|
|
198
|
-
result = await this.tryHydrateObject(fData, param, hydrator);
|
|
199
|
-
}
|
|
200
|
-
else {
|
|
201
|
-
result = data;
|
|
202
|
-
}
|
|
246
|
+
result = await this.tryHydrateParam(fData, param, route);
|
|
203
247
|
return {
|
|
204
248
|
...data,
|
|
205
249
|
Args: result,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FromForm.js","sourceRoot":"","sources":["../../../src/route-args/FromForm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"FromForm.js","sourceRoot":"","sources":["../../../src/route-args/FromForm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteArgs.d.ts","sourceRoot":"","sources":["../../../src/route-args/RouteArgs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,UAAU,CAAC;IACrB,IAAI,EAAE,GAAG,CAAC;CACX;AAED,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,aAAa,GAAG,MAAM,CAAC;IAEtC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAChJ;AAED,8BAAsB,SAAU,YAAW,UAAU;IAEnD,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC;IAEnC,QAAQ,KAAK,aAAa,IAAI,aAAa,GAAG,MAAM,CAAC;aAErC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;cAE9I,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"RouteArgs.d.ts","sourceRoot":"","sources":["../../../src/route-args/RouteArgs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AACjG,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAGnC,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,UAAU,CAAC;IACrB,IAAI,EAAE,GAAG,CAAC;CACX;AAED,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,aAAa,GAAG,MAAM,CAAC;IAEtC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;CAChJ;AAED,8BAAsB,SAAU,YAAW,UAAU;IAEnD,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC;IAEnC,QAAQ,KAAK,aAAa,IAAI,aAAa,GAAG,MAAM,CAAC;aAErC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;cAE9I,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM;cAsCxE,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,EAAE,GAAG;IAKhF,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,eAAe;IAW5C,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,eAAe;IAc3D,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,eAAe;IAI9C,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG;CAoB3D"}
|
|
@@ -33,9 +33,6 @@ class RouteArgs {
|
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
35
|
schema = this.Validator.extractSchema(routeParameter.RuntimeType);
|
|
36
|
-
if (!schema && routeParameter.RuntimeType.prototype) {
|
|
37
|
-
schema = this.Validator.extractSchema(routeParameter.RuntimeType.prototype);
|
|
38
|
-
}
|
|
39
36
|
}
|
|
40
37
|
if (this.isRuntimeType(routeParameter)) {
|
|
41
38
|
result = this.fromRuntimeType(routeParameter, arg);
|
|
@@ -47,7 +44,7 @@ class RouteArgs {
|
|
|
47
44
|
hydrator = this.getHydrator(routeParameter);
|
|
48
45
|
result = hydrator ? arg : this.tryExtractObject(arg, routeParameter);
|
|
49
46
|
if (schema) {
|
|
50
|
-
this.Validator.validate(schema,
|
|
47
|
+
this.Validator.validate(schema, result);
|
|
51
48
|
}
|
|
52
49
|
if (hydrator) {
|
|
53
50
|
result = await this.tryHydrateObject(result, routeParameter, hydrator);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouteArgs.js","sourceRoot":"","sources":["../../../src/route-args/RouteArgs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oCAAkE;AAIlE,oDAAuB;AACvB,oDAAoD;AAapD,MAAsB,SAAS;IAQnB,KAAK,CAAC,eAAe,CAAC,GAAQ,EAAE,cAA+B,EAAE,KAAa;QACtF,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI,MAAM,GAAG,IAAI,CAAC;QAClB,IAAI,QAAQ,GAAG,IAAI,CAAC;QAEpB,mDAAmD;QACnD,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YACrD,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;SAC5C;aAAM,IAAI,cAAc,CAAC,MAAM,EAAE;YAChC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC;SAChC;aAAM,IAAI,cAAc,CAAC,gBAAgB,EAAE;YAC1C,MAAM,GAAG,cAAc,CAAC,gBAAgB,CAAC;SAC1C;aAAM;YACL,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"RouteArgs.js","sourceRoot":"","sources":["../../../src/route-args/RouteArgs.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAiD,MAAM,aAAa,CAAC;AAEtG,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,wBAAwB,CAAC;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,OAAO,OAAO,EAAE,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGlD,OAAO,EAAgC,gBAAgB,EAAyD,MAAM,iBAAiB,CAAC;AAExI,OAAO,yBAAyB,CAAC;AAEjC,OAAO,+BAA+B,CAAC;AACvC,OAAO,4BAA4B,CAAC;AACpC,OAAO,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAiD,MAAM,aAAa,CAAC;AAEtG,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAI3C,OAAO,wBAAwB,CAAC;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAI9B,OAAO,OAAO,EAAE,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGlD,OAAO,EAAgC,gBAAgB,EAAyD,MAAM,iBAAiB,CAAC;AAExI,OAAO,yBAAyB,CAAC;AAEjC,OAAO,+BAA+B,CAAC;AACvC,OAAO,4BAA4B,CAAC;AACpC,OAAO,yBAAyB,CAAC;AAIjC,qBAEa,UAAW,SAAQ,YAAY;IAE1C,SAAS,CAAC,aAAa,EAAE,aAAa,CAAC;IAGvC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC;IAGhC,SAAS,CAAC,WAAW,EAAE,gBAAgB,EAAE,CAAC;IAE1C;;OAEG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IAEnC;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC;IAEzB;;OAEG;IAEH,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;;IAMN,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ErC;;OAEG;IACI,KAAK;IA6BL,IAAI;IAOX;;;;OAIG;IACI,GAAG,CAAC,UAAU,EAAE,cAAc,GAAG,IAAI;IAI5C;;OAEG;IACH,SAAS,CAAC,cAAc;IA2BxB;;OAEG;IACH,SAAS,CAAC,YAAY;CAuFvB"}
|
package/lib/cjs/server.js
CHANGED
|
@@ -32,6 +32,8 @@ const validationError_js_1 = require("./response-methods/validationError.js");
|
|
|
32
32
|
require("./middlewares/ResponseTime.js");
|
|
33
33
|
require("./middlewares/RequestId.js");
|
|
34
34
|
require("./middlewares/RealIp.js");
|
|
35
|
+
const entityTooLarge_js_1 = require("./response-methods/entityTooLarge.js");
|
|
36
|
+
const exceptions_js_1 = require("./exceptions.js");
|
|
35
37
|
let HttpServer = class HttpServer extends di_1.AsyncService {
|
|
36
38
|
constructor() {
|
|
37
39
|
super();
|
|
@@ -190,7 +192,12 @@ let HttpServer = class HttpServer extends di_1.AsyncService {
|
|
|
190
192
|
error.stack = err.stack ? err.stack : err.parameter && err.parameter.stack;
|
|
191
193
|
}
|
|
192
194
|
let response = null;
|
|
195
|
+
// todo refactor this
|
|
196
|
+
// to use responses with proper exception decorators
|
|
193
197
|
switch (err.constructor) {
|
|
198
|
+
case exceptions_js_1.EntityTooLargeException:
|
|
199
|
+
response = new entityTooLarge_js_1.EntityTooLarge(error);
|
|
200
|
+
break;
|
|
194
201
|
case exceptions_1.AuthenticationFailed:
|
|
195
202
|
response = new index_js_1.Unauthorized(error);
|
|
196
203
|
break;
|
package/lib/cjs/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,oCAAsG;AACtG,oDAAuD;AACvD,0DAAuD;AACvD,sCAA2C;AAE3C,oDAAkP;AAClP,kDAA+C;AAC/C,kCAAgC;AAGhC,2BAAgC;AAChC,gDAAwB;AACxB,gEAAwC;AACxC,sDAAkD;AAClD,oDAAuB;AAEvB,mDAAwI;AACxI,0DAA8J;AAC9J,mCAAiC;AACjC,8EAAwE;AACxE,yCAAuC;AACvC,sCAAoC;AACpC,mCAAiC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,13 @@
|
|
|
1
|
-
import { FormFileUploader } from
|
|
2
|
-
import {
|
|
3
|
-
import formidable from "formidable";
|
|
4
|
-
import { Log } from "@spinajs/log-common";
|
|
1
|
+
import { FormFileUploader, IUploadedFile } from '../interfaces.js';
|
|
2
|
+
import { Log } from '@spinajs/log-common';
|
|
5
3
|
export declare class ImmediateFileUploader extends FormFileUploader {
|
|
6
|
-
|
|
4
|
+
Options: {
|
|
5
|
+
fs: string;
|
|
6
|
+
};
|
|
7
7
|
protected Log: Log;
|
|
8
|
-
constructor(
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
Provider: fs;
|
|
13
|
-
Name: string;
|
|
14
|
-
Type: string;
|
|
15
|
-
LastModifiedDate: Date;
|
|
16
|
-
Hash: string;
|
|
17
|
-
}>;
|
|
8
|
+
constructor(Options: {
|
|
9
|
+
fs: string;
|
|
10
|
+
});
|
|
11
|
+
upload(file: IUploadedFile<unknown>): Promise<IUploadedFile<unknown>>;
|
|
18
12
|
}
|
|
19
13
|
//# sourceMappingURL=ImmediateFileUploader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImmediateFileUploader.d.ts","sourceRoot":"","sources":["../../../src/uploaders/ImmediateFileUploader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,
|
|
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;AAEnE,OAAO,EAAE,GAAG,EAAU,MAAM,qBAAqB,CAAC;AAGlD,qBAEa,qBAAsB,SAAQ,gBAAgB;IAItC,OAAO,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE;IAF1C,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;gBAEA,OAAO,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE;IAGpC,MAAM,CAAC,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC;CAuB1C"}
|
|
@@ -12,49 +12,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.ImmediateFileUploader = void 0;
|
|
13
13
|
const di_1 = require("@spinajs/di");
|
|
14
14
|
const interfaces_js_1 = require("../interfaces.js");
|
|
15
|
-
const promises_1 = require("fs/promises");
|
|
16
|
-
const path_1 = require("path");
|
|
17
15
|
const log_common_1 = require("@spinajs/log-common");
|
|
18
16
|
const exceptions_1 = require("@spinajs/exceptions");
|
|
19
17
|
let ImmediateFileUploader = class ImmediateFileUploader extends interfaces_js_1.FormFileUploader {
|
|
20
|
-
constructor(
|
|
18
|
+
constructor(Options) {
|
|
21
19
|
super();
|
|
22
|
-
this.
|
|
20
|
+
this.Options = Options;
|
|
23
21
|
}
|
|
24
|
-
async upload(file
|
|
25
|
-
|
|
26
|
-
const _rm = async (file) => {
|
|
27
|
-
try {
|
|
28
|
-
await (0, promises_1.rm)(file.filepath);
|
|
29
|
-
this.Log.trace(`Deleted temporary incoming file ${file.filepath}`);
|
|
30
|
-
}
|
|
31
|
-
catch (err) {
|
|
32
|
-
this.Log.error(err, `Error deleting temporary incoming file ${file.filepath}`);
|
|
33
|
-
}
|
|
34
|
-
};
|
|
35
|
-
const fs = di_1.DI.resolve("__file_provider__", [this.Filesystem]);
|
|
22
|
+
async upload(file) {
|
|
23
|
+
const fs = di_1.DI.resolve('__file_provider__', [this.Options.fs]);
|
|
36
24
|
if (!fs) {
|
|
37
|
-
throw new exceptions_1.IOFail(`Filesystem ${this.
|
|
25
|
+
throw new exceptions_1.IOFail(`Filesystem ${this.Options.fs} not exists, pleas check your configuration`);
|
|
26
|
+
}
|
|
27
|
+
// if its the same - do nothing
|
|
28
|
+
if (fs.Name === file.Provider.Name) {
|
|
29
|
+
return;
|
|
38
30
|
}
|
|
39
31
|
try {
|
|
40
|
-
await
|
|
41
|
-
this.Log.trace(`Uploaded incoming file ${file.filepath} to ${
|
|
32
|
+
await file.Provider.copy(file.BaseName, file.BaseName, fs);
|
|
33
|
+
this.Log.trace(`Uploaded incoming file ${file.OriginalFile.filepath} to ${file.BaseName} using ${this.Options.fs} filesystem`);
|
|
42
34
|
}
|
|
43
35
|
catch (err) {
|
|
44
|
-
|
|
45
|
-
}
|
|
46
|
-
finally {
|
|
47
|
-
await _rm(file);
|
|
36
|
+
throw new exceptions_1.IOFail(`Error copying incoming file ${file.OriginalFile.filepath} to ${file.BaseName} using ${this.Options.fs} filesystem`, err);
|
|
48
37
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
BaseName: (0, path_1.basename)(file.filepath),
|
|
52
|
-
Provider: fs,
|
|
53
|
-
Name: file.originalFilename,
|
|
54
|
-
Type: file.mimetype,
|
|
55
|
-
LastModifiedDate: file.mtime,
|
|
56
|
-
Hash: file.hash,
|
|
57
|
-
};
|
|
38
|
+
file.Provider = fs;
|
|
39
|
+
return file;
|
|
58
40
|
}
|
|
59
41
|
};
|
|
60
42
|
exports.ImmediateFileUploader = ImmediateFileUploader;
|
|
@@ -63,7 +45,8 @@ __decorate([
|
|
|
63
45
|
__metadata("design:type", log_common_1.Log)
|
|
64
46
|
], ImmediateFileUploader.prototype, "Log", void 0);
|
|
65
47
|
exports.ImmediateFileUploader = ImmediateFileUploader = __decorate([
|
|
66
|
-
(0, di_1.Injectable)(
|
|
67
|
-
|
|
48
|
+
(0, di_1.Injectable)(),
|
|
49
|
+
(0, di_1.NewInstance)(),
|
|
50
|
+
__metadata("design:paramtypes", [Object])
|
|
68
51
|
], ImmediateFileUploader);
|
|
69
52
|
//# sourceMappingURL=ImmediateFileUploader.js.map
|
|
@@ -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,oCAA0D;AAC1D,oDAAmE;AAEnE,oDAAkD;AAClD,oDAA6C;AAItC,IAAM,qBAAqB,GAA3B,MAAM,qBAAsB,SAAQ,gCAAgB;IAIzD,YAAmB,OAAuB;QACxC,KAAK,EAAE,CAAC;QADS,YAAO,GAAP,OAAO,CAAgB;IAE1C,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,IAA4B;QACvC,MAAM,EAAE,GAAG,OAAE,CAAC,OAAO,CAAK,mBAAmB,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAElE,IAAI,CAAC,EAAE,EAAE;YACP,MAAM,IAAI,mBAAM,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,EAAE,6CAA6C,CAAC,CAAC;SAC9F;QAED,+BAA+B;QAC/B,IAAI,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;YAClC,OAAO;SACR;QAED,IAAI;YACF,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;YAC3D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,0BAA0B,IAAI,CAAC,YAAY,CAAC,QAAQ,OAAO,IAAI,CAAC,QAAQ,UAAU,IAAI,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC;SAChI;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,IAAI,mBAAM,CAAC,+BAA+B,IAAI,CAAC,YAAY,CAAC,QAAQ,OAAO,IAAI,CAAC,QAAQ,UAAU,IAAI,CAAC,OAAO,CAAC,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;SAC5I;QAED,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEnB,OAAO,IAAI,CAAC;IACd,CAAC;CACF,CAAA;AA9BY,sDAAqB;AAEtB;IADT,IAAA,mBAAM,EAAC,MAAM,CAAC;8BACA,gBAAG;kDAAC;gCAFR,qBAAqB;IAFjC,IAAA,eAAU,GAAE;IACZ,IAAA,gBAAW,GAAE;;GACD,qBAAqB,CA8BjC"}
|
package/lib/mjs/config/http.d.ts
CHANGED
|
@@ -24,13 +24,6 @@ declare const http: {
|
|
|
24
24
|
http: {
|
|
25
25
|
port: number;
|
|
26
26
|
middlewares: express.RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>[];
|
|
27
|
-
/**
|
|
28
|
-
* Default file receiving options
|
|
29
|
-
*/
|
|
30
|
-
Files: {
|
|
31
|
-
MaxSize: number;
|
|
32
|
-
BasePath: string;
|
|
33
|
-
};
|
|
34
27
|
/**
|
|
35
28
|
* Static files folder. Feel free to override this per app
|
|
36
29
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/config/http.ts"],"names":[],"mappings":";AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/config/http.ts"],"names":[],"mappings":";AAAA,OAAO,OAAO,MAAM,SAAS,CAAC;AAa9B,QAAA,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;QA6CN;;WAEG;;YAGC;;eAEG;;YAGH;;eAEG;;;QAKP;;WAEG;;QAGH;;;WAGG;;;CAgBN,CAAC;AAEF,eAAe,IAAI,CAAC"}
|