@riddledc/openclaw-riddledc 0.9.1 → 0.9.3

package/dist/index.js

@@ -1,3 +1,9 @@
+import {
+  configFromOpenClawApi,
+  createStaticPreview,
+  deleteStaticPreview
+} from "./chunk-LJCZ53PU.js";
+
 // src/index.ts
 import { Type } from "@sinclair/typebox";
 import { writeFile, mkdir, readFile, stat, rm } from "fs/promises";
@@ -6,6 +12,11 @@ import { execFile as execFileCb } from "child_process";
 import { promisify } from "util";
 var execFile = promisify(execFileCb);
 var INLINE_CAP = 50 * 1024;
+var PREVIEW_REQUEST_TIMEOUT_MS = 3e4;
+var PREVIEW_UPLOAD_TIMEOUT_MS = 5 * 6e4;
+var PREVIEW_ARTIFACT_TIMEOUT_MS = 6e4;
+var PREVIEW_RETRY_ATTEMPTS = 3;
+var PREVIEW_RETRY_BASE_DELAY_MS = 750;
 function getCfg(api) {
   const cfg = api?.config ?? {};
   const pluginCfg = cfg?.plugins?.entries?.["openclaw-riddledc"]?.config ?? {};
@@ -51,6 +62,76 @@ function abToBase64(ab) {
 function getWorkspacePath(api) {
   return api?.workspacePath ?? process.cwd();
 }
+function describeError(err) {
+  const anyErr = err;
+  const parts = [];
+  if (err instanceof Error) parts.push(err.message);
+  else parts.push(String(err));
+  const cause = anyErr?.cause;
+  if (cause) {
+    const causeParts = [
+      cause.code ? `code=${cause.code}` : "",
+      cause.name ? `name=${cause.name}` : "",
+      cause.message ? `message=${cause.message}` : ""
+    ].filter(Boolean);
+    if (causeParts.length) parts.push(`cause: ${causeParts.join(" ")}`);
+  }
+  return parts.join("; ");
+}
+async function fetchWithTimeout(url, init, timeoutMs, label) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    return await fetch(url, { ...init, signal: controller.signal });
+  } catch (err) {
+    if (err?.name === "AbortError") {
+      throw new Error(`${label} timed out after ${Math.round(timeoutMs / 1e3)}s`);
+    }
+    throw err;
+  } finally {
+    clearTimeout(timer);
+  }
+}
+function isTransientFetchError(err) {
+  const text = describeError(err).toLowerCase();
+  return [
+    "fetch failed",
+    "timed out",
+    "timeout",
+    "econnreset",
+    "econnrefused",
+    "etimedout",
+    "eai_again",
+    "socket",
+    "network",
+    "und_err",
+    "terminated"
+  ].some((needle) => text.includes(needle));
+}
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+async function fetchWithRetry(url, init, timeoutMs, label, opts = {}) {
+  const attempts = Math.max(1, opts.attempts ?? PREVIEW_RETRY_ATTEMPTS);
+  const baseDelayMs = opts.baseDelayMs ?? PREVIEW_RETRY_BASE_DELAY_MS;
+  let lastErr;
+  for (let attempt = 1; attempt <= attempts; attempt++) {
+    try {
+      return await fetchWithTimeout(url, init, timeoutMs, label);
+    } catch (err) {
+      lastErr = err;
+      if (attempt >= attempts || !isTransientFetchError(err)) break;
+      const jitterMs = Math.floor(Math.random() * 250);
+      const delayMs = Math.min(baseDelayMs * Math.pow(2, attempt - 1) + jitterMs, 5e3);
+      console.warn(`[openclaw-riddledc] ${label} attempt ${attempt}/${attempts} failed: ${describeError(err)}; retrying in ${delayMs}ms`);
+      await sleep(delayMs);
+    }
+  }
+  throw new Error(`${label} failed after ${attempts} attempts: ${describeError(lastErr)}`);
+}
+function isAlreadyStartedResponse(status, body) {
+  return status === 409 && /already in status:\s*(queued|running|complete|completed)/i.test(body);
+}
 async function writeArtifact(workspace, subdir, filename, content) {
   const dir = join(workspace, "riddle", subdir);
   await mkdir(dir, { recursive: true });
@@ -785,70 +866,8 @@ function register(api) {
         framework: Type.Optional(Type.String({ description: "Framework hint: 'spa' (default) or 'static'" }))
       }),
       async execute(_id, params) {
-        const { apiKey, baseUrl } = getCfg(api);
-        if (!apiKey) {
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: "Missing Riddle API key." }, null, 2) }] };
-        }
-        assertAllowedBaseUrl(baseUrl);
-        const dir = params.directory;
-        if (!dir || typeof dir !== "string") throw new Error("directory must be an absolute path");
-        try {
-          const st = await stat(dir);
-          if (!st.isDirectory()) throw new Error(`Not a directory: ${dir}`);
-        } catch (e) {
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Cannot access directory: ${e.message}` }, null, 2) }] };
-        }
-        const endpoint = baseUrl.replace(/\/$/, "");
-        const createRes = await fetch(`${endpoint}/v1/preview`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-          body: JSON.stringify({ framework: params.framework || "spa" })
-        });
-        if (!createRes.ok) {
-          const err = await createRes.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: HTTP ${createRes.status} ${err}` }, null, 2) }] };
-        }
-        const created = await createRes.json();
-        const tarball = `/tmp/riddle-preview-${created.id}.tar.gz`;
-        try {
-          await execFile("tar", ["czf", tarball, "-C", dir, "."], { timeout: 6e4 });
-          const tarData = await readFile(tarball);
-          const uploadRes = await fetch(created.upload_url, {
-            method: "PUT",
-            headers: { "Content-Type": "application/gzip" },
-            body: tarData
-          });
-          if (!uploadRes.ok) {
-            return { content: [{ type: "text", text: JSON.stringify({ ok: false, id: created.id, error: `Upload failed: HTTP ${uploadRes.status}` }, null, 2) }] };
-          }
-        } finally {
-          try {
-            await rm(tarball, { force: true });
-          } catch {
-          }
-        }
-        const publishRes = await fetch(`${endpoint}/v1/preview/${created.id}/publish`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}` }
-        });
-        if (!publishRes.ok) {
-          const err = await publishRes.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, id: created.id, error: `Publish failed: HTTP ${publishRes.status} ${err}` }, null, 2) }] };
-        }
-        const published = await publishRes.json();
-        return {
-          content: [{
-            type: "text",
-            text: JSON.stringify({
-              ok: true,
-              id: published.id,
-              preview_url: published.preview_url,
-              file_count: published.file_count,
-              total_bytes: published.total_bytes,
-              expires_at: created.expires_at
-            }, null, 2)
-          }]
-        };
+        const result = await createStaticPreview(configFromOpenClawApi(api), params);
+        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       }
     },
     { optional: true }
@@ -861,21 +880,8 @@ function register(api) {
         id: Type.String({ description: "Preview ID (e.g. pv_a1b2c3d4)" })
       }),
       async execute(_id, params) {
-        const { apiKey, baseUrl } = getCfg(api);
-        if (!apiKey) {
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: "Missing Riddle API key." }, null, 2) }] };
-        }
-        assertAllowedBaseUrl(baseUrl);
-        const res = await fetch(`${baseUrl.replace(/\/$/, "")}/v1/preview/${params.id}`, {
-          method: "DELETE",
-          headers: { Authorization: `Bearer ${apiKey}` }
-        });
-        if (!res.ok) {
-          const err = await res.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Delete failed: HTTP ${res.status} ${err}` }, null, 2) }] };
-        }
-        const data = await res.json();
-        return { content: [{ type: "text", text: JSON.stringify({ ok: true, deleted: true, files_removed: data.files_removed }, null, 2) }] };
+        const result = await deleteStaticPreview(configFromOpenClawApi(api), params.id);
+        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
       }
     },
     { optional: true }
