@akala/pm 5.2.17 → 5.2.19

package/src/cli.ts

@@ -1,15 +1,14 @@
 #!/usr/bin/env node
 import * as path from 'path'
-import { Processors, NetSocketAdapter, Metadata, Container, ICommandProcessor, proxy, Triggers, Cli } from '@akala/commands';
+import { Processors, NetSocketAdapter, Metadata, Container, proxy, Triggers, Cli } from '@akala/commands';
 import { Socket } from 'net';
 import { TLSSocket } from 'tls';
 import { platform, homedir } from 'os';
 import start from './commands/start.js'
 import { Readable } from 'stream';
 
-import { spawnAsync } from './cli-helper.js';
-import State, { StateConfiguration } from './state.js';
-import program, { buildCliContextFromProcess, CliContext, ErrorMessage, NamespaceMiddleware, unparse } from '@akala/cli';
+import State from './state.js';
+import program, { buildCliContextFromProcess, ErrorMessage } from '@akala/cli';
 import { InteractError } from './index.js';
 import { Binding } from '@akala/core';
 
@@ -35,14 +34,14 @@ const truncate = '…';
 type CliOptions = { output: string, verbose: boolean, pmSock: string | number, tls: boolean, help: boolean };
 
 const cli = program.options<CliOptions>({ output: { aliases: ['o'], needsValue: true, doc: 'output as `table` if array otherwise falls back to standard node output' }, verbose: { aliases: ['v'] }, tls: { doc: "enables tls connection to the `pmSock`" }, pmSock: { aliases: ['pm-sock'], needsValue: true, doc: "path to the unix socket or destination in the form host:port" }, help: { doc: "displays this help message" } });
-const startpm = cli.command('start pm')
+cli.command('start pm')
     .option('inspect', { doc: "starts the process with --inspect-brk parameter to help debugging" })
     .option('keepAttached', { doc: "keeps the process attached" })
     .action(c =>
     {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         c.options['name'] = 'pm'
         c.options['program'] = require.resolve('../commands.json');
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         return start.call({} as unknown as State, null, 'pm', c as any);
     });
 
@@ -50,7 +49,7 @@ let socket: Socket;
 let processor: Processors.JsonRpc;
 let metaContainer: Metadata.Container;
 let container: Container<unknown>;
