@spinajs/http 2.0.38 → 2.0.44
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/controllers.d.ts +5 -5
- package/lib/controllers.js +15 -8
- package/lib/controllers.js.map +1 -1
- package/lib/decorators.d.ts +2 -2
- package/lib/decorators.js.map +1 -1
- package/lib/interfaces.d.ts +41 -8
- package/lib/interfaces.js +10 -4
- package/lib/interfaces.js.map +1 -1
- package/lib/response-methods/badRequest.d.ts +1 -1
- package/lib/response-methods/badRequest.js +1 -1
- package/lib/response-methods/badRequest.js.map +1 -1
- package/lib/response-methods/conflict.d.ts +1 -1
- package/lib/response-methods/conflict.js +1 -1
- package/lib/response-methods/conflict.js.map +1 -1
- package/lib/response-methods/cookieResponse.d.ts +1 -2
- package/lib/response-methods/cookieResponse.js +1 -1
- package/lib/response-methods/cookieResponse.js.map +1 -1
- package/lib/response-methods/created.d.ts +1 -1
- package/lib/response-methods/created.js +1 -1
- package/lib/response-methods/created.js.map +1 -1
- package/lib/response-methods/file.d.ts +12 -8
- package/lib/response-methods/file.js +85 -35
- package/lib/response-methods/file.js.map +1 -1
- package/lib/response-methods/forbidden.d.ts +1 -1
- package/lib/response-methods/forbidden.js +1 -1
- package/lib/response-methods/forbidden.js.map +1 -1
- package/lib/response-methods/noContent.d.ts +1 -1
- package/lib/response-methods/noContent.js +1 -1
- package/lib/response-methods/noContent.js.map +1 -1
- package/lib/response-methods/notAllowed.d.ts +1 -1
- package/lib/response-methods/notAllowed.js +1 -1
- package/lib/response-methods/notAllowed.js.map +1 -1
- package/lib/response-methods/notFound.d.ts +1 -1
- package/lib/response-methods/notFound.js +1 -1
- package/lib/response-methods/notFound.js.map +1 -1
- package/lib/response-methods/ok.d.ts +1 -1
- package/lib/response-methods/ok.js +1 -1
- package/lib/response-methods/ok.js.map +1 -1
- package/lib/response-methods/pug.d.ts +1 -2
- package/lib/response-methods/pug.js +1 -1
- package/lib/response-methods/pug.js.map +1 -1
- package/lib/response-methods/redirect.d.ts +1 -1
- package/lib/response-methods/redirect.js +2 -2
- package/lib/response-methods/redirect.js.map +1 -1
- package/lib/response-methods/serverError.d.ts +1 -1
- package/lib/response-methods/serverError.js +1 -1
- package/lib/response-methods/serverError.js.map +1 -1
- package/lib/response-methods/unauthorized.d.ts +1 -1
- package/lib/response-methods/unauthorized.js +1 -1
- package/lib/response-methods/unauthorized.js.map +1 -1
- package/lib/responses.d.ts +0 -6
- package/lib/responses.js +1 -7
- package/lib/responses.js.map +1 -1
- package/lib/route-args/FromDi.d.ts +3 -3
- package/lib/route-args/FromDi.js +2 -2
- package/lib/route-args/FromDi.js.map +1 -1
- package/lib/route-args/FromForm.d.ts +8 -1
- package/lib/route-args/FromForm.js +54 -58
- package/lib/route-args/FromForm.js.map +1 -1
- package/lib/server.d.ts +3 -3
- package/lib/server.js +2 -2
- package/lib/server.js.map +1 -1
- package/package.json +15 -14
|
@@ -1,33 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
2
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
19
3
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
20
4
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
21
5
|
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;
|
|
22
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
23
7
|
};
|
|
24
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
25
|
-
if (mod && mod.__esModule) return mod;
|
|
26
|
-
var result = {};
|
|
27
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
28
|
-
__setModuleDefault(result, mod);
|
|
29
|
-
return result;
|
|
30
|
-
};
|
|
31
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
32
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
33
10
|
};
|
|
@@ -36,11 +13,10 @@ exports.FromForm = exports.FromFormField = exports.CsvFileRouteArgs = exports.Js
|
|
|
36
13
|
const RouteArgs_1 = require("./RouteArgs");
|
|
37
14
|
const interfaces_1 = require("../interfaces");
|
|
38
15
|
const formidable_1 = require("formidable");
|
|
39
|
-
const configuration_1 = require("@spinajs/configuration");
|
|
40
|
-
const lodash_1 = require("lodash");
|
|
41
16
|
const di_1 = require("@spinajs/di");
|
|
42
|
-
const fs = __importStar(require("fs"));
|
|
43
17
|
const csv_1 = require("csv");
|
|
18
|
+
const path_1 = require("path");
|
|
19
|
+
const fs_1 = require("fs");
|
|
44
20
|
class FromFormBase extends RouteArgs_1.RouteArgs {
|
|
45
21
|
async parseForm(callData, param, req) {
|
|
46
22
|
if (callData && callData.Payload && callData.Payload.Form) {
|
|
@@ -51,11 +27,9 @@ class FromFormBase extends RouteArgs_1.RouteArgs {
|
|
|
51
27
|
}
|
|
52
28
|
}
|
|
53
29
|
async parse(req, options) {
|
|
30
|
+
this.FileService = await di_1.DI.resolve('__file_provider__', [options === null || options === void 0 ? void 0 : options.fileProvider]);
|
|
54
31
|
if (!this.Data) {
|
|
55
32
|
let opts = options || { multiples: true };
|
|
56
|
-
if (options && (0, lodash_1.isFunction)(options.uploadDir)) {
|
|
57
|
-
opts = await options.uploadDir(di_1.DI.get(configuration_1.Configuration));
|
|
58
|
-
}
|
|
59
33
|
this.Data = await this._parse(req, opts);
|
|
60
34
|
}
|
|
61
35
|
}
|
|
@@ -82,44 +56,66 @@ let FromFile = class FromFile extends FromFormBase {
|
|
|
82
56
|
this.Data = data;
|
|
83
57
|
}
|
|
84
58
|
async extract(callData, param, req) {
|
|
59
|
+
const self = this;
|
|
85
60
|
if (!this.Data) {
|
|
86
61
|
await this.parseForm(callData, param, req);
|
|
87
62
|
}
|
|
88
63
|
// map from formidable to our object
|
|
89
64
|
// of type IUploadedFile
|
|
90
65
|
const formFiles = this.Data.Files[param.Name];
|
|
66
|
+
const data = {
|
|
67
|
+
CallData: Object.assign(Object.assign({}, callData), { Payload: {
|
|
68
|
+
Form: this.Data,
|
|
69
|
+
} }),
|
|
70
|
+
};
|
|
91
71
|
if (Array.isArray(formFiles)) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
Size: f.size,
|
|
99
|
-
Path: f.filepath,
|
|
100
|
-
Name: f.originalFilename,
|
|
101
|
-
Type: f.mimetype,
|
|
102
|
-
LastModifiedDate: f.mtime,
|
|
103
|
-
Hash: f.hash,
|
|
104
|
-
};
|
|
105
|
-
}),
|
|
106
|
-
};
|
|
72
|
+
for (const f of formFiles) {
|
|
73
|
+
await copy(f.filepath);
|
|
74
|
+
return Object.assign(data, {
|
|
75
|
+
Args: formFiles.map(mf),
|
|
76
|
+
});
|
|
77
|
+
}
|
|
107
78
|
}
|
|
108
79
|
else {
|
|
80
|
+
await copy(formFiles.filepath);
|
|
81
|
+
return Object.assign(data, {
|
|
82
|
+
Args: mf(formFiles),
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
function mf(f) {
|
|
109
86
|
return {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
Path: formFiles.filepath,
|
|
116
|
-
Name: formFiles.originalFilename,
|
|
117
|
-
Type: formFiles.mimetype,
|
|
118
|
-
LastModifiedDate: formFiles.mtime,
|
|
119
|
-
Hash: formFiles.hash,
|
|
87
|
+
Size: f.size,
|
|
88
|
+
BaseName: (0, path_1.basename)(f.filepath),
|
|
89
|
+
Provider: {
|
|
90
|
+
Name: self.FileService.Name,
|
|
91
|
+
Service: self.FileService.constructor.name,
|
|
120
92
|
},
|
|
93
|
+
Name: f.originalFilename,
|
|
94
|
+
Type: f.mimetype,
|
|
95
|
+
LastModifiedDate: f.mtime,
|
|
96
|
+
Hash: f.hash,
|
|
121
97
|
};
|
|
122
98
|
}
|
|
99
|
+
async function copy(file) {
|
|
100
|
+
const stream = await self.FileService.writeStream((0, path_1.basename)(file));
|
|
101
|
+
return new Promise((resolve, reject) => {
|
|
102
|
+
(0, fs_1.createReadStream)(file)
|
|
103
|
+
.pipe(stream)
|
|
104
|
+
.on('finish', () => {
|
|
105
|
+
(0, fs_1.unlink)(file, (err) => {
|
|
106
|
+
if (err) {
|
|
107
|
+
reject(err);
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
resolve();
|
|
111
|
+
}
|
|
112
|
+
});
|
|
113
|
+
})
|
|
114
|
+
.on('error', (err) => {
|
|
115
|
+
reject(err);
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
}
|
|
123
119
|
}
|
|
124
120
|
};
|
|
125
121
|
FromFile = __decorate([
|
|
@@ -141,9 +137,9 @@ let JsonFileRouteArgs = class JsonFileRouteArgs extends FromFile {
|
|
|
141
137
|
await this.parseForm(callData, param, req);
|
|
142
138
|
}
|
|
143
139
|
const sourceFile = this.Data.Files[param.Name].filepath;
|
|
144
|
-
const content = await
|
|
140
|
+
const content = await fs_1.promises.readFile(sourceFile, { encoding: (_a = param.Options.Encoding) !== null && _a !== void 0 ? _a : 'utf-8', flag: 'r' });
|
|
145
141
|
if (param.Options.DeleteFile) {
|
|
146
|
-
|
|
142
|
+
await fs_1.promises.unlink(sourceFile);
|
|
147
143
|
}
|
|
148
144
|
return {
|
|
149
145
|
CallData: Object.assign(Object.assign({}, callData), { Payload: {
|
|
@@ -172,7 +168,7 @@ let CsvFileRouteArgs = class CsvFileRouteArgs extends FromFile {
|
|
|
172
168
|
}
|
|
173
169
|
const sourceFile = this.Data.Files[param.Name].filepath;
|
|
174
170
|
if (param.Options.DeleteFile) {
|
|
175
|
-
|
|
171
|
+
await fs_1.promises.unlink(sourceFile);
|
|
176
172
|
}
|
|
177
173
|
const data = await this.parseCvs(sourceFile);
|
|
178
174
|
return {
|
|
@@ -185,7 +181,7 @@ let CsvFileRouteArgs = class CsvFileRouteArgs extends FromFile {
|
|
|
185
181
|
async parseCvs(path) {
|
|
186
182
|
const data = [];
|
|
187
183
|
return new Promise((res, rej) => {
|
|
188
|
-
|
|
184
|
+
(0, fs_1.createReadStream)(path)
|
|
189
185
|
.pipe((0, csv_1.parse)())
|
|
190
186
|
.on('error', (err) => rej(err))
|
|
191
187
|
.on('data', (row) => data.push(row))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FromForm.js","sourceRoot":"","sources":["../../src/route-args/FromForm.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"FromForm.js","sourceRoot":"","sources":["../../src/route-args/FromForm.ts"],"names":[],"mappings":"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"}
|
package/lib/server.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import {
|
|
2
|
+
import { AsyncService, IContainer } from '@spinajs/di';
|
|
3
3
|
import { Configuration } from '@spinajs/configuration';
|
|
4
4
|
import { Log } from '@spinajs/log';
|
|
5
5
|
import { Server } from 'http';
|
|
@@ -8,7 +8,7 @@ import { ServerMiddleware } from './interfaces';
|
|
|
8
8
|
import Express = require('express');
|
|
9
9
|
import './transformers';
|
|
10
10
|
import '@spinajs/templates-pug';
|
|
11
|
-
export declare class HttpServer extends
|
|
11
|
+
export declare class HttpServer extends AsyncService {
|
|
12
12
|
protected Configuration: Configuration;
|
|
13
13
|
protected Container: IContainer;
|
|
14
14
|
protected Middlewares: ServerMiddleware[];
|
|
@@ -25,7 +25,7 @@ export declare class HttpServer extends AsyncModule {
|
|
|
25
25
|
*/
|
|
26
26
|
protected Log: Log;
|
|
27
27
|
constructor();
|
|
28
|
-
|
|
28
|
+
resolve(): Promise<void>;
|
|
29
29
|
/**
|
|
30
30
|
* Starts http server & express
|
|
31
31
|
*/
|
package/lib/server.js
CHANGED
|
@@ -45,11 +45,11 @@ const validation_1 = require("@spinajs/validation");
|
|
|
45
45
|
require("./transformers");
|
|
46
46
|
require("@spinajs/templates-pug");
|
|
47
47
|
const templates_1 = require("@spinajs/templates");
|
|
48
|
-
let HttpServer = class HttpServer extends di_1.
|
|
48
|
+
let HttpServer = class HttpServer extends di_1.AsyncService {
|
|
49
49
|
constructor() {
|
|
50
50
|
super();
|
|
51
51
|
}
|
|
52
|
-
async
|
|
52
|
+
async resolve() {
|
|
53
53
|
this.Express = Express();
|
|
54
54
|
/**
|
|
55
55
|
* Register default middlewares from cfg
|
package/lib/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinajs/http",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.44",
|
|
4
4
|
"description": "framework HTTP module base on express.js",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"private": false,
|
|
@@ -38,27 +38,29 @@
|
|
|
38
38
|
},
|
|
39
39
|
"homepage": "https://github.com/spinajs/main#readme",
|
|
40
40
|
"devDependencies": {
|
|
41
|
+
"@spinajs/templates-pug": "^2.0.38",
|
|
41
42
|
"@types/compression": "^1.7.0",
|
|
42
43
|
"@types/cookie-parser": "^1.4.2",
|
|
43
44
|
"@types/cookie-signature": "^1.0.3",
|
|
44
45
|
"@types/cors": "^2.8.6",
|
|
45
46
|
"@types/express": "^4.17.6",
|
|
46
47
|
"@types/formidable": "^2.0.1",
|
|
47
|
-
"@types/luxon": "^2.
|
|
48
|
+
"@types/luxon": "^3.2.0",
|
|
48
49
|
"@types/node": "^16.11.11",
|
|
49
50
|
"@types/pug": "^2.0.4",
|
|
50
51
|
"@types/uuid": "^8.3.3"
|
|
51
52
|
},
|
|
52
53
|
"dependencies": {
|
|
53
|
-
"@spinajs/configuration": "^2.0.
|
|
54
|
-
"@spinajs/di": "^2.0.
|
|
55
|
-
"@spinajs/exceptions": "^2.0.
|
|
56
|
-
"@spinajs/
|
|
57
|
-
"@spinajs/
|
|
58
|
-
"@spinajs/
|
|
59
|
-
"@spinajs/
|
|
60
|
-
"@spinajs/templates
|
|
61
|
-
"@spinajs/
|
|
54
|
+
"@spinajs/configuration": "^2.0.44",
|
|
55
|
+
"@spinajs/di": "^2.0.44",
|
|
56
|
+
"@spinajs/exceptions": "^2.0.39",
|
|
57
|
+
"@spinajs/fs": "^2.0.44",
|
|
58
|
+
"@spinajs/internal-logger": "^2.0.44",
|
|
59
|
+
"@spinajs/log": "^2.0.44",
|
|
60
|
+
"@spinajs/reflection": "^2.0.44",
|
|
61
|
+
"@spinajs/templates": "^2.0.44",
|
|
62
|
+
"@spinajs/templates-pug": "^2.0.44",
|
|
63
|
+
"@spinajs/validation": "^2.0.44",
|
|
62
64
|
"compression": "^1.7.4",
|
|
63
65
|
"cookie-parser": "^1.4.5",
|
|
64
66
|
"cookie-signature": "^1.1.0",
|
|
@@ -69,12 +71,11 @@
|
|
|
69
71
|
"glob": "^7.1.4",
|
|
70
72
|
"helmet": "^3.23.0",
|
|
71
73
|
"lodash": "^4.17.14",
|
|
72
|
-
"luxon": "^2.
|
|
74
|
+
"luxon": "^3.2.1",
|
|
73
75
|
"mime": "^2.4.6",
|
|
74
76
|
"pug": "^3.0.0",
|
|
75
77
|
"randomstring": "^1.1.5",
|
|
76
|
-
"tempfile": "3.0.0",
|
|
77
78
|
"uuid": "^8.3.2"
|
|
78
79
|
},
|
|
79
|
-
"gitHead": "
|
|
80
|
+
"gitHead": "1857a6e3626e0fed22ffb0b44b48d587c79898db"
|
|
80
81
|
}
|