@@ -927,11 +933,16 @@ function register(api) {
           const envBody = {};
           if (hasSensitiveEnv) envBody.env = params.sensitive_env;
           if (hasLocalStorage) envBody.localStorage = params.localStorage;
-          const envRes = await fetch(`${endpoint}/v1/server-preview/env`, {
-            method: "POST",
-            headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-            body: JSON.stringify(envBody)
-          });
+          let envRes;
+          try {
+            envRes = await fetchWithTimeout(`${endpoint}/v1/server-preview/env`, {
+              method: "POST",
+              headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
+              body: JSON.stringify(envBody)
+            }, PREVIEW_REQUEST_TIMEOUT_MS, "server preview env store");
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Store env failed: ${describeError(e)}` }, null, 2) }] };
+          }
           if (!envRes.ok) {
             const err = await envRes.text();
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Store env failed: HTTP ${envRes.status} ${err}` }, null, 2) }] };
@@ -957,11 +968,16 @@ function register(api) {
         if (params.navigation_timeout) createBody.navigation_timeout = params.navigation_timeout;
         if (params.color_scheme) createBody.color_scheme = params.color_scheme;
         if (params.viewport) createBody.viewport = params.viewport;
-        const createRes = await fetch(`${endpoint}/v1/server-preview`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-          body: JSON.stringify(createBody)
-        });
+        let createRes;
+        try {
+          createRes = await fetchWithRetry(`${endpoint}/v1/server-preview`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
+            body: JSON.stringify(createBody)
+          }, PREVIEW_REQUEST_TIMEOUT_MS, "server preview create");
+        } catch (e) {
+          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: ${describeError(e)}` }, null, 2) }] };
+        }
         if (!createRes.ok) {
           const err = await createRes.text();
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: HTTP ${createRes.status} ${err}` }, null, 2) }] };
@@ -973,11 +989,16 @@ function register(api) {
           const excludeArgs = excludes.flatMap((p) => ["--exclude", p]);
           await execFile("tar", ["czf", tarball, ...excludeArgs, "-C", dir, "."], { timeout: 12e4 });
           const tarData = await readFile(tarball);
-          const uploadRes = await fetch(created.upload_url, {
-            method: "PUT",
-            headers: { "Content-Type": "application/gzip" },
-            body: tarData
-          });
+          let uploadRes;
+          try {
+            uploadRes = await fetchWithRetry(created.upload_url, {
+              method: "PUT",
+              headers: { "Content-Type": "application/gzip" },
+              body: tarData
+            }, PREVIEW_UPLOAD_TIMEOUT_MS, "server preview upload");
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Upload failed: ${describeError(e)}` }, null, 2) }] };
+          }
           if (!uploadRes.ok) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Upload failed: HTTP ${uploadRes.status}` }, null, 2) }] };
           }