-const handle = new NamespaceMiddleware(null);
+
 cli.preAction(async c =>
 {
     process.stdin.pause();
@@ -104,6 +103,7 @@ cli.preAction(async c =>
             if (c.options.tls)
             {
                 // socket.on('data', function (e) { console.log(e) });
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 socket.connect({} as any);
                 netsocket.on('error', function (e)
                 {
@@ -412,93 +412,6 @@ function formatResult(result: unknown, outputFormat: string)
     }
 }
 
-function prepareParam(cmd: Metadata.Command, args: CliContext, standalone?: boolean)
-{
-    if (!cmd)
-        return false;
-
-    if (!cmd.config || !cmd.config.cli || (standalone && !cmd.config.cli.standalone))
-        return false;
-
-    delete args.options.pmSock;
-    return {
-        options: args.options, param: args.args.slice(1), _trigger: 'cli', cwd: args.currentWorkingDirectory, context: args, get stdin()
-        {
-            return new Promise<string>((resolve) =>
-            {
-                const buffers = [];
-                process.stdin.on('data', data => buffers.push(data));
-                process.stdin.on('end', () => resolve(Buffer.concat(buffers).toString('utf8')));
-            })
-        }
-    };
-}
-
-async function tryRun(processor: ICommandProcessor, cmd: Metadata.Command, args: CliContext, localProcessing: boolean)
-{
-    const params = prepareParam(cmd, args, localProcessing);
-    if (!params)
-        throw new Error('Either command does not exist or it is not standalone');
-
-    try
-    {
-        const result = await processor.handle(null, cmd, params).then(err => { throw err }, res => res);
-        if (result instanceof Readable)
-            result.pipe(process.stdout);
-        else
-            formatResult(result, args.options.output as string);
-    }
-
-    catch (e)
-    {
-        if (e.code == 'INTERACT')
-        {
-            console.log(e.message);
-            let value = await readLine();
-            value = value.trim();
-            if (e.as)
-                args.options[e] = value;
-            else
-                args.args.push(value);
-            args.args.unshift(cmd.name);
-            return await tryRun(processor, cmd, args, localProcessing);
-        }
-        if (args.options.verbose)
-            console.log(e);
-        else
-            console.log(e.message);
-    }
-
-}
-
-async function tryLocalProcessing(args: CliContext)
-{
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const config: StateConfiguration = require(path.join(homedir(), './.pm.config.json'));
-    let cmdName = args.args.shift();
-    if (!cmdName)
-        throw undefined;
-    const indexOfDot = cmdName.indexOf('.');
-    if (indexOfDot > -1)
-    {
-        const containerName = cmdName.substring(0, indexOfDot);
-        if (config.containers[containerName] && config.containers[containerName].commandable)
-        {
-            cmdName = cmdName.substring(indexOfDot + 1);
-            const container = new Container('cli-temp', {});
-            const options: Processors.DiscoveryOptions = {};
-            await Processors.FileSystem.discoverCommands(config.containers[containerName].path, container, options);
-            const cmd = container.resolve(cmdName);
-            return tryRun(options.processor, cmd, args, true);
-        }
-    }
-    else
-    {
-        if (!config.containers[cmdName].commandable)
-            return spawnAsync(config.containers[cmdName].path, null, ...unparse(args));
-    }
-}
-
 let stdinBuffer = '';
 function readLine()
 {

package/src/commands/$init.ts

@@ -8,7 +8,6 @@ import { PassThrough } from 'stream';
 import { EventEmitter } from 'events';
 import { CliContext } from '@akala/cli';
 import Configuration from '@akala/config';
-import { each, grep } from '@akala/core';
 
 export async function metadata(container: Container<unknown>, deep?: boolean): Promise<Metadata.Container>
 {

package/src/commands/start.ts

@@ -160,6 +160,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
 
         container.running = true;
         let buffer = [];
+
         cp.on('exit', function ()
         {
             (container as RunningContainer).running = false;
@@ -171,6 +172,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
         });
         if (context.options.wait && container.commandable)
         {
+            //eslint-disable-next-line no-inner-declarations
             function gather(chunk: string)
             {
                 buffer.push(chunk);

package/src/container.ts

@@ -1,34 +1,37 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { Arguments, Argument0, Argument1, Argument2, Argument3, Argument4, Argument5, Argument6, Argument7, Argument8, Argument9, Argument10, Argument11, Argument12, Argument13, Argument14, Argument15, Argument16, Argument17 } from '@akala/core';
+//eslint-disable-next-line @typescript-eslint/no-unused-vars
+import {Arguments, Argument0, Argument1, Argument2, Argument3, Argument4, Argument5, Argument6, Argument7, Argument8, Argument9, Argument10, Argument11, Argument12, Argument13, Argument14, Argument15, Argument16, Argument17 } from '@akala/core';
 // eslint-disable-next-line @typescript-eslint/no-namespace
 namespace commands
 {
 	export interface container 
 	{
-		dispatch(cmd: '$init', ...args: [Argument1<typeof import('./commands/$init.js').default>]): ReturnType<typeof import('./commands/$init.js').default>
-		dispatch(cmd: 'bridge', ...args: [Argument0<typeof import('./commands/bridge.js').default>, Argument1<typeof import('./commands/bridge.js').default>]): ReturnType<typeof import('./commands/bridge.js').default>
-		dispatch(cmd: 'config', ...args: [Argument0<typeof import('./commands/config.js').default>, Argument1<typeof import('./commands/config.js').default>]): ReturnType<typeof import('./commands/config.js').default>
-		dispatch(cmd: 'connect', ...args: [Argument0<typeof import('./commands/connect.js').default>, Argument1<typeof import('./commands/connect.js').default>]): ReturnType<typeof import('./commands/connect.js').default>
-		dispatch(cmd: 'discover', ...args: [Argument0<typeof import('./commands/discover.js').default>, Argument1<typeof import('./commands/discover.js').default>]): ReturnType<typeof import('./commands/discover.js').default>
-		dispatch(cmd: 'install', ...args: [Argument0<typeof import('./commands/install.js').default>]): ReturnType<typeof import('./commands/install.js').default>
-		dispatch(cmd: 'link', ...args: [Argument0<typeof import('./commands/link.js').default>, Argument1<typeof import('./commands/link.js').default>]): ReturnType<typeof import('./commands/link.js').default>
-		dispatch(cmd: 'log', ...args: [Argument0<typeof import('./commands/log.js').default>]): ReturnType<typeof import('./commands/log.js').default>
-		dispatch(cmd: 'ls', ...args: []): ReturnType<typeof import('./commands/ls.js').default>
-		dispatch(cmd: 'map', ...args: [Argument0<typeof import('./commands/map.js').default>, Argument1<typeof import('./commands/map.js').default>, Argument2<typeof import('./commands/map.js').default>, Argument3<typeof import('./commands/map.js').default>]): ReturnType<typeof import('./commands/map.js').default>
-		dispatch(cmd: 'name', ...args: [Argument0<typeof import('./commands/name.js').default>]): ReturnType<typeof import('./commands/name.js').default>
-		dispatch(cmd: 'proxy', ...args: [Argument0<typeof import('./commands/proxy.js').default>, Argument1<typeof import('./commands/proxy.js').default>]): ReturnType<typeof import('./commands/proxy.js').default>
-		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: '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>]): ReturnType<typeof import('./commands/update.js').default>
-		dispatch(cmd: 'version', ...args: [Argument0<typeof import('./commands/version.js').default>, Argument1<typeof import('./commands/version.js').default>]): ReturnType<typeof import('./commands/version.js').default>
+		dispatch (cmd:'$init', ...args: [Argument1<typeof import('./commands/$init.js').default>]): ReturnType<typeof import('./commands/$init.js').default>
+		dispatch (cmd:'add', ...args: [Argument0<typeof import('./commands/plugin/add.js').default>]): ReturnType<typeof import('./commands/plugin/add.js').default>
+		dispatch (cmd:'bridge', ...args: [Argument0<typeof import('./commands/bridge.js').default>, Argument1<typeof import('./commands/bridge.js').default>]): ReturnType<typeof import('./commands/bridge.js').default>
+		dispatch (cmd:'config', ...args: [Argument0<typeof import('./commands/config.js').default>, Argument1<typeof import('./commands/config.js').default>]): ReturnType<typeof import('./commands/config.js').default>
+		dispatch (cmd:'connect', ...args: [Argument0<typeof import('./commands/connect.js').default>, Argument1<typeof import('./commands/connect.js').default>]): ReturnType<typeof import('./commands/connect.js').default>
+		dispatch (cmd:'discover', ...args: [Argument0<typeof import('./commands/discover.js').default>, Argument1<typeof import('./commands/discover.js').default>]): ReturnType<typeof import('./commands/discover.js').default>
+		dispatch (cmd:'install', ...args: [Argument0<typeof import('./commands/install.js').default>]): ReturnType<typeof import('./commands/install.js').default>
+		dispatch (cmd:'link', ...args: [Argument0<typeof import('./commands/link.js').default>, Argument1<typeof import('./commands/link.js').default>]): ReturnType<typeof import('./commands/link.js').default>
+		dispatch (cmd:'log', ...args: [Argument0<typeof import('./commands/log.js').default>]): ReturnType<typeof import('./commands/log.js').default>
+		dispatch (cmd:'ls', ...args: []): ReturnType<typeof import('./commands/ls.js').default>
+		dispatch (cmd:'map', ...args: [Argument0<typeof import('./commands/map.js').default>, Argument1<typeof import('./commands/map.js').default>, Argument2<typeof import('./commands/map.js').default>, Argument3<typeof import('./commands/map.js').default>]): ReturnType<typeof import('./commands/map.js').default>
+		dispatch (cmd:'name', ...args: [Argument0<typeof import('./commands/name.js').default>]): ReturnType<typeof import('./commands/name.js').default>
+		dispatch (cmd:'proxy', ...args: [Argument0<typeof import('./commands/proxy.js').default>, Argument1<typeof import('./commands/proxy.js').default>]): ReturnType<typeof import('./commands/proxy.js').default>
+		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:'remove', ...args: [Argument0<typeof import('./commands/plugin/remove.js').default>]): ReturnType<typeof import('./commands/plugin/remove.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:'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>]): ReturnType<typeof import('./commands/update.js').default>
+		dispatch (cmd:'version', ...args: [Argument0<typeof import('./commands/version.js').default>, Argument1<typeof import('./commands/version.js').default>]): ReturnType<typeof import('./commands/version.js').default>
 	}
 	export interface proxy 
 	{
 		'$init'(...args: [Argument1<typeof import('./commands/$init.js').default>]): ReturnType<typeof import('./commands/$init.js').default>
+		'add'(...args: [Argument0<typeof import('./commands/plugin/add.js').default>]): ReturnType<typeof import('./commands/plugin/add.js').default>
 		'bridge'(...args: [Argument0<typeof import('./commands/bridge.js').default>, Argument1<typeof import('./commands/bridge.js').default>]): ReturnType<typeof import('./commands/bridge.js').default>
 		'config'(...args: [Argument0<typeof import('./commands/config.js').default>, Argument1<typeof import('./commands/config.js').default>]): ReturnType<typeof import('./commands/config.js').default>
 		'connect'(...args: [Argument0<typeof import('./commands/connect.js').default>, Argument1<typeof import('./commands/connect.js').default>]): ReturnType<typeof import('./commands/connect.js').default>
@@ -42,6 +45,7 @@ namespace commands
 		'proxy'(...args: [Argument0<typeof import('./commands/proxy.js').default>, Argument1<typeof import('./commands/proxy.js').default>]): ReturnType<typeof import('./commands/proxy.js').default>
 		'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>
+		'remove'(...args: [Argument0<typeof import('./commands/plugin/remove.js').default>]): ReturnType<typeof import('./commands/plugin/remove.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>
 		'status'(...args: [Argument0<typeof import('./commands/status.js').default>]): ReturnType<typeof import('./commands/status.js').default>

package/src/fork.ts

@@ -11,6 +11,10 @@ import program, { buildCliContextFromProcess, ErrorMessage, NamespaceMiddleware
 import { Stats } from 'fs';
 import { registerCommands, SelfDefinedCommand, parseMetadata, StructuredParameters } from '@akala/commands';
 
+import module from 'module'
+
+const require = module.createRequire(import.meta.url.substring('file://'.length));
+
 var isPm = false;
 
 program.option('help')
@@ -183,8 +187,7 @@ controller.signal.addEventListener('abort', function ()
     }
 })
 
-if (require.main == module)
-    program.process(buildCliContextFromProcess()).catch(e =>
-    {
-        setImmediate(() => controller.abort(e));
-    });
+program.process(buildCliContextFromProcess()).catch(e =>
+{
+    setImmediate(() => controller.abort(e));
+});

package/src/standalone.ts

@@ -4,7 +4,7 @@ sms.install();
 import * as path from 'path'
 import * as ac from '@akala/commands';
 import { lstat } from 'fs/promises';
-import { logger, Logger, MiddlewareComposite, module as coreModule } from '@akala/core';
+import { logger, Logger, MiddlewareComposite } from '@akala/core';
 import program, { buildCliContextFromProcess, ErrorMessage, NamespaceMiddleware } from '@akala/cli';
 import { Stats } from 'fs';