@akala/pm 15.7.4 → 15.8.1

package/package.json

@@ -4,7 +4,7 @@
     "pm": "dist/esm/cli.js",
     "pm-fork": "dist/esm/fork.js"
   },
-  "version": "15.7.4",
+  "version": "15.8.1",
   "scripts": {
     "test": "echo 1",
     "generate": "akala sdk generate dist/esm/commands commands.json --name pm && akala sdk generate dist/esm/cli-commands cli-commands.json --name pm",
@@ -29,11 +29,11 @@
     "src/fork.ts"
   ],
   "dependencies": {
-    "@akala/cli": "^5.12.12",
-    "@akala/commands": "^17.6.3",
-    "@akala/config": "^6.1.12",
-    "@akala/core": "^41.9.1",
-    "@akala/json-rpc-ws": "^14.3.1",
+    "@akala/cli": "^5.12.13",
+    "@akala/commands": "^17.6.4",
+    "@akala/config": "^6.1.13",
+    "@akala/core": "^41.9.2",
+    "@akala/json-rpc-ws": "^14.3.2",
     "reflect-metadata": "^0.2.2"
   },
   "devDependencies": {

package/src/akala.mts

@@ -10,6 +10,7 @@ import Configuration from '@akala/config';
 import { IpcAdapter } from './ipc-adapter.js';
 import { FSFileSystemProvider } from '@akala/fs';
 import { containers, InitAkala } from '@akala/commands/akala';
+import { JsonRpcSocketAdapter } from '@akala/json-rpc-ws';
 
 const log = logger('akala:pm');
 
@@ -38,7 +39,7 @@ export const remotePm = new Container('proxy-pm', {}) as commands.container & Co
 if (process.connected)
     protocolHandlers.useProtocol('ipc', async (url, options) =>
     {
-        const connection = Processors.JsonRpc.getConnection(new IpcAdapter(process), options.container);
+        const connection = Processors.JsonRpc.getConnection(new JsonRpcSocketAdapter(new IpcAdapter(process)), options.container);
 
         return {
             processor: new Processors.JsonRpc(connection),

package/src/cli-commands/install.ts

@@ -1,28 +1,20 @@
 import type State from '../state.js';
-import npmHelper from '@akala/cli/npm-helper';
-import yarnHelper, { hasYarn } from '@akala/cli/yarn-helper';
 import { Container } from "@akala/commands";
 import discover from './discover.js';
+import { xpm } from '@akala/cli';
 
 export default async function install(this: State, packageName: string, pm: Container<State>): ReturnType<typeof discover>
 {
-    if (process.versions['pnp'] || await hasYarn())
-    {
-        await yarnHelper.install(packageName);
-        if (!this.config.has('setup'))
-            this.config.set('setup', { packages: [] })
-        if (!this.config.has('setup.packages'))
-            this.config.set('setup.packages', [])
+    const xPM = await xpm(process.cwd());
+    await xPM.install(packageName);
 
-        if (this.config.setup?.packages?.indexOf(packageName) == -1)
-            this.config.setup.packages.push(packageName);
-        return await pm.dispatch('discover', packageName, !process.versions['pnp'] && 'node_modules' || undefined);
-    }
-    else
-    {
-        await npmHelper.install(packageName);
-        if (this.config.setup.packages.indexOf(packageName) == -1)
-            this.config.setup.packages.push(packageName);
-        return await pm.dispatch('discover', packageName, 'node_modules');
-    }
+    if (!this.config.has('setup'))
+        this.config.set('setup', { packages: [] })
+    if (!this.config.has('setup.packages'))
+        this.config.set('setup.packages', [])
+
+    if (this.config.setup.packages.indexOf(packageName) == -1)
+        this.config.setup.packages.push(packageName);
+
+    return await pm.dispatch('discover', packageName, !process.versions['pnp'] && 'node_modules' || undefined);
 }

package/src/cli.ts

@@ -11,6 +11,7 @@ import type { StateConfiguration } from './state.js';
 import { program, buildCliContextFromProcess, ErrorMessage, supportInteract } from '@akala/cli';
 import { open } from 'fs/promises';
 import { LogLevels } from '@akala/core';
+import { JsonRpcSocketAdapter } from '@akala/json-rpc-ws';
 
 const tableChars = {
     'top': '─'
@@ -142,7 +143,7 @@ cli.preAction(async c =>
     if (socket.readyState == 'open')
     {
         if (!processor)
-            processor = new Processors.JsonRpc(Processors.JsonRpc.getConnection(new NetSocketAdapter(socket)));
+            processor = new Processors.JsonRpc(Processors.JsonRpc.getConnection(new JsonRpcSocketAdapter(new NetSocketAdapter(socket))));
         if (!metaContainer)
             metaContainer = (await import(new URL('../../commands.json', import.meta.url).toString(), { assert: { type: 'json' } })).default;
         if (!container)

package/src/runtimes/child_process.ts

@@ -3,8 +3,9 @@ import { Readable } from "stream";
 import { IpcAdapter } from "../ipc-adapter.js";
 import { NewLinePrefixer } from "../new-line-prefixer.js";
 import type { RuntimeEventMap, RuntimeInstance } from "./shared.js";
-import { EventEmitter, type IEvent } from "@akala/core";
+import { EventEmitter, SocketAdapter, type IEvent } from "@akala/core";
 import { fileURLToPath } from "url";
+import { JsonRpcSocketAdapter, Payload } from "@akala/json-rpc-ws";
 
 export type ChildProcessRuntimeEventMap = {
     "close": IEvent<[code: number | null, signal: NodeJS.Signals | null], void>
@@ -23,7 +24,7 @@ export default class Runtime extends EventEmitter<ChildProcessRuntimeEventMap> i
     public readonly runtime = Runtime;
     public static readonly name = 'nodejs';
     private readonly cp: ChildProcess;
-    public readonly adapter: IpcAdapter;
+    public readonly adapter: SocketAdapter<Payload<Readable>>;
     private readonly stderrPrefixer: NewLinePrefixer;
     private readonly stdoutPrefixer: NewLinePrefixer;
     constructor(args: string[], options: ChildProcessRuntimeOptions, signal?: AbortSignal)
@@ -47,7 +48,7 @@ export default class Runtime extends EventEmitter<ChildProcessRuntimeEventMap> i
                 this.stdoutPrefixer?.unpipe();
             });
         }
-        this.adapter = new IpcAdapter(this.cp);
+        this.adapter = new JsonRpcSocketAdapter(new IpcAdapter(this.cp));
         this.cp.on('exit', (code, signal) => { this.emit('exit', code, signal) });
         this.cp.on('message', (message, sendHandle) => this.emit('message', message, sendHandle));
 

package/src/runtimes/process.ts

@@ -1,18 +1,19 @@
 import { Readable, Writable } from "stream";
 import { IpcAdapter } from "../ipc-adapter.js";
 import type { RuntimeEventMap, RuntimeInstance } from "./shared.js";
-import { EventEmitter } from "@akala/core";
+import { EventEmitter, SocketAdapter } from "@akala/core";
+import { JsonRpcSocketAdapter, Payload } from "@akala/json-rpc-ws";
 
 export default class Runtime extends EventEmitter<RuntimeEventMap> implements RuntimeInstance
 {
     public static readonly name = 'self'
     public readonly runtime = Runtime;
-    public readonly adapter: IpcAdapter;
+    public readonly adapter: SocketAdapter<Payload<Readable>>;
     private stdio: { stderr: Readable, stdout: Readable, stdin: Writable }
     constructor(stdio?: { stderr: Readable, stdout: Readable, stdin: Writable })
     {
         super();
-        this.adapter = new IpcAdapter(process);
+        this.adapter = new JsonRpcSocketAdapter(new IpcAdapter(process));
         if (!stdio)
             this.stdio = process;
     }

package/src/runtimes/shared.ts

@@ -1,4 +1,5 @@
 import type { IEvent, EventBus, SpecialEvents, SocketAdapter } from "@akala/core";
+import { Payload } from "@akala/json-rpc-ws";
 import { Readable } from "stream";
 
 export interface Runtime
@@ -17,7 +18,7 @@ export interface RuntimeInstance<T extends RuntimeEventMap = RuntimeEventMap> ex
 {
     runtime: Omit<Runtime, 'build'>;
     stop(): Promise<number>;
-    get adapter(): SocketAdapter;
+    get adapter(): SocketAdapter<Payload<Readable>>;
 
     get stderr(): Readable;
     get stdout(): Readable;

package/src/runtimes/worker.ts

@@ -4,14 +4,15 @@ import { NewLinePrefixer } from "../new-line-prefixer.js";
 import { MessagePortAdapter } from "../messageport-adapter.js";
 import type { RuntimeEventMap, RuntimeInstance } from "./shared.js";
 import module from 'module'
-import { EventEmitter } from "@akala/core";
+import { EventEmitter, SocketAdapter } from "@akala/core";
+import { JsonRpcSocketAdapter, Payload } from "@akala/json-rpc-ws";
 const require = module.createRequire(import.meta.url);
 
 export default class Runtime extends EventEmitter<RuntimeEventMap> implements RuntimeInstance
 {
     public readonly runtime = Runtime;
     private readonly cp: Worker;
-    public readonly adapter: MessagePortAdapter;
+    public readonly adapter: SocketAdapter<Payload<Readable>>;
     private _running: boolean;
     constructor(args: string[], options: { new?: boolean, name: string, keepAttached?: boolean, inspect?: boolean, verbose?: number, wait?: boolean })
     {
@@ -19,7 +20,7 @@ export default class Runtime extends EventEmitter<RuntimeEventMap> implements Ru
         this.cp = new Worker(require.resolve('../fork'), { argv: args, stderr: true, stdout: true })
         this.cp.stderr?.pipe(new NewLinePrefixer(options.name + ' ', { useColors: true })).pipe(process.stderr);
         this.cp.stdout?.pipe(new NewLinePrefixer(options.name + ' ', { useColors: true })).pipe(process.stdout);
-        this.adapter = new MessagePortAdapter(this.cp);
+        this.adapter = new JsonRpcSocketAdapter(new MessagePortAdapter(this.cp));
         this.cp.on('exit', () => { this._running = false; this.emit('runningChanged') })
     }
     stop(): Promise<number>