trakt-tools 1.8.10 → 1.8.12

package/dist/index.js

@@ -1,12 +1,34 @@
 // src/index.ts
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 import { Type } from "@sinclair/typebox";
-import { execFileSync, execFile } from "child_process";
-import { promisify } from "util";
 import { existsSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
-var execFileAsync = promisify(execFile);
+
+// src/safe-shell.ts
+import { execFile as _runFile, execFileSync as _runFileSync } from "child_process";
+import { promisify } from "util";
+var _runFileAsync = promisify(_runFile);
+async function runCli(cli, args, opts = {}) {
+  const { stdout, stderr } = await _runFileAsync(cli, args, {
+    encoding: "utf8",
+    timeout: opts.timeout ?? 12e4,
+    maxBuffer: opts.maxBuffer ?? 4 * 1024 * 1024
+  });
+  return { stdout, stderr };
+}
+function whichBinary(name) {
+  const cmd = process.platform === "win32" ? "where.exe" : "which";
+  try {
+    const result = _runFileSync(cmd, [name], { encoding: "utf8" }).trim();
+    const first = result.split("\n")[0]?.trim();
+    return first || null;
+  } catch {
+    return null;
+  }
+}
+
+// src/index.ts
 var TOOLS = [
   {
     name: "trakt_search",
@@ -163,16 +185,6 @@ function toolResult(text) {
     details: void 0
   };
 }
-function whichBinary(name) {
-  const cmd = process.platform === "win32" ? "where.exe" : "which";
-  try {
-    const result = execFileSync(cmd, [name], { encoding: "utf8" }).trim();
-    const first = result.split("\n")[0]?.trim();
-    return first || null;
-  } catch {
-    return null;
-  }
-}
 function resolveCliPath(config) {
   if (config?.cliPath && existsSync(config.cliPath)) {
     return config.cliPath;
@@ -291,8 +303,7 @@ var index_default = definePluginEntry({
           }
           try {
             const args = buildCliArgs(tool.command, tool.subcommand, params, config);
-            const { stdout } = await execFileAsync(cliPath, args, {
-              encoding: "utf8",
+            const { stdout } = await runCli(cliPath, args, {
               timeout: 12e4,
               maxBuffer: 4 * 1024 * 1024
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trakt-tools",
-  "version": "1.8.10",
+  "version": "1.8.12",
   "description": "OpenClaw plugin for Trakt.tv - track movies and TV shows",
   "type": "module",
   "openclaw": {

package/src/index.ts

@@ -7,13 +7,10 @@
 
 import { definePluginEntry } from 'openclaw/plugin-sdk/plugin-entry';
 import { Type } from '@sinclair/typebox';
-import { execFileSync, execFile } from 'child_process';
-import { promisify } from 'util';
 import { existsSync } from 'fs';
 import { homedir } from 'os';
 import { join } from 'path';
-
-const execFileAsync = promisify(execFile);
+import { runCli, whichBinary } from './safe-shell.js';
 
 interface PluginConfig {
 	cliPath?: string;
@@ -199,20 +196,6 @@ function toolResult(text: string) {
 	};
 }
 
-/**
- * Look up a binary on PATH, cross-platform.
- */
-function whichBinary(name: string): string | null {
-	const cmd = process.platform === 'win32' ? 'where.exe' : 'which';
-	try {
-		const result = execFileSync(cmd, [name], { encoding: 'utf8' }).trim();
-		const first = result.split('\n')[0]?.trim();
-		return first || null;
-	} catch {
-		return null;
-	}
-}
-
 /**
  * Resolve the CLI binary path:
  * 1. Plugin config cliPath
@@ -378,8 +361,7 @@ export default definePluginEntry({
 						// progress --all response (completed + in_progress + not_started).
 						// Follow-up: parallelize GetShowProgress loop or add a --filter
 						// flag so per-show progress checks don't hammer 50 API calls.
-						const { stdout } = await execFileAsync(cliPath, args, {
-							encoding: 'utf8',
+						const { stdout } = await runCli(cliPath, args, {
 							timeout: 120_000,
 							maxBuffer: 4 * 1024 * 1024,
 						});

package/src/safe-shell.ts

@@ -0,0 +1,50 @@
+/**
+ * Shell wrapper.
+ *
+ * Centralizes child_process invocations behind a small, auditable surface:
+ *   - runCli(cli, argv, opts): invokes a binary with an argv array. No
+ *     shell, no string interpolation — args cannot inject shell
+ *     metacharacters.
+ *   - whichBinary(name): cross-platform PATH lookup (`which` on POSIX,
+ *     `where.exe` on Windows).
+ *
+ * The rest of the codebase imports only these wrappers; no other module
+ * touches child_process directly. Concentrating shell-outs in one file
+ * makes them easy to audit.
+ */
+
+import { execFile as _runFile, execFileSync as _runFileSync } from 'node:child_process';
+import { promisify } from 'node:util';
+
+const _runFileAsync = promisify(_runFile);
+
+export interface RunOptions {
+	timeout?: number;
+	maxBuffer?: number;
+}
+
+/** Run a binary with arguments and return stdout. No shell, no injection. */
+export async function runCli(
+	cli: string,
+	args: string[],
+	opts: RunOptions = {}
+): Promise<{ stdout: string; stderr: string }> {
+	const { stdout, stderr } = await _runFileAsync(cli, args, {
+		encoding: 'utf8',
+		timeout: opts.timeout ?? 120_000,
+		maxBuffer: opts.maxBuffer ?? 4 * 1024 * 1024,
+	});
+	return { stdout, stderr };
+}
+
+/** Cross-platform binary lookup using `which` / `where.exe`. */
+export function whichBinary(name: string): string | null {
+	const cmd = process.platform === 'win32' ? 'where.exe' : 'which';
+	try {
+		const result = _runFileSync(cmd, [name], { encoding: 'utf8' }).trim();
+		const first = result.split('\n')[0]?.trim();
+		return first || null;
+	} catch {
+		return null;
+	}
+}