@haibun/web-server-express 1.32.0 → 1.32.2
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/build/defs.d.ts
CHANGED
|
@@ -8,8 +8,8 @@ export interface IWebServer {
|
|
|
8
8
|
listen(): Promise<unknown>;
|
|
9
9
|
close(): Promise<void>;
|
|
10
10
|
mounted: TRouteMap;
|
|
11
|
-
addRoute(type: TRouteTypes, path: string,
|
|
12
|
-
addKnownRoute(type: TRouteTypes, path: string,
|
|
11
|
+
addRoute(type: TRouteTypes, path: string, ...routes: TRequestHandler[]): void;
|
|
12
|
+
addKnownRoute(type: TRouteTypes, path: string, ...routes: TRequestHandler[]): void;
|
|
13
13
|
use(middleware: express.RequestHandler): void;
|
|
14
14
|
}
|
|
15
15
|
export declare const ROUTE_TYPES: readonly ["get", "post", "put", "delete", "head", "options"];
|
|
@@ -21,7 +21,7 @@ export type TRouteMap = {
|
|
|
21
21
|
};
|
|
22
22
|
export type IRequest = typeof express.request;
|
|
23
23
|
export type IResponse = typeof express.response;
|
|
24
|
-
export type TRequestHandler = (req: IRequest, res: IResponse) => void;
|
|
24
|
+
export type TRequestHandler = (req: IRequest, res: IResponse, next: () => void) => void;
|
|
25
25
|
export type TStaticFolderOptions = {
|
|
26
26
|
setHeaders?: (res: any, filePath: any, stat: any) => void;
|
|
27
27
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
2
|
import http from 'http';
|
|
3
3
|
import { RequestHandler } from 'express';
|
|
4
|
-
import { IWebServer, TRouteMap, TRouteTypes, TStaticFolderOptions } from './defs.js';
|
|
4
|
+
import { IWebServer, TRequestHandler, TRouteMap, TRouteTypes, TStaticFolderOptions } from './defs.js';
|
|
5
5
|
import { ILogger } from '@haibun/core/build/lib/interfaces/logger.js';
|
|
6
6
|
export declare const DEFAULT_PORT = 8123;
|
|
7
7
|
export declare class ServerExpress implements IWebServer {
|
|
@@ -15,8 +15,8 @@ export declare class ServerExpress implements IWebServer {
|
|
|
15
15
|
constructor(logger: ILogger, base: string, port?: number);
|
|
16
16
|
use(middleware: RequestHandler): void;
|
|
17
17
|
listen(): Promise<unknown>;
|
|
18
|
-
addRoute(type: TRouteTypes, path: string,
|
|
19
|
-
addKnownRoute(type: TRouteTypes, path: string,
|
|
18
|
+
addRoute(type: TRouteTypes, path: string, ...routes: RequestHandler[]): void;
|
|
19
|
+
addKnownRoute(type: TRouteTypes, path: string, ...routes: TRequestHandler[]): void;
|
|
20
20
|
private addMounted;
|
|
21
21
|
checkAddStaticFolder(relativeFolder: string, mountAt?: string, options?: TStaticFolderOptions): string;
|
|
22
22
|
checkAddIndexFolder(relativeFolder: string, mountAt?: string, options?: TStaticFolderOptions): string;
|
package/build/server-express.js
CHANGED
|
@@ -47,22 +47,22 @@ export class ServerExpress {
|
|
|
47
47
|
}
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
|
-
addRoute(type, path,
|
|
50
|
+
addRoute(type, path, ...routes) {
|
|
51
51
|
if (type !== 'get' && type !== 'post' && type !== 'put' && type !== 'delete' && type !== 'head') {
|
|
52
52
|
throw Error(`invalid route type ${type}`);
|
|
53
53
|
}
|
|
54
|
-
const bad = this.checkMountBadOrMounted('get', path,
|
|
54
|
+
const bad = this.checkMountBadOrMounted('get', path, routes.toString());
|
|
55
55
|
if (bad) {
|
|
56
56
|
throw Error(bad);
|
|
57
57
|
}
|
|
58
58
|
this.logger.log(`adding ${type} route from ${path}`);
|
|
59
|
-
this.app[type](path,
|
|
60
|
-
this.addMounted(type, path,
|
|
59
|
+
this.app[type](path, ...routes);
|
|
60
|
+
this.addMounted(type, path, routes.toString());
|
|
61
61
|
}
|
|
62
|
-
addKnownRoute(type, path,
|
|
62
|
+
addKnownRoute(type, path, ...routes) {
|
|
63
63
|
this.logger.log(`adding known ${type} route from ${path}`);
|
|
64
|
-
this.app[type](path,
|
|
65
|
-
this.addMounted(type, path,
|
|
64
|
+
this.app[type](path, ...routes);
|
|
65
|
+
this.addMounted(type, path, routes.toString());
|
|
66
66
|
}
|
|
67
67
|
addMounted(type, path, what) {
|
|
68
68
|
this.mounted[type][path] = what;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-express.js","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAI1C,OAAO,OAA2B,MAAM,SAAS,CAAC;AAClD,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAc,WAAW,
|
|
1
|
+
{"version":3,"file":"server-express.js","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@haibun/web-server-express",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "1.32.
|
|
4
|
+
"version": "1.32.2",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "build/web-server-stepper.js",
|
|
7
7
|
"files": [
|
|
@@ -20,14 +20,14 @@
|
|
|
20
20
|
"author": "",
|
|
21
21
|
"license": "ISC",
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@haibun/core": "1.32.
|
|
24
|
-
"@haibun/domain-webpage": "1.32.
|
|
23
|
+
"@haibun/core": "1.32.2",
|
|
24
|
+
"@haibun/domain-webpage": "1.32.2",
|
|
25
25
|
"cookie-parser": "^1.4.5",
|
|
26
26
|
"express": "^4.17.1",
|
|
27
27
|
"serve-index": "^1.9.1"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@haibun/web-http": "1.32.
|
|
30
|
+
"@haibun/web-http": "1.32.2",
|
|
31
31
|
"@types/cookie-parser": "^1.4.2",
|
|
32
32
|
"@types/express": "^4.17.15"
|
|
33
33
|
},
|