@dai_ming/plugin-deliverables 1.0.7 → 1.0.9

package/README.md

@@ -20,7 +20,7 @@ OpenClaw 交付物插件。安装后会把交付物 MCP、skill、AGENTS 规则
 
 ```yaml
 installPlugins:
-  - "@dai_ming/plugin-deliverables@1.0.7"
+  - "@dai_ming/plugin-deliverables@1.0.9"
 ```
 
 现有 chart 会在 init 阶段完成安装。
@@ -31,7 +31,7 @@ installPlugins:
 
 ```bash
 npm config set registry https://registry.npmmirror.com
-npm install @dai_ming/plugin-deliverables@1.0.7
+npm install @dai_ming/plugin-deliverables@1.0.9
 node node_modules/@dai_ming/plugin-deliverables/install.js
 ```
 
@@ -133,3 +133,7 @@ env | grep -E 'CLAW_GATEWAY|OPENCLAW_GATEWAY|botID'
 ```bash
 curl -H "X-API-Key: $CLAW_GATEWAY_API_KEY" "$CLAW_GATEWAY_URL/healthz"
 ```
+
+### 返回的是 `/preview/:uuid` 或内部地址
+
+`1.0.9` 起，插件会在 `output` 交付物场景下自动把相对/内部 preview 地址修正为最终的外部 `output` 直链，不再依赖 gateway 当前环境里是否显式配置了 `deliverable.gatewayPublicUrl`。

package/mcp-servers/deliverables.js

@@ -16,11 +16,12 @@ var http  = require("http");
 var https = require("https");
 
 var GATEWAY_URL    = (process.env.CLAW_GATEWAY_URL        || "http://claw-gateway:8080").replace(/\/$/, "");
-var GATEWAY_PUBLIC = (process.env.CLAW_GATEWAY_PUBLIC_URL || GATEWAY_URL).replace(/\/$/, "");
+var RAW_GATEWAY_PUBLIC = (process.env.CLAW_GATEWAY_PUBLIC_URL || GATEWAY_URL).replace(/\/$/, "");
 // Some existing pods were created without CLAW_GATEWAY_API_KEY injected.
 // Keep env-driven behavior first, but provide a dev-compatible fallback to avoid
 // breaking deliverable uploads during rolling migration.
 var API_KEY        = process.env.CLAW_GATEWAY_API_KEY || process.env.OPENCLAW_GATEWAY_API_KEY || "api-key-1";
