@akala/pm 3.10.2 → 4.0.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.
Files changed (37) hide show
  1. package/changelog.md +1 -6
  2. package/commands.json +15 -26
  3. package/dist/cli.js +15 -4
  4. package/dist/cli.js.map +1 -1
  5. package/dist/commands/$init.js +9 -8
  6. package/dist/commands/$init.js.map +1 -1
  7. package/dist/commands/discover.js +8 -8
  8. package/dist/commands/discover.js.map +1 -1
  9. package/dist/commands/map.d.ts +4 -1
  10. package/dist/commands/map.js +2 -2
  11. package/dist/commands/map.js.map +1 -1
  12. package/dist/commands/ready.d.ts +1 -1
  13. package/dist/commands/ready.js +10 -9
  14. package/dist/commands/ready.js.map +1 -1
  15. package/dist/commands/start.js +12 -6
  16. package/dist/commands/start.js.map +1 -1
  17. package/dist/commands/status.js +1 -1
  18. package/dist/commands/status.js.map +1 -1
  19. package/dist/fork.js +13 -4
  20. package/dist/fork.js.map +1 -1
  21. package/dist/index.js +1 -1
  22. package/dist/index.js.map +1 -1
  23. package/dist/state.d.ts +2 -0
  24. package/package.json +6 -6
  25. package/src/cli.ts +19 -4
  26. package/src/commands/$init.ts +10 -7
  27. package/src/commands/discover.ts +8 -8
  28. package/src/commands/map.json +11 -4
  29. package/src/commands/map.ts +2 -2
  30. package/src/commands/ready.ts +10 -9
  31. package/src/commands/start.ts +13 -7
  32. package/src/commands/status.ts +1 -1
  33. package/src/fork.ts +15 -3
  34. package/src/index.ts +1 -1
  35. package/src/state.ts +2 -0
  36. package/test.json +1 -1
  37. package/tsconfig.tsbuildinfo +1 -1
package/dist/commands/status.js CHANGED
@@ -4,7 +4,7 @@ function status(name) {
4
4
  let processes = Object.values(this.processes);
5
5
  if (name)
6
6
  processes = processes.filter(p => p.name == name);
7
- return processes.map(p => { return { name: p.name, filter: name, running: p.running, folder: p.path }; });
7
+ return processes.map(p => { return { name: p.name, filter: name, running: p.running, folder: p.path, stateless: p.stateless, type: p.type, cwd: p.cwd }; });
8
8
  }
9
9
  exports.default = status;
10
10
  //# sourceMappingURL=status.js.map
package/dist/commands/status.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":";;AAEA,SAAwB,MAAM,CAAc,IAAa;IAErD,IAAI,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,IAAI;QACJ,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;IAEtD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA,CAAC,CAAC,CAAC,CAAA;AAC5G,CAAC;AAPD,yBAOC"}
1
+ {"version":3,"file":"status.js","sourceRoot":"","sources":["../../src/commands/status.ts"],"names":[],"mappings":";;AAEA,SAAwB,MAAM,CAAc,IAAa;IAErD,IAAI,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9C,IAAI,IAAI;QACJ,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;IAEtD,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAA,CAAC,CAAC,CAAC,CAAA;AAC9J,CAAC;AAPD,yBAOC"}
package/dist/fork.js CHANGED
@@ -128,9 +128,7 @@ cli_1.default.option('program', { needsValue: true, normalize: true }).
128
128
  throw undefined;
129
129
  }, '$bridge'));
130
130
  if (init) {
131
- var error = await cliContainer.handle(cliContainer, init, { options: c.options, param: c.args, _trigger: 'cli', pm: pm, context: c });
132
- if (error)
133
- throw error;
131
+ await cliContainer.dispatch(init, { options: c.options, param: c.args, _trigger: 'cli', pm: pm, context: c });
134
132
  }
135
133
  let stop;
136
134
  try {
@@ -144,8 +142,19 @@ cli_1.default.option('program', { needsValue: true, normalize: true }).
144
142
  }
145
143
  if (pm !== cliContainer)
146
144
  await pm.dispatch('ready');
