@lengmoxxl/sdk 0.1.3 → 0.1.4

package/README.md

@@ -32,8 +32,8 @@ connection.disconnect();
 
 `openMachine` returns a `MachineConnection`; every call opens its own. Sharing one belongs to the caller: a
 connection is reference counted, so callers that hand the same one around keep it alive until the last
-`disconnect()`. `openMachine({ type: 'ssh', host, agent })` installs the carrier agent on the host first when
-`agent` is given.
+`disconnect()`. `openMachine({ type: 'ssh', host, agent })` calls `agent(host)` before it connects: putting
+the carrier agent on the host belongs to the app that embeds the SDK.
 
 - `connection.pty` - `list`, `cwd`, `create`, `attach`, `close`
 - `connection.fs` - `stat`, `readDirectory`, `readFile`

package/dist/agent.d.ts

@@ -1,5 +1 @@
-import type { AgentInfo } from './types';
 export declare function agentCommand(command: string): string;
-export declare function ensureAgent(host: string, { version, prefixes, signal }: AgentInfo & {
-    signal?: AbortSignal;
-}): Promise<void>;

package/dist/connection.d.ts

@@ -4,6 +4,7 @@ export declare class MachineConnection {
     private options;
     private listeners;
     private terminals;
+    port?: number;
     private instance?;
     readonly ready: Promise<void>;
     private resolveReady;

package/dist/index.cjs

@@ -30,14 +30,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // index.ts
 var index_exports = {};
 __export(index_exports, {
+  agentCommand: () => agentCommand,
   openMachine: () => openMachine
 });
 module.exports = __toCommonJS(index_exports);
 
 // connection.ts
-var import_node_child_process2 = require("node:child_process");
+var import_node_child_process = require("node:child_process");
 var import_node_net = require("node:net");
-var import_node_util2 = require("node:util");
+var import_node_util = require("node:util");
 var import_ws = __toESM(require("ws"));
 
 // pty.ts
@@ -111,61 +112,14 @@ var Pty = class {
 };
 
 // agent.ts
-var import_node_child_process = require("node:child_process");
-var import_node_util = require("node:util");
-var exec = (0, import_node_util.promisify)(import_node_child_process.execFile);
-var DOWNLOAD_TIMEOUT = 3e4;
 function agentCommand(command) {
   const home = process.env.WANGCAI_HOME;
   const exportHome = home ? `export WANGCAI_HOME='${home.replace(/'/g, String.raw`'\''`)}'; ` : "";
   return `${exportHome}export PATH="$HOME/.local/bin:$PATH"; ${command}`;
 }
-async function ensureAgent(host, { version, prefixes, signal }) {
-  const targets = {
-    "Darwin x86_64": "x86_64-apple-darwin",
-    "Darwin arm64": "aarch64-apple-darwin",
-    "Linux x86_64": "x86_64-unknown-linux-musl"
-  };
-  const remote = (command) => ["-T", "-o", "BatchMode=yes", "-o", "ConnectTimeout=8", host, command];
-  const probe = await exec("ssh", remote(agentCommand("uname -s -m; wangcai --version 2>/dev/null; true")), { timeout: 3e4, signal }).catch(() => void 0);
-  const [platform, installed] = (probe?.stdout ?? "").split("\n").map((line) => line.trim());
-  if (!platform) return;
-  const target = targets[platform];
-  if (!target) throw new Error(`${platform} \u4E0A\u6682\u4E0D\u652F\u6301\u81EA\u52A8\u5B89\u88C5 agent`);
-  if (installed === `wangcai ${version}`) return;
-  const failures = [];
-  for (const prefix of prefixes) {
-    signal?.throwIfAborted();
-    const url = `${prefix}/v${version}/wangcai-${target}`;
-    const deadline = AbortSignal.timeout(DOWNLOAD_TIMEOUT);
-    let binary;
-    try {
-      const response = await fetch(url, { signal: signal ? AbortSignal.any([signal, deadline]) : deadline });
-      if (!response.ok) throw new Error(`${response.status} ${response.statusText}`);
-      binary = Buffer.from(await response.arrayBuffer());
-    } catch (error) {
-      failures.push(`${url}
-${error instanceof Error ? error.message : String(error)}`);
-      continue;
-    }
-    await new Promise((resolve, reject) => {
-      const child = (0, import_node_child_process.spawn)("ssh", remote("mkdir -p ~/.local/bin && cat > ~/.local/bin/.wangcai.tmp && chmod 755 ~/.local/bin/.wangcai.tmp && mv ~/.local/bin/.wangcai.tmp ~/.local/bin/wangcai"), { stdio: ["pipe", "ignore", "pipe"] });
-      let stderr = "";
-      child.stderr.on("data", (chunk) => {
-        stderr += chunk;
-      });
-      child.on("error", reject);
-      child.on("close", (code) => code === 0 ? resolve() : reject(new Error(stderr.trim() || `\u5199\u5165 agent \u5931\u8D25\uFF08ssh \u9000\u51FA\u7801 ${code}\uFF09`)));
-      child.stdin.end(binary);
-    });
-    return;
-  }
-  throw new Error(`\u4E0B\u8F7D agent \u5931\u8D25\uFF1A
-${failures.join("\n\n")}`);
-}
 
 // connection.ts
-var exec2 = (0, import_node_util2.promisify)(import_node_child_process2.execFile);
+var exec = (0, import_node_util.promisify)(import_node_child_process.execFile);
 var MachineConnection = class {
   constructor(options) {
     this.options = options;
@@ -178,6 +132,8 @@ var MachineConnection = class {
   }
   listeners = /* @__PURE__ */ new Set();
   terminals = /* @__PURE__ */ new Map();
+  // Where the daemon listens: the window reaches it with this.
+  port;
   instance;
   ready;
   resolveReady;
@@ -300,12 +256,12 @@ var MachineConnection = class {
       let info;
       let port;
       if (this.options.type === "local") {
-        const { stdout } = await exec2(this.options.binary ?? "wangcai", ["server", "start", "--json"], { timeout: 15e3 });
+        const { stdout } = await exec(this.options.binary ?? "wangcai", ["server", "start", "--json"], { timeout: 15e3 });
         info = JSON.parse(stdout);
         port = info.port;
       } else {
-        if (this.options.agent) await ensureAgent(this.options.host, { ...this.options.agent, signal: this.options.signal });
-        const { stdout } = await exec2("ssh", [
+        if (this.options.agent) await this.options.agent(this.options.host, this.options.signal);
+        const { stdout } = await exec("ssh", [
           "-T",
           "-o",
           "BatchMode=yes",
@@ -319,6 +275,7 @@ var MachineConnection = class {
         if (!current()) return;
         port = await this.forward(info.port, current);
       }
+      this.port = port;
       if (!current()) return;
       const socket = new import_ws.default(`ws://127.0.0.1:${port}`, { handshakeTimeout: 5e3, maxPayload: 64 * 1024 * 1024 });
       this.ws = socket;
@@ -415,7 +372,7 @@ var MachineConnection = class {
       const port = reservation.address().port;
       await new Promise((resolve) => reservation.close(() => resolve()));
       if (!current()) throw new Error("Connection cancelled");
-      const tunnel = (0, import_node_child_process2.spawn)("ssh", [
+      const tunnel = (0, import_node_child_process.spawn)("ssh", [
         "-N",
         "-T",
         "-o",
@@ -521,5 +478,6 @@ async function openMachine(options) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  agentCommand,
   openMachine
 });

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { MachineConnection } from './connection';
 import type { ConnectionOptions } from './types';
-export type { AgentInfo, ConnectionOptions, FileClick, Machine, MachineState, Session, Size, Output, Snapshot, TerminalEvent, DirectoryEntry, ExecOptions, ExecResult, Profile, Theme, WorkspaceActive, WorkspaceRow, WorkspaceMenuItem } from './types';
+export { agentCommand } from './agent';
+export type { ConnectionOptions, FileClick, Machine, MachineState, Session, Size, Output, Snapshot, TerminalEvent, DirectoryEntry, ExecOptions, ExecResult, InstallAgent, Profile, Theme, WorkspaceActive, WorkspaceRow, WorkspaceMenuItem } from './types';
 export type { MachineConnection } from './connection';
 export type { Pty } from './pty';
 /** Opens one connection to a machine and waits for it to be ready. */

package/dist/types.d.ts

@@ -1,7 +1,5 @@
-export interface AgentInfo {
-    version: string;
-    prefixes: string[];
-}
+/** What puts the agent on an ssh machine, which the SDK calls before it connects to it. */
+export type InstallAgent = (host: string, signal?: AbortSignal) => Promise<void>;
 /**
  * The workspace protocol. A plugin that init.ts lists under `workspaces` is a workspace provider, and
  * the app drives it through these `ui` methods:
@@ -58,7 +56,7 @@ export type ConnectionOptions = {
 } | {
     type: 'ssh';
     host: string;
-    agent?: AgentInfo;
+    agent?: InstallAgent;
     signal?: AbortSignal;
 };
 export interface Size {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lengmoxxl/sdk",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Client SDK for WangCai: connect to a local or remote machine and drive its pty, files and git",
   "license": "MIT",
   "repository": {