@akala/pm 14.6.2 → 15.0.0

package/src/commands/start.ts

@@ -26,48 +26,38 @@ export default async function start(this: State, pm: pmContainer.container & Con
 
     let def: ProxyConfiguration<SidecarMetadata>;
 
-    if (this.isDaemon)
-    {
-        var instanceConfig = this.config.mapping[options.name || name];
-        if (!instanceConfig?.container)
-            def = this.config.containers[name];
-        else
-            def = this.config.containers[instanceConfig.container];
+    var instanceConfig = this.config.mapping[options.name || name];
+    if (!instanceConfig?.container)
+        def = this.config.containers[name];
+    else
+        def = this.config.containers[instanceConfig.container];
 
-        if (typeof options.autostart !== 'undefined')
-            if (instanceConfig)
-                instanceConfig.autostart = options.autostart;
-            else
-            {
-                this.config.mapping.set(options.name || name, { container: name, autostart: options.autostart });
-                await this.config.commit()
-            }
+    if (typeof options.autostart !== 'undefined')
+        if (instanceConfig)
+            instanceConfig.autostart = options.autostart;
+        else
+        {
+            this.config.mapping.set(options.name || name, { container: name, autostart: options.autostart });
+            await this.config.commit()
+        }
 
-        var container = this.processes[options.name || name];
-        if (container?.running)
-            throw new Error(container.name + ' is already started');
+    var container = this.processes[options.name || name];
+    if (container?.running)
+        throw new Error(container.name + ' is already started');
 
-        args = [];
+    args = [];
 
-        if (!def && name != 'pm')
-            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} ?`)
+    if (!def && name != 'pm')
+        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} ?`)
 
-        // if (options.configFile)
-        //     options.configFile += '#' + options.name
+    // if (options.configFile)
+    //     options.configFile += '#' + options.name
 
-        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
-            args.unshift('--program=' + name);
-    }
+    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
-    {
-        if (name != 'pm')
-            throw new ErrorWithStatus(40, 'this command needs to run through daemon process');
-
-        args = [new URL('../../../commands.json', import.meta.url).toString(), ...(context?.args || []), ...unparseOptions({ ...options, inspect: undefined })];
-    }
+        args.unshift('--program=' + name);
 
     if (options?.inspect)
         args.unshift('--inspect-brk');