@@ -987,21 +1008,35 @@ function register(api) {
           } catch {
           }
         }
-        const startRes = await fetch(`${endpoint}/v1/server-preview/${created.job_id}/start`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}` }
-        });
+        let startRes;
+        try {
+          startRes = await fetchWithRetry(`${endpoint}/v1/server-preview/${created.job_id}/start`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${apiKey}` }
+          }, PREVIEW_REQUEST_TIMEOUT_MS, "server preview start");
+        } catch (e) {
+          return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: ${describeError(e)}` }, null, 2) }] };
+        }
         if (!startRes.ok) {
           const err = await startRes.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: HTTP ${startRes.status} ${err}` }, null, 2) }] };
+          if (isAlreadyStartedResponse(startRes.status, err)) {
+            console.warn(`[openclaw-riddledc] server preview start returned ${startRes.status} for ${created.job_id}; continuing to poll`);
+          } else {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: HTTP ${startRes.status} ${err}` }, null, 2) }] };
+          }
         }
         const timeoutMs = ((params.timeout || 120) + 60) * 1e3;
         const pollStart = Date.now();
         const POLL_INTERVAL = 3e3;
         while (Date.now() - pollStart < timeoutMs) {
-          const statusRes = await fetch(`${endpoint}/v1/server-preview/${created.job_id}`, {
-            headers: { Authorization: `Bearer ${apiKey}` }
-          });
+          let statusRes;
+          try {
+            statusRes = await fetchWithRetry(`${endpoint}/v1/server-preview/${created.job_id}`, {
+              headers: { Authorization: `Bearer ${apiKey}` }
+            }, PREVIEW_REQUEST_TIMEOUT_MS, "server preview poll", { attempts: 2 });
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: ${describeError(e)}` }, null, 2) }] };
+          }
           if (!statusRes.ok) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: HTTP ${statusRes.status}` }, null, 2) }] };
           }
@@ -1020,7 +1055,7 @@ function register(api) {
             for (const output of result.outputs) {
               if (output.name && /\.(png|jpg|jpeg)$/i.test(output.name) && output.url) {
                 try {
-                  const imgRes = await fetch(output.url);
+                  const imgRes = await fetchWithTimeout(output.url, {}, PREVIEW_ARTIFACT_TIMEOUT_MS, "server preview artifact download");
                   if (imgRes.ok) {
                     const buf = await imgRes.arrayBuffer();
                     const base64 = Buffer.from(buf).toString("base64");
@@ -1096,11 +1131,16 @@ function register(api) {
           const envBody = {};
           if (hasSensitiveEnv) envBody.env = params.sensitive_env;
           if (hasLocalStorage) envBody.localStorage = params.localStorage;
-          const envRes = await fetch(`${endpoint}/v1/build-preview/env`, {
-            method: "POST",
-            headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-            body: JSON.stringify(envBody)
-          });
+          let envRes;
+          try {
+            envRes = await fetchWithTimeout(`${endpoint}/v1/build-preview/env`, {
+              method: "POST",
+              headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
+              body: JSON.stringify(envBody)
+            }, PREVIEW_REQUEST_TIMEOUT_MS, "build preview env store");
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Store env failed: ${describeError(e)}` }, null, 2) }] };
+          }
           if (!envRes.ok) {
             const err = await envRes.text();
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Store env failed: HTTP ${envRes.status} ${err}` }, null, 2) }] };
@@ -1128,11 +1168,16 @@ function register(api) {
         if (params.color_scheme) createBody.color_scheme = params.color_scheme;
         if (params.viewport) createBody.viewport = params.viewport;
         if (params.audit) createBody.audit = true;
-        const createRes = await fetch(`${endpoint}/v1/build-preview`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-          body: JSON.stringify(createBody)
-        });
+        let createRes;
+        try {
+          createRes = await fetchWithRetry(`${endpoint}/v1/build-preview`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
+            body: JSON.stringify(createBody)
+          }, PREVIEW_REQUEST_TIMEOUT_MS, "build preview create");
+        } catch (e) {
+          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: ${describeError(e)}` }, null, 2) }] };
+        }
         if (!createRes.ok) {
           const err = await createRes.text();
           return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Create failed: HTTP ${createRes.status} ${err}` }, null, 2) }] };
@@ -1144,11 +1189,16 @@ function register(api) {
           const excludeArgs = excludes.flatMap((p) => ["--exclude", p]);
           await execFile("tar", ["czf", tarball, ...excludeArgs, "-C", dir, "."], { timeout: 12e4 });
           const tarData = await readFile(tarball);
-          const uploadRes = await fetch(created.upload_url, {
-            method: "PUT",
-            headers: { "Content-Type": "application/gzip" },
-            body: tarData
-          });
+          let uploadRes;
+          try {
+            uploadRes = await fetchWithRetry(created.upload_url, {
+              method: "PUT",
+              headers: { "Content-Type": "application/gzip" },
+              body: tarData
+            }, PREVIEW_UPLOAD_TIMEOUT_MS, "build preview upload");
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Upload failed: ${describeError(e)}` }, null, 2) }] };
+          }
           if (!uploadRes.ok) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Upload failed: HTTP ${uploadRes.status}` }, null, 2) }] };
           }
@@ -1158,21 +1208,35 @@ function register(api) {
           } catch {
           }
         }
-        const startRes = await fetch(`${endpoint}/v1/build-preview/${created.job_id}/start`, {
-          method: "POST",
-          headers: { Authorization: `Bearer ${apiKey}` }
-        });
+        let startRes;
+        try {
+          startRes = await fetchWithRetry(`${endpoint}/v1/build-preview/${created.job_id}/start`, {
+            method: "POST",
+            headers: { Authorization: `Bearer ${apiKey}` }
+          }, PREVIEW_REQUEST_TIMEOUT_MS, "build preview start");
+        } catch (e) {
+          return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: ${describeError(e)}` }, null, 2) }] };
+        }
         if (!startRes.ok) {
           const err = await startRes.text();
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: HTTP ${startRes.status} ${err}` }, null, 2) }] };
+          if (isAlreadyStartedResponse(startRes.status, err)) {
+            console.warn(`[openclaw-riddledc] build preview start returned ${startRes.status} for ${created.job_id}; continuing to poll`);
+          } else {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Start failed: HTTP ${startRes.status} ${err}` }, null, 2) }] };
+          }
         }
         const timeoutMs = ((params.timeout || 180) + 120) * 1e3;
         const pollStart = Date.now();
         const POLL_INTERVAL = 3e3;
         while (Date.now() - pollStart < timeoutMs) {
-          const statusRes = await fetch(`${endpoint}/v1/build-preview/${created.job_id}`, {
-            headers: { Authorization: `Bearer ${apiKey}` }
-          });
+          let statusRes;
+          try {
+            statusRes = await fetchWithRetry(`${endpoint}/v1/build-preview/${created.job_id}`, {
+              headers: { Authorization: `Bearer ${apiKey}` }
+            }, PREVIEW_REQUEST_TIMEOUT_MS, "build preview poll", { attempts: 2 });
+          } catch (e) {
+            return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: ${describeError(e)}` }, null, 2) }] };
+          }
           if (!statusRes.ok) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: HTTP ${statusRes.status}` }, null, 2) }] };
           }
