@akala/pm 2.3.1 → 2.4.2

package/dist/yarn-helper.js

@@ -10,21 +10,21 @@ const path_1 = require("path");
 // {
 // }
 function hasYarn(path) {
-    return util_1.promisify(fs_1.stat)(path_1.join(path || process.cwd(), './yarn.lock')).then(f => f.isFile());
+    return (0, util_1.promisify)(fs_1.stat)((0, path_1.join)(path || process.cwd(), './yarn.lock')).then(f => f.isFile());
 }
 exports.hasYarn = hasYarn;
 let npm = 'yarn';
-if (os_1.platform() == 'win32')
+if ((0, os_1.platform)() == 'win32')
     npm = 'yarn.cmd';
 exports.default = {
     async install(packageName, path) {
-        await cli_helper_1.spawnAsync(npm, { cwd: path }, 'add', packageName, '--production');
+        await (0, cli_helper_1.spawnAsync)(npm, { cwd: path }, 'add', packageName, '--production');
     },
     async update(packageName, path) {
-        await cli_helper_1.spawnAsync(npm, { cwd: path }, 'upgrade', packageName, '--production');
+        await (0, cli_helper_1.spawnAsync)(npm, { cwd: path }, 'upgrade', packageName, '--production');
     },
     async link(packageName, path) {
-        await cli_helper_1.spawnAsync(npm, { cwd: path }, 'link', packageName, '--production');
+        await (0, cli_helper_1.spawnAsync)(npm, { cwd: path }, 'link', packageName, '--production');
     }
 };
 //# sourceMappingURL=yarn-helper.js.map

package/dist/yarn-helper.js.map

@@ -1 +1 @@
-{"version":3,"file":"yarn-helper.js","sourceRoot":"","sources":["../src/yarn-helper.ts"],"names":[],"mappings":";;;AAAA,2BAA8B;AAC9B,2BAA0B;AAC1B,+BAAiC;AACjC,6CAA0C;AAC1C,+BAA4B;AAG5B,oDAAoD;AACpD,IAAI;AAEJ,IAAI;AAEJ,SAAgB,OAAO,CAAC,IAAa;IAEjC,OAAO,gBAAS,CAAC,SAAI,CAAC,CAAC,WAAI,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;AAC5F,CAAC;AAHD,0BAGC;AAED,IAAI,GAAG,GAAG,MAAM,CAAC;AACjB,IAAI,aAAQ,EAAE,IAAI,OAAO;IACrB,GAAG,GAAG,UAAU,CAAC;AAErB,kBACI;IACI,KAAK,CAAC,OAAO,CAAC,WAAmB,EAAE,IAAa;QAE5C,MAAM,uBAAU,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;IAC5E,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,WAAmB,EAAE,IAAa;QAE3C,MAAM,uBAAU,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;IAChF,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAAmB,EAAE,IAAa;QAEzC,MAAM,uBAAU,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;IAC7E,CAAC;CACJ,CAAA"}
+{"version":3,"file":"yarn-helper.js","sourceRoot":"","sources":["../src/yarn-helper.ts"],"names":[],"mappings":";;;AAAA,2BAA8B;AAC9B,2BAA0B;AAC1B,+BAAiC;AACjC,6CAA0C;AAC1C,+BAA4B;AAG5B,oDAAoD;AACpD,IAAI;AAEJ,IAAI;AAEJ,SAAgB,OAAO,CAAC,IAAa;IAEjC,OAAO,IAAA,gBAAS,EAAC,SAAI,CAAC,CAAC,IAAA,WAAI,EAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;AAC5F,CAAC;AAHD,0BAGC;AAED,IAAI,GAAG,GAAG,MAAM,CAAC;AACjB,IAAI,IAAA,aAAQ,GAAE,IAAI,OAAO;IACrB,GAAG,GAAG,UAAU,CAAC;AAErB,kBACI;IACI,KAAK,CAAC,OAAO,CAAC,WAAmB,EAAE,IAAa;QAE5C,MAAM,IAAA,uBAAU,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;IAC5E,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,WAAmB,EAAE,IAAa;QAE3C,MAAM,IAAA,uBAAU,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;IAChF,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAAmB,EAAE,IAAa;QAEzC,MAAM,IAAA,uBAAU,EAAC,GAAG,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,CAAA;IAC7E,CAAC;CACJ,CAAA"}