@@ -77,80 +67,58 @@ export default async function start(this: State, pm: pmContainer.container & Con
     if (options?.verbose)
         args.push('-v')
 
-    if (!this.isDaemon)
-    {
-        const cp = ChildProcess.build(args, { inheritStdio: true, name: options.name });
-        cp.on('exit', function ()
-        {
-            console.log(args);
-        })
 
-        return new Promise<void>((resolve) =>
-        {
-            cp.on('runningChanged', () =>
-            {
-                if (!options.keepAttached)
-                    cp.unref();
-                console.log('pm started');
-                resolve();
-            })
-        })
-    }
-    else
+    let cp: RuntimeInstance;
+
+    if (!container && def.dependencies?.length)
     {
-        let cp: RuntimeInstance;
+        const missingDeps = def.dependencies.filter(d => !this.config.containers[d] && !this.config.mapping[d]);
+        if (missingDeps.length > 0)
+            throw new ErrorWithStatus(404, `Some dependencies are missing to start ${options.name}:\n\t-${missingDeps.join('\n\t-')}`);
 
-        if (!container && def.dependencies?.length)
-        {
-            const missingDeps = def.dependencies.filter(d => !this.config.containers[d] && !this.config.mapping[d]);
-            if (missingDeps.length > 0)
-                throw new ErrorWithStatus(404, `Some dependencies are missing to start ${options.name}:\n\t-${missingDeps.join('\n\t-')}`);
+        await eachAsync(def.dependencies, async (dep) => { await pm.dispatch('start', dep, { name: options.name + '-' + dep, wait: true }) });
+    }
 
-            await eachAsync(def.dependencies, async (dep) => { await pm.dispatch('start', dep, { name: options.name + '-' + dep, wait: true }) });
-        }
+    switch (def?.type)
+    {
+        case 'worker':
+            cp = Worker.build(args, options);
+            break;
+        case 'nodejs':
+            args.push('--pm-sock', 'ipc://')
+            cp = ChildProcess.build(args, { ...options, keepAttached: true });
+            break;
+        default:
+            throw new ErrorWithStatus(400, `container with type ${this.config.containers[name]?.type} are not yet supported`);
+    }
 
-        switch (def?.type)
+    if (!container?.running)
+    {
+        container = new Container(options.name, null) as RunningContainer;
+        const connection = Processors.JsonRpc.getConnection(cp.adapter, pm, (params) =>
         {
-            case 'worker':
-                cp = Worker.build(args, options);
-                break;
-            case 'nodejs':
-                cp = ChildProcess.build(args, options);
-                break;
-            default:
-                throw new ErrorWithStatus(400, `container with type ${this.config.containers[name]?.type} are not yet supported`);
-        }
+            params.process = cp;
+            Object.defineProperty(params, 'connectionAsContainer', { value: container });
+        });
+        container.processor.useMiddleware(20, new Processors.JsonRpc(connection));
 
-        if (!container?.running)
+        connection.on('close', function disconnected()
         {
-            container = new Container(options.name, null) as RunningContainer;
-            const connection = Processors.JsonRpc.getConnection(cp.adapter, pm, (params) =>
-            {
-                params.process = cp;
-                Object.defineProperty(params, 'connectionAsContainer', { value: container });
-            });
-            container.processor.useMiddleware(20, new Processors.JsonRpc(connection));
-
-            connection.on('close', function disconnected()
-            {
-                console.warn(`${options.name} has disconnected`);
-                container.running = false;
-            });
+            console.warn(`${options.name} has disconnected`);
+            container.running = false;
+        });
 
-            if (def?.commandable)
-                pm.register(container, def?.stateless);
+        this.processes[options.name] = container;
+    }
+    container.process = cp;
 
-            this.processes[options.name] = container;
-        }
-        container.process = cp;
+    Object.assign(container, def, instanceConfig);
+    container.ready = new Event();
+    if (container.commandable)// && !container.stateless)
+    {
+        container.unregister(Cli.Metadata.name);
+        container.register(Metadata.extractCommandMetadata(Cli.Metadata));
 
-        Object.assign(container, def, instanceConfig);
-        container.ready = new Event();
-        if (container.commandable)// && !container.stateless)
-        {
-            container.unregister(Cli.Metadata.name);
-            container.register(Metadata.extractCommandMetadata(Cli.Metadata));
-        }
         container.ready.addListener(() =>
         {
             return container.dispatch('$metadata').then((metaContainer: Metadata.Container) =>
@@ -160,40 +128,40 @@ export default async function start(this: State, pm: pmContainer.container & Con
                 pm.register(name, container, true);
             });
         });
-        // , () =>
-        // {
-        //     console.warn(`${options.name} has disconnected`);
-        //     container.running = false;
-        // });
+    }
+    // , () =>
+    // {
+    //     console.warn(`${options.name} has disconnected`);
+    //     container.running = false;
+    // });
 
-        container.running = true;
-        let buffer = [];
+    container.running = true;
+    let buffer = [];
 
-        cp.on('exit', function ()
+    cp.on('exit', function ()
+    {
+        container.running = false;
+        if (!container.stateless)
         {
-            container.running = false;
-            if (!container.stateless)
-            {
-                pm.unregister(container.name);
-                console.log(new Error('program stopped: ' + buffer?.join('')));
-            }
-        });
-        if (options.wait && container.commandable)
+            pm.unregister(container.name);
+            console.log(new Error('program stopped: ' + buffer?.join('')));
+        }
+    });
+    if (options.wait && container.commandable)
+    {
+        //eslint-disable-next-line no-inner-declarations
+        function gather(chunk: string)
         {
-            //eslint-disable-next-line no-inner-declarations
-            function gather(chunk: string)
-            {
-                buffer.push(chunk);
-            }
-            cp.stderr.on('data', gather);
-            cp.on('exit', () =>
-            {
-                buffer = null;
-                cp.stderr.off('data', gather);
-            });
+            buffer.push(chunk);
         }
-        if (options.wait)
-            await new Promise<void>(resolve => container.ready?.addListener(resolve));
-        return { execPath: process.execPath, args: args, cwd: process.cwd(), shell: false, windowsHide: true };
+        cp.stderr.on('data', gather);
+        cp.on('exit', () =>
+        {
+            buffer = null;
+            cp.stderr.off('data', gather);
+        });
     }
