@deepkit/http 1.0.1-alpha.91 → 1.0.1-alpha.93

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.
Files changed (59) hide show
  1. package/dist/cjs/src/http.d.ts +7 -6
  2. package/dist/cjs/src/http.js +22 -12
  3. package/dist/cjs/src/http.js.map +1 -1
  4. package/dist/cjs/src/kernel.js +18 -1
  5. package/dist/cjs/src/kernel.js.map +1 -1
  6. package/dist/cjs/src/logger.js +1 -1
  7. package/dist/cjs/src/logger.js.map +1 -1
  8. package/dist/cjs/src/model.d.ts +17 -0
  9. package/dist/cjs/src/model.js +10 -2
  10. package/dist/cjs/src/model.js.map +1 -1
  11. package/dist/cjs/src/module.d.ts +4 -1
  12. package/dist/cjs/src/module.js +57 -1
  13. package/dist/cjs/src/module.js.map +1 -1
  14. package/dist/cjs/src/request-parser.d.ts +35 -0
  15. package/dist/cjs/src/request-parser.js +302 -0
  16. package/dist/cjs/src/request-parser.js.map +1 -0
  17. package/dist/cjs/src/resolver.d.ts +27 -0
  18. package/dist/cjs/src/resolver.js +246 -0
  19. package/dist/cjs/src/resolver.js.map +1 -0
  20. package/dist/cjs/src/router.d.ts +7 -20
  21. package/dist/cjs/src/router.js +23 -247
  22. package/dist/cjs/src/router.js.map +1 -1
  23. package/dist/cjs/src/static-serving.js +1 -1
  24. package/dist/cjs/src/static-serving.js.map +1 -1
  25. package/dist/cjs/tsconfig.tsbuildinfo +1 -1
  26. package/dist/esm/src/http.d.ts +7 -6
  27. package/dist/esm/src/http.js +22 -12
  28. package/dist/esm/src/http.js.map +1 -1
  29. package/dist/esm/src/kernel.js +19 -2
  30. package/dist/esm/src/kernel.js.map +1 -1
  31. package/dist/esm/src/logger.js +1 -1
  32. package/dist/esm/src/logger.js.map +1 -1
  33. package/dist/esm/src/model.d.ts +17 -0
  34. package/dist/esm/src/model.js +9 -1
  35. package/dist/esm/src/model.js.map +1 -1
  36. package/dist/esm/src/module.d.ts +4 -1
  37. package/dist/esm/src/module.js +59 -3
  38. package/dist/esm/src/module.js.map +1 -1
  39. package/dist/esm/src/request-parser.d.ts +35 -0
  40. package/dist/esm/src/request-parser.js +292 -0
  41. package/dist/esm/src/request-parser.js.map +1 -0
  42. package/dist/esm/src/resolver.d.ts +27 -0
  43. package/dist/esm/src/resolver.js +238 -0
  44. package/dist/esm/src/resolver.js.map +1 -0
  45. package/dist/esm/src/router.d.ts +7 -20
  46. package/dist/esm/src/router.js +26 -250
  47. package/dist/esm/src/router.js.map +1 -1
  48. package/dist/esm/src/static-serving.js +1 -1
  49. package/dist/esm/src/static-serving.js.map +1 -1
  50. package/dist/esm/tsconfig.esm.tsbuildinfo +1 -1
  51. package/package.json +11 -11
  52. package/src/http.ts +15 -8
  53. package/src/kernel.ts +22 -3
  54. package/src/logger.ts +1 -1
  55. package/src/model.ts +6 -1
  56. package/src/module.ts +59 -2
  57. package/src/request-parser.ts +340 -0
  58. package/src/router.ts +26 -290
  59. package/src/static-serving.ts +1 -1
