web-search-plus-plugin 1.3.1 → 1.3.3

package/index.ts

@@ -1,6 +1,6 @@
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 import { Type } from "@sinclair/typebox";
-import { spawnSync } from "child_process";
+import { spawn } from "child_process";
 import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
@@ -15,6 +15,12 @@ function getPluginDir(): string {
   return path.join(process.cwd(), "skills", "web-search-plus-plugin");
 }
 
+const SENSITIVE_PATTERN = /(?:key|token|secret|password|api[_-]?key)\s*[=:]\s*\S+/gi;
+
+function sanitizeOutput(text: string): string {
+  return text.replace(SENSITIVE_PATTERN, "[REDACTED]");
+}
+
 function loadEnvFile(envPath: string): Record<string, string> {
   if (!fs.existsSync(envPath)) return {};
   const env: Record<string, string> = {};
@@ -32,6 +38,48 @@ function loadEnvFile(envPath: string): Record<string, string> {
   return env;
 }
 
+function runPython(
+  args: string[],
+  env: NodeJS.ProcessEnv,
+  timeoutMs: number,
+): Promise<{ stdout: string; stderr: string; code: number }> {
+  return new Promise((resolve) => {
+    const child = spawn("python3", args, { env, shell: false });
+    let stdout = "";
+    let stderr = "";
+    let settled = false;
+
+    const timer = setTimeout(() => {
+      if (!settled) {
+        settled = true;
+        child.kill();
+        resolve({ stdout: "", stderr: "Search timed out", code: 1 });
+      }
+    }, timeoutMs);
+
+    child.stdout.on("data", (d: Buffer) => { stdout += d.toString(); });
+    child.stderr.on("data", (d: Buffer) => { stderr += d.toString(); });
+
+    child.on("close", (code: number | null) => {
+      if (!settled) {
+        settled = true;
+        clearTimeout(timer);
+        resolve({ stdout, stderr, code: code ?? 1 });
+      }
+    });
+
+    child.on("error", (err: Error) => {
+      if (!settled) {
+        settled = true;
+        clearTimeout(timer);
+        // Only expose the error message, not the full error object (may contain env/args)
+        const safeMsg = err.code === "ENOENT" ? "python3 not found" : "Process error";
+        resolve({ stdout: "", stderr: safeMsg, code: 1 });
+      }
+    });
+  });
+}
+
 const PLUGIN_DIR = getPluginDir();
 const scriptPath = path.join(PLUGIN_DIR, "scripts", "search.py");
 
@@ -139,6 +187,12 @@ export default definePluginEntry({
             exclude_domains?: string[];
           },
         ) {
+          if (!fs.existsSync(scriptPath)) {
+            return {
+              content: [{ type: "text", text: `Search failed: script not found at ${scriptPath}` }],
+            };
+          }
+
           const args = [scriptPath, "--query", params.query, "--compact"];
 
           if (params.provider && params.provider !== "auto") {
@@ -146,10 +200,7 @@ export default definePluginEntry({
           }
 
           if (typeof params.count === "number" && Number.isFinite(params.count)) {
-            args.push(
-              "--max-results",
-              String(Math.max(1, Math.floor(params.count))),
-            );
+            args.push("--max-results", String(Math.max(1, Math.floor(params.count))));
           }
 
           if (params.depth && params.depth !== "normal") {
@@ -179,44 +230,18 @@ export default definePluginEntry({
           }
           const childEnv = { ...process.env, ...configEnv, ...fileEnv };
 
-          try {
-            const child = spawnSync("python3", args, {
-              timeout: 75000,
-              env: childEnv,
-              shell: false,
-              encoding: "utf8",
-            });
-
-            if (child.error) {
-              return {
-                content: [
-                  { type: "text", text: `Search failed: ${child.error.message}` },
-                ],
-              };
-            }
-
-            if (child.status !== 0) {
-              const stderr = child.stderr?.trim() || "Unknown error";
-              return {
-                content: [
-                  {
-                    type: "text",
-                    text: `Search failed (exit ${child.status}): ${stderr}`,
-                  },
-                ],
-              };
-            }
+          const result = await runPython(args, childEnv, 75000);
 
+          if (result.code !== 0) {
+            const stderr = sanitizeOutput(result.stderr.trim()) || "Unknown error";
             return {
-              content: [{ type: "text", text: child.stdout?.trim() || "{}" }],
-            };
-          } catch (err: any) {
-            return {
-              content: [
-                { type: "text", text: `Search failed: ${err?.message ?? err}` },
-              ],
+              content: [{ type: "text", text: `Search failed (exit ${result.code}): ${stderr}` }],
             };
           }
+
+          return {
+            content: [{ type: "text", text: sanitizeOutput(result.stdout.trim()) || "{}" }],
+          };
         },
       },
       { optional: true },

package/openclaw.plugin.json

@@ -1,7 +1,7 @@
 {
   "id": "web-search-plus-plugin",
   "name": "Web Search Plus",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Multi-provider web search (Serper/Google, Tavily, Querit/Multilingual AI Search, Exa/Neural+Deep, Perplexity, You.com, SearXNG) with intelligent auto-routing",
   "configSchema": {
     "type": "object",
@@ -21,6 +21,7 @@
     "serperApiKey": { "label": "Serper API Key", "placeholder": "sk-...", "sensitive": true },
     "tavilyApiKey": { "label": "Tavily API Key", "placeholder": "tvly-...", "sensitive": true },
     "queritApiKey": { "label": "Querit API Key", "placeholder": "querit-sk-...", "sensitive": true },
+    "queritApiKey": { "label": "Querit API Key", "placeholder": "querit-sk-...", "sensitive": true },
     "exaApiKey": { "label": "Exa API Key", "placeholder": "exa-...", "sensitive": true },
     "perplexityApiKey": { "label": "Perplexity API Key", "placeholder": "pplx-...", "sensitive": true },
     "kilocodeApiKey": { "label": "Kilo Gateway API Key", "placeholder": "...", "sensitive": true },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-search-plus-plugin",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "OpenClaw plugin: multi-provider web search (Serper/Google, Tavily, Querit/Multilingual AI Search, Exa/Neural+Deep, Perplexity, You.com, SearXNG) with intelligent auto-routing",
   "type": "module",
   "main": "index.ts",