@haibun/web-server-express 3.0.5 → 3.1.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.
@@ -34,6 +34,7 @@ export default class HttpExecutorStepper extends AStepper implements IHasOptions
34
34
  protected httpPrompter?: HttpPrompter;
35
35
  configuredToken: string;
36
36
  port: number;
37
+ private runner;
37
38
  setWorld(world: TWorld, steppers: AStepper[]): Promise<void>;
38
39
  addRemoteExecutorRoute(): void;
39
40
  checkAuth(req: IRequest, res: IResponse): boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"http-executor-stepper.d.ts","sourceRoot":"","sources":["../src/http-executor-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAe,MAAM,EAAY,MAAM,0BAA0B,CAAC;AAGzE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAyB,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,QAAS,YAAW,WAAW,EAAE,UAAU;IAC3F,OAAO;;;0BAGS,MAAM;;;;;;;;;;2BAIL,MAAM;;;;;;;;MAErB;IACF,MAAM;;;MAOL;IAED,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAkB;IAClC,SAAS,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IACtC,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IAEP,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAUlD,sBAAsB;IAgGtB,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO;IAajD,KAAK,KAAK;IACV,KAAK;CAML"}
1
+ {"version":3,"file":"http-executor-stepper.d.ts","sourceRoot":"","sources":["../src/http-executor-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAe,MAAM,EAAY,MAAM,0BAA0B,CAAC;AAGzE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAyB,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,CAAC,OAAO,OAAO,mBAAoB,SAAQ,QAAS,YAAW,WAAW,EAAE,UAAU;IAC3F,OAAO;;;0BAGS,MAAM;;;;;;;;;;2BAIL,MAAM;;;;;;;;MAErB;IACF,MAAM;;;MAQL;IAED,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,QAAQ,CAAkB;IAClC,SAAS,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IACtC,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,MAAM,CAAa;IAErB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE;IAWlD,sBAAsB;IA4GtB,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,GAAG,OAAO;IAajD,KAAK,KAAK;IACV,KAAK;CAML"}
@@ -1,8 +1,8 @@
1
1
  import { AStepper } from '@haibun/core/lib/astepper.js';
2
- import { ExecMode } from '@haibun/core/lib/defs.js';
3
- import { resolveAndExecuteStatement } from "@haibun/core/lib/util/featureStep-executor.js";
2
+ import { FlowRunner } from "@haibun/core/lib/core/flow-runner.js";
4
3
  import { getFromRuntime, getStepperOption, getStepperOptionName, intOrError, stringOrError } from '@haibun/core/lib/util/index.js';
5
4
  import { WEBSERVER } from './defs.js';
5
+ import { HttpPrompter } from './http-prompter.js';
6
6
  export default class HttpExecutorStepper extends AStepper {
7
7
  options = {
8
8
  LISTEN_PORT: {
@@ -16,6 +16,7 @@ export default class HttpExecutorStepper extends AStepper {
16
16
  };
17
17
  cycles = {
18
18
  async startFeature() {
19
+ this.httpPrompter = new HttpPrompter(this.getWorld());
19
20
  await this.addRemoteExecutorRoute();
20
21
  },
21
22
  async endFeature() {
@@ -27,8 +28,10 @@ export default class HttpExecutorStepper extends AStepper {
27
28
  httpPrompter;
28
29
  configuredToken;
29
30
  port;
31
+ runner;
30
32
  async setWorld(world, steppers) {
31
33
  await super.setWorld(world, steppers);
34
+ this.runner = new FlowRunner(world, steppers);
32
35
  this.port = intOrError(getStepperOption(this, 'LISTEN_PORT', world.moduleOptions) || '').result || NaN;
33
36
  this.configuredToken = getStepperOption(this, 'ACCESS_TOKEN', this.getWorld().moduleOptions);
34
37
  this.steppers = steppers;
@@ -48,7 +51,7 @@ export default class HttpExecutorStepper extends AStepper {
48
51
  webserver.addRoute('post', '/execute-step', (req, res) => {
49
52
  (async () => {
50
53
  try {
51
- console.log(`📥 HTTP Executor: Received request for statement: "${req.body?.statement}"`);
54
+ console.info(`📥 HTTP Executor: Received request for statement: "${req.body?.statement}"`);
52
55
  if (!this.checkAuth(req, res)) {
53
56
  return;
54
57
  }
@@ -58,11 +61,23 @@ export default class HttpExecutorStepper extends AStepper {
58
61
  return;
59
62
  }
60
63
  const { statement, source } = req.body;
61
- console.log(`🔄 HTTP Executor: Starting execution of "${statement}" from ${source}`);
64
+ console.debug(`🔄 HTTP Executor: Starting execution of "${statement}" from ${source}`);
62
65
  const world = this.getWorld();
63
66
  const steppers = this.steppers;
64
- const result = await resolveAndExecuteStatement(statement, source, steppers, world, ExecMode.NO_CYCLES, [0]);
65
- console.log(`✅ HTTP Executor: Execution completed`, result);
67
+ const result = await (async () => {
68
+ const res = await this.runner.runStatement(statement, {
69
+ intent: { mode: 'authoritative' },
70
+ seqPath: [0]
71
+ });
72
+ return {
73
+ ok: res.kind === 'ok',
74
+ in: statement,
75
+ path: source,
76
+ seqPath: [0],
77
+ stepActionResult: res.payload
78
+ };
79
+ })();
80
+ console.debug(`✅ HTTP Executor: Execution completed`, result);
66
81
  res.json(result);
67
82
  }
68
83
  catch (error) {
@@ -1 +1 @@
1
- {"version":3,"file":"http-executor-stepper.js","sourceRoot":"","sources":["../src/http-executor-stepper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"http-executor-stepper.js","sourceRoot":"","sources":["../src/http-executor-stepper.ts"],"names":[],"mappings":"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"}
@@ -30,27 +30,27 @@ declare class WebServerStepper extends AStepper implements IHasOptions, IHasCycl
30
30
  };
31
31
  serveFilesAt: {
32
32
  gwta: string;
33
- action: ({ where, loc }: TStepArgs) => Promise<import("@haibun/core/lib/defs.js").TOKActionResult | import("@haibun/core/lib/defs.js").TNotOKActionResult>;
33
+ action: ({ where, loc }: TStepArgs) => Promise<import("@haibun/core/lib/defs.js").TNotOKActionResult | import("@haibun/core/lib/defs.js").TOKActionResult>;
34
34
  };
35
35
  serveFiles: {
36
36
  gwta: string;
37
- action: ({ loc }: TStepArgs) => Promise<import("@haibun/core/lib/defs.js").TOKActionResult | import("@haibun/core/lib/defs.js").TNotOKActionResult>;
37
+ action: ({ loc }: TStepArgs) => Promise<import("@haibun/core/lib/defs.js").TNotOKActionResult | import("@haibun/core/lib/defs.js").TOKActionResult>;
38
38
  };
39
39
  indexFiles: {
40
40
  gwta: string;
41
- action: ({ loc }: TStepArgs) => Promise<import("@haibun/core/lib/defs.js").TOKActionResult | import("@haibun/core/lib/defs.js").TNotOKActionResult>;
41
+ action: ({ loc }: TStepArgs) => Promise<import("@haibun/core/lib/defs.js").TNotOKActionResult | import("@haibun/core/lib/defs.js").TOKActionResult>;
42
42
  };
43
43
  indexFilesAt: {
44
44
  gwta: string;
45
- action: ({ where, loc }: TStepArgs) => Promise<import("@haibun/core/lib/defs.js").TOKActionResult | import("@haibun/core/lib/defs.js").TNotOKActionResult>;
45
+ action: ({ where, loc }: TStepArgs) => Promise<import("@haibun/core/lib/defs.js").TNotOKActionResult | import("@haibun/core/lib/defs.js").TOKActionResult>;
46
46
  };
47
47
  showRoutes: {
48
48
  gwta: string;
49
49
  action: () => Promise<import("@haibun/core/lib/defs.js").TOKActionResult>;
50
50
  };
51
51
  };
52
- doServeIndex(where: any, loc: any): Promise<import("@haibun/core/lib/defs.js").TOKActionResult | import("@haibun/core/lib/defs.js").TNotOKActionResult>;
53
- doServeFiles(where: any, loc: any): Promise<import("@haibun/core/lib/defs.js").TOKActionResult | import("@haibun/core/lib/defs.js").TNotOKActionResult>;
52
+ doServeIndex(where: any, loc: any): Promise<import("@haibun/core/lib/defs.js").TNotOKActionResult | import("@haibun/core/lib/defs.js").TOKActionResult>;
53
+ doServeFiles(where: any, loc: any): Promise<import("@haibun/core/lib/defs.js").TNotOKActionResult | import("@haibun/core/lib/defs.js").TOKActionResult>;
54
54
  listen(): Promise<void>;
55
55
  }
56
56
  export default WebServerStepper;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@haibun/web-server-express",
3
3
  "type": "module",
4
- "version": "3.0.5",
4
+ "version": "3.1.1",
5
5
  "description": "",
6
6
  "main": "build/web-server-stepper.js",
7
7
  "files": ["build/**"],
@@ -19,13 +19,13 @@
19
19
  "author": "",
20
20
  "license": "ISC",
21
21
  "dependencies": {
22
- "@haibun/core": "3.0.5",
22
+ "@haibun/core": "3.1.1",
23
23
  "cookie-parser": "^1.4.5",
24
24
  "express": "^4.17.1",
25
25
  "serve-index": "^1.9.1"
26
26
  },
27
27
  "devDependencies": {
28
- "@haibun/web-http": "3.0.5",
28
+ "@haibun/web-http": "3.1.1",
29
29
  "@types/cookie-parser": "^1.4.2",
30
30
  "@types/express": "^4.17.15"
31
31
  },