package/package.json

@@ -4,7 +4,7 @@
     "pm": "dist/cli.js",
     "pm-fork": "dist/fork.js"
   },
-  "version": "2.3.1",
+  "version": "2.4.2",
   "scripts": {
     "test": "echo 1",
     "ac": "ac generate dist/commands commands.json",
@@ -18,12 +18,11 @@
   },
   "homepage": "https://akala.js.org/pm",
   "dependencies": {
-    "@akala/cli": "1.5.2",
-    "@akala/commands": "2.5.2",
-    "@akala/core": "7.5.7",
-    "@akala/json-rpc-ws": "9.2.5",
+    "@akala/cli": "1.5.5",
+    "@akala/commands": "2.5.6",
+    "@akala/core": "7.5.9",
+    "@akala/json-rpc-ws": "9.3.1",
     "debug": "^4.1.1",
-    "mock-require": "^3.0.3",
     "reflect-metadata": "^0.1.13",
     "source-map-support": "^0.5.19"
   },
@@ -33,7 +32,7 @@
     "@types/node": "^14.14.31",
     "@types/source-map-support": "^0.5.4",
     "@types/ws": "^7.4.6",
-    "typescript": "^4.3.5"
+    "typescript": "^4.4.0"
   },
   "gitHead": "d92f6693ed8cca439c8e92d2045bb15c0a7dae43"
 }

package/src/cli.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import * as path from 'path'
-import { Processors, NetSocketAdapter, Metadata, Container, Processor, proxy, Triggers } from '@akala/commands';
+import { Processors, NetSocketAdapter, Metadata, Container, ICommandProcessor, proxy, Triggers, Cli } from '@akala/commands';
 import { Socket } from 'net';
 import { TLSSocket } from 'tls';
 import { platform, homedir } from 'os';
@@ -10,7 +10,7 @@ import { Readable } from 'stream';
 import { spawnAsync } from './cli-helper';
 import State from './state';
 import program, { buildCliContextFromProcess, CliContext, NamespaceMiddleware, unparse } from '@akala/cli';
-import { InteractError } from '.';
+import { InteractError, pm } from '.';
 
 const tableChars = {
     'top': '─'
@@ -126,11 +126,15 @@ cli.command(null).preAction(async c =>
     if (!processor)
         processor = new Processors.JsonRpc(Processors.JsonRpc.getConnection(new NetSocketAdapter(socket)));
     if (!metaContainer)
-        metaContainer = await processor.handle('$metadata', { param: [true] }).then(err => { if (err) throw err }, res => res);
+        metaContainer = require('../commands.json');
     if (!container)
     {
         container = proxy(metaContainer, processor);
-        container.attach(Triggers.cli, handle);
+
+        container.unregister(Cli.Metadata.name);
+        container.register(Metadata.extractCommandMetadata(Cli.Metadata));
+
+        await container.attach(Triggers.cli, handle);
     }
 }).
     useMiddleware(handle).
@@ -146,7 +150,7 @@ cli.command(null).preAction(async c =>
                 args.args.push(value);
             return await cli.process(args);
         }
-        throw err;
+        throw undefined;
     })
 
 // handle.action(async args =>
@@ -191,8 +195,13 @@ program.useError((err: Error, context) =>
         console.error('Error: ' + err.message);
     return Promise.reject(err);
 })
