opensource/lms-cli
1
0
Fork 0
mirror of https://github.com/lmstudio-ai/lms.git synced 2025-09-28 10:24:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Plugin client info returned from server

Browse Source
This commit is contained in:
Ryan Huang
2024-11-01 16:16:16 -04:00
parent cf6dbbfa7e
commit 8da6532345
1 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/subcommands/dev.ts
View File

@ -1,6 +1,5 @@
import { SimpleLogger, Validator } from "@lmstudio/lms-common"; import { SimpleLogger, Validator } from "@lmstudio/lms-common";
import { Esbuild, EsPluginRunnerWatcher } from "@lmstudio/lms-es-plugin-runner"; import { Esbuild, EsPluginRunnerWatcher } from "@lmstudio/lms-es-plugin-runner";
import { generateRandomBase64 } from "@lmstudio/lms-isomorphic";
import { pluginManifestSchema } from "@lmstudio/lms-shared-types/dist/PluginManifest"; import { pluginManifestSchema } from "@lmstudio/lms-shared-types/dist/PluginManifest";
import { type LMStudioClient, type RegisterDevelopmentPluginOpts } from "@lmstudio/sdk"; import { type LMStudioClient, type RegisterDevelopmentPluginOpts } from "@lmstudio/sdk";
import { type ChildProcessWithoutNullStreams, spawn } from "child_process"; import { type ChildProcessWithoutNullStreams, spawn } from "child_process";
@ -46,27 +45,28 @@ class PluginProcess {
private readonly client: LMStudioClient, private readonly client: LMStudioClient,
private readonly registerDevelopmentPluginOpts: RegisterDevelopmentPluginOpts, private readonly registerDevelopmentPluginOpts: RegisterDevelopmentPluginOpts,
private readonly cwd: string, private readonly cwd: string,
private readonly executable: string,
private readonly args: Array<string>,
private readonly env: Record<string, string>,
private readonly logger: SimpleLogger, private readonly logger: SimpleLogger,
) {} ) {}
private serverLogger = new SimpleLogger("plugin-server", this.logger); private readonly executable = process.platform === "win32" ? "node.exe" : "node";
private stderrLogger = new SimpleLogger("stderr", this.logger); private readonly args = ["--enable-source-maps", join(".lmstudio", "dev.js")];
private readonly serverLogger = new SimpleLogger("plugin-server", this.logger);
private readonly stderrLogger = new SimpleLogger("stderr", this.logger);
private currentProcess: ChildProcessWithoutNullStreams | null = null; private currentProcess: ChildProcessWithoutNullStreams | null = null;
private status: PluginProcessStatus = "stopped"; private status: PluginProcessStatus = "stopped";
private endPlugin: (() => Promise<void>) | null = null; private unregister: (() => Promise<void>) | null = null;
private async startProcess() { private async startProcess() {
this.status = "starting"; this.status = "starting";
this.endPlugin = await this.client.plugins.registerDevelopmentPlugin( const { unregister, clientIdentifier, clientPasskey } =
this.registerDevelopmentPluginOpts, await this.client.plugins.registerDevelopmentPlugin(this.registerDevelopmentPluginOpts);
); this.unregister = unregister;
this.currentProcess = spawn(this.executable, this.args, { this.currentProcess = spawn(this.executable, this.args, {
env: { env: {
FORCE_COLOR: "1", FORCE_COLOR: "1",
...process.env, ...process.env,
...this.env, LMS_PLUGIN_CLIENT_IDENTIFIER: clientIdentifier,
LMS_PLUGIN_CLIENT_PASSKEY: clientPasskey,
}, },
cwd: this.cwd, cwd: this.cwd,
}); });
@ -75,8 +75,8 @@ class PluginProcess {
this.stderrLogger.error(data.toString("utf-8").trim()), this.stderrLogger.error(data.toString("utf-8").trim()),
); );
this.currentProcess.on("exit", async (code, signal) => { this.currentProcess.on("exit", async (code, signal) => {
await this.endPlugin?.(); await this.unregister?.();
this.endPlugin = null; this.unregister = null;
if (code !== null) { if (code !== null) {
this.serverLogger.warn(`Plugin process exited with code ${code}`); this.serverLogger.warn(`Plugin process exited with code ${code}`);
} else { } else {
@ -106,12 +106,12 @@ class PluginProcess {
} }
case "running": { case "running": {
this.status = "restarting"; this.status = "restarting";
if (this.endPlugin === null) { if (this.unregister === null) {
this.currentProcess?.kill("SIGKILL"); this.currentProcess?.kill("SIGKILL");
this.currentProcess = null; this.currentProcess = null;
} else { } else {
this.endPlugin().then(() => { this.unregister().then(() => {
this.endPlugin = null; this.unregister = null;
this.currentProcess?.kill("SIGKILL"); this.currentProcess?.kill("SIGKILL");
this.currentProcess = null; this.currentProcess = null;
}); });
@ -161,27 +161,9 @@ export const dev = command({
logger.info(`Starting the development server for ${manifest.owner}/${manifest.name}...`); logger.info(`Starting the development server for ${manifest.owner}/${manifest.name}...`);
const pluginClientIdentifier = `plugin:dev:${manifest.owner}/${manifest.name}`;
const pluginClientPasskey = generateRandomBase64();
const watcher = new EsPluginRunnerWatcher(new Esbuild(), cwd(), logger); const watcher = new EsPluginRunnerWatcher(new Esbuild(), cwd(), logger);
const pluginProcess = new PluginProcess( const pluginProcess = new PluginProcess(client, { manifest }, projectPath, logger);
client,
{
clientIdentifier: pluginClientIdentifier,
clientPasskey: pluginClientPasskey,
manifest,
},
projectPath,
process.platform === "win32" ? "node.exe" : "node",
["--enable-source-maps", join(".lmstudio", "dev.js")],
{
LMS_PLUGIN_CLIENT_IDENTIFIER: pluginClientIdentifier,
LMS_PLUGIN_CLIENT_PASSKEY: pluginClientPasskey,
},
logger,
);
watcher.updatedEvent.subscribe(() => { watcher.updatedEvent.subscribe(() => {
pluginProcess.run(); pluginProcess.run();