147
- if (stop && typeof stop == 'function')
145
+ if (stop && typeof stop == 'function') {
146
+ process.on('unhandledRejection', (x) => {
147
+ stop();
148
+ console.error(x);
149
+ process.exit();
150
+ });
151
+ process.on('uncaughtException', (x) => {
152
+ stop();
153
+ console.error(x);
154
+ process.exit();
155
+ });
148
156
  process.on('SIGINT', stop);
157
+ }
149
158
  else
150
159
  process.on('SIGINT', () => process.exit());
151
160
  });
package/dist/fork.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fork.js","sourceRoot":"","sources":["../src/fork.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fork.js","sourceRoot":"","sources":["../src/fork.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -65,7 +65,7 @@ async function connect(name, container) {
65
65
  return { connect: container.dispatch('connect', name), container: metaContainer };
66
66
  }
67
67
  const metaContainer = await container.dispatch('$metadata', true);
68
- return { connect: container.dispatch('connect', name), container: { name, commands: metaContainer.commands.filter(c => c.name.startsWith(name + '.')).map(c => ({ name: c.name.substring(name.length + 1), inject: c.inject, config: c.config })) } };
68
+ return { connect: container.dispatch('connect', name), container: { name, commands: metaContainer.commands.filter(c => c.name.startsWith(name + '.')).map(c => ({ name: c.name.substring(name.length + 1), config: c.config })) } };
69
69
  }
70
70
  exports.connect = connect;
71
71
  exports.defaultOrders = ['ssocket', 'socket', 'wss', 'ws'];
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/state.d.ts CHANGED
@@ -27,6 +27,7 @@ export interface StateConfiguration {
27
27
  }
