@akala/pm 9.0.1 → 9.0.3

package/package.json

@@ -4,7 +4,7 @@
     "pm": "dist/esm/cli.js",
     "pm-fork": "dist/esm/fork.js"
   },
-  "version": "9.0.1",
+  "version": "9.0.3",
   "scripts": {
     "test": "echo 1",
     "generate": "ac generate dist/esm/commands commands.json",
@@ -26,11 +26,11 @@
     "src/fork.ts"
   ],
   "dependencies": {
-    "@akala/cli": "^2.13.22",
-    "@akala/commands": "^8.0.1",
-    "@akala/config": "^4.0.35",
-    "@akala/core": "^15.0.1",
-    "@akala/json-rpc-ws": "^10.5.1",
+    "@akala/cli": "^2.13.23",
+    "@akala/commands": "^8.0.2",
+    "@akala/config": "^4.0.36",
+    "@akala/core": "^15.0.2",
+    "@akala/json-rpc-ws": "^10.5.2",
     "reflect-metadata": "^0.2.2",
     "source-map-support": "^0.5.21"
   },

package/src/akala.mts

@@ -12,6 +12,7 @@ import { CliContext, ErrorMessage, NamespaceMiddleware, unparse } from '@akala/c
 import { InteractError } from './index.js';
 import { ObservableObject, Parser } from '@akala/core';
 import module from 'module'
+import commands from './container.js';
 
 const require = module.createRequire(import.meta.url);
 
@@ -152,7 +153,7 @@ export default function (_config, program: NamespaceMiddleware)
             if (!processor)
                 processor = new Processors.JsonRpc(Processors.JsonRpc.getConnection(new NetSocketAdapter(socket)));
             if (!metaContainer)
-                metaContainer = require('../../commands.json');
+                metaContainer = commands.meta;
             if (!container)
             {
                 container = proxy(metaContainer, processor);

package/src/commands/restart.ts

@@ -5,5 +5,5 @@ import { CliContext } from "@akala/cli";
 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 }>
 {
     await pm.dispatch('stop', name);
-    await pm.dispatch('start', name, context);
+    await pm.dispatch('start', name, context.options, context);
 }

package/src/commands/start.json

