@akala/pm 5.2.39 → 6.0.0

package/src/commands/$init.ts

@@ -3,11 +3,12 @@ import { homedir } from 'os';
 import fs from 'fs/promises';
 import { join } from 'path';
 import pmContainer from '../container.js';
-import { Container, Metadata, ignoredCommands, configure, SelfDefinedCommand } from '@akala/commands';
+import { Container, Metadata, ignoredCommands, configure, SelfDefinedCommand, serveMetadata, ServeOptions } from '@akala/commands';
 import { PassThrough } from 'stream';
 import { EventEmitter } from 'events';
 import { CliContext } from '@akala/cli';
 import { Configuration } from '@akala/config';
+import { fileURLToPath } from 'url';
 
 export async function metadata(container: Container<unknown>, deep?: boolean): Promise<Metadata.Container>
 {
@@ -48,20 +49,8 @@ export function isRunningContainer(c: Container<unknown>): c is RunningContainer
 {
     return 'running' in c;
 }
-declare var require: NodeRequire | undefined;
 
-//eslint-disable-next-line @typescript-eslint/no-explicit-any
-function requireOrImportJson<T = any>(path: string): Promise<T>
-{
-    if (require)
-        return Promise.resolve(require(path));
-    else
-        //eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        //@ts-ignore
-        return import(path, { assert: { type: 'json' } }).then(i => i.default)
-}
-
-export default async function (this: State, container: RunningContainer & pmContainer.container, context: CliContext<{ config: string, keepAttached: boolean }>): Promise<void>
+export default async function (this: State, container: RunningContainer & pmContainer.container, context: CliContext<{ configFile: string, keepAttached: boolean, args: string[] }>): Promise<void>
 {
     this.isDaemon = true;
     this.processes = {};
@@ -97,7 +86,7 @@ export default async function (this: State, container: RunningContainer & pmCont
         , killed: false
     });
 
-    const configPath = context.options.config || join(homedir(), './.pm.config.json');
+    const configPath = context.options.configFile || join(homedir(), './.pm.config.json');
     this.config = await Configuration.load<StateConfiguration>(configPath, true);
 
     if (this.config?.mapping?.pm)
@@ -106,11 +95,13 @@ export default async function (this: State, container: RunningContainer & pmCont
             process.chdir(this.config.mapping.pm.cwd);
     }
     else
-        this.config = Configuration.new<StateConfiguration>(configPath, {
-            containers: { pm: { commandable: true, stateless: false, path: await requireOrImportJson('../../../commands.json') } },
-            mapping: { pm: { cwd: process.cwd(), container: 'pm' } },
-            plugins: []
-        }) as State['config'];
+    {
+        this.config.set('containers', { pm: { commandable: true, stateless: false, path: fileURLToPath(new URL('../../../commands.json', import.meta.url)) } });
+        this.config.set('mapping', { pm: { cwd: process.cwd(), container: 'pm' } })
+        this.config.set('plugins', [])
+    }
+
+    this.config.mapping['pm'].set('connect', serveMetadata('pm', { options: context.options, args: context.options.args } as unknown as ServeOptions));
 
     if (context && context.args.length)
         await container.dispatch('connect', 'pm', context);

package/src/commands/discover.ts

@@ -99,6 +99,4 @@ export default async function discover(this: State, packageName: string, folder:
         return pm.dispatch('map', packageName, commandsJsonFile, path, { commandable: true });
 
     return pm.dispatch('map', packageName, moduleRequire.resolve('./' + packageConfig.main), path, { commandable: false });
-}
-
-exports.default.$inject = ['param.0', 'param.1', '$container']
+}

package/src/commands/map.ts

@@ -1,11 +1,11 @@
 import State from '../state.js';
 import { isAbsolute, resolve } from "path";
 
-export default async function map<TName extends string>(this: State, name: TName, targetPath: string, cwd?: string, options?: { commandable?: boolean, stateless?: boolean }): Promise<State['config']['mapping'][TName]>
+export default async function map<TName extends string>(this: State, name: TName, targetPath: string, cwd?: string, options?: { commandable?: boolean }): Promise<State['config']['mapping'][TName]>
 {
     if (!isAbsolute(targetPath))
         targetPath = resolve(cwd || process.cwd(), targetPath);
-    this.config.containers.set(name, { path: targetPath, commandable: !!options?.commandable, stateless: !!options?.stateless });
+    this.config.containers.set(name, { path: targetPath, commandable: !!options?.commandable });
     await this.config.commit();
     return this.config.mapping[name]
 }

