@matrix-ai/sdk 1.5.2 → 1.6.1

package/dist/v2/server.js

@@ -1,4 +1,5 @@
-import { spawn } from "node:child_process";
+import launch from "cross-spawn";
+import { stop, bindAbort } from "../process.js";
 export async function createOpencodeServer(options) {
     options = Object.assign({
         hostname: "127.0.0.1",
@@ -8,28 +9,38 @@ export async function createOpencodeServer(options) {
     const args = [`serve`, `--hostname=${options.hostname}`, `--port=${options.port}`];
     if (options.config?.logLevel)
         args.push(`--log-level=${options.config.logLevel}`);
-    const proc = spawn(`opencode`, args, {
-        signal: options.signal,
+    const proc = launch(`opencode`, args, {
         env: {
             ...process.env,
             OPENCODE_CONFIG_CONTENT: JSON.stringify(options.config ?? {}),
         },
     });
+    let clear = () => { };
     const url = await new Promise((resolve, reject) => {
         const id = setTimeout(() => {
+            clear();
+            stop(proc);
             reject(new Error(`Timeout waiting for server to start after ${options.timeout}ms`));
         }, options.timeout);
         let output = "";
+        let resolved = false;
         proc.stdout?.on("data", (chunk) => {
+            if (resolved)
+                return;
             output += chunk.toString();
             const lines = output.split("\n");
             for (const line of lines) {
                 if (line.startsWith("opencode server listening")) {
                     const match = line.match(/on\s+(https?:\/\/[^\s]+)/);
                     if (!match) {
-                        throw new Error(`Failed to parse server url from output: ${line}`);
+                        clear();
+                        stop(proc);
+                        clearTimeout(id);
+                        reject(new Error(`Failed to parse server url from output: ${line}`));
+                        return;
                     }
                     clearTimeout(id);
+                    resolved = true;
                     resolve(match[1]);
                     return;
                 }
@@ -50,17 +61,16 @@ export async function createOpencodeServer(options) {
             clearTimeout(id);
             reject(error);
         });
-        if (options.signal) {
-            options.signal.addEventListener("abort", () => {
-                clearTimeout(id);
-                reject(new Error("Aborted"));
-            });
-        }
+        clear = bindAbort(proc, options.signal, () => {
+            clearTimeout(id);
+            reject(options.signal?.reason);
+        });
     });
     return {
         url,
         close() {
-            proc.kill();
+            clear();
+            stop(proc);
         },
     };
 }
@@ -78,17 +88,18 @@ export function createOpencodeTui(options) {
     if (options?.agent) {
         args.push(`--agent=${options.agent}`);
     }
-    const proc = spawn(`opencode`, args, {
-        signal: options?.signal,
+    const proc = launch(`opencode`, args, {
         stdio: "inherit",
         env: {
             ...process.env,
             OPENCODE_CONFIG_CONTENT: JSON.stringify(options?.config ?? {}),
         },
     });
+    const clear = bindAbort(proc, options?.signal);
     return {
         close() {
-            proc.kill();
+            clear();
+            stop(proc);
         },
     };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@matrix-ai/sdk",
-  "version": "1.5.2",
+  "version": "1.6.1",
   "type": "module",
   "license": "MIT",
   "scripts": {
@@ -44,9 +44,12 @@
   "devDependencies": {
     "@hey-api/openapi-ts": "0.90.10",
     "@tsconfig/node22": "22.0.2",
+    "@types/cross-spawn": "6.0.6",
     "@types/node": "22.13.9",
-    "typescript": "5.8.2",
-    "@typescript/native-preview": "7.0.0-dev.20251207.1"
+    "@typescript/native-preview": "7.0.0-dev.20251207.1",
+    "typescript": "5.8.2"
   },
-  "dependencies": {}
+  "dependencies": {
+    "cross-spawn": "7.0.6"
+  }
 }