@akala/pm 14.5.0 → 14.5.1

package/package.json

@@ -4,7 +4,7 @@
     "pm": "dist/esm/cli.js",
     "pm-fork": "dist/esm/fork.js"
   },
-  "version": "14.5.0",
+  "version": "14.5.1",
   "scripts": {
     "test": "echo 1",
     "generate": "ac generate dist/esm/commands commands.json --name pm && ac generate dist/esm/cli-commands cli-commands.json --name pm",
@@ -29,9 +29,9 @@
     "src/fork.ts"
   ],
   "dependencies": {
-    "@akala/cli": "^5.5.32",
-    "@akala/commands": "^13.0.3",
-    "@akala/config": "^6.0.57",
+    "@akala/cli": "^5.6.0",
+    "@akala/commands": "^13.0.4",
+    "@akala/config": "^6.0.58",
     "@akala/core": "^39.0.0",
     "@akala/json-rpc-ws": "^11.0.75",
     "reflect-metadata": "^0.2.2",

package/src/akala.mts

@@ -81,29 +81,30 @@ export default async function (_config, program: NamespaceMiddleware<{ configFil
                 if (connectMapping)
                     if (connectMapping instanceof Configuration)
                         connectMapping = connectMapping.extract();
-                await eachAsync(connectMapping, async (config, connectionString) =>
-                {
-                    if (container)
-                        return;
-                    try
-                    {
-                        log.verbose('trying to connect to ' + connectionString);
-                        const url = new URL(connectionString);
-                        if (url.hostname == '0.0.0.0')
-                            url.hostname = 'localhost';
-                        container = await connect(url, c.abort.signal, metaContainer);
-                    }
-                    catch (e)
+                if (connectMapping)
+                    await eachAsync(connectMapping, async (config, connectionString) =>
                     {
-                        log.silly('failed to connect to ' + connectionString);
-                        log.silly(e)
-                        if (e.code == 'ENOENT' || e.code == 'ECONNREFUSED')
+                        if (container)
                             return;
-                        log.error(e);
-                        throw e;
-                    }
+                        try
+                        {
+                            log.verbose('trying to connect to ' + connectionString);
+                            const url = new URL(connectionString);
+                            if (url.hostname == '0.0.0.0')
+                                url.hostname = 'localhost';
+                            container = await connect(url, c.abort.signal, metaContainer);
+                        }
+                        catch (e)
+                        {
+                            log.silly('failed to connect to ' + connectionString);
+                            log.silly(e)
+                            if (e.code == 'ENOENT' || e.code == 'ECONNREFUSED')
+                                return;
+                            log.error(e);
+                            throw e;
+                        }
 
-                })
+                    })
             }
             if (container)
             {

package/src/cli-commands/start.ts

@@ -10,7 +10,7 @@ export default async function start(this: State, name: string, context?: CliCont
         configFile: context.options.configFile + '#pm',
         name: 'pm',
         program: new URL('../../../commands.json', import.meta.url).toString(),
-        inspect: undefined, keepAttached: undefined, new: undefined, wait: undefined
+        inspect: undefined, new: undefined, wait: undefined
     })];
 
     const cp = ChildProcess.build(args, { ...context.options, inheritStdio: context.options.keepAttached }, context.abort.signal);
@@ -21,8 +21,8 @@ export default async function start(this: State, name: string, context?: CliCont
     cp.on('message', function (message)
     {
         console.log(message);
-        // cp.disconnect();
     });
+
     return new Promise<void>((resolve) =>
     {
         cp.on('disconnect', function ()

package/src/commands/$init.json

@@ -23,8 +23,19 @@
                 ]
             },
             "keepAttached": {
-                "needsValue": true
+                "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"
             }
         }
     }
-}
+}

package/src/commands/$init.ts

@@ -150,8 +150,13 @@ export default async function (this: State, container: RunningContainer & pmCont
         if (!context.options.keepAttached)
         {
             if (process.send)
-                process.send('disconnecting daemon');
+                await new Promise<void>((resolve, reject) => process.send('disconnecting daemon', err => err ? reject(err) : resolve()));
             process.disconnect();
         }
     }
+
+    context.abort.signal.addEventListener('abort', async () =>
+    {
+        await container.dispatch('stop', { param: ['pm'] });
+    });
 }

package/src/fork.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import sms from 'source-map-support'
 sms.install();
-import * as path from 'path'
+import path from 'path'
 import { lstat } from 'fs/promises';
 import pmDef from './container.js';
 import { IpcAdapter } from "./ipc-adapter.js";
@@ -23,14 +23,15 @@ let log: Logger;
 const logMiddleware = new NamespaceMiddleware<{ program: string, name: string, tls: boolean }>(null).option<string>()('verbose', { aliases: ['v',] });
 logMiddleware.preAction(async c =>
 {
+    const fs: Processors.FileSystem = new Processors.FileSystem(path.dirname(c.options.program));
     if (c.options.verbose)
-        processor = new Processors.LogProcessor((_c, cmd, params) =>
+        processor = new Processors.LogEventProcessor(fs, c.abort.signal, (_c, cmd, params) =>
         {
             log.verbose({ cmd, params });
-            return undefined;
         });
 
-    await Processors.FileSystem.discoverCommands(c.options.program, cliContainer, { processor: processor, isDirectory: folderOrFile.isDirectory() });
+    const options: Processors.DiscoveryOptions = { processor: processor, isDirectory: folderOrFile.isDirectory() };
+    await Processors.FileSystem.discoverCommands(c.options.program, cliContainer, options);
 });
 let initMiddleware = new NamespaceMiddleware<{ program: string, name: string, tls: boolean }>(null);
 const controller = new AbortController();

package/src/runtimes/child_process.ts

@@ -36,9 +36,11 @@ export default class Runtime extends EventEmitter<ChildProcessRuntimeEventMap> i
         }
         this.adapter = new IpcAdapter(this.cp);
         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'); });
         if (options.keepAttached)
-            this.cp.on('disconnect', () => { this.emit('disconnect'); this.emit('exit') });
+            this.cp.on('disconnect', () => { this.emit('exit') });
 
         signal?.addEventListener('abort', () =>
         {