package/src/commands/start.ts

@@ -4,7 +4,7 @@ import { spawn, ChildProcess, StdioOptions } from "child_process";
 import pmContainer from '../container.js';
 import { Deferred, eachAsync } from "@akala/core";
 import { NewLinePrefixer } from "../new-line-prefixer.js";
-import { CliContext } from "@akala/cli";
+import { CliContext, unparseOptions } from "@akala/cli";
 import { ErrorWithStatus } from "@akala/core";
 import getRandomName from "./name.js";
 import { ProxyConfiguration } from "@akala/config";
@@ -47,7 +47,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
             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} ?`)
         }
 
-        args.unshift(...context.args, ...Object.entries(context.options).filter(e => e[0] != 'program' && e[0] != 'new' && e[0] != 'inspect').map(entries => ['--' + entries[0] + '=' + entries[1]]).flat());
+        args.unshift(...context.args, ...unparseOptions({ ...context.options, program: undefined, new: undefined, inspect: undefined }, { ignoreUndefined: true }));
         if (def && def.get('path'))
             args.unshift('--program=' + def.get('path'));
         else
@@ -58,11 +58,14 @@ export default async function start(this: State, pm: pmContainer.container & Con
         if (name != 'pm')
             throw new ErrorWithStatus(40, 'this command needs to run through daemon process');
 
-        args = [...context.args, ...Object.entries(context.options).filter(p => ['inspect'].indexOf(p[0]) == -1).map(entries => ['--' + entries[0] + '=' + entries[1]]).flat()];
+        args = [...context.args, ...unparseOptions({ ...context.options, inspect: undefined })];
     }
 
     if (!def?.type || def.type == 'nodejs')
+    {
+
         args.unshift(path.resolve(_dirname, '../fork'))
+    }
 
     if (context.options && context.options.inspect)
         args.unshift('--inspect-brk');
@@ -153,6 +156,7 @@ export default async function start(this: State, pm: pmContainer.container & Con
             {
                 // console.log(metaContainer);
                 updateCommands(metaContainer.commands, null, container);
+                container.stateless = metaContainer.stateless;
                 pm.register(name, container, true);
             });
         }, () =>

package/src/container.ts

@@ -7,7 +7,6 @@ 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:'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>
@@ -32,7 +31,6 @@ namespace commands
 	}
 	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>

package/src/fork.ts

@@ -36,6 +36,7 @@ const controller = new AbortController();
 program.option<string, 'program'>('program', { needsValue: true, normalize: true, positional: true, position: 0 }).
     option<string, 'name'>('name', { needsValue: true, positional: true, position: 1, optional: true }).
     option<boolean, 'tls'>('tls', { needsValue: false }).
+    option<string, 'configFile'>('configFile', { needsValue: false }).
     options<{
         port?: number,
         tcpPort?: string,

package/tsconfig.cjs.json

@@ -16,7 +16,8 @@
     "exclude": [
         "src/akala.mts",
         "src/fork.ts",
-        "src/cli.ts"
+        "src/cli.ts",
+        "src/commands/$init.ts",
     ],
     "references": [
         {

package/dist/cjs/commands/$init.d.ts

@@ -1,10 +0,0 @@
-import State, { RunningContainer } from '../state.js';
-import pmContainer from '../container.js';
-import { Container, Metadata } from '@akala/commands';
-import { CliContext } from '@akala/cli';
-export declare function metadata(container: Container<unknown>, deep?: boolean): Promise<Metadata.Container>;
-export declare function isRunningContainer(c: Container<unknown>): c is RunningContainer;
-export default function (this: State, container: RunningContainer & pmContainer.container, context: CliContext<{
-    config: string;
-    keepAttached: boolean;
-}>): Promise<void>;

package/dist/cjs/commands/$init.js

@@ -1,145 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isRunningContainer = exports.metadata = void 0;
-const os_1 = require("os");
-const promises_1 = __importDefault(require("fs/promises"));
-const path_1 = require("path");
-const commands_1 = require("@akala/commands");
-const stream_1 = require("stream");
-const events_1 = require("events");
-const config_1 = require("@akala/config");
-function metadata(container, deep) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const metacontainer = { name: container.name || 'unnamed', commands: [] };
-        yield Promise.all(container.keys().map((key) => __awaiter(this, void 0, void 0, function* () {
-            if (key === '$injector' || key === '$state' || key === '$container' || commands_1.ignoredCommands.indexOf(key) > -1 || key == '$init' || key == '$stop')
-                return;
-            const cmd = container.resolve(key);
-            if (cmd && cmd.name && commands_1.Metadata.isCommand(cmd) && commands_1.ignoredCommands.indexOf(cmd.name) == -1)
-                metacontainer.commands.push({ name: cmd.name, config: cmd.config });
-            else if (cmd instanceof commands_1.Container && deep) {
-                if (!isRunningContainer(cmd) || !cmd.running && !cmd.stateless)
-                    return;
-                try {
-                    const subContainer = yield cmd.dispatch('$metadata', deep);
-                    console.log(subContainer);
-                    if (subContainer && subContainer.commands) {
-                        subContainer.commands.forEach(c => c.name = key + '.' + c.name);
-                        metacontainer.commands.push(...subContainer.commands.filter(c => c.name !== key + '.$init' && c.name !== key + '.$stop'));
-                    }
-                }
-                catch (e) {
-                    if (!e || e.statusCode == 404)
-                        return;
-                    throw e;
-                }
-            }
-        })));
-        return metacontainer;
-    });
-}
-exports.metadata = metadata;
-function isRunningContainer(c) {
-    return 'running' in c;
-}
-exports.isRunningContainer = isRunningContainer;
-//eslint-disable-next-line @typescript-eslint/no-explicit-any
-function requireOrImportJson(path) {
-    if (require)
-        return Promise.resolve(require(path));
-    else
-        //eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        //@ts-ignore
-        return import(path, { assert: { type: 'json' } }).then(i => i.default);
-}
-function default_1(container, context) {
-    var _a, _b;
-    return __awaiter(this, void 0, void 0, function* () {
-        this.isDaemon = true;
-        this.processes = {};
-        this.bridges = {};
-        const stderr = process.stderr.write;
-        const stderrPT = new stream_1.PassThrough();
-        process.stderr.write = function (...args) {
-            stderr.call(process.stderr, ...args);
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            return stderrPT.write(...args);
-        };
-        const stdout = process.stdout.write;
-        const stdoutPT = new stream_1.PassThrough();
-        process.stdout.write = function (...args) {
-            stdout.call(process.stdout, ...args);
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            return stdoutPT.write(...args);
-        };
-        container.process = Object.assign(new events_1.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 = context.options.config || (0, path_1.join)((0, os_1.homedir)(), './.pm.config.json');
-        this.config = yield config_1.Configuration.load(configPath, true);
-        if ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.mapping) === null || _b === void 0 ? void 0 : _b.pm) {
-            if (this.config.mapping.pm.cwd)
-                process.chdir(this.config.mapping.pm.cwd);
-        }
-        else
-            this.config = config_1.Configuration.new(configPath, {
-                containers: { pm: { commandable: true, stateless: false, path: yield requireOrImportJson('../../../commands.json') } },
-                mapping: { pm: { cwd: process.cwd(), container: 'pm' } },
-                plugins: []
-            });
-        if (context && context.args.length)
-            yield container.dispatch('connect', 'pm', context);
-        else {
-            yield container.dispatch('connect', 'pm').catch((e) => __awaiter(this, void 0, void 0, function* () {
-                if (e && e.statusCode == 404)
-                    yield container.dispatch('connect', 'pm', { args: ['local'] });
-            }));
-        }
-        yield this.config.commit();
-        container.name = 'pm';
-        const config = container.resolve('$metadata.config');
-        container.unregister('$metadata');
-        container.register((0, commands_1.configure)(config)(new commands_1.SelfDefinedCommand(metadata, '$metadata', ['$container', 'param.0'])));
-        this.processes[container.name] = container;
-        container.running = true;
-        try {
-            yield promises_1.default.unlink('./pm.sock');
-        }
-        catch (e) {
-            if (e.code !== 'ENOENT')
-                console.warn(e);
-        }
-        // var stop = await serve(container as Container<any>, serveMetadata(container.name, options || { _: ['local'] }));
-        if (process.disconnect) {
-            if (!context.options.keepAttached) {
-                if (process.send)
-                    process.send('disconnecting daemon');
-                process.disconnect();
-            }
-        }
-    });
-}
-exports.default = default_1;
-//# sourceMappingURL=$init.js.map

package/dist/cjs/commands/$init.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"$init.js","sourceRoot":"","sources":["../../../src/commands/$init.ts"],"names":[],"mappings":"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"}