-program.process(buildCliContextFromProcess()).then(r =>
+program.process(buildCliContextFromProcess()).then(result =>
 {
+    if(result instanceof Readable)
+    {
+        result.pipe(process.stdout);
+        return;
+    }
     if (socket)
         socket.end();
 }, err =>
@@ -206,6 +215,10 @@ function formatResult(result: unknown, outputFormat: string)
 {
     if (typeof result == 'undefined')
         return;
+    if(result instanceof Readable)
+    {
+        return result;
+    }
     switch (outputFormat)
     {
         case 'table':
@@ -381,7 +394,7 @@ function prepareParam(cmd: Metadata.Command, args: CliContext, standalone?: bool
     return { options: args.options, param: args.args.slice(1), _trigger: 'cli', cwd: args.currentWorkingDirectory, context: args };
 }
 
-async function tryRun(processor: Processor, cmd: Metadata.Command, args: CliContext, localProcessing: boolean)
+async function tryRun(processor: ICommandProcessor, cmd: Metadata.Command, args: CliContext, localProcessing: boolean)
 {
     const params = prepareParam(cmd, args, localProcessing);
     if (!params)
@@ -389,8 +402,7 @@ async function tryRun(processor: Processor, cmd: Metadata.Command, args: CliCont
 
     try
     {
-
-        const result = await processor.handle(cmd, params).then(err => { throw err }, res => res);
+        const result = await processor.handle(null, cmd, params).then(err => { throw err }, res => res);
         if (result instanceof Readable)
             result.pipe(process.stdout);
         else

package/src/commands/$init.json

@@ -6,12 +6,6 @@
             "param.0"
         ]
     },
-    "fs": {
-        "inject": [
-            "$container",
-            "param.0"
-        ]
-    },
     "cli": {
         "inject": [
             "$container",

package/src/commands/$init.ts

@@ -3,8 +3,10 @@ import { homedir } from 'os';
 import fs from 'fs/promises';
 import { join } from 'path';
 import pmContainer from '../container';
-import { Container, Command, Metadata, ignoredCommands, configure, ServeOptions } from '@akala/commands';
+import { Container, Metadata, ignoredCommands, configure, ServeOptions, SelfDefinedCommand } from '@akala/commands';
 import { eachAsync } from '@akala/core';
+import { PassThrough, Readable } from 'stream';
+import { EventEmitter } from 'events';
 
 export async function metadata(container: Container<unknown>, deep?: boolean): Promise<Metadata.Container>
 {
@@ -13,11 +15,10 @@ export async function metadata(container: Container<unknown>, deep?: boolean): P
     {
         if (key === '$injector' || key === '$state' || key === '$container' || ignoredCommands.indexOf(key) > -1 || key == '$init' || key == '$stop')
             return;
-        const cmd = container.resolve<Command | Container<unknown>>(key);
-        if (cmd && cmd.name && cmd instanceof Command && ignoredCommands.indexOf(cmd.name) == -1)
+        const cmd = container.resolve<Metadata.Command | Container<unknown>>(key);
+        if (cmd && cmd.name && Metadata.isCommand(cmd) && ignoredCommands.indexOf(cmd.name) == -1)
             metacontainer.commands.push({ name: cmd.name, inject: cmd.inject || [], config: cmd.config });
-        // console.log(deep)
-        if (cmd instanceof Container && deep)
+        else if (cmd instanceof Container && deep)
         {
             if (isRunningContainer(cmd) && !cmd.running)
                 return;
@@ -43,6 +44,33 @@ export default async function (this: State, container: RunningContainer & pmCont
 {
     this.isDaemon = true;
     this.processes = [];
+    const stderr=process.stderr.write;
+    const stderrPT=new PassThrough();
+    process.stderr.write=function(...args)
+    {
+        stderr.call(process.stderr, ...args);
+        return stderrPT.write(...args as [any, BufferEncoding]);
+    } as any;
+    
+    const stdout=process.stdout.write;
+    const stdoutPT=new PassThrough();
+    process.stdout.write=function(...args)
+    {
+        stdout.call(process.stdout, ...args);
+        return stdoutPT.write(...args as [any, BufferEncoding]);
+    } as any;
+    container.process= Object.assign(new EventEmitter(), {stdout:stdoutPT, stderr:stderrPT, stdio:null, stdin:process.stdin,pid:process.pid, connected:false
+        ,exitCode:undefined
+        ,signalCode:undefined
+        ,spawnargs:process.argv
+        ,spawnfile: null
+        ,kill:process.exit.bind(process)
+        ,send:null
+        ,disconnect:null
+        ,unref:null
+        ,ref:null
+        ,killed:false });
+
     const configPath = join(homedir(), './.pm.config.json');
     try
     {
@@ -84,7 +112,7 @@ export default async function (this: State, container: RunningContainer & pmCont
     container.name = 'pm';
     const config = container.resolve<Metadata.Configurations>('$metadata.config');
     container.unregister('$metadata');
-    container.register(configure(config)(new Command(metadata, '$metadata', ['$container', 'param.0'])));
+    container.register(configure(config)(new SelfDefinedCommand(metadata, '$metadata', ['$container', 'param.0'])));
 
 
     this.processes.push(container);

package/src/commands/discover.json

@@ -8,14 +8,15 @@
         ]
     },
     "cli": {
+        "usage": "discover <name> <folder>",
         "options": {
-            "normalize": [
-                "param.1"
-            ]
+            "folder": {
+                "normalize": true
+            }
         },
         "inject": [
-            "param.0",
-            "param.1",
+            "options.name",
+            "options.folder",
             "$container"
         ]
     }

package/src/commands/discover.ts

@@ -61,7 +61,7 @@ export default async function discover(this: State, packageName: string, folder:
     const moduleRequire = tmpRequire;
 
     const packageConfig = moduleRequire('./package.json');
-    delete moduleRequire.cache['./package.json'];
+    delete moduleRequire.cache[moduleRequire.resolve('./package.json')];
 
     if (packageConfig.commands)
     {

package/src/commands/log.ts

@@ -1,8 +1,16 @@
+import { PassThrough } from "stream";
 import { Readable } from "stream";
 import State from '../state';
 
-export default function ls(this: State, name: string): Readable
+export default function log(this: State, name: string): Readable
 {
-    const p = this.processes.find(p => p.name == name)?.process;
+    if(name=='pm')
+    {
+        const pt=new PassThrough();
+        process.stderr.pipe(pt);
+        process.stdout.pipe(pt);
+        return pt;
+    }
+    const p = this.processes.find(p => p.name == name)?.process;   
     return p?.stderr;
 }

package/src/commands/start.ts

@@ -1,4 +1,4 @@
-import { Container, Processors, Metadata, registerCommands, CommandProxy } from "@akala/commands";
+import { Container, Processors, Metadata, registerCommands, Cli } from "@akala/commands";
 import State, { RunningContainer } from '../state';
 import { spawn, ChildProcess, StdioOptions } from "child_process";
 import pmContainer from '../container';
@@ -74,7 +74,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
         {
             console.log(message);
             cp.disconnect();
-        })
+        });
         return new Promise<void>((resolve) =>
         {
             cp.on('disconnect', function ()
@@ -142,12 +142,17 @@ export default async function start(this: State, pm: pmContainer.container & Con
         container.path = name;
         container.commandable = this.config.mapping[name].commandable;
         container.ready = new jsonrpc.Deferred();
+        if (container.commandable)
+        {
+            container.unregister(Cli.Metadata.name);
+            container.register(Metadata.extractCommandMetadata(Cli.Metadata));
+        }
         container.ready.then(() =>
         {
-            container.dispatch('$metadata').then((metaContainer: Metadata.Container) =>
+            return container.dispatch('$metadata').then((metaContainer: Metadata.Container) =>
             {
                 // console.log(metaContainer);
-                registerCommands(metaContainer.commands, container.processor, container as Container<unknown>);
+                registerCommands(metaContainer.commands, null, container);
                 pm.register(name, container, true);
             });
 

package/src/fork.ts

@@ -6,17 +6,12 @@ import * as ac from '@akala/commands';
 import { lstat } from 'fs/promises';
 import { IpcAdapter } from './commands/start';
 import debug from 'debug';
-import mock from 'mock-require'
 import { Socket } from 'net';
 import { module as coreModule } from '@akala/core';
 import program, { buildCliContextFromProcess, NamespaceMiddleware } from '@akala/cli';
 import { Stats } from 'fs';
 import { registerCommands } from '@akala/commands';
 
-mock('@akala/commands', ac);
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-mock('@akala/pm', require('..'));
-
 var isPm = false;
 
 program.useMiddleware({
@@ -29,7 +24,7 @@ program.useMiddleware({
 });
 let folderOrFile: Stats;
 let cliContainer: ac.Container<unknown>;
-let processor: ac.Processor;
+let processor: ac.CommandProcessor;
 let log: debug.Debugger;
 const logMiddleware = new NamespaceMiddleware<{ program: string, name: string }>(null).option<string, 'verbose'>('verbose', { aliases: ['v',] });
 logMiddleware.preAction(async c =>
@@ -64,9 +59,9 @@ program.option<string, 'program'>('program', { needsValue: true }).option<string
                 cliContainer = new ac.Container(c.options.name, {});
 
             if (folderOrFile.isFile())
-                processor = new ac.Processors.FileSystem(cliContainer, path.dirname(c.options.program));
+                processor = new ac.Processors.FileSystem(path.dirname(c.options.program));
             else
-                processor = new ac.Processors.FileSystem(cliContainer, c.options.program);
+                processor = new ac.Processors.FileSystem(c.options.program);
         }
     }).
     useMiddleware(logMiddleware).
@@ -97,7 +92,10 @@ program.option<string, 'program'>('program', { needsValue: true }).option<string
                         pm = new ac.Container('pm', null, new ac.Processors.JsonRpc(ac.Processors.JsonRpc.getConnection(new ac.NetSocketAdapter(pmSocket), cliContainer), true));
                     }
                     // eslint-disable-next-line @typescript-eslint/no-var-requires
-                    registerCommands(require('../commands.json').commands, pm.processor, pm);
+                    registerCommands(require('../commands.json').commands.map(ac.Metadata.extractCommandMetadata), null, pm);
+                    pm.unregister(ac.Cli.Metadata.name);
+                    pm.register(ac.Metadata.extractCommandMetadata(ac.Cli.Metadata));
+
                 }
                 else
                     pm = cliContainer;

package/src/index.ts

@@ -1,4 +1,4 @@
-import { connectByPreference, Container, Metadata, NetSocketAdapter, Processors, registerCommands, ServeMetadata, ConnectionPreference } from "@akala/commands";
+import { connectByPreference, Container, Metadata, NetSocketAdapter, Processors, registerCommands, ServeMetadata, ConnectionPreference, Cli } from "@akala/commands";
 import { Socket } from "net";
 import { module } from "@akala/core";
 
@@ -34,8 +34,8 @@ export async function pm(socketPath?: string): Promise<Container<unknown>>
         const pmSocket = new Socket();
         const pm = new Container('pm', null, new Processors.JsonRpc(Processors.JsonRpc.getConnection(new NetSocketAdapter(pmSocket)), true));
         pmSocket.connect(socketPath);
-        const metaContainer: Metadata.Container = await pm.processor.handle('$metadata', { param: [] }).then(err => { throw err }, res => res);
-        registerCommands(metaContainer.commands, pm.processor, pm);
+        const metaContainer: Metadata.Container = await pm.handle(pm, Cli.Metadata, { param: [] }).then(err => { throw err }, res => res);
+        registerCommands(metaContainer.commands, null, pm);
         return pm;
     }
     return new Container('pm', {});