28
28
  export interface SidecarMetadata {
29
29
  path: string;
30
+ stateless: boolean;
30
31
  dependencies?: string[];
31
32
  commandable: boolean;
32
33
  type?: 'nodejs';
@@ -41,5 +42,6 @@ export interface SidecarConfiguration<T extends string | SerializableObject = Se
41
42
  export interface RunningContainer<T extends string | SerializableObject = any> extends Container<unknown>, SidecarConfiguration<T>, SidecarMetadata {
42
43
  process: ChildProcess;
43
44
  running?: boolean;
45
+ stateless: boolean;
44
46
  ready?: Deferred<void>;
45
47
  }
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.10.2",
7
+ "version": "4.0.1",
8
8
  "scripts": {
9
9
  "test": "echo 1",
10
10
  "generate": "ac generate dist/commands commands.json",
@@ -19,11 +19,11 @@
19
19
  },
20
20
  "homepage": "https://akala.js.org/pm",
21
21
  "dependencies": {
22
- "@akala/cli": "^2.4.4",
23
- "@akala/commands": "^3.9.4",
24
- "@akala/config": "^1.3.14",
25
- "@akala/core": "^9.4.1",
26
- "@akala/json-rpc-ws": "^9.6.1",
22
+ "@akala/cli": "^2.5.0",
23
+ "@akala/commands": "^4.1.0",
24
+ "@akala/config": "^1.3.16",
25
+ "@akala/core": "^9.5.0",
26
+ "@akala/json-rpc-ws": "^9.7.0",
27
27
  "reflect-metadata": "^0.1.13",
28
28
  "source-map-support": "^0.5.21"
29
29
  },
package/src/cli.ts CHANGED
@@ -82,10 +82,24 @@ cli.preAction(async c =>
82
82
  netsocket.connect('\\\\?\\pipe\\pm')
83
83
  else
84
84
  {
85
- // eslint-disable-next-line @typescript-eslint/no-var-requires
86
- const config = require(path.join(homedir(), './.pm.config.json'));
85
+ try
86
+ {
87
+ // eslint-disable-next-line @typescript-eslint/no-var-requires
88
+ const config = require(path.join(homedir(), './.pm.config.json'));
89
+
90
+ netsocket.connect(config.mapping.pm.connect.socket[0]);
91
+ }
92
+ catch (e)
93
+ {
94
+ if (e.code != 'MODULE_NOT_FOUND')
95
+ reject(e);
96
+ else
97
+ {
98
+ e.code = 'ENOENT';
99
+ socket.destroy(e);
100
+ }
87
101
 
88
- netsocket.connect(config.mapping.pm.connect.socket[0]);
102
+ }
89
103
  }
90
104
  if (c.options.tls)
91
105
  {
@@ -221,7 +235,8 @@ program.process(buildCliContextFromProcess()).then(result =>
221
235
  socket.end();
222
236
  }, err =>
223
237
  {
224
- // console.error(err);
238
+ if (err && !(err instanceof ErrorMessage))
239
+ console.error(err);
225
240
  process.exit(err && err.statusCode || 50);
226
241
  });
227
242
 
package/src/commands/$init.ts CHANGED
@@ -8,6 +8,7 @@ import { PassThrough } from 'stream';
8
8
  import { EventEmitter } from 'events';
9
9
  import { CliContext } from '@akala/cli';
10
10
  import Configuration from '@akala/config';
11
+ import { each, grep } from '@akala/core';
11
12
 
12
13
  export async function metadata(container: Container<unknown>, deep?: boolean): Promise<Metadata.Container>
13
14
  {
@@ -18,10 +19,10 @@ export async function metadata(container: Container<unknown>, deep?: boolean): P
18
19
  return;
19
20
  const cmd = container.resolve<Metadata.Command | Container<unknown>>(key);
20
21
  if (cmd && cmd.name && Metadata.isCommand(cmd) && ignoredCommands.indexOf(cmd.name) == -1)
21
- metacontainer.commands.push({ name: cmd.name, inject: cmd.inject || [], config: cmd.config });
22
+ metacontainer.commands.push({ name: cmd.name, config: cmd.config });
22
23
  else if (cmd instanceof Container && deep)
23
24
  {
24
- if (!isRunningContainer(cmd) || !cmd.running)
25
+ if (!isRunningContainer(cmd) || !cmd.running && !cmd.stateless)
25
26
  return;
26
27
  try
27
28
  {
@@ -86,16 +87,16 @@ export default async function (this: State, container: RunningContainer & pmCont
86
87
  });
87
88
 
88
89
  const configPath = context.options.config || join(homedir(), './.pm.config.json');
89
- this.config = await Configuration.load<StateConfiguration>(configPath);
90
+ this.config = await Configuration.load<StateConfiguration>(configPath, true);
90
91
 
91
- if (this.config)
92
+ if (this.config?.mapping?.pm)
92
93
  {
93
94
  if (this.config.mapping.pm.cwd)
94
95
  process.chdir(this.config.mapping.pm.cwd);
95
96
  }
96
97
  else
97
98
  this.config = Configuration.new<StateConfiguration>(configPath, {
98
- containers: { pm: { commandable: true, path: require.resolve('../../commands.json') } },
99
+ containers: { pm: { commandable: true, stateless: false, path: require.resolve('../../commands.json') } },
99
100
  mapping: { pm: { cwd: process.cwd(), container: 'pm' } }
100
101
  }) as State['config'];
101
102
 
@@ -134,9 +135,11 @@ export default async function (this: State, container: RunningContainer & pmCont
134
135
 
135
136
  if (process.disconnect)
136
137
  {
137
- if (process.send)
138
- process.send('disconnecting daemon');
139
138
  if (!context.options.keepAttached)
139
+ {
140
+ if (process.send)
141
+ process.send('disconnecting daemon');
140
142
  process.disconnect();
143
+ }
141
144
  }
142
145
  }
package/src/commands/discover.ts CHANGED
@@ -50,7 +50,7 @@ export default async function discover(this: State, packageName: string, folder:
50
50
  {
51
51
  try
52
52
  {
53
- moduleRequire?.resolve(p)
53
+ return moduleRequire?.resolve(p)
54
54
  }
55
55
  catch (e)
56
56
  {
@@ -71,9 +71,9 @@ export default async function discover(this: State, packageName: string, folder:
71
71
  if (Array.isArray(packageConfig))
72
72
  throw new Error('commands property must be of type object or string');
73
73
 
74
- return await Promise.all(Object.keys(packageConfig.commands).map(v => pm.dispatch('map', v, moduleRequire?.resolve('./' + packageConfig.commands[v]), path, true)));
74
+ return await Promise.all(Object.keys(packageConfig.commands).map(v => pm.dispatch('map', v, moduleRequire?.resolve('./' + packageConfig.commands[v]), path, { commandable: true })));
75
75
  case 'string':
76
- return await pm.dispatch('map', packageName, moduleRequire.resolve('./' + packageConfig.commands), path, true);
76
+ return await pm.dispatch('map', packageName, moduleRequire.resolve('./' + packageConfig.commands), path, { commandable: true });
77
77
  default:
78
78
  throw new Error('commands property must be of type object or string');
79
79
  }
@@ -86,19 +86,19 @@ export default async function discover(this: State, packageName: string, folder:
86
86
  case 'object':
87
87
  if (Array.isArray(packageConfig))
88
88
  throw new Error('bin property must be of type object or string');
89
- return Promise.all(Object.keys(packageConfig.bin).map(v => pm.dispatch('map', v, moduleRequire.resolve('./' + packageConfig.bin[v]), path, false)));
89
+ return Promise.all(Object.keys(packageConfig.bin).map(v => pm.dispatch('map', v, moduleRequire.resolve('./' + packageConfig.bin[v]), path, { commandable: false })));
90
90
  case 'string':
91
- return await pm.dispatch('map', packageName, moduleRequire.resolve('./' + packageConfig.bin), path, false);
91
+ return await pm.dispatch('map', packageName, moduleRequire.resolve('./' + packageConfig.bin), path, { commandable: false });
92
92
  default:
93
93
  throw new Error('bin property must be of type object or string');
94
94
  }
95
95
  }
96
96
 
97
- const commandsJsonFile = tryModuleRequireResolve(join(packageName, './commands.json'));
97
+ const commandsJsonFile = tryModuleRequireResolve('./commands.json');
98
98
  if (commandsJsonFile)
99
- return pm.dispatch('map', packageName, moduleRequire.resolve('./commands.json'), path, true);
99
+ return pm.dispatch('map', packageName, commandsJsonFile, path, { commandable: true });
100
100
 
101
- return pm.dispatch('map', packageName, moduleRequire.resolve('./' + packageConfig.main), path, false);
101
+ return pm.dispatch('map', packageName, moduleRequire.resolve('./' + packageConfig.main), path, { commandable: false });
102
102
  }
103
103
 
104
104
  exports.default.$inject = ['param.0', 'param.1', '$container']
package/src/commands/map.json CHANGED
@@ -10,10 +10,10 @@
10
10
  },
11
11
  "cli": {
12
12
  "inject": [
13
- "param.0",
14
- "param.1",
13
+ "options.name",
14
+ "options.path",
15
15
  "cwd",
16
- "options.c"
16
+ "options"
17
17
  ],
18
18
  "options": {
19
19
  "commandable": {
@@ -21,7 +21,14 @@
21
21
  "c"
22
22
  ],
23
23
  "needsValue": false
24
+ },
25
+ "stateless": {
26
+ "aliases": [
27
+ "s"
28
+ ],
29
+ "needsValue": false
24
30
  }
25
- }
31
+ },
32
+ "usage": "map <name> <path>"
26
33
  }
27
34
  }
package/src/commands/map.ts CHANGED
@@ -1,11 +1,11 @@
1
1
  import State from '../state';
2
2
  import { isAbsolute, resolve } from "path";
3
3
 
4
- export default async function map<TName extends string>(this: State, name: TName, targetPath: string, cwd?: string, commandable?: boolean): Promise<State['config']['mapping'][TName]>
4
+ export default async function map<TName extends string>(this: State, name: TName, targetPath: string, cwd?: string, options?: { commandable?: boolean, stateless?: boolean }): Promise<State['config']['mapping'][TName]>
5
5
  {
6
6
  if (!isAbsolute(targetPath))
7
7
  targetPath = resolve(cwd || process.cwd(), targetPath);
8
- this.config.containers.set(name, { path: targetPath, commandable: !!commandable });
8
+ this.config.containers.set(name, { path: targetPath, commandable: !!options?.commandable, stateless: !!options?.stateless });
9
9
  await this.config.commit();
10
10
  return this.config.mapping[name]
11
11
  }
package/src/commands/ready.ts CHANGED
@@ -2,19 +2,20 @@ import { Container, Metadata, registerCommands, SelfDefinedCommand } from '@akal
2
2
  import pm from '../container';
3
3
  import State, { RunningContainer } from '../state';
4
4
 
5
- export default async function ready(this: State, pm: pm.container & Container<State>, container: RunningContainer, remoteContainer: Container<void>): Promise<void>
5
+ export default async function ready(this: State, pm: pm.container & Container<State>, container: RunningContainer, standaloneContainer: Container<void>): Promise<void>
6
6
  {
7
- if (remoteContainer['process'])
7
+ if (standaloneContainer['process'])
8
8
  {
9
- container = remoteContainer as RunningContainer;
10
- remoteContainer = null;
9
+ container = standaloneContainer as RunningContainer;
10
+ if (!container.stateless)
11
+ standaloneContainer = null;
11
12
  }
12
- if (remoteContainer)
13
+ if (standaloneContainer)
13
14
  {
14
- remoteContainer.register<Metadata.Command>({ name: '$metadata', config: {}, inject: [] }, true);
15
- const metadata: Metadata.Container = await remoteContainer.dispatch('$metadata');
16
- remoteContainer.name = metadata.name;
17
- this.processes[remoteContainer.name] = container = Object.assign(remoteContainer, { process: null, commandable: true, path: '', container: null, running: true });
15
+ standaloneContainer.register<Metadata.Command>({ name: '$metadata', config: { "": { inject: [] } } }, true);
16
+ const metadata: Metadata.Container = await standaloneContainer.dispatch('$metadata');
17
+ standaloneContainer.name = metadata.name;
18
+ this.processes[standaloneContainer.name] = container = Object.assign(standaloneContainer, { process: container?.process, commandable: true, path: container?.path, container: container?.container, running: true, stateless: container?.stateless || false });
18
19
  registerCommands(metadata.commands, null, container);
19
20
 
20
21
  pm.register(container.name, container, true);
package/src/commands/start.ts CHANGED
@@ -55,7 +55,8 @@ export default async function start(this: State, pm: pmContainer.container & Con
55
55
  args = [...context.args, ...Object.entries(context.options).filter(p => ['inspect'].indexOf(p[0]) == -1).map(entries => ['--' + entries[0] + '=' + entries[1]]).flat()];
56
56
  }
57
57
 
58
- args.unshift(require.resolve('../fork'))
58
+ if (!def?.type || def.type == 'nodejs')
59
+ args.unshift(require.resolve('../fork'))
59
60
 
60
61
  if (context.options && context.options.inspect)
61
62
  args.unshift('--inspect-brk');
@@ -94,7 +95,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
94
95
  }
95
96
  else
96
97
  {
97
- if (!container && this.config.containers[name]?.dependencies?.length)
98
+ if (!container && def.dependencies?.length)
98
99
  {
99
100
  var missingDeps = def.dependencies.filter(d => !this.config.mapping[d]);
100
101
  if (missingDeps.length > 0)
@@ -103,6 +104,8 @@ export default async function start(this: State, pm: pmContainer.container & Con
103
104
  await eachAsync(def.dependencies, (dep) => pm.dispatch('start', dep, { name: context.options.name + '-' + dep, wait: true }));
104
105
  }
105
106
 
107
+ if (def?.type && def.type !== 'nodejs')
108
+ throw new ErrorWithStatus(400, `container with type ${this.config.containers[name]?.type} are not yet supported`);
106
109
  cp = spawn(process.execPath, args, { cwd: process.cwd(), detached: !context.options.keepAttached, env: Object.assign({ DEBUG_COLORS: true }, process.env), stdio: ['ignore', 'pipe', 'pipe', 'ipc'], shell: false, windowsHide: true });
107
110
  cp.stderr?.pipe(new NewLinePrefixer(context.options.name + ' ', { useColors: true })).pipe(process.stderr);
108
111
  cp.stdout?.pipe(new NewLinePrefixer(context.options.name + ' ', { useColors: true })).pipe(process.stdout);
@@ -125,7 +128,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
125
128
  });
126
129
 
127
130
  if (def?.commandable)
128
- pm.register(container);
131
+ pm.register(container, def?.stateless);
129
132
 
130
133
  this.processes[context.options.name] = container;
131
134
  }
@@ -133,7 +136,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
133
136
 
134
137
  Object.assign(container, def, instanceConfig);
135
138
  container.ready = new jsonrpc.Deferred();
136
- if (container.commandable)
139
+ if (container.commandable)// && !container.stateless)
137
140
  {
138
141
  container.unregister(Cli.Metadata.name);
139
142
  container.register(Metadata.extractCommandMetadata(Cli.Metadata));
@@ -150,15 +153,18 @@ export default async function start(this: State, pm: pmContainer.container & Con
150
153
  {
151
154
  console.warn(`${context.options.name} has disconnected`);
152
155
  container.running = false;
153
- })
156
+ });
154
157
 
