@akala/pm 3.6.0 → 3.7.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/changelog.md +3 -3
- package/commands.json +175 -136
- package/dist/cli.js +6 -6
- package/dist/cli.js.map +1 -1
- package/dist/commands/restart.d.ts +18 -0
- package/dist/commands/restart.js +8 -0
- package/dist/commands/restart.js.map +1 -0
- package/dist/container.d.ts +2 -0
- package/dist/fork.js +12 -20
- package/dist/fork.js.map +1 -1
- package/package.json +5 -5
- package/src/cli.ts +7 -7
- package/src/commands/restart.json +27 -0
- package/src/commands/restart.ts +9 -0
- package/src/container.ts +2 -0
- package/src/fork.ts +94 -100
- package/tsconfig.tsbuildinfo +1 -1
package/dist/fork.js
CHANGED
|
@@ -37,7 +37,7 @@ const core_1 = require("@akala/core");
|
|
|
37
37
|
const cli_1 = __importStar(require("@akala/cli"));
|
|
38
38
|
const commands_1 = require("@akala/commands");
|
|
39
39
|
var isPm = false;
|
|
40
|
-
cli_1.default.useMiddleware({
|
|
40
|
+
cli_1.default.useMiddleware(null, {
|
|
41
41
|
handle: async (c) => {
|
|
42
42
|
isPm = c.options.program == 'pm';
|
|
43
43
|
if (isPm)
|
|
@@ -59,26 +59,19 @@ logMiddleware.preAction(async (c) => {
|
|
|
59
59
|
});
|
|
60
60
|
const initMiddleware = new cli_1.NamespaceMiddleware(null);
|
|
61
61
|
cli_1.default.option('program', { needsValue: true }).option('name', { needsValue: true }).option('tls', { needsValue: false }).
|
|
62
|
-
|
|
62
|
+
preAction(async (c) => //If pure js file
|
|
63
63
|
{
|
|
64
64
|
folderOrFile = await (0, promises_1.lstat)(c.options.program);
|
|
65
|
-
if (
|
|
66
|
-
|
|
67
|
-
|
|
65
|
+
if (folderOrFile.isFile() && path.extname(c.options.program) === '.js')
|
|
66
|
+
return require(c.options.program);
|
|
67
|
+
log = (0, core_1.logger)(c.options.name);
|
|
68
|
+
cliContainer = new ac.Container('cli', {});
|
|
69
|
+
if (folderOrFile.isFile())
|
|
70
|
+
processor = new ac.Processors.FileSystem(path.dirname(c.options.program));
|
|
71
|
+
else
|
|
72
|
+
processor = new ac.Processors.FileSystem(c.options.program);
|
|
68
73
|
}).
|
|
69
|
-
useMiddleware({
|
|
70
|
-
handle: async (c) => //if commandable
|
|
71
|
-
{
|
|
72
|
-
log = (0, core_1.logger)(c.options.name);
|
|
73
|
-
cliContainer = new ac.Container('cli', {});
|
|
74
|
-
if (folderOrFile.isFile())
|
|
75
|
-
processor = new ac.Processors.FileSystem(path.dirname(c.options.program));
|
|
76
|
-
else
|
|
77
|
-
processor = new ac.Processors.FileSystem(c.options.program);
|
|
78
|
-
}
|
|
79
|
-
}).
|
|
80
|
-
useMiddleware(logMiddleware).
|
|
81
|
-
useMiddleware({
|
|
74
|
+
useMiddleware(null, core_1.MiddlewareComposite.new(logMiddleware, {
|
|
82
75
|
handle: async (c) => {
|
|
83
76
|
cliContainer.name = c.options.name;
|
|
84
77
|
const init = cliContainer.resolve('$init');
|
|
@@ -150,8 +143,7 @@ cli_1.default.option('program', { needsValue: true }).option('name', { needsValu
|
|
|
150
143
|
process.on('SIGINT', () => process.exit());
|
|
151
144
|
});
|
|
152
145
|
}
|
|
153
|
-
})
|
|
154
|
-
.useMiddleware(initMiddleware);
|
|
146
|
+
}, initMiddleware));
|
|
155
147
|
if (require.main == module)
|
|
156
148
|
cli_1.default.process((0, cli_1.buildCliContextFromProcess)()).catch(e => {
|
|
157
149
|
console.error(e);
|
package/dist/fork.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fork.js","sourceRoot":"","sources":["../src/fork.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4EAAoC;AACpC,4BAAG,CAAC,OAAO,EAAE,CAAC;AACd,2CAA4B;AAC5B,oDAAsC;AACtC,0CAAoC;AACpC,+CAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"fork.js","sourceRoot":"","sources":["../src/fork.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"pm": "dist/cli.js",
|
|
5
5
|
"pm-fork": "dist/fork.js"
|
|
6
6
|
},
|
|
7
|
-
"version": "3.
|
|
7
|
+
"version": "3.7.0",
|
|
8
8
|
"scripts": {
|
|
9
9
|
"test": "echo 1",
|
|
10
10
|
"generate": "ac generate dist/commands commands.json",
|
|
@@ -19,10 +19,10 @@
|
|
|
19
19
|
},
|
|
20
20
|
"homepage": "https://akala.js.org/pm",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@akala/cli": "^2.
|
|
23
|
-
"@akala/commands": "^3.
|
|
24
|
-
"@akala/config": "^1.2.
|
|
25
|
-
"@akala/core": "^9.
|
|
22
|
+
"@akala/cli": "^2.3.0",
|
|
23
|
+
"@akala/commands": "^3.7.0",
|
|
24
|
+
"@akala/config": "^1.2.1",
|
|
25
|
+
"@akala/core": "^9.2.0",
|
|
26
26
|
"@akala/json-rpc-ws": "^9.6.0",
|
|
27
27
|
"reflect-metadata": "^0.1.13",
|
|
28
28
|
"source-map-support": "^0.5.21"
|
package/src/cli.ts
CHANGED
|
@@ -32,14 +32,14 @@ const tableChars = {
|
|
|
32
32
|
}
|
|
33
33
|
const truncate = '…';
|
|
34
34
|
|
|
35
|
-
type CliOptions = { output: string, verbose: boolean, pmSock: string | number, tls: boolean };
|
|
35
|
+
type CliOptions = { output: string, verbose: boolean, pmSock: string | number, tls: boolean, help: boolean };
|
|
36
36
|
|
|
37
|
-
const cli = program.options<CliOptions>({ output: { aliases: ['o'], needsValue: true }, verbose: { aliases: ['v'] }, tls: {}, pmSock: { aliases: ['pm-sock'], needsValue: true } });
|
|
37
|
+
const cli = program.options<CliOptions>({ output: { aliases: ['o'], needsValue: true, doc: 'output as `table` if array otherwise falls back to standard node output' }, verbose: { aliases: ['v'] }, tls: { doc: "enables tls connection to the `pmSock`" }, pmSock: { aliases: ['pm-sock'], needsValue: true, doc: "path to the unix socket or destination in the form host:port" }, help: { doc: "displays this help message" } });
|
|
38
38
|
cli.command<{ program?: string }>('start [program]')
|
|
39
|
-
.option('inspect')
|
|
40
|
-
.option('wait', { aliases: ['w'] })
|
|
39
|
+
.option('inspect', { doc: "starts the process with --inspect-brk parameter to help debugging" })
|
|
40
|
+
.option('wait', { aliases: ['w'], doc: "waits for the program to be started before returning, otherwise, returns after the start command is sent to the pm daemon" })
|
|
41
41
|
.option('new', { needsValue: false })
|
|
42
|
-
.option('name', { needsValue: true })
|
|
42
|
+
.option('name', { needsValue: true, doc: "name the process as per the given value" })
|
|
43
43
|
.action(c =>
|
|
44
44
|
{
|
|
45
45
|
if (typeof c.options.program == 'undefined')
|
|
@@ -119,7 +119,7 @@ cli.command(null).preAction(async c =>
|
|
|
119
119
|
console.error('pm is not started');
|
|
120
120
|
});
|
|
121
121
|
}
|
|
122
|
-
else
|
|
122
|
+
else if (!c.options.help)
|
|
123
123
|
reject(e);
|
|
124
124
|
})
|
|
125
125
|
});
|
|
@@ -139,7 +139,7 @@ cli.command(null).preAction(async c =>
|
|
|
139
139
|
await container.attach(Triggers.cli, handle);
|
|
140
140
|
}
|
|
141
141
|
}).
|
|
142
|
-
useMiddleware(handle).
|
|
142
|
+
useMiddleware(null, handle).
|
|
143
143
|
useError(async (err: InteractError, args) =>
|
|
144
144
|
{
|
|
145
145
|
if (err.code === 'INTERACT')
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "https://raw.githubusercontent.com/npenin/akala/master/packages/commands/command-schema.json",
|
|
3
|
+
"": {
|
|
4
|
+
"inject": [
|
|
5
|
+
"$container",
|
|
6
|
+
"param.0",
|
|
7
|
+
"param.1"
|
|
8
|
+
]
|
|
9
|
+
},
|
|
10
|
+
"cli": {
|
|
11
|
+
"options": {
|
|
12
|
+
"wait": {
|
|
13
|
+
"aliases": [
|
|
14
|
+
"w"
|
|
15
|
+
]
|
|
16
|
+
},
|
|
17
|
+
"inspect": {},
|
|
18
|
+
"new": {},
|
|
19
|
+
"name": {}
|
|
20
|
+
},
|
|
21
|
+
"inject": [
|
|
22
|
+
"$container",
|
|
23
|
+
"param.0",
|
|
24
|
+
"context"
|
|
25
|
+
]
|
|
26
|
+
}
|
|
27
|
+
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { StdioOptions } from "child_process";
|
|
2
|
+
import pmContainer from '../container';
|
|
3
|
+
import { CliContext } from "@akala/cli";
|
|
4
|
+
|
|
5
|
+
export default async function restart(pm: pmContainer.container, name: string, context?: CliContext<{ new?: boolean, name: string, inspect?: boolean, verbose?: boolean, wait?: boolean }>): Promise<void | { execPath: string, args: string[], cwd: string, stdio: StdioOptions, shell: boolean, windowsHide: boolean }>
|
|
6
|
+
{
|
|
7
|
+
await pm.dispatch('stop', name);
|
|
8
|
+
await pm.dispatch('start', name, context);
|
|
9
|
+
}
|
package/src/container.ts
CHANGED
|
@@ -19,6 +19,7 @@ namespace commands
|
|
|
19
19
|
dispatch (cmd:'proxy', ...args: [Argument0<typeof import('./commands/proxy').default>, Argument1<typeof import('./commands/proxy').default>]): ReturnType<typeof import('./commands/proxy').default>
|
|
20
20
|
dispatch (cmd:'ready', ...args: []): ReturnType<typeof import('./commands/ready').default>
|
|
21
21
|
dispatch (cmd:'reload-metadata', ...args: [Argument0<typeof import('./commands/reload-metadata').default>]): ReturnType<typeof import('./commands/reload-metadata').default>
|
|
22
|
+
dispatch (cmd:'restart', ...args: [Argument1<typeof import('./commands/restart').default>, Argument2<typeof import('./commands/restart').default>]): ReturnType<typeof import('./commands/restart').default>
|
|
22
23
|
dispatch (cmd:'start', ...args: [Argument1<typeof import('./commands/start').default>, Argument2<typeof import('./commands/start').default>]): ReturnType<typeof import('./commands/start').default>
|
|
23
24
|
dispatch (cmd:'status', ...args: [Argument0<typeof import('./commands/status').default>]): ReturnType<typeof import('./commands/status').default>
|
|
24
25
|
dispatch (cmd:'stop', ...args: [Argument0<typeof import('./commands/stop').default>]): ReturnType<typeof import('./commands/stop').default>
|
|
@@ -41,6 +42,7 @@ namespace commands
|
|
|
41
42
|
'proxy'(...args: [Argument0<typeof import('./commands/proxy').default>, Argument1<typeof import('./commands/proxy').default>]): ReturnType<typeof import('./commands/proxy').default>
|
|
42
43
|
'ready'(...args: []): ReturnType<typeof import('./commands/ready').default>
|
|
43
44
|
'reload-metadata'(...args: [Argument0<typeof import('./commands/reload-metadata').default>]): ReturnType<typeof import('./commands/reload-metadata').default>
|
|
45
|
+
'restart'(...args: [Argument1<typeof import('./commands/restart').default>, Argument2<typeof import('./commands/restart').default>]): ReturnType<typeof import('./commands/restart').default>
|
|
44
46
|
'start'(...args: [Argument1<typeof import('./commands/start').default>, Argument2<typeof import('./commands/start').default>]): ReturnType<typeof import('./commands/start').default>
|
|
45
47
|
'status'(...args: [Argument0<typeof import('./commands/status').default>]): ReturnType<typeof import('./commands/status').default>
|
|
46
48
|
'stop'(...args: [Argument0<typeof import('./commands/stop').default>]): ReturnType<typeof import('./commands/stop').default>
|
package/src/fork.ts
CHANGED
|
@@ -5,14 +5,14 @@ import * as path from 'path'
|
|
|
5
5
|
import * as ac from '@akala/commands';
|
|
6
6
|
import { lstat } from 'fs/promises';
|
|
7
7
|
import { IpcAdapter } from "./ipc-adapter";
|
|
8
|
-
import { logger, Logger, module as coreModule } from '@akala/core';
|
|
8
|
+
import { logger, Logger, MiddlewareComposite, module as coreModule } from '@akala/core';
|
|
9
9
|
import program, { buildCliContextFromProcess, NamespaceMiddleware } from '@akala/cli';
|
|
10
10
|
import { Stats } from 'fs';
|
|
11
11
|
import { registerCommands, SelfDefinedCommand, parseMetadata, StructuredParameters } from '@akala/commands';
|
|
12
12
|
|
|
13
13
|
var isPm = false;
|
|
14
14
|
|
|
15
|
-
program.useMiddleware({
|
|
15
|
+
program.useMiddleware(null, {
|
|
16
16
|
handle: async c =>
|
|
17
17
|
{
|
|
18
18
|
isPm = c.options.program == 'pm';
|
|
@@ -38,121 +38,115 @@ logMiddleware.preAction(async c =>
|
|
|
38
38
|
});
|
|
39
39
|
const initMiddleware = new NamespaceMiddleware<{ program: string, name: string, tls: boolean }>(null);
|
|
40
40
|
program.option<string, 'program'>('program', { needsValue: true }).option<string, 'name'>('name', { needsValue: true }).option<boolean, 'tls'>('tls', { needsValue: false }).
|
|
41
|
-
|
|
41
|
+
preAction(async c => //If pure js file
|
|
42
42
|
{
|
|
43
43
|
folderOrFile = await lstat(c.options.program);
|
|
44
|
-
if (
|
|
45
|
-
|
|
44
|
+
if (folderOrFile.isFile() && path.extname(c.options.program) === '.js')
|
|
45
|
+
return require(c.options.program);
|
|
46
46
|
|
|
47
|
-
|
|
48
|
-
}).
|
|
49
|
-
useMiddleware({
|
|
50
|
-
handle: async c => //if commandable
|
|
51
|
-
{
|
|
52
|
-
log = logger(c.options.name);
|
|
47
|
+
log = logger(c.options.name);
|
|
53
48
|
|
|
54
|
-
|
|
49
|
+
cliContainer = new ac.Container('cli', {});
|
|
55
50
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}
|
|
51
|
+
if (folderOrFile.isFile())
|
|
52
|
+
processor = new ac.Processors.FileSystem(path.dirname(c.options.program));
|
|
53
|
+
else
|
|
54
|
+
processor = new ac.Processors.FileSystem(c.options.program);
|
|
61
55
|
}).
|
|
62
|
-
useMiddleware(logMiddleware
|
|
63
|
-
useMiddleware({
|
|
64
|
-
handle: async c =>
|
|
56
|
+
useMiddleware(null, MiddlewareComposite.new(logMiddleware,
|
|
65
57
|
{
|
|
66
|
-
|
|
67
|
-
const init = cliContainer.resolve('$init');
|
|
68
|
-
if (init && init.config && init.config.cli && init.config.cli.options)
|
|
69
|
-
ac.Triggers.addCliOptions(init, initMiddleware);
|
|
70
|
-
|
|
71
|
-
initMiddleware.option<string, 'pmSocket'>('pmSocket', { aliases: ['pm-socket', 'pm-sock'] }).action(async c =>
|
|
58
|
+
handle: async c =>
|
|
72
59
|
{
|
|
60
|
+
cliContainer.name = c.options.name;
|
|
61
|
+
const init = cliContainer.resolve('$init');
|
|
62
|
+
if (init && init.config && init.config.cli && init.config.cli.options)
|
|
63
|
+
ac.Triggers.addCliOptions(init, initMiddleware);
|
|
73
64
|
|
|
74
|
-
|
|
75
|
-
let pmConnectInfo: ac.ServeMetadata;
|
|
76
|
-
|
|
77
|
-
if (!isPm)
|
|
65
|
+
initMiddleware.option<string, 'pmSocket'>('pmSocket', { aliases: ['pm-socket', 'pm-sock'] }).action(async c =>
|
|
78
66
|
{
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
67
|
+
|
|
68
|
+
let pm: ac.Container<unknown>;
|
|
69
|
+
let pmConnectInfo: ac.ServeMetadata;
|
|
70
|
+
|
|
71
|
+
if (!isPm)
|
|
82
72
|
{
|
|
83
|
-
|
|
84
|
-
|
|
73
|
+
//eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
74
|
+
const pmMeta = require('../commands.json');
|
|
75
|
+
if (process.connected)
|
|
76
|
+
{
|
|
77
|
+
pm = new ac.Container('pm', null, new ac.Processors.JsonRpc(ac.Processors.JsonRpc.getConnection(new IpcAdapter(process), cliContainer), true));
|
|
78
|
+
registerCommands(pmMeta.commands, null, pm);
|
|
79
|
+
}
|
|
80
|
+
else
|
|
81
|
+
{
|
|
82
|
+
if (c.options.pmSocket)
|
|
83
|
+
pmConnectInfo = parseMetadata(c.options.pmSocket, c.options.tls);
|
|
84
|
+
else
|
|
85
|
+
pmConnectInfo = ac.serveMetadata('pm', { args: ['local'], options: {} })
|
|
86
|
+
const x = await ac.connectByPreference(pmConnectInfo, { metadata: pmMeta, container: cliContainer });
|
|
87
|
+
pm = x.container;
|
|
88
|
+
pm.processor.useMiddleware(20, x.processor);
|
|
89
|
+
const connect = pm.resolve('connect');
|
|
90
|
+
pm.unregister('connect');
|
|
91
|
+
pm.register(new SelfDefinedCommand((name: string, param: StructuredParameters<unknown[]>) =>
|
|
92
|
+
{
|
|
93
|
+
if (name == 'pm')
|
|
94
|
+
return pmConnectInfo;
|
|
95
|
+
return x.processor.handle(pm, connect, param).then(e => { throw e }, r => r);
|
|
96
|
+
}, 'connect', [
|
|
97
|
+
"param.0",
|
|
98
|
+
"$param"
|
|
99
|
+
]));
|
|
100
|
+
}
|
|
101
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
102
|
+
pm.unregister(ac.Cli.Metadata.name);
|
|
103
|
+
pm.register(ac.Metadata.extractCommandMetadata(ac.Cli.Metadata));
|
|
85
104
|
}
|
|
86
105
|
else
|
|
106
|
+
pm = cliContainer;
|
|
107
|
+
|
|
108
|
+
coreModule('@akala/pm').register('container', pm);
|
|
109
|
+
|
|
110
|
+
cliContainer.register(new SelfDefinedCommand(async (connectionId: string) =>
|
|
87
111
|
{
|
|
88
|
-
if (
|
|
89
|
-
pmConnectInfo =
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
112
|
+
if (!pmConnectInfo)
|
|
113
|
+
pmConnectInfo = await pm.dispatch('connect', 'pm');
|
|
114
|
+
var pm2 = await ac.connectByPreference(pmConnectInfo, { container: cliContainer });
|
|
115
|
+
pm2.container.processor.useMiddleware(20, pm2.processor);
|
|
116
|
+
pm2.container.unregister(ac.Cli.Metadata.name);
|
|
117
|
+
pm2.container.register(ac.Metadata.extractCommandMetadata(ac.Cli.Metadata));
|
|
118
|
+
pm2.container.register(ac.Metadata.extractCommandMetadata(pm.resolve('bridge')));
|
|
119
|
+
if (await pm2.container.dispatch('bridge', connectionId))
|
|
120
|
+
throw undefined;
|
|
121
|
+
}, '$bridge'));
|
|
122
|
+
|
|
123
|
+
|
|
124
|
+
if (init)
|
|
125
|
+
await cliContainer.dispatch(init, { options: c.options, param: c.args, _trigger: 'cli', pm: pm, context: c });
|
|
126
|
+
|
|
127
|
+
let stop: (...args: unknown[]) => Promise<void>;
|
|
128
|
+
try
|
|
129
|
+
{
|
|
130
|
+
const serveArgs: ac.ServeMetadata = await pm.dispatch('connect', c.options.name);
|
|
131
|
+
stop = await cliContainer.dispatch('$serve', serveArgs) as (...args: unknown[]) => Promise<void>;
|
|
132
|
+
}
|
|
133
|
+
catch (e)
|
|
134
|
+
{
|
|
135
|
+
if (!e || e.statusCode !== 404)
|
|
136
|
+
throw e;
|
|
137
|
+
console.warn(e.message);
|
|
106
138
|
}
|
|
107
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
108
|
-
pm.unregister(ac.Cli.Metadata.name);
|
|
109
|
-
pm.register(ac.Metadata.extractCommandMetadata(ac.Cli.Metadata));
|
|
110
|
-
}
|
|
111
|
-
else
|
|
112
|
-
pm = cliContainer;
|
|
113
139
|
|
|
114
|
-
|
|
140
|
+
if (pm !== cliContainer)
|
|
141
|
+
await pm.dispatch('ready')
|
|
115
142
|
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
pm2.container.register(ac.Metadata.extractCommandMetadata(ac.Cli.Metadata));
|
|
124
|
-
pm2.container.register(ac.Metadata.extractCommandMetadata(pm.resolve('bridge')));
|
|
125
|
-
if (await pm2.container.dispatch('bridge', connectionId))
|
|
126
|
-
throw undefined;
|
|
127
|
-
}, '$bridge'));
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
if (init)
|
|
131
|
-
await cliContainer.dispatch(init, { options: c.options, param: c.args, _trigger: 'cli', pm: pm, context: c });
|
|
132
|
-
|
|
133
|
-
let stop: (...args: unknown[]) => Promise<void>;
|
|
134
|
-
try
|
|
135
|
-
{
|
|
136
|
-
const serveArgs: ac.ServeMetadata = await pm.dispatch('connect', c.options.name);
|
|
137
|
-
stop = await cliContainer.dispatch('$serve', serveArgs) as (...args: unknown[]) => Promise<void>;
|
|
138
|
-
}
|
|
139
|
-
catch (e)
|
|
140
|
-
{
|
|
141
|
-
if (!e || e.statusCode !== 404)
|
|
142
|
-
throw e;
|
|
143
|
-
console.warn(e.message);
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
if (pm !== cliContainer)
|
|
147
|
-
await pm.dispatch('ready')
|
|
148
|
-
|
|
149
|
-
if (stop && typeof stop == 'function')
|
|
150
|
-
process.on('SIGINT', stop);
|
|
151
|
-
process.on('SIGINT', () => process.exit());
|
|
152
|
-
});
|
|
153
|
-
}
|
|
154
|
-
})
|
|
155
|
-
.useMiddleware(initMiddleware);
|
|
143
|
+
if (stop && typeof stop == 'function')
|
|
144
|
+
process.on('SIGINT', stop);
|
|
145
|
+
process.on('SIGINT', () => process.exit());
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
},
|
|
149
|
+
initMiddleware));
|
|
156
150
|
|
|
157
151
|
if (require.main == module)
|
|
158
152
|
program.process(buildCliContextFromProcess()).catch(e =>
|