barehttp 0.5.0 → 0.6.0
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/request.d.ts +6 -4
- package/lib/request.js +2 -1
- package/lib/server.d.ts +12 -3
- package/package.json +1 -1
package/lib/request.d.ts
CHANGED
|
@@ -14,15 +14,17 @@ export declare type CacheOpts = {
|
|
|
14
14
|
expirationSeconds?: number;
|
|
15
15
|
revalidation?: Revalidation;
|
|
16
16
|
};
|
|
17
|
-
export declare class BareRequest {
|
|
17
|
+
export declare class BareRequest<H extends {
|
|
18
|
+
[key: string]: string | undefined;
|
|
19
|
+
} = {
|
|
20
|
+
[key: string]: string | undefined;
|
|
21
|
+
}> {
|
|
18
22
|
_originalRequest: IncomingMessage;
|
|
19
23
|
_originalResponse: ServerResponse;
|
|
20
24
|
ID: {
|
|
21
25
|
code: string;
|
|
22
26
|
};
|
|
23
|
-
params:
|
|
24
|
-
[k: string]: string | undefined;
|
|
25
|
-
};
|
|
27
|
+
params: H;
|
|
26
28
|
query: {
|
|
27
29
|
[k: string]: string | undefined;
|
|
28
30
|
};
|
package/lib/request.js
CHANGED
|
@@ -21,7 +21,7 @@ class BareRequest {
|
|
|
21
21
|
_originalRequest;
|
|
22
22
|
_originalResponse;
|
|
23
23
|
ID;
|
|
24
|
-
params
|
|
24
|
+
params;
|
|
25
25
|
query = {};
|
|
26
26
|
remoteIp;
|
|
27
27
|
requestBody;
|
|
@@ -42,6 +42,7 @@ class BareRequest {
|
|
|
42
42
|
constructor(_originalRequest, _originalResponse, options) {
|
|
43
43
|
this._originalRequest = _originalRequest;
|
|
44
44
|
this._originalResponse = _originalResponse;
|
|
45
|
+
this.params = {};
|
|
45
46
|
this.ID = { code: _originalRequest.headers['x-request-id'] || generateId() };
|
|
46
47
|
this.remoteIp = _originalRequest.socket.remoteAddress;
|
|
47
48
|
this.contentType = this._originalRequest.headers['content-type'];
|
package/lib/server.d.ts
CHANGED
|
@@ -8,7 +8,9 @@ import { CorsOptions } from './middlewares/cors/cors';
|
|
|
8
8
|
import { WebSocketServer } from './websocket';
|
|
9
9
|
import { Server } from 'http';
|
|
10
10
|
declare type Middleware = (flow: BareRequest) => Promise<void> | void;
|
|
11
|
-
declare type Handler
|
|
11
|
+
declare type Handler<H extends {
|
|
12
|
+
[key: string]: string | undefined;
|
|
13
|
+
}> = (flow: BareRequest<H>) => any;
|
|
12
14
|
declare type ErrorHandler = (err: any, flow: BareRequest, status?: StatusCodesUnion) => void;
|
|
13
15
|
declare type IP = `${number}.${number}.${number}.${number}`;
|
|
14
16
|
declare type RouteOpts<C> = {
|
|
@@ -89,16 +91,23 @@ declare type BareOptions<A extends IP> = {
|
|
|
89
91
|
*/
|
|
90
92
|
cors?: boolean | CorsOptions;
|
|
91
93
|
};
|
|
94
|
+
declare type ExtractRouteParams<T extends string> = T extends `${infer Start}:${infer Param}/${infer Rest}` ? {
|
|
95
|
+
[K in Param | keyof ExtractRouteParams<Rest>]: string;
|
|
96
|
+
} : T extends `${infer Start}:${infer Param}` ? {
|
|
97
|
+
[K in Param]: string;
|
|
98
|
+
} : {
|
|
99
|
+
[k: string]: string;
|
|
100
|
+
};
|
|
92
101
|
interface HandlerExposed<K> {
|
|
93
102
|
<R extends `/${string}`, C>(setUp: K extends 'declare' ? {
|
|
94
103
|
route: R;
|
|
95
104
|
options?: RouteOpts<C>;
|
|
96
|
-
handler: Handler
|
|
105
|
+
handler: Handler<ExtractRouteParams<R>>;
|
|
97
106
|
methods: Array<HttpMethodsUnion>;
|
|
98
107
|
} : {
|
|
99
108
|
route: R;
|
|
100
109
|
options?: RouteOpts<C>;
|
|
101
|
-
handler: Handler
|
|
110
|
+
handler: Handler<ExtractRouteParams<R>>;
|
|
102
111
|
}): BareServer<any> & Routes;
|
|
103
112
|
}
|
|
104
113
|
export declare type RouteReport = {
|