@akala/pm 2.7.2 → 3.0.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 +13 -2
- package/commands.json +28 -41
- package/dist/commands/$init.d.ts +5 -2
- package/dist/commands/$init.js +15 -24
- package/dist/commands/$init.js.map +1 -1
- package/dist/commands/config.d.ts +1 -1
- package/dist/commands/config.js +7 -5
- package/dist/commands/config.js.map +1 -1
- package/dist/commands/connect.d.ts +1 -1
- package/dist/commands/connect.js +5 -5
- package/dist/commands/connect.js.map +1 -1
- package/dist/commands/discover.js +2 -2
- package/dist/commands/discover.js.map +1 -1
- package/dist/commands/log.js +2 -3
- package/dist/commands/log.js.map +1 -1
- package/dist/commands/map.d.ts +1 -1
- package/dist/commands/map.js +3 -3
- package/dist/commands/map.js.map +1 -1
- package/dist/commands/ready.js +1 -2
- package/dist/commands/ready.js.map +1 -1
- package/dist/commands/start.d.ts +1 -1
- package/dist/commands/start.js +42 -32
- package/dist/commands/start.js.map +1 -1
- package/dist/container.d.ts +0 -2
- package/dist/index.d.ts +2 -0
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/new-line-prefixer.js +3 -2
- package/dist/new-line-prefixer.js.map +1 -1
- package/dist/state.d.ts +23 -13
- package/package.json +7 -7
- package/src/commands/$init.json +6 -11
- package/src/commands/$init.ts +17 -29
- package/src/commands/config.ts +11 -7
- package/src/commands/connect.ts +6 -6
- package/src/commands/map.json +20 -3
- package/src/commands/map.ts +3 -3
- package/src/commands/start.ts +42 -29
- package/src/container.ts +16 -18
- package/src/index.ts +3 -0
- package/src/state.ts +26 -10
- package/tsconfig.json +3 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/commands/alias.d.ts +0 -4
- package/dist/commands/alias.js +0 -10
- package/dist/commands/alias.js.map +0 -1
- package/src/commands/alias.json +0 -14
- package/src/commands/alias.ts +0 -9
package/changelog.md
CHANGED
|
@@ -1,9 +1,20 @@
|
|
|
1
|
-
# (2022-
|
|
1
|
+
# (2022-03-21)
|
|
2
2
|
|
|
3
3
|
|
|
4
4
|
### Bug Fixes
|
|
5
5
|
|
|
6
|
-
*
|
|
6
|
+
* swap build dependencies f7d45dd
|
|
7
|
+
* update dependencies and regenerate metadata 0c83667
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* update configuration structure 8a395ff
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### BREAKING CHANGES
|
|
16
|
+
|
|
17
|
+
* Configuration structure has been reshaped
|
|
7
18
|
|
|
8
19
|
|
|
9
20
|
|
package/commands.json
CHANGED
|
@@ -24,49 +24,18 @@
|
|
|
24
24
|
"$container",
|
|
25
25
|
"context"
|
|
26
26
|
],
|
|
27
|
+
"usage": "cmd [config]",
|
|
27
28
|
"options": {
|
|
28
|
-
"
|
|
29
|
-
"needsValue": true
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
},
|
|
34
|
-
"key": {
|
|
35
|
-
"needsValue": true
|
|
36
|
-
},
|
|
37
|
-
"cert": {
|
|
38
|
-
"needsValue": true
|
|
29
|
+
"config": {
|
|
30
|
+
"needsValue": true,
|
|
31
|
+
"aliases": [
|
|
32
|
+
"c"
|
|
33
|
+
]
|
|
39
34
|
}
|
|
40
35
|
}
|
|
41
36
|
}
|
|
42
37
|
}
|
|
43
38
|
},
|
|
44
|
-
{
|
|
45
|
-
"name": "alias",
|
|
46
|
-
"inject": [],
|
|
47
|
-
"config": {
|
|
48
|
-
"fs": {
|
|
49
|
-
"path": "dist/commands/alias.js",
|
|
50
|
-
"source": "src/commands/alias.ts",
|
|
51
|
-
"inject": [
|
|
52
|
-
"param.0",
|
|
53
|
-
"param.1"
|
|
54
|
-
]
|
|
55
|
-
},
|
|
56
|
-
"": {
|
|
57
|
-
"inject": [
|
|
58
|
-
"param.0",
|
|
59
|
-
"param.1"
|
|
60
|
-
]
|
|
61
|
-
},
|
|
62
|
-
"cli": {
|
|
63
|
-
"inject": [
|
|
64
|
-
"param.0",
|
|
65
|
-
"options"
|
|
66
|
-
]
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
},
|
|
70
39
|
{
|
|
71
40
|
"name": "config",
|
|
72
41
|
"inject": [],
|
|
@@ -275,7 +244,8 @@
|
|
|
275
244
|
"param.0",
|
|
276
245
|
"param.1",
|
|
277
246
|
"param.2",
|
|
278
|
-
"param.3"
|
|
247
|
+
"param.3",
|
|
248
|
+
"param.4"
|
|
279
249
|
]
|
|
280
250
|
},
|
|
281
251
|
"": {
|
|
@@ -283,7 +253,8 @@
|
|
|
283
253
|
"param.0",
|
|
284
254
|
"param.1",
|
|
285
255
|
"param.2",
|
|
286
|
-
"param.3"
|
|
256
|
+
"param.3",
|
|
257
|
+
"param.4"
|
|
287
258
|
]
|
|
288
259
|
},
|
|
289
260
|
"cli": {
|
|
@@ -291,8 +262,24 @@
|
|
|
291
262
|
"param.0",
|
|
292
263
|
"param.1",
|
|
293
264
|
"cwd",
|
|
294
|
-
"options.c"
|
|
295
|
-
|
|
265
|
+
"options.c",
|
|
266
|
+
"options.s"
|
|
267
|
+
],
|
|
268
|
+
"options": {
|
|
269
|
+
"commandable": {
|
|
270
|
+
"aliases": [
|
|
271
|
+
"c"
|
|
272
|
+
],
|
|
273
|
+
"needsValue": false
|
|
274
|
+
},
|
|
275
|
+
"stateless": {
|
|
276
|
+
"aliases": [
|
|
277
|
+
"s",
|
|
278
|
+
"state-less"
|
|
279
|
+
],
|
|
280
|
+
"needsValue": false
|
|
281
|
+
}
|
|
282
|
+
}
|
|
296
283
|
}
|
|
297
284
|
}
|
|
298
285
|
},
|
package/dist/commands/$init.d.ts
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import State, { RunningContainer } from '../state';
|
|
2
2
|
import pmContainer from '../container';
|
|
3
|
-
import { Container, Metadata
|
|
3
|
+
import { Container, Metadata } from '@akala/commands';
|
|
4
|
+
import { CliContext } from '@akala/cli';
|
|
4
5
|
export declare function metadata(container: Container<unknown>, deep?: boolean): Promise<Metadata.Container>;
|
|
5
6
|
export declare function isRunningContainer(c: Container<any>): c is RunningContainer;
|
|
6
|
-
export default function (this: State, container: RunningContainer & pmContainer.container,
|
|
7
|
+
export default function (this: State, container: RunningContainer & pmContainer.container, context: CliContext<{
|
|
8
|
+
config: string;
|
|
9
|
+
}>): Promise<void>;
|
package/dist/commands/$init.js
CHANGED
|
@@ -11,6 +11,7 @@ const commands_1 = require("@akala/commands");
|
|
|
11
11
|
const core_1 = require("@akala/core");
|
|
12
12
|
const stream_1 = require("stream");
|
|
13
13
|
const events_1 = require("events");
|
|
14
|
+
const config_1 = __importDefault(require("@akala/config"));
|
|
14
15
|
async function metadata(container, deep) {
|
|
15
16
|
const metacontainer = { name: container.name || 'unnamed', commands: [] };
|
|
16
17
|
await (0, core_1.eachAsync)(container.keys(), async (key) => {
|
|
@@ -37,7 +38,7 @@ function isRunningContainer(c) {
|
|
|
37
38
|
return 'running' in c;
|
|
38
39
|
}
|
|
39
40
|
exports.isRunningContainer = isRunningContainer;
|
|
40
|
-
async function default_1(container,
|
|
41
|
+
async function default_1(container, context) {
|
|
41
42
|
this.isDaemon = true;
|
|
42
43
|
this.processes = {};
|
|
43
44
|
const stderr = process.stderr.write;
|
|
@@ -65,35 +66,25 @@ async function default_1(container, options) {
|
|
|
65
66
|
ref: null,
|
|
66
67
|
killed: false
|
|
67
68
|
});
|
|
68
|
-
const configPath = (0, path_1.join)((0, os_1.homedir)(), './.pm.config.json');
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
catch (e) {
|
|
74
|
-
if (e.code === 'ENOENT')
|
|
75
|
-
this.config = {
|
|
76
|
-
containers: { pm: [process.cwd()] },
|
|
77
|
-
mapping: {}
|
|
78
|
-
};
|
|
79
|
-
else
|
|
80
|
-
throw e;
|
|
69
|
+
const configPath = context.options.config || (0, path_1.join)((0, os_1.homedir)(), './.pm.config.json');
|
|
70
|
+
this.config = await config_1.default.load(configPath);
|
|
71
|
+
if (this.config) {
|
|
72
|
+
if (this.config.mapping.pm.cwd)
|
|
73
|
+
process.chdir(this.config.mapping.pm.cwd);
|
|
81
74
|
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
if (
|
|
88
|
-
await container.dispatch('
|
|
89
|
-
if (options && options.args.length)
|
|
90
|
-
await container.dispatch('connect', 'pm', options);
|
|
75
|
+
else
|
|
76
|
+
this.config = config_1.default.new(configPath, {
|
|
77
|
+
containers: { pm: { commandable: true, path: require.resolve('../../commands.json'), stateless: false } },
|
|
78
|
+
mapping: { pm: { cwd: process.cwd(), container: 'pm' } }
|
|
79
|
+
});
|
|
80
|
+
if (context && context.args.length)
|
|
81
|
+
await container.dispatch('connect', 'pm', context);
|
|
91
82
|
else {
|
|
92
83
|
const connectOptions = await container.dispatch('connect', 'pm');
|
|
93
84
|
if (typeof connectOptions == 'undefined')
|
|
94
85
|
await container.dispatch('connect', 'pm', { args: ['local'] });
|
|
95
86
|
}
|
|
96
|
-
await this.config.
|
|
87
|
+
await this.config.commit();
|
|
97
88
|
container.name = 'pm';
|
|
98
89
|
const config = container.resolve('$metadata.config');
|
|
99
90
|
container.unregister('$metadata');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$init.js","sourceRoot":"","sources":["../../src/commands/$init.ts"],"names":[],"mappings":";;;;;;AACA,2BAA6B;AAC7B,2DAA6B;AAC7B,+BAA4B;AAE5B,8CAAoH;AACpH,sCAAwC;AACxC,mCAA+C;AAC/C,mCAAsC;
|
|
1
|
+
{"version":3,"file":"$init.js","sourceRoot":"","sources":["../../src/commands/$init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { CliContext } from "@akala/cli";
|
|
2
2
|
import State from '../state';
|
|
3
|
-
export default function config(this: State, name: string, options: CliContext['options']): Promise<string[] | State['config']>;
|
|
3
|
+
export default function config(this: State, name: string | undefined | void, options: CliContext['options'] | undefined | void): Promise<string[] | State['config'] | State['config']['containers']['']>;
|
package/dist/commands/config.js
CHANGED
|
@@ -24,16 +24,18 @@ async function config(name, options) {
|
|
|
24
24
|
// debugger;
|
|
25
25
|
if (options) {
|
|
26
26
|
const args = cli.unparseOptions(options);
|
|
27
|
-
if (args[1] && args[1] == 'set') {
|
|
28
|
-
this.config.containers[name] = args.slice(2);
|
|
29
|
-
await this.config.save();
|
|
30
|
-
}
|
|
31
27
|
if (typeof name == 'undefined')
|
|
32
28
|
return this.config;
|
|
29
|
+
if (args[1] && args[1] == 'set') {
|
|
30
|
+
this.config.mapping[name].cli = args.slice(2);
|
|
31
|
+
await this.config.commit();
|
|
32
|
+
}
|
|
33
33
|
return this.config.containers[name];
|
|
34
34
|
}
|
|
35
|
-
else
|
|
35
|
+
else if (typeof name !== 'undefined')
|
|
36
36
|
return this.config.containers[name];
|
|
37
|
+
else
|
|
38
|
+
return this.config;
|
|
37
39
|
}
|
|
38
40
|
exports.default = config;
|
|
39
41
|
exports.default.$inject = ['param.0', 'options'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/commands/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,gDAAkC;AAKnB,KAAK,UAAU,MAAM,CAAc,IAA+B,EAAE,OAAiD;IAEhI,YAAY;IACZ,IAAI,OAAO,EACX;QACI,MAAM,IAAI,GAAG,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAEzC,IAAI,OAAO,IAAI,IAAI,WAAW;YAC1B,OAAO,IAAI,CAAC,MAAM,CAAC;QAEvB,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,EAC/B;YACI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;SAC9B;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;KACvC;SACI,IAAI,OAAO,IAAI,KAAK,WAAW;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;;QAEpC,OAAO,IAAI,CAAC,MAAM,CAAC;AAC3B,CAAC;AAtBD,yBAsBC;AAED,OAAO,CAAC,OAAO,CAAC,OAAO,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { ServeMetadata, ServeOptions } from "@akala/commands";
|
|
2
2
|
import State from '../state';
|
|
3
3
|
export default function connect(this: State, name: string): Promise<ServeMetadata>;
|
|
4
|
-
export default function connect(this: State, name: string,
|
|
4
|
+
export default function connect(this: State, name: string, context?: ServeOptions): Promise<void>;
|
package/dist/commands/connect.js
CHANGED
|
@@ -2,23 +2,23 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const cli_1 = require("@akala/cli");
|
|
4
4
|
const commands_1 = require("@akala/commands");
|
|
5
|
-
async function connect(name,
|
|
5
|
+
async function connect(name, context) {
|
|
6
6
|
let mapping = this.config.mapping[name];
|
|
7
7
|
if (!mapping)
|
|
8
|
-
mapping = Object.values(this.config.mapping).find(m => m.
|
|
8
|
+
mapping = Object.values(this.config.mapping).find(m => m.container === name);
|
|
9
9
|
if (!mapping)
|
|
10
10
|
mapping = this.processes[name];
|
|
11
11
|
// console.log(name);
|
|
12
12
|
// console.log(mapping);
|
|
13
13
|
// console.log(options);
|
|
14
|
-
if (
|
|
15
|
-
mapping.connect = (0, commands_1.serveMetadata)(name,
|
|
14
|
+
if (context && context.args.length > 0)
|
|
15
|
+
mapping.connect = (0, commands_1.serveMetadata)(name, context);
|
|
16
16
|
else {
|
|
17
17
|
if (!mapping)
|
|
18
18
|
throw new cli_1.ErrorWithStatus(404, `Mapping ${name} could not be found`);
|
|
19
19
|
return mapping.connect;
|
|
20
20
|
}
|
|
21
|
-
await this.config.
|
|
21
|
+
await this.config.commit();
|
|
22
22
|
}
|
|
23
23
|
exports.default = connect;
|
|
24
24
|
//# sourceMappingURL=connect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":";;AAAA,oCAA6C;AAE7C,8CAAgD;AAKjC,KAAK,UAAU,OAAO,CAAc,IAAY,EAAE,OAAsB;IAEnF,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO;QACR,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../src/commands/connect.ts"],"names":[],"mappings":";;AAAA,oCAA6C;AAE7C,8CAAgD;AAKjC,KAAK,UAAU,OAAO,CAAc,IAAY,EAAE,OAAsB;IAEnF,IAAI,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACxC,IAAI,CAAC,OAAO;QACR,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,IAAI,CAAC,CAAC;IACjF,IAAI,CAAC,OAAO;QACR,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACnC,qBAAqB;IACrB,wBAAwB;IACxB,wBAAwB;IACxB,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC;QAClC,OAAO,CAAC,OAAO,GAAG,IAAA,wBAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SAEnD;QACI,IAAI,CAAC,OAAO;YACR,MAAM,IAAI,qBAAe,CAAC,GAAG,EAAE,WAAW,IAAI,qBAAqB,CAAC,CAAC;QACzE,OAAO,OAAO,CAAC,OAAO,CAAC;KAC1B;IACD,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;AAC9B,CAAC;AAnBD,0BAmBC"}
|
|
@@ -32,7 +32,7 @@ async function discover(packageName, folder, pm) {
|
|
|
32
32
|
tmpRequire = (0, module_1.createRequire)((0, path_1.join)(path, './package.json'));
|
|
33
33
|
function tryModuleRequireResolve(p) {
|
|
34
34
|
try {
|
|
35
|
-
moduleRequire
|
|
35
|
+
moduleRequire?.resolve(p);
|
|
36
36
|
}
|
|
37
37
|
catch (e) {
|
|
38
38
|
return null;
|
|
@@ -46,7 +46,7 @@ async function discover(packageName, folder, pm) {
|
|
|
46
46
|
case 'object':
|
|
47
47
|
if (Array.isArray(packageConfig))
|
|
48
48
|
throw new Error('commands property must be of type object or string');
|
|
49
|
-
return await Promise.all(Object.keys(packageConfig.commands).map(v => pm.dispatch('map', v, moduleRequire
|
|
49
|
+
return await Promise.all(Object.keys(packageConfig.commands).map(v => pm.dispatch('map', v, moduleRequire?.resolve('./' + packageConfig.commands[v]), path, true)));
|
|
50
50
|
case 'string':
|
|
51
51
|
return await pm.dispatch('map', packageName, moduleRequire.resolve('./' + packageConfig.commands), path, true);
|
|
52
52
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"discover.js","sourceRoot":"","sources":["../../src/commands/discover.ts"],"names":[],"mappings":";;AACA,+BAA2D;AAC3D,2BAAgD;AAGhD,mCAAuC;AACvC,sCAAkC;AAMlC,MAAM,KAAK,GAAG,IAAA,UAAG,EAAC,UAAU,CAAC,CAAC;AAGf,KAAK,UAAU,QAAQ,CAAc,WAAmB,EAAE,MAAc,EAAE,EAAyB;IAE9G,8CAA8C;IAC9C,KAAK,CAAC,SAAS,CAAC,CAAC;IAEjB,IAAI,IAAI,GAAG,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAEnC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEZ,IAAI,UAAU,GAAiD,SAAS,CAAC;IACzE,IAAI,IAAA,eAAU,EAAC,IAAI,CAAC;QAChB,IAAI,IAAA,iBAAU,EAAC,WAAW,CAAC,EAC3B;YACI,MAAM,KAAK,GAAG,MAAM,aAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACxC,IAAI,KAAK,CAAC,MAAM,EAAE;gBACd,UAAU,GAAG,IAAA,sBAAa,EAAC,WAAW,CAAC,CAAC;;gBAExC,UAAU,GAAG,IAAA,sBAAa,EAAC,IAAA,WAAI,EAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC;YACpE,WAAW,GAAG,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC;SACvC;aAED;YACI,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;YACrB,MAAM,KAAK,GAAG,MAAM,aAAE,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAA;YACpD,IAAI,KAAK,CAAC,MAAM,EAAE;gBACd,UAAU,GAAG,IAAA,sBAAa,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;;gBAEpD,UAAU,GAAG,IAAA,sBAAa,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAC,CAAC;SAC7E;IAEL,IAAI,OAAO,UAAU,IAAI,WAAW;QAChC,UAAU,GAAG,IAAA,sBAAa,EAAC,IAAA,WAAI,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAE7D,SAAS,uBAAuB,CAAC,CAAS;QAEtC,IACA;YACI,aAAa,
|
|
1
|
+
{"version":3,"file":"discover.js","sourceRoot":"","sources":["../../src/commands/discover.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/log.js
CHANGED
|
@@ -2,15 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const stream_1 = require("stream");
|
|
4
4
|
function log(name) {
|
|
5
|
-
var _a;
|
|
6
5
|
if (name == 'pm') {
|
|
7
6
|
const pt = new stream_1.PassThrough();
|
|
8
7
|
process.stderr.pipe(pt);
|
|
9
8
|
process.stdout.pipe(pt);
|
|
10
9
|
return pt;
|
|
11
10
|
}
|
|
12
|
-
const p =
|
|
13
|
-
return p
|
|
11
|
+
const p = this.processes[name]?.process;
|
|
12
|
+
return p?.stderr;
|
|
14
13
|
}
|
|
15
14
|
exports.default = log;
|
|
16
15
|
//# sourceMappingURL=log.js.map
|
package/dist/commands/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/commands/log.ts"],"names":[],"mappings":";;AAAA,mCAAqC;AAIrC,SAAwB,GAAG,CAAc,IAAY
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/commands/log.ts"],"names":[],"mappings":";;AAAA,mCAAqC;AAIrC,SAAwB,GAAG,CAAc,IAAY;IAEjD,IAAI,IAAI,IAAI,IAAI,EAChB;QACI,MAAM,EAAE,GAAG,IAAI,oBAAW,EAAE,CAAC;QAC7B,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxB,OAAO,EAAE,CAAC;KACb;IACD,MAAM,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IACxC,OAAO,CAAC,EAAE,MAAM,CAAC;AACrB,CAAC;AAXD,sBAWC"}
|
package/dist/commands/map.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import State from '../state';
|
|
2
|
-
export default function map<TName extends string>(this: State, name: TName, targetPath: string, cwd?: string, commandable?: boolean): Promise<State['config']['mapping'][TName]>;
|
|
2
|
+
export default function map<TName extends string>(this: State, name: TName, targetPath: string, cwd?: string, commandable?: boolean, stateless?: boolean): Promise<State['config']['mapping'][TName]>;
|
package/dist/commands/map.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const path_1 = require("path");
|
|
4
|
-
async function map(name, targetPath, cwd, commandable) {
|
|
4
|
+
async function map(name, targetPath, cwd, commandable, stateless) {
|
|
5
5
|
if (!(0, path_1.isAbsolute)(targetPath))
|
|
6
6
|
targetPath = (0, path_1.resolve)(cwd || process.cwd(), targetPath);
|
|
7
|
-
this.config.
|
|
8
|
-
await this.config.
|
|
7
|
+
this.config.containers[name] = { path: targetPath, commandable: !!commandable, stateless: !!commandable && !!stateless };
|
|
8
|
+
await this.config.commit();
|
|
9
9
|
return this.config.mapping[name];
|
|
10
10
|
}
|
|
11
11
|
exports.default = map;
|
package/dist/commands/map.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map.js","sourceRoot":"","sources":["../../src/commands/map.ts"],"names":[],"mappings":";;AACA,+BAA2C;AAE5B,KAAK,UAAU,GAAG,CAAoC,IAAW,EAAE,UAAkB,EAAE,GAAY,EAAE,WAAqB;
|
|
1
|
+
{"version":3,"file":"map.js","sourceRoot":"","sources":["../../src/commands/map.ts"],"names":[],"mappings":";;AACA,+BAA2C;AAE5B,KAAK,UAAU,GAAG,CAAoC,IAAW,EAAE,UAAkB,EAAE,GAAY,EAAE,WAAqB,EAAE,SAAmB;IAE1J,IAAI,CAAC,IAAA,iBAAU,EAAC,UAAU,CAAC;QACvB,UAAU,GAAG,IAAA,cAAO,EAAC,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,UAAU,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IACzH,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;IAC3B,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACpC,CAAC;AAPD,sBAOC"}
|
package/dist/commands/ready.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
function ready(container) {
|
|
4
|
-
|
|
5
|
-
(_a = container === null || container === void 0 ? void 0 : container.ready) === null || _a === void 0 ? void 0 : _a.resolve();
|
|
4
|
+
container?.ready?.resolve();
|
|
6
5
|
}
|
|
7
6
|
exports.default = ready;
|
|
8
7
|
//# sourceMappingURL=ready.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ready.js","sourceRoot":"","sources":["../../src/commands/ready.ts"],"names":[],"mappings":";;AAEA,SAAwB,KAAK,CAAc,SAA2B
|
|
1
|
+
{"version":3,"file":"ready.js","sourceRoot":"","sources":["../../src/commands/ready.ts"],"names":[],"mappings":";;AAEA,SAAwB,KAAK,CAAc,SAA2B;IAElE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAChC,CAAC;AAHD,wBAGC"}
|
package/dist/commands/start.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import pmContainer from '../container';
|
|
|
7
7
|
import * as jsonrpc from '@akala/json-rpc-ws';
|
|
8
8
|
import { SocketAdapterEventMap } from "@akala/json-rpc-ws";
|
|
9
9
|
import { CliContext } from "@akala/cli";
|
|
10
|
-
declare function start(this: State, pm: pmContainer.container & Container<State>, name: string,
|
|
10
|
+
declare function start(this: State, pm: pmContainer.container & Container<State>, name: string, context?: CliContext<{
|
|
11
11
|
new?: boolean;
|
|
12
12
|
name: string;
|
|
13
13
|
inspect?: boolean;
|
package/dist/commands/start.js
CHANGED
|
@@ -31,16 +31,21 @@ const core_1 = require("@akala/core");
|
|
|
31
31
|
const new_line_prefixer_js_1 = require("../new-line-prefixer.js");
|
|
32
32
|
const cli_1 = require("@akala/cli");
|
|
33
33
|
const name_1 = __importDefault(require("./name"));
|
|
34
|
-
async function start(pm, name,
|
|
35
|
-
var _a, _b, _c, _d, _e;
|
|
34
|
+
async function start(pm, name, context) {
|
|
36
35
|
let args;
|
|
37
|
-
if (!
|
|
38
|
-
|
|
39
|
-
else if (!
|
|
40
|
-
|
|
36
|
+
if (!context.options.name && context.options.new)
|
|
37
|
+
context.options.name = (0, name_1.default)();
|
|
38
|
+
else if (!context.options.name)
|
|
39
|
+
context.options.name = name;
|
|
40
|
+
var instanceConfig = this.config.mapping[context.options.name];
|
|
41
|
+
var def;
|
|
42
|
+
if (typeof instanceConfig == 'undefined')
|
|
43
|
+
def = this.config.containers[name];
|
|
44
|
+
else
|
|
45
|
+
def = this.config.containers[instanceConfig.container];
|
|
41
46
|
if (this.isDaemon) {
|
|
42
47
|
// eslint-disable-next-line no-var
|
|
43
|
-
var container = this.processes[
|
|
48
|
+
var container = this.processes[context.options.name];
|
|
44
49
|
if (container && container.running)
|
|
45
50
|
throw new Error(container.name + ' is already started');
|
|
46
51
|
args = await pm.dispatch('config', name);
|
|
@@ -48,28 +53,28 @@ async function start(pm, name, options) {
|
|
|
48
53
|
args = args.slice(0);
|
|
49
54
|
else
|
|
50
55
|
args = [];
|
|
51
|
-
if (!
|
|
52
|
-
require.resolve(name);
|
|
53
|
-
|
|
56
|
+
if (!def && name != 'pm') {
|
|
57
|
+
// require.resolve(name);
|
|
58
|
+
throw new cli_1.ErrorWithStatus(404, `No mapping was found for ${name}. Did you want to run \`pm install ${name}\` or maybe are you missing the folder to ${name} ?`);
|
|
54
59
|
}
|
|
55
|
-
args.unshift(...
|
|
56
|
-
if (
|
|
57
|
-
args.unshift('--program=' +
|
|
60
|
+
args.unshift(...context.args, ...Object.entries(context.options).filter(e => e[0] != 'program' && e[0] != 'new' && e[0] != 'inspect').map(entries => ['--' + entries[0] + '=' + entries[1]]).flat());
|
|
61
|
+
if (def && def.path)
|
|
62
|
+
args.unshift('--program=' + def.path);
|
|
58
63
|
else
|
|
59
64
|
args.unshift('--program=' + name);
|
|
60
65
|
}
|
|
61
66
|
else {
|
|
62
67
|
if (name != 'pm')
|
|
63
68
|
throw new cli_1.ErrorWithStatus(40, 'this command needs to run through daemon process');
|
|
64
|
-
args = [...
|
|
69
|
+
args = [...context.args, ...Object.entries(context.options).map(entries => ['--' + entries[0] + '=' + entries[1]]).flat()];
|
|
65
70
|
}
|
|
66
71
|
args.unshift(require.resolve('../fork'));
|
|
67
|
-
if (
|
|
72
|
+
if (context.options && context.options.inspect)
|
|
68
73
|
args.unshift('--inspect-brk');
|
|
69
74
|
args.unshift(...process.execArgv);
|
|
70
|
-
if (
|
|
75
|
+
if (context.options && context.options.verbose)
|
|
71
76
|
args.push('-v');
|
|
72
|
-
const log = (0, debug_1.default)('akala:pm:' +
|
|
77
|
+
const log = (0, debug_1.default)('akala:pm:' + context.options.name);
|
|
73
78
|
let cp;
|
|
74
79
|
if (!this.isDaemon) {
|
|
75
80
|
cp = (0, child_process_1.spawn)(process.execPath, args, { cwd: process.cwd(), detached: true, stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
|
|
@@ -89,11 +94,15 @@ async function start(pm, name, options) {
|
|
|
89
94
|
});
|
|
90
95
|
}
|
|
91
96
|
else {
|
|
92
|
-
if (!container &&
|
|
93
|
-
|
|
97
|
+
if (!container && this.config.containers[name]?.dependencies?.length) {
|
|
98
|
+
var missingDeps = def.dependencies.filter(d => !this.config.mapping[d]);
|
|
99
|
+
if (missingDeps.length > 0)
|
|
100
|
+
throw new cli_1.ErrorWithStatus(404, `Some dependencies are missing to start ${context.options.name}:\n\t-${missingDeps.join('\n\t-')}`);
|
|
101
|
+
await (0, core_1.eachAsync)(def.dependencies, (dep) => pm.dispatch('start', dep, { name: context.options.name + '-' + dep, wait: true }));
|
|
102
|
+
}
|
|
94
103
|
cp = (0, child_process_1.spawn)(process.execPath, args, { cwd: process.cwd(), env: Object.assign({ DEBUG_COLORS: true }, process.env), stdio: ['ignore', 'pipe', 'pipe', 'ipc'], shell: false, windowsHide: true });
|
|
95
|
-
|
|
96
|
-
|
|
104
|
+
cp.stderr?.pipe(new new_line_prefixer_js_1.NewLinePrefixer(context.options.name + ' ', { useColors: true })).pipe(process.stderr);
|
|
105
|
+
cp.stdout?.pipe(new new_line_prefixer_js_1.NewLinePrefixer(context.options.name + ' ', { useColors: true })).pipe(process.stdout);
|
|
97
106
|
if (!container || !container.running) {
|
|
98
107
|
const processor = new commands_1.Processors.JsonRpc(new jsonrpc.Connection(new IpcAdapter(cp), {
|
|
99
108
|
type: 'client', getHandler(method) {
|
|
@@ -118,21 +127,20 @@ async function start(pm, name, options) {
|
|
|
118
127
|
};
|
|
119
128
|
},
|
|
120
129
|
disconnected() {
|
|
121
|
-
console.warn(`${
|
|
130
|
+
console.warn(`${context.options.name} has disconnected`);
|
|
122
131
|
container.running = null;
|
|
123
132
|
}
|
|
124
133
|
}), true);
|
|
125
134
|
if (container)
|
|
126
|
-
container = new commands_1.Container(
|
|
135
|
+
container = new commands_1.Container(context.options.name, null, processor);
|
|
127
136
|
else
|
|
128
|
-
container = new commands_1.Container(
|
|
129
|
-
if (
|
|
137
|
+
container = new commands_1.Container(context.options.name, null, processor);
|
|
138
|
+
if (def?.commandable)
|
|
130
139
|
pm.register(container);
|
|
131
|
-
this.processes[
|
|
140
|
+
this.processes[context.options.name] = container;
|
|
132
141
|
}
|
|
133
142
|
container.process = cp;
|
|
134
|
-
container
|
|
135
|
-
container.commandable = this.config.mapping[name].commandable;
|
|
143
|
+
Object.assign(container, def, instanceConfig);
|
|
136
144
|
container.ready = new jsonrpc.Deferred();
|
|
137
145
|
if (container.commandable) {
|
|
138
146
|
container.unregister(commands_1.Cli.Metadata.name);
|
|
@@ -149,17 +157,16 @@ async function start(pm, name, options) {
|
|
|
149
157
|
cp.on('exit', function () {
|
|
150
158
|
container.running = false;
|
|
151
159
|
pm.unregister(container.name);
|
|
160
|
+
container.ready.reject(new Error('program stopped'));
|
|
152
161
|
});
|
|
153
|
-
if (
|
|
162
|
+
if (context.options.wait && container.commandable)
|
|
154
163
|
await container.ready;
|
|
155
164
|
return { execPath: process.execPath, args: args, cwd: process.cwd(), stdio: ['inherit', 'inherit', 'inherit', 'ipc'], shell: false, windowsHide: true };
|
|
156
165
|
}
|
|
157
166
|
}
|
|
158
167
|
exports.default = start;
|
|
159
168
|
class IpcAdapter {
|
|
160
|
-
|
|
161
|
-
this.cp = cp;
|
|
162
|
-
}
|
|
169
|
+
cp;
|
|
163
170
|
get open() { return !!this.cp.pid; }
|
|
164
171
|
close() {
|
|
165
172
|
this.cp.disconnect();
|
|
@@ -196,6 +203,9 @@ class IpcAdapter {
|
|
|
196
203
|
break;
|
|
197
204
|
}
|
|
198
205
|
}
|
|
206
|
+
constructor(cp) {
|
|
207
|
+
this.cp = cp;
|
|
208
|
+
}
|
|
199
209
|
}
|
|
200
210
|
exports.IpcAdapter = IpcAdapter;
|
|
201
211
|
start.$inject = ['$container', 'param.0', 'options'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAyF;AAEzF,iDAAkE;AAElE,4DAA6C;AAC7C,kDAA0B;AAC1B,sCAAwC;AACxC,kEAA0D;AAE1D,oCAAyD;AACzD,kDAAmC;AAEpB,KAAK,UAAU,KAAK,CAAc,EAA4C,EAAE,IAAY,EAAE,OAA2G
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|