@@ -4,7 +4,8 @@
         "inject": [
             "$container",
             "param.0",
-            "param.1"
+            "param.1",
+            "param.2"
         ]
     },
     "cli": {
@@ -34,6 +35,7 @@
         "inject": [
             "$container",
             "options.program",
+            "options",
             "context"
         ],
         "usage": "start <program>"

package/src/commands/start.ts

@@ -16,18 +16,18 @@ import { fileURLToPath } from 'url'
 //@ts-ignore
 const _dirname = typeof __dirname !== 'undefined' ? __dirname : path.dirname(fileURLToPath(import.meta.url))
 
-export default async function start(this: State, pm: pmContainer.container & Container<State>, name: string, context?: CliContext<{ new?: boolean, name: string, keepAttached?: boolean, inspect?: boolean, verbose?: boolean, wait?: boolean }>): Promise<void | { execPath: string, args: string[], cwd: string, stdio: StdioOptions, shell: boolean, windowsHide: boolean }>
+export default async function start(this: State, pm: pmContainer.container & Container<State>, name: string, options?: CliContext<{ new?: boolean, name: string, keepAttached?: boolean, inspect?: boolean, verbose?: boolean, wait?: boolean }>['options'], context?: Pick<CliContext<{}>, 'args'>): Promise<void | { execPath: string, args: string[], cwd: string, stdio: StdioOptions, shell: boolean, windowsHide: boolean }>
 {
     let args: string[];
-
-    if (!context.options.name && context.options.new)
-        context.options.name = getRandomName();
-    else if (!context.options.name)
-        context.options.name = name;
+    if (options)
+        if (!options.name && options.new)
+            options.name = getRandomName();
+        else if (!options.name)
+            options.name = name;
 
     if (this.isDaemon)
     {
-        var instanceConfig = this.config.mapping[context.options.name];
+        var instanceConfig = this.config.mapping[options.name || name];
         var def: ProxyConfiguration<SidecarMetadata>;
         if (typeof instanceConfig == 'undefined')
             def = this.config.containers[name];
@@ -35,7 +35,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
             def = this.config.containers[instanceConfig.container];
 
         // eslint-disable-next-line no-var
-        var container = this.processes[context.options.name];
+        var container = this.processes[options.name || name];
         if (container && container.running)
             throw new Error(container.name + ' is already started');
 
@@ -47,7 +47,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
             throw new 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} ?`)
         }
 
-        args.unshift(...context.args, ...unparseOptions({ ...context.options, program: undefined, new: undefined, inspect: undefined }, { ignoreUndefined: true }));
+        args.unshift(...context?.args, ...unparseOptions({ ...options, program: undefined, new: undefined, inspect: undefined }, { ignoreUndefined: true }));
         if (def && def.get('path'))
             args.unshift('--program=' + def.get('path'));
         else
@@ -58,7 +58,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
         if (name != 'pm')
             throw new ErrorWithStatus(40, 'this command needs to run through daemon process');
 
-        args = [...context.args, ...unparseOptions({ ...context.options, inspect: undefined })];
+        args = [...context?.args, ...unparseOptions({ ...options, inspect: undefined })];
     }
 
     if (!def?.type || def.type == 'nodejs')
@@ -67,18 +67,18 @@ export default async function start(this: State, pm: pmContainer.container & Con
         args.unshift(path.resolve(_dirname, '../fork'))
     }
 
-    if (context.options && context.options.inspect)
+    if (options && options.inspect)
         args.unshift('--inspect-brk');
 
     args.unshift(...process.execArgv);
 
-    if (context.options && context.options.verbose)
+    if (options && options.verbose)
         args.push('-v')
 
     let cp: ChildProcess;
     if (!this.isDaemon)
     {
-        if (context.options.keepAttached)
+        if (options.keepAttached)
             cp = spawn(process.execPath, args, { cwd: process.cwd(), stdio: ['inherit', 'inherit', 'inherit', 'ipc'] });
         else
             cp = spawn(process.execPath, args, { cwd: process.cwd(), detached: true, stdio: ['ignore', 'ignore', 'ignore', 'ipc'] });
@@ -95,7 +95,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
         {
             cp.on('disconnect', function ()
             {
-                if (!context.options.keepAttached)
+                if (!options.keepAttached)
                     cp.unref();
                 console.log('pm started');
                 resolve();
@@ -108,21 +108,21 @@ export default async function start(this: State, pm: pmContainer.container & Con
         {
             var missingDeps = def.dependencies.filter(d => !this.config.mapping[d]);
             if (missingDeps.length > 0)
-                throw new ErrorWithStatus(404, `Some dependencies are missing to start ${context.options.name}:\n\t-${missingDeps.join('\n\t-')}`);
+                throw new ErrorWithStatus(404, `Some dependencies are missing to start ${options.name}:\n\t-${missingDeps.join('\n\t-')}`);
 
-            await eachAsync(def.dependencies, (dep) => pm.dispatch('start', dep, { name: context.options.name + '-' + dep, wait: true }));
+            await eachAsync(def.dependencies, async (dep) => { await pm.dispatch('start', dep, { name: options.name + '-' + dep, wait: true }) });
         }
 
         if (def?.type && def.type !== 'nodejs')
             throw new ErrorWithStatus(400, `container with type ${this.config.containers[name]?.type} are not yet supported`);
-        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 });
-        cp.stderr?.pipe(new NewLinePrefixer(context.options.name + ' ', { useColors: true })).pipe(process.stderr);
-        cp.stdout?.pipe(new NewLinePrefixer(context.options.name + ' ', { useColors: true })).pipe(process.stdout);
+        cp = spawn(process.execPath, args, { cwd: process.cwd(), detached: !options.keepAttached, env: Object.assign({ DEBUG_COLORS: true }, process.env), stdio: ['ignore', 'pipe', 'pipe', 'ipc'], shell: false, windowsHide: true });
+        cp.stderr?.pipe(new NewLinePrefixer(options.name + ' ', { useColors: true })).pipe(process.stderr);
+        cp.stdout?.pipe(new NewLinePrefixer(options.name + ' ', { useColors: true })).pipe(process.stdout);
 
         if (!container || !container.running)
         {
             const socket = new IpcAdapter(cp);
-            container = new Container(context.options.name, null) as RunningContainer;
+            container = new Container(options.name, null) as RunningContainer;
             const connection = Processors.JsonRpc.getConnection(socket, pm, (params) =>
             {
                 params.process = cp;
@@ -132,14 +132,14 @@ export default async function start(this: State, pm: pmContainer.container & Con
 
             connection.on('close', function disconnected()
             {
-                console.warn(`${context.options.name} has disconnected`);
+                console.warn(`${options.name} has disconnected`);
                 container.running = false;
             });
 
             if (def?.commandable)
                 pm.register(container, def?.stateless);
 
-            this.processes[context.options.name] = container;
+            this.processes[options.name] = container;
         }
         container.process = cp;
 
@@ -161,7 +161,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
             });
         }, () =>
         {
-            console.warn(`${context.options.name} has disconnected`);
+            console.warn(`${options.name} has disconnected`);
             container.running = false;
         });
 
@@ -177,7 +177,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
                 container.ready.reject(new Error('program stopped: ' + buffer?.join('')));
             }
         });
-        if (context.options.wait && container.commandable)
+        if (options.wait && container.commandable)
         {
             //eslint-disable-next-line no-inner-declarations
             function gather(chunk: string)

package/src/container.ts

@@ -24,7 +24,7 @@ namespace commands
 		dispatch (cmd:'ready', ...args: []): ReturnType<typeof import('./commands/ready.js').default>
 		dispatch (cmd:'reload-metadata', ...args: [Argument0<typeof import('./commands/reload-metadata.js').default>]): ReturnType<typeof import('./commands/reload-metadata.js').default>
 		dispatch (cmd:'restart', ...args: [Argument1<typeof import('./commands/restart.js').default>, Argument2<typeof import('./commands/restart.js').default>]): ReturnType<typeof import('./commands/restart.js').default>
-		dispatch (cmd:'start', ...args: [Argument1<typeof import('./commands/start.js').default>, Argument2<typeof import('./commands/start.js').default>]): ReturnType<typeof import('./commands/start.js').default>
+		dispatch (cmd:'start', ...args: [Argument1<typeof import('./commands/start.js').default>, Argument2<typeof import('./commands/start.js').default>, Argument3<typeof import('./commands/start.js').default>]): ReturnType<typeof import('./commands/start.js').default>
 		dispatch (cmd:'status', ...args: [Argument0<typeof import('./commands/status.js').default>]): ReturnType<typeof import('./commands/status.js').default>
 		dispatch (cmd:'stop', ...args: [Argument0<typeof import('./commands/stop.js').default>]): ReturnType<typeof import('./commands/stop.js').default>
 		dispatch (cmd:'update', ...args: [Argument0<typeof import('./commands/update.js').default>, Argument1<typeof import('./commands/update.js').default>, Argument2<typeof import('./commands/update.js').default>]): ReturnType<typeof import('./commands/update.js').default>
@@ -48,13 +48,13 @@ namespace commands
 		'ready'(...args: []): ReturnType<typeof import('./commands/ready.js').default>
 		'reload-metadata'(...args: [Argument0<typeof import('./commands/reload-metadata.js').default>]): ReturnType<typeof import('./commands/reload-metadata.js').default>
 		'restart'(...args: [Argument1<typeof import('./commands/restart.js').default>, Argument2<typeof import('./commands/restart.js').default>]): ReturnType<typeof import('./commands/restart.js').default>
-		'start'(...args: [Argument1<typeof import('./commands/start.js').default>, Argument2<typeof import('./commands/start.js').default>]): ReturnType<typeof import('./commands/start.js').default>
+		'start'(...args: [Argument1<typeof import('./commands/start.js').default>, Argument2<typeof import('./commands/start.js').default>, Argument3<typeof import('./commands/start.js').default>]): ReturnType<typeof import('./commands/start.js').default>
 		'status'(...args: [Argument0<typeof import('./commands/status.js').default>]): ReturnType<typeof import('./commands/status.js').default>
 		'stop'(...args: [Argument0<typeof import('./commands/stop.js').default>]): ReturnType<typeof import('./commands/stop.js').default>
 		'update'(...args: [Argument0<typeof import('./commands/update.js').default>, Argument1<typeof import('./commands/update.js').default>, Argument2<typeof import('./commands/update.js').default>]): ReturnType<typeof import('./commands/update.js').default>
 		'version'(...args: [Argument0<typeof import('./commands/version.js').default>, Argument1<typeof import('./commands/version.js').default>]): ReturnType<typeof import('./commands/version.js').default>
 	}
-   export const meta={"name":"commands","commands":[{"name":"$init","config":{"fs":{"disabled":true,"path":"dist/esm/commands/$init.js","source":"src/commands/$init.ts","inject":["$container","param.0"]},"":{"inject":["$container","param.0"]},"cli":{"inject":["$container","context"],"usage":"$init [...args]","options":{"configFile":{"needsValue":true,"aliases":["c"]},"keepAttached":{"needsValue":true}}}}},{"name":"bridge","config":{"fs":{"inject":["param.0","param.1"],"path":"dist/esm/commands/bridge.js","source":"src/commands/bridge.ts"},"jsonrpc":{"inject":["param.0","socket"]},"":{"inject":[]}}},{"name":"config","config":{"fs":{"path":"dist/esm/commands/config.js","source":"src/commands/config.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"cli":{"inject":["param.0","options"]}}},{"name":"connect","config":{"fs":{"path":"dist/esm/commands/connect.js","source":"src/commands/connect.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"cli":{"usage":"connect <name>","inject":["options.name","context"],"options":{"tcpPort":{"needsValue":true,"aliases":["tcp-port"]},"port":{"needsValue":true},"key":{"needsValue":true},"cert":{"needsValue":true}}}}},{"name":"discover","config":{"fs":{"path":"dist/esm/commands/discover.js","source":"src/commands/discover.ts","inject":["param.0","param.1","$container"]},"":{"inject":["param.0","param.1","$container"]},"cli":{"usage":"discover <name> <folder>","options":{"folder":{"normalize":true}},"inject":["options.name","options.folder","$container"]}}},{"name":"install","config":{"fs":{"path":"dist/esm/commands/install.js","source":"src/commands/install.ts","inject":["param.0","$container"]},"":{"inject":["param.0","$container"]},"cli":{"inject":["param.0","$container"]}}},{"name":"link","config":{"fs":{"path":"dist/esm/commands/link.js","source":"src/commands/link.ts","inject":["param.0","param.1","$container"]},"":{"inject":["param.0","param.1","$container"]},"cli":{"inject":["param.0","param.1","$container"]}}},{"name":"log","config":{"fs":{"path":"dist/esm/commands/log.js","source":"src/commands/log.ts","inject":["param.0"]},"":{"inject":["param.0"]},"cli":{"inject":["param.0"]}}},{"name":"ls","config":{"fs":{"path":"dist/esm/commands/ls.js","source":"src/commands/ls.ts","inject":[]},"":{"inject":[]},"cli":{"inject":[]}}},{"name":"map","config":{"fs":{"path":"dist/esm/commands/map.js","source":"src/commands/map.ts","inject":["param.0","param.1","param.2","param.3"]},"":{"inject":["param.0","param.1","param.2","param.3"]},"cli":{"inject":["options.name","options.path","cwd","options"],"options":{"commandable":{"aliases":["c"],"needsValue":false},"stateless":{"aliases":["s"],"needsValue":false}},"usage":"map <name> <path>"}}},{"name":"name","config":{"fs":{"path":"dist/esm/commands/name.js","source":"src/commands/name.ts","inject":["param.0"]},"":{"inject":["param.0"]}}},{"name":"plugin.add","config":{"fs":{"inject":["param.0"],"path":"dist/esm/commands/plugin/add.js","source":"src/commands/plugin/add.ts"},"":{"inject":["param.0"]},"cli":{"usage":"add <plugin>","inject":["options.plugin"],"options":{"plugin":{"normalize":true}}}}},{"name":"plugin.remove","config":{"fs":{"inject":["param.0"],"path":"dist/esm/commands/plugin/remove.js","source":"src/commands/plugin/remove.ts"},"":{"inject":["param.0"]},"cli":{"usage":"remove <plugin>","inject":["options.plugin"],"options":{"plugin":{"normalize":true}}}}},{"name":"proxy","config":{"fs":{"path":"dist/esm/commands/proxy.js","source":"src/commands/proxy.ts","inject":["param.0","param.1"]},"jsonrpc":{"inject":["param.0","socket"]},"":{"inject":["param.0","param.1"]}}},{"name":"ready","config":{"fs":{"path":"dist/esm/commands/ready.js","source":"src/commands/ready.ts","inject":["$container","ignore"]},"jsonrpc":{"inject":["$container","dummy","connectionAsContainer"]},"":{"inject":["$container","connectionAsContainer"]}}},{"name":"reload-metadata","config":{"fs":{"inject":["param.0"],"path":"dist/esm/commands/reload-metadata.js","source":"src/commands/reload-metadata.ts"},"jsonrpc":{"inject":["connectionAsContainer"]},"":{"inject":["param.0"]}}},{"name":"restart","config":{"fs":{"path":"dist/esm/commands/restart.js","source":"src/commands/restart.ts","inject":["$container","param.0","param.1"]},"":{"inject":["$container","param.0","param.1"]},"cli":{"options":{"wait":{"aliases":["w"]},"inspect":{},"new":{},"name":{}},"inject":["$container","param.0","context"]}}},{"name":"start","config":{"fs":{"path":"dist/esm/commands/start.js","source":"src/commands/start.ts","inject":["$container","param.0","param.1"]},"":{"inject":["$container","param.0","param.1"]},"cli":{"options":{"wait":{"aliases":["w"],"needsValue":false,"doc":"waits for the program to be started before returning, otherwise, returns after the start command is sent to the pm daemon"},"inspect":{"needsValue":false,"doc":"starts the process with --inspect-brk parameter to help debugging"},"new":{"needsValue":false},"name":{"doc":"name to assign to the process","needsValue":true},"program":{"doc":"program to start"}},"inject":["$container","options.program","context"],"usage":"start <program>"}}},{"name":"status","config":{"fs":{"path":"dist/esm/commands/status.js","source":"src/commands/status.ts","inject":["param.0"]},"":{"inject":["param.0"]},"cli":{"inject":["param.0"]}}},{"name":"stop","config":{"fs":{"path":"dist/esm/commands/stop.js","source":"src/commands/stop.ts","inject":["param.0","$container"]},"":{"inject":["param.0","$container"]},"cli":{"inject":["options.process","$container"],"options":{"process":{"doc":"process to stop. Stops all the processes otherwise (including pm)."}},"usage":"stop [process]"}}},{"name":"update","config":{"fs":{"path":"dist/esm/commands/update.js","source":"src/commands/update.ts","inject":["param.0","param.1","param.2"]},"cli":{"inject":["param.0","param.1","$container"]},"":{"inject":["param.0","param.1","param.2"]}}},{"name":"version","config":{"fs":{"path":"dist/esm/commands/version.js","source":"src/commands/version.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"cli":{"inject":["param.0","param.1"]}}}]} as Metadata.Container;
+   export const meta={"name":"commands","commands":[{"name":"$init","config":{"fs":{"disabled":true,"path":"dist/esm/commands/$init.js","source":"src/commands/$init.ts","inject":["$container","param.0"]},"":{"inject":["$container","param.0"]},"cli":{"inject":["$container","context"],"usage":"$init [...args]","options":{"configFile":{"needsValue":true,"aliases":["c"]},"keepAttached":{"needsValue":true}}}}},{"name":"bridge","config":{"fs":{"inject":["param.0","param.1"],"path":"dist/esm/commands/bridge.js","source":"src/commands/bridge.ts"},"jsonrpc":{"inject":["param.0","socket"]},"":{"inject":[]}}},{"name":"config","config":{"fs":{"path":"dist/esm/commands/config.js","source":"src/commands/config.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"cli":{"inject":["param.0","options"]}}},{"name":"connect","config":{"fs":{"path":"dist/esm/commands/connect.js","source":"src/commands/connect.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"cli":{"usage":"connect <name>","inject":["options.name","context"],"options":{"tcpPort":{"needsValue":true,"aliases":["tcp-port"]},"port":{"needsValue":true},"key":{"needsValue":true},"cert":{"needsValue":true}}}}},{"name":"discover","config":{"fs":{"path":"dist/esm/commands/discover.js","source":"src/commands/discover.ts","inject":["param.0","param.1","$container"]},"":{"inject":["param.0","param.1","$container"]},"cli":{"usage":"discover <name> <folder>","options":{"folder":{"normalize":true}},"inject":["options.name","options.folder","$container"]}}},{"name":"install","config":{"fs":{"path":"dist/esm/commands/install.js","source":"src/commands/install.ts","inject":["param.0","$container"]},"":{"inject":["param.0","$container"]},"cli":{"inject":["param.0","$container"]}}},{"name":"link","config":{"fs":{"path":"dist/esm/commands/link.js","source":"src/commands/link.ts","inject":["param.0","param.1","$container"]},"":{"inject":["param.0","param.1","$container"]},"cli":{"inject":["param.0","param.1","$container"]}}},{"name":"log","config":{"fs":{"path":"dist/esm/commands/log.js","source":"src/commands/log.ts","inject":["param.0"]},"":{"inject":["param.0"]},"cli":{"inject":["param.0"]}}},{"name":"ls","config":{"fs":{"path":"dist/esm/commands/ls.js","source":"src/commands/ls.ts","inject":[]},"":{"inject":[]},"cli":{"inject":[]}}},{"name":"map","config":{"fs":{"path":"dist/esm/commands/map.js","source":"src/commands/map.ts","inject":["param.0","param.1","param.2","param.3"]},"":{"inject":["param.0","param.1","param.2","param.3"]},"cli":{"inject":["options.name","options.path","cwd","options"],"options":{"commandable":{"aliases":["c"],"needsValue":false},"stateless":{"aliases":["s"],"needsValue":false}},"usage":"map <name> <path>"}}},{"name":"name","config":{"fs":{"path":"dist/esm/commands/name.js","source":"src/commands/name.ts","inject":["param.0"]},"":{"inject":["param.0"]}}},{"name":"plugin.add","config":{"fs":{"inject":["param.0"],"path":"dist/esm/commands/plugin/add.js","source":"src/commands/plugin/add.ts"},"":{"inject":["param.0"]},"cli":{"usage":"add <plugin>","inject":["options.plugin"],"options":{"plugin":{"normalize":true}}}}},{"name":"plugin.remove","config":{"fs":{"inject":["param.0"],"path":"dist/esm/commands/plugin/remove.js","source":"src/commands/plugin/remove.ts"},"":{"inject":["param.0"]},"cli":{"usage":"remove <plugin>","inject":["options.plugin"],"options":{"plugin":{"normalize":true}}}}},{"name":"proxy","config":{"fs":{"path":"dist/esm/commands/proxy.js","source":"src/commands/proxy.ts","inject":["param.0","param.1"]},"jsonrpc":{"inject":["param.0","socket"]},"":{"inject":["param.0","param.1"]}}},{"name":"ready","config":{"fs":{"path":"dist/esm/commands/ready.js","source":"src/commands/ready.ts","inject":["$container","ignore"]},"jsonrpc":{"inject":["$container","dummy","connectionAsContainer"]},"":{"inject":["$container","connectionAsContainer"]}}},{"name":"reload-metadata","config":{"fs":{"inject":["param.0"],"path":"dist/esm/commands/reload-metadata.js","source":"src/commands/reload-metadata.ts"},"jsonrpc":{"inject":["connectionAsContainer"]},"":{"inject":["param.0"]}}},{"name":"restart","config":{"fs":{"path":"dist/esm/commands/restart.js","source":"src/commands/restart.ts","inject":["$container","param.0","param.1"]},"":{"inject":["$container","param.0","param.1"]},"cli":{"options":{"wait":{"aliases":["w"]},"inspect":{},"new":{},"name":{}},"inject":["$container","param.0","context"]}}},{"name":"start","config":{"fs":{"path":"dist/esm/commands/start.js","source":"src/commands/start.ts","inject":["$container","param.0","param.1","param.2"]},"":{"inject":["$container","param.0","param.1","param.2"]},"cli":{"options":{"wait":{"aliases":["w"],"needsValue":false,"doc":"waits for the program to be started before returning, otherwise, returns after the start command is sent to the pm daemon"},"inspect":{"needsValue":false,"doc":"starts the process with --inspect-brk parameter to help debugging"},"new":{"needsValue":false},"name":{"doc":"name to assign to the process","needsValue":true},"program":{"doc":"program to start"}},"inject":["$container","options.program","options","context"],"usage":"start <program>"}}},{"name":"status","config":{"fs":{"path":"dist/esm/commands/status.js","source":"src/commands/status.ts","inject":["param.0"]},"":{"inject":["param.0"]},"cli":{"inject":["param.0"]}}},{"name":"stop","config":{"fs":{"path":"dist/esm/commands/stop.js","source":"src/commands/stop.ts","inject":["param.0","$container"]},"":{"inject":["param.0","$container"]},"cli":{"inject":["options.process","$container"],"options":{"process":{"doc":"process to stop. Stops all the processes otherwise (including pm)."}},"usage":"stop [process]"}}},{"name":"update","config":{"fs":{"path":"dist/esm/commands/update.js","source":"src/commands/update.ts","inject":["param.0","param.1","param.2"]},"cli":{"inject":["param.0","param.1","$container"]},"":{"inject":["param.0","param.1","param.2"]}}},{"name":"version","config":{"fs":{"path":"dist/esm/commands/version.js","source":"src/commands/version.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"cli":{"inject":["param.0","param.1"]}}}]} as Metadata.Container;
 
    export function connect(processor?:ICommandProcessor) {
         const container = new Container<void>("commands", void 0);

package/src/fork.ts

@@ -2,14 +2,13 @@
 import sms from 'source-map-support'
 sms.install();
 import * as path from 'path'
-import * as ac from '@akala/commands';
 import { lstat } from 'fs/promises';
 import pmDef from './container.js';
 import { IpcAdapter } from "./ipc-adapter.js";
 import { logger, Logger, module as coreModule, MiddlewareCompositeAsync } from '@akala/core';
 import { program, buildCliContextFromProcess, ErrorMessage, NamespaceMiddleware } from '@akala/cli';
 import { Stats } from 'fs';
-import { registerCommands, SelfDefinedCommand, parseMetadata, StructuredParameters } from '@akala/commands';
+import { Processors, Triggers, ServeMetadata, Cli, registerCommands, SelfDefinedCommand, parseMetadata, StructuredParameters, Container, CommandProcessor, serveMetadata, connectByPreference, Metadata, ServeMetadataWithSignal } from '@akala/commands';
 import { fileURLToPath } from 'url';
 import commands from './container.js';
 
@@ -17,20 +16,20 @@ var isPm = false;
 
 program.option('help')
 let folderOrFile: Stats;
-let cliContainer: ac.Container<unknown>;
-let processor: ac.CommandProcessor;
+let cliContainer: Container<unknown>;
+let processor: CommandProcessor;
 let log: Logger;
 const logMiddleware = new NamespaceMiddleware<{ program: string, name: string, tls: boolean }>(null).option<string, 'verbose'>('verbose', { aliases: ['v',] });
 logMiddleware.preAction(async c =>
 {
     if (c.options.verbose)
-        processor = new ac.Processors.LogProcessor((_c, cmd, params) =>
+        processor = new Processors.LogProcessor((_c, cmd, params) =>
         {
             log.verbose({ cmd, params });
             return undefined;
         });
 
-    await ac.Processors.FileSystem.discoverCommands(c.options.program, cliContainer, { processor: processor, isDirectory: folderOrFile.isDirectory() });
+    await Processors.FileSystem.discoverCommands(c.options.program, cliContainer, { processor: processor, isDirectory: folderOrFile.isDirectory() });
 });
 let initMiddleware = new NamespaceMiddleware<{ program: string, name: string, tls: boolean }>(null);
 const controller = new AbortController();
@@ -70,12 +69,12 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
 
         log = logger(c.options.name);
 
-        cliContainer = new ac.Container('cli', {});
+        cliContainer = new Container('cli', {});
 
         if (folderOrFile.isFile())
-            processor = new ac.Processors.FileSystem(path.dirname(c.options.program));
+            processor = new Processors.FileSystem(path.dirname(c.options.program));
         else
-            processor = new ac.Processors.FileSystem(c.options.program);
+            processor = new Processors.FileSystem(c.options.program);
     }).
     useMiddleware(null, MiddlewareCompositeAsync.new(logMiddleware,
         {
@@ -91,7 +90,7 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
                         initMiddleware = initMiddleware.command(init.config.cli.usage, init.config?.doc?.description)
                         c.args.unshift('$init');
                     }
-                    ac.Triggers.addCliOptions(init, initMiddleware);
+                    Triggers.addCliOptions(init, initMiddleware);
                 }
 
                 process.on('unhandledRejection', (x) =>
@@ -108,8 +107,8 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
 
                 initMiddleware.option<string, 'pmSocket'>('pmSocket', { aliases: ['pm-socket', 'pm-sock'], needsValue: true }).action(async c =>
                 {
-                    let pm: ac.Container<unknown> & pmDef.container;
-                    let pmConnectInfo: ac.ServeMetadata;
+                    let pm: Container<unknown> & pmDef.container;
+                    let pmConnectInfo: ServeMetadata;
 
                     if (!isPm)
                     {
@@ -117,7 +116,7 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
                         const pmMeta = commands.meta;
                         if (process.connected)
                         {
-                            pm = new ac.Container('pm', null, new ac.Processors.JsonRpc(ac.Processors.JsonRpc.getConnection(new IpcAdapter(process), cliContainer))) as ac.Container<unknown> & pmDef.container;
+                            pm = new Container('pm', null, new Processors.JsonRpc(Processors.JsonRpc.getConnection(new IpcAdapter(process), cliContainer))) as Container<unknown> & pmDef.container;
                             registerCommands(pmMeta.commands, null, pm);
                         }
                         else
@@ -125,9 +124,10 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
                             if (c.options.pmSocket)
                                 pmConnectInfo = parseMetadata(c.options.pmSocket, c.options.tls);
                             else
-                                pmConnectInfo = ac.serveMetadata({ args: ['local'], options: { socketName: 'pm' } })
-                            const x = await ac.connectByPreference(pmConnectInfo, { metadata: pmMeta, container: cliContainer });
-                            pm = x.container as ac.Container<unknown> & pmDef.container;
+                                pmConnectInfo = serveMetadata({ args: ['local'], options: { socketName: 'pm' } })
+                            const x = await connectByPreference(pmConnectInfo, { metadata: pmMeta, container: cliContainer });
+                            controller.signal.addEventListener('abort', () => x.processor)
+                            pm = x.container as Container<unknown> & pmDef.container;
                             pm.processor.useMiddleware(20, x.processor);
                             const connect = pm.resolve('connect');
                             pm.unregister('connect');
@@ -142,11 +142,11 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
                             ]));
                         }
                         // eslint-disable-next-line @typescript-eslint/no-var-requires
-                        pm.unregister(ac.Cli.Metadata.name);
-                        pm.register(ac.Metadata.extractCommandMetadata(ac.Cli.Metadata));
+                        pm.unregister(Cli.Metadata.name);
+                        pm.register(Metadata.extractCommandMetadata(Cli.Metadata));
                     }
                     else
-                        pm = cliContainer as pmDef.container & ac.Container<unknown>;
+                        pm = cliContainer as pmDef.container & Container<unknown>;
 
                     coreModule('@akala/pm').register('container', pm);
 
@@ -154,11 +154,11 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
                     {
                         if (!pmConnectInfo)
                             pmConnectInfo = await pm.dispatch('connect', 'pm');
-                        var pm2 = await ac.connectByPreference(pmConnectInfo, { container: cliContainer, metadata: await cliContainer.dispatch('$metadata') });
+                        var pm2 = await connectByPreference(pmConnectInfo, { container: cliContainer, metadata: await cliContainer.dispatch('$metadata') });
                         pm2.container.processor.useMiddleware(20, pm2.processor);
-                        pm2.container.unregister(ac.Cli.Metadata.name);
-                        pm2.container.register(ac.Metadata.extractCommandMetadata(ac.Cli.Metadata));
-                        pm2.container.register(ac.Metadata.extractCommandMetadata(pm.resolve('bridge')));
+                        pm2.container.unregister(Cli.Metadata.name);
+                        pm2.container.register(Metadata.extractCommandMetadata(Cli.Metadata));
+                        pm2.container.register(Metadata.extractCommandMetadata(pm.resolve('bridge')));
                         if (await pm2.container.dispatch('bridge', connectionId))
                             throw undefined;
                     }, '$bridge'));
@@ -171,7 +171,7 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
 
                     try
                     {
-                        const serveArgs: ac.ServeMetadataWithSignal = await pm.dispatch('connect', c.options.name);
+                        const serveArgs: ServeMetadataWithSignal = await pm.dispatch('connect', c.options.name);
                         // console.log(serveArgs)
                         serveArgs.signal = controller.signal;
                         await cliContainer.dispatch('$serve', serveArgs);