155
158
  container.running = true;
156
159
  let buffer = [];
157
160
  cp.on('exit', function ()
158
161
  {
159
162
  (container as RunningContainer).running = false;
160
- pm.unregister(container.name);
161
- container.ready.reject(new Error('program stopped: ' + buffer?.join('')));
163
+ if (!container.stateless)
164
+ {
165
+ pm.unregister(container.name);
166
+ container.ready.reject(new Error('program stopped: ' + buffer?.join('')));
167
+ }
162
168
  });
163
169
  if (context.options.wait && container.commandable)
164
170
  {
package/src/commands/status.ts CHANGED
@@ -6,5 +6,5 @@ export default function status(this: State, name?: string): { name: string, filt
6
6
  if (name)
7
7
  processes = processes.filter(p => p.name == name);
8
8
 
9
- return processes.map(p => { return { name: p.name, filter: name, running: p.running, folder: p.path } })
9
+ return processes.map(p => { return { name: p.name, filter: name, running: p.running, folder: p.path, stateless: p.stateless, type: p.type, cwd: p.cwd } })
10
10
  }
package/src/fork.ts CHANGED
@@ -128,9 +128,7 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
128
128
 
129
129
  if (init)
130
130
  {
131
- var error = await cliContainer.handle(cliContainer, init, { options: c.options, param: c.args, _trigger: 'cli', pm: pm, context: c });
132
- if (error)
133
- throw error;
131
+ await cliContainer.dispatch(init, { options: c.options, param: c.args, _trigger: 'cli', pm: pm, context: c });
134
132
  }
135
133
 
136
134
  let stop: (...args: unknown[]) => Promise<void>;
@@ -150,7 +148,21 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
150
148
  await pm.dispatch('ready')
151
149
 
152
150
  if (stop && typeof stop == 'function')
151
+ {
152
+ process.on('unhandledRejection', (x) =>
153
+ {
154
+ stop();
155
+ console.error(x);
156
+ process.exit();
157
+ });
158
+ process.on('uncaughtException', (x) =>
159
+ {
160
+ stop();
161
+ console.error(x);
162
+ process.exit();
163
+ });
153
164
  process.on('SIGINT', stop);
165
+ }
154
166
  else
155
167
  process.on('SIGINT', () => process.exit());
156
168
  });
