@haibun/web-server-express 1.69.0 → 1.71.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/build/HttpPrompter.d.ts +25 -0
- package/build/HttpPrompter.d.ts.map +1 -0
- package/build/HttpPrompter.js +49 -0
- package/build/HttpPrompter.js.map +1 -0
- package/build/defs.d.ts +2 -2
- package/build/defs.d.ts.map +1 -1
- package/build/http-client-prompter.d.ts +2 -2
- package/build/http-client-prompter.d.ts.map +1 -1
- package/build/http-client-prompter.js +1 -1
- package/build/http-client-prompter.js.map +1 -1
- package/build/http-executor-stepper.d.ts +9 -10
- package/build/http-executor-stepper.d.ts.map +1 -1
- package/build/http-executor-stepper.js +7 -30
- package/build/http-executor-stepper.js.map +1 -1
- package/build/server-express.d.ts +3 -3
- package/build/server-express.d.ts.map +1 -1
- package/build/server-express.js +14 -11
- package/build/server-express.js.map +1 -1
- package/build/test-constants.d.ts +0 -8
- package/build/test-constants.d.ts.map +1 -1
- package/build/test-constants.js +0 -8
- package/build/test-constants.js.map +1 -1
- package/build/web-server-stepper.d.ts +1 -5
- package/build/web-server-stepper.d.ts.map +1 -1
- package/build/web-server-stepper.js +0 -11
- package/build/web-server-stepper.js.map +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { IPrompter, TPromptResponse, TPrompt } from '@haibun/core/build/lib/prompter.js';
|
|
2
|
+
/**
|
|
3
|
+
* HTTP-based prompter that responds to prompt requests via HTTP API
|
|
4
|
+
*/
|
|
5
|
+
export declare class HttpPrompter implements IPrompter {
|
|
6
|
+
private pendingPrompts;
|
|
7
|
+
prompt(prompt: TPrompt): Promise<TPromptResponse>;
|
|
8
|
+
cancel(): void;
|
|
9
|
+
/**
|
|
10
|
+
* Handle a prompt response from HTTP client
|
|
11
|
+
*/
|
|
12
|
+
handlePromptResponse(promptId: string, response: TPromptResponse): boolean;
|
|
13
|
+
/**
|
|
14
|
+
* Get all pending prompts for HTTP clients to see
|
|
15
|
+
*/
|
|
16
|
+
getPendingPrompts(): {
|
|
17
|
+
id: string;
|
|
18
|
+
message: string;
|
|
19
|
+
context: any;
|
|
20
|
+
options: string[];
|
|
21
|
+
timestamp: number;
|
|
22
|
+
age: number;
|
|
23
|
+
}[];
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=HttpPrompter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HttpPrompter.d.ts","sourceRoot":"","sources":["../src/HttpPrompter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAEzF;;GAEG;AACH,qBAAa,YAAa,YAAW,SAAS;IAC7C,OAAO,CAAC,cAAc,CAKjB;IAEC,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAavD,MAAM,IAAI,IAAI;IAOd;;OAEG;IACH,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,OAAO;IAU1E;;OAEG;IACH,iBAAiB;;;;;;;;CAUjB"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* HTTP-based prompter that responds to prompt requests via HTTP API
|
|
3
|
+
*/
|
|
4
|
+
export class HttpPrompter {
|
|
5
|
+
pendingPrompts = new Map();
|
|
6
|
+
async prompt(prompt) {
|
|
7
|
+
const promptId = Date.now().toString() + Math.random().toString(36).substr(2, 9);
|
|
8
|
+
return new Promise((resolve, reject) => {
|
|
9
|
+
this.pendingPrompts.set(promptId, {
|
|
10
|
+
resolve,
|
|
11
|
+
reject,
|
|
12
|
+
prompt,
|
|
13
|
+
timestamp: Date.now()
|
|
14
|
+
});
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
cancel() {
|
|
18
|
+
for (const [, pendingPrompt] of this.pendingPrompts.entries()) {
|
|
19
|
+
pendingPrompt.resolve(undefined);
|
|
20
|
+
}
|
|
21
|
+
this.pendingPrompts.clear();
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Handle a prompt response from HTTP client
|
|
25
|
+
*/
|
|
26
|
+
handlePromptResponse(promptId, response) {
|
|
27
|
+
const pendingPrompt = this.pendingPrompts.get(promptId);
|
|
28
|
+
if (pendingPrompt) {
|
|
29
|
+
this.pendingPrompts.delete(promptId);
|
|
30
|
+
pendingPrompt.resolve(response);
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Get all pending prompts for HTTP clients to see
|
|
37
|
+
*/
|
|
38
|
+
getPendingPrompts() {
|
|
39
|
+
return Array.from(this.pendingPrompts.entries()).map(([id, data]) => ({
|
|
40
|
+
id,
|
|
41
|
+
message: data.prompt.message,
|
|
42
|
+
context: data.prompt.context,
|
|
43
|
+
options: data.prompt.options,
|
|
44
|
+
timestamp: data.timestamp,
|
|
45
|
+
age: Date.now() - data.timestamp
|
|
46
|
+
}));
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=HttpPrompter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"HttpPrompter.js","sourceRoot":"","sources":["../src/HttpPrompter.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,OAAO,YAAY;IAChB,cAAc,GAAG,IAAI,GAAG,EAK5B,CAAC;IAEL,KAAK,CAAC,MAAM,CAAC,MAAe;QAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEjF,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACvD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE;gBACjC,OAAO;gBACP,MAAM;gBACN,MAAM;gBACN,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;aACrB,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,MAAM;QACL,KAAK,MAAM,CAAC,EAAE,aAAa,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;YAC/D,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAClC,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAC7B,CAAC;IAED;;OAEG;IACH,oBAAoB,CAAC,QAAgB,EAAE,QAAyB;QAC/D,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACxD,IAAI,aAAa,EAAE,CAAC;YACnB,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACrC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAChC,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED;;OAEG;IACH,iBAAiB;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;YACrE,EAAE;YACF,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAC5B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS;SAChC,CAAC,CAAC,CAAC;IACL,CAAC;CACD"}
|
package/build/defs.d.ts
CHANGED
|
@@ -4,8 +4,8 @@ export interface IWebServer {
|
|
|
4
4
|
checkAddStaticFolder(subdir: string, loc: string, options?: TStaticFolderOptions): undefined | string;
|
|
5
5
|
checkAddIndexFolder(subdir: string, loc: string): undefined | string;
|
|
6
6
|
addKnownStaticFolder(subdir: string, mountAt?: string): undefined | string;
|
|
7
|
-
listen(): Promise<unknown>;
|
|
8
|
-
close(): Promise<void>;
|
|
7
|
+
listen(port?: number): Promise<unknown>;
|
|
8
|
+
close(port?: number): Promise<void>;
|
|
9
9
|
mounted: TRouteMap;
|
|
10
10
|
addRoute(type: TRouteTypes, path: string, ...routes: TRequestHandler[]): void;
|
|
11
11
|
addKnownRoute(type: TRouteTypes, path: string, ...routes: TRequestHandler[]): void;
|
package/build/defs.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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;
|
|
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,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { TPrompt, TPromptResponse } from '@haibun/core/lib/prompter.js';
|
|
2
|
-
import { BasePromptManager } from '@haibun/core/lib/base-prompt-manager.js';
|
|
1
|
+
import { TPrompt, TPromptResponse } from '@haibun/core/build/lib/prompter.js';
|
|
2
|
+
import { BasePromptManager } from '@haibun/core/build/lib/base-prompt-manager.js';
|
|
3
3
|
export declare class HttpClientPrompter extends BasePromptManager {
|
|
4
4
|
private serverUrl;
|
|
5
5
|
private accessToken;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client-prompter.d.ts","sourceRoot":"","sources":["../src/http-client-prompter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"http-client-prompter.d.ts","sourceRoot":"","sources":["../src/http-client-prompter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAGlF,qBAAa,kBAAmB,SAAQ,iBAAiB;IAM5C,OAAO,CAAC,SAAS;IAAU,OAAO,CAAC,WAAW;IAL1D,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,qBAAqB,CAA0D;gBAEnE,SAAS,EAAE,MAAM,EAAU,WAAW,EAAE,MAAM;IAIlE,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,OAAO,GAAG,IAAI;IAC3C,SAAS,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAEhC,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC;IAYvD,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAY/B,KAAK,IAAI,IAAI;YAOC,cAAc;CAmC5B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { BasePromptManager } from '@haibun/core/lib/base-prompt-manager.js';
|
|
1
|
+
import { BasePromptManager } from '@haibun/core/build/lib/base-prompt-manager.js';
|
|
2
2
|
import { HTTP_PROMPTER_ENDPOINTS } from './http-executor-stepper.js';
|
|
3
3
|
export class HttpClientPrompter extends BasePromptManager {
|
|
4
4
|
serverUrl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-client-prompter.js","sourceRoot":"","sources":["../src/http-client-prompter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"http-client-prompter.js","sourceRoot":"","sources":["../src/http-client-prompter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,22 +2,26 @@ import { AStepper, IHasCycles, IHasOptions } from '@haibun/core/lib/astepper.js'
|
|
|
2
2
|
import { TWorld } from '@haibun/core/lib/defs.js';
|
|
3
3
|
import { IRequest, IResponse } from './defs.js';
|
|
4
4
|
import { HttpPrompter } from './http-prompter.js';
|
|
5
|
-
export declare const HTTP_PROMPTER_ENDPOINTS: {
|
|
6
|
-
PROMPTS: string;
|
|
7
|
-
PROMPT_RESPONSE: string;
|
|
8
|
-
};
|
|
9
5
|
export default class HttpExecutorStepper extends AStepper implements IHasOptions, IHasCycles {
|
|
10
6
|
options: {
|
|
11
7
|
LISTEN_PORT: {
|
|
12
8
|
desc: string;
|
|
13
9
|
parse: (port: string) => {
|
|
10
|
+
parseError: string;
|
|
11
|
+
result?: undefined;
|
|
12
|
+
} | {
|
|
14
13
|
result: number;
|
|
14
|
+
parseError?: undefined;
|
|
15
15
|
};
|
|
16
16
|
};
|
|
17
17
|
ACCESS_TOKEN: {
|
|
18
18
|
desc: string;
|
|
19
19
|
parse: (token: string) => {
|
|
20
|
+
parseError: string;
|
|
21
|
+
result?: undefined;
|
|
22
|
+
} | {
|
|
20
23
|
result: string;
|
|
24
|
+
parseError?: undefined;
|
|
21
25
|
};
|
|
22
26
|
};
|
|
23
27
|
};
|
|
@@ -33,12 +37,7 @@ export default class HttpExecutorStepper extends AStepper implements IHasOptions
|
|
|
33
37
|
setWorld(world: TWorld, steppers: AStepper[]): Promise<void>;
|
|
34
38
|
addRemoteExecutorRoute(): void;
|
|
35
39
|
checkAuth(req: IRequest, res: IResponse): boolean;
|
|
36
|
-
steps: {
|
|
37
|
-
enableRemoteExecutor: {
|
|
38
|
-
gwta: string;
|
|
39
|
-
action: () => Promise<import("@haibun/core/lib/defs.js").TNotOKActionResult> | Promise<import("@haibun/core/lib/defs.js").TOKActionResult>;
|
|
40
|
-
};
|
|
41
|
-
};
|
|
40
|
+
steps: {};
|
|
42
41
|
close(): void;
|
|
43
42
|
}
|
|
44
43
|
//# sourceMappingURL=http-executor-stepper.d.ts.map
|
|
@@ -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,EAAE,MAAM,0BAA0B,CAAC;AAG/D,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAyB,MAAM,WAAW,CAAC;
|
|
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,EAAE,MAAM,0BAA0B,CAAC;AAG/D,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,22 +1,16 @@
|
|
|
1
1
|
import { AStepper } from '@haibun/core/lib/astepper.js';
|
|
2
2
|
import { resolveAndExecuteStatement } from "@haibun/core/lib/util/resolveAndExecuteStatement.js";
|
|
3
|
-
import {
|
|
3
|
+
import { getFromRuntime, getStepperOption, getStepperOptionName, intOrError, stringOrError } from '@haibun/core/lib/util/index.js';
|
|
4
4
|
import { WEBSERVER } from './defs.js';
|
|
5
|
-
import WebServerStepper from './web-server-stepper.js';
|
|
6
|
-
import { HttpPrompter } from './http-prompter.js';
|
|
7
|
-
export const HTTP_PROMPTER_ENDPOINTS = {
|
|
8
|
-
PROMPTS: '/prompts', // GET: list all pending prompts
|
|
9
|
-
PROMPT_RESPONSE: '/prompt', // POST: respond to a prompt { promptId, response }
|
|
10
|
-
};
|
|
11
5
|
export default class HttpExecutorStepper extends AStepper {
|
|
12
6
|
options = {
|
|
13
7
|
LISTEN_PORT: {
|
|
14
8
|
desc: 'Port for remote execution API',
|
|
15
|
-
parse: (port) => (
|
|
9
|
+
parse: (port) => intOrError(port),
|
|
16
10
|
},
|
|
17
11
|
ACCESS_TOKEN: {
|
|
18
12
|
desc: 'Access token for remote execution API authentication',
|
|
19
|
-
parse: (token) => (
|
|
13
|
+
parse: (token) => stringOrError(token),
|
|
20
14
|
},
|
|
21
15
|
};
|
|
22
16
|
cycles = {
|
|
@@ -37,14 +31,8 @@ export default class HttpExecutorStepper extends AStepper {
|
|
|
37
31
|
this.port = intOrError(getStepperOption(this, 'LISTEN_PORT', world.moduleOptions) || '').result || NaN;
|
|
38
32
|
this.configuredToken = getStepperOption(this, 'ACCESS_TOKEN', this.getWorld().moduleOptions);
|
|
39
33
|
this.steppers = steppers;
|
|
40
|
-
if (
|
|
41
|
-
|
|
42
|
-
throw new Error('ACCESS_TOKEN is required when enabling remote executor');
|
|
43
|
-
}
|
|
44
|
-
const webServerStepper = steppers.find(s => s instanceof WebServerStepper);
|
|
45
|
-
if (webServerStepper) {
|
|
46
|
-
webServerStepper.port = this.port;
|
|
47
|
-
}
|
|
34
|
+
if (isNaN(this.port) || !this.configuredToken) {
|
|
35
|
+
throw new Error(`${getStepperOptionName(this, 'LISTEN_PORT')} and ${getStepperOptionName(this, 'ACCESS_TOKEN')} are required for remote execution`);
|
|
48
36
|
}
|
|
49
37
|
}
|
|
50
38
|
addRemoteExecutorRoute() {
|
|
@@ -55,6 +43,7 @@ export default class HttpExecutorStepper extends AStepper {
|
|
|
55
43
|
if (!webserver) {
|
|
56
44
|
throw new Error('WebServer not available - ensure web-server-stepper is loaded');
|
|
57
45
|
}
|
|
46
|
+
void webserver.listen(this.port);
|
|
58
47
|
webserver.addRoute('post', '/execute-step', (req, res) => {
|
|
59
48
|
(async () => {
|
|
60
49
|
try {
|
|
@@ -138,19 +127,7 @@ export default class HttpExecutorStepper extends AStepper {
|
|
|
138
127
|
}
|
|
139
128
|
return true;
|
|
140
129
|
}
|
|
141
|
-
steps = {
|
|
142
|
-
enableRemoteExecutor: {
|
|
143
|
-
gwta: 'enable remote executor',
|
|
144
|
-
action: () => {
|
|
145
|
-
if (isNaN(this.port)) {
|
|
146
|
-
return Promise.resolve(actionNotOK('Remote executor is not configured - LISTEN_PORT is not set'));
|
|
147
|
-
}
|
|
148
|
-
this.addRemoteExecutorRoute();
|
|
149
|
-
this.httpPrompter = new HttpPrompter(this.getWorld());
|
|
150
|
-
return Promise.resolve(actionOK());
|
|
151
|
-
},
|
|
152
|
-
},
|
|
153
|
-
};
|
|
130
|
+
steps = {};
|
|
154
131
|
close() {
|
|
155
132
|
if (this.httpPrompter) {
|
|
156
133
|
this.world.prompter.unsubscribe(this.httpPrompter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http-executor-stepper.js","sourceRoot":"","sources":["../src/http-executor-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA2B,MAAM,8BAA8B,CAAC;AAEjF,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AACjG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"http-executor-stepper.js","sourceRoot":"","sources":["../src/http-executor-stepper.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,13 @@ export declare class ServerExpress implements IWebServer {
|
|
|
7
7
|
private logger;
|
|
8
8
|
private base;
|
|
9
9
|
private port;
|
|
10
|
-
static listening:
|
|
10
|
+
static listening: number[];
|
|
11
11
|
listener?: http.Server;
|
|
12
12
|
app: import("express-serve-static-core").Express;
|
|
13
13
|
mounted: TRouteMap;
|
|
14
14
|
constructor(logger: ILogger, base: string, port?: number);
|
|
15
15
|
use(middleware: RequestHandler): void;
|
|
16
|
-
listen(): Promise<unknown>;
|
|
16
|
+
listen(port?: number): Promise<unknown>;
|
|
17
17
|
addRoute(type: TRouteTypes, path: string, ...routes: RequestHandler[]): void;
|
|
18
18
|
addKnownRoute(type: TRouteTypes, path: string, ...routes: TRequestHandler[]): void;
|
|
19
19
|
private addMounted;
|
|
@@ -22,6 +22,6 @@ export declare class ServerExpress implements IWebServer {
|
|
|
22
22
|
addKnownStaticFolder(folder: string, mountAt?: string, options?: TStaticFolderOptions): string;
|
|
23
23
|
private doAddStaticFolder;
|
|
24
24
|
checkMountBadOrMounted(type: string, loc: string, what: string): string;
|
|
25
|
-
close(): Promise<void>;
|
|
25
|
+
close(port?: number): Promise<void>;
|
|
26
26
|
}
|
|
27
27
|
//# sourceMappingURL=server-express.d.ts.map
|
|
@@ -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,uCAAuC,CAAC;AAEhE,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,
|
|
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,uCAAuC,CAAC;AAEhE,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,EAAE,MAAM,EAAE,CAAM;IAChC,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,CAAC,IAAI,SAAY;IAoBvB,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;IAexD,KAAK,CAAC,IAAI,SAAY;CAM5B"}
|
package/build/server-express.js
CHANGED
|
@@ -9,7 +9,7 @@ export class ServerExpress {
|
|
|
9
9
|
logger;
|
|
10
10
|
base;
|
|
11
11
|
port;
|
|
12
|
-
static listening =
|
|
12
|
+
static listening = [];
|
|
13
13
|
listener;
|
|
14
14
|
app = express();
|
|
15
15
|
mounted = defaultMounted();
|
|
@@ -26,14 +26,14 @@ export class ServerExpress {
|
|
|
26
26
|
use(middleware) {
|
|
27
27
|
this.app.use(middleware);
|
|
28
28
|
}
|
|
29
|
-
listen() {
|
|
29
|
+
listen(port = this.port) {
|
|
30
30
|
return new Promise((resolve, reject) => {
|
|
31
|
-
if (!ServerExpress.listening) {
|
|
31
|
+
if (!ServerExpress.listening.includes(port)) {
|
|
32
32
|
try {
|
|
33
|
-
this.listener = this.app.listen(
|
|
34
|
-
this.logger.debug(`Server listening on port: ${
|
|
35
|
-
ServerExpress.listening
|
|
36
|
-
this.logger.debug(
|
|
33
|
+
this.listener = this.app.listen(port, () => {
|
|
34
|
+
this.logger.debug(`Server listening on port: ${port}`);
|
|
35
|
+
ServerExpress.listening.push(port);
|
|
36
|
+
this.logger.debug(`express listening on ports ${ServerExpress.listening}`);
|
|
37
37
|
resolve('started');
|
|
38
38
|
});
|
|
39
39
|
}
|
|
@@ -105,7 +105,10 @@ export class ServerExpress {
|
|
|
105
105
|
return;
|
|
106
106
|
}
|
|
107
107
|
checkMountBadOrMounted(type, loc, what) {
|
|
108
|
-
|
|
108
|
+
// accepts valid characters and placeholders
|
|
109
|
+
const sanitized = loc.replace(/[^a-zA-Z0-9/\-:_]/g, '').replace(/:(?![a-zA-Z0-9_-])/g, '');
|
|
110
|
+
if (loc !== sanitized) {
|
|
111
|
+
console.log('sanitized', sanitized, loc);
|
|
109
112
|
return `mount folder ${loc} has illegal characters`;
|
|
110
113
|
}
|
|
111
114
|
const alreadyMounted = this.mounted[type][loc] || Object.keys(this.mounted[type]).find((m) => m.startsWith(`${loc}/`));
|
|
@@ -114,11 +117,11 @@ export class ServerExpress {
|
|
|
114
117
|
}
|
|
115
118
|
return undefined;
|
|
116
119
|
}
|
|
117
|
-
async close() {
|
|
118
|
-
this.logger.debug(`closing server ${
|
|
120
|
+
async close(port = this.port) {
|
|
121
|
+
this.logger.debug(`closing server ${port}`);
|
|
119
122
|
await this.listener?.close();
|
|
120
123
|
this.mounted = defaultMounted();
|
|
121
|
-
ServerExpress.listening =
|
|
124
|
+
ServerExpress.listening = ServerExpress.listening.filter(p => p !== port);
|
|
122
125
|
}
|
|
123
126
|
}
|
|
124
127
|
//# sourceMappingURL=server-express.js.map
|
|
@@ -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;IAKL;IAAyB;IAAsB;IAJnE,MAAM,CAAC,SAAS,
|
|
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;IAKL;IAAyB;IAAsB;IAJnE,MAAM,CAAC,SAAS,GAAa,EAAE,CAAC;IAChC,QAAQ,CAAe;IACvB,GAAG,GAAG,OAAO,EAAE,CAAC;IAChB,OAAO,GAAG,cAAc,EAAE,CAAC;IAC3B,YAAoB,MAAe,EAAU,IAAY,EAAU,OAAe,YAAY;QAA1E,WAAM,GAAN,MAAM,CAAS;QAAU,SAAI,GAAJ,IAAI,CAAQ;QAAU,SAAI,GAAJ,IAAI,CAAuB;QAC7F,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAC/C,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAED,GAAG,CAAC,UAA0B;QAC7B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI;QACtB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACtC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7C,IAAI,CAAC;oBACJ,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE;wBAC1C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;wBACvD,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA8B,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;wBAC3E,OAAO,CAAC,SAAS,CAAC,CAAC;oBACpB,CAAC,CAAC,CAAC;gBACJ,CAAC;gBAAC,OAAO,CAAC,EAAE,CAAC;oBACZ,MAAM,CAAC,CAAC,CAAC,CAAC;gBACX,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;gBAC9C,OAAO,CAAC,mBAAmB,CAAC,CAAC;YAC9B,CAAC;QACF,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,IAAiB,EAAE,IAAY,EAAE,GAAG,MAAwB;QACpE,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACjG,MAAM,KAAK,CAAC,sBAAsB,IAAI,EAAE,CAAC,CAAC;QAC3C,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACxE,IAAI,GAAG,EAAE,CAAC;YACT,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,eAAe,IAAI,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;QAEhC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,aAAa,CAAC,IAAiB,EAAE,IAAY,EAAE,GAAG,MAAyB;QAC1E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,eAAe,IAAI,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IAEO,UAAU,CAAC,IAAY,EAAE,IAAY,EAAE,IAAY;QAC1D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACjC,CAAC;IAED,8DAA8D;IAC9D,oBAAoB,CAAC,cAAsB,EAAE,OAAO,GAAG,GAAG,EAAE,OAA8B;QACzF,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrD,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAED,6DAA6D;IAC7D,mBAAmB,CAAC,cAAsB,EAAE,OAAO,GAAG,GAAG,EAAE,OAA8B;QACxF,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAChE,IAAI,GAAG,EAAE,CAAC;YACT,OAAO,GAAG,CAAC;QACZ,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,MAAM,OAAO,OAAO,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3E,OAAO;IACR,CAAC;IAED,kCAAkC;IAClC,oBAAoB,CAAC,MAAc,EAAE,OAAO,GAAG,GAAG,EAAE,OAA8B;QACjF,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC;IAEO,iBAAiB,CAAC,MAAc,EAAE,OAAO,GAAG,GAAG,EAAE,UAAgC,EAAE;QAC1F,MAAM,GAAG,GAAG,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAChE,IAAI,GAAG,EAAE,CAAC;YACT,OAAO,GAAG,CAAC;QACZ,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,MAAM,iBAAiB,CAAC;QACpC,CAAC;QACD,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACzB,OAAO,IAAI,MAAM,sBAAsB,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QACvD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,MAAM,OAAO,OAAO,EAAE,CAAC,CAAC;QAChE,OAAO;IACR,CAAC;IAED,sBAAsB,CAAC,IAAY,EAAE,GAAW,EAAE,IAAY;QAC7D,4CAA4C;QAC5C,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAA;QAC1F,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;YACzC,OAAO,gBAAgB,GAAG,yBAAyB,CAAC;QACrD,CAAC;QACD,MAAM,cAAc,GACnB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC;QACzG,IAAI,cAAc,EAAE,CAAC;YACpB,OAAO,gBAAgB,IAAI,IAAI,IAAI,OAAO,GAAG,KAAK,cAAc,sBAAsB,CAAC;QACxF,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI;QAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,GAAG,cAAc,EAAE,CAAC;QAChC,aAAa,CAAC,SAAS,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC;IAC3E,CAAC"}
|
|
@@ -1,16 +1,8 @@
|
|
|
1
1
|
export declare const TEST_PORTS: {
|
|
2
2
|
readonly HTTP_EXECUTOR_BASE: 12001;
|
|
3
3
|
readonly HTTP_EXECUTOR_AUTH: 12002;
|
|
4
|
-
readonly HTTP_EXECUTOR_RETRY: 12003;
|
|
5
|
-
readonly HTTP_EXECUTOR_TIMEOUT: 12004;
|
|
6
|
-
readonly HTTP_EXECUTOR_PROMPTER: 12005;
|
|
7
4
|
readonly WEB_SERVER_FILES: 12101;
|
|
8
5
|
readonly WEB_SERVER_ROUTE: 12102;
|
|
9
|
-
readonly WEB_SERVER_EXPRESS: 12103;
|
|
10
6
|
readonly WEB_SERVER_INDEX: 12104;
|
|
11
|
-
readonly WEB_SERVER_STATIC: 12105;
|
|
12
|
-
readonly WEB_PLAYWRIGHT: 12201;
|
|
13
|
-
readonly WEB_PLAYWRIGHT_BROWSER: 12202;
|
|
14
|
-
readonly WEB_PLAYWRIGHT_HEADLESS: 12203;
|
|
15
7
|
};
|
|
16
8
|
//# sourceMappingURL=test-constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-constants.d.ts","sourceRoot":"","sources":["../src/test-constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU
|
|
1
|
+
{"version":3,"file":"test-constants.d.ts","sourceRoot":"","sources":["../src/test-constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,UAAU;;;;;;CAOb,CAAC"}
|
package/build/test-constants.js
CHANGED
|
@@ -1,16 +1,8 @@
|
|
|
1
1
|
export const TEST_PORTS = {
|
|
2
2
|
HTTP_EXECUTOR_BASE: 12001,
|
|
3
3
|
HTTP_EXECUTOR_AUTH: 12002,
|
|
4
|
-
HTTP_EXECUTOR_RETRY: 12003,
|
|
5
|
-
HTTP_EXECUTOR_TIMEOUT: 12004,
|
|
6
|
-
HTTP_EXECUTOR_PROMPTER: 12005,
|
|
7
4
|
WEB_SERVER_FILES: 12101,
|
|
8
5
|
WEB_SERVER_ROUTE: 12102,
|
|
9
|
-
WEB_SERVER_EXPRESS: 12103,
|
|
10
6
|
WEB_SERVER_INDEX: 12104,
|
|
11
|
-
WEB_SERVER_STATIC: 12105,
|
|
12
|
-
WEB_PLAYWRIGHT: 12201,
|
|
13
|
-
WEB_PLAYWRIGHT_BROWSER: 12202,
|
|
14
|
-
WEB_PLAYWRIGHT_HEADLESS: 12203,
|
|
15
7
|
};
|
|
16
8
|
//# sourceMappingURL=test-constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-constants.js","sourceRoot":"","sources":["../src/test-constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,kBAAkB,EAAE,KAAK;IACzB,kBAAkB,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"test-constants.js","sourceRoot":"","sources":["../src/test-constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,kBAAkB,EAAE,KAAK;IACzB,kBAAkB,EAAE,KAAK;IAEzB,gBAAgB,EAAE,KAAK;IACvB,gBAAgB,EAAE,KAAK;IACvB,gBAAgB,EAAE,KAAK;CACf,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TWorld, TNamed,
|
|
1
|
+
import { TWorld, TNamed, IStepperCycles } from '@haibun/core/lib/defs.js';
|
|
2
2
|
import { IWebServer } from './defs.js';
|
|
3
3
|
import { ServerExpress } from './server-express.js';
|
|
4
4
|
import { AStepper, IHasCycles, IHasOptions } from '@haibun/core/lib/astepper.js';
|
|
@@ -20,10 +20,6 @@ declare class WebServerStepper extends AStepper implements IHasOptions, IHasCycl
|
|
|
20
20
|
port: number;
|
|
21
21
|
setWorld(world: TWorld, steppers: AStepper[]): Promise<void>;
|
|
22
22
|
steps: {
|
|
23
|
-
thisURI: {
|
|
24
|
-
gwta: string;
|
|
25
|
-
action: ({ where }: TNamed, featureStep: TFeatureStep) => Promise<import("@haibun/core/lib/defs.js").TOKActionResult>;
|
|
26
|
-
};
|
|
27
23
|
isListening: {
|
|
28
24
|
gwta: string;
|
|
29
25
|
action: () => Promise<import("@haibun/core/lib/defs.js").TOKActionResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-server-stepper.d.ts","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"web-server-stepper.d.ts","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAM,MAAM,EAAE,MAAM,EAAe,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE3F,OAAO,EAAE,UAAU,EAAa,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAGlE,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAkBjF,cAAM,gBAAiB,SAAQ,QAAS,YAAW,WAAW,EAAE,UAAU;IACzE,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;;;;;;;;;;;qCAmB4B,MAAM;;;;8BAMb,MAAM;;;;8BAON,MAAM;;;;qCAOC,MAAM;;;;;;MAarC;IACI,YAAY,CAAC,KAAK,KAAA,EAAE,GAAG,KAAA;IASvB,YAAY,CAAC,KAAK,KAAA,EAAE,GAAG,KAAA;IAUvB,MAAM;CAGZ;AAED,eAAe,gBAAgB,CAAC;AAEhC,MAAM,WAAW,iBAAiB;IACjC,SAAS,EAAE,UAAU,CAAC;IACtB,KAAK,EAAE,MAAM,IAAI,CAAC;CAClB"}
|
|
@@ -2,7 +2,6 @@ import { OK } from '@haibun/core/lib/defs.js';
|
|
|
2
2
|
import { actionNotOK, getFromRuntime, getStepperOption, intOrError } from '@haibun/core/lib/util/index.js';
|
|
3
3
|
import { WEBSERVER } from './defs.js';
|
|
4
4
|
import { ServerExpress, DEFAULT_PORT } from './server-express.js';
|
|
5
|
-
import { WEB_PAGE } from '@haibun/core/lib/domain-types.js';
|
|
6
5
|
import path from 'path';
|
|
7
6
|
import { EExecutionMessageType } from '@haibun/core/lib/interfaces/logger.js';
|
|
8
7
|
import { AStepper } from '@haibun/core/lib/astepper.js';
|
|
@@ -36,16 +35,6 @@ class WebServerStepper extends AStepper {
|
|
|
36
35
|
this.port = parseInt(getStepperOption(this, 'PORT', world.moduleOptions)) || DEFAULT_PORT;
|
|
37
36
|
}
|
|
38
37
|
steps = {
|
|
39
|
-
thisURI: {
|
|
40
|
-
gwta: `a ${WEB_PAGE} at {where}`,
|
|
41
|
-
action: async ({ where }, featureStep) => {
|
|
42
|
-
const page = featureStep.path;
|
|
43
|
-
const webserver = getFromRuntime(this.getWorld().runtime, WEBSERVER);
|
|
44
|
-
await webserver.checkAddStaticFolder(page, where);
|
|
45
|
-
return OK;
|
|
46
|
-
},
|
|
47
|
-
},
|
|
48
|
-
/// generator
|
|
49
38
|
isListening: {
|
|
50
39
|
gwta: 'webserver is listening',
|
|
51
40
|
action: async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-server-stepper.js","sourceRoot":"","sources":["../src/web-server-stepper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,
|
|
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.
|
|
4
|
+
"version": "1.71.0",
|
|
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": "1.
|
|
22
|
+
"@haibun/core": "1.71.0",
|
|
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": "1.
|
|
28
|
+
"@haibun/web-http": "1.71.0",
|
|
29
29
|
"@types/cookie-parser": "^1.4.2",
|
|
30
30
|
"@types/express": "^4.17.15"
|
|
31
31
|
},
|