@akala/pm 5.0.1 → 5.1.1

package/src/commands/stop.ts

@@ -1,5 +1,5 @@
 import { Container } from "@akala/commands";
-import State from '../state';
+import State from '../state.js';
 
 export default async function stop(this: State, name: string, container: Container<State>): Promise<void>
 {

package/src/commands/update.ts

@@ -1,7 +1,7 @@
-import State from '../state';
-import npmHelper from '../npm-helper';
+import State from '../state.js';
+import npmHelper from '../npm-helper.js';
 import { Container } from "@akala/commands";
-import yarnHelper, { hasYarn } from '../yarn-helper';
+import yarnHelper, { hasYarn } from '../yarn-helper.js';
 
 export default async function update(this: State, packageName: string, folder: string, pm: Container<State>): Promise<string>
 {

package/src/commands/version.ts

@@ -1,4 +1,4 @@
-import State from '../state';
+import State from '../state.js';
 import { join } from "path";
 
 

package/src/container.ts

@@ -1,53 +1,53 @@
 /* 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';
+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').default>]): ReturnType<typeof import('./commands/$init').default>
-		dispatch (cmd:'bridge', ...args: [Argument0<typeof import('./commands/bridge').default>, Argument1<typeof import('./commands/bridge').default>]): ReturnType<typeof import('./commands/bridge').default>
-		dispatch (cmd:'config', ...args: [Argument0<typeof import('./commands/config').default>, Argument1<typeof import('./commands/config').default>]): ReturnType<typeof import('./commands/config').default>
-		dispatch (cmd:'connect', ...args: [Argument0<typeof import('./commands/connect').default>, Argument1<typeof import('./commands/connect').default>]): ReturnType<typeof import('./commands/connect').default>
-		dispatch (cmd:'discover', ...args: [Argument0<typeof import('./commands/discover').default>, Argument1<typeof import('./commands/discover').default>]): ReturnType<typeof import('./commands/discover').default>
-		dispatch (cmd:'install', ...args: [Argument0<typeof import('./commands/install').default>]): ReturnType<typeof import('./commands/install').default>
-		dispatch (cmd:'link', ...args: [Argument0<typeof import('./commands/link').default>, Argument1<typeof import('./commands/link').default>]): ReturnType<typeof import('./commands/link').default>
-		dispatch (cmd:'log', ...args: [Argument0<typeof import('./commands/log').default>]): ReturnType<typeof import('./commands/log').default>
-		dispatch (cmd:'ls', ...args: []): ReturnType<typeof import('./commands/ls').default>
-		dispatch (cmd:'map', ...args: [Argument0<typeof import('./commands/map').default>, Argument1<typeof import('./commands/map').default>, Argument2<typeof import('./commands/map').default>, Argument3<typeof import('./commands/map').default>]): ReturnType<typeof import('./commands/map').default>
-		dispatch (cmd:'name', ...args: [Argument0<typeof import('./commands/name').default>]): ReturnType<typeof import('./commands/name').default>
-		dispatch (cmd:'proxy', ...args: [Argument0<typeof import('./commands/proxy').default>, Argument1<typeof import('./commands/proxy').default>]): ReturnType<typeof import('./commands/proxy').default>
-		dispatch (cmd:'ready', ...args: []): ReturnType<typeof import('./commands/ready').default>
-		dispatch (cmd:'reload-metadata', ...args: [Argument0<typeof import('./commands/reload-metadata').default>]): ReturnType<typeof import('./commands/reload-metadata').default>
-		dispatch (cmd:'restart', ...args: [Argument1<typeof import('./commands/restart').default>, Argument2<typeof import('./commands/restart').default>]): ReturnType<typeof import('./commands/restart').default>
-		dispatch (cmd:'start', ...args: [Argument1<typeof import('./commands/start').default>, Argument2<typeof import('./commands/start').default>]): ReturnType<typeof import('./commands/start').default>
-		dispatch (cmd:'status', ...args: [Argument0<typeof import('./commands/status').default>]): ReturnType<typeof import('./commands/status').default>
-		dispatch (cmd:'stop', ...args: [Argument0<typeof import('./commands/stop').default>]): ReturnType<typeof import('./commands/stop').default>
-		dispatch (cmd:'update', ...args: [Argument0<typeof import('./commands/update').default>, Argument1<typeof import('./commands/update').default>]): ReturnType<typeof import('./commands/update').default>
-		dispatch (cmd:'version', ...args: [Argument0<typeof import('./commands/version').default>, Argument1<typeof import('./commands/version').default>]): ReturnType<typeof import('./commands/version').default>
+		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>
 	}
 	export interface proxy 
 	{
-		'$init'(...args: [Argument1<typeof import('./commands/$init').default>]): ReturnType<typeof import('./commands/$init').default>
-		'bridge'(...args: [Argument0<typeof import('./commands/bridge').default>, Argument1<typeof import('./commands/bridge').default>]): ReturnType<typeof import('./commands/bridge').default>
-		'config'(...args: [Argument0<typeof import('./commands/config').default>, Argument1<typeof import('./commands/config').default>]): ReturnType<typeof import('./commands/config').default>
-		'connect'(...args: [Argument0<typeof import('./commands/connect').default>, Argument1<typeof import('./commands/connect').default>]): ReturnType<typeof import('./commands/connect').default>
-		'discover'(...args: [Argument0<typeof import('./commands/discover').default>, Argument1<typeof import('./commands/discover').default>]): ReturnType<typeof import('./commands/discover').default>
-		'install'(...args: [Argument0<typeof import('./commands/install').default>]): ReturnType<typeof import('./commands/install').default>
-		'link'(...args: [Argument0<typeof import('./commands/link').default>, Argument1<typeof import('./commands/link').default>]): ReturnType<typeof import('./commands/link').default>
-		'log'(...args: [Argument0<typeof import('./commands/log').default>]): ReturnType<typeof import('./commands/log').default>
-		'ls'(...args: []): ReturnType<typeof import('./commands/ls').default>
-		'map'(...args: [Argument0<typeof import('./commands/map').default>, Argument1<typeof import('./commands/map').default>, Argument2<typeof import('./commands/map').default>, Argument3<typeof import('./commands/map').default>]): ReturnType<typeof import('./commands/map').default>
-		'name'(...args: [Argument0<typeof import('./commands/name').default>]): ReturnType<typeof import('./commands/name').default>
-		'proxy'(...args: [Argument0<typeof import('./commands/proxy').default>, Argument1<typeof import('./commands/proxy').default>]): ReturnType<typeof import('./commands/proxy').default>
-		'ready'(...args: []): ReturnType<typeof import('./commands/ready').default>
-		'reload-metadata'(...args: [Argument0<typeof import('./commands/reload-metadata').default>]): ReturnType<typeof import('./commands/reload-metadata').default>
-		'restart'(...args: [Argument1<typeof import('./commands/restart').default>, Argument2<typeof import('./commands/restart').default>]): ReturnType<typeof import('./commands/restart').default>
-		'start'(...args: [Argument1<typeof import('./commands/start').default>, Argument2<typeof import('./commands/start').default>]): ReturnType<typeof import('./commands/start').default>
-		'status'(...args: [Argument0<typeof import('./commands/status').default>]): ReturnType<typeof import('./commands/status').default>
-		'stop'(...args: [Argument0<typeof import('./commands/stop').default>]): ReturnType<typeof import('./commands/stop').default>
-		'update'(...args: [Argument0<typeof import('./commands/update').default>, Argument1<typeof import('./commands/update').default>]): ReturnType<typeof import('./commands/update').default>
-		'version'(...args: [Argument0<typeof import('./commands/version').default>, Argument1<typeof import('./commands/version').default>]): ReturnType<typeof import('./commands/version').default>
+		'$init'(...args: [Argument1<typeof import('./commands/$init.js').default>]): ReturnType<typeof import('./commands/$init.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>
+		'discover'(...args: [Argument0<typeof import('./commands/discover.js').default>, Argument1<typeof import('./commands/discover.js').default>]): ReturnType<typeof import('./commands/discover.js').default>
+		'install'(...args: [Argument0<typeof import('./commands/install.js').default>]): ReturnType<typeof import('./commands/install.js').default>
+		'link'(...args: [Argument0<typeof import('./commands/link.js').default>, Argument1<typeof import('./commands/link.js').default>]): ReturnType<typeof import('./commands/link.js').default>
+		'log'(...args: [Argument0<typeof import('./commands/log.js').default>]): ReturnType<typeof import('./commands/log.js').default>
+		'ls'(...args: []): ReturnType<typeof import('./commands/ls.js').default>
+		'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>
+		'name'(...args: [Argument0<typeof import('./commands/name.js').default>]): ReturnType<typeof import('./commands/name.js').default>
+		'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>
+		'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>
+		'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>]): 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>
 	}
 }
 

package/src/fork.ts

@@ -4,8 +4,8 @@ sms.install();
 import * as path from 'path'
 import * as ac from '@akala/commands';
 import { lstat } from 'fs/promises';
-import pmDef from './container';
-import { IpcAdapter } from "./ipc-adapter";
+import pmDef from './container.js';
+import { IpcAdapter } from "./ipc-adapter.js";
 import { logger, Logger, MiddlewareComposite, module as coreModule } from '@akala/core';
 import program, { buildCliContextFromProcess, ErrorMessage, NamespaceMiddleware } from '@akala/cli';
 import { Stats } from 'fs';
@@ -30,7 +30,7 @@ logMiddleware.preAction(async c =>
 
     await ac.Processors.FileSystem.discoverCommands(c.options.program, cliContainer, { processor: processor, isDirectory: folderOrFile.isDirectory() });
 });
-const initMiddleware = new NamespaceMiddleware<{ program: string, name: string, tls: boolean }>(null);
+let initMiddleware = new NamespaceMiddleware<{ program: string, name: string, tls: boolean }>(null);
 const controller = new AbortController();
 
 program.option<string, 'program'>('program', { needsValue: true, normalize: true }).
@@ -70,7 +70,11 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
                 isPm = c.options.name === 'pm' && c.options.program === require.resolve('../commands.json');
                 const init = cliContainer.resolve('$init');
                 if (init && init.config && init.config.cli && init.config.cli.options)
+                {
+                    if (init.config.cli.usage)
+                        initMiddleware = initMiddleware.command(init.config.cli.usage, init.config?.doc?.description)
                     ac.Triggers.addCliOptions(init, initMiddleware);
+                }
 
                 process.on('unhandledRejection', (x) =>
                 {
@@ -143,7 +147,7 @@ program.option<string, 'program'>('program', { needsValue: true, normalize: true
 
                     if (init)
                     {
-                        await cliContainer.dispatch(init, { options: c.options, param: c.args, _trigger: 'cli', pm: pm, context: c });
+                        await cliContainer.dispatch(init, { options: c.options, param: c.args, _trigger: 'cli', pm: pm, context: c, signal: controller.signal });
                     }
 
 

package/src/index.ts

@@ -2,12 +2,12 @@ import { Container, Metadata, NetSocketAdapter, Processors, registerCommands, Se
 import { Socket } from "net";
 import { module } from "@akala/core";
 
-import definition from './container';
+import definition from './container.js';
 
 type pmContainer = definition.container
 export { pmContainer as Container };
 
-import State from './state'
+import State from './state.js'
 export { State }
 
 export class InteractError extends Error
@@ -75,7 +75,7 @@ export interface SidecarMap
 }
 
 
-import getRandomName from './commands/name';
-import sidecarSingleton, { sidecar } from "./sidecar";
+import getRandomName from './commands/name.js';
+import sidecarSingleton, { sidecar } from "./sidecar.js";
 export { sidecar, sidecarSingleton };
 export { getRandomName };

package/src/npm-helper.ts

@@ -1,5 +1,5 @@
 import { platform } from "os";
-import { spawnAsync } from './cli-helper';
+import { spawnAsync } from './cli-helper.js';
 
 
 // if (typeof (process.versions.pnp) != 'undefined')

package/src/sidecar.ts

@@ -1,7 +1,7 @@
 import { connectByPreference, ConnectionPreference, Container, updateCommands } from "@akala/commands";
-import { SideCarConnectionPreference, Sidecar, defaultOrders, connect } from "./index";
+import { SideCarConnectionPreference, Sidecar, defaultOrders, connect } from "./index.js";
 import * as ac from '@akala/commands'
-import pm from './container'
+import pm from './container.js'
 
 let instance: Sidecar;
 

package/src/standalone.ts

@@ -0,0 +1,106 @@
+#!/usr/bin/env node
+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 { logger, Logger, MiddlewareComposite, module as coreModule } from '@akala/core';
+import program, { buildCliContextFromProcess, ErrorMessage, NamespaceMiddleware } from '@akala/cli';
+import { Stats } from 'fs';
+
+program.option('help')
+let folderOrFile: Stats;
+let cliContainer: ac.Container<unknown>;
+let processor: ac.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(processor, (cmd, params) =>
+        {
+            log.verbose({ cmd, params });
+            return Promise.resolve();
+        });
+
+    await ac.Processors.FileSystem.discoverCommands(c.options.program, cliContainer, { processor: processor, isDirectory: folderOrFile.isDirectory() });
+});
+const initMiddleware = new NamespaceMiddleware<{ program: string, name: string, tls: boolean }>(null);
+const controller = new AbortController();
+
+program.option<string, 'program'>('program', { needsValue: true, normalize: true }).
+    option<string, 'name'>('name', { needsValue: true }).
+    option<boolean, 'tls'>('tls', { needsValue: false }).
+    options<{
+        port?: number,
+        tcpPort?: string,
+        cert?: string,
+        key?: string,
+    }>({
+        port: { needsValue: true, doc: 'http/ws port\n(default: 80 if http, 443 is certificate and key are provided)', aliases: ['p'], optional: true, caseSensitive: false },
+        tcpPort: { needsValue: true, doc: 'tcp port', aliases: ['tcp-port'], optional: true, caseSensitive: false },
+        cert: { needsValue: true, doc: 'public certificate', aliases: ['certificate'], optional: true, caseSensitive: false },
+        key: { needsValue: true, doc: 'private certificate key. Requires public certificate', aliases: ['certificate-key'], optional: true, caseSensitive: false }
+    }).
+    preAction(async c => //If pure js file
+    {
+        folderOrFile = await lstat(c.options.program);
+        if (folderOrFile.isFile() && path.extname(c.options.program) === '.js')
+            return require(c.options.program);
+
+        log = logger(c.options.name);
+
+        cliContainer = new ac.Container('cli', {});
+
+        if (folderOrFile.isFile())
+            processor = new ac.Processors.FileSystem(path.dirname(c.options.program));
+        else
+            processor = new ac.Processors.FileSystem(c.options.program);
+    }).
+    useMiddleware(null, MiddlewareComposite.new(logMiddleware,
+        {
+            handle: async c =>
+            {
+                cliContainer.name = c.options.name;
+                const init = cliContainer.resolve('$init');
+                if (init && init.config && init.config.cli && init.config.cli.options)
+                    ac.Triggers.addCliOptions(init, initMiddleware);
+
+                process.on('unhandledRejection', (x) =>
+                {
+                    controller.abort(x)
+                    return false;
+                });
+                process.on('uncaughtException', (x) =>
+                {
+                    controller.abort(x)
+                    return false;
+                });
+                process.on('SIGINT', () => controller.abort(null));
+
+                initMiddleware.action(async c =>
+                {
+                    if (init)
+                        await cliContainer.dispatch(init, { options: c.options, param: c.args, _trigger: 'cli', context: c });
+                });
+            }
+        },
+        initMiddleware));
+
+controller.signal.addEventListener('abort', function () 
+{
+    if (this.reason)
+    {
+        process.exitCode = 1;
+        if (this.reason instanceof ErrorMessage)
+            console.error(this.reason.message);
+        else
+            console.error(this.reason);
+    }
+})
+
+if (require.main == module)
+    program.process(buildCliContextFromProcess()).catch(e =>
+    {
+        setImmediate(() => controller.abort(e));
+    });

package/src/test/pwet.ts

@@ -1,4 +1,4 @@
-import interact from "..";
+import interact from "../index.js";
 
 export default async function pwet(a: string): Promise<void>
 {

package/src/yarn-helper.ts

@@ -1,7 +1,7 @@
 import { platform } from "os";
 import { stat } from 'fs';
 import { promisify } from 'util';
-import { spawnAsync } from './cli-helper';
+import { spawnAsync } from './cli-helper.js';
 import { join } from 'path';