@@ -0,0 +1,340 @@
1
+ import { asyncOperation, ClassType, CompilerContext, getClassName, isObject } from '@deepkit/core';
2
+ import { InjectorModule } from '@deepkit/injector';
3
+ import {
4
+ assertType,
5
+ findMember,
6
+ getSerializeFunction,
7
+ getValidatorFunction,
8
+ metaAnnotation, ReflectionFunction,
9
+ ReflectionKind,
10
+ ReflectionParameter,
11
+ resolveReceiveType,
12
+ serializer,
13
+ stringifyType,
14
+ Type,
15
+ typeToObject, ValidationError
16
+ } from '@deepkit/type';
17
+ import { BodyValidationError, createRequestWithCachedBody, getRegExp, HttpRequest, ValidatedBody } from './model.js';
18
+ import { RouteConfig, UploadedFile } from './router.js';
19
+
20
+ //@ts-ignore
21
+ import qs from 'qs';
22
+
23
+ // @ts-ignore
24
+ import formidable from 'formidable';
25
+
26
+
27
+ function parseBody(req: HttpRequest, foundFiles: { [name: string]: UploadedFile }) {
28
+ const form = formidable({
29
+ multiples: true,
30
+ hash: 'sha1',
31
+ });
32
+ return asyncOperation((resolve, reject) => {
33
+ function parseData(err: any, fields: any, files: any) {
34
+ if (err) {
35
+ reject(err);
36
+ } else {
37
+ for (const [name, file] of Object.entries(files) as any) {
38
+ if (file.size === 0) continue;
39
+ foundFiles[name] = {
40
+ size: file.size,
41
+ path: file.filepath,
42
+ name: file.originalFilename,
43
+ type: file.mimetype,
44
+ lastModifiedDate: file.lastModifiedDate,
45
+ };
46
+ }
47
+ const body = { ...fields, ...foundFiles };
48
+ resolve(body);
49
+ }
50
+ }
51
+
52
+ if (req.body) {
53
+ form.parse(createRequestWithCachedBody(req, req.body), parseData);
54
+ return;
55
+ }
56
+
57
+ const chunks: Buffer[] = [];
58
+
59
+ function read(chunk: Buffer) {
60
+ chunks.push(chunk);
61
+ }
62
+
63
+ req.on('data', read);
64
+ req.once('end', () => {
65
+ req.body = Buffer.concat(chunks);
66
+ req.off('data', read);
67
+ });
68
+ req.once('error', () => req.off('data', read));
69
+
70
+ form.parse(req, parseData);
71
+ });
72
+ }
73
+
74
+ export class ParameterForRequestParser {
75
+ regexPosition?: number;
76
+
77
+ constructor(
78
+ public parameter: ReflectionParameter,
79
+ ) {
80
+ }
81
+
82
+ get body() {
83
+ return metaAnnotation.getForName(this.parameter.type, 'httpBody') !== undefined;
84
+ }
85
+
86
+ get bodyValidation() {
87
+ return metaAnnotation.getForName(this.parameter.type, 'httpBodyValidation') !== undefined;
88
+ }
89
+
90
+ getType(): Type {
91
+ if (this.bodyValidation) {
92
+ assertType(this.parameter.type, ReflectionKind.class);
93
+ const valueType = findMember('value', this.parameter.type.types);
94
+ if (!valueType || valueType.kind !== ReflectionKind.property) throw new Error(`No property value found at ${stringifyType(this.parameter.type)}`);
95
+ return valueType.type as Type;
96
+ }
97
+ return this.parameter.type;
98
+ }
99
+
100
+ get header() {
101
+ return metaAnnotation.getForName(this.parameter.type, 'httpHeader') !== undefined;
102
+ }
103
+
104
+ get query() {
105
+ return metaAnnotation.getForName(this.parameter.type, 'httpQuery') !== undefined;
106
+ }
107
+
108
+ get queries() {
109
+ return metaAnnotation.getForName(this.parameter.type, 'httpQueries') !== undefined;
110
+ }
111
+
112
+ get typePath(): string | undefined {
113
+ const typeOptions = metaAnnotation.getForName(this.parameter.type, 'httpQueries') || metaAnnotation.getForName(this.parameter.type, 'httpQuery')
114
+ || metaAnnotation.getForName(this.parameter.type, 'httpPath') || metaAnnotation.getForName(this.parameter.type, 'httpHeader');
115
+ if (!typeOptions) return;
116
+ const options = typeToObject(typeOptions[0]);
117
+ if (isObject(options)) return options.name;
118
+ return;
119
+ }
120
+
121
+ getName() {
122
+ return this.parameter.name;
123
+ }
124
+
125
+ isPartOfPath(): boolean {
126
+ return metaAnnotation.getForName(this.parameter.type, 'httpPath') !== undefined || this.regexPosition !== undefined;
127
+ }
128
+ }
129
+
130
+ export function parseRoutePathToRegex(path: string, params: ReflectionParameter[]): { regex: string, parameterNames: { [name: string]: number } } {
131
+ const parameterNames: { [name: string]: number } = {};
132
+
133
+ let argumentIndex = 0;
134
+ path = path.replace(/:(\w+)/g, (a, name) => {
135
+ parameterNames[name] = argumentIndex;
136
+ argumentIndex++;
137
+ const parameter = params.find(v => v.name === name);
138
+ if (parameter) {
139
+ const regExp = getRegExp(parameter.type);
140
+ if (regExp instanceof RegExp) {
141
+ return '(' + regExp.source + ')';
142
+ } else if (regExp) {
143
+ return '(' + regExp + ')';
144
+ }
145
+ }
146
+ return String.raw`([^/]+)`;
147
+ });
148
+
149
+ return { regex: path, parameterNames };
150
+ }
151
+
152
+ export function buildRequestParser(parameters: ReflectionParameter[], path?: string): (request: HttpRequest) => any[] {
153
+ const compiler = new CompilerContext();
154
+ const params = parameters.map(v => new ParameterForRequestParser(v));
155
+
156
+ //todo: parse path
157
+ let pathRegex = '';
158
+ if (path) {
159
+ const parsedPath = parseRoutePathToRegex(path, parameters);
160
+ pathRegex = parsedPath.regex;
161
+
162
+ for (const param of params) {
163
+ param.regexPosition = parsedPath.parameterNames[param.parameter.name];
164
+ }
165
+ }
166
+
167
+ const code = getRequestParserCodeForParameters(compiler, params, {});
168
+ compiler.context.set('ValidationError', ValidationError);
169
+ compiler.context.set('qs', qs);
170
+
171
+ let needsQueryString = !!params.find(v => v.query || v.queries);
172
+ const query = needsQueryString ? '_qPosition === -1 ? {} : qs.parse(_url.substr(_qPosition + 1))' : '{}';
173
+
174
+ const regexVar = compiler.reserveVariable('regex', new RegExp('^' + pathRegex + '$'));
175
+
176
+ return compiler.build(`
177
+ const _method = request.method || 'GET';
178
+ const _url = request.url || '/';
179
+ const _headers = request.headers || {};
180
+ const _qPosition = _url.indexOf('?');
181
+ let uploadedFiles = {};
182
+ const _path = _qPosition === -1 ? _url : _url.substr(0, _qPosition);
183
+ const _match = _path.match(${regexVar}) || [];
184
+ const _query = ${query};
185
+ return ${code}
186
+ `, 'request');
187
+ }
188
+
189
+ export function getRequestParserCodeForParameters(
190
+ compiler: CompilerContext,
191
+ parameters: ParameterForRequestParser[],
192
+ config: {
193
+ module?: InjectorModule<any>,
194
+ resolverForParameterName?: Map<string, ClassType>,
195
+ resolverForToken?: Map<any, ClassType>,
196
+ pathParameterNames?: { [name: string]: number },
197
+ routeConfig?: RouteConfig
198
+ }
199
+ ) {
200
+ let enableParseBody = false;
201
+ let requiresAsyncParameters = false;
202
+ const setParameters: string[] = [];
203
+ const parameterNames: string[] = [];
204
+ const parameterValidator: string[] = [];
205
+ let setParametersFromPath = '';
206
+ let bodyValidationErrorHandling = `if (bodyErrors.length) throw ValidationError.from(bodyErrors);`;
207
+
208
+ for (const parameter of parameters) {
209
+ if (parameter.body || parameter.bodyValidation) {
210
+ const type = parameter.getType();
211
+ const validatorVar = compiler.reserveVariable('argumentValidator', getValidatorFunction(undefined, type));
212
+ const converterVar = compiler.reserveVariable('argumentConverter', getSerializeFunction(type, serializer.deserializeRegistry));
213
+
214
+ enableParseBody = true;
215
+ setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(bodyFields, {loosely: true});`);
216
+ parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: bodyErrors});`);
217
+ if (parameter.bodyValidation) {
218
+ compiler.context.set('BodyValidation', ValidatedBody);
219
+ compiler.context.set('BodyValidationError', BodyValidationError);
220
+ parameterNames.push(`new BodyValidation(new BodyValidationError(bodyErrors), bodyErrors.length === 0 ? parameters.${parameter.parameter.name} : undefined)`);
221
+ bodyValidationErrorHandling = '';
222
+ } else {
223
+ parameterNames.push(`parameters.${parameter.parameter.name}`);
224
+ }
225
+ } else if (parameter.query || parameter.queries || parameter.header) {
226
+ const converted = getSerializeFunction(parameter.parameter.parameter, serializer.deserializeRegistry, undefined, parameter.getName());
227
+ const validator = getValidatorFunction(undefined, parameter.parameter.parameter,);
228
+ const converterVar = compiler.reserveVariable('argumentConverter', converted);
229
+ const validatorVar = compiler.reserveVariable('argumentValidator', validator);
230
+
231
+ const queryPath = parameter.typePath === undefined && !parameter.queries ? parameter.parameter.name : parameter.typePath;
232
+ const accessor = queryPath ? `['` + (queryPath.replace(/\./g, `']['`)) + `']` : '';
233
+ const queryAccessor = parameter.header ? `_headers${accessor}` : queryPath ? `_query${accessor}` : '_query';
234
+
235
+ setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(${queryAccessor}, {loosely: true});`);
236
+ parameterNames.push(`parameters.${parameter.parameter.name}`);
237
+ parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: validationErrors}, ${JSON.stringify(parameter.typePath || parameter.getName())});`);
238
+ } else {
239
+ parameterNames.push(`parameters.${parameter.parameter.name}`);
240
+
241
+ if (parameter.isPartOfPath()) {
242
+ if (parameter.parameter.type.kind !== ReflectionKind.class) {
243
+ const converted = getSerializeFunction(parameter.parameter.parameter, serializer.deserializeRegistry, undefined, parameter.getName());
244
+ const converterVar = compiler.reserveVariable('argumentConverter', converted);
245
+ setParameters.push(`parameters.${parameter.parameter.name} = ${converterVar}(_match[${1 + (parameter.regexPosition || 0)}], {loosely: true});`);
246
+
247
+ const validator = getValidatorFunction(undefined, parameter.parameter.parameter);
248
+ const validatorVar = compiler.reserveVariable('argumentValidator', validator);
249
+ parameterValidator.push(`${validatorVar}(parameters.${parameter.parameter.name}, {errors: validationErrors}, ${JSON.stringify(parameter.getName())});`);
250
+ } else {
251
+ setParameters.push(`parameters.${parameter.parameter.name} = _match[${1 + (parameter.regexPosition || 0)}];`);
252
+ }
253
+ }
254
+
255
+ const injectorToken = parameter.parameter.type.kind === ReflectionKind.class ? parameter.parameter.type.classType : undefined;
256
+ const injectorTokenVar = compiler.reserveVariable('classType', injectorToken);
257
+ const parameterResolverFoundVar = compiler.reserveVariable('parameterResolverFound', false);
258
+
259
+ setParameters.push(`${parameterResolverFoundVar} = false;`);
260
+
261
+ const resolverType = config.resolverForParameterName?.get(parameter.getName()) || config.resolverForToken?.get(injectorToken);
262
+
263
+ //make sure all parameter values from the path are available, important for parameter resolver
264
+ if (resolverType && !setParametersFromPath && config.pathParameterNames) {
265
+ for (const i in config.pathParameterNames) {
266
+ setParametersFromPath += `parameters.${i} = _match[${1 + config.pathParameterNames[i]}];`;
267
+ }
268
+ }
269
+
270
+ let injector = '_injector';
271
+ const moduleVar = config.module ? ', ' + compiler.reserveConst(config.module, 'module') : '';
272
+
273
+ if (resolverType) {
274
+ requiresAsyncParameters = true;
275
+ let instanceFetcher = '';
276
+ if (config.module && config.module.injector) {
277
+ const resolverResolverVar = compiler.reserveVariable('resolverProvideToken', config.module.injector.createResolver(resolveReceiveType(resolverType)));
278
+ instanceFetcher = `${resolverResolverVar}(${injector}.scope)`;
279
+ } else {
280
+ const resolverProvideTokenVar = compiler.reserveVariable('resolverProvideToken', resolverType);
281
+ instanceFetcher = `${injector}.get(${resolverProvideTokenVar}${moduleVar})`;
282
+ }
283
+ const instance = compiler.reserveVariable('resolverInstance');
284
+
285
+ const routeConfigVar = compiler.reserveVariable('routeConfigVar', config.routeConfig);
286
+ setParameters.push(`
287
+ //resolver ${getClassName(resolverType)} for ${parameter.getName()}
288
+ ${instance} = ${instanceFetcher};
289
+ if (!${parameterResolverFoundVar}) {
290
+ ${parameterResolverFoundVar} = true;
291
+ parameters.${parameter.parameter.name} = await ${instance}.resolve({
292
+ token: ${injectorTokenVar},
293
+ route: ${routeConfigVar},
294
+ request: request,
295
+ name: ${JSON.stringify(parameter.parameter.name)},
296
+ value: parameters.${parameter.parameter.name},
297
+ query: _query,
298
+ parameters: parameters,
299
+ type: ${compiler.reserveVariable('parameterType', parameter.parameter)}
300
+ });
301
+ }`);
302
+ }
303
+
304
+ if (!parameter.isPartOfPath()) {
305
+ let injectorGet = `parameters.${parameter.parameter.name} = ${injector}.get(${injectorTokenVar});`;
306
+ if (parameter.parameter.isOptional()) {
307
+ injectorGet = `try {parameters.${parameter.parameter.name} = ${injector}.get(${injectorTokenVar}); } catch (e) {}`;
308
+ }
309
+ setParameters.push(`if (!${parameterResolverFoundVar}) ${injectorGet}`);
310
+ }
311
+ }
312
+ }
313
+
314
+
315
+ let parseBodyLoading = '';
316
+ if (enableParseBody) {
317
+ const parseBodyVar = compiler.reserveVariable('parseBody', parseBody);
318
+ parseBodyLoading = `
319
+ const bodyFields = (await ${parseBodyVar}(request, uploadedFiles));`;
320
+ requiresAsyncParameters = true;
321
+ }
322
+
323
+ let parametersLoader = '() => {}';
324
+
325
+ if (setParameters.length) {
326
+ parametersLoader = `${requiresAsyncParameters ? 'async' : ''} function parse(_injector){
327
+ const validationErrors = [];
328
+ const bodyErrors = [];
329
+ const parameters = {};
330
+ ${setParametersFromPath}
331
+ ${parseBodyLoading}
332
+ ${setParameters.join('\n')}
333
+ ${parameterValidator.join('\n')}
334
+ ${bodyValidationErrorHandling}
335
+ if (validationErrors.length) throw new ValidationError(validationErrors);
336
+ return {arguments: [${parameterNames.join(',')}], parameters: parameters};
337
+ }`;
338
+ }
339
+ return parametersLoader;
340
+ }