package/src/index.ts CHANGED
@@ -54,7 +54,7 @@ export async function connect(name: string, container?: pmContainer & Container<
54
54
  }
55
55
  const metaContainer = await container.dispatch('$metadata', true) as Metadata.Container;
56
56
 
57
- return { connect: container.dispatch('connect', name) as Promise<ServeMetadata>, container: { name, commands: metaContainer.commands.filter(c => c.name.startsWith(name + '.')).map(c => ({ name: c.name.substring(name.length + 1), inject: c.inject, config: c.config })) } };
57
+ return { connect: container.dispatch('connect', name) as Promise<ServeMetadata>, container: { name, commands: metaContainer.commands.filter(c => c.name.startsWith(name + '.')).map(c => ({ name: c.name.substring(name.length + 1), config: c.config })) } };
58
58
  }
59
59
 
60
60
  export const defaultOrders: (keyof ServeMetadata)[] = ['ssocket', 'socket', 'wss', 'ws'];
package/src/state.ts CHANGED
@@ -21,6 +21,7 @@ export interface StateConfiguration
21
21
  export interface SidecarMetadata
22
22
  {
23
23
  path: string;
24
+ stateless: boolean;
24
25
  dependencies?: string[];
25
26
  commandable: boolean;
26
27
  type?: 'nodejs';
@@ -40,5 +41,6 @@ export interface RunningContainer<T extends string | SerializableObject = any> e
40
41
  {
41
42
  process: ChildProcess;
42
43
  running?: boolean;
44
+ stateless: boolean;
43
45
  ready?: Deferred<void>;
44
46
  }
package/test.json CHANGED
@@ -28,5 +28,5 @@
28
28
  }
29
29
  }
30
30
  ],
31
- "$schema": "https://raw.githubusercontent.com/npenin/akala-commands/master/schema.json"
31
+ "$schema": "https://raw.githubusercontent.com/npenin/akala/master/packages/commands/container-schema.json"
32
32
  }