+var GATEWAY_PUBLIC = resolveGatewayPublicBase();
 
 var TOOL_DEFS = [
   {
@@ -93,6 +94,200 @@ function parseURL(rawURL) {
   }
 }
 
+function isPrivateIPv4(hostname) {
+  if (!hostname) return false;
+  if (/^10\./.test(hostname)) return true;
+  if (/^127\./.test(hostname)) return true;
+  if (/^192\.168\./.test(hostname)) return true;
+  var m = hostname.match(/^172\.(\d+)\./);
+  if (m) {
+    var second = parseInt(m[1], 10);
+    return second >= 16 && second <= 31;
+  }
+  return false;
+}
+
+function isInternalHostname(hostname) {
+  var host = String(hostname || "").toLowerCase();
+  if (!host) return false;
+  if (host === "localhost" || host === "claw-gateway") return true;
+  if (host.indexOf(".svc") >= 0 || host.indexOf(".cluster.local") >= 0) return true;
+  if (host.indexOf("claw-gateway:") === 0) return true;
+  if (isPrivateIPv4(host)) return true;
+  if (host.indexOf(".") < 0) return true;
+  return false;
+}
+
+function isProbablyInternalURL(rawURL) {
+  var parsed = parseURL(rawURL);
+  if (!parsed) return false;
+  return isInternalHostname(parsed.hostname);
+}
+
+function envGatewayPublicFallback() {
+  var helmEnv = String(process.env.HELM_ENV || process.env.ENV || "").toLowerCase();
+  if (helmEnv === "prod" || helmEnv === "production" || helmEnv === "online") {
+    return "https://claw-gateway.csagentai.com";
+  }
+  if (helmEnv === "dev" || helmEnv === "development" || helmEnv === "staging" || helmEnv === "stage") {
+    return "https://claw-dev.csaiagent.com";
+  }
+  return "";
+}
+
+function resolveGatewayPublicBase() {
+  var candidate = RAW_GATEWAY_PUBLIC;
+  if (candidate && !isProbablyInternalURL(candidate)) {
+    return candidate;
+  }
+  var fallback = envGatewayPublicFallback();
+  if (fallback) {
+    return fallback.replace(/\/$/, "");
+  }
+  return candidate;
+}
+
+function absolutizePublicURL(rawURL) {
+  var val = String(rawURL || "").trim();
+  if (!val) return "";
+  if (/^https?:\/\//i.test(val)) {
+    if (isProbablyInternalURL(val) && GATEWAY_PUBLIC && !isProbablyInternalURL(GATEWAY_PUBLIC)) {
+      var parsed = parseURL(val);
+      if (parsed) {
+        return GATEWAY_PUBLIC + parsed.pathname + (parsed.search || "") + (parsed.hash || "");
+      }
+    }
+    return val;
+  }
+  if (val.charAt(0) !== "/") {
+    val = "/" + val;
+  }
+  return (GATEWAY_PUBLIC || RAW_GATEWAY_PUBLIC || "").replace(/\/$/, "") + val;
+}
+
+function outputPublicBase() {
+  return absolutizePublicURL("/openclaw-gateway/output");
+}
+
+function encodePathSegments(parts) {
+  return parts.map(function(part) {
+    return encodeURIComponent(String(part || ""));
+  }).join("/");
+}
+
+function sanitizePathSegment(v) {
+  var s = String(v || "").trim();
+  if (!s) return "unknown";
+  s = s.replace(/\//g, "_");
+  s = s.replace(/\\/g, "_");
+  s = s.replace(/\.\./g, "_");
+  return s;
+}
+
+function sanitizeFileName(v) {
+  var name = String(v || "").trim();
+  if (!name) return "file";
+  name = name.replace(/^.*[\/\\]/, "");
+  name = name.replace(/\//g, "_");
+  name = name.replace(/\\/g, "_");
+  name = name.replace(/\.\./g, "_");
+  if (!name || name === ".") return "file";
+  return name;
+}
+
+function extractUserIDFromResource(resourceID) {
+  var trimmed = String(resourceID || "").trim();
+  var prefix = "user_";
+  if (!trimmed || trimmed.indexOf(prefix) !== 0) {
+    return "";
+  }
+  var rest = trimmed.slice(prefix.length);
+  var end = rest.indexOf("_");
+  if (end <= 0) {
+    return "";
+  }
+  return rest.slice(0, end);
+}
+
+function deriveRelease(release, resourceID, userID) {
+  var rel = sanitizePathSegment(release);
+  if (rel && rel !== "unknown") {
+    return rel;
+  }
+  var uid = String(userID || "").trim();
+  if (!uid) {
+    uid = extractUserIDFromResource(resourceID);
+  }
+  if (uid) {
+    return "user-" + uid;
+  }
+  return "unknown";
+}
+
+function looksLikePreviewRoute(rawURL) {
+  var val = String(rawURL || "").trim();
+  return /\/openclaw-gateway\/preview\/[^/?#]+(?:[?#].*)?$/i.test(val);
+}
+
+function needsOutputURLRepair(data) {
+  if (!data) return false;
+  if (String(data.backend || "").toLowerCase() !== "output") {
+    return false;
+  }
+  var previewURL = String(data.previewUrl || "").trim();
+  var downloadURL = String(data.downloadUrl || "").trim();
+  if (!previewURL || !downloadURL) {
+    return true;
+  }
+  if (previewURL.charAt(0) === "/" || downloadURL.charAt(0) === "/") {
+    return true;
+  }
+  if (isProbablyInternalURL(previewURL) || isProbablyInternalURL(downloadURL)) {
+    return true;
+  }
+  if (looksLikePreviewRoute(previewURL) || looksLikePreviewRoute(downloadURL)) {
+    return true;
+  }
+  return false;
+}
+
+function fetchDeliverableMeta(uuid) {
+  if (!uuid) return Promise.resolve(null);
+  return httpRequest("GET", "/openclaw-gateway/be/deliverables/" + encodeURIComponent(uuid)).then(function(resp) {
+    return resp.body.data || resp.body || null;
+  });
+}
+
+function buildOutputURLs(meta, args, body, data) {
+  var base = outputPublicBase();
+  if (!base) {
+    return null;
+  }
+  var resourceID = sanitizePathSegment((meta && meta.resourceId) || body.resourceId || args.resource_id);
+  var userID = (meta && meta.userId) || body.userId || args.user_id;
+  var release = deriveRelease((meta && meta.release) || body.release, resourceID, userID);
+  var uuid = String((meta && meta.uuid) || (data && data.uuid) || "").trim();
+  if (!resourceID || !uuid) {
+    return null;
+  }
+  var isDirectory = !!(args.files && args.files.length > 0) || String((meta && meta.mime) || "").trim() === "application/x-directory";
+  if (isDirectory) {
+    var dirURL = base.replace(/\/$/, "") + "/" + encodePathSegments([release, resourceID, uuid]);
+    return {
+      previewURL: dirURL,
+      downloadURL: dirURL + "?list=1",
+      isDirectory: true
+    };
+  }
+  var fileName = sanitizeFileName((meta && meta.fileName) || body.fileName || args.file_name);
+  var fileURL = base.replace(/\/$/, "") + "/" + encodePathSegments([release, resourceID, uuid, fileName]);
+  return {
+    previewURL: fileURL,
+    downloadURL: fileURL,
+    isDirectory: false
+  };
+}
+
 function httpRequest(method, path, body) {
   return new Promise(function(resolve, reject) {
     var parsed = parseURL(GATEWAY_URL + path);
@@ -167,6 +362,17 @@ function buildReplyMarkdown(opts) {
   return lines.join("\n");
 }
 
+function resolveReplyURLs(data, args, body) {
+  if (!needsOutputURLRepair(data)) {
+    return Promise.resolve(null);
+  }
+  return fetchDeliverableMeta(data.uuid).catch(function() {
+    return null;
+  }).then(function(meta) {
+    return buildOutputURLs(meta, args, body, data);
+  });
+}
+
 // ─── Tool implementations ─────────────────────────────────────────────────────
 
 function uploadDeliverable(args) {
@@ -205,29 +411,32 @@ function uploadDeliverable(args) {
 
   return httpRequest("POST", "/openclaw-gateway/be/deliverables", body).then(function(resp) {
     var d = resp.body.data || resp.body;
-    // Prefer backend-aware previewUrl returned by gateway (OSS/output/link).
-    // Fallback to legacy gateway preview endpoint for compatibility.
-    var previewURL = d.previewUrl || (GATEWAY_PUBLIC + "/openclaw-gateway/preview/" + d.uuid);
-    var isDirectory = !!(args.files && args.files.length > 0);
-    if (!isDirectory && d.downloadUrl && previewURL && d.downloadUrl !== previewURL && /(?:\?|&)list=1(?:&|$)/.test(d.downloadUrl)) {
-      isDirectory = true;
-    }
-    var replyMarkdown = buildReplyMarkdown({
-      previewURL: previewURL,
-      downloadURL: d.downloadUrl,
-      type: args.type,
-      isDirectory: isDirectory
+    return resolveReplyURLs(d, args, body).then(function(repaired) {
+      // Prefer backend-aware previewUrl returned by gateway (OSS/output/link).
+      // Fallback to legacy gateway preview endpoint for compatibility.
+      var previewURL = absolutizePublicURL((repaired && repaired.previewURL) || d.previewUrl || ("/openclaw-gateway/preview/" + d.uuid));
+      var downloadURL = absolutizePublicURL((repaired && repaired.downloadURL) || d.downloadUrl);
+      var isDirectory = !!(repaired && repaired.isDirectory) || !!(args.files && args.files.length > 0);
+      if (!isDirectory && downloadURL && previewURL && downloadURL !== previewURL && /(?:\?|&)list=1(?:&|$)/.test(downloadURL)) {
+        isDirectory = true;
+      }
+      var replyMarkdown = buildReplyMarkdown({
+        previewURL: previewURL,
+        downloadURL: downloadURL,
+        type: args.type,
+        isDirectory: isDirectory
+      });
+      return {
+        uuid:         d.uuid,
+        backend:      d.backend || "",
+        download_url: downloadURL,
+        preview_url:  previewURL,
+        expire_at:    d.expireAt,
+        reply_markdown: replyMarkdown,
+        trace_id:     resp.traceID || "",
+        message: replyMarkdown
+      };
     });
-    return {
-      uuid:         d.uuid,
-      backend:      d.backend || "",
-      download_url: d.downloadUrl,
-      preview_url:  previewURL,
-      expire_at:    d.expireAt,
-      reply_markdown: replyMarkdown,
-      trace_id:     resp.traceID || "",
-      message: replyMarkdown
-    };
   });
 }
 
@@ -252,7 +461,7 @@ function handleMessage(msg) {
       send({ jsonrpc: "2.0", id: id, result: {
         protocolVersion: "2024-11-05",
         capabilities: { tools: {} },
-        serverInfo: { name: "deliverables", version: "1.0.2" }
+        serverInfo: { name: "deliverables", version: "1.0.9" }
       }});
       return Promise.resolve();
 

package/openclaw-plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "plugin-deliverables",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "npm_package": "@dai_ming/plugin-deliverables",
   "description": "Deliverables plugin: MCP server + skill + AGENTS rules for AI-generated file uploads",
   "mcp_servers": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dai_ming/plugin-deliverables",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "OpenClaw deliverables plugin — upload AI-generated files to OSS and return shareable preview/download links",
   "keywords": [
     "openclaw",