@haibun/web-server-express 1.41.2 → 1.41.4
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/server-express.d.ts +3 -3
- package/build/server-express.d.ts.map +1 -1
- package/build/server-express.js +2 -2
- package/build/server-express.js.map +1 -1
- package/build/web-server-stepper.d.ts +3 -3
- package/build/web-server-stepper.d.ts.map +1 -1
- package/build/web-server-stepper.js +9 -9
- package/build/web-server-stepper.js.map +1 -1
- package/package.json +3 -3
|
@@ -4,13 +4,13 @@ import { IWebServer, TRequestHandler, TRouteMap, TRouteTypes, TStaticFolderOptio
|
|
|
4
4
|
import { ILogger } from '@haibun/core/build/lib/interfaces/logger.js';
|
|
5
5
|
export declare const DEFAULT_PORT = 8123;
|
|
6
6
|
export declare class ServerExpress implements IWebServer {
|
|
7
|
-
logger
|
|
7
|
+
private logger;
|
|
8
|
+
private base;
|
|
9
|
+
private port;
|
|
8
10
|
static listening: boolean;
|
|
9
11
|
listener?: http.Server;
|
|
10
12
|
app: import("express-serve-static-core").Express;
|
|
11
13
|
mounted: TRouteMap;
|
|
12
|
-
base: string;
|
|
13
|
-
port: number;
|
|
14
14
|
constructor(logger: ILogger, base: string, port?: number);
|
|
15
15
|
use(middleware: RequestHandler): void;
|
|
16
16
|
listen(): Promise<unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-express.d.ts","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAIlD,OAAO,EAAE,UAAU,EAAe,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,6CAA6C,CAAC;AAEtE,eAAO,MAAM,YAAY,OAAO,CAAC;AAGjC,qBAAa,aAAc,YAAW,UAAU;
|
|
1
|
+
{"version":3,"file":"server-express.d.ts","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAgB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAIlD,OAAO,EAAE,UAAU,EAAe,eAAe,EAAE,SAAS,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACnH,OAAO,EAAE,OAAO,EAAE,MAAM,6CAA6C,CAAC;AAEtE,eAAO,MAAM,YAAY,OAAO,CAAC;AAGjC,qBAAa,aAAc,YAAW,UAAU;IAKnC,OAAO,CAAC,MAAM;IAAW,OAAO,CAAC,IAAI;IAAU,OAAO,CAAC,IAAI;IAJvE,MAAM,CAAC,SAAS,UAAS;IACzB,QAAQ,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACvB,GAAG,8CAAa;IAChB,OAAO,YAAoB;gBACP,MAAM,EAAE,OAAO,EAAU,IAAI,EAAE,MAAM,EAAU,IAAI,GAAE,MAAqB;IAQ9F,GAAG,CAAC,UAAU,EAAE,cAAc;IAI9B,MAAM;IAoBN,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,cAAc,EAAE;IAerE,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,eAAe,EAAE;IAM3E,OAAO,CAAC,UAAU;IAKlB,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,SAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB;IAM1F,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,SAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB;IAYzF,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,SAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB;IAIlF,OAAO,CAAC,iBAAiB;IAmBzB,sBAAsB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAYxD,KAAK;CAMX"}
|
package/build/server-express.js
CHANGED
|
@@ -7,12 +7,12 @@ export const DEFAULT_PORT = 8123;
|
|
|
7
7
|
const defaultMounted = () => ROUTE_TYPES.reduce((acc, type) => ({ ...acc, [type]: {} }), {});
|
|
8
8
|
export class ServerExpress {
|
|
9
9
|
logger;
|
|
10
|
+
base;
|
|
11
|
+
port;
|
|
10
12
|
static listening = false;
|
|
11
13
|
listener;
|
|
12
14
|
app = express();
|
|
13
15
|
mounted = defaultMounted();
|
|
14
|
-
base;
|
|
15
|
-
port;
|
|
16
16
|
constructor(logger, base, port = DEFAULT_PORT) {
|
|
17
17
|
this.logger = logger;
|
|
18
18
|
this.base = base;
|
|
@@ -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;AAE1C,OAAO,OAA2B,MAAM,SAAS,CAAC;AAClD,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAc,WAAW,EAAiE,MAAM,WAAW,CAAC;AAGnH,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC;AACjC,MAAM,cAAc,GAAG,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,EAAa,EAAE,CAAC,CAAC;AAExG,MAAM,OAAO,aAAa;
|
|
1
|
+
{"version":3,"file":"server-express.js","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TWorld, TNamed, TOptions, AStepper,
|
|
1
|
+
import { TWorld, TNamed, TOptions, AStepper, TFeatureStep } from '@haibun/core/build/lib/defs.js';
|
|
2
2
|
import { IWebServer } from './defs.js';
|
|
3
3
|
import { ServerExpress } from './server-express.js';
|
|
4
4
|
declare const WebServerStepper: {
|
|
@@ -21,7 +21,7 @@ declare const WebServerStepper: {
|
|
|
21
21
|
steps: {
|
|
22
22
|
thisURI: {
|
|
23
23
|
gwta: string;
|
|
24
|
-
action: ({ where }: TNamed,
|
|
24
|
+
action: ({ where }: TNamed, featureStep: TFeatureStep) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult>;
|
|
25
25
|
};
|
|
26
26
|
isListening: {
|
|
27
27
|
gwta: string;
|
|
@@ -53,7 +53,7 @@ declare const WebServerStepper: {
|
|
|
53
53
|
listen(): Promise<void>;
|
|
54
54
|
world?: TWorld;
|
|
55
55
|
endFeature?(): Promise<void>;
|
|
56
|
-
onFailure?(result: import("@haibun/core/build/lib/defs.js").TStepResult, step:
|
|
56
|
+
onFailure?(result: import("@haibun/core/build/lib/defs.js").TStepResult, step: TFeatureStep): Promise<void | import("@haibun/core/build/lib/interfaces/logger.js").TMessageContext>;
|
|
57
57
|
getWorld(): TWorld;
|
|
58
58
|
};
|
|
59
59
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-server-stepper.d.ts","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"web-server-stepper.d.ts","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEnH,OAAO,EAAE,UAAU,EAAa,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAIlE,QAAA,MAAM,gBAAgB;;mBACV,aAAa,GAAG,SAAS;;;;8BAKpB,MAAM;;;;;;;;;wBAIA,MAAM,YAAY,QAAQ,EAAE;;;;;oCAetB,MAAM,eAAe,YAAY;;;;;;;;;;;;yCA2B5B,MAAM;;;;kCAMb,MAAM;;;;kCAON,MAAM;;;;yCAOC,MAAM;;;;;;;;;;;CA4BvC,CAAC;AACF,eAAe,gBAAgB,CAAC;AAEhC,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,KAAK,IAAI,CAAC;AAChF,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,UAAU,CAAC;IACtB,KAAK,EAAE,MAAM,IAAI,CAAC;CAClB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { OK, AStepper
|
|
1
|
+
import { OK, AStepper } from '@haibun/core/build/lib/defs.js';
|
|
2
2
|
import { actionNotOK, getFromRuntime, getStepperOption, intOrError } from '@haibun/core/build/lib/util/index.js';
|
|
3
|
-
import { WEBSERVER
|
|
3
|
+
import { WEBSERVER } from './defs.js';
|
|
4
4
|
import { ServerExpress, DEFAULT_PORT } from './server-express.js';
|
|
5
5
|
import { WEB_PAGE } from '@haibun/core/build/lib/domain-types.js';
|
|
6
6
|
import path from 'path';
|
|
@@ -9,7 +9,7 @@ const WebServerStepper = class WebServerStepper extends AStepper {
|
|
|
9
9
|
options = {
|
|
10
10
|
PORT: {
|
|
11
11
|
desc: `change web server port from ${DEFAULT_PORT}`,
|
|
12
|
-
parse: (port) => intOrError(port)
|
|
12
|
+
parse: (port) => intOrError(port),
|
|
13
13
|
},
|
|
14
14
|
};
|
|
15
15
|
async setWorld(world, steppers) {
|
|
@@ -25,8 +25,8 @@ const WebServerStepper = class WebServerStepper extends AStepper {
|
|
|
25
25
|
steps = {
|
|
26
26
|
thisURI: {
|
|
27
27
|
gwta: `a ${WEB_PAGE} at {where}`,
|
|
28
|
-
action: async ({ where },
|
|
29
|
-
const page =
|
|
28
|
+
action: async ({ where }, featureStep) => {
|
|
29
|
+
const page = featureStep.source.name;
|
|
30
30
|
const webserver = getFromRuntime(this.getWorld().runtime, WEBSERVER);
|
|
31
31
|
await webserver.checkAddStaticFolder(page, where);
|
|
32
32
|
return OK;
|
|
@@ -60,14 +60,14 @@ const WebServerStepper = class WebServerStepper extends AStepper {
|
|
|
60
60
|
action: async ({ loc }) => {
|
|
61
61
|
const r = await this.doServeFiles('/', loc).catch((e) => actionNotOK(e));
|
|
62
62
|
return r;
|
|
63
|
-
}
|
|
63
|
+
},
|
|
64
64
|
},
|
|
65
65
|
indexFiles: {
|
|
66
66
|
gwta: 'index files from {loc}',
|
|
67
67
|
action: async ({ loc }) => {
|
|
68
68
|
const r = await this.doServeIndex('/', loc).catch((e) => actionNotOK(e));
|
|
69
69
|
return r;
|
|
70
|
-
}
|
|
70
|
+
},
|
|
71
71
|
},
|
|
72
72
|
indexFilesAt: {
|
|
73
73
|
gwta: 'index files at {where} from {loc}',
|
|
@@ -75,8 +75,8 @@ const WebServerStepper = class WebServerStepper extends AStepper {
|
|
|
75
75
|
const r = await this.doServeIndex(where, loc).catch((e) => actionNotOK(e));
|
|
76
76
|
console.log('r', r);
|
|
77
77
|
return r;
|
|
78
|
-
}
|
|
79
|
-
}
|
|
78
|
+
},
|
|
79
|
+
},
|
|
80
80
|
};
|
|
81
81
|
async doServeIndex(where, loc) {
|
|
82
82
|
const ws = getFromRuntime(this.getWorld().runtime, WEBSERVER);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-server-stepper.js","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,EAAE,EAA4B,QAAQ,
|
|
1
|
+
{"version":3,"file":"web-server-stepper.js","sourceRoot":"","sources":["../src/web-server-stepper.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.41.
|
|
4
|
+
"version": "1.41.4",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "build/web-server-stepper.js",
|
|
7
7
|
"files": ["build/**"],
|
|
@@ -18,13 +18,13 @@
|
|
|
18
18
|
"author": "",
|
|
19
19
|
"license": "ISC",
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@haibun/core": "1.41.
|
|
21
|
+
"@haibun/core": "1.41.4",
|
|
22
22
|
"cookie-parser": "^1.4.5",
|
|
23
23
|
"express": "^4.17.1",
|
|
24
24
|
"serve-index": "^1.9.1"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@haibun/web-http": "1.41.
|
|
27
|
+
"@haibun/web-http": "1.41.4",
|
|
28
28
|
"@types/cookie-parser": "^1.4.2",
|
|
29
29
|
"@types/express": "^4.17.15"
|
|
30
30
|
},
|