@@ -1195,7 +1259,7 @@ function register(api) {
             for (const output of result.outputs) {
               if (output.name && /\.(png|jpg|jpeg)$/i.test(output.name) && output.url) {
                 try {
-                  const imgRes = await fetch(output.url);
+                  const imgRes = await fetchWithTimeout(output.url, {}, PREVIEW_ARTIFACT_TIMEOUT_MS, "build preview artifact download");
                   if (imgRes.ok) {
                     const buf = await imgRes.arrayBuffer();
                     const base64 = Buffer.from(buf).toString("base64");

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "openclaw-riddledc",
   "name": "Riddle",
   "description": "Riddle (riddledc.com) hosted browser API tools for OpenClaw agents.",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "notes": "0.8.0: Added riddle_build_preview for Dockerfile-based builds with image caching.",
   "type": "plugin",
   "bundledSkills": [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riddledc/openclaw-riddledc",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "OpenClaw integration package for RiddleDC (no secrets).",
   "license": "MIT",
   "author": "RiddleDC",
@@ -18,6 +18,11 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist/index.cjs"
+    },
+    "./core": {
+      "types": "./dist/core.d.ts",
+      "import": "./dist/core.js",
+      "require": "./dist/core.cjs"
     }
   },
   "files": [
@@ -45,7 +50,7 @@
     "typescript": "^5.4.5"
   },
   "scripts": {
-    "build": "npm run sync:openclaw-plugin-version && tsup src/index.ts --format cjs,esm --dts --out-dir dist",
+    "build": "npm run sync:openclaw-plugin-version && tsup src/index.ts src/core.ts --format cjs,esm --dts --out-dir dist",
     "clean": "rm -rf dist",
     "lint": "echo 'lint: (not configured)'",
     "test": "echo 'test: (not configured)'",