@riddledc/openclaw-riddledc 0.9.2 → 0.9.4

package/dist/index.js

@@ -1,3 +1,9 @@
+import {
+  configFromOpenClawApi,
+  createStaticPreview,
+  deleteStaticPreview
+} from "./chunk-SNGACMAL.js";
+
 // src/index.ts
 import { Type } from "@sinclair/typebox";
 import { writeFile, mkdir, readFile, stat, rm } from "fs/promises";
@@ -126,6 +132,21 @@ async function fetchWithRetry(url, init, timeoutMs, label, opts = {}) {
 function isAlreadyStartedResponse(status, body) {
   return status === 409 && /already in status:\s*(queued|running|complete|completed)/i.test(body);
 }
+function previewTimeoutToolResult(jobId, timeoutMs, lastStatusData, extras = {}) {
+  const lastStatus = lastStatusData?.status ?? "unknown";
+  const result = {
+    ok: false,
+    job_id: jobId,
+    status: lastStatus,
+    outputs: lastStatusData?.outputs || [],
+    compute_seconds: lastStatusData?.compute_seconds,
+    egress_bytes: lastStatusData?.egress_bytes,
+    error: `Job did not complete within ${timeoutMs / 1e3}s; last status was ${lastStatus}`,
+    ...extras
+  };
+  if (lastStatusData?.error) result.server_error = lastStatusData.error;
+  return result;
+}
 async function writeArtifact(workspace, subdir, filename, content) {
   const dir = join(workspace, "riddle", subdir);
   await mkdir(dir, { recursive: true });
@@ -860,85 +881,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(/\/$/, "");
-        let createRes;
-        try {
-          createRes = await fetchWithRetry(`${endpoint}/v1/preview`, {
-            method: "POST",
-            headers: { Authorization: `Bearer ${apiKey}`, "Content-Type": "application/json" },
-            body: JSON.stringify({ framework: params.framework || "spa" })
-          }, PREVIEW_REQUEST_TIMEOUT_MS, "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) }] };
-        }
-        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);
-          let uploadRes;
-          try {
-            uploadRes = await fetchWithRetry(created.upload_url, {
-              method: "PUT",
-              headers: { "Content-Type": "application/gzip" },
-              body: tarData
-            }, PREVIEW_UPLOAD_TIMEOUT_MS, "preview upload");
-          } catch (e) {
-            return { content: [{ type: "text", text: JSON.stringify({ ok: false, id: created.id, error: `Upload failed: ${describeError(e)}` }, null, 2) }] };
-          }
-          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 {
-          }
-        }
-        let publishRes;
-        try {
-          publishRes = await fetchWithTimeout(`${endpoint}/v1/preview/${created.id}/publish`, {
-            method: "POST",
-            headers: { Authorization: `Bearer ${apiKey}` }
-          }, PREVIEW_REQUEST_TIMEOUT_MS, "preview publish");
-        } catch (e) {
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, id: created.id, error: `Publish failed: ${describeError(e)}` }, null, 2) }] };
-        }
-        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 }
@@ -951,26 +895,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);
-        let res;
-        try {
-          res = await fetchWithTimeout(`${baseUrl.replace(/\/$/, "")}/v1/preview/${params.id}`, {
-            method: "DELETE",
-            headers: { Authorization: `Bearer ${apiKey}` }
-          }, PREVIEW_REQUEST_TIMEOUT_MS, "preview delete");
-        } catch (e) {
-          return { content: [{ type: "text", text: JSON.stringify({ ok: false, error: `Delete failed: ${describeError(e)}` }, null, 2) }] };
-        }
-        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 }
@@ -1117,6 +1043,7 @@ function register(api) {
         const timeoutMs = ((params.timeout || 120) + 60) * 1e3;
         const pollStart = Date.now();
         const POLL_INTERVAL = 3e3;
+        let lastStatusData = null;
         while (Date.now() - pollStart < timeoutMs) {
           let statusRes;
           try {
@@ -1130,6 +1057,7 @@ function register(api) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: HTTP ${statusRes.status}` }, null, 2) }] };
           }
           const statusData = await statusRes.json();
+          lastStatusData = statusData;
           if (statusData.status === "complete" || statusData.status === "completed" || statusData.status === "failed") {
             const result = {
               ok: statusData.status === "complete" || statusData.status === "completed",
@@ -1161,7 +1089,7 @@ function register(api) {
           }
           await new Promise((r) => setTimeout(r, POLL_INTERVAL));
         }
-        return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Job did not complete within ${timeoutMs / 1e3}s` }, null, 2) }] };
+        return { content: [{ type: "text", text: JSON.stringify(previewTimeoutToolResult(created.job_id, timeoutMs, lastStatusData), null, 2) }] };
       }
     },
     { optional: true }
@@ -1317,6 +1245,7 @@ function register(api) {
         const timeoutMs = ((params.timeout || 180) + 120) * 1e3;
         const pollStart = Date.now();
         const POLL_INTERVAL = 3e3;
+        let lastStatusData = null;
         while (Date.now() - pollStart < timeoutMs) {
           let statusRes;
           try {
@@ -1330,6 +1259,7 @@ function register(api) {
             return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Poll failed: HTTP ${statusRes.status}` }, null, 2) }] };
           }
           const statusData = await statusRes.json();
+          lastStatusData = statusData;
           if (statusData.status === "complete" || statusData.status === "completed" || statusData.status === "failed") {
             const result = {
               ok: statusData.status === "complete" || statusData.status === "completed",
@@ -1365,7 +1295,12 @@ function register(api) {
           }
           await new Promise((r) => setTimeout(r, POLL_INTERVAL));
         }
-        return { content: [{ type: "text", text: JSON.stringify({ ok: false, job_id: created.job_id, error: `Job did not complete within ${timeoutMs / 1e3}s` }, null, 2) }] };
+        return { content: [{ type: "text", text: JSON.stringify(previewTimeoutToolResult(created.job_id, timeoutMs, lastStatusData, {
+          build_duration_ms: lastStatusData?.build_duration_ms,
+          ...lastStatusData?.build_log ? { build_log: lastStatusData.build_log } : {},
+          ...lastStatusData?.container_log ? { container_log: lastStatusData.container_log } : {},
+          ...lastStatusData?.audit ? { audit: lastStatusData.audit } : {}
+        }), null, 2) }] };
       }
     },
     { optional: true }

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.2",
+  "version": "0.9.4",
   "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.2",
+  "version": "0.9.4",
   "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)'",