@tachybase/plugin-action-custom-request 1.1.2 → 1.1.9

package/dist/externalVersion.js

@@ -1,17 +1,17 @@
 module.exports = {
   "react": "18.3.1",
-  "@tachybase/client": "1.1.2",
+  "@tachybase/client": "1.1.9",
   "react-i18next": "15.2.0",
-  "@tachybase/logger": "1.1.2",
-  "@tachybase/server": "1.1.2",
-  "@tachybase/test": "1.1.2",
-  "@tachybase/schema": "1.1.2",
-  "@tachybase/components": "1.1.2",
+  "@tachybase/logger": "1.1.9",
+  "@tachybase/server": "1.1.9",
+  "@tachybase/test": "1.1.9",
+  "@tachybase/schema": "1.1.9",
+  "@tachybase/components": "1.1.9",
   "antd": "5.22.5",
-  "@tachybase/utils": "1.1.2",
+  "@tachybase/utils": "1.1.9",
   "react-router-dom": "6.28.1",
-  "@tachybase/actions": "1.1.2",
-  "@tachybase/evaluators": "1.1.2",
-  "axios": "0.27.2",
-  "@tachybase/database": "1.1.2"
+  "@tachybase/actions": "1.1.9",
+  "@tachybase/evaluators": "1.1.9",
+  "axios": "1.7.7",
+  "@tachybase/database": "1.1.9"
 };

package/dist/server/actions/send.js

@@ -139,12 +139,14 @@ async function send(ctx, next) {
     });
     return template(variables);
   };
+  const { baseURL, url: axiosURL, isExternal } = extractBaseUrlAndPath(url);
   const axiosRequestConfig = {
-    baseURL: import_server.Gateway.getInstance().runAtLoop,
+    baseURL,
     ...options,
-    url: getParsedValue(url),
+    url: getParsedValue(axiosURL),
     headers: {
-      Authorization: "Bearer " + ctx.getBearerToken(),
+      // 外部请求自行处理权限问题
+      Authorization: isExternal ? void 0 : "Bearer " + ctx.getBearerToken(),
       ...getHeaders(ctx.headers),
       ...omitNullAndUndefined(getParsedValue(arrayToObject(headers)))
     },
@@ -192,6 +194,25 @@ async function send(ctx, next) {
   }
   return next();
 }
+function extractBaseUrlAndPath(url) {
+  const currentBaseURL = import_server.Gateway.getInstance().runAtLoop;
+  if (/^https?:\/\//i.test(url)) {
+    const urlObj = new URL(url);
+    const baseURL = `${urlObj.protocol}//${urlObj.host}`;
+    const newUrl = urlObj.pathname + urlObj.search + urlObj.hash;
+    return {
+      baseURL,
+      url: newUrl,
+      isExternal: baseURL !== currentBaseURL
+    };
+  } else {
+    return {
+      baseURL: import_server.Gateway.getInstance().runAtLoop,
+      url,
+      isExternal: false
+    };
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   send

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tachybase/plugin-action-custom-request",
   "displayName": "Action: Custom request",
-  "version": "1.1.2",
+  "version": "1.1.9",
   "description": "Sending a request to any HTTP service supports sending context data to the target service.",
   "keywords": [
     "Actions"
@@ -11,23 +11,24 @@
   "dependencies": {},
   "devDependencies": {
     "antd": "5.22.5",
+    "axios": "1.7.7",
     "file-saver": "^2.0.5",
     "lodash": "~4.17.21",
     "react-i18next": "^15.2.0",
     "react-router-dom": "6.28.1",
-    "@tachybase/schema": "1.1.2",
-    "@tachybase/components": "1.1.2"
+    "@tachybase/components": "1.1.9",
+    "@tachybase/schema": "1.1.9"
   },
   "peerDependencies": {
-    "@tachybase/actions": "1.1.2",
-    "@tachybase/evaluators": "1.1.2",
-    "@tachybase/client": "1.1.2",
-    "@tachybase/logger": "1.1.2",
-    "@tachybase/sdk": "1.1.2",
-    "@tachybase/database": "1.1.2",
-    "@tachybase/test": "1.1.2",
-    "@tachybase/utils": "1.1.2",
-    "@tachybase/server": "1.1.2"
+    "@tachybase/actions": "1.1.9",
+    "@tachybase/client": "1.1.9",
+    "@tachybase/evaluators": "1.1.9",
+    "@tachybase/logger": "1.1.9",
+    "@tachybase/sdk": "1.1.9",
+    "@tachybase/database": "1.1.9",
+    "@tachybase/utils": "1.1.9",
+    "@tachybase/server": "1.1.9",
+    "@tachybase/test": "1.1.9"
   },
   "description.zh-CN": "向任意 HTTP 服务发送请求，支持将上下文数据发送给目标服务。",
   "displayName.zh-CN": "操作：自定义请求",