+    if (options.wait)
+        await new Promise<void>(resolve => container.ready?.addListener(resolve));
+    return { execPath: process.execPath, args: args, cwd: process.cwd(), shell: false, windowsHide: true };
 }

package/src/commands/status.ts

@@ -6,5 +6,5 @@ export default function status(this: State, name?: string): { name: string, filt
     if (name)
         processes = processes.filter(p => p.name == name);
 
-    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 } })
-}
+    return processes.map(p => { return { name: p.name, filter: name, running: p.running, folder: p.path, stateless: p.stateless, type: p.process?.runtime.name, cwd: p.cwd } })
+}

package/src/commands/stop.ts

@@ -3,7 +3,7 @@ import State from '../state.js';
 
 export default async function stop(this: State, name: string, container: Container<State>): Promise<void>
 {
-    await Promise.all(Object.values(this.processes).filter(p => p.name == name && p.process).map(cp =>
+    await Promise.all(Object.values(this.processes).filter(p => (p.name == name || name === 'pm') && p.process).map(cp =>
     {
         return new Promise<void>((resolve) =>
         {

package/src/container.ts

@@ -23,7 +23,7 @@ namespace commands
 		dispatch (cmd:'link', ...args: [Argument0<typeof import('./cli-commands/link.js').default>, Argument1<typeof import('./cli-commands/link.js').default>]): ReturnType<typeof import('./cli-commands/link.js').default>
 		dispatch (cmd:'log', ...args: [Argument0<typeof import('./cli-commands/log.js').default>]): ReturnType<typeof import('./cli-commands/log.js').default>
 		dispatch (cmd:'ls', ...args: []): ReturnType<typeof import('./cli-commands/ls.js').default>
-		dispatch (cmd:'map', ...args: [Argument0<typeof import('./cli-commands/map.js').default>, Argument1<typeof import('./cli-commands/map.js').default>, Argument2<typeof import('./cli-commands/map.js').default>, Argument3<typeof import('./cli-commands/map.js').default>]): ReturnType<typeof import('./cli-commands/map.js').default>
+		dispatch (cmd:'map', ...args: [Argument0<typeof import('./cli-commands/map.js').default>, Argument1<typeof import('./cli-commands/map.js').default>, Argument2<typeof import('./cli-commands/map.js').default>, Argument3<typeof import('./cli-commands/map.js').default>, Argument4<typeof import('./cli-commands/map.js').default>]): ReturnType<typeof import('./cli-commands/map.js').default>
 		dispatch (cmd:'run', ...args: [Argument0<typeof import('./cli-commands/run.js').default>, Argument1<typeof import('./cli-commands/run.js').default>]): ReturnType<typeof import('./cli-commands/run.js').default>
 		dispatch (cmd:'uninstall', ...args: [Argument0<typeof import('./cli-commands/uninstall.js').default>]): ReturnType<typeof import('./cli-commands/uninstall.js').default>
 		dispatch (cmd:'update', ...args: [Argument0<typeof import('./cli-commands/update.js').default>, Argument1<typeof import('./cli-commands/update.js').default>, Argument2<typeof import('./cli-commands/update.js').default>]): ReturnType<typeof import('./cli-commands/update.js').default>
@@ -46,13 +46,13 @@ namespace commands
 		'link'(...args: [Argument0<typeof import('./cli-commands/link.js').default>, Argument1<typeof import('./cli-commands/link.js').default>]): ReturnType<typeof import('./cli-commands/link.js').default>
 		'log'(...args: [Argument0<typeof import('./cli-commands/log.js').default>]): ReturnType<typeof import('./cli-commands/log.js').default>
 		'ls'(...args: []): ReturnType<typeof import('./cli-commands/ls.js').default>
-		'map'(...args: [Argument0<typeof import('./cli-commands/map.js').default>, Argument1<typeof import('./cli-commands/map.js').default>, Argument2<typeof import('./cli-commands/map.js').default>, Argument3<typeof import('./cli-commands/map.js').default>]): ReturnType<typeof import('./cli-commands/map.js').default>
+		'map'(...args: [Argument0<typeof import('./cli-commands/map.js').default>, Argument1<typeof import('./cli-commands/map.js').default>, Argument2<typeof import('./cli-commands/map.js').default>, Argument3<typeof import('./cli-commands/map.js').default>, Argument4<typeof import('./cli-commands/map.js').default>]): ReturnType<typeof import('./cli-commands/map.js').default>
 		'run'(...args: [Argument0<typeof import('./cli-commands/run.js').default>, Argument1<typeof import('./cli-commands/run.js').default>]): ReturnType<typeof import('./cli-commands/run.js').default>
 		'uninstall'(...args: [Argument0<typeof import('./cli-commands/uninstall.js').default>]): ReturnType<typeof import('./cli-commands/uninstall.js').default>
 		'update'(...args: [Argument0<typeof import('./cli-commands/update.js').default>, Argument1<typeof import('./cli-commands/update.js').default>, Argument2<typeof import('./cli-commands/update.js').default>]): ReturnType<typeof import('./cli-commands/update.js').default>
 		'version'(...args: [Argument0<typeof import('./cli-commands/version.js').default>, Argument1<typeof import('./cli-commands/version.js').default>]): ReturnType<typeof import('./cli-commands/version.js').default>
 	}
-   export const meta={"name":"pm","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":{"aliases":["keep-attached"],"needsValue":false,"doc":"keeps the process attached to the current terminal"},"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"}}}}},{"name":"bridge","config":{"fs":{"path":"dist/esm/commands/bridge.js","source":"src/commands/bridge.ts","inject":["param.0","param.1"]},"jsonrpc":{"inject":["param.0","socket"]},"":{"inject":["param.0","param.1"]}}},{"name":"name","config":{"fs":{"path":"dist/esm/commands/name.js","source":"src/commands/name.ts","inject":["param.0"]},"":{"inject":["param.0"]}}},{"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"],"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","param.0","context"],"usage":"restart <program>"},"schema":{"inject":["$container","param.0","param.1"],"$defs":{"param.0":{"type":"string"},"param.1":{"type":"object","properties":{"wait":{"type":"boolean"}}}}},"html-form":{"inject":["$container","param.0","param.1"]}}},{"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"},"autostart":{"doc":"start automatically when pm starts"}},"inject":["$container","options.program","options","context"],"usage":"start <program>"},"html-form":{"inject":["$container","param.0","param.1","param.2"]},"schema":{"inject":["$container","param.0","param.1","param.2"],"$defs":{"param.0":{"type":"string"},"param.1":{"type":"object","properties":{"wait":{"type":"boolean"},"inspect":{"type":"boolean"},"new":{"type":"boolean"},"name":{"type":"string"},"program":{"type":"string"}}},"param.2":{"type":"object","properties":{"args":{"type":"array","items":{"type":"string"}}}}}}}},{"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"]},"html-form":{"inject":["param.0"]},"schema":{"inject":["param.0"],"$defs":{"param.0":{"type":"string","description":"The name of the container to get the status of"}}}}},{"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]"},"html-form":{"inject":["param.0","$container"]},"schema":{"inject":["param.0","$container"],"$defs":{"param.0":{"type":"string"}}}}},{"name":"connect","config":{"fs":{"path":"dist/esm/cli-commands/connect.js","source":"src/cli-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/cli-commands/discover.js","source":"src/cli-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/cli-commands/install.js","source":"src/cli-commands/install.ts","inject":["param.0","$container"]},"":{"inject":["param.0","$container"]},"cli":{"inject":["param.0","$container"]}}},{"name":"link","config":{"fs":{"path":"dist/esm/cli-commands/link.js","source":"src/cli-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/cli-commands/log.js","source":"src/cli-commands/log.ts","inject":["param.0"]},"":{"inject":["param.0"]},"cli":{"inject":["param.0"]}}},{"name":"ls","config":{"fs":{"path":"dist/esm/cli-commands/ls.js","source":"src/cli-commands/ls.ts","inject":[]},"":{"inject":[]},"cli":{"inject":[]},"html-form":{"inject":[]}}},{"name":"map","config":{"fs":{"path":"dist/esm/cli-commands/map.js","source":"src/cli-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":"run","config":{"fs":{"path":"dist/esm/cli-commands/run.js","source":"src/cli-commands/run.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"cli":{"options":{"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"},"keepAttached":{"aliases":["keep-attached"],"needsValue":false,"doc":"keeps the process attached to the current terminal"},"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":["options.program","options.name","context","options.pmSock"]}}},{"name":"uninstall","config":{"fs":{"path":"dist/esm/cli-commands/uninstall.js","source":"src/cli-commands/uninstall.ts","inject":["param.0","$container"]},"":{"inject":["param.0","$container"]},"cli":{"inject":["param.0","$container"]}}},{"name":"update","config":{"fs":{"path":"dist/esm/cli-commands/update.js","source":"src/cli-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/cli-commands/version.js","source":"src/cli-commands/version.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"cli":{"inject":["options.packageName","options.folder"],"usage":"version <packageName> [folder]"},"schema":{"inject":["param.0","param.1"],"$defs":{"param.0":{"type":"string"},"param.1":{"type":"string"}}}}}],"extends":["./cli-commands.json"],"$schema":"https://raw.githubusercontent.com/npenin/akala/main/packages/commands/container-schema.json"} as Metadata.Container;
+   export const meta={"name":"pm","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":{"aliases":["keep-attached"],"needsValue":false,"doc":"keeps the process attached to the current terminal"},"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"},"tcpPort":{"needsValue":true,"aliases":["tcp-port"]},"port":{"needsValue":true},"key":{"needsValue":true},"cert":{"needsValue":true}}}}},{"name":"bridge","config":{"fs":{"path":"dist/esm/commands/bridge.js","source":"src/commands/bridge.ts","inject":["param.0","param.1"]},"jsonrpc":{"inject":["param.0","socket"]},"":{"inject":["param.0","param.1"]}}},{"name":"name","config":{"fs":{"path":"dist/esm/commands/name.js","source":"src/commands/name.ts","inject":["param.0"]},"":{"inject":["param.0"]}}},{"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"],"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","param.0","context"],"usage":"restart <program>"},"schema":{"inject":["$container","param.0","param.1"],"$defs":{"param.0":{"type":"string"},"param.1":{"type":"object","properties":{"wait":{"type":"boolean"}}}}},"html-form":{"inject":["$container","param.0","param.1"]}}},{"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"},"autostart":{"doc":"start automatically when pm starts"}},"inject":["$container","options.program","options","context"],"usage":"start <program>"},"html-form":{"inject":["$container","param.0","param.1","param.2"]},"schema":{"inject":["$container","param.0","param.1","param.2"],"$defs":{"param.0":{"type":"string"},"param.1":{"type":"object","properties":{"wait":{"type":"boolean"},"inspect":{"type":"boolean"},"new":{"type":"boolean"},"name":{"type":"string"},"program":{"type":"string"}}},"param.2":{"type":"object","properties":{"args":{"type":"array","items":{"type":"string"}}}}}}}},{"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"]},"html-form":{"inject":["param.0"]},"schema":{"inject":["param.0"],"$defs":{"param.0":{"type":"string","description":"The name of the container to get the status of"}}}}},{"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]"},"html-form":{"inject":["param.0","$container"]},"schema":{"inject":["param.0","$container"],"$defs":{"param.0":{"type":"string"}}}}},{"name":"connect","config":{"fs":{"path":"dist/esm/cli-commands/connect.js","source":"src/cli-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/cli-commands/discover.js","source":"src/cli-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/cli-commands/install.js","source":"src/cli-commands/install.ts","inject":["param.0","$container"]},"":{"inject":["param.0","$container"]},"cli":{"inject":["param.0","$container"]}}},{"name":"link","config":{"fs":{"path":"dist/esm/cli-commands/link.js","source":"src/cli-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/cli-commands/log.js","source":"src/cli-commands/log.ts","inject":["param.0"]},"":{"inject":["param.0"]},"cli":{"inject":["param.0"]}}},{"name":"ls","config":{"fs":{"path":"dist/esm/cli-commands/ls.js","source":"src/cli-commands/ls.ts","inject":[]},"":{"inject":[]},"cli":{"inject":[]},"html-form":{"inject":[]}}},{"name":"map","config":{"fs":{"path":"dist/esm/cli-commands/map.js","source":"src/cli-commands/map.ts","inject":["param.0","param.1","param.2","param.3","param.4"]},"":{"inject":["param.0","param.1","param.2","param.3","param.4"]},"cli":{"inject":["options.name","options.path","options.runtime","cwd","options"],"options":{"commandable":{"aliases":["c"],"needsValue":false},"stateless":{"aliases":["s"],"needsValue":false},"runtime":{"aliases":["r"],"needsValue":true}},"usage":"map <name> <path>"}}},{"name":"run","config":{"fs":{"path":"dist/esm/cli-commands/run.js","source":"src/cli-commands/run.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"jsonrpc":false,"cli":{"options":{"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"},"keepAttached":{"aliases":["keep-attached"],"needsValue":false,"doc":"keeps the process attached to the current terminal"},"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":["options.program","options.name","context","options.pmSock"],"usage":"run <name> [...args]"}}},{"name":"uninstall","config":{"fs":{"path":"dist/esm/cli-commands/uninstall.js","source":"src/cli-commands/uninstall.ts","inject":["param.0","$container"]},"":{"inject":["param.0","$container"]},"cli":{"inject":["param.0","$container"]}}},{"name":"update","config":{"fs":{"path":"dist/esm/cli-commands/update.js","source":"src/cli-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/cli-commands/version.js","source":"src/cli-commands/version.ts","inject":["param.0","param.1"]},"":{"inject":["param.0","param.1"]},"cli":{"inject":["options.packageName","options.folder"],"usage":"version <packageName> [folder]"},"schema":{"inject":["param.0","param.1"],"$defs":{"param.0":{"type":"string"},"param.1":{"type":"string"}}}}}],"extends":["./cli-commands.json"],"$schema":"https://raw.githubusercontent.com/npenin/akala/main/packages/commands/container-schema.json"} as Metadata.Container;
 
    export function connect(processor?:ICommandProcessor) {
             const container = new Container<void>("commands", void 0);

package/src/runtimes/child_process.ts

@@ -20,6 +20,8 @@ export type ChildProcessRuntimeOptions = { new?: boolean, name: string, keepAtta
 
 export default class Runtime extends EventEmitter<ChildProcessRuntimeEventMap> implements RuntimeInstance<ChildProcessRuntimeEventMap>
 {
+    public readonly runtime = Runtime;
+    public static readonly name = 'nodejs';
     private readonly cp: ChildProcess;
     public readonly adapter: IpcAdapter;
     constructor(args: string[], options: ChildProcessRuntimeOptions, signal?: AbortSignal)
@@ -47,16 +49,23 @@ export default class Runtime extends EventEmitter<ChildProcessRuntimeEventMap> i
         this.cp.on('close', (code, signal) => { this.emit('close', code, signal); this.emit('exit') });
         this.cp.on('message', (message, sendHandle) => this.emit('message', message, sendHandle));
 
-        this.cp.on('disconnect', () => { this.emit('disconnect'); });
+        this.cp.on('disconnect', () => this.emit('disconnect'));
         if (options.keepAttached)
-            this.cp.on('disconnect', () => { this.emit('exit') });
+            this.cp.on('disconnect', () => this.emit('exit'));
 
         signal?.addEventListener('abort', () =>
         {
-            return this.stop(5000);
+            switch (signal.reason)
+            {
+                case 'SIGINT':
+                case 'SIGTERM':
+                    return this.stop(5000, signal.reason);
+                default:
+                    return this.stop(5000);
+            }
         })
     }
-    stop(timeoutInMs?: number): Promise<number>
+    stop(timeoutInMs?: number, signal?: 'SIGINT' | 'SIGTERM'): Promise<number>
     {
         return new Promise((resolve) =>
         {
@@ -65,8 +74,8 @@ export default class Runtime extends EventEmitter<ChildProcessRuntimeEventMap> i
                 clearTimeout(timeout);
                 resolve(code);
             })
-            this.cp.kill('SIGINT');
-            const timeout = setTimeout(() => { this.cp.kill() }, timeoutInMs || 5000)
+            this.cp.kill(signal);
+            const timeout = setTimeout(() => { this.cp.kill('SIGKILL') }, timeoutInMs || 5000)
         })
     }
 

package/src/runtimes/process.ts

@@ -5,6 +5,8 @@ import { EventEmitter } from "@akala/core";
 
 export default class Runtime extends EventEmitter<RuntimeEventMap> implements RuntimeInstance
 {
+    public static readonly name = 'self'
+    public readonly runtime = Runtime;
     public readonly adapter: IpcAdapter;
     private stdio: { stderr: Readable, stdout: Readable, stdin: Writable }
     constructor(stdio?: { stderr: Readable, stdout: Readable, stdin: Writable })
@@ -16,16 +18,7 @@ export default class Runtime extends EventEmitter<RuntimeEventMap> implements Ru
     }
     stop(timeoutInMs?: number): Promise<number>
     {
-        return new Promise((resolve) =>
-        {
-            process.on('exit', (code, signal) =>
-            {
-                clearTimeout(timeout);
-                resolve(code);
-            })
-            process.kill(process.pid, 'SIGINT')
-            const timeout = setTimeout(() => { process.exit() }, timeoutInMs || 5000)
-        })
+        return Promise.resolve(0);
     }
     get stderr(): Readable { return this.stdio.stderr }
     get stdout(): Readable { return this.stdio.stdout }

package/src/runtimes/shared.ts

@@ -4,6 +4,7 @@ import { Readable } from "stream";
 
 export interface Runtime
 {
+    name: string;
     build(args: string[], options: { new?: boolean, name: string, keepAttached?: boolean, inspect?: boolean, verbose?: boolean, wait?: boolean }): RuntimeInstance;
 }
 
@@ -14,6 +15,7 @@ export type RuntimeEventMap = {
 
 export interface RuntimeInstance<T extends RuntimeEventMap = RuntimeEventMap> extends EventEmitter<T>
 {
+    runtime: Omit<Runtime, 'build'>;
     stop(): Promise<number>;
     get adapter(): SocketAdapter;
 

package/src/runtimes/worker.ts

@@ -9,6 +9,7 @@ const require = module.createRequire(import.meta.url);
 
 export default class Runtime extends EventEmitter<RuntimeEventMap> implements RuntimeInstance
 {
+    public readonly runtime = Runtime;
     private readonly cp: Worker;
     public readonly adapter: MessagePortAdapter;
     private _running: boolean;

package/src/state.ts

@@ -26,7 +26,7 @@ export interface SidecarMetadata
     stateless: boolean;
     dependencies?: string[];
     commandable: boolean;
-    type?: 'nodejs' | 'worker';
+    type: 'nodejs' | 'worker';
 }
 
 export interface SidecarConfiguration<T extends string | SerializableObject = SerializableObject>
@@ -40,7 +40,7 @@ export interface SidecarConfiguration<T extends string | SerializableObject = Se
 }
 
 //eslint-disable-next-line @typescript-eslint/no-explicit-any
-export interface RunningContainer<T extends string | SerializableObject = any> extends Container<unknown>, SidecarConfiguration<T>, SidecarMetadata
+export interface RunningContainer<T extends string | SerializableObject = any> extends Container<unknown>, SidecarConfiguration<T>, Omit<SidecarMetadata, 'type'>
 {
     process: RuntimeInstance;
     running?: boolean;