@haibun/web-server-express 1.43.0 → 1.44.1

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
@@ -1,5 +1,4 @@
1
1
  export declare const WEBSERVER = "webserver";
2
- export declare const CHECK_LISTENER = "CHECK_LISTENER";
3
2
  import * as express from 'express';
4
3
  export interface IWebServer {
5
4
  checkAddStaticFolder(subdir: string, loc: string, options?: TStaticFolderOptions): undefined | string;
@@ -13,7 +12,7 @@ export interface IWebServer {
13
12
  use(middleware: express.RequestHandler): void;
14
13
  }
15
14
  export declare const ROUTE_TYPES: readonly ["get", "post", "put", "delete", "head", "options"];
16
- export type TRouteTypes = typeof ROUTE_TYPES[number];
15
+ export type TRouteTypes = (typeof ROUTE_TYPES)[number];
17
16
  export type TRouteMap = {
18
17
  [K in TRouteTypes]: {
19
18
  [path: string]: string;
@@ -1 +1 @@
1
- {"version":3,"file":"defs.d.ts","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,SAAS,cAAc,CAAC;AACrC,eAAO,MAAM,cAAc,mBAAmB,CAAC;AAC/C,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,UAAU;IACzB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,GAAG,MAAM,CAAC;IACtG,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IACrE,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IAC3E,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,OAAO,EAAE,SAAS,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAC9E,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IACnF,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;CAC/C;AAED,eAAO,MAAM,WAAW,8DAA+D,CAAC;AAExF,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;AACrD,MAAM,MAAM,SAAS,GAAG;KAAG,CAAC,IAAI,WAAW,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;CAAE,CAAA;AAE1E,MAAM,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,OAAO,CAAC;AAE9C,MAAM,MAAM,SAAS,GAAG,OAAO,OAAO,CAAC,QAAQ,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;AAExF,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,CAAC,EAAE,CAAC,GAAG,KAAA,EAAE,QAAQ,KAAA,EAAE,IAAI,KAAA,KAAK,IAAI,CAAC;CAC5C,CAAA"}
1
+ {"version":3,"file":"defs.d.ts","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,cAAc,CAAC;AACrC,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,MAAM,WAAW,UAAU;IAC1B,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,GAAG,MAAM,CAAC;IACtG,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IACrE,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC;IAC3E,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,OAAO,EAAE,SAAS,CAAC;IACnB,QAAQ,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAC9E,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IACnF,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;CAC9C;AAED,eAAO,MAAM,WAAW,8DAA+D,CAAC;AAExF,MAAM,MAAM,WAAW,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AACvD,MAAM,MAAM,SAAS,GAAG;KAAG,CAAC,IAAI,WAAW,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;CAAE,CAAC;AAE3E,MAAM,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,OAAO,CAAC;AAE9C,MAAM,MAAM,SAAS,GAAG,OAAO,OAAO,CAAC,QAAQ,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;AAExF,MAAM,MAAM,oBAAoB,GAAG;IAClC,UAAU,CAAC,EAAE,CAAC,GAAG,KAAA,EAAE,QAAQ,KAAA,EAAE,IAAI,KAAA,KAAK,IAAI,CAAC;CAC3C,CAAC"}
package/build/defs.js CHANGED
@@ -1,4 +1,3 @@
1
1
  export const WEBSERVER = 'webserver';
2
- export const CHECK_LISTENER = 'CHECK_LISTENER';
3
2
  export const ROUTE_TYPES = ['get', 'post', 'put', 'delete', 'head', 'options'];
4
3
  //# sourceMappingURL=defs.js.map
package/build/defs.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"defs.js","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,SAAS,GAAG,WAAW,CAAC;AACrC,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAgB,CAAC;AAe/C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAU,CAAC"}
1
+ {"version":3,"file":"defs.js","sourceRoot":"","sources":["../src/defs.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,WAAW,CAAC;AAerC,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAU,CAAC"}
@@ -31,9 +31,9 @@ export class ServerExpress {
31
31
  if (!ServerExpress.listening) {
32
32
  try {
33
33
  this.listener = this.app.listen(this.port, () => {
34
- this.logger.log(`Server listening on port: ${this.port}`);
34
+ this.logger.debug(`Server listening on port: ${this.port}`);
35
35
  ServerExpress.listening = true;
36
- this.logger.log('express listening');
36
+ this.logger.debug('express listening');
37
37
  resolve('started');
38
38
  });
39
39
  }
@@ -42,7 +42,7 @@ export class ServerExpress {
42
42
  }
43
43
  }
44
44
  else {
45
- this.logger.log('express already listening');
45
+ this.logger.info('express already listening');
46
46
  resolve('already listening');
47
47
  }
48
48
  });
@@ -55,12 +55,12 @@ export class ServerExpress {
55
55
  if (bad) {
56
56
  throw Error(bad);
57
57
  }
58
- this.logger.log(`adding ${type} route from ${path}`);
58
+ this.logger.debug(`adding ${type} route from ${path}`);
59
59
  this.app[type](path, ...routes);
60
60
  this.addMounted(type, path, routes.toString());
61
61
  }
62
62
  addKnownRoute(type, path, ...routes) {
63
- this.logger.log(`adding known ${type} route from ${path}`);
63
+ this.logger.debug(`adding known ${type} route from ${path}`);
64
64
  this.app[type](path, ...routes);
65
65
  this.addMounted(type, path, routes.toString());
66
66
  }
@@ -79,7 +79,7 @@ export class ServerExpress {
79
79
  if (bad) {
80
80
  return bad;
81
81
  }
82
- this.logger.info(`serving index from ${folder} at ${mountAt}`);
82
+ this.logger.debug(`serving index from ${folder} at ${mountAt}`);
83
83
  this.app.use(mountAt, serveIndex(folder), express.static(folder, options));
84
84
  return;
85
85
  }
@@ -101,11 +101,11 @@ export class ServerExpress {
101
101
  }
102
102
  this.app.use(mountAt, express.static(folder, options));
103
103
  this.addMounted('get', mountAt, folder);
104
- this.logger.info(`serving files from ${folder} at ${mountAt}`);
104
+ this.logger.debug(`serving files from ${folder} at ${mountAt}`);
105
105
  return;
106
106
  }
107
107
  checkMountBadOrMounted(type, loc, what) {
108
- if (loc !== loc.replace(/[^a-zA-Z-0-9/\-_]/g, '')) {
108
+ if (loc !== loc.replace(/[^a-zA-Z-0-9:/\-_]/g, '')) {
109
109
  return `mount folder ${loc} has illegal characters`;
110
110
  }
111
111
  const alreadyMounted = this.mounted[type][loc] || Object.keys(this.mounted[type]).find((m) => m.startsWith(`${loc}/`));
@@ -115,7 +115,7 @@ export class ServerExpress {
115
115
  return undefined;
116
116
  }
117
117
  async close() {
118
- this.logger.info(`closing server ${this.port}`);
118
+ this.logger.debug(`closing server ${this.port}`);
119
119
  await this.listener?.close();
120
120
  this.mounted = defaultMounted();
121
121
  ServerExpress.listening = false;
@@ -1 +1 @@
1
- {"version":3,"file":"server-express.js","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server-express.js","sourceRoot":"","sources":["../src/server-express.ts"],"names":[],"mappings":"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"}
@@ -1,64 +1,62 @@
1
- import { TWorld, TNamed, TOptions, AStepper, TFeatureStep } from '@haibun/core/build/lib/defs.js';
1
+ import { IHasOptions, TWorld, TNamed, AStepper, TFeatureStep, IStepperCycles } from '@haibun/core/build/lib/defs.js';
2
2
  import { IWebServer } from './defs.js';
3
3
  import { ServerExpress } from './server-express.js';
4
- declare const WebServerStepper: {
5
- new (): {
6
- webserver: ServerExpress | undefined;
7
- options: {
8
- PORT: {
9
- desc: string;
10
- parse: (port: string) => {
11
- error: string;
12
- result?: undefined;
13
- } | {
14
- result: number;
15
- error?: undefined;
16
- };
4
+ declare class WebServerStepper extends AStepper implements IHasOptions {
5
+ webserver: ServerExpress | undefined;
6
+ cycles: IStepperCycles;
7
+ options: {
8
+ PORT: {
9
+ desc: string;
10
+ parse: (port: string) => {
11
+ parseError: string;
12
+ result?: undefined;
13
+ } | {
14
+ result: number;
15
+ parseError?: undefined;
17
16
  };
18
17
  };
19
- setWorld(world: TWorld, steppers: AStepper[]): Promise<void>;
20
- close(): Promise<void>;
21
- steps: {
22
- thisURI: {
23
- gwta: string;
24
- action: ({ where }: TNamed, featureStep: TFeatureStep) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult>;
25
- };
26
- isListening: {
27
- gwta: string;
28
- action: () => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult>;
29
- };
30
- showMounts: {
31
- gwta: string;
32
- action: () => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult>;
33
- };
34
- serveFilesAt: {
35
- gwta: string;
36
- action: ({ where, loc }: TNamed) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
37
- };
38
- serveFiles: {
39
- gwta: string;
40
- action: ({ loc }: TNamed) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
41
- };
42
- indexFiles: {
43
- gwta: string;
44
- action: ({ loc }: TNamed) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
45
- };
46
- indexFilesAt: {
47
- gwta: string;
48
- action: ({ where, loc }: TNamed) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
49
- };
18
+ };
19
+ port: number;
20
+ setWorld(world: TWorld, steppers: AStepper[]): Promise<void>;
21
+ steps: {
22
+ thisURI: {
23
+ gwta: string;
24
+ action: ({ where }: TNamed, featureStep: TFeatureStep) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult>;
25
+ };
26
+ isListening: {
27
+ gwta: string;
28
+ action: () => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult>;
29
+ };
30
+ showMounts: {
31
+ gwta: string;
32
+ action: () => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult>;
33
+ };
34
+ serveFilesAt: {
35
+ gwta: string;
36
+ action: ({ where, loc }: TNamed) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
37
+ };
38
+ serveFiles: {
39
+ gwta: string;
40
+ action: ({ loc }: TNamed) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
41
+ };
42
+ indexFiles: {
43
+ gwta: string;
44
+ action: ({ loc }: TNamed) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
45
+ };
46
+ indexFilesAt: {
47
+ gwta: string;
48
+ action: ({ where, loc }: TNamed) => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
49
+ };
50
+ showRoutes: {
51
+ gwta: string;
52
+ action: () => Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult>;
50
53
  };
51
- doServeIndex(where: any, loc: any): Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
52
- doServeFiles(where: any, loc: any): Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
53
- listen(): Promise<void>;
54
- world?: TWorld;
55
- endFeature?(): Promise<void>;
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
- getWorld(): TWorld;
58
54
  };
59
- };
55
+ doServeIndex(where: any, loc: any): Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
56
+ doServeFiles(where: any, loc: any): Promise<import("@haibun/core/build/lib/defs.js").TOKActionResult | import("@haibun/core/build/lib/defs.js").TNotOKActionResult>;
57
+ listen(): Promise<void>;
58
+ }
60
59
  export default WebServerStepper;
61
- export type ICheckListener = (options: TOptions, webserver: IWebServer) => void;
62
60
  export interface IWebServerStepper {
63
61
  webserver: IWebServer;
64
62
  close: () => void;
@@ -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,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
+ {"version":3,"file":"web-server-stepper.d.ts","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAM,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAe,MAAM,gCAAgC,CAAC;AAEtI,OAAO,EAAE,UAAU,EAAa,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAoBlE,cAAM,gBAAiB,SAAQ,QAAS,YAAW,WAAW;IAC7D,SAAS,EAAE,aAAa,GAAG,SAAS,CAAC;IACrC,MAAM,EAAE,cAAc,CAAgB;IAEtC,OAAO;;;0BAGS,MAAM;;;;;;;;MAEpB;IACF,IAAI,EAAE,MAAM,CAAC;IAEP,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAKlD,KAAK;;;gCAGuB,MAAM,eAAe,YAAY;;;;;;;;;;;;qCA2B5B,MAAM;;;;8BAMb,MAAM;;;;8BAON,MAAM;;;;qCAOC,MAAM;;;;;;MAcrC;IACI,YAAY,CAAC,KAAK,KAAA,EAAE,GAAG,KAAA;IASvB,YAAY,CAAC,KAAK,KAAA,EAAE,GAAG,KAAA;IASvB,MAAM;CAGZ;AAED,eAAe,gBAAgB,CAAC;AAEhC,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,UAAU,CAAC;IACtB,KAAK,EAAE,MAAM,IAAI,CAAC;CAClB"}
@@ -4,29 +4,40 @@ 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';
7
- const WebServerStepper = class WebServerStepper extends AStepper {
7
+ const cycles = (wss) => ({
8
+ async startFeature() {
9
+ wss.webserver = new ServerExpress(wss.world.logger, path.join([process.cwd(), 'files'].join('/')), wss.port);
10
+ wss.getWorld().runtime[WEBSERVER] = wss.webserver;
11
+ await Promise.resolve();
12
+ },
13
+ async endFeature({ shouldClose = true }) {
14
+ // leave web server running if there was a failure and it's the last feature
15
+ if (shouldClose) {
16
+ await wss.webserver?.close();
17
+ wss.webserver = undefined;
18
+ return;
19
+ }
20
+ }
21
+ });
22
+ class WebServerStepper extends AStepper {
8
23
  webserver;
24
+ cycles = cycles(this);
9
25
  options = {
10
26
  PORT: {
11
27
  desc: `change web server port from ${DEFAULT_PORT}`,
12
28
  parse: (port) => intOrError(port),
13
29
  },
14
30
  };
31
+ port;
15
32
  async setWorld(world, steppers) {
16
33
  await super.setWorld(world, steppers);
17
- // this.world.runtime[CHECK_LISTENER] = WebServerStepper.checkListener;
18
- const port = parseInt(getStepperOption(this, 'PORT', world.moduleOptions)) || DEFAULT_PORT;
19
- this.webserver = new ServerExpress(world.logger, path.join([process.cwd(), 'files'].join('/')), port);
20
- world.runtime[WEBSERVER] = this.webserver;
21
- }
22
- async close() {
23
- await this.webserver?.close();
34
+ this.port = parseInt(getStepperOption(this, 'PORT', world.moduleOptions)) || DEFAULT_PORT;
24
35
  }
25
36
  steps = {
26
37
  thisURI: {
27
38
  gwta: `a ${WEB_PAGE} at {where}`,
28
39
  action: async ({ where }, featureStep) => {
29
- const page = featureStep.source.name;
40
+ const page = featureStep.path;
30
41
  const webserver = getFromRuntime(this.getWorld().runtime, WEBSERVER);
31
42
  await webserver.checkAddStaticFolder(page, where);
32
43
  return OK;
@@ -46,7 +57,7 @@ const WebServerStepper = class WebServerStepper extends AStepper {
46
57
  const webserver = getFromRuntime(this.getWorld().runtime, WEBSERVER);
47
58
  const mounts = webserver.mounted;
48
59
  this.getWorld().logger.info(`mounts: ${JSON.stringify(mounts, null, 2)}`);
49
- return OK;
60
+ return Promise.resolve(OK);
50
61
  },
51
62
  },
52
63
  serveFilesAt: {
@@ -77,6 +88,14 @@ const WebServerStepper = class WebServerStepper extends AStepper {
77
88
  return r;
78
89
  },
79
90
  },
91
+ showRoutes: {
92
+ gwta: 'show routes',
93
+ action: async () => {
94
+ const routes = this.webserver?.mounted;
95
+ this.getWorld().logger.info(`routes: ${JSON.stringify(routes, null, 2)}`);
96
+ return Promise.resolve(OK);
97
+ },
98
+ }
80
99
  };
81
100
  async doServeIndex(where, loc) {
82
101
  const ws = getFromRuntime(this.getWorld().runtime, WEBSERVER);
@@ -99,6 +118,6 @@ const WebServerStepper = class WebServerStepper extends AStepper {
99
118
  async listen() {
100
119
  await this.webserver.listen();
101
120
  }
102
- };
121
+ }
103
122
  export default WebServerStepper;
104
123
  //# sourceMappingURL=web-server-stepper.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"web-server-stepper.js","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"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"}
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.43.0",
4
+ "version": "1.44.1",
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.43.0",
21
+ "@haibun/core": "1.44.1",
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.43.0",
27
+ "@haibun/web-http": "1.44.1",
28
28
  "@types/cookie-parser": "^1.4.2",
29
29
  "@types/express": "^4.17.15"
30
30
  },